From 5044a98e3b0c86902ca6e7e386fc0ec35d22377f Mon Sep 17 00:00:00 2001
From: Christian R <github@chrisnew.de>
Date: Thu, 2 Apr 2026 00:53:21 +0300
Subject: [PATCH 01/67] Octree fixes

---
 jsconfig.json                |   1 -
 source/engine/server/Com.mjs |   2 +-
 source/shared/Octree.mjs     |  90 ++++++++++++++++---------
 source/shared/Q.mjs          |   1 +
 test/common/octree.test.mjs  | 125 +++++++++++++++++++++++++++++++++++
 5 files changed, 185 insertions(+), 34 deletions(-)
 create mode 100644 test/common/octree.test.mjs

diff --git a/jsconfig.json b/jsconfig.json
index 87b17ae0..3932737f 100644
--- a/jsconfig.json
+++ b/jsconfig.json
@@ -4,7 +4,6 @@
     "moduleResolution": "bundler",
     "target": "es2024",
     "checkJs": true,
-    "baseUrl": ".",
   },
   "exclude": ["node_modules"],
   "include": [
diff --git a/source/engine/server/Com.mjs b/source/engine/server/Com.mjs
index 4eddc59a..b5dc2ddf 100644
--- a/source/engine/server/Com.mjs
+++ b/source/engine/server/Com.mjs
@@ -99,7 +99,7 @@ export default class NodeCOM extends COM {
   /**
    * Loads and parses a pack file.
    * @param {string} packfile - The path to the pack file.
-   * @returns {Promise<Array<object> | undefined>} - The parsed pack file entries or undefined if the file doesn't exist.
+   * @returns {Promise<Array<object> | null>} - The parsed pack file entries or null if the file doesn't exist.
    */
   static async LoadPackFile(packfile) {
     if (!existsSync(`data/${packfile}`)) { // CR: wanna see something ugly? check out the async version of existsSync…
diff --git a/source/shared/Octree.mjs b/source/shared/Octree.mjs
index ca6d9bc6..b3ba494f 100644
--- a/source/shared/Octree.mjs
+++ b/source/shared/Octree.mjs
@@ -1,9 +1,9 @@
 import Vector from './Vector.mjs';
 
-/** @typedef {{origin: Vector, absmin: Vector|null, absmax: Vector|null, octreeNode: OctreeNode|null}} OctreeItem */
+/** @typedef {{origin: Vector, absmin: Vector|null, absmax: Vector|null, octreeNode: OctreeNode<OctreeItem>|null}} OctreeItem */
 
 /**
- * Octree node holding an spatial indexed item.
+ * Octree node holding a spatially indexed item.
  * @template {OctreeItem} T
  */
 export class OctreeNode {
@@ -23,7 +23,7 @@ export class OctreeNode {
     this.totalCount = 0;
     /** @type {T[]} */
     this.items = [];
-    /** @type {?OctreeNode<T>[]} */
+    /** @type {OctreeNode<T>[]|null} */
     this.children = null;
   }
 
@@ -59,12 +59,13 @@ export class OctreeNode {
 
   /**
    * Subdivides this node into eight children.
+   * @returns {OctreeNode<T>[]} created children
    */
   #subdivide() {
     const hs = this.halfSize / 2;
     const offs = [-hs, hs];
-
-    this.children = [];
+    /** @type {OctreeNode<T>[]} */
+    const children = [];
 
     for (let ix = 0; ix < 2; ix++) {
       for (let iy = 0; iy < 2; iy++) {
@@ -75,10 +76,30 @@ export class OctreeNode {
             this.center[2] + offs[iz],
           );
 
-          this.children.push(new OctreeNode(c, hs, this.capacity, this.minSize, this));
+          children.push(new OctreeNode(c, hs, this.capacity, this.minSize, this));
         }
       }
     }
+
+    this.children = children;
+    return children;
+  }
+
+  /**
+   * Inserts an item into the first child that fully contains it.
+   * @param {T} item item to insert
+   * @param {OctreeNode<T>[]} children child nodes
+   * @returns {OctreeNode<T>|null} child node that accepted the item, if any
+   */
+  #insertIntoChildren(item, children) {
+    for (const child of children) {
+      const node = child.insert(item);
+      if (node !== null) {
+        return node;
+      }
+    }
+
+    return null;
   }
 
   /**
@@ -98,7 +119,9 @@ export class OctreeNode {
       }
     }
 
-    if (this.children === null) {
+    let children = this.children;
+
+    if (children === null) {
       // is there enough space? if so, add it here
       if (this.items.length < this.capacity || this.halfSize <= this.minSize) {
         this.items.push(obj);
@@ -109,7 +132,7 @@ export class OctreeNode {
       // split
       // temporarily reduce count for items we are about to move
       this.#updateCount(-this.items.length);
-      this.#subdivide();
+      children = this.#subdivide();
 
       // move items into children
       const old = this.items;
@@ -117,18 +140,14 @@ export class OctreeNode {
 
       // re-insert old items
       for (const item of old) {
-        let inserted = false;
-        for (const ch of this.children) {
-          const node = ch.insert(item);
-          if (node) {
-            if (item.octreeNode) {
-              item.octreeNode = node;
-            }
-            inserted = true;
-            break;
+        const node = this.#insertIntoChildren(item, children);
+        if (node !== null) {
+          if (item.octreeNode) {
+            item.octreeNode = node;
           }
         }
-        if (!inserted) {
+
+        if (node === null) {
           this.items.push(item); // keep in parent if it doesn’t fit in any child
           if (item.octreeNode) {
             item.octreeNode = this;
@@ -139,11 +158,9 @@ export class OctreeNode {
     }
 
     // insert into child
-    for (const ch of this.children) {
-      const node = ch.insert(obj);
-      if (node) {
-        return node;
-      }
+    const node = this.#insertIntoChildren(obj, children);
+    if (node !== null) {
+      return node;
     }
 
     // if it didn’t fit in any child (e.g. straddles boundary), keep it here
@@ -215,11 +232,14 @@ export class OctreeNode {
    */
   #getAllItems() {
     let items = [...this.items];
-    if (this.children) {
-      for (const ch of this.children) {
-        items = items.concat(ch.#getAllItems());
+    const children = this.children;
+
+    if (children !== null) {
+      for (const child of children) {
+        items = items.concat(child.#getAllItems());
       }
     }
+
     return items;
   }
 
@@ -228,6 +248,7 @@ export class OctreeNode {
    * @param {Vector} mins minimum bounds
    * @param {Vector} maxs maximum bounds
    * @yields {T} item
+   * @returns {IterableIterator<T>} items inside AABB
    */
   *queryAABB(mins, maxs) {
     // AABB-AABB intersection test
@@ -268,9 +289,11 @@ export class OctreeNode {
     }
 
     // traverse children
-    if (this.children) {
-      for (const ch of this.children) {
-        yield* ch.queryAABB(mins, maxs);
+    const children = this.children;
+
+    if (children !== null) {
+      for (const child of children) {
+        yield* child.queryAABB(mins, maxs);
       }
     }
   }
@@ -280,6 +303,7 @@ export class OctreeNode {
    * @param {Vector} point position
    * @param {number} radius radius
    * @yields {[number, T]} distance and item
+   * @returns {IterableIterator<[number, T]>} items inside sphere
    */
   *querySphere(point, radius) {
     // AABB-sphere intersection test
@@ -304,9 +328,11 @@ export class OctreeNode {
     }
 
     // traverse children
-    if (this.children) {
-      for (const ch of this.children) {
-        yield* ch.querySphere(point, radius);
+    const children = this.children;
+
+    if (children !== null) {
+      for (const child of children) {
+        yield* child.querySphere(point, radius);
       }
     }
   }
diff --git a/source/shared/Q.mjs b/source/shared/Q.mjs
index d0944970..78eabb69 100644
--- a/source/shared/Q.mjs
+++ b/source/shared/Q.mjs
@@ -156,6 +156,7 @@ export const enumHelpers = Object.freeze({
    * @returns {string|number|null} enum value
    */
   fromKey(name) {
+    // @ts-ignore
     return this[name] ?? null;
   },
 });
diff --git a/test/common/octree.test.mjs b/test/common/octree.test.mjs
new file mode 100644
index 00000000..907893dc
--- /dev/null
+++ b/test/common/octree.test.mjs
@@ -0,0 +1,125 @@
+import assert from 'node:assert/strict';
+import { describe, test } from 'node:test';
+
+import { Octree } from '../../source/shared/Octree.mjs';
+import Vector from '../../source/shared/Vector.mjs';
+
+/** @typedef {import('../../source/shared/Octree.mjs').OctreeNode<TestItem>} TestOctreeNode */
+
+/**
+ * @typedef TestItem
+ * @property {string} name item identifier
+ * @property {Vector} origin item origin
+ * @property {Vector|null} absmin minimum bounds when the item has box extents
+ * @property {Vector|null} absmax maximum bounds when the item has box extents
+ * @property {TestOctreeNode|null} octreeNode node currently storing the item
+ */
+
+/**
+ * @param {string} name item identifier
+ * @param {Vector} origin item origin
+ * @returns {TestItem} point item
+ */
+function createPointItem(name, origin) {
+  return {
+    name,
+    origin,
+    absmin: null,
+    absmax: null,
+    octreeNode: null,
+  };
+}
+
+/**
+ * @param {string} name item identifier
+ * @param {Vector} origin item origin
+ * @param {Vector} mins local minimum bounds
+ * @param {Vector} maxs local maximum bounds
+ * @returns {TestItem} bounded item
+ */
+function createBoxItem(name, origin, mins, maxs) {
+  return {
+    name,
+    origin,
+    absmin: origin.copy().add(mins),
+    absmax: origin.copy().add(maxs),
+    octreeNode: null,
+  };
+}
+
+/**
+ * @param {Octree<TestItem>} tree octree under test
+ * @param {TestItem} item item to insert and track
+ * @returns {TestOctreeNode} node that stored the item
+ */
+function insertTracked(tree, item) {
+  const node = tree.insert(item);
+  assert.notEqual(node, null);
+  item.octreeNode = node;
+  return node;
+}
+
+/**
+ * @param {import('../../source/shared/Octree.mjs').OctreeNode<TestItem>} node node whose children must exist
+ * @returns {TestOctreeNode[]} node children
+ */
+function requireChildren(node) {
+  assert.notEqual(node.children, null);
+  return node.children;
+}
+
+describe('Octree', () => {
+  test('splits into children once capacity is exceeded', () => {
+    const tree = new Octree(new Vector(0, 0, 0), 16, 1, 1);
+    const first = createPointItem('first', new Vector(-4, -4, -4));
+    const second = createPointItem('second', new Vector(4, 4, 4));
+
+    insertTracked(tree, first);
+    insertTracked(tree, second);
+
+    const children = requireChildren(tree.root);
+
+    assert.equal(children.length, 8);
+    assert.equal(tree.root.items.length, 0);
+    assert.equal(tree.root.totalCount, 2);
+    assert.notEqual(first.octreeNode, tree.root);
+    assert.notEqual(second.octreeNode, tree.root);
+    assert.deepEqual(
+      [...tree.queryAABB(new Vector(-16, -16, -16), new Vector(16, 16, 16))].map((item) => item.name).sort(),
+      ['first', 'second'],
+    );
+  });
+
+  test('keeps oversized bounds in the parent after a split', () => {
+    const tree = new Octree(new Vector(0, 0, 0), 16, 1, 1);
+    const anchor = createPointItem('anchor', new Vector(10, 10, 10));
+    const straddling = createBoxItem('straddling', new Vector(0, 0, 0), new Vector(-2, -2, -2), new Vector(2, 2, 2));
+
+    insertTracked(tree, anchor);
+    insertTracked(tree, straddling);
+
+    requireChildren(tree.root);
+
+    assert.equal(tree.root.items.length, 1);
+    assert.equal(tree.root.items[0], straddling);
+    assert.equal(straddling.octreeNode, tree.root);
+    assert.notEqual(anchor.octreeNode, tree.root);
+  });
+
+  test('merges children back into the parent when removals drop below capacity', () => {
+    const tree = new Octree(new Vector(0, 0, 0), 16, 1, 1);
+    const first = createPointItem('first', new Vector(-4, -4, -4));
+    const second = createPointItem('second', new Vector(4, 4, 4));
+
+    insertTracked(tree, first);
+    insertTracked(tree, second);
+
+    assert.equal(tree.remove(second), true);
+
+    assert.equal(tree.root.children, null);
+    assert.equal(tree.root.totalCount, 1);
+    assert.deepEqual(tree.root.items.map((item) => item.name), ['first']);
+    assert.equal(first.octreeNode, tree.root);
+    assert.equal(second.octreeNode, null);
+  });
+});

From 5821c7fa3abb7aa38181bf14ec50ebe7bb0d0387 Mon Sep 17 00:00:00 2001
From: Christian R <github@chrisnew.de>
Date: Thu, 2 Apr 2026 11:05:06 +0300
Subject: [PATCH 02/67] introducing TypeScript tooling

---
 eslint.config.mjs         | 54 ++++++++++++++++++++++++++++-------
 jsconfig.json             | 21 --------------
 package.json              |  3 ++
 tsconfig.json             | 60 +++++++++++++++++++++++++++++++++++++++
 vite.config.dedicated.mjs |  5 +++-
 vite.config.mjs           |  1 +
 6 files changed, 112 insertions(+), 32 deletions(-)
 delete mode 100644 jsconfig.json
 create mode 100644 tsconfig.json

diff --git a/eslint.config.mjs b/eslint.config.mjs
index 24b8b520..8746b711 100644
--- a/eslint.config.mjs
+++ b/eslint.config.mjs
@@ -1,4 +1,6 @@
 import { defineConfig } from 'eslint/config';
+import { dirname } from 'path';
+import { fileURLToPath } from 'url';
 import globals from 'globals';
 import pluginJs from '@eslint/js';
 import jsdoc from 'eslint-plugin-jsdoc';
@@ -6,6 +8,14 @@ import stylistic from '@stylistic/eslint-plugin';
 import tseslint from '@typescript-eslint/eslint-plugin';
 import tsparser from '@typescript-eslint/parser';
 
+const __dirname = dirname(fileURLToPath(import.meta.url));
+const typeAwareParserOptions = {
+  ecmaVersion: 'latest',
+  sourceType: 'module',
+  projectService: true,
+  tsconfigRootDir: __dirname,
+};
+
 const jsdocPlugin = /** @type {import('eslint').ESLint.Plugin} */ (jsdoc);
 const stylisticPlugin = /** @type {import('eslint').ESLint.Plugin} */ (stylistic);
 const typeScriptEslintPlugin = /** @type {import('eslint').ESLint.Plugin} */ (
@@ -86,11 +96,7 @@ export default defineConfig([
     languageOptions: {
       globals: globals.browser,
       parser: tsparser,
-      parserOptions: {
-        ecmaVersion: 'latest',
-        sourceType: 'module',
-        project: './jsconfig.json',
-      },
+      parserOptions: typeAwareParserOptions,
     },
     plugins: {
       '@stylistic': stylisticPlugin,
@@ -99,29 +105,57 @@ export default defineConfig([
     },
     rules: commonRules,
   },
+  {
+    files: ['**/*.{ts,mts,cts}'],
+    languageOptions: {
+      globals: globals.browser,
+      parser: tsparser,
+      parserOptions: typeAwareParserOptions,
+    },
+    plugins: {
+      '@stylistic': stylisticPlugin,
+      '@typescript-eslint': typeScriptEslintPlugin,
+      jsdoc: jsdocPlugin,
+    },
+    rules: {
+      ...commonRules,
+      'no-undef': 'off',
+      'no-unused-vars': 'off',
+      '@typescript-eslint/no-unused-vars': ['error', {
+        argsIgnorePattern: '^_',
+        caughtErrorsIgnorePattern: '^_',
+        varsIgnorePattern: '^_',
+      }],
+    },
+  },
   {
     files: [
       'dedicated.mjs',
+      'dedicated.ts',
       'eslint.config.mjs',
+      'eslint.config.ts',
       'vite.config.mjs',
+      'vite.config.ts',
       'vite.config.dedicated.mjs',
+      'vite.config.dedicated.ts',
       'source/engine/main-dedicated.mjs',
-      'source/engine/server/**/*.mjs',
-      'source/engine/common/**/*.mjs',
-      'test/**/*.mjs',
+      'source/engine/main-dedicated.ts',
+      'source/engine/server/**/*.{mjs,ts,mts,cts}',
+      'source/engine/common/**/*.{mjs,ts,mts,cts}',
+      'test/**/*.{mjs,ts,mts,cts}',
     ],
     languageOptions: {
       globals: nodeGlobals,
     },
   },
   {
-    files: ['source/cloudflare/**/*.mjs'],
+    files: ['source/cloudflare/**/*.{mjs,ts,mts,cts}'],
     languageOptions: {
       globals: globals.serviceworker,
     },
   },
   {
-    files: ['**/*.cjs'],
+    files: ['**/*.{cjs,cts}'],
     languageOptions: {
       sourceType: 'commonjs',
     },
diff --git a/jsconfig.json b/jsconfig.json
deleted file mode 100644
index 3932737f..00000000
--- a/jsconfig.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-  "compilerOptions": {
-    "module": "esnext",
-    "moduleResolution": "bundler",
-    "target": "es2024",
-    "checkJs": true,
-  },
-  "exclude": ["node_modules"],
-  "include": [
-    "./source/engine/**/*.mjs",
-    "./source/engine/**/*.d.ts",
-    "./source/game/**/*.mjs",
-    "./source/game/**/*.d.ts",
-    "./source/shared/**/*.mjs",
-    "./source/shared/**/*.d.ts",
-    "./source/cloudflare/**/*.mjs",
-    "./source/cloudflare/**/*.d.ts",
-    "./test/**/*.mjs",
-    "./*.mjs"
-  ]
-}
diff --git a/package.json b/package.json
index ad9e0861..0dbc4a77 100644
--- a/package.json
+++ b/package.json
@@ -10,6 +10,7 @@
     "node": ">=24 <25"
   },
   "devDependencies": {
+    "@types/node": "^24.6.1",
     "@eslint/js": "^9.17.0",
     "@stylistic/eslint-plugin": "^5.2.2",
     "@typescript-eslint/eslint-plugin": "^8.46.4",
@@ -34,6 +35,8 @@
     "test:common": "node --test test/common/**/*.test.mjs",
     "test:physics": "node --test test/physics/**/*.test.mjs",
     "test:renderer": "node --test test/renderer/**/*.test.mjs",
+    "typecheck": "tsc -p tsconfig.json",
+    "typecheck:watch": "tsc -p tsconfig.json --watch --preserveWatchOutput",
     "build:wrangler": "npm run test && npm run build:production",
     "dev": "vite build --watch --mode development",
     "build": "vite build",
diff --git a/tsconfig.json b/tsconfig.json
new file mode 100644
index 00000000..f16999f2
--- /dev/null
+++ b/tsconfig.json
@@ -0,0 +1,60 @@
+{
+  "compilerOptions": {
+    "target": "ESNext",
+    "module": "ESNext",
+    "moduleResolution": "bundler",
+    "lib": ["ESNext", "DOM", "DOM.Iterable"],
+    "types": ["node"],
+    "allowJs": true,
+    "checkJs": true,
+    "noEmit": true,
+    "isolatedModules": true,
+    "verbatimModuleSyntax": true,
+    "allowImportingTsExtensions": true,
+    "allowSyntheticDefaultImports": true,
+    "resolveJsonModule": true,
+    "useDefineForClassFields": true,
+    "moduleDetection": "force",
+    "skipLibCheck": true,
+    "paths": {
+      "@/*": ["./source/*"]
+    }
+  },
+  "exclude": ["node_modules", "dist"],
+  "include": [
+    "./source/engine/**/*.mjs",
+    "./source/engine/**/*.cjs",
+    "./source/engine/**/*.ts",
+    "./source/engine/**/*.mts",
+    "./source/engine/**/*.cts",
+    "./source/engine/**/*.d.ts",
+    "./source/game/**/*.mjs",
+    "./source/game/**/*.cjs",
+    "./source/game/**/*.ts",
+    "./source/game/**/*.mts",
+    "./source/game/**/*.cts",
+    "./source/game/**/*.d.ts",
+    "./source/shared/**/*.mjs",
+    "./source/shared/**/*.cjs",
+    "./source/shared/**/*.ts",
+    "./source/shared/**/*.mts",
+    "./source/shared/**/*.cts",
+    "./source/shared/**/*.d.ts",
+    "./source/cloudflare/**/*.mjs",
+    "./source/cloudflare/**/*.cjs",
+    "./source/cloudflare/**/*.ts",
+    "./source/cloudflare/**/*.mts",
+    "./source/cloudflare/**/*.cts",
+    "./source/cloudflare/**/*.d.ts",
+    "./test/**/*.mjs",
+    "./test/**/*.cjs",
+    "./test/**/*.ts",
+    "./test/**/*.mts",
+    "./test/**/*.cts",
+    "./*.mjs",
+    "./*.cjs",
+    "./*.ts",
+    "./*.mts",
+    "./*.cts"
+  ]
+}
diff --git a/vite.config.dedicated.mjs b/vite.config.dedicated.mjs
index fbd17cca..2621474a 100644
--- a/vite.config.dedicated.mjs
+++ b/vite.config.dedicated.mjs
@@ -118,7 +118,7 @@ function dedicatedWorkerBundlePlugin(mode) {
             // We undo that here so Rollup can resolve and bundle them.
             name: 'resolve-worker-dynamic-imports',
             transform(code, id) {
-              if (!id.includes('WorkerFramework')) return null;
+              if (!id.includes('WorkerFramework')) { return null; }
               // Replace the two-step variable + import() patterns with direct
               // literal import() calls so Rollup can statically resolve them.
               return {
@@ -186,6 +186,8 @@ export default defineConfig(({ mode }) => ({
           if (id.includes('/source/engine/') || id.includes('/source/shared/')) {
             return 'engine';
           }
+
+          return null;
         },
       },
     },
@@ -211,6 +213,7 @@ export default defineConfig(({ mode }) => ({
     alias: {
       '@': resolve(__dirname, 'source'),
     },
+    extensions: ['.ts', '.mts', '.mjs', '.js', '.json'],
     preserveSymlinks: process.env.VITE_PRESERVE_SYMLINKS === 'true',
   },
 }));
diff --git a/vite.config.mjs b/vite.config.mjs
index b45870dd..6d8808dd 100644
--- a/vite.config.mjs
+++ b/vite.config.mjs
@@ -122,6 +122,7 @@ export default defineConfig(({ mode }) => ({
     alias: {
       '@': resolve(__dirname, 'source'),
     },
+    extensions: ['.ts', '.mts', '.mjs', '.js', '.json'],
     preserveSymlinks: process.env.VITE_PRESERVE_SYMLINKS === 'true',
   },
 }));

From e4c5888a8619e11a8873cd8fc7920689392fb972 Mon Sep 17 00:00:00 2001
From: Christian R <github@chrisnew.de>
Date: Thu, 2 Apr 2026 12:20:00 +0300
Subject: [PATCH 03/67] TS: Defs and Vector

---
 dedicated.mjs                                 |   2 +-
 package-lock.json                             |  21 +
 package.json                                  |  10 +-
 source/engine/client/CL.mjs                   |   2 +-
 source/engine/client/ClientEntities.mjs       |   2 +-
 source/engine/client/ClientLegacy.mjs         |   2 +-
 source/engine/client/ClientLifecycle.mjs      |   2 +-
 source/engine/client/ClientMessages.mjs       |   2 +-
 .../client/ClientServerCommandHandlers.mjs    |   2 +-
 source/engine/client/R.mjs                    |   2 +-
 source/engine/client/SCR.mjs                  |   2 +-
 source/engine/client/V.mjs                    |   2 +-
 .../client/renderer/AliasModelRenderer.mjs    |   2 +-
 source/engine/client/renderer/BloomEffect.mjs |   2 +-
 source/engine/client/renderer/Mesh.mjs        |   2 +-
 source/engine/client/renderer/ShadowMap.mjs   |   2 +-
 source/engine/common/Cmd.mjs                  |  10 +-
 source/engine/common/Console.mjs              |   4 +-
 source/engine/common/Cvar.mjs                 |   2 +-
 source/engine/common/Def.mjs                  |   2 +-
 source/engine/common/GameAPIs.mjs             | 212 ++++-
 source/engine/common/Host.mjs                 |   4 +-
 source/engine/common/Pmove.mjs                |   4 +-
 source/engine/common/model/BSP.mjs            |   2 +-
 .../common/model/loaders/BSP29Loader.mjs      |   2 +-
 .../common/model/loaders/BSP38Loader.mjs      |   2 +-
 source/engine/registry.d.ts                   |  44 +-
 source/engine/registry.mjs                    |  50 +-
 source/engine/server/Client.mjs               |   2 +-
 source/engine/server/Edict.mjs                |   2 +-
 source/engine/server/GameLoader.d.ts          |   2 +-
 source/engine/server/Navigation.mjs           |   2 +-
 source/engine/server/Progs.mjs                |   2 +-
 source/engine/server/Server.mjs               |   2 +-
 source/engine/server/ServerMessages.mjs       |   2 +-
 source/engine/server/physics/ServerArea.mjs   |  27 +-
 .../server/physics/ServerClientPhysics.mjs    |   2 +-
 .../engine/server/physics/ServerCollision.mjs |   2 +-
 .../physics/ServerLegacyHullCollision.mjs     |   2 +-
 .../engine/server/physics/ServerMovement.mjs  |   2 +-
 .../engine/server/physics/ServerPhysics.mjs   |   2 +-
 source/shared/Defs.mjs                        | 311 -------
 source/shared/Defs.ts                         | 281 +++++++
 source/shared/Octree.mjs                      |   2 +-
 source/shared/Q.mjs                           |   2 +-
 source/shared/Vector.mjs                      | 760 +-----------------
 source/shared/Vector.ts                       | 652 +++++++++++++++
 source/shared/index.mjs                       |   4 +-
 test/common/game-apis.test.mjs                | 161 ++++
 test/common/vector-typescript-compat.test.mjs |  18 +
 test/physics/brushtrace.test.mjs              |   2 +-
 test/physics/collision-regressions.test.mjs   |   2 +-
 test/physics/fixtures.mjs                     |   2 +-
 test/physics/func-rotating.test.mjs           |   2 +-
 test/physics/pmove.test.mjs                   |   2 +-
 test/physics/server-client-physics.test.mjs   |   2 +-
 test/physics/server-collision.test.mjs        |   2 +-
 test/physics/server-movement.test.mjs         |   2 +-
 test/physics/server-physics.test.mjs          |   2 +-
 test/renderer/bloom-effect.test.mjs           |   2 +-
 vite.config.dedicated.mjs                     |  16 +
 61 files changed, 1474 insertions(+), 1201 deletions(-)
 delete mode 100644 source/shared/Defs.mjs
 create mode 100644 source/shared/Defs.ts
 create mode 100644 source/shared/Vector.ts
 create mode 100644 test/common/game-apis.test.mjs
 create mode 100644 test/common/vector-typescript-compat.test.mjs

diff --git a/dedicated.mjs b/dedicated.mjs
index 69d0d5f0..791729ea 100755
--- a/dedicated.mjs
+++ b/dedicated.mjs
@@ -1,4 +1,4 @@
-#!/usr/bin/env node
+#!/usr/bin/env node --experimental-transform-types
 import process from 'node:process';
 import EngineLauncher from './source/engine/main-dedicated.mjs';
 
diff --git a/package-lock.json b/package-lock.json
index a48bb776..484728ed 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -17,6 +17,7 @@
       "devDependencies": {
         "@eslint/js": "^9.17.0",
         "@stylistic/eslint-plugin": "^5.2.2",
+        "@types/node": "^24.6.1",
         "@typescript-eslint/eslint-plugin": "^8.46.4",
         "@typescript-eslint/parser": "^8.46.4",
         "eslint": "^9.19.0",
@@ -27,6 +28,9 @@
         "globals": "^15.14.0",
         "typescript": "^5.9.3",
         "vite": "^7.1.12"
+      },
+      "engines": {
+        "node": ">=24 <25"
       }
     },
     "node_modules/@es-joy/jsdoccomment": {
@@ -1154,6 +1158,16 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/@types/node": {
+      "version": "24.12.0",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-24.12.0.tgz",
+      "integrity": "sha512-GYDxsZi3ChgmckRT9HPU0WEhKLP08ev/Yfcq2AstjrDASOYCSXeyjDsHg4v5t4jOj7cyDX3vmprafKlWIG9MXQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "undici-types": "~7.16.0"
+      }
+    },
     "node_modules/@typescript-eslint/eslint-plugin": {
       "version": "8.56.1",
       "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.56.1.tgz",
@@ -3473,6 +3487,13 @@
         "node": ">=14.17"
       }
     },
+    "node_modules/undici-types": {
+      "version": "7.16.0",
+      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.16.0.tgz",
+      "integrity": "sha512-Zz+aZWSj8LE6zoxD+xrjh4VfkIG8Ya6LvYkZqtUQGJPZjYl53ypCaUwWqo7eI0x66KBGeRo+mlBEkMSeSZ38Nw==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/unpipe": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
diff --git a/package.json b/package.json
index 0dbc4a77..b36669bf 100644
--- a/package.json
+++ b/package.json
@@ -31,10 +31,10 @@
     "ws": "^8.18.0"
   },
   "scripts": {
-    "test": "node --test test/**/*.test.mjs",
-    "test:common": "node --test test/common/**/*.test.mjs",
-    "test:physics": "node --test test/physics/**/*.test.mjs",
-    "test:renderer": "node --test test/renderer/**/*.test.mjs",
+    "test": "node --experimental-transform-types --test test/**/*.test.mjs",
+    "test:common": "node --experimental-transform-types --test test/common/**/*.test.mjs",
+    "test:physics": "node --experimental-transform-types --test test/physics/**/*.test.mjs",
+    "test:renderer": "node --experimental-transform-types --test test/renderer/**/*.test.mjs",
     "typecheck": "tsc -p tsconfig.json",
     "typecheck:watch": "tsc -p tsconfig.json --watch --preserveWatchOutput",
     "build:wrangler": "npm run test && npm run build:production",
@@ -49,7 +49,7 @@
     "dedicated:dev": "vite build --watch --mode development --config vite.config.dedicated.mjs",
     "dedicated:build": "vite build --config vite.config.dedicated.mjs",
     "dedicated:build:production": "vite build --config vite.config.dedicated.mjs --mode production",
-    "dedicated:start": "node ./dedicated.mjs +exec server.cfg",
+    "dedicated:start": "node --experimental-transform-types ./dedicated.mjs +exec server.cfg",
     "dedicated:start:production": "node ./dist/dedicated/dedicated.mjs +exec server.cfg"
   }
 }
diff --git a/source/engine/client/CL.mjs b/source/engine/client/CL.mjs
index 925707c3..7c6cc9bd 100644
--- a/source/engine/client/CL.mjs
+++ b/source/engine/client/CL.mjs
@@ -5,7 +5,7 @@ import Cmd, { ConsoleCommand } from '../common/Cmd.mjs';
 import Cvar from '../common/Cvar.mjs';
 import { Pmove, PmovePlayer } from '../common/Pmove.mjs';
 import { eventBus, registry } from '../registry.mjs';
-import { gameCapabilities, solid } from '../../shared/Defs.mjs';
+import { gameCapabilities, solid } from '../../shared/Defs.ts';
 import ClientDemos from './ClientDemos.mjs';
 import { ClientPlayerState } from './ClientMessages.mjs';
 import VID from './VID.mjs';
diff --git a/source/engine/client/ClientEntities.mjs b/source/engine/client/ClientEntities.mjs
index ec61874f..03cfceb7 100644
--- a/source/engine/client/ClientEntities.mjs
+++ b/source/engine/client/ClientEntities.mjs
@@ -1,7 +1,7 @@
 import Vector from '../../shared/Vector.mjs';
 import { eventBus, registry } from '../registry.mjs';
 import * as Def from '../common/Def.mjs';
-import { content, effect, solid } from '../../shared/Defs.mjs';
+import { content, effect, solid } from '../../shared/Defs.ts';
 import Chase from './Chase.mjs';
 import { DefaultClientEdictHandler } from './ClientLegacy.mjs';
 import { BaseClientEdictHandler } from '../../shared/ClientEdict.mjs';
diff --git a/source/engine/client/ClientLegacy.mjs b/source/engine/client/ClientLegacy.mjs
index 8e6c51d9..4f877112 100644
--- a/source/engine/client/ClientLegacy.mjs
+++ b/source/engine/client/ClientLegacy.mjs
@@ -4,7 +4,7 @@
  */
 
 import Vector from '../../shared/Vector.mjs';
-import { effect, modelFlags } from '../../shared/Defs.mjs';
+import { effect, modelFlags } from '../../shared/Defs.ts';
 import { BaseClientEdictHandler } from '../../shared/ClientEdict.mjs';
 
 import { registry, eventBus } from '../registry.mjs';
diff --git a/source/engine/client/ClientLifecycle.mjs b/source/engine/client/ClientLifecycle.mjs
index b7291ea1..7fc8145a 100644
--- a/source/engine/client/ClientLifecycle.mjs
+++ b/source/engine/client/ClientLifecycle.mjs
@@ -1,7 +1,7 @@
 import Cvar from '../common/Cvar.mjs';
 import Cmd, { ConsoleCommand } from '../common/Cmd.mjs';
 import * as Def from '../common/Def.mjs';
-import { gameCapabilities } from '../../shared/Defs.mjs';
+import { gameCapabilities } from '../../shared/Defs.ts';
 import ClientInput from './ClientInput.mjs';
 import CL from './CL.mjs';
 import { clientRuntimeState } from './ClientState.mjs';
diff --git a/source/engine/client/ClientMessages.mjs b/source/engine/client/ClientMessages.mjs
index d2305564..bd981f18 100644
--- a/source/engine/client/ClientMessages.mjs
+++ b/source/engine/client/ClientMessages.mjs
@@ -4,7 +4,7 @@ import { eventBus, registry } from '../registry.mjs';
 import { HostError } from '../common/Errors.mjs';
 import Vector from '../../shared/Vector.mjs';
 import { PmovePlayer } from '../common/Pmove.mjs';
-import { gameCapabilities } from '../../shared/Defs.mjs';
+import { gameCapabilities } from '../../shared/Defs.ts';
 import { ClientEdict } from './ClientEntities.mjs';
 
 let { CL, COM, NET } = registry;
diff --git a/source/engine/client/ClientServerCommandHandlers.mjs b/source/engine/client/ClientServerCommandHandlers.mjs
index 1669de05..5b8da30d 100644
--- a/source/engine/client/ClientServerCommandHandlers.mjs
+++ b/source/engine/client/ClientServerCommandHandlers.mjs
@@ -2,7 +2,7 @@ import * as Protocol from '../network/Protocol.mjs';
 import * as Def from '../common/Def.mjs';
 import Cmd from '../common/Cmd.mjs';
 import { HostError } from '../common/Errors.mjs';
-import { gameCapabilities } from '../../shared/Defs.mjs';
+import { gameCapabilities } from '../../shared/Defs.ts';
 import Vector from '../../shared/Vector.mjs';
 import { ClientEngineAPI } from '../common/GameAPIs.mjs';
 import { sharedCollisionModelSource } from '../common/CollisionModelSource.mjs';
diff --git a/source/engine/client/R.mjs b/source/engine/client/R.mjs
index 3b5d9318..a76808fd 100644
--- a/source/engine/client/R.mjs
+++ b/source/engine/client/R.mjs
@@ -8,7 +8,7 @@ import Chase from './Chase.mjs';
 import W from '../common/W.mjs';
 import VID from './VID.mjs';
 import GL, { ATTRIB_LOCATIONS, GLTexture } from './GL.mjs';
-import { content, effect, gameCapabilities } from '../../shared/Defs.mjs';
+import { content, effect, gameCapabilities } from '../../shared/Defs.ts';
 import { modelRendererRegistry } from './renderer/ModelRendererRegistry.mjs';
 import { BrushModelRenderer, LIGHTMAP_BLOCK_HEIGHT, LIGHTMAP_BLOCK_SIZE } from './renderer/BrushModelRenderer.mjs';
 import { AliasModelRenderer } from './renderer/AliasModelRenderer.mjs';
diff --git a/source/engine/client/SCR.mjs b/source/engine/client/SCR.mjs
index aeb05c4f..6faecba3 100644
--- a/source/engine/client/SCR.mjs
+++ b/source/engine/client/SCR.mjs
@@ -1,6 +1,6 @@
 /* global  */
 
-import { gameCapabilities } from '../../shared/Defs.mjs';
+import { gameCapabilities } from '../../shared/Defs.ts';
 import Cmd from '../common/Cmd.mjs';
 import Cvar from '../common/Cvar.mjs';
 import { clientConnectionState } from '../common/Def.mjs';
diff --git a/source/engine/client/V.mjs b/source/engine/client/V.mjs
index d1638524..e5f48598 100644
--- a/source/engine/client/V.mjs
+++ b/source/engine/client/V.mjs
@@ -1,5 +1,5 @@
 import Vector from '../../shared/Vector.mjs';
-import { content, gameCapabilities } from '../../shared/Defs.mjs';
+import { content, gameCapabilities } from '../../shared/Defs.ts';
 import Cmd from '../common/Cmd.mjs';
 import Cvar from '../common/Cvar.mjs';
 import * as Def from '../common/Def.mjs';
diff --git a/source/engine/client/renderer/AliasModelRenderer.mjs b/source/engine/client/renderer/AliasModelRenderer.mjs
index b33520fb..cfdb63bf 100644
--- a/source/engine/client/renderer/AliasModelRenderer.mjs
+++ b/source/engine/client/renderer/AliasModelRenderer.mjs
@@ -4,7 +4,7 @@ import { getEntityBloomEmissiveScale } from './BloomEffect.mjs';
 import { eventBus, registry } from '../../registry.mjs';
 import GL from '../GL.mjs';
 import W from '../../common/W.mjs';
-import { effect } from '../../../shared/Defs.mjs';
+import { effect } from '../../../shared/Defs.ts';
 
 let { CL, Host, R, Con } = registry;
 let gl = /** @type {WebGL2RenderingContext} */ (null);
diff --git a/source/engine/client/renderer/BloomEffect.mjs b/source/engine/client/renderer/BloomEffect.mjs
index 90cf07b9..477393a7 100644
--- a/source/engine/client/renderer/BloomEffect.mjs
+++ b/source/engine/client/renderer/BloomEffect.mjs
@@ -4,7 +4,7 @@ import VID from '../VID.mjs';
 import PostProcessEffect from './PostProcessEffect.mjs';
 import Vector from '../../../shared/Vector.mjs';
 import { eventBus, registry } from '../../registry.mjs';
-import { effect } from '../../../shared/Defs.mjs';
+import { effect } from '../../../shared/Defs.ts';
 
 let { Draw, R } = registry;
 
diff --git a/source/engine/client/renderer/Mesh.mjs b/source/engine/client/renderer/Mesh.mjs
index bc1485f7..0e987e0e 100644
--- a/source/engine/client/renderer/Mesh.mjs
+++ b/source/engine/client/renderer/Mesh.mjs
@@ -1,4 +1,4 @@
-import { EPSILON } from '../../../shared/Defs.mjs';
+import { EPSILON } from '../../../shared/Defs.ts';
 
 /**
  * Mesh stuff.
diff --git a/source/engine/client/renderer/ShadowMap.mjs b/source/engine/client/renderer/ShadowMap.mjs
index a8c076b3..d551bf61 100644
--- a/source/engine/client/renderer/ShadowMap.mjs
+++ b/source/engine/client/renderer/ShadowMap.mjs
@@ -3,7 +3,7 @@ import Cvar from '../../common/Cvar.mjs';
 import { limits } from '../../common/Def.mjs';
 import { eventBus, registry } from '../../registry.mjs';
 import { materialFlags } from './Materials.mjs';
-import { effect } from '../../../shared/Defs.mjs';
+import { effect } from '../../../shared/Defs.ts';
 import Vector from '../../../shared/Vector.mjs';
 import { AliasModelRenderer } from './AliasModelRenderer.mjs';
 
diff --git a/source/engine/common/Cmd.mjs b/source/engine/common/Cmd.mjs
index d223b1eb..cb2633d7 100644
--- a/source/engine/common/Cmd.mjs
+++ b/source/engine/common/Cmd.mjs
@@ -19,9 +19,9 @@ eventBus.subscribe('registry.frozen', () => {
 export class ConsoleCommand {
   /** @type {?import('../server/Edict.mjs').ServerClient} Invoking server client. Unset, when called locally. */
   client = null;
-  /** @type {string} The name that was used to execute this command. */
+  /** @type {string?} The name that was used to execute this command. */
   command = null;
-  /** @type {string} Full command line. */
+  /** @type {string?} Full command line. */
   args = null;
   /** @type {string[]} Arguments including the name. */
   argv = [];
@@ -52,10 +52,10 @@ export class ConsoleCommand {
     let command = this.command;
 
     if (command && command.toLowerCase() === 'cmd') {
-      command = argv.shift();
+      command = argv.shift() || null;
     }
 
-    if (command === undefined) {
+    if (command === null) {
       Con.Print('Usage: cmd <command> <args>\n');
       return true;
     }
@@ -101,7 +101,7 @@ class ForwardCommand extends ConsoleCommand {
 class ExecSlot {
   constructor(/** @type {string} */ filename) {
     this.filename = filename;
-    this.content = null;
+    this.content = /** @type {string|null} */ (null);
     this.isReady = false;
   }
 };
diff --git a/source/engine/common/Console.mjs b/source/engine/common/Console.mjs
index d3552b03..9962a9d8 100644
--- a/source/engine/common/Console.mjs
+++ b/source/engine/common/Console.mjs
@@ -22,9 +22,9 @@ eventBus.subscribe('registry.frozen', () => {
 export default class Con {
   static backscroll = 0;
   static current = 0;
-  static text = [];
+  static text = /** @type {{ text: string, time: number, color: Vector, doNotNotify: boolean }[]} */([]);
   static captureBuffer = null;
-  /** @type {Cvar} */
+  /** @type {Cvar?} */
   static notifytime = null;
 
   /** used by the client to force the console to be up */
diff --git a/source/engine/common/Cvar.mjs b/source/engine/common/Cvar.mjs
index 34497672..ed9e3390 100644
--- a/source/engine/common/Cvar.mjs
+++ b/source/engine/common/Cvar.mjs
@@ -1,7 +1,7 @@
 import { registry, eventBus } from '../registry.mjs';
 import Cmd from './Cmd.mjs';
 import Q from '../../shared/Q.mjs';
-import { cvarFlags } from '../../shared/Defs.mjs';
+import { cvarFlags } from '../../shared/Defs.ts';
 
 let { CL, Con, SV } = registry;
 
diff --git a/source/engine/common/Def.mjs b/source/engine/common/Def.mjs
index c6be3f55..1bf79059 100644
--- a/source/engine/common/Def.mjs
+++ b/source/engine/common/Def.mjs
@@ -7,7 +7,7 @@ export const productName = 'The Quake Shack';
 /**
  * Version string.
  */
-export const productVersion = '1.1.8';
+export const productVersion = '1.2.0';
 
 /**
  * Default game directory.
diff --git a/source/engine/common/GameAPIs.mjs b/source/engine/common/GameAPIs.mjs
index 519e2309..a6ac457d 100644
--- a/source/engine/common/GameAPIs.mjs
+++ b/source/engine/common/GameAPIs.mjs
@@ -1,5 +1,6 @@
 import { PmoveConfiguration } from '../../shared/Pmove.mjs';
 import Vector from '../../shared/Vector.mjs';
+import { solid } from '../../shared/Defs.ts';
 import Key from '../client/Key.mjs';
 import { SFX } from '../client/Sound.mjs';
 import VID from '../client/VID.mjs';
@@ -19,7 +20,22 @@ import W from './W.mjs';
 /** @typedef {import('../server/Navigation.mjs').Navigation} Navigation */
 /** @typedef {import('./model/parsers/ParsedQC.mjs').default} ParsedQC */
 /** @typedef {import('./model/BaseModel.mjs').BaseModel} BaseModel */
-/** @typedef {import('../server/physics/ServerCollision.mjs').Trace} Trace */
+/** @typedef {import('../server/physics/ServerCollisionSupport.mjs').CollisionTrace} CollisionTrace */
+/**
+ * @typedef ClientTraceOptions
+ * @property {boolean} [includeEntities] include current client entities in addition to static world geometry
+ * @property {?number} [passEntityId] client entity number to skip during entity tracing
+ * @property {?((entity: ClientEdict) => boolean)} [filter] optional candidate filter for entity tracing
+ */
+/**
+ * @typedef GameTrace
+ * @property {{ all: boolean, start: boolean }} solid solid hit flags
+ * @property {number} fraction completed trace fraction
+ * @property {{ normal: Vector, distance: number }} plane impact plane
+ * @property {{ inOpen: boolean, inWater: boolean }} contents terminal contents flags
+ * @property {Vector} point final trace point
+ * @property {import('../../game/id1/entity/BaseEntity.mjs').default|ClientEdict|null} entity hit entity, if any
+ */
 
 let { CL, Con, Draw, Host, R, S, SCR, SV, V} = registry;
 
@@ -93,6 +109,164 @@ function internalTraceToGameTrace(trace) {
   };
 }
 
+/**
+ * @param {ClientEdict} entity client entity candidate
+ * @returns {boolean} true when the entity can be traced against
+ */
+function isTraceableClientSolid(entity) {
+  return entity.solid === solid.SOLID_BBOX
+    || entity.solid === solid.SOLID_SLIDEBOX
+    || entity.solid === solid.SOLID_BSP
+    || entity.solid === solid.SOLID_MESH;
+}
+
+/**
+ * @param {ClientEdict} entity client entity candidate
+ * @returns {{ mins: Vector, maxs: Vector }} extents used for tracing this entity
+ */
+function getClientTraceExtents(entity) {
+  if (entity.model !== null && entity.mins.isOrigin() && entity.maxs.isOrigin()) {
+    return {
+      mins: entity.model.mins,
+      maxs: entity.model.maxs,
+    };
+  }
+
+  return {
+    mins: entity.mins,
+    maxs: entity.maxs,
+  };
+}
+
+/**
+ * @param {ClientEdict} entity client entity candidate
+ * @param {Vector} absmin output minimum bounds
+ * @param {Vector} absmax output maximum bounds
+ */
+function computeClientTraceBounds(entity, absmin, absmax) {
+  const { mins, maxs } = getClientTraceExtents(entity);
+
+  if (!entity.angles.isOrigin()) {
+    const basis = entity.angles.toRotationMatrix();
+    const forward = new Vector(basis[0], basis[1], basis[2]);
+    const right = new Vector(basis[3], basis[4], basis[5]);
+    const up = new Vector(basis[6], basis[7], basis[8]);
+
+    const centerX = (mins[0] + maxs[0]) * 0.5;
+    const centerY = (mins[1] + maxs[1]) * 0.5;
+    const centerZ = (mins[2] + maxs[2]) * 0.5;
+    const extentsX = (maxs[0] - mins[0]) * 0.5;
+    const extentsY = (maxs[1] - mins[1]) * 0.5;
+    const extentsZ = (maxs[2] - mins[2]) * 0.5;
+
+    const worldCenter = entity.origin.copy()
+      .add(forward.copy().multiply(centerX))
+      .add(right.copy().multiply(centerY))
+      .add(up.copy().multiply(centerZ));
+
+    const worldExtentX = Math.abs(forward[0]) * extentsX + Math.abs(right[0]) * extentsY + Math.abs(up[0]) * extentsZ;
+    const worldExtentY = Math.abs(forward[1]) * extentsX + Math.abs(right[1]) * extentsY + Math.abs(up[1]) * extentsZ;
+    const worldExtentZ = Math.abs(forward[2]) * extentsX + Math.abs(right[2]) * extentsY + Math.abs(up[2]) * extentsZ;
+
+    absmin.setTo(
+      worldCenter[0] - worldExtentX,
+      worldCenter[1] - worldExtentY,
+      worldCenter[2] - worldExtentZ,
+    );
+    absmax.setTo(
+      worldCenter[0] + worldExtentX,
+      worldCenter[1] + worldExtentY,
+      worldCenter[2] + worldExtentZ,
+    );
+    return;
+  }
+
+  absmin.set(entity.origin).add(mins);
+  absmax.set(entity.origin).add(maxs);
+}
+
+/**
+ * @param {Vector} traceMins trace minimum bounds
+ * @param {Vector} traceMaxs trace maximum bounds
+ * @param {Vector} entityMins entity minimum bounds
+ * @param {Vector} entityMaxs entity maximum bounds
+ * @returns {boolean} true when the AABBs overlap
+ */
+function traceBoundsOverlap(traceMins, traceMaxs, entityMins, entityMaxs) {
+  return !(
+    traceMins[0] > entityMaxs[0]
+    || traceMins[1] > entityMaxs[1]
+    || traceMins[2] > entityMaxs[2]
+    || traceMaxs[0] < entityMins[0]
+    || traceMaxs[1] < entityMins[1]
+    || traceMaxs[2] < entityMins[2]
+  );
+}
+
+/**
+ * @param {Vector} start trace start
+ * @param {Vector} end trace end
+ * @param {CollisionTrace} worldTrace current static-world trace result
+ * @param {ClientTraceOptions} options client trace options
+ * @returns {CollisionTrace} best trace including eligible client entities
+ */
+function traceClientEntities(start, end, worldTrace, options) {
+  const traceMins = new Vector(
+    Math.min(start[0], worldTrace.endpos[0]),
+    Math.min(start[1], worldTrace.endpos[1]),
+    Math.min(start[2], worldTrace.endpos[2]),
+  );
+  const traceMaxs = new Vector(
+    Math.max(start[0], worldTrace.endpos[0]),
+    Math.max(start[1], worldTrace.endpos[1]),
+    Math.max(start[2], worldTrace.endpos[2]),
+  );
+  const entityMins = new Vector();
+  const entityMaxs = new Vector();
+
+  /** @type {CollisionTrace} */
+  let bestTrace = worldTrace;
+
+  for (const entity of CL.state.clientEntities.getEntities()) {
+    if (entity.num === 0 || entity.free || entity.origin.isInfinite() || entity.model === null) {
+      continue;
+    }
+
+    if (!isTraceableClientSolid(entity)) {
+      continue;
+    }
+
+    if (options.passEntityId !== null && options.passEntityId !== undefined && entity.num === options.passEntityId) {
+      continue;
+    }
+
+    if (options.filter !== null && options.filter !== undefined && !options.filter(entity)) {
+      continue;
+    }
+
+    computeClientTraceBounds(entity, entityMins, entityMaxs);
+
+    if (!traceBoundsOverlap(traceMins, traceMaxs, entityMins, entityMaxs)) {
+      continue;
+    }
+
+    const trace = SV.collision.clipMoveToEntity({
+      // @ts-ignore Client tracing reuses shared narrow-phase helpers with a lightweight ClientEdict adapter.
+      entity,
+      num: entity.num,
+      equals(other) {
+        return this === other;
+      },
+    }, start, Vector.origin, Vector.origin, bestTrace.endpos);
+
+    if (trace.allsolid || trace.startsolid || trace.fraction < bestTrace.fraction) {
+      bestTrace = trace;
+    }
+  }
+
+  return bestTrace;
+}
+
 export class CommonEngineAPI {
   /**
    * Indicates whether the game is registered (not shareware).
@@ -373,10 +547,11 @@ export class ServerEngineAPI extends CommonEngineAPI {
   }
 
   /**
-   * @param field
-   * @param value
-   * @param startEdictId
+   * @param {string} field field name to inspect on each entity
+   * @param {import('../../shared/GameInterfaces').EdictValueType} value target field value
+   * @param {number} startEdictId entity number to start searching from
    * @deprecated use FindAllByFieldAndValue instead
+   * @returns {ServerEdict|null} first matching edict, if any
    */
   static FindByFieldAndValue(field, value, startEdictId = 0) { // FIXME: startEdictId should be edict? not 100% happy about this
     for (let i = startEdictId; i < SV.server.num_edicts; i++) {
@@ -497,8 +672,8 @@ export class ServerEngineAPI extends CommonEngineAPI {
   }
 
   /**
-   * @param tempEntityId
-   * @param origin
+   * @param {number} tempEntityId temporary entity protocol id
+   * @param {Vector} origin event origin
    * @deprecated use client events instead
    */
   static DispatchTempEntityEvent(tempEntityId, origin) {
@@ -508,10 +683,10 @@ export class ServerEngineAPI extends CommonEngineAPI {
   }
 
   /**
-   * @param beamId
-   * @param edictId
-   * @param startOrigin
-   * @param endOrigin
+   * @param {number} beamId beam protocol id
+   * @param {number} edictId source entity id
+   * @param {Vector} startOrigin beam start position
+   * @param {Vector} endOrigin beam end position
    * @deprecated use client events instead
    */
   static DispatchBeamEvent(beamId, edictId, startOrigin, endOrigin) {
@@ -805,16 +980,23 @@ export class ClientEngineAPI extends CommonEngineAPI {
 
   /**
    * Performs a trace line in the client game world.
-   * Currently this traces static world geometry only.
+   * By default this traces static world geometry only.
    * Keep this legacy entry point aligned with the server-side Traceline name so
    * client tracing can grow into entity-aware behavior later without another API
    * rename.
    * @param {Vector} start start position
    * @param {Vector} end end position
-   * @returns {Trace} trace result
+   * @param {ClientTraceOptions} [options] optional entity-tracing options
+   * @returns {GameTrace} trace result
    */
-  static Traceline(start, end) {
-    return internalTraceToGameTrace(SV.collision.traceWorldLine(start, end));
+  static Traceline(start, end, options = null) {
+    const worldTrace = SV.collision.traceWorldLine(start, end);
+
+    if (options === null || options.includeEntities !== true) {
+      return internalTraceToGameTrace(worldTrace);
+    }
+
+    return internalTraceToGameTrace(traceClientEntities(start, end, worldTrace, options));
   }
 
   /**
@@ -919,7 +1101,7 @@ export class ClientEngineAPI extends CommonEngineAPI {
       return CL.state.levelname;
     },
     get entityNum() {
-      return CL.state.viewent.num;
+      return CL.state.viewentity;
     },
     /**
      * local time, not game time! If you are looking for SV.server.time, check gametime
diff --git a/source/engine/common/Host.mjs b/source/engine/common/Host.mjs
index 797dcf93..d06d6097 100644
--- a/source/engine/common/Host.mjs
+++ b/source/engine/common/Host.mjs
@@ -11,8 +11,8 @@ import Chase from '../client/Chase.mjs';
 import VID from '../client/VID.mjs';
 import { HostError } from './Errors.mjs';
 import CDAudio from '../client/CDAudio.mjs';
-import * as Defs from '../../shared/Defs.mjs';
-import { content, gameCapabilities } from '../../shared/Defs.mjs';
+import * as Defs from '../../shared/Defs.ts';
+import { content, gameCapabilities } from '../../shared/Defs.ts';
 import ClientLifecycle from '../client/ClientLifecycle.mjs';
 import { Pmove } from './Pmove.mjs';
 
diff --git a/source/engine/common/Pmove.mjs b/source/engine/common/Pmove.mjs
index 212b7699..78ed49ce 100644
--- a/source/engine/common/Pmove.mjs
+++ b/source/engine/common/Pmove.mjs
@@ -9,7 +9,7 @@
 
 import Vector from '../../shared/Vector.mjs';
 import * as Protocol from '../network/Protocol.mjs';
-import { content } from '../../shared/Defs.mjs';
+import { content } from '../../shared/Defs.ts';
 import { BrushModel } from './Mod.mjs';
 import Cvar from './Cvar.mjs';
 import { PmoveConfiguration } from '../../shared/Pmove.mjs';
@@ -3749,7 +3749,7 @@ export class Pmove { // pmove_t
   /**
    * Adds an entity (client or server) to physents.
    * @param {import('../server/Edict.mjs').BaseEntity|import('../client/ClientEntities.mjs').ClientEdict} entity actual entity
-   * @param {BrushModel} model model must be provided when entity is SOLID_BSP
+   * @param {BrushModel|null} model model must be provided when entity is SOLID_BSP
    * @returns {Pmove} this
    */
   addEntity(entity, model = null) {
diff --git a/source/engine/common/model/BSP.mjs b/source/engine/common/model/BSP.mjs
index 34024804..e7b9e423 100644
--- a/source/engine/common/model/BSP.mjs
+++ b/source/engine/common/model/BSP.mjs
@@ -1,5 +1,5 @@
 import { BaseMaterial } from '../../client/renderer/Materials.mjs';
-import { content } from '../../../shared/Defs.mjs';
+import { content } from '../../../shared/Defs.ts';
 import { BaseModel } from './BaseModel.mjs';
 import { SkyRenderer } from '../../client/renderer/Sky.mjs';
 import { AreaPortals } from './AreaPortals.mjs';
diff --git a/source/engine/common/model/loaders/BSP29Loader.mjs b/source/engine/common/model/loaders/BSP29Loader.mjs
index ba97ce7c..f59d1da1 100644
--- a/source/engine/common/model/loaders/BSP29Loader.mjs
+++ b/source/engine/common/model/loaders/BSP29Loader.mjs
@@ -1,6 +1,6 @@
 import Vector from '../../../../shared/Vector.mjs';
 import Q from '../../../../shared/Q.mjs';
-import { content } from '../../../../shared/Defs.mjs';
+import { content } from '../../../../shared/Defs.ts';
 import { GLTexture } from '../../../client/GL.mjs';
 import W, { readWad3Texture, translateIndexToLuminanceRGBA, translateIndexToRGBA } from '../../W.mjs';
 import { CRC16CCITT } from '../../CRC.mjs';
diff --git a/source/engine/common/model/loaders/BSP38Loader.mjs b/source/engine/common/model/loaders/BSP38Loader.mjs
index d487f12b..1508b4b4 100644
--- a/source/engine/common/model/loaders/BSP38Loader.mjs
+++ b/source/engine/common/model/loaders/BSP38Loader.mjs
@@ -1,4 +1,4 @@
-import { content } from '../../../../shared/Defs.mjs';
+import { content } from '../../../../shared/Defs.ts';
 import Q from '../../../../shared/Q.mjs';
 import Vector from '../../../../shared/Vector.mjs';
 import { CRC16CCITT } from '../../CRC.mjs';
diff --git a/source/engine/registry.d.ts b/source/engine/registry.d.ts
index 5f729819..96e0ee86 100644
--- a/source/engine/registry.d.ts
+++ b/source/engine/registry.d.ts
@@ -40,32 +40,32 @@ type IN = typeof _IN;
 type WebSocket = typeof WebSocketClass;
 
 interface Registry {
-  isDedicatedServer: boolean | null;
+  isDedicatedServer?: boolean;
   isInsideWorker: boolean;
 
-  COM: Com | null;
-  Con: Con | null;
-  Host: Host | null;
-  Sys: Sys | null;
-  V: V | null;
-  SV: SV | null;
-  PR: PR | null;
-  NET: NET | null;
-  Mod: Mod | null;
-  CL: CL | null;
-  SCR: SCR | null;
-  R: R | null;
-  Draw: Draw | null;
-  Key: Key | null;
-  IN: IN | null;
-  Sbar: Sbar | null;
-  S: S | null;
-  M: M | null;
+  COM?: Com;
+  Con?: Con;
+  Host?: Host;
+  Sys?: Sys;
+  V?: V;
+  SV?: SV;
+  PR?: PR;
+  NET?: NET;
+  Mod?: Mod;
+  CL?: CL;
+  SCR?: SCR;
+  R?: R;
+  Draw?: Draw;
+  Key?: Key;
+  IN?: IN;
+  Sbar?: Sbar;
+  S?: S;
+  M?: M;
 
-  WebSocket: WebSocket | null;
+  WebSocket?: WebSocket;
 
-  urls: URLs | null;
-  buildConfig: BuildConfig | null;
+  urls?: URLs;
+  buildConfig?: BuildConfig;
 };
 
 export const registry: Registry;
diff --git a/source/engine/registry.mjs b/source/engine/registry.mjs
index 1a6c04e5..5b4241e6 100644
--- a/source/engine/registry.mjs
+++ b/source/engine/registry.mjs
@@ -6,32 +6,32 @@
  * @type {import('./registry').Registry}
  */
 export const registry = {
-  COM: null,
-  Con: null,
-  Host: null,
-  NET: null,
-  Draw: null,
-  Sys: null,
-  V: null,
-  CL: null,
-  SV: null,
-  Mod: null,
-  PR: null,
-  R: null,
-  SCR: null,
-  Key: null,
-  IN: null,
-  Sbar: null,
-  S: null,
-  M: null,
-
-  WebSocket: null,
-
-  urls: null,
-  buildConfig: null,
+  COM: undefined,
+  Con: undefined,
+  Host: undefined,
+  NET: undefined,
+  Draw: undefined,
+  Sys: undefined,
+  V: undefined,
+  CL: undefined,
+  SV: undefined,
+  Mod: undefined,
+  PR: undefined,
+  R: undefined,
+  SCR: undefined,
+  Key: undefined,
+  IN: undefined,
+  Sbar: undefined,
+  S: undefined,
+  M: undefined,
+
+  WebSocket: undefined,
+
+  urls: undefined,
+  buildConfig: undefined,
 
   /** @type {boolean} true, when running in server mode */
-  isDedicatedServer: null,
+  isDedicatedServer: false,
   isInsideWorker: false,
 };
 
@@ -45,7 +45,7 @@ export class EventBus {
   #listeners = new Map();
 
   /** @type {string} */
-  #name = null;
+  #name;
 
   /**
    * @param {string} name name
diff --git a/source/engine/server/Client.mjs b/source/engine/server/Client.mjs
index afc78259..3004b7e7 100644
--- a/source/engine/server/Client.mjs
+++ b/source/engine/server/Client.mjs
@@ -1,5 +1,5 @@
 import { enumHelpers } from '../../shared/Q.mjs';
-import { gameCapabilities } from '../../shared/Defs.mjs';
+import { gameCapabilities } from '../../shared/Defs.ts';
 import Vector from '../../shared/Vector.mjs';
 import { SzBuffer } from '../network/MSG.mjs';
 import { QSocket } from '../network/NetworkDrivers.mjs';
diff --git a/source/engine/server/Edict.mjs b/source/engine/server/Edict.mjs
index 535c6386..3a4e06f7 100644
--- a/source/engine/server/Edict.mjs
+++ b/source/engine/server/Edict.mjs
@@ -2,7 +2,7 @@ import Vector from '../../shared/Vector.mjs';
 import { SzBuffer, registerSerializableType } from '../network/MSG.mjs';
 import * as Protocol from '../network/Protocol.mjs';
 import * as Def from '../common/Def.mjs';
-import * as Defs from '../../shared/Defs.mjs';
+import * as Defs from '../../shared/Defs.ts';
 import { eventBus, registry } from '../registry.mjs';
 import Q from '../../shared/Q.mjs';
 import { ConsoleCommand } from '../common/Cmd.mjs';
diff --git a/source/engine/server/GameLoader.d.ts b/source/engine/server/GameLoader.d.ts
index 02503360..6ebcea25 100644
--- a/source/engine/server/GameLoader.d.ts
+++ b/source/engine/server/GameLoader.d.ts
@@ -1,5 +1,5 @@
 import { ClientGameInterface, ServerGameInterface } from "../../shared/GameInterfaces";
-import { gameCapabilities } from "../../shared/Defs.mjs";
+import { gameCapabilities } from "../../shared/Defs.ts";
 
 export interface GameModuleIdentification {
   name: string;
diff --git a/source/engine/server/Navigation.mjs b/source/engine/server/Navigation.mjs
index 056c906f..cb206ab2 100644
--- a/source/engine/server/Navigation.mjs
+++ b/source/engine/server/Navigation.mjs
@@ -1,5 +1,5 @@
 // import sampleBSpline from '../../shared/BSpline.mjs';
-import * as Def from '../../shared/Defs.mjs';
+import * as Def from '../../shared/Defs.ts';
 import { Octree } from '../../shared/Octree.mjs';
 import Vector from '../../shared/Vector.mjs';
 import Cmd from '../common/Cmd.mjs';
diff --git a/source/engine/server/Progs.mjs b/source/engine/server/Progs.mjs
index 7b76a85d..f5bcf82e 100644
--- a/source/engine/server/Progs.mjs
+++ b/source/engine/server/Progs.mjs
@@ -8,7 +8,7 @@ import { eventBus, registry } from '../registry.mjs';
 import { ED, ServerEdict } from './Edict.mjs';
 import { ServerEngineAPI } from '../common/GameAPIs.mjs';
 import PF, { etype, ofs } from './ProgsAPI.mjs';
-import { gameCapabilities } from '../../shared/Defs.mjs';
+import { gameCapabilities } from '../../shared/Defs.ts';
 import { loadGameModule } from './GameLoader.mjs';
 
 const PR = {};
diff --git a/source/engine/server/Server.mjs b/source/engine/server/Server.mjs
index 2547faa1..ea72f2cd 100644
--- a/source/engine/server/Server.mjs
+++ b/source/engine/server/Server.mjs
@@ -8,7 +8,7 @@ import Cmd, { ConsoleCommand } from '../common/Cmd.mjs';
 import { ED, ServerEdict } from './Edict.mjs';
 import { EventBus, eventBus, registry } from '../registry.mjs';
 import { ServerEngineAPI } from '../common/GameAPIs.mjs';
-import * as Defs from '../../shared/Defs.mjs';
+import * as Defs from '../../shared/Defs.ts';
 import { Navigation } from './Navigation.mjs';
 import { ServerPhysics } from './physics/ServerPhysics.mjs';
 import { ServerClientPhysics } from './physics/ServerClientPhysics.mjs';
diff --git a/source/engine/server/ServerMessages.mjs b/source/engine/server/ServerMessages.mjs
index 221d183f..681283e0 100644
--- a/source/engine/server/ServerMessages.mjs
+++ b/source/engine/server/ServerMessages.mjs
@@ -1,6 +1,6 @@
 import { SzBuffer } from '../network/MSG.mjs';
 import * as Protocol from '../network/Protocol.mjs';
-import * as Defs from '../../shared/Defs.mjs';
+import * as Defs from '../../shared/Defs.ts';
 import Cvar from '../common/Cvar.mjs';
 import { eventBus, registry } from '../registry.mjs';
 import { ServerClient } from './Client.mjs';
diff --git a/source/engine/server/physics/ServerArea.mjs b/source/engine/server/physics/ServerArea.mjs
index 5f02cd4d..9a86fa46 100644
--- a/source/engine/server/physics/ServerArea.mjs
+++ b/source/engine/server/physics/ServerArea.mjs
@@ -1,5 +1,5 @@
 import Vector from '../../../shared/Vector.mjs';
-import * as Defs from '../../../shared/Defs.mjs';
+import * as Defs from '../../../shared/Defs.ts';
 import { Octree } from '../../../shared/Octree.mjs';
 import { eventBus, registry } from '../../registry.mjs';
 import CollisionModelSource, { createRegistryCollisionModelSource } from '../../common/CollisionModelSource.mjs';
@@ -16,6 +16,9 @@ eventBus.subscribe('registry.frozen', () => {
  * Handles the area node BSP tree used for spatial queries.
  */
 export class ServerArea {
+  /** @type {?Octree<import('../Edict.mjs').ServerEdict>} */
+  tree = null;
+
   /**
    * @param {CollisionModelSource} [modelSource] runtime model resolver
    */
@@ -191,7 +194,7 @@ export class ServerArea {
 
     const halfSize = pow2 / 2;
 
-    this.tree = new Octree(center, halfSize, 16, 64);
+    this.tree = /** @type {Octree<import('../Edict.mjs').ServerEdict>} */ (new Octree(center, halfSize, 16, 64));
   }
 
   /**
@@ -246,7 +249,10 @@ export class ServerArea {
       return;
     }
 
-    const sides = Vector.boxOnPlaneSide(ent.entity.absmin, ent.entity.absmax, node.plane);
+    const entity = /** @type {import('../Edict.mjs').BaseEntity} */ (ent.entity);
+    console.assert(entity !== null);
+
+    const sides = Vector.boxOnPlaneSide(entity.absmin, entity.absmax, node.plane);
 
     if ((sides & 1) !== 0) {
       this.findTouchedLeafs(ent, node.children[0]);
@@ -268,6 +274,9 @@ export class ServerArea {
       return;
     }
 
+    const entity = /** @type {import('../Edict.mjs').BaseEntity} */ (ent.entity);
+    console.assert(entity !== null);
+
     SV.server.navigation.relinkEdict(ent);
     this.unlinkEdict(ent);
 
@@ -280,28 +289,28 @@ export class ServerArea {
       absmin.add(new Vector(-1.0, -1.0, -1.0));
       absmax.add(new Vector(1.0, 1.0, 1.0));
 
-      if ((ent.entity.flags & Defs.flags.FL_ITEM) !== 0) { // TODO: should be a feature flag for the game
+      if ((entity.flags & Defs.flags.FL_ITEM) !== 0) { // TODO: should be a feature flag for the game
         absmin.add(new Vector(-14.0, -14.0, 1.0));
         absmax.add(new Vector(14.0, 14.0, -1.0));
       }
     }
 
-    ent.entity.absmin = ent.entity.absmin.set(absmin);
-    ent.entity.absmax = ent.entity.absmax.set(absmax);
+    entity.absmin = entity.absmin.set(absmin);
+    entity.absmax = entity.absmax.set(absmax);
 
     ent.leafnums = [];
-    if (ent.entity.modelindex !== 0) {
+    if (entity.modelindex !== 0) {
       this.findTouchedLeafs(ent, SV.server.worldmodel.nodes[0]);
     }
 
-    if (ent.entity.solid === Defs.solid.SOLID_NOT) {
+    if (entity.solid === Defs.solid.SOLID_NOT) {
       return;
     }
 
     const node = this.tree.insert(ent);
     ent.octreeNode = node;
 
-    if (ent.entity.movetype !== Defs.moveType.MOVETYPE_NOCLIP && touchTriggers) {
+    if (entity.movetype !== Defs.moveType.MOVETYPE_NOCLIP && touchTriggers) {
       this.touchLinks(ent);
     }
   }
diff --git a/source/engine/server/physics/ServerClientPhysics.mjs b/source/engine/server/physics/ServerClientPhysics.mjs
index 4f953e57..b7a4ec9d 100644
--- a/source/engine/server/physics/ServerClientPhysics.mjs
+++ b/source/engine/server/physics/ServerClientPhysics.mjs
@@ -1,5 +1,5 @@
 import Vector from '../../../shared/Vector.mjs';
-import * as Defs from '../../../shared/Defs.mjs';
+import * as Defs from '../../../shared/Defs.ts';
 import { eventBus, registry } from '../../registry.mjs';
 import {
   VELOCITY_EPSILON,
diff --git a/source/engine/server/physics/ServerCollision.mjs b/source/engine/server/physics/ServerCollision.mjs
index b0b4a7c3..7cb6d995 100644
--- a/source/engine/server/physics/ServerCollision.mjs
+++ b/source/engine/server/physics/ServerCollision.mjs
@@ -1,5 +1,5 @@
 import Vector from '../../../shared/Vector.mjs';
-import * as Defs from '../../../shared/Defs.mjs';
+import * as Defs from '../../../shared/Defs.ts';
 import CollisionModelSource, { createRegistryCollisionModelSource } from '../../common/CollisionModelSource.mjs';
 import Mod, { BrushModel } from '../../common/Mod.mjs';
 import { BrushTrace, DIST_EPSILON, Trace as SharedTrace } from '../../common/Pmove.mjs';
diff --git a/source/engine/server/physics/ServerLegacyHullCollision.mjs b/source/engine/server/physics/ServerLegacyHullCollision.mjs
index dbbd9c91..3b4af4f8 100644
--- a/source/engine/server/physics/ServerLegacyHullCollision.mjs
+++ b/source/engine/server/physics/ServerLegacyHullCollision.mjs
@@ -1,5 +1,5 @@
 import Vector from '../../../shared/Vector.mjs';
-import * as Defs from '../../../shared/Defs.mjs';
+import * as Defs from '../../../shared/Defs.ts';
 import { DIST_EPSILON } from '../../common/Pmove.mjs';
 import { eventBus, registry } from '../../registry.mjs';
 
diff --git a/source/engine/server/physics/ServerMovement.mjs b/source/engine/server/physics/ServerMovement.mjs
index 046c0f2a..74e3371a 100644
--- a/source/engine/server/physics/ServerMovement.mjs
+++ b/source/engine/server/physics/ServerMovement.mjs
@@ -1,5 +1,5 @@
 import Vector from '../../../shared/Vector.mjs';
-import * as Defs from '../../../shared/Defs.mjs';
+import * as Defs from '../../../shared/Defs.ts';
 import { STEPSIZE } from '../../common/Pmove.mjs';
 import { ServerEdict } from '../Edict.mjs';
 import { eventBus, registry } from '../../registry.mjs';
diff --git a/source/engine/server/physics/ServerPhysics.mjs b/source/engine/server/physics/ServerPhysics.mjs
index c906a979..299c35ee 100644
--- a/source/engine/server/physics/ServerPhysics.mjs
+++ b/source/engine/server/physics/ServerPhysics.mjs
@@ -1,5 +1,5 @@
 import Vector from '../../../shared/Vector.mjs';
-import * as Defs from '../../../shared/Defs.mjs';
+import * as Defs from '../../../shared/Defs.ts';
 import Q from '../../../shared/Q.mjs';
 import { eventBus, registry } from '../../registry.mjs';
 import {
diff --git a/source/shared/Defs.mjs b/source/shared/Defs.mjs
deleted file mode 100644
index a11db9df..00000000
--- a/source/shared/Defs.mjs
+++ /dev/null
@@ -1,311 +0,0 @@
-/**
- * Engine-game shared definitions.
- */
-
-import Vector from './Vector.mjs';
-
-/**
- * edict.solid values
- * @readonly
- * @enum {number}
- */
-export const solid = Object.freeze({
-  /** no interaction with other objects */
-  SOLID_NOT: 0,
-  /** touch on edge, but not blocking */
-  SOLID_TRIGGER: 1,
-  /** touch on edge, block */
-  SOLID_BBOX: 2,
-  /** touch on edge, but not an onground */
-  SOLID_SLIDEBOX: 3,
-  /** bsp clip, touch on edge, block */
-  SOLID_BSP: 4,
-  /** mesh clip, touch on edge, block */
-  SOLID_MESH: 5,
-});
-
-/**
- * edict.movetype values
- * @readonly
- * @enum {number}
- */
-export const moveType = Object.freeze({
-  /** never moves */
-  MOVETYPE_NONE: 0,
-  //float	MOVETYPE_ANGLENOCLIP: 1,
-  //float	MOVETYPE_ANGLECLIP: 2,
-  /** players only */
-  MOVETYPE_WALK: 3,
-  /** discrete, not real time unless fall */
-  MOVETYPE_STEP: 4,
-  MOVETYPE_FLY: 5,
-  /** gravity */
-  MOVETYPE_TOSS: 6,
-  /** no clip to world, push and crush */
-  MOVETYPE_PUSH: 7,
-  MOVETYPE_NOCLIP: 8,
-  /** fly with extra size against monsters */
-  MOVETYPE_FLYMISSILE: 9,
-  MOVETYPE_BOUNCE: 10,
-  /** bounce with extra size */
-  MOVETYPE_BOUNCEMISSILE: 11,
-});
-
-/**
- * edict.flags
- * @readonly
- * @enum {number}
- */
-export const flags = Object.freeze({
-  FL_NONE: 0, // CR: used to mark something as “flags here”
-  FL_FLY: 1,
-  FL_SWIM: 2,
-  /** set for all client edicts */
-  FL_CLIENT: 8,
-  /** for enter / leave water splash */
-  FL_INWATER: 16,
-  FL_MONSTER: 32,
-  /** player cheat */
-  FL_GODMODE: 64,
-  /** player cheat */
-  FL_NOTARGET: 128,
-  /** extra wide size for bonus items */
-  FL_ITEM: 256,
-  /** standing on something */
-  FL_ONGROUND: 512,
-  /** not all corners are valid */
-  FL_PARTIALGROUND: 1024,
-  /** player jumping out of water */
-  FL_WATERJUMP: 2048,
-  /** for jump debouncing */
-  FL_JUMPRELEASED: 4096,
-  /** entity can be used (interacted with) */
-  FL_USEABLE: 8192,
-});
-
-/**
- * damage types
- * @readonly
- * @enum {number}
- */
-export const damage = Object.freeze({
-  /** no damage */
-  DAMAGE_NO: 0,
-  /** damage is applied */
-  DAMAGE_YES: 1,
-  /** damage aims at entities */
-  DAMAGE_AIM: 2,
-});
-
-/**
- * collision trace move types
- * @readonly
- * @enum {number}
- */
-export const moveTypes = Object.freeze({
-  /** normal trace */
-  MOVE_NORMAL: 0,
-  /** don't clip against monsters */
-  MOVE_NOMONSTERS: 1,
-  /** expand for missile size */
-  MOVE_MISSILE: 2,
-});
-
-/**
- * entity effects
- * NOTE: this is uint8
- * @readonly
- * @enum {number}
- */
-export const effect = Object.freeze({
-  EF_NONE: 0,
-  EF_BRIGHTFIELD: 1,
-  EF_MUZZLEFLASH: 2,
-  EF_BRIGHTLIGHT: 4,
-  EF_DIMLIGHT: 8,
-
-  /** makes sure that the model is always rendered fullbright */
-  EF_FULLBRIGHT: 16,
-
-  /** makes sure the model is never completely dark */
-  EF_MINLIGHT: 32,
-
-  /** make sure the model never casts a shadow */
-  EF_NOSHADOW: 64,
-
-  /** simply not being rendered */
-  EF_NODRAW: 128,
-});
-
-/**
- * model flags
- * @readonly
- * @enum {number}
- */
-export const modelFlags = Object.freeze({
-  MF_NONE: 0,
-  MF_ROCKET: 1,
-  MF_GRENADE: 2,
-  MF_GIB: 4,
-  MF_ROTATE: 8,
-  MF_TRACER: 16,
-  MF_ZOMGIB: 32,
-  MF_TRACER2: 64,
-  MF_TRACER3: 128,
-});
-
-
-/**
- * sound channels
- * channel 0 never willingly overrides
- * other channels (1-7) always override a playing sound on that channel
- * @readonly
- * @enum {number}
- */
-export const channel = Object.freeze({
-  CHAN_AUTO: 0,
-  CHAN_WEAPON: 1,
-  CHAN_VOICE: 2,
-  CHAN_ITEM: 3,
-  CHAN_BODY: 4,
-});
-
-/**
- * attenuation
- * @readonly
- * @enum {number}
- */
-export const attn = Object.freeze({
-  /** whole map */
-  ATTN_NONE: 0,
-  /** around 1,000 units */
-  ATTN_NORM: 1,
-  /** around 500 units */
-  ATTN_IDLE: 2,
-  /** around 300 units */
-  ATTN_STATIC: 3,
-});
-
-/**
- * Mins/max of available hulls.
- * @readonly
- */
-export const hull = Object.freeze([
-  [new Vector(-16.0, -16.0, -24.0).freeze(), new Vector(16.0, 16.0, 32.0).freeze()],
-  [new Vector(-32.0, -32.0, -24.0).freeze(), new Vector(32.0, 32.0, 64.0).freeze()],
-]);
-
-/**
- * @readonly
- * @enum {number}
- * point content values
- */
-export const content = Object.freeze({
-  // for convenience:
-  CONTENT_NONE: 0,
-
-  // for game play:
-  /** inside the world */
-  CONTENT_EMPTY: -1,
-  /** outside the world */
-  CONTENT_SOLID: -2,
-  CONTENT_WATER: -3,
-  CONTENT_SLIME: -4,
-  CONTENT_LAVA: -5,
-  /** behaves like CONTENT_SOLID (collisions and sealing), but renders sky and might affect game play */
-  CONTENT_SKY: -6,
-
-  // for build tools shenanigans:
-  CONTENT_ORIGIN: -7,
-  /** clip brush, does not affect PxS nor rendering, but collisions */
-  CONTENT_CLIP: -8,
-
-  // currents:
-  CONTENT_CURRENT_0: -9,
-  CONTENT_CURRENT_90: -10,
-  CONTENT_CURRENT_180: -11,
-  CONTENT_CURRENT_270: -12,
-  CONTENT_CURRENT_UP: -13,
-  CONTENT_CURRENT_DOWN: -14,
-});
-
-/**
- * @readonly
- * @enum {number}
- * waterlevel values (0, 1, 2, 3) for .waterlevel
- */
-export const waterlevel = Object.freeze({
-  /** not in water */
-  WATERLEVEL_NONE: 0,
-  /** feet in water (origin[2] + playerMins[2] + 1) */
-  WATERLEVEL_FEET: 1,
-  /** waist in water (origin[2] + (playerMins[2] + playerMaxs[2]) / 2) */
-  WATERLEVEL_WAIST: 2,
-  /** head in water (origin[2] + view_ofs[2]) */
-  WATERLEVEL_HEAD: 3,
-});
-
-/**
- * @readonly
- * @enum {number}
- * @deprecated I’m thinking of a more extensible way to handle this
- * thin client information and legacy updatestat values
- */
-export const clientStat = Object.freeze({
-  STAT_HEALTH: 0,
-  STAT_WEAPON: 2,
-  STAT_WEAPONFRAME: 5,
-});
-
-/**
- * @readonly
- * @enum {string}
- * feature flags for the game code (both server and client)
- */
-export const gameCapabilities = Object.freeze({
-  /** this will read total_secrets, total_monsters, found_secrets, killed_monsters being sent via updatestat and let the client write them to CL.state.stat */
-  CAP_CLIENTDATA_UPDATESTAT: 'CAP_CLIENTDATA_UPDATESTAT',
-  /** this will add items and ammo information to clientdata messages */
-  CAP_CLIENTDATA_LEGACY: 'CAP_CLIENTDATA_LEGACY',
-  /** this will transmit clientdataFields defined in the player entity to the client and automatically populate clientdata on the ClientGameAPI */
-  CAP_CLIENTDATA_DYNAMIC: 'CAP_CLIENTDATA_DYNAMIC',
-  /** will allow updating certain fields from server to client */
-  CAP_ENTITY_EXTENDED: 'CAP_ENTITY_EXTENDED',
-  /** the client game code brings its own status bar, in other words: no Sbar required! */
-  CAP_HUD_INCLUDES_SBAR: 'CAP_HUD_INCLUDES_SBAR',
-  /** the client game code takes care of rendering crosshairs, in other words: V is not required to draw one! */
-  CAP_HUD_INCLUDES_CROSSHAIR: 'CAP_HUD_INCLUDES_CROSSHAIR',
-  /** the client game manages the view model now, no longer the game code */
-  CAP_VIEWMODEL_MANAGED: 'CAP_VIEWMODEL_MANAGED',
-  /** no longer using SetNewParms, SetSpawnParms, SetChangeParms, parm0..15, but the new interfaces allowing for more flexibility */
-  CAP_SPAWNPARMS_DYNAMIC: 'CAP_SPAWNPARMS_DYNAMIC',
-  /** will use SetNewParms, SetSpawnParms, SetChangeParms, parm0..15, etc. */
-  CAP_SPAWNPARMS_LEGACY: 'CAP_SPAWNPARMS_LEGACY',
-  /** prevents chat messages from being handled by the engine, client code will handle that */
-  CAP_CHAT_MANAGED: 'CAP_CHAT_MANAGED',
-  /** adds additional units to the bounding box during entity linking (e.g. for items additional 28 units in total per x/y axis) */
-  CAP_ENTITY_BBOX_ADJUSTMENTS_DURING_LINK: 'CAP_ENTITY_BBOX_ADJUSTMENTS_DURING_LINK',
-});
-
-export const cvarFlags = Object.freeze({
-  NONE: 0,
-  /** archive will make the engine write the modified variable to local storage or file (dedicated only) */
-  ARCHIVE: 1,
-  /** server will make changes be broadcast to all clients */
-  SERVER: 2,
-  /** readonly cannot be changed by the user, only through the API */
-  READONLY: 4,
-  /** value won’t be shown in broadcast message */
-  SECRET: 8,
-  /** variable declared by the game code */
-  GAME: 16,
-  /** variable will be changed upon next map */
-  DEFERRED: 32, // TODO: implement
-  /** variable cannot be changed unless sv_cheats is set to 1 */
-  CHEAT: 64,
-  /** variable has been registered from the client code */
-  CLIENT: 128,
-});
-
-/** floating point epsilon to account for inexact comparisons */
-export const EPSILON = 1e-8;
diff --git a/source/shared/Defs.ts b/source/shared/Defs.ts
new file mode 100644
index 00000000..83df1ac2
--- /dev/null
+++ b/source/shared/Defs.ts
@@ -0,0 +1,281 @@
+/**
+ * Engine-game shared definitions.
+ */
+
+import Vector from './Vector.ts';
+
+/**
+ * `edict.solid` values.
+ */
+export enum solid {
+  /** no interaction with other objects */
+  SOLID_NOT = 0,
+  /** touch on edge, but not blocking */
+  SOLID_TRIGGER = 1,
+  /** touch on edge, block */
+  SOLID_BBOX = 2,
+  /** touch on edge, but not an onground */
+  SOLID_SLIDEBOX = 3,
+  /** bsp clip, touch on edge, block */
+  SOLID_BSP = 4,
+  /** mesh clip, touch on edge, block */
+  SOLID_MESH = 5,
+}
+
+/**
+ * `edict.movetype` values.
+ */
+export enum moveType {
+  /** never moves */
+  MOVETYPE_NONE = 0,
+  // float MOVETYPE_ANGLENOCLIP: 1,
+  // float MOVETYPE_ANGLECLIP: 2,
+  /** players only */
+  MOVETYPE_WALK = 3,
+  /** discrete, not real time unless fall */
+  MOVETYPE_STEP = 4,
+  MOVETYPE_FLY = 5,
+  /** gravity */
+  MOVETYPE_TOSS = 6,
+  /** no clip to world, push and crush */
+  MOVETYPE_PUSH = 7,
+  MOVETYPE_NOCLIP = 8,
+  /** fly with extra size against monsters */
+  MOVETYPE_FLYMISSILE = 9,
+  MOVETYPE_BOUNCE = 10,
+  /** bounce with extra size */
+  MOVETYPE_BOUNCEMISSILE = 11,
+}
+
+/**
+ * `edict.flags` values.
+ */
+export enum flags {
+  FL_NONE = 0,
+  FL_FLY = 1,
+  FL_SWIM = 2,
+  /** set for all client edicts */
+  FL_CLIENT = 8,
+  /** for enter / leave water splash */
+  FL_INWATER = 16,
+  FL_MONSTER = 32,
+  /** player cheat */
+  FL_GODMODE = 64,
+  /** player cheat */
+  FL_NOTARGET = 128,
+  /** extra wide size for bonus items */
+  FL_ITEM = 256,
+  /** standing on something */
+  FL_ONGROUND = 512,
+  /** not all corners are valid */
+  FL_PARTIALGROUND = 1024,
+  /** player jumping out of water */
+  FL_WATERJUMP = 2048,
+  /** for jump debouncing */
+  FL_JUMPRELEASED = 4096,
+  /** entity can be used (interacted with) */
+  FL_USEABLE = 8192,
+}
+
+/**
+ * Damage types.
+ */
+export enum damage {
+  /** no damage */
+  DAMAGE_NO = 0,
+  /** damage is applied */
+  DAMAGE_YES = 1,
+  /** damage aims at entities */
+  DAMAGE_AIM = 2,
+}
+
+/**
+ * Collision trace move types.
+ */
+export enum moveTypes {
+  /** normal trace */
+  MOVE_NORMAL = 0,
+  /** don't clip against monsters */
+  MOVE_NOMONSTERS = 1,
+  /** expand for missile size */
+  MOVE_MISSILE = 2,
+}
+
+/**
+ * Entity effects.
+ * This is a uint8.
+ */
+export enum effect {
+  EF_NONE = 0,
+  EF_BRIGHTFIELD = 1,
+  EF_MUZZLEFLASH = 2,
+  EF_BRIGHTLIGHT = 4,
+  EF_DIMLIGHT = 8,
+  /** makes sure that the model is always rendered fullbright */
+  EF_FULLBRIGHT = 16,
+  /** makes sure the model is never completely dark */
+  EF_MINLIGHT = 32,
+  /** make sure the model never casts a shadow */
+  EF_NOSHADOW = 64,
+  /** simply not being rendered */
+  EF_NODRAW = 128,
+}
+
+/**
+ * Model flags.
+ */
+export enum modelFlags {
+  MF_NONE = 0,
+  MF_ROCKET = 1,
+  MF_GRENADE = 2,
+  MF_GIB = 4,
+  MF_ROTATE = 8,
+  MF_TRACER = 16,
+  MF_ZOMGIB = 32,
+  MF_TRACER2 = 64,
+  MF_TRACER3 = 128,
+}
+
+/**
+ * Sound channels.
+ * Channel 0 never willingly overrides.
+ * Other channels (1-7) always override a playing sound on that channel.
+ */
+export enum channel {
+  CHAN_AUTO = 0,
+  CHAN_WEAPON = 1,
+  CHAN_VOICE = 2,
+  CHAN_ITEM = 3,
+  CHAN_BODY = 4,
+}
+
+/**
+ * Sound attenuation.
+ */
+export enum attn {
+  /** whole map */
+  ATTN_NONE = 0,
+  /** around 1,000 units */
+  ATTN_NORM = 1,
+  /** around 500 units */
+  ATTN_IDLE = 2,
+  /** around 300 units */
+  ATTN_STATIC = 3,
+}
+
+/**
+ * Mins/maxes of available hulls.
+ */
+export const hull = Object.freeze([
+  [new Vector(-16.0, -16.0, -24.0).freeze(), new Vector(16.0, 16.0, 32.0).freeze()] as const,
+  [new Vector(-32.0, -32.0, -24.0).freeze(), new Vector(32.0, 32.0, 64.0).freeze()] as const,
+] satisfies readonly [mins: Vector, maxs: Vector][]);
+
+/**
+ * Point content values.
+ */
+export enum content {
+  // for convenience:
+  CONTENT_NONE = 0,
+
+  // for game play:
+  /** inside the world */
+  CONTENT_EMPTY = -1,
+  /** outside the world */
+  CONTENT_SOLID = -2,
+  CONTENT_WATER = -3,
+  CONTENT_SLIME = -4,
+  CONTENT_LAVA = -5,
+  /** behaves like CONTENT_SOLID (collisions and sealing), but renders sky and might affect game play */
+  CONTENT_SKY = -6,
+
+  // for build tools shenanigans:
+  CONTENT_ORIGIN = -7,
+  /** clip brush, does not affect PxS nor rendering, but collisions */
+  CONTENT_CLIP = -8,
+
+  // currents:
+  CONTENT_CURRENT_0 = -9,
+  CONTENT_CURRENT_90 = -10,
+  CONTENT_CURRENT_180 = -11,
+  CONTENT_CURRENT_270 = -12,
+  CONTENT_CURRENT_UP = -13,
+  CONTENT_CURRENT_DOWN = -14,
+}
+
+/**
+ * `waterlevel` values for `.waterlevel`.
+ */
+export enum waterlevel {
+  /** not in water */
+  WATERLEVEL_NONE = 0,
+  /** feet in water (`origin[2] + playerMins[2] + 1`) */
+  WATERLEVEL_FEET = 1,
+  /** waist in water (`origin[2] + (playerMins[2] + playerMaxs[2]) / 2`) */
+  WATERLEVEL_WAIST = 2,
+  /** head in water (`origin[2] + view_ofs[2]`) */
+  WATERLEVEL_HEAD = 3,
+}
+
+/**
+ * Thin client information and legacy `updatestat` values.
+ */
+export enum clientStat {
+  STAT_HEALTH = 0,
+  STAT_WEAPON = 2,
+  STAT_WEAPONFRAME = 5,
+}
+
+/**
+ * Feature flags for the game code (both server and client).
+ */
+export enum gameCapabilities {
+  /** this will read total_secrets, total_monsters, found_secrets, killed_monsters being sent via updatestat and let the client write them to CL.state.stat */
+  CAP_CLIENTDATA_UPDATESTAT = 'CAP_CLIENTDATA_UPDATESTAT',
+  /** this will add items and ammo information to clientdata messages */
+  CAP_CLIENTDATA_LEGACY = 'CAP_CLIENTDATA_LEGACY',
+  /** this will transmit clientdataFields defined in the player entity to the client and automatically populate clientdata on the ClientGameAPI */
+  CAP_CLIENTDATA_DYNAMIC = 'CAP_CLIENTDATA_DYNAMIC',
+  /** will allow updating certain fields from server to client */
+  CAP_ENTITY_EXTENDED = 'CAP_ENTITY_EXTENDED',
+  /** the client game code brings its own status bar, in other words: no Sbar required! */
+  CAP_HUD_INCLUDES_SBAR = 'CAP_HUD_INCLUDES_SBAR',
+  /** the client game code takes care of rendering crosshairs, in other words: V is not required to draw one! */
+  CAP_HUD_INCLUDES_CROSSHAIR = 'CAP_HUD_INCLUDES_CROSSHAIR',
+  /** the client game manages the view model now, no longer the game code */
+  CAP_VIEWMODEL_MANAGED = 'CAP_VIEWMODEL_MANAGED',
+  /** no longer using SetNewParms, SetSpawnParms, SetChangeParms, parm0..15, but the new interfaces allowing for more flexibility */
+  CAP_SPAWNPARMS_DYNAMIC = 'CAP_SPAWNPARMS_DYNAMIC',
+  /** will use SetNewParms, SetSpawnParms, SetChangeParms, parm0..15, etc. */
+  CAP_SPAWNPARMS_LEGACY = 'CAP_SPAWNPARMS_LEGACY',
+  /** prevents chat messages from being handled by the engine, client code will handle that */
+  CAP_CHAT_MANAGED = 'CAP_CHAT_MANAGED',
+  /** adds additional units to the bounding box during entity linking (e.g. for items additional 28 units in total per x/y axis) */
+  CAP_ENTITY_BBOX_ADJUSTMENTS_DURING_LINK = 'CAP_ENTITY_BBOX_ADJUSTMENTS_DURING_LINK',
+}
+
+/**
+ * Cvar registration flags.
+ */
+export enum cvarFlags {
+  NONE = 0,
+  /** archive will make the engine write the modified variable to local storage or file (dedicated only) */
+  ARCHIVE = 1,
+  /** server will make changes be broadcast to all clients */
+  SERVER = 2,
+  /** readonly cannot be changed by the user, only through the API */
+  READONLY = 4,
+  /** value won’t be shown in broadcast message */
+  SECRET = 8,
+  /** variable declared by the game code */
+  GAME = 16,
+  /** variable will be changed upon next map */
+  DEFERRED = 32,
+  /** variable cannot be changed unless sv_cheats is set to 1 */
+  CHEAT = 64,
+  /** variable has been registered from the client code */
+  CLIENT = 128,
+}
+
+/** floating point epsilon to account for inexact comparisons */
+export const EPSILON = 1e-8;
diff --git a/source/shared/Octree.mjs b/source/shared/Octree.mjs
index b3ba494f..e87942bf 100644
--- a/source/shared/Octree.mjs
+++ b/source/shared/Octree.mjs
@@ -1,6 +1,6 @@
 import Vector from './Vector.mjs';
 
-/** @typedef {{origin: Vector, absmin: Vector|null, absmax: Vector|null, octreeNode: OctreeNode<OctreeItem>|null}} OctreeItem */
+/** @typedef {{origin: Vector|null, absmin: Vector|null, absmax: Vector|null, octreeNode: OctreeNode<OctreeItem>|null}} OctreeItem */
 
 /**
  * Octree node holding a spatially indexed item.
diff --git a/source/shared/Q.mjs b/source/shared/Q.mjs
index 78eabb69..1c4ef014 100644
--- a/source/shared/Q.mjs
+++ b/source/shared/Q.mjs
@@ -1,4 +1,4 @@
-import { EPSILON } from './Defs.mjs';
+import { EPSILON } from './Defs.ts';
 
 /**
  * Utility class for common engine functions.
diff --git a/source/shared/Vector.mjs b/source/shared/Vector.mjs
index af4e541f..85418889 100644
--- a/source/shared/Vector.mjs
+++ b/source/shared/Vector.mjs
@@ -1,759 +1,3 @@
 
-/**
- * Directional vectors.
- */
-export class DirectionalVectors {
-  /**
-   * @param {Vector} forward forward direction
-   * @param {Vector} right right direction
-   * @param {Vector} up up direction
-   */
-  constructor(forward, right, up) {
-    this.forward = forward;
-    this.right = right;
-    this.up = up;
-    Object.freeze(this);
-  }
-};
-
-/**
- * Quaternion.
- */
-export class Quaternion extends Array {
-  constructor(x = 0.0, y = 0.0, z = 0.0, w = 0.0) {
-    super(4);
-    console.assert(typeof x === 'number' && typeof y === 'number' && typeof z === 'number' && typeof w === 'number', 'not a number');
-    console.assert(!Number.isNaN(x) && !Number.isNaN(y) && !Number.isNaN(z) && !Number.isNaN(w), 'NaN component');
-    this[0] = x;
-    this[1] = y;
-    this[2] = z;
-    this[3] = w;
-  }
-
-  /**
-   * Creates Quaternion from Vector.
-   * @param {Vector} vector vector
-   * @returns {Quaternion} the resulting quaternion
-   */
-  fromVector(vector) {
-    return vector.toQuaternion();
-  }
-
-  /**
-   * Compares this Quaternion to the other quaternion.
-   * @param {Quaternion} other other quaternion
-   * @returns {boolean} true, if equal
-   */
-  equals(other) {
-    return this[0] === other[0] && this[1] === other[1] && this[2] === other[2] && this[3] === other[3];
-  }
-
-  /**
-   * Compares this Quaternion’s component to x, y, z, w.
-   * @param {number} x x
-   * @param {number} y y
-   * @param {number} z z
-   * @param {number} w omega
-   * @returns {boolean} true, if equal
-   */
-  equalsTo(x, y, z, w) {
-    return this[0] === x && this[1] === y && this[2] === z && this[3] === w;
-  }
-
-  /**
-   * Freezes this Quaternion.
-   * @returns {Quaternion} this
-   */
-  freeze() {
-    Object.freeze(this);
-    return this;
-  }
-
-  /**
-   * Quake-style string representation of a Quaternion
-   * @returns {string} Quake-style string of this quaternion
-   */
-  toString() {
-    return `${this.map((/** @type {number} */ e) => e.toFixed(1)).join(' ')}`;
-  }
-};
-
-/**
- * 3D vector.
- * This is the most commonly used vector type in the engine, and is used for positions, directions, angles, etc.
- * It is different from Quake’s Vector macros (it doesn’t even has classes or functions most of the time),
- * almost all of which are now instance methods here.
- * While most methods are mutating, some return new Vectors for convenience.
- * Make sure to read the JSDoc carefully.
- */
-export default class Vector extends Float32Array { // CR: we need 32 bit precision to simulate some Q1 issues
-  /** Vector origin constant */
-  static origin = (new Vector()).freeze();
-
-  /**
-   * Construct a Vector (defaulting to [0.0, 0.0, 0.0]).
-   * Extending Array allows Vector to be used much like a numeric array
-   * but still benefit from instance methods here.
-   * @param {number} x X
-   * @param {number} y Y
-   * @param {number} z Z
-   */
-  constructor(x = 0.0, y = 0.0, z = 0.0) {
-    console.assert(typeof x === 'number' && typeof y === 'number' && typeof z === 'number', 'not a number');
-    console.assert(!Number.isNaN(x) && !Number.isNaN(y) && !Number.isNaN(z), 'NaN component');
-    super(3);
-    this[0] = x;
-    this[1] = y;
-    this[2] = z;
-  }
-
-  /**
-   * Return a perpendicular direction to `this`.
-   * (Equivalent to the old Vec.Perpendicular.)
-   * @returns {Vector} perpendicular vector
-   */
-  perpendicular() {
-    let pos = 0;
-    let minelem = 1;
-
-    // Find whichever component is the smallest in absolute value:
-    for (let i = 0; i < 3; i++) {
-      const absVal = Math.abs(this[i]);
-      if (absVal < minelem) {
-        pos = i;
-        minelem = absVal;
-      }
-    }
-
-    // Construct a temporary vector with 1.0 in that dimension:
-    const temp = new Vector();
-    temp[pos] = 1.0;
-
-    // Compute the projection and subtract it:
-    const invDenom = 1.0 / (this[0] * this[0] + this[1] * this[1] + this[2] * this[2]);
-    const d = temp.dot(this) * invDenom;
-    const perpendicularVec = new Vector(
-      temp[0] - d * this[0] * invDenom,
-      temp[1] - d * this[1] * invDenom,
-      temp[2] - d * this[2] * invDenom,
-    );
-
-    // Normalize the result and return:
-    perpendicularVec.normalize();
-    return perpendicularVec;
-  }
-
-  /**
-   * Rotate a point around the direction `this`.
-   * (Equivalent to the old Vec.RotatePointAroundVector(dir, point, degrees).)
-   * @param {Vector} point point to rotate
-   * @param {number} degrees angle
-   * @returns {Vector} new point
-   */
-  rotatePointAroundVector(point, degrees) {
-    const vectorR = this.perpendicular();
-    const up = vectorR.cross(this);
-
-    const m = [
-      [vectorR[0], up[0], this[0]],
-      [vectorR[1], up[1], this[1]],
-      [vectorR[2], up[2], this[2]],
-    ];
-
-    const im = [
-      [m[0][0], m[1][0], m[2][0]],
-      [m[0][1], m[1][1], m[2][1]],
-      [m[0][2], m[1][2], m[2][2]],
-    ];
-
-    const radians = (degrees * Math.PI) / 180.0;
-    const s = Math.sin(radians);
-    const c = Math.cos(radians);
-
-    // Rotation about Z-axis by `degrees`:
-    const zrot = [
-      [c, s, 0.0],
-      [-s, c, 0.0],
-      [0.0, 0.0, 1.0],
-    ];
-
-    // Combine the rotations:
-    const matrixRot = Vector.concatRotations(Vector.concatRotations(m, zrot), im);
-
-    // Apply to point:
-    const x = matrixRot[0][0] * point[0] + matrixRot[0][1] * point[1] + matrixRot[0][2] * point[2];
-    const y = matrixRot[1][0] * point[0] + matrixRot[1][1] * point[1] + matrixRot[1][2] * point[2];
-    const z = matrixRot[2][0] * point[0] + matrixRot[2][1] * point[1] + matrixRot[2][2] * point[2];
-    return new Vector(x, y, z);
-  }
-
-  /**
-   * Modulo an angle into [0, 360).
-   * (Same as the old Vector.anglemod.)
-   * @param {number} angle angle
-   * @returns {number} angle in [0, 360)
-   */
-  static anglemod(angle) {
-    return ((angle % 360.0) + 360.0) % 360.0;
-  }
-
-  /**
-   * Equivalent to the old Vec.BoxOnPlaneSide(emins, emaxs, p).
-   * Kept as a static because it does not revolve around a single vector.
-   * @param {Vector} emins emins
-   * @param {Vector} emaxs emaxs
-   * @param {*} p plane
-   * @returns {number|null} which side, null on error
-   */
-  static boxOnPlaneSide(emins, emaxs, p) {
-    if (p.type <= 2) {
-      if (p.dist <= emins[p.type]) {
-        return 1;
-      }
-      if (p.dist >= emaxs[p.type]) {
-        return 2;
-      }
-      return 3;
-    }
-    let dist1; let dist2;
-    console.assert(p.signbits >= 0 && p.signbits < 8, 'signbits must be [0, 8)', p.signbits);
-    switch (p.signbits) {
-      case 0:
-        dist1 = p.normal[0] * emaxs[0] + p.normal[1] * emaxs[1] + p.normal[2] * emaxs[2];
-        dist2 = p.normal[0] * emins[0] + p.normal[1] * emins[1] + p.normal[2] * emins[2];
-        break;
-      case 1:
-        dist1 = p.normal[0] * emins[0] + p.normal[1] * emaxs[1] + p.normal[2] * emaxs[2];
-        dist2 = p.normal[0] * emaxs[0] + p.normal[1] * emins[1] + p.normal[2] * emins[2];
-        break;
-      case 2:
-        dist1 = p.normal[0] * emaxs[0] + p.normal[1] * emins[1] + p.normal[2] * emaxs[2];
-        dist2 = p.normal[0] * emins[0] + p.normal[1] * emaxs[1] + p.normal[2] * emins[2];
-        break;
-      case 3:
-        dist1 = p.normal[0] * emins[0] + p.normal[1] * emins[1] + p.normal[2] * emaxs[2];
-        dist2 = p.normal[0] * emaxs[0] + p.normal[1] * emaxs[1] + p.normal[2] * emins[2];
-        break;
-      case 4:
-        dist1 = p.normal[0] * emaxs[0] + p.normal[1] * emaxs[1] + p.normal[2] * emins[2];
-        dist2 = p.normal[0] * emins[0] + p.normal[1] * emins[1] + p.normal[2] * emaxs[2];
-        break;
-      case 5:
-        dist1 = p.normal[0] * emins[0] + p.normal[1] * emaxs[1] + p.normal[2] * emins[2];
-        dist2 = p.normal[0] * emaxs[0] + p.normal[1] * emins[1] + p.normal[2] * emaxs[2];
-        break;
-      case 6:
-        dist1 = p.normal[0] * emaxs[0] + p.normal[1] * emins[1] + p.normal[2] * emins[2];
-        dist2 = p.normal[0] * emins[0] + p.normal[1] * emaxs[1] + p.normal[2] * emaxs[2];
-        break;
-      case 7:
-        dist1 = p.normal[0] * emins[0] + p.normal[1] * emins[1] + p.normal[2] * emins[2];
-        dist2 = p.normal[0] * emaxs[0] + p.normal[1] * emaxs[1] + p.normal[2] * emaxs[2];
-        break;
-      default:
-        return null;
-    }
-    let sides = 0;
-    if (dist1 >= p.dist) {
-      sides = 1;
-    }
-    if (dist2 < p.dist) {
-      sides += 2;
-    }
-    return sides;
-  }
-
-  /**
-   * Equivalent to the old Vec.AngleVectors(angles, forward, right, up),
-   * but now it acts on `this` as the angles array.
-   * Returns an object containing forward, right, up as Vecs.
-   * @returns {DirectionalVectors} directional vectors
-   */
-  angleVectors() {
-    console.assert(Number.isFinite(this[0]) && Number.isFinite(this[1]) && Number.isFinite(this[2]), 'angles must be finite numbers');
-
-    let angle = this[0] * Math.PI / 180.0;
-    const sp = Math.sin(angle);
-    const cp = Math.cos(angle);
-
-    angle = this[1] * Math.PI / 180.0;
-    const sy = Math.sin(angle);
-    const cy = Math.cos(angle);
-
-    angle = this[2] * Math.PI / 180.0;
-    const sr = Math.sin(angle);
-    const cr = Math.cos(angle);
-
-    const forward = new Vector(
-      cp * cy,
-      cp * sy,
-      -sp,
-    );
-
-    const right = new Vector(
-      cr * sy - sr * sp * cy,
-      -sr * sp * sy - cr * cy,
-      -sr * cp,
-    );
-
-    const up = new Vector(
-      cr * sp * cy + sr * sy,
-      cr * sp * sy - sr * cy,
-      cr * cp,
-    );
-
-    return new DirectionalVectors(forward, right, up);
-  }
-
-  toYaw() {
-    if (!this[0] && !this[1]) {
-      return 0.0;
-    }
-
-    let yaw = (Math.atan2(this[1], this[0]) * 180.0 / Math.PI);
-
-    if (yaw < 0.0) {
-      yaw += 360.0;
-    }
-
-    return yaw;
-  }
-
-  toPitch() {
-    let pitch = (Math.atan2(this[2], Math.hypot(this[0], this[1])) * 180.0 / Math.PI);
-
-    if (pitch < 0.0) {
-      pitch += 360.0;
-    }
-
-    return pitch;
-  }
-
-  /**
-   * Convert this directional vector into pitch and yaw angles and returns them.
-   * @returns {Vector} Vector containing [pitch, yaw, 0]
-   */
-  toAngles() {
-    const angles = new Vector();
-
-    if (this[0] === 0.0 && this[1] === 0.0) {
-      if (this[2] > 0.0) {
-        angles[0] = 90.0;
-      } else {
-        angles[0] = 270.0;
-      }
-
-      return angles;
-    }
-
-    angles.setTo(this.toPitch(), this.toYaw(), 0.0);
-
-    return angles;
-  }
-
-  /**
-   * Assumes in this Vector is [roll, pitch, yaw] and generates a 3x3 rotation matrix.
-   * @returns {number[]} 3x3 rotation matrix
-   */
-  toRotationMatrix() {
-    let [pitch, yaw, roll] = this;
-    // FIXME: with infinite components, we need to err out here
-    console.assert(Number.isFinite(pitch), 'finite pitch');
-    console.assert(Number.isFinite(yaw), 'finite yaw');
-    console.assert(Number.isFinite(roll), 'finite roll');
-    pitch *= Math.PI / -180.0;
-    yaw *= Math.PI / 180.0;
-    roll *= Math.PI / 180.0;
-    const sp = Math.sin(pitch);
-    const cp = Math.cos(pitch);
-    const sy = Math.sin(yaw);
-    const cy = Math.cos(yaw);
-    const sr = Math.sin(roll);
-    const cr = Math.cos(roll);
-    return [
-      cy * cp, sy * cp, -sp,
-      -sy * cr + cy * sp * sr, cy * cr + sy * sp * sr, cp * sr,
-      -sy * -sr + cy * sp * cr, cy * -sr + sy * sp * cr, cp * cr,
-    ];
-  }
-
-  /**
-   * Dot product of this and other.
-   * @param {Vector} other other vector
-   * @returns {number} dot product of this and other
-   */
-  dot(other) {
-    console.assert(other instanceof Vector, 'not a Vector');
-    return this[0] * other[0] + this[1] * other[1] + this[2] * other[2];
-  }
-
-  /**
-   * Create a copy of this vector.
-   * (Equivalent to the old Vec.Copy, but now returns a fresh Vector.)
-   * @returns {Vector} copy of this
-   */
-  copy() {
-    return new Vector(this[0], this[1], this[2]);
-  }
-
-  /**
-   * Add other to this vector (component-wise).
-   * @param {Vector|number[]} other other vector (or vector alike)
-   * @returns {Vector} this
-   */
-  add(other) {
-    console.assert(other instanceof Vector, 'not a Vector');
-    this[0] += other[0];
-    this[1] += other[1];
-    this[2] += other[2];
-    return this;
-  }
-
-  /**
-   * Subtract other from this vector (component-wise).
-   * @param {Vector|number[]} other other vector (or vector alike)
-   * @returns {Vector} this
-   */
-  subtract(other) {
-    console.assert(other instanceof Vector, 'not a Vector');
-    this[0] -= other[0];
-    this[1] -= other[1];
-    this[2] -= other[2];
-    return this;
-  }
-
-  /**
-   * Multiply factor into this vector.
-   * @param {number} factor factor for multiplication
-   * @returns {Vector} this
-   */
-  multiply(factor) {
-    console.assert(typeof factor === 'number', 'not a number');
-    this[0] *= factor;
-    this[1] *= factor;
-    this[2] *= factor;
-    return this;
-  }
-
-  /**
-   * Check if other equals this vector.
-   * @param {Vector|number[]} other other vector (or vector alike)
-   * @returns {boolean} true, if all components are equal
-   */
-  equals(other) {
-    console.assert(other instanceof Vector, 'not a Vector');
-    return this[0] === other[0] && this[1] === other[1] && this[2] === other[2];
-  }
-
-  /**
-   * Check if [x, y, z] equals this vector.
-   * @param {number} x X
-   * @param {number} y Y
-   * @param {number} z Z
-   * @returns {boolean} true, if all components are equal
-   */
-  equalsTo(x, y, z) {
-    return this[0] === x && this[1] === y && this[2] === z;
-  }
-
-  /**
-   * Check if this vector is greater than other.
-   * @param {Vector|number[]} other other vector (or vector alike)
-   * @returns {boolean} true, if all components of this vector are greater than the other vector
-   */
-  gt(other) {
-    console.assert(other instanceof Vector, 'not a Vector');
-    return this[0] > other[0] && this[1] > other[1] && this[2] > other[2];
-  }
-
-  /**
-   * Check if this vector is greater than or equal to other.
-   * @param {Vector|number[]} other other vector (or vector alike)
-   * @returns {boolean} true, if all components of this vector are greater than or equal to the other vector
-   */
-  gte(other) {
-    console.assert(other instanceof Vector, 'not a Vector');
-    return this[0] >= other[0] && this[1] >= other[1] && this[2] >= other[2];
-  }
-
-  /**
-   * Check if this vector is less than other.
-   * @param {Vector|number[]} other other vector (or vector alike)
-   * @returns {boolean} true, if all components of this vector are less than the other vector
-   */
-  lt(other) {
-    console.assert(other instanceof Vector, 'not a Vector');
-    return this[0] < other[0] && this[1] < other[1] && this[2] < other[2];
-  }
-
-  /**
-   * Check if this vector is less than or equal to other.
-   * @param {Vector|number[]} other other vector (or vector alike)
-   * @returns {boolean} true, if all components of this vector are less than or equal to the other vector
-   */
-  lte(other) {
-    console.assert(other instanceof Vector, 'not a Vector');
-    return this[0] <= other[0] && this[1] <= other[1] && this[2] <= other[2];
-  }
-
-  /**
-   * Overwrite this vector with values from other.
-   * @param {Vector|number[]} other other vector
-   * @returns {Vector} this
-   */
-  set(other) {
-    console.assert(other instanceof Vector, 'not a Vector');
-    console.assert(!Number.isNaN(other[0]), 'NaN component');
-    console.assert(!Number.isNaN(other[1]), 'NaN component');
-    console.assert(!Number.isNaN(other[2]), 'NaN component');
-    this[0] = other[0];
-    this[1] = other[1];
-    this[2] = other[2];
-    return this;
-  }
-
-  /**
-   * Sets this vector to [x, y, z].
-   * @param {number} x X
-   * @param {number} y Y
-   * @param {number} z Z
-   * @returns {Vector} this
-   */
-  setTo(x, y, z) {
-    console.assert(typeof x === 'number' && typeof y === 'number' && typeof z === 'number', 'not a number');
-    console.assert(!Number.isNaN(x), 'NaN component');
-    console.assert(!Number.isNaN(y), 'NaN component');
-    console.assert(!Number.isNaN(z), 'NaN component');
-    this[0] = x;
-    this[1] = y;
-    this[2] = z;
-    return this;
-  }
-
-  /**
-   * Clear this vector.
-   * @returns {Vector} this
-   */
-  clear() {
-    this[0] = 0.0;
-    this[1] = 0.0;
-    this[2] = 0.0;
-    return this;
-  }
-
-  /**
-   * Check if this vector is origin.
-   * @returns {boolean} true, if this is an origin vector
-   */
-  isOrigin() {
-    return this[0] === 0.0 && this[1] === 0.0 && this[2] === 0.0;
-  }
-
-  /**
-   * Check if this vector is infinite.
-   * @returns {boolean} true, if this is an infinite vector
-   */
-  isInfinite() {
-    return  this[0] === Infinity || this[1] === Infinity || this[2] === Infinity ||
-            this[0] === -Infinity || this[1] === -Infinity || this[2] === -Infinity;
-  }
-
-  /**
-   * Cross product of this x other, returns a new Vector.
-   * @param {Vector} other other vector
-   * @returns {Vector} cross product of this and the other vector as a new Vector
-   */
-  cross(other) {
-    console.assert(other instanceof Vector, 'not a Vector');
-    return new Vector(
-      this[1] * other[2] - this[2] * other[1],
-      this[2] * other[0] - this[0] * other[2],
-      this[0] * other[1] - this[1] * other[0],
-    );
-  }
-
-  /**
-   * Return the length (magnitude) of this vector.
-   * (Not using len, because Array.prototype.length exists.)
-   * @returns {number} the length of this vector
-   */
-  len() {
-    return Math.hypot(this[0], this[1], this[2]);
-  }
-
-  /**
-   * Returns the average of the components of this vector.
-   * @returns {number} the average of the components of this vector
-   */
-  average() {
-    return (this[0] + this[1] + this[2]) / 3.0;
-  }
-
-  /**
-   * Returns the greatest component of this vector.
-   * @returns {number} the greatest component of this vector
-   */
-  greatest() {
-    return Math.max(this[0], this[1], this[2]);
-  }
-
-  /**
-   * Determines the distance from this to other.
-   * @param {Vector} other other vector
-   * @returns {number} the distance between this and other
-   */
-  distanceTo(other) {
-    const x = this[0] - other[0];
-    const y = this[1] - other[1];
-    const z = this[2] - other[2];
-    return Math.hypot(x, y, z);
-  }
-
-  /**
-   * Normalize this vector in place. Returns the original length.
-   * @returns {number} the original length of this vector
-   */
-  normalize() {
-    const len = this.len();
-    if (len === 0.0) {
-      this[0] = this[1] = this[2] = 0.0;
-      return 0.0;
-    }
-    this[0] /= len;
-    this[1] /= len;
-    this[2] /= len;
-    return len;
-  }
-
-  /**
-   * Multiply two 3×3 rotation matrices (used by rotatePointAroundVector).
-   * This remains static because it’s operating on matrix arrays, not `this`.
-   * @param {number[][]} matrixA A
-   * @param {number[][]} matrixB B
-   * @returns {number[][]} matrix
-   */
-  static concatRotations(matrixA, matrixB) {
-    return [
-      [
-        matrixA[0][0] * matrixB[0][0] +
-        matrixA[0][1] * matrixB[1][0] +
-        matrixA[0][2] * matrixB[2][0],
-        matrixA[0][0] * matrixB[0][1] +
-        matrixA[0][1] * matrixB[1][1] +
-        matrixA[0][2] * matrixB[2][1],
-        matrixA[0][0] * matrixB[0][2] +
-        matrixA[0][1] * matrixB[1][2] +
-        matrixA[0][2] * matrixB[2][2],
-      ],
-      [
-        matrixA[1][0] * matrixB[0][0] +
-        matrixA[1][1] * matrixB[1][0] +
-        matrixA[1][2] * matrixB[2][0],
-        matrixA[1][0] * matrixB[0][1] +
-        matrixA[1][1] * matrixB[1][1] +
-        matrixA[1][2] * matrixB[2][1],
-        matrixA[1][0] * matrixB[0][2] +
-        matrixA[1][1] * matrixB[1][2] +
-        matrixA[1][2] * matrixB[2][2],
-      ],
-      [
-        matrixA[2][0] * matrixB[0][0] +
-        matrixA[2][1] * matrixB[1][0] +
-        matrixA[2][2] * matrixB[2][0],
-        matrixA[2][0] * matrixB[0][1] +
-        matrixA[2][1] * matrixB[1][1] +
-        matrixA[2][2] * matrixB[2][1],
-        matrixA[2][0] * matrixB[0][2] +
-        matrixA[2][1] * matrixB[1][2] +
-        matrixA[2][2] * matrixB[2][2],
-      ],
-    ];
-  }
-
-  /**
-   * Set `this` from a quaternion, interpreting that quaternion as Euler angles.
-   * (Equivalent to the old Vec.SetQuaternion, but we store to `this`.)
-   * @param {Quaternion} quat quaternion
-   * @returns {Vector} this
-   */
-  setQuaternion(quat) {
-    const [w, x, y, z] = quat;
-
-    // Derived via standard quaternion->Euler formula
-    const yaw = Math.atan2(
-      2 * (w * z + x * y),
-      1 - 2 * (y * y + z * z),
-    );
-    const pitch = Math.asin(
-      2 * (w * y - z * x),
-    );
-    const roll = Math.atan2(
-      2 * (w * x + y * z),
-      1 - 2 * (x * x + y * y),
-    );
-
-    // Store angles in this vector.  (Roll, Pitch, Yaw)
-    this[0] = roll;
-    this[1] = pitch;
-    this[2] = yaw;
-    return this;
-  }
-
-  /**
-   * Convert these Euler angles (this) into a quaternion [w, x, y, z].
-   * @returns {Quaternion} quaternion
-   */
-  toQuaternion() {
-    // Expecting [roll, pitch, yaw] in `this`
-    const [roll, pitch, yaw] = this;
-
-    const halfRoll = roll / 2;
-    const halfPitch = pitch / 2;
-    const halfYaw = yaw / 2;
-
-    const sinRoll = Math.sin(halfRoll);
-    const cosRoll = Math.cos(halfRoll);
-
-    const sinPitch = Math.sin(halfPitch);
-    const cosPitch = Math.cos(halfPitch);
-
-    const sinYaw = Math.sin(halfYaw);
-    const cosYaw = Math.cos(halfYaw);
-
-    // w, x, y, z
-    const w = cosRoll * cosPitch * cosYaw + sinRoll * sinPitch * sinYaw;
-    const x = sinRoll * cosPitch * cosYaw - cosRoll * sinPitch * sinYaw;
-    const y = cosRoll * sinPitch * cosYaw + sinRoll * cosPitch * sinYaw;
-    const z = cosRoll * cosPitch * sinYaw - sinRoll * sinPitch * cosYaw;
-
-    return new Quaternion(w, x, y, z);
-  }
-
-  /**
-   * Create a Vector from a quaternion, converting that quaternion to Euler angles.
-   * @param {Quaternion} quat quaternion
-   * @returns {Vector} rotation vector
-   */
-  static fromQuaternion(quat) {
-    const v = new Vector();
-    v.setQuaternion(quat);
-    return v;
-  }
-
-  /**
-   * Freezes this Vector.
-   * @returns {Vector} this
-   */
-  freeze() {
-    // Object.freeze(this);
-    return this;
-  }
-
-  /**
-   * Quake-style string representation of a Vector
-   * @returns {string} Quake-style string of this vector
-   */
-  toString() {
-    return `${this.map((e) => +e.toFixed(1)).join(' ')}`;
-  }
-};
+export { default } from './Vector.ts';
+export * from './Vector.ts';
diff --git a/source/shared/Vector.ts b/source/shared/Vector.ts
new file mode 100644
index 00000000..0c794092
--- /dev/null
+++ b/source/shared/Vector.ts
@@ -0,0 +1,652 @@
+/* eslint jsdoc/require-param-type: "off", jsdoc/require-returns: "off" */
+
+type VectorLike = ArrayLike<number>;
+
+type RotationMatrix = [
+  [number, number, number],
+  [number, number, number],
+  [number, number, number],
+];
+
+type PlaneLike = {
+  type: number;
+  dist: number;
+  signbits: number;
+  normal: VectorLike;
+};
+
+/**
+ * Directional vectors.
+ */
+export class DirectionalVectors {
+  readonly forward: Vector;
+  readonly right: Vector;
+  readonly up: Vector;
+
+  constructor(forward: Vector, right: Vector, up: Vector) {
+    this.forward = forward;
+    this.right = right;
+    this.up = up;
+    Object.freeze(this);
+  }
+}
+
+/**
+ * Quaternion.
+ */
+export class Quaternion extends Array<number> {
+  constructor(x = 0.0, y = 0.0, z = 0.0, w = 0.0) {
+    super(4);
+    console.assert(typeof x === 'number' && typeof y === 'number' && typeof z === 'number' && typeof w === 'number', 'not a number');
+    console.assert(!Number.isNaN(x) && !Number.isNaN(y) && !Number.isNaN(z) && !Number.isNaN(w), 'NaN component');
+    this[0] = x;
+    this[1] = y;
+    this[2] = z;
+    this[3] = w;
+  }
+
+  /**
+   * Creates Quaternion from Vector.
+   * @param vector
+   */
+  fromVector(vector: Vector): Quaternion {
+    return vector.toQuaternion();
+  }
+
+  /**
+   * Compares this Quaternion to the other quaternion.
+   * @param other
+   */
+  equals(other: Quaternion): boolean {
+    return this[0] === other[0] && this[1] === other[1] && this[2] === other[2] && this[3] === other[3];
+  }
+
+  /**
+   * Compares this Quaternion’s component to x, y, z, w.
+   * @param x
+   * @param y
+   * @param z
+   * @param w
+   */
+  equalsTo(x: number, y: number, z: number, w: number): boolean {
+    return this[0] === x && this[1] === y && this[2] === z && this[3] === w;
+  }
+
+  /**
+   * Freezes this Quaternion.
+   */
+  freeze(): Quaternion {
+    Object.freeze(this);
+    return this;
+  }
+
+  /**
+   * Quake-style string representation of a Quaternion.
+   */
+  override toString(): string {
+    return `${this.map((element) => element.toFixed(1)).join(' ')}`;
+  }
+}
+
+/**
+ * 3D vector.
+ * This is the most commonly used vector type in the engine, and is used for positions, directions, angles, etc.
+ * It is different from Quake’s Vector macros (it doesn’t even has classes or functions most of the time),
+ * almost all of which are now instance methods here.
+ * While most methods are mutating, some return new Vectors for convenience.
+ * Make sure to read the JSDoc carefully.
+ */
+export default class Vector extends Float32Array {
+  static origin: Readonly<Vector> = (new Vector()).freeze();
+
+  constructor(x = 0.0, y = 0.0, z = 0.0) {
+    console.assert(typeof x === 'number' && typeof y === 'number' && typeof z === 'number', 'not a number');
+    console.assert(!Number.isNaN(x) && !Number.isNaN(y) && !Number.isNaN(z), 'NaN component');
+    super(3);
+    this[0] = x;
+    this[1] = y;
+    this[2] = z;
+  }
+
+  /**
+   * Return a perpendicular direction to `this`.
+   */
+  perpendicular(): Vector {
+    let pos = 0;
+    let minElement = 1;
+
+    for (let index = 0; index < 3; index++) {
+      const absoluteValue = Math.abs(this[index]);
+      if (absoluteValue < minElement) {
+        pos = index;
+        minElement = absoluteValue;
+      }
+    }
+
+    const temp = new Vector();
+    temp[pos] = 1.0;
+
+    const invDenominator = 1.0 / (this[0] * this[0] + this[1] * this[1] + this[2] * this[2]);
+    const dot = temp.dot(this) * invDenominator;
+    const perpendicularVector = new Vector(
+      temp[0] - dot * this[0] * invDenominator,
+      temp[1] - dot * this[1] * invDenominator,
+      temp[2] - dot * this[2] * invDenominator,
+    );
+
+    perpendicularVector.normalize();
+    return perpendicularVector;
+  }
+
+  /**
+   * Rotate a point around the direction `this`.
+   * @param point
+   * @param degrees
+   */
+  rotatePointAroundVector(point: Vector, degrees: number): Vector {
+    const vectorRight = this.perpendicular();
+    const up = vectorRight.cross(this);
+
+    const matrix: RotationMatrix = [
+      [vectorRight[0], up[0], this[0]],
+      [vectorRight[1], up[1], this[1]],
+      [vectorRight[2], up[2], this[2]],
+    ];
+
+    const inverseMatrix: RotationMatrix = [
+      [matrix[0][0], matrix[1][0], matrix[2][0]],
+      [matrix[0][1], matrix[1][1], matrix[2][1]],
+      [matrix[0][2], matrix[1][2], matrix[2][2]],
+    ];
+
+    const radians = (degrees * Math.PI) / 180.0;
+    const sine = Math.sin(radians);
+    const cosine = Math.cos(radians);
+
+    const zRotation: RotationMatrix = [
+      [cosine, sine, 0.0],
+      [-sine, cosine, 0.0],
+      [0.0, 0.0, 1.0],
+    ];
+
+    const rotationMatrix = Vector.concatRotations(Vector.concatRotations(matrix, zRotation), inverseMatrix);
+
+    const x = rotationMatrix[0][0] * point[0] + rotationMatrix[0][1] * point[1] + rotationMatrix[0][2] * point[2];
+    const y = rotationMatrix[1][0] * point[0] + rotationMatrix[1][1] * point[1] + rotationMatrix[1][2] * point[2];
+    const z = rotationMatrix[2][0] * point[0] + rotationMatrix[2][1] * point[1] + rotationMatrix[2][2] * point[2];
+    return new Vector(x, y, z);
+  }
+
+  /**
+   * Modulo an angle into [0, 360).
+   * @param angle
+   */
+  static anglemod(angle: number): number {
+    return ((angle % 360.0) + 360.0) % 360.0;
+  }
+
+  /**
+   * Equivalent to the old Vec.BoxOnPlaneSide(emins, emaxs, p).
+   * @param emins
+   * @param emaxs
+   * @param plane
+   */
+  static boxOnPlaneSide(emins: Vector, emaxs: Vector, plane: PlaneLike): number {
+    if (plane.type <= 2) {
+      if (plane.dist <= emins[plane.type]) {
+        return 1;
+      }
+      if (plane.dist >= emaxs[plane.type]) {
+        return 2;
+      }
+      return 3;
+    }
+
+    let dist1: number;
+    let dist2: number;
+    console.assert(plane.signbits >= 0 && plane.signbits < 8, 'signbits must be [0, 8)', plane.signbits);
+
+    switch (plane.signbits) {
+      case 0:
+        dist1 = plane.normal[0] * emaxs[0] + plane.normal[1] * emaxs[1] + plane.normal[2] * emaxs[2];
+        dist2 = plane.normal[0] * emins[0] + plane.normal[1] * emins[1] + plane.normal[2] * emins[2];
+        break;
+      case 1:
+        dist1 = plane.normal[0] * emins[0] + plane.normal[1] * emaxs[1] + plane.normal[2] * emaxs[2];
+        dist2 = plane.normal[0] * emaxs[0] + plane.normal[1] * emins[1] + plane.normal[2] * emins[2];
+        break;
+      case 2:
+        dist1 = plane.normal[0] * emaxs[0] + plane.normal[1] * emins[1] + plane.normal[2] * emaxs[2];
+        dist2 = plane.normal[0] * emins[0] + plane.normal[1] * emaxs[1] + plane.normal[2] * emins[2];
+        break;
+      case 3:
+        dist1 = plane.normal[0] * emins[0] + plane.normal[1] * emins[1] + plane.normal[2] * emaxs[2];
+        dist2 = plane.normal[0] * emaxs[0] + plane.normal[1] * emaxs[1] + plane.normal[2] * emins[2];
+        break;
+      case 4:
+        dist1 = plane.normal[0] * emaxs[0] + plane.normal[1] * emaxs[1] + plane.normal[2] * emins[2];
+        dist2 = plane.normal[0] * emins[0] + plane.normal[1] * emins[1] + plane.normal[2] * emaxs[2];
+        break;
+      case 5:
+        dist1 = plane.normal[0] * emins[0] + plane.normal[1] * emaxs[1] + plane.normal[2] * emins[2];
+        dist2 = plane.normal[0] * emaxs[0] + plane.normal[1] * emins[1] + plane.normal[2] * emaxs[2];
+        break;
+      case 6:
+        dist1 = plane.normal[0] * emaxs[0] + plane.normal[1] * emins[1] + plane.normal[2] * emins[2];
+        dist2 = plane.normal[0] * emins[0] + plane.normal[1] * emaxs[1] + plane.normal[2] * emaxs[2];
+        break;
+      case 7:
+        dist1 = plane.normal[0] * emins[0] + plane.normal[1] * emins[1] + plane.normal[2] * emins[2];
+        dist2 = plane.normal[0] * emaxs[0] + plane.normal[1] * emaxs[1] + plane.normal[2] * emaxs[2];
+        break;
+      default:
+        return 0;
+    }
+
+    let sides = 0;
+    if (dist1 >= plane.dist) {
+      sides = 1;
+    }
+    if (dist2 < plane.dist) {
+      sides += 2;
+    }
+    return sides;
+  }
+
+  /**
+   * Returns an object containing forward, right, up as Vecs.
+   */
+  angleVectors(): DirectionalVectors {
+    console.assert(Number.isFinite(this[0]) && Number.isFinite(this[1]) && Number.isFinite(this[2]), 'angles must be finite numbers');
+
+    let angle = this[0] * Math.PI / 180.0;
+    const sp = Math.sin(angle);
+    const cp = Math.cos(angle);
+
+    angle = this[1] * Math.PI / 180.0;
+    const sy = Math.sin(angle);
+    const cy = Math.cos(angle);
+
+    angle = this[2] * Math.PI / 180.0;
+    const sr = Math.sin(angle);
+    const cr = Math.cos(angle);
+
+    const forward = new Vector(cp * cy, cp * sy, -sp);
+    const right = new Vector(
+      cr * sy - sr * sp * cy,
+      -sr * sp * sy - cr * cy,
+      -sr * cp,
+    );
+    const up = new Vector(
+      cr * sp * cy + sr * sy,
+      cr * sp * sy - sr * cy,
+      cr * cp,
+    );
+
+    return new DirectionalVectors(forward, right, up);
+  }
+
+  toYaw(): number {
+    if (!this[0] && !this[1]) {
+      return 0.0;
+    }
+
+    let yaw = Math.atan2(this[1], this[0]) * 180.0 / Math.PI;
+    if (yaw < 0.0) {
+      yaw += 360.0;
+    }
+
+    return yaw;
+  }
+
+  toPitch(): number {
+    let pitch = Math.atan2(this[2], Math.hypot(this[0], this[1])) * 180.0 / Math.PI;
+    if (pitch < 0.0) {
+      pitch += 360.0;
+    }
+
+    return pitch;
+  }
+
+  /**
+   * Convert this directional vector into pitch and yaw angles and returns them.
+   */
+  toAngles(): Vector {
+    const angles = new Vector();
+
+    if (this[0] === 0.0 && this[1] === 0.0) {
+      angles[0] = this[2] > 0.0 ? 90.0 : 270.0;
+      return angles;
+    }
+
+    angles.setTo(this.toPitch(), this.toYaw(), 0.0);
+    return angles;
+  }
+
+  /**
+   * Assumes this Vector is [roll, pitch, yaw] and generates a 3x3 rotation matrix.
+   */
+  toRotationMatrix(): number[] {
+    let [pitch, yaw, roll] = this;
+    console.assert(Number.isFinite(pitch), 'finite pitch');
+    console.assert(Number.isFinite(yaw), 'finite yaw');
+    console.assert(Number.isFinite(roll), 'finite roll');
+    pitch *= Math.PI / -180.0;
+    yaw *= Math.PI / 180.0;
+    roll *= Math.PI / 180.0;
+    const sp = Math.sin(pitch);
+    const cp = Math.cos(pitch);
+    const sy = Math.sin(yaw);
+    const cy = Math.cos(yaw);
+    const sr = Math.sin(roll);
+    const cr = Math.cos(roll);
+    return [
+      cy * cp, sy * cp, -sp,
+      -sy * cr + cy * sp * sr, cy * cr + sy * sp * sr, cp * sr,
+      -sy * -sr + cy * sp * cr, cy * -sr + sy * sp * cr, cp * cr,
+    ];
+  }
+
+  /**
+   * Dot product of this and other.
+   * @param other
+   */
+  dot(other: VectorLike): number {
+    return this[0] * other[0] + this[1] * other[1] + this[2] * other[2];
+  }
+
+  /**
+   * Create a copy of this vector.
+   */
+  copy(): Vector {
+    return new Vector(this[0], this[1], this[2]);
+  }
+
+  /**
+   * Add other to this vector (component-wise).
+   * @param other
+   */
+  add(other: VectorLike): this {
+    this[0] += other[0];
+    this[1] += other[1];
+    this[2] += other[2];
+    return this;
+  }
+
+  /**
+   * Subtract other from this vector (component-wise).
+   * @param other
+   */
+  subtract(other: VectorLike): this {
+    this[0] -= other[0];
+    this[1] -= other[1];
+    this[2] -= other[2];
+    return this;
+  }
+
+  /**
+   * Multiply factor into this vector.
+   * @param factor
+   */
+  multiply(factor: number): this {
+    console.assert(typeof factor === 'number', 'not a number');
+    this[0] *= factor;
+    this[1] *= factor;
+    this[2] *= factor;
+    return this;
+  }
+
+  /**
+   * Check if other equals this vector.
+   * @param other
+   */
+  equals(other: VectorLike): boolean {
+    return this[0] === other[0] && this[1] === other[1] && this[2] === other[2];
+  }
+
+  /**
+   * Check if [x, y, z] equals this vector.
+   * @param x
+   * @param y
+   * @param z
+   */
+  equalsTo(x: number, y: number, z: number): boolean {
+    return this[0] === x && this[1] === y && this[2] === z;
+  }
+
+  /**
+   * Check if this vector is greater than other.
+   * @param other
+   */
+  gt(other: VectorLike): boolean {
+    return this[0] > other[0] && this[1] > other[1] && this[2] > other[2];
+  }
+
+  /**
+   * Check if this vector is greater than or equal to other.
+   * @param other
+   */
+  gte(other: VectorLike): boolean {
+    return this[0] >= other[0] && this[1] >= other[1] && this[2] >= other[2];
+  }
+
+  /**
+   * Check if this vector is less than other.
+   * @param other
+   */
+  lt(other: VectorLike): boolean {
+    return this[0] < other[0] && this[1] < other[1] && this[2] < other[2];
+  }
+
+  /**
+   * Check if this vector is less than or equal to other.
+   * @param other
+   */
+  lte(other: VectorLike): boolean {
+    return this[0] <= other[0] && this[1] <= other[1] && this[2] <= other[2];
+  }
+
+  /**
+   * Overwrite this vector with values from other.
+   * @param other
+   * @param offset
+   */
+  override set(other: VectorLike, offset = 0): this {
+    console.assert(offset === 0, 'Vector.set only supports a zero offset');
+    console.assert(!Number.isNaN(other[0]), 'NaN component');
+    console.assert(!Number.isNaN(other[1]), 'NaN component');
+    console.assert(!Number.isNaN(other[2]), 'NaN component');
+    this[0] = other[0];
+    this[1] = other[1];
+    this[2] = other[2];
+    return this;
+  }
+
+  /**
+   * Sets this vector to [x, y, z].
+   * @param x
+   * @param y
+   * @param z
+   */
+  setTo(x: number, y: number, z: number): this {
+    console.assert(typeof x === 'number' && typeof y === 'number' && typeof z === 'number', 'not a number');
+    console.assert(!Number.isNaN(x), 'NaN component');
+    console.assert(!Number.isNaN(y), 'NaN component');
+    console.assert(!Number.isNaN(z), 'NaN component');
+    this[0] = x;
+    this[1] = y;
+    this[2] = z;
+    return this;
+  }
+
+  /**
+   * Clear this vector.
+   */
+  clear(): this {
+    this[0] = 0.0;
+    this[1] = 0.0;
+    this[2] = 0.0;
+    return this;
+  }
+
+  /**
+   * Check if this vector is origin.
+   */
+  isOrigin(): boolean {
+    return this[0] === 0.0 && this[1] === 0.0 && this[2] === 0.0;
+  }
+
+  /**
+   * Check if this vector is infinite.
+   */
+  isInfinite(): boolean {
+    return this[0] === Infinity || this[1] === Infinity || this[2] === Infinity ||
+      this[0] === -Infinity || this[1] === -Infinity || this[2] === -Infinity;
+  }
+
+  /**
+   * Cross product of this x other, returns a new Vector.
+   * @param other
+   */
+  cross(other: VectorLike): Vector {
+    return new Vector(
+      this[1] * other[2] - this[2] * other[1],
+      this[2] * other[0] - this[0] * other[2],
+      this[0] * other[1] - this[1] * other[0],
+    );
+  }
+
+  /**
+   * Return the length (magnitude) of this vector.
+   */
+  len(): number {
+    return Math.hypot(this[0], this[1], this[2]);
+  }
+
+  /**
+   * Returns the average of the components of this vector.
+   */
+  average(): number {
+    return (this[0] + this[1] + this[2]) / 3.0;
+  }
+
+  /**
+   * Returns the greatest component of this vector.
+   */
+  greatest(): number {
+    return Math.max(this[0], this[1], this[2]);
+  }
+
+  /**
+   * Determines the distance from this to other.
+   * @param other
+   */
+  distanceTo(other: VectorLike): number {
+    const x = this[0] - other[0];
+    const y = this[1] - other[1];
+    const z = this[2] - other[2];
+    return Math.hypot(x, y, z);
+  }
+
+  /**
+   * Normalize this vector in place. Returns the original length.
+   */
+  normalize(): number {
+    const length = this.len();
+    if (length === 0.0) {
+      this[0] = this[1] = this[2] = 0.0;
+      return 0.0;
+    }
+    this[0] /= length;
+    this[1] /= length;
+    this[2] /= length;
+    return length;
+  }
+
+  /**
+   * Multiply two 3x3 rotation matrices.
+   * @param matrixA
+   * @param matrixB
+   */
+  static concatRotations(matrixA: RotationMatrix, matrixB: RotationMatrix): RotationMatrix {
+    return [
+      [
+        matrixA[0][0] * matrixB[0][0] + matrixA[0][1] * matrixB[1][0] + matrixA[0][2] * matrixB[2][0],
+        matrixA[0][0] * matrixB[0][1] + matrixA[0][1] * matrixB[1][1] + matrixA[0][2] * matrixB[2][1],
+        matrixA[0][0] * matrixB[0][2] + matrixA[0][1] * matrixB[1][2] + matrixA[0][2] * matrixB[2][2],
+      ],
+      [
+        matrixA[1][0] * matrixB[0][0] + matrixA[1][1] * matrixB[1][0] + matrixA[1][2] * matrixB[2][0],
+        matrixA[1][0] * matrixB[0][1] + matrixA[1][1] * matrixB[1][1] + matrixA[1][2] * matrixB[2][1],
+        matrixA[1][0] * matrixB[0][2] + matrixA[1][1] * matrixB[1][2] + matrixA[1][2] * matrixB[2][2],
+      ],
+      [
+        matrixA[2][0] * matrixB[0][0] + matrixA[2][1] * matrixB[1][0] + matrixA[2][2] * matrixB[2][0],
+        matrixA[2][0] * matrixB[0][1] + matrixA[2][1] * matrixB[1][1] + matrixA[2][2] * matrixB[2][1],
+        matrixA[2][0] * matrixB[0][2] + matrixA[2][1] * matrixB[1][2] + matrixA[2][2] * matrixB[2][2],
+      ],
+    ];
+  }
+
+  /**
+   * Set `this` from a quaternion, interpreting that quaternion as Euler angles.
+   * @param quaternion
+   */
+  setQuaternion(quaternion: Quaternion): this {
+    const [w, x, y, z] = quaternion;
+    const yaw = Math.atan2(2 * (w * z + x * y), 1 - 2 * (y * y + z * z));
+    const pitch = Math.asin(2 * (w * y - z * x));
+    const roll = Math.atan2(2 * (w * x + y * z), 1 - 2 * (x * x + y * y));
+
+    this[0] = roll;
+    this[1] = pitch;
+    this[2] = yaw;
+    return this;
+  }
+
+  /**
+   * Convert these Euler angles (this) into a quaternion [w, x, y, z].
+   */
+  toQuaternion(): Quaternion {
+    const [roll, pitch, yaw] = this;
+    const halfRoll = roll / 2;
+    const halfPitch = pitch / 2;
+    const halfYaw = yaw / 2;
+    const sinRoll = Math.sin(halfRoll);
+    const cosRoll = Math.cos(halfRoll);
+    const sinPitch = Math.sin(halfPitch);
+    const cosPitch = Math.cos(halfPitch);
+    const sinYaw = Math.sin(halfYaw);
+    const cosYaw = Math.cos(halfYaw);
+    const w = cosRoll * cosPitch * cosYaw + sinRoll * sinPitch * sinYaw;
+    const x = sinRoll * cosPitch * cosYaw - cosRoll * sinPitch * sinYaw;
+    const y = cosRoll * sinPitch * cosYaw + sinRoll * cosPitch * sinYaw;
+    const z = cosRoll * cosPitch * sinYaw - sinRoll * sinPitch * cosYaw;
+
+    return new Quaternion(w, x, y, z);
+  }
+
+  /**
+   * Create a Vector from a quaternion, converting that quaternion to Euler angles.
+   * @param quaternion
+   */
+  static fromQuaternion(quaternion: Quaternion): Vector {
+    const vector = new Vector();
+    vector.setQuaternion(quaternion);
+    return vector;
+  }
+
+  /**
+   * Freezes this Vector.
+   */
+  freeze(): Readonly<Vector> {
+    return this;
+  }
+
+  /**
+   * Quake-style string representation of a Vector.
+   */
+  override toString(): string {
+    return `${this.map((element) => +element.toFixed(1)).join(' ')}`;
+  }
+}
diff --git a/source/shared/index.mjs b/source/shared/index.mjs
index 5a57f74d..247ddfeb 100644
--- a/source/shared/index.mjs
+++ b/source/shared/index.mjs
@@ -1,7 +1,7 @@
 export { default as sampleBSpline } from './BSpline.mjs';
 export * from './ClientEdict.mjs';
-export * from './Defs.mjs';
+export * from './Defs.ts';
 export * from './Keys.mjs';
 export * from './Octree.mjs';
 export { default as Q } from './Q.mjs';
-export * from './Vector.mjs';
+export * from './Vector.ts';
diff --git a/test/common/game-apis.test.mjs b/test/common/game-apis.test.mjs
new file mode 100644
index 00000000..bafb3bb9
--- /dev/null
+++ b/test/common/game-apis.test.mjs
@@ -0,0 +1,161 @@
+import { describe, test } from 'node:test';
+import assert from 'node:assert/strict';
+
+import Vector from '../../source/shared/Vector.mjs';
+import { solid } from '../../source/shared/Defs.ts';
+import { ClientEdict } from '../../source/engine/client/ClientEntities.mjs';
+import { ClientEngineAPI } from '../../source/engine/common/GameAPIs.mjs';
+import { ServerArea } from '../../source/engine/server/physics/ServerArea.mjs';
+import { ServerCollision } from '../../source/engine/server/physics/ServerCollision.mjs';
+import { CollisionTrace } from '../../source/engine/server/physics/ServerCollisionSupport.mjs';
+import { defaultMockRegistry, withMockRegistry } from '../physics/fixtures.mjs';
+
+/**
+ *
+ * @param num
+ * @param origin
+ * @param mins
+ * @param maxs
+ */
+/**
+ * @param {number} num entity number
+ * @param {Vector} origin entity origin
+ * @param {Vector} mins entity minimum bounds
+ * @param {Vector} maxs entity maximum bounds
+ * @returns {ClientEdict} configured client entity fixture
+ */
+function createClientTraceEntity(num, origin, mins, maxs) {
+  const entity = new ClientEdict(num);
+  entity.origin.set(origin);
+  entity.mins.set(mins);
+  entity.maxs.set(maxs);
+  entity.solid = solid.SOLID_BBOX;
+  entity.modelindex = 0;
+  entity.model = {
+    mins: mins.copy(),
+    maxs: maxs.copy(),
+  };
+  return entity;
+}
+
+describe('ClientEngineAPI.Traceline', () => {
+  test('keeps the default client trace static-world only', () => {
+    let clipMoveCalls = 0;
+
+    withMockRegistry(defaultMockRegistry({
+      collision: {
+        traceWorldLine(_start, end) {
+          return CollisionTrace.empty(end);
+        },
+        clipMoveToEntity() {
+          clipMoveCalls += 1;
+          return CollisionTrace.empty(Vector.origin);
+        },
+      },
+    }, {
+      state: {
+        clientEntities: {
+          *getEntities() {
+          },
+        },
+      },
+    }), () => {
+      const trace = ClientEngineAPI.Traceline(new Vector(), new Vector(128, 0, 0));
+
+      assert.equal(trace.fraction, 1.0);
+      assert.equal(trace.entity, null);
+      assert.equal(clipMoveCalls, 0);
+    });
+  });
+
+  test('can trace current client entities on demand', () => {
+    const collision = new ServerCollision();
+    const area = new ServerArea();
+    area.initBoxHull();
+
+    const target = createClientTraceEntity(
+      2,
+      new Vector(64, 0, 0),
+      new Vector(-16, -16, -24),
+      new Vector(16, 16, 32),
+    );
+
+    withMockRegistry(defaultMockRegistry({
+      area,
+      collision: {
+        traceWorldLine(_start, end) {
+          return CollisionTrace.empty(end);
+        },
+        clipMoveToEntity: collision.clipMoveToEntity.bind(collision),
+      },
+    }, {
+      state: {
+        clientEntities: {
+          *getEntities() {
+            yield target;
+          },
+        },
+      },
+    }), () => {
+      const trace = ClientEngineAPI.Traceline(
+        new Vector(0, 0, 0),
+        new Vector(128, 0, 0),
+        { includeEntities: true },
+      );
+
+      assert.ok(trace.fraction < 1.0);
+      assert.equal(trace.entity, target);
+    });
+  });
+
+  test('supports skipping and filtering client trace candidates', () => {
+    const collision = new ServerCollision();
+    const area = new ServerArea();
+    area.initBoxHull();
+
+    const skipped = createClientTraceEntity(
+      1,
+      new Vector(48, 0, 0),
+      new Vector(-16, -16, -24),
+      new Vector(16, 16, 32),
+    );
+    const filtered = createClientTraceEntity(
+      2,
+      new Vector(80, 0, 0),
+      new Vector(-16, -16, -24),
+      new Vector(16, 16, 32),
+    );
+
+    withMockRegistry(defaultMockRegistry({
+      area,
+      collision: {
+        traceWorldLine(_start, end) {
+          return CollisionTrace.empty(end);
+        },
+        clipMoveToEntity: collision.clipMoveToEntity.bind(collision),
+      },
+    }, {
+      state: {
+        clientEntities: {
+          *getEntities() {
+            yield skipped;
+            yield filtered;
+          },
+        },
+      },
+    }), () => {
+      const trace = ClientEngineAPI.Traceline(
+        new Vector(0, 0, 0),
+        new Vector(128, 0, 0),
+        {
+          includeEntities: true,
+          passEntityId: 1,
+          filter: (entity) => entity.num === 2,
+        },
+      );
+
+      assert.ok(trace.fraction < 1.0);
+      assert.equal(trace.entity, filtered);
+    });
+  });
+});
diff --git a/test/common/vector-typescript-compat.test.mjs b/test/common/vector-typescript-compat.test.mjs
new file mode 100644
index 00000000..4d0c5abc
--- /dev/null
+++ b/test/common/vector-typescript-compat.test.mjs
@@ -0,0 +1,18 @@
+import assert from 'node:assert/strict';
+import { describe, test } from 'node:test';
+
+import VectorFromMjs, { DirectionalVectors as DirectionalVectorsFromMjs, Quaternion as QuaternionFromMjs } from '../../source/shared/Vector.mjs';
+import VectorFromTs, { DirectionalVectors as DirectionalVectorsFromTs, Quaternion as QuaternionFromTs } from '../../source/shared/Vector.ts';
+
+void describe('shared Vector TypeScript migration', () => {
+  void test('keeps the .mjs compatibility facade wired to the .ts implementation', () => {
+    assert.strictEqual(VectorFromMjs, VectorFromTs);
+    assert.strictEqual(DirectionalVectorsFromMjs, DirectionalVectorsFromTs);
+    assert.strictEqual(QuaternionFromMjs, QuaternionFromTs);
+    assert.strictEqual(VectorFromMjs.origin, VectorFromTs.origin);
+
+    const vector = new VectorFromMjs(1, 2, 3);
+    assert.equal(vector.toString(), '1 2 3');
+    assert.deepEqual(Array.from(vector.copy()), [1, 2, 3]);
+  });
+});
diff --git a/test/physics/brushtrace.test.mjs b/test/physics/brushtrace.test.mjs
index 58c692b2..5bddbd8d 100644
--- a/test/physics/brushtrace.test.mjs
+++ b/test/physics/brushtrace.test.mjs
@@ -4,7 +4,7 @@ import assert from 'node:assert/strict';
 import Vector from '../../source/shared/Vector.mjs';
 import { BrushTrace, DIST_EPSILON, Pmove } from '../../source/engine/common/Pmove.mjs';
 import { BrushSide } from '../../source/engine/common/model/BSP.mjs';
-import { content } from '../../source/shared/Defs.mjs';
+import { content } from '../../source/shared/Defs.ts';
 
 import {
   assertNear,
diff --git a/test/physics/collision-regressions.test.mjs b/test/physics/collision-regressions.test.mjs
index 662fd6b7..b289ea16 100644
--- a/test/physics/collision-regressions.test.mjs
+++ b/test/physics/collision-regressions.test.mjs
@@ -2,7 +2,7 @@ import { describe, test } from 'node:test';
 import assert from 'node:assert/strict';
 
 import Vector from '../../source/shared/Vector.mjs';
-import { content, flags, moveType, moveTypes, solid } from '../../source/shared/Defs.mjs';
+import { content, flags, moveType, moveTypes, solid } from '../../source/shared/Defs.ts';
 import { Brush, BrushModel, BrushSide } from '../../source/engine/common/model/BSP.mjs';
 import { BrushTrace, Hull, PMF, Pmove, PmovePlayer, Trace } from '../../source/engine/common/Pmove.mjs';
 import { BSP29Loader } from '../../source/engine/common/model/loaders/BSP29Loader.mjs';
diff --git a/test/physics/fixtures.mjs b/test/physics/fixtures.mjs
index 31e869ba..1234a2b4 100644
--- a/test/physics/fixtures.mjs
+++ b/test/physics/fixtures.mjs
@@ -1,7 +1,7 @@
 import assert from 'node:assert/strict';
 
 import Vector from '../../source/shared/Vector.mjs';
-import { content, flags, moveType, moveTypes, solid } from '../../source/shared/Defs.mjs';
+import { content, flags, moveType, moveTypes, solid } from '../../source/shared/Defs.ts';
 import { Brush, BrushModel, BrushSide } from '../../source/engine/common/model/BSP.mjs';
 import { Pmove } from '../../source/engine/common/Pmove.mjs';
 import { eventBus, registry } from '../../source/engine/registry.mjs';
diff --git a/test/physics/func-rotating.test.mjs b/test/physics/func-rotating.test.mjs
index a10c4180..51db69c9 100644
--- a/test/physics/func-rotating.test.mjs
+++ b/test/physics/func-rotating.test.mjs
@@ -2,7 +2,7 @@ import { describe, test } from 'node:test';
 import assert from 'node:assert/strict';
 
 import Vector from '../../source/shared/Vector.mjs';
-import { moveType, solid } from '../../source/shared/Defs.mjs';
+import { moveType, solid } from '../../source/shared/Defs.ts';
 import { entityClasses } from '../../source/game/id1/GameAPI.mjs';
 
 const RotatingEntity = entityClasses.find((entityClass) => entityClass.classname === 'func_rotating');
diff --git a/test/physics/pmove.test.mjs b/test/physics/pmove.test.mjs
index ba22c188..6bb427bb 100644
--- a/test/physics/pmove.test.mjs
+++ b/test/physics/pmove.test.mjs
@@ -5,7 +5,7 @@ import assert from 'node:assert/strict';
 import COMClass from '../../source/engine/common/Com.mjs';
 import Mod from '../../source/engine/common/Mod.mjs';
 import Vector from '../../source/shared/Vector.mjs';
-import { content } from '../../source/shared/Defs.mjs';
+import { content } from '../../source/shared/Defs.ts';
 import { DIST_EPSILON, PM_TYPE, PMF, Pmove, PmovePlayer, Trace } from '../../source/engine/common/Pmove.mjs';
 import { UserCmd } from '../../source/engine/network/Protocol.mjs';
 import { eventBus, registry } from '../../source/engine/registry.mjs';
diff --git a/test/physics/server-client-physics.test.mjs b/test/physics/server-client-physics.test.mjs
index 53556004..f6307215 100644
--- a/test/physics/server-client-physics.test.mjs
+++ b/test/physics/server-client-physics.test.mjs
@@ -2,7 +2,7 @@ import { describe, test } from 'node:test';
 import assert from 'node:assert/strict';
 
 import Vector from '../../source/shared/Vector.mjs';
-import { flags, moveType, solid } from '../../source/shared/Defs.mjs';
+import { flags, moveType, solid } from '../../source/shared/Defs.ts';
 import { UserCmd } from '../../source/engine/network/Protocol.mjs';
 import { eventBus, registry } from '../../source/engine/registry.mjs';
 import { ServerClient } from '../../source/engine/server/Client.mjs';
diff --git a/test/physics/server-collision.test.mjs b/test/physics/server-collision.test.mjs
index 9c5fe6b0..62e1e1a8 100644
--- a/test/physics/server-collision.test.mjs
+++ b/test/physics/server-collision.test.mjs
@@ -2,7 +2,7 @@ import { describe, test } from 'node:test';
 import assert from 'node:assert/strict';
 
 import Vector from '../../source/shared/Vector.mjs';
-import { content, flags, moveType, moveTypes, solid } from '../../source/shared/Defs.mjs';
+import { content, flags, moveType, moveTypes, solid } from '../../source/shared/Defs.ts';
 import { BrushModel } from '../../source/engine/common/model/BSP.mjs';
 import { BrushTrace, Pmove } from '../../source/engine/common/Pmove.mjs';
 import { BSP29Loader } from '../../source/engine/common/model/loaders/BSP29Loader.mjs';
diff --git a/test/physics/server-movement.test.mjs b/test/physics/server-movement.test.mjs
index d5e26494..9c4f9097 100644
--- a/test/physics/server-movement.test.mjs
+++ b/test/physics/server-movement.test.mjs
@@ -2,7 +2,7 @@ import { describe, test } from 'node:test';
 import assert from 'node:assert/strict';
 
 import Vector from '../../source/shared/Vector.mjs';
-import { content, flags, solid } from '../../source/shared/Defs.mjs';
+import { content, flags, solid } from '../../source/shared/Defs.ts';
 import { ServerMovement } from '../../source/engine/server/physics/ServerMovement.mjs';
 
 import {
diff --git a/test/physics/server-physics.test.mjs b/test/physics/server-physics.test.mjs
index 349010d8..fb48c616 100644
--- a/test/physics/server-physics.test.mjs
+++ b/test/physics/server-physics.test.mjs
@@ -2,7 +2,7 @@ import { describe, test } from 'node:test';
 import assert from 'node:assert/strict';
 
 import Vector from '../../source/shared/Vector.mjs';
-import { content, flags, gameCapabilities, moveType, moveTypes, solid } from '../../source/shared/Defs.mjs';
+import { content, flags, gameCapabilities, moveType, moveTypes, solid } from '../../source/shared/Defs.ts';
 import { eventBus, registry } from '../../source/engine/registry.mjs';
 import { ServerArea } from '../../source/engine/server/physics/ServerArea.mjs';
 import { ServerCollision } from '../../source/engine/server/physics/ServerCollision.mjs';
diff --git a/test/renderer/bloom-effect.test.mjs b/test/renderer/bloom-effect.test.mjs
index d0775c62..9665f83e 100644
--- a/test/renderer/bloom-effect.test.mjs
+++ b/test/renderer/bloom-effect.test.mjs
@@ -2,7 +2,7 @@ import assert from 'node:assert/strict';
 import { readFileSync } from 'node:fs';
 import { describe, test } from 'node:test';
 
-import { effect } from '../../source/shared/Defs.mjs';
+import { effect } from '../../source/shared/Defs.ts';
 import { getBloomBufferSize, getBloomDebugPreviewItems, getEntityBloomEmissiveScale, resolveBloomDebugMode, resolveBloomDownsample } from '../../source/engine/client/renderer/BloomEffect.mjs';
 
 const bloomBlurShaderSource = readFileSync(new URL('../../source/engine/client/shaders/bloom-blur.frag', import.meta.url), 'utf8');
diff --git a/vite.config.dedicated.mjs b/vite.config.dedicated.mjs
index 2621474a..7f31a3c0 100644
--- a/vite.config.dedicated.mjs
+++ b/vite.config.dedicated.mjs
@@ -93,6 +93,7 @@ function dedicatedWorkerBundlePlugin(mode) {
 
     async closeBundle() {
       const { rollup } = await import('rollup');
+      const { transformWithEsbuild } = await import('vite');
       const workerDir = resolve(__dirname, 'source/engine/server');
       const outDir = resolve(__dirname, 'dist/dedicated/workers');
 
@@ -112,6 +113,21 @@ function dedicatedWorkerBundlePlugin(mode) {
         // Node built-ins stay external (both prefixed and bare); everything else is inlined
         external: [/^node:/, 'fs', 'path', 'os', 'url', 'util', 'crypto', 'stream', 'events', 'buffer', 'http', 'https', 'net', 'tls', 'child_process', 'worker_threads'],
         plugins: [
+          {
+            name: 'transpile-typescript-modules',
+            async transform(code, id) {
+              if (!/\.(ts|mts|cts)$/.test(id)) {
+                return null;
+              }
+
+              return await transformWithEsbuild(code, id, {
+                format: 'esm',
+                loader: 'ts',
+                sourcemap: mode !== 'production',
+                target: 'node24',
+              });
+            },
+          },
           {
             // WorkerFramework.mjs constructs dynamic import paths at runtime
             // to evade Vite's static analysis (e.g. ['..','server','Com.mjs'].join('/')).

From e295f91eacbbe29be6f2032f6b8eea993fd8135f Mon Sep 17 00:00:00 2001
From: Christian R <github@chrisnew.de>
Date: Thu, 2 Apr 2026 12:34:36 +0300
Subject: [PATCH 04/67] removing Vector.mjs

---
 source/engine/client/Chase.mjs                 |  2 +-
 source/engine/client/ClientEntities.mjs        |  2 +-
 source/engine/client/ClientInput.mjs           |  2 +-
 source/engine/client/ClientLegacy.mjs          |  2 +-
 source/engine/client/ClientMessages.mjs        |  2 +-
 .../client/ClientServerCommandHandlers.mjs     |  2 +-
 source/engine/client/ClientState.mjs           |  2 +-
 source/engine/client/Draw.mjs                  |  2 +-
 source/engine/client/Key.mjs                   |  2 +-
 source/engine/client/LegacyServerCommands.mjs  |  2 +-
 source/engine/client/R.mjs                     |  2 +-
 source/engine/client/Sound.mjs                 |  2 +-
 source/engine/client/V.mjs                     |  2 +-
 .../client/renderer/AliasModelRenderer.mjs     |  2 +-
 source/engine/client/renderer/BloomEffect.mjs  |  2 +-
 .../client/renderer/BrushModelRenderer.mjs     |  2 +-
 .../client/renderer/MeshModelRenderer.mjs      |  2 +-
 source/engine/client/renderer/ShadowMap.mjs    |  2 +-
 source/engine/common/Console.mjs               |  2 +-
 source/engine/common/GameAPIs.mjs              |  2 +-
 source/engine/common/Host.mjs                  |  2 +-
 source/engine/common/Pmove.mjs                 |  4 ++--
 source/engine/common/model/AliasModel.mjs      |  4 ++--
 source/engine/common/model/BSP.mjs             |  2 +-
 source/engine/common/model/BaseModel.mjs       |  2 +-
 source/engine/common/model/MeshModel.mjs       |  2 +-
 .../common/model/loaders/AliasMDLLoader.mjs    |  2 +-
 .../common/model/loaders/BSP29Loader.mjs       |  2 +-
 .../engine/common/model/loaders/BSP2Loader.mjs |  2 +-
 .../common/model/loaders/BSP38Loader.mjs       |  2 +-
 .../common/model/loaders/SpriteSPRLoader.mjs   |  2 +-
 .../model/loaders/WavefrontOBJLoader.mjs       |  2 +-
 .../engine/common/model/parsers/ParsedQC.mjs   |  2 +-
 source/engine/network/MSG.mjs                  |  2 +-
 source/engine/network/Protocol.mjs             |  2 +-
 source/engine/server/Client.mjs                |  2 +-
 source/engine/server/Edict.mjs                 |  2 +-
 source/engine/server/Navigation.mjs            |  2 +-
 source/engine/server/NavigationWorker.mjs      |  2 +-
 source/engine/server/Progs.mjs                 |  2 +-
 source/engine/server/ProgsAPI.mjs              |  2 +-
 source/engine/server/Server.mjs                |  2 +-
 source/engine/server/ServerEntityState.mjs     |  2 +-
 source/engine/server/physics/ServerArea.mjs    |  2 +-
 .../server/physics/ServerClientPhysics.mjs     |  2 +-
 .../engine/server/physics/ServerCollision.mjs  |  2 +-
 .../server/physics/ServerCollisionSupport.mjs  |  2 +-
 .../physics/ServerLegacyHullCollision.mjs      |  2 +-
 .../engine/server/physics/ServerMovement.mjs   |  2 +-
 source/engine/server/physics/ServerPhysics.mjs |  2 +-
 source/shared/BSpline.mjs                      |  2 +-
 source/shared/GameInterfaces.d.ts              |  2 +-
 source/shared/Octree.mjs                       |  2 +-
 source/shared/Vector.mjs                       |  3 ---
 test/common/game-apis.test.mjs                 |  2 +-
 test/common/model-cache.test.mjs               |  2 +-
 test/common/octree.test.mjs                    |  2 +-
 test/common/vector-typescript-compat.test.mjs  | 18 ------------------
 test/physics/brushtrace.test.mjs               |  2 +-
 test/physics/collision-regressions.test.mjs    |  2 +-
 test/physics/fixtures.mjs                      |  3 ++-
 test/physics/func-rotating.test.mjs            |  5 ++++-
 test/physics/func-train.test.mjs               |  2 +-
 test/physics/map-pmove-harness.mjs             |  2 +-
 test/physics/navigation.test.mjs               |  2 +-
 test/physics/pmove.test.mjs                    |  2 +-
 test/physics/server-client-physics.test.mjs    |  2 +-
 test/physics/server-collision.test.mjs         |  2 +-
 test/physics/server-movement.test.mjs          |  2 +-
 test/physics/server-physics.test.mjs           |  2 +-
 test/physics/server.test.mjs                   |  2 +-
 test/renderer/brush-model-renderer.test.mjs    |  2 +-
 test/renderer/r-sorting.test.mjs               |  2 +-
 73 files changed, 77 insertions(+), 94 deletions(-)
 delete mode 100644 source/shared/Vector.mjs
 delete mode 100644 test/common/vector-typescript-compat.test.mjs

diff --git a/source/engine/client/Chase.mjs b/source/engine/client/Chase.mjs
index 1ca6a51c..dcdeed65 100644
--- a/source/engine/client/Chase.mjs
+++ b/source/engine/client/Chase.mjs
@@ -1,4 +1,4 @@
-import Vector from '../../shared/Vector.mjs';
+import Vector from '../../shared/Vector.ts';
 import Cvar from '../common/Cvar.mjs';
 import { eventBus, registry } from '../registry.mjs';
 
diff --git a/source/engine/client/ClientEntities.mjs b/source/engine/client/ClientEntities.mjs
index 03cfceb7..5c93fa10 100644
--- a/source/engine/client/ClientEntities.mjs
+++ b/source/engine/client/ClientEntities.mjs
@@ -1,4 +1,4 @@
-import Vector from '../../shared/Vector.mjs';
+import Vector from '../../shared/Vector.ts';
 import { eventBus, registry } from '../registry.mjs';
 import * as Def from '../common/Def.mjs';
 import { content, effect, solid } from '../../shared/Defs.ts';
diff --git a/source/engine/client/ClientInput.mjs b/source/engine/client/ClientInput.mjs
index e2641438..1e09cf5f 100644
--- a/source/engine/client/ClientInput.mjs
+++ b/source/engine/client/ClientInput.mjs
@@ -1,4 +1,4 @@
-import Vector from '../../shared/Vector.mjs';
+import Vector from '../../shared/Vector.ts';
 import * as Protocol from '../network/Protocol.mjs';
 import Q from '../../shared/Q.mjs';
 import { SzBuffer } from '../network/MSG.mjs';
diff --git a/source/engine/client/ClientLegacy.mjs b/source/engine/client/ClientLegacy.mjs
index 4f877112..af1502e0 100644
--- a/source/engine/client/ClientLegacy.mjs
+++ b/source/engine/client/ClientLegacy.mjs
@@ -3,7 +3,7 @@
  * Classes from this file are used by the client, when the game is not providing a ClientGameAPI implementation.
  */
 
-import Vector from '../../shared/Vector.mjs';
+import Vector from '../../shared/Vector.ts';
 import { effect, modelFlags } from '../../shared/Defs.ts';
 import { BaseClientEdictHandler } from '../../shared/ClientEdict.mjs';
 
diff --git a/source/engine/client/ClientMessages.mjs b/source/engine/client/ClientMessages.mjs
index bd981f18..c39d39c4 100644
--- a/source/engine/client/ClientMessages.mjs
+++ b/source/engine/client/ClientMessages.mjs
@@ -2,7 +2,7 @@ import * as Protocol from '../network/Protocol.mjs';
 import * as Def from '../common/Def.mjs';
 import { eventBus, registry } from '../registry.mjs';
 import { HostError } from '../common/Errors.mjs';
-import Vector from '../../shared/Vector.mjs';
+import Vector from '../../shared/Vector.ts';
 import { PmovePlayer } from '../common/Pmove.mjs';
 import { gameCapabilities } from '../../shared/Defs.ts';
 import { ClientEdict } from './ClientEntities.mjs';
diff --git a/source/engine/client/ClientServerCommandHandlers.mjs b/source/engine/client/ClientServerCommandHandlers.mjs
index 5b8da30d..537245db 100644
--- a/source/engine/client/ClientServerCommandHandlers.mjs
+++ b/source/engine/client/ClientServerCommandHandlers.mjs
@@ -3,7 +3,7 @@ import * as Def from '../common/Def.mjs';
 import Cmd from '../common/Cmd.mjs';
 import { HostError } from '../common/Errors.mjs';
 import { gameCapabilities } from '../../shared/Defs.ts';
-import Vector from '../../shared/Vector.mjs';
+import Vector from '../../shared/Vector.ts';
 import { ClientEngineAPI } from '../common/GameAPIs.mjs';
 import { sharedCollisionModelSource } from '../common/CollisionModelSource.mjs';
 import { eventBus, registry } from '../registry.mjs';
diff --git a/source/engine/client/ClientState.mjs b/source/engine/client/ClientState.mjs
index ac3c9f3a..4ec2b3be 100644
--- a/source/engine/client/ClientState.mjs
+++ b/source/engine/client/ClientState.mjs
@@ -2,7 +2,7 @@ import { SzBuffer } from '../network/MSG.mjs';
 import { QSocket } from '../network/NetworkDrivers.mjs';
 import * as Protocol from '../network/Protocol.mjs';
 import * as Def from '../common/Def.mjs';
-import Vector from '../../shared/Vector.mjs';
+import Vector from '../../shared/Vector.ts';
 import { EventBus, eventBus, registry } from '../registry.mjs';
 import ClientEntities, { ClientEdict } from './ClientEntities.mjs';
 import { ClientMessages } from './ClientMessages.mjs';
diff --git a/source/engine/client/Draw.mjs b/source/engine/client/Draw.mjs
index 31d5bd60..d39f542e 100644
--- a/source/engine/client/Draw.mjs
+++ b/source/engine/client/Draw.mjs
@@ -1,4 +1,4 @@
-import Vector from '../../shared/Vector.mjs';
+import Vector from '../../shared/Vector.ts';
 import { MissingResourceError } from '../common/Errors.mjs';
 
 import VID from './VID.mjs';
diff --git a/source/engine/client/Key.mjs b/source/engine/client/Key.mjs
index 2a55da24..514ef135 100644
--- a/source/engine/client/Key.mjs
+++ b/source/engine/client/Key.mjs
@@ -1,5 +1,5 @@
 import { K } from '../../shared/Keys.mjs';
-import Vector from '../../shared/Vector.mjs';
+import Vector from '../../shared/Vector.ts';
 import Cmd from '../common/Cmd.mjs';
 import Cvar from '../common/Cvar.mjs';
 import { clientConnectionState } from '../common/Def.mjs';
diff --git a/source/engine/client/LegacyServerCommands.mjs b/source/engine/client/LegacyServerCommands.mjs
index a75c6782..9302a344 100644
--- a/source/engine/client/LegacyServerCommands.mjs
+++ b/source/engine/client/LegacyServerCommands.mjs
@@ -3,7 +3,7 @@ import * as Def from '../common/Def.mjs';
 import { HostError } from '../common/Errors.mjs';
 import { eventBus, registry } from '../registry.mjs';
 import { ScoreSlot } from './ClientState.mjs';
-import Vector from '../../shared/Vector.mjs';
+import Vector from '../../shared/Vector.ts';
 import {
   handleNop,
   handleTime,
diff --git a/source/engine/client/R.mjs b/source/engine/client/R.mjs
index a76808fd..0bade1ef 100644
--- a/source/engine/client/R.mjs
+++ b/source/engine/client/R.mjs
@@ -1,4 +1,4 @@
-import Vector from '../../shared/Vector.mjs';
+import Vector from '../../shared/Vector.ts';
 import Cvar from '../common/Cvar.mjs';
 import Cmd from '../common/Cmd.mjs';
 import * as Def from '../common/Def.mjs';
diff --git a/source/engine/client/Sound.mjs b/source/engine/client/Sound.mjs
index 683faf7b..e0c2a91a 100644
--- a/source/engine/client/Sound.mjs
+++ b/source/engine/client/Sound.mjs
@@ -1,4 +1,4 @@
-import Vector from '../../shared/Vector.mjs';
+import Vector from '../../shared/Vector.ts';
 import Cmd from '../common/Cmd.mjs';
 import Cvar from '../common/Cvar.mjs';
 import Q from '../../shared/Q.mjs';
diff --git a/source/engine/client/V.mjs b/source/engine/client/V.mjs
index e5f48598..ff87dfcb 100644
--- a/source/engine/client/V.mjs
+++ b/source/engine/client/V.mjs
@@ -1,4 +1,4 @@
-import Vector from '../../shared/Vector.mjs';
+import Vector from '../../shared/Vector.ts';
 import { content, gameCapabilities } from '../../shared/Defs.ts';
 import Cmd from '../common/Cmd.mjs';
 import Cvar from '../common/Cvar.mjs';
diff --git a/source/engine/client/renderer/AliasModelRenderer.mjs b/source/engine/client/renderer/AliasModelRenderer.mjs
index cfdb63bf..ba5a01f2 100644
--- a/source/engine/client/renderer/AliasModelRenderer.mjs
+++ b/source/engine/client/renderer/AliasModelRenderer.mjs
@@ -1,4 +1,4 @@
-import Vector from '../../../shared/Vector.mjs';
+import Vector from '../../../shared/Vector.ts';
 import { ModelRenderer } from './ModelRenderer.mjs';
 import { getEntityBloomEmissiveScale } from './BloomEffect.mjs';
 import { eventBus, registry } from '../../registry.mjs';
diff --git a/source/engine/client/renderer/BloomEffect.mjs b/source/engine/client/renderer/BloomEffect.mjs
index 477393a7..905c1f4f 100644
--- a/source/engine/client/renderer/BloomEffect.mjs
+++ b/source/engine/client/renderer/BloomEffect.mjs
@@ -2,7 +2,7 @@ import GL from '../GL.mjs';
 import PostProcess from './PostProcess.mjs';
 import VID from '../VID.mjs';
 import PostProcessEffect from './PostProcessEffect.mjs';
-import Vector from '../../../shared/Vector.mjs';
+import Vector from '../../../shared/Vector.ts';
 import { eventBus, registry } from '../../registry.mjs';
 import { effect } from '../../../shared/Defs.ts';
 
diff --git a/source/engine/client/renderer/BrushModelRenderer.mjs b/source/engine/client/renderer/BrushModelRenderer.mjs
index b5eeb139..80cf1a51 100644
--- a/source/engine/client/renderer/BrushModelRenderer.mjs
+++ b/source/engine/client/renderer/BrushModelRenderer.mjs
@@ -1,4 +1,4 @@
-import Vector from '../../../shared/Vector.mjs';
+import Vector from '../../../shared/Vector.ts';
 import { ModelRenderer } from './ModelRenderer.mjs';
 import { eventBus, registry } from '../../registry.mjs';
 import GL, { ATTRIB_LOCATIONS, BRUSH_VERTEX_STRIDE } from '../GL.mjs';
diff --git a/source/engine/client/renderer/MeshModelRenderer.mjs b/source/engine/client/renderer/MeshModelRenderer.mjs
index 381fa997..96602d12 100644
--- a/source/engine/client/renderer/MeshModelRenderer.mjs
+++ b/source/engine/client/renderer/MeshModelRenderer.mjs
@@ -1,4 +1,4 @@
-import Vector from '../../../shared/Vector.mjs';
+import Vector from '../../../shared/Vector.ts';
 import { ModelRenderer } from './ModelRenderer.mjs';
 import { getEntityBloomEmissiveScale } from './BloomEffect.mjs';
 import { eventBus, registry } from '../../registry.mjs';
diff --git a/source/engine/client/renderer/ShadowMap.mjs b/source/engine/client/renderer/ShadowMap.mjs
index d551bf61..eb4059fd 100644
--- a/source/engine/client/renderer/ShadowMap.mjs
+++ b/source/engine/client/renderer/ShadowMap.mjs
@@ -4,7 +4,7 @@ import { limits } from '../../common/Def.mjs';
 import { eventBus, registry } from '../../registry.mjs';
 import { materialFlags } from './Materials.mjs';
 import { effect } from '../../../shared/Defs.ts';
-import Vector from '../../../shared/Vector.mjs';
+import Vector from '../../../shared/Vector.ts';
 import { AliasModelRenderer } from './AliasModelRenderer.mjs';
 
 let { CL, COM, Mod, R, SV } = registry;
diff --git a/source/engine/common/Console.mjs b/source/engine/common/Console.mjs
index 9962a9d8..d92aab8e 100644
--- a/source/engine/common/Console.mjs
+++ b/source/engine/common/Console.mjs
@@ -2,7 +2,7 @@
 
 import { eventBus, registry } from '../registry.mjs';
 import Cvar from './Cvar.mjs';
-import Vector from '../../shared/Vector.mjs';
+import Vector from '../../shared/Vector.ts';
 import Cmd from './Cmd.mjs';
 import VID from '../client/VID.mjs';
 import { clientConnectionState } from './Def.mjs';
diff --git a/source/engine/common/GameAPIs.mjs b/source/engine/common/GameAPIs.mjs
index a6ac457d..7fe9cafd 100644
--- a/source/engine/common/GameAPIs.mjs
+++ b/source/engine/common/GameAPIs.mjs
@@ -1,5 +1,5 @@
 import { PmoveConfiguration } from '../../shared/Pmove.mjs';
-import Vector from '../../shared/Vector.mjs';
+import Vector from '../../shared/Vector.ts';
 import { solid } from '../../shared/Defs.ts';
 import Key from '../client/Key.mjs';
 import { SFX } from '../client/Sound.mjs';
diff --git a/source/engine/common/Host.mjs b/source/engine/common/Host.mjs
index d06d6097..6741c4cc 100644
--- a/source/engine/common/Host.mjs
+++ b/source/engine/common/Host.mjs
@@ -3,7 +3,7 @@ import * as Protocol from '../network/Protocol.mjs';
 import * as Def from './Def.mjs';
 import Cmd, { ConsoleCommand } from './Cmd.mjs';
 import { eventBus, registry } from '../registry.mjs';
-import Vector from '../../shared/Vector.mjs';
+import Vector from '../../shared/Vector.ts';
 import Q from '../../shared/Q.mjs';
 import { ServerClient } from '../server/Client.mjs';
 import { ServerEngineAPI } from './GameAPIs.mjs';
diff --git a/source/engine/common/Pmove.mjs b/source/engine/common/Pmove.mjs
index 78ed49ce..75523440 100644
--- a/source/engine/common/Pmove.mjs
+++ b/source/engine/common/Pmove.mjs
@@ -7,14 +7,14 @@
  * Original sources: pmove.c, pmovetst.c (Q2), pmove.c (Q1).
  */
 
-import Vector from '../../shared/Vector.mjs';
+import Vector from '../../shared/Vector.ts';
 import * as Protocol from '../network/Protocol.mjs';
 import { content } from '../../shared/Defs.ts';
 import { BrushModel } from './Mod.mjs';
 import Cvar from './Cvar.mjs';
 import { PmoveConfiguration } from '../../shared/Pmove.mjs';
 
-/** @typedef {import('../../shared/Vector.mjs').DirectionalVectors} DirectionalVectors */
+/** @typedef {import('../../shared/Vector.ts').DirectionalVectors} DirectionalVectors */
 /** @typedef {{ normal: Vector, type: number }} BrushTracePlaneLike */
 
 // ---------------------------------------------------------------------------
diff --git a/source/engine/common/model/AliasModel.mjs b/source/engine/common/model/AliasModel.mjs
index 2f6881b4..c479e5e9 100644
--- a/source/engine/common/model/AliasModel.mjs
+++ b/source/engine/common/model/AliasModel.mjs
@@ -15,10 +15,10 @@ export class AliasModel extends BaseModel {
 
     // Private model data (used during loading)
 
-    /** @type {import('../../../shared/Vector.mjs').default|null} Scale factors for vertices */
+    /** @type {import('../../../shared/Vector.ts').default|null} Scale factors for vertices */
     this._scale = null;
 
-    /** @type {import('../../../shared/Vector.mjs').default|null} Origin offset for vertices */
+    /** @type {import('../../../shared/Vector.ts').default|null} Origin offset for vertices */
     this._scale_origin = null;
 
     /** @type {number} Number of skins in file */
diff --git a/source/engine/common/model/BSP.mjs b/source/engine/common/model/BSP.mjs
index e7b9e423..c8277f23 100644
--- a/source/engine/common/model/BSP.mjs
+++ b/source/engine/common/model/BSP.mjs
@@ -4,7 +4,7 @@ import { BaseModel } from './BaseModel.mjs';
 import { SkyRenderer } from '../../client/renderer/Sky.mjs';
 import { AreaPortals } from './AreaPortals.mjs';
 
-/** @typedef {import('../../../shared/Vector.mjs').default} Vector */
+/** @typedef {import('../../../shared/Vector.ts').default} Vector */
 /** @typedef {import('./BaseModel.mjs').Face} Face */
 /** @typedef {import('./BaseModel.mjs').Plane} Plane */
 
diff --git a/source/engine/common/model/BaseModel.mjs b/source/engine/common/model/BaseModel.mjs
index 8e52dae5..f56c99f2 100644
--- a/source/engine/common/model/BaseModel.mjs
+++ b/source/engine/common/model/BaseModel.mjs
@@ -1,6 +1,6 @@
 import GL from '../../client/GL.mjs';
 import { eventBus } from '../../registry.mjs';
-import Vector from '../../../shared/Vector.mjs';
+import Vector from '../../../shared/Vector.ts';
 
 let gl = /** @type {WebGL2RenderingContext|null} */ (null);
 
diff --git a/source/engine/common/model/MeshModel.mjs b/source/engine/common/model/MeshModel.mjs
index a1ef9e43..9c2978d0 100644
--- a/source/engine/common/model/MeshModel.mjs
+++ b/source/engine/common/model/MeshModel.mjs
@@ -1,5 +1,5 @@
 import { BaseMaterial } from '../../client/renderer/Materials.mjs';
-import Vector from '../../../shared/Vector.mjs';
+import Vector from '../../../shared/Vector.ts';
 import { BaseModel } from './BaseModel.mjs';
 
 /**
diff --git a/source/engine/common/model/loaders/AliasMDLLoader.mjs b/source/engine/common/model/loaders/AliasMDLLoader.mjs
index 475f0205..4deaec11 100644
--- a/source/engine/common/model/loaders/AliasMDLLoader.mjs
+++ b/source/engine/common/model/loaders/AliasMDLLoader.mjs
@@ -1,4 +1,4 @@
-import Vector from '../../../../shared/Vector.mjs';
+import Vector from '../../../../shared/Vector.ts';
 import Q from '../../../../shared/Q.mjs';
 import GL, { GLTexture, resampleTexture8 } from '../../../client/GL.mjs';
 import W, { translateIndexToLuminanceRGBA, translateIndexToRGBA } from '../../W.mjs';
diff --git a/source/engine/common/model/loaders/BSP29Loader.mjs b/source/engine/common/model/loaders/BSP29Loader.mjs
index f59d1da1..80023498 100644
--- a/source/engine/common/model/loaders/BSP29Loader.mjs
+++ b/source/engine/common/model/loaders/BSP29Loader.mjs
@@ -1,4 +1,4 @@
-import Vector from '../../../../shared/Vector.mjs';
+import Vector from '../../../../shared/Vector.ts';
 import Q from '../../../../shared/Q.mjs';
 import { content } from '../../../../shared/Defs.ts';
 import { GLTexture } from '../../../client/GL.mjs';
diff --git a/source/engine/common/model/loaders/BSP2Loader.mjs b/source/engine/common/model/loaders/BSP2Loader.mjs
index 7b3dee8a..0c8e49cc 100644
--- a/source/engine/common/model/loaders/BSP2Loader.mjs
+++ b/source/engine/common/model/loaders/BSP2Loader.mjs
@@ -1,4 +1,4 @@
-import Vector from '../../../../shared/Vector.mjs';
+import Vector from '../../../../shared/Vector.ts';
 import { CorruptedResourceError } from '../../Errors.mjs';
 import { BSP29Loader } from './BSP29Loader.mjs';
 import { Face } from '../BaseModel.mjs';
diff --git a/source/engine/common/model/loaders/BSP38Loader.mjs b/source/engine/common/model/loaders/BSP38Loader.mjs
index 1508b4b4..e642d94d 100644
--- a/source/engine/common/model/loaders/BSP38Loader.mjs
+++ b/source/engine/common/model/loaders/BSP38Loader.mjs
@@ -1,6 +1,6 @@
 import { content } from '../../../../shared/Defs.ts';
 import Q from '../../../../shared/Q.mjs';
-import Vector from '../../../../shared/Vector.mjs';
+import Vector from '../../../../shared/Vector.ts';
 import { CRC16CCITT } from '../../CRC.mjs';
 import { Plane } from '../BaseModel.mjs';
 import { Brush, BrushModel, BrushSide, Node } from '../BSP.mjs';
diff --git a/source/engine/common/model/loaders/SpriteSPRLoader.mjs b/source/engine/common/model/loaders/SpriteSPRLoader.mjs
index 315a793d..116a6dcc 100644
--- a/source/engine/common/model/loaders/SpriteSPRLoader.mjs
+++ b/source/engine/common/model/loaders/SpriteSPRLoader.mjs
@@ -1,4 +1,4 @@
-import Vector from '../../../../shared/Vector.mjs';
+import Vector from '../../../../shared/Vector.ts';
 import { GLTexture } from '../../../client/GL.mjs';
 import W, { translateIndexToRGBA } from '../../W.mjs';
 import { CRC16CCITT } from '../../CRC.mjs';
diff --git a/source/engine/common/model/loaders/WavefrontOBJLoader.mjs b/source/engine/common/model/loaders/WavefrontOBJLoader.mjs
index 91b8ff3d..34fef9b0 100644
--- a/source/engine/common/model/loaders/WavefrontOBJLoader.mjs
+++ b/source/engine/common/model/loaders/WavefrontOBJLoader.mjs
@@ -1,6 +1,6 @@
 import { registry } from '../../../registry.mjs';
 
-import Vector from '../../../../shared/Vector.mjs';
+import Vector from '../../../../shared/Vector.ts';
 import { ModelLoader } from '../ModelLoader.mjs';
 import { MeshModel } from '../MeshModel.mjs';
 import { PBRMaterial } from '../../../client/renderer/Materials.mjs';
diff --git a/source/engine/common/model/parsers/ParsedQC.mjs b/source/engine/common/model/parsers/ParsedQC.mjs
index 15f9b654..11f40488 100644
--- a/source/engine/common/model/parsers/ParsedQC.mjs
+++ b/source/engine/common/model/parsers/ParsedQC.mjs
@@ -1,5 +1,5 @@
 import Q from '../../../../shared/Q.mjs';
-import Vector from '../../../../shared/Vector.mjs';
+import Vector from '../../../../shared/Vector.ts';
 
 /** @typedef {import('../../../../shared/GameInterfaces.d.ts').ParsedQC} IParsedQC */
 /** @augments IParsedQC */
diff --git a/source/engine/network/MSG.mjs b/source/engine/network/MSG.mjs
index 43278f7c..4dd48795 100644
--- a/source/engine/network/MSG.mjs
+++ b/source/engine/network/MSG.mjs
@@ -1,5 +1,5 @@
 import Q from '../../shared/Q.mjs';
-import Vector from '../../shared/Vector.mjs';
+import Vector from '../../shared/Vector.ts';
 import * as Protocol from '../network/Protocol.mjs';
 import { eventBus, registry } from '../registry.mjs';
 
diff --git a/source/engine/network/Protocol.mjs b/source/engine/network/Protocol.mjs
index 2aea6656..ee32b50c 100644
--- a/source/engine/network/Protocol.mjs
+++ b/source/engine/network/Protocol.mjs
@@ -1,4 +1,4 @@
-import Vector from '../../shared/Vector.mjs';
+import Vector from '../../shared/Vector.ts';
 
 export const version = 42; // QuakeShack special version
 
diff --git a/source/engine/server/Client.mjs b/source/engine/server/Client.mjs
index 3004b7e7..05c00223 100644
--- a/source/engine/server/Client.mjs
+++ b/source/engine/server/Client.mjs
@@ -1,6 +1,6 @@
 import { enumHelpers } from '../../shared/Q.mjs';
 import { gameCapabilities } from '../../shared/Defs.ts';
-import Vector from '../../shared/Vector.mjs';
+import Vector from '../../shared/Vector.ts';
 import { SzBuffer } from '../network/MSG.mjs';
 import { QSocket } from '../network/NetworkDrivers.mjs';
 import * as Protocol from '../network/Protocol.mjs';
diff --git a/source/engine/server/Edict.mjs b/source/engine/server/Edict.mjs
index 3a4e06f7..1f584899 100644
--- a/source/engine/server/Edict.mjs
+++ b/source/engine/server/Edict.mjs
@@ -1,4 +1,4 @@
-import Vector from '../../shared/Vector.mjs';
+import Vector from '../../shared/Vector.ts';
 import { SzBuffer, registerSerializableType } from '../network/MSG.mjs';
 import * as Protocol from '../network/Protocol.mjs';
 import * as Def from '../common/Def.mjs';
diff --git a/source/engine/server/Navigation.mjs b/source/engine/server/Navigation.mjs
index cb206ab2..207d23cc 100644
--- a/source/engine/server/Navigation.mjs
+++ b/source/engine/server/Navigation.mjs
@@ -1,7 +1,7 @@
 // import sampleBSpline from '../../shared/BSpline.mjs';
 import * as Def from '../../shared/Defs.ts';
 import { Octree } from '../../shared/Octree.mjs';
-import Vector from '../../shared/Vector.mjs';
+import Vector from '../../shared/Vector.ts';
 import Cmd from '../common/Cmd.mjs';
 // import Cmd, { ConsoleCommand } from '../common/Cmd.mjs';
 import Cvar from '../common/Cvar.mjs';
diff --git a/source/engine/server/NavigationWorker.mjs b/source/engine/server/NavigationWorker.mjs
index 218447be..e7c036ec 100644
--- a/source/engine/server/NavigationWorker.mjs
+++ b/source/engine/server/NavigationWorker.mjs
@@ -2,7 +2,7 @@ import WorkerFramework from '../common/WorkerFramework.mjs';
 import { eventBus, registry } from '../registry.mjs';
 
 import { Navigation, NavMeshOutOfDateException } from './Navigation.mjs';
-import Vector from '../../shared/Vector.mjs';
+import Vector from '../../shared/Vector.ts';
 
 await WorkerFramework.Init();
 
diff --git a/source/engine/server/Progs.mjs b/source/engine/server/Progs.mjs
index f5bcf82e..947bc4fb 100644
--- a/source/engine/server/Progs.mjs
+++ b/source/engine/server/Progs.mjs
@@ -3,7 +3,7 @@ import { CRC16CCITT } from '../common/CRC.mjs';
 import Cvar from '../common/Cvar.mjs';
 import { HostError, MissingResourceError } from '../common/Errors.mjs';
 import Q from '../../shared/Q.mjs';
-import Vector from '../../shared/Vector.mjs';
+import Vector from '../../shared/Vector.ts';
 import { eventBus, registry } from '../registry.mjs';
 import { ED, ServerEdict } from './Edict.mjs';
 import { ServerEngineAPI } from '../common/GameAPIs.mjs';
diff --git a/source/engine/server/ProgsAPI.mjs b/source/engine/server/ProgsAPI.mjs
index 9b1f98e2..9449ee3d 100644
--- a/source/engine/server/ProgsAPI.mjs
+++ b/source/engine/server/ProgsAPI.mjs
@@ -1,4 +1,4 @@
-import Vector from '../../shared/Vector.mjs';
+import Vector from '../../shared/Vector.ts';
 import Cmd from '../common/Cmd.mjs';
 import { HostError } from '../common/Errors.mjs';
 import { ServerEngineAPI } from '../common/GameAPIs.mjs';
diff --git a/source/engine/server/Server.mjs b/source/engine/server/Server.mjs
index ea72f2cd..cce1259a 100644
--- a/source/engine/server/Server.mjs
+++ b/source/engine/server/Server.mjs
@@ -1,6 +1,6 @@
 import Cvar from '../common/Cvar.mjs';
 import { MoveVars, Pmove } from '../common/Pmove.mjs';
-import Vector from '../../shared/Vector.mjs';
+import Vector from '../../shared/Vector.ts';
 import { SzBuffer } from '../network/MSG.mjs';
 import * as Protocol from '../network/Protocol.mjs';
 import * as Def from './../common/Def.mjs';
diff --git a/source/engine/server/ServerEntityState.mjs b/source/engine/server/ServerEntityState.mjs
index e87c563b..6879543a 100644
--- a/source/engine/server/ServerEntityState.mjs
+++ b/source/engine/server/ServerEntityState.mjs
@@ -1,4 +1,4 @@
-import Vector from '../../shared/Vector.mjs';
+import Vector from '../../shared/Vector.ts';
 
 /** @typedef {import('../../shared/GameInterfaces').SerializableType} SerializableType */
 
diff --git a/source/engine/server/physics/ServerArea.mjs b/source/engine/server/physics/ServerArea.mjs
index 9a86fa46..22e69f2c 100644
--- a/source/engine/server/physics/ServerArea.mjs
+++ b/source/engine/server/physics/ServerArea.mjs
@@ -1,4 +1,4 @@
-import Vector from '../../../shared/Vector.mjs';
+import Vector from '../../../shared/Vector.ts';
 import * as Defs from '../../../shared/Defs.ts';
 import { Octree } from '../../../shared/Octree.mjs';
 import { eventBus, registry } from '../../registry.mjs';
diff --git a/source/engine/server/physics/ServerClientPhysics.mjs b/source/engine/server/physics/ServerClientPhysics.mjs
index b7a4ec9d..41a90d9c 100644
--- a/source/engine/server/physics/ServerClientPhysics.mjs
+++ b/source/engine/server/physics/ServerClientPhysics.mjs
@@ -1,4 +1,4 @@
-import Vector from '../../../shared/Vector.mjs';
+import Vector from '../../../shared/Vector.ts';
 import * as Defs from '../../../shared/Defs.ts';
 import { eventBus, registry } from '../../registry.mjs';
 import {
diff --git a/source/engine/server/physics/ServerCollision.mjs b/source/engine/server/physics/ServerCollision.mjs
index 7cb6d995..511c4b78 100644
--- a/source/engine/server/physics/ServerCollision.mjs
+++ b/source/engine/server/physics/ServerCollision.mjs
@@ -1,4 +1,4 @@
-import Vector from '../../../shared/Vector.mjs';
+import Vector from '../../../shared/Vector.ts';
 import * as Defs from '../../../shared/Defs.ts';
 import CollisionModelSource, { createRegistryCollisionModelSource } from '../../common/CollisionModelSource.mjs';
 import Mod, { BrushModel } from '../../common/Mod.mjs';
diff --git a/source/engine/server/physics/ServerCollisionSupport.mjs b/source/engine/server/physics/ServerCollisionSupport.mjs
index 9eda1661..6e073c70 100644
--- a/source/engine/server/physics/ServerCollisionSupport.mjs
+++ b/source/engine/server/physics/ServerCollisionSupport.mjs
@@ -1,4 +1,4 @@
-import Vector from '../../../shared/Vector.mjs';
+import Vector from '../../../shared/Vector.ts';
 
 /** @typedef {import('../Client.mjs').ServerEdict} ServerEdict */
 
diff --git a/source/engine/server/physics/ServerLegacyHullCollision.mjs b/source/engine/server/physics/ServerLegacyHullCollision.mjs
index 3b4af4f8..f66d9cd1 100644
--- a/source/engine/server/physics/ServerLegacyHullCollision.mjs
+++ b/source/engine/server/physics/ServerLegacyHullCollision.mjs
@@ -1,4 +1,4 @@
-import Vector from '../../../shared/Vector.mjs';
+import Vector from '../../../shared/Vector.ts';
 import * as Defs from '../../../shared/Defs.ts';
 import { DIST_EPSILON } from '../../common/Pmove.mjs';
 import { eventBus, registry } from '../../registry.mjs';
diff --git a/source/engine/server/physics/ServerMovement.mjs b/source/engine/server/physics/ServerMovement.mjs
index 74e3371a..e7c8763b 100644
--- a/source/engine/server/physics/ServerMovement.mjs
+++ b/source/engine/server/physics/ServerMovement.mjs
@@ -1,4 +1,4 @@
-import Vector from '../../../shared/Vector.mjs';
+import Vector from '../../../shared/Vector.ts';
 import * as Defs from '../../../shared/Defs.ts';
 import { STEPSIZE } from '../../common/Pmove.mjs';
 import { ServerEdict } from '../Edict.mjs';
diff --git a/source/engine/server/physics/ServerPhysics.mjs b/source/engine/server/physics/ServerPhysics.mjs
index 299c35ee..996f4a56 100644
--- a/source/engine/server/physics/ServerPhysics.mjs
+++ b/source/engine/server/physics/ServerPhysics.mjs
@@ -1,4 +1,4 @@
-import Vector from '../../../shared/Vector.mjs';
+import Vector from '../../../shared/Vector.ts';
 import * as Defs from '../../../shared/Defs.ts';
 import Q from '../../../shared/Q.mjs';
 import { eventBus, registry } from '../../registry.mjs';
diff --git a/source/shared/BSpline.mjs b/source/shared/BSpline.mjs
index e425e9bd..b93d63dc 100644
--- a/source/shared/BSpline.mjs
+++ b/source/shared/BSpline.mjs
@@ -1,4 +1,4 @@
-import Vector from './Vector.mjs';
+import Vector from './Vector.ts';
 
 /**
  * Uniform clamped knot vector in [0,1]
diff --git a/source/shared/GameInterfaces.d.ts b/source/shared/GameInterfaces.d.ts
index 8399199e..fadee334 100644
--- a/source/shared/GameInterfaces.d.ts
+++ b/source/shared/GameInterfaces.d.ts
@@ -1,7 +1,7 @@
 import { BaseClientEdictHandler } from "./ClientEdict.mjs";
 import { ClientEngineAPI, ServerEngineAPI } from "../engine/common/GameAPIs.mjs";
 import { ServerEdict } from "../engine/server/Edict.mjs";
-import Vector from "./Vector.mjs";
+import Vector from "./Vector.ts";
 import { StartGameInterface } from "../engine/client/ClientLifecycle.mjs";
 
 export type ClientEngineAPI = Readonly<typeof ClientEngineAPI>;
diff --git a/source/shared/Octree.mjs b/source/shared/Octree.mjs
index e87942bf..5bef48f7 100644
--- a/source/shared/Octree.mjs
+++ b/source/shared/Octree.mjs
@@ -1,4 +1,4 @@
-import Vector from './Vector.mjs';
+import Vector from './Vector.ts';
 
 /** @typedef {{origin: Vector|null, absmin: Vector|null, absmax: Vector|null, octreeNode: OctreeNode<OctreeItem>|null}} OctreeItem */
 
diff --git a/source/shared/Vector.mjs b/source/shared/Vector.mjs
deleted file mode 100644
index 85418889..00000000
--- a/source/shared/Vector.mjs
+++ /dev/null
@@ -1,3 +0,0 @@
-
-export { default } from './Vector.ts';
-export * from './Vector.ts';
diff --git a/test/common/game-apis.test.mjs b/test/common/game-apis.test.mjs
index bafb3bb9..89c0c20a 100644
--- a/test/common/game-apis.test.mjs
+++ b/test/common/game-apis.test.mjs
@@ -1,7 +1,7 @@
 import { describe, test } from 'node:test';
 import assert from 'node:assert/strict';
 
-import Vector from '../../source/shared/Vector.mjs';
+import Vector from '../../source/shared/Vector.ts';
 import { solid } from '../../source/shared/Defs.ts';
 import { ClientEdict } from '../../source/engine/client/ClientEntities.mjs';
 import { ClientEngineAPI } from '../../source/engine/common/GameAPIs.mjs';
diff --git a/test/common/model-cache.test.mjs b/test/common/model-cache.test.mjs
index 5aa79cc8..95c79542 100644
--- a/test/common/model-cache.test.mjs
+++ b/test/common/model-cache.test.mjs
@@ -6,7 +6,7 @@ import { AliasModel } from '../../source/engine/common/model/AliasModel.mjs';
 import { Face } from '../../source/engine/common/model/BaseModel.mjs';
 import { BrushModel, Node } from '../../source/engine/common/model/BSP.mjs';
 import { eventBus, registry } from '../../source/engine/registry.mjs';
-import Vector from '../../source/shared/Vector.mjs';
+import Vector from '../../source/shared/Vector.ts';
 
 /** @typedef {import('../../source/engine/common/model/BaseModel.mjs').BaseModel} BaseModel */
 
diff --git a/test/common/octree.test.mjs b/test/common/octree.test.mjs
index 907893dc..f0091886 100644
--- a/test/common/octree.test.mjs
+++ b/test/common/octree.test.mjs
@@ -2,7 +2,7 @@ import assert from 'node:assert/strict';
 import { describe, test } from 'node:test';
 
 import { Octree } from '../../source/shared/Octree.mjs';
-import Vector from '../../source/shared/Vector.mjs';
+import Vector from '../../source/shared/Vector.ts';
 
 /** @typedef {import('../../source/shared/Octree.mjs').OctreeNode<TestItem>} TestOctreeNode */
 
diff --git a/test/common/vector-typescript-compat.test.mjs b/test/common/vector-typescript-compat.test.mjs
deleted file mode 100644
index 4d0c5abc..00000000
--- a/test/common/vector-typescript-compat.test.mjs
+++ /dev/null
@@ -1,18 +0,0 @@
-import assert from 'node:assert/strict';
-import { describe, test } from 'node:test';
-
-import VectorFromMjs, { DirectionalVectors as DirectionalVectorsFromMjs, Quaternion as QuaternionFromMjs } from '../../source/shared/Vector.mjs';
-import VectorFromTs, { DirectionalVectors as DirectionalVectorsFromTs, Quaternion as QuaternionFromTs } from '../../source/shared/Vector.ts';
-
-void describe('shared Vector TypeScript migration', () => {
-  void test('keeps the .mjs compatibility facade wired to the .ts implementation', () => {
-    assert.strictEqual(VectorFromMjs, VectorFromTs);
-    assert.strictEqual(DirectionalVectorsFromMjs, DirectionalVectorsFromTs);
-    assert.strictEqual(QuaternionFromMjs, QuaternionFromTs);
-    assert.strictEqual(VectorFromMjs.origin, VectorFromTs.origin);
-
-    const vector = new VectorFromMjs(1, 2, 3);
-    assert.equal(vector.toString(), '1 2 3');
-    assert.deepEqual(Array.from(vector.copy()), [1, 2, 3]);
-  });
-});
diff --git a/test/physics/brushtrace.test.mjs b/test/physics/brushtrace.test.mjs
index 5bddbd8d..eb5a026b 100644
--- a/test/physics/brushtrace.test.mjs
+++ b/test/physics/brushtrace.test.mjs
@@ -1,7 +1,7 @@
 import { describe, test } from 'node:test';
 import assert from 'node:assert/strict';
 
-import Vector from '../../source/shared/Vector.mjs';
+import Vector from '../../source/shared/Vector.ts';
 import { BrushTrace, DIST_EPSILON, Pmove } from '../../source/engine/common/Pmove.mjs';
 import { BrushSide } from '../../source/engine/common/model/BSP.mjs';
 import { content } from '../../source/shared/Defs.ts';
diff --git a/test/physics/collision-regressions.test.mjs b/test/physics/collision-regressions.test.mjs
index b289ea16..28a8c859 100644
--- a/test/physics/collision-regressions.test.mjs
+++ b/test/physics/collision-regressions.test.mjs
@@ -1,7 +1,7 @@
 import { describe, test } from 'node:test';
 import assert from 'node:assert/strict';
 
-import Vector from '../../source/shared/Vector.mjs';
+import Vector from '../../source/shared/Vector.ts';
 import { content, flags, moveType, moveTypes, solid } from '../../source/shared/Defs.ts';
 import { Brush, BrushModel, BrushSide } from '../../source/engine/common/model/BSP.mjs';
 import { BrushTrace, Hull, PMF, Pmove, PmovePlayer, Trace } from '../../source/engine/common/Pmove.mjs';
diff --git a/test/physics/fixtures.mjs b/test/physics/fixtures.mjs
index 1234a2b4..ab5b0b88 100644
--- a/test/physics/fixtures.mjs
+++ b/test/physics/fixtures.mjs
@@ -1,6 +1,6 @@
 import assert from 'node:assert/strict';
 
-import Vector from '../../source/shared/Vector.mjs';
+import Vector from '../../source/shared/Vector.ts';
 import { content, flags, moveType, moveTypes, solid } from '../../source/shared/Defs.ts';
 import { Brush, BrushModel, BrushSide } from '../../source/engine/common/model/BSP.mjs';
 import { Pmove } from '../../source/engine/common/Pmove.mjs';
@@ -294,6 +294,7 @@ export function createMockEdict(entity) {
  * Build a default mock registry config with silent console and standard frametime.
  * Supply SV overrides to configure server-side mocks.
  * @param {object} [sv] SV overrides
+ * @param cl
  * @returns {MockRegistryConfig} registry config
  */
 export function defaultMockRegistry(sv = {}, cl = null) {
diff --git a/test/physics/func-rotating.test.mjs b/test/physics/func-rotating.test.mjs
index 51db69c9..0b4b4d4e 100644
--- a/test/physics/func-rotating.test.mjs
+++ b/test/physics/func-rotating.test.mjs
@@ -1,7 +1,7 @@
 import { describe, test } from 'node:test';
 import assert from 'node:assert/strict';
 
-import Vector from '../../source/shared/Vector.mjs';
+import Vector from '../../source/shared/Vector.ts';
 import { moveType, solid } from '../../source/shared/Defs.ts';
 import { entityClasses } from '../../source/game/id1/GameAPI.mjs';
 
@@ -9,6 +9,9 @@ const RotatingEntity = entityClasses.find((entityClass) => entityClass.classname
 
 assert.ok(RotatingEntity, 'func_rotating must be registered in GameAPI');
 
+/**
+ *
+ */
 function createRotatingEntityFixture() {
   const modelMins = new Vector(-16, -16, -16);
   const modelMaxs = new Vector(16, 16, 16);
diff --git a/test/physics/func-train.test.mjs b/test/physics/func-train.test.mjs
index a08b001c..d287680a 100644
--- a/test/physics/func-train.test.mjs
+++ b/test/physics/func-train.test.mjs
@@ -1,7 +1,7 @@
 import { describe, test } from 'node:test';
 import assert from 'node:assert/strict';
 
-import Vector from '../../source/shared/Vector.mjs';
+import Vector from '../../source/shared/Vector.ts';
 import { entityClasses } from '../../source/game/id1/GameAPI.mjs';
 
 const TrainEntity = entityClasses.find((entityClass) => entityClass.classname === 'func_train');
diff --git a/test/physics/map-pmove-harness.mjs b/test/physics/map-pmove-harness.mjs
index cb696e33..dde69312 100644
--- a/test/physics/map-pmove-harness.mjs
+++ b/test/physics/map-pmove-harness.mjs
@@ -6,7 +6,7 @@ import Mod from '../../source/engine/common/Mod.mjs';
 import { PMF, Pmove } from '../../source/engine/common/Pmove.mjs';
 import { UserCmd } from '../../source/engine/network/Protocol.mjs';
 import { eventBus, registry } from '../../source/engine/registry.mjs';
-import Vector from '../../source/shared/Vector.mjs';
+import Vector from '../../source/shared/Vector.ts';
 
 /**
  * @typedef {Record<string, string>} EntityKV
diff --git a/test/physics/navigation.test.mjs b/test/physics/navigation.test.mjs
index ab796a1e..3fa18fad 100644
--- a/test/physics/navigation.test.mjs
+++ b/test/physics/navigation.test.mjs
@@ -1,7 +1,7 @@
 import assert from 'node:assert/strict';
 import { describe, test } from 'node:test';
 
-import Vector from '../../source/shared/Vector.mjs';
+import Vector from '../../source/shared/Vector.ts';
 import { eventBus, registry } from '../../source/engine/registry.mjs';
 import { Navigation } from '../../source/engine/server/Navigation.mjs';
 
diff --git a/test/physics/pmove.test.mjs b/test/physics/pmove.test.mjs
index 6bb427bb..407aeac3 100644
--- a/test/physics/pmove.test.mjs
+++ b/test/physics/pmove.test.mjs
@@ -4,7 +4,7 @@ import assert from 'node:assert/strict';
 
 import COMClass from '../../source/engine/common/Com.mjs';
 import Mod from '../../source/engine/common/Mod.mjs';
-import Vector from '../../source/shared/Vector.mjs';
+import Vector from '../../source/shared/Vector.ts';
 import { content } from '../../source/shared/Defs.ts';
 import { DIST_EPSILON, PM_TYPE, PMF, Pmove, PmovePlayer, Trace } from '../../source/engine/common/Pmove.mjs';
 import { UserCmd } from '../../source/engine/network/Protocol.mjs';
diff --git a/test/physics/server-client-physics.test.mjs b/test/physics/server-client-physics.test.mjs
index f6307215..1d549874 100644
--- a/test/physics/server-client-physics.test.mjs
+++ b/test/physics/server-client-physics.test.mjs
@@ -1,7 +1,7 @@
 import { describe, test } from 'node:test';
 import assert from 'node:assert/strict';
 
-import Vector from '../../source/shared/Vector.mjs';
+import Vector from '../../source/shared/Vector.ts';
 import { flags, moveType, solid } from '../../source/shared/Defs.ts';
 import { UserCmd } from '../../source/engine/network/Protocol.mjs';
 import { eventBus, registry } from '../../source/engine/registry.mjs';
diff --git a/test/physics/server-collision.test.mjs b/test/physics/server-collision.test.mjs
index 62e1e1a8..edd17e4a 100644
--- a/test/physics/server-collision.test.mjs
+++ b/test/physics/server-collision.test.mjs
@@ -1,7 +1,7 @@
 import { describe, test } from 'node:test';
 import assert from 'node:assert/strict';
 
-import Vector from '../../source/shared/Vector.mjs';
+import Vector from '../../source/shared/Vector.ts';
 import { content, flags, moveType, moveTypes, solid } from '../../source/shared/Defs.ts';
 import { BrushModel } from '../../source/engine/common/model/BSP.mjs';
 import { BrushTrace, Pmove } from '../../source/engine/common/Pmove.mjs';
diff --git a/test/physics/server-movement.test.mjs b/test/physics/server-movement.test.mjs
index 9c4f9097..96ba81b8 100644
--- a/test/physics/server-movement.test.mjs
+++ b/test/physics/server-movement.test.mjs
@@ -1,7 +1,7 @@
 import { describe, test } from 'node:test';
 import assert from 'node:assert/strict';
 
-import Vector from '../../source/shared/Vector.mjs';
+import Vector from '../../source/shared/Vector.ts';
 import { content, flags, solid } from '../../source/shared/Defs.ts';
 import { ServerMovement } from '../../source/engine/server/physics/ServerMovement.mjs';
 
diff --git a/test/physics/server-physics.test.mjs b/test/physics/server-physics.test.mjs
index fb48c616..f773d705 100644
--- a/test/physics/server-physics.test.mjs
+++ b/test/physics/server-physics.test.mjs
@@ -1,7 +1,7 @@
 import { describe, test } from 'node:test';
 import assert from 'node:assert/strict';
 
-import Vector from '../../source/shared/Vector.mjs';
+import Vector from '../../source/shared/Vector.ts';
 import { content, flags, gameCapabilities, moveType, moveTypes, solid } from '../../source/shared/Defs.ts';
 import { eventBus, registry } from '../../source/engine/registry.mjs';
 import { ServerArea } from '../../source/engine/server/physics/ServerArea.mjs';
diff --git a/test/physics/server.test.mjs b/test/physics/server.test.mjs
index 9a14191b..8325a3c2 100644
--- a/test/physics/server.test.mjs
+++ b/test/physics/server.test.mjs
@@ -1,7 +1,7 @@
 import { describe, test } from 'node:test';
 import assert from 'node:assert/strict';
 
-import Vector from '../../source/shared/Vector.mjs';
+import Vector from '../../source/shared/Vector.ts';
 import * as Protocol from '../../source/engine/network/Protocol.mjs';
 import { eventBus, registry } from '../../source/engine/registry.mjs';
 import SV from '../../source/engine/server/Server.mjs';
diff --git a/test/renderer/brush-model-renderer.test.mjs b/test/renderer/brush-model-renderer.test.mjs
index c408f34f..e15fa4ba 100644
--- a/test/renderer/brush-model-renderer.test.mjs
+++ b/test/renderer/brush-model-renderer.test.mjs
@@ -1,7 +1,7 @@
 import assert from 'node:assert/strict';
 import { describe, test } from 'node:test';
 
-import Vector from '../../source/shared/Vector.mjs';
+import Vector from '../../source/shared/Vector.ts';
 import { eventBus, registry } from '../../source/engine/registry.mjs';
 import { BrushModelRenderer, resolveBrushBloomContributionStrength } from '../../source/engine/client/renderer/BrushModelRenderer.mjs';
 import { SimpleSkyBox } from '../../source/engine/client/renderer/Sky.mjs';
diff --git a/test/renderer/r-sorting.test.mjs b/test/renderer/r-sorting.test.mjs
index 20fad697..a66ca8bd 100644
--- a/test/renderer/r-sorting.test.mjs
+++ b/test/renderer/r-sorting.test.mjs
@@ -3,7 +3,7 @@ import { describe, test } from 'node:test';
 
 import R, { compareFogAndTurbulentItems } from '../../source/engine/client/R.mjs';
 import { eventBus, registry } from '../../source/engine/registry.mjs';
-import Vector from '../../source/shared/Vector.mjs';
+import Vector from '../../source/shared/Vector.ts';
 
 describe('compareFogAndTurbulentItems', () => {
   test('sorts farther items first', () => {

From 78c725af3f8bedf27f48e66a11474b91137ed946 Mon Sep 17 00:00:00 2001
From: Christian R <github@chrisnew.de>
Date: Thu, 2 Apr 2026 12:59:42 +0300
Subject: [PATCH 05/67] TS: Octree, BSpline

---
 eslint.config.mjs                           |  11 +-
 source/engine/server/Edict.mjs              |   2 +-
 source/engine/server/Navigation.mjs         |   4 +-
 source/engine/server/physics/ServerArea.mjs |   2 +-
 source/shared/{BSpline.mjs => BSpline.ts}   |  57 +++--
 source/shared/{Octree.mjs => Octree.ts}     | 228 ++++++++++----------
 source/shared/Vector.ts                     |   2 +-
 source/shared/index.mjs                     |   4 +-
 test/common/bspline.test.mjs                |  31 +++
 test/common/octree.test.mjs                 |  14 +-
 10 files changed, 187 insertions(+), 168 deletions(-)
 rename source/shared/{BSpline.mjs => BSpline.ts} (57%)
 rename source/shared/{Octree.mjs => Octree.ts} (56%)
 create mode 100644 test/common/bspline.test.mjs

diff --git a/eslint.config.mjs b/eslint.config.mjs
index 8746b711..968d9920 100644
--- a/eslint.config.mjs
+++ b/eslint.config.mjs
@@ -21,11 +21,9 @@ const stylisticPlugin = /** @type {import('eslint').ESLint.Plugin} */ (stylistic
 const typeScriptEslintPlugin = /** @type {import('eslint').ESLint.Plugin} */ (
   /** @type {unknown} */ (tseslint)
 );
-const nodeGlobals = {
-  ...globals.node,
-};
-
-delete nodeGlobals.Buffer;
+const nodeGlobals = Object.fromEntries(
+  Object.entries(globals.node).filter(([name]) => name !== 'Buffer'),
+);
 
 const commonRules = /** @type {import('eslint').Linter.RulesRecord} */ ({
   'max-len': 'off',
@@ -119,6 +117,9 @@ export default defineConfig([
     },
     rules: {
       ...commonRules,
+      'jsdoc/require-param-type': 'off',
+      'jsdoc/require-property-type': 'off',
+      'jsdoc/require-returns-type': 'off',
       'no-undef': 'off',
       'no-unused-vars': 'off',
       '@typescript-eslint/no-unused-vars': ['error', {
diff --git a/source/engine/server/Edict.mjs b/source/engine/server/Edict.mjs
index 1f584899..459e7549 100644
--- a/source/engine/server/Edict.mjs
+++ b/source/engine/server/Edict.mjs
@@ -7,7 +7,7 @@ import { eventBus, registry } from '../registry.mjs';
 import Q from '../../shared/Q.mjs';
 import { ConsoleCommand } from '../common/Cmd.mjs';
 import { ClientEdict } from '../client/ClientEntities.mjs';
-import { OctreeNode } from '../../shared/Octree.mjs';
+import { OctreeNode } from '../../shared/Octree.ts';
 import { Visibility } from '../common/model/BSP.mjs';
 
 /** @typedef {import('../../game/id1/entity/BaseEntity.mjs').default} BaseEntity */
diff --git a/source/engine/server/Navigation.mjs b/source/engine/server/Navigation.mjs
index 207d23cc..29ab4fe1 100644
--- a/source/engine/server/Navigation.mjs
+++ b/source/engine/server/Navigation.mjs
@@ -1,6 +1,6 @@
-// import sampleBSpline from '../../shared/BSpline.mjs';
+// import sampleBSpline from '../../shared/BSpline.ts';
 import * as Def from '../../shared/Defs.ts';
-import { Octree } from '../../shared/Octree.mjs';
+import { Octree } from '../../shared/Octree.ts';
 import Vector from '../../shared/Vector.ts';
 import Cmd from '../common/Cmd.mjs';
 // import Cmd, { ConsoleCommand } from '../common/Cmd.mjs';
diff --git a/source/engine/server/physics/ServerArea.mjs b/source/engine/server/physics/ServerArea.mjs
index 22e69f2c..b905eed1 100644
--- a/source/engine/server/physics/ServerArea.mjs
+++ b/source/engine/server/physics/ServerArea.mjs
@@ -1,6 +1,6 @@
 import Vector from '../../../shared/Vector.ts';
 import * as Defs from '../../../shared/Defs.ts';
-import { Octree } from '../../../shared/Octree.mjs';
+import { Octree } from '../../../shared/Octree.ts';
 import { eventBus, registry } from '../../registry.mjs';
 import CollisionModelSource, { createRegistryCollisionModelSource } from '../../common/CollisionModelSource.mjs';
 import { BrushModel } from '../../../engine/common/Mod.mjs';
diff --git a/source/shared/BSpline.mjs b/source/shared/BSpline.ts
similarity index 57%
rename from source/shared/BSpline.mjs
rename to source/shared/BSpline.ts
index b93d63dc..bef593e3 100644
--- a/source/shared/BSpline.mjs
+++ b/source/shared/BSpline.ts
@@ -2,13 +2,13 @@ import Vector from './Vector.ts';
 
 /**
  * Uniform clamped knot vector in [0,1]
- * @param {number} nCtrl nCtrl
- * @param {number} degree degree
- * @returns {number[]} knots
+ * @param nCtrl nCtrl
+ * @param degree degree
+ * @returns knots
  */
-function makeClampedUniformKnots(nCtrl, degree) {
+function makeClampedUniformKnots(nCtrl: number, degree: number): number[] {
   const m = nCtrl + degree + 1;
-  const knots = new Array(m).fill(0);
+  const knots = new Array<number>(m).fill(0);
   const nInterior = m - 2 * (degree + 1);
 
   for (let i = 0; i < nInterior; i++) {
@@ -23,13 +23,13 @@ function makeClampedUniformKnots(nCtrl, degree) {
 }
 
 /**
- * @param {number} u u
- * @param {number} degree degree
- * @param {number[]} knots knots
- * @returns {number} span index
+ * @param u u
+ * @param degree degree
+ * @param knots knots
+ * @returns span index
  */
-function findSpan(u, degree, knots) {
-  const n = knots.length - degree - 2; // last control index
+function findSpan(u: number, degree: number, knots: number[]): number {
+  const n = knots.length - degree - 2;
 
   if (u >= knots[n + 1]) {
     return n;
@@ -39,8 +39,9 @@ function findSpan(u, degree, knots) {
     return degree;
   }
 
-  // binary search
-  let low = degree, high = n + 1, mid = Math.floor((low + high) / 2);
+  let low = degree;
+  let high = n + 1;
+  let mid = Math.floor((low + high) / 2);
 
   while (!(u >= knots[mid] && u < knots[mid + 1])) {
     if (u < knots[mid]) {
@@ -57,17 +58,16 @@ function findSpan(u, degree, knots) {
 
 /**
  * De Boor evaluation at parameter u in [0,1]
- * @param {number} u u
- * @param {number} degree degree
- * @param {number[]} knots knots
- * @param {Vector[]} ctrl ctrl
- * @returns {Vector} point on the curve
+ * @param u u
+ * @param degree degree
+ * @param knots knots
+ * @param ctrl ctrl
+ * @returns point on the curve
  */
-function deBoor(u, degree, knots, ctrl) {
+function deBoor(u: number, degree: number, knots: number[], ctrl: Vector[]): Vector {
   const k = findSpan(u, degree, knots);
-  const d = [];
+  const d: Vector[] = [];
 
-  // copy affected control points
   for (let j = 0; j <= degree; j++) {
     d[j] = ctrl[k - degree + j].copy();
   }
@@ -86,13 +86,13 @@ function deBoor(u, degree, knots, ctrl) {
 
 /**
  * Sample a cubic B-spline through given control points.
- * @param {Vector[]} points control points (path you want to smooth)
- * @param {number?} samples number of points to sample along the curve
- * @returns {Vector[]} sampled points along the B-spline
+ * @param points control points (path you want to smooth)
+ * @param samples number of points to sample along the curve
+ * @returns sampled points along the B-spline
  */
-export default function sampleBSpline(points, samples = null) {
+export default function sampleBSpline(points: Vector[], samples: number | null = null): Vector[] {
   if (points.length < 4) {
-    return points.slice(); // need at least 4 for cubic
+    return points.slice();
   }
 
   if (samples === null) {
@@ -101,11 +101,10 @@ export default function sampleBSpline(points, samples = null) {
 
   const degree = 3;
   const knots = makeClampedUniformKnots(points.length, degree);
-
-  const out = [];
+  const out: Vector[] = [];
 
   for (let i = 0; i < samples; i++) {
-    const u = i / (samples - 1); // [0,1]
+    const u = i / (samples - 1);
     out.push(deBoor(u, degree, knots, points));
   }
 
diff --git a/source/shared/Octree.mjs b/source/shared/Octree.ts
similarity index 56%
rename from source/shared/Octree.mjs
rename to source/shared/Octree.ts
index 5bef48f7..b4a95906 100644
--- a/source/shared/Octree.mjs
+++ b/source/shared/Octree.ts
@@ -1,37 +1,52 @@
 import Vector from './Vector.ts';
 
-/** @typedef {{origin: Vector|null, absmin: Vector|null, absmax: Vector|null, octreeNode: OctreeNode<OctreeItem>|null}} OctreeItem */
+/**
+ * Octree node holding a spatially indexed item.
+ */
+export interface OctreeItem<T extends OctreeItem<T>> {
+  origin: Vector | null;
+  absmin: Vector | null;
+  absmax: Vector | null;
+  octreeNode: OctreeNode<T> | null;
+}
 
 /**
  * Octree node holding a spatially indexed item.
- * @template {OctreeItem} T
+ * @template T
  */
-export class OctreeNode {
+export class OctreeNode<T extends OctreeItem<T>> {
+  center: Vector;
+  halfSize: number;
+  capacity: number;
+  minSize: number;
+  parent: OctreeNode<T> | null;
+  totalCount: number;
+  items: T[];
+  children: OctreeNode<T>[] | null;
+
   /**
-   * @param {Vector} center center point, e.g (mins + maxs) / 2
-   * @param {number} halfSize half the size of the longest dimension, e.g. (Math.max of (maxs - mins)) / 2 +1
-   * @param {number} capacity maximum items per node before splitting
-   * @param {number} minSize minimum halfSize to allow splitting
-   * @param {OctreeNode<T>|null} parent parent node
+   * @param center center point, e.g (mins + maxs) / 2
+   * @param halfSize half the size of the longest dimension, e.g. (Math.max of (maxs - mins)) / 2 +1
+   * @param capacity maximum items per node before splitting
+   * @param minSize minimum halfSize to allow splitting
+   * @param parent parent node
    */
-  constructor(center, halfSize, capacity = 8, minSize = 4, parent = null) {
-    this.center = center; // Vector
-    this.halfSize = halfSize; // number
+  constructor(center: Vector, halfSize: number, capacity = 8, minSize = 4, parent: OctreeNode<T> | null = null) {
+    this.center = center;
+    this.halfSize = halfSize;
     this.capacity = capacity;
     this.minSize = minSize;
     this.parent = parent;
     this.totalCount = 0;
-    /** @type {T[]} */
     this.items = [];
-    /** @type {OctreeNode<T>[]|null} */
     this.children = null;
   }
 
   /**
-   * @param {Vector} point position
-   * @returns {boolean} true if point is inside this node's box
+   * @param point position
+   * @returns true if point is inside this node's box
    */
-  #isInBox(point) {
+  #isInBox(point: Vector): boolean {
     const dx = Math.abs(point[0] - this.center[0]);
     const dy = Math.abs(point[1] - this.center[1]);
     const dz = Math.abs(point[2] - this.center[2]);
@@ -40,11 +55,11 @@ export class OctreeNode {
   }
 
   /**
-   * @param {Vector} mins minimum bounds
-   * @param {Vector} maxs maximum bounds
-   * @returns {boolean} true if box is fully inside this node's box
+   * @param mins minimum bounds
+   * @param maxs maximum bounds
+   * @returns true if box is fully inside this node's box
    */
-  #isBoxInBox(mins, maxs) {
+  #isBoxInBox(mins: Vector, maxs: Vector): boolean {
     const nodeMinX = this.center[0] - this.halfSize;
     const nodeMaxX = this.center[0] + this.halfSize;
     const nodeMinY = this.center[1] - this.halfSize;
@@ -59,13 +74,12 @@ export class OctreeNode {
 
   /**
    * Subdivides this node into eight children.
-   * @returns {OctreeNode<T>[]} created children
+   * @returns created children
    */
-  #subdivide() {
+  #subdivide(): OctreeNode<T>[] {
     const hs = this.halfSize / 2;
     const offs = [-hs, hs];
-    /** @type {OctreeNode<T>[]} */
-    const children = [];
+    const children: OctreeNode<T>[] = [];
 
     for (let ix = 0; ix < 2; ix++) {
       for (let iy = 0; iy < 2; iy++) {
@@ -87,11 +101,11 @@ export class OctreeNode {
 
   /**
    * Inserts an item into the first child that fully contains it.
-   * @param {T} item item to insert
-   * @param {OctreeNode<T>[]} children child nodes
-   * @returns {OctreeNode<T>|null} child node that accepted the item, if any
+   * @param item item to insert
+   * @param children child nodes
+   * @returns child node that accepted the item, if any
    */
-  #insertIntoChildren(item, children) {
+  #insertIntoChildren(item: T, children: OctreeNode<T>[]): OctreeNode<T> | null {
     for (const child of children) {
       const node = child.insert(item);
       if (node !== null) {
@@ -104,17 +118,16 @@ export class OctreeNode {
 
   /**
    * Inserts item.
-   * @param {T} obj item
-   * @returns {OctreeNode<T>|null} node where item was inserted, or null
+   * @param obj item
+   * @returns node where item was inserted, or null
    */
-  insert(obj) {
-    // if the object has bounds, check if it fits in this node
-    if (obj.absmin && obj.absmax) {
+  insert(obj: T): OctreeNode<T> | null {
+    if (obj.absmin !== null && obj.absmax !== null) {
       if (!this.#isBoxInBox(obj.absmin, obj.absmax)) {
         return null;
       }
     } else {
-      if (!this.#isInBox(obj.origin)) {
+      if (obj.origin === null || !this.#isInBox(obj.origin)) {
         return null;
       }
     }
@@ -122,48 +135,37 @@ export class OctreeNode {
     let children = this.children;
 
     if (children === null) {
-      // is there enough space? if so, add it here
       if (this.items.length < this.capacity || this.halfSize <= this.minSize) {
         this.items.push(obj);
         this.#updateCount(1);
         return this;
       }
 
-      // split
-      // temporarily reduce count for items we are about to move
       this.#updateCount(-this.items.length);
       children = this.#subdivide();
 
-      // move items into children
       const old = this.items;
       this.items = [];
 
-      // re-insert old items
       for (const item of old) {
         const node = this.#insertIntoChildren(item, children);
         if (node !== null) {
-          if (item.octreeNode) {
-            item.octreeNode = node;
-          }
+          item.octreeNode = node;
         }
 
         if (node === null) {
-          this.items.push(item); // keep in parent if it doesn’t fit in any child
-          if (item.octreeNode) {
-            item.octreeNode = this;
-          }
-          this.#updateCount(1); // re-add count for the item kept in this node
+          this.items.push(item);
+          item.octreeNode = this;
+          this.#updateCount(1);
         }
       }
     }
 
-    // insert into child
     const node = this.#insertIntoChildren(obj, children);
     if (node !== null) {
       return node;
     }
 
-    // if it didn’t fit in any child (e.g. straddles boundary), keep it here
     this.items.push(obj);
     this.#updateCount(1);
     return this;
@@ -171,12 +173,11 @@ export class OctreeNode {
 
   /**
    * Updates totalCount up the tree.
-   * @param {number} delta changed number of items
+   * @param delta changed number of items
    */
-  #updateCount(delta) {
-    /** @type {OctreeNode<T>|null} */
-    let node = this; // eslint-disable-line consistent-this
-    while (node) {
+  #updateCount(delta: number): void {
+    let node: OctreeNode<T> | null = this; // eslint-disable-line consistent-this
+    while (node !== null) {
       node.totalCount += delta;
       node = node.parent;
     }
@@ -184,10 +185,10 @@ export class OctreeNode {
 
   /**
    * Removes item from this node.
-   * @param {T} obj item
-   * @returns {boolean} true if removed
+   * @param obj item
+   * @returns true if removed
    */
-  remove(obj) {
+  remove(obj: T): boolean {
     const idx = this.items.indexOf(obj);
     if (idx !== -1) {
       this.items.splice(idx, 1);
@@ -201,11 +202,10 @@ export class OctreeNode {
   /**
    * Checks if children can be merged.
    */
-  #checkMerge() {
-    /** @type {OctreeNode<T>|null} */
-    let node = this; // eslint-disable-line consistent-this
-    while (node) {
-      if (node.children && node.totalCount <= node.capacity) {
+  #checkMerge(): void {
+    let node: OctreeNode<T> | null = this; // eslint-disable-line consistent-this
+    while (node !== null) {
+      if (node.children !== null && node.totalCount <= node.capacity) {
         node.#merge();
       }
       node = node.parent;
@@ -215,22 +215,20 @@ export class OctreeNode {
   /**
    * Merges all children into this node.
    */
-  #merge() {
+  #merge(): void {
     const items = this.#getAllItems();
     this.items = items;
     this.children = null;
     for (const item of this.items) {
-      if (item.octreeNode) {
-        item.octreeNode = this;
-      }
+      item.octreeNode = this;
     }
   }
 
   /**
    * Returns all items in this node and its children.
-   * @returns {T[]} items
+   * @returns items
    */
-  #getAllItems() {
+  #getAllItems(): T[] {
     let items = [...this.items];
     const children = this.children;
 
@@ -245,14 +243,12 @@ export class OctreeNode {
 
   /**
    * Collect candidates inside AABB.
-   * @param {Vector} mins minimum bounds
-   * @param {Vector} maxs maximum bounds
-   * @yields {T} item
-   * @returns {IterableIterator<T>} items inside AABB
+   * @param mins minimum bounds
+   * @param maxs maximum bounds
+   * @yields item
+   * @returns items inside AABB
    */
-  *queryAABB(mins, maxs) {
-    // AABB-AABB intersection test
-    // node bounds:
+  *queryAABB(mins: Vector, maxs: Vector): IterableIterator<T> {
     const nodeMinX = this.center[0] - this.halfSize;
     const nodeMaxX = this.center[0] + this.halfSize;
     const nodeMinY = this.center[1] - this.halfSize;
@@ -266,19 +262,15 @@ export class OctreeNode {
       return;
     }
 
-    // check items
     if (this.items.length > 0) {
       for (const p of this.items) {
-        // check if item is inside query AABB
-        if (p.absmin && p.absmax) {
-          // AABB-AABB overlap
+        if (p.absmin !== null && p.absmax !== null) {
           if (p.absmin[0] <= maxs[0] && p.absmax[0] >= mins[0] &&
             p.absmin[1] <= maxs[1] && p.absmax[1] >= mins[1] &&
             p.absmin[2] <= maxs[2] && p.absmax[2] >= mins[2]) {
             yield p;
           }
-        } else {
-          // item in AABB
+        } else if (p.origin !== null) {
           if (p.origin[0] >= mins[0] && p.origin[0] <= maxs[0] &&
             p.origin[1] >= mins[1] && p.origin[1] <= maxs[1] &&
             p.origin[2] >= mins[2] && p.origin[2] <= maxs[2]) {
@@ -288,7 +280,6 @@ export class OctreeNode {
       }
     }
 
-    // traverse children
     const children = this.children;
 
     if (children !== null) {
@@ -300,26 +291,27 @@ export class OctreeNode {
 
   /**
    * Collect candidates inside sphere centered at pos with radius r.
-   * @param {Vector} point position
-   * @param {number} radius radius
-   * @yields {[number, T]} distance and item
-   * @returns {IterableIterator<[number, T]>} items inside sphere
+   * @param point position
+   * @param radius radius
+   * @yields distance and item
+   * @returns items inside sphere
    */
-  *querySphere(point, radius) {
-    // AABB-sphere intersection test
+  *querySphere(point: Vector, radius: number): IterableIterator<[number, T]> {
     const dx = Math.max(0, Math.abs(point[0] - this.center[0]) - this.halfSize);
     const dy = Math.max(0, Math.abs(point[1] - this.center[1]) - this.halfSize);
     const dz = Math.max(0, Math.abs(point[2] - this.center[2]) - this.halfSize);
     const dist2 = dx * dx + dy * dy + dz * dz;
 
     if (dist2 > radius * radius) {
-      // no intersection
       return;
     }
 
-    // check items
     if (this.items.length > 0) {
       for (const item of this.items) {
+        if (item.origin === null) {
+          continue;
+        }
+
         const d = item.origin.copy().subtract(point).len();
         if (d <= radius) {
           yield [d, item];
@@ -327,7 +319,6 @@ export class OctreeNode {
       }
     }
 
-    // traverse children
     const children = this.children;
 
     if (children !== null) {
@@ -340,37 +331,37 @@ export class OctreeNode {
 
 /**
  * Simple Octree for spatial-indexing of anything.
- * @template {OctreeItem} T
+ * @template T
  */
-export class Octree {
+export class Octree<T extends OctreeItem<T>> {
+  root: OctreeNode<T>;
+
   /**
-   * @param {Vector} center center point, e.g (mins + maxs) / 2
-   * @param {number} halfSize half the size of the longest dimension, e.g. (Math.max of (maxs - mins)) / 2 +1
-   * @param {number} capacity maximum items per node before splitting, default 8
-   * @param {number} minSize minimum halfSize to allow splitting, default 4
+   * @param center center point, e.g (mins + maxs) / 2
+   * @param halfSize half the size of the longest dimension, e.g. (Math.max of (maxs - mins)) / 2 +1
+   * @param capacity maximum items per node before splitting, default 8
+   * @param minSize minimum halfSize to allow splitting, default 4
    */
-  constructor(center, halfSize, capacity = 8, minSize = 4) {
-    /** @type {OctreeNode<T>} */
+  constructor(center: Vector, halfSize: number, capacity = 8, minSize = 4) {
     this.root = new OctreeNode(center, halfSize, capacity, minSize);
   }
 
   /**
    * Inserts item.
-   * @param {T} item item to add
-   * @returns {OctreeNode<T>|null} node where item was inserted
+   * @param item item to add
+   * @returns node where item was inserted
    */
-  insert(item) {
+  insert(item: T): OctreeNode<T> | null {
     return this.root.insert(item);
   }
 
   /**
    * Removes item.
-   * @param {T} item item to remove
-   * @returns {boolean} true if removed
+   * @param item item to remove
+   * @returns true if removed
    */
-  remove(item) {
-    // if an item knows its node, use it
-    if (item.octreeNode) {
+  remove(item: T): boolean {
+    if (item.octreeNode !== null) {
       const removed = item.octreeNode.remove(item);
       if (removed) {
         item.octreeNode = null;
@@ -378,30 +369,27 @@ export class Octree {
       return removed;
     }
 
-    // otherwise we can’t easily remove without searching, which is slow
-    // for now assume item has octreeNode if it was inserted
-    // TODO: fallback search removal
     return false;
   }
 
   /**
    * Collect candidates inside AABB.
-   * @param {Vector} mins minimum bounds
-   * @param {Vector} maxs maximum bounds
-   * @yields {T} item
+   * @param mins minimum bounds
+   * @param maxs maximum bounds
+   * @yields item
    */
-  *queryAABB(mins, maxs) {
+  *queryAABB(mins: Vector, maxs: Vector): IterableIterator<T> {
     yield* this.root.queryAABB(mins, maxs);
   }
 
   /**
    * Finds nearest item to point within maxDist.
-   * @param {Vector} point point in space to search nearest to
-   * @param {number} maxDist maximum distance to search, default unlimited
-   * @returns {T|null} nearest item whose origin is within maxDist, or null
+   * @param point point in space to search nearest to
+   * @param maxDist maximum distance to search, default unlimited
+   * @returns nearest item whose origin is within maxDist, or null
    */
-  nearest(point, maxDist = Infinity) {
-    let best = null;
+  nearest(point: Vector, maxDist = Infinity): T | null {
+    let best: T | null = null;
     let bestDist = Infinity;
 
     for (const [d, item] of this.root.querySphere(point, maxDist)) {
@@ -413,4 +401,4 @@ export class Octree {
 
     return best;
   }
-};
+}
diff --git a/source/shared/Vector.ts b/source/shared/Vector.ts
index 0c794092..c8c085f3 100644
--- a/source/shared/Vector.ts
+++ b/source/shared/Vector.ts
@@ -1,4 +1,4 @@
-/* eslint jsdoc/require-param-type: "off", jsdoc/require-returns: "off" */
+/* eslint jsdoc/require-returns: "off" */
 
 type VectorLike = ArrayLike<number>;
 
diff --git a/source/shared/index.mjs b/source/shared/index.mjs
index 247ddfeb..9f65ea46 100644
--- a/source/shared/index.mjs
+++ b/source/shared/index.mjs
@@ -1,7 +1,7 @@
-export { default as sampleBSpline } from './BSpline.mjs';
+export { default as sampleBSpline } from './BSpline.ts';
 export * from './ClientEdict.mjs';
 export * from './Defs.ts';
 export * from './Keys.mjs';
-export * from './Octree.mjs';
+export * from './Octree.ts';
 export { default as Q } from './Q.mjs';
 export * from './Vector.ts';
diff --git a/test/common/bspline.test.mjs b/test/common/bspline.test.mjs
new file mode 100644
index 00000000..ae7fc1f9
--- /dev/null
+++ b/test/common/bspline.test.mjs
@@ -0,0 +1,31 @@
+import assert from 'node:assert/strict';
+import { describe, test } from 'node:test';
+
+import sampleBSpline from '../../source/shared/BSpline.ts';
+import Vector from '../../source/shared/Vector.ts';
+
+void describe('sampleBSpline', () => {
+  void test('returns a shallow copy when there are fewer than four control points', () => {
+    const points = [new Vector(0, 0, 0), new Vector(1, 1, 1), new Vector(2, 2, 2)];
+    const sampled = sampleBSpline(points);
+
+    assert.notStrictEqual(sampled, points);
+    assert.deepEqual(sampled.map((point) => Array.from(point)), points.map((point) => Array.from(point)));
+  });
+
+  void test('samples a clamped cubic curve that starts and ends on the control endpoints', () => {
+    const points = [
+      new Vector(0, 0, 0),
+      new Vector(10, 0, 0),
+      new Vector(10, 10, 0),
+      new Vector(20, 10, 0),
+    ];
+
+    const sampled = sampleBSpline(points, 5);
+
+    assert.equal(sampled.length, 5);
+    assert.deepEqual(Array.from(sampled[0]), Array.from(points[0]));
+    assert.deepEqual(Array.from(sampled.at(-1)), Array.from(points.at(-1)));
+    assert.ok(sampled.every((point) => point instanceof Vector));
+  });
+});
diff --git a/test/common/octree.test.mjs b/test/common/octree.test.mjs
index f0091886..45c89fde 100644
--- a/test/common/octree.test.mjs
+++ b/test/common/octree.test.mjs
@@ -1,10 +1,10 @@
 import assert from 'node:assert/strict';
 import { describe, test } from 'node:test';
 
-import { Octree } from '../../source/shared/Octree.mjs';
+import { Octree } from '../../source/shared/Octree.ts';
 import Vector from '../../source/shared/Vector.ts';
 
-/** @typedef {import('../../source/shared/Octree.mjs').OctreeNode<TestItem>} TestOctreeNode */
+/** @typedef {import('../../source/shared/Octree.ts').OctreeNode<TestItem>} TestOctreeNode */
 
 /**
  * @typedef TestItem
@@ -60,7 +60,7 @@ function insertTracked(tree, item) {
 }
 
 /**
- * @param {import('../../source/shared/Octree.mjs').OctreeNode<TestItem>} node node whose children must exist
+ * @param {import('../../source/shared/Octree.ts').OctreeNode<TestItem>} node node whose children must exist
  * @returns {TestOctreeNode[]} node children
  */
 function requireChildren(node) {
@@ -68,8 +68,8 @@ function requireChildren(node) {
   return node.children;
 }
 
-describe('Octree', () => {
-  test('splits into children once capacity is exceeded', () => {
+void describe('Octree', () => {
+  void test('splits into children once capacity is exceeded', () => {
     const tree = new Octree(new Vector(0, 0, 0), 16, 1, 1);
     const first = createPointItem('first', new Vector(-4, -4, -4));
     const second = createPointItem('second', new Vector(4, 4, 4));
@@ -90,7 +90,7 @@ describe('Octree', () => {
     );
   });
 
-  test('keeps oversized bounds in the parent after a split', () => {
+  void test('keeps oversized bounds in the parent after a split', () => {
     const tree = new Octree(new Vector(0, 0, 0), 16, 1, 1);
     const anchor = createPointItem('anchor', new Vector(10, 10, 10));
     const straddling = createBoxItem('straddling', new Vector(0, 0, 0), new Vector(-2, -2, -2), new Vector(2, 2, 2));
@@ -106,7 +106,7 @@ describe('Octree', () => {
     assert.notEqual(anchor.octreeNode, tree.root);
   });
 
-  test('merges children back into the parent when removals drop below capacity', () => {
+  void test('merges children back into the parent when removals drop below capacity', () => {
     const tree = new Octree(new Vector(0, 0, 0), 16, 1, 1);
     const first = createPointItem('first', new Vector(-4, -4, -4));
     const second = createPointItem('second', new Vector(4, 4, 4));

From 887cf6765d8474c72d2699e9504c7f3af1a0cae6 Mon Sep 17 00:00:00 2001
From: Christian R <github@chrisnew.de>
Date: Thu, 2 Apr 2026 13:15:15 +0300
Subject: [PATCH 06/67] TS: Q and Keys

---
 source/engine/client/CDAudio.mjs              |  2 +-
 source/engine/client/CL.mjs                   |  2 +-
 source/engine/client/ClientInput.mjs          |  2 +-
 source/engine/client/IN.mjs                   |  2 +-
 source/engine/client/Key.mjs                  |  2 +-
 source/engine/client/Menu.mjs                 |  2 +-
 source/engine/client/Sound.mjs                |  2 +-
 source/engine/client/Sys.mjs                  |  4 +-
 source/engine/client/V.mjs                    |  2 +-
 source/engine/client/menu/MenuItem.mjs        |  4 +-
 source/engine/client/menu/MenuPage.mjs        |  2 +-
 source/engine/client/menu/Multiplayer.mjs     |  2 +-
 source/engine/common/Cmd.mjs                  |  2 +-
 source/engine/common/Com.mjs                  |  2 +-
 source/engine/common/Cvar.mjs                 |  2 +-
 source/engine/common/GameAPIs.mjs             |  2 +-
 source/engine/common/Host.mjs                 |  2 +-
 source/engine/common/Pmove.mjs                |  2 +-
 source/engine/common/W.mjs                    |  2 +-
 .../common/model/loaders/AliasMDLLoader.mjs   |  2 +-
 .../common/model/loaders/BSP29Loader.mjs      |  2 +-
 .../common/model/loaders/BSP38Loader.mjs      |  2 +-
 .../engine/common/model/parsers/ParsedQC.mjs  |  2 +-
 source/engine/network/MSG.mjs                 |  2 +-
 source/engine/network/Network.mjs             |  2 +-
 source/engine/server/Client.mjs               |  2 +-
 source/engine/server/Com.mjs                  |  2 +-
 source/engine/server/Edict.mjs                |  2 +-
 source/engine/server/Progs.mjs                |  2 +-
 source/engine/server/Sys.mjs                  |  2 +-
 .../engine/server/physics/ServerPhysics.mjs   |  2 +-
 source/shared/GameInterfaces.d.ts             |  4 +-
 source/shared/Keys.mjs                        | 45 ---------
 source/shared/Keys.ts                         | 44 +++++++++
 source/shared/Pmove.mjs                       | 55 -----------
 source/shared/Pmove.ts                        | 54 +++++++++++
 source/shared/{Q.mjs => Q.ts}                 | 93 ++++++++++---------
 source/shared/index.mjs                       |  5 +-
 test/common/keys.test.mjs                     | 13 +++
 test/common/pmove-config.test.mjs             | 25 +++++
 test/common/q.test.mjs                        | 36 +++++++
 41 files changed, 258 insertions(+), 182 deletions(-)
 delete mode 100644 source/shared/Keys.mjs
 create mode 100644 source/shared/Keys.ts
 delete mode 100644 source/shared/Pmove.mjs
 create mode 100644 source/shared/Pmove.ts
 rename source/shared/{Q.mjs => Q.ts} (62%)
 create mode 100644 test/common/keys.test.mjs
 create mode 100644 test/common/pmove-config.test.mjs
 create mode 100644 test/common/q.test.mjs

diff --git a/source/engine/client/CDAudio.mjs b/source/engine/client/CDAudio.mjs
index 17518345..e9f32f97 100644
--- a/source/engine/client/CDAudio.mjs
+++ b/source/engine/client/CDAudio.mjs
@@ -1,6 +1,6 @@
 import Cmd from '../common/Cmd.mjs';
 import Cvar from '../common/Cvar.mjs';
-import Q from '../../shared/Q.mjs';
+import Q from '../../shared/Q.ts';
 import { eventBus, registry } from '../registry.mjs';
 
 let { COM, Con, S } = registry;
diff --git a/source/engine/client/CL.mjs b/source/engine/client/CL.mjs
index 7c6cc9bd..a936d61d 100644
--- a/source/engine/client/CL.mjs
+++ b/source/engine/client/CL.mjs
@@ -1,4 +1,4 @@
-import Q from '../../shared/Q.mjs';
+import Q from '../../shared/Q.ts';
 import * as Def from '../common/Def.mjs';
 import * as Protocol from '../network/Protocol.mjs';
 import Cmd, { ConsoleCommand } from '../common/Cmd.mjs';
diff --git a/source/engine/client/ClientInput.mjs b/source/engine/client/ClientInput.mjs
index 1e09cf5f..146fc324 100644
--- a/source/engine/client/ClientInput.mjs
+++ b/source/engine/client/ClientInput.mjs
@@ -1,6 +1,6 @@
 import Vector from '../../shared/Vector.ts';
 import * as Protocol from '../network/Protocol.mjs';
-import Q from '../../shared/Q.mjs';
+import Q from '../../shared/Q.ts';
 import { SzBuffer } from '../network/MSG.mjs';
 import Cmd from '../common/Cmd.mjs';
 import { eventBus, registry } from '../registry.mjs';
diff --git a/source/engine/client/IN.mjs b/source/engine/client/IN.mjs
index bce9f9e6..e82212f6 100644
--- a/source/engine/client/IN.mjs
+++ b/source/engine/client/IN.mjs
@@ -1,4 +1,4 @@
-import { K } from '../../shared/Keys.mjs';
+import { K } from '../../shared/Keys.ts';
 import Cvar from '../common/Cvar.mjs';
 import { eventBus, registry } from '../registry.mjs';
 import { kbutton, kbuttons } from './ClientInput.mjs';
diff --git a/source/engine/client/Key.mjs b/source/engine/client/Key.mjs
index 514ef135..3ef6efdf 100644
--- a/source/engine/client/Key.mjs
+++ b/source/engine/client/Key.mjs
@@ -1,4 +1,4 @@
-import { K } from '../../shared/Keys.mjs';
+import { K } from '../../shared/Keys.ts';
 import Vector from '../../shared/Vector.ts';
 import Cmd from '../common/Cmd.mjs';
 import Cvar from '../common/Cvar.mjs';
diff --git a/source/engine/client/Menu.mjs b/source/engine/client/Menu.mjs
index 41877236..3d9cc650 100644
--- a/source/engine/client/Menu.mjs
+++ b/source/engine/client/Menu.mjs
@@ -1,4 +1,4 @@
-import { K } from '../../shared/Keys.mjs';
+import { K } from '../../shared/Keys.ts';
 import Cmd from '../common/Cmd.mjs';
 import Cvar from '../common/Cvar.mjs';
 import { clientConnectionState } from '../common/Def.mjs';
diff --git a/source/engine/client/Sound.mjs b/source/engine/client/Sound.mjs
index e0c2a91a..80356041 100644
--- a/source/engine/client/Sound.mjs
+++ b/source/engine/client/Sound.mjs
@@ -1,7 +1,7 @@
 import Vector from '../../shared/Vector.ts';
 import Cmd from '../common/Cmd.mjs';
 import Cvar from '../common/Cvar.mjs';
-import Q from '../../shared/Q.mjs';
+import Q from '../../shared/Q.ts';
 import { eventBus, registry } from '../registry.mjs';
 
 /** @typedef {import('../common/model/BSP.mjs').Node} BSPNode */
diff --git a/source/engine/client/Sys.mjs b/source/engine/client/Sys.mjs
index ed82d31e..db012398 100644
--- a/source/engine/client/Sys.mjs
+++ b/source/engine/client/Sys.mjs
@@ -1,5 +1,5 @@
-import { K } from '../../shared/Keys.mjs';
-import Q from '../../shared/Q.mjs';
+import { K } from '../../shared/Keys.ts';
+import Q from '../../shared/Q.ts';
 import { eventBus, registry } from '../registry.mjs';
 import Tools from './Tools.mjs';
 import WorkerManager from '../common/WorkerManager.mjs';
diff --git a/source/engine/client/V.mjs b/source/engine/client/V.mjs
index ff87dfcb..6b50d56e 100644
--- a/source/engine/client/V.mjs
+++ b/source/engine/client/V.mjs
@@ -3,7 +3,7 @@ import { content, gameCapabilities } from '../../shared/Defs.ts';
 import Cmd from '../common/Cmd.mjs';
 import Cvar from '../common/Cvar.mjs';
 import * as Def from '../common/Def.mjs';
-import Q from '../../shared/Q.mjs';
+import Q from '../../shared/Q.ts';
 import { eventBus, registry } from '../registry.mjs';
 import Chase from './Chase.mjs';
 
diff --git a/source/engine/client/menu/MenuItem.mjs b/source/engine/client/menu/MenuItem.mjs
index 6441394d..582561cf 100644
--- a/source/engine/client/menu/MenuItem.mjs
+++ b/source/engine/client/menu/MenuItem.mjs
@@ -1,5 +1,5 @@
-import Q from '../../../shared/Q.mjs';
-import { K } from '../../../shared/Keys.mjs';
+import Q from '../../../shared/Q.ts';
+import { K } from '../../../shared/Keys.ts';
 import Cvar from '../../common/Cvar.mjs';
 import { eventBus, registry } from '../../registry.mjs';
 
diff --git a/source/engine/client/menu/MenuPage.mjs b/source/engine/client/menu/MenuPage.mjs
index f29d1505..26913298 100644
--- a/source/engine/client/menu/MenuPage.mjs
+++ b/source/engine/client/menu/MenuPage.mjs
@@ -1,4 +1,4 @@
-import { K } from '../../../shared/Keys.mjs';
+import { K } from '../../../shared/Keys.ts';
 import { eventBus, registry } from '../../registry.mjs';
 
 // Destructure registry modules
diff --git a/source/engine/client/menu/Multiplayer.mjs b/source/engine/client/menu/Multiplayer.mjs
index 1687b060..3060d240 100644
--- a/source/engine/client/menu/Multiplayer.mjs
+++ b/source/engine/client/menu/Multiplayer.mjs
@@ -1,5 +1,5 @@
 import PR from '../../server/Progs.mjs';
-import { K } from '../../../shared/Keys.mjs';
+import { K } from '../../../shared/Keys.ts';
 import Cmd from '../../common/Cmd.mjs';
 import { eventBus, registry } from '../../registry.mjs';
 import { Action, Label, Spacer } from './MenuItem.mjs';
diff --git a/source/engine/common/Cmd.mjs b/source/engine/common/Cmd.mjs
index cb2633d7..7122478c 100644
--- a/source/engine/common/Cmd.mjs
+++ b/source/engine/common/Cmd.mjs
@@ -1,4 +1,4 @@
-import { AsyncFunction } from '../../shared/Q.mjs';
+import { AsyncFunction } from '../../shared/Q.ts';
 import * as Protocol from '../network/Protocol.mjs';
 import { eventBus, registry } from '../registry.mjs';
 import Cvar from './Cvar.mjs';
diff --git a/source/engine/common/Com.mjs b/source/engine/common/Com.mjs
index 78de60c4..f1ba5ce5 100644
--- a/source/engine/common/Com.mjs
+++ b/source/engine/common/Com.mjs
@@ -1,7 +1,7 @@
 
 import { registry, eventBus } from '../registry.mjs';
 
-import Q from '../../shared/Q.mjs';
+import Q from '../../shared/Q.ts';
 import { CorruptedResourceError } from './Errors.mjs';
 
 import Cvar from './Cvar.mjs';
diff --git a/source/engine/common/Cvar.mjs b/source/engine/common/Cvar.mjs
index ed9e3390..aeece77c 100644
--- a/source/engine/common/Cvar.mjs
+++ b/source/engine/common/Cvar.mjs
@@ -1,6 +1,6 @@
 import { registry, eventBus } from '../registry.mjs';
 import Cmd from './Cmd.mjs';
-import Q from '../../shared/Q.mjs';
+import Q from '../../shared/Q.ts';
 import { cvarFlags } from '../../shared/Defs.ts';
 
 let { CL, Con, SV } = registry;
diff --git a/source/engine/common/GameAPIs.mjs b/source/engine/common/GameAPIs.mjs
index 7fe9cafd..9899f1a7 100644
--- a/source/engine/common/GameAPIs.mjs
+++ b/source/engine/common/GameAPIs.mjs
@@ -1,4 +1,4 @@
-import { PmoveConfiguration } from '../../shared/Pmove.mjs';
+import { PmoveConfiguration } from '../../shared/Pmove.ts';
 import Vector from '../../shared/Vector.ts';
 import { solid } from '../../shared/Defs.ts';
 import Key from '../client/Key.mjs';
diff --git a/source/engine/common/Host.mjs b/source/engine/common/Host.mjs
index 6741c4cc..46a64939 100644
--- a/source/engine/common/Host.mjs
+++ b/source/engine/common/Host.mjs
@@ -4,7 +4,7 @@ import * as Def from './Def.mjs';
 import Cmd, { ConsoleCommand } from './Cmd.mjs';
 import { eventBus, registry } from '../registry.mjs';
 import Vector from '../../shared/Vector.ts';
-import Q from '../../shared/Q.mjs';
+import Q from '../../shared/Q.ts';
 import { ServerClient } from '../server/Client.mjs';
 import { ServerEngineAPI } from './GameAPIs.mjs';
 import Chase from '../client/Chase.mjs';
diff --git a/source/engine/common/Pmove.mjs b/source/engine/common/Pmove.mjs
index 75523440..5c63fb3a 100644
--- a/source/engine/common/Pmove.mjs
+++ b/source/engine/common/Pmove.mjs
@@ -12,7 +12,7 @@ import * as Protocol from '../network/Protocol.mjs';
 import { content } from '../../shared/Defs.ts';
 import { BrushModel } from './Mod.mjs';
 import Cvar from './Cvar.mjs';
-import { PmoveConfiguration } from '../../shared/Pmove.mjs';
+import { PmoveConfiguration } from '../../shared/Pmove.ts';
 
 /** @typedef {import('../../shared/Vector.ts').DirectionalVectors} DirectionalVectors */
 /** @typedef {{ normal: Vector, type: number }} BrushTracePlaneLike */
diff --git a/source/engine/common/W.mjs b/source/engine/common/W.mjs
index 7a486469..360e8b30 100644
--- a/source/engine/common/W.mjs
+++ b/source/engine/common/W.mjs
@@ -1,7 +1,7 @@
 
 import { eventBus, registry } from '../registry.mjs';
 import { CorruptedResourceError, MissingResourceError } from './Errors.mjs';
-import Q from '../../shared/Q.mjs';
+import Q from '../../shared/Q.ts';
 
 let { COM } = registry;
 
diff --git a/source/engine/common/model/loaders/AliasMDLLoader.mjs b/source/engine/common/model/loaders/AliasMDLLoader.mjs
index 4deaec11..fbb41b5e 100644
--- a/source/engine/common/model/loaders/AliasMDLLoader.mjs
+++ b/source/engine/common/model/loaders/AliasMDLLoader.mjs
@@ -1,5 +1,5 @@
 import Vector from '../../../../shared/Vector.ts';
-import Q from '../../../../shared/Q.mjs';
+import Q from '../../../../shared/Q.ts';
 import GL, { GLTexture, resampleTexture8 } from '../../../client/GL.mjs';
 import W, { translateIndexToLuminanceRGBA, translateIndexToRGBA } from '../../W.mjs';
 import { CRC16CCITT } from '../../CRC.mjs';
diff --git a/source/engine/common/model/loaders/BSP29Loader.mjs b/source/engine/common/model/loaders/BSP29Loader.mjs
index 80023498..3ba4be74 100644
--- a/source/engine/common/model/loaders/BSP29Loader.mjs
+++ b/source/engine/common/model/loaders/BSP29Loader.mjs
@@ -1,5 +1,5 @@
 import Vector from '../../../../shared/Vector.ts';
-import Q from '../../../../shared/Q.mjs';
+import Q from '../../../../shared/Q.ts';
 import { content } from '../../../../shared/Defs.ts';
 import { GLTexture } from '../../../client/GL.mjs';
 import W, { readWad3Texture, translateIndexToLuminanceRGBA, translateIndexToRGBA } from '../../W.mjs';
diff --git a/source/engine/common/model/loaders/BSP38Loader.mjs b/source/engine/common/model/loaders/BSP38Loader.mjs
index e642d94d..06d0f9d0 100644
--- a/source/engine/common/model/loaders/BSP38Loader.mjs
+++ b/source/engine/common/model/loaders/BSP38Loader.mjs
@@ -1,5 +1,5 @@
 import { content } from '../../../../shared/Defs.ts';
-import Q from '../../../../shared/Q.mjs';
+import Q from '../../../../shared/Q.ts';
 import Vector from '../../../../shared/Vector.ts';
 import { CRC16CCITT } from '../../CRC.mjs';
 import { Plane } from '../BaseModel.mjs';
diff --git a/source/engine/common/model/parsers/ParsedQC.mjs b/source/engine/common/model/parsers/ParsedQC.mjs
index 11f40488..fa3a5f4a 100644
--- a/source/engine/common/model/parsers/ParsedQC.mjs
+++ b/source/engine/common/model/parsers/ParsedQC.mjs
@@ -1,4 +1,4 @@
-import Q from '../../../../shared/Q.mjs';
+import Q from '../../../../shared/Q.ts';
 import Vector from '../../../../shared/Vector.ts';
 
 /** @typedef {import('../../../../shared/GameInterfaces.d.ts').ParsedQC} IParsedQC */
diff --git a/source/engine/network/MSG.mjs b/source/engine/network/MSG.mjs
index 4dd48795..bd3b68e7 100644
--- a/source/engine/network/MSG.mjs
+++ b/source/engine/network/MSG.mjs
@@ -1,4 +1,4 @@
-import Q from '../../shared/Q.mjs';
+import Q from '../../shared/Q.ts';
 import Vector from '../../shared/Vector.ts';
 import * as Protocol from '../network/Protocol.mjs';
 import { eventBus, registry } from '../registry.mjs';
diff --git a/source/engine/network/Network.mjs b/source/engine/network/Network.mjs
index 41ba45f8..e56c3582 100644
--- a/source/engine/network/Network.mjs
+++ b/source/engine/network/Network.mjs
@@ -1,6 +1,6 @@
 import Cmd from '../common/Cmd.mjs';
 import Cvar from '../common/Cvar.mjs';
-import Q from '../../shared/Q.mjs';
+import Q from '../../shared/Q.ts';
 import { eventBus, registry } from '../registry.mjs';
 import { SzBuffer } from './MSG.mjs';
 import { BaseDriver, LoopDriver, QSocket, WebRTCDriver, WebSocketDriver } from './NetworkDrivers.mjs';
diff --git a/source/engine/server/Client.mjs b/source/engine/server/Client.mjs
index 05c00223..4fda9933 100644
--- a/source/engine/server/Client.mjs
+++ b/source/engine/server/Client.mjs
@@ -1,4 +1,4 @@
-import { enumHelpers } from '../../shared/Q.mjs';
+import { enumHelpers } from '../../shared/Q.ts';
 import { gameCapabilities } from '../../shared/Defs.ts';
 import Vector from '../../shared/Vector.ts';
 import { SzBuffer } from '../network/MSG.mjs';
diff --git a/source/engine/server/Com.mjs b/source/engine/server/Com.mjs
index b5dc2ddf..d5a21d28 100644
--- a/source/engine/server/Com.mjs
+++ b/source/engine/server/Com.mjs
@@ -2,7 +2,7 @@
 
 import { promises as fsPromises, existsSync, writeFileSync, constants } from 'fs';
 
-import Q from '../../shared/Q.mjs';
+import Q from '../../shared/Q.ts';
 import { CRC16CCITT as CRC } from '../common/CRC.mjs';
 import COM from '../common/Com.mjs';
 
diff --git a/source/engine/server/Edict.mjs b/source/engine/server/Edict.mjs
index 459e7549..a02f08a2 100644
--- a/source/engine/server/Edict.mjs
+++ b/source/engine/server/Edict.mjs
@@ -4,7 +4,7 @@ import * as Protocol from '../network/Protocol.mjs';
 import * as Def from '../common/Def.mjs';
 import * as Defs from '../../shared/Defs.ts';
 import { eventBus, registry } from '../registry.mjs';
-import Q from '../../shared/Q.mjs';
+import Q from '../../shared/Q.ts';
 import { ConsoleCommand } from '../common/Cmd.mjs';
 import { ClientEdict } from '../client/ClientEntities.mjs';
 import { OctreeNode } from '../../shared/Octree.ts';
diff --git a/source/engine/server/Progs.mjs b/source/engine/server/Progs.mjs
index 947bc4fb..718bc5a3 100644
--- a/source/engine/server/Progs.mjs
+++ b/source/engine/server/Progs.mjs
@@ -2,7 +2,7 @@ import Cmd from '../common/Cmd.mjs';
 import { CRC16CCITT } from '../common/CRC.mjs';
 import Cvar from '../common/Cvar.mjs';
 import { HostError, MissingResourceError } from '../common/Errors.mjs';
-import Q from '../../shared/Q.mjs';
+import Q from '../../shared/Q.ts';
 import Vector from '../../shared/Vector.ts';
 import { eventBus, registry } from '../registry.mjs';
 import { ED, ServerEdict } from './Edict.mjs';
diff --git a/source/engine/server/Sys.mjs b/source/engine/server/Sys.mjs
index 39f794fb..f9fe5421 100644
--- a/source/engine/server/Sys.mjs
+++ b/source/engine/server/Sys.mjs
@@ -11,7 +11,7 @@ import { registry, eventBus } from '../registry.mjs';
 import Cvar from '../common/Cvar.mjs';
 /** @typedef {import('node:repl').REPLServer} REPLServer */
 import Cmd from '../common/Cmd.mjs';
-import Q from '../../shared/Q.mjs';
+import Q from '../../shared/Q.ts';
 import WorkerManager from '../common/WorkerManager.mjs';
 import workerFactories from '../common/WorkerFactories.mjs';
 
diff --git a/source/engine/server/physics/ServerPhysics.mjs b/source/engine/server/physics/ServerPhysics.mjs
index 996f4a56..e8b51af7 100644
--- a/source/engine/server/physics/ServerPhysics.mjs
+++ b/source/engine/server/physics/ServerPhysics.mjs
@@ -1,6 +1,6 @@
 import Vector from '../../../shared/Vector.ts';
 import * as Defs from '../../../shared/Defs.ts';
-import Q from '../../../shared/Q.mjs';
+import Q from '../../../shared/Q.ts';
 import { eventBus, registry } from '../../registry.mjs';
 import {
   GROUND_ANGLE_THRESHOLD,
diff --git a/source/shared/GameInterfaces.d.ts b/source/shared/GameInterfaces.d.ts
index fadee334..036be442 100644
--- a/source/shared/GameInterfaces.d.ts
+++ b/source/shared/GameInterfaces.d.ts
@@ -12,8 +12,8 @@ export type ServerEdict = Readonly<ServerEdict>;
 export type GLTexture = import("../engine/client/GL.mjs").GLTexture;
 export type Cvar = Readonly<import("../engine/common/Cvar.mjs").default>;
 
-export type PmoveConfiguration = Readonly<import("../shared/Pmove.mjs").PmoveConfiguration>;
-export type PmoveQuake2Configuration = Readonly<import("../shared/Pmove.mjs").PmoveQuake2Configuration>;
+export type PmoveConfiguration = Readonly<import("../shared/Pmove.ts").PmoveConfiguration>;
+export type PmoveQuake2Configuration = Readonly<import("../shared/Pmove.ts").PmoveQuake2Configuration>;
 
 export type SerializableType = (string | number | boolean | Vector | ServerEdict | SerializableType[] | null);
 
diff --git a/source/shared/Keys.mjs b/source/shared/Keys.mjs
deleted file mode 100644
index 344ac7cb..00000000
--- a/source/shared/Keys.mjs
+++ /dev/null
@@ -1,45 +0,0 @@
-
-/** Special keys */
-export const K = Object.freeze({
-  TAB: 9,
-  ENTER: 13,
-  ESCAPE: 27,
-  SPACE: 32,
-
-  BACKSPACE: 127,
-  UPARROW: 128,
-  DOWNARROW: 129,
-  LEFTARROW: 130,
-  RIGHTARROW: 131,
-
-  ALT: 132,
-  CTRL: 133,
-  SHIFT: 134,
-  F1: 135,
-  F2: 136,
-  F3: 137,
-  F4: 138,
-  F5: 139,
-  F6: 140,
-  F7: 141,
-  F8: 142,
-  F9: 143,
-  F10: 144,
-  F11: 145,
-  F12: 146,
-  INS: 147,
-  DEL: 148,
-  PGDN: 149,
-  PGUP: 150,
-  HOME: 151,
-  END: 152,
-
-  PAUSE: 255,
-
-  MOUSE1: 200,
-  MOUSE2: 201,
-  MOUSE3: 202,
-
-  MWHEELUP: 239,
-  MWHEELDOWN: 240,
-});
diff --git a/source/shared/Keys.ts b/source/shared/Keys.ts
new file mode 100644
index 00000000..27438193
--- /dev/null
+++ b/source/shared/Keys.ts
@@ -0,0 +1,44 @@
+/** Special keys */
+export enum K {
+  TAB = 9,
+  ENTER = 13,
+  ESCAPE = 27,
+  SPACE = 32,
+
+  BACKSPACE = 127,
+  UPARROW = 128,
+  DOWNARROW = 129,
+  LEFTARROW = 130,
+  RIGHTARROW = 131,
+
+  ALT = 132,
+  CTRL = 133,
+  SHIFT = 134,
+  F1 = 135,
+  F2 = 136,
+  F3 = 137,
+  F4 = 138,
+  F5 = 139,
+  F6 = 140,
+  F7 = 141,
+  F8 = 142,
+  F9 = 143,
+  F10 = 144,
+  F11 = 145,
+  F12 = 146,
+  INS = 147,
+  DEL = 148,
+  PGDN = 149,
+  PGUP = 150,
+  HOME = 151,
+  END = 152,
+
+  PAUSE = 255,
+
+  MOUSE1 = 200,
+  MOUSE2 = 201,
+  MOUSE3 = 202,
+
+  MWHEELUP = 239,
+  MWHEELDOWN = 240,
+}
diff --git a/source/shared/Pmove.mjs b/source/shared/Pmove.mjs
deleted file mode 100644
index 71b3ad73..00000000
--- a/source/shared/Pmove.mjs
+++ /dev/null
@@ -1,55 +0,0 @@
-
-/**
- * Pmove constant defaults.
- *
- * These will give player movement that feels more like Q1 (from QuakeWorld).
- */
-export class PmoveConfiguration {
-  /** @type {number} distance to probe forward for water jump wall detection */
-  forwardProbe = 24;
-  /** @type {number} Z offset for wall check in water jump detection */
-  wallcheckZ = 8;
-  /** @type {number} Z offset for empty space check above wall in water jump */
-  emptycheckZ = 24;
-  /** @type {number} upward velocity when exiting water via water jump */
-  waterExitVelocity = 310;
-  /** @type {number} multiplier applied to wish speed when swimming */
-  waterspeedMultiplier = 0.7;
-  /** @type {number} overbounce factor for velocity clipping (1.0 = QW, 1.01 = Q2) */
-  overbounce = 1.0;
-  /** @type {number} distance below feet for ground detection trace */
-  groundCheckDepth = 1.0;
-  /** @type {number} pitch divisor for ground angle vectors (0 = no scaling, 3 = Q2-style) */
-  pitchDivisor = 0;
-  /** @type {boolean} clamp jump velocity to a minimum of 270 */
-  jumpMinClamp = false;
-  /** @type {boolean} apply landing cooldown (PMF_TIME_LAND) preventing immediate re-jump */
-  landingCooldown = false;
-  /** @type {boolean} prevent swimming jump when sinking faster than -300 */
-  swimJumpGuard = false;
-  /** @type {boolean} fall back to regular accelerate when airaccelerate is 0 */
-  airAccelFallback = false;
-  /** @type {boolean} apply edge friction when near dropoffs */
-  edgeFriction = true;
-};
-
-/**
- * Quake 2 defaults.
- *
- * This will give player movement that original Quake 2 feeling.
- */
-export class PmoveQuake2Configuration extends PmoveConfiguration {
-  forwardProbe = 30;
-  wallcheckZ = 4;
-  emptycheckZ = 16;
-  waterExitVelocity = 350;
-  waterspeedMultiplier = 0.5;
-  overbounce = 1.01;
-  groundCheckDepth = 0.25;
-  pitchDivisor = 3;
-  jumpMinClamp = true;
-  landingCooldown = true;
-  swimJumpGuard = true;
-  airAccelFallback = true;
-  edgeFriction = false;
-};
diff --git a/source/shared/Pmove.ts b/source/shared/Pmove.ts
new file mode 100644
index 00000000..a1525828
--- /dev/null
+++ b/source/shared/Pmove.ts
@@ -0,0 +1,54 @@
+/**
+ * Pmove constant defaults.
+ *
+ * These will give player movement that feels more like Q1 (from QuakeWorld).
+ */
+export class PmoveConfiguration {
+  /** distance to probe forward for water jump wall detection */
+  forwardProbe = 24;
+  /** Z offset for wall check in water jump detection */
+  wallcheckZ = 8;
+  /** Z offset for empty space check above wall in water jump */
+  emptycheckZ = 24;
+  /** upward velocity when exiting water via water jump */
+  waterExitVelocity = 310;
+  /** multiplier applied to wish speed when swimming */
+  waterspeedMultiplier = 0.7;
+  /** overbounce factor for velocity clipping (1.0 = QW, 1.01 = Q2) */
+  overbounce = 1.0;
+  /** distance below feet for ground detection trace */
+  groundCheckDepth = 1.0;
+  /** pitch divisor for ground angle vectors (0 = no scaling, 3 = Q2-style) */
+  pitchDivisor = 0;
+  /** clamp jump velocity to a minimum of 270 */
+  jumpMinClamp = false;
+  /** apply landing cooldown (PMF_TIME_LAND) preventing immediate re-jump */
+  landingCooldown = false;
+  /** prevent swimming jump when sinking faster than -300 */
+  swimJumpGuard = false;
+  /** fall back to regular accelerate when airaccelerate is 0 */
+  airAccelFallback = false;
+  /** apply edge friction when near dropoffs */
+  edgeFriction = true;
+}
+
+/**
+ * Quake 2 defaults.
+ *
+ * This will give player movement that original Quake 2 feeling.
+ */
+export class PmoveQuake2Configuration extends PmoveConfiguration {
+  forwardProbe = 30;
+  wallcheckZ = 4;
+  emptycheckZ = 16;
+  waterExitVelocity = 350;
+  waterspeedMultiplier = 0.5;
+  overbounce = 1.01;
+  groundCheckDepth = 0.25;
+  pitchDivisor = 3;
+  jumpMinClamp = true;
+  landingCooldown = true;
+  swimJumpGuard = true;
+  airAccelFallback = true;
+  edgeFriction = false;
+}
diff --git a/source/shared/Q.mjs b/source/shared/Q.ts
similarity index 62%
rename from source/shared/Q.mjs
rename to source/shared/Q.ts
index 1c4ef014..e196b2da 100644
--- a/source/shared/Q.mjs
+++ b/source/shared/Q.ts
@@ -1,16 +1,20 @@
 import { EPSILON } from './Defs.ts';
 
+type ByteArray = Uint8Array | number[];
+type EnumValue = string | number | null;
+type EnumRecord = Record<string, EnumValue>;
+
 /**
  * Utility class for common engine functions.
  */
 export default class Q {
   /**
    * Converts a Uint8Array or array of bytes to a string, stopping at the first zero byte.
-   * @param {Uint8Array|number[]} src - Source byte array.
-   * @returns {string} The resulting string.
+   * @param src source byte array
+   * @returns the resulting string
    */
-  static memstr(src) {
-    const dest = [];
+  static memstr(src: ByteArray): string {
+    const dest: string[] = [];
     for (let i = 0; i < src.length; i++) {
       if (src[i] === 0) {
         break;
@@ -22,10 +26,10 @@ export default class Q {
 
   /**
    * Converts a string to an ArrayBuffer of bytes (8-bit, zero-padded).
-   * @param {string} src - Source string.
-   * @returns {ArrayBuffer} The resulting ArrayBuffer.
+   * @param src source string
+   * @returns the resulting ArrayBuffer
    */
-  static strmem(src) {
+  static strmem(src: string): ArrayBuffer {
     const buf = new ArrayBuffer(src.length);
     const dest = new Uint8Array(buf);
     for (let i = 0; i < src.length; i++) {
@@ -36,43 +40,44 @@ export default class Q {
 
   /**
    * Checks if a value is NaN.
-   * @param {number} value - Value to check.
-   * @returns {boolean} True if value is NaN.
+   * @param value value to check
+   * @returns true if value is NaN
    */
-  static isNaN(value) {
+  static isNaN(value: number): boolean {
     return Number.isNaN(value);
   }
 
   /**
    * Converts a string to an integer.
    * NOTE: Use `+value|0` during regular use in the main/rendering loop.
-   * @param {string} value - String to convert.
-   * @returns {number} The integer value.
+   * @param value string to convert
+   * @returns the integer value
    */
-  static atoi(value) {
+  static atoi(value: string): number {
     return parseInt(value);
   }
 
   /**
    * Converts a string to a float.
    * NOTE: Use `+value` during regular use in the main/rendering loop.
-   * @param {string} value - String to convert.
-   * @returns {number} The float value.
+   * @param value string to convert
+   * @returns the float value
    */
-  static atof(value) {
+  static atof(value: string): number {
     return parseFloat(value);
   }
 
   /**
    * Encodes a byte array to a base64 string.
-   * @param {Uint8Array|number[]} src - Source byte array.
-   * @returns {string} Base64-encoded string.
+   * @param src source byte array
+   * @returns base64-encoded string
    */
-  static btoa(src) {
+  static btoa(src: ByteArray): string {
     const str = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/';
-    const val = [];
+    const val: string[] = [];
     const len = src.length - (src.length % 3);
-    let c; let i;
+    let c: number;
+    let i: number;
     for (i = 0; i < len; i += 3) {
       c = (src[i] << 16) + (src[i + 1] << 8) + src[i + 2];
       val[val.length] = str.charAt(c >> 18) + str.charAt((c >> 12) & 63) + str.charAt((c >> 6) & 63) + str.charAt(c & 63);
@@ -89,11 +94,11 @@ export default class Q {
 
   /**
    * Turns seconds like 3692 into a string like "01:01:32".
-   * @param {number} secs seconds
-   * @returns {string} hours:mins:seconds
+   * @param secs seconds
+   * @returns hours:mins:seconds
    */
-  static secsToTime(secs) {
-    let negative = secs < 0;
+  static secsToTime(secs: number): string {
+    const negative = secs < 0;
     let seconds = Math.floor(Math.abs(secs));
     let minutes = Math.floor(seconds / 60);
     let hours = 0;
@@ -110,32 +115,32 @@ export default class Q {
 
   /**
    * Yields execution to the event loop (async).
-   * @returns {Promise<void>} Promise that resolves on next tick.
+   * @returns promise that resolves on next tick
    */
-  static yield() {
+  static yield(): Promise<void> {
     return new Promise((resolve) => setTimeout(resolve, 0));
   }
 
   /**
    * Sleeps for a given number of milliseconds (async).
-   * @param {number} msec - Milliseconds to sleep.
-   * @returns {Promise<void>} Promise that resolves after the delay.
+   * @param msec milliseconds to sleep
+   * @returns promise that resolves after the delay
    */
-  static sleep(msec) {
+  static sleep(msec: number): Promise<void> {
     return new Promise((resolve) => setTimeout(resolve, msec));
   }
 
   /**
    * Compares two floating point numbers for near-equality.
-   * @param {number} a - First number.
-   * @param {number} b - Second number.
-   * @param {number} epsilon Tolerance for comparison, optional.
-   * @returns {boolean} True if numbers are nearly equal.
+   * @param a first number
+   * @param b second number
+   * @param epsilon tolerance for comparison, optional
+   * @returns true if numbers are nearly equal
    */
-  static compareFloat(a, b, epsilon = EPSILON) {
+  static compareFloat(a: number, b: number, epsilon = EPSILON): boolean {
     return Math.abs(a - b) < epsilon;
   }
-};
+}
 
 /**
  * Helper functions for enums.
@@ -143,20 +148,18 @@ export default class Q {
  */
 export const enumHelpers = Object.freeze({
   /**
-   * @param {string|number|null} val enum value
-   * @returns {string} enum key
+   * @param val enum value
+   * @returns enum key
    */
-  toKey(val) {
-    // @ts-ignore
-    return /** @type {string} */ (Object.entries(this).find(([, v]) => v === val)?.[0] ?? `unknown (${val})`);
+  toKey(this: EnumRecord, val: EnumValue): string {
+    return Object.entries(this).find(([, value]) => value === val)?.[0] ?? `unknown (${val})`;
   },
 
   /**
-   * @param {string} name enum key
-   * @returns {string|number|null} enum value
+   * @param name enum key
+   * @returns enum value
    */
-  fromKey(name) {
-    // @ts-ignore
+  fromKey(this: EnumRecord, name: string): EnumValue {
     return this[name] ?? null;
   },
 });
diff --git a/source/shared/index.mjs b/source/shared/index.mjs
index 9f65ea46..564e26eb 100644
--- a/source/shared/index.mjs
+++ b/source/shared/index.mjs
@@ -1,7 +1,8 @@
 export { default as sampleBSpline } from './BSpline.ts';
 export * from './ClientEdict.mjs';
 export * from './Defs.ts';
-export * from './Keys.mjs';
+export * from './Keys.ts';
 export * from './Octree.ts';
-export { default as Q } from './Q.mjs';
+export * from './Pmove.ts';
+export { default as Q } from './Q.ts';
 export * from './Vector.ts';
diff --git a/test/common/keys.test.mjs b/test/common/keys.test.mjs
new file mode 100644
index 00000000..9eed200a
--- /dev/null
+++ b/test/common/keys.test.mjs
@@ -0,0 +1,13 @@
+import assert from 'node:assert/strict';
+import { describe, test } from 'node:test';
+
+import { K } from '../../source/shared/Keys.ts';
+
+void describe('K', () => {
+  void test('keeps the expected keyboard and mouse bindings', () => {
+    assert.equal(K.ENTER, 13);
+    assert.equal(K.ESCAPE, 27);
+    assert.equal(K.MOUSE1, 200);
+    assert.equal(K.MWHEELDOWN, 240);
+  });
+});
diff --git a/test/common/pmove-config.test.mjs b/test/common/pmove-config.test.mjs
new file mode 100644
index 00000000..215de3ca
--- /dev/null
+++ b/test/common/pmove-config.test.mjs
@@ -0,0 +1,25 @@
+import assert from 'node:assert/strict';
+import { describe, test } from 'node:test';
+
+import { PmoveConfiguration, PmoveQuake2Configuration } from '../../source/shared/Pmove.ts';
+
+void describe('PmoveConfiguration', () => {
+  void test('keeps the QuakeWorld-style defaults', () => {
+    const config = new PmoveConfiguration();
+
+    assert.equal(config.forwardProbe, 24);
+    assert.equal(config.overbounce, 1.0);
+    assert.equal(config.pitchDivisor, 0);
+    assert.equal(config.edgeFriction, true);
+  });
+
+  void test('applies the Quake 2 overrides in the subclass', () => {
+    const config = new PmoveQuake2Configuration();
+
+    assert.equal(config.forwardProbe, 30);
+    assert.equal(config.overbounce, 1.01);
+    assert.equal(config.pitchDivisor, 3);
+    assert.equal(config.edgeFriction, false);
+    assert.equal(config.landingCooldown, true);
+  });
+});
diff --git a/test/common/q.test.mjs b/test/common/q.test.mjs
new file mode 100644
index 00000000..459833e5
--- /dev/null
+++ b/test/common/q.test.mjs
@@ -0,0 +1,36 @@
+import assert from 'node:assert/strict';
+import { describe, test } from 'node:test';
+
+import Q, { AsyncFunction, enumHelpers } from '../../source/shared/Q.ts';
+
+void describe('Q', () => {
+  void test('round-trips strings through byte buffers', () => {
+    const bytes = new Uint8Array(Q.strmem('quake'));
+
+    assert.equal(Q.memstr(bytes), 'quake');
+  });
+
+  void test('compares floats with epsilon tolerance', () => {
+    assert.equal(Q.compareFloat(1.0, 1.0 + 1e-9), true);
+    assert.equal(Q.compareFloat(1.0, 1.1), false);
+  });
+
+  void test('provides enum helper lookups', () => {
+    const testEnum = Object.freeze({
+      READY: 1,
+      DONE: 2,
+      ...enumHelpers,
+    });
+
+    assert.equal(testEnum.toKey(2), 'DONE');
+    assert.equal(testEnum.fromKey('READY'), 1);
+    assert.equal(testEnum.fromKey('MISSING'), null);
+  });
+
+  void test('exposes the async function constructor', () => {
+    assert.equal(typeof AsyncFunction, 'function');
+    const asyncFunction = new AsyncFunction('return 42;');
+
+    assert.equal(asyncFunction.constructor, AsyncFunction);
+  });
+});

From f82f9fc07314915dcfde544c3f81409fa6974299 Mon Sep 17 00:00:00 2001
From: Christian R <github@chrisnew.de>
Date: Thu, 2 Apr 2026 13:21:08 +0300
Subject: [PATCH 07/67] TS: ClientEdict

---
 source/engine/client/ClientEntities.mjs       |  2 +-
 source/engine/client/ClientLegacy.mjs         |  2 +-
 .../{ClientEdict.mjs => ClientEdict.ts}       | 19 +++++++++------
 source/shared/GameInterfaces.d.ts             |  2 +-
 source/shared/index.mjs                       |  8 -------
 test/common/client-edict.test.mjs             | 23 +++++++++++++++++++
 6 files changed, 38 insertions(+), 18 deletions(-)
 rename source/shared/{ClientEdict.mjs => ClientEdict.ts} (63%)
 delete mode 100644 source/shared/index.mjs
 create mode 100644 test/common/client-edict.test.mjs

diff --git a/source/engine/client/ClientEntities.mjs b/source/engine/client/ClientEntities.mjs
index 5c93fa10..4320569a 100644
--- a/source/engine/client/ClientEntities.mjs
+++ b/source/engine/client/ClientEntities.mjs
@@ -4,7 +4,7 @@ import * as Def from '../common/Def.mjs';
 import { content, effect, solid } from '../../shared/Defs.ts';
 import Chase from './Chase.mjs';
 import { DefaultClientEdictHandler } from './ClientLegacy.mjs';
-import { BaseClientEdictHandler } from '../../shared/ClientEdict.mjs';
+import { BaseClientEdictHandler } from '../../shared/ClientEdict.ts';
 import { ClientEngineAPI } from '../common/GameAPIs.mjs';
 import { SFX } from './Sound.mjs';
 import { Node, revealedVisibility } from '../common/model/BSP.mjs';
diff --git a/source/engine/client/ClientLegacy.mjs b/source/engine/client/ClientLegacy.mjs
index af1502e0..5332671a 100644
--- a/source/engine/client/ClientLegacy.mjs
+++ b/source/engine/client/ClientLegacy.mjs
@@ -5,7 +5,7 @@
 
 import Vector from '../../shared/Vector.ts';
 import { effect, modelFlags } from '../../shared/Defs.ts';
-import { BaseClientEdictHandler } from '../../shared/ClientEdict.mjs';
+import { BaseClientEdictHandler } from '../../shared/ClientEdict.ts';
 
 import { registry, eventBus } from '../registry.mjs';
 
diff --git a/source/shared/ClientEdict.mjs b/source/shared/ClientEdict.ts
similarity index 63%
rename from source/shared/ClientEdict.mjs
rename to source/shared/ClientEdict.ts
index a50736a1..75225e7e 100644
--- a/source/shared/ClientEdict.mjs
+++ b/source/shared/ClientEdict.ts
@@ -1,14 +1,19 @@
+import type { ClientEdict } from '../engine/client/ClientEntities.mjs';
 
-
-/** @typedef {import('../engine/client/ClientEntities.mjs').ClientEdict} ClientEdict */
-/** @typedef {typeof import('../engine/common/GameAPIs.mjs').ClientEngineAPI} ClientEngineAPI */
+type ClientEngineAPI = typeof import('../engine/common/GameAPIs.mjs').ClientEngineAPI;
 
 export class BaseClientEdictHandler {
   /**
-   * @param {ClientEdict} clientEdict client edict instance
-   * @param {ClientEngineAPI} engineAPI client engine API
+   * Client edict instance.
    */
-  constructor(clientEdict, engineAPI) {
+  clientEdict: ClientEdict;
+
+  /**
+   * Client engine API.
+   */
+  engine: ClientEngineAPI;
+
+  constructor(clientEdict: ClientEdict, engineAPI: ClientEngineAPI) {
     this.clientEdict = clientEdict;
     this.engine = engineAPI;
   }
@@ -32,4 +37,4 @@ export class BaseClientEdictHandler {
    */
   think() {
   }
-};
+}
diff --git a/source/shared/GameInterfaces.d.ts b/source/shared/GameInterfaces.d.ts
index 036be442..4a12d784 100644
--- a/source/shared/GameInterfaces.d.ts
+++ b/source/shared/GameInterfaces.d.ts
@@ -1,4 +1,4 @@
-import { BaseClientEdictHandler } from "./ClientEdict.mjs";
+import { BaseClientEdictHandler } from "./ClientEdict.ts";
 import { ClientEngineAPI, ServerEngineAPI } from "../engine/common/GameAPIs.mjs";
 import { ServerEdict } from "../engine/server/Edict.mjs";
 import Vector from "./Vector.ts";
diff --git a/source/shared/index.mjs b/source/shared/index.mjs
deleted file mode 100644
index 564e26eb..00000000
--- a/source/shared/index.mjs
+++ /dev/null
@@ -1,8 +0,0 @@
-export { default as sampleBSpline } from './BSpline.ts';
-export * from './ClientEdict.mjs';
-export * from './Defs.ts';
-export * from './Keys.ts';
-export * from './Octree.ts';
-export * from './Pmove.ts';
-export { default as Q } from './Q.ts';
-export * from './Vector.ts';
diff --git a/test/common/client-edict.test.mjs b/test/common/client-edict.test.mjs
new file mode 100644
index 00000000..74cfcac5
--- /dev/null
+++ b/test/common/client-edict.test.mjs
@@ -0,0 +1,23 @@
+import assert from 'node:assert/strict';
+import { describe, test } from 'node:test';
+
+import { BaseClientEdictHandler } from '../../source/shared/ClientEdict.ts';
+
+void describe('BaseClientEdictHandler', () => {
+  void test('stores the provided client edict and engine API references', () => {
+    const clientEdict = { num: 7 };
+    const engineAPI = { Draw: 'noop' };
+    const handler = new BaseClientEdictHandler(clientEdict, engineAPI);
+
+    assert.equal(handler.clientEdict, clientEdict);
+    assert.equal(handler.engine, engineAPI);
+  });
+
+  void test('keeps the base lifecycle hooks as no-ops', () => {
+    const handler = new BaseClientEdictHandler({}, {});
+
+    assert.equal(handler.spawn(), undefined);
+    assert.equal(handler.emit(), undefined);
+    assert.equal(handler.think(), undefined);
+  });
+});

From 39c7e1c6f14ceb71fe5ee2ef7fe7890b49f5d16e Mon Sep 17 00:00:00 2001
From: Christian R <github@chrisnew.de>
Date: Thu, 2 Apr 2026 13:26:46 +0300
Subject: [PATCH 08/67] removed d.ts for EventBus and registry

---
 source/engine/registry.d.ts | 71 -------------------------------------
 source/engine/registry.mjs  | 49 +++++++++++++++++++++++--
 source/shared/EventBus.d.ts | 32 -----------------
 3 files changed, 46 insertions(+), 106 deletions(-)
 delete mode 100644 source/engine/registry.d.ts
 delete mode 100644 source/shared/EventBus.d.ts

diff --git a/source/engine/registry.d.ts b/source/engine/registry.d.ts
deleted file mode 100644
index 96e0ee86..00000000
--- a/source/engine/registry.d.ts
+++ /dev/null
@@ -1,71 +0,0 @@
-import type WebSocketClass from 'ws';
-import type _Con from './common/Console.mjs';
-import type _Com from './common/Com.mjs';
-import type _Sys from './common/Sys.mjs';
-import type _Host from './common/Host.mjs';
-import type _V from './client/V.mjs';
-import type _NET from './network/Network.mjs';
-import type _SV from './server/Server.mjs';
-import type _PR from './server/Progs.mjs';
-import type _Mod from './common/Mod.mjs';
-import type _CL from './client/CL.mjs';
-import type _SCR from './client/SCR.mjs';
-import type _R from './client/R.mjs';
-import type _Draw from './client/Draw.mjs';
-import type _Key from './client/Key.mjs';
-import type _Sbar from './client/Sbar.mjs';
-import type _S from './client/Sound.mjs';
-import type _M from './client/Menu.mjs';
-import type _IN from './client/IN.mjs';
-import { BuildConfig, URLs } from './build-config';
-
-type Con = typeof _Con;
-type Com = typeof _Com;
-type Sys = typeof _Sys;
-type Host = typeof _Host;
-type V = typeof _V;
-type NET = typeof _NET;
-type SV = typeof _SV;
-type PR = typeof _PR;
-type Mod = typeof _Mod;
-type CL = typeof _CL;
-type SCR = typeof _SCR;
-type R = typeof _R;
-type Draw = typeof _Draw;
-type Key = typeof _Key;
-type Sbar = typeof _Sbar;
-type S = typeof _S;
-type M = typeof _M;
-type IN = typeof _IN;
-type WebSocket = typeof WebSocketClass;
-
-interface Registry {
-  isDedicatedServer?: boolean;
-  isInsideWorker: boolean;
-
-  COM?: Com;
-  Con?: Con;
-  Host?: Host;
-  Sys?: Sys;
-  V?: V;
-  SV?: SV;
-  PR?: PR;
-  NET?: NET;
-  Mod?: Mod;
-  CL?: CL;
-  SCR?: SCR;
-  R?: R;
-  Draw?: Draw;
-  Key?: Key;
-  IN?: IN;
-  Sbar?: Sbar;
-  S?: S;
-  M?: M;
-
-  WebSocket?: WebSocket;
-
-  urls?: URLs;
-  buildConfig?: BuildConfig;
-};
-
-export const registry: Registry;
diff --git a/source/engine/registry.mjs b/source/engine/registry.mjs
index 5b4241e6..00027310 100644
--- a/source/engine/registry.mjs
+++ b/source/engine/registry.mjs
@@ -1,10 +1,55 @@
 
+/** @typedef {typeof import('./common/Console.mjs').default} ConModule */
+/** @typedef {typeof import('./common/Com.mjs').default} ComModule */
+/** @typedef {typeof import('./common/Sys.mjs').default} SysModule */
+/** @typedef {typeof import('./common/Host.mjs').default} HostModule */
+/** @typedef {typeof import('./client/V.mjs').default} VModule */
+/** @typedef {typeof import('./network/Network.mjs').default} NetModule */
+/** @typedef {typeof import('./server/Server.mjs').default} ServerModule */
+/** @typedef {typeof import('./server/Progs.mjs').default} ProgsModule */
+/** @typedef {typeof import('./common/Mod.mjs').default} ModModule */
+/** @typedef {typeof import('./client/CL.mjs').default} ClientModule */
+/** @typedef {typeof import('./client/SCR.mjs').default} ScrModule */
+/** @typedef {typeof import('./client/R.mjs').default} RendererModule */
+/** @typedef {typeof import('./client/Draw.mjs').default} DrawModule */
+/** @typedef {typeof import('./client/Key.mjs').default} KeyModule */
+/** @typedef {typeof import('./client/Sbar.mjs').default} SbarModule */
+/** @typedef {typeof import('./client/Sound.mjs').default} SoundModule */
+/** @typedef {typeof import('./client/Menu.mjs').default} MenuModule */
+/** @typedef {typeof import('./client/IN.mjs').default} InputModule */
+/** @typedef {typeof import('ws').default} WebSocketClass */
+/** @typedef {import('./build-config').BuildConfig} BuildConfig */
+/** @typedef {import('./build-config').URLs} URLs */
 /**
  * Registry for engine components.
  * Unfortunately, the engine components are too tightly coupled, that’s why we need a registry for the time being.
  * NOTE: Before adding more components here, consider refactoring the code to use ES6 modules and imports.
- * @type {import('./registry').Registry}
+ * @typedef {object} Registry
+ * @property {ComModule | undefined} COM command and filesystem module
+ * @property {ConModule | undefined} Con console output module
+ * @property {HostModule | undefined} Host engine host lifecycle module
+ * @property {NetModule | undefined} NET networking module
+ * @property {DrawModule | undefined} Draw 2D drawing module
+ * @property {SysModule | undefined} Sys platform system module
+ * @property {VModule | undefined} V view and camera module
+ * @property {ClientModule | undefined} CL client runtime module
+ * @property {ServerModule | undefined} SV server runtime module
+ * @property {ModModule | undefined} Mod model loading and cache module
+ * @property {ProgsModule | undefined} PR game program interface module
+ * @property {RendererModule | undefined} R renderer module
+ * @property {ScrModule | undefined} SCR screen and HUD module
+ * @property {KeyModule | undefined} Key input binding module
+ * @property {InputModule | undefined} IN low-level input module
+ * @property {SbarModule | undefined} Sbar status bar module
+ * @property {SoundModule | undefined} S audio module
+ * @property {MenuModule | undefined} M menu module
+ * @property {WebSocketClass | undefined} WebSocket injected WebSocket constructor
+ * @property {URLs | undefined} urls runtime URL providers
+ * @property {BuildConfig | undefined} buildConfig build-time configuration snapshot
+ * @property {boolean} isDedicatedServer true when running in server mode
+ * @property {boolean} isInsideWorker true when running inside a worker
  */
+/** @type {Registry} */
 export const registry = {
   COM: undefined,
   Con: undefined,
@@ -38,8 +83,6 @@ export const registry = {
 // make sure the registry is not extensible beyond the defined properties
 Object.seal(registry);
 
-/** @typedef {import('../shared/EventBus').EventBus} EventBusT */
-/** @augments EventBusT */
 export class EventBus {
   /** @type {Map<string, Set<Function>>} */
   #listeners = new Map();
diff --git a/source/shared/EventBus.d.ts b/source/shared/EventBus.d.ts
deleted file mode 100644
index 8e77bc7f..00000000
--- a/source/shared/EventBus.d.ts
+++ /dev/null
@@ -1,32 +0,0 @@
-
-export interface EventBus {
-  /**
-   * Initializes the event bus with a name.
-   * @param {string} name The name of the event bus.
-   */
-  constructor(name: string): void;
-
-  /**
-   * Publishes an event, calling all registered listeners for that event type.
-   * NOTE: Make sure to use arguments that are serializable. Events might be sent over the network or/and to Web Workers.
-   * @param {string} eventName The event type to trigger.
-   * @param {...any} args The arguments to pass to the event listeners.
-   */
-  publish(eventName: string, ...args: any): void;
-
-  /**
-   * Registers an event listener for a specific event type.
-   * @param {string} eventName The event type to listen for.
-   * @param {Function} listener The function to call when the event is triggered.
-   * @returns {Function} A function to remove the listener.
-   */
-  subscribe(eventName: string, listener: Function): Function;
-
-  /**
-   * Unsubscribes from all events.
-   */
-  unsubscribeAll(): void;
-
-  /** All subscribed topics. */
-  get topics(): string[];
-};

From 4872e7b736e623903f47387ccfd80e3bfe1b5421 Mon Sep 17 00:00:00 2001
From: Christian R <github@chrisnew.de>
Date: Thu, 2 Apr 2026 13:33:45 +0300
Subject: [PATCH 09/67] TS: GameInterfaces

---
 .../engine/common/model/parsers/ParsedQC.mjs  |   2 +-
 source/engine/server/GameLoader.d.ts          |   8 +-
 ...{GameInterfaces.d.ts => GameInterfaces.ts} | 100 +++++++++---------
 3 files changed, 56 insertions(+), 54 deletions(-)
 rename source/shared/{GameInterfaces.d.ts => GameInterfaces.ts} (50%)

diff --git a/source/engine/common/model/parsers/ParsedQC.mjs b/source/engine/common/model/parsers/ParsedQC.mjs
index fa3a5f4a..29207976 100644
--- a/source/engine/common/model/parsers/ParsedQC.mjs
+++ b/source/engine/common/model/parsers/ParsedQC.mjs
@@ -1,7 +1,7 @@
 import Q from '../../../../shared/Q.ts';
 import Vector from '../../../../shared/Vector.ts';
 
-/** @typedef {import('../../../../shared/GameInterfaces.d.ts').ParsedQC} IParsedQC */
+/** @typedef {import('../../../../shared/GameInterfaces').ParsedQC} IParsedQC */
 /** @augments IParsedQC */
 export default class ParsedQC {
   /** @type {string} */
diff --git a/source/engine/server/GameLoader.d.ts b/source/engine/server/GameLoader.d.ts
index 6ebcea25..18c65642 100644
--- a/source/engine/server/GameLoader.d.ts
+++ b/source/engine/server/GameLoader.d.ts
@@ -1,5 +1,5 @@
-import { ClientGameInterface, ServerGameInterface } from "../../shared/GameInterfaces";
-import { gameCapabilities } from "../../shared/Defs.ts";
+import { ClientGameConstructor, ServerGameConstructor } from '../../shared/GameInterfaces.ts';
+import { gameCapabilities } from '../../shared/Defs.ts';
 
 export interface GameModuleIdentification {
   name: string;
@@ -10,8 +10,8 @@ export interface GameModuleIdentification {
 
 export interface GameModuleInterface {
   identification: GameModuleIdentification,
-  ServerGameAPI: ServerGameInterface;
-  ClientGameAPI: ClientGameInterface;
+  ServerGameAPI: ServerGameConstructor;
+  ClientGameAPI: ClientGameConstructor;
 };
 
 export async function loadGameModule(gameDir: string): Promise<GameModuleInterface>;
diff --git a/source/shared/GameInterfaces.d.ts b/source/shared/GameInterfaces.ts
similarity index 50%
rename from source/shared/GameInterfaces.d.ts
rename to source/shared/GameInterfaces.ts
index 4a12d784..0bf86820 100644
--- a/source/shared/GameInterfaces.d.ts
+++ b/source/shared/GameInterfaces.ts
@@ -1,28 +1,28 @@
-import { BaseClientEdictHandler } from "./ClientEdict.ts";
-import { ClientEngineAPI, ServerEngineAPI } from "../engine/common/GameAPIs.mjs";
-import { ServerEdict } from "../engine/server/Edict.mjs";
-import Vector from "./Vector.ts";
-import { StartGameInterface } from "../engine/client/ClientLifecycle.mjs";
+import type { BaseClientEdictHandler } from './ClientEdict.ts';
+import type { ClientEngineAPI as ClientEngineApiValue, ServerEngineAPI as ServerEngineApiValue } from '../engine/common/GameAPIs.mjs';
+import type { ServerEdict as ServerEdictValue } from '../engine/server/Edict.mjs';
+import type Vector from './Vector.ts';
+import type { StartGameInterface } from '../engine/client/ClientLifecycle.mjs';
+import type { BaseModel } from '../engine/common/model/BaseModel.mjs';
 
-export type ClientEngineAPI = Readonly<typeof ClientEngineAPI>;
-export type ServerEngineAPI = Readonly<typeof ServerEngineAPI>;
-export type ServerEdict = Readonly<ServerEdict>;
+export type ClientEngineAPI = Readonly<typeof ClientEngineApiValue>;
+export type ServerEngineAPI = Readonly<typeof ServerEngineApiValue>;
+export type ServerEdict = Readonly<ServerEdictValue>;
 
-//export type GLTexture = Readonly<import("../engine/client/GL.mjs").GLTexture>;
-export type GLTexture = import("../engine/client/GL.mjs").GLTexture;
-export type Cvar = Readonly<import("../engine/common/Cvar.mjs").default>;
+export type GLTexture = import('../engine/client/GL.mjs').GLTexture;
+export type Cvar = Readonly<import('../engine/common/Cvar.mjs').default>;
 
-export type PmoveConfiguration = Readonly<import("../shared/Pmove.ts").PmoveConfiguration>;
-export type PmoveQuake2Configuration = Readonly<import("../shared/Pmove.ts").PmoveQuake2Configuration>;
+export type PmoveConfiguration = Readonly<import('../shared/Pmove.ts').PmoveConfiguration>;
+export type PmoveQuake2Configuration = Readonly<import('../shared/Pmove.ts').PmoveQuake2Configuration>;
 
-export type SerializableType = (string | number | boolean | Vector | ServerEdict | SerializableType[] | null);
+export type SerializableType = string | number | boolean | Vector | ServerEdict | SerializableType[] | null;
 
 export type ClientdataMap = Record<string, SerializableType>;
 
-export type EdictValueType = (string | number | boolean | Vector | null);
+export type EdictValueType = string | number | boolean | Vector | null;
 export type EdictData = Record<string, EdictValueType>;
 
-export type SFX = Readonly<import("../engine/client/Sound.mjs").SFX>;
+export type SFX = Readonly<import('../engine/client/Sound.mjs').SFX>;
 
 export type ViewmodelConfig = {
   visible: boolean;
@@ -35,11 +35,10 @@ export type ViewportDimensions = {
   height: number;
 };
 
-export type RefDef = { // TODO: move to engine shared, it’s V’s refdef
+export type RefDef = {
   vrect: ViewportDimensions;
   vieworg: Vector;
   viewangles: Vector;
-  // TODO: fov?
 };
 
 export interface ParsedQC {
@@ -50,76 +49,79 @@ export interface ParsedQC {
   frames: string[];
   animations: Record<string, number[]>;
   scale: number;
-};
+}
 
 export type ViewportResizeEvent = ViewportDimensions;
 
 export type ClientDamageEvent = {
-  damageReceived: number,
-  armorLost: number,
-  attackOrigin: Vector,
+  damageReceived: number;
+  armorLost: number;
+  attackOrigin: Vector;
 };
 
-export interface ClientGameInterface {
+export declare abstract class ClientGameInterface {
   clientdata: ClientdataMap | null;
   viewmodel: ViewmodelConfig | null;
 
-  // client initialization and shutdown methods
   init(): void;
   shutdown(): void;
 
-  // client main loop methods
   startFrame(): void;
   draw(): void;
   drawLoading(): void;
 
-  // serialization methods (for saving/loading games)
   saveGame(): string;
-  loadGame(data: string);
+  loadGame(data: string): void;
 
-  // client event handling methods and state change hooks
   handleClientEvent(code: number, ...args: SerializableType[]): void;
   updateRefDef(refdef: RefDef): void;
 
-  // optional interface for menu integration (NOTE: object to change)
   static GetStartGameInterface(engineAPI: ClientEngineAPI): StartGameInterface | null;
-
-  // client edict handler retrieval
   static GetClientEdictHandler(classname: string): typeof BaseClientEdictHandler | null;
-
-  // lifecycle methods
   static Init(engineAPI: ClientEngineAPI): void;
   static Shutdown(): void;
-
   static IsServerCompatible(version: number[]): boolean;
-};
+}
+
+export type ClientGameConstructor = typeof ClientGameInterface;
 
 export interface PlayerEntitySpawnParamsDynamic {
   saveSpawnParameters(): string;
   restoreSpawnParameters(data: string): void;
-};
+}
 
 export interface ServerInfoField {
   name: string;
   label: string;
-  type: "string" | "number" | "boolean" | "maplist" | "enum";
+  type: 'string' | 'number' | 'boolean' | 'maplist' | 'enum';
   enumValues?: Record<string, string | number>;
-};
+}
 
 export interface MapDetails {
   name: string;
   label: string;
   maxplayers: number;
   pictures: string[];
-};
+}
 
 export interface StartServerListEntry {
   label: string;
-  callback: (ServerEngineAPI: ServerEngineAPI) => void;
-};
-
-export interface ServerGameInterface {
-  // only used with CAP_SPAWNPARMS_LEGACY flag
+  callback: (serverEngineAPI: ServerEngineAPI) => void;
+}
+
+export type SerializedPrimitive = string | number | boolean | null;
+export type SerializedVector = [number, number, number, number];
+export type SerializedSkipped = [number];
+export type SerializedInfinity = [number, number];
+export type SerializedPrimitiveValue = [number, SerializedPrimitive];
+export type SerializedFunction = [number, string];
+export type SerializedArray = [number, SerializedValue[]];
+export type SerializedEdictReference = [number, number];
+export type SerializedObject = [number, SerializedData];
+export type SerializedValue = SerializedSkipped | SerializedInfinity | SerializedPrimitiveValue | SerializedFunction | SerializedVector | SerializedArray | SerializedEdictReference | SerializedObject;
+export type SerializedData = Record<string, SerializedValue>;
+
+export declare abstract class ServerGameInterface {
   SetNewParms?(): void;
   SetSpawnParms?(clientEdict: ServerEdict): void;
   SetChangeParms?(clientEdict: ServerEdict): void;
@@ -144,14 +146,14 @@ export interface ServerGameInterface {
   prepareEntity(edict: ServerEdict, classname: string, initialData?: EdictData): boolean;
   spawnPreparedEntity(edict: ServerEdict): boolean;
 
-  serialize(): any;
-  deserialize(data: any): void;
+  serialize(): SerializedData;
+  deserialize(data: SerializedData): void;
 
   static GetServerInfoFields(): ServerInfoField[];
   static GetMapList(): MapDetails[] | null;
   static GetStartServerList(): StartServerListEntry[] | null;
-
-  static Init(ServerEngineAPI: ServerEngineAPI): void;
+  static Init(serverEngineAPI: ServerEngineAPI): void;
   static Shutdown(): void;
-};
+}
 
+export type ServerGameConstructor = typeof ServerGameInterface;

From 814c231910e39dc2991ce760cf51351a232f96e3 Mon Sep 17 00:00:00 2001
From: Christian R <github@chrisnew.de>
Date: Thu, 2 Apr 2026 13:49:49 +0300
Subject: [PATCH 10/67] TS: network/Protocol

---
 source/engine/client/CL.mjs                   |   2 +-
 source/engine/client/ClientConnection.mjs     |   2 +-
 source/engine/client/ClientDemos.mjs          |   2 +-
 source/engine/client/ClientInput.mjs          |   2 +-
 source/engine/client/ClientMessages.mjs       |   2 +-
 .../client/ClientServerCommandHandlers.mjs    |   2 +-
 source/engine/client/ClientState.mjs          |   2 +-
 source/engine/client/LegacyServerCommands.mjs |   2 +-
 source/engine/common/Cmd.mjs                  |   2 +-
 source/engine/common/GameAPIs.mjs             |   2 +-
 source/engine/common/Host.mjs                 |   2 +-
 source/engine/common/Pmove.mjs                |   2 +-
 source/engine/network/MSG.mjs                 |   2 +-
 source/engine/network/Protocol.mjs            | 310 ------------------
 source/engine/network/Protocol.ts             | 286 ++++++++++++++++
 source/engine/server/Client.mjs               |   2 +-
 source/engine/server/Edict.mjs                |   2 +-
 source/engine/server/Server.mjs               |   2 +-
 source/engine/server/ServerMessages.mjs       |   2 +-
 test/common/protocol.test.mjs                 |  46 +++
 test/physics/collision-regressions.test.mjs   |   2 +-
 test/physics/map-pmove-harness.mjs            |   2 +-
 test/physics/pmove.test.mjs                   |   2 +-
 test/physics/server-client-physics.test.mjs   |   2 +-
 test/physics/server.test.mjs                  |   2 +-
 25 files changed, 354 insertions(+), 332 deletions(-)
 delete mode 100644 source/engine/network/Protocol.mjs
 create mode 100644 source/engine/network/Protocol.ts
 create mode 100644 test/common/protocol.test.mjs

diff --git a/source/engine/client/CL.mjs b/source/engine/client/CL.mjs
index a936d61d..36846624 100644
--- a/source/engine/client/CL.mjs
+++ b/source/engine/client/CL.mjs
@@ -1,6 +1,6 @@
 import Q from '../../shared/Q.ts';
 import * as Def from '../common/Def.mjs';
-import * as Protocol from '../network/Protocol.mjs';
+import * as Protocol from '../network/Protocol.ts';
 import Cmd, { ConsoleCommand } from '../common/Cmd.mjs';
 import Cvar from '../common/Cvar.mjs';
 import { Pmove, PmovePlayer } from '../common/Pmove.mjs';
diff --git a/source/engine/client/ClientConnection.mjs b/source/engine/client/ClientConnection.mjs
index 6aea2bb5..17b63f5d 100644
--- a/source/engine/client/ClientConnection.mjs
+++ b/source/engine/client/ClientConnection.mjs
@@ -1,4 +1,4 @@
-import * as Protocol from '../network/Protocol.mjs';
+import * as Protocol from '../network/Protocol.ts';
 import { HostError } from '../common/Errors.mjs';
 import Cvar from '../common/Cvar.mjs';
 import Cmd from '../common/Cmd.mjs';
diff --git a/source/engine/client/ClientDemos.mjs b/source/engine/client/ClientDemos.mjs
index 0c8280cf..e23831c9 100644
--- a/source/engine/client/ClientDemos.mjs
+++ b/source/engine/client/ClientDemos.mjs
@@ -1,7 +1,7 @@
 
 import { clientConnectionState } from '../common/Def.mjs';
 import { eventBus, registry } from '../registry.mjs';
-import * as Protocol from '../network/Protocol.mjs';
+import * as Protocol from '../network/Protocol.ts';
 import { HostError } from '../common/Errors.mjs';
 
 let { CL, COM, Con, Host, NET } = registry;
diff --git a/source/engine/client/ClientInput.mjs b/source/engine/client/ClientInput.mjs
index 146fc324..31c585ac 100644
--- a/source/engine/client/ClientInput.mjs
+++ b/source/engine/client/ClientInput.mjs
@@ -1,5 +1,5 @@
 import Vector from '../../shared/Vector.ts';
-import * as Protocol from '../network/Protocol.mjs';
+import * as Protocol from '../network/Protocol.ts';
 import Q from '../../shared/Q.ts';
 import { SzBuffer } from '../network/MSG.mjs';
 import Cmd from '../common/Cmd.mjs';
diff --git a/source/engine/client/ClientMessages.mjs b/source/engine/client/ClientMessages.mjs
index c39d39c4..76e8553e 100644
--- a/source/engine/client/ClientMessages.mjs
+++ b/source/engine/client/ClientMessages.mjs
@@ -1,4 +1,4 @@
-import * as Protocol from '../network/Protocol.mjs';
+import * as Protocol from '../network/Protocol.ts';
 import * as Def from '../common/Def.mjs';
 import { eventBus, registry } from '../registry.mjs';
 import { HostError } from '../common/Errors.mjs';
diff --git a/source/engine/client/ClientServerCommandHandlers.mjs b/source/engine/client/ClientServerCommandHandlers.mjs
index 537245db..4f0a4e50 100644
--- a/source/engine/client/ClientServerCommandHandlers.mjs
+++ b/source/engine/client/ClientServerCommandHandlers.mjs
@@ -1,4 +1,4 @@
-import * as Protocol from '../network/Protocol.mjs';
+import * as Protocol from '../network/Protocol.ts';
 import * as Def from '../common/Def.mjs';
 import Cmd from '../common/Cmd.mjs';
 import { HostError } from '../common/Errors.mjs';
diff --git a/source/engine/client/ClientState.mjs b/source/engine/client/ClientState.mjs
index 4ec2b3be..40c9297b 100644
--- a/source/engine/client/ClientState.mjs
+++ b/source/engine/client/ClientState.mjs
@@ -1,6 +1,6 @@
 import { SzBuffer } from '../network/MSG.mjs';
 import { QSocket } from '../network/NetworkDrivers.mjs';
-import * as Protocol from '../network/Protocol.mjs';
+import * as Protocol from '../network/Protocol.ts';
 import * as Def from '../common/Def.mjs';
 import Vector from '../../shared/Vector.ts';
 import { EventBus, eventBus, registry } from '../registry.mjs';
diff --git a/source/engine/client/LegacyServerCommands.mjs b/source/engine/client/LegacyServerCommands.mjs
index 9302a344..f2044fc1 100644
--- a/source/engine/client/LegacyServerCommands.mjs
+++ b/source/engine/client/LegacyServerCommands.mjs
@@ -1,4 +1,4 @@
-import * as Protocol from '../network/Protocol.mjs';
+import * as Protocol from '../network/Protocol.ts';
 import * as Def from '../common/Def.mjs';
 import { HostError } from '../common/Errors.mjs';
 import { eventBus, registry } from '../registry.mjs';
diff --git a/source/engine/common/Cmd.mjs b/source/engine/common/Cmd.mjs
index 7122478c..a2b8df24 100644
--- a/source/engine/common/Cmd.mjs
+++ b/source/engine/common/Cmd.mjs
@@ -1,5 +1,5 @@
 import { AsyncFunction } from '../../shared/Q.ts';
-import * as Protocol from '../network/Protocol.mjs';
+import * as Protocol from '../network/Protocol.ts';
 import { eventBus, registry } from '../registry.mjs';
 import Cvar from './Cvar.mjs';
 import { clientConnectionState } from './Def.mjs';
diff --git a/source/engine/common/GameAPIs.mjs b/source/engine/common/GameAPIs.mjs
index 9899f1a7..c007b513 100644
--- a/source/engine/common/GameAPIs.mjs
+++ b/source/engine/common/GameAPIs.mjs
@@ -4,7 +4,7 @@ import { solid } from '../../shared/Defs.ts';
 import Key from '../client/Key.mjs';
 import { SFX } from '../client/Sound.mjs';
 import VID from '../client/VID.mjs';
-import * as Protocol from '../network/Protocol.mjs';
+import * as Protocol from '../network/Protocol.ts';
 import { EventBus, eventBus, registry } from '../registry.mjs';
 import { ED, ServerEdict } from '../server/Edict.mjs';
 import Cmd from './Cmd.mjs';
diff --git a/source/engine/common/Host.mjs b/source/engine/common/Host.mjs
index 46a64939..e35d8e7a 100644
--- a/source/engine/common/Host.mjs
+++ b/source/engine/common/Host.mjs
@@ -1,5 +1,5 @@
 import Cvar from './Cvar.mjs';
-import * as Protocol from '../network/Protocol.mjs';
+import * as Protocol from '../network/Protocol.ts';
 import * as Def from './Def.mjs';
 import Cmd, { ConsoleCommand } from './Cmd.mjs';
 import { eventBus, registry } from '../registry.mjs';
diff --git a/source/engine/common/Pmove.mjs b/source/engine/common/Pmove.mjs
index 5c63fb3a..cb8f35f3 100644
--- a/source/engine/common/Pmove.mjs
+++ b/source/engine/common/Pmove.mjs
@@ -8,7 +8,7 @@
  */
 
 import Vector from '../../shared/Vector.ts';
-import * as Protocol from '../network/Protocol.mjs';
+import * as Protocol from '../network/Protocol.ts';
 import { content } from '../../shared/Defs.ts';
 import { BrushModel } from './Mod.mjs';
 import Cvar from './Cvar.mjs';
diff --git a/source/engine/network/MSG.mjs b/source/engine/network/MSG.mjs
index bd3b68e7..367edbb4 100644
--- a/source/engine/network/MSG.mjs
+++ b/source/engine/network/MSG.mjs
@@ -1,6 +1,6 @@
 import Q from '../../shared/Q.ts';
 import Vector from '../../shared/Vector.ts';
-import * as Protocol from '../network/Protocol.mjs';
+import * as Protocol from '../network/Protocol.ts';
 import { eventBus, registry } from '../registry.mjs';
 
 let { Con } = registry;
diff --git a/source/engine/network/Protocol.mjs b/source/engine/network/Protocol.mjs
deleted file mode 100644
index ee32b50c..00000000
--- a/source/engine/network/Protocol.mjs
+++ /dev/null
@@ -1,310 +0,0 @@
-import Vector from '../../shared/Vector.ts';
-
-export const version = 42; // QuakeShack special version
-
-export const update_backup = 64; // power of 2
-export const update_mask = update_backup - 1;
-
-export const u = Object.freeze({
-  classname: 1 << 0,
-
-  origin1: 1 << 1,
-  origin2: 1 << 2,
-  origin3: 1 << 3,
-
-  /** used to smuggle velocity[0] */
-  angle1: 1 << 4,
-  /** used to smuggle velocity[1] */
-  angle2: 1 << 5,
-  /** used to smuggle velocity[2] */
-  angle3: 1 << 6,
-
-  nextthink: 1 << 7,
-
-  frame: 1 << 8,
-  free: 1 << 9,
-  model: 1 << 10,
-  colormap: 1 << 11,
-  skin: 1 << 12,
-  /** used to smuggle alpha as well */
-  effects: 1 << 13,
-  solid: 1 << 14,
-  size: 1 << 15,
-});
-
-export const su = Object.freeze({
-  viewheight: 1,
-  idealpitch: 1 << 1,
-  punch1: 1 << 2,
-  punch2: 1 << 3,
-  punch3: 1 << 4,
-  velocity1: 1 << 5,
-  velocity2: 1 << 6,
-  velocity3: 1 << 7,
-  /** server acknowledges the last received move command sequence */
-  moveack: 1 << 8,
-  items: 1 << 9,
-  onground: 1 << 10,
-  inwater: 1 << 11,
-  weaponframe: 1 << 12,
-  armor: 1 << 13,
-  weapon: 1 << 14,
-});
-
-/** number of user commands buffered for client-side prediction replay */
-export const CMD_BUFFER_SIZE = 64;
-export const CMD_BUFFER_MASK = CMD_BUFFER_SIZE - 1;
-
-export const default_viewheight = 22;
-
-/** Server to Client */
-export const svc = Object.freeze({
-  null: 0,
-  nop: 1,
-  disconnect: 2,
-  updatestat: 3,
-  version: 4, // WinQuake
-  setview: 5,
-  sound: 6,
-  time: 7, // WinQuake
-  print: 8,
-  stufftext: 9,
-  setangle: 10,
-  serverdata: 11, // QuakeWorld: serverdata
-  lightstyle: 12,
-  updatename: 13, // WinQuake
-  updatefrags: 14,
-  clientdata: 15, // WinQuake
-  stopsound: 16,
-  updatecolors: 17, // WinQuake
-  particle: 18, // WinQuake
-  damage: 19,
-  spawnstatic: 20,
-  spawnbinary: 21, // WinQuake
-  spawnbaseline: 22,
-  temp_entity: 23, // required by QC
-  setpause: 24,
-  signonnum: 25, // WinQuake
-  centerprint: 26,
-  killedmonster: 27, // required by QC
-  foundsecret: 28, // required by QC
-  spawnstaticsound: 29,
-  intermission: 30, // required by QC
-  finale: 31, // required by QC
-  cdtrack: 32, // required by QC
-  sellscreen: 33, // required by QC
-  cutscene: 34, // WinQuake
-
-  // introduced in QuakeWorld:
-  smallkick: 34,           // set client punchangle to 2
-  bigkick: 35,             // set client punchangle to 4
-  updateping: 36,          // [byte] [short]
-  updateentertime: 7,      // [byte] [float]
-  updatestatlong: 8,       // [byte] [long]
-  muzzleflash: 39,         // [short] entity
-  updateuserinfo: 0,       // [byte] slot [long] uid [string] userinfo
-  download: 41,            // [short] size [size bytes]
-  playerinfo: 42,          // variable
-  nails: 43,               // [byte] num [48 bits] xyzpy 12 12 12 4 8
-  chokecount: 44,          // [byte] packets choked
-  modellist: 45,           // [strings]
-  soundlist: 46,           // [strings]
-  packetentities: 47,      // [...]
-  deltapacketentities: 48, // [...]
-  maxspeed: 49,            // maxspeed change, for prediction
-  entgravity: 50,          // gravity change, for prediction
-  setinfo: 51,             // setinfo on a client
-  serverinfo: 52,          // serverinfo
-  updatepl: 53,            // [byte] [byte]
-
-  // QuakeShack-only:
-  updatepings: 101,
-  loadsound: 102,
-  chatmsg: 103,
-  obituary: 104,
-  pmovevars: 105,
-  cvar: 106,
-  changelevel: 107,
-  clientevent: 108,
-  gamestateupdate: 109,
-  clientstateupdate: 110,
-  setportalstate: 111,
-});
-
-/** Client to Server */
-export const clc = Object.freeze({
-  nop: 1,
-  disconnect: 2,
-  move: 3,
-  stringcmd: 4,
-  rconcmd: 5,
-  delta: 6,
-  qwmove: 7,
-  sync: 8,
-});
-
-export const serializableTypes = Object.freeze({
-  none: 0,
-  long: 1,
-  vector: 2,
-  string: 3,
-  true: 4,
-  false: 5,
-  null: 6,
-  array: 7,
-  float: 8,
-  short: 9,
-  byte: 10,
-  // anything else is a custom type and must be registered with registerSerializableType for more magic
-});
-
-export const te = Object.freeze({
-  spike: 0,
-  superspike: 1,
-  gunshot: 2,
-  explosion: 3,
-  tarexplosion: 4,
-  lightning1: 5,
-  lightning2: 6,
-  wizspike: 7,
-  knightspike: 8,
-  lightning3: 9,
-  lavasplash: 10,
-  teleport: 11,
-  explosion2: 12,
-  beam: 13,
-});
-
-export const button = Object.freeze({
-  attack: 1,
-  jump: 2,
-  use: 4,
-});
-
-/**
- * Player flags
- */
-export const pf = Object.freeze({
-  PF_MSEC: (1 << 0),
-  PF_COMMAND: (1 << 1),
-  PF_VELOCITY1: (1 << 2),
-  PF_VELOCITY2: (1 << 3),
-  PF_VELOCITY3: (1 << 4),
-  PF_MODEL: (1 << 5),
-  PF_SKINNUM: (1 << 6),
-  PF_EFFECTS: (1 << 7),
-  /** only sent for view player */
-  PF_WEAPONFRAME: (1 << 8),
-  /** don't block movement any more */
-  PF_DEAD: (1 << 9),
-  /** offset the view height differently */
-  PF_GIB: (1 << 10),
-  /** don't apply gravity for prediction */
-  PF_NOGRAV: (1 << 11),
-  /** QS: complete Vector */
-  PF_VELOCITY: (1 << 12),
-});
-
-export const cm = Object.freeze({
-  CM_ANGLE1: (1<<0),
-  CM_ANGLE3: (1<<1),
-  CM_FORWARD: (1<<2),
-  CM_SIDE: (1<<3),
-  CM_UP: (1<<4),
-  CM_BUTTONS: (1<<5),
-  CM_IMPULSE: (1<<6),
-  CM_ANGLE2: (1<<7),
-});
-
-export class EntityState { // entity_state_t
-  constructor() {
-    /** @type {number} edict index */
-    this.number = 0;
-    /** @type {number} nolerp, etc. */
-    this.flags = 0;
-    this.frame = 0;
-    this.modelindex = 0;
-    this.colormap = 0;
-    this.skinnum = 0;
-    this.effects = 0;
-    this.alpha = 1.0;
-
-    this.origin = new Vector();
-    this.angles = new Vector();
-  }
-};
-
-export class UserCmd { // usercmd_t
-  constructor() {
-    this.msec = 0;
-    this.forwardmove = 0;
-    this.sidemove = 0;
-    this.upmove = 0;
-    this.angles = new Vector();
-    this.buttons = 0;
-    this.impulse = 0;
-  }
-
-  /**
-   * Copies the usercmd.
-   * @returns {UserCmd} copied usercmd
-   */
-  copy() {
-    const cmd = new UserCmd();
-    cmd.msec = this.msec;
-    cmd.forwardmove = this.forwardmove;
-    cmd.sidemove = this.sidemove;
-    cmd.upmove = this.upmove;
-    cmd.angles.set(this.angles);
-    cmd.buttons = this.buttons;
-    cmd.impulse = this.impulse;
-    return cmd;
-  }
-
-  /**
-   * Sets this to the value of other.
-   * @param {UserCmd} other usercmd
-   * @returns {UserCmd} this
-   */
-  set(other) {
-    this.msec = other.msec;
-    this.forwardmove = other.forwardmove;
-    this.sidemove = other.sidemove;
-    this.upmove = other.upmove;
-    this.angles.set(other.angles);
-    this.buttons = other.buttons;
-    this.impulse = other.impulse;
-    return this;
-  }
-
-  /**
-   * Reset command.
-   * @returns {UserCmd} this
-   */
-  reset() {
-    /** @type {number} 0..255, how long the frame took to process on the client  */
-    this.msec = 0;
-    this.forwardmove = 0;
-    this.sidemove = 0;
-    this.upmove = 0;
-    this.angles.clear();
-    this.buttons = 0;
-    this.impulse = 0;
-    return this;
-  }
-
-  /**
-   * Tests for equality.
-   * @param {UserCmd} other other
-   * @returns {boolean} true, if equal
-   */
-  equals(other) {
-    return this.msec === other.msec &&
-      this.forwardmove === other.forwardmove &&
-      this.sidemove === other.sidemove &&
-      this.upmove === other.upmove &&
-      this.angles.equals(other.angles) && // FIXME: use epsilon?
-      this.buttons === other.buttons &&
-      this.impulse === other.impulse;
-  }
-};
diff --git a/source/engine/network/Protocol.ts b/source/engine/network/Protocol.ts
new file mode 100644
index 00000000..eb39dfb7
--- /dev/null
+++ b/source/engine/network/Protocol.ts
@@ -0,0 +1,286 @@
+import Vector from '../../shared/Vector.ts';
+
+export const version = 42;
+
+export const update_backup = 64;
+export const update_mask = update_backup - 1;
+
+export enum u {
+  classname = 1 << 0,
+  origin1 = 1 << 1,
+  origin2 = 1 << 2,
+  origin3 = 1 << 3,
+  angle1 = 1 << 4,
+  angle2 = 1 << 5,
+  angle3 = 1 << 6,
+  nextthink = 1 << 7,
+  frame = 1 << 8,
+  free = 1 << 9,
+  model = 1 << 10,
+  colormap = 1 << 11,
+  skin = 1 << 12,
+  effects = 1 << 13,
+  solid = 1 << 14,
+  size = 1 << 15,
+}
+
+export enum su {
+  viewheight = 1,
+  idealpitch = 1 << 1,
+  punch1 = 1 << 2,
+  punch2 = 1 << 3,
+  punch3 = 1 << 4,
+  velocity1 = 1 << 5,
+  velocity2 = 1 << 6,
+  velocity3 = 1 << 7,
+  moveack = 1 << 8,
+  items = 1 << 9,
+  onground = 1 << 10,
+  inwater = 1 << 11,
+  weaponframe = 1 << 12,
+  armor = 1 << 13,
+  weapon = 1 << 14,
+}
+
+export const CMD_BUFFER_SIZE = 64;
+export const CMD_BUFFER_MASK = CMD_BUFFER_SIZE - 1;
+
+export const default_viewheight = 22;
+
+export const svc = Object.freeze({
+  null: 0,
+  nop: 1,
+  disconnect: 2,
+  updatestat: 3,
+  version: 4,
+  setview: 5,
+  sound: 6,
+  time: 7,
+  print: 8,
+  stufftext: 9,
+  setangle: 10,
+  serverdata: 11,
+  lightstyle: 12,
+  updatename: 13,
+  updatefrags: 14,
+  clientdata: 15,
+  stopsound: 16,
+  updatecolors: 17,
+  particle: 18,
+  damage: 19,
+  spawnstatic: 20,
+  spawnbinary: 21,
+  spawnbaseline: 22,
+  temp_entity: 23,
+  setpause: 24,
+  signonnum: 25,
+  centerprint: 26,
+  killedmonster: 27,
+  foundsecret: 28,
+  spawnstaticsound: 29,
+  intermission: 30,
+  finale: 31,
+  cdtrack: 32,
+  sellscreen: 33,
+  cutscene: 34,
+  smallkick: 34,
+  bigkick: 35,
+  updateping: 36,
+  updateentertime: 7,
+  updatestatlong: 8,
+  muzzleflash: 39,
+  updateuserinfo: 0,
+  download: 41,
+  playerinfo: 42,
+  nails: 43,
+  chokecount: 44,
+  modellist: 45,
+  soundlist: 46,
+  packetentities: 47,
+  deltapacketentities: 48,
+  maxspeed: 49,
+  entgravity: 50,
+  setinfo: 51,
+  serverinfo: 52,
+  updatepl: 53,
+  updatepings: 101,
+  loadsound: 102,
+  chatmsg: 103,
+  obituary: 104,
+  pmovevars: 105,
+  cvar: 106,
+  changelevel: 107,
+  clientevent: 108,
+  gamestateupdate: 109,
+  clientstateupdate: 110,
+  setportalstate: 111,
+} as const);
+
+export enum clc {
+  nop = 1,
+  disconnect = 2,
+  move = 3,
+  stringcmd = 4,
+  rconcmd = 5,
+  delta = 6,
+  qwmove = 7,
+  sync = 8,
+}
+
+export const serializableTypes = Object.freeze({
+  none: 0,
+  long: 1,
+  vector: 2,
+  string: 3,
+  true: 4,
+  false: 5,
+  null: 6,
+  array: 7,
+  float: 8,
+  short: 9,
+  byte: 10,
+} as const);
+
+export enum te {
+  spike = 0,
+  superspike = 1,
+  gunshot = 2,
+  explosion = 3,
+  tarexplosion = 4,
+  lightning1 = 5,
+  lightning2 = 6,
+  wizspike = 7,
+  knightspike = 8,
+  lightning3 = 9,
+  lavasplash = 10,
+  teleport = 11,
+  explosion2 = 12,
+  beam = 13,
+}
+
+export enum button {
+  attack = 1,
+  jump = 2,
+  use = 4,
+}
+
+export enum pf {
+  PF_MSEC = 1 << 0,
+  PF_COMMAND = 1 << 1,
+  PF_VELOCITY1 = 1 << 2,
+  PF_VELOCITY2 = 1 << 3,
+  PF_VELOCITY3 = 1 << 4,
+  PF_MODEL = 1 << 5,
+  PF_SKINNUM = 1 << 6,
+  PF_EFFECTS = 1 << 7,
+  PF_WEAPONFRAME = 1 << 8,
+  PF_DEAD = 1 << 9,
+  PF_GIB = 1 << 10,
+  PF_NOGRAV = 1 << 11,
+  PF_VELOCITY = 1 << 12,
+}
+
+export enum cm {
+  CM_ANGLE1 = 1 << 0,
+  CM_ANGLE3 = 1 << 1,
+  CM_FORWARD = 1 << 2,
+  CM_SIDE = 1 << 3,
+  CM_UP = 1 << 4,
+  CM_BUTTONS = 1 << 5,
+  CM_IMPULSE = 1 << 6,
+  CM_ANGLE2 = 1 << 7,
+}
+
+export class EntityState {
+  number: number;
+  flags: number;
+  frame: number;
+  modelindex: number;
+  colormap: number;
+  skinnum: number;
+  effects: number;
+  alpha: number;
+  origin: Vector;
+  angles: Vector;
+
+  constructor() {
+    this.number = 0;
+    this.flags = 0;
+    this.frame = 0;
+    this.modelindex = 0;
+    this.colormap = 0;
+    this.skinnum = 0;
+    this.effects = 0;
+    this.alpha = 1.0;
+    this.origin = new Vector();
+    this.angles = new Vector();
+  }
+}
+
+export class UserCmd {
+  msec: number;
+  forwardmove: number;
+  sidemove: number;
+  upmove: number;
+  angles: Vector;
+  buttons: number;
+  impulse: number;
+
+  constructor() {
+    this.msec = 0;
+    this.forwardmove = 0;
+    this.sidemove = 0;
+    this.upmove = 0;
+    this.angles = new Vector();
+    this.buttons = 0;
+    this.impulse = 0;
+  }
+
+  copy(): UserCmd {
+    const cmd = new UserCmd();
+
+    cmd.msec = this.msec;
+    cmd.forwardmove = this.forwardmove;
+    cmd.sidemove = this.sidemove;
+    cmd.upmove = this.upmove;
+    cmd.angles.set(this.angles);
+    cmd.buttons = this.buttons;
+    cmd.impulse = this.impulse;
+
+    return cmd;
+  }
+
+  set(other: UserCmd): UserCmd {
+    this.msec = other.msec;
+    this.forwardmove = other.forwardmove;
+    this.sidemove = other.sidemove;
+    this.upmove = other.upmove;
+    this.angles.set(other.angles);
+    this.buttons = other.buttons;
+    this.impulse = other.impulse;
+
+    return this;
+  }
+
+  reset(): UserCmd {
+    this.msec = 0;
+    this.forwardmove = 0;
+    this.sidemove = 0;
+    this.upmove = 0;
+    this.angles.clear();
+    this.buttons = 0;
+    this.impulse = 0;
+
+    return this;
+  }
+
+  equals(other: UserCmd): boolean {
+    return this.msec === other.msec &&
+      this.forwardmove === other.forwardmove &&
+      this.sidemove === other.sidemove &&
+      this.upmove === other.upmove &&
+      this.angles.equals(other.angles) &&
+      this.buttons === other.buttons &&
+      this.impulse === other.impulse;
+  }
+}
diff --git a/source/engine/server/Client.mjs b/source/engine/server/Client.mjs
index 4fda9933..4dd3c39d 100644
--- a/source/engine/server/Client.mjs
+++ b/source/engine/server/Client.mjs
@@ -3,7 +3,7 @@ import { gameCapabilities } from '../../shared/Defs.ts';
 import Vector from '../../shared/Vector.ts';
 import { SzBuffer } from '../network/MSG.mjs';
 import { QSocket } from '../network/NetworkDrivers.mjs';
-import * as Protocol from '../network/Protocol.mjs';
+import * as Protocol from '../network/Protocol.ts';
 import { eventBus, registry } from '../registry.mjs';
 import { ServerEntityState } from './Server.mjs';
 
diff --git a/source/engine/server/Edict.mjs b/source/engine/server/Edict.mjs
index a02f08a2..c903c0cb 100644
--- a/source/engine/server/Edict.mjs
+++ b/source/engine/server/Edict.mjs
@@ -1,6 +1,6 @@
 import Vector from '../../shared/Vector.ts';
 import { SzBuffer, registerSerializableType } from '../network/MSG.mjs';
-import * as Protocol from '../network/Protocol.mjs';
+import * as Protocol from '../network/Protocol.ts';
 import * as Def from '../common/Def.mjs';
 import * as Defs from '../../shared/Defs.ts';
 import { eventBus, registry } from '../registry.mjs';
diff --git a/source/engine/server/Server.mjs b/source/engine/server/Server.mjs
index cce1259a..ee1d6295 100644
--- a/source/engine/server/Server.mjs
+++ b/source/engine/server/Server.mjs
@@ -2,7 +2,7 @@ import Cvar from '../common/Cvar.mjs';
 import { MoveVars, Pmove } from '../common/Pmove.mjs';
 import Vector from '../../shared/Vector.ts';
 import { SzBuffer } from '../network/MSG.mjs';
-import * as Protocol from '../network/Protocol.mjs';
+import * as Protocol from '../network/Protocol.ts';
 import * as Def from './../common/Def.mjs';
 import Cmd, { ConsoleCommand } from '../common/Cmd.mjs';
 import { ED, ServerEdict } from './Edict.mjs';
diff --git a/source/engine/server/ServerMessages.mjs b/source/engine/server/ServerMessages.mjs
index 681283e0..5a9d77d9 100644
--- a/source/engine/server/ServerMessages.mjs
+++ b/source/engine/server/ServerMessages.mjs
@@ -1,5 +1,5 @@
 import { SzBuffer } from '../network/MSG.mjs';
-import * as Protocol from '../network/Protocol.mjs';
+import * as Protocol from '../network/Protocol.ts';
 import * as Defs from '../../shared/Defs.ts';
 import Cvar from '../common/Cvar.mjs';
 import { eventBus, registry } from '../registry.mjs';
diff --git a/test/common/protocol.test.mjs b/test/common/protocol.test.mjs
new file mode 100644
index 00000000..1d7765f5
--- /dev/null
+++ b/test/common/protocol.test.mjs
@@ -0,0 +1,46 @@
+import assert from 'node:assert/strict';
+import { describe, test } from 'node:test';
+
+import * as Protocol from '../../source/engine/network/Protocol.ts';
+
+void describe('Protocol', () => {
+  void test('keeps the expected command and flag bit values', () => {
+    assert.equal(Protocol.version, 42);
+    assert.equal(Protocol.u.classname, 1 << 0);
+    assert.equal(Protocol.su.moveack, 1 << 8);
+    assert.equal(Protocol.clc.stringcmd, 4);
+    assert.equal(Protocol.cm.CM_IMPULSE, 1 << 6);
+    assert.equal(Protocol.pf.PF_VELOCITY, 1 << 12);
+    assert.equal(Protocol.button.attack, 1);
+    assert.equal(Protocol.svc.clientevent, 108);
+    assert.equal(Protocol.serializableTypes.null, 6);
+  });
+
+  void test('copies and resets user commands without aliasing vectors', () => {
+    const command = new Protocol.UserCmd();
+
+    command.msec = 16;
+    command.forwardmove = 200;
+    command.sidemove = -50;
+    command.upmove = 10;
+    command.angles.set([1, 2, 3]);
+    command.buttons = Protocol.button.attack;
+    command.impulse = 7;
+
+    const copy = command.copy();
+
+    assert.notStrictEqual(copy, command);
+    assert.notStrictEqual(copy.angles, command.angles);
+    assert.equal(copy.equals(command), true);
+
+    command.reset();
+
+    assert.equal(command.msec, 0);
+    assert.equal(command.forwardmove, 0);
+    assert.equal(command.sidemove, 0);
+    assert.equal(command.upmove, 0);
+    assert.equal(command.buttons, 0);
+    assert.equal(command.impulse, 0);
+    assert.deepEqual(Array.from(command.angles), [0, 0, 0]);
+  });
+});
diff --git a/test/physics/collision-regressions.test.mjs b/test/physics/collision-regressions.test.mjs
index 28a8c859..73af9877 100644
--- a/test/physics/collision-regressions.test.mjs
+++ b/test/physics/collision-regressions.test.mjs
@@ -7,7 +7,7 @@ import { Brush, BrushModel, BrushSide } from '../../source/engine/common/model/B
 import { BrushTrace, Hull, PMF, Pmove, PmovePlayer, Trace } from '../../source/engine/common/Pmove.mjs';
 import { BSP29Loader } from '../../source/engine/common/model/loaders/BSP29Loader.mjs';
 import { eventBus, registry } from '../../source/engine/registry.mjs';
-import { UserCmd } from '../../source/engine/network/Protocol.mjs';
+import { UserCmd } from '../../source/engine/network/Protocol.ts';
 import { ClientEdict } from '../../source/engine/client/ClientEntities.mjs';
 import { ServerCollision } from '../../source/engine/server/physics/ServerCollision.mjs';
 import { ServerPhysics } from '../../source/engine/server/physics/ServerPhysics.mjs';
diff --git a/test/physics/map-pmove-harness.mjs b/test/physics/map-pmove-harness.mjs
index dde69312..56d37e6b 100644
--- a/test/physics/map-pmove-harness.mjs
+++ b/test/physics/map-pmove-harness.mjs
@@ -4,7 +4,7 @@ import path from 'node:path';
 import COMClass from '../../source/engine/common/Com.mjs';
 import Mod from '../../source/engine/common/Mod.mjs';
 import { PMF, Pmove } from '../../source/engine/common/Pmove.mjs';
-import { UserCmd } from '../../source/engine/network/Protocol.mjs';
+import { UserCmd } from '../../source/engine/network/Protocol.ts';
 import { eventBus, registry } from '../../source/engine/registry.mjs';
 import Vector from '../../source/shared/Vector.ts';
 
diff --git a/test/physics/pmove.test.mjs b/test/physics/pmove.test.mjs
index 407aeac3..9603c218 100644
--- a/test/physics/pmove.test.mjs
+++ b/test/physics/pmove.test.mjs
@@ -7,7 +7,7 @@ import Mod from '../../source/engine/common/Mod.mjs';
 import Vector from '../../source/shared/Vector.ts';
 import { content } from '../../source/shared/Defs.ts';
 import { DIST_EPSILON, PM_TYPE, PMF, Pmove, PmovePlayer, Trace } from '../../source/engine/common/Pmove.mjs';
-import { UserCmd } from '../../source/engine/network/Protocol.mjs';
+import { UserCmd } from '../../source/engine/network/Protocol.ts';
 import { eventBus, registry } from '../../source/engine/registry.mjs';
 
 import {
diff --git a/test/physics/server-client-physics.test.mjs b/test/physics/server-client-physics.test.mjs
index 1d549874..b4a8912a 100644
--- a/test/physics/server-client-physics.test.mjs
+++ b/test/physics/server-client-physics.test.mjs
@@ -3,7 +3,7 @@ import assert from 'node:assert/strict';
 
 import Vector from '../../source/shared/Vector.ts';
 import { flags, moveType, solid } from '../../source/shared/Defs.ts';
-import { UserCmd } from '../../source/engine/network/Protocol.mjs';
+import { UserCmd } from '../../source/engine/network/Protocol.ts';
 import { eventBus, registry } from '../../source/engine/registry.mjs';
 import { ServerClient } from '../../source/engine/server/Client.mjs';
 import { ServerClientPhysics } from '../../source/engine/server/physics/ServerClientPhysics.mjs';
diff --git a/test/physics/server.test.mjs b/test/physics/server.test.mjs
index 8325a3c2..91319edd 100644
--- a/test/physics/server.test.mjs
+++ b/test/physics/server.test.mjs
@@ -2,7 +2,7 @@ import { describe, test } from 'node:test';
 import assert from 'node:assert/strict';
 
 import Vector from '../../source/shared/Vector.ts';
-import * as Protocol from '../../source/engine/network/Protocol.mjs';
+import * as Protocol from '../../source/engine/network/Protocol.ts';
 import { eventBus, registry } from '../../source/engine/registry.mjs';
 import SV from '../../source/engine/server/Server.mjs';
 import { ServerClient } from '../../source/engine/server/Client.mjs';

From a207c2e09aecfd5e22952f5dd84d4722ef86df29 Mon Sep 17 00:00:00 2001
From: Christian R <github@chrisnew.de>
Date: Thu, 2 Apr 2026 14:11:40 +0300
Subject: [PATCH 11/67] TS: network/MSG

---
 source/engine/client/ClientInput.mjs    |   2 +-
 source/engine/client/ClientState.mjs    |   2 +-
 source/engine/common/GameAPIs.mjs       |   2 +-
 source/engine/network/MSG.mjs           | 580 ----------------------
 source/engine/network/MSG.ts            | 613 ++++++++++++++++++++++++
 source/engine/network/Network.mjs       |   2 +-
 source/engine/registry.mjs              |  50 ++
 source/engine/server/Client.mjs         |   2 +-
 source/engine/server/Edict.mjs          |   2 +-
 source/engine/server/Server.mjs         |   2 +-
 source/engine/server/ServerMessages.mjs |   2 +-
 test/common/msg.test.mjs                |  66 +++
 test/common/registry.test.mjs           |  11 +
 13 files changed, 748 insertions(+), 588 deletions(-)
 delete mode 100644 source/engine/network/MSG.mjs
 create mode 100644 source/engine/network/MSG.ts
 create mode 100644 test/common/msg.test.mjs
 create mode 100644 test/common/registry.test.mjs

diff --git a/source/engine/client/ClientInput.mjs b/source/engine/client/ClientInput.mjs
index 31c585ac..0af70978 100644
--- a/source/engine/client/ClientInput.mjs
+++ b/source/engine/client/ClientInput.mjs
@@ -1,7 +1,7 @@
 import Vector from '../../shared/Vector.ts';
 import * as Protocol from '../network/Protocol.ts';
 import Q from '../../shared/Q.ts';
-import { SzBuffer } from '../network/MSG.mjs';
+import { SzBuffer } from '../network/MSG.ts';
 import Cmd from '../common/Cmd.mjs';
 import { eventBus, registry } from '../registry.mjs';
 import { HostError } from '../common/Errors.mjs';
diff --git a/source/engine/client/ClientState.mjs b/source/engine/client/ClientState.mjs
index 40c9297b..8644e043 100644
--- a/source/engine/client/ClientState.mjs
+++ b/source/engine/client/ClientState.mjs
@@ -1,4 +1,4 @@
-import { SzBuffer } from '../network/MSG.mjs';
+import { SzBuffer } from '../network/MSG.ts';
 import { QSocket } from '../network/NetworkDrivers.mjs';
 import * as Protocol from '../network/Protocol.ts';
 import * as Def from '../common/Def.mjs';
diff --git a/source/engine/common/GameAPIs.mjs b/source/engine/common/GameAPIs.mjs
index c007b513..f97d2589 100644
--- a/source/engine/common/GameAPIs.mjs
+++ b/source/engine/common/GameAPIs.mjs
@@ -16,7 +16,7 @@ import W from './W.mjs';
 /** @typedef {import('../client/ClientEntities.mjs').ClientEdict} ClientEdict */
 /** @typedef {import('../client/ClientEntities.mjs').ClientDlight} ClientDlight */
 /** @typedef {import('../client/GL.mjs').GLTexture} GLTexture */
-/** @typedef {import('../network/MSG.mjs').SzBuffer} SzBuffer */
+/** @typedef {import('../network/MSG.ts').SzBuffer} SzBuffer */
 /** @typedef {import('../server/Navigation.mjs').Navigation} Navigation */
 /** @typedef {import('./model/parsers/ParsedQC.mjs').default} ParsedQC */
 /** @typedef {import('./model/BaseModel.mjs').BaseModel} BaseModel */
diff --git a/source/engine/network/MSG.mjs b/source/engine/network/MSG.mjs
deleted file mode 100644
index 367edbb4..00000000
--- a/source/engine/network/MSG.mjs
+++ /dev/null
@@ -1,580 +0,0 @@
-import Q from '../../shared/Q.ts';
-import Vector from '../../shared/Vector.ts';
-import * as Protocol from '../network/Protocol.ts';
-import { eventBus, registry } from '../registry.mjs';
-
-let { Con } = registry;
-
-eventBus.subscribe('registry.frozen', () => {
-  ({ Con } = registry);
-});
-
-/** @type {{id: number, constructor: Function, serialize: (sz: SzBuffer, object: object) => void, deserializeOnServer: (sz: SzBuffer) => object, deserializeOnClient: (sz: SzBuffer) => object}[]} */
-const serializableHandlers = [];
-
-/**
- * Registers a custom serializable type for network transmission.
- * @param {Function} constructor The constructor function of the type
- * @param {{ serialize: (sz: SzBuffer, object: object) => void, deserializeOnServer: (sz: SzBuffer) => object, deserializeOnClient: (sz: SzBuffer) => object }} handlers serialization handlers
- */
-export function registerSerializableType(constructor, { serialize, deserializeOnServer, deserializeOnClient }) {
-  serializableHandlers.push({
-    constructor,
-    serialize,
-    deserializeOnServer,
-    deserializeOnClient,
-    id: Object.keys(Protocol.serializableTypes).length + serializableHandlers.length,
-  });
-}
-
-export class SzBuffer {
-  /** current read position in the buffer */
-  readcount = 0;
-
-  /** set to true when a read operation fails due to insufficient data */
-  badread = false;
-
-  /**
-   * @param {number} size maximum size of the buffer
-   * @param {string} name name for debugging purposes
-   */
-  constructor(size, name = 'anonymous') {
-    this.name = name;
-    this.data = new ArrayBuffer(size);
-    this.cursize = 0;
-    /** if false, overflow will cause a crash */
-    this.allowoverflow = false;
-    /** set to true, when an overflow has occurred */
-    this.overflowed = false;
-  }
-
-  get maxsize() {
-    return this.data.byteLength;
-  }
-
-  clear() {
-    this.cursize = 0;
-    this.overflowed = false;
-  }
-
-  copy() {
-    const copy = new SzBuffer(this.maxsize, this.name);
-    copy.cursize = this.cursize;
-    copy.overflowed = this.overflowed;
-    const u8 = new Uint8Array(this.data);
-    const u8copy = new Uint8Array(copy.data);
-    u8copy.set(u8);
-    return copy;
-  }
-
-  set(other) {
-    this.name = other.name;
-    this.data = new ArrayBuffer(other.maxsize);
-    new Uint8Array(this.data).set(new Uint8Array(other.data));
-    this.cursize = other.cursize;
-    this.allowoverflow = other.allowoverflow;
-    this.overflowed = other.overflowed;
-    return this;
-  }
-
-  allocate(size) {
-    if (this.cursize + size > this.maxsize) {
-      if (this.allowoverflow !== true) {
-        throw RangeError('SzBuffer.allocate: overflow without allowoverflow set');
-      }
-
-      if (size > this.maxsize) {
-        throw RangeError('SzBuffer.allocate: ' + size + ' is > full buffer size');
-      }
-
-      this.overflowed = true;
-      this.cursize = 0;
-
-      Con.Print('SzBuffer.allocate: overflow\n');
-      // eslint-disable-next-line no-debugger
-      debugger;
-    }
-
-    const cursize = this.cursize;
-    this.cursize += size;
-    return cursize;
-  }
-
-  write(data, length) {
-    const u = new Uint8Array(this.data, this.allocate(length), length);
-    u.set(data.subarray(0, length));
-  }
-
-  print(data) {
-    const buf = new Uint8Array(this.data);
-    let dest;
-    if (this.cursize !== 0) {
-      if (buf[this.cursize - 1] === 0) {
-        dest = this.allocate(data.length - 1) - 1;
-      } else {
-        dest = this.allocate(data.length);
-      }
-    } else {
-      dest = this.allocate(data.length);
-    }
-    for (let i = 0; i < data.length; i++) {
-      buf[dest + i] = data.charCodeAt(i);
-    }
-  }
-
-  toHexString() {
-    let output = '';
-    const u8 = new Uint8Array(this.data, 0, this.cursize);
-    const lineBytes = 16;
-    for (let i = 0; i < u8.length; i += lineBytes) {
-      let line = ('00000000' + i.toString(16)).slice(-8) + ': ';
-      let hexPart = '';
-      let asciiPart = '';
-      for (let j = 0; j < lineBytes; j++) {
-        if (i + j < u8.length) {
-          const byte = u8[i + j];
-          hexPart += ('0' + byte.toString(16)).slice(-2) + ' ';
-          asciiPart += (byte >= 32 && byte <= 126 ? String.fromCharCode(byte) : '.');
-        } else {
-          hexPart += '   ';
-          asciiPart += ' ';
-        }
-      }
-      line += hexPart + ' ' + asciiPart;
-      output += line + '\n';
-    }
-    return output;
-  }
-
-  toString() {
-    return `SzBuffer: (${this.name}) ${this.cursize} bytes of ${this.maxsize} bytes used, overflowed? ${this.overflowed ? 'yes' : 'no'}`;
-  }
-
-  writeChar(c) {
-    console.assert(c >= -128 && c <= 127, 'must be signed byte', c);
-    new DataView(this.data).setInt8(this.allocate(1), c);
-  }
-
-  writeByte(c) {
-    console.assert(c >= 0 && c <= 255, 'must be unsigned byte', c);
-    new DataView(this.data).setUint8(this.allocate(1), c);
-  }
-
-  writeShort(c) {
-    console.assert(c >= -32768 && c <= 32767, 'must be signed short', c);
-    new DataView(this.data).setInt16(this.allocate(2), c, true);
-  }
-
-  writeUint16(c) {
-    console.assert(c >= 0 && c <= 65535, 'must be unsigned short', c);
-    new DataView(this.data).setUint16(this.allocate(2), c, true);
-  }
-
-  writeLong(c) {
-    console.assert(c >= -2147483648 && c <= 2147483647, 'must be signed long', c);
-    new DataView(this.data).setInt32(this.allocate(4), c, true);
-  }
-
-  writeFloat(f) {
-    console.assert(typeof f === 'number' && !Q.isNaN(f) && isFinite(f), 'must be a real number, not NaN or Infinity');
-    new DataView(this.data).setFloat32(this.allocate(4), f, true);
-  }
-
-  writeString(s) {
-    if (s) {
-      this.write(new Uint8Array(Q.strmem(s)), s.length);
-    }
-    this.writeChar(0);
-  }
-
-  writeCoord(f) {
-    // NOTE: when adjusting quantization of coordinates, make sure to update the snap/nudge position logic in Pmove as well
-    this.writeLong(f * 8.0);
-  }
-
-  writeCoordVector(vec) {
-    this.writeCoord(vec[0]);
-    this.writeCoord(vec[1]);
-    this.writeCoord(vec[2]);
-  }
-
-  writeAngle(f) {
-    this.writeShort(Math.round((f / 360.0 * 32768.0)) % 32768);
-  }
-
-  writeAngleVector(vec) {
-    this.writeAngle(vec[0]);
-    this.writeAngle(vec[1]);
-    this.writeAngle(vec[2]);
-  }
-
-  writeRGB(color) {
-    this.writeByte(Math.round(color[0] * 255));
-    this.writeByte(Math.round(color[1] * 255));
-    this.writeByte(Math.round(color[2] * 255));
-  }
-
-  writeRGBA(color, alpha) {
-    this.writeRGB(color);
-    this.writeByte(Math.round(alpha * 255));
-  }
-
-  beginReading() {
-    this.readcount = 0;
-    this.badread = false;
-  }
-
-  readChar() {
-    if (this.readcount >= this.cursize) {
-      this.badread = true;
-      // debugger;
-      return -1;
-    }
-    const c = new Int8Array(this.data, this.readcount, 1)[0];
-    this.readcount++;
-    return c;
-  }
-
-  readByte() {
-    if (this.readcount >= this.cursize) {
-      this.badread = true;
-      // debugger;
-      return -1;
-    }
-    const c = new Uint8Array(this.data, this.readcount, 1)[0];
-    this.readcount++;
-    return c;
-  }
-
-  readShort() {
-    if ((this.readcount + 2) > this.cursize) {
-      this.badread = true;
-      // debugger;
-      return -1;
-    }
-    const num = new DataView(this.data).getInt16(this.readcount, true);
-    this.readcount += 2;
-    return num;
-  }
-
-  readUint16() {
-    if ((this.readcount + 2) > this.cursize) {
-      this.badread = true;
-      // debugger;
-      return -1;
-    }
-    const num = new DataView(this.data).getUint16(this.readcount, true);
-    this.readcount += 2;
-    return num;
-  }
-
-  readLong() {
-    if ((this.readcount + 4) > this.cursize) {
-      this.badread = true;
-      // debugger;
-      return -1;
-    }
-    const num = new DataView(this.data).getInt32(this.readcount, true);
-    this.readcount += 4;
-    return num;
-  }
-
-  readFloat() {
-    if ((this.readcount + 4) > this.cursize) {
-      this.badread = true;
-      // debugger;
-      return -1;
-    }
-    const num = new DataView(this.data).getFloat32(this.readcount, true);
-    this.readcount += 4;
-    return num;
-  }
-
-  readString() {
-    const chars = [];
-    for (let i = 0; i < this.cursize; i++) {
-      const c = this.readByte();
-      if (c <= 0) {
-        break;
-      }
-      chars.push(String.fromCharCode(c));
-    }
-    return chars.join('');
-  }
-
-  readCoord() {
-    return this.readLong() * 0.125;
-  }
-
-  readCoordVector() {
-    return new Vector(this.readCoord(), this.readCoord(), this.readCoord());
-  }
-
-  readAngle() {
-    return this.readShort() * (360.0 / 32768.0);
-  }
-
-  readAngleVector() {
-    return new Vector(this.readAngle(), this.readAngle(), this.readAngle());
-  }
-
-  readRGB() {
-    return new Vector(
-      this.readByte() / 255,
-      this.readByte() / 255,
-      this.readByte() / 255,
-    );
-  }
-
-  readRGBA() {
-    return [this.readRGB(), this.readByte() / 255];
-  }
-
-  /**
-   * Write a delta usercmd to the message buffer.
-   * @param {Protocol.UserCmd} from previous usercmd
-   * @param {Protocol.UserCmd} to current usercmd
-   */
-  writeDeltaUsercmd(from, to) {
-    let bits = 0;
-
-    if (to.forwardmove !== from.forwardmove) {
-      bits |= Protocol.cm.CM_FORWARD;
-    }
-
-    if (to.sidemove !== from.sidemove) {
-      bits |= Protocol.cm.CM_SIDE;
-    }
-
-    if (to.upmove !== from.upmove) {
-      bits |= Protocol.cm.CM_UP;
-    }
-
-    if (to.angles[0] !== from.angles[0]) {
-      bits |= Protocol.cm.CM_ANGLE1;
-    }
-
-    if (to.angles[1] !== from.angles[1]) {
-      bits |= Protocol.cm.CM_ANGLE2;
-    }
-
-    if (to.angles[2] !== from.angles[2]) {
-      bits |= Protocol.cm.CM_ANGLE3;
-    }
-
-    if (to.buttons !== from.buttons) {
-      bits |= Protocol.cm.CM_BUTTONS;
-    }
-
-    if (to.impulse !== from.impulse) {
-      bits |= Protocol.cm.CM_IMPULSE;
-    }
-
-    this.writeByte(bits);
-
-    if (bits & Protocol.cm.CM_FORWARD) {
-      this.writeShort(to.forwardmove);
-    }
-
-    if (bits & Protocol.cm.CM_SIDE) {
-      this.writeShort(to.sidemove);
-    }
-
-    if (bits & Protocol.cm.CM_UP) {
-      this.writeShort(to.upmove);
-    }
-
-    if (bits & Protocol.cm.CM_ANGLE1) {
-      this.writeAngle(to.angles[0]);
-    }
-
-    if (bits & Protocol.cm.CM_ANGLE2) {
-      this.writeAngle(to.angles[1]);
-    }
-
-    if (bits & Protocol.cm.CM_ANGLE3) {
-      this.writeAngle(to.angles[2]);
-    }
-
-    if (bits & Protocol.cm.CM_BUTTONS) {
-      this.writeByte(to.buttons);
-    }
-
-    if (bits & Protocol.cm.CM_IMPULSE) {
-      this.writeByte(to.impulse);
-    }
-
-    this.writeByte(to.msec);
-  }
-
-  /**
-   * Read a delta usercmd from the message buffer.
-   * @param {Protocol.UserCmd} from previous usercmd
-   * @returns {Protocol.UserCmd} current usercmd
-   */
-  readDeltaUsercmd(from) {
-    const to = new Protocol.UserCmd();
-
-    to.set(from);
-
-    const bits = this.readByte();
-
-    if (bits & Protocol.cm.CM_FORWARD) {
-      to.forwardmove = this.readShort();
-    }
-
-    if (bits & Protocol.cm.CM_SIDE) {
-      to.sidemove = this.readShort();
-    }
-
-    if (bits & Protocol.cm.CM_UP) {
-      to.upmove = this.readShort();
-    }
-
-    if (bits & Protocol.cm.CM_ANGLE1) {
-      to.angles[0] = this.readAngle();
-    }
-
-    if (bits & Protocol.cm.CM_ANGLE2) {
-      to.angles[1] = this.readAngle();
-    }
-
-    if (bits & Protocol.cm.CM_ANGLE3) {
-      to.angles[2] = this.readAngle();
-    }
-
-    if (bits & Protocol.cm.CM_BUTTONS) {
-      to.buttons = this.readByte();
-    }
-
-    if (bits & Protocol.cm.CM_IMPULSE) {
-      to.impulse = this.readByte();
-    }
-
-    to.msec = this.readByte();
-
-    return to;
-  }
-
-  /**
-   * Write an array of serializable values to the buffer.
-   * @param {Array} serializables array of values to serialize
-   */
-  writeSerializables(serializables) {
-    for (const serializable of serializables) {
-      switch (true) {
-      case serializable === undefined:
-        console.assert(false, 'serializable must not be undefined');
-        this.writeByte(Protocol.serializableTypes.null);
-        continue;
-      case serializable === null:
-        this.writeByte(Protocol.serializableTypes.null);
-        continue;
-      case typeof serializable === 'string':
-        this.writeByte(Protocol.serializableTypes.string);
-        this.writeString(serializable);
-        continue;
-      case typeof serializable === 'number':
-        if (Number.isInteger(serializable)) {
-          if (serializable >= 0 && serializable < 256) {
-            this.writeByte(Protocol.serializableTypes.byte);
-            this.writeByte(serializable);
-          } else if (serializable >= -32768 && serializable < 32768) {
-            this.writeByte(Protocol.serializableTypes.short);
-            this.writeShort(serializable);
-          } else {
-            this.writeByte(Protocol.serializableTypes.long);
-            this.writeLong(serializable);
-          }
-        } else {
-          this.writeByte(Protocol.serializableTypes.float);
-          this.writeFloat(serializable);
-        }
-        continue;
-      case typeof serializable === 'boolean':
-        this.writeByte(serializable ? Protocol.serializableTypes.true : Protocol.serializableTypes.false);
-        continue;
-      case serializable instanceof Vector:
-        this.writeByte(Protocol.serializableTypes.vector);
-        this.writeCoordVector(serializable);
-        continue;
-      case serializable instanceof Array:
-        this.writeByte(Protocol.serializableTypes.array);
-        this.writeSerializables(serializable);
-        continue;
-      }
-
-      const handler = serializableHandlers.find((h) => serializable instanceof h.constructor);
-
-      if (handler) {
-        this.writeByte(handler.id);
-        handler.serialize(this, serializable);
-        continue;
-      }
-
-      throw new TypeError(`Unsupported argument type: ${typeof serializable}`);
-    }
-
-    // end of event data
-    this.writeByte(Protocol.serializableTypes.none);
-  }
-
-  /**
-   * Read an array of serializable values from the buffer (client-side).
-   * @returns {Array} array of deserialized values
-   */
-  readSerializablesOnClient() {
-    const serializables = [];
-
-    while (true) {
-      const type = this.readByte();
-      if (type === Protocol.serializableTypes.none) {
-        break; // end of stream of serializables
-      }
-
-      switch (type) {
-      case Protocol.serializableTypes.string:
-        serializables.push(this.readString());
-        continue;
-      case Protocol.serializableTypes.long:
-        serializables.push(this.readLong());
-        continue;
-      case Protocol.serializableTypes.short:
-        serializables.push(this.readShort());
-        continue;
-      case Protocol.serializableTypes.byte:
-        serializables.push(this.readByte());
-        continue;
-      case Protocol.serializableTypes.float:
-        serializables.push(this.readFloat());
-        continue;
-      case Protocol.serializableTypes.true:
-        serializables.push(true);
-        continue;
-      case Protocol.serializableTypes.false:
-        serializables.push(false);
-        continue;
-      case Protocol.serializableTypes.null:
-        serializables.push(null);
-        continue;
-      case Protocol.serializableTypes.vector:
-        serializables.push(this.readCoordVector());
-        continue;
-      case Protocol.serializableTypes.array:
-        serializables.push(this.readSerializablesOnClient());
-        continue;
-      }
-
-      const handler = serializableHandlers.find((h) => h.id === type);
-
-      if (handler) {
-        serializables.push(handler.deserializeOnClient(this));
-        continue;
-      }
-
-      throw new TypeError(`Unsupported serializable type: ${type}`);
-    }
-
-    return serializables;
-  }
-};
diff --git a/source/engine/network/MSG.ts b/source/engine/network/MSG.ts
new file mode 100644
index 00000000..75ccd626
--- /dev/null
+++ b/source/engine/network/MSG.ts
@@ -0,0 +1,613 @@
+import type { SerializableType } from '../../shared/GameInterfaces.ts';
+import Q from '../../shared/Q.ts';
+import Vector from '../../shared/Vector.ts';
+import * as Protocol from '../network/Protocol.ts';
+import { eventBus, getCommonRegistry } from '../registry.mjs';
+
+type SerializableVectorLike = ArrayLike<number>;
+type SerializableValue = SerializableType | object;
+type SerializableConstructor<T extends object = object> = abstract new (...args: never[]) => T;
+
+type SerializableHandlers<T extends object = object, ServerValue = object, ClientValue = object> = {
+  serialize: (sz: SzBuffer, object: T) => void;
+  deserializeOnServer: (sz: SzBuffer) => ServerValue;
+  deserializeOnClient: (sz: SzBuffer) => ClientValue;
+};
+
+type RegisteredSerializableHandler = {
+  id: number;
+  constructor: SerializableConstructor;
+  serialize: (sz: SzBuffer, object: object) => void;
+  deserializeOnServer: (sz: SzBuffer) => unknown;
+  deserializeOnClient: (sz: SzBuffer) => unknown;
+};
+
+let { Con } = getCommonRegistry();
+
+eventBus.subscribe('registry.frozen', () => {
+  ({ Con } = getCommonRegistry());
+});
+
+const serializableHandlers: RegisteredSerializableHandler[] = [];
+
+/**
+ * Registers a custom serializable type for network transmission.
+ * @param constructor constructor used to match values during serialization
+ * @param root0 serialization handlers
+ * @param root0.serialize writes the object into the size buffer
+ * @param root0.deserializeOnServer reads the object on the server side
+ * @param root0.deserializeOnClient reads the object on the client side
+ */
+export function registerSerializableType<T extends object, ServerValue = T, ClientValue = T>(
+  constructor: SerializableConstructor<T>,
+  { serialize, deserializeOnServer, deserializeOnClient }: SerializableHandlers<T, ServerValue, ClientValue>,
+): void {
+  serializableHandlers.push({
+    constructor,
+    serialize: serialize as (sz: SzBuffer, object: object) => void,
+    deserializeOnServer,
+    deserializeOnClient,
+    id: Object.keys(Protocol.serializableTypes).length + serializableHandlers.length,
+  });
+}
+
+export class SzBuffer {
+  readcount = 0;
+  badread = false;
+  name: string;
+  data: ArrayBuffer;
+  cursize: number;
+  allowoverflow: boolean;
+  overflowed: boolean;
+
+  constructor(size: number, name = 'anonymous') {
+    this.name = name;
+    this.data = new ArrayBuffer(size);
+    this.cursize = 0;
+    this.allowoverflow = false;
+    this.overflowed = false;
+  }
+
+  get maxsize(): number {
+    return this.data.byteLength;
+  }
+
+  clear(): void {
+    this.cursize = 0;
+    this.overflowed = false;
+  }
+
+  copy(): SzBuffer {
+    const copy = new SzBuffer(this.maxsize, this.name);
+
+    copy.cursize = this.cursize;
+    copy.overflowed = this.overflowed;
+
+    const source = new Uint8Array(this.data);
+    const destination = new Uint8Array(copy.data);
+
+    destination.set(source);
+
+    return copy;
+  }
+
+  set(other: SzBuffer): SzBuffer {
+    this.name = other.name;
+    this.data = new ArrayBuffer(other.maxsize);
+    new Uint8Array(this.data).set(new Uint8Array(other.data));
+    this.cursize = other.cursize;
+    this.allowoverflow = other.allowoverflow;
+    this.overflowed = other.overflowed;
+
+    return this;
+  }
+
+  allocate(size: number): number {
+    if (this.cursize + size > this.maxsize) {
+      if (this.allowoverflow !== true) {
+        throw new RangeError('SzBuffer.allocate: overflow without allowoverflow set');
+      }
+
+      if (size > this.maxsize) {
+        throw new RangeError(`SzBuffer.allocate: ${size} is > full buffer size`);
+      }
+
+      this.overflowed = true;
+      this.cursize = 0;
+
+      Con.Print('SzBuffer.allocate: overflow\n');
+      // eslint-disable-next-line no-debugger
+      debugger;
+    }
+
+    const cursorSize = this.cursize;
+
+    this.cursize += size;
+
+    return cursorSize;
+  }
+
+  write(data: Uint8Array, length: number): void {
+    const view = new Uint8Array(this.data, this.allocate(length), length);
+
+    view.set(data.subarray(0, length));
+  }
+
+  print(data: string): void {
+    const buffer = new Uint8Array(this.data);
+    let destination: number;
+
+    if (this.cursize !== 0) {
+      if (buffer[this.cursize - 1] === 0) {
+        destination = this.allocate(data.length - 1) - 1;
+      } else {
+        destination = this.allocate(data.length);
+      }
+    } else {
+      destination = this.allocate(data.length);
+    }
+
+    for (let i = 0; i < data.length; i++) {
+      buffer[destination + i] = data.charCodeAt(i);
+    }
+  }
+
+  toHexString(): string {
+    let output = '';
+    const bytes = new Uint8Array(this.data, 0, this.cursize);
+    const lineBytes = 16;
+
+    for (let i = 0; i < bytes.length; i += lineBytes) {
+      let line = `00000000${i.toString(16)}`.slice(-8) + ': ';
+      let hexPart = '';
+      let asciiPart = '';
+
+      for (let j = 0; j < lineBytes; j++) {
+        if (i + j < bytes.length) {
+          const byte = bytes[i + j];
+
+          hexPart += `0${byte.toString(16)}`.slice(-2) + ' ';
+          asciiPart += byte >= 32 && byte <= 126 ? String.fromCharCode(byte) : '.';
+        } else {
+          hexPart += '   ';
+          asciiPart += ' ';
+        }
+      }
+
+      line += `${hexPart} ${asciiPart}`;
+      output += `${line}\n`;
+    }
+
+    return output;
+  }
+
+  toString(): string {
+    return `SzBuffer: (${this.name}) ${this.cursize} bytes of ${this.maxsize} bytes used, overflowed? ${this.overflowed ? 'yes' : 'no'}`;
+  }
+
+  writeChar(value: number): void {
+    console.assert(value >= -128 && value <= 127, 'must be signed byte', value);
+    new DataView(this.data).setInt8(this.allocate(1), value);
+  }
+
+  writeByte(value: number): void {
+    console.assert(value >= 0 && value <= 255, 'must be unsigned byte', value);
+    new DataView(this.data).setUint8(this.allocate(1), value);
+  }
+
+  writeShort(value: number): void {
+    console.assert(value >= -32768 && value <= 32767, 'must be signed short', value);
+    new DataView(this.data).setInt16(this.allocate(2), value, true);
+  }
+
+  writeUint16(value: number): void {
+    console.assert(value >= 0 && value <= 65535, 'must be unsigned short', value);
+    new DataView(this.data).setUint16(this.allocate(2), value, true);
+  }
+
+  writeLong(value: number): void {
+    console.assert(value >= -2147483648 && value <= 2147483647, 'must be signed long', value);
+    new DataView(this.data).setInt32(this.allocate(4), value, true);
+  }
+
+  writeFloat(value: number): void {
+    console.assert(typeof value === 'number' && !Q.isNaN(value) && Number.isFinite(value), 'must be a real number, not NaN or Infinity');
+    new DataView(this.data).setFloat32(this.allocate(4), value, true);
+  }
+
+  writeString(value: string): void {
+    if (value) {
+      this.write(new Uint8Array(Q.strmem(value)), value.length);
+    }
+
+    this.writeChar(0);
+  }
+
+  writeCoord(value: number): void {
+    this.writeLong(value * 8.0);
+  }
+
+  writeCoordVector(vector: SerializableVectorLike): void {
+    this.writeCoord(vector[0]);
+    this.writeCoord(vector[1]);
+    this.writeCoord(vector[2]);
+  }
+
+  writeAngle(value: number): void {
+    this.writeShort(Math.round((value / 360.0 * 32768.0)) % 32768);
+  }
+
+  writeAngleVector(vector: SerializableVectorLike): void {
+    this.writeAngle(vector[0]);
+    this.writeAngle(vector[1]);
+    this.writeAngle(vector[2]);
+  }
+
+  writeRGB(color: SerializableVectorLike): void {
+    this.writeByte(Math.round(color[0] * 255));
+    this.writeByte(Math.round(color[1] * 255));
+    this.writeByte(Math.round(color[2] * 255));
+  }
+
+  writeRGBA(color: SerializableVectorLike, alpha: number): void {
+    this.writeRGB(color);
+    this.writeByte(Math.round(alpha * 255));
+  }
+
+  beginReading(): void {
+    this.readcount = 0;
+    this.badread = false;
+  }
+
+  readChar(): number {
+    if (this.readcount >= this.cursize) {
+      this.badread = true;
+      return -1;
+    }
+
+    const value = new Int8Array(this.data, this.readcount, 1)[0];
+
+    this.readcount++;
+
+    return value;
+  }
+
+  readByte(): number {
+    if (this.readcount >= this.cursize) {
+      this.badread = true;
+      return -1;
+    }
+
+    const value = new Uint8Array(this.data, this.readcount, 1)[0];
+
+    this.readcount++;
+
+    return value;
+  }
+
+  readShort(): number {
+    if (this.readcount + 2 > this.cursize) {
+      this.badread = true;
+      return -1;
+    }
+
+    const value = new DataView(this.data).getInt16(this.readcount, true);
+
+    this.readcount += 2;
+
+    return value;
+  }
+
+  readUint16(): number {
+    if (this.readcount + 2 > this.cursize) {
+      this.badread = true;
+      return -1;
+    }
+
+    const value = new DataView(this.data).getUint16(this.readcount, true);
+
+    this.readcount += 2;
+
+    return value;
+  }
+
+  readLong(): number {
+    if (this.readcount + 4 > this.cursize) {
+      this.badread = true;
+      return -1;
+    }
+
+    const value = new DataView(this.data).getInt32(this.readcount, true);
+
+    this.readcount += 4;
+
+    return value;
+  }
+
+  readFloat(): number {
+    if (this.readcount + 4 > this.cursize) {
+      this.badread = true;
+      return -1;
+    }
+
+    const value = new DataView(this.data).getFloat32(this.readcount, true);
+
+    this.readcount += 4;
+
+    return value;
+  }
+
+  readString(): string {
+    const chars: string[] = [];
+
+    for (let i = 0; i < this.cursize; i++) {
+      const character = this.readByte();
+
+      if (character <= 0) {
+        break;
+      }
+
+      chars.push(String.fromCharCode(character));
+    }
+
+    return chars.join('');
+  }
+
+  readCoord(): number {
+    return this.readLong() * 0.125;
+  }
+
+  readCoordVector(): Vector {
+    return new Vector(this.readCoord(), this.readCoord(), this.readCoord());
+  }
+
+  readAngle(): number {
+    return this.readShort() * (360.0 / 32768.0);
+  }
+
+  readAngleVector(): Vector {
+    return new Vector(this.readAngle(), this.readAngle(), this.readAngle());
+  }
+
+  readRGB(): Vector {
+    return new Vector(
+      this.readByte() / 255,
+      this.readByte() / 255,
+      this.readByte() / 255,
+    );
+  }
+
+  readRGBA(): [Vector, number] {
+    return [this.readRGB(), this.readByte() / 255];
+  }
+
+  writeDeltaUsercmd(from: Protocol.UserCmd, to: Protocol.UserCmd): void {
+    let bits = 0;
+
+    if (to.forwardmove !== from.forwardmove) {
+      bits |= Protocol.cm.CM_FORWARD;
+    }
+
+    if (to.sidemove !== from.sidemove) {
+      bits |= Protocol.cm.CM_SIDE;
+    }
+
+    if (to.upmove !== from.upmove) {
+      bits |= Protocol.cm.CM_UP;
+    }
+
+    if (to.angles[0] !== from.angles[0]) {
+      bits |= Protocol.cm.CM_ANGLE1;
+    }
+
+    if (to.angles[1] !== from.angles[1]) {
+      bits |= Protocol.cm.CM_ANGLE2;
+    }
+
+    if (to.angles[2] !== from.angles[2]) {
+      bits |= Protocol.cm.CM_ANGLE3;
+    }
+
+    if (to.buttons !== from.buttons) {
+      bits |= Protocol.cm.CM_BUTTONS;
+    }
+
+    if (to.impulse !== from.impulse) {
+      bits |= Protocol.cm.CM_IMPULSE;
+    }
+
+    this.writeByte(bits);
+
+    if (bits & Protocol.cm.CM_FORWARD) {
+      this.writeShort(to.forwardmove);
+    }
+
+    if (bits & Protocol.cm.CM_SIDE) {
+      this.writeShort(to.sidemove);
+    }
+
+    if (bits & Protocol.cm.CM_UP) {
+      this.writeShort(to.upmove);
+    }
+
+    if (bits & Protocol.cm.CM_ANGLE1) {
+      this.writeAngle(to.angles[0]);
+    }
+
+    if (bits & Protocol.cm.CM_ANGLE2) {
+      this.writeAngle(to.angles[1]);
+    }
+
+    if (bits & Protocol.cm.CM_ANGLE3) {
+      this.writeAngle(to.angles[2]);
+    }
+
+    if (bits & Protocol.cm.CM_BUTTONS) {
+      this.writeByte(to.buttons);
+    }
+
+    if (bits & Protocol.cm.CM_IMPULSE) {
+      this.writeByte(to.impulse);
+    }
+
+    this.writeByte(to.msec);
+  }
+
+  readDeltaUsercmd(from: Protocol.UserCmd): Protocol.UserCmd {
+    const to = new Protocol.UserCmd();
+
+    to.set(from);
+
+    const bits = this.readByte();
+
+    if (bits & Protocol.cm.CM_FORWARD) {
+      to.forwardmove = this.readShort();
+    }
+
+    if (bits & Protocol.cm.CM_SIDE) {
+      to.sidemove = this.readShort();
+    }
+
+    if (bits & Protocol.cm.CM_UP) {
+      to.upmove = this.readShort();
+    }
+
+    if (bits & Protocol.cm.CM_ANGLE1) {
+      to.angles[0] = this.readAngle();
+    }
+
+    if (bits & Protocol.cm.CM_ANGLE2) {
+      to.angles[1] = this.readAngle();
+    }
+
+    if (bits & Protocol.cm.CM_ANGLE3) {
+      to.angles[2] = this.readAngle();
+    }
+
+    if (bits & Protocol.cm.CM_BUTTONS) {
+      to.buttons = this.readByte();
+    }
+
+    if (bits & Protocol.cm.CM_IMPULSE) {
+      to.impulse = this.readByte();
+    }
+
+    to.msec = this.readByte();
+
+    return to;
+  }
+
+  writeSerializables(serializables: readonly SerializableValue[]): void {
+    for (const serializable of serializables) {
+      switch (true) {
+        case serializable === undefined:
+          console.assert(false, 'serializable must not be undefined');
+          this.writeByte(Protocol.serializableTypes.null);
+          continue;
+        case serializable === null:
+          this.writeByte(Protocol.serializableTypes.null);
+          continue;
+        case typeof serializable === 'string':
+          this.writeByte(Protocol.serializableTypes.string);
+          this.writeString(serializable);
+          continue;
+        case typeof serializable === 'number':
+          if (Number.isInteger(serializable)) {
+            if (serializable >= 0 && serializable < 256) {
+              this.writeByte(Protocol.serializableTypes.byte);
+              this.writeByte(serializable);
+            } else if (serializable >= -32768 && serializable < 32768) {
+              this.writeByte(Protocol.serializableTypes.short);
+              this.writeShort(serializable);
+            } else {
+              this.writeByte(Protocol.serializableTypes.long);
+              this.writeLong(serializable);
+            }
+          } else {
+            this.writeByte(Protocol.serializableTypes.float);
+            this.writeFloat(serializable);
+          }
+          continue;
+        case typeof serializable === 'boolean':
+          this.writeByte(serializable ? Protocol.serializableTypes.true : Protocol.serializableTypes.false);
+          continue;
+        case serializable instanceof Vector:
+          this.writeByte(Protocol.serializableTypes.vector);
+          this.writeCoordVector(serializable);
+          continue;
+        case serializable instanceof Array:
+          this.writeByte(Protocol.serializableTypes.array);
+          this.writeSerializables(serializable);
+          continue;
+      }
+
+      const handler = serializableHandlers.find((candidate) => serializable instanceof candidate.constructor);
+
+      if (handler) {
+        this.writeByte(handler.id);
+        handler.serialize(this, serializable);
+        continue;
+      }
+
+      throw new TypeError(`Unsupported argument type: ${typeof serializable}`);
+    }
+
+    this.writeByte(Protocol.serializableTypes.none);
+  }
+
+  readSerializablesOnClient(): SerializableValue[] {
+    const serializables: SerializableValue[] = [];
+
+    while (true) {
+      const type = this.readByte();
+
+      if (type === Protocol.serializableTypes.none) {
+        break;
+      }
+
+      switch (type) {
+        case Protocol.serializableTypes.string:
+          serializables.push(this.readString());
+          continue;
+        case Protocol.serializableTypes.long:
+          serializables.push(this.readLong());
+          continue;
+        case Protocol.serializableTypes.short:
+          serializables.push(this.readShort());
+          continue;
+        case Protocol.serializableTypes.byte:
+          serializables.push(this.readByte());
+          continue;
+        case Protocol.serializableTypes.float:
+          serializables.push(this.readFloat());
+          continue;
+        case Protocol.serializableTypes.true:
+          serializables.push(true);
+          continue;
+        case Protocol.serializableTypes.false:
+          serializables.push(false);
+          continue;
+        case Protocol.serializableTypes.null:
+          serializables.push(null);
+          continue;
+        case Protocol.serializableTypes.vector:
+          serializables.push(this.readCoordVector());
+          continue;
+        case Protocol.serializableTypes.array:
+          serializables.push(this.readSerializablesOnClient());
+          continue;
+      }
+
+      const handler = serializableHandlers.find((candidate) => candidate.id === type);
+
+      if (handler) {
+        serializables.push(handler.deserializeOnClient(this) as SerializableValue);
+        continue;
+      }
+
+      throw new TypeError(`Unsupported serializable type: ${type}`);
+    }
+
+    return serializables;
+  }
+}
diff --git a/source/engine/network/Network.mjs b/source/engine/network/Network.mjs
index e56c3582..0ddab36b 100644
--- a/source/engine/network/Network.mjs
+++ b/source/engine/network/Network.mjs
@@ -2,7 +2,7 @@ import Cmd from '../common/Cmd.mjs';
 import Cvar from '../common/Cvar.mjs';
 import Q from '../../shared/Q.ts';
 import { eventBus, registry } from '../registry.mjs';
-import { SzBuffer } from './MSG.mjs';
+import { SzBuffer } from './MSG.ts';
 import { BaseDriver, LoopDriver, QSocket, WebRTCDriver, WebSocketDriver } from './NetworkDrivers.mjs';
 import { DriverRegistry } from './DriverRegistry.mjs';
 import { InviteCommand } from './ConsoleCommands.mjs';
diff --git a/source/engine/registry.mjs b/source/engine/registry.mjs
index 00027310..47b1723f 100644
--- a/source/engine/registry.mjs
+++ b/source/engine/registry.mjs
@@ -49,6 +49,38 @@
  * @property {boolean} isDedicatedServer true when running in server mode
  * @property {boolean} isInsideWorker true when running inside a worker
  */
+/**
+ * Registry members guaranteed after both browser and dedicated launch.
+ * @typedef {Registry & {
+ *   COM: ComModule,
+ *   Con: ConModule,
+ *   Host: HostModule,
+ *   NET: NetModule,
+ *   Sys: SysModule,
+ *   V: VModule,
+ *   SV: ServerModule,
+ *   Mod: ModModule,
+ *   PR: ProgsModule,
+ *   WebSocket: WebSocketClass,
+ * }} CommonRegistry
+ */
+/**
+ * Registry members guaranteed only after browser launch.
+ * @typedef {CommonRegistry & {
+ *   CL: ClientModule,
+ *   Draw: DrawModule,
+ *   Key: KeyModule,
+ *   IN: InputModule,
+ *   M: MenuModule,
+ *   R: RendererModule,
+ *   S: SoundModule,
+ *   Sbar: SbarModule,
+ *   SCR: ScrModule,
+ *   urls: URLs,
+ *   buildConfig: BuildConfig,
+ *   isDedicatedServer: false,
+ * }} ClientRegistry
+ */
 /** @type {Registry} */
 export const registry = {
   COM: undefined,
@@ -83,6 +115,24 @@ export const registry = {
 // make sure the registry is not extensible beyond the defined properties
 Object.seal(registry);
 
+/**
+ * Returns the registry members guaranteed after both browser and dedicated launch.
+ * Use this from code that runs in either runtime.
+ * @returns {CommonRegistry} initialized common registry view
+ */
+export function getCommonRegistry() {
+  return /** @type {CommonRegistry} */ (registry);
+}
+
+/**
+ * Returns the registry members guaranteed only after browser launch.
+ * Use this only from browser or client-only code paths.
+ * @returns {ClientRegistry} initialized client registry view
+ */
+export function getClientRegistry() {
+  return /** @type {ClientRegistry} */ (registry);
+}
+
 export class EventBus {
   /** @type {Map<string, Set<Function>>} */
   #listeners = new Map();
diff --git a/source/engine/server/Client.mjs b/source/engine/server/Client.mjs
index 4dd3c39d..289a064e 100644
--- a/source/engine/server/Client.mjs
+++ b/source/engine/server/Client.mjs
@@ -1,7 +1,7 @@
 import { enumHelpers } from '../../shared/Q.ts';
 import { gameCapabilities } from '../../shared/Defs.ts';
 import Vector from '../../shared/Vector.ts';
-import { SzBuffer } from '../network/MSG.mjs';
+import { SzBuffer } from '../network/MSG.ts';
 import { QSocket } from '../network/NetworkDrivers.mjs';
 import * as Protocol from '../network/Protocol.ts';
 import { eventBus, registry } from '../registry.mjs';
diff --git a/source/engine/server/Edict.mjs b/source/engine/server/Edict.mjs
index c903c0cb..9a63e050 100644
--- a/source/engine/server/Edict.mjs
+++ b/source/engine/server/Edict.mjs
@@ -1,5 +1,5 @@
 import Vector from '../../shared/Vector.ts';
-import { SzBuffer, registerSerializableType } from '../network/MSG.mjs';
+import { SzBuffer, registerSerializableType } from '../network/MSG.ts';
 import * as Protocol from '../network/Protocol.ts';
 import * as Def from '../common/Def.mjs';
 import * as Defs from '../../shared/Defs.ts';
diff --git a/source/engine/server/Server.mjs b/source/engine/server/Server.mjs
index ee1d6295..9c2080da 100644
--- a/source/engine/server/Server.mjs
+++ b/source/engine/server/Server.mjs
@@ -1,7 +1,7 @@
 import Cvar from '../common/Cvar.mjs';
 import { MoveVars, Pmove } from '../common/Pmove.mjs';
 import Vector from '../../shared/Vector.ts';
-import { SzBuffer } from '../network/MSG.mjs';
+import { SzBuffer } from '../network/MSG.ts';
 import * as Protocol from '../network/Protocol.ts';
 import * as Def from './../common/Def.mjs';
 import Cmd, { ConsoleCommand } from '../common/Cmd.mjs';
diff --git a/source/engine/server/ServerMessages.mjs b/source/engine/server/ServerMessages.mjs
index 5a9d77d9..026a77d9 100644
--- a/source/engine/server/ServerMessages.mjs
+++ b/source/engine/server/ServerMessages.mjs
@@ -1,4 +1,4 @@
-import { SzBuffer } from '../network/MSG.mjs';
+import { SzBuffer } from '../network/MSG.ts';
 import * as Protocol from '../network/Protocol.ts';
 import * as Defs from '../../shared/Defs.ts';
 import Cvar from '../common/Cvar.mjs';
diff --git a/test/common/msg.test.mjs b/test/common/msg.test.mjs
new file mode 100644
index 00000000..39508662
--- /dev/null
+++ b/test/common/msg.test.mjs
@@ -0,0 +1,66 @@
+import assert from 'node:assert/strict';
+import { describe, test } from 'node:test';
+
+import Vector from '../../source/shared/Vector.ts';
+import { SzBuffer } from '../../source/engine/network/MSG.ts';
+import { UserCmd, button } from '../../source/engine/network/Protocol.ts';
+
+void describe('SzBuffer', () => {
+  void test('round-trips delta user commands', () => {
+    const from = new UserCmd();
+    const to = new UserCmd();
+
+    from.msec = 8;
+    from.forwardmove = 100;
+    from.angles.set([5, 10, 15]);
+
+    to.set(from);
+    to.msec = 16;
+    to.forwardmove = 200;
+    to.sidemove = -40;
+    to.upmove = 12;
+    to.angles.set([45, 90, 135]);
+    to.buttons = button.attack;
+    to.impulse = 7;
+
+    const buffer = new SzBuffer(128, 'delta-usercmd');
+
+    buffer.writeDeltaUsercmd(from, to);
+    buffer.beginReading();
+
+    const decoded = buffer.readDeltaUsercmd(from);
+
+    assert.equal(decoded.equals(to), true);
+  });
+
+  void test('round-trips built-in serializable values', () => {
+    const buffer = new SzBuffer(256, 'serializables');
+    const values = [
+      'quake',
+      255,
+      -12,
+      12.5,
+      true,
+      false,
+      null,
+      new Vector(1, 2, 3),
+      [1, 'two', null],
+    ];
+
+    buffer.writeSerializables(values);
+    buffer.beginReading();
+
+    const decoded = buffer.readSerializablesOnClient();
+
+    assert.equal(decoded[0], 'quake');
+    assert.equal(decoded[1], 255);
+    assert.equal(decoded[2], -12);
+    assert.equal(decoded[3], 12.5);
+    assert.equal(decoded[4], true);
+    assert.equal(decoded[5], false);
+    assert.equal(decoded[6], null);
+    assert.ok(decoded[7] instanceof Vector);
+    assert.deepEqual(Array.from(decoded[7]), [1, 2, 3]);
+    assert.deepEqual(decoded[8], [1, 'two', null]);
+  });
+});
diff --git a/test/common/registry.test.mjs b/test/common/registry.test.mjs
new file mode 100644
index 00000000..0fab9a9a
--- /dev/null
+++ b/test/common/registry.test.mjs
@@ -0,0 +1,11 @@
+import assert from 'node:assert/strict';
+import { describe, test } from 'node:test';
+
+import { getClientRegistry, getCommonRegistry, registry } from '../../source/engine/registry.mjs';
+
+void describe('registry views', () => {
+  void test('return the shared registry singleton', () => {
+    assert.equal(getCommonRegistry(), registry);
+    assert.equal(getClientRegistry(), registry);
+  });
+});

From b9fdb332cc8d2421c62a21e1ef7ed1574d8ae41b Mon Sep 17 00:00:00 2001
From: Christian R <github@chrisnew.de>
Date: Thu, 2 Apr 2026 15:26:34 +0300
Subject: [PATCH 12/67] TS: network/

---
 .github/copilot-instructions.md               |    4 +
 .../code-style-guide.instructions.md          |    1 +
 eslint.config.mjs                             |    2 +
 source/engine/client/ClientConnection.mjs     |    2 +-
 source/engine/client/ClientState.mjs          |    2 +-
 source/engine/main-browser.mjs                |    2 +-
 source/engine/main-dedicated.mjs              |    2 +-
 ...ConsoleCommands.mjs => ConsoleCommands.ts} |   19 +-
 source/engine/network/DriverRegistry.mjs      |   78 -
 source/engine/network/DriverRegistry.ts       |   67 +
 source/engine/network/Misc.mjs                |    8 -
 source/engine/network/Misc.ts                 |    9 +
 source/engine/network/Network.mjs             |  316 ---
 source/engine/network/Network.ts              |  303 +++
 source/engine/network/NetworkDrivers.mjs      | 1972 ----------------
 source/engine/network/NetworkDrivers.ts       | 2047 +++++++++++++++++
 source/engine/registry.mjs                    |    2 +-
 source/engine/server/Client.mjs               |    2 +-
 test/common/console-commands.test.mjs         |  145 ++
 test/common/driver-registry.test.mjs          |   96 +
 test/common/network-drivers.test.mjs          |  120 +
 test/common/network-misc.test.mjs             |   14 +
 test/common/network.test.mjs                  |   93 +
 23 files changed, 2917 insertions(+), 2389 deletions(-)
 rename source/engine/network/{ConsoleCommands.mjs => ConsoleCommands.ts} (72%)
 delete mode 100644 source/engine/network/DriverRegistry.mjs
 create mode 100644 source/engine/network/DriverRegistry.ts
 delete mode 100644 source/engine/network/Misc.mjs
 create mode 100644 source/engine/network/Misc.ts
 delete mode 100644 source/engine/network/Network.mjs
 create mode 100644 source/engine/network/Network.ts
 delete mode 100644 source/engine/network/NetworkDrivers.mjs
 create mode 100644 source/engine/network/NetworkDrivers.ts
 create mode 100644 test/common/console-commands.test.mjs
 create mode 100644 test/common/driver-registry.test.mjs
 create mode 100644 test/common/network-drivers.test.mjs
 create mode 100644 test/common/network-misc.test.mjs
 create mode 100644 test/common/network.test.mjs

diff --git a/.github/copilot-instructions.md b/.github/copilot-instructions.md
index b95c08a7..842322bc 100644
--- a/.github/copilot-instructions.md
+++ b/.github/copilot-instructions.md
@@ -63,6 +63,10 @@ eventBus.subscribe("registry.frozen", () => {
 - **No `any`, `unknown`, or `*`**. Use specific types (e.g. `ArrayBuffer`).
 - **No `@returns {void}`**.
 
+### Helper Functions
+- **Prefer function declarations** for helper functions when lexical `this`, expression semantics, or very local inline usage are not needed.
+- **Use `const foo = (...) => ...`** only when arrow-function behavior is actually relevant.
+
 ## Specific Patterns to Observe
 
 - **Module System**: ES Modules exclusively (`type: "module"` in package.json).
diff --git a/.github/instructions/code-style-guide.instructions.md b/.github/instructions/code-style-guide.instructions.md
index f49f1642..efe7d945 100644
--- a/.github/instructions/code-style-guide.instructions.md
+++ b/.github/instructions/code-style-guide.instructions.md
@@ -64,6 +64,7 @@ Use `eventBus` for **business logic events and lifecycle hooks**.
 - **Use camelCase** for variables and functions, PascalCase for classes.
 - **Use descriptive names** for variables and functions.
 - **Keep functions small** and focused on a single task or a single responsibility.
+- **Prefer function declarations** for helper functions when arrow-function semantics are not needed.
 - **Use early returns** to reduce nesting and improve readability.
 - **Avoid deep nesting**; refactor into helper functions if necessary.
 - **Never mutate function parameters**; create new variables instead.
diff --git a/eslint.config.mjs b/eslint.config.mjs
index 968d9920..25c3e939 100644
--- a/eslint.config.mjs
+++ b/eslint.config.mjs
@@ -117,6 +117,8 @@ export default defineConfig([
     },
     rules: {
       ...commonRules,
+      'jsdoc/check-param-names': 'off',
+      'jsdoc/require-param': 'off',
       'jsdoc/require-param-type': 'off',
       'jsdoc/require-property-type': 'off',
       'jsdoc/require-returns-type': 'off',
diff --git a/source/engine/client/ClientConnection.mjs b/source/engine/client/ClientConnection.mjs
index 17b63f5d..d86869fc 100644
--- a/source/engine/client/ClientConnection.mjs
+++ b/source/engine/client/ClientConnection.mjs
@@ -6,7 +6,7 @@ import ClientInput from './ClientInput.mjs';
 import { clientRuntimeState, clientStaticState } from './ClientState.mjs';
 import { eventBus, registry } from '../registry.mjs';
 import * as Def from '../common/Def.mjs';
-import { QSocket } from '../network/NetworkDrivers.mjs';
+import { QSocket } from '../network/NetworkDrivers.ts';
 import { parseServerMessage as parseServerCommandMessage } from './ClientServerCommandHandlers.mjs';
 
 let { Con, Host, IN, Mod, NET, SCR, S, SV } = registry;
diff --git a/source/engine/client/ClientState.mjs b/source/engine/client/ClientState.mjs
index 8644e043..b50e1048 100644
--- a/source/engine/client/ClientState.mjs
+++ b/source/engine/client/ClientState.mjs
@@ -1,5 +1,5 @@
 import { SzBuffer } from '../network/MSG.ts';
-import { QSocket } from '../network/NetworkDrivers.mjs';
+import { QSocket } from '../network/NetworkDrivers.ts';
 import * as Protocol from '../network/Protocol.ts';
 import * as Def from '../common/Def.mjs';
 import Vector from '../../shared/Vector.ts';
diff --git a/source/engine/main-browser.mjs b/source/engine/main-browser.mjs
index d765f004..c941a76b 100644
--- a/source/engine/main-browser.mjs
+++ b/source/engine/main-browser.mjs
@@ -5,7 +5,7 @@ import COM from './common/Com.mjs';
 import Con from './common/Console.mjs';
 import Host from './common/Host.mjs';
 import V from './client/V.mjs';
-import NET from './network/Network.mjs';
+import NET from './network/Network.ts';
 import SV from './server/Server.mjs';
 import PR from './server/Progs.mjs';
 import Mod from './common/Mod.mjs';
diff --git a/source/engine/main-dedicated.mjs b/source/engine/main-dedicated.mjs
index f79ebd9e..fbada24e 100644
--- a/source/engine/main-dedicated.mjs
+++ b/source/engine/main-dedicated.mjs
@@ -13,7 +13,7 @@ import NodeCOM from './server/Com.mjs';
 import Con from './common/Console.mjs';
 import Host from './common/Host.mjs';
 import V from './client/V.mjs';
-import NET from './network/Network.mjs';
+import NET from './network/Network.ts';
 import SV from './server/Server.mjs';
 import PR from './server/Progs.mjs';
 import Mod from './common/Mod.mjs';
diff --git a/source/engine/network/ConsoleCommands.mjs b/source/engine/network/ConsoleCommands.ts
similarity index 72%
rename from source/engine/network/ConsoleCommands.mjs
rename to source/engine/network/ConsoleCommands.ts
index 1a7cac6b..abc95943 100644
--- a/source/engine/network/ConsoleCommands.mjs
+++ b/source/engine/network/ConsoleCommands.ts
@@ -1,18 +1,20 @@
 import { ConsoleCommand } from '../common/Cmd.mjs';
-import { eventBus, registry } from '../registry.mjs';
+import { eventBus, getCommonRegistry } from '../registry.mjs';
 
-let { NET, Con } = registry;
+let { Con, NET } = getCommonRegistry();
 
 eventBus.subscribe('registry.frozen', () => {
-  NET = registry.NET;
-  Con = registry.Con;
+  ({ Con, NET } = getCommonRegistry());
 });
 
+/**
+ * Copy a join link for the currently hosted session.
+ */
 export class InviteCommand extends ConsoleCommand {
-  async run() {
+  async run(): Promise<void> {
     const listenAddress = NET.GetListenAddress();
 
-    if (!listenAddress) {
+    if (listenAddress === null) {
       Con.PrintWarning('Cannot create invite link, not hosting.\n');
       return;
     }
@@ -25,9 +27,8 @@ export class InviteCommand extends ConsoleCommand {
     try {
       await navigator.clipboard.writeText(shareLink.toString());
       Con.Print(`This link has been copied to your clipboard:\n${shareLink.toString()}\n`);
-    // eslint-disable-next-line no-unused-vars
-    } catch (err) {
+    } catch {
       prompt('Share this link to invite players:', shareLink.toString());
     }
   }
-};
+}
diff --git a/source/engine/network/DriverRegistry.mjs b/source/engine/network/DriverRegistry.mjs
deleted file mode 100644
index 818525af..00000000
--- a/source/engine/network/DriverRegistry.mjs
+++ /dev/null
@@ -1,78 +0,0 @@
-import { BaseDriver } from './NetworkDrivers.mjs';
-
-/**
- * DriverRegistry - Manages network drivers and handles driver selection
- *
- * Clean separation of concerns: this class owns driver lifecycle and selection logic,
- * removing the need for global driverlevel state mutation.
- */
-export class DriverRegistry {
-  constructor() {
-    /** @type {Record<string, BaseDriver>} */
-    this.drivers = {};
-
-    /** @type {BaseDriver[]} */
-    this.orderedDrivers = [];
-  }
-
-  /**
-   * Register a network driver
-   * @param {string} name - Unique driver name
-   * @param {BaseDriver} driver - Driver instance
-   */
-  register(name, driver) {
-    this.drivers[name] = driver;
-    this.orderedDrivers.push(driver);
-  }
-
-  /**
-   * Get a driver by name
-   * @param {string} name - Driver name
-   * @returns {BaseDriver|null} driver or null if not found
-   */
-  get(name) {
-    return this.drivers[name] || null;
-  }
-
-  /**
-   * Select appropriate driver for a given address
-   * @param {string} address - address (e.g., "local", "wss://...", "webrtc://...")
-   * @returns {BaseDriver|null} suitable driver or null if none found
-   */
-  getClientDriver(address) {
-    // Fallback: try each initialized driver in order
-    for (const driver of this.orderedDrivers) {
-      if (driver.initialized && driver.canHandle(address)) {
-        return driver;
-      }
-    }
-
-    return null;
-  }
-
-  /**
-   * Get all initialized drivers
-   * @returns {BaseDriver[]} list of initialized drivers
-   */
-  getInitializedDrivers() {
-    return this.orderedDrivers.filter((d) => d.initialized);
-  }
-
-  /**
-   * Initialize all registered drivers
-   */
-  initialize() {
-    for (const driver of this.orderedDrivers) {
-      driver.Init();
-    }
-  }
-
-  /**
-   * Shutdown all drivers
-   */
-  shutdown() {
-    for (const driver of this.orderedDrivers) {
-      driver.Shutdown();
-    }
-  }
-}
diff --git a/source/engine/network/DriverRegistry.ts b/source/engine/network/DriverRegistry.ts
new file mode 100644
index 00000000..63b7c518
--- /dev/null
+++ b/source/engine/network/DriverRegistry.ts
@@ -0,0 +1,67 @@
+import type { BaseDriver } from './NetworkDrivers.ts';
+
+/**
+ * Manage network driver registration, lifecycle, and client-side selection.
+ */
+export class DriverRegistry {
+  /** Registered drivers by name. */
+  drivers: Record<string, BaseDriver> = {};
+  /** Drivers in registration order for deterministic selection. */
+  orderedDrivers: BaseDriver[] = [];
+
+  /**
+   * Register a network driver.
+   * @param name
+   * @param driver
+   */
+  register(name: string, driver: BaseDriver): void {
+    this.drivers[name] = driver;
+    this.orderedDrivers.push(driver);
+  }
+
+  /**
+   * Get a driver by name.
+   * @param name
+   * @returns Registered driver or null when absent.
+   */
+  get(name: string): BaseDriver | null {
+    return this.drivers[name] ?? null;
+  }
+
+  /**
+   * Select the first initialized driver that can handle the address.
+   * @param address
+   * @returns Suitable driver or null when no driver can handle the address.
+   */
+  getClientDriver(address: string): BaseDriver | null {
+    for (const driver of this.orderedDrivers) {
+      if (driver.initialized && driver.canHandle(address)) {
+        return driver;
+      }
+    }
+
+    return null;
+  }
+
+  /**
+   * Return all initialized drivers in registration order.
+   * @returns Initialized drivers.
+   */
+  getInitializedDrivers(): BaseDriver[] {
+    return this.orderedDrivers.filter((driver) => driver.initialized);
+  }
+
+  /** Initialize all registered drivers. */
+  initialize(): void {
+    for (const driver of this.orderedDrivers) {
+      driver.Init();
+    }
+  }
+
+  /** Shutdown all registered drivers. */
+  shutdown(): void {
+    for (const driver of this.orderedDrivers) {
+      driver.Shutdown();
+    }
+  }
+}
diff --git a/source/engine/network/Misc.mjs b/source/engine/network/Misc.mjs
deleted file mode 100644
index 32136655..00000000
--- a/source/engine/network/Misc.mjs
+++ /dev/null
@@ -1,8 +0,0 @@
-/**
- * @param {string} ip IP address
- * @param {number} port port number
- * @returns {string} formatted IP address with port
- */
-export function formatIP(ip, port) {
-  return ip.includes(':') ? `[${ip}]:${port}` : `${ip}:${port}`;
-};
diff --git a/source/engine/network/Misc.ts b/source/engine/network/Misc.ts
new file mode 100644
index 00000000..50d7862a
--- /dev/null
+++ b/source/engine/network/Misc.ts
@@ -0,0 +1,9 @@
+/**
+ * Format a host and port into a network address string.
+ * @param ip
+ * @param port
+ * @returns Formatted network address.
+ */
+export function formatIP(ip: string, port: number): string {
+  return ip.includes(':') ? `[${ip}]:${port}` : `${ip}:${port}`;
+}
diff --git a/source/engine/network/Network.mjs b/source/engine/network/Network.mjs
deleted file mode 100644
index 0ddab36b..00000000
--- a/source/engine/network/Network.mjs
+++ /dev/null
@@ -1,316 +0,0 @@
-import Cmd from '../common/Cmd.mjs';
-import Cvar from '../common/Cvar.mjs';
-import Q from '../../shared/Q.ts';
-import { eventBus, registry } from '../registry.mjs';
-import { SzBuffer } from './MSG.ts';
-import { BaseDriver, LoopDriver, QSocket, WebRTCDriver, WebSocketDriver } from './NetworkDrivers.mjs';
-import { DriverRegistry } from './DriverRegistry.mjs';
-import { InviteCommand } from './ConsoleCommands.mjs';
-import { clientConnectionState } from '../common/Def.mjs';
-
-const NET = {};
-
-export default NET;
-
-let { CL, Con, SV, Sys } = registry;
-
-eventBus.subscribe('registry.frozen', () => {
-  CL = registry.CL;
-  Con = registry.Con;
-  SV = registry.SV;
-  Sys = registry.Sys;
-});
-
-NET.activeSockets = /** @type {QSocket[]} */ ([]);
-NET.message = new SzBuffer(16384, 'NET.message');
-NET.activeconnections = 0;
-NET.listening = false;
-NET.driverRegistry = /** @type {DriverRegistry} */ (null);
-
-/**
- * @param {BaseDriver} driver responsible driver
- * @returns {QSocket} new QSocket
- */
-NET.NewQSocket = function(driver) {
-  let i;
-  for (i = 0; i < NET.activeSockets.length; i++) {
-    if (NET.activeSockets[i].state === QSocket.STATE_DISCONNECTED) {
-      break;
-    }
-  }
-  NET.activeSockets[i] = new QSocket(driver, NET.time);
-  return NET.activeSockets[i];
-};
-
-/**
- * @param {string} address server address
- * @returns {QSocket|null} socket or null on failure
- */
-NET.Connect = function(address) {
-  NET.time = Sys.FloatTime();
-
-  const driver = NET.driverRegistry.getClientDriver(address);
-
-  if (!driver) {
-    Con.PrintWarning(`No suitable network driver found for host: ${address}\n`);
-    return null;
-  }
-
-  const ret = driver.Connect(address);
-
-  if (ret === 0) {
-    CL.cls.state = clientConnectionState.connecting;
-    Con.Print('trying...\n');
-    NET.start_time = NET.time;
-    NET.reps = 0;
-  }
-
-  return ret;
-};
-
-/**
- * Checks all initialized drivers for new connections to handle
- * @returns {QSocket|null} new connection socket or null if none
- */
-NET.CheckNewConnections = function() {
-  NET.time = Sys.FloatTime();
-
-  // Check all initialized drivers for new connections
-  for (const driver of NET.driverRegistry.getInitializedDrivers()) {
-    const ret = driver.CheckNewConnections();
-    if (ret !== null) {
-      return ret;
-    }
-  }
-
-  return null;
-};
-
-/**
- * @param {QSocket} sock connection handle
- */
-NET.Close = function(sock) {
-  if (!sock) {
-    return;
-  }
-  if (sock.state === QSocket.STATE_DISCONNECTED) {
-    return;
-  }
-  NET.time = Sys.FloatTime();
-  sock.Close();
-};
-
-/**
- * @param {QSocket} sock connection handle
- * @returns {number} channel number or -1 on failure
- */
-NET.GetMessage = function(sock) {
-  if (sock === null) {
-    return -1;
-  }
-  if (sock.state === QSocket.STATE_DISCONNECTED) {
-    Con.DPrint('NET.GetMessage: disconnected socket\n');
-    return -1;
-  }
-  NET.time = Sys.FloatTime();
-  const ret = sock.GetMessage();
-  if (sock.driver instanceof LoopDriver) { // FIXME: hardcoded check for loopback driver
-    if (ret === 0) {
-      if ((NET.time - sock.lastMessageTime) > NET.messagetimeout.value) {
-        Con.DPrint(`NET.GetMessage: message timeout for ${sock.address}\n`);
-        NET.Close(sock);
-        return -1;
-      }
-    } else if (ret > 0) {
-      sock.lastMessageTime = NET.time;
-    }
-  }
-  return ret;
-};
-
-NET.SendMessage = function(sock, data) {
-  if (!sock) {
-    return -1;
-  }
-  if (sock.state === QSocket.STATE_DISCONNECTED) {
-    Con.DPrint('NET.SendMessage: disconnected socket\n');
-    return -1;
-  }
-  NET.time = Sys.FloatTime();
-  sock.lastMessageTime = NET.time;
-  return sock.SendMessage(data);
-};
-
-/**
- * @param {QSocket} sock socket
- * @param {SzBuffer} data message
- * @returns {number} -1 on failure, 1 on success
- */
-NET.SendUnreliableMessage = function(sock, data) {
-  if (sock === null) {
-    return -1;
-  }
-  if (sock.state === QSocket.STATE_DISCONNECTED) {
-    Con.DPrint('NET.SendUnreliableMessage: disconnected socket\n');
-    return -1;
-  }
-  // console.debug(`NET.SendUnreliableMessage: ${sock.address} ${data.cursize}`, data.toHexString());
-  NET.time = Sys.FloatTime();
-  sock.lastMessageTime = NET.time;
-  return sock.SendUnreliableMessage(data);
-};
-
-/**
- * Check if a socket can send messages
- * @param {QSocket} sock - The socket to check
- * @returns {boolean} true if the socket can send messages, false otherwise
- */
-NET.CanSendMessage = function(sock) {
-  if (!sock) {
-    return false;
-  }
-  if (sock.state === QSocket.STATE_DISCONNECTED) {
-    return false;
-  }
-  NET.time = Sys.FloatTime();
-  return sock.CanSendMessage();
-};
-
-NET.Init = function() {
-  NET.time = Sys.FloatTime();
-
-  NET.messagetimeout = new Cvar('net_messagetimeout', '60');
-  NET.hostname = new Cvar('hostname', 'UNNAMED', Cvar.FLAG.SERVER, 'Descriptive name of the server.');
-
-  NET.delay_send = new Cvar('net_delay_send', '0', Cvar.FLAG.NONE, 'Delay sending messages to the network. Useful for debugging.');
-  NET.delay_send_jitter = new Cvar('net_delay_send_jitter', '0', Cvar.FLAG.NONE, 'Jitter for the delay sending messages to the network. Useful for debugging.');
-
-  NET.delay_receive = new Cvar('net_delay_receive', '0', Cvar.FLAG.NONE, 'Delay receiving messages from the network. Useful for debugging.');
-  NET.delay_receive_jitter = new Cvar('net_delay_receive_jitter', '0', Cvar.FLAG.NONE, 'Jitter for the delay receiving messages from the network. Useful for debugging.');
-
-  Cmd.AddCommand('maxplayers', NET.MaxPlayers_f);
-  Cmd.AddCommand('listen', NET.Listen_f);
-
-  if (!registry.isDedicatedServer) {
-    Cmd.AddCommand('invite', InviteCommand);
-  }
-
-  if (!registry.isDedicatedServer) { // TODO: move this to the client code path, nothing to do with networking
-    const Key = registry.Key; // client code path
-
-    eventBus.subscribe('server.spawned', async () => {
-      await Q.sleep(5000);
-
-      if (!NET.listening) {
-        return;
-      }
-
-      Con.PrintSuccess('Online multiplayer game has been created!\n');
-    });
-
-    eventBus.subscribe('client.signon', async (signon) => {
-      if (signon !== 4) {
-        return;
-      }
-
-      await Q.sleep(5000);
-
-      if (!NET.listening) {
-        return;
-      }
-
-      const key = Key.BindingToString('invite');
-
-      if (key) {
-        Con.Print(`Press "${key}" to invite others.\n`);
-      } else {
-        Con.Print('Use "invite" command to print the invite message.\n');
-      }
-    });
-  }
-
-  NET.driverRegistry = new DriverRegistry();
-  NET.driverRegistry.register('loopback', new LoopDriver());
-  NET.driverRegistry.register('websocket', new WebSocketDriver());
-  NET.driverRegistry.register('webrtc', new WebRTCDriver());
-  NET.driverRegistry.initialize();
-};
-
-NET.Shutdown = function() {
-  NET.time = Sys.FloatTime();
-
-  for (let i = 0; i < NET.activeSockets.length; i++) {
-    NET.Close(NET.activeSockets[i]);
-  }
-
-  NET.driverRegistry.shutdown();
-};
-
-NET.Listen_f = function(isListening) { // TODO: turn into Cvar with hooks
-  if (isListening === undefined) {
-    Con.Print('"listen" is "' + (NET.listening ? 1 : 0) + '"\n');
-    return;
-  }
-
-  NET.listening = +isListening ? true : false;
-
-  for (const driver of NET.driverRegistry.getInitializedDrivers()) {
-    if (driver.ShouldListen()) {
-      driver.Listen(NET.listening);
-    }
-  }
-};
-
-/**
- * @returns {string|null} listen address or null if not listening
- */
-NET.GetListenAddress = function() {
-  // Try to get listen address from any driver that's listening
-  for (const driver of NET.driverRegistry.getInitializedDrivers()) {
-    const addr = driver.GetListenAddress();
-    if (addr) {
-      return addr;
-    }
-  }
-
-  return null;
-};
-
-NET.MaxPlayers_f = function(maxplayers) { // TODO: turn into Cvar with hooks
-  if (maxplayers === undefined) {
-    Con.Print('"maxplayers" is "' + SV.svs.maxclients + '"\n');
-    return;
-  }
-
-  if (SV.server.active) {
-    Con.Print('maxplayers can not be changed while a server is running.\n');
-    return;
-  }
-
-  let n = Q.atoi(maxplayers);
-  if (n < 1) {
-    n = 1;
-  }
-  if (n > SV.svs.maxclientslimit) {
-    n = SV.svs.maxclientslimit;
-    Con.Print('"maxplayers" set to "' + n + '"\n');
-  }
-
-  SV.svs.maxclients = n;
-};
-
-eventBus.subscribe('server.spawned', () => {
-  if (SV.svs.maxclients === 1 && NET.listening) {
-    Cmd.ExecuteString('listen 0');
-  }
-
-  if (SV.svs.maxclients > 1 && !NET.listening) {
-    Cmd.ExecuteString('listen 1');
-  }
-});
-
-eventBus.subscribe('server.shutdown', () => {
-  if (NET.listening) {
-    Cmd.ExecuteString('listen 0');
-  }
-});
diff --git a/source/engine/network/Network.ts b/source/engine/network/Network.ts
new file mode 100644
index 00000000..765f3e32
--- /dev/null
+++ b/source/engine/network/Network.ts
@@ -0,0 +1,303 @@
+import type { Server as HttpServer } from 'node:http';
+
+import Cmd from '../common/Cmd.mjs';
+import Cvar from '../common/Cvar.mjs';
+import { clientConnectionState } from '../common/Def.mjs';
+import Q from '../../shared/Q.ts';
+import { eventBus, getClientRegistry, getCommonRegistry, registry } from '../registry.mjs';
+import { SzBuffer } from './MSG.ts';
+import { InviteCommand } from './ConsoleCommands.ts';
+import { DriverRegistry } from './DriverRegistry.ts';
+import { BaseDriver, LoopDriver, QSocket, WebRTCDriver, WebSocketDriver } from './NetworkDrivers.ts';
+
+type NetworkPayload = Pick<SzBuffer, 'cursize' | 'data'>;
+
+let { Con, SV, Sys } = getCommonRegistry();
+
+eventBus.subscribe('registry.frozen', () => {
+  ({ Con, SV, Sys } = getCommonRegistry());
+});
+
+export default class NET {
+  static activeSockets: QSocket[] = [];
+  static message = new SzBuffer(16384, 'NET.message');
+  static activeconnections = 0;
+  static listening = false;
+  static driverRegistry = new DriverRegistry();
+  static server: HttpServer | null = null;
+  static time = 0;
+  static start_time = 0;
+  static reps = 0;
+  static messagetimeout: Cvar;
+  static hostname: Cvar;
+  static delay_send: Cvar;
+  static delay_send_jitter: Cvar;
+  static delay_receive: Cvar;
+  static delay_receive_jitter: Cvar;
+
+  static NewQSocket(driver: BaseDriver): QSocket {
+    let index = 0;
+
+    for (; index < NET.activeSockets.length; index++) {
+      if (NET.activeSockets[index].state === QSocket.STATE_DISCONNECTED) {
+        break;
+      }
+    }
+
+    NET.activeSockets[index] = new QSocket(driver, NET.time);
+    return NET.activeSockets[index];
+  }
+
+  static Connect(address: string): QSocket | null {
+    NET.time = Sys.FloatTime();
+
+    const driver = NET.driverRegistry.getClientDriver(address);
+
+    if (driver === null) {
+      Con.PrintWarning(`No suitable network driver found for host: ${address}\n`);
+      return null;
+    }
+
+    const sock = driver.Connect(address);
+
+    if (sock !== null) {
+      const { CL } = getClientRegistry();
+
+      CL.cls.state = clientConnectionState.connecting;
+      Con.Print('trying...\n');
+      NET.start_time = NET.time;
+      NET.reps = 0;
+    }
+
+    return sock;
+  }
+
+  static CheckNewConnections(): QSocket | null {
+    NET.time = Sys.FloatTime();
+
+    for (const driver of NET.driverRegistry.getInitializedDrivers()) {
+      const sock = driver.CheckNewConnections();
+
+      if (sock !== null) {
+        return sock;
+      }
+    }
+
+    return null;
+  }
+
+  static Close(sock: QSocket | null): void {
+    if (sock === null || sock.state === QSocket.STATE_DISCONNECTED) {
+      return;
+    }
+
+    NET.time = Sys.FloatTime();
+    sock.Close();
+  }
+
+  static GetMessage(sock: QSocket | null): number {
+    if (sock === null) {
+      return -1;
+    }
+
+    if (sock.state === QSocket.STATE_DISCONNECTED) {
+      Con.DPrint('NET.GetMessage: disconnected socket\n');
+      return -1;
+    }
+
+    NET.time = Sys.FloatTime();
+    const result = sock.GetMessage();
+
+    if (sock.driver instanceof LoopDriver) {
+      if (result === 0) {
+        if ((NET.time - sock.lastMessageTime) > NET.messagetimeout.value) {
+          Con.DPrint(`NET.GetMessage: message timeout for ${sock.address}\n`);
+          NET.Close(sock);
+          return -1;
+        }
+      } else if (result > 0) {
+        sock.lastMessageTime = NET.time;
+      }
+    }
+
+    return result;
+  }
+
+  static SendMessage(sock: QSocket | null, data: NetworkPayload): number {
+    if (sock === null) {
+      return -1;
+    }
+
+    if (sock.state === QSocket.STATE_DISCONNECTED) {
+      Con.DPrint('NET.SendMessage: disconnected socket\n');
+      return -1;
+    }
+
+    NET.time = Sys.FloatTime();
+    sock.lastMessageTime = NET.time;
+    return sock.SendMessage(data);
+  }
+
+  static SendUnreliableMessage(sock: QSocket | null, data: SzBuffer): number {
+    if (sock === null) {
+      return -1;
+    }
+
+    if (sock.state === QSocket.STATE_DISCONNECTED) {
+      Con.DPrint('NET.SendUnreliableMessage: disconnected socket\n');
+      return -1;
+    }
+
+    NET.time = Sys.FloatTime();
+    sock.lastMessageTime = NET.time;
+    return sock.SendUnreliableMessage(data);
+  }
+
+  static CanSendMessage(sock: QSocket | null): boolean {
+    if (sock === null || sock.state === QSocket.STATE_DISCONNECTED) {
+      return false;
+    }
+
+    NET.time = Sys.FloatTime();
+    return sock.CanSendMessage();
+  }
+
+  static Init(): void {
+    NET.time = Sys.FloatTime();
+
+    NET.messagetimeout = new Cvar('net_messagetimeout', '60');
+    NET.hostname = new Cvar('hostname', 'UNNAMED', Cvar.FLAG.SERVER, 'Descriptive name of the server.');
+
+    NET.delay_send = new Cvar('net_delay_send', '0', Cvar.FLAG.NONE, 'Delay sending messages to the network. Useful for debugging.');
+    NET.delay_send_jitter = new Cvar('net_delay_send_jitter', '0', Cvar.FLAG.NONE, 'Jitter for the delay sending messages to the network. Useful for debugging.');
+
+    NET.delay_receive = new Cvar('net_delay_receive', '0', Cvar.FLAG.NONE, 'Delay receiving messages from the network. Useful for debugging.');
+    NET.delay_receive_jitter = new Cvar('net_delay_receive_jitter', '0', Cvar.FLAG.NONE, 'Jitter for the delay receiving messages from the network. Useful for debugging.');
+
+    Cmd.AddCommand('maxplayers', NET.MaxPlayers_f);
+    Cmd.AddCommand('listen', NET.Listen_f);
+
+    if (!registry.isDedicatedServer) {
+      Cmd.AddCommand('invite', InviteCommand);
+    }
+
+    if (!registry.isDedicatedServer) {
+      const { Key } = getClientRegistry();
+
+      eventBus.subscribe('server.spawned', async () => {
+        await Q.sleep(5000);
+
+        if (!NET.listening) {
+          return;
+        }
+
+        Con.PrintSuccess('Online multiplayer game has been created!\n');
+      });
+
+      eventBus.subscribe('client.signon', async (signon: number) => {
+        if (signon !== 4) {
+          return;
+        }
+
+        await Q.sleep(5000);
+
+        if (!NET.listening) {
+          return;
+        }
+
+        const key = Key.BindingToString('invite');
+
+        if (key) {
+          Con.Print(`Press "${key}" to invite others.\n`);
+          return;
+        }
+
+        Con.Print('Use "invite" command to print the invite message.\n');
+      });
+    }
+
+    NET.driverRegistry = new DriverRegistry();
+    NET.driverRegistry.register('loopback', new LoopDriver());
+    NET.driverRegistry.register('websocket', new WebSocketDriver());
+    NET.driverRegistry.register('webrtc', new WebRTCDriver());
+    NET.driverRegistry.initialize();
+  }
+
+  static Shutdown(): void {
+    NET.time = Sys.FloatTime();
+
+    for (const sock of NET.activeSockets) {
+      NET.Close(sock);
+    }
+
+    NET.driverRegistry.shutdown();
+  }
+
+  static Listen_f(isListening?: string | number): void {
+    if (isListening === undefined) {
+      Con.Print(`"listen" is "${NET.listening ? 1 : 0}"\n`);
+      return;
+    }
+
+    NET.listening = Number(isListening) !== 0;
+
+    for (const driver of NET.driverRegistry.getInitializedDrivers()) {
+      if (driver.ShouldListen()) {
+        driver.Listen(NET.listening);
+      }
+    }
+  }
+
+  static GetListenAddress(): string | null {
+    for (const driver of NET.driverRegistry.getInitializedDrivers()) {
+      const address = driver.GetListenAddress();
+
+      if (address !== null) {
+        return address;
+      }
+    }
+
+    return null;
+  }
+
+  static MaxPlayers_f(maxplayers?: string | number): void {
+    if (maxplayers === undefined) {
+      Con.Print(`"maxplayers" is "${SV.svs.maxclients}"\n`);
+      return;
+    }
+
+    if (SV.server.active) {
+      Con.Print('maxplayers can not be changed while a server is running.\n');
+      return;
+    }
+
+    let value = Q.atoi(String(maxplayers));
+
+    if (value < 1) {
+      value = 1;
+    }
+
+    if (value > SV.svs.maxclientslimit) {
+      value = SV.svs.maxclientslimit;
+      Con.Print(`"maxplayers" set to "${value}"\n`);
+    }
+
+    SV.svs.maxclients = value;
+  }
+}
+
+eventBus.subscribe('server.spawned', () => {
+  if (SV.svs.maxclients === 1 && NET.listening) {
+    Cmd.ExecuteString('listen 0');
+  }
+
+  if (SV.svs.maxclients > 1 && !NET.listening) {
+    Cmd.ExecuteString('listen 1');
+  }
+});
+
+eventBus.subscribe('server.shutdown', () => {
+  if (NET.listening) {
+    Cmd.ExecuteString('listen 0');
+  }
+});
diff --git a/source/engine/network/NetworkDrivers.mjs b/source/engine/network/NetworkDrivers.mjs
deleted file mode 100644
index 9008a20f..00000000
--- a/source/engine/network/NetworkDrivers.mjs
+++ /dev/null
@@ -1,1972 +0,0 @@
-import Cvar from '../common/Cvar.mjs';
-import { HostError } from '../common/Errors.mjs';
-import { eventBus, registry } from '../registry.mjs';
-import { formatIP } from './Misc.mjs';
-
-let { COM, Con, NET, Sys, SV } = registry;
-
-eventBus.subscribe('registry.frozen', () => {
-  COM = registry.COM;
-  Con = registry.Con;
-  NET = registry.NET;
-  Sys = registry.Sys;
-  SV = registry.SV;
-});
-
-export class QSocket {
-  static STATE_NEW = 'new';
-  static STATE_CONNECTING = 'connecting';
-  static STATE_CONNECTED = 'connected';
-  static STATE_DISCONNECTING = 'disconnecting';
-  static STATE_DISCONNECTED = 'disconnected';
-
-  /**
-   * @param {BaseDriver} driver - The driver instance (direct reference, not index)
-   * @param {number} time - Connection time
-   */
-  constructor(driver, time) {
-    this.driver = driver; // Direct reference to driver instance
-    this.connecttime = time;
-    this.lastMessageTime = time;
-    this.address = null;
-    this.state = QSocket.STATE_NEW;
-
-    this.receiveMessage = new Uint8Array(new ArrayBuffer(8192));
-    this.receiveMessageLength = 0;
-
-    this.sendMessage = new Uint8Array(new ArrayBuffer(8192));
-    this.sendMessageLength = 0;
-
-    /** @type {any} driver might store some data here */
-    this.driverdata = null;
-  }
-
-  toString() {
-    return `QSocket(${this.address}, ${this.state})`;
-  }
-
-  GetMessage() {
-    return this.driver.GetMessage(this);
-  }
-
-  SendMessage(data) {
-    return this.driver.SendMessage(this, data);
-  }
-
-  SendUnreliableMessage(data) {
-    return this.driver.SendUnreliableMessage(this, data);
-  }
-
-  CanSendMessage() {
-    if (this.state !== QSocket.STATE_CONNECTED) {
-      return false;
-    }
-
-    return this.driver.CanSendMessage(this);
-  }
-
-  Close() {
-    return this.driver.Close(this);
-  }
-};
-
-export class BaseDriver {
-  /**
-   * @param {string} name - Unique driver name (e.g., 'loop', 'websocket', 'webrtc')
-   */
-  constructor(name) {
-    this.name = name;
-    this.initialized = false;
-  }
-
-  Init() {
-    return false;
-  }
-
-  Shutdown() {
-    this.initialized = false;
-  }
-
-  /**
-   * Check if this driver can handle the given host string
-   * @param {string} host - Host string to check
-   * @returns {boolean} true if this driver can handle the host
-   */
-  // eslint-disable-next-line no-unused-vars
-  canHandle(host) {
-    return false;
-  }
-
-  // eslint-disable-next-line no-unused-vars
-  Connect(host) {
-    return null;
-  }
-
-  CheckNewConnections() {
-    return null;
-  }
-
-  CheckForResend() {
-    return -1;
-  }
-
-  // eslint-disable-next-line no-unused-vars
-  GetMessage(qsocket) {
-    return -1;
-  }
-
-  // eslint-disable-next-line no-unused-vars
-  SendMessage(qsocket, data) {
-    return -1;
-  }
-
-  // eslint-disable-next-line no-unused-vars
-  SendUnreliableMessage(qsocket, data) {
-    return -1;
-  }
-
-  // eslint-disable-next-line no-unused-vars
-  CanSendMessage(qsocket) {
-    return false;
-  }
-
-  Close(qsocket) {
-    qsocket.state = QSocket.STATE_DISCONNECTED;
-  }
-
-  /**
-   * Determine if this driver should handle listening in the current environment
-   * @returns {boolean} true if this driver should listen
-   */
-  ShouldListen() {
-    return true; // Default: always listen
-  }
-
-  // eslint-disable-next-line no-unused-vars
-  Listen(shouldListen) {
-  }
-
-  /**
-   * @returns {string|null} the address this driver is listening on, or null if not applicable
-   */
-  GetListenAddress() {
-    return null;
-  }
-};
-
-export class LoopDriver extends BaseDriver {
-  constructor() {
-    super('loop');
-    this._server = null;
-    this._client = null;
-    this.localconnectpending = false;
-  }
-
-  Init() {
-    this._server = null;
-    this._client = null;
-    this.localconnectpending = false;
-
-    this.initialized = true;
-    return true;
-  }
-
-  canHandle(host) {
-    return host === 'local';
-  }
-
-  Connect(host) {
-    if (host !== 'local') { // Loop Driver only handles loopback/local connections
-      return null;
-    }
-
-    // we will return only one new client ever
-    this.localconnectpending = true;
-
-    if (this._server === null) {
-      this._server = NET.NewQSocket(this);
-      this._server.address = 'local server';
-    }
-
-    this._server.receiveMessageLength = 0;
-    this._server.canSend = true;
-
-    if (this._client === null) {
-      this._client = NET.NewQSocket(this);
-      this._client.address = 'local client';
-    }
-
-    this._client.receiveMessageLength = 0;
-    this._client.canSend = true;
-
-    this._server.driverdata = this._client; // client is directly feeding into the server
-    this._client.driverdata = this._server; // and vice-versa
-
-    this._client.state = QSocket.STATE_CONNECTED;
-    this._server.state = QSocket.STATE_CONNECTED;
-
-    return this._server;
-  }
-
-  CheckNewConnections() {
-    if (!this.localconnectpending) {
-      return null;
-    }
-
-    this.localconnectpending = false;
-
-    this._client.receiveMessageLength = 0;
-    this._client.canSend = true;
-    this._client.state = QSocket.STATE_CONNECTED;
-
-    this._server.receiveMessageLength = 0;
-    this._server.canSend = true;
-    this._server.state = QSocket.STATE_CONNECTED;
-
-    return this._client;
-  }
-
-  GetMessage(sock) {
-    if (sock.receiveMessageLength === 0) {
-      return 0;
-    }
-    const ret = sock.receiveMessage[0];
-    const length = sock.receiveMessage[1] + (sock.receiveMessage[2] << 8);
-    if (length > NET.message.data.byteLength) {
-      throw new HostError('Loop.GetMessage: overflow');
-    }
-    NET.message.cursize = length;
-    new Uint8Array(NET.message.data).set(sock.receiveMessage.subarray(3, length + 3));
-    sock.receiveMessageLength -= length;
-    if (sock.receiveMessageLength >= 4) {
-      sock.receiveMessage.copyWithin(0, length + 3, length + 3 + sock.receiveMessageLength);
-    }
-    sock.receiveMessageLength -= 3;
-    if (sock.driverdata && ret === 1) {
-      sock.driverdata.canSend = true;
-    }
-    if (sock.state === QSocket.STATE_DISCONNECTED) {
-      return -1;
-    }
-    return ret;
-  }
-
-  SendMessage(sock, data) {
-    if (!sock.driverdata) {
-      return -1;
-    }
-    const bufferLength = sock.driverdata.receiveMessageLength;
-    sock.driverdata.receiveMessageLength += data.cursize + 3;
-    if (sock.driverdata.receiveMessageLength > 8192) {
-      throw new HostError('LoopDriver.SendMessage: overflow');
-    }
-    const buffer = sock.driverdata.receiveMessage;
-    buffer[bufferLength] = 1;
-    buffer[bufferLength + 1] = data.cursize & 0xff;
-    buffer[bufferLength + 2] = data.cursize >> 8;
-    buffer.set(new Uint8Array(data.data, 0, data.cursize), bufferLength + 3);
-    sock.canSend = false;
-    return 1;
-  }
-
-  SendUnreliableMessage(sock, data) {
-    if (!sock.driverdata) {
-      return -1;
-    }
-    const bufferLength = sock.driverdata.receiveMessageLength;
-    sock.driverdata.receiveMessageLength += data.cursize + 3;
-    if (sock.driverdata.receiveMessageLength > 8192) {
-      throw new HostError('LoopDriver.SendUnreliableMessage: overflow');
-    }
-    const buffer = sock.driverdata.receiveMessage;
-    buffer[bufferLength] = 2;
-    buffer[bufferLength + 1] = data.cursize & 0xff;
-    buffer[bufferLength + 2] = data.cursize >> 8;
-    buffer.set(new Uint8Array(data.data, 0, data.cursize), bufferLength + 3);
-    return 1;
-  }
-
-  CanSendMessage(sock) {
-    return sock.driverdata ? sock.canSend : false;
-  }
-
-  Close(sock) {
-    if (sock.driverdata) {
-      sock.driverdata.driverdata = null;
-    }
-    sock.receiveMessageLength = 0;
-    sock.canSend = false;
-    if (sock === this._server) {
-      this._server = null;
-    } else {
-      this._client = null;
-    }
-    sock.state = QSocket.STATE_DISCONNECTED;
-  }
-
-  // eslint-disable-next-line no-unused-vars
-  Listen(shouldListen) {
-  }
-};
-
-export class WebSocketDriver extends BaseDriver {
-  constructor() {
-    super('websocket');
-    this.newConnections = [];
-    this.wss = null;
-  }
-
-  Init() {
-    this.initialized = true;
-    this.newConnections = [];
-    return true;
-  }
-
-  canHandle(host) {
-    return /^wss?:\/\//i.test(host);
-  }
-
-  Connect(host) {
-    // Only handle ws:// and wss:// URLs
-    if (!/^wss?:\/\//i.test(host)) {
-      return null;
-    }
-
-    const url = new URL(host);
-
-    // set a default port
-    if (!url.port) {
-      url.port = (new URL(location.href)).port;
-    }
-
-    // we can open a QSocket
-    const sock = NET.NewQSocket(this);
-
-    try {
-      sock.address = url.toString();
-      sock.driverdata = new WebSocket(url, 'quake');
-      sock.driverdata.binaryType = 'arraybuffer';
-    } catch (e) {
-      Con.PrintError(`WebSocketDriver.Connect: failed to setup ${url}, ${e.message}\n`);
-      return null;
-    }
-
-    // these event handlers will feed into the message buffer structures
-    sock.driverdata.onerror = this._OnErrorClient;
-    sock.driverdata.onmessage = this._OnMessageClient;
-    sock.driverdata.onopen = this._OnOpenClient;
-    sock.driverdata.onclose = this._OnCloseClient;
-
-    // freeing up some QSocket structures
-    sock.receiveMessage = [];
-    sock.receiveMessageLength = null;
-    sock.sendMessage = [];
-    sock.sendMessageLength = null;
-
-    sock.driverdata.qsocket = sock;
-
-    sock.state = QSocket.STATE_CONNECTING;
-
-    return sock;
-  }
-
-  CanSendMessage(qsocket) {
-    return ![2, 3].includes(qsocket.driverdata.readyState); // FIXME: WebSocket declaration
-    // return ![WebSocket.CLOSING, WebSocket.CLOSED].includes(qsocket.driverdata.readyState);
-  }
-
-  GetMessage(qsocket) {
-    // check if we have collected new data
-    if (qsocket.receiveMessage.length === 0) {
-      if (qsocket.state === QSocket.STATE_DISCONNECTED) {
-        return -1;
-      }
-
-      // finished message buffer draining due to a disconnect
-      if (qsocket.state === QSocket.STATE_DISCONNECTING) {
-        qsocket.state = QSocket.STATE_DISCONNECTED;
-      }
-
-      return 0;
-    }
-
-    // fetch a message
-    const message = qsocket.receiveMessage.shift();
-
-    // parse header
-    const ret = message[0];
-    const length = message[1] + (message[2] << 8);
-
-    // copy over the payload to our NET.message buffer
-    new Uint8Array(NET.message.data).set(message.subarray(3, length + 3));
-    NET.message.cursize = length;
-
-    return ret;
-  }
-
-  _FlushSendBuffer(qsocket) {
-    switch (qsocket.driverdata.readyState) {
-      case 2:
-      case 3:
-      // case WebSocket.CLOSING: // FIXME: WebSocket declaration
-      // case WebSocket.CLOSED: // FIXME: WebSocket declaration
-        Con.DPrint(`WebSocketDriver._FlushSendBuffer: connection already died (readyState = ${qsocket.driverdata.readyState})`);
-        return false;
-
-      case 0:
-      // case WebSocket.CONNECTING: // still connecting // FIXME: WebSocket declaration
-        return true;
-    }
-
-    while (qsocket.sendMessage.length > 0) {
-      const message = qsocket.sendMessage.shift();
-
-      if (NET.delay_send.value === 0) {
-        (qsocket.driverdata).send(message);
-      } else {
-        setTimeout(() => {
-          /** @type {WebSocket} */(qsocket.driverdata).send(message);
-
-          // failed to send? immediately mark it as disconnected
-          if (qsocket.driverdata.readyState > 1) {
-            qsocket.state = QSocket.STATE_DISCONNECTED;
-          }
-        }, NET.delay_send.value + (Math.random() - 0.5) * NET.delay_send_jitter.value);
-      }
-    }
-
-    return true;
-  }
-
-  _SendRawMessage(qsocket, data) {
-    // push the message onto the sendMessage buffer
-    qsocket.sendMessage.push(data);
-
-    // try sending all out, don’t wait for an immediate reaction
-    this._FlushSendBuffer(qsocket);
-
-    // we always assume it worked
-    return qsocket.state !== QSocket.STATE_DISCONNECTED ? 1 : -1;
-  }
-
-  SendMessage(qsocket, data) {
-    const buffer = new Uint8Array(data.cursize + 3);
-    let i = 0;
-    buffer[i++] = 1;
-    buffer[i++] = data.cursize & 0xff;
-    buffer[i++] = (data.cursize >> 8) & 0xff;
-    buffer.set(new Uint8Array(data.data, 0, data.cursize), i);
-    return this._SendRawMessage(qsocket, buffer);
-  }
-
-  SendUnreliableMessage(qsocket, data) {
-    const buffer = new Uint8Array(data.cursize + 3);
-    let i = 0;
-    buffer[i++] = 2;
-    buffer[i++] = data.cursize & 0xff;
-    buffer[i++] = (data.cursize >> 8) & 0xff;
-    buffer.set(new Uint8Array(data.data, 0, data.cursize), i);
-    return this._SendRawMessage(qsocket, buffer);
-  }
-
-  Close(qsocket) {
-    if (this.CanSendMessage(qsocket)) {
-      this._FlushSendBuffer(qsocket); // make sure to send everything queued up out
-      qsocket.driverdata.close(1000);
-    }
-
-    qsocket.state = QSocket.STATE_DISCONNECTED;
-  }
-
-  // eslint-disable-next-line no-unused-vars
-  _OnErrorClient(error) {
-    Con.PrintError(`WebSocketDriver._OnErrorClient: lost connection to ${this.qsocket.address}\n`);
-    this.qsocket.state = QSocket.STATE_DISCONNECTED; // instant disconnect
-  }
-
-  _OnMessageClient(message) {
-    const data = message.data;
-
-    if (typeof(data) === 'string') {
-      return;
-    }
-
-    if (NET.delay_receive.value === 0) {
-      this.qsocket.receiveMessage.push(new Uint8Array(data));
-      return;
-    }
-
-    setTimeout(() => {
-      this.qsocket.receiveMessage.push(new Uint8Array(data));
-    }, NET.delay_receive.value + (Math.random() - 0.5) * NET.delay_receive_jitter.value);
-  }
-
-  _OnOpenClient() {
-    this.qsocket.state = QSocket.STATE_CONNECTED;
-  }
-
-  _OnCloseClient() {
-    if (this.qsocket.state !== QSocket.STATE_CONNECTED) {
-      return;
-    }
-
-    Con.DPrint('WebSocketDriver._OnCloseClient: connection closed.\n');
-    this.qsocket.state = QSocket.STATE_DISCONNECTING; // mark it as disconnecting, so that we can peacefully process any buffered messages
-  }
-
-  _OnConnectionServer(ws, req) {
-    Con.DPrint('WebSocketDriver._OnConnectionServer: received new connection\n');
-
-    const sock = NET.NewQSocket(this);
-
-    if (!sock) {
-      Con.PrintError('WebSocketDriver._OnConnectionServer: failed to allocate new socket, dropping client\n');
-      // TODO: send a proper good bye to the client?
-      ws.close();
-      return;
-    }
-
-    sock.driverdata = ws;
-    sock.address = formatIP((req.headers['x-forwarded-for'] || req.socket.remoteAddress), req.socket.remotePort);
-
-    // these event handlers will feed into the message buffer structures
-    sock.receiveMessage = [];
-    sock.receiveMessageLength = null;
-    sock.sendMessage = [];
-    sock.sendMessageLength = null;
-    sock.state = QSocket.STATE_CONNECTED;
-
-    // set the last message time to now
-    NET.time = Sys.FloatTime();
-    sock.lastMessageTime = NET.time;
-
-    ws.on('close', () => {
-      Con.DPrint('WebSocketDriver._OnConnectionServer.disconnect: client disconnected\n');
-      sock.state = QSocket.STATE_DISCONNECTED;
-
-      eventBus.publish('net.connection.close', sock);
-    });
-
-    ws.on('error', () => {
-      Con.DPrint('WebSocketDriver._OnConnectionServer.disconnect: client errored out\n');
-      sock.state = QSocket.STATE_DISCONNECTED;
-
-      eventBus.publish('net.connection.error', sock);
-    });
-
-    ws.on('message', (data) => {
-      sock.receiveMessage.push(new Uint8Array(data));
-    });
-
-    this.newConnections.push(sock);
-
-    eventBus.publish('net.connection.accepted', sock);
-  }
-
-  CheckNewConnections() {
-    if (this.newConnections.length === 0) {
-      return null;
-    }
-
-    return this.newConnections.shift();
-  }
-
-  /**
-   * WebSocketDriver only listens in dedicated server mode
-   * Browser environments cannot create WebSocket servers
-   * @returns {boolean} true if should listen and can listen
-   */
-  ShouldListen() {
-    return registry.isDedicatedServer && NET.server;
-  }
-
-  Listen(listening) {
-    if (this.wss) {
-      if (!listening) {
-        this.wss.close();
-        this.wss = null;
-      }
-
-      return;
-    }
-
-    const { WebSocket } = registry;
-
-    this.wss = new WebSocket.WebSocketServer({server: NET.server});
-    this.wss.on('connection', this._OnConnectionServer.bind(this));
-    this.newConnections = [];
-  }
-
-  GetListenAddress() {
-    if (!this.wss) {
-      return null;
-    }
-
-    const addr = this.wss.address();
-
-    if (typeof addr === 'string') {
-      return addr;
-    }
-
-    return formatIP(addr.address, addr.port);
-  }
-};
-
-/**
- * WebRTC Driver
- *
- * Peer-to-peer networking using WebRTC DataChannels.
- * Uses a signaling server for initial connection setup.
- */
-export class WebRTCDriver extends BaseDriver {
-  constructor() {
-    super('webrtc');
-    this.signalingUrl = null;
-    this.signalingWs = null;
-    this.sessionId = null;
-    this.peerId = null;
-    this.hostToken = null; // Token to prove ownership of session for reconnect
-    this.isHost = false;
-    this.creatingSession = false; // Track if we're in the process of creating a session
-    this.pingInterval = null; // Timer for sending pings to signaling server
-    this.reconnectTimer = null; // Timer for reconnecting to signaling server
-    /** @type {Function[]} */
-    this.serverEventSubscriptions = [];
-    this.newConnections = [];
-    this.pendingConnections = new Map(); // peerId -> { qsocket, peerConnection }
-
-    // STUN/TURN servers configuration
-    this.iceServers = [
-      { urls: 'stun:stun.l.google.com:19302' },
-      { urls: 'stun:stun.cloudflare.com:3478' },
-      { urls: 'stun:stun.nextcloud.com:443' },
-    ];
-  }
-
-  Init() {
-    // WebRTC only makes sense in browser environment
-    if (registry.isDedicatedServer) {
-      // Don't initialize in dedicated server mode
-      this.initialized = false;
-      return false;
-    }
-
-    // Determine signaling server URL
-    // For local development: ws://localhost:3001/signaling
-    // For production: could be wss://signaling.yourcdn.com
-    const protocol = location.protocol === 'https:' ? 'wss:' : 'ws:';
-
-    // Try to connect to local signaling server first, fallback to same host
-    this.signalingUrl = `${protocol}//${location.hostname}:8787/signaling`;
-
-    if (registry.urls?.signalingURL) {
-      this.signalingUrl = registry.urls.signalingURL;
-    }
-
-    this.initialized = true;
-    Con.DPrint(`WebRTCDriver: Initialized with signaling at ${this.signalingUrl}\n`);
-    return true;
-  }
-
-  canHandle(host) {
-    return /^webrtc:\/\//i.test(host) || host === 'host';
-  }
-
-  /**
-   * Connect to a WebRTC peer
-   * @param {string} host - Format: "webrtc://sessionId" or just "sessionId" to join
-   *                        Use "webrtc://host" or "host" to create a new session
-   */
-  Connect(host) {
-    if (!/^webrtc:\/\//i.test(host)) {
-      return null;
-    }
-
-    // Parse the host parameter
-    let sessionId = null;
-    let shouldCreateSession = false;
-
-    if (host.startsWith('webrtc://')) {
-      host = host.substring(9);
-    }
-
-    // "host" means create a new session, otherwise join existing
-    if (host === 'host' || host === '') {
-      shouldCreateSession = true;
-    } else {
-      sessionId = host;
-    }
-
-    // Connect to signaling server
-    if (!this._ConnectSignaling()) {
-      Con.PrintError('WebRTCDriver.Connect: Failed to connect to signaling server\n');
-      return null;
-    }
-
-    // Create a QSocket for tracking this connection attempt
-    const sock = NET.NewQSocket(this);
-    sock.state = QSocket.STATE_CONNECTING;
-    sock.address = shouldCreateSession ? 'WebRTC Host' : `WebRTC Session ${sessionId}`;
-
-    // Store connection state
-    sock.driverdata = {
-      sessionId: sessionId,
-      isHost: shouldCreateSession,
-      peerConnections: new Map(), // peerId -> RTCPeerConnection
-      dataChannels: new Map(), // peerId -> { reliable, unreliable }
-      signalingReady: false,
-    };
-
-    // Free up some QSocket structures (we'll use our own buffering)
-    sock.receiveMessage = [];
-    sock.sendMessage = [];
-
-    // Wait for signaling to be ready, then create or join session
-    const onSignalingReady = () => {
-      if (shouldCreateSession) {
-        this._CreateSession(sock);
-      } else {
-        this._JoinSession(sock, sessionId);
-      }
-    };
-
-    if (this.signalingWs && this.signalingWs.readyState === 1) {
-      onSignalingReady();
-    } else {
-      // Store callback for when signaling connects
-      sock.driverdata.onSignalingReady = onSignalingReady;
-    }
-
-    return sock;
-  }
-
-  /**
-   * Connect to the signaling server
-   * @returns {boolean} true if connected or connecting
-   */
-  _ConnectSignaling() {
-    if (this.signalingWs) {
-      if (this.signalingWs.readyState === 1) { // OPEN
-        return true;
-      }
-      if (this.signalingWs.readyState === 0) { // CONNECTING
-        return true;
-      }
-    }
-
-    // Clear any pending reconnect timer since we are connecting now
-    if (this.reconnectTimer) {
-      clearTimeout(this.reconnectTimer);
-      this.reconnectTimer = null;
-    }
-
-    try {
-      this.signalingWs = new WebSocket(this.signalingUrl);
-
-      this.signalingWs.onopen = () => {
-        Con.DPrint(`WebRTCDriver: Connected to signaling server at ${this.signalingUrl}\n`);
-
-        // Capture session state before processing pending requests
-        const previousSessionId = this.sessionId;
-
-        this._ProcessPendingSignaling();
-
-        // If we were in a session AND the session ID hasn't changed (meaning no new session was started)
-        if (previousSessionId && previousSessionId === this.sessionId) {
-          this._RestoreSession();
-        }
-      };
-
-      this.signalingWs.onmessage = async (event) => {
-        await this._OnSignalingMessage(JSON.parse(event.data));
-      };
-
-      this.signalingWs.onerror = (errorEvent) => {
-        // CR: errorEvent is not very useful here, log it anyway
-        console.debug('WebRTCDriver: Signaling WebSocket error', errorEvent);
-        Con.DPrint(`WebRTCDriver: Signaling error: ${errorEvent}\n`);
-
-        this._OnSignalingError({ error: 'Signaling connection error' });
-      };
-
-      this.signalingWs.onclose = (closeEvent) => {
-        Con.DPrint('WebRTCDriver: Signaling connection closed\n');
-        this.signalingWs = null;
-
-        if (closeEvent.code !== 1000) {
-          Con.PrintError(`Signaling connection closed unexpectedly, ${closeEvent.reason || 'unknown reason'} (code: ${closeEvent.code})\n`);
-          Con.PrintWarning(`Signaling server at ${this.signalingUrl} might be unavailable.\n`);
-        }
-
-        this._OnSignalingError({ error: 'Signaling connection closed' });
-
-        // Attempt to reconnect
-        this._ScheduleReconnect();
-      };
-
-      return true;
-    } catch (error) {
-      Con.PrintError(`WebRTCDriver: Failed to connect to signaling at ${this.signalingUrl}:\n${error.message}\n`);
-      this._ScheduleReconnect();
-      return false;
-    }
-  }
-
-  /**
-   * Schedule a reconnection attempt
-   */
-  _ScheduleReconnect() {
-    if (this.reconnectTimer) {
-      return;
-    }
-
-    const delay = 5000; // 5 seconds
-    Con.DPrint(`WebRTCDriver: Scheduling reconnect in ${delay}ms...\n`);
-
-    this.reconnectTimer = setTimeout(() => {
-      this.reconnectTimer = null;
-      Con.DPrint('WebRTCDriver: Attempting to reconnect...\n');
-      this._ConnectSignaling();
-    }, delay);
-  }
-
-  /**
-   * Restore session after reconnection
-   */
-  _RestoreSession() {
-    if (this.isHost) {
-      Con.DPrint('WebRTCDriver: Restoring host session...\n');
-
-      // Send create-session with existing sessionId and hostToken to attempt reconnect
-      this._SendSignaling({
-        type: 'create-session',
-        sessionId: this.sessionId,
-        hostToken: this.hostToken,
-        serverInfo: this._GatherServerInfo(),
-        isPublic: this._IsSessionPublic(),
-      });
-    } else {
-      Con.DPrint(`WebRTCDriver: Restoring client session ${this.sessionId}...\n`);
-      // Try to join the same session
-      this._SendSignaling({
-        type: 'join-session',
-        sessionId: this.sessionId,
-      });
-    }
-  }
-
-  /**
-   * Process any pending signaling operations
-   */
-  _ProcessPendingSignaling() {
-    // Call any pending onSignalingReady callbacks
-    for (let i = 0; i < NET.activeSockets.length; i++) {
-      const sock = NET.activeSockets[i];
-      if (sock && sock.driver === this && sock.driverdata?.onSignalingReady) {
-        sock.driverdata.onSignalingReady();
-        delete sock.driverdata.onSignalingReady;
-      }
-    }
-  }
-
-  /**
-   * Send a message to the signaling server
-   * @param message
-   */
-  _SendSignaling(message) {
-    if (this.signalingWs && this.signalingWs.readyState === 1) {
-      this.signalingWs.send(JSON.stringify(message));
-    }
-  }
-
-  /**
-   * Start sending periodic pings to keep the session alive (host only)
-   */
-  _StartPingInterval() {
-    if (!this.isHost) {
-      return; // Only hosts need to ping
-    }
-
-    // Clear any existing interval
-    this._StopPingInterval();
-
-    // Send ping every 30 seconds
-    this.pingInterval = setInterval(() => {
-      this._SendSignaling({ type: 'ping' });
-    }, 30 * 1000);
-
-    // Send initial ping immediately
-    this._SendSignaling({ type: 'ping' });
-  }
-
-  /**
-   * Stop sending pings
-   */
-  _StopPingInterval() {
-    if (this.pingInterval) {
-      clearInterval(this.pingInterval);
-      this.pingInterval = null;
-    }
-  }
-
-  /**
-   * Start sending periodic server info updates (host only)
-   */
-  _StartServerInfoSubscriptions() {
-    if (!this.isHost) {
-      return; // Only hosts need to update server info
-    }
-
-    // Clear any existing subscriptions
-    this._StopServerInfoSubscriptions();
-
-    this.serverEventSubscriptions.push(eventBus.subscribe('server.spawned', () => this._UpdateServerInfo()));
-
-    this.serverEventSubscriptions.push(eventBus.subscribe('server.client.connected', () => this._UpdateServerInfo()));
-    this.serverEventSubscriptions.push(eventBus.subscribe('server.client.disconnected', () => this._UpdateServerInfo()));
-
-    this.serverEventSubscriptions.push(eventBus.subscribe('cvar.changed', (/** @type {string} */ cvarName) => {
-      const cvar = Cvar.FindVar(cvarName);
-
-      if (cvar && cvar.flags & Cvar.FLAG.SERVER) {
-        this._UpdateServerInfo();
-      }
-    }));
-
-    // Send initial update immediately
-    this._UpdateServerInfo();
-  }
-
-  /**
-   * Stop sending server info updates
-   */
-  _StopServerInfoSubscriptions() {
-    while (this.serverEventSubscriptions.length > 0) {
-      const unsubscribe = this.serverEventSubscriptions.pop();
-      unsubscribe();
-    }
-  }
-
-  /**
-   * Gather and send current server info to master server
-   */
-  _UpdateServerInfo() {
-    if (!this.isHost || !this.sessionId) {
-      return;
-    }
-
-    // Gather server info from game state
-    const serverInfo = this._GatherServerInfo();
-
-    this._SendSignaling({
-      type: 'update-server-info',
-      serverInfo,
-      isPublic: this._IsSessionPublic(),
-    });
-  }
-
-  /**
-   * Gather current server information from game state
-   * Override this or hook into game state to provide actual values
-   */
-  _GatherServerInfo() {
-    const serverInfo = {
-      hostname: Cvar.FindVar('hostname').string,
-      maxPlayers: SV.svs.maxclients,
-      currentPlayers: NET.activeconnections,
-      map: SV.server.mapname,
-      mod: COM.game,
-      /** @type {Record<string, string>} */
-      settings: {},
-    };
-
-    for (const cvar of Cvar.Filter((/** @type {Cvar} */ cvar) => cvar.flags & Cvar.FLAG.SERVER)) {
-      serverInfo.settings[cvar.name] = cvar.string;
-    }
-
-    return serverInfo;
-  }
-
-  /**
-   * Determine if the session should be public
-   * Can be controlled by a cvar or game setting
-   * @returns {boolean} true if session is public
-   */
-  _IsSessionPublic() {
-    // Check if there's a cvar controlling this
-    return Cvar.FindVar('sv_public').value !== 0;
-  }
-
-  /**
-   * Create a new session (host)
-   * @param sock
-   */
-  _CreateSession(sock) {
-    this._SendSignaling({ type: 'create-session' });
-    sock.driverdata.isHost = true;
-    this.isHost = true;
-  }
-
-  /**
-   * Join an existing session
-   * @param sock
-   * @param sessionId
-   */
-  _JoinSession(sock, sessionId) {
-    this._SendSignaling({
-      type: 'join-session',
-      sessionId: sessionId,
-    });
-    sock.driverdata.sessionId = sessionId;
-    this.sessionId = sessionId;
-  }
-
-  /**
-   * Handle messages from signaling server
-   * @param message
-   */
-  async _OnSignalingMessage(message) {
-    switch (message.type) {
-      case 'session-created':
-        this._OnSessionCreated(message);
-        break;
-
-      case 'session-joined':
-        this._OnSessionJoined(message);
-        break;
-
-      case 'peer-joined':
-        this._OnPeerJoined(message);
-        break;
-
-      case 'peer-left':
-        this._OnPeerLeft(message);
-        break;
-
-      case 'offer':
-        await this._OnOffer(message);
-        break;
-
-      case 'answer':
-        await this._OnAnswer(message);
-        break;
-
-      case 'ice-candidate':
-        await this._OnIceCandidate(message);
-        break;
-
-      case 'session-closed':
-        this._OnSessionClosed(message);
-        break;
-
-      case 'pong':
-        // Pong response from server - session is alive
-        // Could track latency here if needed
-        break;
-
-      case 'error':
-        Con.DPrint(`WebRTCDriver: Signaling error: ${message.error}\n`);
-        this._OnSignalingError(message);
-        break;
-
-      default:
-        Con.DPrint(`WebRTCDriver: Unknown signaling message: ${message.type}\n`);
-    }
-  }
-
-  /**
-   * Handle signaling errors (session not found, etc.)
-   * @param message
-   */
-  _OnSignalingError(message) {
-    // Find the socket that's trying to connect
-    // Priority: look for sockets in CONNECTING state that match the error context
-    let failedSocket = null;
-
-    for (let i = 0; i < NET.activeSockets.length; i++) {
-      const sock = NET.activeSockets[i];
-      if (sock && sock.driver === this && sock.state === QSocket.STATE_CONNECTING) {
-        // If the error mentions a session ID, try to match it
-        if (sock.driverdata?.sessionId && message.error.includes(sock.driverdata.sessionId)) {
-          failedSocket = sock;
-          break;
-        }
-        // If we're creating a session and it fails
-        if (sock.driverdata?.isHost && message.error.includes('already exists')) {
-          failedSocket = sock;
-          break;
-        }
-        // Otherwise, just mark the first connecting socket as failed
-        if (!failedSocket) {
-          failedSocket = sock;
-        }
-      }
-    }
-
-    if (failedSocket) {
-      Con.PrintError(`WebRTCDriver: Connection failed - ${message.error}\n`);
-      failedSocket.state = QSocket.STATE_DISCONNECTED;
-
-      // Clean up the failed connection attempt if it was our current session
-      if (failedSocket.driverdata?.sessionId === this.sessionId) {
-        this.sessionId = null;
-        this.peerId = null;
-        this.hostToken = null;
-        this.isHost = false;
-      }
-    } else {
-      // No matching socket found, just log the error
-      Con.PrintWarning(`WebRTCDriver: Signaling error (no matching socket): ${message.error}\n`);
-    }
-  }
-
-  /**
-   * Session was created successfully
-   * @param message
-   */
-  _OnSessionCreated(message) {
-    this.sessionId = message.sessionId;
-    this.peerId = message.peerId;
-    this.isHost = message.isHost;
-    this.hostToken = message.hostToken; // Store host token
-    this.creatingSession = false; // Session creation complete
-
-    Con.DPrint(`WebRTCDriver: Session created: ${this.sessionId}\n`);
-    Con.DPrint(`WebRTCDriver: Your peer ID: ${this.peerId}\n`);
-
-    // Find the socket for this session and update it
-    // For host sessions created via Listen(), we need to find any socket with isHost=true
-    let sock = null;
-    for (let i = 0; i < NET.activeSockets.length; i++) {
-      const s = NET.activeSockets[i];
-      if (s && s.driver === this && s.driverdata?.isHost) {
-        sock = s;
-        break;
-      }
-    }
-
-    if (!sock) {
-      // Fallback: try to find by sessionId
-      sock = this._FindSocketBySession(this.sessionId);
-    }
-
-    if (sock && sock.driverdata) {
-      sock.driverdata.sessionId = this.sessionId;
-      sock.state = QSocket.STATE_CONNECTED;
-      sock.address = `WebRTC Host (${this.sessionId})`;
-      // Don't add host socket to newConnections - it's not an incoming client connection
-      // Only peer connections should be added to newConnections when they join
-      Con.DPrint('WebRTCDriver: Host socket ready for accepting peers\n');
-
-      // Start sending periodic pings to keep session alive
-      this._StartPingInterval();
-
-      // Start sending periodic server info updates
-      this._StartServerInfoSubscriptions();
-
-      // Handle existing peers (reconnect scenario)
-      if (message.existingPeers && message.existingPeers.length > 0) {
-        Con.DPrint(`WebRTCDriver: Reconnecting to ${message.existingPeers.length} existing peers...\n`);
-        for (const peerId of message.existingPeers) {
-          this._OnPeerJoined({ peerId });
-        }
-      }
-    } else {
-      Con.PrintWarning(`WebRTCDriver: No socket found for session ${this.sessionId}\n`);
-    }
-  }
-
-  /**
-   * Successfully joined a session
-   * @param message
-   */
-  _OnSessionJoined(message) {
-    this.sessionId = message.sessionId;
-    this.peerId = message.peerId;
-    this.isHost = message.isHost;
-
-    Con.DPrint(`WebRTCDriver: Joined session: ${this.sessionId}\n`);
-    Con.DPrint(`WebRTCDriver: Your peer ID: ${this.peerId}\n`);
-    Con.DPrint(`WebRTCDriver: Peers in session: ${message.peerCount}\n`);
-
-    // Find the socket for this session and mark it as connected
-    const sock = this._FindSocketBySession(this.sessionId);
-    if (sock) {
-      // Don't mark as fully connected yet - wait for data channels to open
-      // But update the address
-      sock.address = `WebRTC Peer (${this.sessionId})`;
-      Con.DPrint('WebRTCDriver: Socket found, waiting for P2P connection\n');
-    } else {
-      Con.PrintWarning(`WebRTCDriver: No socket found for joined session ${this.sessionId}\n`);
-    }
-  }
-
-  /**
-   * New peer joined the session
-   * @param message
-   */
-  _OnPeerJoined(message) {
-    Con.DPrint(`WebRTCDriver: Peer ${message.peerId} joined\n`);
-
-    // If we're the host, create a new socket for this peer and initiate connection
-    if (this.isHost) {
-      // Create a QSocket for this peer connection
-      const peerSock = NET.NewQSocket(this);
-      peerSock.state = QSocket.STATE_CONNECTING;
-      peerSock.address = `WebRTC Peer ${message.peerId}`;
-
-      // Store peer-specific connection state
-      peerSock.driverdata = {
-        sessionId: this.sessionId,
-        isHost: false,
-        peerId: message.peerId, // This socket represents a connection to this specific peer
-        peerConnections: new Map(),
-        dataChannels: new Map(),
-      };
-
-      // Free up some QSocket structures
-      peerSock.receiveMessage = [];
-      peerSock.sendMessage = [];
-
-      // Initiate P2P connection to this peer using the peer-specific socket
-      this._CreatePeerConnection(peerSock, message.peerId, true);
-
-      // Add to new connections so server accepts it as a client
-      this.newConnections.push(peerSock);
-      Con.DPrint(`WebRTCDriver: Created socket for peer ${message.peerId}, added to new connections\n`);
-    }
-  }
-
-  /**
-   * Peer left the session
-   * @param message
-   */
-  _OnPeerLeft(message) {
-    Con.DPrint(`WebRTCDriver: Peer ${message.peerId} left\n`);
-    this._ClosePeerConnection(message.peerId);
-  }
-
-  /**
-   * Received WebRTC offer from peer
-   * @param message
-   */
-  async _OnOffer(message) {
-    Con.DPrint(`WebRTCDriver: Received offer from ${message.fromPeerId}\n`);
-
-    // Find our socket (we're the joining peer)
-    const sock = this._FindSocketBySession(this.sessionId);
-    if (!sock) {
-      Con.PrintWarning('WebRTCDriver._OnOffer: No socket found for session\n');
-      return;
-    }
-
-    const pc = this._CreatePeerConnection(sock, message.fromPeerId, false);
-
-    try {
-      await pc.setRemoteDescription(new RTCSessionDescription(message.offer));
-      const answer = await pc.createAnswer();
-      await pc.setLocalDescription(answer);
-
-      this._SendSignaling({
-        type: 'answer',
-        targetPeerId: message.fromPeerId,
-        answer: pc.localDescription,
-      });
-    } catch (error) {
-      Con.PrintError(`WebRTCDriver: Error handling offer: ${error.message}\n`);
-    }
-  }
-
-  /**
-   * Received WebRTC answer from peer
-   * @param message
-   */
-  async _OnAnswer(message) {
-    Con.DPrint(`WebRTCDriver: Received answer from ${message.fromPeerId}\n`);
-
-    // If we're the host, find the peer-specific socket
-    // If we're a peer, find our own socket
-    const sock = this.isHost ? this._FindSocketByPeerId(message.fromPeerId) : this._FindSocketBySession(this.sessionId);
-
-    if (!sock || !sock.driverdata) {
-      Con.PrintWarning(`WebRTCDriver._OnAnswer: No socket found for ${message.fromPeerId}\n`);
-      return;
-    }
-
-    const pc = sock.driverdata.peerConnections.get(message.fromPeerId);
-    if (!pc) {
-      Con.PrintWarning(`WebRTCDriver: No peer connection found for ${message.fromPeerId}\n`);
-      return;
-    }
-
-    try {
-      await pc.setRemoteDescription(new RTCSessionDescription(message.answer));
-      Con.DPrint(`WebRTCDriver: Answer processed for ${message.fromPeerId}\n`);
-    } catch (error) {
-      Con.PrintError(`WebRTCDriver: Error handling answer: ${error.message}\n`);
-    }
-  }
-
-  /**
-   * Received ICE candidate from peer
-   * @param message
-   */
-  async _OnIceCandidate(message) {
-    // If we're the host, find the peer-specific socket
-    // If we're a peer, find our own socket
-    const sock = this.isHost
-      ? this._FindSocketByPeerId(message.fromPeerId)
-      : this._FindSocketBySession(this.sessionId);
-
-    if (!sock || !sock.driverdata) {
-      return;
-    }
-
-    const pc = sock.driverdata.peerConnections.get(message.fromPeerId);
-    if (!pc) {
-      return;
-    }
-
-    try {
-      if (message.candidate) {
-        await pc.addIceCandidate(new RTCIceCandidate(message.candidate));
-      }
-    } catch (error) {
-      Con.DPrint(`WebRTCDriver: Error adding ICE candidate: ${error.message}\n`);
-    }
-  }
-
-  /**
-   * Session was closed
-   * @param message
-   */
-  _OnSessionClosed(message) {
-    Con.DPrint(`WebRTCDriver: Session closed: ${message.reason}\n`);
-
-    const sock = this._FindSocketBySession(this.sessionId);
-    if (sock) {
-      sock.state = QSocket.STATE_DISCONNECTED;
-    }
-
-    this.sessionId = null;
-    this.peerId = null;
-    this.isHost = false;
-  }
-
-  /**
-   * Create a peer connection
-   * @param sock - The socket for this peer connection
-   * @param peerId
-   * @param initiator
-   */
-  _CreatePeerConnection(sock, peerId, initiator) {
-    console.assert(sock && sock.driverdata, 'WebRTCDriver._CreatePeerConnection: Invalid socket');
-
-    if (!sock || !sock.driverdata) {
-      Con.PrintError('WebRTCDriver._CreatePeerConnection: No socket provided\n');
-      return null;
-    }
-
-    // Check if connection already exists
-    if (sock.driverdata.peerConnections.has(peerId)) {
-      return sock.driverdata.peerConnections.get(peerId);
-    }
-
-    Con.DPrint(`WebRTCDriver: Creating peer connection to ${peerId} (initiator: ${initiator})\n`);
-
-    const pc = new RTCPeerConnection({ iceServers: this.iceServers });
-    sock.driverdata.peerConnections.set(peerId, pc);
-
-    // Handle ICE candidates
-    pc.onicecandidate = (event) => {
-      if (event.candidate) {
-        Con.DPrint(`WebRTCDriver: Sending ICE candidate to ${peerId}\n`);
-        this._SendSignaling({
-          type: 'ice-candidate',
-          targetPeerId: peerId,
-          candidate: event.candidate,
-        });
-      } else {
-        Con.DPrint(`WebRTCDriver: ICE gathering complete for ${peerId}\n`);
-      }
-    };
-
-    // Handle ICE connection state changes (more detailed than connectionState)
-    pc.oniceconnectionstatechange = () => {
-      Con.DPrint(`WebRTCDriver: ICE state with ${peerId}: ${pc.iceConnectionState}\n`);
-    };
-
-    // Handle connection state changes
-    pc.onconnectionstatechange = () => {
-      Con.DPrint(`WebRTCDriver: Connection state with ${peerId}: ${pc.connectionState}\n`);
-
-      if (pc.connectionState === 'connected') {
-        Con.DPrint(`WebRTCDriver: P2P connection established with ${peerId}\n`);
-      } else if (pc.connectionState === 'failed' || pc.connectionState === 'disconnected') {
-        Con.DPrint(`WebRTCDriver: Connection ${pc.connectionState} with ${peerId}\n`);
-        this._ClosePeerConnection(peerId);
-      }
-    };
-
-    // Create data channels
-    if (initiator) {
-      // Reliable channel for important messages
-      const reliableChannel = pc.createDataChannel('reliable', {
-        ordered: true,
-      });
-
-      // Unreliable channel for position updates, etc.
-      const unreliableChannel = pc.createDataChannel('unreliable', {
-        ordered: false,
-        maxRetransmits: 10,
-      });
-
-      this._SetupDataChannel(sock, peerId, reliableChannel, unreliableChannel);
-
-      // Create and send offer
-      pc.createOffer().then((offer) => pc.setLocalDescription(offer)).then(() => {
-        this._SendSignaling({
-          type: 'offer',
-          targetPeerId: peerId,
-          offer: pc.localDescription,
-        });
-      }).catch((error) => {
-        Con.PrintError(`WebRTCDriver: Error creating offer: ${error.message}\n`);
-      });
-    } else {
-      // Wait for data channels from initiator
-      pc.ondatachannel = (event) => {
-        const channel = event.channel;
-
-        if (!sock.driverdata.dataChannels.has(peerId)) {
-          sock.driverdata.dataChannels.set(peerId, {});
-        }
-
-        const channels = sock.driverdata.dataChannels.get(peerId);
-
-        if (channel.label === 'reliable') {
-          channels.reliable = channel;
-          this._SetupDataChannelHandlers(sock, peerId, channel);
-        } else if (channel.label === 'unreliable') {
-          channels.unreliable = channel;
-          this._SetupDataChannelHandlers(sock, peerId, channel);
-        }
-      };
-    }
-
-    return pc;
-  }
-
-  /**
-   * Setup data channels
-   * @param sock
-   * @param peerId
-   * @param reliableChannel
-   * @param unreliableChannel
-   */
-  _SetupDataChannel(sock, peerId, reliableChannel, unreliableChannel) {
-    sock.driverdata.dataChannels.set(peerId, {
-      reliable: reliableChannel,
-      unreliable: unreliableChannel,
-    });
-
-    this._SetupDataChannelHandlers(sock, peerId, reliableChannel);
-    this._SetupDataChannelHandlers(sock, peerId, unreliableChannel);
-  }
-
-  /**
-   * Setup data channel event handlers
-   * @param sock
-   * @param peerId
-   * @param channel
-   */
-  _SetupDataChannelHandlers(sock, peerId, channel) {
-    channel.binaryType = 'arraybuffer';
-
-    channel.onopen = () => {
-      Con.DPrint(`WebRTCDriver: Data channel ${channel.label} opened with ${peerId}\n`);
-
-      // Mark socket as connected when the reliable channel opens
-      if (channel.label === 'reliable' && sock.state !== QSocket.STATE_CONNECTED) {
-        sock.state = QSocket.STATE_CONNECTED;
-        Con.DPrint('WebRTCDriver: Socket now CONNECTED (can send/receive data)\n');
-      }
-
-      this._FlushSendBuffer(sock);
-    };
-
-    channel.onclose = () => {
-      Con.DPrint(`WebRTCDriver: Data channel ${channel.label} closed with ${peerId}\n`);
-
-      sock.state = QSocket.STATE_DISCONNECTED;
-    };
-
-    channel.onerror = (error) => {
-      Con.PrintError(`WebRTCDriver: Data channel error with ${peerId}: ${error}\n`);
-
-      sock.state = QSocket.STATE_DISCONNECTED;
-    };
-
-    channel.onmessage = (event) => {
-      const data = new Uint8Array(event.data);
-      sock.receiveMessage.push(data);
-    };
-  }
-
-  /**
-   * Close peer connection
-   * @param peerId
-   */
-  _ClosePeerConnection(peerId) {
-    // If we're the host, find the peer-specific socket
-    // If we're a peer, find our own socket
-    const sock = this.isHost ? this._FindSocketByPeerId(peerId) : this._FindSocketBySession(this.sessionId);
-
-    if (!sock || !sock.driverdata) {
-      Con.DPrint(`WebRTCDriver._ClosePeerConnection: No socket found for ${peerId}\n`);
-      return;
-    }
-
-    sock.state = QSocket.STATE_DISCONNECTING;
-
-    const pc = sock.driverdata.peerConnections.get(peerId);
-    if (pc) {
-      pc.close();
-      sock.driverdata.peerConnections.delete(peerId);
-    }
-
-    sock.driverdata.dataChannels.delete(peerId);
-
-    sock.state = QSocket.STATE_DISCONNECTED;
-  }
-
-  /**
-   * Find socket by session ID
-   * @param sessionId
-   */
-  _FindSocketBySession(sessionId) {
-    for (let i = 0; i < NET.activeSockets.length; i++) {
-      const sock = NET.activeSockets[i];
-      if (sock && sock.driver === this && sock.driverdata?.sessionId === sessionId) {
-        return sock;
-      }
-    }
-    return null;
-  }
-
-  /**
-   * Find socket by peer ID (for host to find peer-specific sockets)
-   * @param peerId
-   */
-  _FindSocketByPeerId(peerId) {
-    for (let i = 0; i < NET.activeSockets.length; i++) {
-      const sock = NET.activeSockets[i];
-      if (sock && sock.driver === this && sock.driverdata?.peerId === peerId) {
-        return sock;
-      }
-    }
-    return null;
-  }
-
-  CheckNewConnections() {
-    if (this.newConnections.length === 0) {
-      return null;
-    }
-
-    const sock = this.newConnections.shift();
-    Con.DPrint(`WebRTCDriver.CheckNewConnections: returning new connection ${sock.address}\n`);
-    return sock;
-  }
-
-  _FlushSendBuffer(qsocket) {
-    if (!qsocket.driverdata || !qsocket.driverdata.dataChannels) {
-      return;
-    }
-
-    while (qsocket.sendMessage.length > 0) {
-      const msg = qsocket.sendMessage[0];
-
-      // Check if we can send THIS message type to at least one peer
-      let canSendThis = false;
-      for (const channels of qsocket.driverdata.dataChannels.values()) {
-        const channel = msg.reliable ? channels.reliable : channels.unreliable;
-        if (channel && channel.readyState === 'open') {
-          canSendThis = true;
-          break;
-        }
-      }
-
-      if (!canSendThis) {
-        // Can't send this message yet. Stop flushing.
-        break;
-      }
-
-      const ret = this._SendToAllPeers(qsocket, msg.buffer, msg.reliable);
-
-      if (ret > 0) {
-        qsocket.sendMessage.shift();
-      } else {
-        break;
-      }
-    }
-
-    if (qsocket.sendMessage.length === 0 && qsocket.state === QSocket.STATE_DISCONNECTING) {
-      Con.DPrint(`WebRTCDriver._FlushSendBuffer: buffer drained, closing ${qsocket.address}\n`);
-      this._ForceClose(qsocket);
-    }
-  }
-
-  GetMessage(qsocket) {
-    // Check if we have collected new data
-    if (qsocket.receiveMessage.length === 0) {
-      if (qsocket.state === QSocket.STATE_DISCONNECTED) {
-        return -1;
-      }
-
-      if (qsocket.state === QSocket.STATE_DISCONNECTING) {
-        qsocket.state = QSocket.STATE_DISCONNECTED;
-        return -1;
-      }
-
-      return 0;
-    }
-
-    // Fetch a message
-    const message = qsocket.receiveMessage.shift();
-
-    // Parse header
-    const ret = message[0];
-    const length = message[1] + (message[2] << 8);
-
-    // Con.DPrint(`WebRTCDriver.GetMessage: type=${ret}, length=${length}\n`);
-
-    // Copy over the payload to our NET.message buffer
-    new Uint8Array(NET.message.data).set(message.subarray(3, length + 3));
-    NET.message.cursize = length;
-
-    return ret;
-  }
-
-  SendMessage(qsocket, data) {
-    const buffer = new Uint8Array(data.cursize + 3);
-    buffer[0] = 1; // reliable message type
-    buffer[1] = data.cursize & 0xff;
-    buffer[2] = (data.cursize >> 8) & 0xff;
-    buffer.set(new Uint8Array(data.data, 0, data.cursize), 3);
-
-    // Con.DPrint(`WebRTCDriver.SendMessage: sending ${data.cursize} bytes (reliable)\n`);
-    qsocket.sendMessage.push({
-      buffer: buffer,
-      reliable: true,
-    });
-
-    this._FlushSendBuffer(qsocket);
-    return 1;
-  }
-
-  SendUnreliableMessage(qsocket, data) {
-    const buffer = new Uint8Array(data.cursize + 3);
-    buffer[0] = 2; // unreliable message type
-    buffer[1] = data.cursize & 0xff;
-    buffer[2] = (data.cursize >> 8) & 0xff;
-    buffer.set(new Uint8Array(data.data, 0, data.cursize), 3);
-
-    // Con.DPrint(`WebRTCDriver.SendUnreliableMessage: sending ${data.cursize} bytes (unreliable)\n`);
-    qsocket.sendMessage.push({
-      buffer: buffer,
-      reliable: false,
-    });
-
-    this._FlushSendBuffer(qsocket);
-    return 1;
-  }
-
-  /**
-   * Send data to all connected peers
-   * @param qsocket
-   * @param buffer
-   * @param reliable
-   */
-  _SendToAllPeers(qsocket, buffer, reliable) {
-    console.assert(qsocket && qsocket.driverdata, 'WebRTCDriver._SendToAllPeers: Invalid socket');
-
-    if (!qsocket.driverdata || !qsocket.driverdata.dataChannels) {
-      Con.PrintError('WebRTCDriver._SendToAllPeers: no driverdata or channels\n');
-      return -1;
-    }
-
-    let sentCount = 0;
-
-    for (const [peerId, channels] of qsocket.driverdata.dataChannels) {
-      const channel = reliable ? channels.reliable : channels.unreliable;
-
-      if (!channel || channel.readyState !== 'open') {
-        Con.DPrint(`WebRTCDriver._SendToAllPeers: channel to ${peerId} not open (state=${channel?.readyState})\n`);
-        continue;
-      }
-
-      try {
-        channel.send(buffer);
-        // Con.DPrint(`WebRTCDriver._SendToAllPeers: sent ${buffer.length} bytes to ${peerId} on ${channel.label}\n`);
-        sentCount++;
-      } catch (error) {
-        Con.DPrint(`WebRTCDriver: Error sending to ${peerId}: ${error.message}\n`);
-      }
-    }
-
-    if (sentCount === 0) {
-      Con.DPrint('WebRTCDriver._SendToAllPeers: no peers available to send to\n');
-    }
-
-    return sentCount > 0 ? 1 : -1;
-  }
-
-  CanSendMessage(qsocket) {
-    if (!qsocket.driverdata || !qsocket.driverdata.dataChannels) {
-      return false;
-    }
-
-    // Can send if at least one reliable channel is open
-    for (const channels of qsocket.driverdata.dataChannels.values()) {
-      if (channels.reliable && channels.reliable.readyState === 'open') {
-        return true;
-      }
-    }
-
-    return false;
-  }
-
-  Close(qsocket) {
-    if (!qsocket.driverdata) {
-      qsocket.state = QSocket.STATE_DISCONNECTED;
-      return;
-    }
-
-    // Try to flush any pending messages
-    this._FlushSendBuffer(qsocket);
-
-    // If we have pending messages and we are in a state where we might send them,
-    // delay the actual closing.
-    if (qsocket.sendMessage.length > 0 && qsocket.state !== QSocket.STATE_DISCONNECTED) {
-      // Check if we have any channels that might open or are open
-      if (qsocket.driverdata.dataChannels && qsocket.driverdata.dataChannels.size > 0) {
-        Con.DPrint(`WebRTCDriver.Close: delaying close for ${qsocket.address} to flush buffer\n`);
-        qsocket.state = QSocket.STATE_DISCONNECTING;
-
-        // Set a timeout to force close if it takes too long (e.g. 5 seconds)
-        setTimeout(() => {
-          if (qsocket.state === QSocket.STATE_DISCONNECTING) {
-            Con.DPrint(`WebRTCDriver.Close: timeout waiting for flush, forcing close for ${qsocket.address}\n`);
-            this._ForceClose(qsocket);
-          }
-        }, 5000);
-
-        return;
-      }
-    }
-
-    this._ForceClose(qsocket);
-  }
-
-  _ForceClose(qsocket) {
-    if (!qsocket.driverdata) {
-      qsocket.state = QSocket.STATE_DISCONNECTED;
-      return;
-    }
-
-    // Close all peer connections
-    if (qsocket.driverdata.peerConnections) {
-      for (const pc of qsocket.driverdata.peerConnections.values()) {
-        pc.close();
-      }
-      qsocket.driverdata.peerConnections.clear();
-    }
-
-    // Clear data channels
-    if (qsocket.driverdata.dataChannels) {
-      qsocket.driverdata.dataChannels.clear();
-    }
-
-    // If this socket represents our current session (host or client), clear session state
-    const isSessionSocket = qsocket.driverdata.isHost || (!this.isHost && qsocket.driverdata.sessionId === this.sessionId);
-
-    // Stop ping interval if this is the host socket
-    if (qsocket.driverdata.isHost) {
-      this._StopPingInterval();
-      this._StopServerInfoSubscriptions();
-    }
-
-    // Notify signaling server if we are leaving the session
-    // This applies to both Host (destroying session) and Client (leaving session)
-    if (isSessionSocket && this.sessionId) {
-      this._SendSignaling({ type: 'leave-session' });
-    }
-
-    if (isSessionSocket) {
-      // Only clear if we are actually closing the session socket, not a peer socket on the host
-      // Host has:
-      // 1. Host socket (isHost=true, sessionId=...)
-      // 2. Peer sockets (isHost=false, sessionId=..., peerId=...)
-
-      // If it's a peer socket on the host, we shouldn't clear global session state
-      if (this.isHost && !qsocket.driverdata.isHost) {
-        // This is a peer connection closing on the host side
-        // Do not clear session state
-      } else {
-        this.sessionId = null;
-        this.peerId = null;
-        this.hostToken = null;
-        this.isHost = false;
-      }
-    }
-
-    qsocket.state = QSocket.STATE_DISCONNECTED;
-  }
-
-  /**
-   * WebRTCDriver only listens in browser mode
-   * Dedicated servers use WebSocketDriver instead
-   * @returns {boolean} true if should listen
-   */
-  ShouldListen() {
-    return !registry.isDedicatedServer;
-  }
-
-  Listen(listening) {
-    // In browser environment, listening means hosting a WebRTC session
-    if (!this.ShouldListen()) {
-      // Dedicated servers don't use WebRTC
-      return;
-    }
-
-    if (listening) {
-      // Check if we already have a session or are creating one
-      if (this.sessionId || this.creatingSession) {
-        Con.DPrint('WebRTCDriver: Already hosting or creating a session\n');
-        return;
-      }
-
-      // Auto-create a WebRTC host session for browser-based listen servers
-      Con.DPrint('WebRTCDriver: Starting WebRTC host session for listen server\n');
-      this.creatingSession = true;
-
-      // Connect to signaling and create a host session
-      if (!this._ConnectSignaling()) {
-        Con.PrintWarning('WebRTCDriver: Failed to connect to signaling server\n');
-        this.creatingSession = false;
-        return;
-      }
-
-      // Create a QSocket for tracking this host session
-      const sock = NET.NewQSocket(this);
-      sock.state = QSocket.STATE_CONNECTING;
-      sock.address = 'WebRTC Host';
-
-      // Store connection state
-      sock.driverdata = {
-        sessionId: null, // Will be set when session is created
-        isHost: true,
-        peerConnections: new Map(),
-        dataChannels: new Map(),
-        signalingReady: false,
-      };
-
-      // Free up some QSocket structures
-      sock.receiveMessage = [];
-      sock.sendMessage = [];
-
-      // Wait for signaling to be ready, then create session
-      const createSessionWhenReady = () => {
-        this._SendSignaling({
-          type: 'create-session',
-          serverInfo: this._GatherServerInfo(),
-          isPublic: this._IsSessionPublic(),
-        });
-        Con.DPrint('WebRTCDriver: Session creation request sent\n');
-      };
-
-      if (this.signalingWs && this.signalingWs.readyState === 1) {
-        // Already connected, send immediately
-        createSessionWhenReady();
-      } else {
-        // Store callback for when signaling connects
-        sock.driverdata.onSignalingReady = createSessionWhenReady;
-      }
-
-      this.isHost = true;
-
-      Con.DPrint('WebRTCDriver: Waiting for signaling connection to create session...\n');
-    } else {
-      // Stop listening - tear down the session completely
-      Con.DPrint('WebRTCDriver: Stopping listen server, tearing down session\n');
-
-      // Stop ping interval
-      this._StopPingInterval();
-      this._StopServerInfoSubscriptions();
-
-      // Close all sockets (host and peers) that belong to this driver
-      for (let i = NET.activeSockets.length - 1; i >= 0; i--) {
-        const sock = NET.activeSockets[i];
-        if (sock && sock.driver === this && sock.driverdata) {
-          // Close all peer connections
-          if (sock.driverdata.peerConnections) {
-            for (const pc of sock.driverdata.peerConnections.values()) {
-              pc.close();
-            }
-            sock.driverdata.peerConnections.clear();
-          }
-
-          // Clear data channels
-          if (sock.driverdata.dataChannels) {
-            sock.driverdata.dataChannels.clear();
-          }
-
-          // Mark socket as disconnected
-          sock.state = QSocket.STATE_DISCONNECTED;
-        }
-      }
-
-      // Leave session on signaling server
-      if (this.sessionId) {
-        this._SendSignaling({ type: 'leave-session' });
-      }
-
-      // Close signaling connection
-      if (this.signalingWs) {
-        // Remove listeners to prevent reconnect logic
-        this.signalingWs.onclose = null;
-        this.signalingWs.onerror = null;
-        this.signalingWs.onmessage = null;
-        this.signalingWs.onopen = null;
-
-        this.signalingWs.close();
-        this.signalingWs = null;
-      }
-
-      // Clear any pending reconnect timer
-      if (this.reconnectTimer) {
-        clearTimeout(this.reconnectTimer);
-        this.reconnectTimer = null;
-      }
-
-      if (this.sessionId) {
-        Con.DPrint('WebRTCDriver: Session torn down, no longer accepting connections\n');
-      }
-
-      // Reset state
-      this.sessionId = null;
-      this.peerId = null;
-      this.isHost = false;
-      this.creatingSession = false;
-    }
-  }
-
-  GetListenAddress() {
-    if (this.sessionId) {
-      return `webrtc://${this.sessionId}`;
-    }
-
-    return null;
-  }
-};
-
diff --git a/source/engine/network/NetworkDrivers.ts b/source/engine/network/NetworkDrivers.ts
new file mode 100644
index 00000000..e54a562a
--- /dev/null
+++ b/source/engine/network/NetworkDrivers.ts
@@ -0,0 +1,2047 @@
+import Cvar from '../common/Cvar.mjs';
+import { HostError } from '../common/Errors.mjs';
+import type { SzBuffer } from './MSG.ts';
+import { eventBus, getCommonRegistry, registry } from '../registry.mjs';
+import { formatIP } from './Misc.ts';
+
+type Throwable = Error | string | number | boolean | null | undefined | { message?: string };
+type NetworkPayload = Pick<SzBuffer, 'cursize' | 'data'>;
+type QSocketState = 'new' | 'connecting' | 'connected' | 'disconnecting' | 'disconnected';
+
+type ListenAddress = {
+  address: string;
+  port: number;
+};
+
+type NodeRawData = ArrayBuffer | Uint8Array | Uint8Array[];
+
+type NodeIncomingMessageLike = {
+  headers: Record<string, string | string[] | undefined>;
+  socket: {
+    remoteAddress?: string;
+    remotePort?: number;
+  };
+};
+
+type NodeWebSocketLike = {
+  close: (code?: number) => void;
+  readyState: number;
+  send: (data: ArrayBuffer) => void;
+  on: {
+    (eventName: 'close', listener: () => void): void;
+    (eventName: 'error', listener: () => void): void;
+    (eventName: 'message', listener: (data: NodeRawData) => void): void;
+  };
+};
+
+type NodeWebSocketServerLike = {
+  address: () => string | ListenAddress | null;
+  close: () => void;
+  on: (eventName: 'connection', listener: (ws: NodeWebSocketLike, req: NodeIncomingMessageLike) => void) => void;
+};
+
+type NodeWebSocketModuleLike = {
+  WebSocketServer: new (options: { server: typeof NET.server }) => NodeWebSocketServerLike;
+};
+
+type DataChannelPair = {
+  reliable?: RTCDataChannel;
+  unreliable?: RTCDataChannel;
+};
+
+type WebRTCQueuedMessage = {
+  buffer: Uint8Array;
+  reliable: boolean;
+};
+
+type ServerInfo = {
+  hostname: string;
+  maxPlayers: number;
+  currentPlayers: number;
+  map: string;
+  mod: string;
+  settings: Record<string, string>;
+};
+
+type SignalingMessage = {
+  type: string;
+  answer?: RTCSessionDescription | RTCSessionDescriptionInit | null;
+  candidate?: RTCIceCandidate | RTCIceCandidateInit | null;
+  error?: string;
+  existingPeers?: string[];
+  fromPeerId?: string;
+  hostToken?: string;
+  isHost?: boolean;
+  isPublic?: boolean;
+  offer?: RTCSessionDescription | RTCSessionDescriptionInit | null;
+  peerCount?: number;
+  peerId?: string;
+  reason?: string;
+  serverInfo?: ServerInfo;
+  sessionId?: string;
+  targetPeerId?: string;
+};
+
+type LoopbackSocketState = {
+  kind: 'loopback';
+  peer: QSocket | null;
+  receiveBuffer: Uint8Array;
+  receiveLength: number;
+};
+
+type ClientWebSocketSocketState = {
+  kind: 'websocket';
+  mode: 'client';
+  receiveQueue: Uint8Array[];
+  sendQueue: Uint8Array[];
+  webSocket: BrowserWebSocketWithSocket;
+};
+
+type ServerWebSocketSocketState = {
+  kind: 'websocket';
+  mode: 'server';
+  receiveQueue: Uint8Array[];
+  sendQueue: Uint8Array[];
+  webSocket: NodeWebSocketLike;
+};
+
+type WebSocketSocketState = ClientWebSocketSocketState | ServerWebSocketSocketState;
+
+type WebRTCSocketState = {
+  kind: 'webrtc';
+  dataChannels: Map<string, DataChannelPair>;
+  isHost: boolean;
+  onSignalingReady?: () => void;
+  peerConnections: Map<string, RTCPeerConnection>;
+  peerId?: string | null;
+  receiveQueue: Uint8Array[];
+  sendQueue: WebRTCQueuedMessage[];
+  sessionId: string | null;
+};
+
+type QSocketTransportState = LoopbackSocketState | WebSocketSocketState | WebRTCSocketState | null;
+
+type BrowserWebSocketWithSocket = WebSocket & {
+  qsocket?: QSocket;
+};
+
+let { COM, Con, NET, Sys, SV } = getCommonRegistry();
+
+eventBus.subscribe('registry.frozen', () => {
+  ({ COM, Con, NET, Sys, SV } = getCommonRegistry());
+});
+
+/**
+ * Normalize thrown values into a printable error message.
+ * @param error
+ * @returns Human-readable error text.
+ */
+function getErrorMessage(error: Throwable): string {
+  if (error instanceof Error) {
+    return error.message;
+  }
+
+  if (typeof error === 'object' && error !== null && 'message' in error && typeof error.message === 'string') {
+    return error.message;
+  }
+
+  return String(error);
+}
+
+/**
+ * Create loopback-only runtime state for a qsocket.
+ * @param peer
+ * @returns Initialized loopback transport state.
+ */
+function createLoopbackSocketState(peer: QSocket | null): LoopbackSocketState {
+  return {
+    kind: 'loopback',
+    peer,
+    receiveBuffer: new Uint8Array(new ArrayBuffer(8192)),
+    receiveLength: 0,
+  };
+}
+
+/**
+ * Create WebRTC runtime state for a qsocket.
+ * @param options
+ * @returns Initialized WebRTC transport state.
+ */
+function createWebRTCSocketState(options: {
+  isHost: boolean;
+  peerId?: string | null;
+  sessionId: string | null;
+}): WebRTCSocketState {
+  const {
+    isHost,
+    peerId = null,
+    sessionId,
+  } = options;
+
+  return {
+    kind: 'webrtc',
+    dataChannels: new Map(),
+    isHost,
+    peerConnections: new Map(),
+    peerId,
+    receiveQueue: [],
+    sendQueue: [],
+    sessionId,
+  };
+}
+
+/**
+ * Return loopback transport state when present.
+ * @param sock
+ * @returns Loopback state for the socket when available.
+ */
+function getLoopbackState(sock: QSocket): LoopbackSocketState | null {
+  return sock.transportState?.kind === 'loopback' ? sock.transportState : null;
+}
+
+/**
+ * Return websocket transport state when present.
+ * @param sock
+ * @returns WebSocket state for the socket when available.
+ */
+function getWebSocketState(sock: QSocket): WebSocketSocketState | null {
+  return sock.transportState?.kind === 'websocket' ? sock.transportState : null;
+}
+
+/**
+ * Return WebRTC transport state when present.
+ * @param sock
+ * @returns WebRTC state for the socket when available.
+ */
+function getWebRTCSocketState(sock: QSocket): WebRTCSocketState | null {
+  return sock.transportState?.kind === 'webrtc' ? sock.transportState : null;
+}
+
+/**
+ * Copy a view into a detached ArrayBuffer for transport APIs that require it.
+ * @param data
+ * @returns A standalone buffer containing the input bytes.
+ */
+function toArrayBuffer(data: Uint8Array): ArrayBuffer {
+  const buffer = new ArrayBuffer(data.byteLength);
+  new Uint8Array(buffer).set(new Uint8Array(data.buffer, data.byteOffset, data.byteLength));
+  return buffer;
+}
+
+/**
+ * Normalize node websocket message payloads into a standalone Uint8Array.
+ * @param data
+ * @returns A standalone byte view of the incoming payload.
+ */
+function rawDataToUint8Array(data: NodeRawData): Uint8Array {
+  if (Array.isArray(data)) {
+    const totalLength = data.reduce((length, chunk) => length + chunk.byteLength, 0);
+    const combined = new Uint8Array(totalLength);
+    let offset = 0;
+
+    for (const chunk of data) {
+      combined.set(new Uint8Array(chunk.buffer, chunk.byteOffset, chunk.byteLength), offset);
+      offset += chunk.byteLength;
+    }
+
+    return combined;
+  }
+
+  if (data instanceof ArrayBuffer) {
+    return new Uint8Array(data);
+  }
+
+  return new Uint8Array(data.buffer, data.byteOffset, data.byteLength).slice();
+}
+
+export class QSocket {
+  static readonly STATE_NEW = 'new';
+  static readonly STATE_CONNECTING = 'connecting';
+  static readonly STATE_CONNECTED = 'connected';
+  static readonly STATE_DISCONNECTING = 'disconnecting';
+  static readonly STATE_DISCONNECTED = 'disconnected';
+
+  address: string | null = null;
+  canSend = false;
+  connecttime: number;
+  driver: BaseDriver;
+  lastMessageTime: number;
+  state: QSocketState = QSocket.STATE_NEW;
+  transportState: QSocketTransportState = null;
+
+  constructor(driver: BaseDriver, time: number) {
+    this.driver = driver;
+    this.connecttime = time;
+    this.lastMessageTime = time;
+  }
+
+  toString(): string {
+    return `QSocket(${this.address}, ${this.state})`;
+  }
+
+  GetMessage(): number {
+    return this.driver.GetMessage(this);
+  }
+
+  SendMessage(data: NetworkPayload): number {
+    return this.driver.SendMessage(this, data);
+  }
+
+  SendUnreliableMessage(data: NetworkPayload): number {
+    return this.driver.SendUnreliableMessage(this, data);
+  }
+
+  CanSendMessage(): boolean {
+    if (this.state !== QSocket.STATE_CONNECTED) {
+      return false;
+    }
+
+    return this.driver.CanSendMessage(this);
+  }
+
+  Close(): void {
+    this.driver.Close(this);
+  }
+}
+
+export class BaseDriver {
+  initialized = false;
+  name: string;
+
+  constructor(name: string) {
+    this.name = name;
+  }
+
+  Init(): boolean {
+    return false;
+  }
+
+  Shutdown(): void {
+    this.initialized = false;
+  }
+
+  canHandle(_host: string): boolean {
+    return false;
+  }
+
+  Connect(_host: string): QSocket | null {
+    return null;
+  }
+
+  CheckNewConnections(): QSocket | null {
+    return null;
+  }
+
+  CheckForResend(): number {
+    return -1;
+  }
+
+  GetMessage(_qsocket: QSocket): number {
+    return -1;
+  }
+
+  SendMessage(_qsocket: QSocket, _data: NetworkPayload): number {
+    return -1;
+  }
+
+  SendUnreliableMessage(_qsocket: QSocket, _data: NetworkPayload): number {
+    return -1;
+  }
+
+  CanSendMessage(_qsocket: QSocket): boolean {
+    return false;
+  }
+
+  Close(qsocket: QSocket): void {
+    qsocket.state = QSocket.STATE_DISCONNECTED;
+  }
+
+  ShouldListen(): boolean {
+    return true;
+  }
+
+  Listen(_shouldListen: boolean): void {
+  }
+
+  GetListenAddress(): string | null {
+    return null;
+  }
+}
+
+export class LoopDriver extends BaseDriver {
+  _client: QSocket | null = null;
+  _server: QSocket | null = null;
+  localconnectpending = false;
+
+  constructor() {
+    super('loop');
+  }
+
+  Init(): boolean {
+    this._server = null;
+    this._client = null;
+    this.localconnectpending = false;
+    this.initialized = true;
+    return true;
+  }
+
+  canHandle(host: string): boolean {
+    return host === 'local';
+  }
+
+  Connect(host: string): QSocket | null {
+    if (host !== 'local') {
+      return null;
+    }
+
+    this.localconnectpending = true;
+
+    if (this._server === null) {
+      this._server = NET.NewQSocket(this);
+    }
+
+    if (this._client === null) {
+      this._client = NET.NewQSocket(this);
+    }
+
+    const server = this._server;
+    const client = this._client;
+
+    if (server === null || client === null) {
+      return null;
+    }
+
+    server.address = 'local server';
+    client.address = 'local client';
+    server.canSend = true;
+    client.canSend = true;
+
+    server.transportState = createLoopbackSocketState(client);
+    client.transportState = createLoopbackSocketState(server);
+
+    client.state = QSocket.STATE_CONNECTED;
+    server.state = QSocket.STATE_CONNECTED;
+
+    return server;
+  }
+
+  CheckNewConnections(): QSocket | null {
+    if (!this.localconnectpending) {
+      return null;
+    }
+
+    this.localconnectpending = false;
+
+    if (this._client === null || this._server === null) {
+      return null;
+    }
+
+    const clientState = getLoopbackState(this._client);
+    const serverState = getLoopbackState(this._server);
+
+    if (clientState === null || serverState === null) {
+      return null;
+    }
+
+    clientState.receiveLength = 0;
+    this._client.canSend = true;
+    this._client.state = QSocket.STATE_CONNECTED;
+
+    serverState.receiveLength = 0;
+    this._server.canSend = true;
+    this._server.state = QSocket.STATE_CONNECTED;
+
+    return this._client;
+  }
+
+  GetMessage(sock: QSocket): number {
+    const loopbackState = getLoopbackState(sock);
+
+    if (loopbackState === null || loopbackState.receiveLength === 0) {
+      return 0;
+    }
+
+    const buffer = loopbackState.receiveBuffer;
+    let receiveLength = loopbackState.receiveLength;
+
+    const type = buffer[0];
+    const length = buffer[1] + (buffer[2] << 8);
+
+    if (length > NET.message.data.byteLength) {
+      throw new HostError('Loop.GetMessage: overflow');
+    }
+
+    NET.message.cursize = length;
+    new Uint8Array(NET.message.data).set(buffer.subarray(3, length + 3));
+
+    receiveLength -= length;
+
+    if (receiveLength >= 4) {
+      buffer.copyWithin(0, length + 3, length + 3 + receiveLength);
+    }
+
+    loopbackState.receiveLength = receiveLength - 3;
+
+    const { peer } = loopbackState;
+
+    if (peer !== null && type === 1) {
+      peer.canSend = true;
+    }
+
+    if (sock.state === QSocket.STATE_DISCONNECTED) {
+      return -1;
+    }
+
+    return type;
+  }
+
+  SendMessage(sock: QSocket, data: NetworkPayload): number {
+    const peer = getLoopbackState(sock)?.peer ?? null;
+    const peerState = peer === null ? null : getLoopbackState(peer);
+
+    if (peer === null || peerState === null) {
+      return -1;
+    }
+
+    const bufferLength = peerState.receiveLength;
+    peerState.receiveLength += data.cursize + 3;
+
+    if (peerState.receiveLength > 8192) {
+      throw new HostError('LoopDriver.SendMessage: overflow');
+    }
+
+    const buffer = peerState.receiveBuffer;
+    buffer[bufferLength] = 1;
+    buffer[bufferLength + 1] = data.cursize & 0xff;
+    buffer[bufferLength + 2] = data.cursize >> 8;
+    buffer.set(new Uint8Array(data.data, 0, data.cursize), bufferLength + 3);
+    sock.canSend = false;
+
+    return 1;
+  }
+
+  SendUnreliableMessage(sock: QSocket, data: NetworkPayload): number {
+    const peer = getLoopbackState(sock)?.peer ?? null;
+    const peerState = peer === null ? null : getLoopbackState(peer);
+
+    if (peer === null || peerState === null) {
+      return -1;
+    }
+
+    const bufferLength = peerState.receiveLength;
+    peerState.receiveLength += data.cursize + 3;
+
+    if (peerState.receiveLength > 8192) {
+      throw new HostError('LoopDriver.SendUnreliableMessage: overflow');
+    }
+
+    const buffer = peerState.receiveBuffer;
+    buffer[bufferLength] = 2;
+    buffer[bufferLength + 1] = data.cursize & 0xff;
+    buffer[bufferLength + 2] = data.cursize >> 8;
+    buffer.set(new Uint8Array(data.data, 0, data.cursize), bufferLength + 3);
+
+    return 1;
+  }
+
+  CanSendMessage(sock: QSocket): boolean {
+    return getLoopbackState(sock)?.peer !== null ? sock.canSend : false;
+  }
+
+  Close(sock: QSocket): void {
+    const loopbackState = getLoopbackState(sock);
+    const peer = loopbackState?.peer ?? null;
+
+    if (peer !== null) {
+      const peerState = getLoopbackState(peer);
+
+      if (peerState !== null) {
+        peerState.peer = null;
+      }
+    }
+
+    if (loopbackState !== null) {
+      loopbackState.peer = null;
+      loopbackState.receiveLength = 0;
+    }
+
+    sock.canSend = false;
+
+    if (sock === this._server) {
+      this._server = null;
+    } else {
+      this._client = null;
+    }
+
+    sock.state = QSocket.STATE_DISCONNECTED;
+  }
+}
+
+export class WebSocketDriver extends BaseDriver {
+  newConnections: QSocket[] = [];
+  wss: NodeWebSocketServerLike | null = null;
+
+  constructor() {
+    super('websocket');
+  }
+
+  Init(): boolean {
+    this.initialized = true;
+    this.newConnections = [];
+    return true;
+  }
+
+  canHandle(host: string): boolean {
+    return /^wss?:\/\//i.test(host);
+  }
+
+  Connect(host: string): QSocket | null {
+    if (!/^wss?:\/\//i.test(host)) {
+      return null;
+    }
+
+    const url = new URL(host);
+
+    if (!url.port) {
+      url.port = new URL(location.href).port;
+    }
+
+    const sock = NET.NewQSocket(this);
+
+    try {
+      sock.address = url.toString();
+      const browserSocket = new WebSocket(url, 'quake') as BrowserWebSocketWithSocket;
+      browserSocket.binaryType = 'arraybuffer';
+      sock.transportState = {
+        kind: 'websocket',
+        mode: 'client',
+        receiveQueue: [],
+        sendQueue: [],
+        webSocket: browserSocket,
+      };
+    } catch (error) {
+      Con.PrintError(`WebSocketDriver.Connect: failed to setup ${url}, ${getErrorMessage(error as Throwable)}\n`);
+      return null;
+    }
+
+    const socketState = getWebSocketState(sock);
+
+    if (socketState === null || socketState.mode !== 'client') {
+      return null;
+    }
+
+    const { webSocket: browserSocket } = socketState;
+    browserSocket.onerror = this._OnErrorClient;
+    browserSocket.onmessage = this._OnMessageClient;
+    browserSocket.onopen = this._OnOpenClient;
+    browserSocket.onclose = this._OnCloseClient;
+
+    browserSocket.qsocket = sock;
+    sock.state = QSocket.STATE_CONNECTING;
+
+    return sock;
+  }
+
+  CanSendMessage(qsocket: QSocket): boolean {
+    const socketState = getWebSocketState(qsocket);
+    return socketState !== null ? ![2, 3].includes(socketState.webSocket.readyState) : false;
+  }
+
+  GetMessage(qsocket: QSocket): number {
+    const socketState = getWebSocketState(qsocket);
+
+    if (socketState === null) {
+      return qsocket.state === QSocket.STATE_DISCONNECTED ? -1 : 0;
+    }
+
+    const { receiveQueue } = socketState;
+
+    if (receiveQueue.length === 0) {
+      if (qsocket.state === QSocket.STATE_DISCONNECTED) {
+        return -1;
+      }
+
+      if (qsocket.state === QSocket.STATE_DISCONNECTING) {
+        qsocket.state = QSocket.STATE_DISCONNECTED;
+      }
+
+      return 0;
+    }
+
+    const message = receiveQueue.shift();
+
+    if (message === undefined) {
+      return 0;
+    }
+
+    const type = message[0];
+    const length = message[1] + (message[2] << 8);
+    new Uint8Array(NET.message.data).set(message.subarray(3, length + 3));
+    NET.message.cursize = length;
+
+    return type;
+  }
+
+  _FlushSendBuffer(qsocket: QSocket): boolean {
+    const socketState = getWebSocketState(qsocket);
+
+    if (socketState === null) {
+      return false;
+    }
+
+    const { sendQueue, webSocket } = socketState;
+
+    switch (webSocket.readyState) {
+      case 2:
+      case 3:
+        Con.DPrint(`WebSocketDriver._FlushSendBuffer: connection already died (readyState = ${webSocket.readyState})`);
+        return false;
+
+      case 0:
+        return true;
+    }
+
+    while (sendQueue.length > 0) {
+      const message = sendQueue.shift();
+
+      if (message === undefined) {
+        break;
+      }
+
+      if (NET.delay_send.value === 0) {
+        webSocket.send(toArrayBuffer(message));
+      } else {
+        setTimeout(() => {
+          webSocket.send(toArrayBuffer(message));
+
+          if (webSocket.readyState > 1) {
+            qsocket.state = QSocket.STATE_DISCONNECTED;
+          }
+        }, NET.delay_send.value + (Math.random() - 0.5) * NET.delay_send_jitter.value);
+      }
+    }
+
+    return true;
+  }
+
+  _SendRawMessage(qsocket: QSocket, data: Uint8Array): number {
+    const socketState = getWebSocketState(qsocket);
+
+    if (socketState === null) {
+      return -1;
+    }
+
+    socketState.sendQueue.push(data);
+    this._FlushSendBuffer(qsocket);
+    return qsocket.state !== QSocket.STATE_DISCONNECTED ? 1 : -1;
+  }
+
+  SendMessage(qsocket: QSocket, data: NetworkPayload): number {
+    const buffer = new Uint8Array(data.cursize + 3);
+    let index = 0;
+    buffer[index++] = 1;
+    buffer[index++] = data.cursize & 0xff;
+    buffer[index++] = (data.cursize >> 8) & 0xff;
+    buffer.set(new Uint8Array(data.data, 0, data.cursize), index);
+    return this._SendRawMessage(qsocket, buffer);
+  }
+
+  SendUnreliableMessage(qsocket: QSocket, data: NetworkPayload): number {
+    const buffer = new Uint8Array(data.cursize + 3);
+    let index = 0;
+    buffer[index++] = 2;
+    buffer[index++] = data.cursize & 0xff;
+    buffer[index++] = (data.cursize >> 8) & 0xff;
+    buffer.set(new Uint8Array(data.data, 0, data.cursize), index);
+    return this._SendRawMessage(qsocket, buffer);
+  }
+
+  Close(qsocket: QSocket): void {
+    const socketState = getWebSocketState(qsocket);
+
+    if (socketState !== null && this.CanSendMessage(qsocket)) {
+      this._FlushSendBuffer(qsocket);
+      socketState.webSocket.close(1000);
+    }
+
+    qsocket.state = QSocket.STATE_DISCONNECTED;
+  }
+
+  _OnErrorClient(this: BrowserWebSocketWithSocket, _error: Event): void {
+    if (this.qsocket === undefined) {
+      return;
+    }
+
+    Con.PrintError(`WebSocketDriver._OnErrorClient: lost connection to ${this.qsocket.address}\n`);
+    this.qsocket.state = QSocket.STATE_DISCONNECTED;
+  }
+
+  _OnMessageClient(this: BrowserWebSocketWithSocket, message: MessageEvent<string | ArrayBuffer>): void {
+    if (this.qsocket === undefined) {
+      return;
+    }
+
+    const data = message.data;
+
+    if (typeof data === 'string') {
+      return;
+    }
+
+    const socketState = getWebSocketState(this.qsocket);
+
+    if (socketState === null) {
+      return;
+    }
+
+    if (NET.delay_receive.value === 0) {
+      socketState.receiveQueue.push(new Uint8Array(data));
+      return;
+    }
+
+    setTimeout(() => {
+      socketState.receiveQueue.push(new Uint8Array(data));
+    }, NET.delay_receive.value + (Math.random() - 0.5) * NET.delay_receive_jitter.value);
+  }
+
+  _OnOpenClient(this: BrowserWebSocketWithSocket): void {
+    if (this.qsocket !== undefined) {
+      this.qsocket.state = QSocket.STATE_CONNECTED;
+    }
+  }
+
+  _OnCloseClient(this: BrowserWebSocketWithSocket): void {
+    if (this.qsocket === undefined || this.qsocket.state !== QSocket.STATE_CONNECTED) {
+      return;
+    }
+
+    Con.DPrint('WebSocketDriver._OnCloseClient: connection closed.\n');
+    this.qsocket.state = QSocket.STATE_DISCONNECTING;
+  }
+
+  _OnConnectionServer(ws: NodeWebSocketLike, req: NodeIncomingMessageLike): void {
+    Con.DPrint('WebSocketDriver._OnConnectionServer: received new connection\n');
+
+    const sock = NET.NewQSocket(this);
+    sock.transportState = {
+      kind: 'websocket',
+      mode: 'server',
+      receiveQueue: [],
+      sendQueue: [],
+      webSocket: ws,
+    };
+
+    const forwardedFor = req.headers['x-forwarded-for'];
+    const address = Array.isArray(forwardedFor) ? forwardedFor[0] : forwardedFor ?? req.socket.remoteAddress ?? '';
+
+    sock.address = formatIP(address, req.socket.remotePort ?? 0);
+    sock.state = QSocket.STATE_CONNECTED;
+
+    NET.time = Sys.FloatTime();
+    sock.lastMessageTime = NET.time;
+
+    ws.on('close', () => {
+      Con.DPrint('WebSocketDriver._OnConnectionServer.disconnect: client disconnected\n');
+      sock.state = QSocket.STATE_DISCONNECTED;
+      eventBus.publish('net.connection.close', sock);
+    });
+
+    ws.on('error', () => {
+      Con.DPrint('WebSocketDriver._OnConnectionServer.disconnect: client errored out\n');
+      sock.state = QSocket.STATE_DISCONNECTED;
+      eventBus.publish('net.connection.error', sock);
+    });
+
+    ws.on('message', (data: NodeRawData) => {
+      const socketState = getWebSocketState(sock);
+
+      if (socketState !== null) {
+        socketState.receiveQueue.push(rawDataToUint8Array(data));
+      }
+    });
+
+    this.newConnections.push(sock);
+    eventBus.publish('net.connection.accepted', sock);
+  }
+
+  CheckNewConnections(): QSocket | null {
+    return this.newConnections.shift() ?? null;
+  }
+
+  ShouldListen(): boolean {
+    return registry.isDedicatedServer && NET.server !== null;
+  }
+
+  Listen(listening: boolean): void {
+    if (this.wss !== null) {
+      if (!listening) {
+        this.wss.close();
+        this.wss = null;
+      }
+
+      return;
+    }
+
+    if (!listening || NET.server === null) {
+      return;
+    }
+
+    const { WebSocket: WebSocketModule } = getCommonRegistry();
+    const nodeWebSocketModule = WebSocketModule as NodeWebSocketModuleLike;
+
+    this.wss = new nodeWebSocketModule.WebSocketServer({ server: NET.server });
+    this.wss.on('connection', this._OnConnectionServer.bind(this));
+    this.newConnections = [];
+  }
+
+  GetListenAddress(): string | null {
+    if (this.wss === null) {
+      return null;
+    }
+
+    const address = this.wss.address();
+
+    if (address === null || typeof address === 'string') {
+      return address;
+    }
+
+    const socketAddress = address as ListenAddress;
+    return formatIP(socketAddress.address, socketAddress.port);
+  }
+}
+
+export class WebRTCDriver extends BaseDriver {
+  creatingSession = false;
+  hostToken: string | null = null;
+  iceServers: RTCIceServer[] = [
+    { urls: 'stun:stun.l.google.com:19302' },
+    { urls: 'stun:stun.cloudflare.com:3478' },
+    { urls: 'stun:stun.nextcloud.com:443' },
+  ];
+  isHost = false;
+  newConnections: QSocket[] = [];
+  peerId: string | null = null;
+  pendingConnections = new Map<string, { peerConnection: RTCPeerConnection; qsocket: QSocket }>();
+  pingInterval: ReturnType<typeof setInterval> | null = null;
+  reconnectTimer: ReturnType<typeof setTimeout> | null = null;
+  serverEventSubscriptions: Array<() => void> = [];
+  sessionId: string | null = null;
+  signalingUrl: string | null = null;
+  signalingWs: WebSocket | null = null;
+
+  constructor() {
+    super('webrtc');
+  }
+
+  Init(): boolean {
+    if (registry.isDedicatedServer) {
+      this.initialized = false;
+      return false;
+    }
+
+    const protocol = location.protocol === 'https:' ? 'wss:' : 'ws:';
+    this.signalingUrl = `${protocol}//${location.hostname}:8787/signaling`;
+
+    if (registry.urls?.signalingURL) {
+      this.signalingUrl = registry.urls.signalingURL;
+    }
+
+    this.initialized = true;
+    Con.DPrint(`WebRTCDriver: Initialized with signaling at ${this.signalingUrl}\n`);
+    return true;
+  }
+
+  canHandle(host: string): boolean {
+    return /^webrtc:\/\//i.test(host) || host === 'host';
+  }
+
+  Connect(host: string): QSocket | null {
+    if (!/^webrtc:\/\//i.test(host)) {
+      return null;
+    }
+
+    let sessionId: string | null = null;
+    let shouldCreateSession = false;
+
+    if (host.startsWith('webrtc://')) {
+      host = host.substring(9);
+    }
+
+    if (host === 'host' || host === '') {
+      shouldCreateSession = true;
+    } else {
+      sessionId = host;
+    }
+
+    if (!this._ConnectSignaling()) {
+      Con.PrintError('WebRTCDriver.Connect: Failed to connect to signaling server\n');
+      return null;
+    }
+
+    const sock = NET.NewQSocket(this);
+    sock.state = QSocket.STATE_CONNECTING;
+    sock.address = shouldCreateSession ? 'WebRTC Host' : `WebRTC Session ${sessionId}`;
+    sock.transportState = createWebRTCSocketState({ sessionId, isHost: shouldCreateSession });
+
+    const onSignalingReady = () => {
+      if (shouldCreateSession) {
+        this._CreateSession(sock);
+      } else {
+        this._JoinSession(sock, sessionId);
+      }
+    };
+
+    if (this.signalingWs !== null && this.signalingWs.readyState === 1) {
+      onSignalingReady();
+    } else {
+      const socketState = getWebRTCSocketState(sock);
+
+      if (socketState !== null) {
+        socketState.onSignalingReady = onSignalingReady;
+      }
+    }
+
+    return sock;
+  }
+
+  _ConnectSignaling(): boolean {
+    if (this.signalingWs !== null) {
+      if (this.signalingWs.readyState === 1 || this.signalingWs.readyState === 0) {
+        return true;
+      }
+    }
+
+    if (this.reconnectTimer !== null) {
+      clearTimeout(this.reconnectTimer);
+      this.reconnectTimer = null;
+    }
+
+    try {
+      this.signalingWs = new WebSocket(this.signalingUrl ?? '');
+
+      this.signalingWs.onopen = () => {
+        Con.DPrint(`WebRTCDriver: Connected to signaling server at ${this.signalingUrl}\n`);
+        const previousSessionId = this.sessionId;
+        this._ProcessPendingSignaling();
+
+        if (previousSessionId !== null && previousSessionId === this.sessionId) {
+          this._RestoreSession();
+        }
+      };
+
+      this.signalingWs.onmessage = async (event: MessageEvent<string>) => {
+        if (typeof event.data !== 'string') {
+          return;
+        }
+
+        await this._OnSignalingMessage(JSON.parse(event.data) as SignalingMessage);
+      };
+
+      this.signalingWs.onerror = (errorEvent: Event) => {
+        console.debug('WebRTCDriver: Signaling WebSocket error', errorEvent);
+        Con.DPrint(`WebRTCDriver: Signaling error: ${errorEvent}\n`);
+        this._OnSignalingError({ error: 'Signaling connection error', type: 'error' });
+      };
+
+      this.signalingWs.onclose = (closeEvent: CloseEvent) => {
+        Con.DPrint('WebRTCDriver: Signaling connection closed\n');
+        this.signalingWs = null;
+
+        if (closeEvent.code !== 1000) {
+          Con.PrintError(`Signaling connection closed unexpectedly, ${closeEvent.reason || 'unknown reason'} (code: ${closeEvent.code})\n`);
+          Con.PrintWarning(`Signaling server at ${this.signalingUrl} might be unavailable.\n`);
+        }
+
+        this._OnSignalingError({ error: 'Signaling connection closed', type: 'error' });
+        this._ScheduleReconnect();
+      };
+
+      return true;
+    } catch (error) {
+      Con.PrintError(`WebRTCDriver: Failed to connect to signaling at ${this.signalingUrl}:\n${getErrorMessage(error as Throwable)}\n`);
+      this._ScheduleReconnect();
+      return false;
+    }
+  }
+
+  _ScheduleReconnect(): void {
+    if (this.reconnectTimer !== null) {
+      return;
+    }
+
+    const delay = 5000;
+    Con.DPrint(`WebRTCDriver: Scheduling reconnect in ${delay}ms...\n`);
+
+    this.reconnectTimer = setTimeout(() => {
+      this.reconnectTimer = null;
+      Con.DPrint('WebRTCDriver: Attempting to reconnect...\n');
+      this._ConnectSignaling();
+    }, delay);
+  }
+
+  _RestoreSession(): void {
+    if (this.isHost) {
+      Con.DPrint('WebRTCDriver: Restoring host session...\n');
+      this._SendSignaling({
+        type: 'create-session',
+        sessionId: this.sessionId ?? undefined,
+        hostToken: this.hostToken ?? undefined,
+        serverInfo: this._GatherServerInfo(),
+        isPublic: this._IsSessionPublic(),
+      });
+      return;
+    }
+
+    Con.DPrint(`WebRTCDriver: Restoring client session ${this.sessionId}\n`);
+    this._SendSignaling({
+      type: 'join-session',
+      sessionId: this.sessionId ?? undefined,
+    });
+  }
+
+  _ProcessPendingSignaling(): void {
+    for (const sock of NET.activeSockets) {
+      const socketData = sock === undefined ? null : getWebRTCSocketState(sock);
+
+      if (sock !== undefined && sock.driver === this && socketData?.onSignalingReady !== undefined) {
+        socketData.onSignalingReady();
+        socketData.onSignalingReady = undefined;
+      }
+    }
+  }
+
+  _SendSignaling(message: SignalingMessage): void {
+    if (this.signalingWs !== null && this.signalingWs.readyState === 1) {
+      this.signalingWs.send(JSON.stringify(message));
+    }
+  }
+
+  _StartPingInterval(): void {
+    if (!this.isHost) {
+      return;
+    }
+
+    this._StopPingInterval();
+    this.pingInterval = setInterval(() => {
+      this._SendSignaling({ type: 'ping' });
+    }, 30 * 1000);
+    this._SendSignaling({ type: 'ping' });
+  }
+
+  _StopPingInterval(): void {
+    if (this.pingInterval !== null) {
+      clearInterval(this.pingInterval);
+      this.pingInterval = null;
+    }
+  }
+
+  _StartServerInfoSubscriptions(): void {
+    if (!this.isHost) {
+      return;
+    }
+
+    this._StopServerInfoSubscriptions();
+    this.serverEventSubscriptions.push(eventBus.subscribe('server.spawned', () => this._UpdateServerInfo()));
+    this.serverEventSubscriptions.push(eventBus.subscribe('server.client.connected', () => this._UpdateServerInfo()));
+    this.serverEventSubscriptions.push(eventBus.subscribe('server.client.disconnected', () => this._UpdateServerInfo()));
+    this.serverEventSubscriptions.push(eventBus.subscribe('cvar.changed', (cvarName: string) => {
+      const cvar = Cvar.FindVar(cvarName);
+
+      if (cvar !== null && (cvar.flags & Cvar.FLAG.SERVER) !== 0) {
+        this._UpdateServerInfo();
+      }
+    }));
+    this._UpdateServerInfo();
+  }
+
+  _StopServerInfoSubscriptions(): void {
+    while (this.serverEventSubscriptions.length > 0) {
+      const unsubscribe = this.serverEventSubscriptions.pop();
+
+      if (unsubscribe !== undefined) {
+        unsubscribe();
+      }
+    }
+  }
+
+  _UpdateServerInfo(): void {
+    if (!this.isHost || this.sessionId === null) {
+      return;
+    }
+
+    this._SendSignaling({
+      type: 'update-server-info',
+      serverInfo: this._GatherServerInfo(),
+      isPublic: this._IsSessionPublic(),
+    });
+  }
+
+  _GatherServerInfo(): ServerInfo {
+    const serverInfo: ServerInfo = {
+      hostname: Cvar.FindVar('hostname')?.string ?? 'UNNAMED',
+      maxPlayers: SV.svs.maxclients,
+      currentPlayers: NET.activeconnections,
+      map: SV.server.mapname,
+      mod: COM.game,
+      settings: {},
+    };
+
+    for (const cvar of Cvar.Filter((cvar: Cvar) => (cvar.flags & Cvar.FLAG.SERVER) !== 0)) {
+      serverInfo.settings[cvar.name] = cvar.string;
+    }
+
+    return serverInfo;
+  }
+
+  _IsSessionPublic(): boolean {
+    return (Cvar.FindVar('sv_public')?.value ?? 0) !== 0;
+  }
+
+  _CreateSession(sock: QSocket): void {
+    this._SendSignaling({ type: 'create-session' });
+    const socketState = getWebRTCSocketState(sock);
+
+    if (socketState !== null) {
+      socketState.isHost = true;
+    }
+
+    this.isHost = true;
+  }
+
+  _JoinSession(sock: QSocket, sessionId: string | null): void {
+    this._SendSignaling({
+      type: 'join-session',
+      sessionId: sessionId ?? undefined,
+    });
+    const socketState = getWebRTCSocketState(sock);
+
+    if (socketState !== null) {
+      socketState.sessionId = sessionId;
+    }
+
+    this.sessionId = sessionId;
+  }
+
+  async _OnSignalingMessage(message: SignalingMessage): Promise<void> {
+    switch (message.type) {
+      case 'session-created':
+        this._OnSessionCreated(message);
+        return;
+      case 'session-joined':
+        this._OnSessionJoined(message);
+        return;
+      case 'peer-joined':
+        this._OnPeerJoined(message);
+        return;
+      case 'peer-left':
+        this._OnPeerLeft(message);
+        return;
+      case 'offer':
+        await this._OnOffer(message);
+        return;
+      case 'answer':
+        await this._OnAnswer(message);
+        return;
+      case 'ice-candidate':
+        await this._OnIceCandidate(message);
+        return;
+      case 'session-closed':
+        this._OnSessionClosed(message);
+        return;
+      case 'pong':
+        return;
+      case 'error':
+        Con.DPrint(`WebRTCDriver: Signaling error: ${message.error}\n`);
+        this._OnSignalingError(message);
+        return;
+      default:
+        Con.DPrint(`WebRTCDriver: Unknown signaling message: ${message.type}\n`);
+    }
+  }
+
+  _OnSignalingError(message: SignalingMessage): void {
+    let failedSocket: QSocket | null = null;
+
+    for (const sock of NET.activeSockets) {
+      if (sock !== undefined && sock.driver === this && sock.state === QSocket.STATE_CONNECTING) {
+        const socketData = getWebRTCSocketState(sock);
+
+        if (socketData !== null) {
+          if (socketData.sessionId && (message.error ?? '').includes(socketData.sessionId)) {
+            failedSocket = sock;
+            break;
+          }
+
+          if (socketData.isHost && (message.error ?? '').includes('already exists')) {
+            failedSocket = sock;
+            break;
+          }
+        }
+
+        if (failedSocket === null) {
+          failedSocket = sock;
+        }
+      }
+    }
+
+    if (failedSocket !== null) {
+      Con.PrintError(`WebRTCDriver: Connection failed - ${message.error}\n`);
+      failedSocket.state = QSocket.STATE_DISCONNECTED;
+
+      const webRtcData = getWebRTCSocketState(failedSocket);
+
+      if (webRtcData !== null && webRtcData.sessionId === this.sessionId) {
+        this.sessionId = null;
+        this.peerId = null;
+        this.hostToken = null;
+        this.isHost = false;
+      }
+
+      return;
+    }
+
+    Con.PrintWarning(`WebRTCDriver: Signaling error (no matching socket): ${message.error}\n`);
+  }
+
+  _OnSessionCreated(message: SignalingMessage): void {
+    this.sessionId = message.sessionId ?? null;
+    this.peerId = message.peerId ?? null;
+    this.isHost = message.isHost ?? false;
+    this.hostToken = message.hostToken ?? null;
+    this.creatingSession = false;
+
+    Con.DPrint(`WebRTCDriver: Session created: ${this.sessionId}\n`);
+    Con.DPrint(`WebRTCDriver: Your peer ID: ${this.peerId}\n`);
+
+    let sock: QSocket | null = null;
+
+    for (const activeSocket of NET.activeSockets) {
+      const socketData = activeSocket === undefined ? null : getWebRTCSocketState(activeSocket);
+
+      if (activeSocket !== undefined && activeSocket.driver === this && socketData !== null && socketData.isHost) {
+        sock = activeSocket;
+        break;
+      }
+    }
+
+    if (sock === null) {
+      sock = this._FindSocketBySession(this.sessionId);
+    }
+
+    const socketData = sock === null ? null : getWebRTCSocketState(sock);
+
+    if (sock !== null && socketData !== null) {
+      socketData.sessionId = this.sessionId;
+      sock.state = QSocket.STATE_CONNECTED;
+      sock.address = `WebRTC Host (${this.sessionId})`;
+      Con.DPrint('WebRTCDriver: Host socket ready for accepting peers\n');
+      this._StartPingInterval();
+      this._StartServerInfoSubscriptions();
+
+      if (message.existingPeers !== undefined && message.existingPeers.length > 0) {
+        Con.DPrint(`WebRTCDriver: Reconnecting to ${message.existingPeers.length} existing peers...\n`);
+
+        for (const peerId of message.existingPeers) {
+          this._OnPeerJoined({ type: 'peer-joined', peerId });
+        }
+      }
+
+      return;
+    }
+
+    Con.PrintWarning(`WebRTCDriver: No socket found for session ${this.sessionId}\n`);
+  }
+
+  _OnSessionJoined(message: SignalingMessage): void {
+    this.sessionId = message.sessionId ?? null;
+    this.peerId = message.peerId ?? null;
+    this.isHost = message.isHost ?? false;
+
+    Con.DPrint(`WebRTCDriver: Joined session: ${this.sessionId}\n`);
+    Con.DPrint(`WebRTCDriver: Your peer ID: ${this.peerId}\n`);
+    Con.DPrint(`WebRTCDriver: Peers in session: ${message.peerCount}\n`);
+
+    const sock = this._FindSocketBySession(this.sessionId);
+
+    if (sock !== null) {
+      sock.address = `WebRTC Peer (${this.sessionId})`;
+      Con.DPrint('WebRTCDriver: Socket found, waiting for P2P connection\n');
+      return;
+    }
+
+    Con.PrintWarning(`WebRTCDriver: No socket found for joined session ${this.sessionId}\n`);
+  }
+
+  _OnPeerJoined(message: SignalingMessage): void {
+    if (message.peerId === undefined) {
+      return;
+    }
+
+    Con.DPrint(`WebRTCDriver: Peer ${message.peerId} joined\n`);
+
+    if (this.isHost) {
+      const peerSock = NET.NewQSocket(this);
+      peerSock.state = QSocket.STATE_CONNECTING;
+      peerSock.address = `WebRTC Peer ${message.peerId}`;
+      peerSock.transportState = createWebRTCSocketState({
+        sessionId: this.sessionId,
+        isHost: false,
+        peerId: message.peerId,
+      });
+
+      this._CreatePeerConnection(peerSock, message.peerId, true);
+      this.newConnections.push(peerSock);
+      Con.DPrint(`WebRTCDriver: Created socket for peer ${message.peerId}, added to new connections\n`);
+    }
+  }
+
+  _OnPeerLeft(message: SignalingMessage): void {
+    if (message.peerId !== undefined) {
+      Con.DPrint(`WebRTCDriver: Peer ${message.peerId} left\n`);
+      this._ClosePeerConnection(message.peerId);
+    }
+  }
+
+  async _OnOffer(message: SignalingMessage): Promise<void> {
+    if (message.fromPeerId === undefined || message.offer === undefined || message.offer === null) {
+      return;
+    }
+
+    Con.DPrint(`WebRTCDriver: Received offer from ${message.fromPeerId}\n`);
+
+    const sock = this._FindSocketBySession(this.sessionId);
+
+    if (sock === null) {
+      Con.PrintWarning('WebRTCDriver._OnOffer: No socket found for session\n');
+      return;
+    }
+
+    const peerConnection = this._CreatePeerConnection(sock, message.fromPeerId, false);
+
+    if (peerConnection === null) {
+      return;
+    }
+
+    try {
+      await peerConnection.setRemoteDescription(new RTCSessionDescription(message.offer));
+      const answer = await peerConnection.createAnswer();
+      await peerConnection.setLocalDescription(answer);
+      this._SendSignaling({
+        type: 'answer',
+        targetPeerId: message.fromPeerId,
+        answer: peerConnection.localDescription,
+      });
+    } catch (error) {
+      Con.PrintError(`WebRTCDriver: Error handling offer: ${getErrorMessage(error as Throwable)}\n`);
+    }
+  }
+
+  async _OnAnswer(message: SignalingMessage): Promise<void> {
+    if (message.fromPeerId === undefined || message.answer === undefined || message.answer === null) {
+      return;
+    }
+
+    Con.DPrint(`WebRTCDriver: Received answer from ${message.fromPeerId}\n`);
+
+    const sock = this.isHost ? this._FindSocketByPeerId(message.fromPeerId) : this._FindSocketBySession(this.sessionId);
+
+    const socketData = sock === null ? null : getWebRTCSocketState(sock);
+
+    if (sock === null || socketData === null) {
+      Con.PrintWarning(`WebRTCDriver._OnAnswer: No socket found for ${message.fromPeerId}\n`);
+      return;
+    }
+
+    const peerConnection = socketData.peerConnections.get(message.fromPeerId);
+
+    if (peerConnection === undefined) {
+      Con.PrintWarning(`WebRTCDriver: No peer connection found for ${message.fromPeerId}\n`);
+      return;
+    }
+
+    try {
+      await peerConnection.setRemoteDescription(new RTCSessionDescription(message.answer));
+      Con.DPrint(`WebRTCDriver: Answer processed for ${message.fromPeerId}\n`);
+    } catch (error) {
+      Con.PrintError(`WebRTCDriver: Error handling answer: ${getErrorMessage(error as Throwable)}\n`);
+    }
+  }
+
+  async _OnIceCandidate(message: SignalingMessage): Promise<void> {
+    if (message.fromPeerId === undefined) {
+      return;
+    }
+
+    const sock = this.isHost ? this._FindSocketByPeerId(message.fromPeerId) : this._FindSocketBySession(this.sessionId);
+
+    const socketData = sock === null ? null : getWebRTCSocketState(sock);
+
+    if (sock === null || socketData === null) {
+      return;
+    }
+
+    const peerConnection = socketData.peerConnections.get(message.fromPeerId);
+
+    if (peerConnection === undefined) {
+      return;
+    }
+
+    try {
+      if (message.candidate) {
+        await peerConnection.addIceCandidate(new RTCIceCandidate(message.candidate));
+      }
+    } catch (error) {
+      Con.DPrint(`WebRTCDriver: Error adding ICE candidate: ${getErrorMessage(error as Throwable)}\n`);
+    }
+  }
+
+  _OnSessionClosed(message: SignalingMessage): void {
+    Con.DPrint(`WebRTCDriver: Session closed: ${message.reason}\n`);
+
+    const sock = this._FindSocketBySession(this.sessionId);
+
+    if (sock !== null) {
+      sock.state = QSocket.STATE_DISCONNECTED;
+    }
+
+    this.sessionId = null;
+    this.peerId = null;
+    this.isHost = false;
+  }
+
+  _CreatePeerConnection(sock: QSocket, peerId: string, initiator: boolean): RTCPeerConnection | null {
+    console.assert(sock.transportState?.kind === 'webrtc', 'WebRTCDriver._CreatePeerConnection: Invalid socket');
+
+    const socketData = getWebRTCSocketState(sock);
+
+    if (socketData === null) {
+      Con.PrintError('WebRTCDriver._CreatePeerConnection: No socket provided\n');
+      return null;
+    }
+
+    if (socketData.peerConnections.has(peerId)) {
+      return socketData.peerConnections.get(peerId) ?? null;
+    }
+
+    Con.DPrint(`WebRTCDriver: Creating peer connection to ${peerId} (initiator: ${initiator})\n`);
+
+    const peerConnection = new RTCPeerConnection({ iceServers: this.iceServers });
+    socketData.peerConnections.set(peerId, peerConnection);
+
+    peerConnection.onicecandidate = (event) => {
+      if (event.candidate) {
+        Con.DPrint(`WebRTCDriver: Sending ICE candidate to ${peerId}\n`);
+        this._SendSignaling({
+          type: 'ice-candidate',
+          targetPeerId: peerId,
+          candidate: event.candidate,
+        });
+        return;
+      }
+
+      Con.DPrint(`WebRTCDriver: ICE gathering complete for ${peerId}\n`);
+    };
+
+    peerConnection.oniceconnectionstatechange = () => {
+      Con.DPrint(`WebRTCDriver: ICE state with ${peerId}: ${peerConnection.iceConnectionState}\n`);
+    };
+
+    peerConnection.onconnectionstatechange = () => {
+      Con.DPrint(`WebRTCDriver: Connection state with ${peerId}: ${peerConnection.connectionState}\n`);
+
+      if (peerConnection.connectionState === 'connected') {
+        Con.DPrint(`WebRTCDriver: P2P connection established with ${peerId}\n`);
+      } else if (peerConnection.connectionState === 'failed' || peerConnection.connectionState === 'disconnected') {
+        Con.DPrint(`WebRTCDriver: Connection ${peerConnection.connectionState} with ${peerId}\n`);
+        this._ClosePeerConnection(peerId);
+      }
+    };
+
+    if (initiator) {
+      const reliableChannel = peerConnection.createDataChannel('reliable', { ordered: true });
+      const unreliableChannel = peerConnection.createDataChannel('unreliable', { ordered: false, maxRetransmits: 10 });
+      this._SetupDataChannel(sock, peerId, reliableChannel, unreliableChannel);
+
+      void peerConnection.createOffer()
+        .then((offer) => peerConnection.setLocalDescription(offer))
+        .then(() => {
+          this._SendSignaling({
+            type: 'offer',
+            targetPeerId: peerId,
+            offer: peerConnection.localDescription,
+          });
+        })
+        .catch((error) => {
+          Con.PrintError(`WebRTCDriver: Error creating offer: ${getErrorMessage(error)}\n`);
+        });
+    } else {
+      peerConnection.ondatachannel = (event) => {
+        const liveSocketData = getWebRTCSocketState(sock);
+
+        if (liveSocketData === null) {
+          return;
+        }
+
+        const channel = event.channel;
+
+        if (!liveSocketData.dataChannels.has(peerId)) {
+          liveSocketData.dataChannels.set(peerId, {});
+        }
+
+        const channels = liveSocketData.dataChannels.get(peerId);
+
+        if (channels === undefined) {
+          return;
+        }
+
+        if (channel.label === 'reliable') {
+          channels.reliable = channel;
+          this._SetupDataChannelHandlers(sock, peerId, channel);
+        } else if (channel.label === 'unreliable') {
+          channels.unreliable = channel;
+          this._SetupDataChannelHandlers(sock, peerId, channel);
+        }
+      };
+    }
+
+    return peerConnection;
+  }
+
+  _SetupDataChannel(sock: QSocket, peerId: string, reliableChannel: RTCDataChannel, unreliableChannel: RTCDataChannel): void {
+    const socketData = getWebRTCSocketState(sock);
+
+    if (socketData === null) {
+      return;
+    }
+
+    socketData.dataChannels.set(peerId, {
+      reliable: reliableChannel,
+      unreliable: unreliableChannel,
+    });
+
+    this._SetupDataChannelHandlers(sock, peerId, reliableChannel);
+    this._SetupDataChannelHandlers(sock, peerId, unreliableChannel);
+  }
+
+  _SetupDataChannelHandlers(sock: QSocket, peerId: string, channel: RTCDataChannel): void {
+    channel.binaryType = 'arraybuffer';
+
+    channel.onopen = () => {
+      Con.DPrint(`WebRTCDriver: Data channel ${channel.label} opened with ${peerId}\n`);
+
+      if (channel.label === 'reliable' && sock.state !== QSocket.STATE_CONNECTED) {
+        sock.state = QSocket.STATE_CONNECTED;
+        Con.DPrint('WebRTCDriver: Socket now CONNECTED (can send/receive data)\n');
+      }
+
+      this._FlushSendBuffer(sock);
+    };
+
+    channel.onclose = () => {
+      Con.DPrint(`WebRTCDriver: Data channel ${channel.label} closed with ${peerId}\n`);
+      sock.state = QSocket.STATE_DISCONNECTED;
+    };
+
+    channel.onerror = (error) => {
+      Con.PrintError(`WebRTCDriver: Data channel error with ${peerId}: ${error}\n`);
+      sock.state = QSocket.STATE_DISCONNECTED;
+    };
+
+    channel.onmessage = (event) => {
+      const socketState = getWebRTCSocketState(sock);
+
+      if (socketState !== null) {
+        socketState.receiveQueue.push(new Uint8Array(event.data));
+      }
+    };
+  }
+
+  _ClosePeerConnection(peerId: string): void {
+    const sock = this.isHost ? this._FindSocketByPeerId(peerId) : this._FindSocketBySession(this.sessionId);
+
+    const socketData = sock === null ? null : getWebRTCSocketState(sock);
+
+    if (sock === null || socketData === null) {
+      Con.DPrint(`WebRTCDriver._ClosePeerConnection: No socket found for ${peerId}\n`);
+      return;
+    }
+
+    sock.state = QSocket.STATE_DISCONNECTING;
+
+    const peerConnection = socketData.peerConnections.get(peerId);
+
+    if (peerConnection !== undefined) {
+      peerConnection.close();
+      socketData.peerConnections.delete(peerId);
+    }
+
+    socketData.dataChannels.delete(peerId);
+    sock.state = QSocket.STATE_DISCONNECTED;
+  }
+
+  _FindSocketBySession(sessionId: string | null): QSocket | null {
+    for (const sock of NET.activeSockets) {
+      const socketData = sock === undefined ? null : getWebRTCSocketState(sock);
+
+      if (sock !== undefined && sock.driver === this && socketData !== null && socketData.sessionId === sessionId) {
+        return sock;
+      }
+    }
+
+    return null;
+  }
+
+  _FindSocketByPeerId(peerId: string): QSocket | null {
+    for (const sock of NET.activeSockets) {
+      const socketData = sock === undefined ? null : getWebRTCSocketState(sock);
+
+      if (sock !== undefined && sock.driver === this && socketData !== null && socketData.peerId === peerId) {
+        return sock;
+      }
+    }
+
+    return null;
+  }
+
+  CheckNewConnections(): QSocket | null {
+    const sock = this.newConnections.shift() ?? null;
+
+    if (sock !== null) {
+      Con.DPrint(`WebRTCDriver.CheckNewConnections: returning new connection ${sock.address}\n`);
+    }
+
+    return sock;
+  }
+
+  _FlushSendBuffer(qsocket: QSocket): void {
+    const webRtcData = getWebRTCSocketState(qsocket);
+
+    if (webRtcData === null) {
+      return;
+    }
+
+    const queue = webRtcData.sendQueue;
+
+    while (queue.length > 0) {
+      const message = queue[0];
+      let canSendThis = false;
+
+      for (const channels of webRtcData.dataChannels.values()) {
+        const channel = message.reliable ? channels.reliable : channels.unreliable;
+
+        if (channel !== undefined && channel.readyState === 'open') {
+          canSendThis = true;
+          break;
+        }
+      }
+
+      if (!canSendThis) {
+        break;
+      }
+
+      const result = this._SendToAllPeers(qsocket, message.buffer, message.reliable);
+
+      if (result > 0) {
+        queue.shift();
+      } else {
+        break;
+      }
+    }
+
+    if (queue.length === 0 && qsocket.state === QSocket.STATE_DISCONNECTING) {
+      Con.DPrint(`WebRTCDriver._FlushSendBuffer: buffer drained, closing ${qsocket.address}\n`);
+      this._ForceClose(qsocket);
+    }
+  }
+
+  GetMessage(qsocket: QSocket): number {
+    const socketData = getWebRTCSocketState(qsocket);
+
+    if (socketData === null) {
+      return qsocket.state === QSocket.STATE_DISCONNECTED ? -1 : 0;
+    }
+
+    const { receiveQueue } = socketData;
+
+    if (receiveQueue.length === 0) {
+      if (qsocket.state === QSocket.STATE_DISCONNECTED) {
+        return -1;
+      }
+
+      if (qsocket.state === QSocket.STATE_DISCONNECTING) {
+        qsocket.state = QSocket.STATE_DISCONNECTED;
+        return -1;
+      }
+
+      return 0;
+    }
+
+    const message = receiveQueue.shift();
+
+    if (message === undefined) {
+      return 0;
+    }
+
+    const type = message[0];
+    const length = message[1] + (message[2] << 8);
+    new Uint8Array(NET.message.data).set(message.subarray(3, length + 3));
+    NET.message.cursize = length;
+
+    return type;
+  }
+
+  SendMessage(qsocket: QSocket, data: NetworkPayload): number {
+    const socketData = getWebRTCSocketState(qsocket);
+
+    if (socketData === null) {
+      return -1;
+    }
+
+    const buffer = new Uint8Array(data.cursize + 3);
+    buffer[0] = 1;
+    buffer[1] = data.cursize & 0xff;
+    buffer[2] = (data.cursize >> 8) & 0xff;
+    buffer.set(new Uint8Array(data.data, 0, data.cursize), 3);
+    socketData.sendQueue.push({ buffer, reliable: true });
+    this._FlushSendBuffer(qsocket);
+    return 1;
+  }
+
+  SendUnreliableMessage(qsocket: QSocket, data: NetworkPayload): number {
+    const socketData = getWebRTCSocketState(qsocket);
+
+    if (socketData === null) {
+      return -1;
+    }
+
+    const buffer = new Uint8Array(data.cursize + 3);
+    buffer[0] = 2;
+    buffer[1] = data.cursize & 0xff;
+    buffer[2] = (data.cursize >> 8) & 0xff;
+    buffer.set(new Uint8Array(data.data, 0, data.cursize), 3);
+    socketData.sendQueue.push({ buffer, reliable: false });
+    this._FlushSendBuffer(qsocket);
+    return 1;
+  }
+
+  _SendToAllPeers(qsocket: QSocket, buffer: Uint8Array, reliable: boolean): number {
+    console.assert(qsocket.transportState?.kind === 'webrtc', 'WebRTCDriver._SendToAllPeers: Invalid socket');
+
+    const socketData = getWebRTCSocketState(qsocket);
+
+    if (socketData === null) {
+      Con.PrintError('WebRTCDriver._SendToAllPeers: missing WebRTC transport state\n');
+      return -1;
+    }
+
+    let sentCount = 0;
+
+    for (const [peerId, channels] of socketData.dataChannels) {
+      const channel = reliable ? channels.reliable : channels.unreliable;
+
+      if (channel === undefined || channel.readyState !== 'open') {
+        Con.DPrint(`WebRTCDriver._SendToAllPeers: channel to ${peerId} not open (state=${channel?.readyState})\n`);
+        continue;
+      }
+
+      try {
+        channel.send(toArrayBuffer(buffer));
+        sentCount++;
+      } catch (error) {
+        Con.DPrint(`WebRTCDriver: Error sending to ${peerId}: ${getErrorMessage(error as Throwable)}\n`);
+      }
+    }
+
+    if (sentCount === 0) {
+      Con.DPrint('WebRTCDriver._SendToAllPeers: no peers available to send to\n');
+    }
+
+    return sentCount > 0 ? 1 : -1;
+  }
+
+  CanSendMessage(qsocket: QSocket): boolean {
+    const socketData = getWebRTCSocketState(qsocket);
+
+    if (socketData === null) {
+      return false;
+    }
+
+    for (const channels of socketData.dataChannels.values()) {
+      if (channels.reliable !== undefined && channels.reliable.readyState === 'open') {
+        return true;
+      }
+    }
+
+    return false;
+  }
+
+  Close(qsocket: QSocket): void {
+    const socketData = getWebRTCSocketState(qsocket);
+
+    if (socketData === null) {
+      qsocket.state = QSocket.STATE_DISCONNECTED;
+      return;
+    }
+
+    this._FlushSendBuffer(qsocket);
+
+    if (socketData.sendQueue.length > 0 && qsocket.state !== QSocket.STATE_DISCONNECTED) {
+      if (socketData.dataChannels.size > 0) {
+        Con.DPrint(`WebRTCDriver.Close: delaying close for ${qsocket.address} to flush buffer\n`);
+        qsocket.state = QSocket.STATE_DISCONNECTING;
+
+        setTimeout(() => {
+          if (qsocket.state === QSocket.STATE_DISCONNECTING) {
+            Con.DPrint(`WebRTCDriver.Close: timeout waiting for flush, forcing close for ${qsocket.address}\n`);
+            this._ForceClose(qsocket);
+          }
+        }, 5000);
+
+        return;
+      }
+    }
+
+    this._ForceClose(qsocket);
+  }
+
+  _ForceClose(qsocket: QSocket): void {
+    const socketData = getWebRTCSocketState(qsocket);
+
+    if (socketData === null) {
+      qsocket.state = QSocket.STATE_DISCONNECTED;
+      return;
+    }
+
+    for (const peerConnection of socketData.peerConnections.values()) {
+      peerConnection.close();
+    }
+
+    socketData.peerConnections.clear();
+    socketData.dataChannels.clear();
+
+    const isSessionSocket = socketData.isHost || (!this.isHost && socketData.sessionId === this.sessionId);
+
+    if (socketData.isHost) {
+      this._StopPingInterval();
+      this._StopServerInfoSubscriptions();
+    }
+
+    if (isSessionSocket && this.sessionId !== null) {
+      this._SendSignaling({ type: 'leave-session' });
+    }
+
+    if (isSessionSocket) {
+      if (!(this.isHost && !socketData.isHost)) {
+        this.sessionId = null;
+        this.peerId = null;
+        this.hostToken = null;
+        this.isHost = false;
+      }
+    }
+
+    qsocket.state = QSocket.STATE_DISCONNECTED;
+  }
+
+  ShouldListen(): boolean {
+    return !registry.isDedicatedServer;
+  }
+
+  Listen(listening: boolean): void {
+    if (!this.ShouldListen()) {
+      return;
+    }
+
+    if (listening) {
+      if (this.sessionId !== null || this.creatingSession) {
+        Con.DPrint('WebRTCDriver: Already hosting or creating a session\n');
+        return;
+      }
+
+      Con.DPrint('WebRTCDriver: Starting WebRTC host session for listen server\n');
+      this.creatingSession = true;
+
+      if (!this._ConnectSignaling()) {
+        Con.PrintWarning('WebRTCDriver: Failed to connect to signaling server\n');
+        this.creatingSession = false;
+        return;
+      }
+
+      const sock = NET.NewQSocket(this);
+      sock.state = QSocket.STATE_CONNECTING;
+      sock.address = 'WebRTC Host';
+      sock.transportState = createWebRTCSocketState({ sessionId: null, isHost: true });
+
+      const createSessionWhenReady = () => {
+        this._SendSignaling({
+          type: 'create-session',
+          serverInfo: this._GatherServerInfo(),
+          isPublic: this._IsSessionPublic(),
+        });
+        Con.DPrint('WebRTCDriver: Session creation request sent\n');
+      };
+
+      if (this.signalingWs !== null && this.signalingWs.readyState === 1) {
+        createSessionWhenReady();
+      } else {
+        const socketState = getWebRTCSocketState(sock);
+
+        if (socketState !== null) {
+          socketState.onSignalingReady = createSessionWhenReady;
+        }
+      }
+
+      this.isHost = true;
+      Con.DPrint('WebRTCDriver: Waiting for signaling connection to create session...\n');
+      return;
+    }
+
+    Con.DPrint('WebRTCDriver: Stopping listen server, tearing down session\n');
+    this._StopPingInterval();
+    this._StopServerInfoSubscriptions();
+
+    for (let index = NET.activeSockets.length - 1; index >= 0; index--) {
+      const sock = NET.activeSockets[index];
+      const socketData = sock === undefined ? null : getWebRTCSocketState(sock);
+
+      if (sock !== undefined && sock.driver === this && socketData !== null) {
+        for (const peerConnection of socketData.peerConnections.values()) {
+          peerConnection.close();
+        }
+
+        socketData.peerConnections.clear();
+        socketData.dataChannels.clear();
+        sock.state = QSocket.STATE_DISCONNECTED;
+      }
+    }
+
+    if (this.sessionId !== null) {
+      this._SendSignaling({ type: 'leave-session' });
+    }
+
+    if (this.signalingWs !== null) {
+      this.signalingWs.onclose = null;
+      this.signalingWs.onerror = null;
+      this.signalingWs.onmessage = null;
+      this.signalingWs.onopen = null;
+      this.signalingWs.close();
+      this.signalingWs = null;
+    }
+
+    if (this.reconnectTimer !== null) {
+      clearTimeout(this.reconnectTimer);
+      this.reconnectTimer = null;
+    }
+
+    if (this.sessionId !== null) {
+      Con.DPrint('WebRTCDriver: Session torn down, no longer accepting connections\n');
+    }
+
+    this.sessionId = null;
+    this.peerId = null;
+    this.isHost = false;
+    this.creatingSession = false;
+  }
+
+  GetListenAddress(): string | null {
+    return this.sessionId !== null ? `webrtc://${this.sessionId}` : null;
+  }
+}
diff --git a/source/engine/registry.mjs b/source/engine/registry.mjs
index 47b1723f..bf41c6d2 100644
--- a/source/engine/registry.mjs
+++ b/source/engine/registry.mjs
@@ -4,7 +4,7 @@
 /** @typedef {typeof import('./common/Sys.mjs').default} SysModule */
 /** @typedef {typeof import('./common/Host.mjs').default} HostModule */
 /** @typedef {typeof import('./client/V.mjs').default} VModule */
-/** @typedef {typeof import('./network/Network.mjs').default} NetModule */
+/** @typedef {typeof import('./network/Network').default} NetModule */
 /** @typedef {typeof import('./server/Server.mjs').default} ServerModule */
 /** @typedef {typeof import('./server/Progs.mjs').default} ProgsModule */
 /** @typedef {typeof import('./common/Mod.mjs').default} ModModule */
diff --git a/source/engine/server/Client.mjs b/source/engine/server/Client.mjs
index 289a064e..96d0abf0 100644
--- a/source/engine/server/Client.mjs
+++ b/source/engine/server/Client.mjs
@@ -2,7 +2,7 @@ import { enumHelpers } from '../../shared/Q.ts';
 import { gameCapabilities } from '../../shared/Defs.ts';
 import Vector from '../../shared/Vector.ts';
 import { SzBuffer } from '../network/MSG.ts';
-import { QSocket } from '../network/NetworkDrivers.mjs';
+import { QSocket } from '../network/NetworkDrivers.ts';
 import * as Protocol from '../network/Protocol.ts';
 import { eventBus, registry } from '../registry.mjs';
 import { ServerEntityState } from './Server.mjs';
diff --git a/test/common/console-commands.test.mjs b/test/common/console-commands.test.mjs
new file mode 100644
index 00000000..6e18caf8
--- /dev/null
+++ b/test/common/console-commands.test.mjs
@@ -0,0 +1,145 @@
+import assert from 'node:assert/strict';
+import { describe, test } from 'node:test';
+
+import { InviteCommand } from '../../source/engine/network/ConsoleCommands.ts';
+import { eventBus, registry } from '../../source/engine/registry.mjs';
+
+/**
+ * Temporarily install a global value for the duration of a callback.
+ * @param {string} name
+ * @param {unknown} value
+ * @param {() => Promise<unknown>} callback
+ * @returns {Promise<unknown>} Result of the callback.
+ */
+function withGlobalValue(name, value, callback) {
+  const descriptor = Object.getOwnPropertyDescriptor(globalThis, name);
+
+  Object.defineProperty(globalThis, name, {
+    configurable: true,
+    writable: true,
+    value,
+  });
+
+  try {
+    return Promise.resolve(callback()).finally(() => {
+      if (descriptor === undefined) {
+        delete globalThis[name];
+      } else {
+        Object.defineProperty(globalThis, name, descriptor);
+      }
+    });
+  } catch (error) {
+    if (descriptor === undefined) {
+      delete globalThis[name];
+    } else {
+      Object.defineProperty(globalThis, name, descriptor);
+    }
+
+    throw error;
+  }
+}
+
+/**
+ * Temporarily install mocked networking registry singletons for invite command tests.
+ * @param {{ GetListenAddress: () => string | null }} mockedNet
+ * @param {{ Print: (message: string) => void, PrintWarning: (message: string) => void }} mockedCon
+ * @param {() => Promise<void>} callback
+ * @returns {Promise<void>} Result of the callback.
+ */
+function withInviteRegistry(mockedNet, mockedCon, callback) {
+  const previousCon = registry.Con;
+  const previousNET = registry.NET;
+
+  registry.Con = mockedCon;
+  registry.NET = mockedNet;
+  eventBus.publish('registry.frozen');
+
+  return Promise.resolve(callback()).finally(() => {
+    registry.Con = previousCon;
+    registry.NET = previousNET;
+    eventBus.publish('registry.frozen');
+  });
+}
+
+void describe('InviteCommand', () => {
+  void test('warns when no listen address is available', async () => {
+    const warnings = [];
+    const command = new InviteCommand();
+
+    await withInviteRegistry(
+      { GetListenAddress() { return null; } },
+      { Print() {}, PrintWarning(message) { warnings.push(message); } },
+      async () => {
+        await command.run();
+      },
+    );
+
+    assert.deepEqual(warnings, ['Cannot create invite link, not hosting.\n']);
+  });
+
+  void test('copies a sanitized invite link to the clipboard', async () => {
+    const prints = [];
+    const clipboardWrites = [];
+    const command = new InviteCommand();
+
+    await withInviteRegistry(
+      { GetListenAddress() { return 'webrtc://session-123'; } },
+      { Print(message) { prints.push(message); }, PrintWarning() {} },
+      async () => {
+        await withGlobalValue('location', new URL('https://quake.test/play?exec=autoexec.cfg&map=start&foo=bar'), async () => {
+          await withGlobalValue('navigator', {
+            clipboard: {
+              writeText(text) {
+                clipboardWrites.push(text);
+                return Promise.resolve();
+              },
+            },
+          }, async () => {
+            await withGlobalValue('prompt', () => {
+              throw new Error('prompt should not be called');
+            }, async () => {
+              await command.run();
+            });
+          });
+        });
+      },
+    );
+
+    assert.deepEqual(clipboardWrites, ['https://quake.test/play?foo=bar&connect=webrtc%3A%2F%2Fsession-123']);
+    assert.deepEqual(prints, [
+      'This link has been copied to your clipboard:\nhttps://quake.test/play?foo=bar&connect=webrtc%3A%2F%2Fsession-123\n',
+    ]);
+  });
+
+  void test('falls back to prompt when clipboard write fails', async () => {
+    const prompts = [];
+    const command = new InviteCommand();
+
+    await withInviteRegistry(
+      { GetListenAddress() { return 'webrtc://session-456'; } },
+      { Print() {}, PrintWarning() {} },
+      async () => {
+        await withGlobalValue('location', new URL('https://quake.test/play?map=start'), async () => {
+          await withGlobalValue('navigator', {
+            clipboard: {
+              writeText() {
+                return Promise.reject(new Error('clipboard unavailable'));
+              },
+            },
+          }, async () => {
+            await withGlobalValue('prompt', (message, value) => {
+              prompts.push([message, value]);
+            }, async () => {
+              await command.run();
+            });
+          });
+        });
+      },
+    );
+
+    assert.deepEqual(prompts, [[
+      'Share this link to invite players:',
+      'https://quake.test/play?connect=webrtc%3A%2F%2Fsession-456',
+    ]]);
+  });
+});
diff --git a/test/common/driver-registry.test.mjs b/test/common/driver-registry.test.mjs
new file mode 100644
index 00000000..82153f64
--- /dev/null
+++ b/test/common/driver-registry.test.mjs
@@ -0,0 +1,96 @@
+import assert from 'node:assert/strict';
+import { describe, test } from 'node:test';
+
+import { DriverRegistry } from '../../source/engine/network/DriverRegistry.ts';
+import { BaseDriver } from '../../source/engine/network/NetworkDrivers.ts';
+
+/**
+ * @typedef {object} FakeDriverOptions
+ * @property {boolean} [initialized] Whether the fake driver starts initialized.
+ * @property {string[]} [handleHosts] Addresses the fake driver reports it can handle.
+ */
+
+class FakeDriver extends BaseDriver {
+  /** @type {string[]} */
+  handleHosts = [];
+  initCalls = 0;
+  shutdownCalls = 0;
+
+  /**
+   * @param {string} name
+   * @param {FakeDriverOptions} [options]
+   */
+  constructor(name, options = {}) {
+    super(name);
+    const { initialized = false, handleHosts = [] } = options;
+    this.initialized = initialized;
+    this.handleHosts = handleHosts;
+  }
+
+  Init() {
+    this.initCalls += 1;
+    this.initialized = true;
+    return true;
+  }
+
+  Shutdown() {
+    this.shutdownCalls += 1;
+    this.initialized = false;
+  }
+
+  /**
+   * @param {string} host
+   * @returns {boolean} True when the fake driver accepts the host string.
+   */
+  canHandle(host) {
+    return this.handleHosts.includes(host);
+  }
+}
+
+void describe('DriverRegistry', () => {
+  void test('registers drivers by name and preserves order', () => {
+    const registry = new DriverRegistry();
+    const loop = new FakeDriver('loop');
+    const websocket = new FakeDriver('websocket');
+
+    registry.register('loop', loop);
+    registry.register('websocket', websocket);
+
+    assert.equal(registry.get('loop'), loop);
+    assert.equal(registry.get('websocket'), websocket);
+    assert.deepEqual(registry.orderedDrivers, [loop, websocket]);
+  });
+
+  void test('selects the first initialized driver that can handle an address', () => {
+    const registry = new DriverRegistry();
+    const uninitialized = new FakeDriver('websocket', { initialized: false, handleHosts: ['wss://quake.test'] });
+    const initialized = new FakeDriver('webrtc', { initialized: true, handleHosts: ['wss://quake.test'] });
+
+    registry.register('websocket', uninitialized);
+    registry.register('webrtc', initialized);
+
+    assert.equal(registry.getClientDriver('wss://quake.test'), initialized);
+    assert.equal(registry.getClientDriver('local'), null);
+  });
+
+  void test('initializes and shuts down registered drivers', () => {
+    const registry = new DriverRegistry();
+    const loop = new FakeDriver('loop');
+    const websocket = new FakeDriver('websocket');
+
+    registry.register('loop', loop);
+    registry.register('websocket', websocket);
+
+    registry.initialize();
+
+    assert.equal(loop.initCalls, 1);
+    assert.equal(websocket.initCalls, 1);
+    assert.deepEqual(registry.getInitializedDrivers(), [loop, websocket]);
+
+    registry.shutdown();
+
+    assert.equal(loop.shutdownCalls, 1);
+    assert.equal(websocket.shutdownCalls, 1);
+    assert.deepEqual(registry.getInitializedDrivers(), []);
+  });
+});
diff --git a/test/common/network-drivers.test.mjs b/test/common/network-drivers.test.mjs
new file mode 100644
index 00000000..5a810921
--- /dev/null
+++ b/test/common/network-drivers.test.mjs
@@ -0,0 +1,120 @@
+import assert from 'node:assert/strict';
+import { describe, test } from 'node:test';
+
+import { SzBuffer } from '../../source/engine/network/MSG.ts';
+import NET from '../../source/engine/network/Network.ts';
+import { BaseDriver, LoopDriver, QSocket } from '../../source/engine/network/NetworkDrivers.ts';
+import { eventBus, registry } from '../../source/engine/registry.mjs';
+
+class RecordingDriver extends BaseDriver {
+  calls = [];
+
+  constructor() {
+    super('recording');
+    this.initialized = true;
+  }
+
+  GetMessage(qsocket) {
+    this.calls.push(['GetMessage', qsocket]);
+    return 7;
+  }
+
+  SendMessage(qsocket, data) {
+    this.calls.push(['SendMessage', qsocket, data.cursize]);
+    return 1;
+  }
+
+  SendUnreliableMessage(qsocket, data) {
+    this.calls.push(['SendUnreliableMessage', qsocket, data.cursize]);
+    return 1;
+  }
+
+  CanSendMessage(qsocket) {
+    this.calls.push(['CanSendMessage', qsocket]);
+    return true;
+  }
+
+  Close(qsocket) {
+    this.calls.push(['Close', qsocket]);
+    super.Close(qsocket);
+  }
+}
+
+void describe('NetworkDrivers', () => {
+  void test('QSocket delegates to its driver', () => {
+    const driver = new RecordingDriver();
+    const sock = new QSocket(driver, 5);
+    const message = new SzBuffer(16, 'socket-delegation');
+
+    sock.state = QSocket.STATE_CONNECTED;
+    message.writeByte(42);
+
+    assert.equal(sock.GetMessage(), 7);
+    assert.equal(sock.SendMessage(message), 1);
+    assert.equal(sock.SendUnreliableMessage(message), 1);
+    assert.equal(sock.CanSendMessage(), true);
+
+    sock.Close();
+
+    assert.equal(sock.state, QSocket.STATE_DISCONNECTED);
+    assert.deepEqual(driver.calls.map(([name]) => name), [
+      'GetMessage',
+      'SendMessage',
+      'SendUnreliableMessage',
+      'CanSendMessage',
+      'Close',
+    ]);
+  });
+
+  void test('LoopDriver round-trips a reliable local message', () => {
+    const previousCon = registry.Con;
+    const previousCOM = registry.COM;
+    const previousNET = registry.NET;
+    const previousSV = registry.SV;
+    const previousSys = registry.Sys;
+    const previousSockets = NET.activeSockets.slice();
+    const previousTime = NET.time;
+    const previousMessage = NET.message;
+
+    registry.Con = { DPrint() {}, Print() {}, PrintError() {}, PrintWarning() {} };
+    registry.COM = { game: 'id1' };
+    registry.NET = NET;
+    registry.SV = { server: { mapname: 'start' }, svs: { maxclients: 1 } };
+    registry.Sys = { FloatTime() { return 1; } };
+    eventBus.publish('registry.frozen');
+
+    try {
+      NET.activeSockets = [];
+      NET.time = 1;
+      NET.message = new SzBuffer(128, 'NET.message.test');
+
+      const driver = new LoopDriver();
+      const serverSock = driver.Connect('local');
+      const clientSock = driver.CheckNewConnections();
+
+      assert.ok(serverSock instanceof QSocket);
+      assert.ok(clientSock instanceof QSocket);
+
+      const payload = new SzBuffer(16, 'loop-message');
+      payload.writeByte(99);
+
+      assert.equal(serverSock.SendMessage(payload), 1);
+      assert.equal(serverSock.CanSendMessage(), false);
+      assert.equal(clientSock.GetMessage(), 1);
+      assert.equal(new Uint8Array(NET.message.data)[0], 99);
+      assert.equal(serverSock.CanSendMessage(), true);
+      assert.equal(clientSock.transportState?.kind, 'loopback');
+      assert.equal(clientSock.transportState?.peer, serverSock);
+    } finally {
+      registry.Con = previousCon;
+      registry.COM = previousCOM;
+      registry.NET = previousNET;
+      registry.SV = previousSV;
+      registry.Sys = previousSys;
+      NET.activeSockets = previousSockets;
+      NET.time = previousTime;
+      NET.message = previousMessage;
+      eventBus.publish('registry.frozen');
+    }
+  });
+});
diff --git a/test/common/network-misc.test.mjs b/test/common/network-misc.test.mjs
new file mode 100644
index 00000000..d0501af2
--- /dev/null
+++ b/test/common/network-misc.test.mjs
@@ -0,0 +1,14 @@
+import assert from 'node:assert/strict';
+import { describe, test } from 'node:test';
+
+import { formatIP } from '../../source/engine/network/Misc.ts';
+
+void describe('formatIP', () => {
+  void test('formats ipv4 addresses without brackets', () => {
+    assert.equal(formatIP('127.0.0.1', 26000), '127.0.0.1:26000');
+  });
+
+  void test('wraps ipv6 addresses in brackets', () => {
+    assert.equal(formatIP('2001:db8::1', 26000), '[2001:db8::1]:26000');
+  });
+});
diff --git a/test/common/network.test.mjs b/test/common/network.test.mjs
new file mode 100644
index 00000000..c5b67b64
--- /dev/null
+++ b/test/common/network.test.mjs
@@ -0,0 +1,93 @@
+import assert from 'node:assert/strict';
+import { describe, test } from 'node:test';
+
+import NET from '../../source/engine/network/Network.ts';
+import { BaseDriver, QSocket } from '../../source/engine/network/NetworkDrivers.ts';
+
+class FakeDriver extends BaseDriver {
+  constructor() {
+    super('fake');
+    this.listenCalls = [];
+    this.listenAddress = null;
+    this.initialized = true;
+  }
+
+  Listen(shouldListen) {
+    this.listenCalls.push(shouldListen);
+  }
+
+  GetListenAddress() {
+    return this.listenAddress;
+  }
+}
+
+void describe('NET', () => {
+  void test('reuses disconnected socket slots', () => {
+    const previousTime = NET.time;
+    const previousSockets = NET.activeSockets.slice();
+    const driver = new FakeDriver();
+
+    try {
+      NET.time = 123;
+      NET.activeSockets = [];
+
+      const first = NET.NewQSocket(driver);
+
+      first.state = QSocket.STATE_DISCONNECTED;
+
+      const second = NET.NewQSocket(driver);
+
+      assert.notEqual(second, first);
+      assert.equal(NET.activeSockets[0], second);
+      assert.equal(NET.activeSockets.length, 1);
+      assert.equal(second.connecttime, 123);
+    } finally {
+      NET.time = previousTime;
+      NET.activeSockets = previousSockets;
+    }
+  });
+
+  void test('listens only on eligible initialized drivers', () => {
+    const previousListening = NET.listening;
+    const previousDriverRegistry = NET.driverRegistry;
+    const listeningDriver = new FakeDriver();
+    const skippedDriver = new FakeDriver();
+    skippedDriver.ShouldListen = () => false;
+
+    NET.driverRegistry = {
+      getInitializedDrivers() {
+        return [listeningDriver, skippedDriver];
+      },
+    };
+
+    try {
+      NET.Listen_f(1);
+
+      assert.equal(NET.listening, true);
+      assert.deepEqual(listeningDriver.listenCalls, [true]);
+      assert.deepEqual(skippedDriver.listenCalls, []);
+    } finally {
+      NET.listening = previousListening;
+      NET.driverRegistry = previousDriverRegistry;
+    }
+  });
+
+  void test('returns the first active listen address', () => {
+    const previousDriverRegistry = NET.driverRegistry;
+    const firstDriver = new FakeDriver();
+    const secondDriver = new FakeDriver();
+    secondDriver.listenAddress = 'ws://127.0.0.1:26000';
+
+    NET.driverRegistry = {
+      getInitializedDrivers() {
+        return [firstDriver, secondDriver];
+      },
+    };
+
+    try {
+      assert.equal(NET.GetListenAddress(), 'ws://127.0.0.1:26000');
+    } finally {
+      NET.driverRegistry = previousDriverRegistry;
+    }
+  });
+});

From ab49cddbbf7a1a3ace827cac8c4508c7f2411299 Mon Sep 17 00:00:00 2001
From: Christian R <github@chrisnew.de>
Date: Thu, 2 Apr 2026 15:44:22 +0300
Subject: [PATCH 13/67] TS: common/CRC, common/Def, common/Errors

---
 source/engine/client/CL.mjs                   |   2 +-
 source/engine/client/ClientConnection.mjs     |   4 +-
 source/engine/client/ClientDemos.mjs          |   4 +-
 source/engine/client/ClientEntities.mjs       |   2 +-
 source/engine/client/ClientInput.mjs          |   2 +-
 source/engine/client/ClientLifecycle.mjs      |   2 +-
 source/engine/client/ClientMessages.mjs       |   4 +-
 .../client/ClientServerCommandHandlers.mjs    |   4 +-
 source/engine/client/ClientState.mjs          |  14 +-
 source/engine/client/Draw.mjs                 |   2 +-
 source/engine/client/GL.mjs                   |   2 +-
 source/engine/client/Key.mjs                  |   2 +-
 source/engine/client/LegacyServerCommands.mjs |   4 +-
 source/engine/client/Menu.mjs                 |   2 +-
 source/engine/client/R.mjs                    |   2 +-
 source/engine/client/SCR.mjs                  |   2 +-
 source/engine/client/Sbar.mjs                 |   2 +-
 source/engine/client/V.mjs                    |   2 +-
 .../client/renderer/BrushModelRenderer.mjs    |   2 +-
 .../engine/client/renderer/ModelRenderer.mjs  |   2 +-
 source/engine/client/renderer/ShadowMap.mjs   |   2 +-
 source/engine/common/{CRC.mjs => CRC.ts}      |  20 ++-
 source/engine/common/Cmd.mjs                  |   2 +-
 source/engine/common/Com.mjs                  |   6 +-
 source/engine/common/Console.mjs              |   2 +-
 source/engine/common/Def.mjs                  | 162 ------------------
 source/engine/common/Def.ts                   | 148 ++++++++++++++++
 source/engine/common/Errors.mjs               |  75 --------
 source/engine/common/Errors.ts                |  66 +++++++
 source/engine/common/GameAPIs.mjs             |   2 +-
 source/engine/common/Host.mjs                 |   4 +-
 source/engine/common/Mod.mjs                  |   2 +-
 source/engine/common/Sys.mjs                  |   2 +-
 source/engine/common/W.mjs                    |   2 +-
 source/engine/common/WorkerManager.mjs        |   2 +-
 source/engine/common/model/ModelLoader.mjs    |   2 +-
 .../common/model/ModelLoaderRegistry.mjs      |   2 +-
 .../common/model/loaders/AliasMDLLoader.mjs   |   2 +-
 .../common/model/loaders/BSP29Loader.mjs      |   4 +-
 .../common/model/loaders/BSP2Loader.mjs       |   2 +-
 .../common/model/loaders/BSP38Loader.mjs      |   2 +-
 .../common/model/loaders/SpriteSPRLoader.mjs  |   2 +-
 source/engine/network/Network.ts              |   2 +-
 source/engine/network/NetworkDrivers.ts       |   2 +-
 source/engine/server/Com.mjs                  |   4 +-
 source/engine/server/Edict.mjs                |   2 +-
 source/engine/server/Navigation.mjs           |   2 +-
 source/engine/server/Progs.mjs                |   4 +-
 source/engine/server/ProgsAPI.mjs             |   2 +-
 source/engine/server/Server.mjs               |   2 +-
 test/common/crc.test.mjs                      |  16 ++
 test/common/def.test.mjs                      |  26 +++
 test/common/errors.test.mjs                   |  34 ++++
 53 files changed, 367 insertions(+), 304 deletions(-)
 rename source/engine/common/{CRC.mjs => CRC.ts} (87%)
 delete mode 100644 source/engine/common/Def.mjs
 create mode 100644 source/engine/common/Def.ts
 delete mode 100644 source/engine/common/Errors.mjs
 create mode 100644 source/engine/common/Errors.ts
 create mode 100644 test/common/crc.test.mjs
 create mode 100644 test/common/def.test.mjs
 create mode 100644 test/common/errors.test.mjs

diff --git a/source/engine/client/CL.mjs b/source/engine/client/CL.mjs
index 36846624..ca45f4cf 100644
--- a/source/engine/client/CL.mjs
+++ b/source/engine/client/CL.mjs
@@ -1,5 +1,5 @@
 import Q from '../../shared/Q.ts';
-import * as Def from '../common/Def.mjs';
+import * as Def from '../common/Def.ts';
 import * as Protocol from '../network/Protocol.ts';
 import Cmd, { ConsoleCommand } from '../common/Cmd.mjs';
 import Cvar from '../common/Cvar.mjs';
diff --git a/source/engine/client/ClientConnection.mjs b/source/engine/client/ClientConnection.mjs
index d86869fc..1d949f46 100644
--- a/source/engine/client/ClientConnection.mjs
+++ b/source/engine/client/ClientConnection.mjs
@@ -1,11 +1,11 @@
 import * as Protocol from '../network/Protocol.ts';
-import { HostError } from '../common/Errors.mjs';
+import { HostError } from '../common/Errors.ts';
 import Cvar from '../common/Cvar.mjs';
 import Cmd from '../common/Cmd.mjs';
 import ClientInput from './ClientInput.mjs';
 import { clientRuntimeState, clientStaticState } from './ClientState.mjs';
 import { eventBus, registry } from '../registry.mjs';
-import * as Def from '../common/Def.mjs';
+import * as Def from '../common/Def.ts';
 import { QSocket } from '../network/NetworkDrivers.ts';
 import { parseServerMessage as parseServerCommandMessage } from './ClientServerCommandHandlers.mjs';
 
diff --git a/source/engine/client/ClientDemos.mjs b/source/engine/client/ClientDemos.mjs
index e23831c9..7fe9a801 100644
--- a/source/engine/client/ClientDemos.mjs
+++ b/source/engine/client/ClientDemos.mjs
@@ -1,8 +1,8 @@
 
-import { clientConnectionState } from '../common/Def.mjs';
+import { clientConnectionState } from '../common/Def.ts';
 import { eventBus, registry } from '../registry.mjs';
 import * as Protocol from '../network/Protocol.ts';
-import { HostError } from '../common/Errors.mjs';
+import { HostError } from '../common/Errors.ts';
 
 let { CL, COM, Con, Host, NET } = registry;
 
diff --git a/source/engine/client/ClientEntities.mjs b/source/engine/client/ClientEntities.mjs
index 4320569a..edc1b32c 100644
--- a/source/engine/client/ClientEntities.mjs
+++ b/source/engine/client/ClientEntities.mjs
@@ -1,6 +1,6 @@
 import Vector from '../../shared/Vector.ts';
 import { eventBus, registry } from '../registry.mjs';
-import * as Def from '../common/Def.mjs';
+import * as Def from '../common/Def.ts';
 import { content, effect, solid } from '../../shared/Defs.ts';
 import Chase from './Chase.mjs';
 import { DefaultClientEdictHandler } from './ClientLegacy.mjs';
diff --git a/source/engine/client/ClientInput.mjs b/source/engine/client/ClientInput.mjs
index 0af70978..ebe671d4 100644
--- a/source/engine/client/ClientInput.mjs
+++ b/source/engine/client/ClientInput.mjs
@@ -4,7 +4,7 @@ import Q from '../../shared/Q.ts';
 import { SzBuffer } from '../network/MSG.ts';
 import Cmd from '../common/Cmd.mjs';
 import { eventBus, registry } from '../registry.mjs';
-import { HostError } from '../common/Errors.mjs';
+import { HostError } from '../common/Errors.ts';
 
 let { Con, CL, Host, NET, V } = registry;
 
diff --git a/source/engine/client/ClientLifecycle.mjs b/source/engine/client/ClientLifecycle.mjs
index 7fc8145a..53b31cc2 100644
--- a/source/engine/client/ClientLifecycle.mjs
+++ b/source/engine/client/ClientLifecycle.mjs
@@ -1,6 +1,6 @@
 import Cvar from '../common/Cvar.mjs';
 import Cmd, { ConsoleCommand } from '../common/Cmd.mjs';
-import * as Def from '../common/Def.mjs';
+import * as Def from '../common/Def.ts';
 import { gameCapabilities } from '../../shared/Defs.ts';
 import ClientInput from './ClientInput.mjs';
 import CL from './CL.mjs';
diff --git a/source/engine/client/ClientMessages.mjs b/source/engine/client/ClientMessages.mjs
index 76e8553e..8321f182 100644
--- a/source/engine/client/ClientMessages.mjs
+++ b/source/engine/client/ClientMessages.mjs
@@ -1,7 +1,7 @@
 import * as Protocol from '../network/Protocol.ts';
-import * as Def from '../common/Def.mjs';
+import * as Def from '../common/Def.ts';
 import { eventBus, registry } from '../registry.mjs';
-import { HostError } from '../common/Errors.mjs';
+import { HostError } from '../common/Errors.ts';
 import Vector from '../../shared/Vector.ts';
 import { PmovePlayer } from '../common/Pmove.mjs';
 import { gameCapabilities } from '../../shared/Defs.ts';
diff --git a/source/engine/client/ClientServerCommandHandlers.mjs b/source/engine/client/ClientServerCommandHandlers.mjs
index 4f0a4e50..6c295778 100644
--- a/source/engine/client/ClientServerCommandHandlers.mjs
+++ b/source/engine/client/ClientServerCommandHandlers.mjs
@@ -1,7 +1,7 @@
 import * as Protocol from '../network/Protocol.ts';
-import * as Def from '../common/Def.mjs';
+import * as Def from '../common/Def.ts';
 import Cmd from '../common/Cmd.mjs';
-import { HostError } from '../common/Errors.mjs';
+import { HostError } from '../common/Errors.ts';
 import { gameCapabilities } from '../../shared/Defs.ts';
 import Vector from '../../shared/Vector.ts';
 import { ClientEngineAPI } from '../common/GameAPIs.mjs';
diff --git a/source/engine/client/ClientState.mjs b/source/engine/client/ClientState.mjs
index b50e1048..75f0a3dc 100644
--- a/source/engine/client/ClientState.mjs
+++ b/source/engine/client/ClientState.mjs
@@ -1,7 +1,7 @@
 import { SzBuffer } from '../network/MSG.ts';
 import { QSocket } from '../network/NetworkDrivers.ts';
 import * as Protocol from '../network/Protocol.ts';
-import * as Def from '../common/Def.mjs';
+import * as Def from '../common/Def.ts';
 import Vector from '../../shared/Vector.ts';
 import { EventBus, eventBus, registry } from '../registry.mjs';
 import ClientEntities, { ClientEdict } from './ClientEntities.mjs';
@@ -14,6 +14,14 @@ eventBus.subscribe('registry.frozen', () => {
   CL = registry.CL;
 });
 
+/**
+ * Create a stats array sized to the numeric legacy stat entries.
+ * @returns {number[]} Fresh zeroed stat slots.
+ */
+function createLegacyStatsArray() {
+  return Object.values(Def.stat).filter((value) => typeof value === 'number').map(() => 0);
+}
+
 const clientGameEvents = [
   'vid.resize',
   'cvar.changed',
@@ -157,7 +165,7 @@ class ClientRuntimeState {
   /** @type {number} server-acknowledged old button state */
   ackedPmOldButtons = 0;
 
-  stats = Object.values(Def.stat).map(() => 0);
+  stats = createLegacyStatsArray();
   items = 0;
   item_gettime = new Array(32).fill(0.0);
   faceanimtime = 0.0;
@@ -247,7 +255,7 @@ class ClientRuntimeState {
     this.ackedPmFlags = 0;
     this.ackedPmTime = 0;
     this.ackedPmOldButtons = 0;
-    this.stats = Object.values(Def.stat).map(() => 0);
+    this.stats = createLegacyStatsArray();
     this.items = 0;
     this.item_gettime.fill(0.0);
     this.faceanimtime = 0.0;
diff --git a/source/engine/client/Draw.mjs b/source/engine/client/Draw.mjs
index d39f542e..e3851d72 100644
--- a/source/engine/client/Draw.mjs
+++ b/source/engine/client/Draw.mjs
@@ -1,5 +1,5 @@
 import Vector from '../../shared/Vector.ts';
-import { MissingResourceError } from '../common/Errors.mjs';
+import { MissingResourceError } from '../common/Errors.ts';
 
 import VID from './VID.mjs';
 import W, { WadFileInterface, WadLumpTexture } from '../common/W.mjs';
diff --git a/source/engine/client/GL.mjs b/source/engine/client/GL.mjs
index 80c3bf2c..6fc4ebd8 100644
--- a/source/engine/client/GL.mjs
+++ b/source/engine/client/GL.mjs
@@ -1,6 +1,6 @@
 import Cmd, { ConsoleCommand } from '../common/Cmd.mjs';
 import Cvar from '../common/Cvar.mjs';
-import { MissingResourceError } from '../common/Errors.mjs';
+import { MissingResourceError } from '../common/Errors.ts';
 import { WadLumpTexture } from '../common/W.mjs';
 import { eventBus, registry } from '../registry.mjs';
 import VID from './VID.mjs';
diff --git a/source/engine/client/Key.mjs b/source/engine/client/Key.mjs
index 3ef6efdf..0b49fce5 100644
--- a/source/engine/client/Key.mjs
+++ b/source/engine/client/Key.mjs
@@ -2,7 +2,7 @@ import { K } from '../../shared/Keys.ts';
 import Vector from '../../shared/Vector.ts';
 import Cmd from '../common/Cmd.mjs';
 import Cvar from '../common/Cvar.mjs';
-import { clientConnectionState } from '../common/Def.mjs';
+import { clientConnectionState } from '../common/Def.ts';
 import { registry, eventBus } from '../registry.mjs';
 
 const Key = {};
diff --git a/source/engine/client/LegacyServerCommands.mjs b/source/engine/client/LegacyServerCommands.mjs
index f2044fc1..08e740dc 100644
--- a/source/engine/client/LegacyServerCommands.mjs
+++ b/source/engine/client/LegacyServerCommands.mjs
@@ -1,6 +1,6 @@
 import * as Protocol from '../network/Protocol.ts';
-import * as Def from '../common/Def.mjs';
-import { HostError } from '../common/Errors.mjs';
+import * as Def from '../common/Def.ts';
+import { HostError } from '../common/Errors.ts';
 import { eventBus, registry } from '../registry.mjs';
 import { ScoreSlot } from './ClientState.mjs';
 import Vector from '../../shared/Vector.ts';
diff --git a/source/engine/client/Menu.mjs b/source/engine/client/Menu.mjs
index 3d9cc650..6a7bc2c0 100644
--- a/source/engine/client/Menu.mjs
+++ b/source/engine/client/Menu.mjs
@@ -1,7 +1,7 @@
 import { K } from '../../shared/Keys.ts';
 import Cmd from '../common/Cmd.mjs';
 import Cvar from '../common/Cvar.mjs';
-import { clientConnectionState } from '../common/Def.mjs';
+import { clientConnectionState } from '../common/Def.ts';
 import { eventBus, registry } from '../registry.mjs';
 import ClientLifecycle from './ClientLifecycle.mjs';
 import { GLTexture } from './GL.mjs';
diff --git a/source/engine/client/R.mjs b/source/engine/client/R.mjs
index 0bade1ef..9a1b6140 100644
--- a/source/engine/client/R.mjs
+++ b/source/engine/client/R.mjs
@@ -1,7 +1,7 @@
 import Vector from '../../shared/Vector.ts';
 import Cvar from '../common/Cvar.mjs';
 import Cmd from '../common/Cmd.mjs';
-import * as Def from '../common/Def.mjs';
+import * as Def from '../common/Def.ts';
 
 import { eventBus, registry } from '../registry.mjs';
 import Chase from './Chase.mjs';
diff --git a/source/engine/client/SCR.mjs b/source/engine/client/SCR.mjs
index 6faecba3..8990b4de 100644
--- a/source/engine/client/SCR.mjs
+++ b/source/engine/client/SCR.mjs
@@ -3,7 +3,7 @@
 import { gameCapabilities } from '../../shared/Defs.ts';
 import Cmd from '../common/Cmd.mjs';
 import Cvar from '../common/Cvar.mjs';
-import { clientConnectionState } from '../common/Def.mjs';
+import { clientConnectionState } from '../common/Def.ts';
 import { eventBus, registry } from '../registry.mjs';
 import GL from './GL.mjs';
 import VID from './VID.mjs';
diff --git a/source/engine/client/Sbar.mjs b/source/engine/client/Sbar.mjs
index de728dd4..2f1921dc 100644
--- a/source/engine/client/Sbar.mjs
+++ b/source/engine/client/Sbar.mjs
@@ -3,7 +3,7 @@
 import Cmd from '../common/Cmd.mjs';
 import { eventBus, registry } from '../registry.mjs';
 import VID from './VID.mjs';
-import * as Def from '../common/Def.mjs';
+import * as Def from '../common/Def.ts';
 import Cvar from '../common/Cvar.mjs';
 
 const Sbar = {};
diff --git a/source/engine/client/V.mjs b/source/engine/client/V.mjs
index 6b50d56e..6560ee4d 100644
--- a/source/engine/client/V.mjs
+++ b/source/engine/client/V.mjs
@@ -2,7 +2,7 @@ import Vector from '../../shared/Vector.ts';
 import { content, gameCapabilities } from '../../shared/Defs.ts';
 import Cmd from '../common/Cmd.mjs';
 import Cvar from '../common/Cvar.mjs';
-import * as Def from '../common/Def.mjs';
+import * as Def from '../common/Def.ts';
 import Q from '../../shared/Q.ts';
 import { eventBus, registry } from '../registry.mjs';
 import Chase from './Chase.mjs';
diff --git a/source/engine/client/renderer/BrushModelRenderer.mjs b/source/engine/client/renderer/BrushModelRenderer.mjs
index 80cf1a51..49d0af67 100644
--- a/source/engine/client/renderer/BrushModelRenderer.mjs
+++ b/source/engine/client/renderer/BrushModelRenderer.mjs
@@ -8,7 +8,7 @@ import { BrushModel, Node } from '../../common/model/BSP.mjs';
 import { ClientEdict } from '../ClientEntities.mjs';
 import Mesh from './Mesh.mjs';
 import PostProcess from './PostProcess.mjs';
-import * as Def from '../../common/Def.mjs';
+import * as Def from '../../common/Def.ts';
 
 let { CL, Host, R } = registry;
 
diff --git a/source/engine/client/renderer/ModelRenderer.mjs b/source/engine/client/renderer/ModelRenderer.mjs
index 72b10aae..f8af53b5 100644
--- a/source/engine/client/renderer/ModelRenderer.mjs
+++ b/source/engine/client/renderer/ModelRenderer.mjs
@@ -1,4 +1,4 @@
-import { NotImplementedError } from '../../common/Errors.mjs';
+import { NotImplementedError } from '../../common/Errors.ts';
 
 /**
  * Abstract base class for model renderers.
diff --git a/source/engine/client/renderer/ShadowMap.mjs b/source/engine/client/renderer/ShadowMap.mjs
index eb4059fd..6377792f 100644
--- a/source/engine/client/renderer/ShadowMap.mjs
+++ b/source/engine/client/renderer/ShadowMap.mjs
@@ -1,6 +1,6 @@
 import GL from '../GL.mjs';
 import Cvar from '../../common/Cvar.mjs';
-import { limits } from '../../common/Def.mjs';
+import { limits } from '../../common/Def.ts';
 import { eventBus, registry } from '../../registry.mjs';
 import { materialFlags } from './Materials.mjs';
 import { effect } from '../../../shared/Defs.ts';
diff --git a/source/engine/common/CRC.mjs b/source/engine/common/CRC.ts
similarity index 87%
rename from source/engine/common/CRC.mjs
rename to source/engine/common/CRC.ts
index 29ec1bb9..ab3df759 100644
--- a/source/engine/common/CRC.mjs
+++ b/source/engine/common/CRC.ts
@@ -1,8 +1,8 @@
 /**
- * CRC class for calculating CRC-16-CCITT checksum.
+ * CRC-16-CCITT checksum helper.
  */
 export class CRC16CCITT {
-  static #table = [
+  static readonly #table = [
     0x0000, 0x1021, 0x2042, 0x3063, 0x4084, 0x50a5, 0x60c6, 0x70e7,
     0x8108, 0x9129, 0xa14a, 0xb16b, 0xc18c, 0xd1ad, 0xe1ce, 0xf1ef,
     0x1231, 0x0210, 0x3273, 0x2252, 0x52b5, 0x4294, 0x72f7, 0x62d6,
@@ -38,15 +38,17 @@ export class CRC16CCITT {
   ];
 
   /**
-   * Calculates the CRC-16-CCITT checksum for the given data block.
-   * @param {Uint8Array} start - The input data block.
-   * @returns {number} The calculated CRC-16-CCITT checksum.
+   * Calculate the checksum for a block of bytes.
+   * @param start
+   * @returns CRC-16-CCITT checksum.
    */
-  static Block(start) {
+  static Block(start: Uint8Array): number {
     let crcvalue = 0xffff;
-    for (let i = 0; i < start.length; i++) {
-      crcvalue = ((crcvalue << 8) & 0xffff) ^ this.#table[(crcvalue >> 8) ^ start[i]];
+
+    for (const byte of start) {
+      crcvalue = ((crcvalue << 8) & 0xffff) ^ this.#table[(crcvalue >> 8) ^ byte];
     }
+
     return crcvalue;
   }
-};
+}
diff --git a/source/engine/common/Cmd.mjs b/source/engine/common/Cmd.mjs
index a2b8df24..99e10dc0 100644
--- a/source/engine/common/Cmd.mjs
+++ b/source/engine/common/Cmd.mjs
@@ -2,7 +2,7 @@ import { AsyncFunction } from '../../shared/Q.ts';
 import * as Protocol from '../network/Protocol.ts';
 import { eventBus, registry } from '../registry.mjs';
 import Cvar from './Cvar.mjs';
-import { clientConnectionState } from './Def.mjs';
+import { clientConnectionState } from './Def.ts';
 
 let { CL, COM, Con, Host } = registry;
 
diff --git a/source/engine/common/Com.mjs b/source/engine/common/Com.mjs
index f1ba5ce5..2ab98018 100644
--- a/source/engine/common/Com.mjs
+++ b/source/engine/common/Com.mjs
@@ -2,13 +2,13 @@
 import { registry, eventBus } from '../registry.mjs';
 
 import Q from '../../shared/Q.ts';
-import { CorruptedResourceError } from './Errors.mjs';
+import { CorruptedResourceError } from './Errors.ts';
 
 import Cvar from './Cvar.mjs';
 import W from './W.mjs';
 import Cmd from './Cmd.mjs';
-import { defaultBasedir, defaultGame } from './Def.mjs';
-import { CRC16CCITT } from './CRC.mjs';
+import { defaultBasedir, defaultGame } from './Def.ts';
+import { CRC16CCITT } from './CRC.ts';
 
 let { Con, Sys } = registry;
 
diff --git a/source/engine/common/Console.mjs b/source/engine/common/Console.mjs
index d92aab8e..6ece7d4f 100644
--- a/source/engine/common/Console.mjs
+++ b/source/engine/common/Console.mjs
@@ -5,7 +5,7 @@ import Cvar from './Cvar.mjs';
 import Vector from '../../shared/Vector.ts';
 import Cmd from './Cmd.mjs';
 import VID from '../client/VID.mjs';
-import { clientConnectionState } from './Def.mjs';
+import { clientConnectionState } from './Def.ts';
 import { ClientEngineAPI } from './GameAPIs.mjs';
 
 let { CL, Draw, Host, Key, M, SCR } = registry;
diff --git a/source/engine/common/Def.mjs b/source/engine/common/Def.mjs
deleted file mode 100644
index 1bf79059..00000000
--- a/source/engine/common/Def.mjs
+++ /dev/null
@@ -1,162 +0,0 @@
-
-/**
- * Name of this fun project.
- */
-export const productName = 'The Quake Shack';
-
-/**
- * Version string.
- */
-export const productVersion = '1.2.0';
-
-/**
- * Default game directory.
- */
-export const defaultGame = 'id1';
-
-/**
- * Default base directory.
- */
-export const defaultBasedir = 'id1';
-
-/**
- * Engine limitations.
- * @enum {number}
- * @readonly
- */
-export const limits = Object.freeze({
-  edicts: 64,
-  clients: 32,
-  dlights: 32,
-  lightstyles: 64,
-  beams: 24,
-  entities: 1024,
-});
-
-/**
- * CL.state.state keys
- * @enum {number}
- * @readonly
- * @deprecated TODO: move to CL or PR, it’s legacy code
- */
-export const stat = Object.freeze({
-  health: 0,
-  frags: 1,
-  weapon: 2,
-  ammo: 3,
-  armor: 4,
-  weaponframe: 5,
-  shells: 6,
-  nails: 7,
-  rockets: 8,
-  cells: 9,
-  activeweapon: 10,
-  totalsecrets: 11,
-  totalmonsters: 12,
-  secrets: 13,
-  monsters: 14,
-});
-
-/**
- * @enum {number}
- * @readonly
- * @deprecated TODO: move to CL or PR, it’s legacy code
- */
-export const it = Object.freeze({
-  shotgun: 1,
-  super_shotgun: 2,
-  nailgun: 4,
-  super_nailgun: 8,
-  grenade_launcher: 16,
-  rocket_launcher: 32,
-  lightning: 64,
-  super_lightning: 128,
-  shells: 256,
-  nails: 512,
-  rockets: 1024,
-  cells: 2048,
-  axe: 4096,
-  armor1: 8192,
-  armor2: 16384,
-  armor3: 32768,
-  superhealth: 65536,
-  key1: 131072,
-  key2: 262144,
-  invisibility: 524288,
-  invulnerability: 1048576,
-  suit: 2097152,
-  quad: 4194304,
-});
-
-/**
- * @enum {number}
- * @readonly
- * @deprecated TODO: move to CL or PR, it’s legacy code
- */
-export const rit = Object.freeze({
-  shells: 128,
-  nails: 256,
-  rockets: 512,
-  cells: 1024,
-  axe: 2048,
-  lava_nailgun: 4096,
-  lava_super_nailgun: 8192,
-  multi_grenade: 16384,
-  multi_rocket: 32768,
-  plasma_gun: 65536,
-  armor1: 8388608,
-  armor2: 16777216,
-  armor3: 33554432,
-  lava_nails: 67108864,
-  plasma_ammo: 134217728,
-  multi_rockets: 268435456,
-  shield: 536870912,
-  antigrav: 1073741824,
-  superhealth: 2147483648,
-});
-
-/**
- * @enum {number}
- * @readonly
- * @deprecated TODO: move to CL or PR, it’s legacy code
- */
-export const hit = Object.freeze({
-  proximity_gun_bit: 16,
-  mjolnir_bit: 7,
-  laser_cannon_bit: 23,
-  proximity_gun: 65536,
-  mjolnir: 128,
-  laser_cannon: 8388608,
-  wetsuit: 33554432,
-  empathy_shields: 67108864,
-});
-
-/**
- * @enum {number}
- * @readonly
- */
-export const contentShift = Object.freeze({
-  contents: 0,
-  damage: 1,
-  bonus: 2,
-  powerup: 3,
-  user1: 4,
-  user2: 5,
-  user3: 6,
-  user4: 7,
-});
-
-/**
- * @enum {number}
- * @readonly
- */
-export const clientConnectionState = {
-  disconnected: 0,
-  connecting: 1,
-  connected: 2,
-};
-
-/**
- * Version used for savegames.
- */
-export const gamestateVersion = 2;
diff --git a/source/engine/common/Def.ts b/source/engine/common/Def.ts
new file mode 100644
index 00000000..840feece
--- /dev/null
+++ b/source/engine/common/Def.ts
@@ -0,0 +1,148 @@
+/**
+ * Name of this fun project.
+ */
+export const productName = 'The Quake Shack';
+
+/**
+ * Version string.
+ */
+export const productVersion = '1.2.0';
+
+/**
+ * Default game directory.
+ */
+export const defaultGame = 'id1';
+
+/**
+ * Default base directory.
+ */
+export const defaultBasedir = 'id1';
+
+/**
+ * Engine limitations.
+ */
+export enum limits {
+  edicts = 64,
+  clients = 32,
+  dlights = 32,
+  lightstyles = 64,
+  beams = 24,
+  entities = 1024,
+}
+
+/**
+ * Legacy client stat indices.
+ */
+export enum stat {
+  health = 0,
+  frags = 1,
+  weapon = 2,
+  ammo = 3,
+  armor = 4,
+  weaponframe = 5,
+  shells = 6,
+  nails = 7,
+  rockets = 8,
+  cells = 9,
+  activeweapon = 10,
+  totalsecrets = 11,
+  totalmonsters = 12,
+  secrets = 13,
+  monsters = 14,
+}
+
+/**
+ * Legacy item bit flags.
+ */
+export enum it {
+  shotgun = 1,
+  super_shotgun = 2,
+  nailgun = 4,
+  super_nailgun = 8,
+  grenade_launcher = 16,
+  rocket_launcher = 32,
+  lightning = 64,
+  super_lightning = 128,
+  shells = 256,
+  nails = 512,
+  rockets = 1024,
+  cells = 2048,
+  axe = 4096,
+  armor1 = 8192,
+  armor2 = 16384,
+  armor3 = 32768,
+  superhealth = 65536,
+  key1 = 131072,
+  key2 = 262144,
+  invisibility = 524288,
+  invulnerability = 1048576,
+  suit = 2097152,
+  quad = 4194304,
+}
+
+/**
+ * Rogue item bit flags.
+ */
+export enum rit {
+  shells = 128,
+  nails = 256,
+  rockets = 512,
+  cells = 1024,
+  axe = 2048,
+  lava_nailgun = 4096,
+  lava_super_nailgun = 8192,
+  multi_grenade = 16384,
+  multi_rocket = 32768,
+  plasma_gun = 65536,
+  armor1 = 8388608,
+  armor2 = 16777216,
+  armor3 = 33554432,
+  lava_nails = 67108864,
+  plasma_ammo = 134217728,
+  multi_rockets = 268435456,
+  shield = 536870912,
+  antigrav = 1073741824,
+  superhealth = 2147483648,
+}
+
+/**
+ * Hipnotic item bit flags.
+ */
+export enum hit {
+  proximity_gun_bit = 16,
+  mjolnir_bit = 7,
+  laser_cannon_bit = 23,
+  proximity_gun = 65536,
+  mjolnir = 128,
+  laser_cannon = 8388608,
+  wetsuit = 33554432,
+  empathy_shields = 67108864,
+}
+
+/**
+ * Bit shifts used by legacy contents flags.
+ */
+export enum contentShift {
+  contents = 0,
+  damage = 1,
+  bonus = 2,
+  powerup = 3,
+  user1 = 4,
+  user2 = 5,
+  user3 = 6,
+  user4 = 7,
+}
+
+/**
+ * High-level client connection states.
+ */
+export enum clientConnectionState {
+  disconnected = 0,
+  connecting = 1,
+  connected = 2,
+}
+
+/**
+ * Version used for savegames.
+ */
+export const gamestateVersion = 2;
diff --git a/source/engine/common/Errors.mjs b/source/engine/common/Errors.mjs
deleted file mode 100644
index 97087e1d..00000000
--- a/source/engine/common/Errors.mjs
+++ /dev/null
@@ -1,75 +0,0 @@
-// When in doubt where to put an exception that many modules can use, put it here.
-
-/**
- * Causes the engine to crash with an error message.
- * Loosely based on Sys.Error.
- */
-export class SysError extends Error {
-  constructor(message) {
-    super(message);
-    this.name = 'SysError';
-  }
-};
-
-/**
- * Causes a Host.Error.
- * Breaks the current frame, instantly stops the game and displays the error message.
- */
-export class HostError extends Error {
-  constructor(message) {
-    super(message);
-    this.name = 'HostError';
-  }
-};
-
-/**
- * NOTE: Use subclasses of SysError to provide more context about the error.
- */
-export class ResourceError extends SysError {
-  resource = null;
-  error = null;
-};
-
-/**
- * Use this error when a required resource could not be loaded.
- * Replaces `Sys.Error('Couldn\'t load gfx/palette.lmp');` stanza.
- */
-export class MissingResourceError extends ResourceError {
-  /**
-   * @param {string} resource filename
-   * @param {*} error optional error object, e.g. from a failed fetch
-   */
-  constructor(resource, error = null) {
-    super(`Couldn't load ${resource}`);
-    this.resource = resource;
-    this.error = error;
-    this.name = 'MissingResourceError';
-  }
-};
-
-export class CorruptedResourceError extends ResourceError {
-  /**
-   * @param {string} resource filename
-   * @param {string} reason optional reason why the resource is considered corrupted
-   */
-  constructor(resource, reason) {
-    super(`${resource} is corrupted: ${reason}`);
-    this.resource = resource;
-    this.error = null;
-    this.reason = reason;
-    this.name = 'CorruptedResourceError';
-  }
-};
-
-/**
- * Use this error when a method is not implemented in a subclass.
- */
-export class NotImplementedError extends SysError {
-  /**
-   * @param {string} message message what’s not implemented
-   */
-  constructor(message) {
-    super(message);
-    this.name = 'NotImplementedError';
-  }
-};
diff --git a/source/engine/common/Errors.ts b/source/engine/common/Errors.ts
new file mode 100644
index 00000000..f96ea1bc
--- /dev/null
+++ b/source/engine/common/Errors.ts
@@ -0,0 +1,66 @@
+type ResourceLoadError = Error | null;
+
+/**
+ * Causes the engine to crash with an error message.
+ */
+export class SysError extends Error {
+  constructor(message: string) {
+    super(message);
+    this.name = 'SysError';
+  }
+}
+
+/**
+ * Break the current frame, stop the game, and display the error message.
+ */
+export class HostError extends Error {
+  constructor(message: string) {
+    super(message);
+    this.name = 'HostError';
+  }
+}
+
+/**
+ * Base resource failure carrying the resource name and an optional underlying error.
+ */
+export class ResourceError extends SysError {
+  resource: string | null = null;
+  error: ResourceLoadError = null;
+}
+
+/**
+ * Use this when a required resource could not be loaded.
+ */
+export class MissingResourceError extends ResourceError {
+  constructor(resource: string, error: ResourceLoadError = null) {
+    super(`Couldn't load ${resource}`);
+    this.resource = resource;
+    this.error = error;
+    this.name = 'MissingResourceError';
+  }
+}
+
+/**
+ * Use this when a resource exists but fails validation.
+ */
+export class CorruptedResourceError extends ResourceError {
+  reason: string;
+
+  constructor(resource: string, reason: string) {
+    super(`${resource} is corrupted: ${reason}`);
+    this.resource = resource;
+    this.error = null;
+    this.reason = reason;
+    this.name = 'CorruptedResourceError';
+  }
+}
+
+/**
+ * Use this when a subclass must provide an implementation.
+ */
+export class NotImplementedError extends SysError {
+  constructor(message: string) {
+    super(message);
+    this.name = 'NotImplementedError';
+  }
+}
diff --git a/source/engine/common/GameAPIs.mjs b/source/engine/common/GameAPIs.mjs
index f97d2589..f45ce4fc 100644
--- a/source/engine/common/GameAPIs.mjs
+++ b/source/engine/common/GameAPIs.mjs
@@ -9,7 +9,7 @@ import { EventBus, eventBus, registry } from '../registry.mjs';
 import { ED, ServerEdict } from '../server/Edict.mjs';
 import Cmd from './Cmd.mjs';
 import Cvar from './Cvar.mjs';
-import { HostError } from './Errors.mjs';
+import { HostError } from './Errors.ts';
 import Mod from './Mod.mjs';
 import W from './W.mjs';
 
diff --git a/source/engine/common/Host.mjs b/source/engine/common/Host.mjs
index e35d8e7a..b387c757 100644
--- a/source/engine/common/Host.mjs
+++ b/source/engine/common/Host.mjs
@@ -1,6 +1,6 @@
 import Cvar from './Cvar.mjs';
 import * as Protocol from '../network/Protocol.ts';
-import * as Def from './Def.mjs';
+import * as Def from './Def.ts';
 import Cmd, { ConsoleCommand } from './Cmd.mjs';
 import { eventBus, registry } from '../registry.mjs';
 import Vector from '../../shared/Vector.ts';
@@ -9,7 +9,7 @@ import { ServerClient } from '../server/Client.mjs';
 import { ServerEngineAPI } from './GameAPIs.mjs';
 import Chase from '../client/Chase.mjs';
 import VID from '../client/VID.mjs';
-import { HostError } from './Errors.mjs';
+import { HostError } from './Errors.ts';
 import CDAudio from '../client/CDAudio.mjs';
 import * as Defs from '../../shared/Defs.ts';
 import { content, gameCapabilities } from '../../shared/Defs.ts';
diff --git a/source/engine/common/Mod.mjs b/source/engine/common/Mod.mjs
index 5a429b5a..23729276 100644
--- a/source/engine/common/Mod.mjs
+++ b/source/engine/common/Mod.mjs
@@ -1,5 +1,5 @@
 import { eventBus, registry } from '../registry.mjs';
-import { MissingResourceError } from './Errors.mjs';
+import { MissingResourceError } from './Errors.ts';
 import { ModelLoaderRegistry } from './model/ModelLoaderRegistry.mjs';
 import { AliasMDLLoader } from './model/loaders/AliasMDLLoader.mjs';
 import { SpriteSPRLoader } from './model/loaders/SpriteSPRLoader.mjs';
diff --git a/source/engine/common/Sys.mjs b/source/engine/common/Sys.mjs
index 0496c513..9b5206c8 100644
--- a/source/engine/common/Sys.mjs
+++ b/source/engine/common/Sys.mjs
@@ -1,4 +1,4 @@
-import { NotImplementedError } from './Errors.mjs';
+import { NotImplementedError } from './Errors.ts';
 
 export class BaseWorker {
   /** @type {Function[]} @protected */
diff --git a/source/engine/common/W.mjs b/source/engine/common/W.mjs
index 360e8b30..9fbcb4a3 100644
--- a/source/engine/common/W.mjs
+++ b/source/engine/common/W.mjs
@@ -1,6 +1,6 @@
 
 import { eventBus, registry } from '../registry.mjs';
-import { CorruptedResourceError, MissingResourceError } from './Errors.mjs';
+import { CorruptedResourceError, MissingResourceError } from './Errors.ts';
 import Q from '../../shared/Q.ts';
 
 let { COM } = registry;
diff --git a/source/engine/common/WorkerManager.mjs b/source/engine/common/WorkerManager.mjs
index 03f7fcf6..9c060388 100644
--- a/source/engine/common/WorkerManager.mjs
+++ b/source/engine/common/WorkerManager.mjs
@@ -1,5 +1,5 @@
 import { registry, eventBus } from '../registry.mjs';
-import { SysError } from './Errors.mjs';
+import { SysError } from './Errors.ts';
 import PlatformWorker from './PlatformWorker.mjs';
 
 let { Con, COM } = registry;
diff --git a/source/engine/common/model/ModelLoader.mjs b/source/engine/common/model/ModelLoader.mjs
index 13be2558..a468201b 100644
--- a/source/engine/common/model/ModelLoader.mjs
+++ b/source/engine/common/model/ModelLoader.mjs
@@ -1,4 +1,4 @@
-import { NotImplementedError } from '../Errors.mjs';
+import { NotImplementedError } from '../Errors.ts';
 
 /**
  * Abstract base class for model format loaders.
diff --git a/source/engine/common/model/ModelLoaderRegistry.mjs b/source/engine/common/model/ModelLoaderRegistry.mjs
index 0ea5708c..68ee379e 100644
--- a/source/engine/common/model/ModelLoaderRegistry.mjs
+++ b/source/engine/common/model/ModelLoaderRegistry.mjs
@@ -1,4 +1,4 @@
-import { NotImplementedError } from '../Errors.mjs';
+import { NotImplementedError } from '../Errors.ts';
 import { BaseModel } from './BaseModel.mjs';
 import { ModelLoader } from './ModelLoader.mjs';
 
diff --git a/source/engine/common/model/loaders/AliasMDLLoader.mjs b/source/engine/common/model/loaders/AliasMDLLoader.mjs
index fbb41b5e..a943bbdd 100644
--- a/source/engine/common/model/loaders/AliasMDLLoader.mjs
+++ b/source/engine/common/model/loaders/AliasMDLLoader.mjs
@@ -2,7 +2,7 @@ import Vector from '../../../../shared/Vector.ts';
 import Q from '../../../../shared/Q.ts';
 import GL, { GLTexture, resampleTexture8 } from '../../../client/GL.mjs';
 import W, { translateIndexToLuminanceRGBA, translateIndexToRGBA } from '../../W.mjs';
-import { CRC16CCITT } from '../../CRC.mjs';
+import { CRC16CCITT } from '../../CRC.ts';
 import { registry } from '../../../registry.mjs';
 import { ModelLoader } from '../ModelLoader.mjs';
 import { AliasModel } from '../AliasModel.mjs';
diff --git a/source/engine/common/model/loaders/BSP29Loader.mjs b/source/engine/common/model/loaders/BSP29Loader.mjs
index 3ba4be74..aaa7ab59 100644
--- a/source/engine/common/model/loaders/BSP29Loader.mjs
+++ b/source/engine/common/model/loaders/BSP29Loader.mjs
@@ -3,8 +3,8 @@ import Q from '../../../../shared/Q.ts';
 import { content } from '../../../../shared/Defs.ts';
 import { GLTexture } from '../../../client/GL.mjs';
 import W, { readWad3Texture, translateIndexToLuminanceRGBA, translateIndexToRGBA } from '../../W.mjs';
-import { CRC16CCITT } from '../../CRC.mjs';
-import { CorruptedResourceError } from '../../Errors.mjs';
+import { CRC16CCITT } from '../../CRC.ts';
+import { CorruptedResourceError } from '../../Errors.ts';
 import { eventBus, registry } from '../../../registry.mjs';
 import { ModelLoader } from '../ModelLoader.mjs';
 import { Brush, BrushModel, BrushSide, Node } from '../BSP.mjs';
diff --git a/source/engine/common/model/loaders/BSP2Loader.mjs b/source/engine/common/model/loaders/BSP2Loader.mjs
index 0c8e49cc..32d56c13 100644
--- a/source/engine/common/model/loaders/BSP2Loader.mjs
+++ b/source/engine/common/model/loaders/BSP2Loader.mjs
@@ -1,5 +1,5 @@
 import Vector from '../../../../shared/Vector.ts';
-import { CorruptedResourceError } from '../../Errors.mjs';
+import { CorruptedResourceError } from '../../Errors.ts';
 import { BSP29Loader } from './BSP29Loader.mjs';
 import { Face } from '../BaseModel.mjs';
 import { BrushModel, Node } from '../BSP.mjs';
diff --git a/source/engine/common/model/loaders/BSP38Loader.mjs b/source/engine/common/model/loaders/BSP38Loader.mjs
index 06d0f9d0..118a335d 100644
--- a/source/engine/common/model/loaders/BSP38Loader.mjs
+++ b/source/engine/common/model/loaders/BSP38Loader.mjs
@@ -1,7 +1,7 @@
 import { content } from '../../../../shared/Defs.ts';
 import Q from '../../../../shared/Q.ts';
 import Vector from '../../../../shared/Vector.ts';
-import { CRC16CCITT } from '../../CRC.mjs';
+import { CRC16CCITT } from '../../CRC.ts';
 import { Plane } from '../BaseModel.mjs';
 import { Brush, BrushModel, BrushSide, Node } from '../BSP.mjs';
 import { ModelLoader } from '../ModelLoader.mjs';
diff --git a/source/engine/common/model/loaders/SpriteSPRLoader.mjs b/source/engine/common/model/loaders/SpriteSPRLoader.mjs
index 116a6dcc..2406b26c 100644
--- a/source/engine/common/model/loaders/SpriteSPRLoader.mjs
+++ b/source/engine/common/model/loaders/SpriteSPRLoader.mjs
@@ -1,7 +1,7 @@
 import Vector from '../../../../shared/Vector.ts';
 import { GLTexture } from '../../../client/GL.mjs';
 import W, { translateIndexToRGBA } from '../../W.mjs';
-import { CRC16CCITT } from '../../CRC.mjs';
+import { CRC16CCITT } from '../../CRC.ts';
 import { registry } from '../../../registry.mjs';
 import { ModelLoader } from '../ModelLoader.mjs';
 import { SpriteModel } from '../SpriteModel.mjs';
diff --git a/source/engine/network/Network.ts b/source/engine/network/Network.ts
index 765f3e32..ed2f4d3e 100644
--- a/source/engine/network/Network.ts
+++ b/source/engine/network/Network.ts
@@ -2,7 +2,7 @@ import type { Server as HttpServer } from 'node:http';
 
 import Cmd from '../common/Cmd.mjs';
 import Cvar from '../common/Cvar.mjs';
-import { clientConnectionState } from '../common/Def.mjs';
+import { clientConnectionState } from '../common/Def.ts';
 import Q from '../../shared/Q.ts';
 import { eventBus, getClientRegistry, getCommonRegistry, registry } from '../registry.mjs';
 import { SzBuffer } from './MSG.ts';
diff --git a/source/engine/network/NetworkDrivers.ts b/source/engine/network/NetworkDrivers.ts
index e54a562a..2ee266e6 100644
--- a/source/engine/network/NetworkDrivers.ts
+++ b/source/engine/network/NetworkDrivers.ts
@@ -1,5 +1,5 @@
 import Cvar from '../common/Cvar.mjs';
-import { HostError } from '../common/Errors.mjs';
+import { HostError } from '../common/Errors.ts';
 import type { SzBuffer } from './MSG.ts';
 import { eventBus, getCommonRegistry, registry } from '../registry.mjs';
 import { formatIP } from './Misc.ts';
diff --git a/source/engine/server/Com.mjs b/source/engine/server/Com.mjs
index d5a21d28..cc271d47 100644
--- a/source/engine/server/Com.mjs
+++ b/source/engine/server/Com.mjs
@@ -3,10 +3,10 @@
 import { promises as fsPromises, existsSync, writeFileSync, constants } from 'fs';
 
 import Q from '../../shared/Q.ts';
-import { CRC16CCITT as CRC } from '../common/CRC.mjs';
+import { CRC16CCITT as CRC } from '../common/CRC.ts';
 import COM from '../common/Com.mjs';
 
-import { CorruptedResourceError } from '../common/Errors.mjs';
+import { CorruptedResourceError } from '../common/Errors.ts';
 import { registry, eventBus } from '../registry.mjs';
 
 let { Con, Sys } = registry;
diff --git a/source/engine/server/Edict.mjs b/source/engine/server/Edict.mjs
index 9a63e050..7e57cf23 100644
--- a/source/engine/server/Edict.mjs
+++ b/source/engine/server/Edict.mjs
@@ -1,7 +1,7 @@
 import Vector from '../../shared/Vector.ts';
 import { SzBuffer, registerSerializableType } from '../network/MSG.ts';
 import * as Protocol from '../network/Protocol.ts';
-import * as Def from '../common/Def.mjs';
+import * as Def from '../common/Def.ts';
 import * as Defs from '../../shared/Defs.ts';
 import { eventBus, registry } from '../registry.mjs';
 import Q from '../../shared/Q.ts';
diff --git a/source/engine/server/Navigation.mjs b/source/engine/server/Navigation.mjs
index 29ab4fe1..40191ce7 100644
--- a/source/engine/server/Navigation.mjs
+++ b/source/engine/server/Navigation.mjs
@@ -5,7 +5,7 @@ import Vector from '../../shared/Vector.ts';
 import Cmd from '../common/Cmd.mjs';
 // import Cmd, { ConsoleCommand } from '../common/Cmd.mjs';
 import Cvar from '../common/Cvar.mjs';
-import { CorruptedResourceError, MissingResourceError } from '../common/Errors.mjs';
+import { CorruptedResourceError, MissingResourceError } from '../common/Errors.ts';
 import { ServerEngineAPI } from '../common/GameAPIs.mjs';
 import { BrushModel } from '../common/Mod.mjs';
 import { MIN_STEP_NORMAL, STEPSIZE } from '../common/Pmove.mjs';
diff --git a/source/engine/server/Progs.mjs b/source/engine/server/Progs.mjs
index 718bc5a3..f289e9c5 100644
--- a/source/engine/server/Progs.mjs
+++ b/source/engine/server/Progs.mjs
@@ -1,7 +1,7 @@
 import Cmd from '../common/Cmd.mjs';
-import { CRC16CCITT } from '../common/CRC.mjs';
+import { CRC16CCITT } from '../common/CRC.ts';
 import Cvar from '../common/Cvar.mjs';
-import { HostError, MissingResourceError } from '../common/Errors.mjs';
+import { HostError, MissingResourceError } from '../common/Errors.ts';
 import Q from '../../shared/Q.ts';
 import Vector from '../../shared/Vector.ts';
 import { eventBus, registry } from '../registry.mjs';
diff --git a/source/engine/server/ProgsAPI.mjs b/source/engine/server/ProgsAPI.mjs
index 9449ee3d..fc5ef06c 100644
--- a/source/engine/server/ProgsAPI.mjs
+++ b/source/engine/server/ProgsAPI.mjs
@@ -1,6 +1,6 @@
 import Vector from '../../shared/Vector.ts';
 import Cmd from '../common/Cmd.mjs';
-import { HostError } from '../common/Errors.mjs';
+import { HostError } from '../common/Errors.ts';
 import { ServerEngineAPI } from '../common/GameAPIs.mjs';
 import { eventBus, registry } from '../registry.mjs';
 import { ED, ServerEdict } from './Edict.mjs';
diff --git a/source/engine/server/Server.mjs b/source/engine/server/Server.mjs
index 9c2080da..2fe6658b 100644
--- a/source/engine/server/Server.mjs
+++ b/source/engine/server/Server.mjs
@@ -3,7 +3,7 @@ import { MoveVars, Pmove } from '../common/Pmove.mjs';
 import Vector from '../../shared/Vector.ts';
 import { SzBuffer } from '../network/MSG.ts';
 import * as Protocol from '../network/Protocol.ts';
-import * as Def from './../common/Def.mjs';
+import * as Def from './../common/Def.ts';
 import Cmd, { ConsoleCommand } from '../common/Cmd.mjs';
 import { ED, ServerEdict } from './Edict.mjs';
 import { EventBus, eventBus, registry } from '../registry.mjs';
diff --git a/test/common/crc.test.mjs b/test/common/crc.test.mjs
new file mode 100644
index 00000000..d8177c94
--- /dev/null
+++ b/test/common/crc.test.mjs
@@ -0,0 +1,16 @@
+import assert from 'node:assert/strict';
+import { describe, test } from 'node:test';
+
+import { CRC16CCITT } from '../../source/engine/common/CRC.ts';
+
+void describe('CRC16CCITT', () => {
+  void test('matches the standard CRC-16-CCITT checksum for 123456789', () => {
+    const input = new TextEncoder().encode('123456789');
+
+    assert.equal(CRC16CCITT.Block(input), 0x29b1);
+  });
+
+  void test('returns the initial seed when hashing an empty block', () => {
+    assert.equal(CRC16CCITT.Block(new Uint8Array(0)), 0xffff);
+  });
+});
diff --git a/test/common/def.test.mjs b/test/common/def.test.mjs
new file mode 100644
index 00000000..d8755f9d
--- /dev/null
+++ b/test/common/def.test.mjs
@@ -0,0 +1,26 @@
+import assert from 'node:assert/strict';
+import { describe, test } from 'node:test';
+
+import { clientConnectionState, defaultBasedir, defaultGame, gamestateVersion, limits, productName } from '../../source/engine/common/Def.ts';
+
+void describe('common definitions', () => {
+  void test('exposes the expected engine identity and defaults', () => {
+    assert.equal(productName, 'The Quake Shack');
+    assert.equal(defaultGame, 'id1');
+    assert.equal(defaultBasedir, 'id1');
+    assert.equal(gamestateVersion, 2);
+  });
+
+  void test('keeps stable numeric limits and connection state values', () => {
+    assert.equal(limits.edicts, 64);
+    assert.equal(limits.clients, 32);
+    assert.equal(limits.dlights, 32);
+    assert.equal(limits.lightstyles, 64);
+    assert.equal(limits.beams, 24);
+    assert.equal(limits.entities, 1024);
+
+    assert.equal(clientConnectionState.disconnected, 0);
+    assert.equal(clientConnectionState.connecting, 1);
+    assert.equal(clientConnectionState.connected, 2);
+  });
+});
diff --git a/test/common/errors.test.mjs b/test/common/errors.test.mjs
new file mode 100644
index 00000000..19e27435
--- /dev/null
+++ b/test/common/errors.test.mjs
@@ -0,0 +1,34 @@
+import assert from 'node:assert/strict';
+import { describe, test } from 'node:test';
+
+import { CorruptedResourceError, HostError, MissingResourceError, NotImplementedError, SysError } from '../../source/engine/common/Errors.ts';
+
+void describe('common errors', () => {
+  void test('MissingResourceError stores the resource and optional cause', () => {
+    const cause = new Error('network failed');
+    const error = new MissingResourceError('gfx/palette.lmp', cause);
+
+    assert.equal(error.name, 'MissingResourceError');
+    assert.equal(error.message, "Couldn't load gfx/palette.lmp");
+    assert.equal(error.resource, 'gfx/palette.lmp');
+    assert.equal(error.error, cause);
+  });
+
+  void test('CorruptedResourceError includes the corruption reason', () => {
+    const error = new CorruptedResourceError('maps/start.bsp', 'invalid binary magic');
+
+    assert.equal(error.name, 'CorruptedResourceError');
+    assert.equal(error.resource, 'maps/start.bsp');
+    assert.equal(error.reason, 'invalid binary magic');
+    assert.equal(error.message, 'maps/start.bsp is corrupted: invalid binary magic');
+  });
+
+  void test('HostError and NotImplementedError preserve their class hierarchy', () => {
+    const hostError = new HostError('host failure');
+    const notImplementedError = new NotImplementedError('missing override');
+
+    assert.equal(hostError.name, 'HostError');
+    assert.equal(notImplementedError.name, 'NotImplementedError');
+    assert.equal(notImplementedError instanceof SysError, true);
+  });
+});

From 0b7b3233ddeb6b532bf254f63661da84db9d7117 Mon Sep 17 00:00:00 2001
From: Christian R <github@chrisnew.de>
Date: Thu, 2 Apr 2026 16:14:44 +0300
Subject: [PATCH 14/67] removed Host.client

---
 source/engine/common/Host.mjs | 120 ++++++++++++++++++----------------
 1 file changed, 64 insertions(+), 56 deletions(-)

diff --git a/source/engine/common/Host.mjs b/source/engine/common/Host.mjs
index b387c757..9e02de8a 100644
--- a/source/engine/common/Host.mjs
+++ b/source/engine/common/Host.mjs
@@ -121,9 +121,13 @@ Host.SendChatMessageToClient = function(client, name, message, direct = false) {
   client.message.writeByte(direct ? 1 : 0);
 };
 
-Host.ClientPrint = function(string) { // FIXME: Host.client
-  Host.client.message.writeByte(Protocol.svc.print);
-  Host.client.message.writeString(string);
+/**
+ * @param {ServerClient} client recipient client
+ * @param {string} string text to send
+ */
+Host.ClientPrint = function(client, string) {
+  client.message.writeByte(Protocol.svc.print);
+  client.message.writeString(string);
 };
 
 Host.BroadcastPrint = function(string) {
@@ -204,16 +208,16 @@ Host.ShutdownServer = function(isCrashShutdown = false) { // TODO: SV duties
   do {
     count = 0;
     for (i = 0; i < SV.svs.maxclients; i++) { // FIXME: this 1is completely broken, it won’t properly close connections
-      Host.client = SV.svs.clients[i];
-      if (Host.client.state < ServerClient.STATE.CONNECTED || Host.client.message.cursize === 0) {
+      const client = SV.svs.clients[i];
+      if (client.state < ServerClient.STATE.CONNECTED || client.message.cursize === 0) {
         continue;
       }
-      if (NET.CanSendMessage(Host.client.netconnection)) {
-        NET.SendMessage(Host.client.netconnection, Host.client.message);
-        Host.client.message.clear();
+      if (NET.CanSendMessage(client.netconnection)) {
+        NET.SendMessage(client.netconnection, client.message);
+        client.message.clear();
         continue;
       }
-      NET.GetMessage(Host.client.netconnection);
+      NET.GetMessage(client.netconnection);
       count++;
     }
     if ((Sys.FloatTime() - start) > 3.0) { // this breaks a loop when the stuff on the top is stuck
@@ -561,7 +565,10 @@ Host.Status_f = function() {
     }
     print = Con.Print;
   } else {
-    print = Host.ClientPrint;
+    const client = this.client;
+    print = (text) => {
+      Host.ClientPrint(client, text);
+    };
   }
   print('hostname: ' + NET.hostname.string + '\n');
   print('address : ' + NET.GetListenAddress() + '\n');
@@ -614,7 +621,7 @@ class HostConsoleCommand extends ConsoleCommand {
    */
   cheat() {
     if (!SV.cheats.value) {
-      Host.ClientPrint('Cheats are not enabled on this server.\n');
+      Host.ClientPrint(this.client, 'Cheats are not enabled on this server.\n');
       return true;
     }
 
@@ -633,9 +640,9 @@ Host.God_f = class extends HostConsoleCommand {
     const client = this.client;
     client.edict.entity.flags ^= Defs.flags.FL_GODMODE;
     if ((client.edict.entity.flags & Defs.flags.FL_GODMODE) === 0) {
-      Host.ClientPrint('godmode OFF\n');
+      Host.ClientPrint(client, 'godmode OFF\n');
     } else {
-      Host.ClientPrint('godmode ON\n');
+      Host.ClientPrint(client, 'godmode ON\n');
     }
   }
 };
@@ -651,9 +658,9 @@ Host.Notarget_f = class extends HostConsoleCommand {
     const client = this.client;
     client.edict.entity.flags ^= Defs.flags.FL_NOTARGET;
     if ((client.edict.entity.flags & Defs.flags.FL_NOTARGET) === 0) {
-      Host.ClientPrint('notarget OFF\n');
+      Host.ClientPrint(client, 'notarget OFF\n');
     } else {
-      Host.ClientPrint('notarget ON\n');
+      Host.ClientPrint(client, 'notarget ON\n');
     }
   }
 };
@@ -670,12 +677,12 @@ Host.Noclip_f = class extends HostConsoleCommand {
     if (client.edict.entity.movetype !== Defs.moveType.MOVETYPE_NOCLIP) {
       Host.noclip_anglehack = true;
       client.edict.entity.movetype = Defs.moveType.MOVETYPE_NOCLIP;
-      Host.ClientPrint('noclip ON\n');
+      Host.ClientPrint(client, 'noclip ON\n');
       return;
     }
     Host.noclip_anglehack = false;
     client.edict.entity.movetype = Defs.moveType.MOVETYPE_WALK;
-    Host.ClientPrint('noclip OFF\n');
+    Host.ClientPrint(client, 'noclip OFF\n');
   }
 };
 
@@ -690,11 +697,11 @@ Host.Fly_f = class extends HostConsoleCommand {
     const client = this.client;
     if (client.edict.entity.movetype !== Defs.moveType.MOVETYPE_FLY) {
       client.edict.entity.movetype = Defs.moveType.MOVETYPE_FLY;
-      Host.ClientPrint('flymode ON\n');
+      Host.ClientPrint(client, 'flymode ON\n');
       return;
     }
     client.edict.entity.movetype = Defs.moveType.MOVETYPE_WALK;
-    Host.ClientPrint('flymode OFF\n');
+    Host.ClientPrint(client, 'flymode OFF\n');
   }
 };
 
@@ -703,7 +710,9 @@ Host.Ping_f = function() {
     return;
   }
 
-  Host.ClientPrint('Client ping times:\n');
+  const recipientClient = this.client;
+
+  Host.ClientPrint(recipientClient, 'Client ping times:\n');
 
   for (let i = 0; i < SV.svs.maxclients; i++) {
     /** @type {ServerClient} */
@@ -719,7 +728,7 @@ Host.Ping_f = function() {
       total += client.ping_times[j];
     }
 
-    Host.ClientPrint((total * 62.5).toFixed(0).padStart(3) + ' ' + client.name + '\n');
+    Host.ClientPrint(recipientClient, (total * 62.5).toFixed(0).padStart(3) + ' ' + client.name + '\n');
   }
 };
 
@@ -822,7 +831,7 @@ Host.Changelevel_f = function(mapname) {
 
 Host.Restart_f = function() {
   if ((SV.server.active) && (registry.isDedicatedServer || !CL.cls.demoplayback && !this.client)) {
-    Cmd.ExecuteString(`map ${SV.server.mapname}`);
+    void Cmd.ExecuteString(`map ${SV.server.mapname}`);
   }
 };
 
@@ -1098,7 +1107,7 @@ Host.Say_f = function(teamonly, message) {
     return;
   }
 
-  const save = Host.client;
+  const sender = this.client;
 
   if (message.length > 140) {
     message = message.substring(0, 140) + '...';
@@ -1109,15 +1118,13 @@ Host.Say_f = function(teamonly, message) {
     if (client.state < ServerClient.STATE.CONNECTED) {
       continue;
     }
-    if ((Host.teamplay.value !== 0) && (teamonly === true) && (client.entity.team !== save.entity.team)) { // Legacy cvars
+    if ((Host.teamplay.value !== 0) && (teamonly === true) && (client.entity.team !== sender.entity.team)) { // Legacy cvars
       continue;
     }
-    Host.SendChatMessageToClient(client, save.name, message, false);
+    Host.SendChatMessageToClient(client, sender.name, message, false);
   }
 
-  Host.client = save; // unsure whether I removed it or not
-
-  Con.Print(`${save.name}: ${message}\n`);
+  Con.Print(`${sender.name}: ${message}\n`);
 };
 
 Host.Say_Team_f = function(message) {
@@ -1148,7 +1155,7 @@ Host.Tell_f = function(recipient, message) {
     message = message.substring(0, 140) + '...';
   }
 
-  const save = Host.client;
+  const sender = this.client;
   for (let i = 0; i < SV.svs.maxclients; i++) {
     const client = SV.svs.clients[i];
     if (client.state < ServerClient.STATE.CONNECTED) {
@@ -1157,14 +1164,13 @@ Host.Tell_f = function(recipient, message) {
     if (client.name.toLowerCase() !== recipient.toLowerCase()) {
       continue;
     }
-    Host.SendChatMessageToClient(client, save.name, message, true);
-    Host.SendChatMessageToClient(Host.client, save.name, message, true);
+    Host.SendChatMessageToClient(client, sender.name, message, true);
+    Host.SendChatMessageToClient(sender, sender.name, message, true);
     break;
   }
-  Host.client = save;
 };
 
-Host.Color_f = function(...argv) { // signon 2, step 2 // FIXME: Host.client
+Host.Color_f = function(...argv) { // signon 2, step 2
   Con.DPrint(`Host.Color_f: ${this.client}\n`);
   if (argv.length <= 1) {
     Con.Print('"color" is "' + (CL.color.value >> 4) + ' ' + (CL.color.value & 15) + '"\ncolor <0-13> [0-13]\n');
@@ -1213,7 +1219,7 @@ Host.Kill_f = function() {
 
   const client = this.client;
   if (client.edict.entity.health <= 0.0) {
-    Host.ClientPrint('Can\'t suicide -- already dead!\n');
+    Host.ClientPrint(client, 'Can\'t suicide -- already dead!\n');
     return;
   }
 
@@ -1226,12 +1232,14 @@ Host.Pause_f = function() {
     return;
   }
 
+  const client = this.client;
+
   if (Host.pausable.value === 0) {
-    Host.ClientPrint('Pause not allowed.\n');
+    Host.ClientPrint(client, 'Pause not allowed.\n');
     return;
   }
   SV.server.paused = !SV.server.paused;
-  Host.BroadcastPrint(Host.client.name + (SV.server.paused === true ? ' paused the game\n' : ' unpaused the game\n'));
+  Host.BroadcastPrint(client.name + (SV.server.paused === true ? ' paused the game\n' : ' unpaused the game\n'));
   SV.server.reliable_datagram.writeByte(Protocol.svc.setpause);
   SV.server.reliable_datagram.writeByte(SV.server.paused === true ? 1 : 0);
 };
@@ -1370,7 +1378,7 @@ Host.Begin_f = function() {  // signon 3, step 1
   }
 };
 
-Host.Kick_f = function() { // FIXME: Host.client
+Host.Kick_f = function() {
   const argv = this.argv;
   if (!this.client) {
     if (!SV.server.active) {
@@ -1381,9 +1389,11 @@ Host.Kick_f = function() { // FIXME: Host.client
   if (argv.length < 2) {
     return;
   }
-  const save = Host.client;
   const s = argv[1].toLowerCase();
+  const invokingClient = this.client;
   let i; let byNumber = false;
+  let targetClient = /** @type {ServerClient | null} */ (null);
+
   if ((argv.length >= 3) && (s === '#')) {
     i = Q.atoi(argv[2]) - 1;
     if ((i < 0) || (i >= SV.svs.maxclients)) {
@@ -1392,38 +1402,35 @@ Host.Kick_f = function() { // FIXME: Host.client
     if (SV.svs.clients[i].state !== ServerClient.STATE.SPAWNED) {
       return;
     }
-    Host.client = SV.svs.clients[i];
+    targetClient = SV.svs.clients[i];
     byNumber = true;
   } else {
     for (i = 0; i < SV.svs.maxclients; i++) {
-      Host.client = SV.svs.clients[i];
-      if (Host.client.state < ServerClient.STATE.CONNECTED) {
+      const client = SV.svs.clients[i];
+      if (client.state < ServerClient.STATE.CONNECTED) {
         continue;
       }
-      if (Host.client.name.toLowerCase() === s) {
+      if (client.name.toLowerCase() === s) {
+        targetClient = client;
         break;
       }
     }
   }
-  if (i >= SV.svs.maxclients) {
-    Host.client = save;
+  if (targetClient === null) {
     return;
   }
-  if (Host.client === save) {
+  if (targetClient === invokingClient) {
     return;
   }
   let who;
-  if (!this.client) {
+  if (!invokingClient) {
     if (registry.isDedicatedServer) {
       who = NET.hostname.string;
     } else {
       who = CL.name.string;
     }
   } else {
-    if (Host.client === save) {
-      return;
-    }
-    who = save.name;
+    who = invokingClient.name;
   }
   let message;
   if (argv.length >= 3) {
@@ -1448,8 +1455,7 @@ Host.Kick_f = function() { // FIXME: Host.client
     }
     dropReason = 'Kicked by ' + who + ': ' + message.data.substring(p);
   }
-  Host.DropClient(Host.client, false, dropReason);
-  Host.client = save;
+  Host.DropClient(targetClient, false, dropReason);
 };
 
 Host.Give_f = class extends HostConsoleCommand { // TODO: move to game
@@ -1466,15 +1472,17 @@ Host.Give_f = class extends HostConsoleCommand { // TODO: move to game
       return;
     }
 
+    const client = this.client;
+
     if (!classname) {
-      Host.ClientPrint('give <classname>\n');
+      Host.ClientPrint(client, 'give <classname>\n');
       return;
     }
 
-    const player = this.client.edict;
+    const player = client.edict;
 
     if (!classname.startsWith('item_') && !classname.startsWith('weapon_')) {
-      Host.ClientPrint('Only entity classes item_* and weapon_* are allowed!\n');
+      Host.ClientPrint(client, 'Only entity classes item_* and weapon_* are allowed!\n');
       return;
     }
 
@@ -1493,7 +1501,7 @@ Host.Give_f = class extends HostConsoleCommand { // TODO: move to game
       const origin = trace.point.subtract(forward.multiply(16.0)).add(new Vector(0.0, 0.0, 16.0));
 
       if (![content.CONTENT_EMPTY, content.CONTENT_WATER].includes(ServerEngineAPI.DetermineStaticWorldContents(origin))) {
-        Host.ClientPrint('Item would spawn out of world!\n');
+        Host.ClientPrint(client, 'Item would spawn out of world!\n');
         return;
       }
 

From 8d8fc82ac020a66da290ec6bf6c67f8d973bb173 Mon Sep 17 00:00:00 2001
From: Christian R <github@chrisnew.de>
Date: Thu, 2 Apr 2026 16:36:55 +0300
Subject: [PATCH 15/67] TS: common/Cmd, common/Cvar

---
 source/engine/client/CDAudio.mjs              |   4 +-
 source/engine/client/CL.mjs                   |   4 +-
 source/engine/client/Chase.mjs                |   2 +-
 source/engine/client/ClientConnection.mjs     |   4 +-
 source/engine/client/ClientInput.mjs          |   4 +-
 source/engine/client/ClientLifecycle.mjs      |   4 +-
 .../client/ClientServerCommandHandlers.mjs    |   2 +-
 source/engine/client/GL.mjs                   |   4 +-
 source/engine/client/IN.mjs                   |   2 +-
 source/engine/client/Key.mjs                  |   4 +-
 source/engine/client/Menu.mjs                 |   4 +-
 source/engine/client/R.mjs                    |   4 +-
 source/engine/client/SCR.mjs                  |   4 +-
 source/engine/client/Sbar.mjs                 |   4 +-
 source/engine/client/Sound.mjs                |   4 +-
 source/engine/client/Tools.mjs                |   2 +-
 source/engine/client/V.mjs                    |   4 +-
 source/engine/client/VID.mjs                  |   2 +-
 source/engine/client/menu/MenuItem.mjs        |   2 +-
 source/engine/client/menu/Multiplayer.mjs     |   2 +-
 source/engine/client/renderer/PostProcess.mjs |   2 +-
 source/engine/client/renderer/ShadowMap.mjs   |   2 +-
 source/engine/common/Cmd.mjs                  | 398 ----------------
 source/engine/common/Cmd.ts                   | 424 ++++++++++++++++++
 source/engine/common/Com.mjs                  |   4 +-
 source/engine/common/Console.mjs              |   4 +-
 source/engine/common/Cvar.mjs                 | 404 -----------------
 source/engine/common/Cvar.ts                  | 326 ++++++++++++++
 source/engine/common/GameAPIs.mjs             |   4 +-
 source/engine/common/Host.mjs                 |   4 +-
 source/engine/common/Pmove.mjs                |   2 +-
 source/engine/network/ConsoleCommands.ts      |   2 +-
 source/engine/network/Network.ts              |   4 +-
 source/engine/network/NetworkDrivers.ts       |   2 +-
 source/engine/server/Edict.mjs                |   2 +-
 source/engine/server/Navigation.mjs           |   6 +-
 source/engine/server/Progs.mjs                |   4 +-
 source/engine/server/ProgsAPI.mjs             |   2 +-
 source/engine/server/Server.mjs               |   4 +-
 source/engine/server/ServerMessages.mjs       |   2 +-
 source/engine/server/Sys.mjs                  |   8 +-
 source/shared/GameInterfaces.ts               |   2 +-
 test/common/cmd.test.mjs                      | 141 ++++++
 test/common/cvar.test.mjs                     | 114 +++++
 test/physics/fixtures.mjs                     |  29 +-
 45 files changed, 1091 insertions(+), 871 deletions(-)
 delete mode 100644 source/engine/common/Cmd.mjs
 create mode 100644 source/engine/common/Cmd.ts
 delete mode 100644 source/engine/common/Cvar.mjs
 create mode 100644 source/engine/common/Cvar.ts
 create mode 100644 test/common/cmd.test.mjs
 create mode 100644 test/common/cvar.test.mjs

diff --git a/source/engine/client/CDAudio.mjs b/source/engine/client/CDAudio.mjs
index e9f32f97..51794b70 100644
--- a/source/engine/client/CDAudio.mjs
+++ b/source/engine/client/CDAudio.mjs
@@ -1,5 +1,5 @@
-import Cmd from '../common/Cmd.mjs';
-import Cvar from '../common/Cvar.mjs';
+import Cmd from '../common/Cmd.ts';
+import Cvar from '../common/Cvar.ts';
 import Q from '../../shared/Q.ts';
 import { eventBus, registry } from '../registry.mjs';
 
diff --git a/source/engine/client/CL.mjs b/source/engine/client/CL.mjs
index ca45f4cf..87010c84 100644
--- a/source/engine/client/CL.mjs
+++ b/source/engine/client/CL.mjs
@@ -1,8 +1,8 @@
 import Q from '../../shared/Q.ts';
 import * as Def from '../common/Def.ts';
 import * as Protocol from '../network/Protocol.ts';
-import Cmd, { ConsoleCommand } from '../common/Cmd.mjs';
-import Cvar from '../common/Cvar.mjs';
+import Cmd, { ConsoleCommand } from '../common/Cmd.ts';
+import Cvar from '../common/Cvar.ts';
 import { Pmove, PmovePlayer } from '../common/Pmove.mjs';
 import { eventBus, registry } from '../registry.mjs';
 import { gameCapabilities, solid } from '../../shared/Defs.ts';
diff --git a/source/engine/client/Chase.mjs b/source/engine/client/Chase.mjs
index dcdeed65..4c4c9ca2 100644
--- a/source/engine/client/Chase.mjs
+++ b/source/engine/client/Chase.mjs
@@ -1,5 +1,5 @@
 import Vector from '../../shared/Vector.ts';
-import Cvar from '../common/Cvar.mjs';
+import Cvar from '../common/Cvar.ts';
 import { eventBus, registry } from '../registry.mjs';
 
 let { CL, R, SV } = registry;
diff --git a/source/engine/client/ClientConnection.mjs b/source/engine/client/ClientConnection.mjs
index 1d949f46..bf2a53b4 100644
--- a/source/engine/client/ClientConnection.mjs
+++ b/source/engine/client/ClientConnection.mjs
@@ -1,7 +1,7 @@
 import * as Protocol from '../network/Protocol.ts';
 import { HostError } from '../common/Errors.ts';
-import Cvar from '../common/Cvar.mjs';
-import Cmd from '../common/Cmd.mjs';
+import Cvar from '../common/Cvar.ts';
+import Cmd from '../common/Cmd.ts';
 import ClientInput from './ClientInput.mjs';
 import { clientRuntimeState, clientStaticState } from './ClientState.mjs';
 import { eventBus, registry } from '../registry.mjs';
diff --git a/source/engine/client/ClientInput.mjs b/source/engine/client/ClientInput.mjs
index ebe671d4..2f5afac6 100644
--- a/source/engine/client/ClientInput.mjs
+++ b/source/engine/client/ClientInput.mjs
@@ -2,7 +2,7 @@ import Vector from '../../shared/Vector.ts';
 import * as Protocol from '../network/Protocol.ts';
 import Q from '../../shared/Q.ts';
 import { SzBuffer } from '../network/MSG.ts';
-import Cmd from '../common/Cmd.mjs';
+import Cmd from '../common/Cmd.ts';
 import { eventBus, registry } from '../registry.mjs';
 import { HostError } from '../common/Errors.ts';
 
@@ -46,6 +46,7 @@ export const kbuttons = new Array(Object.keys(kbutton).length);
 export default class ClientInput {
   static impulse = 0;
 
+  /** @this {import('../common/Cmd.ts').ConsoleCommand} */
   static KeyDown_f(cmd) { // private
     let b = kbutton[this.command.substring(1)];
     if (b === undefined) {
@@ -78,6 +79,7 @@ export default class ClientInput {
     }
   }
 
+  /** @this {import('../common/Cmd.ts').ConsoleCommand} */
   static KeyUp_f(cmd) { // private
     let b = kbutton[this.command.substring(1)];
 
diff --git a/source/engine/client/ClientLifecycle.mjs b/source/engine/client/ClientLifecycle.mjs
index 53b31cc2..78324166 100644
--- a/source/engine/client/ClientLifecycle.mjs
+++ b/source/engine/client/ClientLifecycle.mjs
@@ -1,5 +1,5 @@
-import Cvar from '../common/Cvar.mjs';
-import Cmd, { ConsoleCommand } from '../common/Cmd.mjs';
+import Cvar from '../common/Cvar.ts';
+import Cmd, { ConsoleCommand } from '../common/Cmd.ts';
 import * as Def from '../common/Def.ts';
 import { gameCapabilities } from '../../shared/Defs.ts';
 import ClientInput from './ClientInput.mjs';
diff --git a/source/engine/client/ClientServerCommandHandlers.mjs b/source/engine/client/ClientServerCommandHandlers.mjs
index 6c295778..34b0c4ce 100644
--- a/source/engine/client/ClientServerCommandHandlers.mjs
+++ b/source/engine/client/ClientServerCommandHandlers.mjs
@@ -1,6 +1,6 @@
 import * as Protocol from '../network/Protocol.ts';
 import * as Def from '../common/Def.ts';
-import Cmd from '../common/Cmd.mjs';
+import Cmd from '../common/Cmd.ts';
 import { HostError } from '../common/Errors.ts';
 import { gameCapabilities } from '../../shared/Defs.ts';
 import Vector from '../../shared/Vector.ts';
diff --git a/source/engine/client/GL.mjs b/source/engine/client/GL.mjs
index 6fc4ebd8..dad99bfc 100644
--- a/source/engine/client/GL.mjs
+++ b/source/engine/client/GL.mjs
@@ -1,5 +1,5 @@
-import Cmd, { ConsoleCommand } from '../common/Cmd.mjs';
-import Cvar from '../common/Cvar.mjs';
+import Cmd, { ConsoleCommand } from '../common/Cmd.ts';
+import Cvar from '../common/Cvar.ts';
 import { MissingResourceError } from '../common/Errors.ts';
 import { WadLumpTexture } from '../common/W.mjs';
 import { eventBus, registry } from '../registry.mjs';
diff --git a/source/engine/client/IN.mjs b/source/engine/client/IN.mjs
index e82212f6..a24a4128 100644
--- a/source/engine/client/IN.mjs
+++ b/source/engine/client/IN.mjs
@@ -1,5 +1,5 @@
 import { K } from '../../shared/Keys.ts';
-import Cvar from '../common/Cvar.mjs';
+import Cvar from '../common/Cvar.ts';
 import { eventBus, registry } from '../registry.mjs';
 import { kbutton, kbuttons } from './ClientInput.mjs';
 import VID from './VID.mjs';
diff --git a/source/engine/client/Key.mjs b/source/engine/client/Key.mjs
index 0b49fce5..908aebf9 100644
--- a/source/engine/client/Key.mjs
+++ b/source/engine/client/Key.mjs
@@ -1,7 +1,7 @@
 import { K } from '../../shared/Keys.ts';
 import Vector from '../../shared/Vector.ts';
-import Cmd from '../common/Cmd.mjs';
-import Cvar from '../common/Cvar.mjs';
+import Cmd from '../common/Cmd.ts';
+import Cvar from '../common/Cvar.ts';
 import { clientConnectionState } from '../common/Def.ts';
 import { registry, eventBus } from '../registry.mjs';
 
diff --git a/source/engine/client/Menu.mjs b/source/engine/client/Menu.mjs
index 6a7bc2c0..39f00458 100644
--- a/source/engine/client/Menu.mjs
+++ b/source/engine/client/Menu.mjs
@@ -1,6 +1,6 @@
 import { K } from '../../shared/Keys.ts';
-import Cmd from '../common/Cmd.mjs';
-import Cvar from '../common/Cvar.mjs';
+import Cmd from '../common/Cmd.ts';
+import Cvar from '../common/Cvar.ts';
 import { clientConnectionState } from '../common/Def.ts';
 import { eventBus, registry } from '../registry.mjs';
 import ClientLifecycle from './ClientLifecycle.mjs';
diff --git a/source/engine/client/R.mjs b/source/engine/client/R.mjs
index 9a1b6140..4ce00765 100644
--- a/source/engine/client/R.mjs
+++ b/source/engine/client/R.mjs
@@ -1,6 +1,6 @@
 import Vector from '../../shared/Vector.ts';
-import Cvar from '../common/Cvar.mjs';
-import Cmd from '../common/Cmd.mjs';
+import Cvar from '../common/Cvar.ts';
+import Cmd from '../common/Cmd.ts';
 import * as Def from '../common/Def.ts';
 
 import { eventBus, registry } from '../registry.mjs';
diff --git a/source/engine/client/SCR.mjs b/source/engine/client/SCR.mjs
index 8990b4de..bbbfc261 100644
--- a/source/engine/client/SCR.mjs
+++ b/source/engine/client/SCR.mjs
@@ -1,8 +1,8 @@
 /* global  */
 
 import { gameCapabilities } from '../../shared/Defs.ts';
-import Cmd from '../common/Cmd.mjs';
-import Cvar from '../common/Cvar.mjs';
+import Cmd from '../common/Cmd.ts';
+import Cvar from '../common/Cvar.ts';
 import { clientConnectionState } from '../common/Def.ts';
 import { eventBus, registry } from '../registry.mjs';
 import GL from './GL.mjs';
diff --git a/source/engine/client/Sbar.mjs b/source/engine/client/Sbar.mjs
index 2f1921dc..f6edb24a 100644
--- a/source/engine/client/Sbar.mjs
+++ b/source/engine/client/Sbar.mjs
@@ -1,10 +1,10 @@
 /* globalx Sbar Draw, COM, Host, CL, Cmd, SCR, Def, VID */
 
-import Cmd from '../common/Cmd.mjs';
+import Cmd from '../common/Cmd.ts';
 import { eventBus, registry } from '../registry.mjs';
 import VID from './VID.mjs';
 import * as Def from '../common/Def.ts';
-import Cvar from '../common/Cvar.mjs';
+import Cvar from '../common/Cvar.ts';
 
 const Sbar = {};
 
diff --git a/source/engine/client/Sound.mjs b/source/engine/client/Sound.mjs
index 80356041..d8bd4097 100644
--- a/source/engine/client/Sound.mjs
+++ b/source/engine/client/Sound.mjs
@@ -1,6 +1,6 @@
 import Vector from '../../shared/Vector.ts';
-import Cmd from '../common/Cmd.mjs';
-import Cvar from '../common/Cvar.mjs';
+import Cmd from '../common/Cmd.ts';
+import Cvar from '../common/Cvar.ts';
 import Q from '../../shared/Q.ts';
 import { eventBus, registry } from '../registry.mjs';
 
diff --git a/source/engine/client/Tools.mjs b/source/engine/client/Tools.mjs
index b501461a..f3d1ec8e 100644
--- a/source/engine/client/Tools.mjs
+++ b/source/engine/client/Tools.mjs
@@ -1,4 +1,4 @@
-import Cmd, { ConsoleCommand } from '../common/Cmd.mjs';
+import Cmd, { ConsoleCommand } from '../common/Cmd.ts';
 import W, { WadFileInterface } from '../common/W.mjs';
 import { eventBus, registry } from '../registry.mjs';
 
diff --git a/source/engine/client/V.mjs b/source/engine/client/V.mjs
index 6560ee4d..3f2b84af 100644
--- a/source/engine/client/V.mjs
+++ b/source/engine/client/V.mjs
@@ -1,7 +1,7 @@
 import Vector from '../../shared/Vector.ts';
 import { content, gameCapabilities } from '../../shared/Defs.ts';
-import Cmd from '../common/Cmd.mjs';
-import Cvar from '../common/Cvar.mjs';
+import Cmd from '../common/Cmd.ts';
+import Cvar from '../common/Cvar.ts';
 import * as Def from '../common/Def.ts';
 import Q from '../../shared/Q.ts';
 import { eventBus, registry } from '../registry.mjs';
diff --git a/source/engine/client/VID.mjs b/source/engine/client/VID.mjs
index 0774e3ee..af99768e 100644
--- a/source/engine/client/VID.mjs
+++ b/source/engine/client/VID.mjs
@@ -1,4 +1,4 @@
-import Cmd, { ConsoleCommand } from '../common/Cmd.mjs';
+import Cmd, { ConsoleCommand } from '../common/Cmd.ts';
 import { eventBus } from '../registry.mjs';
 
 class FullscreenCommand extends ConsoleCommand {
diff --git a/source/engine/client/menu/MenuItem.mjs b/source/engine/client/menu/MenuItem.mjs
index 582561cf..4e7df0a5 100644
--- a/source/engine/client/menu/MenuItem.mjs
+++ b/source/engine/client/menu/MenuItem.mjs
@@ -1,6 +1,6 @@
 import Q from '../../../shared/Q.ts';
 import { K } from '../../../shared/Keys.ts';
-import Cvar from '../../common/Cvar.mjs';
+import Cvar from '../../common/Cvar.ts';
 import { eventBus, registry } from '../../registry.mjs';
 
 let { S, M, Host } = registry;
diff --git a/source/engine/client/menu/Multiplayer.mjs b/source/engine/client/menu/Multiplayer.mjs
index 3060d240..96047af2 100644
--- a/source/engine/client/menu/Multiplayer.mjs
+++ b/source/engine/client/menu/Multiplayer.mjs
@@ -1,6 +1,6 @@
 import PR from '../../server/Progs.mjs';
 import { K } from '../../../shared/Keys.ts';
-import Cmd from '../../common/Cmd.mjs';
+import Cmd from '../../common/Cmd.ts';
 import { eventBus, registry } from '../../registry.mjs';
 import { Action, Label, Spacer } from './MenuItem.mjs';
 import { MenuPage, VerticalLayout } from './MenuPage.mjs';
diff --git a/source/engine/client/renderer/PostProcess.mjs b/source/engine/client/renderer/PostProcess.mjs
index af4aaa55..a933372c 100644
--- a/source/engine/client/renderer/PostProcess.mjs
+++ b/source/engine/client/renderer/PostProcess.mjs
@@ -1,5 +1,5 @@
 import GL from '../GL.mjs';
-import Cvar from '../../common/Cvar.mjs';
+import Cvar from '../../common/Cvar.ts';
 import VID from '../VID.mjs';
 import PostProcessEffect from './PostProcessEffect.mjs';
 import { eventBus } from '../../registry.mjs';
diff --git a/source/engine/client/renderer/ShadowMap.mjs b/source/engine/client/renderer/ShadowMap.mjs
index 6377792f..7985a7b8 100644
--- a/source/engine/client/renderer/ShadowMap.mjs
+++ b/source/engine/client/renderer/ShadowMap.mjs
@@ -1,5 +1,5 @@
 import GL from '../GL.mjs';
-import Cvar from '../../common/Cvar.mjs';
+import Cvar from '../../common/Cvar.ts';
 import { limits } from '../../common/Def.ts';
 import { eventBus, registry } from '../../registry.mjs';
 import { materialFlags } from './Materials.mjs';
diff --git a/source/engine/common/Cmd.mjs b/source/engine/common/Cmd.mjs
deleted file mode 100644
index 99e10dc0..00000000
--- a/source/engine/common/Cmd.mjs
+++ /dev/null
@@ -1,398 +0,0 @@
-import { AsyncFunction } from '../../shared/Q.ts';
-import * as Protocol from '../network/Protocol.ts';
-import { eventBus, registry } from '../registry.mjs';
-import Cvar from './Cvar.mjs';
-import { clientConnectionState } from './Def.ts';
-
-let { CL, COM, Con, Host } = registry;
-
-eventBus.subscribe('registry.frozen', () => {
-  CL = registry.CL;
-  COM = registry.COM;
-  Con = registry.Con;
-  Host = registry.Host;
-});
-
-/**
- * Console Command.
- */
-export class ConsoleCommand {
-  /** @type {?import('../server/Edict.mjs').ServerClient} Invoking server client. Unset, when called locally. */
-  client = null;
-  /** @type {string?} The name that was used to execute this command. */
-  command = null;
-  /** @type {string?} Full command line. */
-  args = null;
-  /** @type {string[]} Arguments including the name. */
-  argv = [];
-
-  /** @returns {void|Promise<void>} Hint: function can be async */
-  run() {
-    console.assert(false, 'ConsoleCommand.run() must be overridden');
-  }
-
-  /**
-   * Forwards a console command to the server.
-   * To forward a console command, use `this.forward();`.
-   * NOTE: Forwarded commands must be allowlisted in `SV.ReadClientMessage`.
-   * @returns {boolean} true, if forwarded
-   */
-  forward() {
-    if (this.client !== null) {
-      return false;
-    }
-
-    if (registry.isDedicatedServer) {
-      return true;
-    }
-
-    console.assert(this.client === null, 'must be executed locally');
-
-    const argv = this.argv;
-    let command = this.command;
-
-    if (command && command.toLowerCase() === 'cmd') {
-      command = argv.shift() || null;
-    }
-
-    if (command === null) {
-      Con.Print('Usage: cmd <command> <args>\n');
-      return true;
-    }
-
-    console.assert(CL !== null, 'CL must be available');
-
-    if (CL.cls.state !== clientConnectionState.connected) {
-      Con.Print('Can\'t "' + command + '", not connected\n');
-      return true;
-    }
-
-    if (CL.cls.demoplayback === true) {
-      return true;
-    }
-
-    // send command to the server in behalf of the client
-    CL.cls.message.writeByte(Protocol.clc.stringcmd);
-    CL.cls.message.writeString(this.args);
-
-    return true;
-  }
-};
-
-/**
- * Just the naked console command context.
- */
-class AnonymousConsoleCommand extends ConsoleCommand {
-  run() {
-    console.assert(false, 'AnonymousConsoleCommand.run() cannot be used');
-  }
-
-  forward() {
-    return false;
-  }
-};
-
-class ForwardCommand extends ConsoleCommand {
-  run() {
-    this.forward();
-  }
-};
-
-class ExecSlot {
-  constructor(/** @type {string} */ filename) {
-    this.filename = filename;
-    this.content = /** @type {string|null} */ (null);
-    this.isReady = false;
-  }
-};
-
-export default class Cmd {
-  static alias = /** @type {{ name: string, value: string }[]} */([]);
-  static functions = /** @type {{ name: string, command: typeof ConsoleCommand }[]} */([]);
-  static text = '';
-  static wait = false;
-
-  static #execSlots = /** @type {ExecSlot[]} */([]);
-
-  static HasPendingCommands() {
-    return this.wait === true || this.text.length > 0 || this.#execSlots.length > 0;
-  }
-
-  static Wait_f() {
-    Cmd.wait = true;
-  }
-
-  static Execute() {
-    // go through all pending exec slots
-    while (this.#execSlots.length > 0) {
-      const slot = this.#execSlots[0];
-
-      if (!slot.isReady) {
-        // as long as the first exec slot is not ready, we
-        // cannot proceed with any command, we want to keep order
-        return;
-      }
-
-      if (slot.content !== null) {
-        Con.DPrint('execing ' + slot.filename + '\n');
-        Cmd.text += slot.content;
-      } else {
-        Con.PrintWarning('couldn\'t exec ' + slot.filename + '\n');
-      }
-
-      this.#execSlots.shift();
-
-      // if the exec caused a wait, we stop processing here
-      if (Cmd.wait) {
-        Cmd.wait = false;
-        return;
-      }
-    }
-
-    let line = ''; let quotes = false;
-    while (Cmd.text.length !== 0) {
-      const c = Cmd.text[0];
-      Cmd.text = Cmd.text.substring(1);
-      if (c === '"') {
-        quotes = !quotes;
-        line += '"';
-        continue;
-      }
-      if (((quotes === false) && (c === ';')) || (c === '\n')) {
-        if (line.length === 0) {
-          continue;
-        }
-        Cmd.ExecuteString(line);
-        if (Cmd.wait) {
-          Cmd.wait = false;
-          return;
-        }
-        line = '';
-        continue;
-      }
-      line += c;
-    }
-    Cmd.text = '';
-  }
-
-  /**
-   * Executes all console commands passed by the command line.
-   */
-  static StuffCmds_f() {
-    let s = false; let build = '';
-    for (let i = 0; i < COM.argv.length; i++) {
-      const c = COM.argv[i][0];
-      if (s === true) {
-        if (c === '+') {
-          build += ('\n' + COM.argv[i].substring(1) + ' ');
-          continue;
-        }
-        if (c === '-') {
-          s = false;
-          build += '\n';
-          continue;
-        }
-        build += (COM.argv[i] + ' ');
-        continue;
-      }
-      if (c === '+') {
-        s = true;
-        build += (COM.argv[i].substring(1) + ' ');
-      }
-    }
-    if (build.length !== 0) {
-      Cmd.text = build + '\n' + Cmd.text;
-    }
-  }
-
-  static Exec_f = class ExecConsoleCommand extends ConsoleCommand {
-    async run(filename) {
-      if (!filename) {
-        Con.Print('exec <filename> : execute a script file\n');
-        return;
-      }
-      const slot = new ExecSlot(filename);
-      Cmd.#execSlots.push(slot);
-      const f = await COM.LoadTextFile(filename);
-      slot.isReady = true;
-      slot.content = f;
-    }
-  };
-
-  static Echo_f = class EchoConsoleCommand extends ConsoleCommand {
-    run() {
-      Con.Print(`${this.args.substring(this.argv[0].length + 1)}\n`);
-    }
-  };
-
-  static Alias_f(...argv) {
-    if (argv.length <= 1) {
-      Con.Print('Current alias commands:\n');
-      for (let i = 0; i < Cmd.alias.length; i++) {
-        Con.Print(Cmd.alias[i].name + ' : ' + Cmd.alias[i].value + '\n');
-      }
-    }
-    let value = '';
-    for (let i = 0; i < Cmd.alias.length; i++) {
-      if (Cmd.alias[i].name === argv[1]) {
-        break;
-      }
-    }
-    for (let j = 2; j < argv.length; j++) {
-      value += argv[j];
-      if (j !== argv.length) {
-        value += ' ';
-      }
-    }
-    Cmd.alias.push({ name: argv[1], value: value + '\n' });
-  }
-
-  static Init() {
-    Cmd.functions.length = 0;
-
-    Cmd.AddCommand('stuffcmds', Cmd.StuffCmds_f);
-    Cmd.AddCommand('exec', Cmd.Exec_f);
-    Cmd.AddCommand('echo', Cmd.Echo_f);
-    Cmd.AddCommand('alias', Cmd.Alias_f);
-    Cmd.AddCommand('cmd', ForwardCommand);
-    Cmd.AddCommand('wait', Cmd.Wait_f);
-  }
-
-  static Shutdown() {
-    Cmd.functions.length = 0;
-  }
-
-  static TokenizeString(text) {
-    const argv = [];
-    let i; let c;
-    while (true) {
-      for (i = 0; i < text.length; i++) {
-        c = text.charCodeAt(i);
-        if ((c > 32) || (c === 10)) {
-          break;
-        }
-      }
-      if ((text.charCodeAt(i) === 10) || (i >= text.length)) {
-        break;
-      }
-      const parsed = COM.Parse(text);
-      if (parsed.data === null) {
-        break;
-      }
-      text = parsed.data;
-      argv.push(parsed.token);
-    }
-    return argv;
-  }
-
-  static HasCommand(name) {
-    for (let i = 0; i < Cmd.functions.length; i++) {
-      if (Cmd.functions[i].name === name) {
-        return true;
-      }
-    }
-
-    return false;
-  }
-
-  static AddCommand(name, command) {
-    console.assert(Cvar.FindVar(name) === null, 'command name must not be taken by a cvar', name);
-
-    for (let i = 0; i < Cmd.functions.length; i++) {
-      if (Cmd.functions[i].name === name) {
-        Con.Print('Cmd.AddCommand: ' + name + ' already defined\n');
-        return;
-      }
-    }
-
-    if (command.prototype instanceof ConsoleCommand) {
-      Cmd.functions.push({ name: name, command: command });
-    } else if (typeof command === 'function') {
-      // if the command is a function, wrap it into a ConsoleCommand
-      Cmd.functions.push({ name: name, command: class extends ConsoleCommand {
-        run(...args) {
-          command.apply(this, args);
-        }
-      }});
-    }
-  }
-
-  static CompleteCommand(partial) {
-    if (!partial) {
-      return null;
-    }
-
-    for (let i = 0; i < Cmd.functions.length; i++) {
-      if (Cmd.functions[i].name.startsWith(partial)) {
-        return Cmd.functions[i].name;
-      }
-    }
-
-    return null;
-  }
-
-  static ExecuteString(text, client = null) {
-    const argv = Cmd.TokenizeString(text);
-
-    if (argv.length === 0) {
-      return;
-    }
-
-    const cmdname = argv[0].toLowerCase();
-    const cmdargs = argv.slice(1);
-
-    // check commands
-    for (let i = 0; i < Cmd.functions.length; i++) {
-      if (Cmd.functions[i].name === cmdname) {
-        /** @type {ConsoleCommand} */
-        const handler = new Cmd.functions[i].command();
-        handler.client = client;
-        handler.args = text;
-        handler.command = cmdname;
-        handler.argv = argv;
-
-        if (handler.run instanceof AsyncFunction) {
-          handler.run.apply(handler, cmdargs).catch((err) => {
-            Con.PrintError(`Error executing command "${cmdname}":\n${err?.message || err}\n`);
-          });
-          return;
-        }
-
-        // Temporarily set Host.client for backward compatibility with commands that still use it
-        const savedHostClient = Host.client;
-        if (client) {
-          Host.client = client;
-        }
-        try {
-          handler.run.apply(handler, cmdargs);
-        } finally {
-          if (client) {
-            Host.client = savedHostClient;
-          }
-        }
-        return;
-      }
-    }
-
-    // check aliases
-    for (let i = 0; i < Cmd.alias.length; i++) {
-      if (Cmd.alias[i].name === cmdname) {
-        Cmd.text = Cmd.alias[i].value + Cmd.text;
-        return;
-      }
-    }
-
-    // ask Cvar, if it knows more
-    const ctx = new AnonymousConsoleCommand();
-    ctx.client = client;
-    ctx.args = text;
-    ctx.command = cmdname;
-    ctx.argv = argv;
-
-    if (Cvar.Command_f.call(ctx, argv[0], argv[1])) {
-      return;
-    }
-
-    Con.Print('Unknown command "' + cmdname + '"\n');
-  }
-};
diff --git a/source/engine/common/Cmd.ts b/source/engine/common/Cmd.ts
new file mode 100644
index 00000000..730b3080
--- /dev/null
+++ b/source/engine/common/Cmd.ts
@@ -0,0 +1,424 @@
+import type { ServerClient } from '../server/Client.mjs';
+
+import * as Protocol from '../network/Protocol.ts';
+import { eventBus, getClientRegistry, getCommonRegistry, registry } from '../registry.mjs';
+import Cvar from './Cvar.ts';
+import { clientConnectionState } from './Def.ts';
+
+type CommandFunction = (this: ConsoleCommand, ...args: string[]) => void | Promise<void>;
+type CommandConstructor = new () => ConsoleCommand;
+type CommandRegistration = CommandConstructor | CommandFunction;
+type CommandEntry = {
+  name: string;
+  command: CommandConstructor;
+};
+type AliasEntry = {
+  name: string;
+  value: string;
+};
+
+let { COM, Con } = getCommonRegistry();
+
+eventBus.subscribe('registry.frozen', () => {
+  ({ COM, Con } = getCommonRegistry());
+});
+
+/** @returns {boolean} True when the registration is a ConsoleCommand subclass. */
+function isConsoleCommandClass(command: CommandRegistration): command is CommandConstructor {
+  return typeof command === 'function' && command.prototype instanceof ConsoleCommand;
+}
+
+/**
+ * Console Command.
+ */
+export class ConsoleCommand {
+  client: ServerClient | null = null;
+  command: string | null = null;
+  args: string | null = null;
+  argv: string[] = [];
+
+  run(..._args: string[]): void | Promise<void> {
+    console.assert(false, 'ConsoleCommand.run() must be overridden');
+  }
+
+  // Forwards a console command to the server.
+  // To forward a console command, use `this.forward();`.
+  // NOTE: Forwarded commands must be allowlisted in `SV.ReadClientMessage`.
+  forward(): boolean {
+    if (this.client !== null) {
+      return false;
+    }
+
+    if (registry.isDedicatedServer) {
+      return true;
+    }
+
+    console.assert(this.client === null, 'must be executed locally');
+
+    const argv = [...this.argv];
+    let command = this.command;
+
+    if (command !== null && command.toLowerCase() === 'cmd') {
+      command = argv.shift() ?? null;
+    }
+
+    if (command === null) {
+      Con.Print('Usage: cmd <command> <args>\n');
+      return true;
+    }
+
+    const { CL } = getClientRegistry();
+
+    if (CL.cls.state !== clientConnectionState.connected) {
+      Con.Print(`Can't "${command}", not connected\n`);
+      return true;
+    }
+
+    if (CL.cls.demoplayback) {
+      return true;
+    }
+
+    // send command to the server in behalf of the client
+    CL.cls.message.writeByte(Protocol.clc.stringcmd);
+    CL.cls.message.writeString(this.args ?? '');
+
+    return true;
+  }
+}
+
+/**
+ * Just the naked console command context.
+ */
+class AnonymousConsoleCommand extends ConsoleCommand {
+  override run(): void {
+    console.assert(false, 'AnonymousConsoleCommand.run() cannot be used');
+  }
+
+  override forward(): boolean {
+    return false;
+  }
+}
+
+class ForwardCommand extends ConsoleCommand {
+  override run(): void {
+    this.forward();
+  }
+}
+
+class ExecSlot {
+  filename: string;
+  content: string | null = null;
+  isReady = false;
+
+  constructor(filename: string) {
+    this.filename = filename;
+  }
+}
+
+export default class Cmd {
+  static alias: AliasEntry[] = [];
+  static functions: CommandEntry[] = [];
+  static text = '';
+  static wait = false;
+
+  static #execSlots: ExecSlot[] = [];
+
+  static HasPendingCommands(): boolean {
+    return this.wait || this.text.length > 0 || this.#execSlots.length > 0;
+  }
+
+  static Wait_f(): void {
+    Cmd.wait = true;
+  }
+
+  static Execute(): void {
+    // go through all pending exec slots
+    while (this.#execSlots.length > 0) {
+      const slot = this.#execSlots[0];
+
+      if (!slot.isReady) {
+        // as long as the first exec slot is not ready, we
+        // cannot proceed with any command, we want to keep order
+        return;
+      }
+
+      if (slot.content !== null) {
+        Con.DPrint(`execing ${slot.filename}\n`);
+        Cmd.text += slot.content;
+      } else {
+        Con.PrintWarning(`couldn't exec ${slot.filename}\n`);
+      }
+
+      this.#execSlots.shift();
+
+      // if the exec caused a wait, we stop processing here
+      if (Cmd.wait) {
+        Cmd.wait = false;
+        return;
+      }
+    }
+
+    let line = '';
+    let quotes = false;
+
+    while (Cmd.text.length !== 0) {
+      const character = Cmd.text[0];
+      Cmd.text = Cmd.text.substring(1);
+
+      if (character === '"') {
+        quotes = !quotes;
+        line += '"';
+        continue;
+      }
+
+      if ((!quotes && character === ';') || character === '\n') {
+        if (line.length === 0) {
+          continue;
+        }
+
+        void Cmd.ExecuteString(line);
+
+        if (Cmd.wait) {
+          Cmd.wait = false;
+          return;
+        }
+
+        line = '';
+        continue;
+      }
+
+      line += character;
+    }
+
+    Cmd.text = '';
+  }
+
+  /**
+   * Executes all console commands passed by the command line.
+   */
+  static StuffCmds_f(): void {
+    let readingCommand = false;
+    let build = '';
+
+    for (let index = 0; index < COM.argv.length; index++) {
+      const firstCharacter = COM.argv[index][0];
+
+      if (readingCommand) {
+        if (firstCharacter === '+') {
+          build += `\n${COM.argv[index].substring(1)} `;
+          continue;
+        }
+
+        if (firstCharacter === '-') {
+          readingCommand = false;
+          build += '\n';
+          continue;
+        }
+
+        build += `${COM.argv[index]} `;
+        continue;
+      }
+
+      if (firstCharacter === '+') {
+        readingCommand = true;
+        build += `${COM.argv[index].substring(1)} `;
+      }
+    }
+
+    if (build.length !== 0) {
+      Cmd.text = `${build}\n${Cmd.text}`;
+    }
+  }
+
+  static Exec_f = class ExecConsoleCommand extends ConsoleCommand {
+    override async run(filename?: string): Promise<void> {
+      if (!filename) {
+        Con.Print('exec <filename> : execute a script file\n');
+        return;
+      }
+
+      const slot = new ExecSlot(filename);
+      Cmd.#execSlots.push(slot);
+      slot.content = await COM.LoadTextFile(filename);
+      slot.isReady = true;
+    }
+  };
+
+  static Echo_f = class EchoConsoleCommand extends ConsoleCommand {
+    override run(): void {
+      const args = this.args ?? '';
+      Con.Print(`${args.substring(this.argv[0].length + 1)}\n`);
+    }
+  };
+
+  static Alias_f(...argv: string[]): void {
+    if (argv.length === 0) {
+      Con.Print('Current alias commands:\n');
+
+      for (const alias of Cmd.alias) {
+        Con.Print(`${alias.name} : ${alias.value}\n`);
+      }
+
+      return;
+    }
+
+    const aliasName = argv[0].toLowerCase();
+    const value = `${argv.slice(1).join(' ')}\n`;
+
+    for (const alias of Cmd.alias) {
+      if (alias.name === aliasName) {
+        alias.value = value;
+        return;
+      }
+    }
+
+    Cmd.alias.push({ name: aliasName, value });
+  }
+
+  static Init(): void {
+    Cmd.functions.length = 0;
+
+    Cmd.AddCommand('stuffcmds', Cmd.StuffCmds_f);
+    Cmd.AddCommand('exec', Cmd.Exec_f);
+    Cmd.AddCommand('echo', Cmd.Echo_f);
+    Cmd.AddCommand('alias', Cmd.Alias_f);
+    Cmd.AddCommand('cmd', ForwardCommand);
+    Cmd.AddCommand('wait', Cmd.Wait_f);
+  }
+
+  static Shutdown(): void {
+    Cmd.functions.length = 0;
+  }
+
+  static TokenizeString(text: string): string[] {
+    const argv: string[] = [];
+
+    while (true) {
+      let index = 0;
+      let character = 0;
+
+      for (; index < text.length; index++) {
+        character = text.charCodeAt(index);
+
+        if (character > 32 || character === 10) {
+          break;
+        }
+      }
+
+      if (text.charCodeAt(index) === 10 || index >= text.length) {
+        break;
+      }
+
+      const parsed = COM.Parse(text);
+
+      if (parsed.data === null) {
+        break;
+      }
+
+      text = parsed.data;
+      argv.push(parsed.token);
+    }
+
+    return argv;
+  }
+
+  static HasCommand(name: string): boolean {
+    return Cmd.GetCommandNames().includes(name);
+  }
+
+  static GetCommandNames(): string[] {
+    return Cmd.functions.map((entry) => entry.name);
+  }
+
+  static AddCommand(name: string, command: CommandRegistration): void {
+    console.assert(Cvar.FindVar(name) === null, 'command name must not be taken by a cvar', name);
+
+    if (Cmd.HasCommand(name)) {
+      Con.Print(`Cmd.AddCommand: ${name} already defined\n`);
+      return;
+    }
+
+    if (isConsoleCommandClass(command)) {
+      Cmd.functions.push({ name, command });
+      return;
+    }
+
+    Cmd.functions.push({
+      name,
+      command: class extends ConsoleCommand {
+        // if the command is a function, wrap it into a ConsoleCommand
+        override run(...args: string[]): void | Promise<void> {
+          return command.apply(this, args);
+        }
+      },
+    });
+  }
+
+  static CompleteCommand(partial: string): string | null {
+    if (!partial) {
+      return null;
+    }
+
+    return Cmd.GetCommandNames().find((name) => name.startsWith(partial)) ?? null;
+  }
+
+  static ExecuteString(text: string, client: ServerClient | null = null): void | Promise<void> {
+    const argv = Cmd.TokenizeString(text);
+
+    if (argv.length === 0) {
+      return undefined;
+    }
+
+    const commandName = argv[0].toLowerCase();
+    const commandArgs = argv.slice(1);
+
+    // check commands
+    for (const entry of Cmd.functions) {
+      if (entry.name !== commandName) {
+        continue;
+      }
+
+      const handler = new entry.command();
+      handler.client = client;
+      handler.args = text;
+      handler.command = commandName;
+      handler.argv = argv;
+
+      const run = handler.run.bind(handler) as (...args: string[]) => void | Promise<void>;
+      const result = run(...commandArgs);
+
+      if (result instanceof Promise) {
+        return result.catch((error: Error | string | null | undefined) => {
+          const message = error instanceof Error ? error.message : error;
+          Con.PrintError(`Error executing command "${commandName}":\n${message}\n`);
+        });
+      }
+
+      return result;
+    }
+
+    for (const alias of Cmd.alias) {
+      if (alias.name !== commandName) {
+        continue;
+      }
+
+      Cmd.text = alias.value + Cmd.text;
+      return undefined;
+    }
+
+    const context = new AnonymousConsoleCommand();
+    context.client = client;
+    context.args = text;
+    context.command = commandName;
+    context.argv = argv;
+
+    // ask Cvar, if it knows more
+    if (Cvar.Command_f.call(context, argv[0], argv[1])) {
+      return undefined;
+    }
+
+    Con.Print(`Unknown command "${commandName}"\n`);
+
+    return undefined;
+  }
+}
diff --git a/source/engine/common/Com.mjs b/source/engine/common/Com.mjs
index 2ab98018..50e44370 100644
--- a/source/engine/common/Com.mjs
+++ b/source/engine/common/Com.mjs
@@ -4,9 +4,9 @@ import { registry, eventBus } from '../registry.mjs';
 import Q from '../../shared/Q.ts';
 import { CorruptedResourceError } from './Errors.ts';
 
-import Cvar from './Cvar.mjs';
+import Cvar from './Cvar.ts';
 import W from './W.mjs';
-import Cmd from './Cmd.mjs';
+import Cmd from './Cmd.ts';
 import { defaultBasedir, defaultGame } from './Def.ts';
 import { CRC16CCITT } from './CRC.ts';
 
diff --git a/source/engine/common/Console.mjs b/source/engine/common/Console.mjs
index 6ece7d4f..4290be14 100644
--- a/source/engine/common/Console.mjs
+++ b/source/engine/common/Console.mjs
@@ -1,9 +1,9 @@
 
 
 import { eventBus, registry } from '../registry.mjs';
-import Cvar from './Cvar.mjs';
+import Cvar from './Cvar.ts';
 import Vector from '../../shared/Vector.ts';
-import Cmd from './Cmd.mjs';
+import Cmd from './Cmd.ts';
 import VID from '../client/VID.mjs';
 import { clientConnectionState } from './Def.ts';
 import { ClientEngineAPI } from './GameAPIs.mjs';
diff --git a/source/engine/common/Cvar.mjs b/source/engine/common/Cvar.mjs
deleted file mode 100644
index aeece77c..00000000
--- a/source/engine/common/Cvar.mjs
+++ /dev/null
@@ -1,404 +0,0 @@
-import { registry, eventBus } from '../registry.mjs';
-import Cmd from './Cmd.mjs';
-import Q from '../../shared/Q.ts';
-import { cvarFlags } from '../../shared/Defs.ts';
-
-let { CL, Con, SV } = registry;
-
-eventBus.subscribe('registry.frozen', () => {
-  CL = registry.CL;
-  Con = registry.Con;
-  SV = registry.SV;
-});
-
-/**
- * Console Variable
- */
-export default class Cvar {
-  /** @type {Record<string, Cvar>} @private */
-  static _vars = {};
-
-  static FLAG = cvarFlags;
-
-  // TODO: add things like onChange, onPreChange so that we can hook into changes of the variable
-
-  /** @type {string} */
-  #currentValue = null;
-
-  /** @type {number} */
-  #numberValue = null;
-
-  /** @type {string} @readonly */
-  #originalValue = null;
-
-  /** @type {string} @readonly */
-  #name = null;
-
-  get name() { return this.#name; }
-  get string() { return this.#currentValue; }
-  get value() { return this.#numberValue; }
-
-  /**
-   * @param {string} name name of the variable
-   * @param {string} value preset value of the variable
-   * @param {number} flags optional flags for the variable
-   * @param {?string} description optional description of the variable
-   */
-  constructor(name, value, flags = Cvar.FLAG.NONE, description = null) {
-    // making sure these fields are out of reach
-    this.#name = name;
-    this.#currentValue = value;
-    this.#originalValue = value;
-
-    /** @type {number} @see Cvar.FLAG */
-    this.flags = flags;
-    /** @type {?string} @readonly */
-    this.description = description;
-
-    this.#numberValue = value === '' ? 0 : Q.atof(value);
-
-    console.assert(name.length > 0, 'Cvar name must be at least 1 character long', name);
-    console.assert(!Cvar._vars[name], 'Cvar name must not be used already', name);
-
-    Cvar._vars[name] = this;
-  }
-
-  /**
-   * @deprecated use flags instead
-   * @returns {boolean} whether the variable is an archive variable
-   */
-  get archive() {
-    return !!(this.flags & Cvar.FLAG.ARCHIVE);
-  }
-
-  /**
-   * @deprecated use flags instead
-   * @returns {boolean} whether the variable is a server variable
-   */
-  get server() {
-    return !!(this.flags & Cvar.FLAG.SERVER);
-  }
-
-  /**
-   * Deletes the console variable from the list of variables.
-   */
-  free() {
-    delete Cvar._vars[this.name];
-  }
-
-  /**
-   * Finds a console variable by name.
-   * @param {string} name console variable name
-   * @returns {Cvar|null} The console variable if found, otherwise null.
-   */
-  static FindVar(name) {
-    return Cvar._vars[name] || null;
-  }
-
-  /**
-   * Completes a variable name based on a partial string.
-   * @param {string} partial starting string of the variable name
-   * @returns {string|null} The name of the console variable if found, otherwise null.
-   */
-  static CompleteVariable(partial) {
-    if (!partial.length) {
-      return null;
-    }
-
-    return Object.keys(Cvar._vars).find((name) => name.startsWith(partial)) || null;
-  }
-
-  /**
-   * Sets the value of the console variable.
-   * Setting a variable to a boolean will convert it to a string.
-   * READONLY variables can be changed through this.
-   * @param {number|string|boolean} value new value
-   * @returns {Cvar} this
-   */
-  set(value) {
-    // turning everything into a string
-    switch (typeof value) {
-      case 'boolean':
-        value = value ? '1' : '0';
-        break;
-      case 'string':
-        value = value.trim();
-        break;
-      case 'number':
-        value = value.toString();
-        break;
-
-      default:
-        console.assert(false, 'invalid type of value', value);
-        value = '';
-      }
-
-    const changed = this.#currentValue !== value;
-
-    // TODO: implement Cvar.FLAG.DEFERRED
-
-    this.#currentValue = value;
-    this.#numberValue = value === '' ? 0 : Q.atof(value);
-
-    if (changed) {
-      eventBus.publish('cvar.changed', this.name);
-      eventBus.publish(`cvar.changed.${this.name}`, this);
-    }
-
-    return this;
-  }
-
-  /**
-   * Resets the console variable to its original value.
-   * @returns {Cvar} this
-   */
-  reset() {
-    this.set(this.#originalValue);
-
-    return this;
-  }
-
-  /**
-   * For easy embedding in strings. It will return the current value of the console variable.
-   * @returns {string} string representation of the console variable
-   */
-  toString() {
-    return this.#currentValue;
-  }
-
-  /**
-   * Sets the value of the console variable.
-   * @param {string} name name of the variable
-   * @param {number|string|boolean} value new value
-   * @returns {Cvar} variable
-   */
-  static Set(name, value) {
-    const variable = Cvar._vars[name];
-
-    console.assert(variable !== undefined, 'variable must be registered', name);
-
-    if (!variable) {
-      return null;
-    }
-
-    variable.set(value);
-
-    return variable;
-  }
-
-  /**
-   * Command line interface for console variables.
-   * @param {string} name name of the variable
-   * @param {?string} value value to set
-   * @returns {boolean} true if the variable handling was executed successfully, false otherwise
-   */
-  static Command_f(name, value) {
-    const v = Cvar.FindVar(name);
-
-    if (!v) {
-      return false;
-    }
-
-    if (value === undefined) {
-      Con.Print(`"${v.name}" is "${v.string}"\n`);
-      Con.DPrint(`... "${v.string}" is ${v.value} as a numeric value\n`);
-
-      if (v.description) {
-        Con.Print(`> ${v.description}\n`);
-      }
-
-      if (v.flags & Cvar.FLAG.READONLY) {
-        Con.Print('- Cannot be changed.\n');
-      }
-
-      if (v.flags & Cvar.FLAG.ARCHIVE) {
-        Con.Print('- Will be saved to the configuration file.\n');
-      }
-
-      if (v.flags & Cvar.FLAG.SERVER) {
-        Con.Print('- Is a server variable.\n');
-      }
-
-      if (v.flags & Cvar.FLAG.GAME) {
-        Con.Print('- Is a game variable.\n');
-      }
-
-      if (v.flags & Cvar.FLAG.DEFERRED) {
-        Con.Print('- New value will be applied on the next map.\n');
-      }
-
-      if (v.flags & Cvar.FLAG.CHEAT) {
-        Con.Print('- Cheat.\n');
-      }
-
-      if (v.flags & Cvar.FLAG.SECRET) {
-        if (v.flags & Cvar.FLAG.SERVER) {
-          Con.Print('- Changed value will not be broadcasted, sensitive information.\n');
-        }
-      }
-
-      return true;
-    }
-
-    if (v.flags & Cvar.FLAG.READONLY) {
-      Con.PrintWarning(`"${v.name}" is read-only\n`);
-      return true;
-    }
-
-    if ((v.flags & Cvar.FLAG.CHEAT) && SV.server.active && CL?.cls.serverInfo?.sv_cheats !== '1') {
-      Con.Print('Cheats are not enabled on this server.\n');
-      return true;
-    }
-
-    // TODO: check if there’s a min/max value and clamp accordingly
-
-    v.set(value);
-
-    return true;
-  }
-
-  /**
-   * @returns {string} all variables that are marked as archive
-   */
-  static WriteVariables() {
-    return Object.values(Cvar._vars)
-        .filter((v) => (v.flags & Cvar.FLAG.ARCHIVE) !== 0)
-        .map((v) => `seta "${v.name}" "${v.string}"\n`) // FIXME: escape quotes in value
-        .join('');
-  }
-
-  /**
-   * Filter all variables by a function.
-   * @param {Function} compareFn function to compare the variable, first argument will be a Cvar
-   * @yields {Cvar} variable
-   */
-  static *Filter(compareFn) {
-    for (const variable of Object.values(Cvar._vars)) {
-      if (compareFn(variable)) {
-        yield variable;
-      }
-    }
-  }
-
-  /**
-   * @param {string} name name of the variable
-   * @param {?string} value value to set
-   */
-  static Set_f(name, value) {
-    if (name === undefined) {
-      Con.Print('Usage: set <name> <value>\n');
-      return;
-    }
-
-    if (!Cvar.Command_f.call(this, name, value)) {
-      Con.PrintWarning(`Unknown variable "${name}"\n`);
-    }
-  }
-
-  /**
-   * @param {string} name name of the variable
-   * @param {?string} value value to set
-   */
-  static Seta_f(name, value) {
-    if (name === undefined) {
-      Con.Print('Usage: seta <name> <value>\n');
-      return;
-    }
-
-    const variable = Cvar.FindVar(name);
-
-    if (!variable) {
-      Con.PrintWarning(`Unknown variable "${name}"\n`);
-      return;
-    }
-
-    if (!(variable.flags & (Cvar.FLAG.ARCHIVE | Cvar.FLAG.READONLY))) {
-      variable.flags |= Cvar.FLAG.ARCHIVE;
-      Con.DPrint(`"${name}" flagged as archive variable\n`);
-    }
-
-    if (!Cvar.Command_f.call(this, name, value)) {
-      Con.PrintWarning(`Unknown variable "${name}"\n`);
-    }
-  }
-
-  /**
-   * Toggles a variable between 0 and 1.
-   * @param {string} name name of the variable
-   */
-  static Toggle_f(name) {
-    if (name === undefined) {
-      Con.Print('Usage: toggle <name>\n');
-      return;
-    }
-
-    const variable = Cvar.FindVar(name);
-
-    if (!variable) {
-      Con.PrintWarning(`Unknown variable "${name}"\n`);
-      return;
-    }
-
-    if (variable.flags & Cvar.FLAG.READONLY) {
-      Con.PrintWarning(`"${name}" is read-only\n`);
-      return;
-    }
-
-    variable.set(variable.value === 0 ? 1 : 0);
-
-    Con.Print(`"${name}" toggled to "${variable.string}"\n`);
-  }
-
-  static Cvarlist_f(start) {
-    const names = Object.keys(Cvar._vars).sort();
-
-    for (const name of names) {
-      const v = Cvar._vars[name];
-
-      if (start !== undefined && !name.startsWith(start)) {
-        continue;
-      }
-
-      const flags = new Array(5).fill(' ');
-
-      if (v.flags & Cvar.FLAG.ARCHIVE) {
-        flags[0] = 'A';
-      }
-
-      if (v.flags & Cvar.FLAG.GAME) {
-        flags[1] = 'G';
-      }
-
-      if (v.flags & Cvar.FLAG.SERVER) {
-        flags[2] = 'S';
-      }
-
-      if (v.flags & Cvar.FLAG.READONLY) {
-        flags[3] = 'R';
-      }
-
-      if (v.flags & Cvar.FLAG.CHEAT) {
-        flags[4] = 'C';
-      }
-
-      Con.Print(`${v.name.padEnd(24)} | ${flags.join('')} | ${v.string.padEnd(16)} | ${v.description || ''}\n`);
-    }
-  }
-
-  /**
-   * Initializes the Cvar system.
-   */
-  static Init() {
-    Cmd.AddCommand('set', Cvar.Set_f);
-    Cmd.AddCommand('seta', Cvar.Seta_f);
-    Cmd.AddCommand('toggle', Cvar.Toggle_f);
-    Cmd.AddCommand('cvarlist', Cvar.Cvarlist_f);
-  }
-
-  /**
-   * Unregisters all variables.
-   */
-  static Shutdown() {
-    Cvar._vars = {};
-  }
-};
diff --git a/source/engine/common/Cvar.ts b/source/engine/common/Cvar.ts
new file mode 100644
index 00000000..7b48075d
--- /dev/null
+++ b/source/engine/common/Cvar.ts
@@ -0,0 +1,326 @@
+import { eventBus, getCommonRegistry, registry } from '../registry.mjs';
+import Cmd from './Cmd.ts';
+import Q from '../../shared/Q.ts';
+import { cvarFlags } from '../../shared/Defs.ts';
+
+type CvarValue = number | string | boolean;
+type CvarFilter = (variable: Cvar) => boolean;
+
+let { Con, SV } = getCommonRegistry();
+
+eventBus.subscribe('registry.frozen', () => {
+  ({ Con, SV } = getCommonRegistry());
+});
+
+/**
+ * Console Variable.
+ */
+export default class Cvar {
+  static _vars: Record<string, Cvar> = {};
+
+  static FLAG = cvarFlags;
+
+  // TODO: add things like onChange, onPreChange so that we can hook into changes of the variable
+
+  #currentValue: string;
+  #numberValue: number;
+  #originalValue: string;
+  #name: string;
+
+  flags: number;
+  readonly description: string | null;
+
+  get name(): string {
+    return this.#name;
+  }
+
+  get string(): string {
+    return this.#currentValue;
+  }
+
+  get value(): number {
+    return this.#numberValue;
+  }
+
+  constructor(name: string, value: string, flags: number = Cvar.FLAG.NONE, description: string | null = null) {
+    // making sure these fields are out of reach
+    this.#name = name;
+    this.#currentValue = value;
+    this.#originalValue = value;
+    this.flags = flags;
+    this.description = description;
+    this.#numberValue = value === '' ? 0 : Q.atof(value);
+
+    console.assert(name.length > 0, 'Cvar name must be at least 1 character long', name);
+    console.assert(!Cvar._vars[name], 'Cvar name must not be used already', name);
+
+    Cvar._vars[name] = this;
+  }
+
+  get archive(): boolean {
+    return (this.flags & Cvar.FLAG.ARCHIVE) !== 0;
+  }
+
+  get server(): boolean {
+    return (this.flags & Cvar.FLAG.SERVER) !== 0;
+  }
+
+  free(): void {
+    delete Cvar._vars[this.name];
+  }
+
+  static FindVar(name: string): Cvar | null {
+    return Cvar._vars[name] ?? null;
+  }
+
+  static GetVariableNames(): string[] {
+    return Object.keys(Cvar._vars);
+  }
+
+  static CompleteVariable(partial: string): string | null {
+    if (!partial.length) {
+      return null;
+    }
+
+    return Cvar.GetVariableNames().find((name) => name.startsWith(partial)) ?? null;
+  }
+
+  set(value: CvarValue): Cvar {
+    let nextValue: string;
+
+    // turning everything into a string
+    switch (typeof value) {
+      case 'boolean':
+        nextValue = value ? '1' : '0';
+        break;
+      case 'string':
+        nextValue = value.trim();
+        break;
+      case 'number':
+        nextValue = value.toString();
+        break;
+      default:
+        console.assert(false, 'invalid type of value', value);
+        nextValue = '';
+        break;
+    }
+
+    const changed = this.#currentValue !== nextValue;
+
+    // TODO: implement Cvar.FLAG.DEFERRED
+
+    this.#currentValue = nextValue;
+    this.#numberValue = nextValue === '' ? 0 : Q.atof(nextValue);
+
+    if (changed) {
+      eventBus.publish('cvar.changed', this.name);
+      eventBus.publish(`cvar.changed.${this.name}`, this);
+    }
+
+    return this;
+  }
+
+  reset(): Cvar {
+    this.set(this.#originalValue);
+    return this;
+  }
+
+  toString(): string {
+    return this.#currentValue;
+  }
+
+  static Set(name: string, value: CvarValue): Cvar | null {
+    const variable = Cvar._vars[name];
+
+    console.assert(variable !== undefined, 'variable must be registered', name);
+
+    if (!variable) {
+      return null;
+    }
+
+    variable.set(value);
+    return variable;
+  }
+
+  static Command_f(name: string, value?: string): boolean {
+    const variable = Cvar.FindVar(name);
+
+    if (variable === null) {
+      return false;
+    }
+
+    if (value === undefined) {
+      Con.Print(`"${variable.name}" is "${variable.string}"\n`);
+      Con.DPrint(`... "${variable.string}" is ${variable.value} as a numeric value\n`);
+
+      if (variable.description) {
+        Con.Print(`> ${variable.description}\n`);
+      }
+
+      if (variable.flags & Cvar.FLAG.READONLY) {
+        Con.Print('- Cannot be changed.\n');
+      }
+
+      if (variable.flags & Cvar.FLAG.ARCHIVE) {
+        Con.Print('- Will be saved to the configuration file.\n');
+      }
+
+      if (variable.flags & Cvar.FLAG.SERVER) {
+        Con.Print('- Is a server variable.\n');
+      }
+
+      if (variable.flags & Cvar.FLAG.GAME) {
+        Con.Print('- Is a game variable.\n');
+      }
+
+      if (variable.flags & Cvar.FLAG.DEFERRED) {
+        Con.Print('- New value will be applied on the next map.\n');
+      }
+
+      if (variable.flags & Cvar.FLAG.CHEAT) {
+        Con.Print('- Cheat.\n');
+      }
+
+      if ((variable.flags & Cvar.FLAG.SECRET) && (variable.flags & Cvar.FLAG.SERVER)) {
+        Con.Print('- Changed value will not be broadcasted, sensitive information.\n');
+      }
+
+      return true;
+    }
+
+    if (variable.flags & Cvar.FLAG.READONLY) {
+      Con.PrintWarning(`"${variable.name}" is read-only\n`);
+      return true;
+    }
+
+    const clientSvCheats = registry.CL?.cls.serverInfo?.sv_cheats;
+
+    if ((variable.flags & Cvar.FLAG.CHEAT) && SV.server.active && clientSvCheats !== '1') {
+      Con.Print('Cheats are not enabled on this server.\n');
+      return true;
+    }
+
+    // TODO: check if there’s a min/max value and clamp accordingly
+
+    variable.set(value);
+    return true;
+  }
+
+  static WriteVariables(): string {
+    return Object.values(Cvar._vars)
+        .filter((variable) => (variable.flags & Cvar.FLAG.ARCHIVE) !== 0)
+        .map((variable) => `seta "${variable.name}" "${variable.string}"\n`)
+        .join('');
+  }
+
+  static *Filter(compareFn: CvarFilter): Generator<Cvar, void, undefined> {
+    for (const variable of Object.values(Cvar._vars)) {
+      if (compareFn(variable)) {
+        yield variable;
+      }
+    }
+  }
+
+  static Set_f(name?: string, value?: string): void {
+    if (name === undefined) {
+      Con.Print('Usage: set <name> <value>\n');
+      return;
+    }
+
+    if (!Cvar.Command_f.call(this, name, value)) {
+      Con.PrintWarning(`Unknown variable "${name}"\n`);
+    }
+  }
+
+  static Seta_f(name?: string, value?: string): void {
+    if (name === undefined) {
+      Con.Print('Usage: seta <name> <value>\n');
+      return;
+    }
+
+    const variable = Cvar.FindVar(name);
+
+    if (variable === null) {
+      Con.PrintWarning(`Unknown variable "${name}"\n`);
+      return;
+    }
+
+    if ((variable.flags & (Cvar.FLAG.ARCHIVE | Cvar.FLAG.READONLY)) === 0) {
+      variable.flags |= Cvar.FLAG.ARCHIVE;
+      Con.DPrint(`"${name}" flagged as archive variable\n`);
+    }
+
+    if (!Cvar.Command_f.call(this, name, value)) {
+      Con.PrintWarning(`Unknown variable "${name}"\n`);
+    }
+  }
+
+  static Toggle_f(name?: string): void {
+    if (name === undefined) {
+      Con.Print('Usage: toggle <name>\n');
+      return;
+    }
+
+    const variable = Cvar.FindVar(name);
+
+    if (variable === null) {
+      Con.PrintWarning(`Unknown variable "${name}"\n`);
+      return;
+    }
+
+    if (variable.flags & Cvar.FLAG.READONLY) {
+      Con.PrintWarning(`"${name}" is read-only\n`);
+      return;
+    }
+
+    variable.set(variable.value === 0 ? 1 : 0);
+    Con.Print(`"${name}" toggled to "${variable.string}"\n`);
+  }
+
+  static Cvarlist_f(start?: string): void {
+    const names = Cvar.GetVariableNames().sort();
+
+    for (const name of names) {
+      const variable = Cvar._vars[name];
+
+      if (start !== undefined && !name.startsWith(start)) {
+        continue;
+      }
+
+      const flags = new Array(5).fill(' ');
+
+      if (variable.flags & Cvar.FLAG.ARCHIVE) {
+        flags[0] = 'A';
+      }
+
+      if (variable.flags & Cvar.FLAG.GAME) {
+        flags[1] = 'G';
+      }
+
+      if (variable.flags & Cvar.FLAG.SERVER) {
+        flags[2] = 'S';
+      }
+
+      if (variable.flags & Cvar.FLAG.READONLY) {
+        flags[3] = 'R';
+      }
+
+      if (variable.flags & Cvar.FLAG.CHEAT) {
+        flags[4] = 'C';
+      }
+
+      Con.Print(`${variable.name.padEnd(24)} | ${flags.join('')} | ${variable.string.padEnd(16)} | ${variable.description ?? ''}\n`);
+    }
+  }
+
+  static Init(): void {
+    Cmd.AddCommand('set', Cvar.Set_f);
+    Cmd.AddCommand('seta', Cvar.Seta_f);
+    Cmd.AddCommand('toggle', Cvar.Toggle_f);
+    Cmd.AddCommand('cvarlist', Cvar.Cvarlist_f);
+  }
+
+  static Shutdown(): void {
+    Cvar._vars = {};
+  }
+}
diff --git a/source/engine/common/GameAPIs.mjs b/source/engine/common/GameAPIs.mjs
index f45ce4fc..7860a941 100644
--- a/source/engine/common/GameAPIs.mjs
+++ b/source/engine/common/GameAPIs.mjs
@@ -7,8 +7,8 @@ import VID from '../client/VID.mjs';
 import * as Protocol from '../network/Protocol.ts';
 import { EventBus, eventBus, registry } from '../registry.mjs';
 import { ED, ServerEdict } from '../server/Edict.mjs';
-import Cmd from './Cmd.mjs';
-import Cvar from './Cvar.mjs';
+import Cmd from './Cmd.ts';
+import Cvar from './Cvar.ts';
 import { HostError } from './Errors.ts';
 import Mod from './Mod.mjs';
 import W from './W.mjs';
diff --git a/source/engine/common/Host.mjs b/source/engine/common/Host.mjs
index 9e02de8a..e1e76688 100644
--- a/source/engine/common/Host.mjs
+++ b/source/engine/common/Host.mjs
@@ -1,7 +1,7 @@
-import Cvar from './Cvar.mjs';
+import Cvar from './Cvar.ts';
 import * as Protocol from '../network/Protocol.ts';
 import * as Def from './Def.ts';
-import Cmd, { ConsoleCommand } from './Cmd.mjs';
+import Cmd, { ConsoleCommand } from './Cmd.ts';
 import { eventBus, registry } from '../registry.mjs';
 import Vector from '../../shared/Vector.ts';
 import Q from '../../shared/Q.ts';
diff --git a/source/engine/common/Pmove.mjs b/source/engine/common/Pmove.mjs
index cb8f35f3..d250890e 100644
--- a/source/engine/common/Pmove.mjs
+++ b/source/engine/common/Pmove.mjs
@@ -11,7 +11,7 @@ import Vector from '../../shared/Vector.ts';
 import * as Protocol from '../network/Protocol.ts';
 import { content } from '../../shared/Defs.ts';
 import { BrushModel } from './Mod.mjs';
-import Cvar from './Cvar.mjs';
+import Cvar from './Cvar.ts';
 import { PmoveConfiguration } from '../../shared/Pmove.ts';
 
 /** @typedef {import('../../shared/Vector.ts').DirectionalVectors} DirectionalVectors */
diff --git a/source/engine/network/ConsoleCommands.ts b/source/engine/network/ConsoleCommands.ts
index abc95943..55f8f5e7 100644
--- a/source/engine/network/ConsoleCommands.ts
+++ b/source/engine/network/ConsoleCommands.ts
@@ -1,4 +1,4 @@
-import { ConsoleCommand } from '../common/Cmd.mjs';
+import { ConsoleCommand } from '../common/Cmd.ts';
 import { eventBus, getCommonRegistry } from '../registry.mjs';
 
 let { Con, NET } = getCommonRegistry();
diff --git a/source/engine/network/Network.ts b/source/engine/network/Network.ts
index ed2f4d3e..cd0bba3c 100644
--- a/source/engine/network/Network.ts
+++ b/source/engine/network/Network.ts
@@ -1,7 +1,7 @@
 import type { Server as HttpServer } from 'node:http';
 
-import Cmd from '../common/Cmd.mjs';
-import Cvar from '../common/Cvar.mjs';
+import Cmd from '../common/Cmd.ts';
+import Cvar from '../common/Cvar.ts';
 import { clientConnectionState } from '../common/Def.ts';
 import Q from '../../shared/Q.ts';
 import { eventBus, getClientRegistry, getCommonRegistry, registry } from '../registry.mjs';
diff --git a/source/engine/network/NetworkDrivers.ts b/source/engine/network/NetworkDrivers.ts
index 2ee266e6..682cb57f 100644
--- a/source/engine/network/NetworkDrivers.ts
+++ b/source/engine/network/NetworkDrivers.ts
@@ -1,4 +1,4 @@
-import Cvar from '../common/Cvar.mjs';
+import Cvar from '../common/Cvar.ts';
 import { HostError } from '../common/Errors.ts';
 import type { SzBuffer } from './MSG.ts';
 import { eventBus, getCommonRegistry, registry } from '../registry.mjs';
diff --git a/source/engine/server/Edict.mjs b/source/engine/server/Edict.mjs
index 7e57cf23..8dfe6f30 100644
--- a/source/engine/server/Edict.mjs
+++ b/source/engine/server/Edict.mjs
@@ -5,7 +5,7 @@ import * as Def from '../common/Def.ts';
 import * as Defs from '../../shared/Defs.ts';
 import { eventBus, registry } from '../registry.mjs';
 import Q from '../../shared/Q.ts';
-import { ConsoleCommand } from '../common/Cmd.mjs';
+import { ConsoleCommand } from '../common/Cmd.ts';
 import { ClientEdict } from '../client/ClientEntities.mjs';
 import { OctreeNode } from '../../shared/Octree.ts';
 import { Visibility } from '../common/model/BSP.mjs';
diff --git a/source/engine/server/Navigation.mjs b/source/engine/server/Navigation.mjs
index 40191ce7..d3d9af6d 100644
--- a/source/engine/server/Navigation.mjs
+++ b/source/engine/server/Navigation.mjs
@@ -2,9 +2,9 @@
 import * as Def from '../../shared/Defs.ts';
 import { Octree } from '../../shared/Octree.ts';
 import Vector from '../../shared/Vector.ts';
-import Cmd from '../common/Cmd.mjs';
-// import Cmd, { ConsoleCommand } from '../common/Cmd.mjs';
-import Cvar from '../common/Cvar.mjs';
+import Cmd from '../common/Cmd.ts';
+// import Cmd, { ConsoleCommand } from '../common/Cmd.ts';
+import Cvar from '../common/Cvar.ts';
 import { CorruptedResourceError, MissingResourceError } from '../common/Errors.ts';
 import { ServerEngineAPI } from '../common/GameAPIs.mjs';
 import { BrushModel } from '../common/Mod.mjs';
diff --git a/source/engine/server/Progs.mjs b/source/engine/server/Progs.mjs
index f289e9c5..7e873a85 100644
--- a/source/engine/server/Progs.mjs
+++ b/source/engine/server/Progs.mjs
@@ -1,6 +1,6 @@
-import Cmd from '../common/Cmd.mjs';
+import Cmd from '../common/Cmd.ts';
 import { CRC16CCITT } from '../common/CRC.ts';
-import Cvar from '../common/Cvar.mjs';
+import Cvar from '../common/Cvar.ts';
 import { HostError, MissingResourceError } from '../common/Errors.ts';
 import Q from '../../shared/Q.ts';
 import Vector from '../../shared/Vector.ts';
diff --git a/source/engine/server/ProgsAPI.mjs b/source/engine/server/ProgsAPI.mjs
index fc5ef06c..c5efc8bf 100644
--- a/source/engine/server/ProgsAPI.mjs
+++ b/source/engine/server/ProgsAPI.mjs
@@ -1,5 +1,5 @@
 import Vector from '../../shared/Vector.ts';
-import Cmd from '../common/Cmd.mjs';
+import Cmd from '../common/Cmd.ts';
 import { HostError } from '../common/Errors.ts';
 import { ServerEngineAPI } from '../common/GameAPIs.mjs';
 import { eventBus, registry } from '../registry.mjs';
diff --git a/source/engine/server/Server.mjs b/source/engine/server/Server.mjs
index 2fe6658b..e5040adf 100644
--- a/source/engine/server/Server.mjs
+++ b/source/engine/server/Server.mjs
@@ -1,10 +1,10 @@
-import Cvar from '../common/Cvar.mjs';
+import Cvar from '../common/Cvar.ts';
 import { MoveVars, Pmove } from '../common/Pmove.mjs';
 import Vector from '../../shared/Vector.ts';
 import { SzBuffer } from '../network/MSG.ts';
 import * as Protocol from '../network/Protocol.ts';
 import * as Def from './../common/Def.ts';
-import Cmd, { ConsoleCommand } from '../common/Cmd.mjs';
+import Cmd, { ConsoleCommand } from '../common/Cmd.ts';
 import { ED, ServerEdict } from './Edict.mjs';
 import { EventBus, eventBus, registry } from '../registry.mjs';
 import { ServerEngineAPI } from '../common/GameAPIs.mjs';
diff --git a/source/engine/server/ServerMessages.mjs b/source/engine/server/ServerMessages.mjs
index 026a77d9..ec1f22de 100644
--- a/source/engine/server/ServerMessages.mjs
+++ b/source/engine/server/ServerMessages.mjs
@@ -1,7 +1,7 @@
 import { SzBuffer } from '../network/MSG.ts';
 import * as Protocol from '../network/Protocol.ts';
 import * as Defs from '../../shared/Defs.ts';
-import Cvar from '../common/Cvar.mjs';
+import Cvar from '../common/Cvar.ts';
 import { eventBus, registry } from '../registry.mjs';
 import { ServerClient } from './Client.mjs';
 import { ServerEntityState } from './ServerEntityState.mjs';
diff --git a/source/engine/server/Sys.mjs b/source/engine/server/Sys.mjs
index f9fe5421..5c4e1618 100644
--- a/source/engine/server/Sys.mjs
+++ b/source/engine/server/Sys.mjs
@@ -8,9 +8,9 @@ import { join } from 'path';
 import { createServer } from 'http';
 
 import { registry, eventBus } from '../registry.mjs';
-import Cvar from '../common/Cvar.mjs';
+import Cvar from '../common/Cvar.ts';
 /** @typedef {import('node:repl').REPLServer} REPLServer */
-import Cmd from '../common/Cmd.mjs';
+import Cmd from '../common/Cmd.ts';
 import Q from '../../shared/Q.ts';
 import WorkerManager from '../common/WorkerManager.mjs';
 import workerFactories from '../common/WorkerFactories.mjs';
@@ -92,8 +92,8 @@ export default class Sys {
         },
         completer(line) {
           const completions = [
-            ...Cmd.functions.map((fnc) => fnc.name),
-            ...Object.keys(Cvar._vars).map((cvar) => cvar), // FIXME: Cvar._vars is private, should not be accessed directly
+            ...Cmd.GetCommandNames(),
+            ...Cvar.GetVariableNames(),
           ];
 
           const hits = completions.filter((c) => c.startsWith(line));
diff --git a/source/shared/GameInterfaces.ts b/source/shared/GameInterfaces.ts
index 0bf86820..95921638 100644
--- a/source/shared/GameInterfaces.ts
+++ b/source/shared/GameInterfaces.ts
@@ -10,7 +10,7 @@ export type ServerEngineAPI = Readonly<typeof ServerEngineApiValue>;
 export type ServerEdict = Readonly<ServerEdictValue>;
 
 export type GLTexture = import('../engine/client/GL.mjs').GLTexture;
-export type Cvar = Readonly<import('../engine/common/Cvar.mjs').default>;
+export type Cvar = Readonly<import('../engine/common/Cvar.ts').default>;
 
 export type PmoveConfiguration = Readonly<import('../shared/Pmove.ts').PmoveConfiguration>;
 export type PmoveQuake2Configuration = Readonly<import('../shared/Pmove.ts').PmoveQuake2Configuration>;
diff --git a/test/common/cmd.test.mjs b/test/common/cmd.test.mjs
new file mode 100644
index 00000000..0a118fbe
--- /dev/null
+++ b/test/common/cmd.test.mjs
@@ -0,0 +1,141 @@
+import assert from 'node:assert/strict';
+import { describe, test } from 'node:test';
+
+import Cmd from '../../source/engine/common/Cmd.ts';
+import COM from '../../source/engine/common/Com.mjs';
+import Cvar from '../../source/engine/common/Cvar.ts';
+import { registry } from '../../source/engine/registry.mjs';
+import { defaultMockRegistry, withMockRegistry } from '../physics/fixtures.mjs';
+
+/** @typedef {{ prints: string[], warnings: string[], errors: string[], dprints: string[], Print: (message: string) => void, PrintWarning: (message: string) => void, PrintError: (message: string) => void, DPrint: (message: string) => void }} ConsoleCapture */
+
+/** @returns {ConsoleCapture} captured console methods */
+function createConsoleCapture() {
+  return {
+    prints: [],
+    warnings: [],
+    errors: [],
+    dprints: [],
+    Print(message) {
+      this.prints.push(message);
+    },
+    PrintWarning(message) {
+      this.warnings.push(message);
+    },
+    PrintError(message) {
+      this.errors.push(message);
+    },
+    DPrint(message) {
+      this.dprints.push(message);
+    },
+  };
+}
+
+/**
+ * Reset Cmd and Cvar globals between tests.
+ */
+function resetCommandState() {
+  Cmd.Shutdown();
+  Cmd.alias.length = 0;
+  Cmd.text = '';
+  Cmd.wait = false;
+  Cvar.Shutdown();
+}
+
+/**
+ * @param {ConsoleCapture} consoleCapture captured console sinks
+ * @param {{ frametime?: number }} [hostOverrides] host registry overrides
+ * @returns {import('../physics/fixtures.mjs').MockRegistryConfig & { Host: { frametime: number } }} mock registry config
+ */
+function createMockRegistryConfig(consoleCapture, hostOverrides = {}) {
+  return {
+    ...defaultMockRegistry({}, null),
+    COM,
+    Con: consoleCapture,
+    Host: {
+      frametime: 0.1,
+      ...hostOverrides,
+    },
+  };
+}
+
+void describe('Cmd', () => {
+  void test('lists aliases without creating a broken alias entry and overwrites existing aliases by name', async () => {
+    const consoleCapture = createConsoleCapture();
+
+    await withMockRegistry(createMockRegistryConfig(consoleCapture), async () => {
+      resetCommandState();
+      Cmd.Init();
+
+      try {
+        await Cmd.ExecuteString('alias');
+        assert.deepEqual(Cmd.alias, []);
+        assert.deepEqual(consoleCapture.prints, ['Current alias commands:\n']);
+
+        await Cmd.ExecuteString('alias greet echo first');
+        assert.deepEqual(Cmd.alias, [{ name: 'greet', value: 'echo first\n' }]);
+
+        await Cmd.ExecuteString('alias GREET echo second');
+        assert.deepEqual(Cmd.alias, [{ name: 'greet', value: 'echo second\n' }]);
+
+        await Cmd.ExecuteString('greet');
+        assert.equal(Cmd.text, 'echo second\n');
+      } finally {
+        resetCommandState();
+      }
+    });
+  });
+
+  void test('exposes public command and variable name lists for completion', async () => {
+    const consoleCapture = createConsoleCapture();
+
+    await withMockRegistry(createMockRegistryConfig(consoleCapture), () => {
+      resetCommandState();
+      Cmd.Init();
+
+      try {
+        Cmd.AddCommand('customcommand', () => {});
+        new Cvar('skill', '1');
+        new Cvar('deathmatch', '0');
+
+        assert.equal(Cmd.GetCommandNames().includes('alias'), true);
+        assert.equal(Cmd.GetCommandNames().includes('customcommand'), true);
+        assert.deepEqual(Cvar.GetVariableNames(), ['skill', 'deathmatch']);
+      } finally {
+        resetCommandState();
+      }
+    });
+  });
+
+  void test('captures rejected promises from wrapped async function commands without mutating Host', async () => {
+    const consoleCapture = createConsoleCapture();
+    const invokingClient = { name: 'player' };
+
+    await withMockRegistry(createMockRegistryConfig(consoleCapture), async () => {
+      resetCommandState();
+      Cmd.Init();
+
+      try {
+        Cmd.AddCommand('asyncplain', async function (arg) {
+          assert.equal(arg, 'payload');
+          assert.equal(this.client, invokingClient);
+          assert.equal(this.command, 'asyncplain');
+          assert.equal(this.args, 'asyncplain payload');
+          assert.deepEqual(this.argv, ['asyncplain', 'payload']);
+          assert.equal(Object.hasOwn(registry.Host, 'client'), false);
+
+          await Promise.resolve();
+
+          throw new Error('boom');
+        });
+
+        await Cmd.ExecuteString('asyncplain payload', invokingClient);
+
+        assert.equal(Object.hasOwn(registry.Host, 'client'), false);
+        assert.deepEqual(consoleCapture.errors, ['Error executing command "asyncplain":\nboom\n']);
+      } finally {
+        resetCommandState();
+      }
+    });
+  });
+});
diff --git a/test/common/cvar.test.mjs b/test/common/cvar.test.mjs
new file mode 100644
index 00000000..0300f33a
--- /dev/null
+++ b/test/common/cvar.test.mjs
@@ -0,0 +1,114 @@
+import assert from 'node:assert/strict';
+import { describe, test } from 'node:test';
+
+import Cvar from '../../source/engine/common/Cvar.ts';
+import { defaultMockRegistry, withMockRegistry } from '../physics/fixtures.mjs';
+
+/** @returns {{ prints: string[], warnings: string[], dprints: string[], Print: (message: string) => void, PrintWarning: (message: string) => void, DPrint: (message: string) => void }} captured console methods */
+function createConsoleCapture() {
+  return {
+    prints: [],
+    warnings: [],
+    dprints: [],
+    Print(message) {
+      this.prints.push(message);
+    },
+    PrintWarning(message) {
+      this.warnings.push(message);
+    },
+    DPrint(message) {
+      this.dprints.push(message);
+    },
+  };
+}
+
+/**
+ * Reset the global Cvar registry between tests.
+ */
+function resetCvarState() {
+  Cvar.Shutdown();
+}
+
+void describe('Cvar', () => {
+  void test('coerces values and completes variable names', async () => {
+    const consoleCapture = createConsoleCapture();
+
+    await withMockRegistry({
+      ...defaultMockRegistry({ server: { active: false } }, null),
+      Con: consoleCapture,
+    }, () => {
+      resetCvarState();
+
+      try {
+        const skill = new Cvar('skill', '1');
+        new Cvar('deathmatch', '0');
+
+        skill.set(' 2 ');
+        assert.equal(skill.string, '2');
+        assert.equal(skill.value, 2);
+
+        skill.set(true);
+        assert.equal(skill.string, '1');
+        assert.equal(skill.value, 1);
+
+        assert.deepEqual(Cvar.GetVariableNames(), ['skill', 'deathmatch']);
+        assert.equal(Cvar.CompleteVariable('dea'), 'deathmatch');
+      } finally {
+        resetCvarState();
+      }
+    });
+  });
+
+  void test('reports variable metadata and blocks readonly changes', async () => {
+    const consoleCapture = createConsoleCapture();
+
+    await withMockRegistry({
+      ...defaultMockRegistry({ server: { active: false } }, null),
+      Con: consoleCapture,
+    }, () => {
+      resetCvarState();
+
+      try {
+        const registered = new Cvar('registered', '0', Cvar.FLAG.READONLY | Cvar.FLAG.ARCHIVE, 'Shareware marker.');
+
+        assert.equal(Cvar.Command_f('registered'), true);
+        assert.deepEqual(consoleCapture.prints, [
+          '"registered" is "0"\n',
+          '> Shareware marker.\n',
+          '- Cannot be changed.\n',
+          '- Will be saved to the configuration file.\n',
+        ]);
+
+        assert.equal(Cvar.Command_f('registered', '1'), true);
+        assert.equal(registered.string, '0');
+        assert.deepEqual(consoleCapture.warnings, ['"registered" is read-only\n']);
+      } finally {
+        resetCvarState();
+      }
+    });
+  });
+
+  void test('marks archive variables and serializes them to config commands', async () => {
+    const consoleCapture = createConsoleCapture();
+
+    await withMockRegistry({
+      ...defaultMockRegistry({ server: { active: false } }, null),
+      Con: consoleCapture,
+    }, () => {
+      resetCvarState();
+
+      try {
+        const crosshair = new Cvar('crosshair', '0');
+        new Cvar('name', 'player');
+
+        Cvar.Seta_f('crosshair', '1');
+
+        assert.equal((crosshair.flags & Cvar.FLAG.ARCHIVE) !== 0, true);
+        assert.equal(crosshair.string, '1');
+        assert.equal(Cvar.WriteVariables(), 'seta "crosshair" "1"\n');
+      } finally {
+        resetCvarState();
+      }
+    });
+  });
+});
diff --git a/test/physics/fixtures.mjs b/test/physics/fixtures.mjs
index ab5b0b88..cbf9059b 100644
--- a/test/physics/fixtures.mjs
+++ b/test/physics/fixtures.mjs
@@ -1,9 +1,8 @@
 import assert from 'node:assert/strict';
 
 import Vector from '../../source/shared/Vector.ts';
-import { content, flags, moveType, moveTypes, solid } from '../../source/shared/Defs.ts';
+import { content, flags, moveType, solid } from '../../source/shared/Defs.ts';
 import { Brush, BrushModel, BrushSide } from '../../source/engine/common/model/BSP.mjs';
-import { Pmove } from '../../source/engine/common/Pmove.mjs';
 import { eventBus, registry } from '../../source/engine/registry.mjs';
 import { ClientEdict } from '../../source/engine/client/ClientEntities.mjs';
 import { ServerPhysics } from '../../source/engine/server/physics/ServerPhysics.mjs';
@@ -47,6 +46,7 @@ import { ServerPhysics } from '../../source/engine/server/physics/ServerPhysics.
 
 /**
  * @typedef MockRegistryConfig
+ * @property {typeof import('../../source/engine/common/Com.mjs').default | null} [COM]
  * @property {object|null} [CL]
  * @property {{ Print: Function, DPrint: Function }} Con
  * @property {{ frametime: number }} Host
@@ -309,28 +309,43 @@ export function defaultMockRegistry(sv = {}, cl = null) {
 /**
  * Run a callback with mocked registry values.
  * @param {MockRegistryConfig} mockedRegistry registry replacements
- * @param {() => void} callback test callback
+ * @param {() => void | Promise<void>} callback test callback
  */
 export function withMockRegistry(mockedRegistry, callback) {
+  const previousCOM = registry.COM;
   const previousCL = registry.CL;
   const previousCon = registry.Con;
   const previousHost = registry.Host;
   const previousSV = registry.SV;
 
+  registry.COM = mockedRegistry.COM ?? previousCOM;
   registry.CL = mockedRegistry.CL ?? null;
   registry.Con = mockedRegistry.Con;
   registry.Host = mockedRegistry.Host;
   registry.SV = mockedRegistry.SV;
   eventBus.publish('registry.frozen');
 
-  try {
-    callback();
-  } finally {
+  const restore = () => {
+    registry.COM = previousCOM;
     registry.CL = previousCL;
     registry.Con = previousCon;
     registry.Host = previousHost;
     registry.SV = previousSV;
     eventBus.publish('registry.frozen');
+  };
+
+  try {
+    const result = callback();
+
+    if (result !== null && result !== undefined && typeof result.then === 'function') {
+      return Promise.resolve(result).finally(restore);
+    }
+
+    restore();
+    return result;
+  } catch (error) {
+    restore();
+    throw error;
   }
 }
 
@@ -379,7 +394,7 @@ export function withMockServerPhysics(callback) {
     linkCalls.push(edict);
   };
 
-  withMockRegistry({
+  void withMockRegistry({
     Con: {
       Print() {},
       DPrint() {},

From 7e8618f28ab1868ca4a15f07933180bd69bcfd2a Mon Sep 17 00:00:00 2001
From: Christian R <github@chrisnew.de>
Date: Thu, 2 Apr 2026 16:50:44 +0300
Subject: [PATCH 16/67] TS: common/Console

---
 .../engine/common/{Console.mjs => Console.ts} |  60 +++---
 source/engine/main-browser.mjs                |   2 +-
 source/engine/main-dedicated.mjs              |   2 +-
 source/engine/registry.mjs                    |   2 +-
 test/common/console.test.mjs                  | 189 ++++++++++++++++++
 test/common/model-cache.test.mjs              |   2 +-
 test/physics/pmove.test.mjs                   |   2 +-
 7 files changed, 228 insertions(+), 31 deletions(-)
 rename source/engine/common/{Console.mjs => Console.ts} (81%)
 create mode 100644 test/common/console.test.mjs

diff --git a/source/engine/common/Console.mjs b/source/engine/common/Console.ts
similarity index 81%
rename from source/engine/common/Console.mjs
rename to source/engine/common/Console.ts
index 4290be14..fb927ea5 100644
--- a/source/engine/common/Console.mjs
+++ b/source/engine/common/Console.ts
@@ -1,36 +1,44 @@
-
-
-import { eventBus, registry } from '../registry.mjs';
-import Cvar from './Cvar.ts';
 import Vector from '../../shared/Vector.ts';
+import { eventBus, getClientRegistry, registry } from '../registry.mjs';
+import Cvar from './Cvar.ts';
 import Cmd from './Cmd.ts';
 import VID from '../client/VID.mjs';
 import { clientConnectionState } from './Def.ts';
 import { ClientEngineAPI } from './GameAPIs.mjs';
 
-let { CL, Draw, Host, Key, M, SCR } = registry;
+let { CL, Draw, Host, Key, M, SCR } = getClientRegistry();
 
 eventBus.subscribe('registry.frozen', () => {
-  CL = registry.CL;
-  Draw = registry.Draw;
-  Host = registry.Host;
-  Key = registry.Key;
-  M = registry.M;
-  SCR = registry.SCR;
+  ({ CL, Draw, Host, Key, M, SCR } = getClientRegistry());
 });
 
+/** A single line entry in the console text buffer. */
+type ConsoleLine = {
+  text: string;
+  time: number;
+  color: Vector;
+  doNotNotify: boolean;
+};
+
+/**
+ * Console output and display.
+ *
+ * Handles printing, notification display, and the interactive drop-down
+ * console overlay used by both the browser client and dedicated server.
+ */
 export default class Con {
   static backscroll = 0;
   static current = 0;
-  static text = /** @type {{ text: string, time: number, color: Vector, doNotNotify: boolean }[]} */([]);
-  static captureBuffer = null;
-  /** @type {Cvar?} */
-  static notifytime = null;
+  static text: ConsoleLine[] = [];
+  static captureBuffer: string[] | null = null;
+
+  /** Console notification display time. */
+  static notifytime: Cvar | null = null;
 
-  /** used by the client to force the console to be up */
+  /** Used by the client to force the console to be up. */
   static forcedup = false;
 
-  /** used by the client to determine how many lines to draw */
+  /** Used by the client to determine how many lines to draw. */
   static vislines = 0;
 
   static ToggleConsole_f() {
@@ -87,13 +95,13 @@ export default class Con {
     Con.captureBuffer = [];
   }
 
-  static StopCapturing() {
-    const data = Con.captureBuffer.join('\n') + '\n';
+  static StopCapturing(): string {
+    const data = Con.captureBuffer!.join('\n') + '\n';
     Con.captureBuffer = null;
     return data;
   }
 
-  static Print(msg, color = new Vector(1.0, 1.0, 1.0)) {
+  static Print(msg: string, color = new Vector(1.0, 1.0, 1.0)) {
     let doNotNotify = false;
 
     Con.backscroll = 0;
@@ -135,7 +143,7 @@ export default class Con {
     }
   }
 
-  static DPrint(msg) {
+  static DPrint(msg: string) {
     if (!Host.developer?.value) {
       return;
     }
@@ -143,15 +151,15 @@ export default class Con {
     Con.Print(msg, new Vector(0.7, 0.7, 1.0));
   }
 
-  static PrintWarning(msg) {
+  static PrintWarning(msg: string) {
     Con.Print(msg, new Vector(1.0, 1.0, 0.3));
   }
 
-  static PrintError(msg) {
+  static PrintError(msg: string) {
     Con.Print(msg, new Vector(1.0, 0.3, 0.3));
   }
 
-  static PrintSuccess(msg) {
+  static PrintSuccess(msg: string) {
     Con.Print(msg, new Vector(0.3, 1.0, 0.3));
   }
 
@@ -177,7 +185,7 @@ export default class Con {
     }
 
     for (; i < Con.text.length; i++) {
-      if (Con.text[i].doNotNotify || (Host.realtime - Con.text[i].time) > Con.notifytime.value) {
+      if (Con.text[i].doNotNotify || (Host.realtime - Con.text[i].time) > Con.notifytime!.value) {
         continue;
       }
 
@@ -192,7 +200,7 @@ export default class Con {
     }
   }
 
-  static DrawConsole(lines) {
+  static DrawConsole(lines: number) {
     if (lines <= 0) {
       return;
     }
diff --git a/source/engine/main-browser.mjs b/source/engine/main-browser.mjs
index c941a76b..7ed2ccd3 100644
--- a/source/engine/main-browser.mjs
+++ b/source/engine/main-browser.mjs
@@ -2,7 +2,7 @@ import { registry, freeze as registryFreeze } from './registry.mjs';
 
 import Sys from './client/Sys.mjs';
 import COM from './common/Com.mjs';
-import Con from './common/Console.mjs';
+import Con from './common/Console.ts';
 import Host from './common/Host.mjs';
 import V from './client/V.mjs';
 import NET from './network/Network.ts';
diff --git a/source/engine/main-dedicated.mjs b/source/engine/main-dedicated.mjs
index fbada24e..6d0b3ebf 100644
--- a/source/engine/main-dedicated.mjs
+++ b/source/engine/main-dedicated.mjs
@@ -10,7 +10,7 @@ globalThis.Worker = Worker;
 
 import Sys from './server/Sys.mjs';
 import NodeCOM from './server/Com.mjs';
-import Con from './common/Console.mjs';
+import Con from './common/Console.ts';
 import Host from './common/Host.mjs';
 import V from './client/V.mjs';
 import NET from './network/Network.ts';
diff --git a/source/engine/registry.mjs b/source/engine/registry.mjs
index bf41c6d2..0aa7bd8f 100644
--- a/source/engine/registry.mjs
+++ b/source/engine/registry.mjs
@@ -1,5 +1,5 @@
 
-/** @typedef {typeof import('./common/Console.mjs').default} ConModule */
+/** @typedef {typeof import('./common/Console.ts').default} ConModule */
 /** @typedef {typeof import('./common/Com.mjs').default} ComModule */
 /** @typedef {typeof import('./common/Sys.mjs').default} SysModule */
 /** @typedef {typeof import('./common/Host.mjs').default} HostModule */
diff --git a/test/common/console.test.mjs b/test/common/console.test.mjs
new file mode 100644
index 00000000..fafd517e
--- /dev/null
+++ b/test/common/console.test.mjs
@@ -0,0 +1,189 @@
+import assert from 'node:assert/strict';
+import { describe, test } from 'node:test';
+
+import Con from '../../source/engine/common/Console.ts';
+import { eventBus, registry } from '../../source/engine/registry.mjs';
+
+/**
+ * Install minimal registry stubs for Console and fire registry.frozen so
+ * the module picks up Host (the only registry member Con needs at print time).
+ * @param {{ realtime?: number, developer?: { value: number } }} [hostOverrides]
+ * @param {() => void} callback
+ */
+function withMinimalRegistry(hostOverrides = {}, callback) {
+  const previousHost = registry.Host;
+  registry.Host = /** @type {any} */ ({
+    realtime: 0,
+    developer: { value: 0 },
+    ...hostOverrides,
+  });
+  eventBus.publish('registry.frozen');
+
+  try {
+    callback();
+  } finally {
+    registry.Host = previousHost;
+    eventBus.publish('registry.frozen');
+  }
+}
+
+/** Reset Con state between tests. */
+function resetConState() {
+  Con.backscroll = 0;
+  Con.current = 0;
+  Con.text = [];
+  Con.captureBuffer = null;
+  Con.forcedup = false;
+  Con.vislines = 0;
+}
+
+void describe('Con', () => {
+  void describe('Print', () => {
+    void test('appends text to the current line and advances on newline', () => {
+      withMinimalRegistry({ realtime: 1.5 }, () => {
+        resetConState();
+        try {
+          Con.Print('hello\n');
+          assert.equal(Con.text.length, 1);
+          assert.equal(Con.text[0].text, 'hello');
+          assert.equal(Con.text[0].time, 1.5);
+          assert.equal(Con.current, 1);
+        } finally {
+          resetConState();
+        }
+      });
+    });
+
+    void test('handles multiple lines in a single Print call', () => {
+      withMinimalRegistry({}, () => {
+        resetConState();
+        try {
+          Con.Print('line1\nline2\nline3\n');
+          assert.equal(Con.text.length, 3);
+          assert.equal(Con.text[0].text, 'line1');
+          assert.equal(Con.text[1].text, 'line2');
+          assert.equal(Con.text[2].text, 'line3');
+          assert.equal(Con.current, 3);
+        } finally {
+          resetConState();
+        }
+      });
+    });
+
+    void test('trims buffer when it exceeds 1024 lines', () => {
+      withMinimalRegistry({}, () => {
+        resetConState();
+        try {
+          // fill up 1023 lines then add one more to trigger the trim
+          for (let i = 0; i < 1024; i++) {
+            Con.Print(`line${i}\n`);
+          }
+          // after crossing 1024, the buffer is sliced to the last 512
+          assert.ok(Con.text.length <= 512 + 1, `expected <= 513, got ${Con.text.length}`);
+        } finally {
+          resetConState();
+        }
+      });
+    });
+
+    void test('legacy color code 3 sets doNotNotify', () => {
+      withMinimalRegistry({}, () => {
+        resetConState();
+        try {
+          Con.Print('\x03silent\n');
+          assert.equal(Con.text[0].doNotNotify, true);
+          assert.equal(Con.text[0].text, 'silent');
+        } finally {
+          resetConState();
+        }
+      });
+    });
+  });
+
+  void describe('DPrint', () => {
+    void test('suppresses output when developer is 0', () => {
+      withMinimalRegistry({ developer: { value: 0 } }, () => {
+        resetConState();
+        try {
+          Con.DPrint('debug only\n');
+          assert.equal(Con.text.length, 0);
+        } finally {
+          resetConState();
+        }
+      });
+    });
+
+    void test('prints when developer is non-zero', () => {
+      withMinimalRegistry({ developer: { value: 1 } }, () => {
+        resetConState();
+        try {
+          Con.DPrint('debug msg\n');
+          assert.equal(Con.text.length, 1);
+          assert.equal(Con.text[0].text, 'debug msg');
+        } finally {
+          resetConState();
+        }
+      });
+    });
+  });
+
+  void describe('capture', () => {
+    void test('captures printed lines between start and stop', () => {
+      withMinimalRegistry({}, () => {
+        resetConState();
+        try {
+          Con.StartCapturing();
+          Con.Print('captured1\n');
+          Con.Print('captured2\n');
+          const result = Con.StopCapturing();
+          assert.equal(result, 'captured1\ncaptured2\n');
+          assert.equal(Con.captureBuffer, null);
+        } finally {
+          resetConState();
+        }
+      });
+    });
+  });
+
+  void describe('Clear_f', () => {
+    void test('resets text buffer and scroll position', () => {
+      withMinimalRegistry({}, () => {
+        resetConState();
+        try {
+          Con.Print('something\n');
+          Con.backscroll = 5;
+          Con.Clear_f();
+          assert.equal(Con.text.length, 0);
+          assert.equal(Con.current, 0);
+          assert.equal(Con.backscroll, 0);
+        } finally {
+          resetConState();
+        }
+      });
+    });
+  });
+
+  void describe('ClearNotify', () => {
+    void test('zeroes time on the last 4 lines', () => {
+      withMinimalRegistry({ realtime: 10 }, () => {
+        resetConState();
+        try {
+          for (let i = 0; i < 6; i++) {
+            Con.Print(`line${i}\n`);
+          }
+          Con.ClearNotify();
+          // first two lines should keep their time
+          assert.equal(Con.text[0].time, 10);
+          assert.equal(Con.text[1].time, 10);
+          // last four lines should have time = 0
+          assert.equal(Con.text[2].time, 0);
+          assert.equal(Con.text[3].time, 0);
+          assert.equal(Con.text[4].time, 0);
+          assert.equal(Con.text[5].time, 0);
+        } finally {
+          resetConState();
+        }
+      });
+    });
+  });
+});
diff --git a/test/common/model-cache.test.mjs b/test/common/model-cache.test.mjs
index 95c79542..9a3616c9 100644
--- a/test/common/model-cache.test.mjs
+++ b/test/common/model-cache.test.mjs
@@ -41,7 +41,7 @@ async function withModelRegistry(callback) {
   const previousPendingLoads = { ...Mod.pendingLoads };
 
   registry.isDedicatedServer = true;
-  registry.Con = /** @type {typeof import('../../source/engine/common/Console.mjs').default} */ ({
+  registry.Con = /** @type {typeof import('../../source/engine/common/Console.ts').default} */ ({
     Print() {},
     DPrint() {},
     PrintWarning() {},
diff --git a/test/physics/pmove.test.mjs b/test/physics/pmove.test.mjs
index 9603c218..533f8a8d 100644
--- a/test/physics/pmove.test.mjs
+++ b/test/physics/pmove.test.mjs
@@ -208,7 +208,7 @@ async function runMapFrames({
   const knownKeysBefore = new Set(Object.keys(Mod.known));
 
   registry.isDedicatedServer = true;
-  registry.Con = /** @type {typeof import('../../source/engine/common/Console.mjs').default} */ ({
+  registry.Con = /** @type {typeof import('../../source/engine/common/Console.ts').default} */ ({
     Print() {},
     DPrint() {},
     PrintWarning() {},

From 4faad0b15329cd7ddf83c5407ea654099ed97bb2 Mon Sep 17 00:00:00 2001
From: Christian R <github@chrisnew.de>
Date: Thu, 2 Apr 2026 17:09:04 +0300
Subject: [PATCH 17/67] TS: common/Com

---
 source/engine/common/{Com.mjs => Com.ts} | 214 +++++++++++++----------
 source/engine/common/WorkerFramework.mjs |   4 +-
 source/engine/main-browser.mjs           |   2 +-
 source/engine/registry.mjs               |   2 +-
 source/engine/server/Com.mjs             |   2 +-
 test/common/cmd.test.mjs                 |   2 +-
 test/common/com.test.mjs                 | 110 ++++++++++++
 test/physics/fixtures.mjs                |   2 +-
 test/physics/map-pmove-harness.mjs       |   2 +-
 test/physics/pmove.test.mjs              |   4 +-
 10 files changed, 241 insertions(+), 103 deletions(-)
 rename source/engine/common/{Com.mjs => Com.ts} (62%)
 create mode 100644 test/common/com.test.mjs

diff --git a/source/engine/common/Com.mjs b/source/engine/common/Com.ts
similarity index 62%
rename from source/engine/common/Com.mjs
rename to source/engine/common/Com.ts
index 50e44370..f00f8301 100644
--- a/source/engine/common/Com.mjs
+++ b/source/engine/common/Com.ts
@@ -1,5 +1,4 @@
-
-import { registry, eventBus } from '../registry.mjs';
+import { registry, eventBus, getCommonRegistry } from '../registry.mjs';
 
 import Q from '../../shared/Q.ts';
 import { CorruptedResourceError } from './Errors.ts';
@@ -10,50 +9,72 @@ import Cmd from './Cmd.ts';
 import { defaultBasedir, defaultGame } from './Def.ts';
 import { CRC16CCITT } from './CRC.ts';
 
-let { Con, Sys } = registry;
+let { Con, Sys } = getCommonRegistry();
 
 eventBus.subscribe('registry.frozen', () => {
-  Con = registry.Con;
-  Sys = registry.Sys;
+  ({ Con, Sys } = getCommonRegistry());
 });
 
-/** @typedef {{ name: string; filepos: number; filelen: number;}[]} PackFile */
-/** @typedef {{filename: any; pack: PackFile[];}} SearchPath */
+/** A file entry inside a .pak archive. */
+export type PackFileEntry = {
+  name: string;
+  filepos: number;
+  filelen: number;
+};
 
-export default class COM {
-  /** @type {string[]} */
-  static argv = [];
+/** A search path entry in the virtual filesystem. */
+export type SearchPath = {
+  filename: string;
+  pack: PackFileEntry[][];
+};
 
-  /** @type {SearchPath[]} */
-  static searchpaths = [];
+/** Result of {@link COM.Parse}. */
+export type ParseResult = {
+  token: string;
+  data: string | null;
+};
+
+/**
+ * Common file system, command line, and string parsing utilities.
+ *
+ * This is the base class shared by both the browser client and the Node.js
+ * dedicated server (`server/Com.mjs` extends this as `NodeCOM`).
+ */
+export default class COM {
+  static argv: string[] = [];
+  static searchpaths: SearchPath[] = [];
 
   static hipnotic = false;
   static rogue = false;
   static standard_quake = true;
   static modified = false;
 
-  /** @type {Cvar} */
-  static registered = null;
+  static registered: Cvar | null = null;
 
-  /** @type {Cvar|string} */ // FIXME: string turns into Cvar when jumping from InitArgv to Init
-  static cmdline = null;
+  /**
+   * Command line string — starts as a plain string from
+   * {@link COM.InitArgv}, then replaced with a Cvar in {@link COM.Init}.
+   */
+  static cmdline: Cvar | string | null = null;
 
-  /** @type {?AbortController} */
-  static abortController = null;
+  static abortController: AbortController | null = null;
 
-  /** @type {SearchPath[]} */
-  static gamedir = null;
+  static gamedir: SearchPath[] | null = null;
 
-  /** @type {string} mod name */
-  static game = defaultGame;
+  /** Active mod name. */
+  static game: string = defaultGame;
 
-  static DefaultExtension(path, extension) {
+  /**
+   * Append a default file extension if none is present.
+   * @returns the path with extension appended when no extension was found
+   */
+  static DefaultExtension(path: string, extension: string): string {
     for (let i = path.length - 1; i >= 0; i--) {
       const src = path.charCodeAt(i);
-      if (src === 47) {
+      if (src === 47) { // '/'
         break;
       }
-      if (src === 46) {
+      if (src === 46) { // '.'
         return path;
       }
     }
@@ -61,20 +82,25 @@ export default class COM {
   }
 
   /**
-   * Quake style parser.
-   * @param {string} data string to parse
-   * @returns {{token: string, data: string|null}} parsed token and remaining data to parse
+   * Quake-style token parser.
+   *
+   * Splits `data` into the next whitespace-delimited token (respecting
+   * double-quote strings and `//` line comments) and returns the token
+   * together with the remaining unparsed data.
+   * @returns parsed token and remaining data
    */
-  static Parse(data) { // FIXME: remove charCodeAt code
+  static Parse(data: string): ParseResult {
     let token = '';
-    let i = 0; let c;
+    let i = 0;
+    let c = 0;
     if (data.length === 0) {
       return { token, data: null };
     }
 
+    // skip whitespace and // comments
     let skipwhite = true;
     while (true) {
-      if (skipwhite !== true) {
+      if (!skipwhite) {
         break;
       }
       skipwhite = false;
@@ -88,9 +114,10 @@ export default class COM {
         }
         i++;
       }
-      if ((c === 47) && (data.charCodeAt(i + 1) === 47)) {
+      // skip // comments
+      if (c === 47 && data.charCodeAt(i + 1) === 47) { // '//'
         while (true) {
-          if ((i >= data.length) || (data.charCodeAt(i) === 10)) {
+          if (i >= data.length || data.charCodeAt(i) === 10) { // '\n'
             break;
           }
           i++;
@@ -99,20 +126,22 @@ export default class COM {
       }
     }
 
-    if (c === 34) {
+    // handle quoted strings
+    if (c === 34) { // '"'
       i++;
       while (true) {
         c = data.charCodeAt(i);
         i++;
-        if ((i >= data.length) || (c === 34)) {
+        if (i >= data.length || c === 34) { // '"'
           return { token, data: data.substring(i) };
         }
         token += String.fromCharCode(c);
       }
     }
 
+    // regular token
     while (true) {
-      if ((i >= data.length) || (c <= 32)) {
+      if (i >= data.length || c <= 32) { // whitespace
         break;
       }
       token += String.fromCharCode(c);
@@ -121,34 +150,35 @@ export default class COM {
     }
 
     return { token, data: data.substring(i) };
-  };
+  }
 
-  static CheckParm(parm) {
+  /**
+   * Check if a command-line parameter is present.
+   * @returns the argv index of the parameter, or null if not found
+   */
+  static CheckParm(parm: string): number | null {
     for (let i = 1; i < this.argv.length; i++) {
       if (this.argv[i] === parm) {
         return i;
       }
     }
-
     return null;
-  };
+  }
 
   /**
-   * Gets parameter from command line.
-   * @param {string} parm parameter name
-   * @returns {string|null} value of the parameter or null if not found
+   * Get a command-line parameter value (the argument after the flag).
+   * @returns the value following `parm`, or null if not found
    */
-  static GetParm(parm) {
+  static GetParm(parm: string): string | null {
     for (let i = 1; i < this.argv.length; i++) {
       if (this.argv[i] === parm) {
         return this.argv[i + 1] || null;
       }
     }
-
     return null;
-  };
+  }
 
-  static async CheckRegistered() {
+  static async CheckRegistered(): Promise<boolean> {
     const filename = 'gfx/pop.lmp';
     const h = await this.LoadFile(filename);
 
@@ -158,17 +188,18 @@ export default class COM {
       return false;
     }
 
-    if (CRC16CCITT.Block(new Uint8Array(h)) !== 25990) { // CR: shouldn’t be that hard to generate a fake pop.lmp with the same checksum
+    // CR: shouldn't be that hard to generate a fake pop.lmp with the same checksum
+    if (CRC16CCITT.Block(new Uint8Array(h)) !== 25990) {
       throw new CorruptedResourceError(filename, 'not genuine registered version');
     }
 
-    this.registered.set(true);
+    this.registered!.set(true);
     Con.PrintSuccess('Playing registered version.\n');
     eventBus.publish('com.registered', true);
     return true;
   }
 
-  static InitArgv(argv) {
+  static InitArgv(argv: string[]) {
     this.cmdline = (argv.join(' ') + ' ').substring(0, 256);
     for (let i = 0; i < argv.length; i++) {
       this.argv[i] = argv[i];
@@ -193,8 +224,8 @@ export default class COM {
     this.abortController = new AbortController();
 
     this.registered = new Cvar('registered', '0', Cvar.FLAG.READONLY, 'Set to 1, when not playing shareware.');
-    // @ts-ignore: need to fix that later, this.cmdline is a string first, but then it’s turned into a Cvar.
-    this.cmdline = new Cvar('cmdline', this.cmdline, Cvar.FLAG.READONLY, 'Command line used to start the game.');
+    // cmdline starts as a string from InitArgv, then becomes a Cvar here
+    this.cmdline = new Cvar('cmdline', this.cmdline as string, Cvar.FLAG.READONLY, 'Command line used to start the game.');
 
     Cmd.AddCommand('path', this.Path_f);
 
@@ -202,7 +233,7 @@ export default class COM {
 
     await Promise.all([
       this.CheckRegistered(),
-      W.LoadPalette('gfx/palette.lmp'), // CR: we early load the palette here, it’s needed in both dedicated and browser processes
+      W.LoadPalette('gfx/palette.lmp'), // CR: we early load the palette here, it's needed in both dedicated and browser processes
     ]);
 
     Sys.Print('COM.Init: low-level initialization completed.\n');
@@ -212,8 +243,7 @@ export default class COM {
 
   static Shutdown() {
     Sys.Print('COM.Shutdown: signaling outstanding promises to abort\n');
-
-    this.abortController.abort('COM.Shutdown');
+    this.abortController!.abort('COM.Shutdown');
   }
 
   static Path_f() {
@@ -221,40 +251,40 @@ export default class COM {
   }
 
   // eslint-disable-next-line @typescript-eslint/require-await
-  static async WriteFile(filename, data, len) {
+  static async WriteFile(filename: string, data: ArrayLike<number>, len: number): Promise<boolean> {
     if (registry.isInsideWorker) {
       Sys.Print('COM.WriteFile: not supported inside worker threads\n');
       return false;
     }
 
     filename = filename.toLowerCase();
-    const dest = [];
+    const dest: string[] = [];
     for (let i = 0; i < len; i++) {
       dest[i] = String.fromCharCode(data[i]);
     }
     try {
       localStorage.setItem('Quake.' + this.searchpaths[this.searchpaths.length - 1].filename + '/' + filename, dest.join(''));
     } catch (e) {
-      Sys.Print('COM.WriteFile: failed on ' + filename + ', ' + e.message + '\n');
+      Sys.Print('COM.WriteFile: failed on ' + filename + ', ' + (e as Error).message + '\n');
       return false;
     }
     Sys.Print('COM.WriteFile: ' + filename + '\n');
     return true;
-  };
+  }
 
-  static WriteTextFile(filename, data) {
+  static WriteTextFile(filename: string, data: string): boolean {
     filename = filename.toLowerCase();
     try {
       localStorage.setItem('Quake.' + this.searchpaths[this.searchpaths.length - 1].filename + '/' + filename, data);
     } catch (e) {
-      Sys.Print('COM.WriteTextFile: failed on ' + filename + ', ' + e.message + '\n');
+      Sys.Print('COM.WriteTextFile: failed on ' + filename + ', ' + (e as Error).message + '\n');
       return false;
     }
     Sys.Print('COM.WriteTextFile: ' + filename + '\n');
     return true;
-  };
+  }
 
-  static GetNetpath(filename, gameDir = null) {
+  static GetNetpath(filename: string, gameDir: string | null = null): string {
     if (gameDir === null) {
       gameDir = this.GetGamedir();
     }
@@ -272,20 +302,21 @@ export default class COM {
   }
 
   /**
-   * Get the current game directory
-   * @returns {string} game name, e.g. 'id1'
+   * Get the current game directory.
+   * @returns game name, e.g. `'id1'`
    */
-  static GetGamedir() {
+  static GetGamedir(): string {
     return this.searchpaths.length > 0
       ? this.searchpaths[this.searchpaths.length - 1].filename
       : defaultGame;
   }
 
   /**
-   * @param {string} filename virtual filename
-   * @returns {Promise<ArrayBuffer>} binary content
+   * Load a file from the virtual filesystem.
+   * Searches localStorage first, then fetches from the CDN/server.
+   * @returns binary content, or null if not found
    */
-  static async LoadFile(filename) {
+  static async LoadFile(filename: string): Promise<ArrayBuffer | null> {
     filename = filename.toLowerCase();
 
     eventBus.publish('com.fs.being', filename);
@@ -328,37 +359,34 @@ export default class COM {
   }
 
   /**
-   * Loads a text file.
-   * @param {string} filename filename
-   * @returns {Promise<string>} content of the file as a string
+   * Load a text file, stripping carriage returns.
+   * @returns file content as a string, or null if not found
    */
-  static async LoadTextFile(filename) {
+  static async LoadTextFile(filename: string): Promise<string | null> {
     const buf = await this.LoadFile(filename);
     if (buf === null) {
       return null;
     }
     const bufview = new Uint8Array(buf);
-    const f = [];
+    const f: string[] = [];
     for (let i = 0; i < bufview.length; i++) {
-      if (bufview[i] !== 13) {
+      if (bufview[i] !== 13) { // skip CR
         f[f.length] = String.fromCharCode(bufview[i]);
       }
     }
     return f.join('');
-  };
+  }
 
   /**
    * Add a game directory to the search path.
    * Note: PAK files are pre-extracted at build time, so we only track the directory.
-   * @param {string} dir - directory name (e.g., 'id1')
    */
   // eslint-disable-next-line @typescript-eslint/require-await
-  static async AddGameDirectory(dir) {
-    /** @type {SearchPath} */
-    const search = { filename: dir, pack: [] };
-    this.searchpaths[this.searchpaths.length] = search;
+  static async AddGameDirectory(dir: string) {
+    const search: SearchPath = { filename: dir, pack: [] };
+    this.searchpaths.push(search);
     Con.DPrint(`Added game directory: ${dir}\n`);
-  };
+  }
 
   static async InitFilesystem() {
     // Shortcut for specifying game directory at build time
@@ -368,9 +396,9 @@ export default class COM {
       return;
     }
 
-    let search;
+    let search: string | undefined;
 
-    let i = this.CheckParm('-basedir');
+    const i = this.CheckParm('-basedir');
     if (i !== null) {
       search = this.argv[i + 1];
     }
@@ -380,19 +408,19 @@ export default class COM {
       await this.AddGameDirectory(defaultBasedir);
     }
 
-    if (this.rogue === true) {
+    if (this.rogue) {
       await this.AddGameDirectory('rogue');
-    } else if (this.hipnotic === true) {
+    } else if (this.hipnotic) {
       await this.AddGameDirectory('hipnotic');
     }
 
-    i = this.CheckParm('-game');
-    if (i !== null) {
-      search = this.argv[i + 1];
-      if (search !== undefined) {
+    const gameIdx = this.CheckParm('-game');
+    if (gameIdx !== null) {
+      const gameArg = this.argv[gameIdx + 1];
+      if (gameArg !== undefined) {
         this.modified = true;
-        this.game = search;
-        await this.AddGameDirectory(search);
+        this.game = gameArg;
+        await this.AddGameDirectory(gameArg);
       }
     } else if (defaultGame !== defaultBasedir) {
       this.game = defaultGame;
@@ -402,4 +430,4 @@ export default class COM {
 
     this.gamedir = [this.searchpaths[this.searchpaths.length - 1]];
   }
-};
+}
diff --git a/source/engine/common/WorkerFramework.mjs b/source/engine/common/WorkerFramework.mjs
index a74e4fee..d49a22f7 100644
--- a/source/engine/common/WorkerFramework.mjs
+++ b/source/engine/common/WorkerFramework.mjs
@@ -1,7 +1,7 @@
 import { eventBus, registry } from '../registry.mjs';
 import Mod from './Mod.mjs';
 import Sys from './Sys.mjs';
-import COM from './Com.mjs';
+import COM from './Com.ts';
 
 class WorkerConsole {
   static Print(message) {
@@ -71,7 +71,7 @@ export default class WorkerFramework {
 
   static async Init() {
     let COM;
-     
+
     const isNode = typeof process !== 'undefined' && process.versions != null && process.versions.node != null;
 
     if (isNode) {
diff --git a/source/engine/main-browser.mjs b/source/engine/main-browser.mjs
index 7ed2ccd3..4c2364b4 100644
--- a/source/engine/main-browser.mjs
+++ b/source/engine/main-browser.mjs
@@ -1,7 +1,7 @@
 import { registry, freeze as registryFreeze } from './registry.mjs';
 
 import Sys from './client/Sys.mjs';
-import COM from './common/Com.mjs';
+import COM from './common/Com.ts';
 import Con from './common/Console.ts';
 import Host from './common/Host.mjs';
 import V from './client/V.mjs';
diff --git a/source/engine/registry.mjs b/source/engine/registry.mjs
index 0aa7bd8f..1d8e373f 100644
--- a/source/engine/registry.mjs
+++ b/source/engine/registry.mjs
@@ -1,6 +1,6 @@
 
 /** @typedef {typeof import('./common/Console.ts').default} ConModule */
-/** @typedef {typeof import('./common/Com.mjs').default} ComModule */
+/** @typedef {typeof import('./common/Com.ts').default} ComModule */
 /** @typedef {typeof import('./common/Sys.mjs').default} SysModule */
 /** @typedef {typeof import('./common/Host.mjs').default} HostModule */
 /** @typedef {typeof import('./client/V.mjs').default} VModule */
diff --git a/source/engine/server/Com.mjs b/source/engine/server/Com.mjs
index cc271d47..7a0359b4 100644
--- a/source/engine/server/Com.mjs
+++ b/source/engine/server/Com.mjs
@@ -4,7 +4,7 @@ import { promises as fsPromises, existsSync, writeFileSync, constants } from 'fs
 
 import Q from '../../shared/Q.ts';
 import { CRC16CCITT as CRC } from '../common/CRC.ts';
-import COM from '../common/Com.mjs';
+import COM from '../common/Com.ts';
 
 import { CorruptedResourceError } from '../common/Errors.ts';
 import { registry, eventBus } from '../registry.mjs';
diff --git a/test/common/cmd.test.mjs b/test/common/cmd.test.mjs
index 0a118fbe..f40d09f0 100644
--- a/test/common/cmd.test.mjs
+++ b/test/common/cmd.test.mjs
@@ -2,7 +2,7 @@ import assert from 'node:assert/strict';
 import { describe, test } from 'node:test';
 
 import Cmd from '../../source/engine/common/Cmd.ts';
-import COM from '../../source/engine/common/Com.mjs';
+import COM from '../../source/engine/common/Com.ts';
 import Cvar from '../../source/engine/common/Cvar.ts';
 import { registry } from '../../source/engine/registry.mjs';
 import { defaultMockRegistry, withMockRegistry } from '../physics/fixtures.mjs';
diff --git a/test/common/com.test.mjs b/test/common/com.test.mjs
new file mode 100644
index 00000000..e60a0d79
--- /dev/null
+++ b/test/common/com.test.mjs
@@ -0,0 +1,110 @@
+import assert from 'node:assert/strict';
+import { describe, test } from 'node:test';
+
+import COM from '../../source/engine/common/Com.ts';
+
+void describe('COM', () => {
+  void describe('DefaultExtension', () => {
+    void test('appends extension when path has none', () => {
+      assert.equal(COM.DefaultExtension('maps/e1m1', '.bsp'), 'maps/e1m1.bsp');
+    });
+
+    void test('does not append when path already has an extension', () => {
+      assert.equal(COM.DefaultExtension('maps/e1m1.bsp', '.lit'), 'maps/e1m1.bsp');
+    });
+
+    void test('does not treat directory slashes as extensions', () => {
+      assert.equal(COM.DefaultExtension('gfx/env/sky', '.tga'), 'gfx/env/sky.tga');
+    });
+  });
+
+  void describe('Parse', () => {
+    void test('parses a simple token', () => {
+      const result = COM.Parse('hello world');
+      assert.equal(result.token, 'hello');
+      assert.equal(result.data?.trim(), 'world');
+    });
+
+    void test('returns null data when input is exhausted', () => {
+      const result = COM.Parse('');
+      assert.equal(result.token, '');
+      assert.equal(result.data, null);
+    });
+
+    void test('parses a quoted string as a single token', () => {
+      const result = COM.Parse('"hello world" rest');
+      assert.equal(result.token, 'hello world');
+      assert.equal(result.data?.trim(), 'rest');
+    });
+
+    void test('skips // line comments', () => {
+      const result = COM.Parse('// comment\ntoken');
+      assert.equal(result.token, 'token');
+    });
+
+    void test('skips leading whitespace', () => {
+      const result = COM.Parse('   spaced');
+      assert.equal(result.token, 'spaced');
+    });
+  });
+
+  void describe('CheckParm / GetParm', () => {
+    const savedArgv = [...COM.argv];
+
+    void test('CheckParm returns index when parameter exists', () => {
+      COM.argv = ['quake', '-game', 'hipnotic', '-developer'];
+      try {
+        assert.equal(COM.CheckParm('-game'), 1);
+        assert.equal(COM.CheckParm('-developer'), 3);
+        assert.equal(COM.CheckParm('-missing'), null);
+      } finally {
+        COM.argv = savedArgv;
+      }
+    });
+
+    void test('GetParm returns the value following the flag', () => {
+      COM.argv = ['quake', '-game', 'hipnotic', '-developer'];
+      try {
+        assert.equal(COM.GetParm('-game'), 'hipnotic');
+        assert.equal(COM.GetParm('-developer'), null); // no value after last flag
+        assert.equal(COM.GetParm('-missing'), null);
+      } finally {
+        COM.argv = savedArgv;
+      }
+    });
+  });
+
+  void describe('InitArgv', () => {
+    void test('populates argv and detects -rogue flag', () => {
+      const savedArgv = [...COM.argv];
+      const savedRogue = COM.rogue;
+      const savedStdQuake = COM.standard_quake;
+      try {
+        COM.argv = [];
+        COM.rogue = false;
+        COM.standard_quake = true;
+        COM.InitArgv(['quake', '-rogue']);
+        assert.equal(COM.rogue, true);
+        assert.equal(COM.standard_quake, false);
+        assert.equal(COM.argv[0], 'quake');
+      } finally {
+        COM.argv = savedArgv;
+        COM.rogue = savedRogue;
+        COM.standard_quake = savedStdQuake;
+      }
+    });
+
+    void test('-safe appends disable flags', () => {
+      const savedArgv = [...COM.argv];
+      try {
+        COM.argv = [];
+        COM.InitArgv(['quake', '-safe']);
+        assert.ok(COM.argv.includes('-nosound'));
+        assert.ok(COM.argv.includes('-nocdaudio'));
+        assert.ok(COM.argv.includes('-nomouse'));
+      } finally {
+        COM.argv = savedArgv;
+      }
+    });
+  });
+});
diff --git a/test/physics/fixtures.mjs b/test/physics/fixtures.mjs
index cbf9059b..39af2ed3 100644
--- a/test/physics/fixtures.mjs
+++ b/test/physics/fixtures.mjs
@@ -46,7 +46,7 @@ import { ServerPhysics } from '../../source/engine/server/physics/ServerPhysics.
 
 /**
  * @typedef MockRegistryConfig
- * @property {typeof import('../../source/engine/common/Com.mjs').default | null} [COM]
+ * @property {typeof import('../../source/engine/common/Com.ts').default | null} [COM]
  * @property {object|null} [CL]
  * @property {{ Print: Function, DPrint: Function }} Con
  * @property {{ frametime: number }} Host
diff --git a/test/physics/map-pmove-harness.mjs b/test/physics/map-pmove-harness.mjs
index 56d37e6b..ac0a136e 100644
--- a/test/physics/map-pmove-harness.mjs
+++ b/test/physics/map-pmove-harness.mjs
@@ -1,7 +1,7 @@
 import fs from 'node:fs/promises';
 import path from 'node:path';
 
-import COMClass from '../../source/engine/common/Com.mjs';
+import COMClass from '../../source/engine/common/Com.ts';
 import Mod from '../../source/engine/common/Mod.mjs';
 import { PMF, Pmove } from '../../source/engine/common/Pmove.mjs';
 import { UserCmd } from '../../source/engine/network/Protocol.ts';
diff --git a/test/physics/pmove.test.mjs b/test/physics/pmove.test.mjs
index 533f8a8d..d7136497 100644
--- a/test/physics/pmove.test.mjs
+++ b/test/physics/pmove.test.mjs
@@ -2,7 +2,7 @@ import fs from 'node:fs/promises';
 import { describe, test } from 'node:test';
 import assert from 'node:assert/strict';
 
-import COMClass from '../../source/engine/common/Com.mjs';
+import COMClass from '../../source/engine/common/Com.ts';
 import Mod from '../../source/engine/common/Mod.mjs';
 import Vector from '../../source/shared/Vector.ts';
 import { content } from '../../source/shared/Defs.ts';
@@ -218,7 +218,7 @@ async function runMapFrames({
     PrintSuccess() {},
   });
   registry.Mod = Mod;
-  registry.COM = /** @type {typeof import('../../source/engine/common/Com.mjs').default} */ ({
+  registry.COM = /** @type {typeof import('../../source/engine/common/Com.ts').default} */ ({
     Parse: COMClass.Parse,
     async LoadFile(name) {
       try {

From 0e3fd19b235713e08ea7a694e36198bc4f4877f8 Mon Sep 17 00:00:00 2001
From: Christian R <github@chrisnew.de>
Date: Thu, 2 Apr 2026 17:09:35 +0300
Subject: [PATCH 18/67] TS: common/Com improvements

---
 source/engine/common/Com.ts | 61 ++++++++++++++++---------------------
 1 file changed, 26 insertions(+), 35 deletions(-)

diff --git a/source/engine/common/Com.ts b/source/engine/common/Com.ts
index f00f8301..ad663688 100644
--- a/source/engine/common/Com.ts
+++ b/source/engine/common/Com.ts
@@ -16,23 +16,23 @@ eventBus.subscribe('registry.frozen', () => {
 });
 
 /** A file entry inside a .pak archive. */
-export type PackFileEntry = {
-  name: string;
-  filepos: number;
-  filelen: number;
-};
+export interface PackFileEntry {
+  readonly name: string;
+  readonly filepos: number;
+  readonly filelen: number;
+}
 
 /** A search path entry in the virtual filesystem. */
-export type SearchPath = {
-  filename: string;
+export interface SearchPath {
+  readonly filename: string;
   pack: PackFileEntry[][];
-};
+}
 
 /** Result of {@link COM.Parse}. */
-export type ParseResult = {
-  token: string;
-  data: string | null;
-};
+export interface ParseResult {
+  readonly token: string;
+  readonly data: string | null;
+}
 
 /**
  * Common file system, command line, and string parsing utilities.
@@ -200,14 +200,10 @@ export default class COM {
   }
 
   static InitArgv(argv: string[]) {
-    this.cmdline = (argv.join(' ') + ' ').substring(0, 256);
-    for (let i = 0; i < argv.length; i++) {
-      this.argv[i] = argv[i];
-    }
+    this.cmdline = `${argv.join(' ')} `.substring(0, 256);
+    this.argv = [...argv];
     if (this.CheckParm('-safe')) {
-      this.argv[this.argv.length] = '-nosound';
-      this.argv[this.argv.length] = '-nocdaudio';
-      this.argv[this.argv.length] = '-nomouse';
+      this.argv.push('-nosound', '-nocdaudio', '-nomouse');
     }
     if (this.CheckParm('-rogue')) {
       this.rogue = true;
@@ -258,29 +254,31 @@ export default class COM {
     }
 
     filename = filename.toLowerCase();
-    const dest: string[] = [];
+    const bytes = new Uint8Array(len);
     for (let i = 0; i < len; i++) {
-      dest[i] = String.fromCharCode(data[i]);
+      bytes[i] = data[i];
     }
+    const gameDir = this.searchpaths[this.searchpaths.length - 1].filename;
     try {
-      localStorage.setItem('Quake.' + this.searchpaths[this.searchpaths.length - 1].filename + '/' + filename, dest.join(''));
+      localStorage.setItem(`Quake.${gameDir}/${filename}`, new TextDecoder('iso-8859-1').decode(bytes));
     } catch (e) {
-      Sys.Print('COM.WriteFile: failed on ' + filename + ', ' + (e as Error).message + '\n');
+      Sys.Print(`COM.WriteFile: failed on ${filename}, ${(e as Error).message}\n`);
       return false;
     }
-    Sys.Print('COM.WriteFile: ' + filename + '\n');
+    Sys.Print(`COM.WriteFile: ${filename}\n`);
     return true;
   }
 
   static WriteTextFile(filename: string, data: string): boolean {
     filename = filename.toLowerCase();
+    const gameDir = this.searchpaths[this.searchpaths.length - 1].filename;
     try {
-      localStorage.setItem('Quake.' + this.searchpaths[this.searchpaths.length - 1].filename + '/' + filename, data);
+      localStorage.setItem(`Quake.${gameDir}/${filename}`, data);
     } catch (e) {
-      Sys.Print('COM.WriteTextFile: failed on ' + filename + ', ' + (e as Error).message + '\n');
+      Sys.Print(`COM.WriteTextFile: failed on ${filename}, ${(e as Error).message}\n`);
       return false;
     }
-    Sys.Print('COM.WriteTextFile: ' + filename + '\n');
+    Sys.Print(`COM.WriteTextFile: ${filename}\n`);
     return true;
   }
 
@@ -367,14 +365,7 @@ export default class COM {
     if (buf === null) {
       return null;
     }
-    const bufview = new Uint8Array(buf);
-    const f: string[] = [];
-    for (let i = 0; i < bufview.length; i++) {
-      if (bufview[i] !== 13) { // skip CR
-        f[f.length] = String.fromCharCode(bufview[i]);
-      }
-    }
-    return f.join('');
+    return new TextDecoder('iso-8859-1').decode(buf).replaceAll('\r', '');
   }
 
   /**

From 4d79df3901a0337fd2c7b8d49aff5be7da00ff0e Mon Sep 17 00:00:00 2001
From: Christian R <github@chrisnew.de>
Date: Thu, 2 Apr 2026 17:17:10 +0300
Subject: [PATCH 19/67] TS: common/Sys

---
 source/engine/common/PlatformWorker.mjs  |  2 +-
 source/engine/common/{Sys.mjs => Sys.ts} | 58 ++++++++++++++----------
 source/engine/common/WorkerFramework.mjs |  2 +-
 source/engine/registry.mjs               |  2 +-
 test/common/sys.test.mjs                 | 40 ++++++++++++++++
 5 files changed, 76 insertions(+), 28 deletions(-)
 rename source/engine/common/{Sys.mjs => Sys.ts} (50%)
 create mode 100644 test/common/sys.test.mjs

diff --git a/source/engine/common/PlatformWorker.mjs b/source/engine/common/PlatformWorker.mjs
index cee3e24e..d09d2914 100644
--- a/source/engine/common/PlatformWorker.mjs
+++ b/source/engine/common/PlatformWorker.mjs
@@ -1,5 +1,5 @@
 import { registry, eventBus } from '../registry.mjs';
-import { BaseWorker } from './Sys.mjs';
+import { BaseWorker } from './Sys.ts';
 
 let { Host } = registry;
 
diff --git a/source/engine/common/Sys.mjs b/source/engine/common/Sys.ts
similarity index 50%
rename from source/engine/common/Sys.mjs
rename to source/engine/common/Sys.ts
index 9b5206c8..ccc8f8ed 100644
--- a/source/engine/common/Sys.mjs
+++ b/source/engine/common/Sys.ts
@@ -1,27 +1,36 @@
 import { NotImplementedError } from './Errors.ts';
 
+/** Message listener callback for worker communication. */
+type WorkerMessageListener = (message: unknown) => void;
+
+/** Shutdown listener callback. */
+type WorkerShutdownListener = () => void;
+
+/**
+ * Abstract base class for platform-specific worker implementations.
+ *
+ * Subclassed by `PlatformWorker` for both browser (Web Worker) and
+ * Node.js (worker_threads) environments.
+ */
 export class BaseWorker {
-  /** @type {Function[]} @protected */
-  _shutdownListeners = [];
+  protected _shutdownListeners: WorkerShutdownListener[] = [];
+
+  /** Display name of this worker instance. */
+  name: string;
 
-  /**
-   * @param {string} name name of the worker
-   */
-  constructor(name) {
+  constructor(name: string) {
     this.name = name;
   }
 
-  // eslint-disable-next-line no-unused-vars
-  addOnMessageListener(listener) {
+  addOnMessageListener(_listener: WorkerMessageListener) {
     throw new NotImplementedError('Worker.addOnMessageListener must be implemented in a subclass');
   }
 
-  addOnShutdownListener(listener) {
+  addOnShutdownListener(listener: WorkerShutdownListener) {
     this._shutdownListeners.push(listener);
   }
 
-  // eslint-disable-next-line no-unused-vars
-  postMessage(message) {
+  postMessage(_message: unknown) {
     throw new NotImplementedError('Worker.postMessage must be implemented in a subclass');
   }
 
@@ -29,35 +38,34 @@ export class BaseWorker {
   async shutdown() {
     throw new NotImplementedError('Worker.shutdown must be implemented in a subclass');
   }
-};
+}
 
-/** Base class for Sys implementations. */
+/**
+ * Abstract base class for platform system services.
+ *
+ * Provides the contract for initialization, output, and timing that
+ * platform-specific implementations (`client/Sys`, `server/Sys`,
+ * `WorkerSys`) must fulfil.
+ */
 export default class Sys {
   // eslint-disable-next-line @typescript-eslint/require-await
   static async Init() {
     throw new NotImplementedError('Sys.Init must be implemented in a subclass');
   }
 
-  static Quit() {
+  static Quit(): never {
     throw new NotImplementedError('Sys.Quit must be implemented in a subclass');
   }
 
-  // eslint-disable-next-line no-unused-vars
-  static Print(text) {
+  static Print(_text: string) {
     throw new NotImplementedError('Sys.Print must be implemented in a subclass');
   }
 
-  /** @returns {number} uptime in seconds */
-  static FloatTime() {
+  static FloatTime(): number {
     throw new NotImplementedError('Sys.GetTime must be implemented in a subclass');
-    // eslint-disable-next-line no-unreachable
-    return 0;
   }
 
-  /** @returns {number} uptime in milliseconds, containing microseconds */
-  static FloatMilliTime() {
+  static FloatMilliTime(): number {
     throw new NotImplementedError('Sys.FloatMilliTime must be implemented in a subclass');
-    // eslint-disable-next-line no-unreachable
-    return 0;
   }
-};
+}
diff --git a/source/engine/common/WorkerFramework.mjs b/source/engine/common/WorkerFramework.mjs
index d49a22f7..30e80c84 100644
--- a/source/engine/common/WorkerFramework.mjs
+++ b/source/engine/common/WorkerFramework.mjs
@@ -1,6 +1,6 @@
 import { eventBus, registry } from '../registry.mjs';
 import Mod from './Mod.mjs';
-import Sys from './Sys.mjs';
+import Sys from './Sys.ts';
 import COM from './Com.ts';
 
 class WorkerConsole {
diff --git a/source/engine/registry.mjs b/source/engine/registry.mjs
index 1d8e373f..6a965dc9 100644
--- a/source/engine/registry.mjs
+++ b/source/engine/registry.mjs
@@ -1,7 +1,7 @@
 
 /** @typedef {typeof import('./common/Console.ts').default} ConModule */
 /** @typedef {typeof import('./common/Com.ts').default} ComModule */
-/** @typedef {typeof import('./common/Sys.mjs').default} SysModule */
+/** @typedef {typeof import('./common/Sys.ts').default} SysModule */
 /** @typedef {typeof import('./common/Host.mjs').default} HostModule */
 /** @typedef {typeof import('./client/V.mjs').default} VModule */
 /** @typedef {typeof import('./network/Network').default} NetModule */
diff --git a/test/common/sys.test.mjs b/test/common/sys.test.mjs
new file mode 100644
index 00000000..c7d4db1e
--- /dev/null
+++ b/test/common/sys.test.mjs
@@ -0,0 +1,40 @@
+import assert from 'node:assert/strict';
+import { describe, test } from 'node:test';
+
+import Sys, { BaseWorker } from '../../source/engine/common/Sys.ts';
+
+void describe('Sys (base class)', () => {
+  void test('all static methods throw NotImplementedError', () => {
+    assert.throws(() => Sys.Print('test'), { name: 'NotImplementedError' });
+    assert.throws(() => Sys.Quit(), { name: 'NotImplementedError' });
+    assert.throws(() => Sys.FloatTime(), { name: 'NotImplementedError' });
+    assert.throws(() => Sys.FloatMilliTime(), { name: 'NotImplementedError' });
+  });
+
+  void test('Init rejects with NotImplementedError', async () => {
+    await assert.rejects(() => Sys.Init(), { name: 'NotImplementedError' });
+  });
+});
+
+void describe('BaseWorker', () => {
+  void test('abstract methods throw NotImplementedError', () => {
+    const worker = new BaseWorker('test-worker');
+    assert.equal(worker.name, 'test-worker');
+    assert.throws(() => worker.addOnMessageListener(() => {}), { name: 'NotImplementedError' });
+    assert.throws(() => worker.postMessage({}), { name: 'NotImplementedError' });
+  });
+
+  void test('shutdown rejects with NotImplementedError', async () => {
+    const worker = new BaseWorker('test-worker');
+    await assert.rejects(() => worker.shutdown(), { name: 'NotImplementedError' });
+  });
+
+  void test('addOnShutdownListener accumulates listeners', () => {
+    const worker = new BaseWorker('test-worker');
+    const fn1 = () => {};
+    const fn2 = () => {};
+    worker.addOnShutdownListener(fn1);
+    worker.addOnShutdownListener(fn2);
+    assert.equal(worker._shutdownListeners.length, 2);
+  });
+});

From 27777770881e637e2b73cc90872338c3466e0c06 Mon Sep 17 00:00:00 2001
From: Christian R <github@chrisnew.de>
Date: Thu, 2 Apr 2026 17:33:29 +0300
Subject: [PATCH 20/67] TS: common/W

---
 source/engine/client/Draw.mjs                 |   2 +-
 source/engine/client/GL.mjs                   |   2 +-
 source/engine/client/R.mjs                    |   2 +-
 source/engine/client/Tools.mjs                |   2 +-
 .../client/renderer/AliasModelRenderer.mjs    |   2 +-
 source/engine/client/renderer/Sky.mjs         |   2 +-
 source/engine/common/Com.ts                   |   2 +-
 source/engine/common/GameAPIs.mjs             |   2 +-
 source/engine/common/PlatformWorker.mjs       |   2 +-
 source/engine/common/{W.mjs => W.ts}          | 256 +++++++++---------
 .../common/model/loaders/AliasMDLLoader.mjs   |   2 +-
 .../common/model/loaders/BSP29Loader.mjs      |   2 +-
 .../common/model/loaders/SpriteSPRLoader.mjs  |   2 +-
 test/common/w-textures.test.mjs               |  55 +++-
 14 files changed, 185 insertions(+), 150 deletions(-)
 rename source/engine/common/{W.mjs => W.ts} (64%)

diff --git a/source/engine/client/Draw.mjs b/source/engine/client/Draw.mjs
index e3851d72..2157f21a 100644
--- a/source/engine/client/Draw.mjs
+++ b/source/engine/client/Draw.mjs
@@ -2,7 +2,7 @@ import Vector from '../../shared/Vector.ts';
 import { MissingResourceError } from '../common/Errors.ts';
 
 import VID from './VID.mjs';
-import W, { WadFileInterface, WadLumpTexture } from '../common/W.mjs';
+import W, { WadFileInterface, WadLumpTexture } from '../common/W.ts';
 
 import { eventBus, registry } from '../registry.mjs';
 import GL, { GLTexture } from './GL.mjs';
diff --git a/source/engine/client/GL.mjs b/source/engine/client/GL.mjs
index dad99bfc..44ae10ef 100644
--- a/source/engine/client/GL.mjs
+++ b/source/engine/client/GL.mjs
@@ -1,7 +1,7 @@
 import Cmd, { ConsoleCommand } from '../common/Cmd.ts';
 import Cvar from '../common/Cvar.ts';
 import { MissingResourceError } from '../common/Errors.ts';
-import { WadLumpTexture } from '../common/W.mjs';
+import { WadLumpTexture } from '../common/W.ts';
 import { eventBus, registry } from '../registry.mjs';
 import VID from './VID.mjs';
 
diff --git a/source/engine/client/R.mjs b/source/engine/client/R.mjs
index 4ce00765..f8836b97 100644
--- a/source/engine/client/R.mjs
+++ b/source/engine/client/R.mjs
@@ -5,7 +5,7 @@ import * as Def from '../common/Def.ts';
 
 import { eventBus, registry } from '../registry.mjs';
 import Chase from './Chase.mjs';
-import W from '../common/W.mjs';
+import W from '../common/W.ts';
 import VID from './VID.mjs';
 import GL, { ATTRIB_LOCATIONS, GLTexture } from './GL.mjs';
 import { content, effect, gameCapabilities } from '../../shared/Defs.ts';
diff --git a/source/engine/client/Tools.mjs b/source/engine/client/Tools.mjs
index f3d1ec8e..636dd5cc 100644
--- a/source/engine/client/Tools.mjs
+++ b/source/engine/client/Tools.mjs
@@ -1,5 +1,5 @@
 import Cmd, { ConsoleCommand } from '../common/Cmd.ts';
-import W, { WadFileInterface } from '../common/W.mjs';
+import W, { WadFileInterface } from '../common/W.ts';
 import { eventBus, registry } from '../registry.mjs';
 
 let { Con } = registry;
diff --git a/source/engine/client/renderer/AliasModelRenderer.mjs b/source/engine/client/renderer/AliasModelRenderer.mjs
index ba5a01f2..4716503d 100644
--- a/source/engine/client/renderer/AliasModelRenderer.mjs
+++ b/source/engine/client/renderer/AliasModelRenderer.mjs
@@ -3,7 +3,7 @@ import { ModelRenderer } from './ModelRenderer.mjs';
 import { getEntityBloomEmissiveScale } from './BloomEffect.mjs';
 import { eventBus, registry } from '../../registry.mjs';
 import GL from '../GL.mjs';
-import W from '../../common/W.mjs';
+import W from '../../common/W.ts';
 import { effect } from '../../../shared/Defs.ts';
 
 let { CL, Host, R, Con } = registry;
diff --git a/source/engine/client/renderer/Sky.mjs b/source/engine/client/renderer/Sky.mjs
index f71f14af..49187a1c 100644
--- a/source/engine/client/renderer/Sky.mjs
+++ b/source/engine/client/renderer/Sky.mjs
@@ -1,4 +1,4 @@
-import W from '../../common/W.mjs';
+import W from '../../common/W.ts';
 import { BrushModel } from '../../common/Mod.mjs';
 import { eventBus, registry } from '../../registry.mjs';
 
diff --git a/source/engine/common/Com.ts b/source/engine/common/Com.ts
index ad663688..cac7ae54 100644
--- a/source/engine/common/Com.ts
+++ b/source/engine/common/Com.ts
@@ -4,7 +4,7 @@ import Q from '../../shared/Q.ts';
 import { CorruptedResourceError } from './Errors.ts';
 
 import Cvar from './Cvar.ts';
-import W from './W.mjs';
+import W from './W.ts';
 import Cmd from './Cmd.ts';
 import { defaultBasedir, defaultGame } from './Def.ts';
 import { CRC16CCITT } from './CRC.ts';
diff --git a/source/engine/common/GameAPIs.mjs b/source/engine/common/GameAPIs.mjs
index 7860a941..fc51b63c 100644
--- a/source/engine/common/GameAPIs.mjs
+++ b/source/engine/common/GameAPIs.mjs
@@ -11,7 +11,7 @@ import Cmd from './Cmd.ts';
 import Cvar from './Cvar.ts';
 import { HostError } from './Errors.ts';
 import Mod from './Mod.mjs';
-import W from './W.mjs';
+import W from './W.ts';
 
 /** @typedef {import('../client/ClientEntities.mjs').ClientEdict} ClientEdict */
 /** @typedef {import('../client/ClientEntities.mjs').ClientDlight} ClientDlight */
diff --git a/source/engine/common/PlatformWorker.mjs b/source/engine/common/PlatformWorker.mjs
index d09d2914..3ff4e8e0 100644
--- a/source/engine/common/PlatformWorker.mjs
+++ b/source/engine/common/PlatformWorker.mjs
@@ -8,7 +8,7 @@ eventBus.subscribe('registry.frozen', () => {
 });
 
 /** @type {boolean} */
-const isNode = typeof process !== 'undefined' && process.versions?.node !== null;  
+const isNode = typeof process !== 'undefined' && process.versions?.node !== null;
 
 /**
  * Unified worker wrapper that works on both Node.js and browser environments.
diff --git a/source/engine/common/W.mjs b/source/engine/common/W.ts
similarity index 64%
rename from source/engine/common/W.mjs
rename to source/engine/common/W.ts
index 9fbcb4a3..6c7f1508 100644
--- a/source/engine/common/W.mjs
+++ b/source/engine/common/W.ts
@@ -1,108 +1,100 @@
-
-import { eventBus, registry } from '../registry.mjs';
+import { eventBus, getCommonRegistry } from '../registry.mjs';
 import { CorruptedResourceError, MissingResourceError } from './Errors.ts';
 import Q from '../../shared/Q.ts';
 
-let { COM } = registry;
+let { COM } = getCommonRegistry();
 
 eventBus.subscribe('registry.frozen', () => {
-  COM = registry.COM;
+  ({ COM } = getCommonRegistry());
 });
 
+export interface WadLumpRecord {
+  readonly data: ArrayBuffer;
+  readonly type: number;
+  readonly size: number;
+  readonly name: string;
+}
+
 /**
  * WAD lump texture representation.
  * Contains only data, not uploaded to the GPU or anything.
  */
 export class WadLumpTexture {
-  /**
-   * @param {string} name internal texture name
-   * @param {number} width width
-   * @param {number} height height
-   * @param {Uint8Array} data RGBA texture data
-   */
-  constructor(name, width, height, data) {
-    this.name = name; // lump name
-    this.width = width; // texture width
-    this.height = height; // texture height
-    this.data = data; // texture data (Uint8Array)
-
+  constructor(
+    readonly name: string,
+    readonly width: number,
+    readonly height: number,
+    readonly data: Uint8Array,
+  ) {
     Object.freeze(this);
   }
 
-  toDataURL() {
+  toDataURL(): string {
     const canvas = document.createElement('canvas');
     canvas.width = this.width;
     canvas.height = this.height;
     const ctx = canvas.getContext('2d');
+    if (ctx === null) {
+      throw new Error('WadLumpTexture.toDataURL: 2D canvas context unavailable');
+    }
     const data = ctx.createImageData(canvas.width, canvas.height);
     data.data.set(new Uint8Array(this.data));
     ctx.putImageData(data, 0, 0);
     return canvas.toDataURL();
   }
 
-  toString() {
+  toString(): string {
     return `WadLumpTexture(${this.name}, ${this.width} x ${this.height} pixels, ${this.data.length} bytes)`;
   }
-};
+}
 
-export class WadFileInterface {
-  static MAGIC = 0; // magic number, to be defined in subclasses
+export abstract class WadFileInterface {
+  static MAGIC = 0;
 
-  /** @protected */
-  _lumps = {};
+  protected _lumps: Record<string, WadLumpRecord> = {};
 
-  getLumpNames() {
+  getLumpNames(): string[] {
     return Object.keys(this._lumps);
   }
 
-  // eslint-disable-next-line no-unused-vars
-  load(view) {
-    console.assert(null, 'WadFileInterface.load: not implemented');
-  }
+  abstract load(base: ArrayBuffer): void;
 
   /**
    * This will return the raw data for the given name.
-   * @param {string} name identifer of the lump to retrieve
-   * @returns {ArrayBuffer} the lump data
+   * @returns the lump data
    */
-  // eslint-disable-next-line no-unused-vars
-  getLump(name) {
-    console.assert(null, 'WadFileInterface.getLump: not implemented');
-    return new ArrayBuffer(0);
-  }
+  abstract getLump(name: string): ArrayBuffer | WadLumpRecord;
 
   /**
    * This will return the palette translated data for the given name.
-   * @param {string} name identifer of the lump to retrieve
-   * @param {?number} mipmapLevel mipmap level to retrieve, will always take the most available mipmap level
-   * @returns {WadLumpTexture} the decoded texture data
+   * @returns the decoded texture data
    */
-  // eslint-disable-next-line no-unused-vars
-  getLumpMipmap(name, mipmapLevel) {
-    console.assert(null, 'WadFileInterface.getLumpMipmap: not implemented');
-    return null;
-  }
-};
+  abstract getLumpMipmap(name: string, mipmapLevel?: number): WadLumpTexture | null;
+}
+
+/** A concrete WAD handler constructor with a static MAGIC identifier. */
+interface WadHandlerConstructor {
+  readonly MAGIC: number;
+  new(): WadFileInterface;
+}
 
 export default class W {
-  /** @type {Array<typeof WadFileInterface>} */
-  static _handlers = [];
+  static _handlers: WadHandlerConstructor[] = [];
 
   /** Current palette in 32 bit words. */
-  static d_8to24table = new Uint32Array(new ArrayBuffer(1024));
+  static d_8to24table = new Uint32Array(256);
 
   /** Current palette in 256 8 bit tuples for RGB. */
   static d_8to24table_u8 = new Uint8Array(768);
 
-  /** @type {number} Fill color index */
-  static filledColor = null;
+  /** Fill color index. */
+  static filledColor: number | null = null;
 
   /**
    * Loads given WAD file. Supports multiple WAD formats (WAD2, WAD3).
-   * @param {string} filename wad file path
-   * @returns {Promise<WadFileInterface>} the loaded WAD file or null if not found
+   * @returns the loaded WAD file
    */
-  static async LoadFile(filename) {
+  static async LoadFile(filename: string): Promise<WadFileInterface> {
     const base = await COM.LoadFile(filename);
 
     if (!base) {
@@ -111,23 +103,22 @@ export default class W {
 
     const view = new DataView(base);
     const magic = view.getUint32(0, true);
-    const handler = W._handlers.find((h) => h.MAGIC === magic);
+    const handler = W._handlers.find((wadHandler) => wadHandler.MAGIC === magic);
 
-    if (!handler) {
+    if (handler === undefined) {
       throw new CorruptedResourceError(filename, 'not a valid WAD file');
     }
 
     const wadFile = new handler();
     wadFile.load(base);
     return wadFile;
-  };
+  }
 
   /**
    * Loads the default palette from the given file. Used for all Quake resources.
    * A palette is a 256 color palette, each color is 3 bytes (RGB). 768 bytes in total.
-   * @param {string} filename palette file path, e.g. 'gfx/palette.lmp'
    */
-  static async LoadPalette(filename) {
+  static async LoadPalette(filename: string) {
     const palette = await COM.LoadFile(filename);
 
     if (palette === null) {
@@ -135,6 +126,7 @@ export default class W {
     }
 
     W.d_8to24table_u8 = new Uint8Array(palette);
+    W.filledColor = null;
 
     for (let i = 0, src = 0; i < 256; i++) {
       const pal = W.d_8to24table_u8;
@@ -147,14 +139,13 @@ export default class W {
     }
 
     eventBus.publish('wad.palette.loaded');
-  };
+  }
 
   /**
    * Loads a lump from the filesystem as texture.
-   * @param {string} filename lump file path
-   * @returns {Promise<WadLumpTexture>} the loaded lump texture
+   * @returns the loaded lump texture
    */
-  static async LoadLump(filename) { // TODO: this should take a type parameter to specify the type of the lump
+  static async LoadLump(filename: string) { // TODO: this should take a type parameter to specify the type of the lump
     const buf = await COM.LoadFile(filename);
 
     if (buf === null) {
@@ -168,20 +159,23 @@ export default class W {
 
     return new WadLumpTexture(filename, width, height, translateIndexToRGBA(data, width, height, W.d_8to24table_u8, 255));
   }
-};
+}
 
 /**
  * Quake 1 WAD file format handler.
  */
 class Wad2File extends WadFileInterface {
-  static MAGIC = 0x32444157; // 'WAD2'
+  static override MAGIC = 0x32444157; // 'WAD2'
+
+  /** Active palette, sourced from {@link W.d_8to24table_u8}. */
+  readonly palette: Uint8Array;
 
   constructor() {
     super();
-    this.palette = W.d_8to24table_u8; // use the palette from VID
+    this.palette = W.d_8to24table_u8;
   }
 
-  load(base) {
+  override load(base: ArrayBuffer) {
     const view = new DataView(base);
     console.assert(view.getUint32(0, true) === Wad2File.MAGIC, 'magic number');
     const numlumps = view.getUint32(4, true);
@@ -191,12 +185,12 @@ class Wad2File extends WadFileInterface {
       const type = view.getUint8(infotableofs + 12);
       const lump = new ArrayBuffer(size);
       const name = Q.memstr(new Uint8Array(base, infotableofs + 16, 16));
-      (new Uint8Array(lump)).set(new Uint8Array(base, view.getUint32(infotableofs, true), size));
+      new Uint8Array(lump).set(new Uint8Array(base, view.getUint32(infotableofs, true), size));
       this._lumps[name.toUpperCase()] = {
         data: lump,
-        type: type, // lump type
-        size: size, // uncompressed size
-        name: name,
+        type, // lump type
+        size, // uncompressed size
+        name,
       };
       infotableofs += 32;
     }
@@ -204,10 +198,9 @@ class Wad2File extends WadFileInterface {
 
   /**
    * This will return the raw data for the given name.
-   * @param {string} name identifer of the lump to retrieve
-   * @returns {ArrayBuffer} the lump data
+   * @returns the lump data
    */
-  getLump(name) {
+  override getLump(name: string): ArrayBuffer {
     const lump = this._lumps[name.toUpperCase()];
 
     if (!lump) {
@@ -219,12 +212,9 @@ class Wad2File extends WadFileInterface {
 
   /**
    * This will return the palette translated data for the given name.
-   * @param {string} name identifer of the lump to retrieve
-   * @param {?number} mipmapLevel always 0, WAD2 does not support mipmaps
-   * @returns {WadLumpTexture} the decoded texture data
+   * @returns the decoded texture data
    */
-  // eslint-disable-next-line no-unused-vars
-  getLumpMipmap(name, mipmapLevel = 0) {
+  override getLumpMipmap(name: string, _mipmapLevel = 0): WadLumpTexture {
     const data = this.getLump(name);
     const view = new DataView(data);
 
@@ -245,7 +235,7 @@ class Wad2File extends WadFileInterface {
 
     return new WadLumpTexture(name, width, height, rgba);
   }
-};
+}
 
 W._handlers.push(Wad2File);
 
@@ -253,9 +243,9 @@ W._handlers.push(Wad2File);
  * GoldSrc WAD3 file format handler.
  */
 class Wad3File extends WadFileInterface {
-  static MAGIC = 0x33444157; // 'WAD3'
+  static override MAGIC = 0x33444157; // 'WAD3'
 
-  load(base) {
+  override load(base: ArrayBuffer) {
     const view = new DataView(base);
     console.assert(view.getUint32(0, true) === Wad3File.MAGIC, 'magic number');
     const numlumps = view.getUint32(4, true);
@@ -271,26 +261,25 @@ class Wad3File extends WadFileInterface {
       const lump = new ArrayBuffer(size);
 
       if (!compression) { // Uncompressed
-        (new Uint8Array(lump)).set(new Uint8Array(base, filepos, disksize));
+        new Uint8Array(lump).set(new Uint8Array(base, filepos, disksize));
       } else { // Compressed
         const compressedData = new Uint8Array(base, filepos, disksize);
         const decompressed = Wad3File._decompressLZ(compressedData, size);
-        (new Uint8Array(lump)).set(decompressed);
+        new Uint8Array(lump).set(decompressed);
       }
 
       this._lumps[name.toUpperCase()] = {
         data: lump,
-        type: type,
-        size: size,
-        name: name,
+        type,
+        size,
+        name,
       };
 
       infotableofs += 32;
     }
   }
 
-  // eslint-disable-next-line no-unused-vars
-  _parseQPicLump(name, data, mipmapLevel) {
+  _parseQPicLump(name: string, data: ArrayBuffer, _mipmapLevel: number): WadLumpTexture {
     const view = new DataView(data);
     const width = view.getUint32(0, true);
     const height = view.getUint32(4, true);
@@ -308,16 +297,15 @@ class Wad3File extends WadFileInterface {
     return new WadLumpTexture(name, width, height, rgba);
   }
 
-  _parseMiptexLump(name, data, mipmapLevel) {
+  _parseMiptexLump(name: string, data: ArrayBuffer, mipmapLevel: number): WadLumpTexture {
     return readWad3Texture(data, name, mipmapLevel);
   }
 
   /**
    * This will return the raw data for the given name.
-   * @param {string} name identifer of the lump to retrieve
-   * @returns {ArrayBuffer} the lump data
+   * @returns the lump data
    */
-  getLump(name) {
+  override getLump(name: string): WadLumpRecord {
     const lump = this._lumps[name.toUpperCase()];
 
     if (!lump) {
@@ -329,11 +317,9 @@ class Wad3File extends WadFileInterface {
 
   /**
    * This will return the palette translated data for the given name.
-   * @param {string} name name of the lump to retrieve
-   * @param {number} mipmapLevel 0..3, 0 is the base level
-   * @returns {WadLumpTexture} the decoded texture data
+   * @returns the decoded texture data
    */
-  getLumpMipmap(name, mipmapLevel = 0) {
+  override getLumpMipmap(name: string, mipmapLevel = 0): WadLumpTexture | null {
     const lumpInfo = this._lumps[name.toUpperCase()];
 
     if (!lumpInfo) {
@@ -353,16 +339,14 @@ class Wad3File extends WadFileInterface {
         return null; // TODO: implement font handling
     }
 
-    throw new CorruptedResourceError(name, 'not a valid lump type (' + lumpInfo.type + ')');
+    throw new CorruptedResourceError(name, `not a valid lump type (${lumpInfo.type})`);
   }
 
   /**
    * Decompress LZ-compressed data from GoldSrc WAD3 files
-   * @param {Uint8Array} compressed - The compressed data
-   * @param {number} uncompressedSize - Expected size of uncompressed data
-   * @returns {Uint8Array} - The decompressed data
+   * @returns the decompressed data
    */
-  static _decompressLZ(compressed, uncompressedSize) {
+  static _decompressLZ(compressed: Uint8Array, uncompressedSize: number): Uint8Array {
     const output = new Uint8Array(uncompressedSize);
     let inPos = 0;
     let outPos = 0;
@@ -407,23 +391,25 @@ class Wad3File extends WadFileInterface {
     }
 
     return output;
-  };
-};
+  }
+}
 
 W._handlers.push(Wad3File);
 
 /**
  * Helper function to convert indexed 8-bit data to RGBA format.
  * It has options for transparency and fullbright colors.
- * @param {Uint8Array} uint8data indexed 8-bit data, each byte is an index to the palette
- * @param {number} width width
- * @param {number} height height
- * @param {?Uint8Array} palette palette data, 256 colors, each color is 3 bytes (RGB), default is W.d_8to24table_u8
- * @param {?number} transparentColor optional color index to treat as transparent (default is null, no transparency)
- * @param {?number} fullbrightColorStart optional color index where fullbright colors start (default is null, no fullbright)
- * @returns {Uint8Array} RGBA data, each pixel is 4 bytes (R, G, B, A)
+ * @returns RGBA data, each pixel is 4 bytes (R, G, B, A)
  */
-export function translateIndexToRGBA(uint8data, width, height, palette = W.d_8to24table_u8, transparentColor = null, fullbrightColorStart = null) {
+export function translateIndexToRGBA(
+  uint8data: Uint8Array,
+  width: number,
+  height: number,
+  palette: Uint8Array | null = W.d_8to24table_u8,
+  transparentColor: number | null = null,
+  fullbrightColorStart: number | null = null,
+): Uint8Array {
+  const resolvedPalette = palette ?? W.d_8to24table_u8;
   const rgba = new Uint8Array(width * height * 4);
 
   for (let i = 0; i < width * height; i++) {
@@ -437,29 +423,31 @@ export function translateIndexToRGBA(uint8data, width, height, palette = W.d_8to
     }
 
     // lookup the color in the palette
-    rgba[i * 4 + 0] = palette[colorIndex * 3];
-    rgba[i * 4 + 1] = palette[colorIndex * 3 + 1];
-    rgba[i * 4 + 2] = palette[colorIndex * 3 + 2];
+    rgba[i * 4 + 0] = resolvedPalette[colorIndex * 3];
+    rgba[i * 4 + 1] = resolvedPalette[colorIndex * 3 + 1];
+    rgba[i * 4 + 2] = resolvedPalette[colorIndex * 3 + 2];
 
     // our pixel shader is considering the alpha channel whether to use the lightmap or not
     rgba[i * 4 + 3] = fullbrightColorStart !== null && colorIndex >= fullbrightColorStart ? 0 : 255;
   }
 
   return rgba;
-};
+}
 
 /**
  * Convert indexed 8-bit data into an RGBA emissive texture containing only
  * Quake fullbright pixels.
- * @param {Uint8Array} uint8data Indexed 8-bit texture data.
- * @param {number} width Texture width.
- * @param {number} height Texture height.
- * @param {?Uint8Array} palette Palette data, 256 colors x 3 bytes.
- * @param {?number} transparentColor Optional transparent palette index.
- * @param {?number} fullbrightColorStart Palette index where fullbright colors begin.
- * @returns {Uint8Array} RGBA data containing only fullbright pixels.
+ * @returns RGBA data containing only fullbright pixels
  */
-export function translateIndexToLuminanceRGBA(uint8data, width, height, palette = W.d_8to24table_u8, transparentColor = null, fullbrightColorStart = 240) {
+export function translateIndexToLuminanceRGBA(
+  uint8data: Uint8Array,
+  width: number,
+  height: number,
+  palette: Uint8Array | null = W.d_8to24table_u8,
+  transparentColor: number | null = null,
+  fullbrightColorStart: number | null = 240,
+): Uint8Array {
+  const resolvedPalette = palette ?? W.d_8to24table_u8;
   const rgba = new Uint8Array(width * height * 4);
 
   for (let i = 0; i < width * height; i++) {
@@ -473,9 +461,9 @@ export function translateIndexToLuminanceRGBA(uint8data, width, height, palette
       continue;
     }
 
-    rgba[i * 4 + 0] = palette[colorIndex * 3];
-    rgba[i * 4 + 1] = palette[colorIndex * 3 + 1];
-    rgba[i * 4 + 2] = palette[colorIndex * 3 + 2];
+    rgba[i * 4 + 0] = resolvedPalette[colorIndex * 3];
+    rgba[i * 4 + 1] = resolvedPalette[colorIndex * 3 + 1];
+    rgba[i * 4 + 2] = resolvedPalette[colorIndex * 3 + 2];
     rgba[i * 4 + 3] = 255;
   }
 
@@ -484,12 +472,9 @@ export function translateIndexToLuminanceRGBA(uint8data, width, height, palette
 
 /**
  * Reads a WAD3 texture from the given data.
- * @param {ArrayBuffer} data WAD3 texture data
- * @param {string} name texture name, used if the texture name in the data is empty
- * @param {number} mipmapLevel 0..3, 0 is the base level
- * @returns {WadLumpTexture} the decoded texture data
+ * @returns the decoded texture data
  */
-export function readWad3Texture(data, name, mipmapLevel = 0) {
+export function readWad3Texture(data: ArrayBuffer, name: string, mipmapLevel = 0): WadLumpTexture {
   const view = new DataView(data);
   const width = view.getUint32(16, true);
   const height = view.getUint32(20, true);
@@ -523,7 +508,14 @@ export function readWad3Texture(data, name, mipmapLevel = 0) {
   );
 
   // Textures with a name starting with '{' are transparent, so we set the transparent color to 255
-  const rgba = translateIndexToRGBA(uint8data, swidth, sheight, palette, texName[0] === '{' ? 255 : null, (texName[0] === '~' || texName[2] === '~') ? 240 : null);
+  const rgba = translateIndexToRGBA(
+    uint8data,
+    swidth,
+    sheight,
+    palette,
+    texName[0] === '{' ? 255 : null,
+    (texName[0] === '~' || texName[2] === '~') ? 240 : null,
+  );
 
   return new WadLumpTexture(texName, swidth, sheight, rgba);
-};
+}
diff --git a/source/engine/common/model/loaders/AliasMDLLoader.mjs b/source/engine/common/model/loaders/AliasMDLLoader.mjs
index a943bbdd..50b389d3 100644
--- a/source/engine/common/model/loaders/AliasMDLLoader.mjs
+++ b/source/engine/common/model/loaders/AliasMDLLoader.mjs
@@ -1,7 +1,7 @@
 import Vector from '../../../../shared/Vector.ts';
 import Q from '../../../../shared/Q.ts';
 import GL, { GLTexture, resampleTexture8 } from '../../../client/GL.mjs';
-import W, { translateIndexToLuminanceRGBA, translateIndexToRGBA } from '../../W.mjs';
+import W, { translateIndexToLuminanceRGBA, translateIndexToRGBA } from '../../W.ts';
 import { CRC16CCITT } from '../../CRC.ts';
 import { registry } from '../../../registry.mjs';
 import { ModelLoader } from '../ModelLoader.mjs';
diff --git a/source/engine/common/model/loaders/BSP29Loader.mjs b/source/engine/common/model/loaders/BSP29Loader.mjs
index aaa7ab59..4ed11168 100644
--- a/source/engine/common/model/loaders/BSP29Loader.mjs
+++ b/source/engine/common/model/loaders/BSP29Loader.mjs
@@ -2,7 +2,7 @@ import Vector from '../../../../shared/Vector.ts';
 import Q from '../../../../shared/Q.ts';
 import { content } from '../../../../shared/Defs.ts';
 import { GLTexture } from '../../../client/GL.mjs';
-import W, { readWad3Texture, translateIndexToLuminanceRGBA, translateIndexToRGBA } from '../../W.mjs';
+import W, { readWad3Texture, translateIndexToLuminanceRGBA, translateIndexToRGBA } from '../../W.ts';
 import { CRC16CCITT } from '../../CRC.ts';
 import { CorruptedResourceError } from '../../Errors.ts';
 import { eventBus, registry } from '../../../registry.mjs';
diff --git a/source/engine/common/model/loaders/SpriteSPRLoader.mjs b/source/engine/common/model/loaders/SpriteSPRLoader.mjs
index 2406b26c..d915bb0d 100644
--- a/source/engine/common/model/loaders/SpriteSPRLoader.mjs
+++ b/source/engine/common/model/loaders/SpriteSPRLoader.mjs
@@ -1,6 +1,6 @@
 import Vector from '../../../../shared/Vector.ts';
 import { GLTexture } from '../../../client/GL.mjs';
-import W, { translateIndexToRGBA } from '../../W.mjs';
+import W, { translateIndexToRGBA } from '../../W.ts';
 import { CRC16CCITT } from '../../CRC.ts';
 import { registry } from '../../../registry.mjs';
 import { ModelLoader } from '../ModelLoader.mjs';
diff --git a/test/common/w-textures.test.mjs b/test/common/w-textures.test.mjs
index 24bdc474..b43a6c93 100644
--- a/test/common/w-textures.test.mjs
+++ b/test/common/w-textures.test.mjs
@@ -1,10 +1,10 @@
 import assert from 'node:assert/strict';
 import { describe, test } from 'node:test';
 
-import { translateIndexToLuminanceRGBA, translateIndexToRGBA } from '../../source/engine/common/W.mjs';
+import { readWad3Texture, translateIndexToLuminanceRGBA, translateIndexToRGBA } from '../../source/engine/common/W.ts';
 
-describe('translateIndexToRGBA', () => {
-  test('treats palette index 240 as fullbright for legacy Quake textures', () => {
+void describe('translateIndexToRGBA', () => {
+  void test('treats palette index 240 as fullbright for legacy Quake textures', () => {
     const palette = new Uint8Array(256 * 3);
     palette[240 * 3] = 10;
     palette[240 * 3 + 1] = 20;
@@ -19,8 +19,8 @@ describe('translateIndexToRGBA', () => {
   });
 });
 
-describe('translateIndexToLuminanceRGBA', () => {
-  test('keeps only fullbright palette entries in the luminance texture', () => {
+void describe('translateIndexToLuminanceRGBA', () => {
+  void test('keeps only fullbright palette entries in the luminance texture', () => {
     const palette = new Uint8Array(256 * 3);
     palette[239 * 3] = 1;
     palette[239 * 3 + 1] = 2;
@@ -41,7 +41,7 @@ describe('translateIndexToLuminanceRGBA', () => {
     ]);
   });
 
-  test('skips transparent indexed pixels even when their palette index is fullbright', () => {
+  void test('skips transparent indexed pixels even when their palette index is fullbright', () => {
     const palette = new Uint8Array(256 * 3);
     palette[255 * 3] = 70;
     palette[255 * 3 + 1] = 80;
@@ -52,3 +52,46 @@ describe('translateIndexToLuminanceRGBA', () => {
     assert.deepEqual(Array.from(rgba), [0, 0, 0, 0]);
   });
 });
+
+void describe('readWad3Texture', () => {
+  void test('applies transparent and fullbright rules from the miptex name markers', () => {
+    const width = 8;
+    const height = 8;
+    const headerSize = 40;
+    const mip0Size = width * height;
+    const mip1Size = (width / 2) * (height / 2);
+    const mip2Size = (width / 4) * (height / 4);
+    const mip3Size = (width / 8) * (height / 8);
+    const paletteOffset = headerSize + mip0Size + mip1Size + mip2Size + mip3Size + 2;
+    const buffer = new ArrayBuffer(paletteOffset + 768);
+    const view = new DataView(buffer);
+    const bytes = new Uint8Array(buffer);
+
+    bytes.set(new TextEncoder().encode('{A~'), 0);
+    view.setUint32(16, width, true);
+    view.setUint32(20, height, true);
+    view.setUint32(24, headerSize, true);
+    view.setUint32(28, headerSize + mip0Size, true);
+    view.setUint32(32, headerSize + mip0Size + mip1Size, true);
+    view.setUint32(36, headerSize + mip0Size + mip1Size + mip2Size, true);
+
+    bytes[headerSize] = 255;
+    bytes[headerSize + 1] = 240;
+
+    view.setUint16(headerSize + mip0Size + mip1Size + mip2Size + mip3Size, 256, true);
+
+    bytes[paletteOffset + 240 * 3] = 10;
+    bytes[paletteOffset + 240 * 3 + 1] = 20;
+    bytes[paletteOffset + 240 * 3 + 2] = 30;
+
+    const texture = readWad3Texture(buffer, 'fallback', 0);
+
+    assert.equal(texture.name, '{A~');
+    assert.equal(texture.width, 8);
+    assert.equal(texture.height, 8);
+    assert.deepEqual(Array.from(texture.data.slice(0, 8)), [
+      0, 0, 0, 0,
+      10, 20, 30, 0,
+    ]);
+  });
+});

From b187d137f703586c8263c29500b770e3d70a8cf3 Mon Sep 17 00:00:00 2001
From: Christian R <github@chrisnew.de>
Date: Thu, 2 Apr 2026 17:51:02 +0300
Subject: [PATCH 21/67] TS: common/ anything Worker

---
 source/engine/client/Sys.mjs                  |   4 +-
 source/engine/common/PlatformWorker.mjs       |  99 ---------
 source/engine/common/PlatformWorker.ts        | 126 ++++++++++++
 source/engine/common/Sys.ts                   |   4 +-
 ...WorkerFactories.mjs => WorkerFactories.ts} |   5 +-
 source/engine/common/WorkerFramework.mjs      | 118 -----------
 source/engine/common/WorkerFramework.ts       | 140 +++++++++++++
 .../{WorkerManager.mjs => WorkerManager.ts}   |  85 ++++----
 source/engine/main-dedicated.mjs              |   2 +-
 source/engine/server/DummyWorker.mjs          |   2 +-
 source/engine/server/Navigation.mjs           |   4 +-
 source/engine/server/NavigationWorker.mjs     |   2 +-
 source/engine/server/Sys.mjs                  |   4 +-
 test/common/workers.test.mjs                  | 194 ++++++++++++++++++
 14 files changed, 523 insertions(+), 266 deletions(-)
 delete mode 100644 source/engine/common/PlatformWorker.mjs
 create mode 100644 source/engine/common/PlatformWorker.ts
 rename source/engine/common/{WorkerFactories.mjs => WorkerFactories.ts} (76%)
 delete mode 100644 source/engine/common/WorkerFramework.mjs
 create mode 100644 source/engine/common/WorkerFramework.ts
 rename source/engine/common/{WorkerManager.mjs => WorkerManager.ts} (58%)
 create mode 100644 test/common/workers.test.mjs

diff --git a/source/engine/client/Sys.mjs b/source/engine/client/Sys.mjs
index db012398..b90100f6 100644
--- a/source/engine/client/Sys.mjs
+++ b/source/engine/client/Sys.mjs
@@ -2,8 +2,8 @@ import { K } from '../../shared/Keys.ts';
 import Q from '../../shared/Q.ts';
 import { eventBus, registry } from '../registry.mjs';
 import Tools from './Tools.mjs';
-import WorkerManager from '../common/WorkerManager.mjs';
-import workerFactories from '../common/WorkerFactories.mjs';
+import WorkerManager from '../common/WorkerManager.ts';
+import workerFactories from '../common/WorkerFactories.ts';
 
 let { COM, Host, Key } = registry;
 
diff --git a/source/engine/common/PlatformWorker.mjs b/source/engine/common/PlatformWorker.mjs
deleted file mode 100644
index 3ff4e8e0..00000000
--- a/source/engine/common/PlatformWorker.mjs
+++ /dev/null
@@ -1,99 +0,0 @@
-import { registry, eventBus } from '../registry.mjs';
-import { BaseWorker } from './Sys.ts';
-
-let { Host } = registry;
-
-eventBus.subscribe('registry.frozen', () => {
-  ({ Host } = registry);
-});
-
-/** @type {boolean} */
-const isNode = typeof process !== 'undefined' && process.versions?.node !== null;
-
-/**
- * Unified worker wrapper that works on both Node.js and browser environments.
- *
- * In Node.js, it wraps a `worker_threads.Worker` (event emitter API).
- * In the browser, it wraps a Web Worker (DOM event target API).
- *
- * Platform differences (message unwrapping, error subscription, terminate
- * semantics) are detected once at module load via `isNode` and handled
- * transparently.
- *
- * Receives an already-constructed Worker instance to avoid importing
- * WorkerFactories (which would create a circular dependency through
- * worker scripts that transitively import this module).
- */
-export default class PlatformWorker extends BaseWorker {
-  /**
-   * @type {Worker}
-   * @description In Node.js this is a `worker_threads.Worker` (EventEmitter API);
-   * in the browser it is a standard Web Worker (EventTarget API).
-   */
-  #worker = null;
-
-  /**
-   * @param {string} name worker script name
-   * @param {Worker} worker pre-constructed Worker instance
-   */
-  constructor(name, worker) {
-    super(name);
-
-    this.#worker = worker;
-    this.#setupErrorHandler();
-  }
-
-  #setupErrorHandler() {
-    if (isNode) {
-      // @ts-ignore — Node.js Worker uses EventEmitter API (.on), not EventTarget
-      this.#worker.on('error', (e) => {
-        console.error(`PlatformWorker ${this.name} error: ${e.message}`);
-
-        void this.shutdown();
-
-        Host.HandleCrash(e);
-      });
-    } else {
-      this.#worker.addEventListener('error', (e) => {
-        const detail = e?.message || e?.filename || '(no details)';
-
-        console.error(`PlatformWorker ${this.name} error: ${detail}`, e);
-
-        void this.shutdown();
-
-        Host.HandleCrash(e);
-      });
-    }
-  }
-
-  addOnMessageListener(listener) {
-    if (isNode) {
-      // @ts-ignore — Node.js Worker uses EventEmitter API (.on), not EventTarget
-      this.#worker.on('message', (data) => {
-        listener(data);
-      });
-    } else {
-      this.#worker.addEventListener('message', (e) => {
-        listener(e.data);
-      });
-    }
-  }
-
-  postMessage(message) {
-    this.#worker.postMessage(message);
-  }
-
-  async shutdown() {
-    for (const listener of this._shutdownListeners) {
-      listener();
-    }
-
-    this._shutdownListeners.length = 0;
-
-    // Node.js Worker.terminate() returns a Promise; browser Worker.terminate() does not.
-    // eslint-disable-next-line @typescript-eslint/await-thenable
-    await this.#worker.terminate();
-
-    this.#worker = null;
-  }
-}
diff --git a/source/engine/common/PlatformWorker.ts b/source/engine/common/PlatformWorker.ts
new file mode 100644
index 00000000..8c79e3ef
--- /dev/null
+++ b/source/engine/common/PlatformWorker.ts
@@ -0,0 +1,126 @@
+import { registry, eventBus } from '../registry.mjs';
+import { BaseWorker, type WorkerMessageListener } from './Sys.ts';
+
+let { Host } = registry;
+
+eventBus.subscribe('registry.frozen', () => {
+  ({ Host } = registry);
+});
+
+const isNode = typeof process !== 'undefined' && process.versions?.node !== undefined;
+
+export interface WorkerMessageEnvelope {
+  readonly event: string;
+  readonly data?: unknown[];
+  readonly args?: unknown[];
+}
+
+type NodeLikeWorker = {
+  on(event: 'message', listener: (data: unknown) => void): void;
+  on(event: 'error', listener: (error: Error) => void): void;
+  postMessage(message: unknown): void;
+  terminate(): Promise<number>;
+};
+
+type BrowserLikeWorker = {
+  addEventListener(event: 'message', listener: (event: MessageEvent<unknown>) => void): void;
+  addEventListener(event: 'error', listener: (event: ErrorEvent) => void): void;
+  postMessage(message: unknown): void;
+  terminate(): void;
+};
+
+export type PlatformWorkerHandle = NodeLikeWorker | BrowserLikeWorker;
+export type WorkerFactory = (name: string) => PlatformWorkerHandle;
+export type WorkerFactoryRegistry = Record<string, WorkerFactory>;
+
+/**
+ * Unified worker wrapper that works on both Node.js and browser environments.
+ *
+ * In Node.js, it wraps a `worker_threads.Worker` (event emitter API).
+ * In the browser, it wraps a Web Worker (DOM event target API).
+ *
+ * Platform differences (message unwrapping, error subscription, terminate
+ * semantics) are detected once at module load via `isNode` and handled
+ * transparently.
+ *
+ * Receives an already-constructed Worker instance to avoid importing
+ * WorkerFactories (which would create a circular dependency through
+ * worker scripts that transitively import this module).
+ */
+export default class PlatformWorker extends BaseWorker {
+  #worker: PlatformWorkerHandle | null = null;
+
+  constructor(name: string, worker: PlatformWorkerHandle) {
+    super(name);
+
+    this.#worker = worker;
+    this.#setupErrorHandler();
+  }
+
+  #setupErrorHandler() {
+    const worker = this.#worker;
+
+    if (worker === null) {
+      return;
+    }
+
+    if (isNode) {
+      (worker as NodeLikeWorker).on('error', (error) => {
+        console.error(`PlatformWorker ${this.name} error: ${error.message}`);
+
+        void this.shutdown();
+
+        Host.HandleCrash(error);
+      });
+    } else {
+      (worker as BrowserLikeWorker).addEventListener('error', (error) => {
+        const detail = error.message || error.filename || '(no details)';
+
+        console.error(`PlatformWorker ${this.name} error: ${detail}`, error);
+
+        void this.shutdown();
+
+        Host.HandleCrash(error);
+      });
+    }
+  }
+
+  addOnMessageListener(listener: WorkerMessageListener) {
+    const worker = this.#worker;
+
+    if (worker === null) {
+      return;
+    }
+
+    if (isNode) {
+      (worker as NodeLikeWorker).on('message', (data) => {
+        listener(data);
+      });
+    } else {
+      (worker as BrowserLikeWorker).addEventListener('message', (event) => {
+        listener(event.data);
+      });
+    }
+  }
+
+  postMessage(message: unknown) {
+    this.#worker?.postMessage(message);
+  }
+
+  async shutdown() {
+    for (const listener of this._shutdownListeners) {
+      listener();
+    }
+
+    this._shutdownListeners.length = 0;
+
+    const worker = this.#worker;
+    this.#worker = null;
+
+    if (worker === null) {
+      return;
+    }
+
+    await worker.terminate();
+  }
+}
diff --git a/source/engine/common/Sys.ts b/source/engine/common/Sys.ts
index ccc8f8ed..7c02abaf 100644
--- a/source/engine/common/Sys.ts
+++ b/source/engine/common/Sys.ts
@@ -1,10 +1,10 @@
 import { NotImplementedError } from './Errors.ts';
 
 /** Message listener callback for worker communication. */
-type WorkerMessageListener = (message: unknown) => void;
+export type WorkerMessageListener = (message: unknown) => void;
 
 /** Shutdown listener callback. */
-type WorkerShutdownListener = () => void;
+export type WorkerShutdownListener = () => void;
 
 /**
  * Abstract base class for platform-specific worker implementations.
diff --git a/source/engine/common/WorkerFactories.mjs b/source/engine/common/WorkerFactories.ts
similarity index 76%
rename from source/engine/common/WorkerFactories.mjs
rename to source/engine/common/WorkerFactories.ts
index e9656fb7..645f1ade 100644
--- a/source/engine/common/WorkerFactories.mjs
+++ b/source/engine/common/WorkerFactories.ts
@@ -1,8 +1,9 @@
+import type { WorkerFactoryRegistry } from './PlatformWorker.ts';
+
 /**
  * Add new worker scripts here when creating additional workers.
- * @type {Record<string, (name: string) => Worker>}
  */
-const workerFactories = {
+const workerFactories: WorkerFactoryRegistry = {
   'server/DummyWorker.mjs': (name) => new Worker(new URL('../server/DummyWorker.mjs', import.meta.url), { name, type: 'module' }),
   'server/NavigationWorker.mjs': (name) => new Worker(new URL('../server/NavigationWorker.mjs', import.meta.url), { name, type: 'module' }),
 };
diff --git a/source/engine/common/WorkerFramework.mjs b/source/engine/common/WorkerFramework.mjs
deleted file mode 100644
index 30e80c84..00000000
--- a/source/engine/common/WorkerFramework.mjs
+++ /dev/null
@@ -1,118 +0,0 @@
-import { eventBus, registry } from '../registry.mjs';
-import Mod from './Mod.mjs';
-import Sys from './Sys.ts';
-import COM from './Com.ts';
-
-class WorkerConsole {
-  static Print(message) {
-    WorkerFramework.Publish('worker.con.print', message);
-  }
-
-  static PrintError(message) {
-    WorkerFramework.Publish('worker.con.print.error', message);
-  }
-
-  static PrintWarning(message) {
-    WorkerFramework.Publish('worker.con.print.warning', message);
-  }
-
-  static PrintSuccess(message) {
-    WorkerFramework.Publish('worker.con.print.success', message);
-  }
-
-  static DPrint(message) {
-    WorkerFramework.Publish('worker.con.dprint', message);
-  }
-}
-
-class WorkerSys extends Sys {
-  static Print(message) {
-    console.info(message);
-  }
-
-  static FloatTime() {
-    return Date.now() / 1000;
-  }
-}
-
-class WorkerCOM extends COM {
-  // TODO: implement the COM stuff here for workers to share files etc.
-}
-
-/**
- * Worker Framework
- *
- * Initializes the worker framework, setting up the registry and event bus.
- * Listens for messages from the parent thread and publishes them to the event bus.
- *
- * Also prepares lean versions of Con, Sys, and COM for use within the worker.
- *
- * Usage: `await WorkerFramework.Init();` at the top of the worker script.
- */
-export default class WorkerFramework {
-  static port = null;
-
-  static #InitRegistry(COM) {
-    registry.isDedicatedServer = true;
-    registry.isInsideWorker = true;
-    registry.Con = WorkerConsole;
-    registry.Sys = WorkerSys;
-    registry.COM = COM;
-    registry.Mod = Mod;
-
-    registry.urls = {}; // will be set later
-
-    eventBus.publish('registry.frozen');
-  }
-
-  static #InitModules() {
-    Mod.Init();
-  }
-
-  static async Init() {
-    let COM;
-
-    const isNode = typeof process !== 'undefined' && process.versions != null && process.versions.node != null;
-
-    if (isNode) {
-      // Paths constructed at runtime so Vite's worker bundler cannot
-      // statically resolve them (it ignores @vite-ignore in its
-      // separate Rollup pass). These modules are Node.js-only.
-      const workerThreadsId = ['node', 'worker_threads'].join(':');
-      const { parentPort } = await import(/* @vite-ignore */ workerThreadsId);
-      this.port = parentPort;
-      const serverComId = ['..', 'server', 'Com.mjs'].join('/');
-      const comModule = await import(/* @vite-ignore */ serverComId);
-      COM = comModule.default;
-
-      this.port.on('message', ({ event, args }) => {
-        eventBus.publish(event, ...args);
-      });
-    } else {
-      this.port = self;
-      COM = WorkerCOM;
-
-      this.port.addEventListener('message', (e) => {
-        const { event, args } = e.data;
-        eventBus.publish(event, ...args);
-      });
-    }
-
-    this.#InitRegistry(COM);
-    this.#InitModules();
-
-    eventBus.subscribe('worker.framework.init', (comParams, urls) => {
-      COM.searchpaths = comParams[0];
-      COM.gamedir = comParams[1];
-      COM.game = comParams[2];
-
-      Object.assign(registry.urls, urls);
-    });
-
-    console.debug('Worker Framework initialized.');
-  }
-
-  static Publish(event, ...data) {
-    this.port.postMessage({ event, data });
-  }
-};
diff --git a/source/engine/common/WorkerFramework.ts b/source/engine/common/WorkerFramework.ts
new file mode 100644
index 00000000..e945b742
--- /dev/null
+++ b/source/engine/common/WorkerFramework.ts
@@ -0,0 +1,140 @@
+import type { URLs } from '../build-config';
+
+import { eventBus, registry } from '../registry.mjs';
+import Mod from './Mod.mjs';
+import Sys from './Sys.ts';
+import COM, { type SearchPath } from './Com.ts';
+
+type WorkerConsoleMessage = string;
+
+type WorkerPortMessage = {
+  readonly event: string;
+  readonly args: unknown[];
+};
+
+type WorkerPublishMessage = {
+  readonly event: string;
+  readonly data: unknown[];
+};
+
+type WorkerFrameworkPort = {
+  postMessage(message: WorkerPublishMessage): void;
+  addEventListener?(event: 'message', listener: (event: MessageEvent<WorkerPortMessage>) => void): void;
+  on?(event: 'message', listener: (message: WorkerPortMessage) => void): void;
+};
+
+type WorkerFrameworkInitPayload = [SearchPath[], SearchPath[] | null, string];
+
+class WorkerConsole {
+  static Print(message: WorkerConsoleMessage) {
+    WorkerFramework.Publish('worker.con.print', message);
+  }
+
+  static PrintError(message: WorkerConsoleMessage) {
+    WorkerFramework.Publish('worker.con.print.error', message);
+  }
+
+  static PrintWarning(message: WorkerConsoleMessage) {
+    WorkerFramework.Publish('worker.con.print.warning', message);
+  }
+
+  static PrintSuccess(message: WorkerConsoleMessage) {
+    WorkerFramework.Publish('worker.con.print.success', message);
+  }
+
+  static DPrint(message: WorkerConsoleMessage) {
+    WorkerFramework.Publish('worker.con.dprint', message);
+  }
+}
+
+class WorkerSys extends Sys {
+  static Print(message: string) {
+    console.info(message);
+  }
+
+  static FloatTime(): number {
+    return Date.now() / 1000;
+  }
+}
+
+class WorkerCOM extends COM {
+  // TODO: implement the COM stuff here for workers to share files etc.
+}
+
+/**
+ * Worker Framework
+ *
+ * Initializes the worker framework, setting up the registry and event bus.
+ * Listens for messages from the parent thread and publishes them to the event bus.
+ *
+ * Also prepares lean versions of Con, Sys, and COM for use within the worker.
+ *
+ * Usage: `await WorkerFramework.Init();` at the top of the worker script.
+ */
+export default class WorkerFramework {
+  static port: WorkerFrameworkPort | null = null;
+
+  static #InitRegistry(workerCom: typeof COM) {
+    registry.isDedicatedServer = true;
+    registry.isInsideWorker = true;
+    registry.Con = WorkerConsole as typeof registry.Con;
+    registry.Sys = WorkerSys;
+    registry.COM = workerCom;
+    registry.Mod = Mod;
+
+    registry.urls = {} as URLs; // will be set later
+
+    eventBus.publish('registry.frozen');
+  }
+
+  static #InitModules() {
+    Mod.Init();
+  }
+
+  static async Init() {
+    let workerCom: typeof COM;
+
+    const isNode = typeof process !== 'undefined' && process.versions !== undefined && process.versions.node !== undefined;
+
+    if (isNode) {
+      // Paths constructed at runtime so Vite's worker bundler cannot
+      // statically resolve them (it ignores @vite-ignore in its
+      // separate Rollup pass). These modules are Node.js-only.
+      const workerThreadsId = ['node', 'worker_threads'].join(':');
+      const { parentPort } = await import(/* @vite-ignore */ workerThreadsId);
+      this.port = parentPort as WorkerFrameworkPort;
+      const serverComId = ['..', 'server', 'Com.mjs'].join('/');
+      const comModule = await import(/* @vite-ignore */ serverComId);
+      workerCom = comModule.default as typeof COM;
+
+      this.port.on?.('message', ({ event, args }) => {
+        eventBus.publish(event, ...args);
+      });
+    } else {
+      this.port = self as unknown as WorkerFrameworkPort;
+      workerCom = WorkerCOM;
+
+      this.port.addEventListener?.('message', (event) => {
+        const { event: eventName, args } = event.data;
+        eventBus.publish(eventName, ...args);
+      });
+    }
+
+    this.#InitRegistry(workerCom);
+    this.#InitModules();
+
+    eventBus.subscribe('worker.framework.init', (comParams: WorkerFrameworkInitPayload, urls: URLs | undefined) => {
+      workerCom.searchpaths = comParams[0];
+      workerCom.gamedir = comParams[1];
+      workerCom.game = comParams[2];
+
+      Object.assign(registry.urls ?? (registry.urls = {} as URLs), urls ?? {});
+    });
+
+    console.debug('Worker Framework initialized.');
+  }
+
+  static Publish(event: string, ...data: unknown[]) {
+    this.port?.postMessage({ event, data });
+  }
+}
diff --git a/source/engine/common/WorkerManager.mjs b/source/engine/common/WorkerManager.ts
similarity index 58%
rename from source/engine/common/WorkerManager.mjs
rename to source/engine/common/WorkerManager.ts
index 9c060388..768e9c3b 100644
--- a/source/engine/common/WorkerManager.mjs
+++ b/source/engine/common/WorkerManager.ts
@@ -1,28 +1,35 @@
-import { registry, eventBus } from '../registry.mjs';
+import { registry, eventBus, getCommonRegistry } from '../registry.mjs';
 import { SysError } from './Errors.ts';
-import PlatformWorker from './PlatformWorker.mjs';
+import PlatformWorker, { type WorkerFactoryRegistry, type WorkerMessageEnvelope } from './PlatformWorker.ts';
 
-let { Con, COM } = registry;
+let { Con, COM } = getCommonRegistry();
 
 eventBus.subscribe('registry.frozen', () => {
-  COM = registry.COM;
-  Con = registry.Con;
+  ({ COM, Con } = getCommonRegistry());
 });
 
+type WorkerFrameworkInitArgs = [
+  [typeof COM.searchpaths, typeof COM.gamedir, typeof COM.game],
+  typeof registry.urls,
+];
+
+type WorkerOutboundEnvelope = {
+  readonly event: string;
+  readonly args: unknown[];
+};
+
 export default class WorkerManager {
-  /** @type {Record<string, (name: string) => Worker>} */
-  static #factories = null;
+  static #factories: WorkerFactoryRegistry | null = null;
 
   /**
    * Initializes the worker manager with the worker factory registry.
    *
    * Factories are passed in at runtime (rather than statically imported)
    * to avoid a circular module dependency: worker scripts transitively
-   * import WorkerManager via Navigation.mjs, and WorkerFactories.mjs
+   * import WorkerManager via Navigation.mjs, and WorkerFactories.ts
    * references those same worker scripts.
-   * @param {Record<string, (name: string) => Worker>} factories worker factory map from WorkerFactories.mjs
    */
-  static Init(factories) {
+  static Init(factories: WorkerFactoryRegistry) {
     WorkerManager.#factories = factories;
     // eventBus.subscribe('com.ready', () => {
     //   console.info('WorkerManager: Spawning dummy worker for initialization test.');
@@ -43,47 +50,52 @@ export default class WorkerManager {
 
   /**
    * Spawns a worker thread and sets up event forwarding.
-   * @param {string} script Path to worker script (must be registered in WorkerFactories.mjs)
-   * @param {string[]} events list of events the worker wants to subscribe to
-   * @returns {PlatformWorker} worker thread wrapper
+   * @returns worker thread wrapper
    */
-  static SpawnWorker(script, events) {
-    const factory = WorkerManager.#factories[script];
+  static SpawnWorker(script: string, events: string[]): PlatformWorker {
+    const factory = WorkerManager.#factories?.[script];
 
-    console.assert(factory, `No worker factory found for script "${script}". Make sure it's registered in WorkerFactories.mjs.`);
+    console.assert(factory, `No worker factory found for script "${script}". Make sure it's registered in WorkerFactories.ts.`);
+
+    if (factory === undefined) {
+      throw new SysError(`Worker ${script}: no registered factory`);
+    }
 
     let rawWorker;
     try {
       rawWorker = factory(script);
-    } catch (e) {
-      console.error(`WorkerManager: failed to create worker "${script}":`, e);
-      throw new SysError(`Worker ${script}: failed to construct: ${e.message}`);
+    } catch (error) {
+      console.error(`WorkerManager: failed to create worker "${script}":`, error);
+      const message = error instanceof Error ? error.message : String(error);
+      throw new SysError(`Worker ${script}: failed to construct: ${message}`);
     }
 
     const worker = new PlatformWorker(script, rawWorker);
 
     // worker thread --> main thread
-    worker.addOnMessageListener(({ event, data }) => {
+    worker.addOnMessageListener((message: unknown) => {
+      const { event, data = [] } = message as WorkerMessageEnvelope;
+
       // Handle special events directly, otherwise publish to event bus
       switch (event) {
         case 'worker.con.print':
-          Con.Print(data[0]);
+          Con.Print(String(data[0] ?? ''));
           break;
 
         case 'worker.con.print.success':
-          Con.PrintSuccess(data[0]);
+          Con.PrintSuccess(String(data[0] ?? ''));
           break;
 
         case 'worker.con.print.warning':
-          Con.PrintWarning(data[0]);
+          Con.PrintWarning(String(data[0] ?? ''));
           break;
 
         case 'worker.con.print.error':
-          Con.PrintError(data[0]);
+          Con.PrintError(String(data[0] ?? ''));
           break;
 
         case 'worker.con.dprint':
-          Con.DPrint(data[0]);
+          Con.DPrint(String(data[0] ?? ''));
           break;
 
         default:
@@ -92,8 +104,7 @@ export default class WorkerManager {
       }
     });
 
-    /** @type {Function[]} all subscribed events need to be unsubscribed once the worker finished */
-    const unsubscribeFunctions = [];
+    const unsubscribeFunctions: Array<() => void> = [];
 
     // make sure all subscriptions are removed on shutdown
     worker.addOnShutdownListener(() => {
@@ -106,24 +117,26 @@ export default class WorkerManager {
 
     // main thread --> worker thread
     for (const event of events) {
-      unsubscribeFunctions.push(eventBus.subscribe(event, (...args) => {
-        worker.postMessage({
+      unsubscribeFunctions.push(eventBus.subscribe(event, (...args: unknown[]) => {
+        const payload: WorkerOutboundEnvelope = {
           event,
           args,
-        });
+        };
+        worker.postMessage(payload);
       }));
     }
 
+    const initArgs: WorkerFrameworkInitArgs = [
+      [COM.searchpaths, COM.gamedir, COM.game], // COM
+      registry.urls, // urls
+    ];
+
     // tell the worker that it can initialize now
     worker.postMessage({
       event: 'worker.framework.init',
-      args: [
-        [COM.searchpaths, COM.gamedir, COM.game], // COM
-        registry.urls, // urls
-      ],
+      args: initArgs,
     });
 
     return worker;
   }
-};
-
+}
diff --git a/source/engine/main-dedicated.mjs b/source/engine/main-dedicated.mjs
index 6d0b3ebf..924fc3bf 100644
--- a/source/engine/main-dedicated.mjs
+++ b/source/engine/main-dedicated.mjs
@@ -2,7 +2,7 @@
 import { Worker } from 'node:worker_threads';
 import { registry, freeze as registryFreeze } from './registry.mjs';
 
-// Polyfill Worker global for Node.js so that WorkerFactories.mjs
+// Polyfill Worker global for Node.js so that WorkerFactories.ts
 // (which uses the browser-compatible `new Worker(url)` pattern for
 // Vite static analysis) works identically in unbundled Node.js.
 // @ts-ignore — Node.js worker_threads.Worker is API-compatible at runtime
diff --git a/source/engine/server/DummyWorker.mjs b/source/engine/server/DummyWorker.mjs
index 8ac222d0..4c90b5a0 100644
--- a/source/engine/server/DummyWorker.mjs
+++ b/source/engine/server/DummyWorker.mjs
@@ -1,4 +1,4 @@
-import WorkerFramework from '../common/WorkerFramework.mjs';
+import WorkerFramework from '../common/WorkerFramework.ts';
 import { eventBus, registry } from '../registry.mjs';
 
 await WorkerFramework.Init();
diff --git a/source/engine/server/Navigation.mjs b/source/engine/server/Navigation.mjs
index d3d9af6d..4adf5f4a 100644
--- a/source/engine/server/Navigation.mjs
+++ b/source/engine/server/Navigation.mjs
@@ -10,8 +10,8 @@ import { ServerEngineAPI } from '../common/GameAPIs.mjs';
 import { BrushModel } from '../common/Mod.mjs';
 import { MIN_STEP_NORMAL, STEPSIZE } from '../common/Pmove.mjs';
 import { Face } from '../common/model/BaseModel.mjs';
-import PlatformWorker from '../common/PlatformWorker.mjs';
-import WorkerManager from '../common/WorkerManager.mjs';
+import PlatformWorker from '../common/PlatformWorker.ts';
+import WorkerManager from '../common/WorkerManager.ts';
 import { eventBus, registry } from '../registry.mjs';
 import { ServerEdict } from './Edict.mjs';
 
diff --git a/source/engine/server/NavigationWorker.mjs b/source/engine/server/NavigationWorker.mjs
index e7c036ec..d169d678 100644
--- a/source/engine/server/NavigationWorker.mjs
+++ b/source/engine/server/NavigationWorker.mjs
@@ -1,4 +1,4 @@
-import WorkerFramework from '../common/WorkerFramework.mjs';
+import WorkerFramework from '../common/WorkerFramework.ts';
 import { eventBus, registry } from '../registry.mjs';
 
 import { Navigation, NavMeshOutOfDateException } from './Navigation.mjs';
diff --git a/source/engine/server/Sys.mjs b/source/engine/server/Sys.mjs
index 5c4e1618..36cdf2fa 100644
--- a/source/engine/server/Sys.mjs
+++ b/source/engine/server/Sys.mjs
@@ -12,8 +12,8 @@ import Cvar from '../common/Cvar.ts';
 /** @typedef {import('node:repl').REPLServer} REPLServer */
 import Cmd from '../common/Cmd.ts';
 import Q from '../../shared/Q.ts';
-import WorkerManager from '../common/WorkerManager.mjs';
-import workerFactories from '../common/WorkerFactories.mjs';
+import WorkerManager from '../common/WorkerManager.ts';
+import workerFactories from '../common/WorkerFactories.ts';
 
 let { COM, Host, NET } = registry;
 
diff --git a/test/common/workers.test.mjs b/test/common/workers.test.mjs
new file mode 100644
index 00000000..176ce25b
--- /dev/null
+++ b/test/common/workers.test.mjs
@@ -0,0 +1,194 @@
+import assert from 'node:assert/strict';
+import { describe, test } from 'node:test';
+
+import PlatformWorker from '../../source/engine/common/PlatformWorker.ts';
+import WorkerManager from '../../source/engine/common/WorkerManager.ts';
+import { eventBus, registry } from '../../source/engine/registry.mjs';
+
+class FakeNodeWorker {
+  constructor() {
+    this.listeners = {
+      error: [],
+      message: [],
+    };
+    this.messages = [];
+    this.terminated = 0;
+  }
+
+  on(event, listener) {
+    this.listeners[event].push(listener);
+  }
+
+  postMessage(message) {
+    this.messages.push(message);
+  }
+
+  terminate() {
+    this.terminated += 1;
+    return Promise.resolve(0);
+  }
+
+  emit(event, payload) {
+    for (const listener of this.listeners[event]) {
+      listener(payload);
+    }
+  }
+}
+
+/** @returns {{ prints: string[], successes: string[], warnings: string[], errors: string[], dprints: string[], Print: (message: string) => void, PrintSuccess: (message: string) => void, PrintWarning: (message: string) => void, PrintError: (message: string) => void, DPrint: (message: string) => void }} console capture */
+function createConsoleCapture() {
+  return {
+    prints: [],
+    successes: [],
+    warnings: [],
+    errors: [],
+    dprints: [],
+    Print(message) {
+      this.prints.push(message);
+    },
+    PrintSuccess(message) {
+      this.successes.push(message);
+    },
+    PrintWarning(message) {
+      this.warnings.push(message);
+    },
+    PrintError(message) {
+      this.errors.push(message);
+    },
+    DPrint(message) {
+      this.dprints.push(message);
+    },
+  };
+}
+
+/**
+ * Run with a minimal worker-capable registry.
+ * @param {ReturnType<typeof createConsoleCapture>} consoleCapture
+ * @param {() => void | Promise<void>} callback
+ */
+async function withWorkerRegistry(consoleCapture, callback) {
+  const previousCon = registry.Con;
+  const previousCom = registry.COM;
+  const previousHost = registry.Host;
+  const previousUrls = registry.urls;
+  const crashes = [];
+
+  Object.assign(registry, {
+    Con: /** @type {typeof import('../../source/engine/common/Console.ts').default} */ (/** @type {unknown} */ (consoleCapture)),
+    COM: /** @type {typeof import('../../source/engine/common/Com.ts').default} */ ({
+    searchpaths: [{ filename: 'id1', pack: [] }],
+    gamedir: [{ filename: 'id1', pack: [] }],
+    game: 'id1',
+    }),
+    Host: /** @type {typeof import('../../source/engine/common/Host.mjs').default} */ (/** @type {unknown} */ ({
+      crashes,
+      HandleCrash(error) {
+        crashes.push(error);
+      },
+    })),
+    urls: /** @type {import('../../source/engine/build-config').URLs} */ ({ cdnURL: 'https://cdn.example/{gameDir}/{filename}' }),
+  });
+
+  eventBus.publish('registry.frozen');
+
+  try {
+    await callback();
+  } finally {
+    Object.assign(registry, {
+      Con: previousCon,
+      COM: previousCom,
+      Host: previousHost,
+      urls: previousUrls,
+    });
+    eventBus.publish('registry.frozen');
+  }
+}
+
+void describe('PlatformWorker', () => {
+  void test('forwards messages and runs shutdown listeners once on terminate', async () => {
+    const consoleCapture = createConsoleCapture();
+
+    await withWorkerRegistry(consoleCapture, async () => {
+      const rawWorker = new FakeNodeWorker();
+      const worker = new PlatformWorker('server/DummyWorker.mjs', rawWorker);
+      const messages = [];
+      let shutdownCalls = 0;
+
+      worker.addOnMessageListener((message) => {
+        messages.push(message);
+      });
+      worker.addOnShutdownListener(() => {
+        shutdownCalls += 1;
+      });
+
+      rawWorker.emit('message', { event: 'nav.build', args: [] });
+      worker.postMessage({ event: 'nav.load', args: ['e1m1'] });
+      await worker.shutdown();
+
+      assert.deepEqual(messages, [{ event: 'nav.build', args: [] }]);
+      assert.deepEqual(rawWorker.messages, [{ event: 'nav.load', args: ['e1m1'] }]);
+      assert.equal(shutdownCalls, 1);
+      assert.equal(rawWorker.terminated, 1);
+    });
+  });
+
+  void test('routes worker errors through Host.HandleCrash', async () => {
+    const consoleCapture = createConsoleCapture();
+
+    await withWorkerRegistry(consoleCapture, async () => {
+      const rawWorker = new FakeNodeWorker();
+      const worker = new PlatformWorker('server/DummyWorker.mjs', rawWorker);
+      const error = new Error('worker boom');
+
+      rawWorker.emit('error', error);
+
+      const mockedHost = /** @type {{ crashes: Error[] }} */ (/** @type {unknown} */ (registry.Host));
+      assert.deepEqual(mockedHost.crashes, [error]);
+      await worker.shutdown();
+    });
+  });
+});
+
+void describe('WorkerManager', () => {
+  void test('subscribes worker events, forwards console messages, and sends framework init payload', async () => {
+    const consoleCapture = createConsoleCapture();
+
+    await withWorkerRegistry(consoleCapture, async () => {
+      const rawWorker = new FakeNodeWorker();
+
+      WorkerManager.Init({
+        'server/DummyWorker.mjs': () => rawWorker,
+      });
+
+      const worker = WorkerManager.SpawnWorker('server/DummyWorker.mjs', ['nav.build']);
+
+      assert.deepEqual(rawWorker.messages[0], {
+        event: 'worker.framework.init',
+        args: [
+          [registry.COM.searchpaths, registry.COM.gamedir, registry.COM.game],
+          registry.urls,
+        ],
+      });
+
+      eventBus.publish('nav.build', 'arg1', 2);
+      assert.deepEqual(rawWorker.messages[1], {
+        event: 'nav.build',
+        args: ['arg1', 2],
+      });
+
+      const navResponses = [];
+      const unsubscribe = eventBus.subscribe('nav.path.response', (...args) => {
+        navResponses.push(args);
+      });
+
+      rawWorker.emit('message', { event: 'worker.con.print.warning', data: ['from worker\n'] });
+      rawWorker.emit('message', { event: 'nav.path.response', data: [8, ['c']] });
+
+      unsubscribe();
+      await worker.shutdown();
+
+      assert.deepEqual(consoleCapture.warnings, ['from worker\n']);
+      assert.deepEqual(navResponses, [[8, ['c']]]);
+    });
+  });
+});

From 15c6831cf881c346af88cce0e4acaf5ee8fa1593 Mon Sep 17 00:00:00 2001
From: Christian R <github@chrisnew.de>
Date: Thu, 2 Apr 2026 19:01:13 +0300
Subject: [PATCH 22/67] TS: common/Pmove

---
 source/engine/client/CL.mjs                   |    4 +-
 source/engine/client/ClientLifecycle.mjs      |    6 +-
 source/engine/client/ClientMessages.mjs       |    2 +-
 source/engine/common/Host.mjs                 |    2 +-
 source/engine/common/{Pmove.mjs => Pmove.ts}  | 1034 ++++++++---------
 source/engine/server/Navigation.mjs           |    6 +-
 source/engine/server/Server.mjs               |    6 +-
 .../server/physics/ServerClientPhysics.mjs    |    2 +-
 .../engine/server/physics/ServerCollision.mjs |    6 +-
 .../server/physics/ServerCollisionSupport.mjs |    2 +-
 .../physics/ServerLegacyHullCollision.mjs     |    2 +-
 .../engine/server/physics/ServerMovement.mjs  |    2 +-
 test/physics/brushtrace.test.mjs              |    2 +-
 test/physics/collision-regressions.test.mjs   |    2 +-
 test/physics/map-pmove-harness.mjs            |    2 +-
 test/physics/pmove.test.mjs                   |    2 +-
 test/physics/server-collision.test.mjs        |    2 +-
 17 files changed, 537 insertions(+), 547 deletions(-)
 rename source/engine/common/{Pmove.mjs => Pmove.ts} (81%)

diff --git a/source/engine/client/CL.mjs b/source/engine/client/CL.mjs
index 87010c84..517e3ec8 100644
--- a/source/engine/client/CL.mjs
+++ b/source/engine/client/CL.mjs
@@ -3,7 +3,7 @@ import * as Def from '../common/Def.ts';
 import * as Protocol from '../network/Protocol.ts';
 import Cmd, { ConsoleCommand } from '../common/Cmd.ts';
 import Cvar from '../common/Cvar.ts';
-import { Pmove, PmovePlayer } from '../common/Pmove.mjs';
+import { Pmove, PmovePlayer } from '../common/Pmove.ts';
 import { eventBus, registry } from '../registry.mjs';
 import { gameCapabilities, solid } from '../../shared/Defs.ts';
 import ClientDemos from './ClientDemos.mjs';
@@ -209,7 +209,7 @@ export default class CL {
         return;
       }
 
-      Cmd.ExecuteString('map ' + map);
+      void Cmd.ExecuteString('map ' + map);
 
       CL.StartRecording(demoname, Q.atoi(track));
     }
diff --git a/source/engine/client/ClientLifecycle.mjs b/source/engine/client/ClientLifecycle.mjs
index 78324166..b68fa5a9 100644
--- a/source/engine/client/ClientLifecycle.mjs
+++ b/source/engine/client/ClientLifecycle.mjs
@@ -5,7 +5,7 @@ import { gameCapabilities } from '../../shared/Defs.ts';
 import ClientInput from './ClientInput.mjs';
 import CL from './CL.mjs';
 import { clientRuntimeState } from './ClientState.mjs';
-import { MoveVars, Pmove } from '../common/Pmove.mjs';
+import { MoveVars, Pmove } from '../common/Pmove.ts';
 import { ClientEngineAPI } from '../common/GameAPIs.mjs';
 import { eventBus, registry } from '../registry.mjs';
 
@@ -30,11 +30,11 @@ export class StartGameInterface {
 /** Quake 1 default start game entries */
 export class DefaultStartGameFunctions extends StartGameInterface {
   startSingleplayerGame() {
-    Cmd.ExecuteString('map start');
+    void Cmd.ExecuteString('map start');
   }
 
   startMultiplayerGame(/** @type {string} */ mapname) {
-    Cmd.ExecuteString(`map ${mapname}`);
+    void Cmd.ExecuteString(`map ${mapname}`);
   }
 };
 
diff --git a/source/engine/client/ClientMessages.mjs b/source/engine/client/ClientMessages.mjs
index 8321f182..0811a0e8 100644
--- a/source/engine/client/ClientMessages.mjs
+++ b/source/engine/client/ClientMessages.mjs
@@ -3,7 +3,7 @@ import * as Def from '../common/Def.ts';
 import { eventBus, registry } from '../registry.mjs';
 import { HostError } from '../common/Errors.ts';
 import Vector from '../../shared/Vector.ts';
-import { PmovePlayer } from '../common/Pmove.mjs';
+import { PmovePlayer } from '../common/Pmove.ts';
 import { gameCapabilities } from '../../shared/Defs.ts';
 import { ClientEdict } from './ClientEntities.mjs';
 
diff --git a/source/engine/common/Host.mjs b/source/engine/common/Host.mjs
index e1e76688..8c2da13c 100644
--- a/source/engine/common/Host.mjs
+++ b/source/engine/common/Host.mjs
@@ -14,7 +14,7 @@ import CDAudio from '../client/CDAudio.mjs';
 import * as Defs from '../../shared/Defs.ts';
 import { content, gameCapabilities } from '../../shared/Defs.ts';
 import ClientLifecycle from '../client/ClientLifecycle.mjs';
-import { Pmove } from './Pmove.mjs';
+import { Pmove } from './Pmove.ts';
 
 const Host = {};
 
diff --git a/source/engine/common/Pmove.mjs b/source/engine/common/Pmove.ts
similarity index 81%
rename from source/engine/common/Pmove.mjs
rename to source/engine/common/Pmove.ts
index d250890e..ab3ccc24 100644
--- a/source/engine/common/Pmove.mjs
+++ b/source/engine/common/Pmove.ts
@@ -7,6 +7,8 @@
  * Original sources: pmove.c, pmovetst.c (Q2), pmove.c (Q1).
  */
 
+/* eslint-disable jsdoc/require-returns */
+
 import Vector from '../../shared/Vector.ts';
 import * as Protocol from '../network/Protocol.ts';
 import { content } from '../../shared/Defs.ts';
@@ -14,12 +16,26 @@ import { BrushModel } from './Mod.mjs';
 import Cvar from './Cvar.ts';
 import { PmoveConfiguration } from '../../shared/Pmove.ts';
 
-/** @typedef {import('../../shared/Vector.ts').DirectionalVectors} DirectionalVectors */
-/** @typedef {{ normal: Vector, type: number }} BrushTracePlaneLike */
-
-// ---------------------------------------------------------------------------
-// Constants
-// ---------------------------------------------------------------------------
+type DirectionalVectors = import('../../shared/Vector.ts').DirectionalVectors;
+interface BrushTracePlaneLike {
+  readonly normal: Vector;
+  readonly type: number;
+}
+type BrushTraceTransform = { readonly origin: Vector; readonly basis: number[] | null } | null;
+interface NearbyBrushSideSummary {
+  readonly distance: number;
+  readonly summary: string;
+}
+interface NearbyBrushCandidate {
+  readonly index: number;
+  readonly contents: number;
+  readonly numsides: number;
+  readonly nearestPlaneDistance: number;
+  touchingPlanes: number;
+  readonly mins: Vector;
+  readonly maxs: Vector;
+  sideSummaries: string[];
+}
 
 export const DIST_EPSILON = 0.03125;
 export const STOP_EPSILON = 0.1;
@@ -37,39 +53,35 @@ export const ZERO_PROGRESS_DUPLICATE_DOT = 0.985;
 /**
  * Player movement flags (pmove-specific, separate from entity flags).
  * These travel with the player state and are used for prediction.
- * @readonly
- * @enum {number}
  */
-export const PMF = Object.freeze({
+export enum PMF {
   /** Player is ducked */
-  DUCKED: (1 << 0),
+  DUCKED = (1 << 0),
   /** Player has jump button held (prevent re-jump) */
-  JUMP_HELD: (1 << 1),
+  JUMP_HELD = (1 << 1),
   /** Player is on the ground */
-  ON_GROUND: (1 << 2),
+  ON_GROUND = (1 << 2),
   /** Timing: landing cooldown (prevents immediate re-jump after hard landing) */
-  TIME_LAND: (1 << 3),
+  TIME_LAND = (1 << 3),
   /** Timing: water jump is active */
-  TIME_WATERJUMP: (1 << 4),
+  TIME_WATERJUMP = (1 << 4),
   /** Timing: teleport freeze */
-  TIME_TELEPORT: (1 << 5),
-});
+  TIME_TELEPORT = (1 << 5),
+}
 
 /**
  * Player movement types.
- * @readonly
- * @enum {number}
  */
-export const PM_TYPE = Object.freeze({
+export enum PM_TYPE {
   /** Normal movement */
-  NORMAL: 0,
+  NORMAL = 0,
   /** Spectator - noclip flight */
-  SPECTATOR: 1,
+  SPECTATOR = 1,
   /** Dead – reduced input, extra friction */
-  DEAD: 2,
+  DEAD = 2,
   /** Frozen – no movement at all */
-  FREEZE: 3,
-});
+  FREEZE = 3,
+}
 
 // ---------------------------------------------------------------------------
 // MoveVars: shared physics tuning knobs
@@ -81,77 +93,107 @@ export const PM_TYPE = Object.freeze({
  * Physics tuning knobs shared between client and server.
  */
 export class MoveVars { // movevars_t
+  /** World gravity strength. */
+  gravity: number;
+  /** Minimum speed preserved before friction stops the player. */
+  stopspeed: number;
+  /** Default maximum ground speed. */
+  maxspeed: number;
+  /** Maximum speed while in spectator flight. */
+  spectatormaxspeed: number;
+  /** Maximum speed while ducked. */
+  duckspeed: number;
+  /** Ground acceleration factor. */
+  accelerate: number;
+  /** Air acceleration factor. */
+  airaccelerate: number;
+  /** Water acceleration factor. */
+  wateraccelerate: number;
+  /** Ground friction multiplier. */
+  friction: number;
+  /** Water friction multiplier. */
+  waterfriction: number;
+  /** Base swimming speed. */
+  waterspeed: number;
+  /** Per-entity gravity scale. */
+  entgravity: number;
+  /** Extra friction applied near ledges. */
+  edgefriction: number;
+
   constructor() {
-    /** @type {number} world gravity (units/sec²) */
     this.gravity = 800;
-    /** @type {number} speed below which friction acts at full strength */
     this.stopspeed = 100;
-    /** @type {number} maximum walking speed */
     this.maxspeed = 320; // Q2: 300
-    /** @type {number} maximum spectator speed */
     this.spectatormaxspeed = 500;
-    /** @type {number} duck speed cap */
     this.duckspeed = 100;
-    /** @type {number} ground acceleration factor */
     this.accelerate = 10;
-    /** @type {number} air acceleration factor */
     this.airaccelerate = 0.7;
-    /** @type {number} water acceleration factor */
     this.wateraccelerate = 10;
-    /** @type {number} ground friction factor */
     this.friction = 6;
-    /** @type {number} water friction factor */
     this.waterfriction = 1;
-    /** @type {number} maximum water speed */
     this.waterspeed = 400;
-    /** @type {number} per-entity gravity multiplier (1.0 = normal) */
     this.entgravity = 1.0;
-    /** @type {number} edge friction multiplier */
     this.edgefriction = 2;
   }
-};
+}
 
 // ---------------------------------------------------------------------------
 // Geometry primitives: Plane, Trace, ClipNode, Hull, BoxHull
 // ---------------------------------------------------------------------------
 
 export class Plane { // mplane_t
+  /** Plane normal. */
+  normal: Vector;
+  /** Signed distance from the origin. */
+  dist: number;
+  /** Plane axis classification used by BSP tracing. */
+  type: number;
+  /** Cached sign bits for fast box-plane tests. */
+  signBits: number;
+
   constructor() {
     this.normal = new Vector();
     this.dist = 0;
-    /** @type {number} for texture axis selection and fast side tests */
     this.type = 0;
-    /** @type {number} signx + signy<<1 + signz<<1 */
     this.signBits = 0;
   }
-};
+}
 
 export class Trace { // pmtrace_t
+  /** Whether the entire trace volume stayed inside solid. */
+  allsolid: boolean;
+  /** Whether the start point began inside solid. */
+  startsolid: boolean;
+  /** Completed fraction of the attempted move. */
+  fraction: number;
+  /** Final position after clipping. */
+  endpos: Vector;
+  /** Impact plane for the first blocking hit. */
+  plane: Plane;
+  /** Physent index hit by the trace, or null when nothing was hit. */
+  ent: number | null;
+  /** Whether the trace entered open space. */
+  inopen: boolean;
+  /** Whether the trace entered water. */
+  inwater: boolean;
+
   constructor() {
-    /** if true, plane is not valid */
     this.allsolid = true;
-    /** if true, the initial point was in a solid area */
     this.startsolid = false;
-    /** moving along the vector completed, 1.0 = didn’t hit anything */
     this.fraction = 1.0;
-    /** final position */
     this.endpos = new Vector();
-    /** surface normal at impact */
     this.plane = new Plane();
-    /** @type {?number} edict number the surface is on, if applicable */
     this.ent = null;
-    /** true if the surface is in a open area */
     this.inopen = false;
-    /** true if the surface is in water */
     this.inwater = false;
   }
 
   /**
    * Sets this trace to the other trace.
-   * @param {Trace} other other trace
-   * @returns {Trace} this
+   * @param other - source trace to copy from
+   * @returns this trace after copying the values
    */
-  set(other) {
+  set(other: Trace): Trace {
     console.assert(other instanceof Trace, 'other must be a Trace');
 
     this.allsolid = other.allsolid;
@@ -169,36 +211,58 @@ export class Trace { // pmtrace_t
 
   /**
    * Creates a copy.
-   * @returns {Trace} copy of this trace
+   * @returns duplicated trace state
    */
-  copy() {
+  copy(): Trace {
     const trace = new Trace();
     trace.set(this);
     return trace;
   }
-};
+}
 
 export class ClipNode { // dclipnode_t
+  /** Plane index used by this BSP clip node. */
+  readonly planeNum: number;
+  /** Child node indices or negative contents values. */
+  readonly children: [number, number];
+
   constructor(planeNum = 0) {
     this.planeNum = planeNum;
     this.children = [0, 0];
   }
-};
+}
 
 export class Hull { // hull_t
+  /** Hull-space minimum bounds for this collision hull. */
+  clipMins: Vector;
+  /** Hull-space maximum bounds for this collision hull. */
+  clipMaxs: Vector;
+  /** First valid BSP clip node index. */
+  firstClipNode: number;
+  /** Last valid BSP clip node index. */
+  lastClipNode: number;
+  /** Optional mask restricting which clip nodes may be traversed. */
+  allowedClipNodes: Uint8Array | null;
+  /** BSP clip nodes used for hull traversal. */
+  clipNodes: ClipNode[];
+  /** Plane list referenced by the clip nodes. */
+  planes: Plane[];
+
   constructor() {
     this.clipMins = new Vector();
     this.clipMaxs = new Vector();
     this.firstClipNode = 0;
     this.lastClipNode = 0;
-    /** @type {Uint8Array|null} */
     this.allowedClipNodes = null;
-    /** @type {ClipNode[]} */
     this.clipNodes = [];
-    /** @type {Plane[]} */
     this.planes = [];
   }
 
+  /**
+   * Clone collision data from a model hull into runtime Hull objects.
+   * @param hull - source hull from model loading
+   * @returns copied runtime hull
+   */
   static fromModelHull(hull) {
     const newHull = new Hull();
     newHull.clipMins = hull.clip_mins.copy();
@@ -226,11 +290,11 @@ export class Hull { // hull_t
 
   /**
    * Determine if a point is inside the hull and if so, return the content type.
-   * @param {Vector} point point to test
-   * @param {number} num clip node to start
-   * @returns {number} content type
+   * @param point - point to classify in hull space
+   * @param num - starting clip node index
+   * @returns negative Quake contents value for the containing leaf
    */
-  pointContents(point, num = this.firstClipNode) {
+  pointContents(point: Vector, num: number = this.firstClipNode): number {
     // as long as num is a valid node, keep going down the tree
     while (num >= 0) {
       if (this.allowedClipNodes !== null && this.allowedClipNodes[num] !== 1) {
@@ -262,21 +326,20 @@ export class Hull { // hull_t
     return num;
   }
 
-  /** @type {Vector[]} */
-  static _midPool = Array.from({ length: 64 }, () => new Vector());
+  static readonly _midPool: Vector[] = Array.from({ length: 64 }, () => new Vector());
 
   /**
    * Check against hull.
-   * @param {number} p1f fraction at p1 (usually 0.0)
-   * @param {number} p2f fraction at p2 (usually 1.0)
-   * @param {Vector} p1 start point
-   * @param {Vector} p2 end point
-   * @param {Trace} trace object to store trace results
-   * @param {number} num starting clipnode number (typically hull.firstclipnode)
-   * @param {number} depth recursion depth
-   * @returns {boolean} true means going down, false means going up
-   */
-  check(p1f, p2f, p1, p2, trace, num = this.firstClipNode, depth = 0) {
+   * @param p1f - starting fraction along the trace segment
+   * @param p2f - ending fraction along the trace segment
+   * @param p1 - start point in hull space
+   * @param p2 - end point in hull space
+   * @param trace - trace result being updated in place
+   * @param num - current clip node index
+   * @param depth - recursion depth for pooled midpoint scratch vectors
+   * @returns true while traversal should continue, false after a blocking hit
+   */
+  check(p1f: number, p2f: number, p1: Vector, p2: Vector, trace: Trace, num: number = this.firstClipNode, depth: number = 0): boolean {
     // check for empty
     if (num < 0) {
       if (num !== content.CONTENT_SOLID && num !== content.CONTENT_SKY) {
@@ -426,11 +489,12 @@ export class BoxHull extends Hull {
   }
 
   /**
-   * @param {Vector} mins mins
-   * @param {Vector} maxs maxs
-   * @returns {BoxHull} this
+   * Configure the reusable box hull to match an entity bounding box.
+   * @param mins - local minimum corner
+   * @param maxs - local maximum corner
+   * @returns this box hull for chaining
    */
-  setSize(mins, maxs) {
+  setSize(mins: Vector, maxs: Vector): BoxHull {
     console.assert(mins instanceof Vector, 'mins must be a Vector');
     console.assert(maxs instanceof Vector, 'maxs must be a Vector');
 
@@ -442,7 +506,7 @@ export class BoxHull extends Hull {
 
     return this;
   }
-};
+}
 
 // ---------------------------------------------------------------------------
 // BrushTrace: Q2-style brush-based collision tracing
@@ -464,31 +528,20 @@ export class BoxHull extends Hull {
  * traces for maps that include brush data.
  */
 export class BrushTrace {
-  /** @type {number} monotonically increasing counter to avoid testing the same brush twice */
-  static _checkCount = 0;
+  static _checkCount: number = 0;
 
   /**
    * Test whether two axis-aligned bounding boxes overlap.
-   * @param {Vector} mins1 first box minimum
-   * @param {Vector} maxs1 first box maximum
-   * @param {Vector} mins2 second box minimum
-   * @param {Vector} maxs2 second box maximum
-   * @returns {boolean} true when the boxes overlap or touch
    */
-  static _boundsOverlap(mins1, maxs1, mins2, maxs2) {
+  static _boundsOverlap(mins1: Vector, maxs1: Vector, mins2: Vector, maxs2: Vector): boolean {
     return mins1[0] <= maxs2[0] && mins1[1] <= maxs2[1] && mins1[2] <= maxs2[2]
       && maxs1[0] >= mins2[0] && maxs1[1] >= mins2[1] && maxs1[2] >= mins2[2];
   }
 
   /**
    * Compute the swept world-space bounds of a point or box move.
-   * @param {Vector} start trace start
-   * @param {Vector} end trace end
-   * @param {Vector} mins box mins
-   * @param {Vector} maxs box maxs
-   * @returns {{mins: Vector, maxs: Vector}} swept bounds
    */
-  static _computeSweepBounds(start, end, mins, maxs) {
+  static _computeSweepBounds(start: Vector, end: Vector, mins: Vector, maxs: Vector): { mins: Vector; maxs: Vector } {
     return {
       mins: new Vector(
         Math.min(start[0] + mins[0], end[0] + mins[0]),
@@ -505,12 +558,8 @@ export class BrushTrace {
 
   /**
    * Compute the world-space bounds of a point or box at a fixed position.
-   * @param {Vector} position position to test
-   * @param {Vector} mins box mins
-   * @param {Vector} maxs box maxs
-   * @returns {{mins: Vector, maxs: Vector}} world-space bounds
    */
-  static _computePositionBounds(position, mins, maxs) {
+  static _computePositionBounds(position: Vector, mins: Vector, maxs: Vector): { mins: Vector; maxs: Vector } {
     return {
       mins: new Vector(position[0] + mins[0], position[1] + mins[1], position[2] + mins[2]),
       maxs: new Vector(position[0] + maxs[0], position[1] + maxs[1], position[2] + maxs[2]),
@@ -519,11 +568,8 @@ export class BrushTrace {
 
   /**
    * Check whether a brush AABB can possibly overlap the current swept move.
-   * @param {BrushTraceContext} ctx trace context
-   * @param {import('./model/BSP.mjs').Brush} brush brush candidate
-   * @returns {boolean} true when the brush could affect the move
    */
-  static _brushMayAffectTrace(ctx, brush) {
+  static _brushMayAffectTrace(ctx: BrushTraceContext, brush: import('./model/BSP.mjs').Brush): boolean {
     if (brush.mins === null || brush.mins === undefined || brush.maxs === null || brush.maxs === undefined) {
       return true;
     }
@@ -533,12 +579,8 @@ export class BrushTrace {
 
   /**
    * Check whether a brush AABB can possibly overlap the current position test.
-   * @param {import('./model/BSP.mjs').Brush} brush brush candidate
-   * @param {Vector} boundsMins position-test bounds minimum
-   * @param {Vector} boundsMaxs position-test bounds maximum
-   * @returns {boolean} true when the brush could affect the test
    */
-  static _brushMayAffectPosition(brush, boundsMins, boundsMaxs) {
+  static _brushMayAffectPosition(brush: import('./model/BSP.mjs').Brush, boundsMins: Vector, boundsMaxs: Vector): boolean {
     if (brush.mins === null || brush.mins === undefined || brush.maxs === null || brush.maxs === undefined) {
       return true;
     }
@@ -550,11 +592,8 @@ export class BrushTrace {
    * Estimate the earliest global trace fraction where a swept point/box can
    * enter a node's bounds. Used only for pruning; false negatives are avoided
    * by falling back when bounds are missing.
-   * @param {BrushTraceContext} ctx trace context
-   * @param {import('./model/BSP.mjs').Node} node BSP node or leaf
-   * @returns {number} earliest possible entry fraction, or Infinity when unreachable
    */
-  static _estimateNodeEntryFraction(ctx, node) {
+  static _estimateNodeEntryFraction(ctx: BrushTraceContext, node: import('./model/BSP.mjs').Node): number {
     if (node.mins === null || node.mins === undefined || node.maxs === null || node.maxs === undefined) {
       return 0;
     }
@@ -597,11 +636,8 @@ export class BrushTrace {
 
   /**
    * Check whether a node can still affect the current trace.
-   * @param {BrushTraceContext} ctx trace context
-   * @param {import('./model/BSP.mjs').Node} node BSP node or leaf
-   * @returns {boolean} true when traversal should continue into the node
    */
-  static _nodeMayAffectTrace(ctx, node) {
+  static _nodeMayAffectTrace(ctx: BrushTraceContext, node: import('./model/BSP.mjs').Node): boolean {
     if (node.mins === null || node.mins === undefined || node.maxs === null || node.maxs === undefined) {
       return true;
     }
@@ -618,14 +654,8 @@ export class BrushTrace {
    * Walkable ramps need this to avoid horizontal climb stalls, and corner
    * slides need it so a real diagonal face can beat an inferred axial wall
    * from the same brush when both land within epsilon.
-   * @param {BrushTracePlaneLike|null} currentPlane currently selected clip plane
-   * @param {number} currentFraction currently selected enter fraction
-   * @param {BrushTracePlaneLike} candidatePlane newly intersected plane
-   * @param {number} candidateFraction newly intersected enter fraction
-   * @param {number} fractionEpsilon move-distance-scaled tie threshold
-   * @returns {boolean} true when the candidate plane should replace the current one
-   */
-  static _shouldPreferClipPlane(currentPlane, currentFraction, candidatePlane, candidateFraction, fractionEpsilon) {
+   */
+  static _shouldPreferClipPlane(currentPlane: BrushTracePlaneLike | null, currentFraction: number, candidatePlane: BrushTracePlaneLike, candidateFraction: number, fractionEpsilon: number): boolean {
     if (currentPlane === null) {
       return true;
     }
@@ -648,14 +678,8 @@ export class BrushTrace {
    * Earlier trace hits win globally, but nearly simultaneous hits can still
    * benefit from plane preference. This lets a real non-axial face replace an
    * exact-tangent axial wall from another brush in the same leaf.
-   * @param {BrushTracePlaneLike|null} currentPlane currently selected trace plane
-   * @param {number} currentFraction currently selected trace fraction
-   * @param {BrushTracePlaneLike} candidatePlane newly intersected trace plane
-   * @param {number} candidateFraction newly intersected trace fraction
-   * @param {number} fractionEpsilon move-distance-scaled tie threshold
-   * @returns {boolean} true when the candidate trace hit should replace the current hit
-   */
-  static _shouldPreferTraceHit(currentPlane, currentFraction, candidatePlane, candidateFraction, fractionEpsilon) {
+   */
+  static _shouldPreferTraceHit(currentPlane: BrushTracePlaneLike | null, currentFraction: number, candidatePlane: BrushTracePlaneLike, candidateFraction: number, fractionEpsilon: number): boolean {
     if (currentPlane === null) {
       return true;
     }
@@ -677,23 +701,21 @@ export class BrushTrace {
 
   /**
    * Resolve the head node for world-model BSP traversal.
-   * @param {BrushModel} model - brush model to inspect
-   * @returns {number} clipnode index used as the trace root
    */
-  static _getHeadNode(model) {
+  static _getHeadNode(model: BrushModel): number {
     return model.hulls[0]?.firstclipnode ?? 0;
   }
 
   /**
    * Dispatch a brush trace against either a submodel brush range or a world BSP.
-   * @param {BrushModel} model - world model or submodel owning the brush data
-   * @param {Vector} start - local-space trace start
-   * @param {Vector} end - local-space trace end
-   * @param {Vector} mins - box mins
-   * @param {Vector} maxs - box maxs
-   * @returns {Trace} trace result
-   */
-  static _traceModel(model, start, end, mins, maxs) {
+   * @param model - model to trace against
+   * @param start - world-space start point
+   * @param end - world-space end point
+   * @param mins - box minimum corner relative to the origin
+   * @param maxs - box maximum corner relative to the origin
+   * @returns trace result in model space or world space as appropriate
+   */
+  static _traceModel(model: BrushModel, start: Vector, end: Vector, mins: Vector, maxs: Vector): Trace {
     return model.submodel
       ? BrushTrace.boxTraceModel(model, start, end, mins, maxs)
       : BrushTrace.boxTrace(model, BrushTrace._getHeadNode(model), start, end, mins, maxs);
@@ -701,13 +723,13 @@ export class BrushTrace {
 
   /**
    * Dispatch a position test against either a submodel brush range or a world BSP.
-   * @param {BrushModel} model - world model or submodel owning the brush data
-   * @param {Vector} position - local-space position to test
-   * @param {Vector} mins - box mins
-   * @param {Vector} maxs - box maxs
-   * @returns {boolean} true if position is valid (not in solid)
+   * @param model - model to test against
+   * @param position - world-space position to test
+   * @param mins - box minimum corner relative to the origin
+   * @param maxs - box maximum corner relative to the origin
+   * @returns true when the position does not overlap solid brush geometry
    */
-  static _testModelPosition(model, position, mins, maxs) {
+  static _testModelPosition(model: BrushModel, position: Vector, mins: Vector, maxs: Vector): boolean {
     return model.submodel
       ? BrushTrace.testPositionModel(model, position, mins, maxs)
       : BrushTrace.testPosition(model, BrushTrace._getHeadNode(model), position, mins, maxs);
@@ -715,11 +737,11 @@ export class BrushTrace {
 
   /**
    * Resolve the entity transform used by shared brush collision helpers.
-   * @param {Vector} origin - entity origin
-   * @param {Vector} angles - entity angles
-   * @returns {{origin: Vector, basis: number[]|null}|null} transform context, or null when identity
+   * @param origin - entity origin in world space
+   * @param angles - entity rotation angles
+   * @returns cached transform data, or null when no transform is needed
    */
-  static _getTransformContext(origin, angles) {
+  static _getTransformContext(origin: Vector, angles: Vector): BrushTraceTransform {
     const basis = angles.isOrigin() ? null : angles.toRotationMatrix();
 
     if (basis === null && origin.isOrigin()) {
@@ -731,11 +753,11 @@ export class BrushTrace {
 
   /**
    * Convert a world-space point into local model space for an entity transform.
-   * @param {Vector} point - world-space point
-   * @param {{origin: Vector, basis: number[]|null}|null} transform - entity transform context
-   * @returns {Vector} transformed local-space point
+   * @param point - point in world space
+   * @param transform - entity transform context
+   * @returns point in local model space
    */
-  static _toLocalPoint(point, transform) {
+  static _toLocalPoint(point: Vector, transform: BrushTraceTransform): Vector {
     if (transform === null) {
       return point;
     }
@@ -750,16 +772,16 @@ export class BrushTrace {
   /**
    * Trace a box against a brush model with entity transform applied.
    * Equivalent to Quake 2's transformed box trace helpers.
-   * @param {BrushModel} model - world model or submodel owning the brush data
-   * @param {Vector} start - world-space trace start
-   * @param {Vector} end - world-space trace end
-   * @param {Vector} mins - box mins
-   * @param {Vector} maxs - box maxs
-   * @param {Vector} origin - entity origin
-   * @param {Vector} angles - entity angles
-   * @returns {Trace} world-space trace result
-   */
-  static transformedBoxTrace(model, start, end, mins, maxs, origin = Vector.origin, angles = Vector.origin) {
+   * @param model - brush model to trace against
+   * @param start - world-space start point
+   * @param end - world-space end point
+   * @param mins - box minimum corner relative to the origin
+   * @param maxs - box maximum corner relative to the origin
+   * @param origin - entity origin applied before tracing
+   * @param angles - entity rotation applied before tracing
+   * @returns world-space trace result
+   */
+  static transformedBoxTrace(model: BrushModel, start: Vector, end: Vector, mins: Vector, maxs: Vector, origin: Vector = Vector.origin, angles: Vector = Vector.origin): Trace {
     const transform = BrushTrace._getTransformContext(origin, angles);
 
     if (transform === null) {
@@ -777,15 +799,15 @@ export class BrushTrace {
    * Test if a box at the given world-space position overlaps a brush model
    * after applying entity translation and rotation.
    * Equivalent to Quake 2's transformed position test helpers.
-   * @param {BrushModel} model - world model or submodel owning the brush data
-   * @param {Vector} position - world-space position to test
-   * @param {Vector} mins - box mins
-   * @param {Vector} maxs - box maxs
-   * @param {Vector} origin - entity origin
-   * @param {Vector} angles - entity angles
-   * @returns {boolean} true if position is valid (not in solid)
-   */
-  static transformedTestPosition(model, position, mins, maxs, origin = Vector.origin, angles = Vector.origin) {
+   * @param model - brush model to test against
+   * @param position - world-space position to test
+   * @param mins - box minimum corner relative to the origin
+   * @param maxs - box maximum corner relative to the origin
+   * @param origin - entity origin applied before testing
+   * @param angles - entity rotation applied before testing
+   * @returns true when the transformed box does not overlap solid brush geometry
+   */
+  static transformedTestPosition(model: BrushModel, position: Vector, mins: Vector, maxs: Vector, origin: Vector = Vector.origin, angles: Vector = Vector.origin): boolean {
     const transform = BrushTrace._getTransformContext(origin, angles);
 
     if (transform === null) {
@@ -800,15 +822,15 @@ export class BrushTrace {
   /**
    * Trace a box from start to end through the BSP tree, testing individual brushes.
    * Equivalent to Q2’s CM_BoxTrace.
-   * @param {BrushModel} worldModel - world model owning the BSP data
-   * @param {number} headNode - BSP node index to start traversal from
-   * @param {Vector} start - start position
-   * @param {Vector} end - end position
-   * @param {Vector} mins - box mins (typically PLAYER_MINS)
-   * @param {Vector} maxs - box maxs (typically PLAYER_MAXS)
-   * @returns {Trace} trace result
-   */
-  static boxTrace(worldModel, headNode, start, end, mins, maxs) {
+   * @param worldModel - world brush model with BSP data
+   * @param headNode - BSP node index to start traversal from
+   * @param start - world-space start point
+   * @param end - world-space end point
+   * @param mins - box minimum corner relative to the origin
+   * @param maxs - box maximum corner relative to the origin
+   * @returns trace result against BSP brushes
+   */
+  static boxTrace(worldModel: BrushModel, headNode: number, start: Vector, end: Vector, mins: Vector, maxs: Vector): Trace {
     const trace = new Trace();
 
     // Brush traces must derive allsolid from brush overlap, not from the
@@ -839,8 +861,7 @@ export class BrushTrace {
     const totalMove = end.copy().subtract(start);
     const sweepBounds = BrushTrace._computeSweepBounds(start, end, mins, maxs);
 
-    /** @type {BrushTraceContext} */
-    const ctx = {
+    const ctx: BrushTraceContext = {
       worldModel,
       trace,
       mins,
@@ -884,14 +905,14 @@ export class BrushTrace {
   /**
    * Test if a player-sized box at the given position overlaps any solid brush.
    * Equivalent to Q2’s CM_BoxTrace position-test special case.
-   * @param {BrushModel} worldModel - world model owning the BSP data
-   * @param {number} headNode - BSP node index to start traversal from
-   * @param {Vector} position - position to test
-   * @param {Vector} mins - box mins (typically PLAYER_MINS)
-   * @param {Vector} maxs - box maxs (typically PLAYER_MAXS)
-   * @returns {boolean} true if position is valid (not stuck in solid)
-   */
-  static testPosition(worldModel, headNode, position, mins, maxs) {
+   * @param worldModel - world brush model with BSP data
+   * @param headNode - BSP node index to start traversal from
+   * @param position - world-space position to test
+   * @param mins - box minimum corner relative to the origin
+   * @param maxs - box maximum corner relative to the origin
+   * @returns true when the position is clear of solid brushes
+   */
+  static testPosition(worldModel: BrushModel, headNode: number, position: Vector, mins: Vector, maxs: Vector): boolean {
     if (!worldModel.nodes || worldModel.nodes.length === 0) {
       return true;
     }
@@ -925,19 +946,8 @@ export class BrushTrace {
   /**
    * Recursively walk the BSP tree for position testing, expanding by box
    * extents to visit all leaves the player box overlaps.
-   * @param {BrushModel} worldModel - world model
-   * @param {import('./model/BSP.mjs').Node} node - current node
-   * @param {Vector} position - test position
-   * @param {Vector} mins - box mins
-   * @param {Vector} maxs - box maxs
-   * @param {Vector} boundsMins - world-space test bounds minimum
-   * @param {Vector} boundsMaxs - world-space test bounds maximum
-   * @param {Vector} extents - absolute half-extents
-   * @param {boolean} isPoint - true if point trace
-   * @param {number} checkCount - dedup counter
-   * @returns {boolean} true if solid overlap found
-   */
-  static _testPositionRecursive(worldModel, node, position, mins, maxs, boundsMins, boundsMaxs, extents, isPoint, checkCount) {
+   */
+  static _testPositionRecursive(worldModel: BrushModel, node: import('./model/BSP.mjs').Node, position: Vector, mins: Vector, maxs: Vector, boundsMins: Vector, boundsMaxs: Vector, extents: Vector, isPoint: boolean, checkCount: number): boolean {
     if (node.mins !== null && node.mins !== undefined && node.maxs !== null && node.maxs !== undefined
       && !BrushTrace._boundsOverlap(boundsMins, boundsMaxs, node.mins, node.maxs)) {
       return false;
@@ -997,14 +1007,8 @@ export class BrushTrace {
    * Unlike boxTrace which walks the BSP tree, this tests every brush in the
    * submodel's range directly. Used for submodel entities (doors, plats, etc.)
    * whose brushes are NOT inserted into the world BSP leaf-brush index.
-   * @param {BrushModel} model - submodel with brush data (shared arrays from world)
-   * @param {Vector} start - start position (local to entity)
-   * @param {Vector} end - end position (local to entity)
-   * @param {Vector} mins - box mins
-   * @param {Vector} maxs - box maxs
-   * @returns {Trace} trace result
-   */
-  static boxTraceModel(model, start, end, mins, maxs) {
+   */
+  static boxTraceModel(model: BrushModel, start: Vector, end: Vector, mins: Vector, maxs: Vector): Trace {
     const trace = new Trace();
 
     // Brute-force path: no BSP tree walk, so no leaf visits to clear allsolid.
@@ -1032,8 +1036,7 @@ export class BrushTrace {
     const totalMove = end.copy().subtract(start);
     const sweepBounds = BrushTrace._computeSweepBounds(start, end, mins, maxs);
 
-    /** @type {BrushTraceContext} */
-    const ctx = {
+    const ctx: BrushTraceContext = {
       worldModel: model,
       trace,
       mins,
@@ -1094,13 +1097,8 @@ export class BrushTrace {
    * Test if a player-sized box at position overlaps any solid brush in
    * a submodel's brush range (brute-force). Used for submodel entities
    * whose brushes are NOT in the BSP leaf-brush index.
-   * @param {BrushModel} model - submodel with brush data
-   * @param {Vector} position - position to test (local to entity)
-   * @param {Vector} mins - box mins
-   * @param {Vector} maxs - box maxs
-   * @returns {boolean} true if position is valid (not in solid)
    */
-  static testPositionModel(model, position, mins, maxs) {
+  static testPositionModel(model: BrushModel, position: Vector, mins: Vector, maxs: Vector): boolean {
     if (!model.brushes || model.numBrushes === 0) {
       return true;
     }
@@ -1138,17 +1136,8 @@ export class BrushTrace {
 
   /**
    * Test if a player-sized box overlaps any solid brush in a leaf.
-   * @param {BrushModel} worldModel - world model
-   * @param {import('./model/BSP.mjs').Node} leaf - leaf node
-   * @param {Vector} position - position to test
-   * @param {Vector} mins - box mins
-   * @param {Vector} maxs - box maxs
-   * @param {Vector} boundsMins - world-space test bounds minimum
-   * @param {Vector} boundsMaxs - world-space test bounds maximum
-   * @param {number} checkCount - dedup counter
-   * @returns {boolean} true if solid overlap found
-   */
-  static _testLeafSolid(worldModel, leaf, position, mins, maxs, boundsMins, boundsMaxs, checkCount) {
+   */
+  static _testLeafSolid(worldModel: BrushModel, leaf: import('./model/BSP.mjs').Node, position: Vector, mins: Vector, maxs: Vector, boundsMins: Vector, boundsMaxs: Vector, checkCount: number): boolean {
     const brushes = worldModel.brushes;
     const leafbrushes = worldModel.leafbrushes;
 
@@ -1192,14 +1181,8 @@ export class BrushTrace {
 
   /**
    * Test if a box at origin is inside a brush. Equivalent to Q2’s CM_TestBoxInBrush.
-   * @param {BrushModel} worldModel - world model
-   * @param {import('./model/BSP.mjs').Brush} brush - brush to test
-   * @param {Vector} position - box center position
-   * @param {Vector} mins - box mins
-   * @param {Vector} maxs - box maxs
-   * @returns {boolean} true if the box is inside the brush
-   */
-  static _testBoxInBrush(worldModel, brush, position, mins, maxs) {
+   */
+  static _testBoxInBrush(worldModel: BrushModel, brush: import('./model/BSP.mjs').Brush, position: Vector, mins: Vector, maxs: Vector): boolean {
     const brushsides = worldModel.brushsides;
     const planes = worldModel.planes;
 
@@ -1234,23 +1217,14 @@ export class BrushTrace {
     return true;
   }
 
-  /** @type {Vector[]} */
-  static _midPool = Array.from({ length: 96 }, () => new Vector());
-  /** @type {Vector[]} */
-  static _mid2Pool = Array.from({ length: 96 }, () => new Vector());
+  static readonly _midPool: Vector[] = Array.from({ length: 96 }, () => new Vector());
+  static readonly _mid2Pool: Vector[] = Array.from({ length: 96 }, () => new Vector());
 
   /**
    * Recursively traverse the BSP node tree, expanding by trace extents.
    * At leaf nodes, test all brushes. Equivalent to Q2’s CM_RecursiveHullCheck.
-   * @param {BrushTraceContext} ctx - trace context
-   * @param {import('./model/BSP.mjs').Node} node - current BSP node (or leaf)
-   * @param {number} p1f - fraction at p1
-   * @param {number} p2f - fraction at p2
-   * @param {Vector} p1 - start of segment
-   * @param {Vector} p2 - end of segment
-   * @param {number} depth - recursion depth
-   */
-  static _recursiveHullCheck(ctx, node, p1f, p2f, p1, p2, depth = 0) {
+   */
+  static _recursiveHullCheck(ctx: BrushTraceContext, node: import('./model/BSP.mjs').Node, p1f: number, p2f: number, p1: Vector, p2: Vector, depth: number = 0) {
     if (!BrushTrace._nodeMayAffectTrace(ctx, node)) {
       return;
     }
@@ -1346,10 +1320,8 @@ export class BrushTrace {
   /**
    * Test all brushes in a leaf against the current trace.
    * Equivalent to Q2’s CM_TraceToLeaf.
-   * @param {BrushTraceContext} ctx - trace context
-   * @param {import('./model/BSP.mjs').Node} leaf - leaf node
    */
-  static _traceToLeaf(ctx, leaf) {
+  static _traceToLeaf(ctx: BrushTraceContext, leaf: import('./model/BSP.mjs').Node) {
     // Q1 content classification for trace flags
     if (leaf.contents !== content.CONTENT_SOLID && leaf.contents !== content.CONTENT_SKY) {
       ctx.trace.allsolid = false;
@@ -1400,10 +1372,8 @@ export class BrushTrace {
   /**
    * Clip the trace against a single brush’s planes.
    * Equivalent to Q2’s CM_ClipBoxToBrush.
-   * @param {BrushTraceContext} ctx - trace context
-   * @param {import('./model/BSP.mjs').Brush} brush - brush to clip against
    */
-  static _clipBoxToBrush(ctx, brush) {
+  static _clipBoxToBrush(ctx: BrushTraceContext, brush: import('./model/BSP.mjs').Brush) {
     const brushsides = ctx.worldModel.brushsides;
     const planes = ctx.worldModel.planes;
     const moveDeltaX = ctx.end[0] - ctx.start[0];
@@ -1414,10 +1384,8 @@ export class BrushTrace {
 
     let enterfrac = -1;
     let leavefrac = 1;
-    /** @type {import('./model/BaseModel.mjs').Plane|null} */
-    let clipplane = null;
-    /** @type {import('./model/BaseModel.mjs').Plane|null} */
-    let tangentAxialPlane = null;
+    let clipplane: import('./model/BaseModel.mjs').Plane | null = null;
+    let tangentAxialPlane: import('./model/BaseModel.mjs').Plane | null = null;
     let tangentAxialMovesDeeper = false;
 
     let getout = false;
@@ -1538,12 +1506,12 @@ export class BrushTrace {
   /**
    * Convert a world-space point into local model space using the inverse of a
    * rigid transform represented by origin plus orthonormal basis rows.
-   * @param {Vector} point - world-space point
-   * @param {Vector} origin - transform origin
-   * @param {number[]} basis - 3x3 rotation matrix from Vector.toRotationMatrix()
-   * @returns {Vector} point in local space
+   * @param point - world-space point
+   * @param origin - transform origin
+   * @param basis - 3x3 rotation matrix from Vector.toRotationMatrix()
+   * @returns point in local model space
    */
-  static _transformPointToLocal(point, origin, basis) {
+  static _transformPointToLocal(point: Vector, origin: Vector, basis: number[]): Vector {
     const delta = point.copy().subtract(origin);
     const forward = new Vector(basis[0], basis[1], basis[2]);
     const right = new Vector(basis[3], basis[4], basis[5]);
@@ -1558,12 +1526,12 @@ export class BrushTrace {
 
   /**
    * Convert a local-space point into world space using origin plus basis rows.
-   * @param {Vector} point - local-space point
-   * @param {Vector} origin - transform origin
-   * @param {number[]} basis - 3x3 rotation matrix from Vector.toRotationMatrix()
-   * @returns {Vector} point in world space
+   * @param point - local-space point
+   * @param origin - transform origin
+   * @param basis - 3x3 rotation matrix from Vector.toRotationMatrix()
+   * @returns point in world space
    */
-  static _transformPointToWorld(point, origin, basis) {
+  static _transformPointToWorld(point: Vector, origin: Vector, basis: number[]): Vector {
     const forward = new Vector(basis[0], basis[1], basis[2]);
     const right = new Vector(basis[3], basis[4], basis[5]);
     const up = new Vector(basis[6], basis[7], basis[8]);
@@ -1576,11 +1544,11 @@ export class BrushTrace {
 
   /**
    * Rotate a local-space plane normal into world space.
-   * @param {Vector} normal - local-space normal
-   * @param {number[]} basis - 3x3 rotation matrix from Vector.toRotationMatrix()
-   * @returns {Vector} world-space normal
+   * @param normal - local-space normal
+   * @param basis - 3x3 rotation matrix from Vector.toRotationMatrix()
+   * @returns world-space normal
    */
-  static _transformNormalToWorld(normal, basis) {
+  static _transformNormalToWorld(normal: Vector, basis: number[]): Vector {
     const forward = new Vector(basis[0], basis[1], basis[2]);
     const right = new Vector(basis[3], basis[4], basis[5]);
     const up = new Vector(basis[6], basis[7], basis[8]);
@@ -1592,11 +1560,11 @@ export class BrushTrace {
 
   /**
    * Convert a local-space trace result back into world space.
-   * @param {Trace} localTrace - local-space trace result
-   * @param {{origin: Vector, basis: number[]|null}|null} transform - entity transform context
-   * @returns {Trace} world-space trace result
+   * @param localTrace - local-space trace result
+   * @param transform - entity transform context
+   * @returns world-space trace result
    */
-  static _transformTraceToWorld(localTrace, transform) {
+  static _transformTraceToWorld(localTrace: Trace, transform: BrushTraceTransform): Trace {
     if (transform === null) {
       return localTrace;
     }
@@ -1616,102 +1584,101 @@ export class BrushTrace {
   }
 }
 
-/**
- * @typedef {object} BrushTraceContext
- * @property {BrushModel} worldModel - world model with BSP data
- * @property {Trace} trace - trace result being accumulated
- * @property {Vector} mins - player box mins
- * @property {Vector} maxs - player box maxs
- * @property {boolean} isPoint - true if mins/maxs are zero (point trace)
- * @property {Vector} extents - absolute half-extents of the player box
- * @property {Vector} start - trace start position
- * @property {Vector} end - trace end position
- * @property {Vector} totalMove - end minus start
- * @property {Vector} sweepMins - swept move bounding box minimum
- * @property {Vector} sweepMaxs - swept move bounding box maximum
- * @property {number} checkCount - dedup counter for brush testing
- */
+interface BrushTraceContext {
+  readonly worldModel: BrushModel;
+  readonly trace: Trace;
+  readonly mins: Vector;
+  readonly maxs: Vector;
+  readonly isPoint: boolean;
+  readonly extents: Vector;
+  readonly start: Vector;
+  readonly end: Vector;
+  readonly totalMove: Vector;
+  readonly sweepMins: Vector;
+  readonly sweepMaxs: Vector;
+  readonly checkCount: number;
+}
+
 
 // ---------------------------------------------------------------------------
 // PhysEnt: a physics entity stored in the Pmove world
 // ---------------------------------------------------------------------------
 
 export class PhysEnt { // physent_t
-  /**
-   * @param {Pmove} pmove parent pmove instance
-   */
-  constructor(pmove) {
-    /** only for bsp models (legacy Q1 hull-based collision) @type {Hull[]} */
+  /** Legacy Q1 hulls used when brush tracing is unavailable. */
+  hulls: Hull[];
+  /** Entity origin in world space. */
+  origin: Vector;
+  /** Entity rotation used for transformed brush traces. */
+  angles: Vector;
+  /** Local bounding-box minimums for non-BSP entities. */
+  mins: Vector;
+  /** Local bounding-box maximums for non-BSP entities. */
+  maxs: Vector;
+  /** Owning edict index when this physent maps back to game state. */
+  edictId: number | null;
+  /** Shared world brush model used for Q2-style brush tracing. */
+  brushWorldModel: BrushModel | null;
+  /** BSP node root used when tracing against the world brush model. */
+  brushHeadNode: number;
+  /** Submodel brush range used for brute-force submodel tracing. */
+  brushModel: BrushModel | null;
+  readonly #pmoveRef: WeakRef<Pmove>;
+
+  /**
+   * @param pmove - parent pmove instance
+   */
+  constructor(pmove: Pmove) {
     this.hulls = [];
-    /** origin */
     this.origin = new Vector();
-    /** angles for transformed brush collision */
     this.angles = new Vector();
-    /** only for non-bsp models */
     this.mins = new Vector();
-    /** only for non-bsp models */
     this.maxs = new Vector();
-    /** actual edict index, used to map back to edicts @type {?number} */
     this.edictId = null;
 
-    /**
-     * Reference to the world model for brush-based collision.
-     * The world model owns nodes, leafs, planes, brushes, brushsides, leafbrushes.
-     * Submodels reference the same world model (shared BSP tree).
-     * @type {BrushModel|null}
-     */
     this.brushWorldModel = null;
 
-    /**
-     * BSP node index for brush collision traversal root.
-     * For the world entity this is the world headnode.
-     * Not used for submodel entities (they use brute-force brush testing).
-     * @type {number}
-     */
     this.brushHeadNode = -1;
 
-    /**
-     * Submodel reference for brute-force brush collision.
-     * Set for submodel entities (doors, plats, etc.) whose brushes are
-     * NOT in the BSP leaf-brush index. When set, tracing iterates this
-     * model's firstBrush..firstBrush+numBrushes directly.
-     * Null for the world entity (which uses BSP tree walk via brushHeadNode).
-     * @type {BrushModel|null}
-     */
     this.brushModel = null;
 
-    /** @type {WeakRef<Pmove>} @private */
-    this._pmove_wf = new WeakRef(pmove);
+    this.#pmoveRef = new WeakRef(pmove);
   }
 
-  /** @returns {Pmove} pmove @private */
-  get _pmove() {
-    return this._pmove_wf.deref();
+  /** Parent Pmove instance. */
+  get _pmove(): Pmove {
+    const pmove = this.#pmoveRef.deref();
+
+    if (pmove === undefined) {
+      throw new Error('PhysEnt parent Pmove was released');
+    }
+
+    return pmove;
   }
 
   /**
    * Whether this entity uses brush-based collision (Q2-style).
    * When false, falls back to legacy hull-based collision (Q1-style).
-   * @returns {boolean} true if brush-based collision is available
+   * @returns true when brush-based collision is available
    */
-  get usesBrushTracing() {
+  get usesBrushTracing(): boolean {
     return this.brushWorldModel !== null && this.brushWorldModel.hasBrushData;
   }
 
   /**
    * Active brush collision model: submodels use their own brush range, world uses the world model.
-   * @returns {BrushModel} brush model to trace against
+   * @returns brush model to trace against
    */
-  get brushCollisionModel() {
+  get brushCollisionModel(): BrushModel | null {
     return this.brushModel ?? this.brushWorldModel;
   }
 
   /**
    * Emit nearby blocking brushes around a debug position when brush and hull comparisons disagree.
-   * @param {Vector} position world-space position to inspect
-   * @param {string} label debug label for the sampled position
+   * @param position - world-space position to inspect
+   * @param label - debug label for the sampled position
    */
-  _debugLogNearbyBlockingBrushes(position, label) {
+  _debugLogNearbyBlockingBrushes(position: Vector, label: string) {
     const model = this.brushCollisionModel;
     const brushes = model?.brushes;
     const planes = model?.planes;
@@ -1723,8 +1690,7 @@ export class PhysEnt { // physent_t
 
     const firstBrush = model.firstBrush ?? 0;
     const lastBrush = firstBrush + (model.numBrushes ?? brushes.length);
-    /** @type {{ index: number, contents: number, numsides: number, nearestPlaneDistance: number, touchingPlanes: number, mins: Vector, maxs: Vector, sideSummaries: string[] }[]} */
-    const candidates = [];
+    const candidates: NearbyBrushCandidate[] = [];
 
     for (let brushIndex = firstBrush; brushIndex < lastBrush; brushIndex++) {
       const brush = brushes[brushIndex];
@@ -1752,8 +1718,7 @@ export class PhysEnt { // physent_t
 
       let nearestPlaneDistance = Number.POSITIVE_INFINITY;
       let touchingPlanes = 0;
-      /** @type {{ distance: number, summary: string }[]} */
-      const sideSummaries = [];
+      const sideSummaries: NearbyBrushSideSummary[] = [];
 
       for (let sideIndex = 0; sideIndex < brush.numsides; sideIndex++) {
         const side = brushsides[brush.firstside + sideIndex];
@@ -1816,10 +1781,10 @@ export class PhysEnt { // physent_t
    * they sit exactly tangent to an axial wall plane. Legacy BSP hull point
    * contents treats that pose as solid, which causes the tiny separating nudge
    * seen in hull-backed maps before movement begins.
-   * @param {Vector} position world-space position to inspect
-   * @returns {boolean} true when the position would become solid if axial wall tangency counted as overlap
+   * @param position - world-space position to inspect
+   * @returns true when hull-style tangency should still count as blocked
    */
-  _brushPositionNeedsHullTangentFallback(position) {
+  _brushPositionNeedsHullTangentFallback(position: Vector): boolean {
     const model = this.brushCollisionModel;
     const brushes = model?.brushes;
     const planes = model?.planes;
@@ -1901,18 +1866,18 @@ export class PhysEnt { // physent_t
 
   /**
    * Legacy hull comparisons are only meaningful for axis-aligned brush traces.
-   * @returns {boolean} true if brush-vs-hull debug comparison is valid
+   * @returns true when brush-vs-hull debug comparisons are valid
    */
-  get canCompareBrushAgainstHull() {
+  get canCompareBrushAgainstHull(): boolean {
     return this.hulls.length > 0 && this.angles.isOrigin();
   }
 
   /**
    * Legacy hull comparisons are only meaningful for axial contact planes.
-   * @param {Vector} normal candidate contact normal
-   * @returns {boolean} true when the normal is axis-aligned
+   * @param normal - candidate contact normal
+   * @returns true when the normal is axis-aligned
    */
-  static _isAxialNormal(normal) {
+  static _isAxialNormal(normal: Vector): boolean {
     const ax = Math.abs(normal[0]);
     const ay = Math.abs(normal[1]);
     const az = Math.abs(normal[2]);
@@ -1924,11 +1889,11 @@ export class PhysEnt { // physent_t
 
   /**
    * Convert a point into this physent's legacy hull space.
-   * @param {Vector} point point in world space
-   * @param {Vector|null} scratch scratch vector to reuse, or null to allocate
-   * @returns {Vector} point in local hull space
+   * @param point - point in world space
+   * @param scratch - optional scratch vector to reuse
+   * @returns point in local hull space
    */
-  toHullSpace(point, scratch = null) {
+  toHullSpace(point: Vector, scratch: Vector | null = null): Vector {
     const localPoint = scratch ?? point.copy();
     return localPoint.set(point).subtract(this.origin);
   }
@@ -1936,11 +1901,11 @@ export class PhysEnt { // physent_t
   /**
    * Convert a point into the collision space expected by this physent.
    * Brush traces operate in world space; legacy hull traces use local space.
-   * @param {Vector} point point in world space
-   * @param {Vector|null} scratch scratch vector to reuse for hull traces
-   * @returns {Vector} point in the collision space expected by the active path
+   * @param point - point in world space
+   * @param scratch - optional scratch vector for hull conversion
+   * @returns point in the active collision space
    */
-  toCollisionSpace(point, scratch = null) {
+  toCollisionSpace(point: Vector, scratch: Vector | null = null): Vector {
     if (this.usesBrushTracing) {
       return point;
     }
@@ -1950,11 +1915,11 @@ export class PhysEnt { // physent_t
 
   /**
    * Convert a point from this physent's collision space back to world space.
-   * @param {Vector} point point in collision space
-   * @param {Vector|null} scratch scratch vector to reuse for hull traces
-   * @returns {Vector} point in world space
+   * @param point - point in collision space
+   * @param scratch - optional scratch vector for hull conversion
+   * @returns point in world space
    */
-  toWorldSpace(point, scratch = null) {
+  toWorldSpace(point: Vector, scratch: Vector | null = null): Vector {
     if (this.usesBrushTracing) {
       return point;
     }
@@ -1963,15 +1928,15 @@ export class PhysEnt { // physent_t
     return worldPoint.set(point).add(this.origin);
   }
 
-  #hullMinsScratch = new Vector();
-  #hullMaxsScratch = new Vector();
+  readonly #hullMinsScratch = new Vector();
+  readonly #hullMaxsScratch = new Vector();
 
   /**
    * Returns clipping hull for this entity (legacy Q1 hull-based path).
    * NOTE: This is not async/wait safe, since it will modify pmove’s boxHull in-place.
-   * @returns {Hull} hull
+   * @returns hull used for legacy player traces
    */
-  getClippingHull() {
+  getClippingHull(): Hull {
     if (this.hulls.length > 0) {
       return this.hulls[1]; // player hull
     }
@@ -1986,11 +1951,11 @@ export class PhysEnt { // physent_t
    * Trace a player-sized box from start to end using the appropriate collision method.
    * For brush-based entities, uses Q2-style brush tracing.
    * For hull-based entities, uses Q1-style hull tracing.
-   * @param {Vector} start world-space start position
-   * @param {Vector} end world-space end position
-   * @returns {Trace} trace result
+   * @param start - world-space start position
+   * @param end - world-space end position
+   * @returns trace result for this physent
    */
-  tracePlayerMove(start, end) {
+  tracePlayerMove(start: Vector, end: Vector): Trace {
     const traceStart = this.toCollisionSpace(start);
     const traceEnd = this.toCollisionSpace(end);
 
@@ -2068,10 +2033,10 @@ export class PhysEnt { // physent_t
 
   /**
    * Test if a player-sized box at position is inside solid.
-   * @param {Vector} position world-space position to test
-   * @returns {boolean} true if position is valid (not in solid)
+   * @param position - world-space position to test
+   * @returns true when the position is valid and not in solid
    */
-  testPlayerPosition(position) {
+  testPlayerPosition(position: Vector): boolean {
     if (this.usesBrushTracing) {
       const brushResult = BrushTrace.transformedTestPosition(
         this.brushCollisionModel,
@@ -2177,7 +2142,7 @@ export class PhysEnt { // physent_t
   }
 
   // CR: we can add getClippingHullCrouch() for BSP30 hulls here later
-};
+}
 
 // ---------------------------------------------------------------------------
 // PmovePlayer: the core player movement simulation
@@ -2207,74 +2172,100 @@ export class PhysEnt { // physent_t
  * it back after.
  */
 export class PmovePlayer { // pmove_t (player state only)
-  /** @type {boolean} enables verbose movement debugging */
-  static get DEBUG() {
+  /** Frame time derived from the current user command. */
+  frametime: number;
+  /** Water depth from 0 to 3. */
+  waterlevel: number;
+  /** Current water contents value. */
+  watertype: number;
+  /** Ground physent index, or null while airborne. */
+  onground: number | null;
+  /** Player origin in world space. */
+  origin: Vector;
+  /** Player velocity in world units per second. */
+  velocity: Vector;
+  /** Resolved view angles used for movement. */
+  angles: Vector;
+  /** Current movement mode. */
+  pmType: PM_TYPE;
+  /** Player movement flags bitmask. */
+  pmFlags: number;
+  /** Timing counter for landing, teleport, and water-jump states. */
+  pmTime: number;
+  /** View height offset from the origin. */
+  viewheight: number;
+  /** Previous frame button state for edge-triggered input. */
+  oldbuttons: number;
+  /** Quake 1 water-jump timer compatibility field. */
+  waterjumptime: number;
+  /** Backwards-compatible spectator flag. */
+  spectator: boolean;
+  /** Backwards-compatible dead-player flag. */
+  dead: boolean;
+  /** Current input command being simulated. */
+  cmd: Protocol.UserCmd;
+  /** Physent indices touched during this frame. */
+  touchindices: number[];
+  /** Whether the player is on a ladder this frame. */
+  _ladder: boolean;
+  /** Cached angle vectors for the current view angles. */
+  _angleVectors: DirectionalVectors | null;
+  readonly #pmoveRef: WeakRef<Pmove>;
+
+  /** Enables verbose movement debugging. */
+  static get DEBUG(): boolean {
     return (Pmove.debug?.value ?? 0) !== 0;
   }
 
   /**
-   * @param {Pmove} pmove pmove instance (world + physents)
+   * @param pmove - pmove instance containing world collision state
    */
-  constructor(pmove) {
+  constructor(pmove: Pmove) {
     // --- Public state (read/write by caller) ---
 
-    /** @type {number} computed from cmd.msec */
     this.frametime = 0;
-    /** @type {number} 0-3 water depth */
     this.waterlevel = 0;
-    /** @type {number} content type of water */
     this.watertype = 0;
 
-    /** @type {?number} ground edict number; null if airborne */
     this.onground = null;
 
-    /** @type {Vector} player position (full float precision) */
     this.origin = new Vector();
-    /** @type {Vector} player velocity (full float precision) */
     this.velocity = new Vector();
-    /** @type {Vector} resolved view angles */
     this.angles = new Vector();
 
-    /** @type {number} movement type (PM_TYPE enum) */
     this.pmType = PM_TYPE.NORMAL;
-    /** @type {number} PM flag bitmask (PMF enum) */
     this.pmFlags = 0;
-    /** @type {number} timing counter for special states (in msec/8 units) */
     this.pmTime = 0;
 
-    /** @type {number} view height offset from origin */
     this.viewheight = 22;
 
-    /** @type {number} remembered old buttons for edge detection */
     this.oldbuttons = 0;
-    /** @type {number} Q1 compat, waterjump time remaining */
     this.waterjumptime = 0.0;
-    /** @type {boolean} backwards compat flag */
     this.spectator = false;
-    /** @type {boolean} backwards compat flag */
     this.dead = false;
 
-    /** @type {Protocol.UserCmd} input command */
     this.cmd = new Protocol.UserCmd();
 
-    /** @type {number[]} list of touched edict numbers */
     this.touchindices = [];
 
     // --- Private ---
 
-    /** @type {boolean} whether we are on a ladder this frame */
     this._ladder = false;
 
-    /** @type {DirectionalVectors} cached angle vectors @private */
     this._angleVectors = null;
 
-    /** @type {WeakRef<Pmove>} @private */
-    this._pmove_wf = new WeakRef(pmove);
+    this.#pmoveRef = new WeakRef(pmove);
   }
 
-  /** @returns {Pmove} parent Pmove instance @private */
-  get _pmove() {
-    return this._pmove_wf.deref();
+  /** Parent Pmove instance. */
+  get _pmove(): Pmove {
+    const pmove = this.#pmoveRef.deref();
+
+    if (pmove === undefined) {
+      throw new Error('PmovePlayer parent Pmove was released');
+    }
+
+    return pmove;
   }
 
   // =========================================================================
@@ -2761,12 +2752,12 @@ export class PmovePlayer { // pmove_t (player state only)
 
   /**
    * Slide off of the impacting surface.
-   * @param {Vector} veloIn input velocity
-   * @param {Vector} normal surface normal
-   * @param {Vector} veloOut output velocity (may alias veloIn)
-   * @param {number} overbounce overbounce factor (Q1: 1.0, Q2: 1.01)
+   * @param veloIn - input velocity
+   * @param normal - surface normal
+   * @param veloOut - output velocity, which may alias the input
+   * @param overbounce - overbounce factor used by Quake movement
    */
-  _clipVelocity(veloIn, normal, veloOut, overbounce) { // Q2: PM_ClipVelocity
+  _clipVelocity(veloIn: Vector, normal: Vector, veloOut: Vector, overbounce: number) { // Q2: PM_ClipVelocity
     const backoff = veloIn.dot(normal) * overbounce;
 
     for (let i = 0; i < 3; i++) {
@@ -2784,11 +2775,11 @@ export class PmovePlayer { // pmove_t (player state only)
 
   /**
    * Ground/water acceleration.
-   * @param {Vector} wishdir desired direction (unit vector)
-   * @param {number} wishspeed desired speed
-   * @param {number} accel acceleration factor
+   * @param wishdir - desired movement direction as a unit vector
+   * @param wishspeed - desired movement speed
+   * @param accel - acceleration factor to apply this frame
    */
-  _accelerate(wishdir, wishspeed, accel) { // Q2: PM_Accelerate
+  _accelerate(wishdir: Vector, wishspeed: number, accel: number) { // Q2: PM_Accelerate
     const currentspeed = this.velocity.dot(wishdir);
     let addspeed = wishspeed - currentspeed;
     if (addspeed <= 0) {
@@ -2809,11 +2800,11 @@ export class PmovePlayer { // pmove_t (player state only)
    * Air acceleration, preserves the Q1/Q2 air-strafe mechanic.
    * wishspeed is capped at 30 for the addspeed check, but the uncapped
    * value is used for accelspeed. This allows bunny-hopping.
-   * @param {Vector} wishdir desired direction (unit vector)
-   * @param {number} wishspeed desired speed (uncapped)
-   * @param {number} accel acceleration factor
+   * @param wishdir - desired movement direction as a unit vector
+   * @param wishspeed - uncapped desired movement speed
+   * @param accel - acceleration factor to apply this frame
    */
-  _airAccelerate(wishdir, wishspeed, accel) { // Q2: PM_AirAccelerate
+  _airAccelerate(wishdir: Vector, wishspeed: number, accel: number) { // Q2: PM_AirAccelerate
     let wishspd = wishspeed;
     if (wishspd > 30) {
       wishspd = 30;
@@ -2841,24 +2832,24 @@ export class PmovePlayer { // pmove_t (player state only)
   // =========================================================================
 
   // --- Scratch Vectors for _slideMove ---
-  #slideOriginalVelocity = new Vector();
-  #slidePrimalVelocity = new Vector();
-  #slideEnd = new Vector();
-  #slideClipVelocity = new Vector();
-  #slideCreaseDir = new Vector();
-  #slidePlanes = Array.from({ length: MAX_CLIP_PLANES }, () => new Vector());
+  readonly #slideOriginalVelocity = new Vector();
+  readonly #slidePrimalVelocity = new Vector();
+  readonly #slideEnd = new Vector();
+  readonly #slideClipVelocity = new Vector();
+  readonly #slideCreaseDir = new Vector();
+  readonly #slidePlanes = Array.from({ length: MAX_CLIP_PLANES }, () => new Vector());
 
   /**
    * Brush bevels can report a second zero-progress hit whose normal only
    * differs slightly from the wall we already clipped against. Treat that as a
    * duplicate plane so we keep sliding instead of manufacturing a bogus crease.
-   * @param {Vector} normal candidate collision plane normal
-   * @param {number} planeCount number of existing clip planes
-   * @param {Vector[]} planes existing clip planes
-   * @param {number} fraction trace fraction for the candidate hit
-   * @returns {boolean} true when the candidate plane should be collapsed into an existing one
+   * @param normal - candidate collision plane normal
+   * @param planeCount - number of existing slide planes
+   * @param planes - accumulated slide plane normals
+   * @param fraction - trace fraction for the candidate collision
+   * @returns true when the candidate plane should be merged into an existing one
    */
-  _isDuplicateSlidePlane(normal, planeCount, planes, fraction) {
+  _isDuplicateSlidePlane(normal: Vector, planeCount: number, planes: Vector[], fraction: number): boolean {
     const duplicateDot = fraction === 0.0 ? ZERO_PROGRESS_DUPLICATE_DOT : 0.99;
 
     for (let i = 0; i < planeCount; i++) {
@@ -2873,9 +2864,8 @@ export class PmovePlayer { // pmove_t (player state only)
   /**
    * The basic solid body movement clip that slides along multiple planes.
    * This is the inner loop, it does NOT attempt step-up.
-   * @returns {boolean} True when movement hit a blocking plane and required clipping.
    */
-  _slideMove() { // Q1: SV_FlyMove / Q2: PM_StepSlideMove_
+  _slideMove(): boolean { // Q1: SV_FlyMove / Q2: PM_StepSlideMove_
     const _dbg = PmovePlayer.DEBUG;
     const _dbgStartOrigin = _dbg ? this.origin.copy() : null;
     const _dbgStartVelocity = _dbg ? this.velocity.copy() : null;
@@ -2887,8 +2877,7 @@ export class PmovePlayer { // pmove_t (player state only)
     // against the same BSP hull plane with the 1.01 overbounce factor.
     const originalVelocity = this.#slideOriginalVelocity.set(this.velocity);
     let numplanes = 0;
-    /** @type {Vector[]} */
-    const planes = this.#slidePlanes;
+    const planes: Vector[] = this.#slidePlanes;
     let timeLeft = this.frametime;
     const end = this.#slideEnd;
     const clipVelocity = this.#slideClipVelocity;
@@ -3030,20 +3019,20 @@ export class PmovePlayer { // pmove_t (player state only)
   // =========================================================================
 
   // --- Scratch Vectors for _stepSlideMove ---
-  #stepStartOrigin = new Vector();
-  #stepStartVelocity = new Vector();
-  #stepDownOrigin = new Vector();
-  #stepDownVelocity = new Vector();
-  #stepUpOrigin = new Vector();
-  #stepStickTarget = new Vector();
-  #stepUp = new Vector();
-  #stepDown = new Vector();
+  readonly #stepStartOrigin = new Vector();
+  readonly #stepStartVelocity = new Vector();
+  readonly #stepDownOrigin = new Vector();
+  readonly #stepDownVelocity = new Vector();
+  readonly #stepUpOrigin = new Vector();
+  readonly #stepStickTarget = new Vector();
+  readonly #stepUp = new Vector();
+  readonly #stepDown = new Vector();
 
-  /**
-   * Each intersection will try to step over the obstruction instead of
-   * sliding along it. This calls _slideMove twice: once without step-up,
-   * once with step-up, and picks whichever went farther horizontally.
-   */
+/**
+ * Each intersection will try to step over the obstruction instead of
+ * sliding along it. This calls _slideMove twice: once without step-up,
+ * once with step-up, and picks whichever went farther horizontally.
+ */
   _stepSlideMove() { // Q2: PM_StepSlideMove
     const startOrigin = this.#stepStartOrigin.set(this.origin);
     const startVelocity = this.#stepStartVelocity.set(this.velocity);
@@ -3300,10 +3289,10 @@ export class PmovePlayer { // pmove_t (player state only)
     this._slideMove();
   }
 
-  /**
-   * Fly/spectator movement - noclip with friction.
-   * Can be called by spectators or noclip modes.
-   */
+/**
+ * Fly/spectator movement - noclip with friction.
+ * Can be called by spectators or noclip modes.
+ */
   _flyMove() { // Q2: PM_FlyMove
     this.viewheight = 22; // TODO: config
 
@@ -3376,10 +3365,10 @@ export class PmovePlayer { // pmove_t (player state only)
   // Position snapping / nudging
   // =========================================================================
 
-  /**
-   * Quantize position to 1/8 unit precision for network transmission
-   * and nudge into a valid position.
-   */
+/**
+ * Quantize position to 1/8 unit precision for network transmission
+ * and nudge into a valid position.
+ */
   _snapPosition() { // Q2: PM_SnapPosition
     // snap velocity to 1/8 unit precision (see SzBuffer)
     for (let i = 0; i < 3; i++) {
@@ -3421,11 +3410,11 @@ export class PmovePlayer { // pmove_t (player state only)
     this.origin.set(base);
   }
 
-  /**
-   * If pmove.origin is in a solid position,
-   * try nudging slightly on all axes to
-   * allow for the cut precision of the net coordinates.
-   */
+/**
+ * If pmove.origin is in a solid position,
+ * try nudging slightly on all axes to
+ * allow for the cut precision of the net coordinates.
+ */
   _nudgePosition() { // Q2: PM_InitialSnapPosition / QW: NudgePosition
     const offsets = [0, -1, 1];
     const base = this.origin.copy();
@@ -3449,7 +3438,7 @@ export class PmovePlayer { // pmove_t (player state only)
     }
     this.origin.set(base);
   }
-};
+}
 
 // ---------------------------------------------------------------------------
 // Pmove: the world container (physents, collision infrastructure)
@@ -3470,13 +3459,21 @@ export class Pmove { // pmove_t
 
   static MAX_CLIP_PLANES = MAX_CLIP_PLANES;
 
-  static PLAYER_MINS = new Vector(-16.0, -16.0, -24.0);
-  static PLAYER_MAXS = new Vector(16.0, 16.0, 32.0);
+  static readonly PLAYER_MINS = new Vector(-16.0, -16.0, -24.0);
+  static readonly PLAYER_MAXS = new Vector(16.0, 16.0, 32.0);
 
-  static MAX_PHYSENTS = 32;
+  static readonly MAX_PHYSENTS = 32;
 
-  /** @type {Cvar} */
-  static debug = null;
+  static debug: Cvar | null = null;
+
+  /** Runtime configuration shared by client and server movement. */
+  configuration = new PmoveConfiguration();
+  /** Physics entities, with index 0 reserved for the static world. */
+  physents: PhysEnt[] = [];
+  /** Reusable box hull for non-BSP entity collision. */
+  boxHull = new BoxHull();
+  /** Movement tuning variables shared by simulated players. */
+  movevars = new MoveVars();
 
   static Init() {
     Pmove.debug = new Cvar('pm_debug', '0', Cvar.FLAG.NONE, 'pmove debug output');
@@ -3487,23 +3484,15 @@ export class Pmove { // pmove_t
     Pmove.debug = null;
   }
 
-  /** @type {PmoveConfiguration} parameters for certain checks */
-  configuration = new PmoveConfiguration();
-
-  /** @type {PhysEnt[]} 0 - world */
-  physents = [];
-  boxHull = new BoxHull();
-  movevars = new MoveVars();
-
-  /** @type {Map<string, Hull[]>} cache for pm hulls from mod hulls */
-  #modelHullsCache = new Map();
+  /** Cache for cloned model hulls keyed by model name. */
+  readonly #modelHullsCache = new Map<string, Hull[]>();
 
   /**
    * Normalize static-world contents values so current volumes behave like water.
-   * @param {number} contents raw contents value
-   * @returns {number} normalized static-world contents value
+   * @param contents - raw contents value from the collision backend
+   * @returns normalized static-world contents value
    */
-  _normalizeStaticWorldContents(contents) {
+  _normalizeStaticWorldContents(contents: number): number {
     if ((contents <= content.CONTENT_CURRENT_0) && (contents >= content.CONTENT_CURRENT_DOWN)) {
       return content.CONTENT_WATER;
     }
@@ -3513,11 +3502,11 @@ export class Pmove { // pmove_t
 
   /**
    * Sample brush-backed static-world contents without exposing BSP details to callers.
-   * @param {PhysEnt} worldPhysEnt world physent
-   * @param {Vector} point position to sample
-   * @returns {number} static-world contents value
+   * @param worldPhysEnt - world physent holding the active brush model
+   * @param point - world-space position to sample
+   * @returns static-world contents value
    */
-  _pointContentsBrushStaticWorld(worldPhysEnt, point) {
+  _pointContentsBrushStaticWorld(worldPhysEnt: PhysEnt, point: Vector): number {
     console.assert(worldPhysEnt.brushWorldModel instanceof BrushModel, 'world brush model');
 
     if (!BrushTrace.transformedTestPosition(
@@ -3538,10 +3527,10 @@ export class Pmove { // pmove_t
    * Sample static-world contents using the active world collision backend.
    * This queries the world physent only; dynamic entities and BSP submodels are
    * not included here.
-   * @param {Vector} point position to sample
-   * @returns {number} static-world contents value
+   * @param point - world-space position to sample
+   * @returns static-world contents value
    */
-  staticWorldContents(point) {
+  staticWorldContents(point: Vector): number {
     console.assert(this.physents[0] instanceof PhysEnt, 'world physent');
 
     const worldPhysEnt = this.physents[0];
@@ -3558,31 +3547,31 @@ export class Pmove { // pmove_t
 
   /**
    * Compatibility alias for staticWorldContents.
-   * @param {Vector} point position to sample
-   * @returns {number} static-world contents value
+   * @param point - world-space position to sample
+   * @returns static-world contents value
    */
-  worldContents(point) {
+  worldContents(point: Vector): number {
     return this.staticWorldContents(point);
   }
 
   /**
    * Compatibility alias for staticWorldContents.
-   * @param {Vector} point position to sample
-   * @returns {number} static-world contents value
+   * @param point - world-space position to sample
+   * @returns static-world contents value
    */
-  pointContents(point) {
+  pointContents(point: Vector): number {
     return this.staticWorldContents(point);
   }
 
   /**
    * Normalize a player-move trace so startsolid results stop at the start point.
-   * @param {Trace} trace trace to normalize
-   * @param {Vector} start trace start position
-   * @param {number} physEntIndex physent index for debug logging
-   * @param {PhysEnt} physEnt physent that produced the trace
-   * @returns {Trace} normalized trace
+   * @param trace - trace to normalize in place
+   * @param start - original trace start position
+   * @param physEntIndex - physent index used for debug logging
+   * @param physEnt - physent that produced the trace
+   * @returns normalized trace
    */
-  _finalizePlayerMoveTrace(trace, start, physEntIndex, physEnt) {
+  _finalizePlayerMoveTrace(trace: Trace, start: Vector, physEntIndex: number, physEnt: PhysEnt): Trace {
     if (trace.allsolid) {
       trace.startsolid = true;
     }
@@ -3602,11 +3591,11 @@ export class Pmove { // pmove_t
    * Trace a player-sized move against the static world only.
    * Dynamic entities and BSP submodels owned by separate physents are not
    * included here.
-   * @param {Vector} start starting point
-   * @param {Vector} end end point (e.g. start + velocity * frametime)
-   * @returns {Trace} trace object against the world physent only
+   * @param start - starting point
+   * @param end - end point, usually start plus velocity times frame time
+   * @returns trace against the world physent only
    */
-  traceStaticWorldPlayerMove(start, end) {
+  traceStaticWorldPlayerMove(start: Vector, end: Vector): Trace {
     console.assert(!Number.isNaN(start[0]) && !Number.isNaN(start[1]) && !Number.isNaN(start[2]), 'NaN start');
     console.assert(!Number.isNaN(end[0]) && !Number.isNaN(end[1]) && !Number.isNaN(end[2]), 'NaN end');
     console.assert(this.physents[0] instanceof PhysEnt, 'world physent');
@@ -3621,13 +3610,14 @@ export class Pmove { // pmove_t
     return this._finalizePlayerMoveTrace(trace, start, 0, worldPhysEnt);
   }
 
-  #validPosTestScratch = new Vector();
+  readonly #validPosTestScratch = new Vector();
 
   /**
-   * @param {Vector} position player’s origin
-   * @returns {boolean} Returns false if the given player position is not valid (in solid)
+   * Check whether a player-sized box can occupy the given world-space position.
+   * @param position - player origin to validate
+   * @returns true when no physent blocks the position
    */
-  isValidPlayerPosition(position) {
+  isValidPlayerPosition(position: Vector): boolean {
     for (let i = 0; i < this.physents.length; i++) {
       const pe = this.physents[i];
 
@@ -3653,11 +3643,11 @@ export class Pmove { // pmove_t
 
   /**
    * Attempts to move the player from start to end.
-   * @param {Vector} start starting point
-   * @param {Vector} end end point (e.g. start + velocity * frametime)
-   * @returns {Trace} trace object
+   * @param start - starting point
+   * @param end - end point, usually start plus velocity times frame time
+   * @returns earliest blocking trace across all physents
    */
-  clipPlayerMove(start, end) {
+  clipPlayerMove(start: Vector, end: Vector): Trace {
     console.assert(!Number.isNaN(start[0]) && !Number.isNaN(start[1]) && !Number.isNaN(start[2]), 'NaN start');
     console.assert(!Number.isNaN(end[0]) && !Number.isNaN(end[1]) && !Number.isNaN(end[2]), 'NaN end');
 
@@ -3710,10 +3700,10 @@ export class Pmove { // pmove_t
   /**
    * Sets worldmodel.
    * This will automatically reset all physents.
-   * @param {BrushModel} model worldmodel
-   * @returns {Pmove} this
+   * @param model - world brush model to use as physent zero
+   * @returns this pmove instance
    */
-  setWorldmodel(model) {
+  setWorldmodel(model: BrushModel): Pmove {
     console.assert(model instanceof BrushModel, 'model');
 
     this.physents.length = 0;
@@ -3739,20 +3729,20 @@ export class Pmove { // pmove_t
 
   /**
    * Clears all entities.
-   * @returns {Pmove} this
+   * @returns this pmove instance
    */
-  clearEntities() {
+  clearEntities(): Pmove {
     this.physents.length = 1;
     return this;
   }
 
   /**
    * Adds an entity (client or server) to physents.
-   * @param {import('../server/Edict.mjs').BaseEntity|import('../client/ClientEntities.mjs').ClientEdict} entity actual entity
-   * @param {BrushModel|null} model model must be provided when entity is SOLID_BSP
-   * @returns {Pmove} this
+   * @param entity - entity state to mirror into the physent list
+   * @param model - brush model to use for SOLID_BSP-style entities
+   * @returns this pmove instance
    */
-  addEntity(entity, model = null) {
+  addEntity(entity: import('../server/Edict.mjs').BaseEntity | import('../client/ClientEntities.mjs').ClientEdict, model: BrushModel | null = null): Pmove {
     const pe = new PhysEnt(this);
 
     console.assert(model === null || model instanceof BrushModel, 'no model or brush model required');
@@ -3812,9 +3802,9 @@ export class Pmove { // pmove_t
 
   /**
    * Returns a new player move engine.
-   * @returns {PmovePlayer} player move engine
+   * @returns fresh per-player movement state bound to this pmove world
    */
-  newPlayerMove() {
+  newPlayerMove(): PmovePlayer {
     return new PmovePlayer(this);
   }
-};
+}
diff --git a/source/engine/server/Navigation.mjs b/source/engine/server/Navigation.mjs
index 4adf5f4a..538d9a75 100644
--- a/source/engine/server/Navigation.mjs
+++ b/source/engine/server/Navigation.mjs
@@ -8,7 +8,7 @@ import Cvar from '../common/Cvar.ts';
 import { CorruptedResourceError, MissingResourceError } from '../common/Errors.ts';
 import { ServerEngineAPI } from '../common/GameAPIs.mjs';
 import { BrushModel } from '../common/Mod.mjs';
-import { MIN_STEP_NORMAL, STEPSIZE } from '../common/Pmove.mjs';
+import { MIN_STEP_NORMAL, STEPSIZE } from '../common/Pmove.ts';
 import { Face } from '../common/model/BaseModel.mjs';
 import PlatformWorker from '../common/PlatformWorker.ts';
 import WorkerManager from '../common/WorkerManager.ts';
@@ -1803,11 +1803,11 @@ export class Navigation {
 
     Con.DPrint('Navigation: node graph built with ' + this.graph.nodes.length + ' nodes.\n');
 
-    this.save()
+    void this.save()
       .then(() => {
         Con.PrintSuccess('Navigation: navigation graph saved!\n');
         if (Navigation.nav_build_process?.value) {
-          Cmd.ExecuteString('quit');
+          void Cmd.ExecuteString('quit');
         }
       })
       .catch((err) => Con.PrintError('Navigation: failed to save navigation graph: ' + err + '\n'));
diff --git a/source/engine/server/Server.mjs b/source/engine/server/Server.mjs
index e5040adf..307cee0d 100644
--- a/source/engine/server/Server.mjs
+++ b/source/engine/server/Server.mjs
@@ -1,5 +1,5 @@
 import Cvar from '../common/Cvar.ts';
-import { MoveVars, Pmove } from '../common/Pmove.mjs';
+import { MoveVars, Pmove } from '../common/Pmove.ts';
 import Vector from '../../shared/Vector.ts';
 import { SzBuffer } from '../network/MSG.ts';
 import * as Protocol from '../network/Protocol.ts';
@@ -686,7 +686,7 @@ export default class SV {
     Con.Print(`[${client.name}@${client.netconnection.address}] ${cmd}\n`);
 
     Con.StartCapturing();
-    Cmd.ExecuteString(cmd);
+    void Cmd.ExecuteString(cmd);
 
     const response = Con.StopCapturing();
     message.writeByte(Protocol.svc.print);
@@ -1056,7 +1056,7 @@ export default class SV {
     );
 
     if (matchedCommand) {
-      Cmd.ExecuteString(input, client);
+      void Cmd.ExecuteString(input, client);
     } else {
       Con.Print(`${client.name} tried to ${input}!\n`);
     }
diff --git a/source/engine/server/physics/ServerClientPhysics.mjs b/source/engine/server/physics/ServerClientPhysics.mjs
index 41a90d9c..4f9e2c02 100644
--- a/source/engine/server/physics/ServerClientPhysics.mjs
+++ b/source/engine/server/physics/ServerClientPhysics.mjs
@@ -5,7 +5,7 @@ import {
   VELOCITY_EPSILON,
 } from './Defs.mjs';
 import { ServerClient } from '../Client.mjs';
-import { PM_TYPE } from '../../common/Pmove.mjs';
+import { PM_TYPE } from '../../common/Pmove.ts';
 import { BrushModel } from '../../common/Mod.mjs';
 
 let { Host, SV, V } = registry;
diff --git a/source/engine/server/physics/ServerCollision.mjs b/source/engine/server/physics/ServerCollision.mjs
index 511c4b78..5f39f8a7 100644
--- a/source/engine/server/physics/ServerCollision.mjs
+++ b/source/engine/server/physics/ServerCollision.mjs
@@ -2,7 +2,7 @@ import Vector from '../../../shared/Vector.ts';
 import * as Defs from '../../../shared/Defs.ts';
 import CollisionModelSource, { createRegistryCollisionModelSource } from '../../common/CollisionModelSource.mjs';
 import Mod, { BrushModel } from '../../common/Mod.mjs';
-import { BrushTrace, DIST_EPSILON, Trace as SharedTrace } from '../../common/Pmove.mjs';
+import { BrushTrace, DIST_EPSILON, Trace as SharedTrace } from '../../common/Pmove.ts';
 import { eventBus, registry } from '../../registry.mjs';
 import {
   BrushCollisionState,
@@ -24,7 +24,7 @@ let { Con, SV } = registry;
 
 /** @typedef {import('../Client.mjs').ServerEdict} ServerEdict */
 
-/** @typedef {import('../../common/Pmove.mjs').Trace} SharedBrushTrace */
+/** @typedef {import('../../common/Pmove.ts').Trace} SharedBrushTrace */
 
 eventBus.subscribe('registry.frozen', () => {
   Con = registry.Con;
@@ -119,7 +119,7 @@ export class ServerCollision {
 
   /**
    * Convert a shared brush trace result into the server collision trace shape.
-   * @param {import('../../common/Pmove.mjs').Trace} brushTrace shared brush trace result
+   * @param {import('../../common/Pmove.ts').Trace} brushTrace shared brush trace result
    * @param {ServerEdict} ent entity that owns the brush model
    * @returns {CollisionTrace} server collision trace
    */
diff --git a/source/engine/server/physics/ServerCollisionSupport.mjs b/source/engine/server/physics/ServerCollisionSupport.mjs
index 6e073c70..3e07f4f9 100644
--- a/source/engine/server/physics/ServerCollisionSupport.mjs
+++ b/source/engine/server/physics/ServerCollisionSupport.mjs
@@ -119,7 +119,7 @@ export class CollisionTrace {
   }
 
   /**
-   * @param {import('../../common/Pmove.mjs').Trace} brushTrace shared brush trace result
+   * @param {import('../../common/Pmove.ts').Trace} brushTrace shared brush trace result
    * @param {ServerEdict} ent entity that owns the brush model
    * @returns {CollisionTrace} server collision trace
    */
diff --git a/source/engine/server/physics/ServerLegacyHullCollision.mjs b/source/engine/server/physics/ServerLegacyHullCollision.mjs
index f66d9cd1..e54e7285 100644
--- a/source/engine/server/physics/ServerLegacyHullCollision.mjs
+++ b/source/engine/server/physics/ServerLegacyHullCollision.mjs
@@ -1,6 +1,6 @@
 import Vector from '../../../shared/Vector.ts';
 import * as Defs from '../../../shared/Defs.ts';
-import { DIST_EPSILON } from '../../common/Pmove.mjs';
+import { DIST_EPSILON } from '../../common/Pmove.ts';
 import { eventBus, registry } from '../../registry.mjs';
 
 let { Con } = registry;
diff --git a/source/engine/server/physics/ServerMovement.mjs b/source/engine/server/physics/ServerMovement.mjs
index e7c8763b..3521c517 100644
--- a/source/engine/server/physics/ServerMovement.mjs
+++ b/source/engine/server/physics/ServerMovement.mjs
@@ -1,6 +1,6 @@
 import Vector from '../../../shared/Vector.ts';
 import * as Defs from '../../../shared/Defs.ts';
-import { STEPSIZE } from '../../common/Pmove.mjs';
+import { STEPSIZE } from '../../common/Pmove.ts';
 import { ServerEdict } from '../Edict.mjs';
 import { eventBus, registry } from '../../registry.mjs';
 
diff --git a/test/physics/brushtrace.test.mjs b/test/physics/brushtrace.test.mjs
index eb5a026b..7de530dc 100644
--- a/test/physics/brushtrace.test.mjs
+++ b/test/physics/brushtrace.test.mjs
@@ -2,7 +2,7 @@ import { describe, test } from 'node:test';
 import assert from 'node:assert/strict';
 
 import Vector from '../../source/shared/Vector.ts';
-import { BrushTrace, DIST_EPSILON, Pmove } from '../../source/engine/common/Pmove.mjs';
+import { BrushTrace, DIST_EPSILON, Pmove } from '../../source/engine/common/Pmove.ts';
 import { BrushSide } from '../../source/engine/common/model/BSP.mjs';
 import { content } from '../../source/shared/Defs.ts';
 
diff --git a/test/physics/collision-regressions.test.mjs b/test/physics/collision-regressions.test.mjs
index 73af9877..9423f2bd 100644
--- a/test/physics/collision-regressions.test.mjs
+++ b/test/physics/collision-regressions.test.mjs
@@ -4,7 +4,7 @@ import assert from 'node:assert/strict';
 import Vector from '../../source/shared/Vector.ts';
 import { content, flags, moveType, moveTypes, solid } from '../../source/shared/Defs.ts';
 import { Brush, BrushModel, BrushSide } from '../../source/engine/common/model/BSP.mjs';
-import { BrushTrace, Hull, PMF, Pmove, PmovePlayer, Trace } from '../../source/engine/common/Pmove.mjs';
+import { BrushTrace, Hull, PMF, Pmove, PmovePlayer, Trace } from '../../source/engine/common/Pmove.ts';
 import { BSP29Loader } from '../../source/engine/common/model/loaders/BSP29Loader.mjs';
 import { eventBus, registry } from '../../source/engine/registry.mjs';
 import { UserCmd } from '../../source/engine/network/Protocol.ts';
diff --git a/test/physics/map-pmove-harness.mjs b/test/physics/map-pmove-harness.mjs
index ac0a136e..93b1cf11 100644
--- a/test/physics/map-pmove-harness.mjs
+++ b/test/physics/map-pmove-harness.mjs
@@ -3,7 +3,7 @@ import path from 'node:path';
 
 import COMClass from '../../source/engine/common/Com.ts';
 import Mod from '../../source/engine/common/Mod.mjs';
-import { PMF, Pmove } from '../../source/engine/common/Pmove.mjs';
+import { PMF, Pmove } from '../../source/engine/common/Pmove.ts';
 import { UserCmd } from '../../source/engine/network/Protocol.ts';
 import { eventBus, registry } from '../../source/engine/registry.mjs';
 import Vector from '../../source/shared/Vector.ts';
diff --git a/test/physics/pmove.test.mjs b/test/physics/pmove.test.mjs
index d7136497..8e31a9e9 100644
--- a/test/physics/pmove.test.mjs
+++ b/test/physics/pmove.test.mjs
@@ -6,7 +6,7 @@ import COMClass from '../../source/engine/common/Com.ts';
 import Mod from '../../source/engine/common/Mod.mjs';
 import Vector from '../../source/shared/Vector.ts';
 import { content } from '../../source/shared/Defs.ts';
-import { DIST_EPSILON, PM_TYPE, PMF, Pmove, PmovePlayer, Trace } from '../../source/engine/common/Pmove.mjs';
+import { DIST_EPSILON, PM_TYPE, PMF, Pmove, PmovePlayer, Trace } from '../../source/engine/common/Pmove.ts';
 import { UserCmd } from '../../source/engine/network/Protocol.ts';
 import { eventBus, registry } from '../../source/engine/registry.mjs';
 
diff --git a/test/physics/server-collision.test.mjs b/test/physics/server-collision.test.mjs
index edd17e4a..594b19b6 100644
--- a/test/physics/server-collision.test.mjs
+++ b/test/physics/server-collision.test.mjs
@@ -4,7 +4,7 @@ import assert from 'node:assert/strict';
 import Vector from '../../source/shared/Vector.ts';
 import { content, flags, moveType, moveTypes, solid } from '../../source/shared/Defs.ts';
 import { BrushModel } from '../../source/engine/common/model/BSP.mjs';
-import { BrushTrace, Pmove } from '../../source/engine/common/Pmove.mjs';
+import { BrushTrace, Pmove } from '../../source/engine/common/Pmove.ts';
 import { BSP29Loader } from '../../source/engine/common/model/loaders/BSP29Loader.mjs';
 import { ServerCollision } from '../../source/engine/server/physics/ServerCollision.mjs';
 import { ServerArea } from '../../source/engine/server/physics/ServerArea.mjs';

From aba084049913b20ad587a128aa6fd61ef42b4e33 Mon Sep 17 00:00:00 2001
From: Christian R <github@chrisnew.de>
Date: Thu, 2 Apr 2026 20:49:32 +0300
Subject: [PATCH 23/67] clean up of Host.mjs

---
 source/engine/common/Host.mjs | 2729 +++++++++++++++++----------------
 1 file changed, 1372 insertions(+), 1357 deletions(-)

diff --git a/source/engine/common/Host.mjs b/source/engine/common/Host.mjs
index 8c2da13c..a881584c 100644
--- a/source/engine/common/Host.mjs
+++ b/source/engine/common/Host.mjs
@@ -16,9 +16,6 @@ import { content, gameCapabilities } from '../../shared/Defs.ts';
 import ClientLifecycle from '../client/ClientLifecycle.mjs';
 import { Pmove } from './Pmove.ts';
 
-const Host = {};
-
-export default Host;
 
 let { CL, COM, Con, Draw, IN, Key, M, Mod, NET, PR, R, S, SCR, SV, Sbar, Sys, V } = registry;
 
@@ -42,1634 +39,1652 @@ eventBus.subscribe('registry.frozen', () => {
   V = registry.V;
 });
 
-Host.framecount = 0;
-
-Host.EndGame = function(message) {
-  Con.PrintSuccess('Host.EndGame: ' + message + '\n');
-  if (CL.cls.demonum !== -1) {
-    CL.NextDemo();
-  } else {
-    CL.Disconnect();
-    M.Alert('Host.EndGame', message);
-  }
-};
+class HostConsoleCommand extends ConsoleCommand {
+  /**
+   * @protected
+   * @returns {boolean} true, if it’s a cheat and cannot be invoked
+   */
+  cheat() {
+    if (!SV.cheats.value) {
+      Host.ClientPrint(this.client, 'Cheats are not enabled on this server.\n');
+      return true;
+    }
 
-Host.Error = function(error) {
-  if (Host.inerror === true) {
-    throw new Error('throw new HostError: recursively entered');
-  }
-  Host.inerror = true;
-  if (!registry.isDedicatedServer) {
-    SCR.EndLoadingPlaque();
-  }
-  Con.PrintError('Host Error: ' + error + '\n');
-  if (SV.server.active === true) {
-    Host.ShutdownServer();
-  }
-  CL.Disconnect();
-  CL.cls.demonum = -1;
-  Host.inerror = false;
-  M.Alert('Host Error', error);
-};
-
-Host.FindMaxClients = function() {
-  SV.svs.maxclients = 1;
-  SV.svs.maxclientslimit = Def.limits.clients;
-  SV.svs.clients.length = 0;
-  if (!registry.isDedicatedServer) {
-    CL.cls.state = Def.clientConnectionState.disconnected;
-  }
-  for (let i = 0; i < SV.svs.maxclientslimit; i++) {
-    SV.svs.clients.push(new ServerClient(i));
-  }
-};
-
-Host.InitLocal = function() {
-  const commitHash = registry.buildConfig?.commitHash;
-  const version = commitHash ? `${Def.productVersion}+${commitHash}` : Def.productVersion;
-
-  Host.version = new Cvar('version', version, Cvar.FLAG.READONLY);
-
-  Host.InitCommands();
-  Host.refreshrate = new Cvar('host_refreshrate', '0', Cvar.FLAG.ARCHIVE, 'Affects main loop sleep time, keep it at 0 for vsync-based timing. Vanilla recommendation is 60.');
-  Host.framerate = new Cvar('host_framerate', '0');
-  Host.speeds = new Cvar('host_speeds', '0');
-  Host.ticrate = new Cvar('sys_ticrate', '0.05');
-  Host.developer = new Cvar('developer', '0');
-  Host.pausable = new Cvar('pausable', '1', Cvar.FLAG.SERVER);
-  Host.teamplay = new Cvar('teamplay', '0', Cvar.FLAG.SERVER); // actually a game cvar, but we need it here, since a bunch of server code is using it
-
-  /** @deprecated use registry.isDedicatedServer instead, this is only made available to the game code */
-  Host.dedicated = new Cvar('dedicated', registry.isDedicatedServer ? '1' : '0', Cvar.FLAG.READONLY, 'Set to 1, if running in dedicated server mode.');
-
-  eventBus.subscribe('cvar.changed', (name) => {
-    const cvar = Cvar.FindVar(name);
-
-    // Automatically save when an archive Cvar changed
-    if ((cvar.flags & Cvar.FLAG.ARCHIVE) && Host.initialized) {
-      Host.WriteConfiguration();
-    }
-  });
-
-  Host.FindMaxClients();
-};
-
-Host.SendChatMessageToClient = function(client, name, message, direct = false) {
-  client.message.writeByte(Protocol.svc.chatmsg);
-  client.message.writeString(name);
-  client.message.writeString(message);
-  client.message.writeByte(direct ? 1 : 0);
-};
-
-/**
- * @param {ServerClient} client recipient client
- * @param {string} string text to send
- */
-Host.ClientPrint = function(client, string) {
-  client.message.writeByte(Protocol.svc.print);
-  client.message.writeString(string);
-};
-
-Host.BroadcastPrint = function(string) {
-  for (const client of SV.svs.spawnedClients()) {
-    client.message.writeByte(Protocol.svc.print);
-    client.message.writeString(string);
-  }
-};
-
-/**
- *
- * @param {ServerClient} client
- * @param {boolean} crash
- * @param {string} reason
- */
-Host.DropClient = function(client, crash, reason) { // TODO: refactor into ServerClient
-  if (NET.CanSendMessage(client.netconnection)) {
-    client.message.writeByte(Protocol.svc.disconnect);
-    client.message.writeString(reason);
-    NET.SendMessage(client.netconnection, client.message);
+    return false;
   }
+}
 
-  if (!crash) {
-    if (client.edict && client.state === ServerClient.STATE.SPAWNED) {
-      const saveSelf = SV.server.gameAPI.self;
-      SV.server.gameAPI.ClientDisconnect(client.edict);
-      if (saveSelf !== undefined) {
-        SV.server.gameAPI.self = saveSelf;
-      }
+export default class Host {
+  static developer = null;
+  static dedicated = null;
+  static framecount = 0;
+  static framerate = null;
+  static frametime = 0.0;
+  static initialized = false;
+  static inerror = false;
+  static isdown = false;
+  static noclip_anglehack = false;
+  static oldrealtime = 0.0;
+  static pausable = null;
+  static realtime = 0.0;
+  static refreshrate = null;
+  static speeds = null;
+  static teamplay = null;
+  static ticrate = null;
+  static version = null;
+
+  static EndGame(message) {
+    Con.PrintSuccess('Host.EndGame: ' + message + '\n');
+    if (CL.cls.demonum !== -1) {
+      CL.NextDemo();
+    } else {
+      CL.Disconnect();
+      M.Alert('Host.EndGame', message);
     }
-    Sys.Print('Client ' + client.name + ' removed\n');
-  } else {
-    client.state = ServerClient.STATE.DROPASAP;
-    Sys.Print('Client ' + client.name + ' dropped\n');
-  }
-
-  NET.Close(client.netconnection);
-
-  const { name, num } = client;
-
-  client.clear();
-
-  NET.activeconnections--;
-
-  eventBus.publish('server.client.disconnected', num, name);
+  };
 
-  for (let i = 0; i < SV.svs.maxclients; i++) {
-    const client = SV.svs.clients[i];
-    if (client.state <= ServerClient.STATE.CONNECTED) {
-      continue;
+  static Error(error) {
+    if (Host.inerror === true) {
+      throw new Error('throw new HostError: recursively entered');
     }
-    // FIXME: consolidate into a single message
-    client.message.writeByte(Protocol.svc.updatename);
-    client.message.writeByte(num);
-    client.message.writeByte(0);
-    client.message.writeByte(Protocol.svc.updatefrags);
-    client.message.writeByte(num);
-    client.message.writeShort(0);
-    client.message.writeByte(Protocol.svc.updatecolors);
-    client.message.writeByte(num);
-    client.message.writeByte(0);
-    client.message.writeByte(Protocol.svc.updatepings);
-    client.message.writeByte(num);
-    client.message.writeShort(0);
-  }
-};
-
-Host.ShutdownServer = function(isCrashShutdown = false) { // TODO: SV duties
-  if (SV.server.active !== true) {
-    return;
-  }
-  eventBus.publish('server.shutting-down');
-  SV.server.active = false;
-  if (!registry.isDedicatedServer && CL.cls.state === Def.clientConnectionState.connected) {
-    CL.Disconnect();
-  }
-  const start = Sys.FloatTime(); let count; let i;
-  do {
-    count = 0;
-    for (i = 0; i < SV.svs.maxclients; i++) { // FIXME: this 1is completely broken, it won’t properly close connections
-      const client = SV.svs.clients[i];
-      if (client.state < ServerClient.STATE.CONNECTED || client.message.cursize === 0) {
-        continue;
-      }
-      if (NET.CanSendMessage(client.netconnection)) {
-        NET.SendMessage(client.netconnection, client.message);
-        client.message.clear();
-        continue;
-      }
-      NET.GetMessage(client.netconnection);
-      count++;
+    Host.inerror = true;
+    if (!registry.isDedicatedServer) {
+      SCR.EndLoadingPlaque();
     }
-    if ((Sys.FloatTime() - start) > 3.0) { // this breaks a loop when the stuff on the top is stuck
-      break;
+    Con.PrintError('Host Error: ' + error + '\n');
+    if (SV.server.active === true) {
+      Host.ShutdownServer();
     }
-  } while (count !== 0);
-  for (i = 0; i < SV.svs.maxclients; i++) {
-    const client = SV.svs.clients[i];
-    if (client.state >= ServerClient.STATE.CONNECTED) {
-      Host.DropClient(client, isCrashShutdown, 'Server shutting down');
+    CL.Disconnect();
+    CL.cls.demonum = -1;
+    Host.inerror = false;
+    M.Alert('Host Error', error);
+  };
+
+  static FindMaxClients() {
+    SV.svs.maxclients = 1;
+    SV.svs.maxclientslimit = Def.limits.clients;
+    SV.svs.clients.length = 0;
+    if (!registry.isDedicatedServer) {
+      CL.cls.state = Def.clientConnectionState.disconnected;
     }
-  }
-  SV.ShutdownServer(isCrashShutdown);
-  eventBus.publish('server.shutdown');
-};
-
-Host.ConfigReady_f = function() {
-  eventBus.publish('host.config.loaded');
-  Con.DPrint('Loaded configuration\n');
-};
-
-Host.WriteConfiguration = function() {
-  Host.ScheduleInFuture('Host.WriteConfiguration', () => {
-    // never save a config during pending commands
-    if (Cmd.HasPendingCommands()) {
-      Con.PrintWarning('Writing configuration dismissed, pending commands outstanding. Try again later.\n');
-      return;
+    for (let i = 0; i < SV.svs.maxclientslimit; i++) {
+      SV.svs.clients.push(new ServerClient(i));
     }
+  };
 
-    const config = `
-${(!registry.isDedicatedServer ? Key.WriteBindings() + '\n\n\n': '')}
+  static InitLocal() {
+    const commitHash = registry.buildConfig?.commitHash;
+    const version = commitHash ? `${Def.productVersion}+${commitHash}` : Def.productVersion;
 
-${Cvar.WriteVariables()}
+    Host.version = new Cvar('version', version, Cvar.FLAG.READONLY);
 
-configready
-`;
+    Host.InitCommands();
+    Host.refreshrate = new Cvar('host_refreshrate', '0', Cvar.FLAG.ARCHIVE, 'Affects main loop sleep time, keep it at 0 for vsync-based timing. Vanilla recommendation is 60.');
+    Host.framerate = new Cvar('host_framerate', '0');
+    Host.speeds = new Cvar('host_speeds', '0');
+    Host.ticrate = new Cvar('sys_ticrate', '0.05');
+    Host.developer = new Cvar('developer', '0');
+    Host.pausable = new Cvar('pausable', '1', Cvar.FLAG.SERVER);
+    Host.teamplay = new Cvar('teamplay', '0', Cvar.FLAG.SERVER); // actually a game cvar, but we need it here, since a bunch of server code is using it
 
-    COM.WriteTextFile('config.cfg', config);
-    Con.DPrint('Wrote configuration\n');
-  }, 5.000);
-};
+    /** @deprecated use registry.isDedicatedServer instead, this is only made available to the game code */
+    Host.dedicated = new Cvar('dedicated', registry.isDedicatedServer ? '1' : '0', Cvar.FLAG.READONLY, 'Set to 1, if running in dedicated server mode.');
 
-Host.WriteConfiguration_f = function() {
-  Con.Print('Writing configuration\n');
-  Host.WriteConfiguration();
-};
+    eventBus.subscribe('cvar.changed', (name) => {
+      const cvar = Cvar.FindVar(name);
 
-Host.ServerFrame = function() { // TODO: move to SV.ServerFrame
-  SV.server.gameAPI.frametime = Host.frametime;
-  SV.server.datagram.clear();
-  SV.server.expedited_datagram.clear();
-  SV.CheckForNewClients();
-  SV.RunClients();
-  if ((SV.server.paused !== true) && ((SV.svs.maxclients >= 2) || (!registry.isDedicatedServer && Key.dest.value === Key.dest.game))) {
-    SV.physics.physics();
-  }
-  SV.RunScheduledGameCommands();
-  SV.messages.sendClientMessages();
-};
-
-Host._scheduledForNextFrame = [];
-Host.ScheduleForNextFrame = function(callback) {
-  Host._scheduledForNextFrame.push(callback);
-};
-
-Host._scheduleInFuture = new Map();
-Host.ScheduleInFuture = function(name, callback, whenInSeconds) {
-  if (Host.isdown) {
-    // there’s no future when shutting down
-    callback();
-    return;
-  }
+      // Automatically save when an archive Cvar changed
+      if ((cvar.flags & Cvar.FLAG.ARCHIVE) && Host.initialized) {
+        Host.WriteConfiguration();
+      }
+    });
 
-  if (Host._scheduleInFuture.has(name)) {
-    return;
-  }
+    Host.FindMaxClients();
+  };
 
-  Host._scheduleInFuture.set(name, {
-    time: Host.realtime + whenInSeconds,
-    callback,
-  });
-};
-
-Host._Frame = async function() {
-  Host.realtime = Sys.FloatTime();
-  Host.frametime = Host.realtime - Host.oldrealtime;
-  Host.oldrealtime = Host.realtime;
-  if (Host.framerate.value > 0) {
-    Host.frametime = Host.framerate.value;
-  } else {
-    if (Host.frametime > 0.1) {
-      Host.frametime = 0.1;
-    } else if (Host.frametime < 0.001) {
-      Host.frametime = 0.001;
-    }
-  }
+  static SendChatMessageToClient(client, name, message, direct = false) {
+    client.message.writeByte(Protocol.svc.chatmsg);
+    client.message.writeString(name);
+    client.message.writeString(message);
+    client.message.writeByte(direct ? 1 : 0);
+  };
 
-  // check all scheduled things for the next frame
-  while (Host._scheduledForNextFrame.length > 0) {
-    const callback = Host._scheduledForNextFrame.shift();
-    await callback();
-  }
+  /**
+   * @param {ServerClient} client recipient client
+   * @param {string} string text to send
+   */
+  static ClientPrint(client, string) {
+    client.message.writeByte(Protocol.svc.print);
+    client.message.writeString(string);
+  };
 
-  // check what’s scheduled in future
-  for (const [name, { time, callback }] of Host._scheduleInFuture.entries()) {
-    if (time > Host.realtime) {
-      continue;
+  static BroadcastPrint(string) {
+    for (const client of SV.svs.spawnedClients()) {
+      client.message.writeByte(Protocol.svc.print);
+      client.message.writeString(string);
     }
+  };
 
-    await callback();
-    Host._scheduleInFuture.delete(name);
-  }
-
-  if (registry.isDedicatedServer) {
-    Cmd.Execute();
-
-    if (SV.server.active === true) {
-      if (Host.speeds.value !== 0) {
-        console.profile('Host.ServerFrame');
-      }
-
-      Host.ServerFrame();
-
-      if (Host.speeds.value !== 0) {
-        console.profileEnd('Host.ServerFrame');
+  /**
+   *
+   * @param {ServerClient} client
+   * @param {boolean} crash
+   * @param {string} reason
+   */
+  static DropClient(client, crash, reason) { // TODO: refactor into ServerClient
+    if (NET.CanSendMessage(client.netconnection)) {
+      client.message.writeByte(Protocol.svc.disconnect);
+      client.message.writeString(reason);
+      NET.SendMessage(client.netconnection, client.message);
+    }
+
+    if (!crash) {
+      if (client.edict && client.state === ServerClient.STATE.SPAWNED) {
+        const saveSelf = SV.server.gameAPI.self;
+        SV.server.gameAPI.ClientDisconnect(client.edict);
+        if (saveSelf !== undefined) {
+          SV.server.gameAPI.self = saveSelf;
+        }
       }
+      Sys.Print('Client ' + client.name + ' removed\n');
+    } else {
+      client.state = ServerClient.STATE.DROPASAP;
+      Sys.Print('Client ' + client.name + ' dropped\n');
     }
 
-    // TODO: add times
-
-    Host.framecount++;
-
-    return;
-  }
-
-  if (CL.cls.state === Def.clientConnectionState.connecting) {
-    CL.CheckConnectingState();
-    SCR.UpdateScreen();
-    return;
-  }
+    NET.Close(client.netconnection);
 
-  Cmd.Execute();
+    const { name, num } = client;
 
-  if (CL.cls.state === Def.clientConnectionState.connected) {
-    CL.ReadFromServer();
-  }
+    client.clear();
 
-  if (Host.speeds.value !== 0) {
-    console.profile('CL.ClientFrame');
-  }
-  CL.ClientFrame();
-  if (Host.speeds.value !== 0) {
-    console.profileEnd('CL.ClientFrame');
-  }
+    NET.activeconnections--;
 
-  CL.SendCmd();
+    eventBus.publish('server.client.disconnected', num, name);
 
-  if (SV.server.active && !SV.svs.changelevelIssued) {
-    if (Host.speeds.value !== 0) {
-      console.profile('Host.ServerFrame');
+    for (let i = 0; i < SV.svs.maxclients; i++) {
+      const client = SV.svs.clients[i];
+      if (client.state <= ServerClient.STATE.CONNECTED) {
+        continue;
+      }
+      // FIXME: consolidate into a single message
+      client.message.writeByte(Protocol.svc.updatename);
+      client.message.writeByte(num);
+      client.message.writeByte(0);
+      client.message.writeByte(Protocol.svc.updatefrags);
+      client.message.writeByte(num);
+      client.message.writeShort(0);
+      client.message.writeByte(Protocol.svc.updatecolors);
+      client.message.writeByte(num);
+      client.message.writeByte(0);
+      client.message.writeByte(Protocol.svc.updatepings);
+      client.message.writeByte(num);
+      client.message.writeShort(0);
     }
+  };
 
-    Host.ServerFrame();
-
-    if (Host.speeds.value !== 0) {
-      console.profileEnd('Host.ServerFrame');
+  static ShutdownServer(isCrashShutdown = false) { // TODO: SV duties
+    if (SV.server.active !== true) {
+      return;
     }
-  }
+    eventBus.publish('server.shutting-down');
+    SV.server.active = false;
+    if (!registry.isDedicatedServer && CL.cls.state === Def.clientConnectionState.connected) {
+      CL.Disconnect();
+    }
+    const start = Sys.FloatTime(); let count; let i;
+    do {
+      count = 0;
+      for (i = 0; i < SV.svs.maxclients; i++) { // FIXME: this 1is completely broken, it won’t properly close connections
+        const client = SV.svs.clients[i];
+        if (client.state < ServerClient.STATE.CONNECTED || client.message.cursize === 0) {
+          continue;
+        }
+        if (NET.CanSendMessage(client.netconnection)) {
+          NET.SendMessage(client.netconnection, client.message);
+          client.message.clear();
+          continue;
+        }
+        NET.GetMessage(client.netconnection);
+        count++;
+      }
+      if ((Sys.FloatTime() - start) > 3.0) { // this breaks a loop when the stuff on the top is stuck
+        break;
+      }
+    } while (count !== 0);
+    for (i = 0; i < SV.svs.maxclients; i++) {
+      const client = SV.svs.clients[i];
+      if (client.state >= ServerClient.STATE.CONNECTED) {
+        Host.DropClient(client, isCrashShutdown, 'Server shutting down');
+      }
+    }
+    SV.ShutdownServer(isCrashShutdown);
+    eventBus.publish('server.shutdown');
+  };
 
-  // Set up prediction for other players
-  CL.SetUpPlayerPrediction(false);
+  static ConfigReady_f() {
+    eventBus.publish('host.config.loaded');
+    Con.DPrint('Loaded configuration\n');
+  };
 
-  if (Host.speeds.value !== 0) {
-    console.profile('CL.PredictMove');
-  }
+  static WriteConfiguration() {
+    Host.ScheduleInFuture('Host.WriteConfiguration', () => {
+      // never save a config during pending commands
+      if (Cmd.HasPendingCommands()) {
+        Con.PrintWarning('Writing configuration dismissed, pending commands outstanding. Try again later.\n');
+        return;
+      }
 
-  // do client side motion prediction
-  CL.PredictMove();
+      const config = `
+  ${(!registry.isDedicatedServer ? Key.WriteBindings() + '\n\n\n': '')}
 
-  if (Host.speeds.value !== 0) {
-    console.profileEnd('CL.PredictMove');
-  }
+  ${Cvar.WriteVariables()}
 
-  // Set up prediction for other players
-  CL.SetUpPlayerPrediction(true);
+  configready
+  `;
 
-  // build a refresh entity list
-  CL.state.clientEntities.emit();
+      COM.WriteTextFile('config.cfg', config);
+      Con.DPrint('Wrote configuration\n');
+    }, 5.000);
+  };
 
-  SCR.UpdateScreen();
+  static WriteConfiguration_f() {
+    Con.Print('Writing configuration\n');
+    Host.WriteConfiguration();
+  };
 
-  if (Host.speeds.value !== 0) {
-    console.profile('S.Update');
-  }
+  static ServerFrame() { // TODO: move to SV.ServerFrame
+    SV.server.gameAPI.frametime = Host.frametime;
+    SV.server.datagram.clear();
+    SV.server.expedited_datagram.clear();
+    SV.CheckForNewClients();
+    SV.RunClients();
+    if ((SV.server.paused !== true) && ((SV.svs.maxclients >= 2) || (!registry.isDedicatedServer && Key.dest.value === Key.dest.game))) {
+      SV.physics.physics();
+    }
+    SV.RunScheduledGameCommands();
+    SV.messages.sendClientMessages();
+  };
 
-  if (CL.cls.signon === 4) {
-    S.Update(R.refdef.vieworg, R.vpn, R.vright, R.vup, R.viewleaf ? R.viewleaf.contents <= content.CONTENT_WATER : false);
-  } else {
-    S.Update(Vector.origin, Vector.origin, Vector.origin, Vector.origin, false);
-  }
-  CDAudio.Update();
+  static _scheduledForNextFrame = [];
+  static ScheduleForNextFrame(callback) {
+    Host._scheduledForNextFrame.push(callback);
+  };
 
-  if (Host.speeds.value !== 0) {
-    console.profileEnd('S.Update');
-  }
+  static _scheduleInFuture = new Map();
+  static ScheduleInFuture(name, callback, whenInSeconds) {
+    if (Host.isdown) {
+      // there’s no future when shutting down
+      callback();
+      return;
+    }
 
-  Host.framecount++;
-};
+    if (Host._scheduleInFuture.has(name)) {
+      return;
+    }
 
-let inHandleCrash = false;
+    Host._scheduleInFuture.set(name, {
+      time: Host.realtime + whenInSeconds,
+      callback,
+    });
+  };
 
-// TODO: Sys.Init can handle a crash now since we are main looping without setInterval
-Host.HandleCrash = function(e) {
-  if (e instanceof HostError) {
-    Host.Error(e.message);
-    return;
-  }
-  if (inHandleCrash) {
-    console.error(e);
-    // eslint-disable-next-line no-debugger
-    debugger;
-    return;
-  }
-  inHandleCrash = true;
-  Con.PrintError((e.name ?? e.constructor.name) + ': ' + e.message + '\n');
-  eventBus.publish('host.crash', e);
-  Sys.Quit();
-};
-
-Host.Frame = async function() {
-  if (inHandleCrash) {
-    return;
-  }
+  static async _Frame() {
+    Host.realtime = Sys.FloatTime();
+    Host.frametime = Host.realtime - Host.oldrealtime;
+    Host.oldrealtime = Host.realtime;
+    if (Host.framerate.value > 0) {
+      Host.frametime = Host.framerate.value;
+    } else {
+      if (Host.frametime > 0.1) {
+        Host.frametime = 0.1;
+      } else if (Host.frametime < 0.001) {
+        Host.frametime = 0.001;
+      }
+    }
 
-  try {
-    await Host._Frame();
-  } catch (e) {
-    Host.HandleCrash(e);
-  }
-};
+    // check all scheduled things for the next frame
+    while (Host._scheduledForNextFrame.length > 0) {
+      const callback = Host._scheduledForNextFrame.shift();
+      await callback();
+    }
 
-Host.Init = async function() {
-  Host.oldrealtime = Sys.FloatTime();
-  Cmd.Init();
-  Cvar.Init();
+    // check what’s scheduled in future
+    for (const [name, { time, callback }] of Host._scheduleInFuture.entries()) {
+      if (time > Host.realtime) {
+        continue;
+      }
 
-  V.Init(); // required for V.CalcRoll
+      await callback();
+      Host._scheduleInFuture.delete(name);
+    }
 
-  if (!registry.isDedicatedServer) {
-    Chase.Init();
-  }
+    if (registry.isDedicatedServer) {
+      Cmd.Execute();
+
+      if (SV.server.active === true) {
+        if (Host.speeds.value !== 0) {
+          console.profile('Host.ServerFrame');
+        }
 
-  await COM.Init();
-  Host.InitLocal();
+        Host.ServerFrame();
 
-  if (!registry.isDedicatedServer) {
-    Key.Init();
-  }
+        if (Host.speeds.value !== 0) {
+          console.profileEnd('Host.ServerFrame');
+        }
+      }
 
-  Con.Init();
-  await PR.Init();
-  Mod.Init();
-  NET.Init();
-  Pmove.Init();
-  SV.Init();
+      // TODO: add times
 
-  if (!registry.isDedicatedServer) {
-    S.Init();
-    VID.Init();
-    await Draw.Init();
-    await R.Init();
-    await M.Init();
-    await CL.Init();
-    SCR.Init();
-    CDAudio.Init();
+      Host.framecount++;
 
-    if (!CL.gameCapabilities.includes(gameCapabilities.CAP_HUD_INCLUDES_SBAR)) {
-      await Sbar.Init();
+      return;
     }
 
-    IN.Init();
-  }
-
-  Cmd.text = 'exec better-quake.rc\n' + Cmd.text;
+    if (CL.cls.state === Def.clientConnectionState.connecting) {
+      CL.CheckConnectingState();
+      SCR.UpdateScreen();
+      return;
+    }
 
-  // eslint-disable-next-line require-atomic-updates
-  Host.initialized = true;
-  Sys.Print('========Host Initialized=========\n');
+    Cmd.Execute();
 
-  eventBus.publish('host.ready');
-};
+    if (CL.cls.state === Def.clientConnectionState.connected) {
+      CL.ReadFromServer();
+    }
 
-Host.Shutdown = function() {
-  if (Host.isdown === true) {
-    Sys.Print('recursive shutdown\n');
-    return;
-  }
-  eventBus.publish('host.shutting-down');
-  Host.isdown = true;
-  Host.WriteConfiguration();
-  if (!registry.isDedicatedServer) {
-    S.Shutdown();
-    CDAudio.Shutdown();
-  }
-  NET.Shutdown();
-  if (!registry.isDedicatedServer) {
-    IN.Shutdown();
-    VID.Shutdown();
-  }
-  Pmove.Shutdown();
-  Cmd.Shutdown();
-  Cvar.Shutdown();
-  eventBus.publish('host.shutdown');
-};
-
-// Commands
-
-Host.Quit_f = function() {
-  if (!registry.isDedicatedServer) {
-    if (Key.dest.value !== Key.dest.console) {
-      M.Menu_Quit_f();
-      return;
+    if (Host.speeds.value !== 0) {
+      console.profile('CL.ClientFrame');
+    }
+    CL.ClientFrame();
+    if (Host.speeds.value !== 0) {
+      console.profileEnd('CL.ClientFrame');
     }
-  }
 
-  if (SV.server.active === true) {
-    Host.ShutdownServer();
-  }
+    CL.SendCmd();
 
-  COM.Shutdown();
-  Sys.Quit();
-};
+    if (SV.server.active && !SV.svs.changelevelIssued) {
+      if (Host.speeds.value !== 0) {
+        console.profile('Host.ServerFrame');
+      }
 
-Host.Status_f = function() {
-  /** @type {Function} */
-  let print;
-  if (!this.client) {
-    if (!SV.server.active) {
-      if (registry.isDedicatedServer) {
-        Con.Print('No active server\n');
-        return;
+      Host.ServerFrame();
+
+      if (Host.speeds.value !== 0) {
+        console.profileEnd('Host.ServerFrame');
       }
-      this.forward();
-      return;
     }
-    print = Con.Print;
-  } else {
-    const client = this.client;
-    print = (text) => {
-      Host.ClientPrint(client, text);
-    };
-  }
-  print('hostname: ' + NET.hostname.string + '\n');
-  print('address : ' + NET.GetListenAddress() + '\n');
-  print('version : ' + Host.version.string + ' (' + SV.server.gameVersion + ')\n');
-  print('map     : ' + SV.server.mapname + '\n');
-  print('game    : ' + SV.server.gameName + '\n');
-  print('edicts  : ' + SV.server.num_edicts + ' used of ' + SV.server.edicts.length + ' allocated\n');
-  print('players : ' + NET.activeconnections + ' active (' + SV.svs.maxclients + ' max)\n\n');
-
-  const lines = [];
-
-  for (let i = 0; i < SV.svs.maxclients; i++) {
-    /** @type {ServerClient} */
-    const client = SV.svs.clients[i];
-
-    if (client.state < ServerClient.STATE.CONNECTED) {
-      continue;
-    }
-
-    const parts = [
-      client.num.toString().padStart(3),
-      client.name.substring(0, 19).padEnd(19),
-      client.uniqueId.substring(0, 19).padEnd(19),
-      Q.secsToTime(NET.time - client.netconnection.connecttime).padEnd(9),
-      client.ping.toFixed(0).padStart(4),
-      new Number(0).toFixed(0).padStart(4),   // TODO: add loss
-      ServerClient.STATE.toKey(client.state).padEnd(10),
-      client.netconnection.address,
-    ];
-
-    lines.push(parts.join(' | ') + '\n');
-  }
 
-  if (lines.length === 0) {
-    return;
-  }
+    // Set up prediction for other players
+    CL.SetUpPlayerPrediction(false);
 
-  print('id  | name                | unique id           | play time | ping | loss | state      | adr\n');
-  print('----|---------------------|---------------------|-----------|------|------|------------|-----\n');
+    if (Host.speeds.value !== 0) {
+      console.profile('CL.PredictMove');
+    }
 
-  for (const line of lines) {
-    print(line);
-  }
-};
+    // do client side motion prediction
+    CL.PredictMove();
 
-class HostConsoleCommand extends ConsoleCommand {
-  /**
-   * @protected
-   * @returns {boolean} true, if it’s a cheat and cannot be invoked
-   */
-  cheat() {
-    if (!SV.cheats.value) {
-      Host.ClientPrint(this.client, 'Cheats are not enabled on this server.\n');
-      return true;
+    if (Host.speeds.value !== 0) {
+      console.profileEnd('CL.PredictMove');
     }
 
-    return false;
-  }
-}
+    // Set up prediction for other players
+    CL.SetUpPlayerPrediction(true);
 
-Host.God_f = class extends HostConsoleCommand {
-  run() {
-    if (this.forward()) {
-      return;
-    }
-    if (this.cheat()) {
-      return;
-    }
-    const client = this.client;
-    client.edict.entity.flags ^= Defs.flags.FL_GODMODE;
-    if ((client.edict.entity.flags & Defs.flags.FL_GODMODE) === 0) {
-      Host.ClientPrint(client, 'godmode OFF\n');
-    } else {
-      Host.ClientPrint(client, 'godmode ON\n');
-    }
-  }
-};
+    // build a refresh entity list
+    CL.state.clientEntities.emit();
 
-Host.Notarget_f = class extends HostConsoleCommand {
-  run() {
-    if (this.forward()) {
-      return;
-    }
-    if (this.cheat()) {
-      return;
+    SCR.UpdateScreen();
+
+    if (Host.speeds.value !== 0) {
+      console.profile('S.Update');
     }
-    const client = this.client;
-    client.edict.entity.flags ^= Defs.flags.FL_NOTARGET;
-    if ((client.edict.entity.flags & Defs.flags.FL_NOTARGET) === 0) {
-      Host.ClientPrint(client, 'notarget OFF\n');
+
+    if (CL.cls.signon === 4) {
+      S.Update(R.refdef.vieworg, R.vpn, R.vright, R.vup, R.viewleaf ? R.viewleaf.contents <= content.CONTENT_WATER : false);
     } else {
-      Host.ClientPrint(client, 'notarget ON\n');
+      S.Update(Vector.origin, Vector.origin, Vector.origin, Vector.origin, false);
     }
-  }
-};
+    CDAudio.Update();
 
-Host.Noclip_f = class extends HostConsoleCommand {
-  run() {
-    if (this.forward()) {
-      return;
+    if (Host.speeds.value !== 0) {
+      console.profileEnd('S.Update');
     }
-    if (this.cheat()) {
+
+    Host.framecount++;
+  };
+
+  static #inHandleCrash = false;
+
+  // TODO: Sys.Init can handle a crash now since we are main looping without setInterval
+  static HandleCrash(e) {
+    if (e instanceof HostError) {
+      Host.Error(e.message);
       return;
     }
-    const client = this.client;
-    if (client.edict.entity.movetype !== Defs.moveType.MOVETYPE_NOCLIP) {
-      Host.noclip_anglehack = true;
-      client.edict.entity.movetype = Defs.moveType.MOVETYPE_NOCLIP;
-      Host.ClientPrint(client, 'noclip ON\n');
+    if (Host.#inHandleCrash) {
+      console.error(e);
+      // eslint-disable-next-line no-debugger
+      debugger;
       return;
     }
-    Host.noclip_anglehack = false;
-    client.edict.entity.movetype = Defs.moveType.MOVETYPE_WALK;
-    Host.ClientPrint(client, 'noclip OFF\n');
-  }
-};
+    Host.#inHandleCrash = true;
+    Con.PrintError((e.name ?? e.constructor.name) + ': ' + e.message + '\n');
+    eventBus.publish('host.crash', e);
+    Sys.Quit();
+  };
 
-Host.Fly_f = class extends HostConsoleCommand {
-  run() {
-    if (this.forward()) {
-      return;
-    }
-    if (this.cheat()) {
+  static async Frame() {
+    if (Host.#inHandleCrash) {
       return;
     }
-    const client = this.client;
-    if (client.edict.entity.movetype !== Defs.moveType.MOVETYPE_FLY) {
-      client.edict.entity.movetype = Defs.moveType.MOVETYPE_FLY;
-      Host.ClientPrint(client, 'flymode ON\n');
-      return;
+
+    try {
+      await Host._Frame();
+    } catch (e) {
+      Host.HandleCrash(e);
     }
-    client.edict.entity.movetype = Defs.moveType.MOVETYPE_WALK;
-    Host.ClientPrint(client, 'flymode OFF\n');
-  }
-};
+  };
 
-Host.Ping_f = function() {
-  if (this.forward()) {
-    return;
-  }
+  static async Init() {
+    Host.oldrealtime = Sys.FloatTime();
+    Cmd.Init();
+    Cvar.Init();
 
-  const recipientClient = this.client;
+    V.Init(); // required for V.CalcRoll
 
-  Host.ClientPrint(recipientClient, 'Client ping times:\n');
+    if (!registry.isDedicatedServer) {
+      Chase.Init();
+    }
 
-  for (let i = 0; i < SV.svs.maxclients; i++) {
-    /** @type {ServerClient} */
-    const client = SV.svs.clients[i];
+    await COM.Init();
+    Host.InitLocal();
 
-    if (client.state < ServerClient.STATE.CONNECTED) {
-      continue;
+    if (!registry.isDedicatedServer) {
+      Key.Init();
     }
 
-    let total = 0;
+    Con.Init();
+    await PR.Init();
+    Mod.Init();
+    NET.Init();
+    Pmove.Init();
+    SV.Init();
+
+    if (!registry.isDedicatedServer) {
+      S.Init();
+      VID.Init();
+      await Draw.Init();
+      await R.Init();
+      await M.Init();
+      await CL.Init();
+      SCR.Init();
+      CDAudio.Init();
+
+      if (!CL.gameCapabilities.includes(gameCapabilities.CAP_HUD_INCLUDES_SBAR)) {
+        await Sbar.Init();
+      }
 
-    for (let j = 0; j < client.ping_times.length; j++) {
-      total += client.ping_times[j];
+      IN.Init();
     }
 
-    Host.ClientPrint(recipientClient, (total * 62.5).toFixed(0).padStart(3) + ' ' + client.name + '\n');
-  }
-};
+    Cmd.text = 'exec better-quake.rc\n' + Cmd.text;
 
-Host.Map_f = function(mapname, ...spawnparms) {
-  if (mapname === undefined) {
-    Con.Print('Usage: map <map>\n');
-    return;
-  }
-  if (this.client) {
-    return;
-  }
-  // if (!SV.HasMap(mapname)) {
-  //   Con.Print(`No such map: ${mapname}\n`);
-  //   return;
-  // }
-  if (!registry.isDedicatedServer) {
-    CL.cls.demonum = -1;
-    CL.Disconnect();
-  }
-  Host.ShutdownServer(); // CR: this is the reason why you would need to use changelevel on Counter-Strike 1.6 etc.
-  if (!registry.isDedicatedServer) {
-    Key.dest.value = Key.dest.game;
-    SCR.BeginLoadingPlaque();
-  }
-  SV.svs.serverflags = 0;
+    // eslint-disable-next-line require-atomic-updates
+    Host.initialized = true;
+    Sys.Print('========Host Initialized=========\n');
 
-  if (!registry.isDedicatedServer) {
-    CL.SetConnectingStep(5, 'Spawning server');
-  }
-
-  if (!registry.isDedicatedServer) {
-    CL.cls.spawnparms = spawnparms.join(' ');
-  }
+    eventBus.publish('host.ready');
+  };
 
-  Host.ScheduleForNextFrame(async () => {
-    if (!await SV.SpawnServer(mapname)) {
-      SV.ShutdownServer(false);
-      throw new HostError('Could not spawn server with map ' + mapname);
+  static Shutdown() {
+    if (Host.isdown === true) {
+      Sys.Print('recursive shutdown\n');
+      return;
     }
-
+    eventBus.publish('host.shutting-down');
+    Host.isdown = true;
+    Host.WriteConfiguration();
     if (!registry.isDedicatedServer) {
-      CL.SetConnectingStep(null, null);
+      S.Shutdown();
+      CDAudio.Shutdown();
     }
+    NET.Shutdown();
+    if (!registry.isDedicatedServer) {
+      IN.Shutdown();
+      VID.Shutdown();
+    }
+    Pmove.Shutdown();
+    Cmd.Shutdown();
+    Cvar.Shutdown();
+    eventBus.publish('host.shutdown');
+  };
 
+  // Commands
+
+  static Quit_f() {
     if (!registry.isDedicatedServer) {
-      CL.Connect('local');
+      if (Key.dest.value !== Key.dest.console) {
+        M.Menu_Quit_f();
+        return;
+      }
     }
-  });
-};
 
-Host.Changelevel_f = function(mapname) {
-  if (mapname === undefined) {
-    Con.Print('Usage: changelevel <levelname>\n');
-    return;
-  }
+    if (SV.server.active === true) {
+      Host.ShutdownServer();
+    }
 
-  if (!SV.server.active || (!registry.isDedicatedServer && CL.cls.demoplayback)) {
-    Con.Print('Only the server may changelevel\n');
-    return;
-  }
+    COM.Shutdown();
+    Sys.Quit();
+  };
 
-  // if (!SV.HasMap(mapname)) {
-  //   throw new HostError(`No such map: ${mapname}`);
-  // }
+  static Status_f() {
+    /** @type {Function} */
+    let print;
+    if (!this.client) {
+      if (!SV.server.active) {
+        if (registry.isDedicatedServer) {
+          Con.Print('No active server\n');
+          return;
+        }
+        this.forward();
+        return;
+      }
+      print = Con.Print;
+    } else {
+      const client = this.client;
+      print = (text) => {
+        Host.ClientPrint(client, text);
+      };
+    }
+    print('hostname: ' + NET.hostname.string + '\n');
+    print('address : ' + NET.GetListenAddress() + '\n');
+    print('version : ' + Host.version.string + ' (' + SV.server.gameVersion + ')\n');
+    print('map     : ' + SV.server.mapname + '\n');
+    print('game    : ' + SV.server.gameName + '\n');
+    print('edicts  : ' + SV.server.num_edicts + ' used of ' + SV.server.edicts.length + ' allocated\n');
+    print('players : ' + NET.activeconnections + ' active (' + SV.svs.maxclients + ' max)\n\n');
+
+    const lines = [];
+
+    for (let i = 0; i < SV.svs.maxclients; i++) {
+      /** @type {ServerClient} */
+      const client = SV.svs.clients[i];
 
-  SV.svs.changelevelIssued = true;
+      if (client.state < ServerClient.STATE.CONNECTED) {
+        continue;
+      }
 
-  for (let i = 0; i < SV.svs.maxclients; i++) {
-    const client = SV.svs.clients[i];
-    if (client.state < ServerClient.STATE.CONNECTED) {
-      continue;
-    }
-    client.message.writeByte(Protocol.svc.changelevel);
-    client.message.writeString(mapname);
-  }
+      const parts = [
+        client.num.toString().padStart(3),
+        client.name.substring(0, 19).padEnd(19),
+        client.uniqueId.substring(0, 19).padEnd(19),
+        Q.secsToTime(NET.time - client.netconnection.connecttime).padEnd(9),
+        client.ping.toFixed(0).padStart(4),
+        new Number(0).toFixed(0).padStart(4),   // TODO: add loss
+        ServerClient.STATE.toKey(client.state).padEnd(10),
+        client.netconnection.address,
+      ];
 
-  if (!registry.isDedicatedServer) {
-    // this hack allows us to show the loading plaque and resetting the client renderer
-    CL.cls.changelevel = true;
-    CL.cls.signon = 0;
-  }
+      lines.push(parts.join(' | ') + '\n');
+    }
 
-  Host.ScheduleForNextFrame(async () => {
-    SV.SaveSpawnparms();
+    if (lines.length === 0) {
+      return;
+    }
 
-    Con.DPrint('Host.Changelevel_f: changing level to ' + mapname + '\n');
+    print('id  | name                | unique id           | play time | ping | loss | state      | adr\n');
+    print('----|---------------------|---------------------|-----------|------|------|------------|-----\n');
 
-    if (!await SV.SpawnServer(mapname)) {
-      SV.ShutdownServer(false);
-      throw new HostError('Could not spawn server for changelevel to ' + mapname);
+    for (const line of lines) {
+      print(line);
     }
+  };
 
-    Con.DPrint('Host.Changelevel_f: spawned server for changelevel to ' + mapname + '\n');
+  static God_f = class extends HostConsoleCommand {
+    run() {
+      if (this.forward()) {
+        return;
+      }
+      if (this.cheat()) {
+        return;
+      }
+      const client = this.client;
+      client.edict.entity.flags ^= Defs.flags.FL_GODMODE;
+      if ((client.edict.entity.flags & Defs.flags.FL_GODMODE) === 0) {
+        Host.ClientPrint(client, 'godmode OFF\n');
+      } else {
+        Host.ClientPrint(client, 'godmode ON\n');
+      }
+    }
+  };
 
-    if (!registry.isDedicatedServer) {
-      CL.SetConnectingStep(null, null);
+  static Notarget_f = class extends HostConsoleCommand {
+    run() {
+      if (this.forward()) {
+        return;
+      }
+      if (this.cheat()) {
+        return;
+      }
+      const client = this.client;
+      client.edict.entity.flags ^= Defs.flags.FL_NOTARGET;
+      if ((client.edict.entity.flags & Defs.flags.FL_NOTARGET) === 0) {
+        Host.ClientPrint(client, 'notarget OFF\n');
+      } else {
+        Host.ClientPrint(client, 'notarget ON\n');
+      }
     }
-  });
-};
+  };
 
-Host.Restart_f = function() {
-  if ((SV.server.active) && (registry.isDedicatedServer || !CL.cls.demoplayback && !this.client)) {
-    void Cmd.ExecuteString(`map ${SV.server.mapname}`);
-  }
-};
+  static Noclip_f = class extends HostConsoleCommand {
+    run() {
+      if (this.forward()) {
+        return;
+      }
+      if (this.cheat()) {
+        return;
+      }
+      const client = this.client;
+      if (client.edict.entity.movetype !== Defs.moveType.MOVETYPE_NOCLIP) {
+        Host.noclip_anglehack = true;
+        client.edict.entity.movetype = Defs.moveType.MOVETYPE_NOCLIP;
+        Host.ClientPrint(client, 'noclip ON\n');
+        return;
+      }
+      Host.noclip_anglehack = false;
+      client.edict.entity.movetype = Defs.moveType.MOVETYPE_WALK;
+      Host.ClientPrint(client, 'noclip OFF\n');
+    }
+  };
 
-// NOTE: this is the dedicated server version of disconnect
-Host.Disconnect_f = function() {
-  if (!SV.server.active) {
-    Con.Print('No active server\n');
-    return;
-  }
+  static Fly_f = class extends HostConsoleCommand {
+    run() {
+      if (this.forward()) {
+        return;
+      }
+      if (this.cheat()) {
+        return;
+      }
+      const client = this.client;
+      if (client.edict.entity.movetype !== Defs.moveType.MOVETYPE_FLY) {
+        client.edict.entity.movetype = Defs.moveType.MOVETYPE_FLY;
+        Host.ClientPrint(client, 'flymode ON\n');
+        return;
+      }
+      client.edict.entity.movetype = Defs.moveType.MOVETYPE_WALK;
+      Host.ClientPrint(client, 'flymode OFF\n');
+    }
+  };
 
-  Host.ShutdownServer();
-};
+  static Ping_f() {
+    if (this.forward()) {
+      return;
+    }
 
-Host.Reconnect_f = function() {
-  if (registry.isDedicatedServer) {
-    Con.Print('cannot reconnect in dedicated server mode\n');
-    return;
-  }
+    const recipientClient = this.client;
 
-  Con.PrintWarning('NOT IMPLEMENTED: reconnect\n'); // TODO: reimplement reconnect here
-};
+    Host.ClientPrint(recipientClient, 'Client ping times:\n');
 
-Host.Connect_f = function(address) {
-  if (address === undefined) {
-    Con.Print('Usage: connect <address>\n');
-    Con.Print(' - <address> can be "self", connecting to the current domain name\n');
-    return;
-  }
+    for (let i = 0; i < SV.svs.maxclients; i++) {
+      /** @type {ServerClient} */
+      const client = SV.svs.clients[i];
 
-  if (registry.isDedicatedServer) {
-    Con.Print('cannot connect to another server in dedicated server mode\n');
-    return;
-  }
+      if (client.state < ServerClient.STATE.CONNECTED) {
+        continue;
+      }
 
-  CL.cls.demonum = -1;
-  if (CL.cls.demoplayback === true) {
-    CL.StopPlayback();
-    CL.Disconnect();
-  }
+      let total = 0;
 
-  if (address === 'self') {
-    const url = new URL(location.href);
-    CL.Connect((url.protocol === 'https:' ? 'wss' : 'ws') + '://' + url.host + url.pathname + (!url.pathname.endsWith('/') ? '/' : '') + 'api/');
-  } else {
-    CL.Connect(address);
-  }
+      for (let j = 0; j < client.ping_times.length; j++) {
+        total += client.ping_times[j];
+      }
 
-  CL.cls.signon = 0;
-};
+      Host.ClientPrint(recipientClient, (total * 62.5).toFixed(0).padStart(3) + ' ' + client.name + '\n');
+    }
+  };
 
-Host.Savegame_f = function(savename) {
-  if (this.client) {
-    return;
-  }
-  if (savename === undefined) {
-    Con.Print('Usage: save <savename>\n');
-    return;
-  }
-  if (SV.server.active !== true) {
-    Con.PrintWarning('Not playing a local game.\n');
-    return;
-  }
-  if (CL.state.intermission !== 0) {
-    Con.PrintWarning('Can\'t save in intermission.\n');
-    return;
-  }
-  if (SV.svs.maxclients !== 1) {
-    Con.PrintWarning('Can\'t save multiplayer games.\n');
-    return;
-  }
-  if (savename.indexOf('..') !== -1) {
-    Con.PrintWarning('Relative pathnames are not allowed.\n');
-    return;
-  }
-  const client = SV.svs.clients[0];
-  if (client.state >= ServerClient.STATE.CONNECTED) {
-    if (client.edict.entity.health <= 0.0) {
-      Con.PrintWarning('Can\'t savegame with a dead player\n');
+  static Map_f(mapname, ...spawnparms) {
+    if (mapname === undefined) {
+      Con.Print('Usage: map <map>\n');
       return;
     }
-  }
-
-  const gamestate = {
-    version: Def.gamestateVersion,
-    gameversion: SV.server.gameVersion,
-    comment: CL.state.levelname, // TODO: ask the game for a comment
-    spawn_parms: client.spawn_parms,
-    mapname: SV.server.mapname,
-    time: SV.server.time,
-    lightstyles: SV.server.lightstyles,
-    globals: null,
-    cvars: [...Cvar.Filter((cvar) => cvar.flags & (Cvar.FLAG.SERVER | Cvar.FLAG.GAME))].map((cvar) => [cvar.name, cvar.string]),
-    clientdata: null,
-    edicts: [],
-    num_edicts: SV.server.num_edicts,
-    // TODO: client entities
-    particles: R.SerializeParticles(),
-  };
+    if (this.client) {
+      return;
+    }
+    // if (!SV.HasMap(mapname)) {
+    //   Con.Print(`No such map: ${mapname}\n`);
+    //   return;
+    // }
+    if (!registry.isDedicatedServer) {
+      CL.cls.demonum = -1;
+      CL.Disconnect();
+    }
+    Host.ShutdownServer(); // CR: this is the reason why you would need to use changelevel on Counter-Strike 1.6 etc.
+    if (!registry.isDedicatedServer) {
+      Key.dest.value = Key.dest.game;
+      SCR.BeginLoadingPlaque();
+    }
+    SV.svs.serverflags = 0;
 
-  if (CL.state.gameAPI) {
-    gamestate.clientdata = CL.state.gameAPI.saveGame();
-  }
+    if (!registry.isDedicatedServer) {
+      CL.SetConnectingStep(5, 'Spawning server');
+    }
 
-  // IDEA: we could actually compress this by using a list of common fields
-  for (const edict of SV.server.edicts) {
-    if (edict.isFree()) {
-      gamestate.edicts.push(null);
-      continue;
+    if (!registry.isDedicatedServer) {
+      CL.cls.spawnparms = spawnparms.join(' ');
     }
 
-    gamestate.edicts.push([edict.entity.classname, edict.entity.serialize()]);
-  }
+    Host.ScheduleForNextFrame(async () => {
+      if (!await SV.SpawnServer(mapname)) {
+        SV.ShutdownServer(false);
+        throw new HostError('Could not spawn server with map ' + mapname);
+      }
 
-  gamestate.globals = SV.server.gameAPI.serialize();
+      if (!registry.isDedicatedServer) {
+        CL.SetConnectingStep(null, null);
+      }
 
-  const name = COM.DefaultExtension(savename, '.json');
-  Con.Print('Saving game to ' + name + '...\n');
-  if (COM.WriteTextFile(name, JSON.stringify(gamestate))) {
-    Con.PrintSuccess('done.\n');
-  } else {
-    Con.PrintError('ERROR: couldn\'t open.\n');
-  }
-};
+      if (!registry.isDedicatedServer) {
+        CL.Connect('local');
+      }
+    });
+  };
 
-Host.Loadgame_f = async function (savename) {
-  if (this.client) {
-    return;
-  }
-  if (savename === undefined) {
-    Con.Print('Usage: load <savename>\n');
-    return;
-  }
-  if (savename.indexOf('..') !== -1) {
-    Con.PrintWarning('Relative pathnames are not allowed.\n');
-    return;
-  }
-  CL.cls.demonum = -1;
-  const name = COM.DefaultExtension(savename, '.json');
-  Con.Print('Loading game from ' + name + '...\n');
-  const data = await COM.LoadTextFile(name);
-  if (data === null) {
-    Con.PrintError('ERROR: couldn\'t open.\n');
-    return;
-  }
+  static Changelevel_f(mapname) {
+    if (mapname === undefined) {
+      Con.Print('Usage: changelevel <levelname>\n');
+      return;
+    }
 
-  const gamestate = JSON.parse(data);
+    if (!SV.server.active || (!registry.isDedicatedServer && CL.cls.demoplayback)) {
+      Con.Print('Only the server may changelevel\n');
+      return;
+    }
 
-  if (gamestate.version !== Def.gamestateVersion) {
-    throw new HostError(`Savegame is version ${gamestate.version}, not ${Def.gamestateVersion}\n`);
-  }
+    // if (!SV.HasMap(mapname)) {
+    //   throw new HostError(`No such map: ${mapname}`);
+    // }
 
-  CL.Disconnect();
+    SV.svs.changelevelIssued = true;
 
-  // restore all server/game cvars
-  for (const [name, value] of gamestate.cvars) {
-    const cvar = Cvar.FindVar(name);
-    if (cvar) {
-      cvar.set(value);
-    } else {
-      Con.PrintWarning(`Saved cvar ${name} not found, skipping\n`);
+    for (let i = 0; i < SV.svs.maxclients; i++) {
+      const client = SV.svs.clients[i];
+      if (client.state < ServerClient.STATE.CONNECTED) {
+        continue;
+      }
+      client.message.writeByte(Protocol.svc.changelevel);
+      client.message.writeString(mapname);
     }
-  }
 
-  if (!await SV.SpawnServer(gamestate.mapname)) {
     if (!registry.isDedicatedServer) {
-      CL.SetConnectingStep(null, null);
+      // this hack allows us to show the loading plaque and resetting the client renderer
+      CL.cls.changelevel = true;
+      CL.cls.signon = 0;
     }
 
-    SV.ShutdownServer(false);
-    throw new HostError(`Couldn't load map ${gamestate.mapname} for save game ${name}\n`);
-  }
+    Host.ScheduleForNextFrame(async () => {
+      SV.SaveSpawnparms();
 
-  if (gamestate.gameversion !== SV.server.gameVersion) {
-    SV.ShutdownServer(false);
-    throw new HostError(`Game is version ${gamestate.gameversion}, not ${SV.server.gameVersion}\n`);
-  }
-
-  SV.server.paused = true;
-  SV.server.loadgame = true;
+      Con.DPrint('Host.Changelevel_f: changing level to ' + mapname + '\n');
 
-  SV.server.lightstyles = gamestate.lightstyles;
-  SV.server.gameAPI.deserialize(gamestate.globals);
+      if (!await SV.SpawnServer(mapname)) {
+        SV.ShutdownServer(false);
+        throw new HostError('Could not spawn server for changelevel to ' + mapname);
+      }
 
-  SV.server.num_edicts = gamestate.num_edicts;
-  console.assert(SV.server.num_edicts <= SV.server.edicts.length, 'resizing edicts not supported yet'); // TODO: alloc more edicts
+      Con.DPrint('Host.Changelevel_f: spawned server for changelevel to ' + mapname + '\n');
 
-  // first run through all edicts to make sure the entity structures get initialized
-  for (let i = 0; i < SV.server.edicts.length; i++) {
-    const edict = SV.server.edicts[i];
+      if (!registry.isDedicatedServer) {
+        CL.SetConnectingStep(null, null);
+      }
+    });
+  };
 
-    if (!gamestate.edicts[i]) { // freed edict
-      // FIXME: QuakeC doesn’t like it at all when edicts suddenly disappear, we should offload this code to the GameAPI
-      edict.freeEdict();
-      continue;
+  static Restart_f() {
+    if ((SV.server.active) && (registry.isDedicatedServer || !CL.cls.demoplayback && !this.client)) {
+      void Cmd.ExecuteString(`map ${SV.server.mapname}`);
     }
+  };
 
-    const [classname] = gamestate.edicts[i];
-    console.assert(SV.server.gameAPI.prepareEntity(edict, classname), 'no entity for classname');
-  }
+  // NOTE: this is the dedicated server version of disconnect
+  static Disconnect_f() {
+    if (!SV.server.active) {
+      Con.Print('No active server\n');
+      return;
+    }
 
-  // second run we can start deserializing
-  for (let i = 0; i < SV.server.edicts.length; i++) {
-    const edict = SV.server.edicts[i];
+    Host.ShutdownServer();
+  };
 
-    if (edict.isFree()) { // freed edict
-      continue;
+  static Reconnect_f() {
+    if (registry.isDedicatedServer) {
+      Con.Print('cannot reconnect in dedicated server mode\n');
+      return;
     }
 
-    const [, data] = gamestate.edicts[i];
-    edict.entity.deserialize(data);
-    edict.linkEdict();
-  }
-
-  SV.server.time = gamestate.time;
+    Con.PrintWarning('NOT IMPLEMENTED: reconnect\n'); // TODO: reimplement reconnect here
+  };
 
-  const client = SV.svs.clients[0];
-  client.spawn_parms = gamestate.spawn_parms;
+  static Connect_f(address) {
+    if (address === undefined) {
+      Con.Print('Usage: connect <address>\n');
+      Con.Print(' - <address> can be "self", connecting to the current domain name\n');
+      return;
+    }
 
-  ClientLifecycle.resumeGame(gamestate.clientdata, gamestate.particles);
-};
+    if (registry.isDedicatedServer) {
+      Con.Print('cannot connect to another server in dedicated server mode\n');
+      return;
+    }
 
-Host.Name_f = function(...names) { // signon 2, step 1
-  Con.DPrint(`Host.Name_f: ${this.client}\n`);
-  if (names.length < 1) {
-    Con.Print('"name" is "' + CL.name.string + '"\n');
-    return;
-  }
+    CL.cls.demonum = -1;
+    if (CL.cls.demoplayback === true) {
+      CL.StopPlayback();
+      CL.Disconnect();
+    }
 
-  if (!SV.server.active) { // ???
-    return;
-  }
+    if (address === 'self') {
+      const url = new URL(location.href);
+      CL.Connect((url.protocol === 'https:' ? 'wss' : 'ws') + '://' + url.host + url.pathname + (!url.pathname.endsWith('/') ? '/' : '') + 'api/');
+    } else {
+      CL.Connect(address);
+    }
 
-  let newName = names.join(' ').trim().substring(0, 15);
+    CL.cls.signon = 0;
+  };
 
-  if (!registry.isDedicatedServer && !this.client) {
-    Cvar.Set('_cl_name', newName);
-    if (CL.cls.state === Def.clientConnectionState.connected) {
-      this.forward();
+  static Savegame_f(savename) {
+    if (this.client) {
+      return;
+    }
+    if (savename === undefined) {
+      Con.Print('Usage: save <savename>\n');
+      return;
+    }
+    if (SV.server.active !== true) {
+      Con.PrintWarning('Not playing a local game.\n');
+      return;
+    }
+    if (CL.state.intermission !== 0) {
+      Con.PrintWarning('Can\'t save in intermission.\n');
+      return;
+    }
+    if (SV.svs.maxclients !== 1) {
+      Con.PrintWarning('Can\'t save multiplayer games.\n');
+      return;
+    }
+    if (savename.indexOf('..') !== -1) {
+      Con.PrintWarning('Relative pathnames are not allowed.\n');
+      return;
+    }
+    const client = SV.svs.clients[0];
+    if (client.state >= ServerClient.STATE.CONNECTED) {
+      if (client.edict.entity.health <= 0.0) {
+        Con.PrintWarning('Can\'t savegame with a dead player\n');
+        return;
+      }
     }
-    return;
-  }
-
-  if (!this.client) {
-    return;
-  }
 
-  const initialNewName = newName;
-  let newNameCounter = 2;
+    const gamestate = {
+      version: Def.gamestateVersion,
+      gameversion: SV.server.gameVersion,
+      comment: CL.state.levelname, // TODO: ask the game for a comment
+      spawn_parms: client.spawn_parms,
+      mapname: SV.server.mapname,
+      time: SV.server.time,
+      lightstyles: SV.server.lightstyles,
+      globals: null,
+      cvars: [...Cvar.Filter((cvar) => cvar.flags & (Cvar.FLAG.SERVER | Cvar.FLAG.GAME))].map((cvar) => [cvar.name, cvar.string]),
+      clientdata: null,
+      edicts: [],
+      num_edicts: SV.server.num_edicts,
+      // TODO: client entities
+      particles: R.SerializeParticles(),
+    };
 
-  // make sure we have a somewhat unique name
-  while (SV.FindClientByName(newName)) {
-    newName = `${initialNewName}${newNameCounter++}`;
-  }
+    if (CL.state.gameAPI) {
+      gamestate.clientdata = CL.state.gameAPI.saveGame();
+    }
 
-  const name = this.client.name;
-  if (registry.isDedicatedServer && name && (name.length !== 0) && (name !== 'unconnected') && (name !== newName)) {
-    Con.Print(name + ' renamed to ' + newName + '\n');
-  }
+    // IDEA: we could actually compress this by using a list of common fields
+    for (const edict of SV.server.edicts) {
+      if (edict.isFree()) {
+        gamestate.edicts.push(null);
+        continue;
+      }
 
-  this.client.name = newName;
-  const msg = SV.server.reliable_datagram;
-  msg.writeByte(Protocol.svc.updatename);
-  msg.writeByte(this.client.num);
-  msg.writeString(newName);
-};
+      gamestate.edicts.push([edict.entity.classname, edict.entity.serialize()]);
+    }
 
-Host.Say_f = function(teamonly, message) {
-  if (this.forward()) {
-    return;
-  }
+    gamestate.globals = SV.server.gameAPI.serialize();
 
-  if (!message) {
-    return;
-  }
+    const name = COM.DefaultExtension(savename, '.json');
+    Con.Print('Saving game to ' + name + '...\n');
+    if (COM.WriteTextFile(name, JSON.stringify(gamestate))) {
+      Con.PrintSuccess('done.\n');
+    } else {
+      Con.PrintError('ERROR: couldn\'t open.\n');
+    }
+  };
 
-  const sender = this.client;
+  static async Loadgame_f(savename) {
+    if (this.client) {
+      return;
+    }
+    if (savename === undefined) {
+      Con.Print('Usage: load <savename>\n');
+      return;
+    }
+    if (savename.indexOf('..') !== -1) {
+      Con.PrintWarning('Relative pathnames are not allowed.\n');
+      return;
+    }
+    CL.cls.demonum = -1;
+    const name = COM.DefaultExtension(savename, '.json');
+    Con.Print('Loading game from ' + name + '...\n');
+    const data = await COM.LoadTextFile(name);
+    if (data === null) {
+      Con.PrintError('ERROR: couldn\'t open.\n');
+      return;
+    }
 
-  if (message.length > 140) {
-    message = message.substring(0, 140) + '...';
-  }
+    const gamestate = JSON.parse(data);
 
-  for (let i = 0; i < SV.svs.maxclients; i++) {
-    const client = SV.svs.clients[i];
-    if (client.state < ServerClient.STATE.CONNECTED) {
-      continue;
-    }
-    if ((Host.teamplay.value !== 0) && (teamonly === true) && (client.entity.team !== sender.entity.team)) { // Legacy cvars
-      continue;
+    if (gamestate.version !== Def.gamestateVersion) {
+      throw new HostError(`Savegame is version ${gamestate.version}, not ${Def.gamestateVersion}\n`);
     }
-    Host.SendChatMessageToClient(client, sender.name, message, false);
-  }
 
-  Con.Print(`${sender.name}: ${message}\n`);
-};
+    CL.Disconnect();
 
-Host.Say_Team_f = function(message) {
-  Host.Say_f.call(this, true, message);
-};
+    // restore all server/game cvars
+    for (const [name, value] of gamestate.cvars) {
+      const cvar = Cvar.FindVar(name);
+      if (cvar) {
+        cvar.set(value);
+      } else {
+        Con.PrintWarning(`Saved cvar ${name} not found, skipping\n`);
+      }
+    }
 
-Host.Say_All_f = function(message) {
-  Host.Say_f.call(this, false, message);
-};
+    if (!await SV.SpawnServer(gamestate.mapname)) {
+      if (!registry.isDedicatedServer) {
+        CL.SetConnectingStep(null, null);
+      }
 
-Host.Tell_f = function(recipient, message) {
-  if (this.forward()) {
-    return;
-  }
+      SV.ShutdownServer(false);
+      throw new HostError(`Couldn't load map ${gamestate.mapname} for save game ${name}\n`);
+    }
 
-  if (!recipient || !message) {
-    Con.Print('Usage: tell <recipient> <message>\n');
-    return;
-  }
+    if (gamestate.gameversion !== SV.server.gameVersion) {
+      SV.ShutdownServer(false);
+      throw new HostError(`Game is version ${gamestate.gameversion}, not ${SV.server.gameVersion}\n`);
+    }
 
-  message = message.trim();
+    SV.server.paused = true;
+    SV.server.loadgame = true;
 
-  // Remove surrounding double quotes if present
-  if (message.startsWith('"')) {
-    message = message.slice(1, -1);
-  }
-  if (message.length > 140) {
-    message = message.substring(0, 140) + '...';
-  }
+    SV.server.lightstyles = gamestate.lightstyles;
+    SV.server.gameAPI.deserialize(gamestate.globals);
 
-  const sender = this.client;
-  for (let i = 0; i < SV.svs.maxclients; i++) {
-    const client = SV.svs.clients[i];
-    if (client.state < ServerClient.STATE.CONNECTED) {
-      continue;
-    }
-    if (client.name.toLowerCase() !== recipient.toLowerCase()) {
-      continue;
-    }
-    Host.SendChatMessageToClient(client, sender.name, message, true);
-    Host.SendChatMessageToClient(sender, sender.name, message, true);
-    break;
-  }
-};
+    SV.server.num_edicts = gamestate.num_edicts;
+    console.assert(SV.server.num_edicts <= SV.server.edicts.length, 'resizing edicts not supported yet'); // TODO: alloc more edicts
 
-Host.Color_f = function(...argv) { // signon 2, step 2
-  Con.DPrint(`Host.Color_f: ${this.client}\n`);
-  if (argv.length <= 1) {
-    Con.Print('"color" is "' + (CL.color.value >> 4) + ' ' + (CL.color.value & 15) + '"\ncolor <0-13> [0-13]\n');
-    return;
-  }
+    // first run through all edicts to make sure the entity structures get initialized
+    for (let i = 0; i < SV.server.edicts.length; i++) {
+      const edict = SV.server.edicts[i];
 
-  let top; let bottom;
-  if (argv.length === 2) {
-    top = bottom = (Q.atoi(argv[1]) & 15) >>> 0;
-  } else {
-    top = (Q.atoi(argv[1]) & 15) >>> 0;
-    bottom = (Q.atoi(argv[2]) & 15) >>> 0;
-  }
-  if (top >= 14) {
-    top = 13;
-  }
-  if (bottom >= 14) {
-    bottom = 13;
-  }
-  const playercolor = (top << 4) + bottom;
+      if (!gamestate.edicts[i]) { // freed edict
+        // FIXME: QuakeC doesn’t like it at all when edicts suddenly disappear, we should offload this code to the GameAPI
+        edict.freeEdict();
+        continue;
+      }
 
-  if (!registry.isDedicatedServer && !this.client) {
-    Cvar.Set('_cl_color', playercolor);
-    if (CL.cls.state === Def.clientConnectionState.connected) {
-      this.forward();
+      const [classname] = gamestate.edicts[i];
+      console.assert(SV.server.gameAPI.prepareEntity(edict, classname), 'no entity for classname');
     }
-    return;
-  }
 
-  if (!this.client) {
-    return;
-  }
+    // second run we can start deserializing
+    for (let i = 0; i < SV.server.edicts.length; i++) {
+      const edict = SV.server.edicts[i];
 
-  this.client.colors = playercolor;
-  this.client.edict.entity.team = bottom + 1;
-  const msg = SV.server.reliable_datagram;
-  msg.writeByte(Protocol.svc.updatecolors);
-  msg.writeByte(this.client.num);
-  msg.writeByte(playercolor);
-};
-
-Host.Kill_f = function() {
-  if (this.forward()) {
-    return;
-  }
+      if (edict.isFree()) { // freed edict
+        continue;
+      }
 
-  const client = this.client;
-  if (client.edict.entity.health <= 0.0) {
-    Host.ClientPrint(client, 'Can\'t suicide -- already dead!\n');
-    return;
-  }
+      const [, data] = gamestate.edicts[i];
+      edict.entity.deserialize(data);
+      edict.linkEdict();
+    }
 
-  SV.server.gameAPI.time = SV.server.time;
-  SV.server.gameAPI.ClientKill(client.edict);
-};
+    SV.server.time = gamestate.time;
 
-Host.Pause_f = function() {
-  if (this.forward()) {
-    return;
-  }
+    const client = SV.svs.clients[0];
+    client.spawn_parms = gamestate.spawn_parms;
 
-  const client = this.client;
+    ClientLifecycle.resumeGame(gamestate.clientdata, gamestate.particles);
+  };
 
-  if (Host.pausable.value === 0) {
-    Host.ClientPrint(client, 'Pause not allowed.\n');
-    return;
-  }
-  SV.server.paused = !SV.server.paused;
-  Host.BroadcastPrint(client.name + (SV.server.paused === true ? ' paused the game\n' : ' unpaused the game\n'));
-  SV.server.reliable_datagram.writeByte(Protocol.svc.setpause);
-  SV.server.reliable_datagram.writeByte(SV.server.paused === true ? 1 : 0);
-};
-
-Host.PreSpawn_f = function() { // signon 1, step 1
-  if (!this.client) {
-    Con.Print('prespawn is not valid from the console\n');
-    return;
-  }
-  Con.DPrint(`Host.PreSpawn_f: ${this.client}\n`);
-  const client = this.client;
-  if (client.state === ServerClient.STATE.SPAWNED) {
-    Con.Print('prespawn not valid -- already spawned\n');
-    return;
-  }
-  // CR: SV.server.signon is a special buffer that is used to send the signon messages (make static as well as baseline information)
-  client.message.write(new Uint8Array(SV.server.signon.data), SV.server.signon.cursize);
-  client.message.writeByte(Protocol.svc.signonnum);
-  client.message.writeByte(2);
-};
-
-Host.Spawn_f = function() { // signon 2, step 3
-  Con.DPrint(`Host.Spawn_f: ${this.client}\n`);
-  if (!this.client) {
-    Con.Print('spawn is not valid from the console\n');
-    return;
-  }
-  let client = this.client;
-  if (client.state === ServerClient.STATE.SPAWNED) {
-    Con.Print('Spawn not valid -- already spawned\n');
-    return;
-  }
+  static Name_f(...names) { // signon 2, step 1
+    Con.DPrint(`Host.Name_f: ${this.client}\n`);
+    if (names.length < 1) {
+      Con.Print('"name" is "' + CL.name.string + '"\n');
+      return;
+    }
 
-  const message = client.message;
-  message.clear();
-
-  message.writeByte(Protocol.svc.time);
-  message.writeFloat(SV.server.time);
-
-  const ent = client.edict;
-  if (SV.server.loadgame === true) {
-    SV.server.paused = false;
-  } else {
-    // ent.clear(); // FIXME: there’s a weird edge case
-    SV.server.gameAPI.prepareEntity(ent, 'player', {
-      netname: client.name,
-      colormap: ent.num, // the num, not the entity
-      team: (client.colors & 15) + 1,
-    });
+    if (!SV.server.active) { // ???
+      return;
+    }
 
-    // load in spawn parameters (legacy)
-    if (SV.server.gameCapabilities.includes(gameCapabilities.CAP_SPAWNPARMS_LEGACY)) {
-      for (let i = 0; i <= 15; i++) {
-        SV.server.gameAPI[`parm${i + 1}`] = client.spawn_parms[i];
+    let newName = names.join(' ').trim().substring(0, 15);
+
+    if (!registry.isDedicatedServer && !this.client) {
+      Cvar.Set('_cl_name', newName);
+      if (CL.cls.state === Def.clientConnectionState.connected) {
+        this.forward();
       }
+      return;
     }
 
-    // load in spawn parameters
-    if (SV.server.gameCapabilities.includes(gameCapabilities.CAP_SPAWNPARMS_DYNAMIC)) {
-      ent.entity.restoreSpawnParameters(client.spawn_parms);
+    if (!this.client) {
+      return;
     }
 
-    // call the spawn function
-    SV.server.gameAPI.time = SV.server.time;
-    SV.server.gameAPI.ClientConnect(ent);
-
-    // actually spawn the player
-    SV.server.gameAPI.time = SV.server.time;
-    SV.server.gameAPI.PutClientInServer(ent);
-  }
+    const initialNewName = newName;
+    let newNameCounter = 2;
 
-  for (let i = 0; i < SV.svs.maxclients; i++) {
-    client = SV.svs.clients[i];
-    message.writeByte(Protocol.svc.updatename);
-    message.writeByte(i);
-    message.writeString(client.name);
-    message.writeByte(Protocol.svc.updatefrags);
-    message.writeByte(i);
-    message.writeShort(client.old_frags);
-    message.writeByte(Protocol.svc.updatecolors);
-    message.writeByte(i);
-    message.writeByte(client.colors);
-  }
+    // make sure we have a somewhat unique name
+    while (SV.FindClientByName(newName)) {
+      newName = `${initialNewName}${newNameCounter++}`;
+    }
 
-  for (let i = 0; i < Def.limits.lightstyles; i++) {
-    message.writeByte(Protocol.svc.lightstyle);
-    message.writeByte(i);
-    message.writeString(SV.server.lightstyles[i]);
-  }
+    const name = this.client.name;
+    if (registry.isDedicatedServer && name && (name.length !== 0) && (name !== 'unconnected') && (name !== newName)) {
+      Con.Print(name + ' renamed to ' + newName + '\n');
+    }
 
-  if (SV.server.gameCapabilities.includes(gameCapabilities.CAP_CLIENTDATA_UPDATESTAT)) {
-    message.writeByte(Protocol.svc.updatestat);
-    message.writeByte(Def.stat.totalsecrets);
-    message.writeLong(SV.server.gameAPI.total_secrets);
-    message.writeByte(Protocol.svc.updatestat);
-    message.writeByte(Def.stat.totalmonsters);
-    message.writeLong(SV.server.gameAPI.total_monsters);
-    message.writeByte(Protocol.svc.updatestat);
-    message.writeByte(Def.stat.secrets);
-    message.writeLong(SV.server.gameAPI.found_secrets);
-    message.writeByte(Protocol.svc.updatestat);
-    message.writeByte(Def.stat.monsters);
-    message.writeLong(SV.server.gameAPI.killed_monsters);
-  }
+    this.client.name = newName;
+    const msg = SV.server.reliable_datagram;
+    msg.writeByte(Protocol.svc.updatename);
+    msg.writeByte(this.client.num);
+    msg.writeString(newName);
+  };
 
-  message.writeByte(Protocol.svc.setangle);
-  message.writeAngleVector(ent.entity.angles);
+  static Say_f(teamonly, message) {
+    if (this.forward()) {
+      return;
+    }
 
-  SV.messages.writeClientdataToMessage(client, message);
+    if (!message) {
+      return;
+    }
 
-  message.writeByte(Protocol.svc.signonnum);
-  message.writeByte(3);
-};
+    const sender = this.client;
 
-Host.Begin_f = function() {  // signon 3, step 1
-  Con.DPrint(`Host.Begin_f: ${this.client}\n`);
-  if (!this.client) {
-    Con.Print('begin is not valid from the console\n');
-    return;
-  }
+    if (message.length > 140) {
+      message = message.substring(0, 140) + '...';
+    }
 
-  // Send all portal states before the client is offically spawned and gets updates incrementally
-  const areaPortals = SV.server.worldmodel.areaPortals;
+    for (let i = 0; i < SV.svs.maxclients; i++) {
+      const client = SV.svs.clients[i];
+      if (client.state < ServerClient.STATE.CONNECTED) {
+        continue;
+      }
+      if ((Host.teamplay.value !== 0) && (teamonly === true) && (client.entity.team !== sender.entity.team)) { // Legacy cvars
+        continue;
+      }
+      Host.SendChatMessageToClient(client, sender.name, message, false);
+    }
 
-  for (let p = 0; p < areaPortals.numPortals; p++) {
-    this.client.message.writeByte(Protocol.svc.setportalstate);
-    this.client.message.writeShort(p);
-    this.client.message.writeByte(areaPortals.isPortalOpen(p) ? 1 : 0);
-  }
+    Con.Print(`${sender.name}: ${message}\n`);
+  };
 
-  this.client.state = ServerClient.STATE.SPAWNED;
+  static Say_Team_f(message) {
+    Host.Say_f.call(this, true, message);
+  };
 
-  if (SV.server.gameAPI.ClientBegin) {
-    SV.server.gameAPI.time = SV.server.time;
-    SV.server.gameAPI.ClientBegin(this.client.edict);
-  }
-};
+  static Say_All_f(message) {
+    Host.Say_f.call(this, false, message);
+  };
 
-Host.Kick_f = function() {
-  const argv = this.argv;
-  if (!this.client) {
-    if (!SV.server.active) {
-      this.forward();
+  static Tell_f(recipient, message) {
+    if (this.forward()) {
       return;
     }
-  }
-  if (argv.length < 2) {
-    return;
-  }
-  const s = argv[1].toLowerCase();
-  const invokingClient = this.client;
-  let i; let byNumber = false;
-  let targetClient = /** @type {ServerClient | null} */ (null);
-
-  if ((argv.length >= 3) && (s === '#')) {
-    i = Q.atoi(argv[2]) - 1;
-    if ((i < 0) || (i >= SV.svs.maxclients)) {
+
+    if (!recipient || !message) {
+      Con.Print('Usage: tell <recipient> <message>\n');
       return;
     }
-    if (SV.svs.clients[i].state !== ServerClient.STATE.SPAWNED) {
-      return;
+
+    message = message.trim();
+
+    // Remove surrounding double quotes if present
+    if (message.startsWith('"')) {
+      message = message.slice(1, -1);
     }
-    targetClient = SV.svs.clients[i];
-    byNumber = true;
-  } else {
-    for (i = 0; i < SV.svs.maxclients; i++) {
+    if (message.length > 140) {
+      message = message.substring(0, 140) + '...';
+    }
+
+    const sender = this.client;
+    for (let i = 0; i < SV.svs.maxclients; i++) {
       const client = SV.svs.clients[i];
       if (client.state < ServerClient.STATE.CONNECTED) {
         continue;
       }
-      if (client.name.toLowerCase() === s) {
-        targetClient = client;
-        break;
+      if (client.name.toLowerCase() !== recipient.toLowerCase()) {
+        continue;
       }
+      Host.SendChatMessageToClient(client, sender.name, message, true);
+      Host.SendChatMessageToClient(sender, sender.name, message, true);
+      break;
     }
-  }
-  if (targetClient === null) {
-    return;
-  }
-  if (targetClient === invokingClient) {
-    return;
-  }
-  let who;
-  if (!invokingClient) {
-    if (registry.isDedicatedServer) {
-      who = NET.hostname.string;
+  };
+
+  static Color_f(...argv) { // signon 2, step 2
+    Con.DPrint(`Host.Color_f: ${this.client}\n`);
+    if (argv.length <= 1) {
+      Con.Print('"color" is "' + (CL.color.value >> 4) + ' ' + (CL.color.value & 15) + '"\ncolor <0-13> [0-13]\n');
+      return;
+    }
+
+    let top; let bottom;
+    if (argv.length === 2) {
+      top = bottom = (Q.atoi(argv[1]) & 15) >>> 0;
     } else {
-      who = CL.name.string;
+      top = (Q.atoi(argv[1]) & 15) >>> 0;
+      bottom = (Q.atoi(argv[2]) & 15) >>> 0;
     }
-  } else {
-    who = invokingClient.name;
-  }
-  let message;
-  if (argv.length >= 3) {
-    message = COM.Parse(this.args);
-  }
-  let dropReason = 'Kicked by ' + who;
-  if (message.data !== null) {
-    let p = 0;
-    if (byNumber) {
-      p++;
-      for (; p < message.data.length; p++) {
-        if (message.data.charCodeAt(p) !== 32) {
-          break;
-        }
-      }
-      p += argv[2].length;
+    if (top >= 14) {
+      top = 13;
     }
-    for (; p < message.data.length; p++) {
-      if (message.data.charCodeAt(p) !== 32) {
-        break;
+    if (bottom >= 14) {
+      bottom = 13;
+    }
+    const playercolor = (top << 4) + bottom;
+
+    if (!registry.isDedicatedServer && !this.client) {
+      Cvar.Set('_cl_color', playercolor);
+      if (CL.cls.state === Def.clientConnectionState.connected) {
+        this.forward();
       }
+      return;
+    }
+
+    if (!this.client) {
+      return;
     }
-    dropReason = 'Kicked by ' + who + ': ' + message.data.substring(p);
-  }
-  Host.DropClient(targetClient, false, dropReason);
-};
 
-Host.Give_f = class extends HostConsoleCommand { // TODO: move to game
-  run(classname) {
-    // CR:  unsure if I want a “give item_shells” approach or
-    //      if I want to push this piece of code into PR/PF and let
-    //      the game handle this instead
+    this.client.colors = playercolor;
+    this.client.edict.entity.team = bottom + 1;
+    const msg = SV.server.reliable_datagram;
+    msg.writeByte(Protocol.svc.updatecolors);
+    msg.writeByte(this.client.num);
+    msg.writeByte(playercolor);
+  };
 
+  static Kill_f() {
     if (this.forward()) {
       return;
     }
 
-    if (this.cheat()) {
+    const client = this.client;
+    if (client.edict.entity.health <= 0.0) {
+      Host.ClientPrint(client, 'Can\'t suicide -- already dead!\n');
       return;
     }
 
-    const client = this.client;
+    SV.server.gameAPI.time = SV.server.time;
+    SV.server.gameAPI.ClientKill(client.edict);
+  };
 
-    if (!classname) {
-      Host.ClientPrint(client, 'give <classname>\n');
+  static Pause_f() {
+    if (this.forward()) {
       return;
     }
 
-    const player = client.edict;
+    const client = this.client;
 
-    if (!classname.startsWith('item_') && !classname.startsWith('weapon_')) {
-      Host.ClientPrint(client, 'Only entity classes item_* and weapon_* are allowed!\n');
+    if (Host.pausable.value === 0) {
+      Host.ClientPrint(client, 'Pause not allowed.\n');
       return;
     }
+    SV.server.paused = !SV.server.paused;
+    Host.BroadcastPrint(client.name + (SV.server.paused === true ? ' paused the game\n' : ' unpaused the game\n'));
+    SV.server.reliable_datagram.writeByte(Protocol.svc.setpause);
+    SV.server.reliable_datagram.writeByte(SV.server.paused === true ? 1 : 0);
+  };
 
-    // wait for the next server frame
-    SV.ScheduleGameCommand(() => {
-      const { forward } = player.entity.v_angle.angleVectors();
+  static PreSpawn_f() { // signon 1, step 1
+    if (!this.client) {
+      Con.Print('prespawn is not valid from the console\n');
+      return;
+    }
+    Con.DPrint(`Host.PreSpawn_f: ${this.client}\n`);
+    const client = this.client;
+    if (client.state === ServerClient.STATE.SPAWNED) {
+      Con.Print('prespawn not valid -- already spawned\n');
+      return;
+    }
+    // CR: SV.server.signon is a special buffer that is used to send the signon messages (make static as well as baseline information)
+    client.message.write(new Uint8Array(SV.server.signon.data), SV.server.signon.cursize);
+    client.message.writeByte(Protocol.svc.signonnum);
+    client.message.writeByte(2);
+  };
 
-      const start = player.entity.origin;
-      const end = forward.copy().multiply(64.0).add(start);
+  static Spawn_f() { // signon 2, step 3
+    Con.DPrint(`Host.Spawn_f: ${this.client}\n`);
+    if (!this.client) {
+      Con.Print('spawn is not valid from the console\n');
+      return;
+    }
+    let client = this.client;
+    if (client.state === ServerClient.STATE.SPAWNED) {
+      Con.Print('Spawn not valid -- already spawned\n');
+      return;
+    }
 
-      const mins = new Vector(-16.0, -16.0, -24.0);
-      const maxs = new Vector(16.0, 16.0, 32.0);
+    const message = client.message;
+    message.clear();
 
-      const trace = ServerEngineAPI.Traceline(start, end, false, player, mins, maxs);
+    message.writeByte(Protocol.svc.time);
+    message.writeFloat(SV.server.time);
 
-      const origin = trace.point.subtract(forward.multiply(16.0)).add(new Vector(0.0, 0.0, 16.0));
+    const ent = client.edict;
+    if (SV.server.loadgame === true) {
+      SV.server.paused = false;
+    } else {
+      // ent.clear(); // FIXME: there’s a weird edge case
+      SV.server.gameAPI.prepareEntity(ent, 'player', {
+        netname: client.name,
+        colormap: ent.num, // the num, not the entity
+        team: (client.colors & 15) + 1,
+      });
 
-      if (![content.CONTENT_EMPTY, content.CONTENT_WATER].includes(ServerEngineAPI.DetermineStaticWorldContents(origin))) {
-        Host.ClientPrint(client, 'Item would spawn out of world!\n');
-        return;
+      // load in spawn parameters (legacy)
+      if (SV.server.gameCapabilities.includes(gameCapabilities.CAP_SPAWNPARMS_LEGACY)) {
+        for (let i = 0; i <= 15; i++) {
+          SV.server.gameAPI[`parm${i + 1}`] = client.spawn_parms[i];
+        }
       }
 
-      ServerEngineAPI.SpawnEntity(classname, {
-        origin,
-      });
-    });
-  }
-};
-
-Host.FindViewthing = function() {
-  if (SV.server.active) {
-    for (let i = 0; i < SV.server.num_edicts; i++) {
-      const e = SV.server.edicts[i];
-      if (!e.isFree() && e.entity.classname === 'viewthing') {
-        return e;
+      // load in spawn parameters
+      if (SV.server.gameCapabilities.includes(gameCapabilities.CAP_SPAWNPARMS_DYNAMIC)) {
+        ent.entity.restoreSpawnParameters(client.spawn_parms);
       }
+
+      // call the spawn function
+      SV.server.gameAPI.time = SV.server.time;
+      SV.server.gameAPI.ClientConnect(ent);
+
+      // actually spawn the player
+      SV.server.gameAPI.time = SV.server.time;
+      SV.server.gameAPI.PutClientInServer(ent);
     }
-  }
-  Con.Print('No viewthing on map\n');
-  return null;
-};
-
-Host.Viewmodel_f = async function(model) {
-  if (model === undefined) {
-    Con.Print('Usage: viewmodel <model>\n');
-    return;
-  }
-  const ent = Host.FindViewthing();
-  if (ent) {
-    return;
-  }
-  const m = await Mod.ForNameAsync(model, false, Mod.scope.client);
-  if (!m) {
-    Con.Print('Can\'t load ' + model + '\n');
-    return;
-  }
-  ent.entity.frame = 0;
-  CL.state.model_precache[ent.entity.modelindex] = m;
-};
-
-Host.Viewframe_f = function(frame) {
-  if (frame === undefined) {
-    Con.Print('Usage: viewframe <frame>\n');
-    return;
-  }
-  const ent = Host.FindViewthing();
-  if (!ent) {
-    return;
-  }
-  const m = CL.state.model_precache[ent.entity.modelindex >> 0];
-  let f = Q.atoi(frame);
-  if (f >= m.frames.length) {
-    f = m.frames.length - 1;
-  }
-  ent.entity.frame = f;
-};
 
-Host.Viewnext_f = function() {
-  const ent = Host.FindViewthing();
-  if (!ent) {
-    return;
-  }
-  const m = CL.state.model_precache[ent.entity.modelindex >> 0];
-  let f = (ent.entity.frame >> 0) + 1;
-  if (f >= m.frames.length) {
-    f = m.frames.length - 1;
-  }
-  ent.entity.frame = f;
-  Con.Print('frame ' + f + ': ' + m.frames[f].name + '\n');
-};
-
-Host.Viewprev_f = function() {
-  const ent = Host.FindViewthing();
-  if (!ent) {
-    return;
-  }
-  const m = CL.state.model_precache[ent.entity.modelindex >> 0];
-  let f = (ent.entity.frame >> 0) - 1;
-  if (f < 0) {
-    f = 0;
-  }
-  ent.entity.frame = f;
-  Con.Print('frame ' + f + ': ' + m.frames[f].name + '\n');
-};
+    for (let i = 0; i < SV.svs.maxclients; i++) {
+      client = SV.svs.clients[i];
+      message.writeByte(Protocol.svc.updatename);
+      message.writeByte(i);
+      message.writeString(client.name);
+      message.writeByte(Protocol.svc.updatefrags);
+      message.writeByte(i);
+      message.writeShort(client.old_frags);
+      message.writeByte(Protocol.svc.updatecolors);
+      message.writeByte(i);
+      message.writeByte(client.colors);
+    }
 
-Host.InitCommands = function() {
-  if (registry.isDedicatedServer) { // TODO: move this to a dedicated stub for IN
-    Cmd.AddCommand('bind', () => {});
-    Cmd.AddCommand('unbind', () => {});
-    Cmd.AddCommand('unbindall', () => {});
+    for (let i = 0; i < Def.limits.lightstyles; i++) {
+      message.writeByte(Protocol.svc.lightstyle);
+      message.writeByte(i);
+      message.writeString(SV.server.lightstyles[i]);
+    }
 
-    Cmd.AddCommand('disconnect', Host.Disconnect_f);
-  }
+    if (SV.server.gameCapabilities.includes(gameCapabilities.CAP_CLIENTDATA_UPDATESTAT)) {
+      message.writeByte(Protocol.svc.updatestat);
+      message.writeByte(Def.stat.totalsecrets);
+      message.writeLong(SV.server.gameAPI.total_secrets);
+      message.writeByte(Protocol.svc.updatestat);
+      message.writeByte(Def.stat.totalmonsters);
+      message.writeLong(SV.server.gameAPI.total_monsters);
+      message.writeByte(Protocol.svc.updatestat);
+      message.writeByte(Def.stat.secrets);
+      message.writeLong(SV.server.gameAPI.found_secrets);
+      message.writeByte(Protocol.svc.updatestat);
+      message.writeByte(Def.stat.monsters);
+      message.writeLong(SV.server.gameAPI.killed_monsters);
+    }
 
-  Cmd.AddCommand('status', Host.Status_f);
-  Cmd.AddCommand('quit', Host.Quit_f);
-  Cmd.AddCommand('god', Host.God_f);
-  Cmd.AddCommand('notarget', Host.Notarget_f);
-  Cmd.AddCommand('fly', Host.Fly_f);
-  Cmd.AddCommand('map', Host.Map_f);
-  Cmd.AddCommand('restart', Host.Restart_f);
-  Cmd.AddCommand('changelevel', Host.Changelevel_f);
-  Cmd.AddCommand('connect', Host.Connect_f);
-  Cmd.AddCommand('reconnect', Host.Reconnect_f);
-  Cmd.AddCommand('name', Host.Name_f);
-  Cmd.AddCommand('noclip', Host.Noclip_f);
-  Cmd.AddCommand('say', Host.Say_All_f);
-  Cmd.AddCommand('say_team', Host.Say_Team_f);
-  Cmd.AddCommand('tell', Host.Tell_f);
-  Cmd.AddCommand('color', Host.Color_f);
-  Cmd.AddCommand('kill', Host.Kill_f);
-  Cmd.AddCommand('pause', Host.Pause_f);
-  Cmd.AddCommand('spawn', Host.Spawn_f);
-  Cmd.AddCommand('begin', Host.Begin_f);
-  Cmd.AddCommand('prespawn', Host.PreSpawn_f);
-  Cmd.AddCommand('kick', Host.Kick_f);
-  Cmd.AddCommand('ping', Host.Ping_f);
-  if (!registry.isDedicatedServer) {
-    Cmd.AddCommand('load', Host.Loadgame_f);
-    Cmd.AddCommand('save', Host.Savegame_f);
-  }
-  Cmd.AddCommand('give', Host.Give_f);
-  Cmd.AddCommand('viewmodel', Host.Viewmodel_f);
-  Cmd.AddCommand('viewframe', Host.Viewframe_f);
-  Cmd.AddCommand('viewnext', Host.Viewnext_f);
-  Cmd.AddCommand('viewprev', Host.Viewprev_f);
-  // Cmd.AddCommand('mcache', Mod.Print);
-  Cmd.AddCommand('writeconfig', Host.WriteConfiguration_f);
-  Cmd.AddCommand('configready', Host.ConfigReady_f);
+    message.writeByte(Protocol.svc.setangle);
+    message.writeAngleVector(ent.entity.angles);
+
+    SV.messages.writeClientdataToMessage(client, message);
+
+    message.writeByte(Protocol.svc.signonnum);
+    message.writeByte(3);
+  };
 
-  Cmd.AddCommand('error', class extends ConsoleCommand {
-    run(message) {
-      throw new HostError(message);
+  static Begin_f() {  // signon 3, step 1
+    Con.DPrint(`Host.Begin_f: ${this.client}\n`);
+    if (!this.client) {
+      Con.Print('begin is not valid from the console\n');
+      return;
     }
-  });
 
-  Cmd.AddCommand('fatalerror', class extends ConsoleCommand {
-    run(message) {
-      throw new Error(message);
+    // Send all portal states before the client is offically spawned and gets updates incrementally
+    const areaPortals = SV.server.worldmodel.areaPortals;
+
+    for (let p = 0; p < areaPortals.numPortals; p++) {
+      this.client.message.writeByte(Protocol.svc.setportalstate);
+      this.client.message.writeShort(p);
+      this.client.message.writeByte(areaPortals.isPortalOpen(p) ? 1 : 0);
     }
-  });
 
-  Cmd.AddCommand('eb_topics', class extends ConsoleCommand {
-    run() {
-      // TODO: do not allow this command when server is having cheats disabled
+    this.client.state = ServerClient.STATE.SPAWNED;
 
-      for (const topic of eventBus.topics.sort()) {
-        Con.Print(topic + '\n');
+    if (SV.server.gameAPI.ClientBegin) {
+      SV.server.gameAPI.time = SV.server.time;
+      SV.server.gameAPI.ClientBegin(this.client.edict);
+    }
+  };
+
+  static Kick_f() {
+    const argv = this.argv;
+    if (!this.client) {
+      if (!SV.server.active) {
+        this.forward();
+        return;
       }
     }
-  });
+    if (argv.length < 2) {
+      return;
+    }
+    const s = argv[1].toLowerCase();
+    const invokingClient = this.client;
+    let i; let byNumber = false;
+    let targetClient = /** @type {ServerClient | null} */ (null);
 
-  Cmd.AddCommand('eb_publish', class extends ConsoleCommand {
-    run(eventName, ...args) {
-      // TODO: do not allow this command when server is having cheats disabled
+    if ((argv.length >= 3) && (s === '#')) {
+      i = Q.atoi(argv[2]) - 1;
+      if ((i < 0) || (i >= SV.svs.maxclients)) {
+        return;
+      }
+      if (SV.svs.clients[i].state !== ServerClient.STATE.SPAWNED) {
+        return;
+      }
+      targetClient = SV.svs.clients[i];
+      byNumber = true;
+    } else {
+      for (i = 0; i < SV.svs.maxclients; i++) {
+        const client = SV.svs.clients[i];
+        if (client.state < ServerClient.STATE.CONNECTED) {
+          continue;
+        }
+        if (client.name.toLowerCase() === s) {
+          targetClient = client;
+          break;
+        }
+      }
+    }
+    if (targetClient === null) {
+      return;
+    }
+    if (targetClient === invokingClient) {
+      return;
+    }
+    let who;
+    if (!invokingClient) {
+      if (registry.isDedicatedServer) {
+        who = NET.hostname.string;
+      } else {
+        who = CL.name.string;
+      }
+    } else {
+      who = invokingClient.name;
+    }
+    let message;
+    if (argv.length >= 3) {
+      message = COM.Parse(this.args);
+    }
+    let dropReason = 'Kicked by ' + who;
+    if (message.data !== null) {
+      let p = 0;
+      if (byNumber) {
+        p++;
+        for (; p < message.data.length; p++) {
+          if (message.data.charCodeAt(p) !== 32) {
+            break;
+          }
+        }
+        p += argv[2].length;
+      }
+      for (; p < message.data.length; p++) {
+        if (message.data.charCodeAt(p) !== 32) {
+          break;
+        }
+      }
+      dropReason = 'Kicked by ' + who + ': ' + message.data.substring(p);
+    }
+    Host.DropClient(targetClient, false, dropReason);
+  };
+
+  static Give_f = class extends HostConsoleCommand { // TODO: move to game
+    run(classname) {
+      // CR:  unsure if I want a “give item_shells” approach or
+      //      if I want to push this piece of code into PR/PF and let
+      //      the game handle this instead
+
+      if (this.forward()) {
+        return;
+      }
+
+      if (this.cheat()) {
+        return;
+      }
 
-      if (!eventName) {
-        Con.Print(`Usage: ${this.command} <eventName> [args...]\n`);
+      const client = this.client;
+
+      if (!classname) {
+        Host.ClientPrint(client, 'give <classname>\n');
         return;
       }
 
-      if (!eventBus.topics.includes(eventName)) {
-        Con.PrintError(`No such event topic: ${eventName}\n`);
+      const player = client.edict;
+
+      if (!classname.startsWith('item_') && !classname.startsWith('weapon_')) {
+        Host.ClientPrint(client, 'Only entity classes item_* and weapon_* are allowed!\n');
         return;
       }
 
-      eventBus.publish(eventName, ...args);
+      // wait for the next server frame
+      SV.ScheduleGameCommand(() => {
+        const { forward } = player.entity.v_angle.angleVectors();
+
+        const start = player.entity.origin;
+        const end = forward.copy().multiply(64.0).add(start);
+
+        const mins = new Vector(-16.0, -16.0, -24.0);
+        const maxs = new Vector(16.0, 16.0, 32.0);
+
+        const trace = ServerEngineAPI.Traceline(start, end, false, player, mins, maxs);
+
+        const origin = trace.point.subtract(forward.multiply(16.0)).add(new Vector(0.0, 0.0, 16.0));
+
+        if (![content.CONTENT_EMPTY, content.CONTENT_WATER].includes(ServerEngineAPI.DetermineStaticWorldContents(origin))) {
+          Host.ClientPrint(client, 'Item would spawn out of world!\n');
+          return;
+        }
+
+        ServerEngineAPI.SpawnEntity(classname, {
+          origin,
+        });
+      });
+    }
+  };
+
+  static FindViewthing() {
+    if (SV.server.active) {
+      for (let i = 0; i < SV.server.num_edicts; i++) {
+        const e = SV.server.edicts[i];
+        if (!e.isFree() && e.entity.classname === 'viewthing') {
+          return e;
+        }
+      }
+    }
+    Con.Print('No viewthing on map\n');
+    return null;
+  };
+
+  static async Viewmodel_f(model) {
+    if (model === undefined) {
+      Con.Print('Usage: viewmodel <model>\n');
+      return;
+    }
+    const ent = Host.FindViewthing();
+    if (ent) {
+      return;
+    }
+    const m = await Mod.ForNameAsync(model, false, Mod.scope.client);
+    if (!m) {
+      Con.Print('Can\'t load ' + model + '\n');
+      return;
+    }
+    ent.entity.frame = 0;
+    CL.state.model_precache[ent.entity.modelindex] = m;
+  };
+
+  static Viewframe_f(frame) {
+    if (frame === undefined) {
+      Con.Print('Usage: viewframe <frame>\n');
+      return;
+    }
+    const ent = Host.FindViewthing();
+    if (!ent) {
+      return;
+    }
+    const m = CL.state.model_precache[ent.entity.modelindex >> 0];
+    let f = Q.atoi(frame);
+    if (f >= m.frames.length) {
+      f = m.frames.length - 1;
+    }
+    ent.entity.frame = f;
+  };
+
+  static Viewnext_f() {
+    const ent = Host.FindViewthing();
+    if (!ent) {
+      return;
     }
-  });
-};
+    const m = CL.state.model_precache[ent.entity.modelindex >> 0];
+    let f = (ent.entity.frame >> 0) + 1;
+    if (f >= m.frames.length) {
+      f = m.frames.length - 1;
+    }
+    ent.entity.frame = f;
+    Con.Print('frame ' + f + ': ' + m.frames[f].name + '\n');
+  };
+
+  static Viewprev_f() {
+    const ent = Host.FindViewthing();
+    if (!ent) {
+      return;
+    }
+    const m = CL.state.model_precache[ent.entity.modelindex >> 0];
+    let f = (ent.entity.frame >> 0) - 1;
+    if (f < 0) {
+      f = 0;
+    }
+    ent.entity.frame = f;
+    Con.Print('frame ' + f + ': ' + m.frames[f].name + '\n');
+  };
+
+  static InitCommands() {
+    if (registry.isDedicatedServer) { // TODO: move this to a dedicated stub for IN
+      Cmd.AddCommand('bind', () => {});
+      Cmd.AddCommand('unbind', () => {});
+      Cmd.AddCommand('unbindall', () => {});
+
+      Cmd.AddCommand('disconnect', Host.Disconnect_f);
+    }
+
+    Cmd.AddCommand('status', Host.Status_f);
+    Cmd.AddCommand('quit', Host.Quit_f);
+    Cmd.AddCommand('god', Host.God_f);
+    Cmd.AddCommand('notarget', Host.Notarget_f);
+    Cmd.AddCommand('fly', Host.Fly_f);
+    Cmd.AddCommand('map', Host.Map_f);
+    Cmd.AddCommand('restart', Host.Restart_f);
+    Cmd.AddCommand('changelevel', Host.Changelevel_f);
+    Cmd.AddCommand('connect', Host.Connect_f);
+    Cmd.AddCommand('reconnect', Host.Reconnect_f);
+    Cmd.AddCommand('name', Host.Name_f);
+    Cmd.AddCommand('noclip', Host.Noclip_f);
+    Cmd.AddCommand('say', Host.Say_All_f);
+    Cmd.AddCommand('say_team', Host.Say_Team_f);
+    Cmd.AddCommand('tell', Host.Tell_f);
+    Cmd.AddCommand('color', Host.Color_f);
+    Cmd.AddCommand('kill', Host.Kill_f);
+    Cmd.AddCommand('pause', Host.Pause_f);
+    Cmd.AddCommand('spawn', Host.Spawn_f);
+    Cmd.AddCommand('begin', Host.Begin_f);
+    Cmd.AddCommand('prespawn', Host.PreSpawn_f);
+    Cmd.AddCommand('kick', Host.Kick_f);
+    Cmd.AddCommand('ping', Host.Ping_f);
+    if (!registry.isDedicatedServer) {
+      Cmd.AddCommand('load', Host.Loadgame_f);
+      Cmd.AddCommand('save', Host.Savegame_f);
+    }
+    Cmd.AddCommand('give', Host.Give_f);
+    Cmd.AddCommand('viewmodel', Host.Viewmodel_f);
+    Cmd.AddCommand('viewframe', Host.Viewframe_f);
+    Cmd.AddCommand('viewnext', Host.Viewnext_f);
+    Cmd.AddCommand('viewprev', Host.Viewprev_f);
+    // Cmd.AddCommand('mcache', Mod.Print);
+    Cmd.AddCommand('writeconfig', Host.WriteConfiguration_f);
+    Cmd.AddCommand('configready', Host.ConfigReady_f);
+
+    Cmd.AddCommand('error', class extends ConsoleCommand {
+      run(message) {
+        throw new HostError(message);
+      }
+    });
+
+    Cmd.AddCommand('fatalerror', class extends ConsoleCommand {
+      run(message) {
+        throw new Error(message);
+      }
+    });
+
+    Cmd.AddCommand('eb_topics', class extends ConsoleCommand {
+      run() {
+        // TODO: do not allow this command when server is having cheats disabled
+
+        for (const topic of eventBus.topics.sort()) {
+          Con.Print(topic + '\n');
+        }
+      }
+    });
+
+    Cmd.AddCommand('eb_publish', class extends ConsoleCommand {
+      run(eventName, ...args) {
+        // TODO: do not allow this command when server is having cheats disabled
+
+        if (!eventName) {
+          Con.Print(`Usage: ${this.command} <eventName> [args...]\n`);
+          return;
+        }
+
+        if (!eventBus.topics.includes(eventName)) {
+          Con.PrintError(`No such event topic: ${eventName}\n`);
+          return;
+        }
+
+        eventBus.publish(eventName, ...args);
+      }
+    });
+  };
+}

From a2fd54b6d07e93903ec9772ae9270abf3c35356a Mon Sep 17 00:00:00 2001
From: Christian R <github@chrisnew.de>
Date: Thu, 2 Apr 2026 21:21:37 +0300
Subject: [PATCH 24/67] TS: common/Host

---
 source/engine/common/{Host.mjs => Host.ts} | 1319 +++++++++++---------
 source/engine/main-browser.mjs             |    2 +-
 source/engine/main-dedicated.mjs           |    2 +-
 source/engine/registry.mjs                 |    2 +-
 test/common/workers.test.mjs               |    2 +-
 5 files changed, 760 insertions(+), 567 deletions(-)
 rename source/engine/common/{Host.mjs => Host.ts} (54%)

diff --git a/source/engine/common/Host.mjs b/source/engine/common/Host.ts
similarity index 54%
rename from source/engine/common/Host.mjs
rename to source/engine/common/Host.ts
index a881584c..b3717966 100644
--- a/source/engine/common/Host.mjs
+++ b/source/engine/common/Host.ts
@@ -1,8 +1,20 @@
+/*
+ * Host: shared engine lifecycle coordinator for both browser and dedicated
+ * runtimes.
+ *
+ * Owns startup and shutdown sequencing, the main frame loop, server lifecycle
+ * transitions, and the classic host and gameplay console commands.
+ */
+
+/* eslint-disable jsdoc/require-returns */
+
+import type { ServerEdict } from '../server/Edict.mjs';
+
 import Cvar from './Cvar.ts';
 import * as Protocol from '../network/Protocol.ts';
 import * as Def from './Def.ts';
 import Cmd, { ConsoleCommand } from './Cmd.ts';
-import { eventBus, registry } from '../registry.mjs';
+import { eventBus, getClientRegistry, getCommonRegistry, registry } from '../registry.mjs';
 import Vector from '../../shared/Vector.ts';
 import Q from '../../shared/Q.ts';
 import { ServerClient } from '../server/Client.mjs';
@@ -16,104 +28,179 @@ import { content, gameCapabilities } from '../../shared/Defs.ts';
 import ClientLifecycle from '../client/ClientLifecycle.mjs';
 import { Pmove } from './Pmove.ts';
 
-
-let { CL, COM, Con, Draw, IN, Key, M, Mod, NET, PR, R, S, SCR, SV, Sbar, Sys, V } = registry;
+let { COM, Con, Mod, NET, PR, SV, Sys, V } = getCommonRegistry();
+let { CL, Draw, IN, Key, M, R, S, SCR, Sbar } = getClientRegistry();
 
 eventBus.subscribe('registry.frozen', () => {
-  CL = registry.CL;
-  COM = registry.COM;
-  Con = registry.Con;
-  Draw = registry.Draw;
-  IN = registry.IN;
-  Key = registry.Key;
-  M = registry.M;
-  Mod = registry.Mod;
-  NET = registry.NET;
-  PR = registry.PR;
-  R = registry.R;
-  S = registry.S;
-  SCR = registry.SCR;
-  SV = registry.SV;
-  Sbar = registry.Sbar;
-  Sys = registry.Sys;
-  V = registry.V;
+  ({ COM, Con, Mod, NET, PR, SV, Sys, V } = getCommonRegistry());
+  ({ CL, Draw, IN, Key, M, R, S, SCR, Sbar } = getClientRegistry());
 });
 
+type DeferredCallback = () => void | Promise<void>;
+interface ScheduledFutureEntry {
+  readonly time: number;
+  readonly callback: DeferredCallback;
+}
+type PrintFunction = (text: string) => void;
+type JsonValue = string | number | boolean | null | JsonValue[] | { [key: string]: JsonValue };
+type SavegameEdictEntry = [classname: string, data: JsonValue] | null;
+type SpawnParameters = ServerClient['spawn_parms'];
+type CrashLike =
+  | Error
+  | string
+  | null
+  | undefined
+  | {
+      readonly name?: string;
+      readonly message?: string;
+      readonly constructor?: { readonly name?: string };
+    };
+
+interface SavegameState {
+  readonly version: number;
+  readonly gameversion: string;
+  readonly comment: string | null;
+  readonly spawn_parms: SpawnParameters;
+  readonly mapname: string;
+  readonly time: number;
+  readonly lightstyles: string[];
+  readonly globals: JsonValue;
+  readonly cvars: Array<[name: string, value: string]>;
+  readonly clientdata: JsonValue | null;
+  readonly edicts: SavegameEdictEntry[];
+  readonly num_edicts: number;
+  readonly particles: JsonValue;
+}
+
+/** Extracts a display name from a CrashLike value. */
+function crashName(error: CrashLike): string {
+  if (error instanceof Error) {
+    return error.name;
+  }
+
+  if (typeof error === 'string') {
+    return 'Error';
+  }
+
+  return error?.name ?? error?.constructor?.name ?? 'Error';
+}
+
+/** Extracts a human-readable message from a CrashLike value. */
+function crashMessage(error: CrashLike): string {
+  if (error instanceof Error) {
+    return error.message;
+  }
+
+  if (typeof error === 'string') {
+    return error;
+  }
+
+  return error?.message ?? 'Unknown error';
+}
+
 class HostConsoleCommand extends ConsoleCommand {
   /**
-   * @protected
-   * @returns {boolean} true, if it’s a cheat and cannot be invoked
+   * Returns true when the command must abort because cheats are disabled.
    */
-  cheat() {
-    if (!SV.cheats.value) {
-      Host.ClientPrint(this.client, 'Cheats are not enabled on this server.\n');
-      return true;
+  cheat(): boolean {
+    if (SV.cheats.value) {
+      return false;
+    }
+
+    const client = this.client;
+
+    if (client !== null) {
+      Host.ClientPrint(client, 'Cheats are not enabled on this server.\n');
     }
 
-    return false;
+    return true;
   }
 }
 
+/**
+ * Host lifecycle singleton.
+ *
+ * Historically this module was a mutable namespace object. It now uses a real
+ * class with static state and methods so the engine can keep the existing
+ * `Host.X` call sites while gaining native TypeScript typing.
+ */
 export default class Host {
-  static developer = null;
-  static dedicated = null;
+  static developer: Cvar | null = null;
+  static dedicated: Cvar | null = null;
   static framecount = 0;
-  static framerate = null;
+  static framerate: Cvar | null = null;
   static frametime = 0.0;
   static initialized = false;
   static inerror = false;
   static isdown = false;
   static noclip_anglehack = false;
   static oldrealtime = 0.0;
-  static pausable = null;
+  static pausable: Cvar | null = null;
   static realtime = 0.0;
-  static refreshrate = null;
-  static speeds = null;
-  static teamplay = null;
-  static ticrate = null;
-  static version = null;
-
-  static EndGame(message) {
-    Con.PrintSuccess('Host.EndGame: ' + message + '\n');
+  static refreshrate: Cvar | null = null;
+  static speeds: Cvar | null = null;
+  static teamplay: Cvar | null = null;
+  static ticrate: Cvar | null = null;
+  static version: Cvar | null = null;
+
+  /** Callbacks that must run before the next frame body starts. */
+  static readonly _scheduledForNextFrame: DeferredCallback[] = [];
+
+  /** Named deferred tasks used to coalesce repeated requests. */
+  static readonly _scheduleInFuture = new Map<string, ScheduledFutureEntry>();
+
+  static #inHandleCrash = false;
+
+  static EndGame(message: string): void {
+    Con.PrintSuccess(`Host.EndGame: ${message}\n`);
+
     if (CL.cls.demonum !== -1) {
       CL.NextDemo();
-    } else {
-      CL.Disconnect();
-      M.Alert('Host.EndGame', message);
+      return;
     }
-  };
 
-  static Error(error) {
-    if (Host.inerror === true) {
+    CL.Disconnect();
+    M.Alert('Host.EndGame', message);
+  }
+
+  static Error(error: string): never | void {
+    if (Host.inerror) {
       throw new Error('throw new HostError: recursively entered');
     }
+
     Host.inerror = true;
+
     if (!registry.isDedicatedServer) {
       SCR.EndLoadingPlaque();
     }
-    Con.PrintError('Host Error: ' + error + '\n');
-    if (SV.server.active === true) {
+
+    Con.PrintError(`Host Error: ${error}\n`);
+
+    if (SV.server.active) {
       Host.ShutdownServer();
     }
+
     CL.Disconnect();
     CL.cls.demonum = -1;
     Host.inerror = false;
     M.Alert('Host Error', error);
-  };
+  }
 
-  static FindMaxClients() {
+  static FindMaxClients(): void {
     SV.svs.maxclients = 1;
     SV.svs.maxclientslimit = Def.limits.clients;
     SV.svs.clients.length = 0;
+
     if (!registry.isDedicatedServer) {
       CL.cls.state = Def.clientConnectionState.disconnected;
     }
-    for (let i = 0; i < SV.svs.maxclientslimit; i++) {
-      SV.svs.clients.push(new ServerClient(i));
+
+    for (let index = 0; index < SV.svs.maxclientslimit; index++) {
+      SV.svs.clients.push(new ServerClient(index));
     }
-  };
+  }
 
-  static InitLocal() {
+  static InitLocal(): void {
     const commitHash = registry.buildConfig?.commitHash;
     const version = commitHash ? `${Def.productVersion}+${commitHash}` : Def.productVersion;
 
@@ -131,48 +218,44 @@ export default class Host {
     /** @deprecated use registry.isDedicatedServer instead, this is only made available to the game code */
     Host.dedicated = new Cvar('dedicated', registry.isDedicatedServer ? '1' : '0', Cvar.FLAG.READONLY, 'Set to 1, if running in dedicated server mode.');
 
-    eventBus.subscribe('cvar.changed', (name) => {
+    eventBus.subscribe('cvar.changed', (name: string) => {
       const cvar = Cvar.FindVar(name);
 
-      // Automatically save when an archive Cvar changed
+      if (cvar === null) {
+        return;
+      }
+
+      // Automatically save when an archive Cvar changed.
       if ((cvar.flags & Cvar.FLAG.ARCHIVE) && Host.initialized) {
         Host.WriteConfiguration();
       }
     });
 
     Host.FindMaxClients();
-  };
+  }
 
-  static SendChatMessageToClient(client, name, message, direct = false) {
+  /** Sends a chat message packet to a single client. */
+  static SendChatMessageToClient(client: ServerClient, name: string, message: string, direct = false): void {
     client.message.writeByte(Protocol.svc.chatmsg);
     client.message.writeString(name);
     client.message.writeString(message);
     client.message.writeByte(direct ? 1 : 0);
-  };
+  }
 
-  /**
-   * @param {ServerClient} client recipient client
-   * @param {string} string text to send
-   */
-  static ClientPrint(client, string) {
+  /** Sends a plain print message to a single client. */
+  static ClientPrint(client: ServerClient, text: string): void {
     client.message.writeByte(Protocol.svc.print);
-    client.message.writeString(string);
-  };
+    client.message.writeString(text);
+  }
 
-  static BroadcastPrint(string) {
+  static BroadcastPrint(text: string): void {
     for (const client of SV.svs.spawnedClients()) {
       client.message.writeByte(Protocol.svc.print);
-      client.message.writeString(string);
+      client.message.writeString(text);
     }
-  };
+  }
 
-  /**
-   *
-   * @param {ServerClient} client
-   * @param {boolean} crash
-   * @param {string} reason
-   */
-  static DropClient(client, crash, reason) { // TODO: refactor into ServerClient
+  static DropClient(client: ServerClient, crash: boolean, reason: string): void { // TODO: refactor into ServerClient
     if (NET.CanSendMessage(client.netconnection)) {
       client.message.writeByte(Protocol.svc.disconnect);
       client.message.writeString(reason);
@@ -181,16 +264,20 @@ export default class Host {
 
     if (!crash) {
       if (client.edict && client.state === ServerClient.STATE.SPAWNED) {
-        const saveSelf = SV.server.gameAPI.self;
-        SV.server.gameAPI.ClientDisconnect(client.edict);
-        if (saveSelf !== undefined) {
-          SV.server.gameAPI.self = saveSelf;
+        const gameAPI = SV.server.gameAPI as typeof SV.server.gameAPI & { self?: ServerClient['edict'] };
+        const savedSelf = gameAPI.self;
+
+        gameAPI.ClientDisconnect(client.edict);
+
+        if (savedSelf !== undefined) {
+          gameAPI.self = savedSelf;
         }
       }
-      Sys.Print('Client ' + client.name + ' removed\n');
+
+      Sys.Print(`Client ${client.name} removed\n`);
     } else {
       client.state = ServerClient.STATE.DROPASAP;
-      Sys.Print('Client ' + client.name + ' dropped\n');
+      Sys.Print(`Client ${client.name} dropped\n`);
     }
 
     NET.Close(client.netconnection);
@@ -198,86 +285,100 @@ export default class Host {
     const { name, num } = client;
 
     client.clear();
-
     NET.activeconnections--;
 
     eventBus.publish('server.client.disconnected', num, name);
 
-    for (let i = 0; i < SV.svs.maxclients; i++) {
-      const client = SV.svs.clients[i];
-      if (client.state <= ServerClient.STATE.CONNECTED) {
+    for (let index = 0; index < SV.svs.maxclients; index++) {
+      const spawnedClient = SV.svs.clients[index];
+
+      if (spawnedClient.state <= ServerClient.STATE.CONNECTED) {
         continue;
       }
-      // FIXME: consolidate into a single message
-      client.message.writeByte(Protocol.svc.updatename);
-      client.message.writeByte(num);
-      client.message.writeByte(0);
-      client.message.writeByte(Protocol.svc.updatefrags);
-      client.message.writeByte(num);
-      client.message.writeShort(0);
-      client.message.writeByte(Protocol.svc.updatecolors);
-      client.message.writeByte(num);
-      client.message.writeByte(0);
-      client.message.writeByte(Protocol.svc.updatepings);
-      client.message.writeByte(num);
-      client.message.writeShort(0);
+
+      // FIXME: consolidate into a single message.
+      spawnedClient.message.writeByte(Protocol.svc.updatename);
+      spawnedClient.message.writeByte(num);
+      spawnedClient.message.writeByte(0);
+      spawnedClient.message.writeByte(Protocol.svc.updatefrags);
+      spawnedClient.message.writeByte(num);
+      spawnedClient.message.writeShort(0);
+      spawnedClient.message.writeByte(Protocol.svc.updatecolors);
+      spawnedClient.message.writeByte(num);
+      spawnedClient.message.writeByte(0);
+      spawnedClient.message.writeByte(Protocol.svc.updatepings);
+      spawnedClient.message.writeByte(num);
+      spawnedClient.message.writeShort(0);
     }
-  };
+  }
 
-  static ShutdownServer(isCrashShutdown = false) { // TODO: SV duties
-    if (SV.server.active !== true) {
+  static ShutdownServer(isCrashShutdown = false): void { // TODO: SV duties
+    if (!SV.server.active) {
       return;
     }
+
     eventBus.publish('server.shutting-down');
     SV.server.active = false;
+
     if (!registry.isDedicatedServer && CL.cls.state === Def.clientConnectionState.connected) {
       CL.Disconnect();
     }
-    const start = Sys.FloatTime(); let count; let i;
+
+    const start = Sys.FloatTime();
+    let count = 0;
+
     do {
       count = 0;
-      for (i = 0; i < SV.svs.maxclients; i++) { // FIXME: this 1is completely broken, it won’t properly close connections
-        const client = SV.svs.clients[i];
+
+      for (let index = 0; index < SV.svs.maxclients; index++) { // FIXME: this is completely broken, it won’t properly close connections
+        const client = SV.svs.clients[index];
+
         if (client.state < ServerClient.STATE.CONNECTED || client.message.cursize === 0) {
           continue;
         }
+
         if (NET.CanSendMessage(client.netconnection)) {
           NET.SendMessage(client.netconnection, client.message);
           client.message.clear();
           continue;
         }
+
         NET.GetMessage(client.netconnection);
         count++;
       }
-      if ((Sys.FloatTime() - start) > 3.0) { // this breaks a loop when the stuff on the top is stuck
+
+      if ((Sys.FloatTime() - start) > 3.0) {
         break;
       }
     } while (count !== 0);
-    for (i = 0; i < SV.svs.maxclients; i++) {
-      const client = SV.svs.clients[i];
+
+    for (let index = 0; index < SV.svs.maxclients; index++) {
+      const client = SV.svs.clients[index];
+
       if (client.state >= ServerClient.STATE.CONNECTED) {
         Host.DropClient(client, isCrashShutdown, 'Server shutting down');
       }
     }
+
     SV.ShutdownServer(isCrashShutdown);
     eventBus.publish('server.shutdown');
-  };
+  }
 
-  static ConfigReady_f() {
+  static ConfigReady_f(): void {
     eventBus.publish('host.config.loaded');
     Con.DPrint('Loaded configuration\n');
-  };
+  }
 
-  static WriteConfiguration() {
+  static WriteConfiguration(): void {
     Host.ScheduleInFuture('Host.WriteConfiguration', () => {
-      // never save a config during pending commands
+      // Never save a config during pending commands.
       if (Cmd.HasPendingCommands()) {
         Con.PrintWarning('Writing configuration dismissed, pending commands outstanding. Try again later.\n');
         return;
       }
 
       const config = `
-  ${(!registry.isDedicatedServer ? Key.WriteBindings() + '\n\n\n': '')}
+  ${!registry.isDedicatedServer ? `${Key.WriteBindings()}\n\n\n` : ''}
 
   ${Cvar.WriteVariables()}
 
@@ -286,37 +387,37 @@ export default class Host {
 
       COM.WriteTextFile('config.cfg', config);
       Con.DPrint('Wrote configuration\n');
-    }, 5.000);
-  };
+    }, 5.0);
+  }
 
-  static WriteConfiguration_f() {
+  static WriteConfiguration_f(): void {
     Con.Print('Writing configuration\n');
     Host.WriteConfiguration();
-  };
+  }
 
-  static ServerFrame() { // TODO: move to SV.ServerFrame
+  static ServerFrame(): void { // TODO: move to SV.ServerFrame
     SV.server.gameAPI.frametime = Host.frametime;
     SV.server.datagram.clear();
     SV.server.expedited_datagram.clear();
     SV.CheckForNewClients();
     SV.RunClients();
-    if ((SV.server.paused !== true) && ((SV.svs.maxclients >= 2) || (!registry.isDedicatedServer && Key.dest.value === Key.dest.game))) {
+
+    if (SV.server.paused !== true && (SV.svs.maxclients >= 2 || (!registry.isDedicatedServer && Key.dest.value === Key.dest.game))) {
       SV.physics.physics();
     }
+
     SV.RunScheduledGameCommands();
     SV.messages.sendClientMessages();
-  };
+  }
 
-  static _scheduledForNextFrame = [];
-  static ScheduleForNextFrame(callback) {
+  static ScheduleForNextFrame(callback: DeferredCallback): void {
     Host._scheduledForNextFrame.push(callback);
-  };
+  }
 
-  static _scheduleInFuture = new Map();
-  static ScheduleInFuture(name, callback, whenInSeconds) {
+  static ScheduleInFuture(name: string, callback: DeferredCallback, whenInSeconds: number): void {
     if (Host.isdown) {
-      // there’s no future when shutting down
-      callback();
+      // There’s no future when shutting down.
+      void callback();
       return;
     }
 
@@ -328,29 +429,33 @@ export default class Host {
       time: Host.realtime + whenInSeconds,
       callback,
     });
-  };
+  }
 
-  static async _Frame() {
+  static async _Frame(): Promise<void> {
     Host.realtime = Sys.FloatTime();
     Host.frametime = Host.realtime - Host.oldrealtime;
     Host.oldrealtime = Host.realtime;
-    if (Host.framerate.value > 0) {
+
+    if (Host.framerate !== null && Host.framerate.value > 0) {
       Host.frametime = Host.framerate.value;
-    } else {
-      if (Host.frametime > 0.1) {
-        Host.frametime = 0.1;
-      } else if (Host.frametime < 0.001) {
-        Host.frametime = 0.001;
-      }
+    } else if (Host.frametime > 0.1) {
+      Host.frametime = 0.1;
+    } else if (Host.frametime < 0.001) {
+      Host.frametime = 0.001;
     }
 
-    // check all scheduled things for the next frame
+    // Check all scheduled things for the next frame.
     while (Host._scheduledForNextFrame.length > 0) {
       const callback = Host._scheduledForNextFrame.shift();
+
+      if (callback === undefined) {
+        break;
+      }
+
       await callback();
     }
 
-    // check what’s scheduled in future
+    // Check what’s scheduled in the future.
     for (const [name, { time, callback }] of Host._scheduleInFuture.entries()) {
       if (time > Host.realtime) {
         continue;
@@ -363,22 +468,19 @@ export default class Host {
     if (registry.isDedicatedServer) {
       Cmd.Execute();
 
-      if (SV.server.active === true) {
-        if (Host.speeds.value !== 0) {
+      if (SV.server.active) {
+        if (Host.speeds !== null && Host.speeds.value !== 0) {
           console.profile('Host.ServerFrame');
         }
 
         Host.ServerFrame();
 
-        if (Host.speeds.value !== 0) {
+        if (Host.speeds !== null && Host.speeds.value !== 0) {
           console.profileEnd('Host.ServerFrame');
         }
       }
 
-      // TODO: add times
-
       Host.framecount++;
-
       return;
     }
 
@@ -394,51 +496,53 @@ export default class Host {
       CL.ReadFromServer();
     }
 
-    if (Host.speeds.value !== 0) {
+    if (Host.speeds !== null && Host.speeds.value !== 0) {
       console.profile('CL.ClientFrame');
     }
+
     CL.ClientFrame();
-    if (Host.speeds.value !== 0) {
+
+    if (Host.speeds !== null && Host.speeds.value !== 0) {
       console.profileEnd('CL.ClientFrame');
     }
 
     CL.SendCmd();
 
     if (SV.server.active && !SV.svs.changelevelIssued) {
-      if (Host.speeds.value !== 0) {
+      if (Host.speeds !== null && Host.speeds.value !== 0) {
         console.profile('Host.ServerFrame');
       }
 
       Host.ServerFrame();
 
-      if (Host.speeds.value !== 0) {
+      if (Host.speeds !== null && Host.speeds.value !== 0) {
         console.profileEnd('Host.ServerFrame');
       }
     }
 
-    // Set up prediction for other players
+    // Set up prediction for other players.
     CL.SetUpPlayerPrediction(false);
 
-    if (Host.speeds.value !== 0) {
+    if (Host.speeds !== null && Host.speeds.value !== 0) {
       console.profile('CL.PredictMove');
     }
 
-    // do client side motion prediction
+    // Do client-side motion prediction.
     CL.PredictMove();
 
-    if (Host.speeds.value !== 0) {
+    if (Host.speeds !== null && Host.speeds.value !== 0) {
       console.profileEnd('CL.PredictMove');
     }
 
-    // Set up prediction for other players
+    // Set up prediction for other players.
     CL.SetUpPlayerPrediction(true);
 
-    // build a refresh entity list
+    // Build a refresh entity list.
     CL.state.clientEntities.emit();
 
     SCR.UpdateScreen();
 
-    if (Host.speeds.value !== 0) {
+    if (Host.speeds !== null && Host.speeds.value !== 0) {
       console.profile('S.Update');
     }
 
@@ -447,48 +551,49 @@ export default class Host {
     } else {
       S.Update(Vector.origin, Vector.origin, Vector.origin, Vector.origin, false);
     }
+
     CDAudio.Update();
 
-    if (Host.speeds.value !== 0) {
+    if (Host.speeds !== null && Host.speeds.value !== 0) {
       console.profileEnd('S.Update');
     }
 
     Host.framecount++;
-  };
-
-  static #inHandleCrash = false;
+  }
 
-  // TODO: Sys.Init can handle a crash now since we are main looping without setInterval
-  static HandleCrash(e) {
-    if (e instanceof HostError) {
-      Host.Error(e.message);
+  // TODO: Sys.Init can handle a crash now since we are main looping without setInterval.
+  static HandleCrash(error: CrashLike): void {
+    if (error instanceof HostError) {
+      Host.Error(error.message);
       return;
     }
+
     if (Host.#inHandleCrash) {
-      console.error(e);
+      console.error(error);
       // eslint-disable-next-line no-debugger
       debugger;
       return;
     }
+
     Host.#inHandleCrash = true;
-    Con.PrintError((e.name ?? e.constructor.name) + ': ' + e.message + '\n');
-    eventBus.publish('host.crash', e);
+    Con.PrintError(`${crashName(error)}: ${crashMessage(error)}\n`);
+    eventBus.publish('host.crash', error);
     Sys.Quit();
-  };
+  }
 
-  static async Frame() {
+  static async Frame(): Promise<void> {
     if (Host.#inHandleCrash) {
       return;
     }
 
     try {
       await Host._Frame();
-    } catch (e) {
-      Host.HandleCrash(e);
+    } catch (error) {
+      Host.HandleCrash(error as CrashLike);
     }
-  };
+  }
 
-  static async Init() {
+  static async Init(): Promise<void> {
     Host.oldrealtime = Sys.FloatTime();
     Cmd.Init();
     Cvar.Init();
@@ -530,90 +635,94 @@ export default class Host {
       IN.Init();
     }
 
-    Cmd.text = 'exec better-quake.rc\n' + Cmd.text;
-
+    Cmd.text = `exec better-quake.rc\n${Cmd.text}`;
     // eslint-disable-next-line require-atomic-updates
     Host.initialized = true;
     Sys.Print('========Host Initialized=========\n');
 
     eventBus.publish('host.ready');
-  };
+  }
 
-  static Shutdown() {
-    if (Host.isdown === true) {
+  static Shutdown(): void {
+    if (Host.isdown) {
       Sys.Print('recursive shutdown\n');
       return;
     }
+
     eventBus.publish('host.shutting-down');
     Host.isdown = true;
     Host.WriteConfiguration();
+
     if (!registry.isDedicatedServer) {
       S.Shutdown();
       CDAudio.Shutdown();
     }
+
     NET.Shutdown();
+
     if (!registry.isDedicatedServer) {
       IN.Shutdown();
       VID.Shutdown();
     }
+
     Pmove.Shutdown();
     Cmd.Shutdown();
     Cvar.Shutdown();
     eventBus.publish('host.shutdown');
-  };
+  }
 
   // Commands
 
-  static Quit_f() {
-    if (!registry.isDedicatedServer) {
-      if (Key.dest.value !== Key.dest.console) {
-        M.Menu_Quit_f();
-        return;
-      }
+  static Quit_f(): void {
+    if (!registry.isDedicatedServer && Key.dest.value !== Key.dest.console) {
+      M.Menu_Quit_f();
+      return;
     }
 
-    if (SV.server.active === true) {
+    if (SV.server.active) {
       Host.ShutdownServer();
     }
 
     COM.Shutdown();
     Sys.Quit();
-  };
+  }
 
-  static Status_f() {
-    /** @type {Function} */
-    let print;
-    if (!this.client) {
+  static Status_f(this: ConsoleCommand): void {
+    let print: PrintFunction;
+
+    if (this.client === null) {
       if (!SV.server.active) {
         if (registry.isDedicatedServer) {
           Con.Print('No active server\n');
           return;
         }
+
         this.forward();
         return;
       }
+
       print = Con.Print;
     } else {
       const client = this.client;
-      print = (text) => {
+      print = (text: string) => {
         Host.ClientPrint(client, text);
       };
     }
-    print('hostname: ' + NET.hostname.string + '\n');
-    print('address : ' + NET.GetListenAddress() + '\n');
-    print('version : ' + Host.version.string + ' (' + SV.server.gameVersion + ')\n');
-    print('map     : ' + SV.server.mapname + '\n');
-    print('game    : ' + SV.server.gameName + '\n');
-    print('edicts  : ' + SV.server.num_edicts + ' used of ' + SV.server.edicts.length + ' allocated\n');
-    print('players : ' + NET.activeconnections + ' active (' + SV.svs.maxclients + ' max)\n\n');
 
-    const lines = [];
+    print(`hostname: ${NET.hostname.string}\n`);
+    print(`address : ${NET.GetListenAddress()}\n`);
+    print(`version : ${Host.version!.string} (${SV.server.gameVersion})\n`);
+    print(`map     : ${SV.server.mapname}\n`);
+    print(`game    : ${SV.server.gameName}\n`);
+    print(`edicts  : ${SV.server.num_edicts} used of ${SV.server.edicts.length} allocated\n`);
+    print(`players : ${NET.activeconnections} active (${SV.svs.maxclients} max)\n\n`);
 
-    for (let i = 0; i < SV.svs.maxclients; i++) {
-      /** @type {ServerClient} */
-      const client = SV.svs.clients[i];
+    const lines: string[] = [];
 
-      if (client.state < ServerClient.STATE.CONNECTED) {
+    for (let index = 0; index < SV.svs.maxclients; index++) {
+      const client = SV.svs.clients[index];
+
+      if (client.state < ServerClient.STATE.CONNECTED || client.netconnection === null) {
         continue;
       }
 
@@ -623,12 +732,12 @@ export default class Host {
         client.uniqueId.substring(0, 19).padEnd(19),
         Q.secsToTime(NET.time - client.netconnection.connecttime).padEnd(9),
         client.ping.toFixed(0).padStart(4),
-        new Number(0).toFixed(0).padStart(4),   // TODO: add loss
+        Number(0).toFixed(0).padStart(4), // TODO: add loss
         ServerClient.STATE.toKey(client.state).padEnd(10),
         client.netconnection.address,
       ];
 
-      lines.push(parts.join(' | ') + '\n');
+      lines.push(`${parts.join(' | ')}\n`);
     }
 
     if (lines.length === 0) {
@@ -641,59 +750,73 @@ export default class Host {
     for (const line of lines) {
       print(line);
     }
-  };
+  }
 
   static God_f = class extends HostConsoleCommand {
-    run() {
-      if (this.forward()) {
+    override run(): void {
+      if (this.forward() || this.cheat()) {
         return;
       }
-      if (this.cheat()) {
+
+      const client = this.client;
+
+      if (client === null) {
         return;
       }
-      const client = this.client;
+
       client.edict.entity.flags ^= Defs.flags.FL_GODMODE;
+
       if ((client.edict.entity.flags & Defs.flags.FL_GODMODE) === 0) {
         Host.ClientPrint(client, 'godmode OFF\n');
-      } else {
-        Host.ClientPrint(client, 'godmode ON\n');
+        return;
       }
+
+      Host.ClientPrint(client, 'godmode ON\n');
     }
   };
 
   static Notarget_f = class extends HostConsoleCommand {
-    run() {
-      if (this.forward()) {
+    override run(): void {
+      if (this.forward() || this.cheat()) {
         return;
       }
-      if (this.cheat()) {
+
+      const client = this.client;
+
+      if (client === null) {
         return;
       }
-      const client = this.client;
+
       client.edict.entity.flags ^= Defs.flags.FL_NOTARGET;
+
       if ((client.edict.entity.flags & Defs.flags.FL_NOTARGET) === 0) {
         Host.ClientPrint(client, 'notarget OFF\n');
-      } else {
-        Host.ClientPrint(client, 'notarget ON\n');
+        return;
       }
+
+      Host.ClientPrint(client, 'notarget ON\n');
     }
   };
 
   static Noclip_f = class extends HostConsoleCommand {
-    run() {
-      if (this.forward()) {
+    override run(): void {
+      if (this.forward() || this.cheat()) {
         return;
       }
-      if (this.cheat()) {
+
+      const client = this.client;
+
+      if (client === null) {
         return;
       }
-      const client = this.client;
+
       if (client.edict.entity.movetype !== Defs.moveType.MOVETYPE_NOCLIP) {
         Host.noclip_anglehack = true;
         client.edict.entity.movetype = Defs.moveType.MOVETYPE_NOCLIP;
         Host.ClientPrint(client, 'noclip ON\n');
         return;
       }
+
       Host.noclip_anglehack = false;
       client.edict.entity.movetype = Defs.moveType.MOVETYPE_WALK;
       Host.ClientPrint(client, 'noclip OFF\n');
@@ -701,36 +824,43 @@ export default class Host {
   };
 
   static Fly_f = class extends HostConsoleCommand {
-    run() {
-      if (this.forward()) {
+    override run(): void {
+      if (this.forward() || this.cheat()) {
         return;
       }
-      if (this.cheat()) {
+
+      const client = this.client;
+
+      if (client === null) {
         return;
       }
-      const client = this.client;
+
       if (client.edict.entity.movetype !== Defs.moveType.MOVETYPE_FLY) {
         client.edict.entity.movetype = Defs.moveType.MOVETYPE_FLY;
         Host.ClientPrint(client, 'flymode ON\n');
         return;
       }
+
       client.edict.entity.movetype = Defs.moveType.MOVETYPE_WALK;
       Host.ClientPrint(client, 'flymode OFF\n');
     }
   };
 
-  static Ping_f() {
+  static Ping_f(this: ConsoleCommand): void {
     if (this.forward()) {
       return;
     }
 
     const recipientClient = this.client;
 
+    if (recipientClient === null) {
+      return;
+    }
+
     Host.ClientPrint(recipientClient, 'Client ping times:\n');
 
-    for (let i = 0; i < SV.svs.maxclients; i++) {
-      /** @type {ServerClient} */
-      const client = SV.svs.clients[i];
+    for (let index = 0; index < SV.svs.maxclients; index++) {
+      const client = SV.svs.clients[index];
 
       if (client.state < ServerClient.STATE.CONNECTED) {
         continue;
@@ -738,62 +868,59 @@ export default class Host {
 
       let total = 0;
 
-      for (let j = 0; j < client.ping_times.length; j++) {
-        total += client.ping_times[j];
+      for (let pingIndex = 0; pingIndex < client.ping_times.length; pingIndex++) {
+        total += client.ping_times[pingIndex];
       }
 
-      Host.ClientPrint(recipientClient, (total * 62.5).toFixed(0).padStart(3) + ' ' + client.name + '\n');
+      Host.ClientPrint(recipientClient, `${(total * 62.5).toFixed(0).padStart(3)} ${client.name}\n`);
     }
-  };
+  }
 
-  static Map_f(mapname, ...spawnparms) {
+  static Map_f(this: ConsoleCommand, mapname?: string, ...spawnparms: string[]): void {
     if (mapname === undefined) {
       Con.Print('Usage: map <map>\n');
       return;
     }
-    if (this.client) {
+
+    if (this.client !== null) {
       return;
     }
+
     // if (!SV.HasMap(mapname)) {
     //   Con.Print(`No such map: ${mapname}\n`);
     //   return;
     // }
+
     if (!registry.isDedicatedServer) {
       CL.cls.demonum = -1;
       CL.Disconnect();
     }
+
     Host.ShutdownServer(); // CR: this is the reason why you would need to use changelevel on Counter-Strike 1.6 etc.
+
     if (!registry.isDedicatedServer) {
       Key.dest.value = Key.dest.game;
       SCR.BeginLoadingPlaque();
-    }
-    SV.svs.serverflags = 0;
-
-    if (!registry.isDedicatedServer) {
       CL.SetConnectingStep(5, 'Spawning server');
-    }
-
-    if (!registry.isDedicatedServer) {
       CL.cls.spawnparms = spawnparms.join(' ');
     }
 
+    SV.svs.serverflags = 0;
+
     Host.ScheduleForNextFrame(async () => {
       if (!await SV.SpawnServer(mapname)) {
         SV.ShutdownServer(false);
-        throw new HostError('Could not spawn server with map ' + mapname);
+        throw new HostError(`Could not spawn server with map ${mapname}`);
       }
 
       if (!registry.isDedicatedServer) {
         CL.SetConnectingStep(null, null);
-      }
-
-      if (!registry.isDedicatedServer) {
         CL.Connect('local');
       }
     });
-  };
+  }
 
-  static Changelevel_f(mapname) {
+  static Changelevel_f(mapname?: string): void {
     if (mapname === undefined) {
       Con.Print('Usage: changelevel <levelname>\n');
       return;
@@ -810,65 +937,66 @@ export default class Host {
 
     SV.svs.changelevelIssued = true;
 
-    for (let i = 0; i < SV.svs.maxclients; i++) {
-      const client = SV.svs.clients[i];
+    for (let index = 0; index < SV.svs.maxclients; index++) {
+      const client = SV.svs.clients[index];
+
       if (client.state < ServerClient.STATE.CONNECTED) {
         continue;
       }
+
       client.message.writeByte(Protocol.svc.changelevel);
       client.message.writeString(mapname);
     }
 
     if (!registry.isDedicatedServer) {
-      // this hack allows us to show the loading plaque and resetting the client renderer
+      // This hack allows us to show the loading plaque while resetting the client renderer.
       CL.cls.changelevel = true;
       CL.cls.signon = 0;
     }
 
     Host.ScheduleForNextFrame(async () => {
       SV.SaveSpawnparms();
-
-      Con.DPrint('Host.Changelevel_f: changing level to ' + mapname + '\n');
+      Con.DPrint(`Host.Changelevel_f: changing level to ${mapname}\n`);
 
       if (!await SV.SpawnServer(mapname)) {
         SV.ShutdownServer(false);
-        throw new HostError('Could not spawn server for changelevel to ' + mapname);
+        throw new HostError(`Could not spawn server for changelevel to ${mapname}`);
       }
 
-      Con.DPrint('Host.Changelevel_f: spawned server for changelevel to ' + mapname + '\n');
+      Con.DPrint(`Host.Changelevel_f: spawned server for changelevel to ${mapname}\n`);
 
       if (!registry.isDedicatedServer) {
         CL.SetConnectingStep(null, null);
       }
     });
-  };
+  }
 
-  static Restart_f() {
-    if ((SV.server.active) && (registry.isDedicatedServer || !CL.cls.demoplayback && !this.client)) {
+  static Restart_f(this: ConsoleCommand): void {
+    if (SV.server.active && (registry.isDedicatedServer || (!CL.cls.demoplayback && this.client === null))) {
       void Cmd.ExecuteString(`map ${SV.server.mapname}`);
     }
-  };
+  }
 
-  // NOTE: this is the dedicated server version of disconnect
-  static Disconnect_f() {
+  // NOTE: this is the dedicated server version of disconnect.
+  static Disconnect_f(): void {
     if (!SV.server.active) {
       Con.Print('No active server\n');
       return;
     }
 
     Host.ShutdownServer();
-  };
+  }
 
-  static Reconnect_f() {
+  static Reconnect_f(): void {
     if (registry.isDedicatedServer) {
       Con.Print('cannot reconnect in dedicated server mode\n');
       return;
     }
 
     Con.PrintWarning('NOT IMPLEMENTED: reconnect\n'); // TODO: reimplement reconnect here
-  };
+  }
 
-  static Connect_f(address) {
+  static Connect_f(address?: string): void {
     if (address === undefined) {
       Con.Print('Usage: connect <address>\n');
       Con.Print(' - <address> can be "self", connecting to the current domain name\n');
@@ -881,117 +1009,128 @@ export default class Host {
     }
 
     CL.cls.demonum = -1;
-    if (CL.cls.demoplayback === true) {
+
+    if (CL.cls.demoplayback) {
       CL.StopPlayback();
       CL.Disconnect();
     }
 
     if (address === 'self') {
       const url = new URL(location.href);
-      CL.Connect((url.protocol === 'https:' ? 'wss' : 'ws') + '://' + url.host + url.pathname + (!url.pathname.endsWith('/') ? '/' : '') + 'api/');
+      const path = !url.pathname.endsWith('/') ? `${url.pathname}/` : url.pathname;
+      CL.Connect(`${url.protocol === 'https:' ? 'wss' : 'ws'}://${url.host}${path}api/`);
     } else {
       CL.Connect(address);
     }
 
     CL.cls.signon = 0;
-  };
+  }
 
-  static Savegame_f(savename) {
-    if (this.client) {
+  static Savegame_f(this: ConsoleCommand, savename?: string): void {
+    if (this.client !== null) {
       return;
     }
+
     if (savename === undefined) {
       Con.Print('Usage: save <savename>\n');
       return;
     }
-    if (SV.server.active !== true) {
+
+    if (!SV.server.active) {
       Con.PrintWarning('Not playing a local game.\n');
       return;
     }
+
     if (CL.state.intermission !== 0) {
       Con.PrintWarning('Can\'t save in intermission.\n');
       return;
     }
+
     if (SV.svs.maxclients !== 1) {
       Con.PrintWarning('Can\'t save multiplayer games.\n');
       return;
     }
-    if (savename.indexOf('..') !== -1) {
+
+    if (savename.includes('..')) {
       Con.PrintWarning('Relative pathnames are not allowed.\n');
       return;
     }
+
     const client = SV.svs.clients[0];
-    if (client.state >= ServerClient.STATE.CONNECTED) {
-      if (client.edict.entity.health <= 0.0) {
-        Con.PrintWarning('Can\'t savegame with a dead player\n');
-        return;
-      }
+
+    if (client.state >= ServerClient.STATE.CONNECTED && client.edict.entity.health <= 0.0) {
+      Con.PrintWarning('Can\'t savegame with a dead player\n');
+      return;
     }
 
-    const gamestate = {
+    const clientdata = CL.state.gameAPI ? CL.state.gameAPI.saveGame() as JsonValue : null;
+
+    // IDEA: we could actually compress this by using a list of common fields.
+    const edicts: SavegameEdictEntry[] = [];
+
+    for (const edict of SV.server.edicts) {
+      edicts.push(edict.isFree() ? null : [edict.entity.classname, edict.entity.serialize() as JsonValue]);
+    }
+
+    const globals = SV.server.gameAPI.serialize() as JsonValue;
+
+    const gamestate: SavegameState = {
       version: Def.gamestateVersion,
       gameversion: SV.server.gameVersion,
-      comment: CL.state.levelname, // TODO: ask the game for a comment
+      comment: CL.state.levelname,
       spawn_parms: client.spawn_parms,
       mapname: SV.server.mapname,
       time: SV.server.time,
       lightstyles: SV.server.lightstyles,
-      globals: null,
-      cvars: [...Cvar.Filter((cvar) => cvar.flags & (Cvar.FLAG.SERVER | Cvar.FLAG.GAME))].map((cvar) => [cvar.name, cvar.string]),
-      clientdata: null,
-      edicts: [],
+      globals,
+      cvars: [...Cvar.Filter((cvar) => (cvar.flags & (Cvar.FLAG.SERVER | Cvar.FLAG.GAME)) !== 0)].map((cvar) => [cvar.name, cvar.string]),
+      clientdata,
+      edicts,
       num_edicts: SV.server.num_edicts,
-      // TODO: client entities
-      particles: R.SerializeParticles(),
+      particles: R.SerializeParticles() as JsonValue,
     };
 
-    if (CL.state.gameAPI) {
-      gamestate.clientdata = CL.state.gameAPI.saveGame();
-    }
-
-    // IDEA: we could actually compress this by using a list of common fields
-    for (const edict of SV.server.edicts) {
-      if (edict.isFree()) {
-        gamestate.edicts.push(null);
-        continue;
-      }
-
-      gamestate.edicts.push([edict.entity.classname, edict.entity.serialize()]);
-    }
+    const filename = COM.DefaultExtension(savename, '.json');
 
-    gamestate.globals = SV.server.gameAPI.serialize();
+    Con.Print(`Saving game to ${filename}...\n`);
 
-    const name = COM.DefaultExtension(savename, '.json');
-    Con.Print('Saving game to ' + name + '...\n');
-    if (COM.WriteTextFile(name, JSON.stringify(gamestate))) {
+    if (COM.WriteTextFile(filename, JSON.stringify(gamestate))) {
       Con.PrintSuccess('done.\n');
-    } else {
-      Con.PrintError('ERROR: couldn\'t open.\n');
+      return;
     }
-  };
 
-  static async Loadgame_f(savename) {
-    if (this.client) {
+    Con.PrintError('ERROR: couldn\'t open.\n');
+  }
+
+  static async Loadgame_f(this: ConsoleCommand, savename?: string): Promise<void> {
+    if (this.client !== null) {
       return;
     }
+
     if (savename === undefined) {
       Con.Print('Usage: load <savename>\n');
       return;
     }
-    if (savename.indexOf('..') !== -1) {
+
+    if (savename.includes('..')) {
       Con.PrintWarning('Relative pathnames are not allowed.\n');
       return;
     }
+
     CL.cls.demonum = -1;
-    const name = COM.DefaultExtension(savename, '.json');
-    Con.Print('Loading game from ' + name + '...\n');
-    const data = await COM.LoadTextFile(name);
+
+    const filename = COM.DefaultExtension(savename, '.json');
+
+    Con.Print(`Loading game from ${filename}...\n`);
+
+    const data = await COM.LoadTextFile(filename);
+
     if (data === null) {
       Con.PrintError('ERROR: couldn\'t open.\n');
       return;
     }
 
-    const gamestate = JSON.parse(data);
+    const gamestate = JSON.parse(data) as SavegameState;
 
     if (gamestate.version !== Def.gamestateVersion) {
       throw new HostError(`Savegame is version ${gamestate.version}, not ${Def.gamestateVersion}\n`);
@@ -999,14 +1138,16 @@ export default class Host {
 
     CL.Disconnect();
 
-    // restore all server/game cvars
+    // Restore all server and game cvars.
     for (const [name, value] of gamestate.cvars) {
       const cvar = Cvar.FindVar(name);
-      if (cvar) {
+
+      if (cvar !== null) {
         cvar.set(value);
-      } else {
-        Con.PrintWarning(`Saved cvar ${name} not found, skipping\n`);
+        continue;
       }
+
+      Con.PrintWarning(`Saved cvar ${name} not found, skipping\n`);
     }
 
     if (!await SV.SpawnServer(gamestate.mapname)) {
@@ -1015,7 +1156,7 @@ export default class Host {
       }
 
       SV.ShutdownServer(false);
-      throw new HostError(`Couldn't load map ${gamestate.mapname} for save game ${name}\n`);
+      throw new HostError(`Couldn't load map ${gamestate.mapname} for save game ${filename}\n`);
     }
 
     if (gamestate.gameversion !== SV.server.gameVersion) {
@@ -1032,30 +1173,32 @@ export default class Host {
     SV.server.num_edicts = gamestate.num_edicts;
     console.assert(SV.server.num_edicts <= SV.server.edicts.length, 'resizing edicts not supported yet'); // TODO: alloc more edicts
 
-    // first run through all edicts to make sure the entity structures get initialized
-    for (let i = 0; i < SV.server.edicts.length; i++) {
-      const edict = SV.server.edicts[i];
+    // First run through all edicts to make sure the entity structures get initialized.
+    for (let index = 0; index < SV.server.edicts.length; index++) {
+      const edict = SV.server.edicts[index];
+      const serializedEdict = gamestate.edicts[index];
 
-      if (!gamestate.edicts[i]) { // freed edict
-        // FIXME: QuakeC doesn’t like it at all when edicts suddenly disappear, we should offload this code to the GameAPI
+      if (serializedEdict === undefined || serializedEdict === null) {
+        // FIXME: QuakeC doesn’t like it at all when edicts suddenly disappear, we should offload this code to the GameAPI.
         edict.freeEdict();
         continue;
       }
 
-      const [classname] = gamestate.edicts[i];
+      const [classname] = serializedEdict;
       console.assert(SV.server.gameAPI.prepareEntity(edict, classname), 'no entity for classname');
     }
 
-    // second run we can start deserializing
-    for (let i = 0; i < SV.server.edicts.length; i++) {
-      const edict = SV.server.edicts[i];
+    // Second run: we can start deserializing now that entity classes exist.
+    for (let index = 0; index < SV.server.edicts.length; index++) {
+      const edict = SV.server.edicts[index];
+      const serializedEdict = gamestate.edicts[index];
 
-      if (edict.isFree()) { // freed edict
+      if (edict.isFree() || serializedEdict === undefined || serializedEdict === null) {
         continue;
       }
 
-      const [, data] = gamestate.edicts[i];
-      edict.entity.deserialize(data);
+      const [, entityData] = serializedEdict;
+      edict.entity.deserialize(entityData);
       edict.linkEdict();
     }
 
@@ -1065,173 +1208,188 @@ export default class Host {
     client.spawn_parms = gamestate.spawn_parms;
 
     ClientLifecycle.resumeGame(gamestate.clientdata, gamestate.particles);
-  };
+  }
 
-  static Name_f(...names) { // signon 2, step 1
+  static Name_f(this: ConsoleCommand, ...names: string[]): void { // signon 2, step 1
     Con.DPrint(`Host.Name_f: ${this.client}\n`);
+
     if (names.length < 1) {
-      Con.Print('"name" is "' + CL.name.string + '"\n');
+      Con.Print(`"name" is "${CL.name.string}"\n`);
       return;
     }
 
-    if (!SV.server.active) { // ???
+    if (!SV.server.active) {
       return;
     }
 
     let newName = names.join(' ').trim().substring(0, 15);
 
-    if (!registry.isDedicatedServer && !this.client) {
+    if (!registry.isDedicatedServer && this.client === null) {
       Cvar.Set('_cl_name', newName);
+
       if (CL.cls.state === Def.clientConnectionState.connected) {
         this.forward();
       }
+
       return;
     }
 
-    if (!this.client) {
+    if (this.client === null) {
       return;
     }
 
     const initialNewName = newName;
     let newNameCounter = 2;
 
-    // make sure we have a somewhat unique name
+    // Make sure we have a somewhat unique name.
     while (SV.FindClientByName(newName)) {
       newName = `${initialNewName}${newNameCounter++}`;
     }
 
-    const name = this.client.name;
-    if (registry.isDedicatedServer && name && (name.length !== 0) && (name !== 'unconnected') && (name !== newName)) {
-      Con.Print(name + ' renamed to ' + newName + '\n');
+    const previousName = this.client.name;
+
+    if (registry.isDedicatedServer && previousName.length !== 0 && previousName !== 'unconnected' && previousName !== newName) {
+      Con.Print(`${previousName} renamed to ${newName}\n`);
     }
 
     this.client.name = newName;
-    const msg = SV.server.reliable_datagram;
-    msg.writeByte(Protocol.svc.updatename);
-    msg.writeByte(this.client.num);
-    msg.writeString(newName);
-  };
 
-  static Say_f(teamonly, message) {
-    if (this.forward()) {
-      return;
-    }
+    const message = SV.server.reliable_datagram;
+    message.writeByte(Protocol.svc.updatename);
+    message.writeByte(this.client.num);
+    message.writeString(newName);
+  }
 
-    if (!message) {
+  static Say_f(this: ConsoleCommand, teamonly: boolean, message?: string): void {
+    if (this.forward() || !message || this.client === null) {
       return;
     }
 
     const sender = this.client;
+    const formattedMessage = message.length > 140 ? `${message.substring(0, 140)}...` : message;
 
-    if (message.length > 140) {
-      message = message.substring(0, 140) + '...';
-    }
+    for (let index = 0; index < SV.svs.maxclients; index++) {
+      const client = SV.svs.clients[index];
 
-    for (let i = 0; i < SV.svs.maxclients; i++) {
-      const client = SV.svs.clients[i];
       if (client.state < ServerClient.STATE.CONNECTED) {
         continue;
       }
-      if ((Host.teamplay.value !== 0) && (teamonly === true) && (client.entity.team !== sender.entity.team)) { // Legacy cvars
+
+      if (Host.teamplay !== null && Host.teamplay.value !== 0 && teamonly && client.entity.team !== sender.entity.team) {
         continue;
       }
-      Host.SendChatMessageToClient(client, sender.name, message, false);
+
+      Host.SendChatMessageToClient(client, sender.name, formattedMessage, false);
     }
 
-    Con.Print(`${sender.name}: ${message}\n`);
-  };
+    Con.Print(`${sender.name}: ${formattedMessage}\n`);
+  }
 
-  static Say_Team_f(message) {
+  static Say_Team_f(this: ConsoleCommand, message?: string): void {
     Host.Say_f.call(this, true, message);
-  };
+  }
 
-  static Say_All_f(message) {
+  static Say_All_f(this: ConsoleCommand, message?: string): void {
     Host.Say_f.call(this, false, message);
-  };
+  }
 
-  static Tell_f(recipient, message) {
-    if (this.forward()) {
-      return;
-    }
+  static Tell_f(this: ConsoleCommand, recipient?: string, message?: string): void {
+    if (this.forward() || !recipient || !message || this.client === null) {
+      if (!recipient || !message) {
+        Con.Print('Usage: tell <recipient> <message>\n');
+      }
 
-    if (!recipient || !message) {
-      Con.Print('Usage: tell <recipient> <message>\n');
       return;
     }
 
-    message = message.trim();
+    let formattedMessage = message.trim();
 
-    // Remove surrounding double quotes if present
-    if (message.startsWith('"')) {
-      message = message.slice(1, -1);
+    // Remove surrounding double quotes if present.
+    if (formattedMessage.startsWith('"')) {
+      formattedMessage = formattedMessage.slice(1, -1);
     }
-    if (message.length > 140) {
-      message = message.substring(0, 140) + '...';
+
+    if (formattedMessage.length > 140) {
+      formattedMessage = `${formattedMessage.substring(0, 140)}...`;
     }
 
     const sender = this.client;
-    for (let i = 0; i < SV.svs.maxclients; i++) {
-      const client = SV.svs.clients[i];
+
+    for (let index = 0; index < SV.svs.maxclients; index++) {
+      const client = SV.svs.clients[index];
+
       if (client.state < ServerClient.STATE.CONNECTED) {
         continue;
       }
+
       if (client.name.toLowerCase() !== recipient.toLowerCase()) {
         continue;
       }
-      Host.SendChatMessageToClient(client, sender.name, message, true);
-      Host.SendChatMessageToClient(sender, sender.name, message, true);
+
+      Host.SendChatMessageToClient(client, sender.name, formattedMessage, true);
+      Host.SendChatMessageToClient(sender, sender.name, formattedMessage, true);
       break;
     }
-  };
+  }
 
-  static Color_f(...argv) { // signon 2, step 2
+  static Color_f(this: ConsoleCommand, ...argv: string[]): void { // signon 2, step 2
     Con.DPrint(`Host.Color_f: ${this.client}\n`);
+
     if (argv.length <= 1) {
-      Con.Print('"color" is "' + (CL.color.value >> 4) + ' ' + (CL.color.value & 15) + '"\ncolor <0-13> [0-13]\n');
+      Con.Print(`"color" is "${CL.color.value >> 4} ${CL.color.value & 15}"\ncolor <0-13> [0-13]\n`);
       return;
     }
 
-    let top; let bottom;
+    let top: number;
+    let bottom: number;
+
     if (argv.length === 2) {
       top = bottom = (Q.atoi(argv[1]) & 15) >>> 0;
     } else {
       top = (Q.atoi(argv[1]) & 15) >>> 0;
       bottom = (Q.atoi(argv[2]) & 15) >>> 0;
     }
+
     if (top >= 14) {
       top = 13;
     }
+
     if (bottom >= 14) {
       bottom = 13;
     }
+
     const playercolor = (top << 4) + bottom;
 
-    if (!registry.isDedicatedServer && !this.client) {
+    if (!registry.isDedicatedServer && this.client === null) {
       Cvar.Set('_cl_color', playercolor);
+
       if (CL.cls.state === Def.clientConnectionState.connected) {
         this.forward();
       }
+
       return;
     }
 
-    if (!this.client) {
+    if (this.client === null) {
       return;
     }
 
     this.client.colors = playercolor;
     this.client.edict.entity.team = bottom + 1;
-    const msg = SV.server.reliable_datagram;
-    msg.writeByte(Protocol.svc.updatecolors);
-    msg.writeByte(this.client.num);
-    msg.writeByte(playercolor);
-  };
 
-  static Kill_f() {
-    if (this.forward()) {
+    const message = SV.server.reliable_datagram;
+    message.writeByte(Protocol.svc.updatecolors);
+    message.writeByte(this.client.num);
+    message.writeByte(playercolor);
+  }
+
+  static Kill_f(this: ConsoleCommand): void {
+    if (this.forward() || this.client === null) {
       return;
     }
 
     const client = this.client;
+
     if (client.edict.entity.health <= 0.0) {
       Host.ClientPrint(client, 'Can\'t suicide -- already dead!\n');
       return;
@@ -1239,49 +1397,57 @@ export default class Host {
 
     SV.server.gameAPI.time = SV.server.time;
     SV.server.gameAPI.ClientKill(client.edict);
-  };
+  }
 
-  static Pause_f() {
-    if (this.forward()) {
+  static Pause_f(this: ConsoleCommand): void {
+    if (this.forward() || this.client === null) {
       return;
     }
 
     const client = this.client;
 
-    if (Host.pausable.value === 0) {
+    if (Host.pausable === null || Host.pausable.value === 0) {
       Host.ClientPrint(client, 'Pause not allowed.\n');
       return;
     }
+
     SV.server.paused = !SV.server.paused;
-    Host.BroadcastPrint(client.name + (SV.server.paused === true ? ' paused the game\n' : ' unpaused the game\n'));
+    Host.BroadcastPrint(`${client.name}${SV.server.paused === true ? ' paused the game\n' : ' unpaused the game\n'}`);
     SV.server.reliable_datagram.writeByte(Protocol.svc.setpause);
     SV.server.reliable_datagram.writeByte(SV.server.paused === true ? 1 : 0);
-  };
+  }
 
-  static PreSpawn_f() { // signon 1, step 1
-    if (!this.client) {
+  static PreSpawn_f(this: ConsoleCommand): void { // signon 1, step 1
+    if (this.client === null) {
       Con.Print('prespawn is not valid from the console\n');
       return;
     }
+
     Con.DPrint(`Host.PreSpawn_f: ${this.client}\n`);
+
     const client = this.client;
+
     if (client.state === ServerClient.STATE.SPAWNED) {
       Con.Print('prespawn not valid -- already spawned\n');
       return;
     }
-    // CR: SV.server.signon is a special buffer that is used to send the signon messages (make static as well as baseline information)
+
+    // CR: SV.server.signon is a special buffer that is used to send the signon messages.
     client.message.write(new Uint8Array(SV.server.signon.data), SV.server.signon.cursize);
     client.message.writeByte(Protocol.svc.signonnum);
     client.message.writeByte(2);
-  };
+  }
 
-  static Spawn_f() { // signon 2, step 3
+  static Spawn_f(this: ConsoleCommand): void { // signon 2, step 3
     Con.DPrint(`Host.Spawn_f: ${this.client}\n`);
-    if (!this.client) {
+
+    if (this.client === null) {
       Con.Print('spawn is not valid from the console\n');
       return;
     }
-    let client = this.client;
+
+    const client = this.client;
+
     if (client.state === ServerClient.STATE.SPAWNED) {
       Con.Print('Spawn not valid -- already spawned\n');
       return;
@@ -1293,55 +1459,52 @@ export default class Host {
     message.writeByte(Protocol.svc.time);
     message.writeFloat(SV.server.time);
 
-    const ent = client.edict;
-    if (SV.server.loadgame === true) {
+    const entity = client.edict;
+
+    if (SV.server.loadgame) {
       SV.server.paused = false;
     } else {
-      // ent.clear(); // FIXME: there’s a weird edge case
-      SV.server.gameAPI.prepareEntity(ent, 'player', {
+      SV.server.gameAPI.prepareEntity(entity, 'player', {
         netname: client.name,
-        colormap: ent.num, // the num, not the entity
+        colormap: entity.num, // the num, not the entity
         team: (client.colors & 15) + 1,
       });
 
-      // load in spawn parameters (legacy)
-      if (SV.server.gameCapabilities.includes(gameCapabilities.CAP_SPAWNPARMS_LEGACY)) {
-        for (let i = 0; i <= 15; i++) {
-          SV.server.gameAPI[`parm${i + 1}`] = client.spawn_parms[i];
+      // Load legacy spawn parameters.
+      if (SV.server.gameCapabilities.includes(gameCapabilities.CAP_SPAWNPARMS_LEGACY) && Array.isArray(client.spawn_parms)) {
+        for (let index = 0; index <= 15; index++) {
+          SV.server.gameAPI[`parm${index + 1}`] = client.spawn_parms[index];
         }
       }
 
-      // load in spawn parameters
+      // Load dynamic spawn parameters.
       if (SV.server.gameCapabilities.includes(gameCapabilities.CAP_SPAWNPARMS_DYNAMIC)) {
-        ent.entity.restoreSpawnParameters(client.spawn_parms);
+        entity.entity.restoreSpawnParameters(client.spawn_parms);
       }
 
-      // call the spawn function
       SV.server.gameAPI.time = SV.server.time;
-      SV.server.gameAPI.ClientConnect(ent);
-
-      // actually spawn the player
+      SV.server.gameAPI.ClientConnect(entity);
       SV.server.gameAPI.time = SV.server.time;
-      SV.server.gameAPI.PutClientInServer(ent);
+      SV.server.gameAPI.PutClientInServer(entity);
     }
 
-    for (let i = 0; i < SV.svs.maxclients; i++) {
-      client = SV.svs.clients[i];
+    for (let index = 0; index < SV.svs.maxclients; index++) {
+      const otherClient = SV.svs.clients[index];
       message.writeByte(Protocol.svc.updatename);
-      message.writeByte(i);
-      message.writeString(client.name);
+      message.writeByte(index);
+      message.writeString(otherClient.name);
       message.writeByte(Protocol.svc.updatefrags);
-      message.writeByte(i);
-      message.writeShort(client.old_frags);
+      message.writeByte(index);
+      message.writeShort(otherClient.old_frags);
       message.writeByte(Protocol.svc.updatecolors);
-      message.writeByte(i);
-      message.writeByte(client.colors);
+      message.writeByte(index);
+      message.writeByte(otherClient.colors);
     }
 
-    for (let i = 0; i < Def.limits.lightstyles; i++) {
+    for (let index = 0; index < Def.limits.lightstyles; index++) {
       message.writeByte(Protocol.svc.lightstyle);
-      message.writeByte(i);
-      message.writeString(SV.server.lightstyles[i]);
+      message.writeByte(index);
+      message.writeString(SV.server.lightstyles[index]);
     }
 
     if (SV.server.gameCapabilities.includes(gameCapabilities.CAP_CLIENTDATA_UPDATESTAT)) {
@@ -1360,28 +1523,27 @@ export default class Host {
     }
 
     message.writeByte(Protocol.svc.setangle);
-    message.writeAngleVector(ent.entity.angles);
-
+    message.writeAngleVector(entity.entity.angles);
     SV.messages.writeClientdataToMessage(client, message);
-
     message.writeByte(Protocol.svc.signonnum);
     message.writeByte(3);
-  };
+  }
 
-  static Begin_f() {  // signon 3, step 1
+  static Begin_f(this: ConsoleCommand): void { // signon 3, step 1
     Con.DPrint(`Host.Begin_f: ${this.client}\n`);
-    if (!this.client) {
+
+    if (this.client === null) {
       Con.Print('begin is not valid from the console\n');
       return;
     }
 
-    // Send all portal states before the client is offically spawned and gets updates incrementally
+    // Send all portal states before the client is officially spawned and gets updates incrementally.
     const areaPortals = SV.server.worldmodel.areaPortals;
 
-    for (let p = 0; p < areaPortals.numPortals; p++) {
+    for (let portalIndex = 0; portalIndex < areaPortals.numPortals; portalIndex++) {
       this.client.message.writeByte(Protocol.svc.setportalstate);
-      this.client.message.writeShort(p);
-      this.client.message.writeByte(areaPortals.isPortalOpen(p) ? 1 : 0);
+      this.client.message.writeShort(portalIndex);
+      this.client.message.writeByte(areaPortals.isPortalOpen(portalIndex) ? 1 : 0);
     }
 
     this.client.state = ServerClient.STATE.SPAWNED;
@@ -1390,104 +1552,106 @@ export default class Host {
       SV.server.gameAPI.time = SV.server.time;
       SV.server.gameAPI.ClientBegin(this.client.edict);
     }
-  };
+  }
 
-  static Kick_f() {
+  static Kick_f(this: ConsoleCommand): void {
     const argv = this.argv;
-    if (!this.client) {
-      if (!SV.server.active) {
-        this.forward();
-        return;
-      }
+
+    if (this.client === null && !SV.server.active) {
+      this.forward();
+      return;
     }
+
     if (argv.length < 2) {
       return;
     }
-    const s = argv[1].toLowerCase();
+
+    const selection = argv[1].toLowerCase();
     const invokingClient = this.client;
-    let i; let byNumber = false;
-    let targetClient = /** @type {ServerClient | null} */ (null);
+    let clientIndex = 0;
+    let byNumber = false;
+    let targetClient: ServerClient | null = null;
 
-    if ((argv.length >= 3) && (s === '#')) {
-      i = Q.atoi(argv[2]) - 1;
-      if ((i < 0) || (i >= SV.svs.maxclients)) {
+    if (argv.length >= 3 && selection === '#') {
+      clientIndex = Q.atoi(argv[2]) - 1;
+
+      if (clientIndex < 0 || clientIndex >= SV.svs.maxclients) {
         return;
       }
-      if (SV.svs.clients[i].state !== ServerClient.STATE.SPAWNED) {
+
+      if (SV.svs.clients[clientIndex].state !== ServerClient.STATE.SPAWNED) {
         return;
       }
-      targetClient = SV.svs.clients[i];
+
+      targetClient = SV.svs.clients[clientIndex];
       byNumber = true;
     } else {
-      for (i = 0; i < SV.svs.maxclients; i++) {
-        const client = SV.svs.clients[i];
+      for (clientIndex = 0; clientIndex < SV.svs.maxclients; clientIndex++) {
+        const client = SV.svs.clients[clientIndex];
+
         if (client.state < ServerClient.STATE.CONNECTED) {
           continue;
         }
-        if (client.name.toLowerCase() === s) {
+
+        if (client.name.toLowerCase() === selection) {
           targetClient = client;
           break;
         }
       }
     }
-    if (targetClient === null) {
-      return;
-    }
-    if (targetClient === invokingClient) {
+
+    if (targetClient === null || targetClient === invokingClient) {
       return;
     }
-    let who;
-    if (!invokingClient) {
-      if (registry.isDedicatedServer) {
-        who = NET.hostname.string;
-      } else {
-        who = CL.name.string;
-      }
-    } else {
-      who = invokingClient.name;
-    }
-    let message;
-    if (argv.length >= 3) {
-      message = COM.Parse(this.args);
-    }
-    let dropReason = 'Kicked by ' + who;
-    if (message.data !== null) {
-      let p = 0;
+
+    const who = invokingClient === null
+      ? (registry.isDedicatedServer ? NET.hostname.string : CL.name.string)
+      : invokingClient.name;
+    const parsedMessage = argv.length >= 3 && this.args !== null ? COM.Parse(this.args) : null;
+    let dropReason = `Kicked by ${who}`;
+
+    if (parsedMessage !== null && parsedMessage.data !== null) {
+      let offset = 0;
+
       if (byNumber) {
-        p++;
-        for (; p < message.data.length; p++) {
-          if (message.data.charCodeAt(p) !== 32) {
+        offset++;
+
+        for (; offset < parsedMessage.data.length; offset++) {
+          if (parsedMessage.data.charCodeAt(offset) !== 32) {
             break;
           }
         }
-        p += argv[2].length;
+
+        offset += argv[2].length;
       }
-      for (; p < message.data.length; p++) {
-        if (message.data.charCodeAt(p) !== 32) {
+
+      for (; offset < parsedMessage.data.length; offset++) {
+        if (parsedMessage.data.charCodeAt(offset) !== 32) {
           break;
         }
       }
-      dropReason = 'Kicked by ' + who + ': ' + message.data.substring(p);
+
+      dropReason = `Kicked by ${who}: ${parsedMessage.data.substring(offset)}`;
     }
+
     Host.DropClient(targetClient, false, dropReason);
-  };
+  }
 
   static Give_f = class extends HostConsoleCommand { // TODO: move to game
-    run(classname) {
-      // CR:  unsure if I want a “give item_shells” approach or
-      //      if I want to push this piece of code into PR/PF and let
-      //      the game handle this instead
+    override run(classname?: string): void {
+      // CR: unsure if I want a “give item_shells” approach or if I want to push
+      // this piece of code into PR/PF and let the game handle this instead.
 
-      if (this.forward()) {
+      if (this.forward() || this.cheat()) {
         return;
       }
 
-      if (this.cheat()) {
+      const client = this.client;
+
+      if (client === null) {
         return;
       }
 
-      const client = this.client;
-
       if (!classname) {
         Host.ClientPrint(client, 'give <classname>\n');
         return;
@@ -1500,18 +1664,14 @@ export default class Host {
         return;
       }
 
-      // wait for the next server frame
+      // Wait for the next server frame.
       SV.ScheduleGameCommand(() => {
         const { forward } = player.entity.v_angle.angleVectors();
-
         const start = player.entity.origin;
         const end = forward.copy().multiply(64.0).add(start);
-
         const mins = new Vector(-16.0, -16.0, -24.0);
         const maxs = new Vector(16.0, 16.0, 32.0);
-
         const trace = ServerEngineAPI.Traceline(start, end, false, player, mins, maxs);
-
         const origin = trace.point.subtract(forward.multiply(16.0)).add(new Vector(0.0, 0.0, 16.0));
 
         if (![content.CONTENT_EMPTY, content.CONTENT_WATER].includes(ServerEngineAPI.DetermineStaticWorldContents(origin))) {
@@ -1526,88 +1686,122 @@ export default class Host {
     }
   };
 
-  static FindViewthing() {
+  static FindViewthing(): ServerEdict | null {
     if (SV.server.active) {
-      for (let i = 0; i < SV.server.num_edicts; i++) {
-        const e = SV.server.edicts[i];
-        if (!e.isFree() && e.entity.classname === 'viewthing') {
-          return e;
+      for (let index = 0; index < SV.server.num_edicts; index++) {
+        const edict = SV.server.edicts[index];
+
+        if (!edict.isFree() && edict.entity.classname === 'viewthing') {
+          return edict;
         }
       }
     }
+
     Con.Print('No viewthing on map\n');
     return null;
-  };
+  }
 
-  static async Viewmodel_f(model) {
+  static async Viewmodel_f(model?: string): Promise<void> {
     if (model === undefined) {
       Con.Print('Usage: viewmodel <model>\n');
       return;
     }
-    const ent = Host.FindViewthing();
-    if (ent) {
+
+    const entity = Host.FindViewthing();
+
+    if (entity === null) {
       return;
     }
-    const m = await Mod.ForNameAsync(model, false, Mod.scope.client);
-    if (!m) {
-      Con.Print('Can\'t load ' + model + '\n');
+
+    const loadedModel = await Mod.ForNameAsync(model, false, Mod.scope.client);
+
+    if (!loadedModel) {
+      Con.Print(`Can't load ${model}\n`);
       return;
     }
-    ent.entity.frame = 0;
-    CL.state.model_precache[ent.entity.modelindex] = m;
-  };
 
-  static Viewframe_f(frame) {
+    entity.entity.frame = 0;
+    CL.state.model_precache[entity.entity.modelindex] = loadedModel;
+  }
+
+  static Viewframe_f(frame?: string): void {
     if (frame === undefined) {
       Con.Print('Usage: viewframe <frame>\n');
       return;
     }
-    const ent = Host.FindViewthing();
-    if (!ent) {
+
+    const entity = Host.FindViewthing();
+
+    if (entity === null) {
       return;
     }
-    const m = CL.state.model_precache[ent.entity.modelindex >> 0];
-    let f = Q.atoi(frame);
-    if (f >= m.frames.length) {
-      f = m.frames.length - 1;
+
+    const model = CL.state.model_precache[entity.entity.modelindex >> 0];
+
+    if (!model) {
+      return;
     }
-    ent.entity.frame = f;
-  };
 
-  static Viewnext_f() {
-    const ent = Host.FindViewthing();
-    if (!ent) {
+    let nextFrame = Q.atoi(frame);
+
+    if (nextFrame >= model.frames.length) {
+      nextFrame = model.frames.length - 1;
+    }
+
+    entity.entity.frame = nextFrame;
+  }
+
+  static Viewnext_f(): void {
+    const entity = Host.FindViewthing();
+
+    if (entity === null) {
       return;
     }
-    const m = CL.state.model_precache[ent.entity.modelindex >> 0];
-    let f = (ent.entity.frame >> 0) + 1;
-    if (f >= m.frames.length) {
-      f = m.frames.length - 1;
+
+    const model = CL.state.model_precache[entity.entity.modelindex >> 0];
+
+    if (!model) {
+      return;
     }
-    ent.entity.frame = f;
-    Con.Print('frame ' + f + ': ' + m.frames[f].name + '\n');
-  };
 
-  static Viewprev_f() {
-    const ent = Host.FindViewthing();
-    if (!ent) {
+    let nextFrame = (entity.entity.frame >> 0) + 1;
+
+    if (nextFrame >= model.frames.length) {
+      nextFrame = model.frames.length - 1;
+    }
+
+    entity.entity.frame = nextFrame;
+    Con.Print(`frame ${nextFrame}: ${model.frames[nextFrame].name}\n`);
+  }
+
+  static Viewprev_f(): void {
+    const entity = Host.FindViewthing();
+
+    if (entity === null) {
       return;
     }
-    const m = CL.state.model_precache[ent.entity.modelindex >> 0];
-    let f = (ent.entity.frame >> 0) - 1;
-    if (f < 0) {
-      f = 0;
+
+    const model = CL.state.model_precache[entity.entity.modelindex >> 0];
+
+    if (!model) {
+      return;
     }
-    ent.entity.frame = f;
-    Con.Print('frame ' + f + ': ' + m.frames[f].name + '\n');
-  };
 
-  static InitCommands() {
+    let nextFrame = (entity.entity.frame >> 0) - 1;
+
+    if (nextFrame < 0) {
+      nextFrame = 0;
+    }
+
+    entity.entity.frame = nextFrame;
+    Con.Print(`frame ${nextFrame}: ${model.frames[nextFrame].name}\n`);
+  }
+
+  static InitCommands(): void {
     if (registry.isDedicatedServer) { // TODO: move this to a dedicated stub for IN
       Cmd.AddCommand('bind', () => {});
       Cmd.AddCommand('unbind', () => {});
       Cmd.AddCommand('unbindall', () => {});
-
       Cmd.AddCommand('disconnect', Host.Disconnect_f);
     }
 
@@ -1634,45 +1828,44 @@ export default class Host {
     Cmd.AddCommand('prespawn', Host.PreSpawn_f);
     Cmd.AddCommand('kick', Host.Kick_f);
     Cmd.AddCommand('ping', Host.Ping_f);
+
     if (!registry.isDedicatedServer) {
       Cmd.AddCommand('load', Host.Loadgame_f);
       Cmd.AddCommand('save', Host.Savegame_f);
     }
+
     Cmd.AddCommand('give', Host.Give_f);
     Cmd.AddCommand('viewmodel', Host.Viewmodel_f);
     Cmd.AddCommand('viewframe', Host.Viewframe_f);
     Cmd.AddCommand('viewnext', Host.Viewnext_f);
     Cmd.AddCommand('viewprev', Host.Viewprev_f);
-    // Cmd.AddCommand('mcache', Mod.Print);
     Cmd.AddCommand('writeconfig', Host.WriteConfiguration_f);
     Cmd.AddCommand('configready', Host.ConfigReady_f);
 
-    Cmd.AddCommand('error', class extends ConsoleCommand {
-      run(message) {
+    Cmd.AddCommand('error', class HostErrorCommand extends ConsoleCommand {
+      override run(message = ''): void {
         throw new HostError(message);
       }
     });
 
-    Cmd.AddCommand('fatalerror', class extends ConsoleCommand {
-      run(message) {
+    Cmd.AddCommand('fatalerror', class HostFatalErrorCommand extends ConsoleCommand {
+      override run(message = ''): void {
         throw new Error(message);
       }
     });
 
-    Cmd.AddCommand('eb_topics', class extends ConsoleCommand {
-      run() {
-        // TODO: do not allow this command when server is having cheats disabled
-
+    Cmd.AddCommand('eb_topics', class HostEventBusTopicsCommand extends ConsoleCommand {
+      override run(): void {
+        // TODO: do not allow this command when server is having cheats disabled.
         for (const topic of eventBus.topics.sort()) {
-          Con.Print(topic + '\n');
+          Con.Print(`${topic}\n`);
         }
       }
     });
 
-    Cmd.AddCommand('eb_publish', class extends ConsoleCommand {
-      run(eventName, ...args) {
-        // TODO: do not allow this command when server is having cheats disabled
-
+    Cmd.AddCommand('eb_publish', class HostEventBusPublishCommand extends ConsoleCommand {
+      override run(eventName?: string, ...args: string[]): void {
+        // TODO: do not allow this command when server is having cheats disabled.
         if (!eventName) {
           Con.Print(`Usage: ${this.command} <eventName> [args...]\n`);
           return;
@@ -1686,5 +1879,5 @@ export default class Host {
         eventBus.publish(eventName, ...args);
       }
     });
-  };
+  }
 }
diff --git a/source/engine/main-browser.mjs b/source/engine/main-browser.mjs
index 4c2364b4..876d5ee7 100644
--- a/source/engine/main-browser.mjs
+++ b/source/engine/main-browser.mjs
@@ -3,7 +3,7 @@ import { registry, freeze as registryFreeze } from './registry.mjs';
 import Sys from './client/Sys.mjs';
 import COM from './common/Com.ts';
 import Con from './common/Console.ts';
-import Host from './common/Host.mjs';
+import Host from './common/Host.ts';
 import V from './client/V.mjs';
 import NET from './network/Network.ts';
 import SV from './server/Server.mjs';
diff --git a/source/engine/main-dedicated.mjs b/source/engine/main-dedicated.mjs
index 924fc3bf..75d2abfd 100644
--- a/source/engine/main-dedicated.mjs
+++ b/source/engine/main-dedicated.mjs
@@ -11,7 +11,7 @@ globalThis.Worker = Worker;
 import Sys from './server/Sys.mjs';
 import NodeCOM from './server/Com.mjs';
 import Con from './common/Console.ts';
-import Host from './common/Host.mjs';
+import Host from './common/Host.ts';
 import V from './client/V.mjs';
 import NET from './network/Network.ts';
 import SV from './server/Server.mjs';
diff --git a/source/engine/registry.mjs b/source/engine/registry.mjs
index 6a965dc9..024ed0b0 100644
--- a/source/engine/registry.mjs
+++ b/source/engine/registry.mjs
@@ -2,7 +2,7 @@
 /** @typedef {typeof import('./common/Console.ts').default} ConModule */
 /** @typedef {typeof import('./common/Com.ts').default} ComModule */
 /** @typedef {typeof import('./common/Sys.ts').default} SysModule */
-/** @typedef {typeof import('./common/Host.mjs').default} HostModule */
+/** @typedef {typeof import('./common/Host.ts').default} HostModule */
 /** @typedef {typeof import('./client/V.mjs').default} VModule */
 /** @typedef {typeof import('./network/Network').default} NetModule */
 /** @typedef {typeof import('./server/Server.mjs').default} ServerModule */
diff --git a/test/common/workers.test.mjs b/test/common/workers.test.mjs
index 176ce25b..f43baec4 100644
--- a/test/common/workers.test.mjs
+++ b/test/common/workers.test.mjs
@@ -80,7 +80,7 @@ async function withWorkerRegistry(consoleCapture, callback) {
     gamedir: [{ filename: 'id1', pack: [] }],
     game: 'id1',
     }),
-    Host: /** @type {typeof import('../../source/engine/common/Host.mjs').default} */ (/** @type {unknown} */ ({
+    Host: /** @type {typeof import('../../source/engine/common/Host.ts').default} */ (/** @type {unknown} */ ({
       crashes,
       HandleCrash(error) {
         crashes.push(error);

From f0d00cca6abed8c8b1036fd6d2b26a68828dd344 Mon Sep 17 00:00:00 2001
From: Christian R <github@chrisnew.de>
Date: Thu, 2 Apr 2026 22:27:04 +0300
Subject: [PATCH 25/67] TS: common/model/* and common/Mod

---
 source/engine/client/CL.mjs                   |   2 +-
 source/engine/client/ClientEntities.mjs       |   6 +-
 .../client/ClientServerCommandHandlers.mjs    |   4 +-
 source/engine/client/ClientState.mjs          |   2 +-
 source/engine/client/LegacyServerCommands.mjs |   2 +-
 source/engine/client/R.mjs                    |   6 +-
 .../client/renderer/AliasModelRenderer.mjs    |  16 +-
 .../client/renderer/BrushModelRenderer.mjs    |  16 +-
 .../client/renderer/MeshModelRenderer.mjs     |  10 +-
 .../engine/client/renderer/ModelRenderer.mjs  |  10 +-
 source/engine/client/renderer/ShadowMap.mjs   |   4 +-
 source/engine/client/renderer/Sky.mjs         |   2 +-
 .../client/renderer/SpriteModelRenderer.mjs   |  10 +-
 source/engine/common/CollisionModelSource.mjs |  16 +-
 source/engine/common/GameAPIs.mjs             |   4 +-
 source/engine/common/{Mod.mjs => Mod.ts}      | 182 ++--
 source/engine/common/Pmove.ts                 |   6 +-
 source/engine/common/WorkerFramework.ts       |   2 +-
 source/engine/common/model/AliasModel.mjs     |  70 --
 source/engine/common/model/AliasModel.ts      | 146 ++++
 source/engine/common/model/AreaPortals.mjs    | 294 -------
 source/engine/common/model/AreaPortals.ts     | 251 ++++++
 source/engine/common/model/BSP.mjs            | 715 +--------------
 source/engine/common/model/BSP.ts             | 821 ++++++++++++++++++
 source/engine/common/model/BaseModel.mjs      | 151 ----
 source/engine/common/model/BaseModel.ts       | 207 +++++
 source/engine/common/model/MeshModel.mjs      |  86 --
 source/engine/common/model/MeshModel.ts       | 132 +++
 source/engine/common/model/ModelLoader.mjs    |  67 --
 source/engine/common/model/ModelLoader.ts     |  44 +
 .../common/model/ModelLoaderRegistry.mjs      |  62 --
 .../common/model/ModelLoaderRegistry.ts       |  53 ++
 source/engine/common/model/SpriteModel.mjs    |  40 -
 source/engine/common/model/SpriteModel.ts     |  75 ++
 .../common/model/loaders/AliasMDLLoader.mjs   |  18 +-
 .../common/model/loaders/BSP29Loader.mjs      |   4 +-
 .../common/model/loaders/BSP2Loader.mjs       |   2 +-
 .../common/model/loaders/BSP38Loader.mjs      |  13 +-
 .../common/model/loaders/SpriteSPRLoader.mjs  |   4 +-
 .../model/loaders/WavefrontOBJLoader.mjs      |   8 +-
 source/engine/main-browser.mjs                |   2 +-
 source/engine/main-dedicated.mjs              |   2 +-
 source/engine/registry.mjs                    |   2 +-
 source/engine/server/Navigation.mjs           |   4 +-
 source/engine/server/Server.mjs               |   4 +-
 source/engine/server/physics/ServerArea.mjs   |   2 +-
 .../server/physics/ServerClientPhysics.mjs    |   2 +-
 .../engine/server/physics/ServerCollision.mjs |   4 +-
 .../server/physics/ServerCollisionSupport.mjs |   6 +-
 .../physics/ServerLegacyHullCollision.mjs     |   2 +-
 source/shared/GameInterfaces.ts               |   2 +-
 test/common/model-cache.test.mjs              |  20 +-
 test/physics/map-pmove-harness.mjs            |  18 +-
 test/physics/pmove.test.mjs                   |  80 +-
 54 files changed, 1974 insertions(+), 1739 deletions(-)
 rename source/engine/common/{Mod.mjs => Mod.ts} (57%)
 delete mode 100644 source/engine/common/model/AliasModel.mjs
 create mode 100644 source/engine/common/model/AliasModel.ts
 delete mode 100644 source/engine/common/model/AreaPortals.mjs
 create mode 100644 source/engine/common/model/AreaPortals.ts
 create mode 100644 source/engine/common/model/BSP.ts
 delete mode 100644 source/engine/common/model/BaseModel.mjs
 create mode 100644 source/engine/common/model/BaseModel.ts
 delete mode 100644 source/engine/common/model/MeshModel.mjs
 create mode 100644 source/engine/common/model/MeshModel.ts
 delete mode 100644 source/engine/common/model/ModelLoader.mjs
 create mode 100644 source/engine/common/model/ModelLoader.ts
 delete mode 100644 source/engine/common/model/ModelLoaderRegistry.mjs
 create mode 100644 source/engine/common/model/ModelLoaderRegistry.ts
 delete mode 100644 source/engine/common/model/SpriteModel.mjs
 create mode 100644 source/engine/common/model/SpriteModel.ts

diff --git a/source/engine/client/CL.mjs b/source/engine/client/CL.mjs
index 517e3ec8..9fffd086 100644
--- a/source/engine/client/CL.mjs
+++ b/source/engine/client/CL.mjs
@@ -12,7 +12,7 @@ import VID from './VID.mjs';
 import { clientRuntimeState, clientStaticState } from './ClientState.mjs';
 import ClientConnection from './ClientConnection.mjs';
 import ClientLifecycle from './ClientLifecycle.mjs';
-import { BrushModel } from '../common/Mod.mjs';
+import { BrushModel } from '../common/Mod.ts';
 // import { materialFlags, PBRMaterial, QuakeMaterial } from './renderer/Materials.mjs';
 /** @typedef {import('./Sound.mjs').SFX} SFX */
 
diff --git a/source/engine/client/ClientEntities.mjs b/source/engine/client/ClientEntities.mjs
index edc1b32c..4f8fe12e 100644
--- a/source/engine/client/ClientEntities.mjs
+++ b/source/engine/client/ClientEntities.mjs
@@ -8,7 +8,7 @@ import { BaseClientEdictHandler } from '../../shared/ClientEdict.ts';
 import { ClientEngineAPI } from '../common/GameAPIs.mjs';
 import { SFX } from './Sound.mjs';
 import { Node, revealedVisibility } from '../common/model/BSP.mjs';
-import { BaseModel } from '../common/model/BaseModel.mjs';
+import { BaseModel } from '../common/model/BaseModel.ts';
 
 let { CL, Con, Mod, PR, R, S } = registry;
 
@@ -70,7 +70,7 @@ export class ClientBeam {
   start = new Vector();
   end = new Vector();
 
-  /** @type {import('../common/model/BaseModel.mjs').BaseModel} what model to use to draw the beam */
+  /** @type {import('../common/model/BaseModel.ts').BaseModel} what model to use to draw the beam */
   model = null;
 
   /** @type {number} */
@@ -425,7 +425,7 @@ export default class ClientEntities {
     explosion: null,
   };
 
-  /** @type {Record<string, import('../common/Mod.mjs').BaseModel>} available tent models, initialized in initTempEntities */
+  /** @type {Record<string, import('../common/Mod.ts').BaseModel>} available tent models, initialized in initTempEntities */
   tempEntityModels = {};
 
   constructor() {
diff --git a/source/engine/client/ClientServerCommandHandlers.mjs b/source/engine/client/ClientServerCommandHandlers.mjs
index 34b0c4ce..4af8f9e7 100644
--- a/source/engine/client/ClientServerCommandHandlers.mjs
+++ b/source/engine/client/ClientServerCommandHandlers.mjs
@@ -332,7 +332,7 @@ function parseServerCvars() {
 
 /**
  * Parses beam-style temporary entities.
- * @param {import('../common/model/BaseModel.mjs').BaseModel} model Model to attach to the beam.
+ * @param {import('../common/model/BaseModel.ts').BaseModel} model Model to attach to the beam.
  */
 function parseBeam(model) {
   const ent = NET.message.readShort();
@@ -930,7 +930,7 @@ function handleCutscene() {
  * Calls the help command when the server requests the sell screen.
  */
 function handleSellScreen() {
-  Cmd.ExecuteString('help');
+  void Cmd.ExecuteString('help');
 }
 
 /**
diff --git a/source/engine/client/ClientState.mjs b/source/engine/client/ClientState.mjs
index 75f0a3dc..2e23a681 100644
--- a/source/engine/client/ClientState.mjs
+++ b/source/engine/client/ClientState.mjs
@@ -6,7 +6,7 @@ import Vector from '../../shared/Vector.ts';
 import { EventBus, eventBus, registry } from '../registry.mjs';
 import ClientEntities, { ClientEdict } from './ClientEntities.mjs';
 import { ClientMessages } from './ClientMessages.mjs';
-import { BrushModel } from '../common/Mod.mjs';
+import { BrushModel } from '../common/Mod.ts';
 
 let { CL } = registry;
 
diff --git a/source/engine/client/LegacyServerCommands.mjs b/source/engine/client/LegacyServerCommands.mjs
index 08e740dc..75037c22 100644
--- a/source/engine/client/LegacyServerCommands.mjs
+++ b/source/engine/client/LegacyServerCommands.mjs
@@ -581,7 +581,7 @@ function handleLegacyParticle() {
 
 /**
  * Parses a beam entity from the message buffer.
- * @param {import('../common/model/BaseModel.mjs').BaseModel} model beam model to use
+ * @param {import('../common/model/BaseModel.ts').BaseModel} model beam model to use
  */
 function parseLegacyBeam(model) {
   const ent = NET.message.readShort();
diff --git a/source/engine/client/R.mjs b/source/engine/client/R.mjs
index f8836b97..10ed32b1 100644
--- a/source/engine/client/R.mjs
+++ b/source/engine/client/R.mjs
@@ -146,7 +146,7 @@ R.RenderDlights = function() {
 };
 
 /**
- * @param {import('../common/model/BaseModel.mjs').Face} surf Surface to sample.
+ * @param {import('../common/model/BaseModel.ts').Face} surf Surface to sample.
  * @returns {Vector} A known point on the surface plane.
  */
 R.GetDynamicLightSurfacePoint = function(surf) {
@@ -161,7 +161,7 @@ R.GetDynamicLightSurfacePoint = function(surf) {
 
 /**
  * @param {ClientDlight} light Dynamic light being evaluated.
- * @param {import('../common/model/BaseModel.mjs').Face} surf Surface being tested.
+ * @param {import('../common/model/BaseModel.ts').Face} surf Surface being tested.
  * @returns {{distanceToPlane: number, impact: Vector}|null} Surface-plane hit information when the light is in front of the face.
  */
 R.GetDynamicLightSurfaceImpact = function(light, surf) {
@@ -180,7 +180,7 @@ R.GetDynamicLightSurfaceImpact = function(light, surf) {
 
 /**
  * @param {ClientDlight} light Dynamic light being evaluated.
- * @param {import('../common/model/BaseModel.mjs').Face} surf Surface being tested.
+ * @param {import('../common/model/BaseModel.ts').Face} surf Surface being tested.
  * @param {Vector} impact Projected point on the face plane.
  * @returns {boolean} True when the light has line of sight to the surface.
  */
diff --git a/source/engine/client/renderer/AliasModelRenderer.mjs b/source/engine/client/renderer/AliasModelRenderer.mjs
index 4716503d..16311f87 100644
--- a/source/engine/client/renderer/AliasModelRenderer.mjs
+++ b/source/engine/client/renderer/AliasModelRenderer.mjs
@@ -45,7 +45,7 @@ export class AliasModelRenderer extends ModelRenderer {
   }
 
   /**
-   * @param {import('../../common/model/AliasModel.mjs').AliasModel} _model The alias model
+   * @param {import('../../common/model/AliasModel.ts').AliasModel} _model The alias model
    * @param {import('../ClientEntities.mjs').ClientEdict} entity The entity being rendered
    * @returns {boolean} True when this alias model should render in the opaque pass
    */
@@ -54,7 +54,7 @@ export class AliasModelRenderer extends ModelRenderer {
   }
 
   /**
-   * @param {import('../../common/model/AliasModel.mjs').AliasModel} _model The alias model
+   * @param {import('../../common/model/AliasModel.ts').AliasModel} _model The alias model
    * @param {import('../ClientEntities.mjs').ClientEdict} entity The entity being rendered
    * @returns {boolean} True when this alias model should render in the sorted transparent pass
    */
@@ -65,7 +65,7 @@ export class AliasModelRenderer extends ModelRenderer {
   /**
    * Render a single alias model entity.
    * Handles frustum culling, frame interpolation, skinning, and player color translation.
-   * @param {import('../../common/model/AliasModel.mjs').AliasModel} model The alias model to render
+   * @param {import('../../common/model/AliasModel.ts').AliasModel} model The alias model to render
    * @param {import('../ClientEntities.mjs').ClientEdict} entity The entity being rendered
    * @param {number} pass Rendering pass (0=opaque, 1=transparent)
    */
@@ -182,7 +182,7 @@ export class AliasModelRenderer extends ModelRenderer {
 
   /**
    * Select animation frames for rendering with interpolation
-   * @param {import('../../common/model/AliasModel.mjs').AliasModel} clmodel The alias model
+   * @param {import('../../common/model/AliasModel.ts').AliasModel} clmodel The alias model
    * @param {import('../ClientEntities.mjs').ClientEdict} e The entity
    * @returns {{frameA: object, frameB: object, targettime: number}} Selected frames and interpolation factor
    */
@@ -230,7 +230,7 @@ export class AliasModelRenderer extends ModelRenderer {
   /**
    * Select skin texture for rendering (handles skin groups and animation)
    * @private
-   * @param {import('../../common/model/AliasModel.mjs').AliasModel} clmodel The alias model
+   * @param {import('../../common/model/AliasModel.ts').AliasModel} clmodel The alias model
    * @param {import('../ClientEntities.mjs').ClientEdict} e The entity
    * @returns {object} Selected skin texture
    */
@@ -276,19 +276,19 @@ export class AliasModelRenderer extends ModelRenderer {
 
   /**
    * Prepare alias model for rendering (build vertex buffers from triangle data).
-   * @param {import('../../common/model/AliasModel.mjs').AliasModel} model The alias model to prepare
+   * @param {import('../../common/model/AliasModel.ts').AliasModel} model The alias model to prepare
    * @param {boolean} isWorldModel Whether this model is the world model
    */
   // eslint-disable-next-line no-unused-vars
   prepareModel(model, isWorldModel = false) {
     // This will be implemented in a later task
-    // For now, vertex buffer building is still done in Mod.mjs
+    // For now, vertex buffer building is still done in Mod.ts
     Con.DPrint(`AliasModelRenderer.prepareModel: TODO - implement for ${model.name}\n`);
   }
 
   /**
    * Free GPU resources for this alias model.
-   * @param {import('../../common/model/AliasModel.mjs').AliasModel} model The alias model to cleanup
+   * @param {import('../../common/model/AliasModel.ts').AliasModel} model The alias model to cleanup
    */
   cleanupModel(model) {
     if (model.cmds) {
diff --git a/source/engine/client/renderer/BrushModelRenderer.mjs b/source/engine/client/renderer/BrushModelRenderer.mjs
index 49d0af67..957ac0dd 100644
--- a/source/engine/client/renderer/BrushModelRenderer.mjs
+++ b/source/engine/client/renderer/BrushModelRenderer.mjs
@@ -113,7 +113,7 @@ export class BrushModelRenderer extends ModelRenderer {
   /**
    * @private
    * @param {BrushModel} model Model containing the face.
-   * @param {import('../../common/model/BaseModel.mjs').Face} face Turbulent face being packed.
+   * @param {import('../../common/model/BaseModel.ts').Face} face Turbulent face being packed.
    * @returns {{tangent: Vector, bitangent: Vector}} Face-plane sampling basis.
    */
   static _getTurbulentFallbackBasis(model, face) {
@@ -134,7 +134,7 @@ export class BrushModelRenderer extends ModelRenderer {
       ? BrushModelRenderer._projectTurbulentFallbackAxis(new Vector(texinfo.vecs[1][0], texinfo.vecs[1][1], texinfo.vecs[1][2]), normal)
       : null;
 
-    const faceWithVerts = /** @type {import('../../common/model/BaseModel.mjs').Face & { verts?: number[][] }} */ (face);
+    const faceWithVerts = /** @type {import('../../common/model/BaseModel.ts').Face & { verts?: number[][] }} */ (face);
 
     if (tangent === null && faceWithVerts.verts && faceWithVerts.verts.length >= 2) {
       const edge = new Vector(
@@ -161,7 +161,7 @@ export class BrushModelRenderer extends ModelRenderer {
 
   /**
    * @param {BrushModel} model Model containing the face.
-   * @param {import('../../common/model/BaseModel.mjs').Face} face Turbulent face being packed.
+   * @param {import('../../common/model/BaseModel.ts').Face} face Turbulent face being packed.
    * @param {Vector} worldPos Vertex position used for the fallback sample.
    * @param {(position: Vector) => [Vector, Vector]} sampleLightPoint Light sampler callback.
    * @returns {number[]} Vertex-level fallback light color.
@@ -1986,7 +1986,7 @@ export class BrushModelRenderer extends ModelRenderer {
   /**
    * @private
    * @param {BrushModel} model Model containing the face.
-   * @param {import('../../common/model/BaseModel.mjs').Face} face Turbulent face being packed.
+   * @param {import('../../common/model/BaseModel.ts').Face} face Turbulent face being packed.
    * @returns {boolean} True when the face has usable baked lightmap samples.
    */
   _surfaceHasTurbulentLightmap(model, face) {
@@ -2003,7 +2003,7 @@ export class BrushModelRenderer extends ModelRenderer {
 
   /**
    * @private
-   * @param {import('../../common/model/BaseModel.mjs').Face} face Turbulent face being packed.
+   * @param {import('../../common/model/BaseModel.ts').Face} face Turbulent face being packed.
    * @param {Vector} worldPos Vertex position used for the fallback sample.
    * @returns {string} Cache key shared by coplanar turbulent edges.
    */
@@ -2022,7 +2022,7 @@ export class BrushModelRenderer extends ModelRenderer {
   /**
    * @private
    * @param {BrushModel} model Model containing the face.
-   * @param {import('../../common/model/BaseModel.mjs').Face} face Turbulent face being packed.
+   * @param {import('../../common/model/BaseModel.ts').Face} face Turbulent face being packed.
    * @returns {Vector} Approximate center used for face-level fallback smoothing.
    */
   _getTurbulentFallbackFaceCenter(model, face) {
@@ -2043,7 +2043,7 @@ export class BrushModelRenderer extends ModelRenderer {
   /**
    * @private
    * @param {BrushModel} model Model containing the face.
-   * @param {import('../../common/model/BaseModel.mjs').Face} face Turbulent face being packed.
+   * @param {import('../../common/model/BaseModel.ts').Face} face Turbulent face being packed.
    * @param {Map<string, number[]>} cache Shared per-model fallback cache.
    * @returns {number[]} Face-level fallback color.
    */
@@ -2055,7 +2055,7 @@ export class BrushModelRenderer extends ModelRenderer {
   /**
    * @private
    * @param {BrushModel} model Model containing the face.
-   * @param {import('../../common/model/BaseModel.mjs').Face} face Turbulent face being packed.
+   * @param {import('../../common/model/BaseModel.ts').Face} face Turbulent face being packed.
    * @param {Vector} worldPos Vertex position used for the fallback sample.
    * @param {Map<string, number[]>} [cache] Shared per-model fallback cache.
    * @returns {number[]} Vertex-level fallback light color.
diff --git a/source/engine/client/renderer/MeshModelRenderer.mjs b/source/engine/client/renderer/MeshModelRenderer.mjs
index 96602d12..ba3f73d4 100644
--- a/source/engine/client/renderer/MeshModelRenderer.mjs
+++ b/source/engine/client/renderer/MeshModelRenderer.mjs
@@ -44,7 +44,7 @@ export class MeshModelRenderer extends ModelRenderer {
   }
 
   /**
-   * @param {import('../../common/model/MeshModel.mjs').MeshModel} _model The mesh model
+   * @param {import('../../common/model/MeshModel.ts').MeshModel} _model The mesh model
    * @param {import('../ClientEntities.mjs').ClientEdict} _entity The entity being rendered
    * @returns {boolean} Mesh transparency is not implemented, so meshes stay in the opaque pass
    */
@@ -54,7 +54,7 @@ export class MeshModelRenderer extends ModelRenderer {
   }
 
   /**
-   * @param {import('../../common/model/MeshModel.mjs').MeshModel} _model The mesh model
+   * @param {import('../../common/model/MeshModel.ts').MeshModel} _model The mesh model
    * @param {import('../ClientEntities.mjs').ClientEdict} _entity The entity being rendered
    * @returns {boolean} False because sorted transparent mesh rendering is not implemented yet
    */
@@ -74,7 +74,7 @@ export class MeshModelRenderer extends ModelRenderer {
 
   /**
    * Render a single mesh model entity.
-   * @param {import('../../common/model/MeshModel.mjs').MeshModel} model The mesh model to render
+   * @param {import('../../common/model/MeshModel.ts').MeshModel} model The mesh model to render
    * @param {import('../ClientEntities.mjs').ClientEdict} entity The entity being rendered
    * @param {number} pass Rendering pass (0=opaque, 1=transparent)
    */
@@ -163,7 +163,7 @@ export class MeshModelRenderer extends ModelRenderer {
 
   /**
    * Prepare mesh model for rendering (build display lists, upload to GPU).
-   * @param {import('../../common/model/MeshModel.mjs').MeshModel} model The mesh model to prepare
+   * @param {import('../../common/model/MeshModel.ts').MeshModel} model The mesh model to prepare
    * @param {boolean} isWorldModel Whether this model is the world model
    */
   // eslint-disable-next-line no-unused-vars
@@ -281,7 +281,7 @@ export class MeshModelRenderer extends ModelRenderer {
   /**
    * Load texture for mesh model
    * @private
-   * @param {import('../../common/model/MeshModel.mjs').MeshModel} model The mesh model
+   * @param {import('../../common/model/MeshModel.ts').MeshModel} model The mesh model
    */
   _loadTexture(model) {
     // Try to load texture using the texture name
diff --git a/source/engine/client/renderer/ModelRenderer.mjs b/source/engine/client/renderer/ModelRenderer.mjs
index f8af53b5..8854b8bd 100644
--- a/source/engine/client/renderer/ModelRenderer.mjs
+++ b/source/engine/client/renderer/ModelRenderer.mjs
@@ -31,7 +31,7 @@ export class ModelRenderer {
   /**
    * Whether this model/entity pair should contribute to the opaque pass.
    * Renderers can override this when transparency is entity- or material-driven.
-   * @param {import('../../common/model/BaseModel.mjs').BaseModel} _model The model to evaluate
+   * @param {import('../../common/model/BaseModel.ts').BaseModel} _model The model to evaluate
    * @param {import('../ClientEntities.mjs').ClientEdict} _entity The entity to evaluate
    * @returns {boolean} True when the pair should render during the opaque pass
    */
@@ -43,7 +43,7 @@ export class ModelRenderer {
   /**
    * Whether this model/entity pair should contribute to the sorted transparent pass.
    * Sprites are handled by their dedicated pass and should normally return false here.
-   * @param {import('../../common/model/BaseModel.mjs').BaseModel} _model The model to evaluate
+   * @param {import('../../common/model/BaseModel.ts').BaseModel} _model The model to evaluate
    * @param {import('../ClientEntities.mjs').ClientEdict} _entity The entity to evaluate
    * @returns {boolean} True when the pair should render during the sorted transparent pass
    */
@@ -54,7 +54,7 @@ export class ModelRenderer {
 
   /**
    * Render a single entity with this model type.
-   * @param {import('../../common/model/BaseModel.mjs').BaseModel} _model The model to render
+   * @param {import('../../common/model/BaseModel.ts').BaseModel} _model The model to render
    * @param {import('../ClientEntities.mjs').ClientEdict} _entity The entity being rendered
    * @param {number} [_pass] Rendering pass (0=opaque, 1=transparent, etc.)
    */
@@ -77,7 +77,7 @@ export class ModelRenderer {
    * Prepare model for rendering (build display lists, upload to GPU, etc.).
    * Called when model is first loaded or needs rebuilding.
    * Uses global `gl` from registry.
-   * @param {import('../../common/model/BaseModel.mjs').BaseModel} _model The model to prepare
+   * @param {import('../../common/model/BaseModel.ts').BaseModel} _model The model to prepare
    * @param {boolean} isWorldModel Whether this model is the world model
    */
   // eslint-disable-next-line no-unused-vars
@@ -89,7 +89,7 @@ export class ModelRenderer {
    * Free GPU resources for this model.
    * Called when model is unloaded or needs cleanup.
    * Uses global `gl` from registry.
-   * @param {import('../../common/model/BaseModel.mjs').BaseModel} _model The model to cleanup
+   * @param {import('../../common/model/BaseModel.ts').BaseModel} _model The model to cleanup
    */
   // eslint-disable-next-line no-unused-vars
   cleanupModel(_model) {
diff --git a/source/engine/client/renderer/ShadowMap.mjs b/source/engine/client/renderer/ShadowMap.mjs
index 7985a7b8..33ad08e5 100644
--- a/source/engine/client/renderer/ShadowMap.mjs
+++ b/source/engine/client/renderer/ShadowMap.mjs
@@ -584,7 +584,7 @@ export default class ShadowMap {
   /**
    * Render an alias model entity (monster, item, weapon) into a shadow map.
    * Handles frame interpolation identically to AliasModelRenderer.
-   * @param {import('../../common/model/AliasModel.mjs').AliasModel} model
+   * @param {import('../../common/model/AliasModel.ts').AliasModel} model
    * @param {import('../ClientEntities.mjs').ClientEdict} entity
    * @param {Float64Array} lightSpaceMatrix
    * @param {string} programName
@@ -632,7 +632,7 @@ export default class ShadowMap {
 
   /**
    * Render a mesh model entity (glTF) into a shadow map.
-   * @param {import('../../common/model/MeshModel.mjs').MeshModel} model
+   * @param {import('../../common/model/MeshModel.ts').MeshModel} model
    * @param {import('../ClientEntities.mjs').ClientEdict} entity
    * @param {Float64Array} lightSpaceMatrix
    * @param {string} programName
diff --git a/source/engine/client/renderer/Sky.mjs b/source/engine/client/renderer/Sky.mjs
index 49187a1c..6e0ef02b 100644
--- a/source/engine/client/renderer/Sky.mjs
+++ b/source/engine/client/renderer/Sky.mjs
@@ -1,5 +1,5 @@
 import W from '../../common/W.ts';
-import { BrushModel } from '../../common/Mod.mjs';
+import { BrushModel } from '../../common/Mod.ts';
 import { eventBus, registry } from '../../registry.mjs';
 
 import GL, { ATTRIB_LOCATIONS, GLTexture } from '../GL.mjs';
diff --git a/source/engine/client/renderer/SpriteModelRenderer.mjs b/source/engine/client/renderer/SpriteModelRenderer.mjs
index 665a4581..8c1c5519 100644
--- a/source/engine/client/renderer/SpriteModelRenderer.mjs
+++ b/source/engine/client/renderer/SpriteModelRenderer.mjs
@@ -48,7 +48,7 @@ export class SpriteModelRenderer extends ModelRenderer {
   }
 
   /**
-   * @param {import('../../common/model/SpriteModel.mjs').SpriteModel} _model The sprite model
+   * @param {import('../../common/model/SpriteModel.ts').SpriteModel} _model The sprite model
    * @param {import('../ClientEntities.mjs').ClientEdict} _entity The entity being rendered
    * @returns {boolean} Sprites are never drawn in the opaque pass
    */
@@ -58,7 +58,7 @@ export class SpriteModelRenderer extends ModelRenderer {
   }
 
   /**
-   * @param {import('../../common/model/SpriteModel.mjs').SpriteModel} _model The sprite model
+   * @param {import('../../common/model/SpriteModel.ts').SpriteModel} _model The sprite model
    * @param {import('../ClientEntities.mjs').ClientEdict} _entity The entity being rendered
    * @returns {boolean} Sprites use their dedicated sprite pass rather than the sorted transparent pass
    */
@@ -70,7 +70,7 @@ export class SpriteModelRenderer extends ModelRenderer {
   /**
    * Render a single sprite model entity.
    * Generates billboard geometry dynamically based on camera orientation.
-   * @param {import('../../common/model/SpriteModel.mjs').SpriteModel} model The sprite model to render
+   * @param {import('../../common/model/SpriteModel.ts').SpriteModel} model The sprite model to render
    * @param {import('../ClientEntities.mjs').ClientEdict} entity The entity being rendered
    * @param {number} pass Rendering pass (0=opaque, 1=transparent)
    */
@@ -195,7 +195,7 @@ export class SpriteModelRenderer extends ModelRenderer {
   /**
    * Prepare sprite model for rendering.
    * Sprites use dynamic geometry, so no GPU resources to prepare.
-   * @param {import('../../common/model/SpriteModel.mjs').SpriteModel} _model The sprite model to prepare
+   * @param {import('../../common/model/SpriteModel.ts').SpriteModel} _model The sprite model to prepare
    * @param {boolean} isWorldModel Whether this model is the world model
    */
   // eslint-disable-next-line no-unused-vars
@@ -206,7 +206,7 @@ export class SpriteModelRenderer extends ModelRenderer {
   /**
    * Free GPU resources for this sprite model.
    * Sprites don't allocate GPU resources.
-   * @param {import('../../common/model/SpriteModel.mjs').SpriteModel} _model The sprite model to cleanup
+   * @param {import('../../common/model/SpriteModel.ts').SpriteModel} _model The sprite model to cleanup
    */
   // eslint-disable-next-line no-unused-vars
   cleanupModel(_model) {
diff --git a/source/engine/common/CollisionModelSource.mjs b/source/engine/common/CollisionModelSource.mjs
index 79b106a8..969ecbec 100644
--- a/source/engine/common/CollisionModelSource.mjs
+++ b/source/engine/common/CollisionModelSource.mjs
@@ -11,21 +11,21 @@ export class CollisionModelSource {
   /** @type {() => ServerEdict|null} */
   #getServerWorldEntity = () => null;
 
-  /** @type {() => import('./Mod.mjs').BrushModel|null} */
+  /** @type {() => import('./Mod.ts').BrushModel|null} */
   #getServerWorldModel = () => null;
 
-  /** @type {() => Array<import('./Mod.mjs').BrushModel|object|null>|null} */
+  /** @type {() => Array<import('./Mod.ts').BrushModel|object|null>|null} */
   #getServerModels = () => null;
 
-  /** @type {() => import('./Mod.mjs').BrushModel|null} */
+  /** @type {() => import('./Mod.ts').BrushModel|null} */
   #getClientWorldModel = () => null;
 
-  /** @type {() => Array<import('./Mod.mjs').BrushModel|object|null>|null} */
+  /** @type {() => Array<import('./Mod.ts').BrushModel|object|null>|null} */
   #getClientModels = () => null;
 
   /**
    * Install live server accessors.
-   * @param {{getWorldEntity?: () => ServerEdict|null, getWorldModel?: () => import('./Mod.mjs').BrushModel|null, getModels?: () => Array<import('./Mod.mjs').BrushModel|object|null>|null}} accessors server accessors
+   * @param {{getWorldEntity?: () => ServerEdict|null, getWorldModel?: () => import('./Mod.ts').BrushModel|null, getModels?: () => Array<import('./Mod.ts').BrushModel|object|null>|null}} accessors server accessors
    */
   configureServer(accessors = {}) {
     this.#getServerWorldEntity = accessors.getWorldEntity ?? (() => null);
@@ -35,7 +35,7 @@ export class CollisionModelSource {
 
   /**
    * Install live client accessors.
-   * @param {{getWorldModel?: () => import('./Mod.mjs').BrushModel|null, getModels?: () => Array<import('./Mod.mjs').BrushModel|object|null>|null}} accessors client accessors
+   * @param {{getWorldModel?: () => import('./Mod.ts').BrushModel|null, getModels?: () => Array<import('./Mod.ts').BrushModel|object|null>|null}} accessors client accessors
    */
   configureClient(accessors = {}) {
     this.#getClientWorldModel = accessors.getWorldModel ?? (() => null);
@@ -47,7 +47,7 @@ export class CollisionModelSource {
     return this.#getServerWorldEntity();
   }
 
-  /** @returns {import('./Mod.mjs').BrushModel|null} active static-world model */
+  /** @returns {import('./Mod.ts').BrushModel|null} active static-world model */
   getWorldModel() {
     return this.#getServerWorldModel()
       ?? this.#getClientWorldModel()
@@ -58,7 +58,7 @@ export class CollisionModelSource {
   /**
    * Resolve a model from the active runtime's model cache.
    * @param {number} modelIndex precached model index
-   * @returns {import('./Mod.mjs').BrushModel|object|null} resolved model, if any
+   * @returns {import('./Mod.ts').BrushModel|object|null} resolved model, if any
    */
   getModelByIndex(modelIndex) {
     return this.#getServerModels()?.[modelIndex]
diff --git a/source/engine/common/GameAPIs.mjs b/source/engine/common/GameAPIs.mjs
index fc51b63c..179a85c9 100644
--- a/source/engine/common/GameAPIs.mjs
+++ b/source/engine/common/GameAPIs.mjs
@@ -10,7 +10,7 @@ import { ED, ServerEdict } from '../server/Edict.mjs';
 import Cmd from './Cmd.ts';
 import Cvar from './Cvar.ts';
 import { HostError } from './Errors.ts';
-import Mod from './Mod.mjs';
+import Mod from './Mod.ts';
 import W from './W.ts';
 
 /** @typedef {import('../client/ClientEntities.mjs').ClientEdict} ClientEdict */
@@ -19,7 +19,7 @@ import W from './W.ts';
 /** @typedef {import('../network/MSG.ts').SzBuffer} SzBuffer */
 /** @typedef {import('../server/Navigation.mjs').Navigation} Navigation */
 /** @typedef {import('./model/parsers/ParsedQC.mjs').default} ParsedQC */
-/** @typedef {import('./model/BaseModel.mjs').BaseModel} BaseModel */
+/** @typedef {import('./model/BaseModel.ts').BaseModel} BaseModel */
 /** @typedef {import('../server/physics/ServerCollisionSupport.mjs').CollisionTrace} CollisionTrace */
 /**
  * @typedef ClientTraceOptions
diff --git a/source/engine/common/Mod.mjs b/source/engine/common/Mod.ts
similarity index 57%
rename from source/engine/common/Mod.mjs
rename to source/engine/common/Mod.ts
index 23729276..537a83f6 100644
--- a/source/engine/common/Mod.mjs
+++ b/source/engine/common/Mod.ts
@@ -1,6 +1,6 @@
-import { eventBus, registry } from '../registry.mjs';
+import { eventBus, getClientRegistry, getCommonRegistry, registry } from '../registry.mjs';
 import { MissingResourceError } from './Errors.ts';
-import { ModelLoaderRegistry } from './model/ModelLoaderRegistry.mjs';
+import { ModelLoaderRegistry } from './model/ModelLoaderRegistry.ts';
 import { AliasMDLLoader } from './model/loaders/AliasMDLLoader.mjs';
 import { SpriteSPRLoader } from './model/loaders/SpriteSPRLoader.mjs';
 import { BSP29Loader } from './model/loaders/BSP29Loader.mjs';
@@ -8,62 +8,66 @@ import { BSP2Loader } from './model/loaders/BSP2Loader.mjs';
 import { WavefrontOBJLoader } from './model/loaders/WavefrontOBJLoader.mjs';
 import ParsedQC from './model/parsers/ParsedQC.mjs';
 import { BSP38Loader } from './model/loaders/BSP38Loader.mjs';
+import type { BaseModel } from './model/BaseModel.ts';
 
-/** @typedef {import('./model/BaseModel.mjs').BaseModel} BaseModel */
-/** @typedef {'shared' | 'client' | 'server'} ModelScope */
-
-let { CL, COM } = registry;
+let { COM } = getCommonRegistry();
+let { CL } = getClientRegistry();
 
 eventBus.subscribe('registry.frozen', () => {
-  CL = registry.CL;
-  COM = registry.COM;
+  ({ COM } = getCommonRegistry());
+  ({ CL } = getClientRegistry());
 });
 
-// Re-export model classes for backward compatibility
-export { AliasModel } from './model/AliasModel.mjs';
-export { BrushModel } from './model/BSP.mjs';
-export { SpriteModel } from './model/SpriteModel.mjs';
-export { MeshModel } from './model/MeshModel.mjs';
-
-export default class Mod {
-  static type = { brush: 0, sprite: 1, alias: 2, mesh: 3 };
-
-  static scope = Object.freeze({
-    shared: 'shared',
-    client: 'client',
-    server: 'server',
-  });
-
-  static hull = {
-    /** hull0, point intersection */
-    normal: 0,
-    /** hull1, testing for player (32, 32, 56) */
-    player: 1,
-    /** hull2, testing for large objects (64, 64, 88) */
-    big: 2,
-    /** hull3, only used by BSP30 for crouching etc. (32, 32, 36) */
-    crouch: 3,
-  };
-
-  static known = /** @type {Record<string, BaseModel>} */ ({});
+export enum ModelType {
+  brush = 0,
+  sprite = 1,
+  alias = 2,
+  mesh = 3,
+}
 
-  static clientKnown = /** @type {Record<string, BaseModel>} */ ({});
+export enum ModelScope {
+  shared = 'shared',
+  client = 'client',
+  server = 'server',
+}
 
-  static serverKnown = /** @type {Record<string, BaseModel>} */ ({});
+export enum ModelHull {
+  normal = 0,
+  player = 1,
+  big = 2,
+  crouch = 3,
+}
 
-  static pendingLoads = /** @type {Record<string, Promise<BaseModel|null>>} */ ({});
+type ModelCache = Record<string, BaseModel>;
 
-  static modelLoaderRegistry = new ModelLoaderRegistry();
+// Re-export model classes for backward compatibility.
+export { AliasModel } from './model/AliasModel.ts';
+export { BrushModel } from './model/BSP.ts';
+export { SpriteModel } from './model/SpriteModel.ts';
+export { MeshModel } from './model/MeshModel.ts';
 
-  static IsSubmodelName(name) {
+/**
+ * Shared model cache and loading entry point.
+ */
+export default class Mod {
+  static type = ModelType;
+  static scope = ModelScope;
+  static hull = ModelHull;
+  static known: ModelCache = {};
+  static clientKnown: ModelCache = {};
+  static serverKnown: ModelCache = {};
+  static readonly pendingLoads: Record<string, Promise<BaseModel | null>> = {};
+  static readonly modelLoaderRegistry = new ModelLoaderRegistry();
+
+  static IsSubmodelName(name: string): boolean {
     return name[0] === '*';
   }
 
   /**
-   * @param {BaseModel} sharedModel shared cached model
-   * @returns {boolean} true when the model is a world brush model with inline submodels
+   * Returns true when the shared model is a world brush model with inline submodels.
+   * @returns True when the model is a world brush model with inline submodels.
    */
-  static IsBrushWorldModel(sharedModel) {
+  static IsBrushWorldModel(sharedModel: BaseModel): boolean {
     return sharedModel.type === Mod.type.brush
       && sharedModel.submodel !== true
       && Array.isArray(sharedModel.submodels)
@@ -71,11 +75,9 @@ export default class Mod {
   }
 
   /**
-   * @param {BaseModel} sharedWorld shared world model
-   * @param {BaseModel} scopedWorld scoped world model
-   * @param {ModelScope} scope requested scope
+   * Rebuilds scoped inline submodels against a scoped world view.
    */
-  static RegisterScopedSubmodels(sharedWorld, scopedWorld, scope) {
+  static RegisterScopedSubmodels(sharedWorld: BaseModel, scopedWorld: BaseModel, scope: ModelScope): void {
     if (!Mod.IsBrushWorldModel(sharedWorld)) {
       return;
     }
@@ -83,15 +85,15 @@ export default class Mod {
     const scopedCache = Mod.GetScopeCache(scope);
     scopedWorld.submodels = [];
 
-    for (let i = 0; i < sharedWorld.submodels.length; i++) {
-      const submodelName = `*${i + 1}`;
+    for (let index = 0; index < sharedWorld.submodels.length; index++) {
+      const submodelName = `*${index + 1}`;
       const existingScopedSubmodel = scopedCache[submodelName];
 
       if (existingScopedSubmodel) {
         existingScopedSubmodel.cleanupScopedView();
       }
 
-      const sharedSubmodel = sharedWorld.submodels[i];
+      const sharedSubmodel = sharedWorld.submodels[index];
       const scopedSubmodel = sharedSubmodel.createScopedView();
 
       scopedSubmodel.vertexes = scopedWorld.vertexes;
@@ -113,15 +115,15 @@ export default class Mod {
       scopedSubmodel.clusterPhsOffsets = scopedWorld.clusterPhsOffsets;
       scopedSubmodel.worldspawnInfo = scopedWorld.worldspawnInfo;
 
-      scopedWorld.submodels[i] = scopedSubmodel;
+      scopedWorld.submodels[index] = scopedSubmodel;
       scopedCache[submodelName] = scopedSubmodel;
     }
   }
 
-  static Init() {
+  static Init(): void {
     Mod.modelLoaderRegistry.clear();
     Mod.modelLoaderRegistry.register(new BSP38Loader());
-    Mod.modelLoaderRegistry.register(new BSP2Loader()); // Register BSP2 before BSP29 so it’s checked first (more specific format)
+    Mod.modelLoaderRegistry.register(new BSP2Loader()); // Register BSP2 before BSP29 so the more specific format wins.
     Mod.modelLoaderRegistry.register(new BSP29Loader());
     Mod.modelLoaderRegistry.register(new AliasMDLLoader());
     Mod.modelLoaderRegistry.register(new SpriteSPRLoader());
@@ -129,10 +131,10 @@ export default class Mod {
   }
 
   /**
-   * @param {ModelScope} scope requested model scope
-   * @returns {Record<string, BaseModel>} cache for the requested scope
+   * Returns the model cache for the requested scope.
+   * @returns The cache object for the requested scope.
    */
-  static GetScopeCache(scope) {
+  static GetScopeCache(scope: ModelScope): ModelCache {
     switch (scope) {
       case Mod.scope.client:
         return Mod.clientKnown;
@@ -144,13 +146,13 @@ export default class Mod {
   }
 
   /**
-   * @param {string} name model name
-   * @param {ModelScope} scope requested scope
-   * @returns {BaseModel|null} scoped model instance or null when unavailable
+   * Resolves the cached model instance for a scope, creating a scoped runtime
+   * view when needed.
+   * @returns The scoped model instance, or `null` when unavailable.
    */
-  static ResolveScopedModel(name, scope) {
+  static ResolveScopedModel(name: string, scope: ModelScope): BaseModel | null {
     if (scope === Mod.scope.shared) {
-      return Mod.known[name] || null;
+      return Mod.known[name] ?? null;
     }
 
     const scopedCache = Mod.GetScopeCache(scope);
@@ -175,7 +177,7 @@ export default class Mod {
     return scopedModel;
   }
 
-  static PruneSharedCache() {
+  static PruneSharedCache(): void {
     for (const name of Object.keys(Mod.known)) {
       if (Mod.clientKnown[name] || Mod.serverKnown[name]) {
         continue;
@@ -186,9 +188,9 @@ export default class Mod {
   }
 
   /**
-   * @param {ModelScope} [scope] scope to clear
+   * Clears cached models for a scope.
    */
-  static ClearAll(scope = Mod.scope.shared) {
+  static ClearAll(scope: ModelScope = Mod.scope.shared): void {
     if (scope === Mod.scope.shared) {
       for (const scopedScope of [Mod.scope.client, Mod.scope.server]) {
         Mod.ClearAll(scopedScope);
@@ -203,7 +205,7 @@ export default class Mod {
 
     const tempEnts = (() => {
       if (scope !== Mod.scope.client || registry.isDedicatedServer) {
-        return [];
+        return [] as string[];
       }
 
       return Object.keys(CL.state.clientEntities.tempEntityModels);
@@ -212,40 +214,34 @@ export default class Mod {
     const scopedCache = Mod.GetScopeCache(scope);
 
     for (const name of Object.keys(scopedCache)) {
-      const mod = scopedCache[name];
+      const model = scopedCache[name];
 
       if (tempEnts.includes(name)) {
         continue;
       }
 
-      mod.cleanupScopedView();
+      model.cleanupScopedView();
       delete scopedCache[name];
     }
 
     Mod.PruneSharedCache();
   }
 
-  static async LoadModelFromBuffer(name, buffer) {
-    // FIXME: maybe catch at least NotImplementedError here and give a better
-    //        error message, right now it will simply crash the whole engine
+  static async LoadModelFromBuffer(name: string, buffer: ArrayBuffer): Promise<BaseModel> {
     const model = await Mod.modelLoaderRegistry.load(buffer, name);
-
     Mod.RegisterModel(model);
-
     return model;
   }
 
-  static RegisterModel(model) {
+  static RegisterModel(model: BaseModel): void {
     Mod.known[model.name] = model;
   }
 
   /**
-   * @param {string} name model to load
-   * @param {boolean} crash whether to throw an error if the model is not found
-   * @param {ModelScope} scope requested cache scope
-   * @returns {Promise<BaseModel|null>} the loaded model or null if not found
+   * Loads a named model into the shared cache and returns the scoped instance.
+   * @returns The scoped model instance, or `null` when the load fails without crashing.
    */
-  static async LoadModelAsync(name, crash, scope = Mod.scope.shared) { // private method
+  static async LoadModelAsync(name: string, crash: boolean, scope: ModelScope = Mod.scope.shared): Promise<BaseModel | null> {
     const scopedModel = Mod.ResolveScopedModel(name, scope);
 
     if (scopedModel !== null) {
@@ -254,15 +250,17 @@ export default class Mod {
 
     if (Mod.pendingLoads[name] === undefined) {
       Mod.pendingLoads[name] = (async () => {
-        const buf = await COM.LoadFile(name);
-        if (buf === null) {
-          if (crash === true) {
+        const buffer = await COM.LoadFile(name);
+
+        if (buffer === null) {
+          if (crash) {
             throw new MissingResourceError(name);
           }
+
           return null;
         }
 
-        return await Mod.LoadModelFromBuffer(name, buf);
+        return await Mod.LoadModelFromBuffer(name, buffer);
       })().finally(() => {
         delete Mod.pendingLoads[name];
       });
@@ -278,24 +276,19 @@ export default class Mod {
   }
 
   /**
-   * Load submodels. For anything else, use Mod.ForNameAsync instead.
-   * @param {string} name filename
-   * @param {ModelScope} [scope] requested cache scope
-   * @returns {BaseModel|null} the loaded model or null if not found
+   * Resolves an inline submodel from the already loaded world model cache.
+   * @returns The scoped inline submodel, or `null` when it is unavailable.
    */
-  static ForName(name, scope = Mod.scope.shared) { // public method
+  static ForName(name: string, scope: ModelScope = Mod.scope.shared): BaseModel | null {
     console.assert(name[0] === '*', 'only submodels supported in Mod.ForName');
-
     return Mod.ResolveScopedModel(name, scope);
   }
 
   /**
-   * @param {string} name filename
-   * @param {boolean} crash whether to throw an error if the model is not found
-   * @param {ModelScope} [scope] requested cache scope
-   * @returns {Promise<BaseModel|null>} the loaded model or null if not found
+   * Returns the requested model, loading it first when necessary.
+   * @returns The requested model, or `null` when it cannot be loaded.
    */
-  static async ForNameAsync(name, crash = false, scope = Mod.scope.shared) { // public method
+  static async ForNameAsync(name: string, crash = false, scope: ModelScope = Mod.scope.shared): Promise<BaseModel | null> {
     if (name[0] === '*') {
       return Mod.ForName(name, scope);
     }
@@ -303,9 +296,8 @@ export default class Mod {
     return await Mod.LoadModelAsync(name, crash, scope);
   }
 
-  static ParseQC(qcContent) {
+  static ParseQC(qcContent: string) {
     const data = new ParsedQC();
-
     return data.parseQC(qcContent);
   }
 }
diff --git a/source/engine/common/Pmove.ts b/source/engine/common/Pmove.ts
index ab3ccc24..c425e094 100644
--- a/source/engine/common/Pmove.ts
+++ b/source/engine/common/Pmove.ts
@@ -12,7 +12,7 @@
 import Vector from '../../shared/Vector.ts';
 import * as Protocol from '../network/Protocol.ts';
 import { content } from '../../shared/Defs.ts';
-import { BrushModel } from './Mod.mjs';
+import { BrushModel } from './Mod.ts';
 import Cvar from './Cvar.ts';
 import { PmoveConfiguration } from '../../shared/Pmove.ts';
 
@@ -1384,8 +1384,8 @@ export class BrushTrace {
 
     let enterfrac = -1;
     let leavefrac = 1;
-    let clipplane: import('./model/BaseModel.mjs').Plane | null = null;
-    let tangentAxialPlane: import('./model/BaseModel.mjs').Plane | null = null;
+    let clipplane: import('./model/BaseModel.ts').Plane | null = null;
+    let tangentAxialPlane: import('./model/BaseModel.ts').Plane | null = null;
     let tangentAxialMovesDeeper = false;
 
     let getout = false;
diff --git a/source/engine/common/WorkerFramework.ts b/source/engine/common/WorkerFramework.ts
index e945b742..3d3fc654 100644
--- a/source/engine/common/WorkerFramework.ts
+++ b/source/engine/common/WorkerFramework.ts
@@ -1,7 +1,7 @@
 import type { URLs } from '../build-config';
 
 import { eventBus, registry } from '../registry.mjs';
-import Mod from './Mod.mjs';
+import Mod from './Mod.ts';
 import Sys from './Sys.ts';
 import COM, { type SearchPath } from './Com.ts';
 
diff --git a/source/engine/common/model/AliasModel.mjs b/source/engine/common/model/AliasModel.mjs
deleted file mode 100644
index c479e5e9..00000000
--- a/source/engine/common/model/AliasModel.mjs
+++ /dev/null
@@ -1,70 +0,0 @@
-import { BaseModel } from './BaseModel.mjs';
-
-/**
- * Alias model (.mdl) - Quake's animated mesh format.
- * Used for characters, monsters, weapons, and other animated models.
- */
-export class AliasModel extends BaseModel {
-  constructor(name) {
-    super(name);
-    this.type = 2; // Mod.type.alias
-  }
-
-  reset() {
-    super.reset();
-
-    // Private model data (used during loading)
-
-    /** @type {import('../../../shared/Vector.ts').default|null} Scale factors for vertices */
-    this._scale = null;
-
-    /** @type {import('../../../shared/Vector.ts').default|null} Origin offset for vertices */
-    this._scale_origin = null;
-
-    /** @type {number} Number of skins in file */
-    this._num_skins = 0;
-
-    /** @type {number} Skin texture width */
-    this._skin_width = 0;
-
-    /** @type {number} Skin texture height */
-    this._skin_height = 0;
-
-    /** @type {number} Number of vertices */
-    this._num_verts = 0;
-
-    /** @type {number} Number of triangles */
-    this._num_tris = 0;
-
-    /** @type {number} Number of frames in file */
-    this._frames = 0;
-
-    /** @type {Array<{facesfront: boolean, vertindex: number[]}>} Triangle definitions */
-    this._triangles = [];
-
-    /** @type {Array<{onseam: boolean, s: number, t: number}>} Texture coordinate vertices */
-    this._stverts = [];
-
-    // Public variables
-
-    /** @type {number} Model flags (CL requires that together with Mod.flags) */
-    this.flags = 0;
-
-    /** @type {boolean} Random frame selection */
-    this.random = false;
-
-    /** @type {Array} Animation frames (required by R, Host for name and interval) */
-    this.frames = [];
-
-    // Public variables just for rendering purposes (IDEA: refactor into ModelRenderer classes)
-
-    /** @type {Array} Skin textures (R requires that to pick the right texture) */
-    this.skins = [];
-
-    /** @type {number} Bounding radius (R requires that) */
-    this.boundingradius = 0;
-
-    /** @type {boolean} Is this a player model (R requires that to change colors) */
-    this.player = false;
-  }
-}
diff --git a/source/engine/common/model/AliasModel.ts b/source/engine/common/model/AliasModel.ts
new file mode 100644
index 00000000..01412b5b
--- /dev/null
+++ b/source/engine/common/model/AliasModel.ts
@@ -0,0 +1,146 @@
+import type { GLTexture } from '../../client/GL.mjs';
+
+import Vector from '../../../shared/Vector.ts';
+import { BaseModel } from './BaseModel.ts';
+
+interface AliasStVertex {
+  readonly onseam: boolean;
+  readonly s: number;
+  readonly t: number;
+}
+
+interface AliasTriangle {
+  readonly facesfront: boolean;
+  readonly vertindex: number[];
+}
+
+interface AliasPoseVertex {
+  readonly v: Vector;
+  readonly lightnormalindex: number;
+}
+
+interface AliasSingleFrame {
+  readonly group: false;
+  readonly bboxmin: Vector;
+  readonly bboxmax: Vector;
+  readonly name: string;
+  readonly v: AliasPoseVertex[];
+}
+
+interface AliasGroupedFrameEntry {
+  readonly interval: number;
+  readonly bboxmin: Vector;
+  readonly bboxmax: Vector;
+  readonly name: string;
+  readonly v: AliasPoseVertex[];
+}
+
+interface AliasGroupedFrame {
+  readonly group: true;
+  readonly bboxmin: Vector;
+  readonly bboxmax: Vector;
+  readonly frames: AliasGroupedFrameEntry[];
+}
+
+interface AliasSingleSkin {
+  readonly group: false;
+  readonly texturenum: GLTexture | null;
+  readonly luminanceTexture: GLTexture | null;
+  readonly translated?: Uint8Array;
+  readonly playertexture?: GLTexture | null;
+}
+
+interface AliasGroupedSkinEntry {
+  readonly interval: number;
+  readonly texturenum?: GLTexture | null;
+  readonly luminanceTexture?: GLTexture | null;
+  readonly translated?: Uint8Array;
+  readonly playertexture?: GLTexture | null;
+}
+
+interface AliasGroupedSkin {
+  readonly group: true;
+  readonly skins: AliasGroupedSkinEntry[];
+}
+
+export type AliasFrame = AliasSingleFrame | AliasGroupedFrame;
+export type AliasSkin = AliasSingleSkin | AliasGroupedSkin;
+
+/**
+ * Alias model (.mdl), Quake's animated triangle mesh format.
+ * Used for characters, monsters, weapons, and other animated models.
+ */
+export class AliasModel extends BaseModel {
+  /** Scale factors for vertices. */
+  override _scale: Vector | null = null;
+
+  /** Origin offset for vertices. */
+  override _scale_origin: Vector | null = null;
+
+  /** Number of skins in file. */
+  override _num_skins = 0;
+
+  /** Skin texture width. */
+  _skin_width = 0;
+
+  /** Skin texture height. */
+  _skin_height = 0;
+
+  /** Number of vertices. */
+  override _num_verts = 0;
+
+  /** Number of triangles. */
+  override _num_tris = 0;
+
+  /** Number of frames in file. */
+  _frames = 0;
+
+  /** Triangle definitions. */
+  _triangles: AliasTriangle[] = [];
+
+  /** Texture coordinate vertices. */
+  _stverts: AliasStVertex[] = [];
+
+  /** Model flags, used together with `Mod.flags` on the client. */
+  flags = 0;
+
+  /** True when animation frames should be selected randomly. */
+  random = false;
+
+  /** Animation frames used by rendering and host-side metadata lookups. */
+  frames: AliasFrame[] = [];
+
+  /** Skin textures used by the renderer. */
+  skins: AliasSkin[] = [];
+
+  /** Bounding radius consumed by the renderer. */
+  boundingradius = 0;
+
+  /** True when this is a player model that supports color translation. */
+  player = false;
+
+  constructor(name: string) {
+    super(name);
+    this.type = 2;
+  }
+
+  override reset(): void {
+    super.reset();
+    this._scale = null;
+    this._scale_origin = null;
+    this._num_skins = 0;
+    this._skin_width = 0;
+    this._skin_height = 0;
+    this._num_verts = 0;
+    this._num_tris = 0;
+    this._frames = 0;
+    this._triangles = [];
+    this._stverts = [];
+    this.flags = 0;
+    this.random = false;
+    this.frames = [];
+    this.skins = [];
+    this.boundingradius = 0;
+    this.player = false;
+  }
+}
diff --git a/source/engine/common/model/AreaPortals.mjs b/source/engine/common/model/AreaPortals.mjs
deleted file mode 100644
index ca0e22a8..00000000
--- a/source/engine/common/model/AreaPortals.mjs
+++ /dev/null
@@ -1,294 +0,0 @@
-import { eventBus } from '../../registry.mjs';
-
-/**
- * Manages area portal state and area connectivity for a BrushModel.
- *
- * Q2-style area portals: each leaf belongs to an area, and portals
- * connect pairs of areas. When a portal is closed (e.g. a door shuts),
- * the two areas become disconnected, blocking sound propagation and
- * optionally visibility even if PVS/PHS say otherwise.
- *
- * For BSP29/BSP2 maps (which lack area data), all leafs are in area 0
- * and everything is trivially connected.
- *
- * Portal groups: a single physical portal (e.g. a door) may separate
- * multiple area pairs when the map has more than one portal. Each
- * connection stores a `group` number identifying its physical portal.
- * The open/close state is tracked per group, so opening one physical
- * portal opens all its connections at once.
- *
- * Usage:
- *   if (phs.isRevealed(leafIndex) && areaPortals.areasConnected(srcArea, dstArea)) { ... }
- */
-export class AreaPortals {
-  /** @type {number} total number of areas in the map */
-  #numAreas = 0;
-
-  /**
-   * Per-group open reference count. A group is open when its count > 0.
-   * Index = group number (physical portal number).
-   * Multiple entities can hold the same portal open.
-   * @type {number[]}
-   */
-  #portalOpen = [];
-
-  /** @type {number} number of groups (physical portals) */
-  #numPortals = 0;
-
-  /**
-   * Portal connections: each entry connects two areas and belongs to a group.
-   * Multiple connections can share the same group (physical portal).
-   * @type {{ area0: number, area1: number, group: number }[]}
-   */
-  #connections = [];
-
-  /**
-   * Flood-fill reachability: floodnum[area] after flood.
-   * Two areas are connected iff they have the same floodnum and it is > 0.
-   * @type {number[]}
-   */
-  #floodNum = [];
-
-  /** @type {number} current flood generation counter */
-  #floodGeneration = 0;
-
-  /**
-   * Initialize the area portal system for a given map.
-   *
-   * Each portal entry may include an optional `group` field identifying
-   * the physical portal it belongs to. When omitted, each entry is
-   * treated as its own group (backward compatible with BSP38).
-   * @param {number} numAreas number of areas (from BSP areas lump or 1 for Q1)
-   * @param {{ area0: number, area1: number, group?: number }[]} portals portal definitions
-   * @param {number} [numGroups] number of physical portal groups (defaults to portals.length)
-   */
-  /**
-   * Adjacency list for fast graph traversal.
-   * Index = area number.
-   * Value = array of edges { target: number, group: number }.
-   * @type {Array<{ target: number, group: number }[]>}
-   */
-  #adjacency = [];
-
-  /**
-   * Initialize the area portal system for a given map.
-   *
-   * Each portal entry may include an optional `group` field identifying
-   * the physical portal it belongs to. When omitted, each entry is
-   * treated as its own group (backward compatible with BSP38).
-   * @param {number} numAreas number of areas (from BSP areas lump or 1 for Q1)
-   * @param {{ area0: number, area1: number, group?: number }[]} portals portal definitions
-   * @param {number} [numGroups] number of physical portal groups (defaults to portals.length)
-   */
-  init(numAreas, portals, numGroups) {
-    this.#numAreas = numAreas;
-
-    // Normalize connections and determine max group
-    this.#connections = [];
-    let calculatedMaxGroup = -1;
-
-    // Build adjacency list immediately for O(1) edge lookups
-    this.#adjacency = Array.from({ length: numAreas }, () => []);
-
-    for (let i = 0; i < portals.length; i++) {
-      const p = portals[i];
-      const area0 = p.area0;
-      const area1 = p.area1;
-      const group = p.group !== undefined ? p.group : i; // Default to unique group
-
-      // Store normalized connection (optional, purely for debug/serialization if needed)
-      this.#connections.push({ area0, area1, group });
-
-      // Populate adjacency graph (undirected)
-      if (area0 >= 0 && area0 < numAreas && area1 >= 0 && area1 < numAreas) {
-        this.#adjacency[area0].push({ target: area1, group });
-        this.#adjacency[area1].push({ target: area0, group });
-      }
-
-      if (group > calculatedMaxGroup) {
-        calculatedMaxGroup = group;
-      }
-    }
-
-    // Determine number of physical portal groups
-    this.#numPortals = numGroups !== undefined ? numGroups : (calculatedMaxGroup + 1);
-
-    this.#portalOpen = new Array(this.#numPortals).fill(0);
-    this.#floodNum = new Array(numAreas).fill(0);
-    this.#floodGeneration = 0;
-
-    // Initially all portals are closed (doors start closed).
-    // The server will send the correct state to clients during signon.
-    this.closeAll();
-  }
-
-  /**
-   * Open all portals (reset to fully connected state).
-   * This is the default after map load.
-   */
-  openAll() {
-    this.#portalOpen.fill(1);
-    this.#floodAreas();
-  }
-
-  /**
-   * Close all portals (fully disconnected).
-   */
-  closeAll() {
-    this.#portalOpen.fill(0);
-    this.#floodAreas();
-  }
-
-  /**
-   * Set a portal's open state. Uses reference counting so multiple
-   * entities can hold the same portal open.
-   * @param {number} portalNum portal index
-   * @param {boolean} open true to increment open count, false to decrement
-   */
-  setPortalState(portalNum, open) {
-    if (portalNum < 0 || portalNum >= this.#numPortals) {
-      return;
-    }
-
-    const oldState = this.#portalOpen[portalNum] > 0;
-
-    if (open) {
-      this.#portalOpen[portalNum]++;
-    } else {
-      this.#portalOpen[portalNum] = Math.max(0, this.#portalOpen[portalNum] - 1);
-    }
-
-    const newState = this.#portalOpen[portalNum] > 0;
-
-    // Only reflood if the effective open/closed state actually changed
-    if (oldState !== newState) {
-      this.#floodAreas();
-    }
-  }
-
-  /**
-   * Check whether two areas are connected through open portals.
-   * @param {number} area0 first area index
-   * @param {number} area1 second area index
-   * @returns {boolean} true if the areas are connected
-   */
-  areasConnected(area0, area1) {
-    // Same area is always connected
-    if (area0 === area1) {
-      return true;
-    }
-
-    // Area 0 (outside/solid) is considered connected to everything to avoid
-    // culling bugs when camera/entities clip into void.
-    // Also bounds check handles invalid areas gracefully.
-    if (area0 <= 0 || area0 >= this.#numAreas || area1 <= 0 || area1 >= this.#numAreas) {
-      return true;
-    }
-
-    // Connected if they share the same non-zero flood signature
-    const f0 = this.#floodNum[area0];
-    const f1 = this.#floodNum[area1];
-    return f0 > 0 && f1 > 0 && f0 === f1;
-  }
-
-  /**
-   * Check whether two leafs are connected through area portals.
-   * Convenience method that takes leaf nodes directly.
-   * @param {import('./BSP.mjs').Node} leaf0 first leaf
-   * @param {import('./BSP.mjs').Node} leaf1 second leaf
-   * @returns {boolean} true if the leafs' areas are connected
-   */
-  leafsConnected(leaf0, leaf1) {
-    return this.areasConnected(leaf0.area, leaf1.area);
-  }
-
-  /**
-   * Check whether a specific portal is currently open.
-   * @param {number} portalNum portal index
-   * @returns {boolean} true if the portal's open count is > 0
-   */
-  isPortalOpen(portalNum) {
-    if (portalNum < 0 || portalNum >= this.#numPortals) {
-      return false;
-    }
-
-    return this.#portalOpen[portalNum] > 0;
-  }
-
-  /**
-   * Get the number of areas.
-   * @returns {number} area count
-   */
-  get numAreas() {
-    return this.#numAreas;
-  }
-
-  /**
-   * Get the number of portals.
-   * @returns {number} portal count
-   */
-  get numPortals() {
-    return this.#numPortals;
-  }
-
-  /**
-   * Flood-fill areas through open portals to compute reachability.
-   * Two areas with the same non-zero floodNum are mutually reachable.
-   * Uses BFS to avoid recursion depth limits.
-   */
-  #floodAreas() {
-    this.#floodGeneration = 0;
-    this.#floodNum.fill(0);
-
-    // Reusable queue to avoid allocation in loop
-    // Note: In extremely large maps, a dedicated Queue class might be faster than Array.push/shift
-    // but for typical area counts (hundreds), array is fine.
-    const queue = [];
-
-    for (let startArea = 1; startArea < this.#numAreas; startArea++) {
-      // If area already visited by a previous flood, skip it
-      if (this.#floodNum[startArea] !== 0) {
-        continue;
-      }
-
-      this.#floodGeneration++;
-      const currentFloodId = this.#floodGeneration;
-
-      // Start BFS
-      this.#floodNum[startArea] = currentFloodId;
-      queue.push(startArea);
-
-      while (queue.length > 0) {
-        const u = queue.shift();
-        const neighbors = this.#adjacency[u];
-
-        // neighbors might be undefined if area index is weird, but we init all valid areas
-        if (!neighbors) {
-          continue;
-        }
-
-        for (const edge of neighbors) {
-          // Check if portal is blocked (group >= 0 means it's a switchable door)
-          // If group is out of bounds, treat it as a closed door
-          const isOpen = !(edge.group >= 0 && (edge.group >= this.#numPortals || this.#portalOpen[edge.group] <= 0));
-
-          if (!isOpen) {
-            continue; // Door is effectively closed
-          }
-
-          const v = edge.target;
-          if (this.#floodNum[v] === 0) {
-            this.#floodNum[v] = currentFloodId;
-            queue.push(v);
-          }
-        }
-      }
-    }
-
-    this.#emitChangeEvent();
-  }
-
-  #emitChangeEvent() {
-    eventBus.publish('areaportals.changed');
-  }
-}
diff --git a/source/engine/common/model/AreaPortals.ts b/source/engine/common/model/AreaPortals.ts
new file mode 100644
index 00000000..22275ea7
--- /dev/null
+++ b/source/engine/common/model/AreaPortals.ts
@@ -0,0 +1,251 @@
+import type { Node } from './BSP.ts';
+
+import { eventBus } from '../../registry.mjs';
+
+export interface PortalDefinition {
+  readonly area0: number;
+  readonly area1: number;
+  readonly group?: number;
+}
+
+interface PortalConnection {
+  readonly area0: number;
+  readonly area1: number;
+  readonly group: number;
+}
+
+interface AreaAdjacencyEdge {
+  readonly target: number;
+  readonly group: number;
+}
+
+/**
+ * Tracks area portal connectivity for brush worlds.
+ *
+ * Q2-style area portals assign each leaf to an area and use portals to
+ * connect pairs of areas. Closing a portal, such as when a door shuts,
+ * disconnects the affected areas and blocks sound propagation even when
+ * PVS or PHS alone would still relate them.
+ *
+ * For BSP29 and BSP2 maps that lack explicit area data, every leaf falls
+ * into area 0 and connectivity becomes trivially open.
+ *
+ * A portal can connect one or more area pairs through a shared group id so a
+ * single physical door can open or close multiple logical connections.
+ */
+export class AreaPortals {
+  /** Total number of areas in the loaded map. */
+  #numAreas = 0;
+
+  /**
+   * Per-group open reference count.
+   * A group is effectively open whenever its count is greater than zero.
+   */
+  #portalOpen: number[] = [];
+
+  /** Number of physical portal groups. */
+  #numPortals = 0;
+
+  /** Portal connections between area pairs. */
+  #connections: PortalConnection[] = [];
+
+  /** Flood-fill reachability signature for each area. */
+  #floodNum: number[] = [];
+
+  /** Current flood generation counter. */
+  #floodGeneration = 0;
+
+  /** Adjacency list used for flood-fill traversal. */
+  #adjacency: AreaAdjacencyEdge[][] = [];
+
+  /**
+   * Initializes the area portal graph for a map.
+   *
+   * Each portal entry can optionally provide a `group` field identifying the
+   * physical portal it belongs to. When omitted, the entry gets its own group,
+   * matching the older BSP38 behavior.
+   */
+  init(numAreas: number, portals: PortalDefinition[], numGroups?: number): void {
+    this.#numAreas = numAreas;
+    this.#connections = [];
+    this.#adjacency = Array.from({ length: numAreas }, () => []);
+
+    let calculatedMaxGroup = -1;
+
+    for (let index = 0; index < portals.length; index++) {
+      const portal = portals[index];
+      const group = portal.group !== undefined ? portal.group : index;
+
+      this.#connections.push({
+        area0: portal.area0,
+        area1: portal.area1,
+        group,
+      });
+
+      if (portal.area0 >= 0 && portal.area0 < numAreas && portal.area1 >= 0 && portal.area1 < numAreas) {
+        this.#adjacency[portal.area0].push({ target: portal.area1, group });
+        this.#adjacency[portal.area1].push({ target: portal.area0, group });
+      }
+
+      if (group > calculatedMaxGroup) {
+        calculatedMaxGroup = group;
+      }
+    }
+
+    this.#numPortals = numGroups !== undefined ? numGroups : calculatedMaxGroup + 1;
+    this.#portalOpen = new Array(this.#numPortals).fill(0);
+    this.#floodNum = new Array(numAreas).fill(0);
+    this.#floodGeneration = 0;
+
+    // The server will publish the real state during signon.
+    this.closeAll();
+  }
+
+  /**
+   * Opens every physical portal group.
+   */
+  openAll(): void {
+    this.#portalOpen.fill(1);
+    this.#floodAreas();
+  }
+
+  /**
+   * Closes every physical portal group.
+   */
+  closeAll(): void {
+    this.#portalOpen.fill(0);
+    this.#floodAreas();
+  }
+
+  /**
+   * Updates the open state of a portal group using reference counting.
+   * Multiple entities can hold the same physical portal open at once.
+   */
+  setPortalState(portalNum: number, open: boolean): void {
+    if (portalNum < 0 || portalNum >= this.#numPortals) {
+      return;
+    }
+
+    const wasOpen = this.#portalOpen[portalNum] > 0;
+
+    if (open) {
+      this.#portalOpen[portalNum]++;
+    } else {
+      this.#portalOpen[portalNum] = Math.max(0, this.#portalOpen[portalNum] - 1);
+    }
+
+    const isOpen = this.#portalOpen[portalNum] > 0;
+
+    if (wasOpen !== isOpen) {
+      this.#floodAreas();
+    }
+  }
+
+  /**
+   * Returns true when two areas are connected through open portals.
+   *
+   * Area 0 is treated as connected to everything to avoid culling bugs when
+   * the camera or entities clip into invalid space.
+   * @returns True when the two areas are mutually reachable.
+   */
+  areasConnected(area0: number, area1: number): boolean {
+    if (area0 === area1) {
+      return true;
+    }
+
+    // Area 0 (outside/solid) remains connected to everything to avoid culling
+    // glitches when the camera or entities clip into invalid space.
+    if (area0 <= 0 || area0 >= this.#numAreas || area1 <= 0 || area1 >= this.#numAreas) {
+      return true;
+    }
+
+    const flood0 = this.#floodNum[area0];
+    const flood1 = this.#floodNum[area1];
+    return flood0 > 0 && flood1 > 0 && flood0 === flood1;
+  }
+
+  /**
+   * Convenience wrapper that checks connectivity by leaf area ids.
+   * @returns True when the two leaf areas are mutually reachable.
+   */
+  leafsConnected(leaf0: Node, leaf1: Node): boolean {
+    return this.areasConnected(leaf0.area, leaf1.area);
+  }
+
+  /**
+   * Returns true when the portal group is currently open.
+   * @returns True when the portal group's open count is above zero.
+   */
+  isPortalOpen(portalNum: number): boolean {
+    if (portalNum < 0 || portalNum >= this.#numPortals) {
+      return false;
+    }
+
+    return this.#portalOpen[portalNum] > 0;
+  }
+
+  get numAreas(): number {
+    return this.#numAreas;
+  }
+
+  get numPortals(): number {
+    return this.#numPortals;
+  }
+
+  /**
+   * Recomputes reachability by flooding through currently open portal groups.
+   * Uses breadth-first traversal to avoid recursion depth issues.
+   */
+  #floodAreas(): void {
+    this.#floodGeneration = 0;
+    this.#floodNum.fill(0);
+
+    const queue: number[] = [];
+
+    for (let startArea = 1; startArea < this.#numAreas; startArea++) {
+      if (this.#floodNum[startArea] !== 0) {
+        continue;
+      }
+
+      this.#floodGeneration++;
+      const currentFloodId = this.#floodGeneration;
+      this.#floodNum[startArea] = currentFloodId;
+      queue.push(startArea);
+
+      while (queue.length > 0) {
+        const area = queue.shift();
+
+        if (area === undefined) {
+          break;
+        }
+
+        const neighbors = this.#adjacency[area];
+
+        if (!neighbors) {
+          continue;
+        }
+
+        for (const edge of neighbors) {
+          const isOpen = !(edge.group >= 0 && (edge.group >= this.#numPortals || this.#portalOpen[edge.group] <= 0));
+
+          if (!isOpen) {
+            continue;
+          }
+
+          if (this.#floodNum[edge.target] !== 0) {
+            continue;
+          }
+
+          this.#floodNum[edge.target] = currentFloodId;
+          queue.push(edge.target);
+        }
+      }
+    }
+
+    this.#emitChangeEvent();
+  }
+
+  #emitChangeEvent(): void {
+    eventBus.publish('areaportals.changed');
+  }
+}
diff --git a/source/engine/common/model/BSP.mjs b/source/engine/common/model/BSP.mjs
index c8277f23..224f42b0 100644
--- a/source/engine/common/model/BSP.mjs
+++ b/source/engine/common/model/BSP.mjs
@@ -1,714 +1 @@
-import { BaseMaterial } from '../../client/renderer/Materials.mjs';
-import { content } from '../../../shared/Defs.ts';
-import { BaseModel } from './BaseModel.mjs';
-import { SkyRenderer } from '../../client/renderer/Sky.mjs';
-import { AreaPortals } from './AreaPortals.mjs';
-
-/** @typedef {import('../../../shared/Vector.ts').default} Vector */
-/** @typedef {import('./BaseModel.mjs').Face} Face */
-/** @typedef {import('./BaseModel.mjs').Plane} Plane */
-
-/**
- * @typedef {object} Clipnode
- * @property {number} planenum - Index into planes array
- * @property {number[]} children - Child node indices [front, back]
- */
-
-/**
- * @typedef {object} Hull
- * @property {Clipnode[]} clipnodes - Clipnodes for this hull
- * @property {Plane[]} planes - Planes for collision detection
- * @property {number} [firstclipnode] - Index of first clipnode (optional)
- * @property {number} lastclipnode - Index of last clipnode
- * @property {Vector} clip_mins - Minimum bounding box for this hull
- * @property {Vector} clip_maxs - Maximum bounding box for this hull
- */
-
-/**
- * @typedef {Record<string, string>} WorldspawnInfo
- * Parsed worldspawn entity key-value pairs
- */
-
-/**
- * @typedef {object} FogVolumeInfo
- * @property {number} modelIndex - The inline brush model index (from *N notation), 0 for world water
- * @property {number[]} color - Fog color as [r, g, b] in 0-255 range
- * @property {number} density - Fog density for exponential falloff
- * @property {number} maxOpacity - Maximum fog opacity (0-1 clamped)
- * @property {number[]} mins - AABB minimum corner [x, y, z]
- * @property {number[]} maxs - AABB maximum corner [x, y, z]
- */
-
-/**
- * @typedef {object} WorldTurbulentChainInfo
- * @property {number} texture Texture index used by the draw batch
- * @property {number} firstVertex First vertex in the turbulent VBO region
- * @property {number} vertexCount Number of vertices in the draw batch
- * @property {Vector} mins Tight world-space bounds minimum
- * @property {Vector} maxs Tight world-space bounds maximum
- */
-
-/**
- * @typedef {Record<string, {fileofs: number, filelen: number}>} BSPXLumps
- * BSPX extended lump data (RGBLIGHTING, LIGHTINGDIR, etc.)
- */
-
-const VISDATA_SIZE = 1024; // fallback for singleton Visibility instances (no model)
-
-/**
- * Visibility data for PVS/PHS.
- * Stored as cluster-indexed bits. Each bit corresponds to a cluster;
- * leaf → cluster mapping is resolved via the owning BrushModel.
- */
-export class Visibility {
-  #data = new Uint8Array(VISDATA_SIZE);
-
-  #model = /** @type {BrushModel} */ (null);
-
-  /** @type {boolean} when set, isRevealed/areRevealed always return true */
-  #unconditionalReveal = false;
-
-  constructor(model = null) {
-    this.#model = model;
-
-    if (model !== null) {
-      const clusterBytes = Math.max((model.numclusters + 7) >> 3, 1);
-      this.#data = new Uint8Array(clusterBytes);
-
-      if (model.visdata === null) {
-        this.revealAll();
-      }
-    }
-  }
-
-  /**
-   * Create a Visibility instance from RLE-compressed cluster PVS data.
-   * @param {BrushModel} model map model
-   * @param {number} visofs byte offset into sourceData
-   * @param {Uint8Array} sourceData compressed vis data (defaults to model.visdata)
-   * @returns {Visibility} visibility instance
-   */
-  static fromBrushModel(model, visofs, sourceData = model.visdata) {
-    console.assert(model instanceof BrushModel);
-
-    const modelVisSize = (model.numclusters + 7) >> 3;
-    const visibility = new Visibility(model);
-
-    if (sourceData !== null && visofs >= 0) {
-      for (let _out = 0, _in = visofs; _out < modelVisSize;) {
-        // Bounds check to prevent reading past end of sourceData
-        // Note: It's normal for visibility data to end before modelVisSize is filled;
-        // remaining bytes stay zero, which is correct for unvisible clusters.
-        if (_in >= sourceData.length) {
-          break;
-        }
-
-        if (sourceData[_in] !== 0) {
-          visibility.#data[_out++] = sourceData[_in++];
-          continue;
-        }
-
-        // RLE: 0 byte followed by count of zeros
-        if (_in + 1 >= sourceData.length) {
-          // End of RLE data; remaining output stays zero (unvisible)
-          break;
-        }
-
-        for (let c = sourceData[_in + 1]; c > 0; c--) {
-          visibility.#data[_out++] = 0x00;
-        }
-
-        _in += 2;
-      }
-    }
-
-    return visibility;
-  }
-
-  /**
-   * Will reveal all clusters.
-   * @returns {Visibility} this
-   */
-  revealAll() {
-    this.#data.fill(0xff);
-    this.#unconditionalReveal = true;
-
-    return this;
-  }
-
-  /**
-   * Will hide all clusters.
-   * @returns {Visibility} this
-   */
-  hideAll() {
-    this.#data.fill(0x00);
-
-    return this;
-  }
-
-  /**
-   * Recursive helper for addFatPoint.
-   * @param {Vector} p point in world
-   * @param {Node} node current BSP node
-   */
-  #addToFatPoint(p, node) {
-    while (true) {
-      if (node.contents < 0) {
-        if (node.contents !== content.CONTENT_SOLID && node.cluster >= 0) {
-          const visofs = this.#model.clusterPvsOffsets[node.cluster];
-          const vis = Visibility.fromBrushModel(this.#model, visofs);
-
-          for (let i = 0; i < this.#data.length; i++) { // merge visibility from node to ours
-            this.#data[i] |= vis.#data[i];
-          }
-        }
-        return;
-      }
-
-      const normal = node.plane.normal;
-      const d = p.dot(normal) - node.plane.dist;
-
-      if (d > 8.0) {
-        node = node.children[0];
-        continue;
-      }
-
-      if (d < -8.0) {
-        node = node.children[1];
-        continue;
-      }
-
-      this.#addToFatPoint(p, node.children[0]);
-      node = node.children[1];
-    }
-  }
-
-  /**
-   * Adds a point to the visibility, merging visibility from all leafs connected.
-   * @param {Vector} p point in world
-   * @returns {Visibility} this
-   */
-  addFatPoint(p) {
-    this.#addToFatPoint(p, this.#model.nodes[0]);
-
-    return this;
-  }
-
-  /**
-   * Check if any of the given leaf indices have visible clusters.
-   * @param {number[]} leafIndices leaf array indices (Node.num values)
-   * @returns {boolean} whether any of the given leafs are revealed
-   */
-  areRevealed(leafIndices) {
-    if (this.#unconditionalReveal) {
-      return leafIndices.length > 0;
-    }
-
-    if (this.#model === null) {
-      // Sentinel fallback (hiddenVisibility)
-      for (let i = 0; i < leafIndices.length; i++) {
-        if ((this.#data[leafIndices[i] >> 3] & (1 << (leafIndices[i] & 7))) !== 0) {
-          return true;
-        }
-      }
-      return false;
-    }
-
-    for (let i = 0; i < leafIndices.length; i++) {
-      const cluster = this.#model.leafs[leafIndices[i]].cluster;
-
-      if (cluster < 0) {
-        continue;
-      }
-
-      if ((this.#data[cluster >> 3] & (1 << (cluster & 7))) !== 0) {
-        return true;
-      }
-    }
-
-    return false;
-  }
-
-  /**
-   * Check if a given leaf is revealed via its cluster.
-   * @param {number} leafIndex leaf array index (Node.num)
-   * @returns {boolean} whether the given leaf is revealed
-   */
-  isRevealed(leafIndex) {
-    if (this.#unconditionalReveal) {
-      return true;
-    }
-
-    if (this.#model === null) {
-      // Sentinel fallback (hiddenVisibility)
-      return (this.#data[leafIndex >> 3] & (1 << (leafIndex & 7))) !== 0;
-    }
-
-    const cluster = this.#model.leafs[leafIndex].cluster;
-
-    if (cluster < 0) {
-      return false;
-    }
-
-    return (this.#data[cluster >> 3] & (1 << (cluster & 7))) !== 0;
-  }
-};
-
-/** @type {Visibility} @readonly */
-export const revealedVisibility = (new Visibility()).revealAll();
-
-/** @type {Visibility} @readonly */
-export const hiddenVisibility = (new Visibility()).hideAll();
-
-export class BrushModelComponent {
-  /**
-   * @param {BrushModel} brushmodel parent brush model
-   */
-  constructor(brushmodel) {
-    /** @type {BrushModel} owning brush model @protected */
-    this._brushmodel = brushmodel;
-  }
-};
-
-/**
- * BSP tree node aka. BSP leaf
- */
-export class Node extends BrushModelComponent {
-  /** @type {number} node index in the nodes array */
-  num = 0;
-
-  /** @type {number} */
-  contents = 0;
-  /** @type {number} index into planes array */
-  planenum = 0;
-  /** @type {Plane} splitting plane */
-  plane = null;
-  /** @type {Node|null} parent node */
-  parent = null;
-  /** @type {Node[]} frontside, backside - numbers during loading, Node refs after */
-  children = [null, null];
-  /** @type {number} visibility offset for PVS */
-  visofs = 0;
-  /** @type {Vector|null} minimum bounding box */
-  mins = null;
-  /** @type {Vector|null} maximum bounding box */
-  maxs = null;
-  /** @type {Vector|null} immutable bounds loaded from BSP data */
-  baseMins = null;
-  /** @type {Vector|null} immutable bounds loaded from BSP data */
-  baseMaxs = null;
-  /** @type {number} first marksurface index (for leafs), aka firstleafface */
-  firstmarksurface = 0;
-  /** @type {number} number of marksurfaces (for leafs), aka numleaffaces */
-  nummarksurfaces = 0;
-  /** @type {number} first face index (for nodes) */
-  firstface = 0;
-  /** @type {number} number of faces (for nodes) */
-  numfaces = 0;
-  /** @type {number[]} ambient sound levels [water, sky, slime, lava] */
-  ambient_level = [0, 0, 0, 0];
-
-  // === Renderer related ===
-  /** @type {number} used by the renderer to determine what to draw */
-  markvisframe = 0;
-  /** @type {number} used by the renderer to determine what to draw */
-  visframe = 0;
-  /** @type {number} index into skychain list */
-  skychain = 0;
-  /** @type {number} index into waterchain list */
-  waterchain = 0;
-  /** @type {number[]} render command list */
-  cmds = [];
-  /** @type {WorldTurbulentChainInfo[]} tight turbulent draw batches for sorted world rendering */
-  turbulentChains = [];
-
-  // === Quake 2 based features ===
-  /** @type {number} cluster for PVS */
-  cluster = 0;
-  /** @type {number} area for area portals */
-  area = 0;
-  /** @type {number} first leaf brush index */
-  firstleafbrush = 0;
-  /** @type {number} number of leaf brushes */
-  numleafbrushes = 0;
-
-  *facesIter() {
-    for (let i = 0; i < this.numfaces; i++) {
-      yield this._brushmodel.faces[this.firstface + i];
-    }
-  }
-
-  /**
-   * Reset renderer-owned runtime state on this BSP node/leaf.
-   * Leaf bounds may be expanded during display-list packing, so restore them
-   * from the immutable BSP bounds before rebuilding world render chains.
-   */
-  resetRenderState() {
-    this.markvisframe = 0;
-    this.visframe = 0;
-    this.skychain = 0;
-    this.waterchain = 0;
-    this.cmds.length = 0;
-    this.turbulentChains.length = 0;
-
-    if (this.mins !== null && this.baseMins !== null) {
-      this.mins.set(this.baseMins);
-    }
-
-    if (this.maxs !== null && this.baseMaxs !== null) {
-      this.maxs.set(this.baseMaxs);
-    }
-  }
-};
-
-export class BrushSide extends BrushModelComponent {
-  /** @type {number} plane index, facing leaf outwards */
-  planenum = 0;
-  /** @type {number} texture info index */
-  texinfo = 0;
-};
-
-export class Brush extends BrushModelComponent {
-  /** @type {number} first brush side index */
-  firstside = 0;
-  /** @type {number} number of brush sides */
-  numsides = 0;
-  /** @type {number} contents flags, see Def.contents */
-  contents = 0;
-  /** @type {Vector|null} axis-aligned bounding box minimum */
-  mins = null;
-  /** @type {Vector|null} axis-aligned bounding box maximum */
-  maxs = null;
-  /** @type {number} BrushTrace dedup counter to avoid testing the same brush twice */
-  _brushTraceCheck = 0;
-
-  *sidesIter() {
-    for (let i = 0; i < this.numsides; i++) {
-      yield this._brushmodel.brushsides[this.firstside + i];
-    }
-  }
-};
-
-/**
- * Base class for brush-based models (BSP maps)
- * All loading is handled by BSP29Loader.mjs
- */
-export class BrushModel extends BaseModel {
-  /** @type {number} BSP format version */
-  version = null;
-
-  /** @type {number} Bounding radius for culling */
-  radius = 0;
-
-  /** @type {Plane[]} All planes in the BSP tree */
-  planes = [];
-
-  /** @type {Face[]} All visible faces/surfaces */
-  faces = [];
-
-  /** @type {Vector[]} All vertex positions */
-  vertexes = [];
-
-  /** @type {number[][]} Edge vertex indices [v1, v2] */
-  edges = [];
-
-  /** @type {number[]} Surface edge list (index into edges, negative = reverse) */
-  surfedges = [];
-
-  /** @type {Node[]} BSP tree nodes */
-  nodes = [];
-
-  /** @type {Node[]} BSP leaf nodes */
-  leafs = [];
-
-  /** @type {BaseMaterial[]} Texture information */
-  textures = [];
-
-  /** @type {any[]} Texture coordinate info per face */
-  texinfo = [];
-
-  /** @type {number[]} Face indices visible from each leaf */
-  marksurfaces = [];
-
-  /** @type {Uint8Array} Lightmap data (grayscale) */
-  lightdata = null;
-
-  /** @type {Uint8Array} Lightmap data (RGB) */
-  lightdata_rgb = null;
-
-  /** @type {Uint8Array} Deluxemap data (normals) */
-  deluxemap = null;
-
-  /** @type {object|null} Lightgrid octree data */
-  lightgrid = null;
-
-  /** @type {Uint8Array} Visibility data for PVS */
-  visdata = null;
-
-  /** @type {Clipnode[]} Clipnodes for collision detection */
-  clipnodes = [];
-
-  /** @type {Hull[]} Collision hulls for physics (hull0, hull1, hull2) */
-  hulls = [];
-
-  /** @type {BrushModel[]} Submodels (brush entities) */
-  submodels = [];
-
-  /** @type {number} First face index for this submodel */
-  firstface = 0;
-
-  /** @type {number} Number of faces in this submodel */
-  numfaces = 0;
-
-  /** @type {string} Entity lump as string */
-  entities = null;
-
-  /** @type {WorldspawnInfo} Parsed worldspawn entity properties */
-  worldspawnInfo = {};
-
-  /** @type {number} Offset for BSPX extended data */
-  bspxoffset = 0;
-
-  /** @type {BSPXLumps} BSPX extended lumps */
-  bspxlumps = null;
-
-  /** @type {boolean} Whether this is an inline submodel (brush entity) vs the world */
-  submodel = false;
-
-  /** @type {Array<number[]>} Rendering chains (texture batches) for optimized drawing */
-  chains = [];
-
-  /** @type {number} Offset into vertex buffer for turbulent surfaces (water, slime, lava) */
-  waterchain = 0;
-
-  /** @type {number} Offset into vertex buffer for sky surfaces */
-  skychain = 0;
-
-  /** @type {boolean} Whether RGB lighting is used */
-  coloredlights = false;
-
-  /** @type {number} Number of visibility clusters */
-  numclusters = 0;
-
-  /** @type {number[]|null} PVS byte offset per cluster into visdata */
-  clusterPvsOffsets = null;
-
-  /** @type {Uint8Array|null} PHS (Potentially Hearable Set) data, cluster-indexed RLE */
-  phsdata = null;
-
-  /** @type {number[]|null} PHS byte offset per cluster into phsdata */
-  clusterPhsOffsets = null;
-
-  /** @type {number} Number of areas for area portals */
-  numAreas = 0;
-
-  /** @type {{ area0: number, area1: number, group?: number }[]} Area portal definitions */
-  portalDefs = [];
-
-  /** @type {AreaPortals} Area portal connectivity manager */
-  areaPortals = new AreaPortals();
-
-  /** @type {Record<string, number>} Maps brush model names (e.g. "*1") to auto-assigned portal numbers */
-  modelPortalMap = {};
-
-  /** @type {FogVolumeInfo[]} Fog volume brush entities parsed from the BSP entity lump */
-  fogVolumes = [];
-
-  /** @type {number[]|null} Leaf brushes, useful for PHS/PVS (optional) */
-  leafbrushes = null;
-
-  /** @type {BrushSide[]|null} Brush sides (optional) */
-  brushsides = null;
-
-  /** @type {Brush[]|null} Brushes (optional) */
-  brushes = null;
-
-  /** @type {number} First brush index in the shared brushes array for this model */
-  firstBrush = 0;
-
-  /** @type {number} Number of brushes belonging to this model */
-  numBrushes = 0;
-
-  /**
-   * Whether this model has complete brush-based collision data.
-   * When true, Q2-style brush tracing can be used instead of Q1-style hull tracing.
-   * Requires brushes, brushsides, leafbrushes arrays plus nodes with leaf brush references.
-   * @returns {boolean} true if brush data is available for Q2-style tracing
-   */
-  get hasBrushData() {
-    return this.brushes !== null
-      && this.brushsides !== null
-      && this.leafbrushes !== null
-      && this.brushes.length > 0;
-  }
-
-  type = 0; // Mod.type.brush;
-
-  *facesIter() {
-    for (let i = 0; i < this.numfaces; i++) {
-      yield this.faces[this.firstface + i];
-    }
-  }
-
-  /**
-   * Find the leaf node for a given point in 3D space
-   * @param {Vector} p position
-   * @returns {Node} leaf node containing the point
-   */
-  getLeafForPoint(p) {
-    let node = this.nodes[0];
-
-    while (true) {
-      if (node.contents < 0) {
-        // reached a leaf
-        return node;
-      }
-
-      /** @type {Vector} */
-      const normal = node.plane.normal;
-
-      if (p.dot(normal) - node.plane.dist > 0) {
-        node = node.children[0];
-      } else {
-        node = node.children[1];
-      }
-    }
-  }
-
-  /**
-   * @param {Vector} point point in world
-   * @returns {Visibility} visibility data for the leaf containing the point
-   */
-  getPvsByPoint(point) {
-    return this.getPvsByLeaf(this.getLeafForPoint(point));
-  }
-
-  /**
-   * @param {Node} leaf leaf node
-   * @returns {Visibility} visibility data for the given leaf
-   */
-  getPvsByLeaf(leaf) {
-    if (leaf === this.leafs[0] || leaf.cluster < 0 || this.clusterPvsOffsets === null) {
-      return hiddenVisibility;
-    }
-
-    return Visibility.fromBrushModel(this, this.clusterPvsOffsets[leaf.cluster]);
-  }
-
-  /**
-   * This will merge visibility from all leafs from a given starting point.
-   * @param {Vector} point point in world
-   * @returns {Visibility} visibility data for the leaf containing the point
-   */
-  getFatPvsByPoint(point) {
-    const vis = new Visibility(this);
-
-    return vis.addFatPoint(point);
-  }
-
-  /**
-   * Get PHS (Potentially Hearable Set) for a point in the world.
-   * @param {Vector} point point in world
-   * @returns {Visibility} PHS data for the leaf containing the point
-   */
-  getPhsByPoint(point) {
-    return this.getPhsByLeaf(this.getLeafForPoint(point));
-  }
-
-  /**
-   * Get PHS (Potentially Hearable Set) for a given leaf.
-   * Returns a Visibility where isRevealed/areRevealed check hearability.
-   * @param {Node} leaf leaf node
-   * @returns {Visibility} PHS data for the given leaf
-   */
-  getPhsByLeaf(leaf) {
-    if (this.phsdata === null || leaf === this.leafs[0] || leaf.cluster < 0 || this.clusterPhsOffsets === null) {
-      return hiddenVisibility;
-    }
-
-    return Visibility.fromBrushModel(this, this.clusterPhsOffsets[leaf.cluster], this.phsdata);
-  }
-
-  /**
-   * Will create a new sky renderer for this brush model, if supported.
-   * @returns {SkyRenderer|null} desired sky renderer
-   */
-  newSkyRenderer() {
-    return null;
-  }
-
-  /**
-   * Reset runtime-only face state for a scoped brush model view.
-   * Dynamic light bookkeeping is rebuilt per client frame and must not be
-   * inherited from an earlier scoped instance of the same cached map.
-   * @private
-   */
-  _resetScopedFaces() {
-    for (let i = 0; i < this.faces.length; i++) {
-      this.faces[i].dlightbits = 0;
-      this.faces[i].dlightframe = -1;
-    }
-  }
-
-  /**
-   * Reset renderer-owned world BSP runtime state before rebuilding display lists.
-   * This clears stale per-leaf command chains and restores original BSP bounds
-   * without cloning the full node graph per scoped model view.
-   */
-  resetWorldRenderState() {
-    for (let i = 0; i < this.nodes.length; i++) {
-      this.nodes[i].resetRenderState();
-    }
-
-    for (let i = 0; i < this.leafs.length; i++) {
-      this.leafs[i].resetRenderState();
-    }
-
-    this._resetScopedFaces();
-  }
-
-  /**
-   * @returns {BrushModel} scoped runtime view
-   */
-  createScopedView() {
-    const scopedView = /** @type {BrushModel} */ (super.createScopedView());
-
-    scopedView.cmds = null;
-    scopedView.chains = [];
-    scopedView.waterchain = 0;
-    scopedView.skychain = 0;
-    scopedView.opaqueVAO = null;
-    scopedView.turbulentVAO = null;
-
-    scopedView._resetScopedFaces();
-
-    return scopedView;
-  }
-
-  /**
-   */
-  cleanupScopedView() {
-    super.cleanupScopedView();
-
-    const gl = this._getGLContext();
-
-    if (gl === null) {
-      return;
-    }
-
-    if (this.cmds !== null) {
-      gl.deleteBuffer(this.cmds);
-      this.cmds = null;
-    }
-
-    if (this.opaqueVAO) {
-      gl.deleteVertexArray(this.opaqueVAO);
-      this.opaqueVAO = null;
-    }
-
-    if (this.turbulentVAO) {
-      gl.deleteVertexArray(this.turbulentVAO);
-      this.turbulentVAO = null;
-    }
-  }
-};
+export * from './BSP.ts';
diff --git a/source/engine/common/model/BSP.ts b/source/engine/common/model/BSP.ts
new file mode 100644
index 00000000..9f197e3f
--- /dev/null
+++ b/source/engine/common/model/BSP.ts
@@ -0,0 +1,821 @@
+import type { BaseMaterial } from '../../client/renderer/Materials.mjs';
+import type Vector from '../../../shared/Vector.ts';
+
+import { content } from '../../../shared/Defs.ts';
+import { BaseModel, type Face, type Plane } from './BaseModel.ts';
+import { SkyRenderer } from '../../client/renderer/Sky.mjs';
+import { AreaPortals, type PortalDefinition } from './AreaPortals.ts';
+
+export interface Clipnode {
+  /** Index into planes array. */
+  readonly planenum: number;
+
+  /** Child node indices `[front, back]`. */
+  readonly children: [number, number];
+}
+
+export interface Hull {
+  /** Clipnodes for this hull. */
+  readonly clipnodes: Clipnode[];
+
+  /** Planes for collision detection. */
+  readonly planes: Plane[];
+
+  /** Index of the first clipnode, when the hull is a subrange. */
+  readonly firstclipnode?: number;
+
+  /** Index of the last clipnode. */
+  readonly lastclipnode: number;
+
+  /** Minimum bounding box for this hull. */
+  readonly clip_mins: Vector;
+
+  /** Maximum bounding box for this hull. */
+  readonly clip_maxs: Vector;
+}
+
+export type WorldspawnInfo = Record<string, string>;
+
+export interface FogVolumeInfo {
+  /** The inline brush model index from `*N` notation, or `0` for world water. */
+  readonly modelIndex: number;
+
+  /** Fog color as `[r, g, b]` in 0-255 range. */
+  readonly color: [number, number, number];
+
+  /** Fog density for exponential falloff. */
+  readonly density: number;
+
+  /** Maximum fog opacity, clamped to `0..1`. */
+  readonly maxOpacity: number;
+
+  /** AABB minimum corner. */
+  readonly mins: [number, number, number];
+
+  /** AABB maximum corner. */
+  readonly maxs: [number, number, number];
+}
+
+export interface WorldTurbulentChainInfo {
+  /** Texture index used by the draw batch. */
+  readonly texture: number;
+
+  /** First vertex in the turbulent VBO region. */
+  readonly firstVertex: number;
+
+  /** Number of vertices in the draw batch. */
+  readonly vertexCount: number;
+
+  /** Tight world-space bounds minimum. */
+  readonly mins: Vector;
+
+  /** Tight world-space bounds maximum. */
+  readonly maxs: Vector;
+}
+
+export type BSPXLumps = Record<string, { readonly fileofs: number; readonly filelen: number }>;
+
+export type BrushTexVec = readonly [number, number, number, number];
+
+export interface BrushTexInfo {
+  /** Texture projection vectors with offsets. */
+  readonly vecs: [BrushTexVec, BrushTexVec];
+
+  /** Texture index or name, depending on the BSP format. */
+  readonly texture: number | string;
+
+  /** Material and surface flags. */
+  readonly flags: number;
+
+  /** Optional Quake 2 texture value field. */
+  readonly value?: number;
+
+  /** Optional Quake 2 linked texture-info index. */
+  readonly nexttexinfo?: number;
+}
+
+export interface LightgridStyleSample {
+  readonly stylenum: number;
+  readonly rgb: [number, number, number];
+}
+
+export interface LightgridPointSample {
+  readonly stylecount: number;
+  readonly styles: LightgridStyleSample[];
+}
+
+export interface LightgridLeaf {
+  readonly mins: [number, number, number];
+  readonly size: [number, number, number];
+  readonly points: LightgridPointSample[];
+}
+
+export interface LightgridNode {
+  readonly mid: [number, number, number];
+  readonly child: number[];
+}
+
+export interface LightgridOctree {
+  readonly step: [number, number, number];
+  readonly size: [number, number, number];
+  readonly mins: Vector;
+  readonly numstyles: number;
+  readonly rootnode: number;
+  readonly nodes: LightgridNode[];
+  readonly leafs: LightgridLeaf[];
+}
+
+type NodeChild = Node | number | null;
+
+const VISDATA_SIZE = 1024;
+
+/**
+ * Visibility data for PVS/PHS.
+ * Stored as cluster-indexed bits. Each bit corresponds to a cluster;
+ * leaf to cluster mapping is resolved via the owning BrushModel.
+ */
+export class Visibility {
+  #data = new Uint8Array(VISDATA_SIZE);
+  #model: BrushModel | null = null;
+
+  /** When set, `isRevealed` and `areRevealed` always return true. */
+  #unconditionalReveal = false;
+
+  constructor(model: BrushModel | null = null) {
+    this.#model = model;
+
+    if (model !== null) {
+      const clusterBytes = Math.max((model.numclusters + 7) >> 3, 1);
+      this.#data = new Uint8Array(clusterBytes);
+
+      if (model.visdata === null) {
+        this.revealAll();
+      }
+    }
+  }
+
+  /**
+   * Create a Visibility instance from RLE-compressed cluster PVS data.
+   * @param model Map model.
+   * @param visofs Byte offset into `sourceData`.
+   * @param sourceData Compressed visibility data, defaulting to `model.visdata`.
+   * @returns Visibility instance.
+   */
+  static fromBrushModel(model: BrushModel, visofs: number, sourceData: Uint8Array | null = model.visdata): Visibility {
+    console.assert(model instanceof BrushModel);
+
+    const modelVisSize = (model.numclusters + 7) >> 3;
+    const visibility = new Visibility(model);
+
+    if (sourceData !== null && visofs >= 0) {
+      for (let outIndex = 0, inIndex = visofs; outIndex < modelVisSize;) {
+        if (inIndex >= sourceData.length) {
+          break;
+        }
+
+        if (sourceData[inIndex] !== 0) {
+          visibility.#data[outIndex++] = sourceData[inIndex++];
+          continue;
+        }
+
+        if (inIndex + 1 >= sourceData.length) {
+          break;
+        }
+
+        for (let count = sourceData[inIndex + 1]; count > 0; count--) {
+          visibility.#data[outIndex++] = 0x00;
+        }
+
+        inIndex += 2;
+      }
+    }
+
+    return visibility;
+  }
+
+  /**
+   * Reveal all clusters.
+   * @returns This visibility object.
+   */
+  revealAll(): Visibility {
+    this.#data.fill(0xff);
+    this.#unconditionalReveal = true;
+
+    return this;
+  }
+
+  /**
+   * Hide all clusters.
+   * @returns This visibility object.
+   */
+  hideAll(): Visibility {
+    this.#data.fill(0x00);
+
+    return this;
+  }
+
+  /**
+   * Recursive helper for `addFatPoint`.
+   * @param p Point in world space.
+   * @param node Current BSP node.
+   */
+  #addToFatPoint(p: Vector, node: Node): void {
+    const model = this.#model;
+
+    if (model === null) {
+      return;
+    }
+
+    while (true) {
+      if (node.contents < 0) {
+        if (node.contents !== content.CONTENT_SOLID && node.cluster >= 0 && model.clusterPvsOffsets !== null) {
+          const visofs = model.clusterPvsOffsets[node.cluster];
+          const vis = Visibility.fromBrushModel(model, visofs);
+
+          for (let index = 0; index < this.#data.length; index++) {
+            this.#data[index] |= vis.#data[index];
+          }
+        }
+
+        return;
+      }
+
+      const plane = node.plane as Plane;
+      const d = p.dot(plane.normal) - plane.dist;
+
+      if (d > 8.0) {
+        node = node.children[0] as Node;
+        continue;
+      }
+
+      if (d < -8.0) {
+        node = node.children[1] as Node;
+        continue;
+      }
+
+      this.#addToFatPoint(p, node.children[0] as Node);
+      node = node.children[1] as Node;
+    }
+  }
+
+  /**
+   * Merge visibility from all leafs connected to the point.
+   * @param p Point in world space.
+   * @returns This visibility object.
+   */
+  addFatPoint(p: Vector): Visibility {
+    const model = this.#model;
+
+    if (model !== null) {
+      this.#addToFatPoint(p, model.nodes[0] as Node);
+    }
+
+    return this;
+  }
+
+  /**
+   * Check whether any of the given leaf indices have visible clusters.
+   * @param leafIndices Leaf array indices (`Node.num` values).
+   * @returns True when any of the given leafs are revealed.
+   */
+  areRevealed(leafIndices: number[]): boolean {
+    if (this.#unconditionalReveal) {
+      return leafIndices.length > 0;
+    }
+
+    const model = this.#model;
+
+    if (model === null) {
+      for (let index = 0; index < leafIndices.length; index++) {
+        if ((this.#data[leafIndices[index] >> 3] & (1 << (leafIndices[index] & 7))) !== 0) {
+          return true;
+        }
+      }
+
+      return false;
+    }
+
+    for (let index = 0; index < leafIndices.length; index++) {
+      const cluster = model.leafs[leafIndices[index]]?.cluster ?? -1;
+
+      if (cluster < 0) {
+        continue;
+      }
+
+      if ((this.#data[cluster >> 3] & (1 << (cluster & 7))) !== 0) {
+        return true;
+      }
+    }
+
+    return false;
+  }
+
+  /**
+   * Check whether a given leaf is revealed via its cluster.
+   * @param leafIndex Leaf array index (`Node.num`).
+   * @returns True when the given leaf is revealed.
+   */
+  isRevealed(leafIndex: number): boolean {
+    if (this.#unconditionalReveal) {
+      return true;
+    }
+
+    const model = this.#model;
+
+    if (model === null) {
+      return (this.#data[leafIndex >> 3] & (1 << (leafIndex & 7))) !== 0;
+    }
+
+    const cluster = model.leafs[leafIndex]?.cluster ?? -1;
+
+    if (cluster < 0) {
+      return false;
+    }
+
+    return (this.#data[cluster >> 3] & (1 << (cluster & 7))) !== 0;
+  }
+}
+
+export const revealedVisibility = new Visibility().revealAll();
+export const hiddenVisibility = new Visibility().hideAll();
+
+export class BrushModelComponent {
+  /** Owning brush model. */
+  protected _brushmodel: BrushModel;
+
+  constructor(brushmodel: BrushModel) {
+    this._brushmodel = brushmodel;
+  }
+}
+
+/**
+ * BSP tree node, also reused for BSP leafs.
+ */
+export class Node extends BrushModelComponent {
+  /** Node index in the nodes array. */
+  num = 0;
+
+  contents = 0;
+
+  /** Index into planes array. */
+  planenum = 0;
+
+  /** Splitting plane. */
+  plane: Plane | null = null;
+
+  /** Parent node. */
+  parent: Node | null = null;
+
+  /** Frontside/backside, numbers during loading and `Node` refs after linking. */
+  children: [NodeChild, NodeChild] = [null, null];
+
+  /** Visibility offset for PVS. */
+  visofs = 0;
+
+  /** Minimum bounding box. */
+  mins: Vector | null = null;
+
+  /** Maximum bounding box. */
+  maxs: Vector | null = null;
+
+  /** Immutable bounds loaded from BSP data. */
+  baseMins: Vector | null = null;
+
+  /** Immutable bounds loaded from BSP data. */
+  baseMaxs: Vector | null = null;
+
+  /** First marksurface index for leafs, aka `firstleafface`. */
+  firstmarksurface = 0;
+
+  /** Number of marksurfaces for leafs, aka `numleaffaces`. */
+  nummarksurfaces = 0;
+
+  /** First face index for nodes. */
+  firstface = 0;
+
+  /** Number of faces for nodes. */
+  numfaces = 0;
+
+  /** Ambient sound levels `[water, sky, slime, lava]`. */
+  ambient_level: [number, number, number, number] = [0, 0, 0, 0];
+
+  /** Used by the renderer to determine what to draw. */
+  markvisframe = 0;
+
+  /** Used by the renderer to determine what to draw. */
+  visframe = 0;
+
+  /** Index into skychain list. */
+  skychain = 0;
+
+  /** Index into waterchain list. */
+  waterchain = 0;
+
+  /** Render command list. */
+  cmds: number[][] = [];
+
+  /** Tight turbulent draw batches for sorted world rendering. */
+  turbulentChains: WorldTurbulentChainInfo[] = [];
+
+  /** Cluster for PVS. */
+  cluster = 0;
+
+  /** Area id for area portals. */
+  area = 0;
+
+  /** First leaf brush index. */
+  firstleafbrush = 0;
+
+  /** Number of leaf brushes. */
+  numleafbrushes = 0;
+
+  *facesIter(): Generator<Face, void, void> {
+    for (let index = 0; index < this.numfaces; index++) {
+      yield this._brushmodel.faces[this.firstface + index] as Face;
+    }
+  }
+
+  /**
+   * Reset renderer-owned runtime state on this BSP node or leaf.
+   * Leaf bounds may be expanded during display-list packing, so restore them
+   * from the immutable BSP bounds before rebuilding world render chains.
+   */
+  resetRenderState(): void {
+    this.markvisframe = 0;
+    this.visframe = 0;
+    this.skychain = 0;
+    this.waterchain = 0;
+    this.cmds.length = 0;
+    this.turbulentChains.length = 0;
+
+    if (this.mins !== null && this.baseMins !== null) {
+      this.mins.set(this.baseMins);
+    }
+
+    if (this.maxs !== null && this.baseMaxs !== null) {
+      this.maxs.set(this.baseMaxs);
+    }
+  }
+}
+
+export class BrushSide extends BrushModelComponent {
+  /** Plane index, facing leaf outwards. */
+  planenum = 0;
+
+  /** Texture info index. */
+  texinfo = 0;
+}
+
+export class Brush extends BrushModelComponent {
+  /** First brush side index. */
+  firstside = 0;
+
+  /** Number of brush sides. */
+  numsides = 0;
+
+  /** Contents flags, see `Defs.content`. */
+  contents = 0;
+
+  /** Axis-aligned bounding box minimum. */
+  mins: Vector | null = null;
+
+  /** Axis-aligned bounding box maximum. */
+  maxs: Vector | null = null;
+
+  /** BrushTrace dedup counter to avoid testing the same brush twice. */
+  _brushTraceCheck = 0;
+
+  *sidesIter(): Generator<BrushSide, void, void> {
+    for (let index = 0; index < this.numsides; index++) {
+      yield this._brushmodel.brushsides![this.firstside + index] as BrushSide;
+    }
+  }
+}
+
+/**
+ * Base class for brush-based models (BSP maps).
+ * All loading is handled by `BSP29Loader.mjs`.
+ */
+export class BrushModel extends BaseModel {
+  /** BSP format version. */
+  version: number | null = null;
+
+  /** Bounding radius for culling. */
+  radius = 0;
+
+  /** All planes in the BSP tree. */
+  planes: Plane[] = [];
+
+  /** All visible faces and surfaces. */
+  faces: Face[] = [];
+
+  /** All vertex positions. */
+  vertexes: Vector[] = [];
+
+  /** Edge vertex indices `[v1, v2]`. */
+  edges: number[][] = [];
+
+  /** Surface edge list, negative indices mean reversed winding. */
+  surfedges: number[] = [];
+
+  /** BSP tree nodes. */
+  nodes: Node[] = [];
+
+  /** BSP leaf nodes. */
+  leafs: Node[] = [];
+
+  /** Texture materials. */
+  textures: BaseMaterial[] = [];
+
+  /** Texture coordinate info per face. */
+  texinfo: BrushTexInfo[] = [];
+
+  /** Face indices visible from each leaf. */
+  marksurfaces: number[] = [];
+
+  /** Grayscale lightmap data. */
+  lightdata: Uint8Array | null = null;
+
+  /** RGB lightmap data. */
+  lightdata_rgb: Uint8Array | null = null;
+
+  /** Deluxemap data storing dominant light directions. */
+  deluxemap: Uint8Array | null = null;
+
+  /** Lightgrid octree data. */
+  lightgrid: LightgridOctree | null = null;
+
+  /** Visibility data for PVS. */
+  visdata: Uint8Array | null = null;
+
+  /** Clipnodes for collision detection. */
+  clipnodes: Clipnode[] = [];
+
+  /** Collision hulls for physics. */
+  hulls: Hull[] = [];
+
+  /** Inline brush submodels. */
+  submodels: BrushModel[] = [];
+
+  /** First face index for this submodel. */
+  firstface = 0;
+
+  /** Number of faces in this submodel. */
+  numfaces = 0;
+
+  /** Entity lump as a string. */
+  entities: string | null = null;
+
+  /** Parsed worldspawn entity properties. */
+  worldspawnInfo: WorldspawnInfo = {};
+
+  /** Offset for BSPX extended data. */
+  bspxoffset = 0;
+
+  /** BSPX extended lumps. */
+  bspxlumps: BSPXLumps | null = null;
+
+  /** True when this is an inline submodel rather than the main world. */
+  submodel = false;
+
+  /** Rendering chains for optimized texture batching. */
+  chains: number[][] = [];
+
+  /** Offset into the vertex buffer for turbulent surfaces. */
+  waterchain = 0;
+
+  /** Offset into the vertex buffer for sky surfaces. */
+  skychain = 0;
+
+  /** True when RGB lighting is available. */
+  coloredlights = false;
+
+  /** Number of visibility clusters. */
+  numclusters = 0;
+
+  /** PVS byte offset per cluster into `visdata`. */
+  clusterPvsOffsets: number[] | null = null;
+
+  /** PHS data, cluster-indexed and RLE-compressed. */
+  phsdata: Uint8Array | null = null;
+
+  /** PHS byte offset per cluster into `phsdata`. */
+  clusterPhsOffsets: number[] | null = null;
+
+  /** Number of areas for area portals. */
+  numAreas = 0;
+
+  /** Area portal definitions. */
+  portalDefs: PortalDefinition[] = [];
+
+  /** Area portal connectivity manager. */
+  areaPortals = new AreaPortals();
+
+  /** Maps brush model names such as `*1` to auto-assigned portal numbers. */
+  modelPortalMap: Record<string, number> = {};
+
+  /** Fog volume brush entities parsed from the BSP entity lump. */
+  fogVolumes: FogVolumeInfo[] = [];
+
+  /** Leaf brushes, when present. */
+  leafbrushes: number[] | null = null;
+
+  /** Brush sides, when present. */
+  brushsides: BrushSide[] | null = null;
+
+  /** Brushes, when present. */
+  brushes: Brush[] | null = null;
+
+  /** First brush index in the shared brushes array for this model. */
+  firstBrush = 0;
+
+  /** Number of brushes belonging to this model. */
+  numBrushes = 0;
+
+  /** Opaque world VAO created by the brush renderer. */
+  opaqueVAO: WebGLVertexArrayObject | null = null;
+
+  /** Turbulent world VAO created by the brush renderer. */
+  turbulentVAO: WebGLVertexArrayObject | null = null;
+
+  override type = 0;
+
+  /**
+   * Whether this model has complete brush-based collision data.
+   * When true, Q2-style brush tracing can be used instead of Q1-style hull tracing.
+   * Requires brushes, brushsides, leafbrushes arrays plus nodes with leaf brush references.
+   * @returns True if brush data is available for Q2-style tracing.
+   */
+  get hasBrushData(): boolean {
+    return this.brushes !== null
+      && this.brushsides !== null
+      && this.leafbrushes !== null
+      && this.brushes.length > 0;
+  }
+
+  *facesIter(): Generator<Face, void, void> {
+    for (let index = 0; index < this.numfaces; index++) {
+      yield this.faces[this.firstface + index] as Face;
+    }
+  }
+
+  /**
+   * Find the leaf node for a given point in 3D space.
+   * @param p Position.
+   * @returns The leaf node containing the point.
+   */
+  getLeafForPoint(p: Vector): Node {
+    let node = this.nodes[0] as Node;
+
+    while (true) {
+      if (node.contents < 0) {
+        return node;
+      }
+
+      const plane = node.plane as Plane;
+
+      if (p.dot(plane.normal) - plane.dist > 0) {
+        node = node.children[0] as Node;
+      } else {
+        node = node.children[1] as Node;
+      }
+    }
+  }
+
+  /**
+   * @param point Point in world space.
+   * @returns Visibility data for the leaf containing the point.
+   */
+  getPvsByPoint(point: Vector): Visibility {
+    return this.getPvsByLeaf(this.getLeafForPoint(point));
+  }
+
+  /**
+   * @param leaf Leaf node.
+   * @returns Visibility data for the given leaf.
+   */
+  getPvsByLeaf(leaf: Node): Visibility {
+    if (leaf === this.leafs[0] || leaf.cluster < 0 || this.clusterPvsOffsets === null) {
+      return hiddenVisibility;
+    }
+
+    return Visibility.fromBrushModel(this, this.clusterPvsOffsets[leaf.cluster]);
+  }
+
+  /**
+   * Merge visibility from all leafs near the given starting point.
+   * @param point Point in world space.
+   * @returns Visibility data for the leaf containing the point.
+   */
+  getFatPvsByPoint(point: Vector): Visibility {
+    const vis = new Visibility(this);
+
+    return vis.addFatPoint(point);
+  }
+
+  /**
+   * Get PHS for a point in the world.
+   * @param point Point in world space.
+   * @returns PHS data for the leaf containing the point.
+   */
+  getPhsByPoint(point: Vector): Visibility {
+    return this.getPhsByLeaf(this.getLeafForPoint(point));
+  }
+
+  /**
+   * Get PHS for a given leaf.
+   * Returns a `Visibility` where `isRevealed` and `areRevealed` check hearability.
+   * @param leaf Leaf node.
+   * @returns PHS data for the given leaf.
+   */
+  getPhsByLeaf(leaf: Node): Visibility {
+    if (this.phsdata === null || leaf === this.leafs[0] || leaf.cluster < 0 || this.clusterPhsOffsets === null) {
+      return hiddenVisibility;
+    }
+
+    return Visibility.fromBrushModel(this, this.clusterPhsOffsets[leaf.cluster], this.phsdata);
+  }
+
+  /**
+   * Create a new sky renderer for this brush model, if supported.
+   * @returns Desired sky renderer.
+   */
+  newSkyRenderer(): SkyRenderer | null {
+    return null;
+  }
+
+  /**
+   * Reset runtime-only face state for a scoped brush model view.
+   * Dynamic light bookkeeping is rebuilt per client frame and must not be
+   * inherited from an earlier scoped instance of the same cached map.
+   */
+  _resetScopedFaces(): void {
+    for (let index = 0; index < this.faces.length; index++) {
+      this.faces[index].dlightbits = 0;
+      this.faces[index].dlightframe = -1;
+    }
+  }
+
+  /**
+   * Reset renderer-owned world BSP runtime state before rebuilding display lists.
+   * This clears stale per-leaf command chains and restores original BSP bounds
+   * without cloning the full node graph per scoped model view.
+   */
+  resetWorldRenderState(): void {
+    for (let index = 0; index < this.nodes.length; index++) {
+      this.nodes[index].resetRenderState();
+    }
+
+    for (let index = 0; index < this.leafs.length; index++) {
+      this.leafs[index].resetRenderState();
+    }
+
+    this._resetScopedFaces();
+  }
+
+  /**
+   * @returns Scoped runtime view.
+   */
+  override createScopedView(): BrushModel {
+    const scopedView = super.createScopedView() as BrushModel;
+
+    scopedView.cmds = null;
+    scopedView.chains = [];
+    scopedView.waterchain = 0;
+    scopedView.skychain = 0;
+    scopedView.opaqueVAO = null;
+    scopedView.turbulentVAO = null;
+
+    scopedView._resetScopedFaces();
+
+    return scopedView;
+  }
+
+  /**
+   * Release scoped GPU buffers and VAOs owned by this brush-model view.
+   */
+  override cleanupScopedView(): void {
+    super.cleanupScopedView();
+
+    const gl = this._getGLContext();
+
+    if (gl === null) {
+      return;
+    }
+
+    if (this.cmds !== null) {
+      gl.deleteBuffer(this.cmds);
+      this.cmds = null;
+    }
+
+    if (this.opaqueVAO !== null) {
+      gl.deleteVertexArray(this.opaqueVAO);
+      this.opaqueVAO = null;
+    }
+
+    if (this.turbulentVAO !== null) {
+      gl.deleteVertexArray(this.turbulentVAO);
+      this.turbulentVAO = null;
+    }
+  }
+}
diff --git a/source/engine/common/model/BaseModel.mjs b/source/engine/common/model/BaseModel.mjs
deleted file mode 100644
index f56c99f2..00000000
--- a/source/engine/common/model/BaseModel.mjs
+++ /dev/null
@@ -1,151 +0,0 @@
-import GL from '../../client/GL.mjs';
-import { eventBus } from '../../registry.mjs';
-import Vector from '../../../shared/Vector.ts';
-
-let gl = /** @type {WebGL2RenderingContext|null} */ (null);
-
-eventBus.subscribe('gl.ready', () => {
-  gl = GL.gl;
-});
-
-eventBus.subscribe('gl.shutdown', () => {
-  gl = null;
-});
-
-export class Plane { // TODO: move to shared
-  type = 0;
-
-  /** @type {0|1|2|3|4|5|6|7} bits 1, 2 and 3 represent the normal’s components signess */
-  signbits = 0;
-
-  /**
-   * @param {Vector} normal normal vector
-   * @param {number} dist distance from origin
-   */
-  constructor(normal, dist) {
-    /** @type {Vector} plane’s normal vector, on n-sided polygons it might not be facing correctly, better use Face’s normal instead. */
-    this.normal = normal;
-
-    /** @type {number} distance from origin along normal (in direction of normal) */
-    this.dist = dist;
-  }
-};
-
-export class Face {
-  submodel = false;
-  plane = /** @type {Plane} */(null); // will be linked during loading
-
-  /** @type {boolean} True when the face uses the back side of its BSP plane. */
-  planeBack = false;
-  firstedge = 0;
-  numedges = 0;
-  texinfo = 0;
-  styles = /** @type {number[]} */([]);
-  lightofs = 0;
-  texture = 0;
-  texturemins = [0, 0];
-  extents = [0, 0];
-
-  // lightmap scaling
-  lmshift = null;
-
-  // TODO: refactor these fields into a flags bitmap, there’s more to come
-  turbulent = false;
-  sky = false;
-
-  /** @type {Vector} Face normal oriented to the BSP face side. */
-  normal = new Vector();
-
-  dlightbits = 0;
-  dlightframe = -1;
-};
-
-export class BaseModel {
-  static STATE = {
-    NOT_READY: 'not-ready',
-    LOADING: 'loading',
-    READY: 'ready',
-    FAILED: 'failed',
-  };
-
-  constructor(name) {
-    this.name = name;
-    this.type = null;
-    this.reset();
-  }
-
-  reset() {
-    // Private variables (used during loading)
-
-    /** @type {number} Number of frames in file */
-    this._num_frames = 0;
-
-    /** @type {number} Number of skins in file */
-    this._num_skins = 0;
-
-    /** @type {number} Number of triangles (R requires that) */
-    this._num_tris = 0;
-
-    /** @type {number} Number of vertices */
-    this._num_verts = 0;
-
-    /** @type {Vector} Scale factors for vertices */
-    this._scale = new Vector(1.0, 1.0, 1.0);
-
-    /** @type {Vector} Origin offset for vertices */
-    this._scale_origin = new Vector();
-
-    /** @type {boolean} FIXME: read but unused */
-    this._random = false;
-
-    // Public variables
-
-    /** @type {boolean} Whether the file still needs loading */
-    this.needload = true;
-
-    /** @type {number} Simple CRC checksum to check if things are still the same */
-    this.checksum = 0;
-
-    /** @type {Vector} Bounding box minimum (required by PF, R, CL, SV on worldmodel) */
-    this.mins = new Vector();
-
-    /** @type {Vector} Bounding box maximum (required by PF, R, CL, SV on worldmodel) */
-    this.maxs = new Vector();
-
-    /** @type {Vector} Origin offset for vertices */
-    this.origin = new Vector();
-
-    // Public variables just for rendering purposes (IDEA: refactor into ModelRenderer classes)
-
-    /** @type {WebGLBuffer|null} WebGLBuffer for alias models, or null for brush/sprite models */
-    this.cmds = null;
-  }
-
-  /**
-   * Create a per-scope runtime view that reuses immutable model data.
-   * @returns {BaseModel} scoped runtime view
-   */
-  createScopedView() {
-    const scopedView = /** @type {BaseModel} */ (Object.assign(
-      Object.create(Object.getPrototypeOf(this)),
-      this,
-    ));
-
-    return scopedView;
-  }
-
-  /**
-   * @protected
-   * @returns {WebGL2RenderingContext|null} current GL context, if available
-   */
-  _getGLContext() {
-    return gl;
-  }
-
-  /**
-   * Release runtime-only resources owned by a scoped model view.
-   */
-  cleanupScopedView() {
-    // Base models do not assume ownership of shared GPU resources.
-  }
-};
diff --git a/source/engine/common/model/BaseModel.ts b/source/engine/common/model/BaseModel.ts
new file mode 100644
index 00000000..d6058ef4
--- /dev/null
+++ b/source/engine/common/model/BaseModel.ts
@@ -0,0 +1,207 @@
+import GL from '../../client/GL.mjs';
+import { eventBus } from '../../registry.mjs';
+import Vector from '../../../shared/Vector.ts';
+
+let gl: WebGL2RenderingContext | null = null;
+
+eventBus.subscribe('gl.ready', () => {
+  gl = GL.gl;
+});
+
+eventBus.subscribe('gl.shutdown', () => {
+  gl = null;
+});
+
+export enum ModelState {
+  NOT_READY = 'not-ready',
+  LOADING = 'loading',
+  READY = 'ready',
+  FAILED = 'failed',
+}
+
+export type PlaneSignBits = 0 | 1 | 2 | 3 | 4 | 5 | 6 | 7;
+
+/**
+ * Shared plane representation used by BSP rendering and collision code.
+ */
+export class Plane {
+  type = 0;
+
+  /** Bits 1, 2, and 3 encode the signs of the normal components. */
+  signbits: PlaneSignBits = 0;
+
+  /** Plane normal. Face normals are usually more reliable for winding-facing work. */
+  normal: Vector;
+
+  /** Distance from the origin measured along the plane normal. */
+  dist: number;
+
+  constructor(normal: Vector, dist: number) {
+    this.normal = normal;
+    this.dist = dist;
+  }
+}
+
+/**
+ * Shared face metadata used by brush models and lightmap generation.
+ */
+export class Face {
+  /** True when this face belongs to an inline submodel. */
+  submodel = false;
+
+  /** BSP plane linked during loading. */
+  plane: Plane | null = null;
+
+  /** True when the face uses the back side of its BSP plane. */
+  planeBack = false;
+
+  /** First surfedge index for this face. */
+  firstedge = 0;
+
+  /** Number of surfedges referenced by this face. */
+  numedges = 0;
+
+  /** Texture info index. */
+  texinfo = 0;
+
+  /** Lightstyle ids used by this face. */
+  styles: number[] = [];
+
+  /** Offset into the baked light data. */
+  lightofs = 0;
+
+  /** Texture index used by the renderer. */
+  texture = 0;
+
+  /** Texture-space minimum extents. */
+  texturemins: [number, number] = [0, 0];
+
+  /** Texture-space size extents. */
+  extents: [number, number] = [0, 0];
+
+  /** Optional per-face lightmap downscale shift. */
+  lmshift: number | null = null;
+
+  /** True when this face uses turbulent warping. */
+  turbulent = false;
+
+  /** True when this face renders as sky. */
+  sky = false;
+
+  /** Face normal oriented to the BSP face side. */
+  normal = new Vector();
+
+  /** Dynamic light bitmask affecting this face. */
+  dlightbits = 0;
+
+  /** Last frame index that updated the dynamic light bits. */
+  dlightframe = -1;
+}
+
+/**
+ * Base class for all model types.
+ *
+ * Holds common bounds, loading state, and runtime-only rendering resources
+ * shared by brush, sprite, alias, and mesh models.
+ */
+export class BaseModel {
+  static STATE = ModelState;
+
+  /** Model name or load path. */
+  name: string;
+
+  /** Concrete model type, assigned by subclasses. */
+  type: number | null;
+
+  /** Number of frames in file. */
+  _num_frames = 0;
+
+  /** Number of skins in file. */
+  _num_skins = 0;
+
+  /** Number of triangles, also consumed by the renderer. */
+  _num_tris = 0;
+
+  /** Number of vertices in the loaded model. */
+  _num_verts = 0;
+
+  /** Scale factors applied to model vertices. */
+  _scale: Vector | null = new Vector(1.0, 1.0, 1.0);
+
+  /** Origin offset applied to model vertices. */
+  _scale_origin: Vector | null = new Vector();
+
+  /** Randomization flag retained from legacy formats. */
+  _random = false;
+
+  /** True while the file still needs loading. */
+  needload = true;
+
+  /** Simple CRC checksum used to detect content changes. */
+  checksum = 0;
+
+  /** Bounding box minimum, required by gameplay and rendering code. */
+  mins = new Vector();
+
+  /** Bounding box maximum, required by gameplay and rendering code. */
+  maxs = new Vector();
+
+  /** Model-space origin offset. */
+  origin = new Vector();
+
+  /** Shared alias-model command buffer, when applicable. */
+  cmds: WebGLBuffer | null = null;
+
+  constructor(name: string) {
+    this.name = name;
+    this.type = null;
+    this.reset();
+  }
+
+  reset(): void {
+    // Private variables used while loading.
+    this._num_frames = 0;
+    this._num_skins = 0;
+    this._num_tris = 0;
+    this._num_verts = 0;
+    this._scale = new Vector(1.0, 1.0, 1.0);
+    this._scale_origin = new Vector();
+    this._random = false;
+
+    // Public variables shared across model users.
+    this.needload = true;
+    this.checksum = 0;
+    this.mins = new Vector();
+    this.maxs = new Vector();
+    this.origin = new Vector();
+
+    // Runtime-only rendering state.
+    this.cmds = null;
+  }
+
+  /**
+   * Creates a per-scope runtime view that reuses immutable model data.
+   * @returns A scoped model view that shares immutable backing data.
+   */
+  createScopedView(): this {
+    return Object.assign(
+      Object.create(Object.getPrototypeOf(this)) as this,
+      this,
+    );
+  }
+
+  /**
+   * Returns the active GL context, if a client renderer is currently running.
+   * @returns The active WebGL context, or `null` when rendering is unavailable.
+   */
+  protected _getGLContext(): WebGL2RenderingContext | null {
+    return gl;
+  }
+
+  /**
+   * Releases runtime-only resources owned by a scoped model view.
+   */
+  cleanupScopedView(): void {
+    // Base models do not assume ownership of shared GPU resources.
+  }
+}
diff --git a/source/engine/common/model/MeshModel.mjs b/source/engine/common/model/MeshModel.mjs
deleted file mode 100644
index 9c2978d0..00000000
--- a/source/engine/common/model/MeshModel.mjs
+++ /dev/null
@@ -1,86 +0,0 @@
-import { BaseMaterial } from '../../client/renderer/Materials.mjs';
-import Vector from '../../../shared/Vector.ts';
-import { BaseModel } from './BaseModel.mjs';
-
-/**
- * Mesh model - Generic polygon mesh format for OBJ, IQM, GLTF, etc.
- * Used for static and animated meshes with modern vertex attributes.
- */
-export class MeshModel extends BaseModel {
-  constructor(name) {
-    super(name);
-    this.type = 3; // Mod.type.mesh
-  }
-
-  // Vertex data (flat arrays ready for WebGL)
-  /** @type {Float32Array|null} */ vertices = null;      // Positions (x,y,z triplets)
-  /** @type {Float32Array|null} */ normals = null;       // Normals (x,y,z triplets)
-  /** @type {Float32Array|null} */ texcoords = null;     // UVs (u,v pairs)
-  /** @type {Float32Array|null} */ tangents = null;      // Tangents for normal mapping (x,y,z triplets)
-  /** @type {Float32Array|null} */ bitangents = null;    // Bitangents for normal mapping (x,y,z triplets)
-
-  // Geometry
-  /** @type {Uint16Array|Uint32Array|null} */ indices = null;  // Triangle indices
-  /** @type {number} */ numVertices = 0;
-  /** @type {number} */ numTriangles = 0;
-
-  // Materials & textures
-  /** @type {string} */ materialName = '';     // Material library reference
-  /** @type {string} */ textureName = '';      // Diffuse texture path
-  /** @type {BaseMaterial|null} */ texture = null;   // Loaded texture object
-
-  // GPU buffers (created by renderer)
-  /** @type {WebGLBuffer|null} */ vbo = null;  // Vertex buffer object
-  /** @type {WebGLBuffer|null} */ ibo = null;  // Index buffer object
-
-  // Bounding volume
-  /** @type {Vector} */ mins = new Vector(-16, -16, -16);
-  /** @type {Vector} */ maxs = new Vector(16, 16, 16);
-  /** @type {number} */ boundingradius = 16.0;
-
-  // Animation support (for future IQM/GLTF)
-  /** @type {boolean} */ animated = false;
-  /** @type {Array} */ animations = [];
-  /** @type {Array} */ bones = [];
-
-  // Submesh support (multiple materials)
-  /** @type {Array} */ submeshes = [];
-
-  /**
-   * @returns {MeshModel} scoped runtime view
-   */
-  createScopedView() {
-    const scopedView = /** @type {MeshModel} */ (super.createScopedView());
-
-    scopedView.vbo = null;
-    scopedView.ibo = null;
-    scopedView.vao = null;
-
-    return scopedView;
-  }
-
-  cleanupScopedView() {
-    super.cleanupScopedView();
-
-    const gl = this._getGLContext();
-
-    if (gl === null) {
-      return;
-    }
-
-    if (this.vao) {
-      gl.deleteVertexArray(this.vao);
-      this.vao = null;
-    }
-
-    if (this.vbo !== null) {
-      gl.deleteBuffer(this.vbo);
-      this.vbo = null;
-    }
-
-    if (this.ibo !== null) {
-      gl.deleteBuffer(this.ibo);
-      this.ibo = null;
-    }
-  }
-}
diff --git a/source/engine/common/model/MeshModel.ts b/source/engine/common/model/MeshModel.ts
new file mode 100644
index 00000000..6fb58cb3
--- /dev/null
+++ b/source/engine/common/model/MeshModel.ts
@@ -0,0 +1,132 @@
+import type { BaseMaterial } from '../../client/renderer/Materials.mjs';
+
+import Vector from '../../../shared/Vector.ts';
+import { BaseModel } from './BaseModel.ts';
+
+interface MeshAnimation {
+  readonly name?: string;
+  readonly firstFrame?: number;
+  readonly frameCount?: number;
+  readonly fps?: number;
+}
+
+interface MeshBone {
+  readonly name?: string;
+  readonly parentIndex?: number;
+}
+
+interface MeshSubmesh {
+  readonly startIndex?: number;
+  readonly indexCount?: number;
+  readonly materialName?: string;
+}
+
+/**
+ * Mesh model, a generic polygon mesh format for OBJ, IQM, glTF, and similar assets.
+ * Used for static and animated meshes with modern vertex attributes.
+ */
+export class MeshModel extends BaseModel {
+  /** Position buffer stored as flat `x, y, z` triplets. */
+  vertices: Float32Array | null = null;
+
+  /** Normal buffer stored as flat `x, y, z` triplets. */
+  normals: Float32Array | null = null;
+
+  /** Texture coordinate buffer stored as flat `u, v` pairs. */
+  texcoords: Float32Array | null = null;
+
+  /** Tangent buffer used for normal mapping. */
+  tangents: Float32Array | null = null;
+
+  /** Bitangent buffer used for normal mapping. */
+  bitangents: Float32Array | null = null;
+
+  /** Triangle index buffer. */
+  indices: Uint16Array | Uint32Array | null = null;
+
+  /** Number of vertices in the mesh. */
+  numVertices = 0;
+
+  /** Number of triangles in the mesh. */
+  numTriangles = 0;
+
+  /** Material library reference. */
+  materialName = '';
+
+  /** Diffuse texture path or asset name. */
+  textureName = '';
+
+  /** Loaded material instance used by the renderer. */
+  texture: BaseMaterial | null = null;
+
+  /** Vertex buffer object created by the renderer. */
+  vbo: WebGLBuffer | null = null;
+
+  /** Index buffer object created by the renderer. */
+  ibo: WebGLBuffer | null = null;
+
+  /** Vertex array object created by the renderer. */
+  vao: WebGLVertexArrayObject | null = null;
+
+  /** Conservative bounding box minimum. */
+  override mins = new Vector(-16, -16, -16);
+
+  /** Conservative bounding box maximum. */
+  override maxs = new Vector(16, 16, 16);
+
+  /** Bounding sphere radius. */
+  boundingradius = 16.0;
+
+  /** True when the mesh carries skeletal or keyframed animation data. */
+  animated = false;
+
+  /** Animation clips for future IQM or glTF support. */
+  animations: MeshAnimation[] = [];
+
+  /** Skeleton or bind-pose bone metadata. */
+  bones: MeshBone[] = [];
+
+  /** Optional submesh partitions for multi-material meshes. */
+  submeshes: MeshSubmesh[] = [];
+
+  constructor(name: string) {
+    super(name);
+    this.type = 3;
+  }
+
+  override createScopedView(): MeshModel {
+    const scopedView = super.createScopedView() as MeshModel;
+
+    // Scoped views must not own shared GPU objects from the source model.
+    scopedView.vbo = null;
+    scopedView.ibo = null;
+    scopedView.vao = null;
+
+    return scopedView;
+  }
+
+  override cleanupScopedView(): void {
+    super.cleanupScopedView();
+
+    const gl = this._getGLContext();
+
+    if (gl === null) {
+      return;
+    }
+
+    if (this.vao !== null) {
+      gl.deleteVertexArray(this.vao);
+      this.vao = null;
+    }
+
+    if (this.vbo !== null) {
+      gl.deleteBuffer(this.vbo);
+      this.vbo = null;
+    }
+
+    if (this.ibo !== null) {
+      gl.deleteBuffer(this.ibo);
+      this.ibo = null;
+    }
+  }
+}
diff --git a/source/engine/common/model/ModelLoader.mjs b/source/engine/common/model/ModelLoader.mjs
deleted file mode 100644
index a468201b..00000000
--- a/source/engine/common/model/ModelLoader.mjs
+++ /dev/null
@@ -1,67 +0,0 @@
-import { NotImplementedError } from '../Errors.ts';
-
-/**
- * Abstract base class for model format loaders.
- * Each format (BSP, MDL, SPR, OBJ, IQM, etc.) should implement this interface.
- */
-export class ModelLoader {
-  // eslint-disable-next-line jsdoc/require-returns-check
-  /**
-   * Get the magic number(s) that identify this format.
-   * Magic numbers are read from the first 4 bytes of the file.
-   * @returns {number[]} Array of magic numbers (uint32, little-endian)
-   */
-  getMagicNumbers() {
-    throw new NotImplementedError('ModelLoader.getMagicNumbers must be implemented');
-  }
-
-  // eslint-disable-next-line jsdoc/require-returns-check
-  /**
-   * Get the file extension(s) this loader supports.
-   * Used as a fallback when magic number detection isn't conclusive.
-   * @returns {string[]} Array of file extensions (e.g., ['.bsp', '.mdl'])
-   */
-  getExtensions() {
-    throw new NotImplementedError('ModelLoader.getExtensions must be implemented');
-  }
-
-  /**
-   * Check if this loader can handle the given buffer/filename.
-   * Default implementation checks magic number and extension.
-   * @param {ArrayBuffer} buffer The file buffer to check
-   * @param {string} filename The filename (for extension checking)
-   * @returns {boolean} True if this loader can handle the file
-   */
-  canLoad(buffer, filename) {
-    const view = new DataView(buffer);
-    const magic = view.getUint32(0, true); // little-endian
-    const ext = filename.substring(filename.lastIndexOf('.')).toLowerCase();
-
-    // Check magic number
-    if (this.getExtensions().includes(ext) && this.getMagicNumbers().includes(magic)) {
-      return true;
-    }
-
-    return false;
-  }
-
-  /**
-   * Load the model from the buffer.
-   * @param {ArrayBuffer} buffer The file buffer
-   * @param {string} name The model name/path
-   * @returns {Promise<import('./BaseModel.mjs').BaseModel>} The loaded model
-   */
-  // eslint-disable-next-line @typescript-eslint/require-await
-  async load(buffer, name) { // eslint-disable-line no-unused-vars
-    throw new NotImplementedError('ModelLoader.load must be implemented');
-  }
-
-  // eslint-disable-next-line jsdoc/require-returns-check
-  /**
-   * Get a human-readable name for this loader.
-   * @returns {string} Loader name (e.g., "BSP29", "Quake MDL", "Sprite")
-   */
-  getName() {
-    throw new NotImplementedError('ModelLoader.getName must be implemented');
-  }
-}
diff --git a/source/engine/common/model/ModelLoader.ts b/source/engine/common/model/ModelLoader.ts
new file mode 100644
index 00000000..9029d7f1
--- /dev/null
+++ b/source/engine/common/model/ModelLoader.ts
@@ -0,0 +1,44 @@
+import type { BaseModel } from './BaseModel.ts';
+
+/**
+ * Abstract base class for model format loaders.
+ *
+ * Each model format provides magic-number detection and a loader that returns
+ * a populated model instance.
+ */
+export abstract class ModelLoader {
+  /**
+   * Returns the magic numbers that identify this format.
+   * Magic numbers are read from the first four bytes of the file.
+   */
+  abstract getMagicNumbers(): number[];
+
+  /**
+   * Returns the file extensions supported by this loader.
+   */
+  abstract getExtensions(): string[];
+
+  /**
+   * Returns a human-readable loader name.
+   */
+  abstract getName(): string;
+
+  /**
+   * Checks whether this loader can handle the given file.
+   *
+   * The default implementation requires both a matching extension and a
+   * matching magic number.
+   */
+  canLoad(buffer: ArrayBuffer, filename: string): boolean {
+    const view = new DataView(buffer);
+    const magic = view.getUint32(0, true);
+    const extension = filename.substring(filename.lastIndexOf('.')).toLowerCase();
+
+    return this.getExtensions().includes(extension) && this.getMagicNumbers().includes(magic);
+  }
+
+  /**
+   * Loads a model from the supplied file buffer.
+   */
+  abstract load(buffer: ArrayBuffer, name: string): Promise<BaseModel>;
+}
diff --git a/source/engine/common/model/ModelLoaderRegistry.mjs b/source/engine/common/model/ModelLoaderRegistry.mjs
deleted file mode 100644
index 68ee379e..00000000
--- a/source/engine/common/model/ModelLoaderRegistry.mjs
+++ /dev/null
@@ -1,62 +0,0 @@
-import { NotImplementedError } from '../Errors.ts';
-import { BaseModel } from './BaseModel.mjs';
-import { ModelLoader } from './ModelLoader.mjs';
-
-/**
- * Registry for managing model format loaders.
- * Provides automatic format detection and routing to the appropriate loader.
- */
-export class ModelLoaderRegistry {
-  constructor() {
-    /** @type {ModelLoader[]} */
-    this.loaders = [];
-  }
-
-  /**
-   * Register a model loader.
-   * Loaders are checked in the order they are registered.
-   * @param {ModelLoader} loader The loader to register
-   */
-  register(loader) {
-    this.loaders.push(loader);
-  }
-
-  /**
-   * Find a loader that can handle the given buffer/filename.
-   * @param {ArrayBuffer} buffer The file buffer
-   * @param {string} filename The filename
-   * @returns {ModelLoader|null} The loader, or null if none found
-   */
-  findLoader(buffer, filename) {
-    for (const loader of this.loaders) {
-      if (loader.canLoad(buffer, filename)) {
-        return loader;
-      }
-    }
-    return null;
-  }
-
-  /**
-   * Load a model using the appropriate loader.
-   * @param {ArrayBuffer} buffer The file buffer
-   * @param {string} name The model name/path
-   * @returns {Promise<BaseModel>} The loaded model
-   * @throws {NotImplementedError} If no suitable loader is found
-   */
-  async load(buffer, name) {
-    const loader = this.findLoader(buffer, name);
-
-    if (!loader) {
-      throw new NotImplementedError(`No loader found for model format: ${name}`);
-    }
-
-    return await loader.load(buffer, name);
-  }
-
-  /**
-   * Clear all registered loaders.
-   */
-  clear() {
-    this.loaders.length = 0;
-  }
-};
diff --git a/source/engine/common/model/ModelLoaderRegistry.ts b/source/engine/common/model/ModelLoaderRegistry.ts
new file mode 100644
index 00000000..c47f98fb
--- /dev/null
+++ b/source/engine/common/model/ModelLoaderRegistry.ts
@@ -0,0 +1,53 @@
+import { NotImplementedError } from '../Errors.ts';
+import type { BaseModel } from './BaseModel.ts';
+import type { ModelLoader } from './ModelLoader.ts';
+
+/**
+ * Registry for managing model format loaders.
+ *
+ * Loaders are checked in registration order so more specific formats can win
+ * before broader fallbacks.
+ */
+export class ModelLoaderRegistry {
+  readonly loaders: ModelLoader[] = [];
+
+  /**
+   * Registers a model loader.
+   */
+  register(loader: ModelLoader): void {
+    this.loaders.push(loader);
+  }
+
+  /**
+   * Finds a loader that can handle the given file.
+   */
+  findLoader(buffer: ArrayBuffer, filename: string): ModelLoader | null {
+    for (const loader of this.loaders) {
+      if (loader.canLoad(buffer, filename)) {
+        return loader;
+      }
+    }
+
+    return null;
+  }
+
+  /**
+   * Loads a model using the first compatible registered loader.
+   */
+  async load(buffer: ArrayBuffer, name: string): Promise<BaseModel> {
+    const loader = this.findLoader(buffer, name);
+
+    if (loader === null) {
+      throw new NotImplementedError(`No loader found for model format: ${name}`);
+    }
+
+    return await loader.load(buffer, name);
+  }
+
+  /**
+   * Clears the registry.
+   */
+  clear(): void {
+    this.loaders.length = 0;
+  }
+}
diff --git a/source/engine/common/model/SpriteModel.mjs b/source/engine/common/model/SpriteModel.mjs
deleted file mode 100644
index 28d1d970..00000000
--- a/source/engine/common/model/SpriteModel.mjs
+++ /dev/null
@@ -1,40 +0,0 @@
-import { BaseModel } from './BaseModel.mjs';
-
-/**
- * Sprite model (.spr) - Quake's 2D billboard sprite format.
- * Used for explosions, particles, and other effects that always face the camera.
- */
-export class SpriteModel extends BaseModel {
-  constructor(name) {
-    super(name);
-    this.type = 1; // Mod.type.sprite
-  }
-
-  reset() {
-    super.reset();
-
-    /** @type {boolean} Whether sprite orientation is fixed or faces camera */
-    this.oriented = false;
-
-    /** @type {number} Bounding sphere radius */
-    this.boundingradius = 0;
-
-    /** @type {number} Sprite width */
-    this.width = 0;
-
-    /** @type {number} Sprite height */
-    this.height = 0;
-
-    /** @type {number} Number of frames in file (used during loading) */
-    this._frames = 0;
-
-    /** @type {Array} Sprite frames (single or groups) */
-    this.frames = [];
-
-    /** @type {boolean} Random frame selection */
-    this.random = false;
-
-    /** @type {number} Total number of frames */
-    this.numframes = 0;
-  }
-}
diff --git a/source/engine/common/model/SpriteModel.ts b/source/engine/common/model/SpriteModel.ts
new file mode 100644
index 00000000..3552ad66
--- /dev/null
+++ b/source/engine/common/model/SpriteModel.ts
@@ -0,0 +1,75 @@
+import type { GLTexture } from '../../client/GL.mjs';
+
+import { BaseModel } from './BaseModel.ts';
+
+interface SpriteFrameImage {
+  readonly interval?: number;
+  readonly origin: [number, number];
+  readonly width: number;
+  readonly height: number;
+  readonly glt: GLTexture;
+  readonly texturenum: number;
+}
+
+interface SpriteSingleFrame {
+  readonly group: false;
+  readonly origin: [number, number];
+  readonly width: number;
+  readonly height: number;
+  readonly glt: GLTexture;
+  readonly texturenum: number;
+}
+
+interface SpriteFrameGroup {
+  readonly group: true;
+  readonly frames: SpriteFrameImage[];
+}
+
+export type SpriteFrame = SpriteSingleFrame | SpriteFrameGroup;
+
+/**
+ * Sprite model (.spr), Quake's 2D billboard sprite format.
+ * Used for explosions, particles, and other effects that always face the camera.
+ */
+export class SpriteModel extends BaseModel {
+  /** Whether sprite orientation is fixed or faces the camera. */
+  oriented = false;
+
+  /** Bounding sphere radius. */
+  boundingradius = 0;
+
+  /** Sprite width. */
+  width = 0;
+
+  /** Sprite height. */
+  height = 0;
+
+  /** Number of frames in file, used during loading. */
+  _frames = 0;
+
+  /** Sprite frames, stored as single images or grouped animations. */
+  frames: SpriteFrame[] = [];
+
+  /** True when frame selection should be randomized. */
+  random = false;
+
+  /** Total number of frames. */
+  numframes = 0;
+
+  constructor(name: string) {
+    super(name);
+    this.type = 1;
+  }
+
+  override reset(): void {
+    super.reset();
+    this.oriented = false;
+    this.boundingradius = 0;
+    this.width = 0;
+    this.height = 0;
+    this._frames = 0;
+    this.frames = [];
+    this.random = false;
+    this.numframes = 0;
+  }
+}
diff --git a/source/engine/common/model/loaders/AliasMDLLoader.mjs b/source/engine/common/model/loaders/AliasMDLLoader.mjs
index 50b389d3..b37dcc5e 100644
--- a/source/engine/common/model/loaders/AliasMDLLoader.mjs
+++ b/source/engine/common/model/loaders/AliasMDLLoader.mjs
@@ -4,8 +4,8 @@ import GL, { GLTexture, resampleTexture8 } from '../../../client/GL.mjs';
 import W, { translateIndexToLuminanceRGBA, translateIndexToRGBA } from '../../W.ts';
 import { CRC16CCITT } from '../../CRC.ts';
 import { registry } from '../../../registry.mjs';
-import { ModelLoader } from '../ModelLoader.mjs';
-import { AliasModel } from '../AliasModel.mjs';
+import { ModelLoader } from '../ModelLoader.ts';
+import { AliasModel } from '../AliasModel.ts';
 
 /**
  * Builds the diffuse and luminance skin layers for a legacy alias model skin.
@@ -324,7 +324,7 @@ export class AliasMDLLoader extends ModelLoader {
 
   /**
    * Load ST (texture coordinate) vertices
-   * @param {import('../AliasModel.mjs').AliasModel} loadmodel - The model being loaded
+   * @param {import('../AliasModel.ts').AliasModel} loadmodel - The model being loaded
    * @param {ArrayBuffer} buffer - The model file data
    * @param {number} inmodel - Current offset in buffer
    * @returns {number} New offset after reading vertices
@@ -348,7 +348,7 @@ export class AliasMDLLoader extends ModelLoader {
 
   /**
    * Load triangles
-   * @param {import('../AliasModel.mjs').AliasModel} loadmodel - The model being loaded
+   * @param {import('../AliasModel.ts').AliasModel} loadmodel - The model being loaded
    * @param {ArrayBuffer} buffer - The model file data
    * @param {number} inmodel - Current offset in buffer
    * @returns {number} New offset after reading triangles
@@ -375,7 +375,7 @@ export class AliasMDLLoader extends ModelLoader {
 
   /**
    * Flood fill skin to handle transparent areas
-   * @param {import('../AliasModel.mjs').AliasModel} loadmodel - The model being loaded
+   * @param {import('../AliasModel.ts').AliasModel} loadmodel - The model being loaded
    * @param {Uint8Array} skin - The skin pixel data
    * @private
    */
@@ -415,7 +415,7 @@ export class AliasMDLLoader extends ModelLoader {
 
   /**
    * Translate player skin for color customization
-   * @param {import('../AliasModel.mjs').AliasModel} loadmodel - The model being loaded
+   * @param {import('../AliasModel.ts').AliasModel} loadmodel - The model being loaded
    * @param {Uint8Array} data - The original skin data
    * @param {*} skin - The skin object to store the result
    * @private
@@ -447,7 +447,7 @@ export class AliasMDLLoader extends ModelLoader {
 
   /**
    * Load all skins (textures) for the model
-   * @param {import('../AliasModel.mjs').AliasModel} loadmodel - The model being loaded
+   * @param {import('../AliasModel.ts').AliasModel} loadmodel - The model being loaded
    * @param {ArrayBuffer} buffer - The model file data
    * @param {number} inmodel - Current offset in buffer
    * @returns {number} New offset after reading skins
@@ -527,7 +527,7 @@ export class AliasMDLLoader extends ModelLoader {
 
   /**
    * Load all animation frames
-   * @param {import('../AliasModel.mjs').AliasModel} loadmodel - The model being loaded
+   * @param {import('../AliasModel.ts').AliasModel} loadmodel - The model being loaded
    * @param {ArrayBuffer} buffer - The model file data
    * @param {number} inmodel - Current offset in buffer
    * @private
@@ -602,7 +602,7 @@ export class AliasMDLLoader extends ModelLoader {
 
   /**
    * Build rendering commands (WebGL buffers) for efficient rendering
-   * @param {import('../AliasModel.mjs').AliasModel} loadmodel - The model being loaded
+   * @param {import('../AliasModel.ts').AliasModel} loadmodel - The model being loaded
    * @private
    */
   _buildRenderCommands(loadmodel) {
diff --git a/source/engine/common/model/loaders/BSP29Loader.mjs b/source/engine/common/model/loaders/BSP29Loader.mjs
index 4ed11168..b097c0f2 100644
--- a/source/engine/common/model/loaders/BSP29Loader.mjs
+++ b/source/engine/common/model/loaders/BSP29Loader.mjs
@@ -6,9 +6,9 @@ import W, { readWad3Texture, translateIndexToLuminanceRGBA, translateIndexToRGBA
 import { CRC16CCITT } from '../../CRC.ts';
 import { CorruptedResourceError } from '../../Errors.ts';
 import { eventBus, registry } from '../../../registry.mjs';
-import { ModelLoader } from '../ModelLoader.mjs';
+import { ModelLoader } from '../ModelLoader.ts';
 import { Brush, BrushModel, BrushSide, Node } from '../BSP.mjs';
-import { Face, Plane } from '../BaseModel.mjs';
+import { Face, Plane } from '../BaseModel.ts';
 import { materialFlags, noTextureMaterial, PBRMaterial, QuakeMaterial } from '../../../client/renderer/Materials.mjs';
 import { Quake1Sky, SimpleSkyBox } from '../../../client/renderer/Sky.mjs';
 
diff --git a/source/engine/common/model/loaders/BSP2Loader.mjs b/source/engine/common/model/loaders/BSP2Loader.mjs
index 32d56c13..c8357b2a 100644
--- a/source/engine/common/model/loaders/BSP2Loader.mjs
+++ b/source/engine/common/model/loaders/BSP2Loader.mjs
@@ -1,7 +1,7 @@
 import Vector from '../../../../shared/Vector.ts';
 import { CorruptedResourceError } from '../../Errors.ts';
 import { BSP29Loader } from './BSP29Loader.mjs';
-import { Face } from '../BaseModel.mjs';
+import { Face } from '../BaseModel.ts';
 import { BrushModel, Node } from '../BSP.mjs';
 import { materialFlags } from '../../../client/renderer/Materials.mjs';
 
diff --git a/source/engine/common/model/loaders/BSP38Loader.mjs b/source/engine/common/model/loaders/BSP38Loader.mjs
index 118a335d..2917307e 100644
--- a/source/engine/common/model/loaders/BSP38Loader.mjs
+++ b/source/engine/common/model/loaders/BSP38Loader.mjs
@@ -2,9 +2,9 @@ import { content } from '../../../../shared/Defs.ts';
 import Q from '../../../../shared/Q.ts';
 import Vector from '../../../../shared/Vector.ts';
 import { CRC16CCITT } from '../../CRC.ts';
-import { Plane } from '../BaseModel.mjs';
+import { Plane } from '../BaseModel.ts';
 import { Brush, BrushModel, BrushSide, Node } from '../BSP.mjs';
-import { ModelLoader } from '../ModelLoader.mjs';
+import { ModelLoader } from '../ModelLoader.ts';
 
 /** @typedef {Record<number, DataView>} LumpViews */
 
@@ -300,14 +300,13 @@ export class BSP38Loader extends ModelLoader {
     // int32		firstface, numfaces;	// submodels just draw faces
     //                   // without walking the bsp tree
 
-    const stride = 48;
-    const length = modelsLump.byteLength / stride;
+    void modelsLump;
     loadmodel.submodels.length = 0;
 
 
   }
 
-  async load(buffer, name) {
+  load(buffer, name) {
     const loadmodel = new BrushModel(name);
 
     loadmodel.version = BSP_VERSION;
@@ -325,9 +324,7 @@ export class BSP38Loader extends ModelLoader {
     loadmodel.needload = false;
     loadmodel.checksum = CRC16CCITT.Block(new Uint8Array(buffer));
 
-    debugger;
-
-    return loadmodel;
+    return Promise.resolve(loadmodel);
   }
 };
 
diff --git a/source/engine/common/model/loaders/SpriteSPRLoader.mjs b/source/engine/common/model/loaders/SpriteSPRLoader.mjs
index d915bb0d..b7d58e44 100644
--- a/source/engine/common/model/loaders/SpriteSPRLoader.mjs
+++ b/source/engine/common/model/loaders/SpriteSPRLoader.mjs
@@ -3,8 +3,8 @@ import { GLTexture } from '../../../client/GL.mjs';
 import W, { translateIndexToRGBA } from '../../W.ts';
 import { CRC16CCITT } from '../../CRC.ts';
 import { registry } from '../../../registry.mjs';
-import { ModelLoader } from '../ModelLoader.mjs';
-import { SpriteModel } from '../SpriteModel.mjs';
+import { ModelLoader } from '../ModelLoader.ts';
+import { SpriteModel } from '../SpriteModel.ts';
 
 /**
  * Loader for Quake Sprite format (.spr)
diff --git a/source/engine/common/model/loaders/WavefrontOBJLoader.mjs b/source/engine/common/model/loaders/WavefrontOBJLoader.mjs
index 34fef9b0..d6841a98 100644
--- a/source/engine/common/model/loaders/WavefrontOBJLoader.mjs
+++ b/source/engine/common/model/loaders/WavefrontOBJLoader.mjs
@@ -1,8 +1,8 @@
 import { registry } from '../../../registry.mjs';
 
 import Vector from '../../../../shared/Vector.ts';
-import { ModelLoader } from '../ModelLoader.mjs';
-import { MeshModel } from '../MeshModel.mjs';
+import { ModelLoader } from '../ModelLoader.ts';
+import { MeshModel } from '../MeshModel.ts';
 import { PBRMaterial } from '../../../client/renderer/Materials.mjs';
 import { GLTexture } from '../../../client/GL.mjs';
 
@@ -330,7 +330,7 @@ export class WavefrontOBJLoader extends ModelLoader {
   /**
    * Calculate bounding box for the model
    * @protected
-   * @param {import('../MeshModel.mjs').MeshModel} model The model
+   * @param {import('../MeshModel.ts').MeshModel} model The model
    */
   _calculateBounds(model) {
     if (!model.vertices || model.vertices.length === 0) {
@@ -371,7 +371,7 @@ export class WavefrontOBJLoader extends ModelLoader {
    * Generate tangent and bitangent vectors for normal mapping
    * Based on "Lengyel's Method" for computing tangent space basis
    * @protected
-   * @param {import('../MeshModel.mjs').MeshModel} model The model
+   * @param {import('../MeshModel.ts').MeshModel} model The model
    */
   _generateTangentSpace(model) {
     const numVerts = model.numVertices;
diff --git a/source/engine/main-browser.mjs b/source/engine/main-browser.mjs
index 876d5ee7..335318ce 100644
--- a/source/engine/main-browser.mjs
+++ b/source/engine/main-browser.mjs
@@ -8,7 +8,7 @@ import V from './client/V.mjs';
 import NET from './network/Network.ts';
 import SV from './server/Server.mjs';
 import PR from './server/Progs.mjs';
-import Mod from './common/Mod.mjs';
+import Mod from './common/Mod.ts';
 import Key from './client/Key.mjs';
 import CL from './client/CL.mjs';
 import S from './client/Sound.mjs';
diff --git a/source/engine/main-dedicated.mjs b/source/engine/main-dedicated.mjs
index 75d2abfd..19be2500 100644
--- a/source/engine/main-dedicated.mjs
+++ b/source/engine/main-dedicated.mjs
@@ -16,7 +16,7 @@ import V from './client/V.mjs';
 import NET from './network/Network.ts';
 import SV from './server/Server.mjs';
 import PR from './server/Progs.mjs';
-import Mod from './common/Mod.mjs';
+import Mod from './common/Mod.ts';
 import * as WebSocket from 'ws';
 
 export default class EngineLauncher {
diff --git a/source/engine/registry.mjs b/source/engine/registry.mjs
index 024ed0b0..1ccb4961 100644
--- a/source/engine/registry.mjs
+++ b/source/engine/registry.mjs
@@ -7,7 +7,7 @@
 /** @typedef {typeof import('./network/Network').default} NetModule */
 /** @typedef {typeof import('./server/Server.mjs').default} ServerModule */
 /** @typedef {typeof import('./server/Progs.mjs').default} ProgsModule */
-/** @typedef {typeof import('./common/Mod.mjs').default} ModModule */
+/** @typedef {typeof import('./common/Mod.ts').default} ModModule */
 /** @typedef {typeof import('./client/CL.mjs').default} ClientModule */
 /** @typedef {typeof import('./client/SCR.mjs').default} ScrModule */
 /** @typedef {typeof import('./client/R.mjs').default} RendererModule */
diff --git a/source/engine/server/Navigation.mjs b/source/engine/server/Navigation.mjs
index 538d9a75..da222d81 100644
--- a/source/engine/server/Navigation.mjs
+++ b/source/engine/server/Navigation.mjs
@@ -7,9 +7,9 @@ import Cmd from '../common/Cmd.ts';
 import Cvar from '../common/Cvar.ts';
 import { CorruptedResourceError, MissingResourceError } from '../common/Errors.ts';
 import { ServerEngineAPI } from '../common/GameAPIs.mjs';
-import { BrushModel } from '../common/Mod.mjs';
+import { BrushModel } from '../common/Mod.ts';
 import { MIN_STEP_NORMAL, STEPSIZE } from '../common/Pmove.ts';
-import { Face } from '../common/model/BaseModel.mjs';
+import { Face } from '../common/model/BaseModel.ts';
 import PlatformWorker from '../common/PlatformWorker.ts';
 import WorkerManager from '../common/WorkerManager.ts';
 import { eventBus, registry } from '../registry.mjs';
diff --git a/source/engine/server/Server.mjs b/source/engine/server/Server.mjs
index 307cee0d..f342c912 100644
--- a/source/engine/server/Server.mjs
+++ b/source/engine/server/Server.mjs
@@ -17,7 +17,7 @@ import { ServerMovement } from './physics/ServerMovement.mjs';
 import { ServerArea } from './physics/ServerArea.mjs';
 import { ServerCollision } from './physics/ServerCollision.mjs';
 import { sharedCollisionModelSource } from '../common/CollisionModelSource.mjs';
-import { BrushModel } from '../common/Mod.mjs';
+import { BrushModel } from '../common/Mod.ts';
 import { ServerClient } from './Client.mjs';
 
 let { COM, Con, Host, Mod, NET, PR } = registry;
@@ -171,7 +171,7 @@ export default class SV {
     clientdataFieldsBitsWriter: null,
     /** @type {Record<string, { fields: string[], bitsWriter: 'writeByte' | 'writeShort' | 'writeLong'}>} maps classname to its fields and the apropriate bits writer */
     clientEntityFields: {},
-    /** @type {import('../common/Mod.mjs').BaseModel[]} */
+    /** @type {import('../common/Mod.ts').BaseModel[]} */
     models: [],
     /** @type {string[]} */
     soundPrecache: [],
diff --git a/source/engine/server/physics/ServerArea.mjs b/source/engine/server/physics/ServerArea.mjs
index b905eed1..25e6d4eb 100644
--- a/source/engine/server/physics/ServerArea.mjs
+++ b/source/engine/server/physics/ServerArea.mjs
@@ -3,7 +3,7 @@ import * as Defs from '../../../shared/Defs.ts';
 import { Octree } from '../../../shared/Octree.ts';
 import { eventBus, registry } from '../../registry.mjs';
 import CollisionModelSource, { createRegistryCollisionModelSource } from '../../common/CollisionModelSource.mjs';
-import { BrushModel } from '../../../engine/common/Mod.mjs';
+import { BrushModel } from '../../../engine/common/Mod.ts';
 
 let { SV } = registry;
 
diff --git a/source/engine/server/physics/ServerClientPhysics.mjs b/source/engine/server/physics/ServerClientPhysics.mjs
index 4f9e2c02..f994716f 100644
--- a/source/engine/server/physics/ServerClientPhysics.mjs
+++ b/source/engine/server/physics/ServerClientPhysics.mjs
@@ -6,7 +6,7 @@ import {
 } from './Defs.mjs';
 import { ServerClient } from '../Client.mjs';
 import { PM_TYPE } from '../../common/Pmove.ts';
-import { BrushModel } from '../../common/Mod.mjs';
+import { BrushModel } from '../../common/Mod.ts';
 
 let { Host, SV, V } = registry;
 
diff --git a/source/engine/server/physics/ServerCollision.mjs b/source/engine/server/physics/ServerCollision.mjs
index 5f39f8a7..29032c48 100644
--- a/source/engine/server/physics/ServerCollision.mjs
+++ b/source/engine/server/physics/ServerCollision.mjs
@@ -1,7 +1,7 @@
 import Vector from '../../../shared/Vector.ts';
 import * as Defs from '../../../shared/Defs.ts';
 import CollisionModelSource, { createRegistryCollisionModelSource } from '../../common/CollisionModelSource.mjs';
-import Mod, { BrushModel } from '../../common/Mod.mjs';
+import Mod, { BrushModel } from '../../common/Mod.ts';
 import { BrushTrace, DIST_EPSILON, Trace as SharedTrace } from '../../common/Pmove.ts';
 import { eventBus, registry } from '../../registry.mjs';
 import {
@@ -628,7 +628,7 @@ export class ServerCollision {
       return null;
     }
 
-    const meshModel = /** @type {import('../../common/model/MeshModel.mjs').MeshModel} */ (model);
+    const meshModel = /** @type {import('../../common/model/MeshModel.ts').MeshModel} */ (model);
     if (!meshModel.indices || !meshModel.vertices || meshModel.numTriangles === 0) {
       return null;
     }
diff --git a/source/engine/server/physics/ServerCollisionSupport.mjs b/source/engine/server/physics/ServerCollisionSupport.mjs
index 3e07f4f9..f85704de 100644
--- a/source/engine/server/physics/ServerCollisionSupport.mjs
+++ b/source/engine/server/physics/ServerCollisionSupport.mjs
@@ -25,7 +25,7 @@ export class MeshCollisionState extends CollisionState {
 export class BrushCollisionState extends CollisionState {
   /**
    * @param {ServerEdict} ent entity being traced against
-   * @param {import('../../common/Mod.mjs').BrushModel} model brush collision model
+   * @param {import('../../common/Mod.ts').BrushModel} model brush collision model
    * @param {Vector} origin brush-model origin
    * @param {Vector} angles brush-model angles
    */
@@ -148,7 +148,7 @@ export class CollisionTrace {
 export class MeshTraceContext {
   /** @type {ServerEdict} */
   ent;
-  /** @type {import('../../common/model/MeshModel.mjs').MeshModel} */
+  /** @type {import('../../common/model/MeshModel.ts').MeshModel} */
   model;
   /** @type {Vector} */
   start;
@@ -171,7 +171,7 @@ export class MeshTraceContext {
 
   /**
    * @param {ServerEdict} ent entity being traced against
-   * @param {import('../../common/model/MeshModel.mjs').MeshModel} model mesh collision model
+   * @param {import('../../common/model/MeshModel.ts').MeshModel} model mesh collision model
    * @param {Vector} start start position
    * @param {Vector} mins minimum extents of the moving box
    * @param {Vector} maxs maximum extents of the moving box
diff --git a/source/engine/server/physics/ServerLegacyHullCollision.mjs b/source/engine/server/physics/ServerLegacyHullCollision.mjs
index e54e7285..cb5d178f 100644
--- a/source/engine/server/physics/ServerLegacyHullCollision.mjs
+++ b/source/engine/server/physics/ServerLegacyHullCollision.mjs
@@ -10,7 +10,7 @@ eventBus.subscribe('registry.frozen', () => {
 });
 
 /** @typedef {import('./ServerCollisionSupport.mjs').CollisionTrace} CollisionTrace */
-/** @typedef {import('../../common/Mod.mjs').BrushModel} BrushModel */
+/** @typedef {import('../../common/Mod.ts').BrushModel} BrushModel */
 
 /**
  * Check whether a clipnode belongs to the owning legacy hull subtree.
diff --git a/source/shared/GameInterfaces.ts b/source/shared/GameInterfaces.ts
index 95921638..0dffafab 100644
--- a/source/shared/GameInterfaces.ts
+++ b/source/shared/GameInterfaces.ts
@@ -3,7 +3,7 @@ import type { ClientEngineAPI as ClientEngineApiValue, ServerEngineAPI as Server
 import type { ServerEdict as ServerEdictValue } from '../engine/server/Edict.mjs';
 import type Vector from './Vector.ts';
 import type { StartGameInterface } from '../engine/client/ClientLifecycle.mjs';
-import type { BaseModel } from '../engine/common/model/BaseModel.mjs';
+import type { BaseModel } from '../engine/common/model/BaseModel.ts';
 
 export type ClientEngineAPI = Readonly<typeof ClientEngineApiValue>;
 export type ServerEngineAPI = Readonly<typeof ServerEngineApiValue>;
diff --git a/test/common/model-cache.test.mjs b/test/common/model-cache.test.mjs
index 9a3616c9..dcfd7672 100644
--- a/test/common/model-cache.test.mjs
+++ b/test/common/model-cache.test.mjs
@@ -1,14 +1,14 @@
 import assert from 'node:assert/strict';
 import { describe, test } from 'node:test';
 
-import Mod from '../../source/engine/common/Mod.mjs';
-import { AliasModel } from '../../source/engine/common/model/AliasModel.mjs';
-import { Face } from '../../source/engine/common/model/BaseModel.mjs';
+import Mod from '../../source/engine/common/Mod.ts';
+import { AliasModel } from '../../source/engine/common/model/AliasModel.ts';
+import { Face } from '../../source/engine/common/model/BaseModel.ts';
 import { BrushModel, Node } from '../../source/engine/common/model/BSP.mjs';
 import { eventBus, registry } from '../../source/engine/registry.mjs';
 import Vector from '../../source/shared/Vector.ts';
 
-/** @typedef {import('../../source/engine/common/model/BaseModel.mjs').BaseModel} BaseModel */
+/** @typedef {import('../../source/engine/common/model/BaseModel.ts').BaseModel} BaseModel */
 
 /**
  * @param {BaseModel|null} model model to narrow
@@ -180,8 +180,8 @@ function createSharedAliasModel() {
   return aliasModel;
 }
 
-describe('Mod scoped model cache', () => {
-  test('separates client and server submodel instances while reusing shared BSP data', async () => {
+void describe('Mod scoped model cache', () => {
+  void test('separates client and server submodel instances while reusing shared BSP data', async () => {
     await withModelRegistry(async () => {
       const { worldModel, submodel } = createSharedBrushModels();
 
@@ -225,7 +225,7 @@ describe('Mod scoped model cache', () => {
     });
   });
 
-  test('keeps bare submodel names scoped to their owning world per side', async () => {
+  void test('keeps bare submodel names scoped to their owning world per side', async () => {
     await withModelRegistry(async () => {
       const { worldModel: serverWorldShared } = createSharedBrushModelsForWorld('maps/server-test.bsp', 64);
       const { worldModel: clientWorldShared } = createSharedBrushModelsForWorld('maps/client-test.bsp', 256);
@@ -244,7 +244,7 @@ describe('Mod scoped model cache', () => {
     });
   });
 
-  test('keeps shared alias vertex buffers visible to scoped views', async () => {
+  void test('keeps shared alias vertex buffers visible to scoped views', async () => {
     await withModelRegistry(async () => {
       const sharedAliasModel = createSharedAliasModel();
 
@@ -265,7 +265,7 @@ describe('Mod scoped model cache', () => {
     });
   });
 
-  test('resets shared brush leaf runtime state before rebuilding a scoped client view', async () => {
+  void test('resets shared brush leaf runtime state before rebuilding a scoped client view', async () => {
     await withModelRegistry(async () => {
       const { worldModel } = createSharedBrushModels();
 
@@ -317,7 +317,7 @@ describe('Mod scoped model cache', () => {
     });
   });
 
-  test('clears shared and scoped caches together when clearing shared scope', async () => {
+  void test('clears shared and scoped caches together when clearing shared scope', async () => {
     await withModelRegistry(async () => {
       const { worldModel } = createSharedBrushModels();
       const sharedAliasModel = createSharedAliasModel();
diff --git a/test/physics/map-pmove-harness.mjs b/test/physics/map-pmove-harness.mjs
index 93b1cf11..af7f2c26 100644
--- a/test/physics/map-pmove-harness.mjs
+++ b/test/physics/map-pmove-harness.mjs
@@ -2,7 +2,7 @@ import fs from 'node:fs/promises';
 import path from 'node:path';
 
 import COMClass from '../../source/engine/common/Com.ts';
-import Mod from '../../source/engine/common/Mod.mjs';
+import Mod from '../../source/engine/common/Mod.ts';
 import { PMF, Pmove } from '../../source/engine/common/Pmove.ts';
 import { UserCmd } from '../../source/engine/network/Protocol.ts';
 import { eventBus, registry } from '../../source/engine/registry.mjs';
@@ -14,14 +14,14 @@ import Vector from '../../source/shared/Vector.ts';
 
 /**
  * @typedef {object} HarnessOptions
- * @property {string} mapName
- * @property {string} gameDir
- * @property {string} spawnClassname
- * @property {string} orientationTargetname
- * @property {number} frames
- * @property {number} msec
- * @property {number} forwardmove
- * @property {number} probeDistance
+ * @property {string} mapName BSP path relative to the selected game directory.
+ * @property {string} gameDir Game directory used to resolve the BSP and assets.
+ * @property {string} spawnClassname Spawn classname used to place the probe entity.
+ * @property {string} orientationTargetname Optional targetname used to derive the probe yaw.
+ * @property {number} frames Number of movement frames to simulate.
+ * @property {number} msec Frame duration in milliseconds for each simulated command.
+ * @property {number} forwardmove Forward movement command applied each frame.
+ * @property {number} probeDistance Distance used for optional forward probe traces.
  */
 
 /**
diff --git a/test/physics/pmove.test.mjs b/test/physics/pmove.test.mjs
index 8e31a9e9..318b6070 100644
--- a/test/physics/pmove.test.mjs
+++ b/test/physics/pmove.test.mjs
@@ -3,7 +3,7 @@ import { describe, test } from 'node:test';
 import assert from 'node:assert/strict';
 
 import COMClass from '../../source/engine/common/Com.ts';
-import Mod from '../../source/engine/common/Mod.mjs';
+import Mod from '../../source/engine/common/Mod.ts';
 import Vector from '../../source/shared/Vector.ts';
 import { content } from '../../source/shared/Defs.ts';
 import { DIST_EPSILON, PM_TYPE, PMF, Pmove, PmovePlayer, Trace } from '../../source/engine/common/Pmove.ts';
@@ -304,12 +304,12 @@ async function runMapForwardFrames(mapName, frames) {
   return runMapFrames({ mapName, frames });
 }
 
-describe('PmovePlayer', () => {
-  test('DEBUG is disabled before Pmove.Init()', () => {
+void describe('PmovePlayer', () => {
+  void test('DEBUG is disabled before Pmove.Init()', () => {
     assert.equal(PmovePlayer.DEBUG, false);
   });
 
-  test('move integrates one grounded movement frame against a world model', () => {
+  void test('move integrates one grounded movement frame against a world model', () => {
     const worldModel = createBrushWorldModel({ axis: 2, center: [0, 0, -40], halfExtents: [512, 512, 16] });
     const pmove = new Pmove();
     const player = pmove.newPlayerMove();
@@ -332,7 +332,7 @@ describe('PmovePlayer', () => {
     assert.ok(player.velocity[0] > 0);
   });
 
-  test('move uses noclip-style spectator movement without collision traces', () => {
+  void test('move uses noclip-style spectator movement without collision traces', () => {
     const pmove = new Pmove();
     const player = pmove.newPlayerMove();
 
@@ -363,7 +363,7 @@ describe('PmovePlayer', () => {
     assertNear(player.velocity[2], 41.5, 0.001);
   });
 
-  test('keeps decisive uphill progress on the brush-backed slope regression map', async () => {
+  void test('keeps decisive uphill progress on the brush-backed slope regression map', async () => {
     const brushFrames = await runMapForwardFrames('maps/test_slope.bsp', 24);
 
     const firstRampFrame = 13;
@@ -378,7 +378,7 @@ describe('PmovePlayer', () => {
     }
   });
 
-  test('tracks the hull slope climb on the brush-backed slope regression map', async () => {
+  void test('tracks the hull slope climb on the brush-backed slope regression map', async () => {
     const brushFrames = await runMapForwardFrames('maps/test_slope.bsp', 24);
     const hullFrames = await runMapForwardFrames('maps/test_slope_hull.bsp', 24);
 
@@ -390,7 +390,7 @@ describe('PmovePlayer', () => {
     }
   });
 
-  test('matches the hull corner slide timing on the brush-backed clip_2 regression map', async () => {
+  void test('matches the hull corner slide timing on the brush-backed clip_2 regression map', async () => {
     const brushFrames = await runMapForwardFrames('maps/test_clip_2.bsp', 12);
     const hullFrames = await runMapForwardFrames('maps/test_clip_2_hull.bsp', 12);
 
@@ -407,7 +407,7 @@ describe('PmovePlayer', () => {
     assert.ok(hullFrames[7].moved[1] < -1.0);
   });
 
-  test('does not wedge on the hw_doom corridor sidestep repro', async () => {
+  void test('does not wedge on the hw_doom corridor sidestep repro', async () => {
     const frames = await runMapFrames({
       mapName: 'maps/test_hw_doom.bsp',
       frames: 8,
@@ -427,7 +427,7 @@ describe('PmovePlayer', () => {
     assert.ok(frames[7].moved[0] > 4.0);
   });
 
-  test('tracks the hull slope climb on the brush-backed slope_2 regression map', async () => {
+  void test('tracks the hull slope climb on the brush-backed slope_2 regression map', async () => {
     const brushFrames = await runMapForwardFrames('maps/test_slope_2.bsp', 24);
     const hullFrames = await runMapForwardFrames('maps/test_slope_2_hull.bsp', 24);
 
@@ -439,8 +439,8 @@ describe('PmovePlayer', () => {
     }
   });
 
-  describe('_checkDuck', () => {
-    test('enters ducked state on grounded crouch input and stands when space is clear', () => {
+  void describe('_checkDuck', () => {
+    void test('enters ducked state on grounded crouch input and stands when space is clear', () => {
       const pmove = new Pmove();
       const player = pmove.newPlayerMove();
 
@@ -464,8 +464,8 @@ describe('PmovePlayer', () => {
     });
   });
 
-  describe('_checkSpecialMovement', () => {
-    test('starts a waterjump when water waist depth meets a solid lip with empty space above', () => {
+  void describe('_checkSpecialMovement', () => {
+    void test('starts a waterjump when water waist depth meets a solid lip with empty space above', () => {
       const pmove = new Pmove();
       const player = pmove.newPlayerMove();
 
@@ -503,8 +503,8 @@ describe('PmovePlayer', () => {
     });
   });
 
-  describe('_categorizePosition', () => {
-    test('keeps grounded state on a walkable slope while climbing quickly', () => {
+  void describe('_categorizePosition', () => {
+    void test('keeps grounded state on a walkable slope while climbing quickly', () => {
       const pmove = new Pmove();
       const player = pmove.newPlayerMove();
 
@@ -530,7 +530,7 @@ describe('PmovePlayer', () => {
       assert.deepEqual(player.touchindices, [0]);
     });
 
-    test('still drops ground while moving upward fast after leaving the floor', () => {
+    void test('still drops ground while moving upward fast after leaving the floor', () => {
       const pmove = new Pmove();
       const player = pmove.newPlayerMove();
       let traceCalls = 0;
@@ -553,7 +553,7 @@ describe('PmovePlayer', () => {
       assert.equal(traceCalls, 0);
     });
 
-    test('ignores a stale grounded flag while moving upward fast', () => {
+    void test('ignores a stale grounded flag while moving upward fast', () => {
       const pmove = new Pmove();
       const player = pmove.newPlayerMove();
       let traceCalls = 0;
@@ -577,8 +577,8 @@ describe('PmovePlayer', () => {
     });
   });
 
-  describe('waterjump movement', () => {
-    test('applies gravity and clears waterjump once the upward boost turns downward', () => {
+  void describe('waterjump movement', () => {
+    void test('applies gravity and clears waterjump once the upward boost turns downward', () => {
       const pmove = new Pmove();
       const player = pmove.newPlayerMove();
       let stepSlideCalls = 0;
@@ -610,8 +610,8 @@ describe('PmovePlayer', () => {
     });
   });
 
-  describe('_stepSlideMove', () => {
-    test('snaps down to a walkable slope after an unblocked slide', () => {
+  void describe('_stepSlideMove', () => {
+    void test('snaps down to a walkable slope after an unblocked slide', () => {
       const pmove = new Pmove();
       const player = pmove.newPlayerMove();
       let slideCalls = 0;
@@ -650,7 +650,7 @@ describe('PmovePlayer', () => {
       assert.deepEqual(player.touchindices, [5]);
     });
 
-    test('still evaluates the stepped retry after a blocked slide move', () => {
+    void test('still evaluates the stepped retry after a blocked slide move', () => {
       const pmove = new Pmove();
       const player = pmove.newPlayerMove();
       let slideCalls = 0;
@@ -709,8 +709,8 @@ describe('PmovePlayer', () => {
     });
   });
 
-  describe('_slideMove', () => {
-    test('slides past a wall-to-clip seam and snap keeps the seam walkable', () => {
+  void describe('_slideMove', () => {
+    void test('slides past a wall-to-clip seam and snap keeps the seam walkable', () => {
       const pmove = new Pmove();
       const player = pmove.newPlayerMove();
 
@@ -746,7 +746,7 @@ describe('PmovePlayer', () => {
       assert.deepEqual([...continuedTrace.endpos], [0, 144, 0]);
     });
 
-    test('treats zero-progress near-parallel brush re-clips as a single slide plane', () => {
+    void test('treats zero-progress near-parallel brush re-clips as a single slide plane', () => {
       const pmove = new Pmove();
       const player = pmove.newPlayerMove();
       let traceCalls = 0;
@@ -796,9 +796,9 @@ describe('PmovePlayer', () => {
   });
 });
 
-describe('Pmove', () => {
-  describe('clipPlayerMove', () => {
-    test('keeps startsolid end positions in world space', () => {
+void describe('Pmove', () => {
+  void describe('clipPlayerMove', () => {
+    void test('keeps startsolid end positions in world space', () => {
       const pmove = new Pmove();
 
       pmove.addEntity(createPmoveBoxEntity({
@@ -816,7 +816,7 @@ describe('Pmove', () => {
       assert.deepEqual([...trace.endpos], [...start]);
     });
 
-    test('reports hull hits in world coordinates', () => {
+    void test('reports hull hits in world coordinates', () => {
       const pmove = new Pmove();
 
       pmove.addEntity(createPmoveBoxEntity({
@@ -834,7 +834,7 @@ describe('Pmove', () => {
       assertNear(trace.endpos[2], 0);
     });
 
-    test('preserves later startsolid when an earlier equal-fraction clip already won', () => {
+    void test('preserves later startsolid when an earlier equal-fraction clip already won', () => {
       const pmove = new Pmove();
       const start = new Vector(0, 0, 0);
       const end = new Vector(100, 0, 0);
@@ -870,7 +870,7 @@ describe('Pmove', () => {
       assert.deepEqual([...trace.endpos], [...start]);
     });
 
-    test('ands allsolid across equal-fraction startsolid physents', () => {
+    void test('ands allsolid across equal-fraction startsolid physents', () => {
       const pmove = new Pmove();
       const start = new Vector(0, 0, 0);
       const end = new Vector(100, 0, 0);
@@ -907,7 +907,7 @@ describe('Pmove', () => {
     });
   });
 
-  test('server-style smoke setup mirrors TestServerside assertions', () => {
+  void test('server-style smoke setup mirrors TestServerside assertions', () => {
     const worldModel = createLegacyWorldModel(
       new Vector(-256, -256, -128),
       new Vector(256, 256, 128),
@@ -945,7 +945,7 @@ describe('Pmove', () => {
     assert.equal(playerMoveTraceHigher.fraction, 1.0);
   });
 
-  test('traceStaticWorldPlayerMove traces world only and ignores dynamic physents', () => {
+  void test('traceStaticWorldPlayerMove traces world only and ignores dynamic physents', () => {
     const worldModel = createLegacyWorldModel(
       new Vector(-256, -256, -128),
       new Vector(256, 256, 128),
@@ -969,7 +969,7 @@ describe('Pmove', () => {
     assertNear(aggregateTrace.endpos[0], 31.96875, 0.001);
   });
 
-  test('brush-list world path supports server-style vertical smoke checks', () => {
+  void test('brush-list world path supports server-style vertical smoke checks', () => {
     const worldModel = createBrushWorldModel({ axis: 2, center: [0, 0, 144], halfExtents: [512, 512, 16] });
     const pmove = new Pmove();
     const entity = createPmoveBoxEntity({
@@ -997,8 +997,8 @@ describe('Pmove', () => {
     assert.equal(playerMoveTraceHigher.fraction, 1.0);
   });
 
-  describe('staticWorldContents', () => {
-    test('uses brush-backed world solids before leaf contents', () => {
+  void describe('staticWorldContents', () => {
+    void test('uses brush-backed world solids before leaf contents', () => {
       const worldModel = createBrushWorldModel({ center: [64, 0, 0], halfExtents: [16, 16, 16] });
       const pmove = new Pmove();
 
@@ -1010,7 +1010,7 @@ describe('Pmove', () => {
       assert.equal(pmove.staticWorldContents(new Vector(8, 0, 0)), content.CONTENT_WATER);
     });
 
-    test('normalizes brush-backed current leaves to water', () => {
+    void test('normalizes brush-backed current leaves to water', () => {
       const worldModel = createBrushWorldModel({ center: [64, 0, 0], halfExtents: [16, 16, 16] });
       const pmove = new Pmove();
 
@@ -1022,8 +1022,8 @@ describe('Pmove', () => {
     });
   });
 
-  describe('crouching movement', () => {
-    test('uses duckspeed as the movement cap while ducked on the ground', () => {
+  void describe('crouching movement', () => {
+    void test('uses duckspeed as the movement cap while ducked on the ground', () => {
       const pmove = new Pmove();
       const player = pmove.newPlayerMove();
       const recordedWishspeeds = [];

From e2cfd787148a79b357e1d3ce9700bb4d5170f1bf Mon Sep 17 00:00:00 2001
From: Christian R <github@chrisnew.de>
Date: Fri, 3 Apr 2026 00:43:06 +0300
Subject: [PATCH 26/67] TS: common/model/loaders/* and more

---
 .../code-style-guide.instructions.md          |   11 +-
 .../typescript-port.instructions.md           |  232 ++
 docs/code-style-guide.md                      |    6 +-
 source/engine/client/ClientEntities.mjs       |    2 +-
 source/engine/client/R.mjs                    |    8 +-
 source/engine/client/Sound.mjs                |    2 +-
 .../client/renderer/BrushModelRenderer.mjs    |   22 +-
 source/engine/client/renderer/ShadowMap.mjs   |    8 +-
 source/engine/common/Mod.ts                   |    2 +-
 source/engine/common/Pmove.ts                 |   20 +-
 source/engine/common/model/BSP.mjs            |    1 -
 source/engine/common/model/BSP.ts             |    2 +-
 .../common/model/loaders/BSP29Loader.mjs      | 2724 +----------------
 .../common/model/loaders/BSP29Loader.ts       | 2563 ++++++++++++++++
 .../common/model/loaders/BSP2Loader.mjs       |    4 +-
 .../common/model/loaders/BSP38Loader.mjs      |    2 +-
 source/engine/server/Edict.mjs                |    2 +-
 test/common/model-cache.test.mjs              |    2 +-
 test/physics/brushtrace.test.mjs              |   24 +-
 test/physics/collision-regressions.test.mjs   |  172 +-
 test/physics/fixtures.mjs                     |   10 +-
 test/physics/pmove.test.mjs                   |    4 +-
 test/physics/server-collision.test.mjs        |   94 +-
 23 files changed, 2996 insertions(+), 2921 deletions(-)
 create mode 100644 .github/instructions/typescript-port.instructions.md
 delete mode 100644 source/engine/common/model/BSP.mjs
 create mode 100644 source/engine/common/model/loaders/BSP29Loader.ts

diff --git a/.github/instructions/code-style-guide.instructions.md b/.github/instructions/code-style-guide.instructions.md
index efe7d945..a71f4c99 100644
--- a/.github/instructions/code-style-guide.instructions.md
+++ b/.github/instructions/code-style-guide.instructions.md
@@ -154,13 +154,15 @@ class GL {
 
 ### `null` initializations
 
-- **Explicitly initialize variables to `null`** when they will later hold an object reference and provide JSDoc type annotations either as cast or an inline comment.
-  - Example: `let model = /** @type {BaseModel} */ (null);`
+- **Explicitly initialize variables to `null`** when they will later hold an object reference.
+  - In `.ts` files: `let model: BaseModel | null = null;`
+  - In `.mjs` files: `let model = /** @type {BaseModel} */ (null);`
 
 ### Empty Arrays
 
-- **Initialize empty arrays with `[]`** instead of `new Array()` and provide JSDoc type annotations.
-  - Example: `let vertices = /** @type {number[]} */ ([]);`
+- **Initialize empty arrays with `[]`** instead of `new Array()`.
+  - In `.ts` files: `const vertices: number[] = [];`
+  - In `.mjs` files: `let vertices = /** @type {number[]} */ ([]);`
 
 ## Class and Interface Design
 
@@ -173,6 +175,7 @@ class GL {
 
 - **Use `_` prefix** for protected methods. Add `@protected` JSDoc tag.
 - **Use `#` prefix** for private methods.
+- In `.ts` files, prefer native `protected` / `private` keywords. See `typescript-port.instructions.md`.
 
 ### Respect boundaries of abstraction
 
diff --git a/.github/instructions/typescript-port.instructions.md b/.github/instructions/typescript-port.instructions.md
new file mode 100644
index 00000000..c28bd16d
--- /dev/null
+++ b/.github/instructions/typescript-port.instructions.md
@@ -0,0 +1,232 @@
+
+## TypeScript Porting Guide
+
+When porting `.mjs` files to `.ts` (or polishing an earlier verbatim JS→TS port), apply every applicable rule below. The goal is idiomatic, type-safe TypeScript that relies on the compiler rather than JSDoc for type information.
+
+### Interfaces over Type Aliases
+
+- **Prefer `interface`** for object shapes. Only use `type` for unions, intersections, tuples, or mapped types.
+- **Mark every field `readonly`** unless the field is genuinely mutated after construction.
+
+```typescript
+// ✅ Good
+interface Hull {
+  readonly clipnodes: Clipnode[];
+  readonly planes: Plane[];
+  readonly clip_mins: Vector;
+  readonly clip_maxs: Vector;
+}
+
+// ❌ Bad — type alias for a plain object shape
+type Hull = {
+  clipnodes: Clipnode[];
+  planes: Plane[];
+};
+```
+
+### Typed Declarations — No JSDoc Type Casts
+
+Replace every `/** @type {X} */` cast with a native TS annotation or `as` cast.
+
+```typescript
+// ❌ JSDoc cast
+const materials = /** @type {Record<string, QuakeMaterial>} */ ({});
+loadmodel.version = /** @type {29|844124994} */ (dv.getUint32(0, true));
+const node = /** @type {Node} */ (stack.pop());
+
+// ✅ TS annotation or `as` cast
+const materials: Record<string, QuakeMaterial> = {};
+loadmodel.version = dv.getUint32(0, true) as 29 | 844124994;
+const node = stack.pop()!;            // when non-null is guaranteed
+const node = stack.pop() as Node;     // when a type narrowing is needed
+```
+
+Apply the same rule to local variables that used a JSDoc `@type` on the preceding line:
+
+```typescript
+// ❌ JSDoc-typed local
+/** @type {Map<number, number[]>} */
+const leafsByType = new Map();
+
+// ✅ TS generic
+const leafsByType = new Map<number, number[]>();
+```
+
+### Method and Function Signatures
+
+- **Always provide explicit parameter types and return types** on every class method (public, protected, and private).
+- For inner arrow / local functions, add parameter types; the return type may be inferred unless it improves clarity.
+
+```typescript
+// ❌ Untyped method — leftover from JS
+_loadVertexes(loadmodel, buf) {
+
+// ✅ Fully typed
+_loadVertexes(loadmodel: BrushModel, buf: ArrayBuffer): void {
+```
+
+### JSDoc Cleanup
+
+When a method has TS parameter/return types, remove the redundant JSDoc `@param {Type}` and `@returns {Type}` annotations. **Keep the description text.**
+
+```typescript
+// ❌ Redundant JSDoc types
+/**
+ * Load vertices from BSP lump.
+ * @param {BrushModel} loadmodel - The model being loaded
+ * @param {ArrayBuffer} buf - The BSP file buffer
+ * @returns {void}
+ */
+_loadVertexes(loadmodel: BrushModel, buf: ArrayBuffer): void {
+
+// ✅ Description only
+/**
+ * Load vertices from BSP lump.
+ * @protected
+ */
+_loadVertexes(loadmodel: BrushModel, buf: ArrayBuffer): void {
+```
+
+- **Never leave an empty JSDoc block** — always add a description sentence.
+- **End JSDoc description sentences with a period.**
+- **Keep `@protected` and `@private` tags** only during the transition period while the codebase still has `.mjs` callers that rely on them. Once all callers are `.ts`, prefer TS native access modifiers (see below).
+
+### Access Modifiers — `protected` / `private`
+
+Convert JSDoc access annotations to native TS modifiers:
+
+| JSDoc pattern | TS replacement |
+|---|---|
+| `@protected` + `_` prefix | `protected _methodName(…)` |
+| `@private` + `_` prefix | `#methodName(…)` |
+| `#methodName` (already private) | keep `#methodName(…)` |
+
+- **Use `protected`** for methods overridden by subclasses (e.g., `_loadFaces` in BSP29Loader → BSP2Loader).
+- **Use `#` (hard private)** for methods that are truly internal and never accessed outside the class.
+- **Keep the `_` prefix** on protected members for visual consistency during the migration. Once the full codebase is TS, the prefix may be dropped.
+
+### `override` Keyword
+
+Add `override` to every method that overrides a base class method. This catches accidental signature mismatches at compile time.
+
+```typescript
+// ✅ Signals this overrides ModelLoader.getMagicNumbers()
+override getMagicNumbers(): number[] {
+  return [29];
+}
+```
+
+### `readonly` and `static readonly`
+
+- Mark class fields and static fields `readonly` when they are assigned once (at declaration or in the constructor) and never reassigned.
+- Applies to `static` lookup tables, frozen objects, configuration sets, etc.
+
+```typescript
+static readonly #lump = Object.freeze({ entities: 0, planes: 1, /* … */ });
+static readonly doorClassnames = new Set(['func_door', 'func_door_secret']);
+```
+
+### Enums
+
+Port obvious enumeration-like patterns to native TS `enum` (or `const enum` for zero-runtime overhead when all consumers are TS):
+
+```typescript
+// ❌ JS-era frozen object enum
+const materialFlags = Object.freeze({
+  MF_SKY: 1,
+  MF_TURBULENT: 2,
+  MF_TRANSPARENT: 4,
+});
+
+// ✅ TS enum
+export enum MaterialFlags {
+  MF_SKY = 1,
+  MF_TURBULENT = 2,
+  MF_TRANSPARENT = 4,
+}
+```
+
+**When to use `const enum`:** only when every consumer is TypeScript and no runtime object is needed (e.g., internal flags bitfields). Prefer a regular `enum` when the values may be iterated at runtime or exposed to `.mjs` callers.
+
+### Redundant Constructor Removal
+
+Remove empty constructors that only call `super()` with no additional logic — TypeScript (and JavaScript) does this implicitly.
+
+```typescript
+// ❌ Redundant
+constructor() {
+  super();
+}
+
+// ✅ Just omit it
+```
+
+### Template Literals
+
+Replace string concatenation with template literals for readability.
+
+```typescript
+// ❌ Concatenation
+throw new Error('Bad lump size in ' + loadmodel.name);
+
+// ✅ Template literal
+throw new Error(`Bad lump size in ${loadmodel.name}`);
+```
+
+### Null Initialization and Empty Arrays
+
+When porting `null`-initialized or empty-array variables, use TS annotations directly instead of JSDoc casts:
+
+```typescript
+// ❌ JSDoc
+let model = /** @type {BaseModel} */ (null);
+let vertices = /** @type {number[]} */ ([]);
+
+// ✅ TS
+let model: BaseModel | null = null;
+const vertices: number[] = [];
+```
+
+### Checklist (per file)
+
+Use this checklist when polishing a ported `.ts` file:
+
+1. [ ] All `/** @type {X} */` casts → TS annotations or `as` casts.
+2. [ ] All method parameters and return types explicitly typed.
+3. [ ] JSDoc `@param {Type}` / `@returns {Type}` removed (descriptions kept).
+4. [ ] `interface` + `readonly` for all object shape types.
+5. [ ] `override` on every overriding method.
+6. [ ] `static readonly` on immutable class fields.
+7. [ ] `protected` / `private` / `#` replacing JSDoc `@protected` / `@private`.
+8. [ ] Obvious enums ported to TS `enum`.
+9. [ ] Redundant empty constructors removed.
+10. [ ] String concatenation → template literals.
+11. [ ] No empty JSDoc blocks — every block has a description ending with a period.
+12. [ ] ESLint clean (`npx eslint <file>`).
+13. [ ] All tests pass (`npm run test`).
+
+### Avoid inline import type annotations
+
+When importing types, prefer file-level imports over inline `import('…').Type` annotations for better readability and maintainability.
+
+```typescript
+
+// ❌ Inline import type
+static _brushMayAffectTrace(ctx: BrushTraceContext, brush: import('./model/BSP.ts').Brush): boolean {
+…
+
+// ✅ File-level import
+import { Brush } from './model/BSP.ts';
+…
+static _brushMayAffectTrace(ctx: BrushTraceContext, brush: Brush): boolean {
+…
+```
+
+Exception: When used in dynamically to load modules like so
+
+```typescript
+const comModule = await import(/* @vite-ignore */ serverComId);
+const COM = comModule.COM as typeof import('../common/COM.ts');
+```
+
+But this is a special case and should not be used as a general pattern for type imports!
diff --git a/docs/code-style-guide.md b/docs/code-style-guide.md
index 4b8b51d8..d43b5104 100644
--- a/docs/code-style-guide.md
+++ b/docs/code-style-guide.md
@@ -64,7 +64,7 @@ This document outlines the coding conventions and style rules for the Quakeshack
    /** @type {import('./ClientEntities.mjs').ClientEdict} */
 
    // ✅ GOOD for model types
-   /** @type {import('../../common/model/BSP.mjs').BrushModel} */
+   /** @type {import('../../common/model/BSP.ts').BrushModel} */
    ```
 
 ## Registry and Global Variables
@@ -231,10 +231,10 @@ Always verify import paths are correct:
 
 ```javascript
 // ❌ BAD - Wrong relative path
-/** @param {import('../../../common/model/BSP.mjs').BrushModel} model */
+/** @param {import('../../../common/model/BSP.ts').BrushModel} model */
 
 // ✅ GOOD - Correct relative path from current file
-/** @param {import('../../common/model/BSP.mjs').BrushModel} model */
+/** @param {import('../../common/model/BSP.ts').BrushModel} model */
 ```
 
 ### Return Types from Library Functions
diff --git a/source/engine/client/ClientEntities.mjs b/source/engine/client/ClientEntities.mjs
index 4f8fe12e..2379731f 100644
--- a/source/engine/client/ClientEntities.mjs
+++ b/source/engine/client/ClientEntities.mjs
@@ -7,7 +7,7 @@ import { DefaultClientEdictHandler } from './ClientLegacy.mjs';
 import { BaseClientEdictHandler } from '../../shared/ClientEdict.ts';
 import { ClientEngineAPI } from '../common/GameAPIs.mjs';
 import { SFX } from './Sound.mjs';
-import { Node, revealedVisibility } from '../common/model/BSP.mjs';
+import { Node, revealedVisibility } from '../common/model/BSP.ts';
 import { BaseModel } from '../common/model/BaseModel.ts';
 
 let { CL, Con, Mod, PR, R, S } = registry;
diff --git a/source/engine/client/R.mjs b/source/engine/client/R.mjs
index 10ed32b1..599913c8 100644
--- a/source/engine/client/R.mjs
+++ b/source/engine/client/R.mjs
@@ -15,7 +15,7 @@ import { AliasModelRenderer } from './renderer/AliasModelRenderer.mjs';
 import { SpriteModelRenderer } from './renderer/SpriteModelRenderer.mjs';
 import { MeshModelRenderer } from './renderer/MeshModelRenderer.mjs';
 import Draw from './Draw.mjs';
-import { BrushModel, Node, revealedVisibility } from '../common/model/BSP.mjs';
+import { BrushModel, Node, revealedVisibility } from '../common/model/BSP.ts';
 import PostProcess from './renderer/PostProcess.mjs';
 import BloomEffect from './renderer/BloomEffect.mjs';
 import WarpEffect from './renderer/WarpEffect.mjs';
@@ -822,7 +822,7 @@ R._renderFogAndTurbulentsSorted = function(worldEntity) {
   }
 
   const vieworg = R.refdef.vieworg;
-  /** @type {Array<{dist: number, kind: number, data: import('../common/model/BSP.mjs').WorldTurbulentChainInfo|import('../common/model/BSP.mjs').FogVolumeInfo}>} */
+  /** @type {Array<{dist: number, kind: number, data: import('../common/model/BSP.ts').WorldTurbulentChainInfo|import('../common/model/BSP.ts').FogVolumeInfo}>} */
   const items = [];
 
   const turbulentChains = brushRenderer.getWorldTurbulentChains(worldmodel, vieworg);
@@ -864,11 +864,11 @@ R._renderFogAndTurbulentsSorted = function(worldEntity) {
     }
 
     if (item.kind === 0) {
-      brushRenderer.renderWorldTurbulentChain(worldmodel, /** @type {import('../common/model/BSP.mjs').WorldTurbulentChainInfo} */ (item.data));
+      brushRenderer.renderWorldTurbulentChain(worldmodel, /** @type {import('../common/model/BSP.ts').WorldTurbulentChainInfo} */ (item.data));
       continue;
     }
 
-    brushRenderer.renderSingleFogVolume(worldmodel, /** @type {import('../common/model/BSP.mjs').FogVolumeInfo} */ (item.data));
+    brushRenderer.renderSingleFogVolume(worldmodel, /** @type {import('../common/model/BSP.ts').FogVolumeInfo} */ (item.data));
   }
 
   if (activePass === 0) {
diff --git a/source/engine/client/Sound.mjs b/source/engine/client/Sound.mjs
index d8bd4097..a195a0ac 100644
--- a/source/engine/client/Sound.mjs
+++ b/source/engine/client/Sound.mjs
@@ -4,7 +4,7 @@ import Cvar from '../common/Cvar.ts';
 import Q from '../../shared/Q.ts';
 import { eventBus, registry } from '../registry.mjs';
 
-/** @typedef {import('../common/model/BSP.mjs').Node} BSPNode */
+/** @typedef {import('../common/model/BSP.ts').Node} BSPNode */
 
 let { CL, COM, Con, Host } = registry;
 
diff --git a/source/engine/client/renderer/BrushModelRenderer.mjs b/source/engine/client/renderer/BrushModelRenderer.mjs
index 957ac0dd..17782912 100644
--- a/source/engine/client/renderer/BrushModelRenderer.mjs
+++ b/source/engine/client/renderer/BrushModelRenderer.mjs
@@ -4,7 +4,7 @@ import { eventBus, registry } from '../../registry.mjs';
 import GL, { ATTRIB_LOCATIONS, BRUSH_VERTEX_STRIDE } from '../GL.mjs';
 import { getEntityBloomEmissiveScale } from './BloomEffect.mjs';
 import { materialFlags } from './Materials.mjs';
-import { BrushModel, Node } from '../../common/model/BSP.mjs';
+import { BrushModel, Node } from '../../common/model/BSP.ts';
 import { ClientEdict } from '../ClientEntities.mjs';
 import Mesh from './Mesh.mjs';
 import PostProcess from './PostProcess.mjs';
@@ -662,7 +662,7 @@ export class BrushModelRenderer extends ModelRenderer {
    * semi-transparent liquids can share the same sorted space.
    * @param {BrushModel} clmodel The world model
    * @param {Float32Array|number[]} vieworg Camera position [x, y, z]
-   * @returns {{chain: import('../../common/model/BSP.mjs').WorldTurbulentChainInfo, dist: number}[]} Turbulent draw items with distance metadata
+   * @returns {{chain: import('../../common/model/BSP.ts').WorldTurbulentChainInfo, dist: number}[]} Turbulent draw items with distance metadata
    */
   getWorldTurbulentChains(clmodel, vieworg) {
     const items = [];
@@ -754,7 +754,7 @@ export class BrushModelRenderer extends ModelRenderer {
    * Render a single pre-sorted world turbulent draw batch.
    * Must be called between `beginWorldTurbulentPass` and `endWorldTurbulentPass`.
    * @param {BrushModel} clmodel The world model
-   * @param {import('../../common/model/BSP.mjs').WorldTurbulentChainInfo} chain The turbulent draw batch to render
+   * @param {import('../../common/model/BSP.ts').WorldTurbulentChainInfo} chain The turbulent draw batch to render
    */
   renderWorldTurbulentChain(clmodel, chain) {
     this._renderWorldTurbulentBatch(clmodel, chain.texture, chain.firstVertex, chain.vertexCount);
@@ -1119,7 +1119,7 @@ export class BrushModelRenderer extends ModelRenderer {
    * Light probe textures for fog volumes, keyed by the fog volume object.
    * Each entry holds a raw WebGL texture, the grid resolution, and a reusable
    * pixel buffer to avoid reallocating on every lightstyle update.
-   * @type {Map<import('../../common/model/BSP.mjs').FogVolumeInfo, {texture: WebGLTexture, resX: number, resY: number, resZ: number, data: Uint8Array}>}
+   * @type {Map<import('../../common/model/BSP.ts').FogVolumeInfo, {texture: WebGLTexture, resX: number, resY: number, resZ: number, data: Uint8Array}>}
    */
   #fogLightProbes = new Map();
 
@@ -1174,7 +1174,7 @@ export class BrushModelRenderer extends ModelRenderer {
    * Sample R.LightPoint into a pixel buffer for a fog volume's light probe grid.
    * Data is laid out for TEXTURE_3D upload: Z slices are contiguous in memory.
    * Texel at grid (ix, iy, iz) is at index (iz * resY * resX + iy * resX + ix).
-   * @param {import('../../common/model/BSP.mjs').FogVolumeInfo} fogVolume The fog volume
+   * @param {import('../../common/model/BSP.ts').FogVolumeInfo} fogVolume The fog volume
    * @param {Uint8Array} data Pixel buffer to fill (resX * resY * resZ * 4)
    * @param {number} resX Grid resolution X
    * @param {number} resY Grid resolution Y
@@ -1229,7 +1229,7 @@ export class BrushModelRenderer extends ModelRenderer {
    * Create or update the light probe texture for a fog volume.
    * If the probe already exists, re-samples into the existing pixel buffer
    * and re-uploads via texSubImage2D (avoids GPU allocation).
-   * @param {import('../../common/model/BSP.mjs').FogVolumeInfo} fogVolume The fog volume
+   * @param {import('../../common/model/BSP.ts').FogVolumeInfo} fogVolume The fog volume
    * @returns {{texture: WebGLTexture, resX: number, resY: number, resZ: number, data: Uint8Array}} The probe data
    */
   _createOrUpdateFogLightProbe(fogVolume) {
@@ -1269,7 +1269,7 @@ export class BrushModelRenderer extends ModelRenderer {
    * Get the light probe texture for a fog volume, creating or updating it
    * when lightstyle animations tick. Lightstyles animate at 10 Hz, so the
    * probes are re-sampled at most 10 times per second.
-   * @param {import('../../common/model/BSP.mjs').FogVolumeInfo} fogVolume The fog volume
+   * @param {import('../../common/model/BSP.ts').FogVolumeInfo} fogVolume The fog volume
    * @returns {{texture: WebGLTexture, resX: number, resY: number, resZ: number, data: Uint8Array}|null} Probe data, or null if light data is unavailable
    */
   _getFogLightProbe(fogVolume) {
@@ -1310,7 +1310,7 @@ export class BrushModelRenderer extends ModelRenderer {
   /**
    * Collect active dynamic lights that overlap a fog volume's AABB.
    * Returns up to MAX_FOG_DLIGHTS lights sorted by contribution (closest first).
-   * @param {import('../../common/model/BSP.mjs').FogVolumeInfo} fogVolume The fog volume
+   * @param {import('../../common/model/BSP.ts').FogVolumeInfo} fogVolume The fog volume
    * @returns {{origin: Vector, radius: number, color: Vector}[]} Overlapping dlights
    */
   _collectFogDlights(fogVolume) {
@@ -1350,7 +1350,7 @@ export class BrushModelRenderer extends ModelRenderer {
 
   /**
    * Upload dynamic light uniforms for the current fog volume.
-   * @param {import('../../common/model/BSP.mjs').FogVolumeInfo} fogVolume The fog volume
+   * @param {import('../../common/model/BSP.ts').FogVolumeInfo} fogVolume The fog volume
    */
   _uploadFogDlights(fogVolume) {
     const program = this._fogVolumeProgram;
@@ -1431,7 +1431,7 @@ export class BrushModelRenderer extends ModelRenderer {
    * Collect fog volumes with distance from the given viewpoint for back-to-front sorting.
    * @param {BrushModel} worldmodel The world model containing fog volume definitions
    * @param {Float32Array|number[]} vieworg Camera position [x, y, z]
-   * @returns {{fogVolume: import('../../common/model/BSP.mjs').FogVolumeInfo, dist: number}[]} Fog volume items with distance
+   * @returns {{fogVolume: import('../../common/model/BSP.ts').FogVolumeInfo, dist: number}[]} Fog volume items with distance
    */
   getFogVolumeItems(worldmodel, vieworg) {
     if (!worldmodel.fogVolumes || worldmodel.fogVolumes.length === 0) {
@@ -1488,7 +1488,7 @@ export class BrushModelRenderer extends ModelRenderer {
    * Render a single fog volume.
    * Must be called between `beginFogVolumePass` and `endFogVolumePass`.
    * @param {BrushModel} worldmodel The world model
-   * @param {import('../../common/model/BSP.mjs').FogVolumeInfo} fogVolume The fog volume to render
+   * @param {import('../../common/model/BSP.ts').FogVolumeInfo} fogVolume The fog volume to render
    */
   renderSingleFogVolume(worldmodel, fogVolume) {
     const program = this._fogVolumeProgram;
diff --git a/source/engine/client/renderer/ShadowMap.mjs b/source/engine/client/renderer/ShadowMap.mjs
index 33ad08e5..efcc50f9 100644
--- a/source/engine/client/renderer/ShadowMap.mjs
+++ b/source/engine/client/renderer/ShadowMap.mjs
@@ -131,7 +131,7 @@ export default class ShadowMap {
   /**
    * Reference to the worldmodel whose entities were last parsed.
    * Used to detect map changes and re-parse lazily.
-   * @type {import('../../common/model/BSP.mjs').BrushModel|null}
+   * @type {import('../../common/model/BSP.ts').BrushModel|null}
    */
   static _parsedWorldmodel = null;
 
@@ -431,7 +431,7 @@ export default class ShadowMap {
    * viewpoint differs from the camera's.
    */
   static renderWorldShadow() {
-    const worldmodel = /** @type {import('../../common/model/BSP.mjs').BrushModel} */ (CL.state.worldmodel);
+    const worldmodel = /** @type {import('../../common/model/BSP.ts').BrushModel} */ (CL.state.worldmodel);
     if (!worldmodel) {
       return;
     }
@@ -554,7 +554,7 @@ export default class ShadowMap {
 
   /**
    * Render a brush submodel entity (door, platform, etc.) into a shadow map.
-   * @param {import('../../common/model/BSP.mjs').BrushModel} model
+   * @param {import('../../common/model/BSP.ts').BrushModel} model
    * @param {import('../ClientEntities.mjs').ClientEdict} entity
    * @param {Float64Array} lightSpaceMatrix
    * @param {string} programName
@@ -1004,7 +1004,7 @@ export default class ShadowMap {
    * Call after selectPointLight() returns true.
    */
   static renderPointLightShadow() {
-    const worldmodel = /** @type {import('../../common/model/BSP.mjs').BrushModel} */ (CL.state.worldmodel);
+    const worldmodel = /** @type {import('../../common/model/BSP.ts').BrushModel} */ (CL.state.worldmodel);
     if (!worldmodel) {
       return;
     }
diff --git a/source/engine/common/Mod.ts b/source/engine/common/Mod.ts
index 537a83f6..d151beb0 100644
--- a/source/engine/common/Mod.ts
+++ b/source/engine/common/Mod.ts
@@ -3,7 +3,7 @@ import { MissingResourceError } from './Errors.ts';
 import { ModelLoaderRegistry } from './model/ModelLoaderRegistry.ts';
 import { AliasMDLLoader } from './model/loaders/AliasMDLLoader.mjs';
 import { SpriteSPRLoader } from './model/loaders/SpriteSPRLoader.mjs';
-import { BSP29Loader } from './model/loaders/BSP29Loader.mjs';
+import { BSP29Loader } from './model/loaders/BSP29Loader.ts';
 import { BSP2Loader } from './model/loaders/BSP2Loader.mjs';
 import { WavefrontOBJLoader } from './model/loaders/WavefrontOBJLoader.mjs';
 import ParsedQC from './model/parsers/ParsedQC.mjs';
diff --git a/source/engine/common/Pmove.ts b/source/engine/common/Pmove.ts
index c425e094..d533b7f4 100644
--- a/source/engine/common/Pmove.ts
+++ b/source/engine/common/Pmove.ts
@@ -569,7 +569,7 @@ export class BrushTrace {
   /**
    * Check whether a brush AABB can possibly overlap the current swept move.
    */
-  static _brushMayAffectTrace(ctx: BrushTraceContext, brush: import('./model/BSP.mjs').Brush): boolean {
+  static _brushMayAffectTrace(ctx: BrushTraceContext, brush: import('./model/BSP.ts').Brush): boolean {
     if (brush.mins === null || brush.mins === undefined || brush.maxs === null || brush.maxs === undefined) {
       return true;
     }
@@ -580,7 +580,7 @@ export class BrushTrace {
   /**
    * Check whether a brush AABB can possibly overlap the current position test.
    */
-  static _brushMayAffectPosition(brush: import('./model/BSP.mjs').Brush, boundsMins: Vector, boundsMaxs: Vector): boolean {
+  static _brushMayAffectPosition(brush: import('./model/BSP.ts').Brush, boundsMins: Vector, boundsMaxs: Vector): boolean {
     if (brush.mins === null || brush.mins === undefined || brush.maxs === null || brush.maxs === undefined) {
       return true;
     }
@@ -593,7 +593,7 @@ export class BrushTrace {
    * enter a node's bounds. Used only for pruning; false negatives are avoided
    * by falling back when bounds are missing.
    */
-  static _estimateNodeEntryFraction(ctx: BrushTraceContext, node: import('./model/BSP.mjs').Node): number {
+  static _estimateNodeEntryFraction(ctx: BrushTraceContext, node: import('./model/BSP.ts').Node): number {
     if (node.mins === null || node.mins === undefined || node.maxs === null || node.maxs === undefined) {
       return 0;
     }
@@ -637,7 +637,7 @@ export class BrushTrace {
   /**
    * Check whether a node can still affect the current trace.
    */
-  static _nodeMayAffectTrace(ctx: BrushTraceContext, node: import('./model/BSP.mjs').Node): boolean {
+  static _nodeMayAffectTrace(ctx: BrushTraceContext, node: import('./model/BSP.ts').Node): boolean {
     if (node.mins === null || node.mins === undefined || node.maxs === null || node.maxs === undefined) {
       return true;
     }
@@ -947,7 +947,7 @@ export class BrushTrace {
    * Recursively walk the BSP tree for position testing, expanding by box
    * extents to visit all leaves the player box overlaps.
    */
-  static _testPositionRecursive(worldModel: BrushModel, node: import('./model/BSP.mjs').Node, position: Vector, mins: Vector, maxs: Vector, boundsMins: Vector, boundsMaxs: Vector, extents: Vector, isPoint: boolean, checkCount: number): boolean {
+  static _testPositionRecursive(worldModel: BrushModel, node: import('./model/BSP.ts').Node, position: Vector, mins: Vector, maxs: Vector, boundsMins: Vector, boundsMaxs: Vector, extents: Vector, isPoint: boolean, checkCount: number): boolean {
     if (node.mins !== null && node.mins !== undefined && node.maxs !== null && node.maxs !== undefined
       && !BrushTrace._boundsOverlap(boundsMins, boundsMaxs, node.mins, node.maxs)) {
       return false;
@@ -1137,7 +1137,7 @@ export class BrushTrace {
   /**
    * Test if a player-sized box overlaps any solid brush in a leaf.
    */
-  static _testLeafSolid(worldModel: BrushModel, leaf: import('./model/BSP.mjs').Node, position: Vector, mins: Vector, maxs: Vector, boundsMins: Vector, boundsMaxs: Vector, checkCount: number): boolean {
+  static _testLeafSolid(worldModel: BrushModel, leaf: import('./model/BSP.ts').Node, position: Vector, mins: Vector, maxs: Vector, boundsMins: Vector, boundsMaxs: Vector, checkCount: number): boolean {
     const brushes = worldModel.brushes;
     const leafbrushes = worldModel.leafbrushes;
 
@@ -1182,7 +1182,7 @@ export class BrushTrace {
   /**
    * Test if a box at origin is inside a brush. Equivalent to Q2’s CM_TestBoxInBrush.
    */
-  static _testBoxInBrush(worldModel: BrushModel, brush: import('./model/BSP.mjs').Brush, position: Vector, mins: Vector, maxs: Vector): boolean {
+  static _testBoxInBrush(worldModel: BrushModel, brush: import('./model/BSP.ts').Brush, position: Vector, mins: Vector, maxs: Vector): boolean {
     const brushsides = worldModel.brushsides;
     const planes = worldModel.planes;
 
@@ -1224,7 +1224,7 @@ export class BrushTrace {
    * Recursively traverse the BSP node tree, expanding by trace extents.
    * At leaf nodes, test all brushes. Equivalent to Q2’s CM_RecursiveHullCheck.
    */
-  static _recursiveHullCheck(ctx: BrushTraceContext, node: import('./model/BSP.mjs').Node, p1f: number, p2f: number, p1: Vector, p2: Vector, depth: number = 0) {
+  static _recursiveHullCheck(ctx: BrushTraceContext, node: import('./model/BSP.ts').Node, p1f: number, p2f: number, p1: Vector, p2: Vector, depth: number = 0) {
     if (!BrushTrace._nodeMayAffectTrace(ctx, node)) {
       return;
     }
@@ -1321,7 +1321,7 @@ export class BrushTrace {
    * Test all brushes in a leaf against the current trace.
    * Equivalent to Q2’s CM_TraceToLeaf.
    */
-  static _traceToLeaf(ctx: BrushTraceContext, leaf: import('./model/BSP.mjs').Node) {
+  static _traceToLeaf(ctx: BrushTraceContext, leaf: import('./model/BSP.ts').Node) {
     // Q1 content classification for trace flags
     if (leaf.contents !== content.CONTENT_SOLID && leaf.contents !== content.CONTENT_SKY) {
       ctx.trace.allsolid = false;
@@ -1373,7 +1373,7 @@ export class BrushTrace {
    * Clip the trace against a single brush’s planes.
    * Equivalent to Q2’s CM_ClipBoxToBrush.
    */
-  static _clipBoxToBrush(ctx: BrushTraceContext, brush: import('./model/BSP.mjs').Brush) {
+  static _clipBoxToBrush(ctx: BrushTraceContext, brush: import('./model/BSP.ts').Brush) {
     const brushsides = ctx.worldModel.brushsides;
     const planes = ctx.worldModel.planes;
     const moveDeltaX = ctx.end[0] - ctx.start[0];
diff --git a/source/engine/common/model/BSP.mjs b/source/engine/common/model/BSP.mjs
deleted file mode 100644
index 224f42b0..00000000
--- a/source/engine/common/model/BSP.mjs
+++ /dev/null
@@ -1 +0,0 @@
-export * from './BSP.ts';
diff --git a/source/engine/common/model/BSP.ts b/source/engine/common/model/BSP.ts
index 9f197e3f..43c751cc 100644
--- a/source/engine/common/model/BSP.ts
+++ b/source/engine/common/model/BSP.ts
@@ -494,7 +494,7 @@ export class Brush extends BrushModelComponent {
 
 /**
  * Base class for brush-based models (BSP maps).
- * All loading is handled by `BSP29Loader.mjs`.
+ * All loading is handled by `BSP29Loader`.
  */
 export class BrushModel extends BaseModel {
   /** BSP format version. */
diff --git a/source/engine/common/model/loaders/BSP29Loader.mjs b/source/engine/common/model/loaders/BSP29Loader.mjs
index b097c0f2..d9fb6e2a 100644
--- a/source/engine/common/model/loaders/BSP29Loader.mjs
+++ b/source/engine/common/model/loaders/BSP29Loader.mjs
@@ -1,2723 +1 @@
-import Vector from '../../../../shared/Vector.ts';
-import Q from '../../../../shared/Q.ts';
-import { content } from '../../../../shared/Defs.ts';
-import { GLTexture } from '../../../client/GL.mjs';
-import W, { readWad3Texture, translateIndexToLuminanceRGBA, translateIndexToRGBA } from '../../W.ts';
-import { CRC16CCITT } from '../../CRC.ts';
-import { CorruptedResourceError } from '../../Errors.ts';
-import { eventBus, registry } from '../../../registry.mjs';
-import { ModelLoader } from '../ModelLoader.ts';
-import { Brush, BrushModel, BrushSide, Node } from '../BSP.mjs';
-import { Face, Plane } from '../BaseModel.ts';
-import { materialFlags, noTextureMaterial, PBRMaterial, QuakeMaterial } from '../../../client/renderer/Materials.mjs';
-import { Quake1Sky, SimpleSkyBox } from '../../../client/renderer/Sky.mjs';
-
-// Get registry references (will be set by eventBus)
-let { COM, Con } = registry;
-
-eventBus.subscribe('registry.frozen', () => {
-  ({ COM, Con } = registry);
-});
-
-/**
- * Loader for Quake BSP29 format (.bsp)
- * It supports vanilla BSP29 and a few BSPX extensions (such as lightgrid, RGB lighting).
- */
-export class BSP29Loader extends ModelLoader {
-  /** BSP29 lump indices */
-  static #lump = Object.freeze({
-    entities: 0,
-    planes: 1,
-    textures: 2,
-    vertexes: 3,
-    visibility: 4,
-    nodes: 5,
-    texinfo: 6,
-    faces: 7,
-    lighting: 8,
-    clipnodes: 9,
-    leafs: 10,
-    marksurfaces: 11,
-    edges: 12,
-    surfedges: 13,
-    models: 14,
-  });
-
-  constructor() {
-    super();
-  }
-
-  /**
-   * Get magic numbers that identify this format
-   * @returns {number[]} Array of magic numbers
-   */
-  getMagicNumbers() {
-    return [29]; // BSP version 29
-  }
-
-  /**
-   * Get file extensions for this format
-   * @returns {string[]} Array of file extensions
-   */
-  getExtensions() {
-    return ['.bsp'];
-  }
-
-  /**
-   * Get human-readable name of this loader
-   * @returns {string} Loader name
-   */
-  getName() {
-    return 'Quake BSP29';
-  }
-
-  /**
-   * Load a BSP29 map model from buffer
-   * @param {ArrayBuffer} buffer - The BSP file data
-   * @param {string} name - The model name/path
-   * @returns {Promise<BrushModel>} The loaded model
-   */
-  async load(buffer, name) {
-    const loadmodel = new BrushModel(name);
-
-    loadmodel.version = /** @type {29|844124994} */ ((new DataView(buffer)).getUint32(0, true));
-    loadmodel.bspxoffset = 0;
-
-    // Load all BSP lumps
-    this._loadEntities(loadmodel, buffer);
-    this._loadVertexes(loadmodel, buffer);
-    this._loadEdges(loadmodel, buffer);
-    this._loadSurfedges(loadmodel, buffer);
-    this._loadTextures(loadmodel, buffer);
-    await this._loadMaterials(loadmodel);
-    this._loadLighting(loadmodel, buffer);
-    this._loadPlanes(loadmodel, buffer);
-    this._loadTexinfo(loadmodel, buffer);
-    this._loadFaces(loadmodel, buffer);
-    this._loadMarksurfaces(loadmodel, buffer);
-    this._loadVisibility(loadmodel, buffer);
-    this._loadLeafs(loadmodel, buffer);
-    this._buildClusterData(loadmodel);
-    this._loadNodes(loadmodel, buffer);
-    this._loadClipnodes(loadmodel, buffer);
-    this._makeHull0(loadmodel);
-    this._loadBSPX(loadmodel, buffer);
-    this._loadBrushList(loadmodel, buffer);
-    this._loadLightingRGB(loadmodel, buffer);
-    this._loadDeluxeMap(loadmodel, buffer);
-    this._loadLightgridOctree(loadmodel, buffer);
-    this._loadSubmodels(loadmodel, buffer); // CR: must be last, since it’s creating additional models based on this one
-    this._parseFogVolumes(loadmodel); // must be after _loadSubmodels so we can scan submodel faces
-    this._computeAreas(loadmodel);
-
-    if (loadmodel.coloredlights && !loadmodel.lightdata_rgb) {
-      await this._loadExternalLighting(loadmodel, name);
-    }
-
-    await this._loadSkybox(loadmodel);
-
-    // Calculate bounding radius
-    this._calculateRadius(loadmodel);
-
-    loadmodel.needload = false;
-    loadmodel.checksum = CRC16CCITT.Block(new Uint8Array(buffer));
-
-    return loadmodel;
-  }
-
-  async _loadSkybox(loadmodel) {
-    if (registry.isDedicatedServer) {
-      return;
-    }
-
-    const skyname = loadmodel.worldspawnInfo.skyname;
-
-    if (!skyname) {
-      return;
-    }
-
-    const [front, back, left, right, up, down] = await Promise.all([
-      GLTexture.FromImageFile(`gfx/env/${skyname}ft.png`),
-      GLTexture.FromImageFile(`gfx/env/${skyname}bk.png`),
-      GLTexture.FromImageFile(`gfx/env/${skyname}lf.png`),
-      GLTexture.FromImageFile(`gfx/env/${skyname}rt.png`),
-      GLTexture.FromImageFile(`gfx/env/${skyname}up.png`),
-      GLTexture.FromImageFile(`gfx/env/${skyname}dn.png`),
-    ]);
-
-    // CR: unholy yet convenient hack to pass sky texture data to SkyRenderer
-    loadmodel.newSkyRenderer = function () {
-      const skyrenderer = new SimpleSkyBox(this);
-      skyrenderer.setSkyTextures(front, back, left, right, up, down);
-      return skyrenderer;
-    };
-  }
-
-  /**
-   * Calculate the bounding radius of the model from its vertices
-   * @protected
-   * @param {BrushModel} loadmodel - The model being loaded
-   */
-  _calculateRadius(loadmodel) {
-    const mins = new Vector();
-    const maxs = new Vector();
-
-    for (let i = 0; i < loadmodel.vertexes.length; i++) {
-      const vert = loadmodel.vertexes[i];
-
-      if (vert[0] < mins[0]) {
-        mins[0] = vert[0];
-      } else if (vert[0] > maxs[0]) {
-        maxs[0] = vert[0];
-      }
-
-      if (vert[1] < mins[1]) {
-        mins[1] = vert[1];
-      } else if (vert[1] > maxs[1]) {
-        maxs[1] = vert[1];
-      }
-
-      if (vert[2] < mins[2]) {
-        mins[2] = vert[2];
-      } else if (vert[2] > maxs[2]) {
-        maxs[2] = vert[2];
-      }
-    }
-
-    loadmodel.radius = (new Vector(
-      Math.abs(mins[0]) > Math.abs(maxs[0]) ? Math.abs(mins[0]) : Math.abs(maxs[0]),
-      Math.abs(mins[1]) > Math.abs(maxs[1]) ? Math.abs(mins[1]) : Math.abs(maxs[1]),
-      Math.abs(mins[2]) > Math.abs(maxs[2]) ? Math.abs(mins[2]) : Math.abs(maxs[2]),
-    )).len();
-  }
-
-  /**
-   * Load texture information and create GL textures from BSP texture lump
-   * @protected
-   * @param {BrushModel} loadmodel - The model being loaded
-   * @param {ArrayBuffer} buf - The BSP file buffer
-   */
-  _loadTextures(loadmodel, buf) {
-    const view = new DataView(buf);
-    const lump = BSP29Loader.#lump;
-    const fileofs = view.getUint32((lump.textures << 3) + 4, true);
-    const filelen = view.getUint32((lump.textures << 3) + 8, true);
-    loadmodel.textures.length = 0;
-    const nummiptex = view.getUint32(fileofs, true);
-    let dataofs = fileofs + 4;
-
-    // const textures = /** @type {Record<string,GLTexture>} */ ({}); // list of textures
-    const materials = /** @type {Record<string,QuakeMaterial>} */ ({}); // list of materials
-
-    for (let i = 0; i < nummiptex; i++) {
-      const miptexofs = view.getInt32(dataofs, true);
-      dataofs += 4;
-      if (miptexofs === -1) {
-        loadmodel.textures[i] = noTextureMaterial;
-        continue;
-      }
-      const absofs = miptexofs + fileofs;
-
-      const name = Q.memstr(new Uint8Array(buf, absofs, 16));
-      const cleanName = name.replace(/^\+[0-9a-j]/, ''); // no anim prefix
-
-      if (!materials[cleanName]) {
-        materials[cleanName] = new QuakeMaterial(name, view.getUint32(absofs + 16, true), view.getUint32(absofs + 20, true));
-      }
-
-      const tx = materials[cleanName];
-
-      let glt = null;
-      let luminanceTexture = null;
-
-      // Load texture data (skip for dedicated server)
-      if (!registry.isDedicatedServer) {
-        if (tx.name.substring(0, 3).toLowerCase() === 'sky') {
-          const skyTexture = new Uint8Array(buf, absofs + view.getUint32(absofs + 24, true), 32768);
-
-          // CR: unholy yet convenient hack to pass sky texture data to SkyRenderer
-          loadmodel.newSkyRenderer = function () {
-            const skyrenderer = new Quake1Sky(this);
-            skyrenderer.setSkyTexture(skyTexture);
-            return skyrenderer;
-          };
-
-          tx.flags |= materialFlags.MF_SKY;
-        } else {
-          // Try loading WAD3 texture
-          const len = 40 + tx.width * tx.height * (1 + 0.25 + 0.0625 + 0.015625) + 2 + 768;
-          if (absofs + len - 2 - 768 < buf.byteLength) {
-            const magic = view.getInt16(absofs + len - 2 - 768, true);
-            if (magic === 256) {
-              const data = new ArrayBuffer(len);
-              new Uint8Array(data).set(new Uint8Array(buf, absofs, len));
-              const wtex = readWad3Texture(data, tx.name, 0);
-              glt = GLTexture.FromLumpTexture(wtex);
-              const wadLuminance = BSP29Loader._createWadLuminanceTexture(data, tx.name, tx.width, tx.height);
-              if (wadLuminance !== null) {
-                luminanceTexture = wadLuminance;
-              }
-              tx.averageColor = BSP29Loader._computeAverageColor(wtex.data);
-            }
-          }
-        }
-
-        if (!glt) {
-          const pixelData = new Uint8Array(buf, absofs + view.getUint32(absofs + 24, true), tx.width * tx.height);
-          const rgba = translateIndexToRGBA(pixelData, tx.width, tx.height, W.d_8to24table_u8, tx.name[0] === '{' ? 255 : null, 240);
-          const textureId = `${tx.name}/${CRC16CCITT.Block(pixelData)}`; // CR: unique texture ID to avoid conflicts across maps
-          glt = GLTexture.Allocate(textureId, tx.width, tx.height, rgba);
-          const luminanceRGBA = translateIndexToLuminanceRGBA(pixelData, tx.width, tx.height, W.d_8to24table_u8, tx.name[0] === '{' ? 255 : null, 240);
-          if (BSP29Loader._hasVisiblePixels(luminanceRGBA)) {
-            luminanceTexture = GLTexture.Allocate(`${textureId}:luminance`, tx.width, tx.height, luminanceRGBA);
-          }
-          tx.averageColor = BSP29Loader._computeAverageColor(rgba);
-        }
-
-        if (tx.name[0] === '*' || tx.name[0] === '!') {
-          tx.flags |= materialFlags.MF_TURBULENT;
-        }
-
-        // Mark textures with '{' prefix as transparent (for alpha blending)
-        if (tx.name[0] === '{') {
-          tx.flags |= materialFlags.MF_TRANSPARENT;
-        }
-
-        if (tx.name.toLowerCase().startsWith('*lava')) {
-          tx.flags |= materialFlags.MF_FULLBRIGHT;
-        }
-      }
-
-      if (name[0] === '+') { // animation prefix
-        const frame = name.toUpperCase().charCodeAt(1);
-
-        if (frame >= 48 && frame <= 57) { // '0'-'9'
-          const frameIndex = frame - 48;
-          tx.addAnimationFrame(frameIndex, glt, luminanceTexture);
-        } else if (frame >= 65 && frame <= 74) { // 'A'-'J'
-          const frameIndex = frame - 65;
-          tx.addAlternateFrame(frameIndex, glt, luminanceTexture);
-        }
-      } else {
-        tx.texture = glt;
-        tx.luminanceTexture = luminanceTexture;
-      }
-
-      loadmodel.textures[i] = tx;
-    }
-
-    loadmodel.bspxoffset = Math.max(loadmodel.bspxoffset, fileofs + filelen);
-  }
-
-  /**
-   * @param {ArrayBuffer} wadTextureData Copied WAD3 texture data.
-   * @param {string} textureName Texture name for cache IDs.
-   * @param {number} width Texture width.
-   * @param {number} height Texture height.
-   * @returns {GLTexture|null} Uploaded luminance texture when the source has fullbright pixels.
-   */
-  static _createWadLuminanceTexture(wadTextureData, textureName, width, height) {
-    const indexedData = new Uint8Array(wadTextureData, 40, width * height);
-    const palette = new Uint8Array(wadTextureData,
-      40 +
-      width * height +
-      width / 2 * height / 2 +
-      width / 4 * height / 4 +
-      width / 8 * height / 8 +
-      2,
-    768);
-    const luminanceRGBA = translateIndexToLuminanceRGBA(indexedData, width, height, palette, textureName[0] === '{' ? 255 : null, 240);
-
-    if (!BSP29Loader._hasVisiblePixels(luminanceRGBA)) {
-      return null;
-    }
-
-    return GLTexture.Allocate(`${textureName}/${CRC16CCITT.Block(indexedData)}:luminance`, width, height, luminanceRGBA);
-  }
-
-  /**
-   * @param {Uint8Array} rgba RGBA texture data.
-   * @returns {boolean} True when any pixel contributes visible color.
-   */
-  static _hasVisiblePixels(rgba) {
-    for (let i = 3; i < rgba.length; i += 4) {
-      if (rgba[i] !== 0) {
-        return true;
-      }
-    }
-
-    return false;
-  }
-
-  /**
-   * Load material definitions from .qsmat.json file if available
-   * @protected
-   * @param {BrushModel} loadmodel - The model being loaded
-   */
-  async _loadMaterials(loadmodel) {
-    if (registry.isDedicatedServer) {
-      return;
-    }
-
-    const matfile = await COM.LoadTextFile(loadmodel.name.replace(/\.bsp$/i, '.qsmat.json'));
-
-    if (!matfile) {
-      return;
-    }
-
-    Con.DPrint(`BSP29Loader: found materials file for ${loadmodel.name}\n`);
-    const materialData = JSON.parse(matfile);
-    console.assert(materialData.version === 1);
-
-    for (const [txName, textures] of Object.entries(materialData.materials)) {
-      const textureEntry = Array.from(loadmodel.textures.entries()).find(([, t]) => t.name === txName);
-
-      if (!textureEntry) {
-        Con.DPrint(`BSP29Loader: referenced material (${txName}) is not used\n`);
-        continue;
-      }
-
-      const [txIndex, texture] = textureEntry;
-      const pbr = new PBRMaterial(texture.name, texture.width, texture.height);
-
-      for (const category of ['luminance', 'diffuse', 'specular', 'normal']) {
-        if (textures[category]) {
-          try {
-            pbr[category] = await GLTexture.FromImageFile(textures[category]);
-            Con.DPrint(`BSP29Loader: loaded ${category} texture for ${texture.name} from ${textures[category]}\n`);
-          } catch (e) {
-            Con.PrintError(`BSP29Loader: failed to load ${textures[category]}: ${e.message}\n`);
-          }
-        }
-      }
-
-      if (textures.flags) {
-        for (const flagName of textures.flags) {
-          const flagValue = materialFlags[flagName];
-          console.assert(typeof flagValue === 'number', `BSP29Loader: unknown material flag ${flagName} in ${loadmodel.name}`);
-          pbr.flags |= flagValue;
-        }
-      }
-
-      if (!textures.diffuse && (texture instanceof QuakeMaterial)) {
-        pbr.diffuse = texture.texture; // keep original diffuse as base
-      }
-
-      loadmodel.textures[txIndex] = pbr; // replace with PBR material
-    }
-  }
-
-  /**
-   * Load lighting data from BSP lump
-   * @protected
-   * @param {BrushModel} loadmodel - The model being loaded
-   * @param {ArrayBuffer} buf - The BSP file buffer
-   */
-  _loadLighting(loadmodel, buf) {
-    loadmodel.lightdata_rgb = null;
-    loadmodel.lightdata = null;
-
-    const view = new DataView(buf);
-    const lump = BSP29Loader.#lump;
-    const fileofs = view.getUint32((lump.lighting << 3) + 4, true);
-    const filelen = view.getUint32((lump.lighting << 3) + 8, true);
-
-    if (filelen === 0) {
-      return;
-    }
-
-    loadmodel.lightdata = new Uint8Array(new ArrayBuffer(filelen));
-    loadmodel.lightdata.set(new Uint8Array(buf, fileofs, filelen));
-    loadmodel.bspxoffset = Math.max(loadmodel.bspxoffset, fileofs + filelen);
-  }
-
-  /**
-   * Load visibility data for potentially visible set (PVS) calculations
-   * @protected
-   * @param {BrushModel} loadmodel - The model being loaded
-   * @param {ArrayBuffer} buf - The BSP file buffer
-   */
-  _loadVisibility(loadmodel, buf) {
-    const view = new DataView(buf);
-    const lump = BSP29Loader.#lump;
-    const fileofs = view.getUint32((lump.visibility << 3) + 4, true);
-    const filelen = view.getUint32((lump.visibility << 3) + 8, true);
-
-    if (filelen === 0) {
-      return;
-    }
-
-    loadmodel.visdata = new Uint8Array(new ArrayBuffer(filelen));
-    loadmodel.visdata.set(new Uint8Array(buf, fileofs, filelen));
-    loadmodel.bspxoffset = Math.max(loadmodel.bspxoffset, fileofs + filelen);
-  }
-
-  /**
-   * Build cluster-native visibility data structures after vis + leafs are loaded.
-   * Sets numclusters, builds clusterPvsOffsets from leaf visofs values, and
-   * computes PHS (Potentially Hearable Set) via transitive closure of PVS.
-   * @protected
-   * @param {BrushModel} loadmodel - The model being loaded
-   */
-  _buildClusterData(loadmodel) {
-    const numclusters = loadmodel.leafs.length - 1; // leaf 0 is outside sentinel
-    loadmodel.numclusters = numclusters;
-
-    // BSP29/BSP2 maps have no area data — single area, no portals
-    loadmodel.numAreas = 1;
-    loadmodel.areaPortals.init(1, []);
-
-    if (loadmodel.visdata === null || numclusters <= 0) {
-      return;
-    }
-
-    // Build clusterPvsOffsets from leaf visofs values
-    // For BSP29: cluster c = leaf c+1, so clusterPvsOffsets[c] = leafs[c+1].visofs
-    const clusterPvsOffsets = new Array(numclusters);
-
-    for (let c = 0; c < numclusters; c++) {
-      clusterPvsOffsets[c] = loadmodel.leafs[c + 1].visofs;
-    }
-
-    loadmodel.clusterPvsOffsets = clusterPvsOffsets;
-
-    // Compute PHS via transitive closure of PVS
-    this._computePHS(loadmodel);
-  }
-
-  /**
-   * Compute PHS (Potentially Hearable Set) data by transitive closure of PVS.
-   * For each cluster, the PHS includes all clusters visible from any cluster
-   * that is itself visible from the source cluster (one-hop expansion).
-   * @protected
-   * @param {BrushModel} loadmodel - The model being loaded
-   */
-  _computePHS(loadmodel) {
-    const numclusters = loadmodel.numclusters;
-    const clusterBytes = (numclusters + 7) >> 3;
-    const visdata = loadmodel.visdata;
-    const offsets = loadmodel.clusterPvsOffsets;
-
-    if (visdata === null || offsets === null || numclusters <= 0) {
-      return;
-    }
-
-    // Decompress all PVS rows into a flat buffer for fast OR operations
-    const pvsRows = new Uint8Array(numclusters * clusterBytes);
-    for (let c = 0; c < numclusters; c++) {
-      const rowStart = c * clusterBytes;
-
-      if (offsets[c] < 0) {
-        continue; // no vis for this cluster; row stays zero
-      }
-
-      for (let _out = 0, _in = offsets[c]; _out < clusterBytes;) {
-        // Bounds check to prevent reading past end of visdata
-        // Note: It's normal for visibility data to end before clusterBytes is filled;
-        // remaining bytes stay zero, which is correct for unvisible clusters.
-        if (_in >= visdata.length) {
-          break;
-        }
-
-        if (visdata[_in] !== 0) {
-          pvsRows[rowStart + _out++] = visdata[_in++];
-          continue;
-        }
-
-        // RLE: 0 byte followed by count of zeros
-        if (_in + 1 >= visdata.length) {
-          // End of RLE data; remaining output stays zero (unvisible)
-          break;
-        }
-
-        for (let skip = visdata[_in + 1]; skip > 0; skip--) {
-          pvsRows[rowStart + _out++] = 0x00;
-        }
-
-        _in += 2;
-      }
-    }
-
-    // Transitive closure: PHS[src] = OR of PVS[c] for all c where PVS[src] has bit c set
-    const phsRows = new Uint8Array(numclusters * clusterBytes);
-    for (let src = 0; src < numclusters; src++) {
-      const srcPvsStart = src * clusterBytes;
-      const dstPhsStart = src * clusterBytes;
-
-      // Start with the PVS itself
-      for (let b = 0; b < clusterBytes; b++) {
-        phsRows[dstPhsStart + b] = pvsRows[srcPvsStart + b];
-      }
-
-      // OR in PVS of every cluster visible from src
-      for (let c = 0; c < numclusters; c++) {
-        if ((pvsRows[srcPvsStart + (c >> 3)] & (1 << (c & 7))) === 0) {
-          continue;
-        }
-
-        const neighborPvsStart = c * clusterBytes;
-
-        for (let b = 0; b < clusterBytes; b++) {
-          phsRows[dstPhsStart + b] |= pvsRows[neighborPvsStart + b];
-        }
-      }
-    }
-
-    // RLE-compress PHS rows into phsdata + build clusterPhsOffsets
-    // Worst case: each row expands to clusterBytes (no compression)
-    // Typical case: significant compression due to zero runs
-    // Format: Non-zero bytes are literal, [0, count] represents count zero bytes
-    const phsBuffer = [];
-    const clusterPhsOffsets = new Array(numclusters);
-
-    for (let c = 0; c < numclusters; c++) {
-      clusterPhsOffsets[c] = phsBuffer.length;
-      const rowStart = c * clusterBytes;
-      let i = 0;
-
-      while (i < clusterBytes) {
-        if (phsRows[rowStart + i] !== 0) {
-          // Literal non-zero byte
-          phsBuffer.push(phsRows[rowStart + i]);
-          i++;
-        } else {
-          // Count zero run (up to 255 bytes)
-          let zeroCount = 0;
-
-          while (i < clusterBytes && phsRows[rowStart + i] === 0 && zeroCount < 255) {
-            i++;
-            zeroCount++;
-          }
-
-          // Encode as [0, count]
-          phsBuffer.push(0);
-          phsBuffer.push(zeroCount);
-        }
-      }
-    }
-
-    loadmodel.phsdata = new Uint8Array(phsBuffer);
-    loadmodel.clusterPhsOffsets = clusterPhsOffsets;
-  }
-
-  /**
-   * Compute visibility areas and portals based on door entities and PHS.
-   * This traverses the BSP tree to classify leaves against door planes,
-   * then clusters them based on PVS connectivity.
-   * @protected
-   * @param {BrushModel} loadmodel - The model being loaded
-   */
-  _computeAreas(loadmodel) {
-    // 1. Identify Portal Definitions (Doors)
-    const portalDefs = this.#parsePortalEntities(loadmodel);
-
-    // 2. Build Portal Planes from Door BBoxes
-    // Merge bboxes for shared portalNums (e.g. double doors)
-    const mergedBboxes = new Map();
-
-    for (const def of portalDefs) {
-      const submodel = loadmodel.submodels[def.modelIndex - 1]; // *N -> submodels[N-1]
-
-      if (!submodel) {
-        Con.PrintWarning(`BSP29Loader._computeAreas: portal ${def.portalNum} references invalid model *${def.modelIndex}\n`);
-        continue;
-      }
-
-      const existing = mergedBboxes.get(def.portalNum);
-
-      if (existing) {
-        for (let k = 0; k < 3; k++) {
-          existing.mins[k] = Math.min(existing.mins[k], submodel.mins[k]);
-          existing.maxs[k] = Math.max(existing.maxs[k], submodel.maxs[k]);
-        }
-      } else {
-        mergedBboxes.set(def.portalNum, {
-          mins: [submodel.mins[0], submodel.mins[1], submodel.mins[2]],
-          maxs: [submodel.maxs[0], submodel.maxs[1], submodel.maxs[2]],
-        });
-      }
-    }
-
-    const portals = [];
-
-    for (const [portalNum, bbox] of mergedBboxes) {
-      // Determine split plane (thinnest axis)
-      const size = [bbox.maxs[0] - bbox.mins[0], bbox.maxs[1] - bbox.mins[1], bbox.maxs[2] - bbox.mins[2]];
-      let axis = 0;
-
-      if (size[1] < size[0]) {
-        axis = 1;
-      }
-
-      if (size[2] < size[axis]) {
-        axis = 2;
-      }
-
-      const dist = (bbox.mins[axis] + bbox.maxs[axis]) * 0.5;
-      const thickness = (bbox.maxs[axis] - bbox.mins[axis]) * 0.5;
-      const offset = Math.max(24.0, thickness + 16.0); // Offset for PHS sampling
-
-      // Sample PHS points
-      const center = [(bbox.mins[0] + bbox.maxs[0]) * 0.5, (bbox.mins[1] + bbox.maxs[1]) * 0.5, (bbox.mins[2] + bbox.maxs[2]) * 0.5];
-      const backPt = [...center];
-      backPt[axis] -= offset;
-      const frontPt = [...center];
-      frontPt[axis] += offset;
-
-      portals.push({
-        portalNum,
-        axis,
-        dist,
-        backVis: loadmodel.getPhsByPoint(new Vector(...backPt)),
-        frontVis: loadmodel.getPhsByPoint(new Vector(...frontPt)),
-      });
-    }
-
-    // 3. Traverse BSP Nodes to assign "Side" Signatures
-    // Optimization: If a node is fully on one side of a portal plane, all its children are too.
-    const leafSignatures = new Map(); // leafIndex -> "signature string"
-
-    /**
-     * Recursively classify nodes against portal planes
-     * @param {import('../BSP.mjs').Node} node Current BSP node being classified.
-     * @param {number[]} states - Array of 0 (Back), 1 (Front), or -1 (Unknown)
-     */
-    const classifyRecursive = (node, states) => {
-      // Check unknown portals against node bounds
-      const nextStates = states.slice();
-
-      for (let i = 0; i < portals.length; i++) {
-        if (nextStates[i] !== -1) {
-          continue;
-        }
-
-        const p = portals[i];
-
-        if (node.maxs[p.axis] < p.dist) {
-          nextStates[i] = 0;
-        } else if (node.mins[p.axis] > p.dist) {
-          nextStates[i] = 1;
-        }
-      }
-
-      if (node.contents < 0) {
-        // Leaf Node
-        if (node.contents === content.CONTENT_SOLID) {
-          node.area = 0;
-          return;
-        }
-
-        const cx = (node.mins[0] + node.maxs[0]) * 0.5;
-        const cy = (node.mins[1] + node.maxs[1]) * 0.5;
-        const cz = (node.mins[2] + node.maxs[2]) * 0.5;
-        const center = [cx, cy, cz];
-
-        let sig = '';
-
-        for (let i = 0; i < portals.length; i++) {
-          let side = nextStates[i];
-
-          if (side === -1) {
-            side = center[portals[i].axis] >= portals[i].dist ? 1 : 0;
-          }
-
-          // Nearness check via PHS
-          const p = portals[i];
-          const isNear = side === 0 ? p.backVis.isRevealed(node.num) : p.frontVis.isRevealed(node.num);
-
-          // Sig Codes: 0=BackFar, 1=BackNear, 2=FrontNear, 3=FrontFar
-          let code = 0;
-
-          if (side === 0) {
-            code = isNear ? 1 : 0;
-          } else {
-            code = isNear ? 2 : 3;
-          }
-
-          sig += code.toString();
-        }
-
-        leafSignatures.set(node.num, sig);
-        return;
-      }
-
-      // Inner Node
-      if (node.children[0]) {
-        classifyRecursive(node.children[0], nextStates);
-      }
-      if (node.children[1]) {
-        classifyRecursive(node.children[1], nextStates);
-      }
-    };
-
-    // Start traversal from root
-    const initialStates = new Array(portals.length).fill(-1);
-    classifyRecursive(loadmodel.nodes[0], initialStates);
-
-    // 4. Cluster Signatures into Areas (PVS connectivity)
-    const sigGroups = new Map();
-
-    for (const [leafNum, sig] of leafSignatures) {
-      if (!sigGroups.has(sig)) {
-        sigGroups.set(sig, []);
-      }
-      sigGroups.get(sig).push(leafNum);
-    }
-
-    let nextArea = 1;
-    /** @type {{ sig: string, area: number }[]} */
-    const areasList = [];
-    /** @type {Map<number, number[]>} areaID -> leafNum[] */
-    const areaLeafsMap = new Map();
-
-    for (const [sig, leafIndices] of sigGroups) {
-      const visited = new Set();
-
-      for (const startLeaf of leafIndices) {
-        if (visited.has(startLeaf)) {
-          continue;
-        }
-
-        const area = nextArea++;
-        areasList.push({ sig, area });
-        areaLeafsMap.set(area, []);
-
-        // BFS within this signature group using PVS
-        const queue = [startLeaf];
-        visited.add(startLeaf);
-        loadmodel.leafs[startLeaf].area = area;
-        areaLeafsMap.get(area).push(startLeaf);
-
-        while (queue.length > 0) {
-          const current = queue.shift();
-          const pvs = loadmodel.getPvsByLeaf(loadmodel.leafs[current]);
-
-          // We only need to check leaves in the same signature group
-          for (const candidate of leafIndices) {
-            if (!visited.has(candidate) && pvs.isRevealed(candidate)) {
-              visited.add(candidate);
-              loadmodel.leafs[candidate].area = area;
-              areaLeafsMap.get(area).push(candidate);
-              queue.push(candidate);
-            }
-          }
-        }
-      }
-    }
-
-    loadmodel.numAreas = nextArea;
-
-    // 5. Connect Areas
-    /** @type {{ area0: number, area1: number, group: number }[]} */
-    const allConnections = [];
-
-    for (let i = 0; i < areasList.length; i++) {
-      for (let j = i + 1; j < areasList.length; j++) {
-        const { sig: sigA, area: areaA } = areasList[i];
-        const { sig: sigB, area: areaB } = areasList[j];
-
-        // Differences logic:
-        // 1 -> 2 (BackNear <-> FrontNear) : Door Crossing (Gated)
-        // Others: Open connection (just movement)
-        let diffCount = 0;
-        let doorCount = 0;
-        let doorGroup = -1;
-
-        for (let k = 0; k < sigA.length; k++) {
-          if (sigA[k] !== sigB[k]) {
-            diffCount++;
-            const s1 = parseInt(sigA[k]);
-            const s2 = parseInt(sigB[k]);
-
-            // Check if transition is BackNear(1) <-> FrontNear(2)
-            if ((s1 === 1 && s2 === 2) || (s1 === 2 && s2 === 1)) {
-              doorCount++;
-              doorGroup = portals[k].portalNum;
-            }
-          }
-        }
-
-        if (diffCount === 0) {
-          continue;
-        }
-
-        // PVS Adjacency Check
-        const leafsA = areaLeafsMap.get(areaA);
-        const leafsB = areaLeafsMap.get(areaB);
-        let pvsAdjacent = false;
-
-        // Check A seeing B (optimization: only check first few or scan until hit)
-        for (let li = 0; li < leafsA.length && !pvsAdjacent; li++) {
-          const pvs = loadmodel.getPvsByLeaf(loadmodel.leafs[leafsA[li]]);
-          for (let lj = 0; lj < leafsB.length; lj++) {
-            if (pvs.isRevealed(leafsB[lj])) {
-              pvsAdjacent = true;
-              break;
-            }
-          }
-        }
-
-        if (!pvsAdjacent) {
-          continue;
-        }
-
-        if (doorCount === 1) {
-          allConnections.push({ area0: areaA, area1: areaB, group: doorGroup });
-        } else if (doorCount === 0) {
-          allConnections.push({ area0: areaA, area1: areaB, group: -1 });
-        }
-      }
-    }
-
-    let maxGroup = 0;
-    for (const c of allConnections) {
-      if (c.group > maxGroup) {
-        maxGroup = c.group;
-      }
-    }
-    const numGroups = maxGroup + 1;
-
-    loadmodel.portalDefs = allConnections;
-    loadmodel.areaPortals.init(loadmodel.numAreas, allConnections, numGroups);
-
-    Con.DPrint(`_computeAreas: Computed ${loadmodel.numAreas} areas, ${allConnections.length} connections, ${numGroups} groups\n`);
-  }
-
-  /** @type {Set<string>} Classnames that are auto-assigned portal numbers */
-  static doorClassnames = new Set(['func_door', 'func_door_secret', 'func_buyzone_shutters']);
-
-  /**
-   * Parse the entity lump for portal entity definitions.
-   * Entities with an explicit "portal" key are used directly. Door entities
-   * (func_door, func_door_secret) with brush models are auto-assigned portal
-   * numbers if they don't have an explicit one. The mapping from model name
-   * to portal number is stored in loadmodel.modelPortalMap.
-   * @param {BrushModel} loadmodel - The model being loaded
-   * @returns {{ portalNum: number, modelIndex: number }[]} portal definitions
-   */
-  #parsePortalEntities(loadmodel) {
-    /** @type {{ portalNum: number, modelIndex: number }[]} */
-    const portals = [];
-
-    // First pass: collect explicit portals and door entities needing auto-assignment
-    /** @type {{ modelIndex: number, model: string }[]} */
-    const autoAssignDoors = [];
-    let maxExplicitPortal = -1;
-
-    let data = loadmodel.entities;
-
-    Con.DPrint('BSP29Loader.#parsePortalEntities: looking for portals in entity lump...\n');
-
-    while (data) {
-      const parsed = COM.Parse(data);
-      data = parsed.data;
-
-      if (!data) {
-        break;
-      }
-
-      // Parse one entity block
-      /** @type {Record<string, string>} */
-      const ent = {};
-
-      while (data) {
-        const parsedKey = COM.Parse(data);
-        data = parsedKey.data;
-
-        if (!data || parsedKey.token === '}') {
-          break;
-        }
-
-        const parsedValue = COM.Parse(data);
-        data = parsedValue.data;
-
-        if (!data || parsedValue.token === '}') {
-          break;
-        }
-
-        ent[parsedKey.token] = parsedValue.token;
-      }
-
-      if (!ent.model || !ent.model.startsWith('*')) {
-        continue;
-      }
-
-      const modelIndex = parseInt(ent.model.substring(1), 10);
-
-      if (isNaN(modelIndex) || modelIndex <= 0) {
-        continue;
-      }
-
-      // Explicit portal key takes priority
-      if (ent.portal !== undefined) {
-        const portalNum = parseInt(ent.portal, 10);
-
-        if (!isNaN(portalNum) && portalNum >= 0) {
-          portals.push({ portalNum, modelIndex });
-          loadmodel.modelPortalMap[ent.model] = portalNum;
-
-          if (portalNum > maxExplicitPortal) {
-            maxExplicitPortal = portalNum;
-          }
-        }
-
-        continue;
-      }
-
-      // CR: temporarily disabled due to funny bugs
-      // // Auto-assign portal numbers to door entities
-      // if (ent.classname && BSP29Loader.doorClassnames.has(ent.classname)) {
-      //   Con.DPrint(`...detected portal ${ent.classname} with model ${ent.model}\n`);
-      //   autoAssignDoors.push({ modelIndex, model: ent.model });
-      // }
-    }
-
-    // Auto-assign portal numbers starting after the highest explicit one.
-    // Double doors (two touching door halves) must share a single portal
-    // number, otherwise each half generates its own splitting plane and
-    // the area assignment breaks.
-    let nextPortal = maxExplicitPortal + 1;
-
-    // Group touching doors using union-find so linked door pairs share
-    // a portal. This mirrors the game-side _linkDoors() touching test.
-    const doorCount = autoAssignDoors.length;
-
-    /** @type {number[]} union-find parent array */
-    const parent = autoAssignDoors.map((_, i) => i);
-
-    /**
-     * @param {number} i - element index
-     * @returns {number} root of the set containing i
-     */
-    const find = (i) => {
-      while (parent[i] !== i) {
-        parent[i] = parent[parent[i]]; // path compression
-        i = parent[i];
-      }
-
-      return i;
-    };
-
-    /**
-     * @param {number} a - first element
-     * @param {number} b - second element
-     */
-    const union = (a, b) => {
-      parent[find(a)] = find(b);
-    };
-
-    for (let i = 0; i < doorCount; i++) {
-      const smA = loadmodel.submodels[autoAssignDoors[i].modelIndex - 1];
-
-      if (!smA) {
-        continue;
-      }
-
-      for (let j = i + 1; j < doorCount; j++) {
-        const smB = loadmodel.submodels[autoAssignDoors[j].modelIndex - 1];
-
-        if (!smB) {
-          continue;
-        }
-
-        // Same touching test as BaseEntity.isTouching / QuakeC EntitiesTouching
-        if (smA.mins[0] <= smB.maxs[0] && smA.maxs[0] >= smB.mins[0]
-          && smA.mins[1] <= smB.maxs[1] && smA.maxs[1] >= smB.mins[1]
-          && smA.mins[2] <= smB.maxs[2] && smA.maxs[2] >= smB.mins[2]) {
-          union(i, j);
-        }
-      }
-    }
-
-    // Assign one portal number per group
-    /** @type {Map<number, number>} group root → portal number */
-    const groupPortal = new Map();
-
-    for (let i = 0; i < doorCount; i++) {
-      const door = autoAssignDoors[i];
-
-      if (loadmodel.modelPortalMap[door.model]) {
-        continue;
-      }
-
-      const root = find(i);
-      let portalNum = groupPortal.get(root);
-
-      if (portalNum === undefined) {
-        portalNum = nextPortal++;
-        groupPortal.set(root, portalNum);
-      }
-
-      portals.push({ portalNum, modelIndex: door.modelIndex });
-      loadmodel.modelPortalMap[door.model] = portalNum;
-    }
-
-    if (autoAssignDoors.length > 0) {
-      Con.DPrint(`BSP29Loader.#parsePortalEntities: auto-assigned ${autoAssignDoors.length} door portals (${groupPortal.size} groups)\n`);
-    }
-
-    return portals;
-  }
-
-  /**
-   * Load entities from BSP lump and parse worldspawn properties.
-   * Also this tries to parse light entities to determine if RGB lighting is used and whether we need to load the .lit file.
-   * @protected
-   * @param {BrushModel} loadmodel - The model being loaded
-   * @param {ArrayBuffer} buf - The BSP file buffer
-   */
-  _loadEntities(loadmodel, buf) {
-    const view = new DataView(buf);
-    const lump = BSP29Loader.#lump;
-    const fileofs = view.getUint32((lump.entities << 3) + 4, true);
-    const filelen = view.getUint32((lump.entities << 3) + 8, true);
-    loadmodel.entities = Q.memstr(new Uint8Array(buf, fileofs, filelen));
-    loadmodel.worldspawnInfo = {};
-
-    let data = loadmodel.entities;
-
-    // going for worldspawn and light
-    let stillLooking = 2;
-    while (stillLooking > 0) {
-      const parsed = COM.Parse(data);
-      data = parsed.data;
-
-      if (!data) {
-        break;
-      }
-
-      const currentEntity = {};
-      while (data) {
-        const parsedKey = COM.Parse(data);
-        data = parsedKey.data;
-
-        if (!data || parsedKey.token === '}') {
-          break;
-        }
-
-        const parsedValue = COM.Parse(data);
-        data = parsedValue.data;
-
-        if (!data || parsedKey.token === '}') {
-          break;
-        }
-
-        currentEntity[parsedKey.token] = parsedValue.token;
-      }
-
-      if (!currentEntity.classname) {
-        break;
-      }
-
-      switch (currentEntity.classname) {
-        case 'worldspawn':
-          Object.assign(loadmodel.worldspawnInfo, currentEntity);
-          stillLooking--;
-          break;
-
-        case 'light':
-          if (currentEntity._color) {
-            loadmodel.coloredlights = true;
-            stillLooking--;
-          }
-          break;
-      }
-    }
-
-    // Second pass: parse func_fog entities from the entity lump
-    // (moved to load() after _loadSubmodels so we can also scan submodel faces)
-
-    loadmodel.bspxoffset = Math.max(loadmodel.bspxoffset, fileofs + filelen);
-  }
-
-  /**
-   * Parse func_fog entities from the BSP entity lump and store
-   * them as fog volume descriptors on the model.
-   * @protected
-   * @param {BrushModel} loadmodel - The model being loaded
-   */
-  _parseFogVolumes(loadmodel) {
-    loadmodel.fogVolumes.length = 0;
-
-    let data = loadmodel.entities;
-    if (!data) {
-      return;
-    }
-
-    while (data) {
-      const parsed = COM.Parse(data);
-      data = parsed.data;
-
-      if (!data) {
-        break;
-      }
-
-      const entity = {};
-
-      while (data) {
-        const parsedKey = COM.Parse(data);
-        data = parsedKey.data;
-
-        if (!data || parsedKey.token === '}') {
-          break;
-        }
-
-        const parsedValue = COM.Parse(data);
-        data = parsedValue.data;
-
-        if (!data || parsedValue.token === '}') {
-          break;
-        }
-
-        entity[parsedKey.token] = parsedValue.token;
-      }
-
-      if (entity.classname !== 'func_fog' || !entity.model) {
-        continue;
-      }
-
-      const modelIndex = parseInt(entity.model.substring(1), 10);
-
-      if (isNaN(modelIndex) || modelIndex <= 0) {
-        Con.PrintWarning(`func_fog has invalid model '${entity.model}'\n`);
-        continue;
-      }
-
-      const colorParts = (entity.fog_color || '128 128 128').split(/\s+/).map(Number);
-      const submodel = loadmodel.submodels[modelIndex - 1];
-
-      loadmodel.fogVolumes.push({
-        modelIndex,
-        color: [colorParts[0] || 128, colorParts[1] || 128, colorParts[2] || 128],
-        density: parseFloat(entity.fog_density || '0.01'),
-        maxOpacity: Math.min(1.0, Math.max(0.0, parseFloat(entity.fog_max_opacity || '0.8'))),
-        mins: submodel ? [submodel.mins[0], submodel.mins[1], submodel.mins[2]] : [0, 0, 0],
-        maxs: submodel ? [submodel.maxs[0], submodel.maxs[1], submodel.maxs[2]] : [0, 0, 0],
-      });
-
-      Con.DPrint(`Found func_fog: model *${modelIndex}, color ${colorParts}, density ${entity.fog_density || '0.01'}\n`);
-    }
-
-    if (loadmodel.worldspawnInfo._qs_autogen_fog !== '1') {
-      Con.DPrint('Auto-generation of fog volumes is disabled.\n');
-      return;
-    }
-
-    // Auto-generate fog volumes for turbulent submodels (water, slime, lava)
-    // that weren't already claimed by a func_fog entity
-    const claimedModels = new Set(loadmodel.fogVolumes.map((fv) => fv.modelIndex));
-
-    for (let i = 0; i < loadmodel.submodels.length; i++) {
-      const modelIndex = i + 1; // submodels[0] = *1, submodels[1] = *2, etc.
-
-      if (claimedModels.has(modelIndex)) {
-        continue;
-      }
-
-      const submodel = loadmodel.submodels[i];
-
-      // Check if ALL faces in this submodel are turbulent
-      let allTurbulent = submodel.numfaces > 0;
-      /** @type {number} */
-      let turbulentTextureIndex = -1;
-
-      for (let j = 0; j < submodel.numfaces; j++) {
-        const face = submodel.faces[submodel.firstface + j];
-        const material = loadmodel.textures[face.texture];
-
-        if (!(material.flags & materialFlags.MF_TURBULENT)) {
-          allTurbulent = false;
-          break;
-        }
-
-        if (turbulentTextureIndex === -1) {
-          turbulentTextureIndex = face.texture;
-        }
-      }
-
-      if (!allTurbulent || turbulentTextureIndex === -1) {
-        continue;
-      }
-
-      // Derive fog color from the texture's average color, modulated by ambient light
-      const material = loadmodel.textures[turbulentTextureIndex];
-      const baseColor = material.averageColor || [128, 128, 128];
-      const volMins = [submodel.mins[0], submodel.mins[1], submodel.mins[2]];
-      const volMaxs = [submodel.maxs[0], submodel.maxs[1], submodel.maxs[2]];
-      const lightFactor = this._sampleAmbientLightForVolume(loadmodel, volMins, volMaxs);
-      const color = [
-        Math.round(baseColor[0] * lightFactor),
-        Math.round(baseColor[1] * lightFactor),
-        Math.round(baseColor[2] * lightFactor),
-      ];
-
-      loadmodel.fogVolumes.push({
-        modelIndex,
-        color,
-        density: 0.02,
-        maxOpacity: 0.85,
-        mins: volMins,
-        maxs: volMaxs,
-      });
-
-      Con.DPrint(`Auto-fog for turbulent *${modelIndex} (${material.name}): color [${color}], light=${lightFactor.toFixed(2)}\n`);
-    }
-
-    // Phase 3: Auto-generate fog volumes for world-level turbulent surfaces
-    // (water/slime/lava that belong to the worldspawn, not a brush entity).
-    // These exist as BSP leafs with CONTENT_WATER/SLIME/LAVA contents.
-    // We cluster adjacent leafs of the same type and create fog volumes from their merged AABBs.
-    this._parseFogVolumesFromWorldLeafs(loadmodel);
-  }
-
-  /**
-   * Create fog volumes for world-level water/slime/lava directly from BSP leafs.
-   * Each liquid leaf gets its own fog volume with exact bounds from the BSP compiler,
-   * avoiding imprecision from merging AABBs across multiple leafs.
-   * @private
-   * @param {BrushModel} loadmodel - The model being loaded
-   */
-  _parseFogVolumesFromWorldLeafs(loadmodel) {
-    if (!loadmodel.leafs || loadmodel.leafs.length === 0) {
-      return;
-    }
-
-    /** @type {Map<number, number[]>} content type -> leaf indices (for color lookup) */
-    const liquidLeafsByType = new Map();
-
-    for (let i = 0; i < loadmodel.leafs.length; i++) {
-      const leaf = loadmodel.leafs[i];
-      const c = leaf.contents;
-
-      if (c !== content.CONTENT_WATER && c !== content.CONTENT_SLIME && c !== content.CONTENT_LAVA) {
-        continue;
-      }
-
-      if (!liquidLeafsByType.has(c)) {
-        liquidLeafsByType.set(c, []);
-      }
-      liquidLeafsByType.get(c).push(i);
-    }
-
-    if (liquidLeafsByType.size === 0) {
-      return;
-    }
-
-    for (const [contentType, leafIndices] of liquidLeafsByType) {
-      // Find dominant turbulent texture color across all leafs of this type
-      const color = this._findClusterTurbulentColor(loadmodel, leafIndices) || [128, 128, 128];
-
-      const contentName = contentType === content.CONTENT_WATER ? 'water'
-        : contentType === content.CONTENT_SLIME ? 'slime' : 'lava';
-
-      const density = contentType === content.CONTENT_LAVA ? 0.05
-        : contentType === content.CONTENT_SLIME ? 0.01 : 0.005;
-
-      // Create one fog volume per leaf with exact BSP bounds, modulated by ambient light
-      for (const leafIdx of leafIndices) {
-        const leaf = loadmodel.leafs[leafIdx];
-        const volMins = [leaf.mins[0], leaf.mins[1], leaf.mins[2]];
-        const volMaxs = [leaf.maxs[0], leaf.maxs[1], leaf.maxs[2]];
-        const lightFactor = this._sampleAmbientLightForVolume(loadmodel, volMins, volMaxs);
-        const dimmedColor = [
-          Math.round(color[0] * lightFactor),
-          Math.round(color[1] * lightFactor),
-          Math.round(color[2] * lightFactor),
-        ];
-
-        loadmodel.fogVolumes.push({
-          modelIndex: 0,
-          color: dimmedColor,
-          density,
-          maxOpacity: 0.85,
-          mins: volMins,
-          maxs: volMaxs,
-        });
-
-        Con.DPrint(`Auto-fog: ${leafIdx} ${contentName} leaf volume, base color [${color}], lightFactor = ${lightFactor.toFixed(2)}\n`);
-      }
-    }
-  }
-
-  /**
-   * Find the average color of the dominant turbulent texture in a set of leafs.
-   * Scans marksurfaces for turbulent faces and returns the most common texture's color.
-   * @param {BrushModel} loadmodel - The model with leaf/face/texture data
-   * @param {number[]} leafIndices - Leaf indices to scan
-   * @returns {number[]|null} Average color as [r, g, b] or null if no turbulent face found
-   */
-  _findClusterTurbulentColor(loadmodel, leafIndices) {
-    /** @type {Map<number, number>} texture index -> face count */
-    const textureCounts = new Map();
-
-    for (const leafIdx of leafIndices) {
-      const leaf = loadmodel.leafs[leafIdx];
-
-      for (let k = 0; k < leaf.nummarksurfaces; k++) {
-        const faceIdx = loadmodel.marksurfaces[leaf.firstmarksurface + k];
-        const face = loadmodel.faces[faceIdx];
-
-        if (!face.turbulent) {
-          continue;
-        }
-
-        textureCounts.set(face.texture, (textureCounts.get(face.texture) || 0) + 1);
-      }
-    }
-
-    if (textureCounts.size === 0) {
-      return null;
-    }
-
-    // Find the most common turbulent texture
-    let bestTexture = -1;
-    let bestCount = 0;
-
-    for (const [texIdx, count] of textureCounts) {
-      if (count > bestCount) {
-        bestCount = count;
-        bestTexture = texIdx;
-      }
-    }
-
-    const material = loadmodel.textures[bestTexture];
-    return material?.averageColor || null;
-  }
-
-  /**
-   * Sample the average ambient light intensity near a fog volume's bounding box.
-   * Scans BSP leafs that overlap the expanded AABB and samples lightmap data
-   * from non-turbulent, non-sky faces to estimate the local light level.
-   * @param {BrushModel} loadmodel - The model with leaf/face/lighting data
-   * @param {number[]} mins - Volume AABB minimum [x, y, z]
-   * @param {number[]} maxs - Volume AABB maximum [x, y, z]
-   * @returns {number} Normalized intensity factor in [0.15, 1.0] range
-   */
-  _sampleAmbientLightForVolume(loadmodel, mins, maxs) {
-    if ((loadmodel.lightdata_rgb === null && loadmodel.lightdata === null) || !loadmodel.leafs || loadmodel.leafs.length === 0) {
-      return 1.0;
-    }
-
-    // Expand AABB by 64 units to catch nearby lit surfaces
-    const expand = 64;
-    const eMins = [mins[0] - expand, mins[1] - expand, mins[2] - expand];
-    const eMaxs = [maxs[0] + expand, maxs[1] + expand, maxs[2] + expand];
-
-    let totalIntensity = 0;
-    let sampleCount = 0;
-
-    const hasRGB = loadmodel.lightdata_rgb !== null;
-
-    for (let i = 0; i < loadmodel.leafs.length; i++) {
-      const leaf = loadmodel.leafs[i];
-
-      // Skip liquid leafs — we want light from surrounding solid geometry
-      if (leaf.contents === content.CONTENT_WATER
-        || leaf.contents === content.CONTENT_SLIME
-        || leaf.contents === content.CONTENT_LAVA) {
-        continue;
-      }
-
-      // AABB overlap test
-      if (leaf.mins[0] > eMaxs[0] || leaf.maxs[0] < eMins[0]
-        || leaf.mins[1] > eMaxs[1] || leaf.maxs[1] < eMins[1]
-        || leaf.mins[2] > eMaxs[2] || leaf.maxs[2] < eMins[2]) {
-        continue;
-      }
-
-      // Scan marksurfaces in this leaf
-      for (let k = 0; k < leaf.nummarksurfaces; k++) {
-        const faceIdx = loadmodel.marksurfaces[leaf.firstmarksurface + k];
-        const face = loadmodel.faces[faceIdx];
-
-        if (face.turbulent || face.sky || face.lightofs < 0 || face.styles.length === 0) {
-          continue;
-        }
-
-        // Compute lightmap dimensions for this face
-        const smax = (face.extents[0] >> face.lmshift) + 1;
-        const tmax = (face.extents[1] >> face.lmshift) + 1;
-        const size = smax * tmax;
-
-        if (size <= 0 || size > 4096) {
-          continue;
-        }
-
-        // Sample only the first light style (style 0 = static light)
-        if (hasRGB) {
-          const offset = face.lightofs * 3;
-
-          if (offset + size * 3 > loadmodel.lightdata_rgb.length) {
-            continue;
-          }
-
-          for (let s = 0; s < size * 3; s += 3) {
-            // Perceptual luminance
-            totalIntensity += loadmodel.lightdata_rgb[offset + s] * 0.299
-              + loadmodel.lightdata_rgb[offset + s + 1] * 0.587
-              + loadmodel.lightdata_rgb[offset + s + 2] * 0.114;
-            sampleCount++;
-          }
-        } else {
-          const offset = face.lightofs;
-
-          if (offset + size > loadmodel.lightdata.length) {
-            continue;
-          }
-
-          for (let s = 0; s < size; s++) {
-            totalIntensity += loadmodel.lightdata[offset + s];
-            sampleCount++;
-          }
-        }
-      }
-    }
-
-    if (sampleCount === 0) {
-      return 1.0;
-    }
-
-    // Average intensity in 0-255 range, normalize to a 0-1 scale.
-    // Quake lighting with value ~200 is considered well-lit; we use 200 as reference
-    // so well-lit areas keep the fog color roughly unchanged.
-    const avgIntensity = totalIntensity / sampleCount;
-    const factor = Math.min(1.0, Math.max(0.15, avgIntensity / 200.0));
-    return factor;
-  }
-
-  /**
-   * Compute the average color of an RGBA texture buffer.
-   * Skips fully transparent pixels so alpha-masked areas don't dilute the color.
-   * @param {Uint8Array} rgba - RGBA pixel data
-   * @returns {number[]} Average color as [r, g, b] in 0-255 range
-   */
-  static _computeAverageColor(rgba) {
-    let r = 0;
-    let g = 0;
-    let b = 0;
-    let count = 0;
-
-    for (let i = 0; i < rgba.length; i += 4) {
-      if (rgba[i + 3] === 0) {
-        continue; // skip fully transparent pixels
-      }
-      r += rgba[i];
-      g += rgba[i + 1];
-      b += rgba[i + 2];
-      count++;
-    }
-
-    if (count === 0) {
-      return [128, 128, 128];
-    }
-
-    return [
-      Math.round(r / count),
-      Math.round(g / count),
-      Math.round(b / count),
-    ];
-  }
-
-  /**
-   * Load vertices from BSP lump
-   * @protected
-   * @param {BrushModel} loadmodel - The model being loaded
-   * @param {ArrayBuffer} buf - The BSP file buffer
-   * @throws {Error} If vertex lump size is not a multiple of 12
-   */
-  _loadVertexes(loadmodel, buf) {
-    const view = new DataView(buf);
-    const lump = BSP29Loader.#lump;
-    let fileofs = view.getUint32((lump.vertexes << 3) + 4, true);
-    const filelen = view.getUint32((lump.vertexes << 3) + 8, true);
-    if ((filelen % 12) !== 0) {
-      throw new Error('BSP29Loader: vertexes lump size is not a multiple of 12 in ' + loadmodel.name);
-    }
-    const count = filelen / 12;
-    loadmodel.vertexes.length = 0;
-    for (let i = 0; i < count; i++) {
-      loadmodel.vertexes[i] = new Vector(
-        view.getFloat32(fileofs, true),
-        view.getFloat32(fileofs + 4, true),
-        view.getFloat32(fileofs + 8, true),
-      );
-      fileofs += 12;
-    }
-    loadmodel.bspxoffset = Math.max(loadmodel.bspxoffset, fileofs);
-  }
-
-  /**
-   * Load edges from BSP lump
-   * @protected
-   * @param {BrushModel} loadmodel - The model being loaded
-   * @param {ArrayBuffer} buf - The BSP file buffer
-   * @throws {CorruptedResourceError} If edge lump size is not a multiple of 4
-   */
-  _loadEdges(loadmodel, buf) {
-    const view = new DataView(buf);
-    const lump = BSP29Loader.#lump;
-    let fileofs = view.getUint32((lump.edges << 3) + 4, true);
-    const filelen = view.getUint32((lump.edges << 3) + 8, true);
-    if ((filelen & 3) !== 0) {
-      throw new CorruptedResourceError(loadmodel.name, 'BSP29Loader: edges lump size is not a multiple of 4');
-    }
-    const count = filelen >> 2;
-    loadmodel.edges.length = 0;
-    for (let i = 0; i < count; i++) {
-      loadmodel.edges[i] = [view.getUint16(fileofs, true), view.getUint16(fileofs + 2, true)];
-      fileofs += 4;
-    }
-    loadmodel.bspxoffset = Math.max(loadmodel.bspxoffset, fileofs);
-  }
-
-  /**
-   * Load surface edges from BSP lump (indices into edge array, negative = reversed)
-   * @protected
-   * @param {BrushModel} loadmodel - The model being loaded
-   * @param {ArrayBuffer} buf - The BSP file buffer
-   */
-  _loadSurfedges(loadmodel, buf) {
-    const view = new DataView(buf);
-    const lump = BSP29Loader.#lump;
-    const fileofs = view.getUint32((lump.surfedges << 3) + 4, true);
-    const filelen = view.getUint32((lump.surfedges << 3) + 8, true);
-    const count = filelen >> 2;
-    loadmodel.surfedges.length = 0;
-    for (let i = 0; i < count; i++) {
-      loadmodel.surfedges[i] = view.getInt32(fileofs + (i << 2), true);
-    }
-    loadmodel.bspxoffset = Math.max(loadmodel.bspxoffset, fileofs + filelen);
-  }
-
-  /**
-   * Load planes from BSP lump
-   * @protected
-   * @param {BrushModel} loadmodel - The model being loaded
-   * @param {ArrayBuffer} buf - The BSP file buffer
-   * @throws {Error} If planes lump size is not a multiple of 20
-   */
-  _loadPlanes(loadmodel, buf) {
-    const view = new DataView(buf);
-    const lump = BSP29Loader.#lump;
-    let fileofs = view.getUint32((lump.planes << 3) + 4, true);
-    const filelen = view.getUint32((lump.planes << 3) + 8, true);
-    if ((filelen % 20) !== 0) {
-      throw new Error('BSP29Loader: planes lump size is not a multiple of 20 in ' + loadmodel.name);
-    }
-    const count = filelen / 20;
-    loadmodel.planes.length = 0;
-    for (let i = 0; i < count; i++) {
-      const normal = new Vector(
-        view.getFloat32(fileofs, true),
-        view.getFloat32(fileofs + 4, true),
-        view.getFloat32(fileofs + 8, true),
-      );
-      const dist = view.getFloat32(fileofs + 12, true);
-      const out = new Plane(normal, dist);
-      out.type = view.getUint32(fileofs + 16, true);
-      if (out.normal[0] < 0) { out.signbits |= 1; }
-      if (out.normal[1] < 0) { out.signbits |= 2; }
-      if (out.normal[2] < 0) { out.signbits |= 4; }
-      loadmodel.planes[i] = out;
-      fileofs += 20;
-    }
-    loadmodel.bspxoffset = Math.max(loadmodel.bspxoffset, fileofs);
-  }
-
-  /**
-   * Load texture coordinate information from BSP lump
-   * @protected
-   * @param {BrushModel} loadmodel - The model being loaded
-   * @param {ArrayBuffer} buf - The BSP file buffer
-   * @throws {Error} If texinfo lump size is not a multiple of 40
-   */
-  _loadTexinfo(loadmodel, buf) {
-    const view = new DataView(buf);
-    const lump = BSP29Loader.#lump;
-    let fileofs = view.getUint32((lump.texinfo << 3) + 4, true);
-    const filelen = view.getUint32((lump.texinfo << 3) + 8, true);
-    if ((filelen % 40) !== 0) {
-      throw new Error('BSP29Loader: texinfo lump size is not a multiple of 40 in ' + loadmodel.name);
-    }
-    const count = filelen / 40;
-    loadmodel.texinfo.length = 0;
-    for (let i = 0; i < count; i++) {
-      const out = {
-        vecs: [
-          [view.getFloat32(fileofs, true), view.getFloat32(fileofs + 4, true), view.getFloat32(fileofs + 8, true), view.getFloat32(fileofs + 12, true)],
-          [view.getFloat32(fileofs + 16, true), view.getFloat32(fileofs + 20, true), view.getFloat32(fileofs + 24, true), view.getFloat32(fileofs + 28, true)],
-        ],
-        texture: view.getUint32(fileofs + 32, true),
-        flags: view.getUint32(fileofs + 36, true),
-      };
-      if (out.texture >= loadmodel.textures.length) {
-        out.texture = loadmodel.textures.length - 1;
-        out.flags = 0;
-      }
-      loadmodel.texinfo[i] = out;
-      fileofs += 40;
-    }
-    loadmodel.bspxoffset = Math.max(loadmodel.bspxoffset, fileofs);
-  }
-
-  /**
-   * Load faces (surfaces) from BSP lump and derive oriented face normals
-   * @protected
-   * @param {BrushModel} loadmodel - The model being loaded
-   * @param {ArrayBuffer} buf - The BSP file buffer
-   * @throws {CorruptedResourceError} If faces lump size is not a multiple of 20
-   */
-  _loadFaces(loadmodel, buf) {
-    const view = new DataView(buf);
-    const lump = BSP29Loader.#lump;
-    let fileofs = view.getUint32((lump.faces << 3) + 4, true);
-    const filelen = view.getUint32((lump.faces << 3) + 8, true);
-    if ((filelen % 20) !== 0) {
-      throw new CorruptedResourceError(loadmodel.name, 'BSP29Loader: faces lump size is not a multiple of 20');
-    }
-
-    const lmshift = loadmodel.worldspawnInfo._lightmap_scale ? Math.log2(parseInt(loadmodel.worldspawnInfo._lightmap_scale)) : 4;
-    const count = filelen / 20;
-    loadmodel.firstface = 0;
-    loadmodel.numfaces = count;
-    loadmodel.faces.length = 0;
-
-    for (let i = 0; i < count; i++) {
-      const styles = new Uint8Array(buf, fileofs + 12, 4);
-      const out = Object.assign(new Face(), {
-        plane: loadmodel.planes[view.getUint16(fileofs, true)],
-        planeBack: view.getInt16(fileofs + 2, true) !== 0,
-        firstedge: view.getInt32(fileofs + 4, true),
-        numedges: view.getUint16(fileofs + 8, true),
-        texinfo: view.getUint16(fileofs + 10, true),
-        styles: [],
-        lightofs: view.getInt32(fileofs + 16, true),
-        lmshift,
-      });
-
-      for (let j = 0; j < 4; j++) {
-        if (styles[j] !== 255) {
-          out.styles[j] = styles[j];
-        }
-      }
-
-      const mins = [Infinity, Infinity];
-      const maxs = [-Infinity, -Infinity];
-      const tex = loadmodel.texinfo[out.texinfo];
-      out.texture = tex.texture;
-
-      for (let j = 0; j < out.numedges; j++) {
-        const e = loadmodel.surfedges[out.firstedge + j];
-        const v = e >= 0
-          ? loadmodel.vertexes[loadmodel.edges[e][0]]
-          : loadmodel.vertexes[loadmodel.edges[-e][1]];
-
-        const val0 = v.dot(new Vector(...tex.vecs[0])) + tex.vecs[0][3];
-        const val1 = v.dot(new Vector(...tex.vecs[1])) + tex.vecs[1][3];
-
-        if (val0 < mins[0]) {
-          mins[0] = val0;
-        }
-
-        if (val0 > maxs[0]) {
-          maxs[0] = val0;
-        }
-
-        if (val1 < mins[1]) {
-          mins[1] = val1;
-        }
-
-        if (val1 > maxs[1]) {
-          maxs[1] = val1;
-        }
-      }
-
-      const lmscale = 1 << out.lmshift;
-      out.texturemins = [Math.floor(mins[0] / lmscale) * lmscale, Math.floor(mins[1] / lmscale) * lmscale];
-      out.extents = [Math.ceil(maxs[0] / lmscale) * lmscale - out.texturemins[0], Math.ceil(maxs[1] / lmscale) * lmscale - out.texturemins[1]];
-
-      if (loadmodel.textures[tex.texture].flags & materialFlags.MF_TURBULENT) {
-        out.turbulent = true;
-      } else if (loadmodel.textures[tex.texture].flags & materialFlags.MF_SKY) {
-        out.sky = true;
-      }
-
-      out.normal.set(out.plane.normal);
-      if (out.planeBack) {
-        out.normal.multiply(-1.0);
-      }
-
-      loadmodel.faces[i] = out;
-      fileofs += 20;
-    }
-    loadmodel.bspxoffset = Math.max(loadmodel.bspxoffset, fileofs);
-  }
-
-  /**
-   * Recursively set parent references for BSP tree nodes
-   * @protected
-   * @param {import('../BSP.mjs').Node} node - The node to set parent for
-   * @param {import('../BSP.mjs').Node|null} parent - The parent node
-   */
-  _setParent(node, parent) {
-    node.parent = parent;
-
-    if (node.contents < 0) {
-      return;
-    }
-
-    this._setParent(/** @type {import('../BSP.mjs').Node} */(node.children[0]), node);
-    this._setParent(/** @type {import('../BSP.mjs').Node} */(node.children[1]), node);
-  }
-
-  /**
-   * Load BSP tree nodes from BSP lump
-   * @protected
-   * @param {BrushModel} loadmodel - The model being loaded
-   * @param {ArrayBuffer} buf - The BSP file buffer
-   * @throws {CorruptedResourceError} If nodes lump is empty or incorrectly sized
-   */
-  _loadNodes(loadmodel, buf) {
-    const view = new DataView(buf);
-    const lump = BSP29Loader.#lump;
-    let fileofs = view.getUint32((lump.nodes << 3) + 4, true);
-    const filelen = view.getUint32((lump.nodes << 3) + 8, true);
-
-    if ((filelen === 0) || ((filelen % 24) !== 0)) {
-      throw new Error('BSP29Loader: nodes lump size is invalid in ' + loadmodel.name);
-    }
-
-    const count = filelen / 24;
-    loadmodel.nodes.length = 0;
-
-    for (let i = 0; i < count; i++) {
-      loadmodel.nodes[i] = Object.assign(new Node(loadmodel), {
-        num: i,
-        planenum: view.getUint32(fileofs, true),
-        children: [view.getInt16(fileofs + 4, true), view.getInt16(fileofs + 6, true)],
-        mins: new Vector(view.getInt16(fileofs + 8, true), view.getInt16(fileofs + 10, true), view.getInt16(fileofs + 12, true)),
-        maxs: new Vector(view.getInt16(fileofs + 14, true), view.getInt16(fileofs + 16, true), view.getInt16(fileofs + 18, true)),
-        firstface: view.getUint16(fileofs + 20, true),
-        numfaces: view.getUint16(fileofs + 22, true),
-      });
-      loadmodel.nodes[i].baseMins = loadmodel.nodes[i].mins.copy();
-      loadmodel.nodes[i].baseMaxs = loadmodel.nodes[i].maxs.copy();
-      fileofs += 24;
-    }
-
-    for (let i = 0; i < count; i++) {
-      const out = loadmodel.nodes[i];
-      out.plane = loadmodel.planes[out.planenum];
-      // At this point children contain indices, we convert them to Node references
-      const child0Idx = /** @type {number} */ (out.children[0]);
-      const child1Idx = /** @type {number} */ (out.children[1]);
-      out.children[0] = child0Idx >= 0
-        ? loadmodel.nodes[child0Idx]
-        : loadmodel.leafs[-1 - child0Idx];
-      out.children[1] = child1Idx >= 0
-        ? loadmodel.nodes[child1Idx]
-        : loadmodel.leafs[-1 - child1Idx];
-    }
-
-    this._setParent(loadmodel.nodes[0], null);
-    loadmodel.bspxoffset = Math.max(loadmodel.bspxoffset, fileofs);
-  }
-
-  /**
-   * Load BSP leaf nodes from BSP lump
-   * @protected
-   * @param {BrushModel} loadmodel - The model being loaded
-   * @param {ArrayBuffer} buf - The BSP file buffer
-   * @throws {Error} If leafs lump size is not a multiple of 28
-   */
-  _loadLeafs(loadmodel, buf) {
-    const view = new DataView(buf);
-    const lump = BSP29Loader.#lump;
-    let fileofs = view.getUint32((lump.leafs << 3) + 4, true);
-    const filelen = view.getUint32((lump.leafs << 3) + 8, true);
-    if ((filelen % 28) !== 0) {
-      throw new Error('BSP29Loader: leafs lump size is not a multiple of 28 in ' + loadmodel.name);
-    }
-    const count = filelen / 28;
-    loadmodel.leafs.length = count;
-
-    for (let i = 0; i < count; i++) {
-      loadmodel.leafs[i] = /** @type {Node} */ (Object.assign(new Node(loadmodel), {
-        num: i,
-        contents: view.getInt32(fileofs, true),
-        visofs: view.getInt32(fileofs + 4, true),
-        cluster: i > 0 ? i - 1 : -1,
-        mins: new Vector(view.getInt16(fileofs + 8, true), view.getInt16(fileofs + 10, true), view.getInt16(fileofs + 12, true)),
-        maxs: new Vector(view.getInt16(fileofs + 14, true), view.getInt16(fileofs + 16, true), view.getInt16(fileofs + 18, true)),
-        firstmarksurface: view.getUint16(fileofs + 20, true),
-        nummarksurfaces: view.getUint16(fileofs + 22, true),
-        ambient_level: [
-          view.getUint8(fileofs + 24),
-          view.getUint8(fileofs + 25),
-          view.getUint8(fileofs + 26),
-          view.getUint8(fileofs + 27),
-        ],
-      }));
-      loadmodel.leafs[i].baseMins = loadmodel.leafs[i].mins.copy();
-      loadmodel.leafs[i].baseMaxs = loadmodel.leafs[i].maxs.copy();
-      fileofs += 28;
-    }
-    loadmodel.bspxoffset = Math.max(loadmodel.bspxoffset, fileofs);
-  }
-
-  /**
-   * Load collision clipnodes and initialize physics hulls
-   * @protected
-   * @param {BrushModel} loadmodel - The model being loaded
-   * @param {ArrayBuffer} buf - The BSP file buffer
-   */
-  _loadClipnodes(loadmodel, buf) {
-    const view = new DataView(buf);
-    const lump = BSP29Loader.#lump;
-    let fileofs = view.getUint32((lump.clipnodes << 3) + 4, true);
-    const filelen = view.getUint32((lump.clipnodes << 3) + 8, true);
-    const count = filelen >> 3;
-    loadmodel.clipnodes.length = 0;
-
-    loadmodel.hulls.length = 0;
-    loadmodel.hulls[1] = {
-      clipnodes: loadmodel.clipnodes,
-      firstclipnode: 0,
-      lastclipnode: count - 1,
-      planes: loadmodel.planes,
-      clip_mins: new Vector(-16.0, -16.0, -24.0),
-      clip_maxs: new Vector(16.0, 16.0, 32.0),
-    };
-    loadmodel.hulls[2] = {
-      clipnodes: loadmodel.clipnodes,
-      firstclipnode: 0,
-      lastclipnode: count - 1,
-      planes: loadmodel.planes,
-      clip_mins: new Vector(-32.0, -32.0, -24.0),
-      clip_maxs: new Vector(32.0, 32.0, 64.0),
-    };
-
-    for (let i = 0; i < count; i++) {
-      loadmodel.clipnodes[i] = {
-        planenum: view.getUint32(fileofs, true),
-        children: [view.getInt16(fileofs + 4, true), view.getInt16(fileofs + 6, true)],
-      };
-      fileofs += 8;
-    }
-    loadmodel.bspxoffset = Math.max(loadmodel.bspxoffset, fileofs);
-  }
-
-  /**
-   * Create hull0 (point hull) from BSP nodes for collision detection
-   * @protected
-   * @param {BrushModel} loadmodel - The model being loaded
-   */
-  _makeHull0(loadmodel) {
-    const clipnodes = [];
-    const hull = {
-      clipnodes: clipnodes,
-      lastclipnode: loadmodel.nodes.length - 1,
-      planes: loadmodel.planes,
-      clip_mins: new Vector(),
-      clip_maxs: new Vector(),
-    };
-
-    for (let i = 0; i < loadmodel.nodes.length; i++) {
-      const node = loadmodel.nodes[i];
-      const out = { planenum: node.planenum, children: [] };
-      const child0 = /** @type {import('../BSP.mjs').Node} */ (node.children[0]);
-      const child1 = /** @type {import('../BSP.mjs').Node} */ (node.children[1]);
-      out.children[0] = child0.contents < 0 ? child0.contents : child0.num;
-      out.children[1] = child1.contents < 0 ? child1.contents : child1.num;
-      clipnodes[i] = out;
-    }
-    loadmodel.hulls[0] = hull;
-  }
-
-  /**
-   * Build a reachability mask for the clipnodes owned by a model headnode.
-   * Legacy BSP29 clipnode arrays are shared across worldspawn and inline
-   * submodels, so traces must stay within the owning subtree.
-   * @protected
-   * @param {import('../BSP.mjs').Clipnode[]} clipnodes clipnode array backing the hull
-   * @param {number} firstclipnode root clipnode for the owning model
-   * @returns {Uint8Array|null} mask with 1 for reachable clipnodes, or null when unavailable
-   */
-  _buildAllowedClipnodeMask(clipnodes, firstclipnode) {
-    if (!clipnodes || clipnodes.length === 0 || firstclipnode < 0 || firstclipnode >= clipnodes.length) {
-      return null;
-    }
-
-    const allowedClipNodes = new Uint8Array(clipnodes.length);
-    const stack = [firstclipnode];
-
-    while (stack.length > 0) {
-      const nodeIndex = /** @type {number} */ (stack.pop());
-
-      if (nodeIndex < 0 || nodeIndex >= clipnodes.length || allowedClipNodes[nodeIndex] === 1) {
-        continue;
-      }
-
-      allowedClipNodes[nodeIndex] = 1;
-
-      const node = clipnodes[nodeIndex];
-      if (!node) {
-        continue;
-      }
-
-      for (const childIndex of node.children) {
-        if (childIndex >= 0) {
-          stack.push(childIndex);
-        }
-      }
-    }
-
-    return allowedClipNodes;
-  }
-
-  /**
-   * Attach the owning subtree mask to a legacy hull.
-   * @protected
-   * @param {{clipnodes: import('../BSP.mjs').Clipnode[], firstclipnode: number, allowedClipNodes?: Uint8Array|null}|undefined} hull legacy hull descriptor
-   */
-  _assignAllowedClipnodeMask(hull) {
-    if (!hull) {
-      return;
-    }
-
-    hull.allowedClipNodes = this._buildAllowedClipnodeMask(hull.clipnodes, hull.firstclipnode);
-  }
-
-  /**
-   * Load marksurfaces (face indices visible from each leaf)
-   * @protected
-   * @param {BrushModel} loadmodel - The model being loaded
-   * @param {ArrayBuffer} buf - The BSP file buffer
-   * @throws {Error} If marksurface index is out of bounds
-   */
-  _loadMarksurfaces(loadmodel, buf) {
-    const view = new DataView(buf);
-    const lump = BSP29Loader.#lump;
-    const fileofs = view.getUint32((lump.marksurfaces << 3) + 4, true);
-    const filelen = view.getUint32((lump.marksurfaces << 3) + 8, true);
-    const count = filelen >> 1;
-    loadmodel.marksurfaces.length = 0;
-
-    for (let i = 0; i < count; i++) {
-      const j = view.getUint16(fileofs + (i << 1), true);
-      if (j > loadmodel.faces.length) {
-        throw new Error('BSP29Loader: bad surface number in marksurfaces');
-      }
-      loadmodel.marksurfaces[i] = j;
-    }
-    loadmodel.bspxoffset = Math.max(loadmodel.bspxoffset, fileofs + filelen);
-  }
-
-  /**
-   * Load submodels (brush models for doors, lifts, etc.)
-   * @protected
-   * @param {BrushModel} loadmodel - The model being loaded
-   * @param {ArrayBuffer} buf - The BSP file buffer
-   * @throws {Error} If no submodels found
-   */
-  _loadSubmodels(loadmodel, buf) {
-    const view = new DataView(buf);
-    const lump = BSP29Loader.#lump;
-    let fileofs = view.getUint32((lump.models << 3) + 4, true);
-    const filelen = view.getUint32((lump.models << 3) + 8, true);
-    const count = filelen >> 6;
-    if (count === 0) {
-      throw new Error('BSP29Loader: no submodels in ' + loadmodel.name);
-    }
-    loadmodel.submodels.length = 0;
-
-    loadmodel.mins.setTo(view.getFloat32(fileofs, true) - 1.0, view.getFloat32(fileofs + 4, true) - 1.0, view.getFloat32(fileofs + 8, true) - 1.0);
-    loadmodel.maxs.setTo(view.getFloat32(fileofs + 12, true) + 1.0, view.getFloat32(fileofs + 16, true) + 1.0, view.getFloat32(fileofs + 20, true) + 1.0);
-    loadmodel.hulls[0].firstclipnode = view.getUint32(fileofs + 36, true);
-    loadmodel.hulls[1].firstclipnode = view.getUint32(fileofs + 40, true);
-    loadmodel.hulls[2].firstclipnode = view.getUint32(fileofs + 44, true);
-    this._assignAllowedClipnodeMask(loadmodel.hulls[0]);
-    this._assignAllowedClipnodeMask(loadmodel.hulls[1]);
-    this._assignAllowedClipnodeMask(loadmodel.hulls[2]);
-    fileofs += 64;
-
-    const clipnodes = loadmodel.hulls[0].clipnodes;
-    for (let i = 1; i < count; i++) {
-      const out = new BrushModel('*' + i);
-      out.submodel = true;
-      out.mins.setTo(view.getFloat32(fileofs, true) - 1.0, view.getFloat32(fileofs + 4, true) - 1.0, view.getFloat32(fileofs + 8, true) - 1.0);
-      out.maxs.setTo(view.getFloat32(fileofs + 12, true) + 1.0, view.getFloat32(fileofs + 16, true) + 1.0, view.getFloat32(fileofs + 20, true) + 1.0);
-      out.origin.setTo(view.getFloat32(fileofs + 24, true), view.getFloat32(fileofs + 28, true), view.getFloat32(fileofs + 32, true));
-      out.hulls = [
-        {
-          clipnodes: clipnodes,
-          firstclipnode: view.getUint32(fileofs + 36, true),
-          lastclipnode: loadmodel.nodes.length - 1,
-          planes: loadmodel.planes,
-          clip_mins: new Vector(),
-          clip_maxs: new Vector(),
-        },
-        {
-          clipnodes: loadmodel.clipnodes,
-          firstclipnode: view.getUint32(fileofs + 40, true),
-          lastclipnode: loadmodel.clipnodes.length - 1,
-          planes: loadmodel.planes,
-          clip_mins: new Vector(-16.0, -16.0, -24.0),
-          clip_maxs: new Vector(16.0, 16.0, 32.0),
-        },
-        {
-          clipnodes: loadmodel.clipnodes,
-          firstclipnode: view.getUint32(fileofs + 44, true),
-          lastclipnode: loadmodel.clipnodes.length - 1,
-          planes: loadmodel.planes,
-          clip_mins: new Vector(-32.0, -32.0, -24.0),
-          clip_maxs: new Vector(32.0, 32.0, 64.0),
-        },
-      ];
-      this._assignAllowedClipnodeMask(out.hulls[0]);
-      this._assignAllowedClipnodeMask(out.hulls[1]);
-      this._assignAllowedClipnodeMask(out.hulls[2]);
-      out.vertexes = loadmodel.vertexes;
-      out.edges = loadmodel.edges;
-      out.surfedges = loadmodel.surfedges;
-      out.nodes = loadmodel.nodes;
-      out.leafs = loadmodel.leafs;
-      out.texinfo = loadmodel.texinfo;
-      out.textures = loadmodel.textures;
-      out.marksurfaces = loadmodel.marksurfaces;
-      out.lightdata = loadmodel.lightdata;
-      out.lightdata_rgb = loadmodel.lightdata_rgb;
-      out.deluxemap = loadmodel.deluxemap;
-      out.faces = loadmodel.faces;
-      out.visdata = loadmodel.visdata;
-      out.numclusters = loadmodel.numclusters;
-      out.clusterPvsOffsets = loadmodel.clusterPvsOffsets;
-      out.phsdata = loadmodel.phsdata;
-      out.clusterPhsOffsets = loadmodel.clusterPhsOffsets;
-      out.firstface = view.getUint32(fileofs + 56, true);
-      out.numfaces = view.getUint32(fileofs + 60, true);
-
-      // Propagate brush data from world model to submodels (shared arrays)
-      if (loadmodel.hasBrushData) {
-        out.brushes = loadmodel.brushes;
-        out.brushsides = loadmodel.brushsides;
-        out.leafbrushes = loadmodel.leafbrushes;
-        out.planes = loadmodel.planes;
-
-        // Set per-submodel brush range from BRUSHLIST data
-        const brushRange = loadmodel._brushRanges?.get(i);
-        if (brushRange) {
-          out.firstBrush = brushRange.firstBrush;
-          out.numBrushes = brushRange.numBrushes;
-        }
-      }
-
-      out.worldspawnInfo = loadmodel.worldspawnInfo;
-
-      loadmodel.submodels[i - 1] = out;
-      fileofs += 64;
-
-      for (let j = 0; j < out.numfaces; j++) {
-        out.faces[out.firstface + j].submodel = true;
-      }
-    }
-    loadmodel.bspxoffset = Math.max(loadmodel.bspxoffset, fileofs);
-  }
-
-  /**
-   * Load BSPX extended format data (optional extra lumps)
-   * @protected
-   * @param {BrushModel} loadmodel - The model being loaded
-   * @param {ArrayBuffer} buffer - The BSP file buffer
-   */
-  _loadBSPX(loadmodel, buffer) {
-    loadmodel.bspxoffset = (loadmodel.bspxoffset + 3) & ~3;
-    if (loadmodel.bspxoffset >= buffer.byteLength) {
-      Con.DPrint('BSP29Loader: no BSPX data found\n');
-      return;
-    }
-
-    const view = new DataView(buffer);
-    const magic = view.getUint32(loadmodel.bspxoffset, true);
-    console.assert(magic === 0x58505342, 'BSP29Loader: bad BSPX magic');
-
-    const numlumps = view.getUint32(loadmodel.bspxoffset + 4, true);
-    Con.DPrint('BSP29Loader: found BSPX data with ' + numlumps + ' lumps\n');
-
-    /** @type {import('../BSP.mjs').BSPXLumps} */
-    const bspxLumps = {};
-    for (let i = 0, pointer = loadmodel.bspxoffset + 8; i < numlumps; i++, pointer += 32) {
-      const name = Q.memstr(new Uint8Array(buffer, pointer, 24));
-      const fileofs = view.getUint32(pointer + 24, true);
-      const filelen = view.getUint32(pointer + 28, true);
-      bspxLumps[name] = { fileofs, filelen };
-    }
-    loadmodel.bspxlumps = bspxLumps;
-  }
-
-  /**
-   * Load BSPX BRUSHLIST lump if available.
-   * Parses per-model brush data from the BSPX extension, creates Brush and
-   * BrushSide objects, generates the 6 axial planes that the spec says must
-   * be inferred from each brush's mins/maxs, and inserts brushes into BSP
-   * leaf nodes so that BrushTrace can find them during collision testing.
-   * @protected
-   * @param {BrushModel} loadmodel - The world model being loaded
-   * @param {ArrayBuffer} buf - The BSP file buffer
-   */
-  _loadBrushList(loadmodel, buf) {
-    if (!loadmodel.bspxlumps || !loadmodel.bspxlumps['BRUSHLIST']) {
-      return;
-    }
-
-    const { fileofs, filelen } = loadmodel.bspxlumps['BRUSHLIST'];
-
-    if (filelen === 0) {
-      return;
-    }
-
-    const view = new DataView(buf);
-    let offset = fileofs;
-    const endOffset = fileofs + filelen;
-
-    /** @type {Brush[]} all brushes across all models */
-    const allBrushes = [];
-    /** @type {BrushSide[]} all brush sides across all models */
-    const allBrushSides = [];
-    /** @type {Plane[]} planes generated for brush collision (separate from BSP planes) */
-    const allBrushPlanes = [];
-
-    /**
-     * Create a Plane with type and signbits set.
-     * type: 0=X, 1=Y, 2=Z for axial, 3/4/5 for non-axial dominant axis.
-     * @param {Vector} normal plane normal
-     * @param {number} dist plane distance
-     * @returns {Plane} plane with type and signbits computed
-     */
-    const makePlane = (normal, dist) => {
-      const p = new Plane(normal, dist);
-      const ax = Math.abs(normal[0]);
-      const ay = Math.abs(normal[1]);
-      const az = Math.abs(normal[2]);
-      if (ax === 1 && ay === 0 && az === 0) {
-        p.type = 0;
-      } else if (ax === 0 && ay === 1 && az === 0) {
-        p.type = 1;
-      } else if (ax === 0 && ay === 0 && az === 1) {
-        p.type = 2;
-      } else if (ax >= ay && ax >= az) {
-        p.type = 3;
-      } else if (ay >= ax && ay >= az) {
-        p.type = 4;
-      } else {
-        p.type = 5;
-      }
-      if (normal[0] < 0) { p.signbits |= 1; }
-      if (normal[1] < 0) { p.signbits |= 2; }
-      if (normal[2] < 0) { p.signbits |= 4; }
-      return p;
-    };
-
-    // Track per-model brush ranges for submodel assignment
-    /** @type {Map<number, { firstBrush: number, numBrushes: number }>} */
-    const modelBrushRanges = new Map();
-
-    while (offset + 16 <= endOffset) {
-      const ver = view.getUint32(offset, true);
-      offset += 4;
-
-      if (ver !== 1) {
-        Con.Print(`BSP29Loader: unsupported BRUSHLIST version ${ver}\n`);
-        return;
-      }
-
-      const modelnum = view.getUint32(offset, true);
-      offset += 4;
-      const numbrushes = view.getUint32(offset, true);
-      offset += 4;
-      const numplanes = view.getUint32(offset, true);
-      offset += 4;
-
-      const firstBrush = allBrushes.length;
-
-      let planesRead = 0;
-
-      for (let b = 0; b < numbrushes; b++) {
-        if (offset + 28 > endOffset) {
-          Con.Print('BSP29Loader: BRUSHLIST lump truncated at brush header\n');
-          return;
-        }
-
-        // Parse brush header: vec3 mins (12) + vec3 maxs (12) + short contents (2) + ushort numplanes (2) = 28 bytes
-        // Actually: vec_t mins is 3 floats, vec_t maxs is 3 floats
-        const bmins = new Vector(
-          view.getFloat32(offset, true),
-          view.getFloat32(offset + 4, true),
-          view.getFloat32(offset + 8, true),
-        );
-        offset += 12;
-
-        const bmaxs = new Vector(
-          view.getFloat32(offset, true),
-          view.getFloat32(offset + 4, true),
-          view.getFloat32(offset + 8, true),
-        );
-        offset += 12;
-
-        const brushContents = view.getInt16(offset, true);
-        offset += 2;
-        const brushNumPlanes = view.getUint16(offset, true);
-        offset += 2;
-
-        const firstside = allBrushSides.length;
-
-        // Generate the 6 axial planes inferred from mins/maxs.
-        // Per the BSPX spec: "Axial planes MUST NOT be written - they will be
-        // inferred from the brush's mins+maxs."
-        // +X, -X, +Y, -Y, +Z, -Z
-        /** @type {[Vector, number][]} */
-        const axialDefs = [
-          [new Vector(1, 0, 0), bmaxs[0]],
-          [new Vector(-1, 0, 0), -bmins[0]],
-          [new Vector(0, 1, 0), bmaxs[1]],
-          [new Vector(0, -1, 0), -bmins[1]],
-          [new Vector(0, 0, 1), bmaxs[2]],
-          [new Vector(0, 0, -1), -bmins[2]],
-        ];
-
-        for (const [normal, dist] of axialDefs) {
-          const planeIdx = allBrushPlanes.length;
-          allBrushPlanes.push(makePlane(normal, dist));
-
-          const side = new BrushSide(loadmodel);
-          side.planenum = planeIdx;
-          allBrushSides.push(side);
-        }
-
-        // Parse the non-axial planes from the lump
-        if (offset + brushNumPlanes * 16 > endOffset) {
-          Con.Print('BSP29Loader: BRUSHLIST lump truncated at brush planes\n');
-          return;
-        }
-
-        for (let p = 0; p < brushNumPlanes; p++) {
-          const normal = new Vector(
-            view.getFloat32(offset, true),
-            view.getFloat32(offset + 4, true),
-            view.getFloat32(offset + 8, true),
-          );
-          const dist = view.getFloat32(offset + 12, true);
-          offset += 16;
-
-          const planeIdx = allBrushPlanes.length;
-          allBrushPlanes.push(makePlane(normal, dist));
-
-          const side = new BrushSide(loadmodel);
-          side.planenum = planeIdx;
-          allBrushSides.push(side);
-        }
-
-        planesRead += brushNumPlanes;
-
-        const brush = new Brush(loadmodel);
-        brush.firstside = firstside;
-        brush.numsides = 6 + brushNumPlanes; // axial + explicit
-        brush.contents = brushContents;
-        brush.mins = bmins;
-        brush.maxs = bmaxs;
-        allBrushes.push(brush);
-      }
-
-      if (planesRead !== numplanes) {
-        Con.Print(`BSP29Loader: BRUSHLIST plane count mismatch for model ${modelnum}: expected ${numplanes}, got ${planesRead}\n`);
-      }
-
-      modelBrushRanges.set(modelnum, { firstBrush, numBrushes: numbrushes });
-    }
-
-    if (allBrushes.length === 0) {
-      return;
-    }
-
-    // Assign brush data to the world model
-    loadmodel.brushes = allBrushes;
-    loadmodel.brushsides = allBrushSides;
-
-    // Use allBrushPlanes as a separate plane array for brush collision.
-    // These are stored alongside BSP planes but indexed separately by brushsides.
-    // We store them on the world model where BrushTrace can reference them.
-    loadmodel.planes = loadmodel.planes.concat(allBrushPlanes);
-
-    // Remap brushside plane indices to account for the offset into the combined array
-    const planeOffset = loadmodel.planes.length - allBrushPlanes.length;
-    for (const side of allBrushSides) {
-      side.planenum += planeOffset;
-    }
-
-    // Insert brushes into BSP leaf nodes by walking the node tree.
-    // Each model's brushes are only inserted under that model's headnode,
-    // so that world traces don't collide with submodel brushes (func_plat,
-    // trigger_*, func_door, etc.) and vice versa.
-
-    /** @type {Map<Node, number>} leaf-to-index lookup for fast insertion */
-    const leafIndexMap = new Map();
-    for (let i = 0; i < loadmodel.leafs.length; i++) {
-      leafIndexMap.set(loadmodel.leafs[i], i);
-    }
-
-    /** @type {number[][]} per-leaf brush index lists */
-    const leafBrushLists = new Array(loadmodel.leafs.length);
-    for (let i = 0; i < loadmodel.leafs.length; i++) {
-      leafBrushLists[i] = [];
-    }
-
-    /**
-     * Recursively insert a brush into BSP leaf nodes whose bounds overlap.
-     * @param {Node} node - current BSP node
-     * @param {number} brushIdx - index into allBrushes
-     * @param {Brush} brush - the brush being inserted
-     */
-    const insertBrushRecursive = (node, brushIdx, brush) => {
-      // Leaf node: add the brush here
-      if (node.contents < 0) {
-        const leafIndex = leafIndexMap.get(node);
-        if (leafIndex !== undefined) {
-          leafBrushLists[leafIndex].push(brushIdx);
-        }
-        return;
-      }
-
-      // Internal node: test brush AABB against splitting plane
-      const plane = node.plane;
-      let d1, d2;
-
-      if (plane.type < 3) {
-        // Axial plane: fast path
-        d1 = brush.maxs[plane.type] - plane.dist;
-        d2 = brush.mins[plane.type] - plane.dist;
-      } else {
-        // General plane: compute support points using worst-case AABB corners
-        const nx = plane.normal[0];
-        const ny = plane.normal[1];
-        const nz = plane.normal[2];
-
-        d1 = nx * (nx >= 0 ? brush.maxs[0] : brush.mins[0])
-           + ny * (ny >= 0 ? brush.maxs[1] : brush.mins[1])
-           + nz * (nz >= 0 ? brush.maxs[2] : brush.mins[2])
-           - plane.dist;
-        d2 = nx * (nx >= 0 ? brush.mins[0] : brush.maxs[0])
-           + ny * (ny >= 0 ? brush.mins[1] : brush.maxs[1])
-           + nz * (nz >= 0 ? brush.mins[2] : brush.maxs[2])
-           - plane.dist;
-      }
-
-      if (d1 >= 0) {
-        insertBrushRecursive(node.children[0], brushIdx, brush);
-      }
-      // Brushes that touch the split plane on their back-most extent must be
-      // inserted into both leaves. Otherwise exact-boundary player positions
-      // can miss a clip brush in one leaf and hit it only after a tiny move
-      // into the adjacent leaf, producing false stuck/allsolid behavior.
-      if (d2 <= 0) {
-        insertBrushRecursive(node.children[1], brushIdx, brush);
-      }
-    };
-
-    // Only insert world (model 0) brushes into leaf nodes.
-    // Submodel brushes must NOT be inserted into the BSP leaf-brush index
-    // because Q1 BSP leaf nodes are shared between the world tree and
-    // submodel subtrees — inserting submodel brushes would make them
-    // appear in world traces, causing phantom collisions with triggers,
-    // removed entities (func_fog), etc.
-    // Submodel collision is handled by brute-force testing against the
-    // submodel's brush range (see BrushTrace.boxTraceModel).
-    const worldRange = modelBrushRanges.get(0);
-    if (worldRange) {
-      const rootNode = loadmodel.nodes[0];
-      if (rootNode) {
-        for (let brushIdx = worldRange.firstBrush; brushIdx < worldRange.firstBrush + worldRange.numBrushes; brushIdx++) {
-          insertBrushRecursive(rootNode, brushIdx, allBrushes[brushIdx]);
-        }
-      }
-    }
-
-    // Store brush ranges on the world model for submodel propagation
-    loadmodel._brushRanges = modelBrushRanges;
-    if (worldRange) {
-      loadmodel.firstBrush = worldRange.firstBrush;
-      loadmodel.numBrushes = worldRange.numBrushes;
-    }
-
-    // Build the flat leafbrushes array from per-leaf lists
-    /** @type {number[]} */
-    const leafbrushes = [];
-
-    for (let i = 0; i < loadmodel.leafs.length; i++) {
-      const leaf = loadmodel.leafs[i];
-      const list = leafBrushLists[i];
-      leaf.firstleafbrush = leafbrushes.length;
-      leaf.numleafbrushes = list.length;
-      for (const brushIdx of list) {
-        leafbrushes.push(brushIdx);
-      }
-    }
-
-    loadmodel.leafbrushes = leafbrushes;
-
-    Con.DPrint(`BSP29Loader: loaded BRUSHLIST with ${allBrushes.length} brushes, ${allBrushSides.length} sides, ${leafbrushes.length} leaf-brush refs\n`);
-  }
-
-  /**
-   * Load RGB colored lighting from BSPX lump if available
-   * @protected
-   * @param {BrushModel} loadmodel - The model being loaded
-   * @param {ArrayBuffer} buf - The BSP file buffer
-   */
-  _loadLightingRGB(loadmodel, buf) {
-    loadmodel.lightdata_rgb = null;
-
-    if (!loadmodel.bspxlumps || !loadmodel.bspxlumps['RGBLIGHTING']) {
-      return;
-    }
-
-    const { fileofs, filelen } = loadmodel.bspxlumps['RGBLIGHTING'];
-
-    if (filelen === 0) {
-      return;
-    }
-
-    loadmodel.lightdata_rgb = new Uint8Array(buf.slice(fileofs, fileofs + filelen));
-  }
-
-  /**
-   * Load external RGB lighting from .lit file if available
-   * @param {BrushModel} loadmodel - The model being loaded
-   * @param {string} filename - The original BSP filename
-   */
-  async _loadExternalLighting(loadmodel, filename) {
-    const rgbFilename = filename.replace(/\.bsp$/i, '.lit');
-
-    const data = await COM.LoadFile(rgbFilename);
-
-    if (!data) {
-      Con.DPrint(`BSP29Loader: no external RGB lighting file found: ${rgbFilename}\n`);
-      return;
-    }
-
-    const dv = new DataView(data);
-
-    console.assert(dv.getUint32(0, true) === 0x54494C51, 'QLIT header');
-    console.assert(dv.getUint32(4, true) === 0x00000001, 'QLIT version 1');
-
-    loadmodel.lightdata_rgb = new Uint8Array(data.slice(8)); // Skip header
-  }
-
-  /**
-   * Load deluxemap (directional lighting normals) from BSPX lump if available
-   * @protected
-   * @param {BrushModel} loadmodel - The model being loaded
-   * @param {ArrayBuffer} buf - The BSP file buffer
-   */
-  _loadDeluxeMap(loadmodel, buf) {
-    loadmodel.deluxemap = null;
-
-    if (!loadmodel.bspxlumps || !loadmodel.bspxlumps['LIGHTINGDIR']) {
-      return;
-    }
-
-    const { fileofs, filelen } = loadmodel.bspxlumps['LIGHTINGDIR'];
-
-    if (filelen === 0) {
-      return;
-    }
-
-    loadmodel.deluxemap = new Uint8Array(buf.slice(fileofs, fileofs + filelen));
-  }
-
-  /**
-   * Load lightgrid octree from BSPX lump if available
-   * @protected
-   * @param {BrushModel} loadmodel - The model being loaded
-   * @param {ArrayBuffer} buf - The BSP file buffer
-   */
-  _loadLightgridOctree(loadmodel, buf) {
-    loadmodel.lightgrid = null;
-
-    if (!loadmodel.bspxlumps || !loadmodel.bspxlumps['LIGHTGRID_OCTREE']) {
-      return;
-    }
-
-    const { fileofs, filelen } = loadmodel.bspxlumps['LIGHTGRID_OCTREE'];
-
-    if (filelen === 0) {
-      return;
-    }
-
-    try {
-      const view = new DataView(buf);
-      let offset = fileofs;
-      const endOffset = fileofs + filelen;
-
-      // Minimum size check: vec3_t step (12) + ivec3_t size (12) + vec3_t mins (12) + byte numstyles (1) + uint32_t rootnode (4) + uint32_t numnodes (4) + uint32_t numleafs (4) = 49 bytes
-      if (filelen < 49) {
-        Con.DPrint('BSP29Loader: LIGHTGRID_OCTREE lump too small\n');
-        return;
-      }
-
-      // vec3_t step
-      const step = new Vector(
-        view.getFloat32(offset, true),
-        view.getFloat32(offset + 4, true),
-        view.getFloat32(offset + 8, true),
-      );
-      offset += 12;
-
-      // ivec3_t size
-      const size = [
-        view.getInt32(offset, true),
-        view.getInt32(offset + 4, true),
-        view.getInt32(offset + 8, true),
-      ];
-      offset += 12;
-
-      // vec3_t mins
-      const mins = new Vector(
-        view.getFloat32(offset, true),
-        view.getFloat32(offset + 4, true),
-        view.getFloat32(offset + 8, true),
-      );
-      offset += 12;
-
-      // byte numstyles (WARNING: misaligns the rest of the data)
-      const numstyles = view.getUint8(offset);
-      offset += 1;
-
-      // uint32_t rootnode
-      const rootnode = view.getUint32(offset, true);
-      offset += 4;
-
-      // uint32_t numnodes
-      const numnodes = view.getUint32(offset, true);
-      offset += 4;
-
-      // Check if we have enough data for nodes (each node is 44 bytes: 3*4 for mid + 8*4 for children)
-      if (offset + (numnodes * 44) > endOffset) {
-        Con.DPrint('BSP29Loader: LIGHTGRID_OCTREE nodes data truncated\n');
-        return;
-      }
-
-      // Parse nodes
-      const nodes = [];
-      for (let i = 0; i < numnodes; i++) {
-        const mid = [
-          view.getUint32(offset, true),
-          view.getUint32(offset + 4, true),
-          view.getUint32(offset + 8, true),
-        ];
-        offset += 12;
-
-        const child = [];
-        for (let j = 0; j < 8; j++) {
-          child[j] = view.getUint32(offset, true);
-          offset += 4;
-        }
-
-        nodes[i] = { mid, child };
-      }
-
-      // uint32_t numleafs
-      if (offset + 4 > endOffset) {
-        Con.DPrint('BSP29Loader: LIGHTGRID_OCTREE numleafs missing\n');
-        return;
-      }
-      const numleafs = view.getUint32(offset, true);
-      offset += 4;
-
-      // Parse leafs
-      const leafs = [];
-      for (let i = 0; i < numleafs; i++) {
-        // Check bounds for leaf header (mins + size = 24 bytes)
-        if (offset + 24 > endOffset) {
-          Con.DPrint(`BSP29Loader: LIGHTGRID_OCTREE leaf ${i} header truncated\n`);
-          return;
-        }
-
-        const leafMins = [
-          view.getInt32(offset, true),
-          view.getInt32(offset + 4, true),
-          view.getInt32(offset + 8, true),
-        ];
-        offset += 12;
-
-        const leafSize = [
-          view.getInt32(offset, true),
-          view.getInt32(offset + 4, true),
-          view.getInt32(offset + 8, true),
-        ];
-        offset += 12;
-
-        // Parse per-point data
-        const totalPoints = leafSize[0] * leafSize[1] * leafSize[2];
-        const points = [];
-
-        for (let p = 0; p < totalPoints; p++) {
-          // Check bounds for stylecount byte
-          if (offset >= endOffset) {
-            Con.DPrint(`BSP29Loader: LIGHTGRID_OCTREE leaf ${i} point ${p} truncated\n`);
-            return;
-          }
-
-          const stylecount = view.getUint8(offset);
-          offset += 1;
-
-          // Skip points with no data (stylecount = 0xff means missing)
-          if (stylecount === 0xff) {
-            points.push({ stylecount, styles: [] });
-            continue;
-          }
-
-          const styles = [];
-          for (let s = 0; s < stylecount; s++) {
-            // Check bounds for style data (1 byte stylenum + 3 bytes rgb = 4 bytes)
-            if (offset + 3 >= endOffset) {
-              Con.DPrint(`BSP29Loader: LIGHTGRID_OCTREE leaf ${i} point ${p} style ${s} truncated\n`);
-              return;
-            }
-
-            const stylenum = view.getUint8(offset);
-
-            offset += 1;
-
-            const rgb = [
-              view.getUint8(offset),
-              view.getUint8(offset + 1),
-              view.getUint8(offset + 2),
-            ];
-            offset += 3;
-
-            styles.push({ stylenum, rgb });
-          }
-
-          points.push({ stylecount, styles });
-        }
-
-        leafs.push({ mins: leafMins, size: leafSize, points });
-      }
-
-      loadmodel.lightgrid = {
-        step,
-        size,
-        mins,
-        numstyles,
-        rootnode,
-        nodes,
-        leafs,
-      };
-
-      Con.DPrint(`BSP29Loader: loaded LIGHTGRID_OCTREE with ${numnodes} nodes and ${numleafs} leafs\n`);
-    } catch (error) {
-      Con.DPrint(`BSP29Loader: error loading LIGHTGRID_OCTREE: ${error.message}\n`);
-      loadmodel.lightgrid = null;
-    }
-  }
-}
+export * from './BSP29Loader.ts';
diff --git a/source/engine/common/model/loaders/BSP29Loader.ts b/source/engine/common/model/loaders/BSP29Loader.ts
new file mode 100644
index 00000000..569511eb
--- /dev/null
+++ b/source/engine/common/model/loaders/BSP29Loader.ts
@@ -0,0 +1,2563 @@
+import Vector from '../../../../shared/Vector.ts';
+import Q from '../../../../shared/Q.ts';
+import { content } from '../../../../shared/Defs.ts';
+import { GLTexture } from '../../../client/GL.mjs';
+import W, { readWad3Texture, translateIndexToLuminanceRGBA, translateIndexToRGBA } from '../../W.ts';
+import { CRC16CCITT } from '../../CRC.ts';
+import { CorruptedResourceError } from '../../Errors.ts';
+import { eventBus, registry } from '../../../registry.mjs';
+import { ModelLoader } from '../ModelLoader.ts';
+import { Brush, BrushModel, BrushSide, Node, type BSPXLumps, type Clipnode, type Hull } from '../BSP.ts';
+import { Face, Plane } from '../BaseModel.ts';
+import { materialFlags, noTextureMaterial, PBRMaterial, QuakeMaterial } from '../../../client/renderer/Materials.mjs';
+import { Quake1Sky, SimpleSkyBox } from '../../../client/renderer/Sky.mjs';
+
+// Get registry references (will be set by eventBus)
+let { COM, Con } = registry;
+
+eventBus.subscribe('registry.frozen', () => {
+  ({ COM, Con } = registry);
+});
+
+interface AllowedClipnodeHull extends Hull {
+  readonly firstclipnode: number;
+  allowedClipNodes?: Uint8Array | null;
+}
+
+/**
+ * Loader for Quake BSP29 format (.bsp)
+ * It supports vanilla BSP29 and a few BSPX extensions (such as lightgrid, RGB lighting).
+ */
+export class BSP29Loader extends ModelLoader {
+  /** BSP29 lump indices. */
+  static readonly #lump = Object.freeze({
+    entities: 0,
+    planes: 1,
+    textures: 2,
+    vertexes: 3,
+    visibility: 4,
+    nodes: 5,
+    texinfo: 6,
+    faces: 7,
+    lighting: 8,
+    clipnodes: 9,
+    leafs: 10,
+    marksurfaces: 11,
+    edges: 12,
+    surfedges: 13,
+    models: 14,
+  });
+
+  override getMagicNumbers(): number[] {
+    return [29]; // BSP version 29
+  }
+
+  override getExtensions(): string[] {
+    return ['.bsp'];
+  }
+
+  override getName(): string {
+    return 'Quake BSP29';
+  }
+
+  /**
+   * Load a BSP29 map model from buffer.
+   * @returns The loaded brush model.
+   */
+  override async load(buffer: ArrayBuffer, name: string): Promise<BrushModel> {
+    const loadmodel = new BrushModel(name);
+
+    loadmodel.version = (new DataView(buffer)).getUint32(0, true) as 29 | 844124994;
+    loadmodel.bspxoffset = 0;
+
+    // Load all BSP lumps
+    this.#loadEntities(loadmodel, buffer);
+    this.#loadVertexes(loadmodel, buffer);
+    this.#loadEdges(loadmodel, buffer);
+    this.#loadSurfedges(loadmodel, buffer);
+    this.#loadTextures(loadmodel, buffer);
+    await this.#loadMaterials(loadmodel);
+    this.#loadLighting(loadmodel, buffer);
+    this.#loadPlanes(loadmodel, buffer);
+    this.#loadTexinfo(loadmodel, buffer);
+    this._loadFaces(loadmodel, buffer);
+    this._loadMarksurfaces(loadmodel, buffer);
+    this.#loadVisibility(loadmodel, buffer);
+    this._loadLeafs(loadmodel, buffer);
+    this.#buildClusterData(loadmodel);
+    this._loadNodes(loadmodel, buffer);
+    this._loadClipnodes(loadmodel, buffer);
+    this.#makeHull0(loadmodel);
+    this.#loadBSPX(loadmodel, buffer);
+    this._loadBrushList(loadmodel, buffer);
+    this.#loadLightingRGB(loadmodel, buffer);
+    this.#loadDeluxeMap(loadmodel, buffer);
+    this.#loadLightgridOctree(loadmodel, buffer);
+    this.#loadSubmodels(loadmodel, buffer); // CR: must be last, since it creates additional models based on this one
+    this.#parseFogVolumes(loadmodel); // must be after submodels load so we can scan submodel faces
+    this.#computeAreas(loadmodel);
+
+    if (loadmodel.coloredlights && !loadmodel.lightdata_rgb) {
+      await this.#loadExternalLighting(loadmodel, name);
+    }
+
+    await this.#loadSkybox(loadmodel);
+
+    // Calculate bounding radius
+    this.#calculateRadius(loadmodel);
+
+    loadmodel.needload = false;
+    loadmodel.checksum = CRC16CCITT.Block(new Uint8Array(buffer));
+
+    return loadmodel;
+  }
+
+  async #loadSkybox(loadmodel: BrushModel): Promise<void> {
+    if (registry.isDedicatedServer) {
+      return;
+    }
+
+    const skyname = loadmodel.worldspawnInfo.skyname;
+
+    if (!skyname) {
+      return;
+    }
+
+    const [front, back, left, right, up, down] = await Promise.all([
+      GLTexture.FromImageFile(`gfx/env/${skyname}ft.png`),
+      GLTexture.FromImageFile(`gfx/env/${skyname}bk.png`),
+      GLTexture.FromImageFile(`gfx/env/${skyname}lf.png`),
+      GLTexture.FromImageFile(`gfx/env/${skyname}rt.png`),
+      GLTexture.FromImageFile(`gfx/env/${skyname}up.png`),
+      GLTexture.FromImageFile(`gfx/env/${skyname}dn.png`),
+    ]);
+
+    // CR: unholy yet convenient hack to pass sky texture data to SkyRenderer
+    loadmodel.newSkyRenderer = function () {
+      const skyrenderer = new SimpleSkyBox(this);
+      skyrenderer.setSkyTextures(front, back, left, right, up, down);
+      return skyrenderer;
+    };
+  }
+
+  /**
+   * Calculate the bounding radius of the model from its vertices.
+   */
+  #calculateRadius(loadmodel: BrushModel): void {
+    const mins = new Vector();
+    const maxs = new Vector();
+
+    for (let i = 0; i < loadmodel.vertexes.length; i++) {
+      const vert = loadmodel.vertexes[i];
+
+      if (vert[0] < mins[0]) {
+        mins[0] = vert[0];
+      } else if (vert[0] > maxs[0]) {
+        maxs[0] = vert[0];
+      }
+
+      if (vert[1] < mins[1]) {
+        mins[1] = vert[1];
+      } else if (vert[1] > maxs[1]) {
+        maxs[1] = vert[1];
+      }
+
+      if (vert[2] < mins[2]) {
+        mins[2] = vert[2];
+      } else if (vert[2] > maxs[2]) {
+        maxs[2] = vert[2];
+      }
+    }
+
+    loadmodel.radius = (new Vector(
+      Math.abs(mins[0]) > Math.abs(maxs[0]) ? Math.abs(mins[0]) : Math.abs(maxs[0]),
+      Math.abs(mins[1]) > Math.abs(maxs[1]) ? Math.abs(mins[1]) : Math.abs(maxs[1]),
+      Math.abs(mins[2]) > Math.abs(maxs[2]) ? Math.abs(mins[2]) : Math.abs(maxs[2]),
+    )).len();
+  }
+
+  /**
+   * Load texture information and create GL textures from BSP texture lump.
+   */
+  #loadTextures(loadmodel: BrushModel, buf: ArrayBuffer): void {
+    const view = new DataView(buf);
+    const lump = BSP29Loader.#lump;
+    const fileofs = view.getUint32((lump.textures << 3) + 4, true);
+    const filelen = view.getUint32((lump.textures << 3) + 8, true);
+    loadmodel.textures.length = 0;
+    const nummiptex = view.getUint32(fileofs, true);
+    let dataofs = fileofs + 4;
+
+    const materials: Record<string, QuakeMaterial> = {};
+
+    for (let i = 0; i < nummiptex; i++) {
+      const miptexofs = view.getInt32(dataofs, true);
+      dataofs += 4;
+      if (miptexofs === -1) {
+        loadmodel.textures[i] = noTextureMaterial;
+        continue;
+      }
+      const absofs = miptexofs + fileofs;
+
+      const name = Q.memstr(new Uint8Array(buf, absofs, 16));
+      const cleanName = name.replace(/^\+[0-9a-j]/, ''); // no anim prefix
+
+      if (!materials[cleanName]) {
+        materials[cleanName] = new QuakeMaterial(name, view.getUint32(absofs + 16, true), view.getUint32(absofs + 20, true));
+      }
+
+      const tx = materials[cleanName];
+
+      let glt = null;
+      let luminanceTexture = null;
+
+      // Load texture data (skip for dedicated server)
+      if (!registry.isDedicatedServer) {
+        if (tx.name.substring(0, 3).toLowerCase() === 'sky') {
+          const skyTexture = new Uint8Array(buf, absofs + view.getUint32(absofs + 24, true), 32768);
+
+          // CR: unholy yet convenient hack to pass sky texture data to SkyRenderer
+          loadmodel.newSkyRenderer = function () {
+            const skyrenderer = new Quake1Sky(this);
+            skyrenderer.setSkyTexture(skyTexture);
+            return skyrenderer;
+          };
+
+          tx.flags |= materialFlags.MF_SKY;
+        } else {
+          // Try loading WAD3 texture
+          const len = 40 + tx.width * tx.height * (1 + 0.25 + 0.0625 + 0.015625) + 2 + 768;
+          if (absofs + len - 2 - 768 < buf.byteLength) {
+            const magic = view.getInt16(absofs + len - 2 - 768, true);
+            if (magic === 256) {
+              const data = new ArrayBuffer(len);
+              new Uint8Array(data).set(new Uint8Array(buf, absofs, len));
+              const wtex = readWad3Texture(data, tx.name, 0);
+              glt = GLTexture.FromLumpTexture(wtex);
+              const wadLuminance = BSP29Loader.#createWadLuminanceTexture(data, tx.name, tx.width, tx.height);
+              if (wadLuminance !== null) {
+                luminanceTexture = wadLuminance;
+              }
+              tx.averageColor = BSP29Loader.#computeAverageColor(wtex.data);
+            }
+          }
+        }
+
+        if (!glt) {
+          const pixelData = new Uint8Array(buf, absofs + view.getUint32(absofs + 24, true), tx.width * tx.height);
+          const rgba = translateIndexToRGBA(pixelData, tx.width, tx.height, W.d_8to24table_u8, tx.name[0] === '{' ? 255 : null, 240);
+          const textureId = `${tx.name}/${CRC16CCITT.Block(pixelData)}`; // CR: unique texture ID to avoid conflicts across maps
+          glt = GLTexture.Allocate(textureId, tx.width, tx.height, rgba);
+          const luminanceRGBA = translateIndexToLuminanceRGBA(pixelData, tx.width, tx.height, W.d_8to24table_u8, tx.name[0] === '{' ? 255 : null, 240);
+          if (BSP29Loader.#hasVisiblePixels(luminanceRGBA)) {
+            luminanceTexture = GLTexture.Allocate(`${textureId}:luminance`, tx.width, tx.height, luminanceRGBA);
+          }
+          tx.averageColor = BSP29Loader.#computeAverageColor(rgba);
+        }
+
+        if (tx.name[0] === '*' || tx.name[0] === '!') {
+          tx.flags |= materialFlags.MF_TURBULENT;
+        }
+
+        // Mark textures with '{' prefix as transparent (for alpha blending)
+        if (tx.name[0] === '{') {
+          tx.flags |= materialFlags.MF_TRANSPARENT;
+        }
+
+        if (tx.name.toLowerCase().startsWith('*lava')) {
+          tx.flags |= materialFlags.MF_FULLBRIGHT;
+        }
+      }
+
+      if (name[0] === '+') { // animation prefix
+        const frame = name.toUpperCase().charCodeAt(1);
+
+        if (frame >= 48 && frame <= 57) { // '0'-'9'
+          const frameIndex = frame - 48;
+          tx.addAnimationFrame(frameIndex, glt, luminanceTexture);
+        } else if (frame >= 65 && frame <= 74) { // 'A'-'J'
+          const frameIndex = frame - 65;
+          tx.addAlternateFrame(frameIndex, glt, luminanceTexture);
+        }
+      } else {
+        tx.texture = glt;
+        tx.luminanceTexture = luminanceTexture;
+      }
+
+      loadmodel.textures[i] = tx;
+    }
+
+    loadmodel.bspxoffset = Math.max(loadmodel.bspxoffset, fileofs + filelen);
+  }
+
+  /**
+   * Upload a luminance texture when the source WAD3 texture has fullbright pixels.
+   * @returns The uploaded luminance texture, or null when no visible fullbright pixels exist.
+   */
+  static #createWadLuminanceTexture(wadTextureData: ArrayBuffer, textureName: string, width: number, height: number): GLTexture | null {
+    const indexedData = new Uint8Array(wadTextureData, 40, width * height);
+    const palette = new Uint8Array(wadTextureData,
+      40 +
+      width * height +
+      width / 2 * height / 2 +
+      width / 4 * height / 4 +
+      width / 8 * height / 8 +
+      2,
+    768);
+    const luminanceRGBA = translateIndexToLuminanceRGBA(indexedData, width, height, palette, textureName[0] === '{' ? 255 : null, 240);
+
+    if (!BSP29Loader.#hasVisiblePixels(luminanceRGBA)) {
+      return null;
+    }
+
+    return GLTexture.Allocate(`${textureName}/${CRC16CCITT.Block(indexedData)}:luminance`, width, height, luminanceRGBA);
+  }
+
+  /**
+   * Check whether any pixel in the RGBA data contributes visible color.
+   * @returns True when any pixel is visible.
+   */
+  static #hasVisiblePixels(rgba: Uint8Array): boolean {
+    for (let i = 3; i < rgba.length; i += 4) {
+      if (rgba[i] !== 0) {
+        return true;
+      }
+    }
+
+    return false;
+  }
+
+  /**
+   * Load material definitions from .qsmat.json file if available.
+   */
+  async #loadMaterials(loadmodel: BrushModel): Promise<void> {
+    if (registry.isDedicatedServer) {
+      return;
+    }
+
+    const matfile = await COM.LoadTextFile(loadmodel.name.replace(/\.bsp$/i, '.qsmat.json'));
+
+    if (!matfile) {
+      return;
+    }
+
+    Con.DPrint(`BSP29Loader: found materials file for ${loadmodel.name}\n`);
+    const materialData = JSON.parse(matfile);
+    console.assert(materialData.version === 1);
+
+    for (const [txName, textures] of Object.entries(materialData.materials)) {
+      const textureEntry = Array.from(loadmodel.textures.entries()).find(([, t]) => t.name === txName);
+
+      if (!textureEntry) {
+        Con.DPrint(`BSP29Loader: referenced material (${txName}) is not used\n`);
+        continue;
+      }
+
+      const [txIndex, texture] = textureEntry;
+      const pbr = new PBRMaterial(texture.name, texture.width, texture.height);
+
+      for (const category of ['luminance', 'diffuse', 'specular', 'normal']) {
+        if (textures[category]) {
+          try {
+            pbr[category] = await GLTexture.FromImageFile(textures[category]);
+            Con.DPrint(`BSP29Loader: loaded ${category} texture for ${texture.name} from ${textures[category]}\n`);
+          } catch (e) {
+            Con.PrintError(`BSP29Loader: failed to load ${textures[category]}: ${e.message}\n`);
+          }
+        }
+      }
+
+      if (textures.flags) {
+        for (const flagName of textures.flags) {
+          const flagValue = materialFlags[flagName];
+          console.assert(typeof flagValue === 'number', `BSP29Loader: unknown material flag ${flagName} in ${loadmodel.name}`);
+          pbr.flags |= flagValue;
+        }
+      }
+
+      if (!textures.diffuse && (texture instanceof QuakeMaterial)) {
+        pbr.diffuse = texture.texture; // keep original diffuse as base
+      }
+
+      loadmodel.textures[txIndex] = pbr; // replace with PBR material
+    }
+  }
+
+  /**
+   * Load lighting data from BSP lump.
+   */
+  #loadLighting(loadmodel: BrushModel, buf: ArrayBuffer): void {
+    loadmodel.lightdata_rgb = null;
+    loadmodel.lightdata = null;
+
+    const view = new DataView(buf);
+    const lump = BSP29Loader.#lump;
+    const fileofs = view.getUint32((lump.lighting << 3) + 4, true);
+    const filelen = view.getUint32((lump.lighting << 3) + 8, true);
+
+    if (filelen === 0) {
+      return;
+    }
+
+    loadmodel.lightdata = new Uint8Array(new ArrayBuffer(filelen));
+    loadmodel.lightdata.set(new Uint8Array(buf, fileofs, filelen));
+    loadmodel.bspxoffset = Math.max(loadmodel.bspxoffset, fileofs + filelen);
+  }
+
+  /**
+   * Load visibility data for potentially visible set (PVS) calculations.
+   */
+  #loadVisibility(loadmodel: BrushModel, buf: ArrayBuffer): void {
+    const view = new DataView(buf);
+    const lump = BSP29Loader.#lump;
+    const fileofs = view.getUint32((lump.visibility << 3) + 4, true);
+    const filelen = view.getUint32((lump.visibility << 3) + 8, true);
+
+    if (filelen === 0) {
+      return;
+    }
+
+    loadmodel.visdata = new Uint8Array(new ArrayBuffer(filelen));
+    loadmodel.visdata.set(new Uint8Array(buf, fileofs, filelen));
+    loadmodel.bspxoffset = Math.max(loadmodel.bspxoffset, fileofs + filelen);
+  }
+
+  /**
+   * Build cluster-native visibility data structures after vis + leafs are loaded.
+   * Sets numclusters, builds clusterPvsOffsets from leaf visofs values, and
+   * computes PHS (Potentially Hearable Set) via transitive closure of PVS.
+   */
+  #buildClusterData(loadmodel: BrushModel): void {
+    const numclusters = loadmodel.leafs.length - 1; // leaf 0 is outside sentinel
+    loadmodel.numclusters = numclusters;
+
+    // BSP29/BSP2 maps have no area data — single area, no portals
+    loadmodel.numAreas = 1;
+    loadmodel.areaPortals.init(1, []);
+
+    if (loadmodel.visdata === null || numclusters <= 0) {
+      return;
+    }
+
+    // Build clusterPvsOffsets from leaf visofs values
+    // For BSP29: cluster c = leaf c+1, so clusterPvsOffsets[c] = leafs[c+1].visofs
+    const clusterPvsOffsets = new Array(numclusters);
+
+    for (let c = 0; c < numclusters; c++) {
+      clusterPvsOffsets[c] = loadmodel.leafs[c + 1].visofs;
+    }
+
+    loadmodel.clusterPvsOffsets = clusterPvsOffsets;
+
+    // Compute PHS via transitive closure of PVS
+    this.#computePHS(loadmodel);
+  }
+
+  /**
+   * Compute PHS (Potentially Hearable Set) data by transitive closure of PVS.
+   * For each cluster, the PHS includes all clusters visible from any cluster
+   * that is itself visible from the source cluster (one-hop expansion).
+   */
+  #computePHS(loadmodel: BrushModel): void {
+    const numclusters = loadmodel.numclusters;
+    const clusterBytes = (numclusters + 7) >> 3;
+    const visdata = loadmodel.visdata;
+    const offsets = loadmodel.clusterPvsOffsets;
+
+    if (visdata === null || offsets === null || numclusters <= 0) {
+      return;
+    }
+
+    // Decompress all PVS rows into a flat buffer for fast OR operations
+    const pvsRows = new Uint8Array(numclusters * clusterBytes);
+    for (let c = 0; c < numclusters; c++) {
+      const rowStart = c * clusterBytes;
+
+      if (offsets[c] < 0) {
+        continue; // no vis for this cluster; row stays zero
+      }
+
+      for (let _out = 0, _in = offsets[c]; _out < clusterBytes;) {
+        // Bounds check to prevent reading past end of visdata
+        // Note: It's normal for visibility data to end before clusterBytes is filled;
+        // remaining bytes stay zero, which is correct for unvisible clusters.
+        if (_in >= visdata.length) {
+          break;
+        }
+
+        if (visdata[_in] !== 0) {
+          pvsRows[rowStart + _out++] = visdata[_in++];
+          continue;
+        }
+
+        // RLE: 0 byte followed by count of zeros
+        if (_in + 1 >= visdata.length) {
+          // End of RLE data; remaining output stays zero (unvisible)
+          break;
+        }
+
+        for (let skip = visdata[_in + 1]; skip > 0; skip--) {
+          pvsRows[rowStart + _out++] = 0x00;
+        }
+
+        _in += 2;
+      }
+    }
+
+    // Transitive closure: PHS[src] = OR of PVS[c] for all c where PVS[src] has bit c set
+    const phsRows = new Uint8Array(numclusters * clusterBytes);
+    for (let src = 0; src < numclusters; src++) {
+      const srcPvsStart = src * clusterBytes;
+      const dstPhsStart = src * clusterBytes;
+
+      // Start with the PVS itself
+      for (let b = 0; b < clusterBytes; b++) {
+        phsRows[dstPhsStart + b] = pvsRows[srcPvsStart + b];
+      }
+
+      // OR in PVS of every cluster visible from src
+      for (let c = 0; c < numclusters; c++) {
+        if ((pvsRows[srcPvsStart + (c >> 3)] & (1 << (c & 7))) === 0) {
+          continue;
+        }
+
+        const neighborPvsStart = c * clusterBytes;
+
+        for (let b = 0; b < clusterBytes; b++) {
+          phsRows[dstPhsStart + b] |= pvsRows[neighborPvsStart + b];
+        }
+      }
+    }
+
+    // RLE-compress PHS rows into phsdata + build clusterPhsOffsets
+    // Worst case: each row expands to clusterBytes (no compression)
+    // Typical case: significant compression due to zero runs
+    // Format: Non-zero bytes are literal, [0, count] represents count zero bytes
+    const phsBuffer = [];
+    const clusterPhsOffsets = new Array(numclusters);
+
+    for (let c = 0; c < numclusters; c++) {
+      clusterPhsOffsets[c] = phsBuffer.length;
+      const rowStart = c * clusterBytes;
+      let i = 0;
+
+      while (i < clusterBytes) {
+        if (phsRows[rowStart + i] !== 0) {
+          // Literal non-zero byte
+          phsBuffer.push(phsRows[rowStart + i]);
+          i++;
+        } else {
+          // Count zero run (up to 255 bytes)
+          let zeroCount = 0;
+
+          while (i < clusterBytes && phsRows[rowStart + i] === 0 && zeroCount < 255) {
+            i++;
+            zeroCount++;
+          }
+
+          // Encode as [0, count]
+          phsBuffer.push(0);
+          phsBuffer.push(zeroCount);
+        }
+      }
+    }
+
+    loadmodel.phsdata = new Uint8Array(phsBuffer);
+    loadmodel.clusterPhsOffsets = clusterPhsOffsets;
+  }
+
+  /**
+   * Compute visibility areas and portals based on door entities and PHS.
+   * This traverses the BSP tree to classify leaves against door planes,
+   * then clusters them based on PVS connectivity.
+   */
+  #computeAreas(loadmodel: BrushModel): void {
+    // 1. Identify Portal Definitions (Doors)
+    const portalDefs = this.#parsePortalEntities(loadmodel);
+
+    // 2. Build Portal Planes from Door BBoxes
+    // Merge bboxes for shared portalNums (e.g. double doors)
+    const mergedBboxes = new Map();
+
+    for (const def of portalDefs) {
+      const submodel = loadmodel.submodels[def.modelIndex - 1]; // *N -> submodels[N-1]
+
+      if (!submodel) {
+        Con.PrintWarning(`BSP29Loader.computeAreas: portal ${def.portalNum} references invalid model *${def.modelIndex}\n`);
+        continue;
+      }
+
+      const existing = mergedBboxes.get(def.portalNum);
+
+      if (existing) {
+        for (let k = 0; k < 3; k++) {
+          existing.mins[k] = Math.min(existing.mins[k], submodel.mins[k]);
+          existing.maxs[k] = Math.max(existing.maxs[k], submodel.maxs[k]);
+        }
+      } else {
+        mergedBboxes.set(def.portalNum, {
+          mins: [submodel.mins[0], submodel.mins[1], submodel.mins[2]],
+          maxs: [submodel.maxs[0], submodel.maxs[1], submodel.maxs[2]],
+        });
+      }
+    }
+
+    const portals = [];
+
+    for (const [portalNum, bbox] of mergedBboxes) {
+      // Determine split plane (thinnest axis)
+      const size = [bbox.maxs[0] - bbox.mins[0], bbox.maxs[1] - bbox.mins[1], bbox.maxs[2] - bbox.mins[2]];
+      let axis = 0;
+
+      if (size[1] < size[0]) {
+        axis = 1;
+      }
+
+      if (size[2] < size[axis]) {
+        axis = 2;
+      }
+
+      const dist = (bbox.mins[axis] + bbox.maxs[axis]) * 0.5;
+      const thickness = (bbox.maxs[axis] - bbox.mins[axis]) * 0.5;
+      const offset = Math.max(24.0, thickness + 16.0); // Offset for PHS sampling
+
+      // Sample PHS points
+      const center = [(bbox.mins[0] + bbox.maxs[0]) * 0.5, (bbox.mins[1] + bbox.maxs[1]) * 0.5, (bbox.mins[2] + bbox.maxs[2]) * 0.5];
+      const backPt = [...center];
+      backPt[axis] -= offset;
+      const frontPt = [...center];
+      frontPt[axis] += offset;
+
+      portals.push({
+        portalNum,
+        axis,
+        dist,
+        backVis: loadmodel.getPhsByPoint(new Vector(...backPt)),
+        frontVis: loadmodel.getPhsByPoint(new Vector(...frontPt)),
+      });
+    }
+
+    // 3. Traverse BSP Nodes to assign "Side" Signatures
+    // Optimization: If a node is fully on one side of a portal plane, all its children are too.
+    const leafSignatures = new Map<number, string>();
+
+    /** Recursively classify nodes against portal planes. */
+    const classifyRecursive = (node: Node, states: number[]): void => {
+      // Check unknown portals against node bounds
+      const nextStates = states.slice();
+
+      for (let i = 0; i < portals.length; i++) {
+        if (nextStates[i] !== -1) {
+          continue;
+        }
+
+        const p = portals[i];
+
+        if (node.maxs[p.axis] < p.dist) {
+          nextStates[i] = 0;
+        } else if (node.mins[p.axis] > p.dist) {
+          nextStates[i] = 1;
+        }
+      }
+
+      if (node.contents < 0) {
+        // Leaf Node
+        if (node.contents === content.CONTENT_SOLID) {
+          node.area = 0;
+          return;
+        }
+
+        const cx = (node.mins[0] + node.maxs[0]) * 0.5;
+        const cy = (node.mins[1] + node.maxs[1]) * 0.5;
+        const cz = (node.mins[2] + node.maxs[2]) * 0.5;
+        const center = [cx, cy, cz];
+
+        let sig = '';
+
+        for (let i = 0; i < portals.length; i++) {
+          let side = nextStates[i];
+
+          if (side === -1) {
+            side = center[portals[i].axis] >= portals[i].dist ? 1 : 0;
+          }
+
+          // Nearness check via PHS
+          const p = portals[i];
+          const isNear = side === 0 ? p.backVis.isRevealed(node.num) : p.frontVis.isRevealed(node.num);
+
+          // Sig Codes: 0=BackFar, 1=BackNear, 2=FrontNear, 3=FrontFar
+          let code = 0;
+
+          if (side === 0) {
+            code = isNear ? 1 : 0;
+          } else {
+            code = isNear ? 2 : 3;
+          }
+
+          sig += code.toString();
+        }
+
+        leafSignatures.set(node.num, sig);
+        return;
+      }
+
+      // Inner Node
+      if (node.children[0]) {
+        classifyRecursive(node.children[0], nextStates);
+      }
+      if (node.children[1]) {
+        classifyRecursive(node.children[1], nextStates);
+      }
+    };
+
+    // Start traversal from root
+    const initialStates = new Array(portals.length).fill(-1);
+    classifyRecursive(loadmodel.nodes[0], initialStates);
+
+    // 4. Cluster Signatures into Areas (PVS connectivity)
+    const sigGroups = new Map();
+
+    for (const [leafNum, sig] of leafSignatures) {
+      if (!sigGroups.has(sig)) {
+        sigGroups.set(sig, []);
+      }
+      sigGroups.get(sig).push(leafNum);
+    }
+
+    let nextArea = 1;
+    const areasList: { sig: string; area: number }[] = [];
+    const areaLeafsMap = new Map<number, number[]>();
+
+    for (const [sig, leafIndices] of sigGroups) {
+      const visited = new Set();
+
+      for (const startLeaf of leafIndices) {
+        if (visited.has(startLeaf)) {
+          continue;
+        }
+
+        const area = nextArea++;
+        areasList.push({ sig, area });
+        areaLeafsMap.set(area, []);
+
+        // BFS within this signature group using PVS
+        const queue = [startLeaf];
+        visited.add(startLeaf);
+        loadmodel.leafs[startLeaf].area = area;
+        areaLeafsMap.get(area).push(startLeaf);
+
+        while (queue.length > 0) {
+          const current = queue.shift();
+          const pvs = loadmodel.getPvsByLeaf(loadmodel.leafs[current]);
+
+          // We only need to check leaves in the same signature group
+          for (const candidate of leafIndices) {
+            if (!visited.has(candidate) && pvs.isRevealed(candidate)) {
+              visited.add(candidate);
+              loadmodel.leafs[candidate].area = area;
+              areaLeafsMap.get(area).push(candidate);
+              queue.push(candidate);
+            }
+          }
+        }
+      }
+    }
+
+    loadmodel.numAreas = nextArea;
+
+    // 5. Connect Areas
+    const allConnections: { area0: number; area1: number; group: number }[] = [];
+
+    for (let i = 0; i < areasList.length; i++) {
+      for (let j = i + 1; j < areasList.length; j++) {
+        const { sig: sigA, area: areaA } = areasList[i];
+        const { sig: sigB, area: areaB } = areasList[j];
+
+        // Differences logic:
+        // 1 -> 2 (BackNear <-> FrontNear) : Door Crossing (Gated)
+        // Others: Open connection (just movement)
+        let diffCount = 0;
+        let doorCount = 0;
+        let doorGroup = -1;
+
+        for (let k = 0; k < sigA.length; k++) {
+          if (sigA[k] !== sigB[k]) {
+            diffCount++;
+            const s1 = parseInt(sigA[k]);
+            const s2 = parseInt(sigB[k]);
+
+            // Check if transition is BackNear(1) <-> FrontNear(2)
+            if ((s1 === 1 && s2 === 2) || (s1 === 2 && s2 === 1)) {
+              doorCount++;
+              doorGroup = portals[k].portalNum;
+            }
+          }
+        }
+
+        if (diffCount === 0) {
+          continue;
+        }
+
+        // PVS Adjacency Check
+        const leafsA = areaLeafsMap.get(areaA);
+        const leafsB = areaLeafsMap.get(areaB);
+        let pvsAdjacent = false;
+
+        // Check A seeing B (optimization: only check first few or scan until hit)
+        for (let li = 0; li < leafsA.length && !pvsAdjacent; li++) {
+          const pvs = loadmodel.getPvsByLeaf(loadmodel.leafs[leafsA[li]]);
+          for (let lj = 0; lj < leafsB.length; lj++) {
+            if (pvs.isRevealed(leafsB[lj])) {
+              pvsAdjacent = true;
+              break;
+            }
+          }
+        }
+
+        if (!pvsAdjacent) {
+          continue;
+        }
+
+        if (doorCount === 1) {
+          allConnections.push({ area0: areaA, area1: areaB, group: doorGroup });
+        } else if (doorCount === 0) {
+          allConnections.push({ area0: areaA, area1: areaB, group: -1 });
+        }
+      }
+    }
+
+    let maxGroup = 0;
+    for (const c of allConnections) {
+      if (c.group > maxGroup) {
+        maxGroup = c.group;
+      }
+    }
+    const numGroups = maxGroup + 1;
+
+    loadmodel.portalDefs = allConnections;
+    loadmodel.areaPortals.init(loadmodel.numAreas, allConnections, numGroups);
+
+    Con.DPrint(`BSP29Loader.computeAreas: computed ${loadmodel.numAreas} areas, ${allConnections.length} connections, ${numGroups} groups\n`);
+  }
+
+  /**
+   * Parse the entity lump for portal entity definitions.
+   * Entities with an explicit "portal" key are used directly. Door entities
+   * (func_door, func_door_secret) with brush models are auto-assigned portal
+   * numbers if they don't have an explicit one. The mapping from model name
+   * to portal number is stored in loadmodel.modelPortalMap.
+   * @returns Portal definitions keyed by submodel index.
+   */
+  #parsePortalEntities(loadmodel: BrushModel): { portalNum: number; modelIndex: number }[] {
+    const portals: { portalNum: number; modelIndex: number }[] = [];
+
+    // First pass: collect explicit portals and door entities needing auto-assignment
+    const autoAssignDoors: { modelIndex: number; model: string }[] = [];
+    let maxExplicitPortal = -1;
+
+    let data = loadmodel.entities;
+
+    Con.DPrint('BSP29Loader.#parsePortalEntities: looking for portals in entity lump...\n');
+
+    while (data) {
+      const parsed = COM.Parse(data);
+      data = parsed.data;
+
+      if (!data) {
+        break;
+      }
+
+      // Parse one entity block
+      const ent: Record<string, string> = {};
+
+      while (data) {
+        const parsedKey = COM.Parse(data);
+        data = parsedKey.data;
+
+        if (!data || parsedKey.token === '}') {
+          break;
+        }
+
+        const parsedValue = COM.Parse(data);
+        data = parsedValue.data;
+
+        if (!data || parsedValue.token === '}') {
+          break;
+        }
+
+        ent[parsedKey.token] = parsedValue.token;
+      }
+
+      if (!ent.model || !ent.model.startsWith('*')) {
+        continue;
+      }
+
+      const modelIndex = parseInt(ent.model.substring(1), 10);
+
+      if (isNaN(modelIndex) || modelIndex <= 0) {
+        continue;
+      }
+
+      // Explicit portal key takes priority
+      if (ent.portal !== undefined) {
+        const portalNum = parseInt(ent.portal, 10);
+
+        if (!isNaN(portalNum) && portalNum >= 0) {
+          portals.push({ portalNum, modelIndex });
+          loadmodel.modelPortalMap[ent.model] = portalNum;
+
+          if (portalNum > maxExplicitPortal) {
+            maxExplicitPortal = portalNum;
+          }
+        }
+
+        continue;
+      }
+
+      // CR: temporarily disabled due to funny bugs
+      // // Auto-assign portal numbers to door entities
+      // if (ent.classname is an auto-assigned door classname) {
+      //   Con.DPrint(`...detected portal ${ent.classname} with model ${ent.model}\n`);
+      //   autoAssignDoors.push({ modelIndex, model: ent.model });
+      // }
+    }
+
+    // Auto-assign portal numbers starting after the highest explicit one.
+    // Double doors (two touching door halves) must share a single portal
+    // number, otherwise each half generates its own splitting plane and
+    // the area assignment breaks.
+    let nextPortal = maxExplicitPortal + 1;
+
+    // Group touching doors using union-find so linked door pairs share
+    // a portal. This mirrors the game-side _linkDoors() touching test.
+    const doorCount = autoAssignDoors.length;
+
+    const parent: number[] = autoAssignDoors.map((_, i) => i);
+
+    const find = (i: number): number => {
+      while (parent[i] !== i) {
+        parent[i] = parent[parent[i]]; // path compression
+        i = parent[i];
+      }
+
+      return i;
+    };
+
+    const union = (a: number, b: number): void => {
+      parent[find(a)] = find(b);
+    };
+
+    for (let i = 0; i < doorCount; i++) {
+      const smA = loadmodel.submodels[autoAssignDoors[i].modelIndex - 1];
+
+      if (!smA) {
+        continue;
+      }
+
+      for (let j = i + 1; j < doorCount; j++) {
+        const smB = loadmodel.submodels[autoAssignDoors[j].modelIndex - 1];
+
+        if (!smB) {
+          continue;
+        }
+
+        // Same touching test as BaseEntity.isTouching / QuakeC EntitiesTouching
+        if (smA.mins[0] <= smB.maxs[0] && smA.maxs[0] >= smB.mins[0]
+          && smA.mins[1] <= smB.maxs[1] && smA.maxs[1] >= smB.mins[1]
+          && smA.mins[2] <= smB.maxs[2] && smA.maxs[2] >= smB.mins[2]) {
+          union(i, j);
+        }
+      }
+    }
+
+    // Assign one portal number per group
+    const groupPortal = new Map<number, number>();
+
+    for (let i = 0; i < doorCount; i++) {
+      const door = autoAssignDoors[i];
+
+      if (loadmodel.modelPortalMap[door.model]) {
+        continue;
+      }
+
+      const root = find(i);
+      let portalNum = groupPortal.get(root);
+
+      if (portalNum === undefined) {
+        portalNum = nextPortal++;
+        groupPortal.set(root, portalNum);
+      }
+
+      portals.push({ portalNum, modelIndex: door.modelIndex });
+      loadmodel.modelPortalMap[door.model] = portalNum;
+    }
+
+    if (autoAssignDoors.length > 0) {
+      Con.DPrint(`BSP29Loader.#parsePortalEntities: auto-assigned ${autoAssignDoors.length} door portals (${groupPortal.size} groups)\n`);
+    }
+
+    return portals;
+  }
+
+  /**
+   * Load entities from BSP lump and parse worldspawn properties.
+   * Also tries to parse light entities to determine if RGB lighting is used
+   * and whether we need to load the .lit file.
+   */
+  #loadEntities(loadmodel: BrushModel, buf: ArrayBuffer): void {
+    const view = new DataView(buf);
+    const lump = BSP29Loader.#lump;
+    const fileofs = view.getUint32((lump.entities << 3) + 4, true);
+    const filelen = view.getUint32((lump.entities << 3) + 8, true);
+    loadmodel.entities = Q.memstr(new Uint8Array(buf, fileofs, filelen));
+    loadmodel.worldspawnInfo = {};
+
+    let data = loadmodel.entities;
+
+    // going for worldspawn and light
+    let stillLooking = 2;
+    while (stillLooking > 0) {
+      const parsed = COM.Parse(data);
+      data = parsed.data;
+
+      if (!data) {
+        break;
+      }
+
+      const currentEntity: Record<string, string> = {};
+      while (data) {
+        const parsedKey = COM.Parse(data);
+        data = parsedKey.data;
+
+        if (!data || parsedKey.token === '}') {
+          break;
+        }
+
+        const parsedValue = COM.Parse(data);
+        data = parsedValue.data;
+
+        if (!data || parsedKey.token === '}') {
+          break;
+        }
+
+        currentEntity[parsedKey.token] = parsedValue.token;
+      }
+
+      if (!currentEntity.classname) {
+        break;
+      }
+
+      switch (currentEntity.classname) {
+        case 'worldspawn':
+          Object.assign(loadmodel.worldspawnInfo, currentEntity);
+          stillLooking--;
+          break;
+
+        case 'light':
+          if (currentEntity._color) {
+            loadmodel.coloredlights = true;
+            stillLooking--;
+          }
+          break;
+      }
+    }
+
+    // Second pass: parse func_fog entities from the entity lump
+    // (moved to load() after submodels load so we can also scan submodel faces)
+
+    loadmodel.bspxoffset = Math.max(loadmodel.bspxoffset, fileofs + filelen);
+  }
+
+  /**
+   * Parse func_fog entities from the BSP entity lump and store
+   * them as fog volume descriptors on the model.
+   */
+  #parseFogVolumes(loadmodel: BrushModel): void {
+    loadmodel.fogVolumes.length = 0;
+
+    let data = loadmodel.entities;
+    if (!data) {
+      return;
+    }
+
+    while (data) {
+      const parsed = COM.Parse(data);
+      data = parsed.data;
+
+      if (!data) {
+        break;
+      }
+
+      const entity: Record<string, string> = {};
+
+      while (data) {
+        const parsedKey = COM.Parse(data);
+        data = parsedKey.data;
+
+        if (!data || parsedKey.token === '}') {
+          break;
+        }
+
+        const parsedValue = COM.Parse(data);
+        data = parsedValue.data;
+
+        if (!data || parsedValue.token === '}') {
+          break;
+        }
+
+        entity[parsedKey.token] = parsedValue.token;
+      }
+
+      if (entity.classname !== 'func_fog' || !entity.model) {
+        continue;
+      }
+
+      const modelIndex = parseInt(entity.model.substring(1), 10);
+
+      if (isNaN(modelIndex) || modelIndex <= 0) {
+        Con.PrintWarning(`func_fog has invalid model '${entity.model}'\n`);
+        continue;
+      }
+
+      const colorParts = (entity.fog_color || '128 128 128').split(/\s+/).map(Number);
+      const submodel = loadmodel.submodels[modelIndex - 1];
+
+      loadmodel.fogVolumes.push({
+        modelIndex,
+        color: [colorParts[0] || 128, colorParts[1] || 128, colorParts[2] || 128],
+        density: parseFloat(entity.fog_density || '0.01'),
+        maxOpacity: Math.min(1.0, Math.max(0.0, parseFloat(entity.fog_max_opacity || '0.8'))),
+        mins: submodel ? [submodel.mins[0], submodel.mins[1], submodel.mins[2]] : [0, 0, 0],
+        maxs: submodel ? [submodel.maxs[0], submodel.maxs[1], submodel.maxs[2]] : [0, 0, 0],
+      });
+
+      Con.DPrint(`Found func_fog: model *${modelIndex}, color ${colorParts}, density ${entity.fog_density || '0.01'}\n`);
+    }
+
+    if (loadmodel.worldspawnInfo._qs_autogen_fog !== '1') {
+      Con.DPrint('Auto-generation of fog volumes is disabled.\n');
+      return;
+    }
+
+    // Auto-generate fog volumes for turbulent submodels (water, slime, lava)
+    // that weren't already claimed by a func_fog entity
+    const claimedModels = new Set(loadmodel.fogVolumes.map((fv) => fv.modelIndex));
+
+    for (let i = 0; i < loadmodel.submodels.length; i++) {
+      const modelIndex = i + 1; // submodels[0] = *1, submodels[1] = *2, etc.
+
+      if (claimedModels.has(modelIndex)) {
+        continue;
+      }
+
+      const submodel = loadmodel.submodels[i];
+
+      // Check if ALL faces in this submodel are turbulent
+      let allTurbulent = submodel.numfaces > 0;
+      let turbulentTextureIndex = -1;
+
+      for (let j = 0; j < submodel.numfaces; j++) {
+        const face = submodel.faces[submodel.firstface + j];
+        const material = loadmodel.textures[face.texture];
+
+        if (!(material.flags & materialFlags.MF_TURBULENT)) {
+          allTurbulent = false;
+          break;
+        }
+
+        if (turbulentTextureIndex === -1) {
+          turbulentTextureIndex = face.texture;
+        }
+      }
+
+      if (!allTurbulent || turbulentTextureIndex === -1) {
+        continue;
+      }
+
+      // Derive fog color from the texture's average color, modulated by ambient light
+      const material = loadmodel.textures[turbulentTextureIndex];
+      const baseColor = material.averageColor || [128, 128, 128];
+      const volMins = [submodel.mins[0], submodel.mins[1], submodel.mins[2]];
+      const volMaxs = [submodel.maxs[0], submodel.maxs[1], submodel.maxs[2]];
+      const lightFactor = this.#sampleAmbientLightForVolume(loadmodel, volMins, volMaxs);
+      const color = [
+        Math.round(baseColor[0] * lightFactor),
+        Math.round(baseColor[1] * lightFactor),
+        Math.round(baseColor[2] * lightFactor),
+      ];
+
+      loadmodel.fogVolumes.push({
+        modelIndex,
+        color,
+        density: 0.02,
+        maxOpacity: 0.85,
+        mins: volMins,
+        maxs: volMaxs,
+      });
+
+      Con.DPrint(`Auto-fog for turbulent *${modelIndex} (${material.name}): color [${color}], light=${lightFactor.toFixed(2)}\n`);
+    }
+
+    // Phase 3: Auto-generate fog volumes for world-level turbulent surfaces
+    // (water/slime/lava that belong to the worldspawn, not a brush entity).
+    // These exist as BSP leafs with CONTENT_WATER/SLIME/LAVA contents.
+    // We cluster adjacent leafs of the same type and create fog volumes from their merged AABBs.
+    this.#parseFogVolumesFromWorldLeafs(loadmodel);
+  }
+
+  /**
+   * Create fog volumes for world-level water/slime/lava directly from BSP leafs.
+   * Each liquid leaf gets its own fog volume with exact bounds from the BSP compiler,
+   * avoiding imprecision from merging AABBs across multiple leafs.
+   */
+  #parseFogVolumesFromWorldLeafs(loadmodel: BrushModel): void {
+    if (!loadmodel.leafs || loadmodel.leafs.length === 0) {
+      return;
+    }
+
+    const liquidLeafsByType = new Map<number, number[]>();
+
+    for (let i = 0; i < loadmodel.leafs.length; i++) {
+      const leaf = loadmodel.leafs[i];
+      const c = leaf.contents;
+
+      if (c !== content.CONTENT_WATER && c !== content.CONTENT_SLIME && c !== content.CONTENT_LAVA) {
+        continue;
+      }
+
+      if (!liquidLeafsByType.has(c)) {
+        liquidLeafsByType.set(c, []);
+      }
+      liquidLeafsByType.get(c).push(i);
+    }
+
+    if (liquidLeafsByType.size === 0) {
+      return;
+    }
+
+    for (const [contentType, leafIndices] of liquidLeafsByType) {
+      // Find dominant turbulent texture color across all leafs of this type
+      const color = this.#findClusterTurbulentColor(loadmodel, leafIndices) || [128, 128, 128];
+
+      const contentName = contentType === content.CONTENT_WATER ? 'water'
+        : contentType === content.CONTENT_SLIME ? 'slime' : 'lava';
+
+      const density = contentType === content.CONTENT_LAVA ? 0.05
+        : contentType === content.CONTENT_SLIME ? 0.01 : 0.005;
+
+      // Create one fog volume per leaf with exact BSP bounds, modulated by ambient light
+      for (const leafIdx of leafIndices) {
+        const leaf = loadmodel.leafs[leafIdx];
+        const volMins = [leaf.mins[0], leaf.mins[1], leaf.mins[2]];
+        const volMaxs = [leaf.maxs[0], leaf.maxs[1], leaf.maxs[2]];
+        const lightFactor = this.#sampleAmbientLightForVolume(loadmodel, volMins, volMaxs);
+        const dimmedColor = [
+          Math.round(color[0] * lightFactor),
+          Math.round(color[1] * lightFactor),
+          Math.round(color[2] * lightFactor),
+        ];
+
+        loadmodel.fogVolumes.push({
+          modelIndex: 0,
+          color: dimmedColor,
+          density,
+          maxOpacity: 0.85,
+          mins: volMins,
+          maxs: volMaxs,
+        });
+
+        Con.DPrint(`Auto-fog: ${leafIdx} ${contentName} leaf volume, base color [${color}], lightFactor = ${lightFactor.toFixed(2)}\n`);
+      }
+    }
+  }
+
+  /**
+   * Find the average color of the dominant turbulent texture in a set of leafs.
+   * Scans marksurfaces for turbulent faces and returns the most common texture's color.
+   * @returns The dominant turbulent color, or null when no turbulent face is present.
+   */
+  #findClusterTurbulentColor(loadmodel: BrushModel, leafIndices: number[]): number[] | null {
+    const textureCounts = new Map<number, number>();
+
+    for (const leafIdx of leafIndices) {
+      const leaf = loadmodel.leafs[leafIdx];
+
+      for (let k = 0; k < leaf.nummarksurfaces; k++) {
+        const faceIdx = loadmodel.marksurfaces[leaf.firstmarksurface + k];
+        const face = loadmodel.faces[faceIdx];
+
+        if (!face.turbulent) {
+          continue;
+        }
+
+        textureCounts.set(face.texture, (textureCounts.get(face.texture) || 0) + 1);
+      }
+    }
+
+    if (textureCounts.size === 0) {
+      return null;
+    }
+
+    // Find the most common turbulent texture
+    let bestTexture = -1;
+    let bestCount = 0;
+
+    for (const [texIdx, count] of textureCounts) {
+      if (count > bestCount) {
+        bestCount = count;
+        bestTexture = texIdx;
+      }
+    }
+
+    const material = loadmodel.textures[bestTexture];
+    return material?.averageColor || null;
+  }
+
+  /**
+   * Sample the average ambient light intensity near a fog volume's bounding box.
+   * Scans BSP leafs that overlap the expanded AABB and samples lightmap data
+   * from non-turbulent, non-sky faces to estimate the local light level.
+   * @returns A normalized lighting factor in the range used for fog modulation.
+   */
+  #sampleAmbientLightForVolume(loadmodel: BrushModel, mins: number[], maxs: number[]): number {
+    if ((loadmodel.lightdata_rgb === null && loadmodel.lightdata === null) || !loadmodel.leafs || loadmodel.leafs.length === 0) {
+      return 1.0;
+    }
+
+    // Expand AABB by 64 units to catch nearby lit surfaces
+    const expand = 64;
+    const eMins = [mins[0] - expand, mins[1] - expand, mins[2] - expand];
+    const eMaxs = [maxs[0] + expand, maxs[1] + expand, maxs[2] + expand];
+
+    let totalIntensity = 0;
+    let sampleCount = 0;
+
+    const hasRGB = loadmodel.lightdata_rgb !== null;
+
+    for (let i = 0; i < loadmodel.leafs.length; i++) {
+      const leaf = loadmodel.leafs[i];
+
+      // Skip liquid leafs — we want light from surrounding solid geometry
+      if (leaf.contents === content.CONTENT_WATER
+        || leaf.contents === content.CONTENT_SLIME
+        || leaf.contents === content.CONTENT_LAVA) {
+        continue;
+      }
+
+      // AABB overlap test
+      if (leaf.mins[0] > eMaxs[0] || leaf.maxs[0] < eMins[0]
+        || leaf.mins[1] > eMaxs[1] || leaf.maxs[1] < eMins[1]
+        || leaf.mins[2] > eMaxs[2] || leaf.maxs[2] < eMins[2]) {
+        continue;
+      }
+
+      // Scan marksurfaces in this leaf
+      for (let k = 0; k < leaf.nummarksurfaces; k++) {
+        const faceIdx = loadmodel.marksurfaces[leaf.firstmarksurface + k];
+        const face = loadmodel.faces[faceIdx];
+
+        if (face.turbulent || face.sky || face.lightofs < 0 || face.styles.length === 0) {
+          continue;
+        }
+
+        // Compute lightmap dimensions for this face
+        const smax = (face.extents[0] >> face.lmshift) + 1;
+        const tmax = (face.extents[1] >> face.lmshift) + 1;
+        const size = smax * tmax;
+
+        if (size <= 0 || size > 4096) {
+          continue;
+        }
+
+        // Sample only the first light style (style 0 = static light)
+        if (hasRGB) {
+          const offset = face.lightofs * 3;
+
+          if (offset + size * 3 > loadmodel.lightdata_rgb.length) {
+            continue;
+          }
+
+          for (let s = 0; s < size * 3; s += 3) {
+            // Perceptual luminance
+            totalIntensity += loadmodel.lightdata_rgb[offset + s] * 0.299
+              + loadmodel.lightdata_rgb[offset + s + 1] * 0.587
+              + loadmodel.lightdata_rgb[offset + s + 2] * 0.114;
+            sampleCount++;
+          }
+        } else {
+          const offset = face.lightofs;
+
+          if (offset + size > loadmodel.lightdata.length) {
+            continue;
+          }
+
+          for (let s = 0; s < size; s++) {
+            totalIntensity += loadmodel.lightdata[offset + s];
+            sampleCount++;
+          }
+        }
+      }
+    }
+
+    if (sampleCount === 0) {
+      return 1.0;
+    }
+
+    // Average intensity in 0-255 range, normalize to a 0-1 scale.
+    // Quake lighting with value ~200 is considered well-lit; we use 200 as reference
+    // so well-lit areas keep the fog color roughly unchanged.
+    const avgIntensity = totalIntensity / sampleCount;
+    const factor = Math.min(1.0, Math.max(0.15, avgIntensity / 200.0));
+    return factor;
+  }
+
+  /**
+   * Compute the average color of an RGBA texture buffer.
+   * Skips fully transparent pixels so alpha-masked areas don't dilute the color.
+   * @returns The average RGB color.
+   */
+  static #computeAverageColor(rgba: Uint8Array): number[] {
+    let r = 0;
+    let g = 0;
+    let b = 0;
+    let count = 0;
+
+    for (let i = 0; i < rgba.length; i += 4) {
+      if (rgba[i + 3] === 0) {
+        continue; // skip fully transparent pixels
+      }
+      r += rgba[i];
+      g += rgba[i + 1];
+      b += rgba[i + 2];
+      count++;
+    }
+
+    if (count === 0) {
+      return [128, 128, 128];
+    }
+
+    return [
+      Math.round(r / count),
+      Math.round(g / count),
+      Math.round(b / count),
+    ];
+  }
+
+  /**
+   * Load vertices from BSP lump.
+   */
+  #loadVertexes(loadmodel: BrushModel, buf: ArrayBuffer): void {
+    const view = new DataView(buf);
+    const lump = BSP29Loader.#lump;
+    let fileofs = view.getUint32((lump.vertexes << 3) + 4, true);
+    const filelen = view.getUint32((lump.vertexes << 3) + 8, true);
+    if ((filelen % 12) !== 0) {
+      throw new Error(`BSP29Loader: vertexes lump size is not a multiple of 12 in ${loadmodel.name}`);
+    }
+    const count = filelen / 12;
+    loadmodel.vertexes.length = 0;
+    for (let i = 0; i < count; i++) {
+      loadmodel.vertexes[i] = new Vector(
+        view.getFloat32(fileofs, true),
+        view.getFloat32(fileofs + 4, true),
+        view.getFloat32(fileofs + 8, true),
+      );
+      fileofs += 12;
+    }
+    loadmodel.bspxoffset = Math.max(loadmodel.bspxoffset, fileofs);
+  }
+
+  /**
+   * Load edges from BSP lump.
+   */
+  #loadEdges(loadmodel: BrushModel, buf: ArrayBuffer): void {
+    const view = new DataView(buf);
+    const lump = BSP29Loader.#lump;
+    let fileofs = view.getUint32((lump.edges << 3) + 4, true);
+    const filelen = view.getUint32((lump.edges << 3) + 8, true);
+    if ((filelen & 3) !== 0) {
+      throw new CorruptedResourceError(loadmodel.name, 'BSP29Loader: edges lump size is not a multiple of 4');
+    }
+    const count = filelen >> 2;
+    loadmodel.edges.length = 0;
+    for (let i = 0; i < count; i++) {
+      loadmodel.edges[i] = [view.getUint16(fileofs, true), view.getUint16(fileofs + 2, true)];
+      fileofs += 4;
+    }
+    loadmodel.bspxoffset = Math.max(loadmodel.bspxoffset, fileofs);
+  }
+
+  /**
+   * Load surface edges from BSP lump (indices into edge array, negative = reversed).
+   */
+  #loadSurfedges(loadmodel: BrushModel, buf: ArrayBuffer): void {
+    const view = new DataView(buf);
+    const lump = BSP29Loader.#lump;
+    const fileofs = view.getUint32((lump.surfedges << 3) + 4, true);
+    const filelen = view.getUint32((lump.surfedges << 3) + 8, true);
+    const count = filelen >> 2;
+    loadmodel.surfedges.length = 0;
+    for (let i = 0; i < count; i++) {
+      loadmodel.surfedges[i] = view.getInt32(fileofs + (i << 2), true);
+    }
+    loadmodel.bspxoffset = Math.max(loadmodel.bspxoffset, fileofs + filelen);
+  }
+
+  /**
+   * Load planes from BSP lump.
+   */
+  #loadPlanes(loadmodel: BrushModel, buf: ArrayBuffer): void {
+    const view = new DataView(buf);
+    const lump = BSP29Loader.#lump;
+    let fileofs = view.getUint32((lump.planes << 3) + 4, true);
+    const filelen = view.getUint32((lump.planes << 3) + 8, true);
+    if ((filelen % 20) !== 0) {
+      throw new Error(`BSP29Loader: planes lump size is not a multiple of 20 in ${loadmodel.name}`);
+    }
+    const count = filelen / 20;
+    loadmodel.planes.length = 0;
+    for (let i = 0; i < count; i++) {
+      const normal = new Vector(
+        view.getFloat32(fileofs, true),
+        view.getFloat32(fileofs + 4, true),
+        view.getFloat32(fileofs + 8, true),
+      );
+      const dist = view.getFloat32(fileofs + 12, true);
+      const out = new Plane(normal, dist);
+      out.type = view.getUint32(fileofs + 16, true);
+      if (out.normal[0] < 0) { out.signbits |= 1; }
+      if (out.normal[1] < 0) { out.signbits |= 2; }
+      if (out.normal[2] < 0) { out.signbits |= 4; }
+      loadmodel.planes[i] = out;
+      fileofs += 20;
+    }
+    loadmodel.bspxoffset = Math.max(loadmodel.bspxoffset, fileofs);
+  }
+
+  /**
+   * Load texture coordinate information from BSP lump.
+   */
+  #loadTexinfo(loadmodel: BrushModel, buf: ArrayBuffer): void {
+    const view = new DataView(buf);
+    const lump = BSP29Loader.#lump;
+    let fileofs = view.getUint32((lump.texinfo << 3) + 4, true);
+    const filelen = view.getUint32((lump.texinfo << 3) + 8, true);
+    if ((filelen % 40) !== 0) {
+      throw new Error(`BSP29Loader: texinfo lump size is not a multiple of 40 in ${loadmodel.name}`);
+    }
+    const count = filelen / 40;
+    loadmodel.texinfo.length = 0;
+    for (let i = 0; i < count; i++) {
+      const out = {
+        vecs: [
+          [view.getFloat32(fileofs, true), view.getFloat32(fileofs + 4, true), view.getFloat32(fileofs + 8, true), view.getFloat32(fileofs + 12, true)],
+          [view.getFloat32(fileofs + 16, true), view.getFloat32(fileofs + 20, true), view.getFloat32(fileofs + 24, true), view.getFloat32(fileofs + 28, true)],
+        ],
+        texture: view.getUint32(fileofs + 32, true),
+        flags: view.getUint32(fileofs + 36, true),
+      };
+      if (out.texture >= loadmodel.textures.length) {
+        out.texture = loadmodel.textures.length - 1;
+        out.flags = 0;
+      }
+      loadmodel.texinfo[i] = out;
+      fileofs += 40;
+    }
+    loadmodel.bspxoffset = Math.max(loadmodel.bspxoffset, fileofs);
+  }
+
+  /**
+   * Load faces (surfaces) from BSP lump and derive oriented face normals.
+   */
+  protected _loadFaces(loadmodel: BrushModel, buf: ArrayBuffer): void {
+    const view = new DataView(buf);
+    const lump = BSP29Loader.#lump;
+    let fileofs = view.getUint32((lump.faces << 3) + 4, true);
+    const filelen = view.getUint32((lump.faces << 3) + 8, true);
+    if ((filelen % 20) !== 0) {
+      throw new CorruptedResourceError(loadmodel.name, 'BSP29Loader: faces lump size is not a multiple of 20');
+    }
+
+    const lmshift = loadmodel.worldspawnInfo._lightmap_scale ? Math.log2(parseInt(loadmodel.worldspawnInfo._lightmap_scale)) : 4;
+    const count = filelen / 20;
+    loadmodel.firstface = 0;
+    loadmodel.numfaces = count;
+    loadmodel.faces.length = 0;
+
+    for (let i = 0; i < count; i++) {
+      const styles = new Uint8Array(buf, fileofs + 12, 4);
+      const face = Object.assign(new Face(), {
+        plane: loadmodel.planes[view.getUint16(fileofs, true)],
+        planeBack: view.getInt16(fileofs + 2, true) !== 0,
+        firstedge: view.getInt32(fileofs + 4, true),
+        numedges: view.getUint16(fileofs + 8, true),
+        texinfo: view.getUint16(fileofs + 10, true),
+        styles: [],
+        lightofs: view.getInt32(fileofs + 16, true),
+        lmshift,
+      });
+
+      for (let j = 0; j < 4; j++) {
+        if (styles[j] !== 255) {
+          face.styles[j] = styles[j];
+        }
+      }
+
+      const mins = [Infinity, Infinity];
+      const maxs = [-Infinity, -Infinity];
+      const tex = loadmodel.texinfo[face.texinfo];
+      face.texture = tex.texture;
+
+      for (let j = 0; j < face.numedges; j++) {
+        const e = loadmodel.surfedges[face.firstedge + j];
+        const v = e >= 0
+          ? loadmodel.vertexes[loadmodel.edges[e][0]]
+          : loadmodel.vertexes[loadmodel.edges[-e][1]];
+
+        const val0 = v.dot(new Vector(...tex.vecs[0])) + tex.vecs[0][3];
+        const val1 = v.dot(new Vector(...tex.vecs[1])) + tex.vecs[1][3];
+
+        if (val0 < mins[0]) {
+          mins[0] = val0;
+        }
+
+        if (val0 > maxs[0]) {
+          maxs[0] = val0;
+        }
+
+        if (val1 < mins[1]) {
+          mins[1] = val1;
+        }
+
+        if (val1 > maxs[1]) {
+          maxs[1] = val1;
+        }
+      }
+
+      const lmscale = 1 << face.lmshift;
+      face.texturemins = [Math.floor(mins[0] / lmscale) * lmscale, Math.floor(mins[1] / lmscale) * lmscale];
+      face.extents = [Math.ceil(maxs[0] / lmscale) * lmscale - face.texturemins[0], Math.ceil(maxs[1] / lmscale) * lmscale - face.texturemins[1]];
+
+      if (loadmodel.textures[tex.texture].flags & materialFlags.MF_TURBULENT) {
+        face.turbulent = true;
+      } else if (loadmodel.textures[tex.texture].flags & materialFlags.MF_SKY) {
+        face.sky = true;
+      }
+
+      face.normal.set(face.plane.normal);
+      if (face.planeBack) {
+        face.normal.multiply(-1.0);
+      }
+
+      loadmodel.faces[i] = face;
+      fileofs += 20;
+    }
+    loadmodel.bspxoffset = Math.max(loadmodel.bspxoffset, fileofs);
+  }
+
+  /**
+   * Recursively set parent references for BSP tree nodes.
+   */
+  #setParent(node: Node, parent: Node | null): void {
+    node.parent = parent;
+
+    if (node.contents < 0) {
+      return;
+    }
+
+    this.#setParent(node.children[0] as Node, node);
+    this.#setParent(node.children[1] as Node, node);
+  }
+
+  /**
+   * Load BSP tree nodes from BSP lump.
+   */
+  protected _loadNodes(loadmodel: BrushModel, buf: ArrayBuffer): void {
+    const view = new DataView(buf);
+    const lump = BSP29Loader.#lump;
+    let fileofs = view.getUint32((lump.nodes << 3) + 4, true);
+    const filelen = view.getUint32((lump.nodes << 3) + 8, true);
+
+    if ((filelen === 0) || ((filelen % 24) !== 0)) {
+      throw new Error(`BSP29Loader: nodes lump size is invalid in ${loadmodel.name}`);
+    }
+
+    const count = filelen / 24;
+    loadmodel.nodes.length = 0;
+
+    for (let i = 0; i < count; i++) {
+      loadmodel.nodes[i] = Object.assign(new Node(loadmodel), {
+        num: i,
+        planenum: view.getUint32(fileofs, true),
+        children: [view.getInt16(fileofs + 4, true), view.getInt16(fileofs + 6, true)],
+        mins: new Vector(view.getInt16(fileofs + 8, true), view.getInt16(fileofs + 10, true), view.getInt16(fileofs + 12, true)),
+        maxs: new Vector(view.getInt16(fileofs + 14, true), view.getInt16(fileofs + 16, true), view.getInt16(fileofs + 18, true)),
+        firstface: view.getUint16(fileofs + 20, true),
+        numfaces: view.getUint16(fileofs + 22, true),
+      });
+      loadmodel.nodes[i].baseMins = loadmodel.nodes[i].mins.copy();
+      loadmodel.nodes[i].baseMaxs = loadmodel.nodes[i].maxs.copy();
+      fileofs += 24;
+    }
+
+    for (let i = 0; i < count; i++) {
+      const out = loadmodel.nodes[i];
+      out.plane = loadmodel.planes[out.planenum];
+      // At this point children contain indices, we convert them to Node references
+      const child0Idx = out.children[0] as number;
+      const child1Idx = out.children[1] as number;
+      out.children[0] = child0Idx >= 0
+        ? loadmodel.nodes[child0Idx]
+        : loadmodel.leafs[-1 - child0Idx];
+      out.children[1] = child1Idx >= 0
+        ? loadmodel.nodes[child1Idx]
+        : loadmodel.leafs[-1 - child1Idx];
+    }
+
+    this.#setParent(loadmodel.nodes[0], null);
+    loadmodel.bspxoffset = Math.max(loadmodel.bspxoffset, fileofs);
+  }
+
+  /**
+   * Load BSP leaf nodes from BSP lump.
+   */
+  protected _loadLeafs(loadmodel: BrushModel, buf: ArrayBuffer): void {
+    const view = new DataView(buf);
+    const lump = BSP29Loader.#lump;
+    let fileofs = view.getUint32((lump.leafs << 3) + 4, true);
+    const filelen = view.getUint32((lump.leafs << 3) + 8, true);
+    if ((filelen % 28) !== 0) {
+      throw new Error(`BSP29Loader: leafs lump size is not a multiple of 28 in ${loadmodel.name}`);
+    }
+    const count = filelen / 28;
+    loadmodel.leafs.length = count;
+
+    for (let i = 0; i < count; i++) {
+      loadmodel.leafs[i] = Object.assign(new Node(loadmodel), {
+        num: i,
+        contents: view.getInt32(fileofs, true),
+        visofs: view.getInt32(fileofs + 4, true),
+        cluster: i > 0 ? i - 1 : -1,
+        mins: new Vector(view.getInt16(fileofs + 8, true), view.getInt16(fileofs + 10, true), view.getInt16(fileofs + 12, true)),
+        maxs: new Vector(view.getInt16(fileofs + 14, true), view.getInt16(fileofs + 16, true), view.getInt16(fileofs + 18, true)),
+        firstmarksurface: view.getUint16(fileofs + 20, true),
+        nummarksurfaces: view.getUint16(fileofs + 22, true),
+        ambient_level: [
+          view.getUint8(fileofs + 24),
+          view.getUint8(fileofs + 25),
+          view.getUint8(fileofs + 26),
+          view.getUint8(fileofs + 27),
+        ],
+      });
+      loadmodel.leafs[i].baseMins = loadmodel.leafs[i].mins.copy();
+      loadmodel.leafs[i].baseMaxs = loadmodel.leafs[i].maxs.copy();
+      fileofs += 28;
+    }
+    loadmodel.bspxoffset = Math.max(loadmodel.bspxoffset, fileofs);
+  }
+
+  /**
+   * Load collision clipnodes and initialize physics hulls.
+   */
+  protected _loadClipnodes(loadmodel: BrushModel, buf: ArrayBuffer): void {
+    const view = new DataView(buf);
+    const lump = BSP29Loader.#lump;
+    let fileofs = view.getUint32((lump.clipnodes << 3) + 4, true);
+    const filelen = view.getUint32((lump.clipnodes << 3) + 8, true);
+    const count = filelen >> 3;
+    loadmodel.clipnodes.length = 0;
+
+    loadmodel.hulls.length = 0;
+    loadmodel.hulls[1] = {
+      clipnodes: loadmodel.clipnodes,
+      firstclipnode: 0,
+      lastclipnode: count - 1,
+      planes: loadmodel.planes,
+      clip_mins: new Vector(-16.0, -16.0, -24.0),
+      clip_maxs: new Vector(16.0, 16.0, 32.0),
+    };
+    loadmodel.hulls[2] = {
+      clipnodes: loadmodel.clipnodes,
+      firstclipnode: 0,
+      lastclipnode: count - 1,
+      planes: loadmodel.planes,
+      clip_mins: new Vector(-32.0, -32.0, -24.0),
+      clip_maxs: new Vector(32.0, 32.0, 64.0),
+    };
+
+    for (let i = 0; i < count; i++) {
+      loadmodel.clipnodes[i] = {
+        planenum: view.getUint32(fileofs, true),
+        children: [view.getInt16(fileofs + 4, true), view.getInt16(fileofs + 6, true)],
+      };
+      fileofs += 8;
+    }
+    loadmodel.bspxoffset = Math.max(loadmodel.bspxoffset, fileofs);
+  }
+
+  /**
+   * Create hull0 (point hull) from BSP nodes for collision detection.
+   */
+  #makeHull0(loadmodel: BrushModel): void {
+    const clipnodes = [];
+    const hull = {
+      clipnodes: clipnodes,
+      lastclipnode: loadmodel.nodes.length - 1,
+      planes: loadmodel.planes,
+      clip_mins: new Vector(),
+      clip_maxs: new Vector(),
+    };
+
+    for (let i = 0; i < loadmodel.nodes.length; i++) {
+      const node = loadmodel.nodes[i];
+      const out = { planenum: node.planenum, children: [] };
+      const child0 = node.children[0] as Node;
+      const child1 = node.children[1] as Node;
+      out.children[0] = child0.contents < 0 ? child0.contents : child0.num;
+      out.children[1] = child1.contents < 0 ? child1.contents : child1.num;
+      clipnodes[i] = out;
+    }
+    loadmodel.hulls[0] = hull;
+  }
+
+  /**
+   * Build a reachability mask for the clipnodes owned by a model headnode.
+   * Legacy BSP29 clipnode arrays are shared across worldspawn and inline
+   * submodels, so traces must stay within the owning subtree.
+   * @returns A mask of reachable clipnodes, or null when the requested root is invalid.
+   */
+  _buildAllowedClipnodeMask(clipnodes: Clipnode[], firstclipnode: number): Uint8Array | null {
+    if (!clipnodes || clipnodes.length === 0 || firstclipnode < 0 || firstclipnode >= clipnodes.length) {
+      return null;
+    }
+
+    const allowedClipNodes = new Uint8Array(clipnodes.length);
+    const stack = [firstclipnode];
+
+    while (stack.length > 0) {
+      const nodeIndex = stack.pop()!;
+
+      if (nodeIndex < 0 || nodeIndex >= clipnodes.length || allowedClipNodes[nodeIndex] === 1) {
+        continue;
+      }
+
+      allowedClipNodes[nodeIndex] = 1;
+
+      const node = clipnodes[nodeIndex];
+      if (!node) {
+        continue;
+      }
+
+      for (const childIndex of node.children) {
+        if (childIndex >= 0) {
+          stack.push(childIndex);
+        }
+      }
+    }
+
+    return allowedClipNodes;
+  }
+
+  /**
+   * Attach the owning subtree mask to a legacy hull.
+   */
+  #assignAllowedClipnodeMask(hull?: AllowedClipnodeHull): void {
+    if (!hull) {
+      return;
+    }
+
+    hull.allowedClipNodes = this._buildAllowedClipnodeMask(hull.clipnodes, hull.firstclipnode);
+  }
+
+  /**
+   * Load marksurfaces (face indices visible from each leaf).
+   */
+  protected _loadMarksurfaces(loadmodel: BrushModel, buf: ArrayBuffer): void {
+    const view = new DataView(buf);
+    const lump = BSP29Loader.#lump;
+    const fileofs = view.getUint32((lump.marksurfaces << 3) + 4, true);
+    const filelen = view.getUint32((lump.marksurfaces << 3) + 8, true);
+    const count = filelen >> 1;
+    loadmodel.marksurfaces.length = 0;
+
+    for (let i = 0; i < count; i++) {
+      const j = view.getUint16(fileofs + (i << 1), true);
+      if (j > loadmodel.faces.length) {
+        throw new Error('BSP29Loader: bad surface number in marksurfaces');
+      }
+      loadmodel.marksurfaces[i] = j;
+    }
+    loadmodel.bspxoffset = Math.max(loadmodel.bspxoffset, fileofs + filelen);
+  }
+
+  /**
+   * Load submodels (brush models for doors, lifts, etc.).
+   */
+  #loadSubmodels(loadmodel: BrushModel, buf: ArrayBuffer): void {
+    const view = new DataView(buf);
+    const lump = BSP29Loader.#lump;
+    let fileofs = view.getUint32((lump.models << 3) + 4, true);
+    const filelen = view.getUint32((lump.models << 3) + 8, true);
+    const count = filelen >> 6;
+    if (count === 0) {
+      throw new Error(`BSP29Loader: no submodels in ${loadmodel.name}`);
+    }
+    loadmodel.submodels.length = 0;
+
+    loadmodel.mins.setTo(view.getFloat32(fileofs, true) - 1.0, view.getFloat32(fileofs + 4, true) - 1.0, view.getFloat32(fileofs + 8, true) - 1.0);
+    loadmodel.maxs.setTo(view.getFloat32(fileofs + 12, true) + 1.0, view.getFloat32(fileofs + 16, true) + 1.0, view.getFloat32(fileofs + 20, true) + 1.0);
+    loadmodel.hulls[0].firstclipnode = view.getUint32(fileofs + 36, true);
+    loadmodel.hulls[1].firstclipnode = view.getUint32(fileofs + 40, true);
+    loadmodel.hulls[2].firstclipnode = view.getUint32(fileofs + 44, true);
+    this.#assignAllowedClipnodeMask(loadmodel.hulls[0]);
+    this.#assignAllowedClipnodeMask(loadmodel.hulls[1]);
+    this.#assignAllowedClipnodeMask(loadmodel.hulls[2]);
+    fileofs += 64;
+
+    const clipnodes = loadmodel.hulls[0].clipnodes;
+    for (let i = 1; i < count; i++) {
+      const out = new BrushModel('*' + i);
+      out.submodel = true;
+      out.mins.setTo(view.getFloat32(fileofs, true) - 1.0, view.getFloat32(fileofs + 4, true) - 1.0, view.getFloat32(fileofs + 8, true) - 1.0);
+      out.maxs.setTo(view.getFloat32(fileofs + 12, true) + 1.0, view.getFloat32(fileofs + 16, true) + 1.0, view.getFloat32(fileofs + 20, true) + 1.0);
+      out.origin.setTo(view.getFloat32(fileofs + 24, true), view.getFloat32(fileofs + 28, true), view.getFloat32(fileofs + 32, true));
+      out.hulls = [
+        {
+          clipnodes: clipnodes,
+          firstclipnode: view.getUint32(fileofs + 36, true),
+          lastclipnode: loadmodel.nodes.length - 1,
+          planes: loadmodel.planes,
+          clip_mins: new Vector(),
+          clip_maxs: new Vector(),
+        },
+        {
+          clipnodes: loadmodel.clipnodes,
+          firstclipnode: view.getUint32(fileofs + 40, true),
+          lastclipnode: loadmodel.clipnodes.length - 1,
+          planes: loadmodel.planes,
+          clip_mins: new Vector(-16.0, -16.0, -24.0),
+          clip_maxs: new Vector(16.0, 16.0, 32.0),
+        },
+        {
+          clipnodes: loadmodel.clipnodes,
+          firstclipnode: view.getUint32(fileofs + 44, true),
+          lastclipnode: loadmodel.clipnodes.length - 1,
+          planes: loadmodel.planes,
+          clip_mins: new Vector(-32.0, -32.0, -24.0),
+          clip_maxs: new Vector(32.0, 32.0, 64.0),
+        },
+      ];
+      this.#assignAllowedClipnodeMask(out.hulls[0]);
+      this.#assignAllowedClipnodeMask(out.hulls[1]);
+      this.#assignAllowedClipnodeMask(out.hulls[2]);
+      out.vertexes = loadmodel.vertexes;
+      out.edges = loadmodel.edges;
+      out.surfedges = loadmodel.surfedges;
+      out.nodes = loadmodel.nodes;
+      out.leafs = loadmodel.leafs;
+      out.texinfo = loadmodel.texinfo;
+      out.textures = loadmodel.textures;
+      out.marksurfaces = loadmodel.marksurfaces;
+      out.lightdata = loadmodel.lightdata;
+      out.lightdata_rgb = loadmodel.lightdata_rgb;
+      out.deluxemap = loadmodel.deluxemap;
+      out.faces = loadmodel.faces;
+      out.visdata = loadmodel.visdata;
+      out.numclusters = loadmodel.numclusters;
+      out.clusterPvsOffsets = loadmodel.clusterPvsOffsets;
+      out.phsdata = loadmodel.phsdata;
+      out.clusterPhsOffsets = loadmodel.clusterPhsOffsets;
+      out.firstface = view.getUint32(fileofs + 56, true);
+      out.numfaces = view.getUint32(fileofs + 60, true);
+
+      // Propagate brush data from world model to submodels (shared arrays)
+      if (loadmodel.hasBrushData) {
+        out.brushes = loadmodel.brushes;
+        out.brushsides = loadmodel.brushsides;
+        out.leafbrushes = loadmodel.leafbrushes;
+        out.planes = loadmodel.planes;
+
+        // Set per-submodel brush range from BRUSHLIST data
+        const brushRange = loadmodel._brushRanges?.get(i);
+        if (brushRange) {
+          out.firstBrush = brushRange.firstBrush;
+          out.numBrushes = brushRange.numBrushes;
+        }
+      }
+
+      out.worldspawnInfo = loadmodel.worldspawnInfo;
+
+      loadmodel.submodels[i - 1] = out;
+      fileofs += 64;
+
+      for (let j = 0; j < out.numfaces; j++) {
+        out.faces[out.firstface + j].submodel = true;
+      }
+    }
+    loadmodel.bspxoffset = Math.max(loadmodel.bspxoffset, fileofs);
+  }
+
+  /**
+   * Load BSPX extended format data (optional extra lumps).
+   */
+  #loadBSPX(loadmodel: BrushModel, buffer: ArrayBuffer): void {
+    loadmodel.bspxoffset = (loadmodel.bspxoffset + 3) & ~3;
+    if (loadmodel.bspxoffset >= buffer.byteLength) {
+      Con.DPrint('BSP29Loader: no BSPX data found\n');
+      return;
+    }
+
+    const view = new DataView(buffer);
+    const magic = view.getUint32(loadmodel.bspxoffset, true);
+    console.assert(magic === 0x58505342, 'BSP29Loader: bad BSPX magic');
+
+    const numlumps = view.getUint32(loadmodel.bspxoffset + 4, true);
+    Con.DPrint(`BSP29Loader: found BSPX data with ${numlumps} lumps\n`);
+
+    const bspxLumps: BSPXLumps = {};
+    for (let i = 0, pointer = loadmodel.bspxoffset + 8; i < numlumps; i++, pointer += 32) {
+      const name = Q.memstr(new Uint8Array(buffer, pointer, 24));
+      const fileofs = view.getUint32(pointer + 24, true);
+      const filelen = view.getUint32(pointer + 28, true);
+      bspxLumps[name] = { fileofs, filelen };
+    }
+    loadmodel.bspxlumps = bspxLumps;
+  }
+
+  /**
+   * Load BSPX BRUSHLIST lump if available.
+   * Parses per-model brush data from the BSPX extension, creates Brush and
+   * BrushSide objects, generates the 6 axial planes that the spec says must
+   * be inferred from each brush's mins/maxs, and inserts brushes into BSP
+   * leaf nodes so that BrushTrace can find them during collision testing.
+   */
+  _loadBrushList(loadmodel: BrushModel, buf: ArrayBuffer): void {
+    if (!loadmodel.bspxlumps || !loadmodel.bspxlumps['BRUSHLIST']) {
+      return;
+    }
+
+    const { fileofs, filelen } = loadmodel.bspxlumps['BRUSHLIST'];
+
+    if (filelen === 0) {
+      return;
+    }
+
+    const view = new DataView(buf);
+    let offset = fileofs;
+    const endOffset = fileofs + filelen;
+
+    const allBrushes: Brush[] = [];
+    const allBrushSides: BrushSide[] = [];
+    const allBrushPlanes: Plane[] = [];
+
+    /**
+     * Create a Plane with type and signbits set.
+     * type: 0=X, 1=Y, 2=Z for axial, 3/4/5 for non-axial dominant axis.
+     * @returns A plane with precomputed type and sign bits.
+     */
+    const makePlane = (normal: Vector, dist: number): Plane => {
+      const p = new Plane(normal, dist);
+      const ax = Math.abs(normal[0]);
+      const ay = Math.abs(normal[1]);
+      const az = Math.abs(normal[2]);
+      if (ax === 1 && ay === 0 && az === 0) {
+        p.type = 0;
+      } else if (ax === 0 && ay === 1 && az === 0) {
+        p.type = 1;
+      } else if (ax === 0 && ay === 0 && az === 1) {
+        p.type = 2;
+      } else if (ax >= ay && ax >= az) {
+        p.type = 3;
+      } else if (ay >= ax && ay >= az) {
+        p.type = 4;
+      } else {
+        p.type = 5;
+      }
+      if (normal[0] < 0) { p.signbits |= 1; }
+      if (normal[1] < 0) { p.signbits |= 2; }
+      if (normal[2] < 0) { p.signbits |= 4; }
+      return p;
+    };
+
+    // Track per-model brush ranges for submodel assignment
+    const modelBrushRanges = new Map<number, { firstBrush: number; numBrushes: number }>();
+
+    while (offset + 16 <= endOffset) {
+      const ver = view.getUint32(offset, true);
+      offset += 4;
+
+      if (ver !== 1) {
+        Con.Print(`BSP29Loader: unsupported BRUSHLIST version ${ver}\n`);
+        return;
+      }
+
+      const modelnum = view.getUint32(offset, true);
+      offset += 4;
+      const numbrushes = view.getUint32(offset, true);
+      offset += 4;
+      const numplanes = view.getUint32(offset, true);
+      offset += 4;
+
+      const firstBrush = allBrushes.length;
+
+      let planesRead = 0;
+
+      for (let b = 0; b < numbrushes; b++) {
+        if (offset + 28 > endOffset) {
+          Con.Print('BSP29Loader: BRUSHLIST lump truncated at brush header\n');
+          return;
+        }
+
+        // Parse brush header: vec3 mins (12) + vec3 maxs (12) + short contents (2) + ushort numplanes (2) = 28 bytes
+        // Actually: vec_t mins is 3 floats, vec_t maxs is 3 floats
+        const bmins = new Vector(
+          view.getFloat32(offset, true),
+          view.getFloat32(offset + 4, true),
+          view.getFloat32(offset + 8, true),
+        );
+        offset += 12;
+
+        const bmaxs = new Vector(
+          view.getFloat32(offset, true),
+          view.getFloat32(offset + 4, true),
+          view.getFloat32(offset + 8, true),
+        );
+        offset += 12;
+
+        const brushContents = view.getInt16(offset, true);
+        offset += 2;
+        const brushNumPlanes = view.getUint16(offset, true);
+        offset += 2;
+
+        const firstside = allBrushSides.length;
+
+        // Generate the 6 axial planes inferred from mins/maxs.
+        // Per the BSPX spec: "Axial planes MUST NOT be written - they will be
+        // inferred from the brush's mins+maxs."
+        // +X, -X, +Y, -Y, +Z, -Z
+        const axialDefs: [Vector, number][] = [
+          [new Vector(1, 0, 0), bmaxs[0]],
+          [new Vector(-1, 0, 0), -bmins[0]],
+          [new Vector(0, 1, 0), bmaxs[1]],
+          [new Vector(0, -1, 0), -bmins[1]],
+          [new Vector(0, 0, 1), bmaxs[2]],
+          [new Vector(0, 0, -1), -bmins[2]],
+        ];
+
+        for (const [normal, dist] of axialDefs) {
+          const planeIdx = allBrushPlanes.length;
+          allBrushPlanes.push(makePlane(normal, dist));
+
+          const side = new BrushSide(loadmodel);
+          side.planenum = planeIdx;
+          allBrushSides.push(side);
+        }
+
+        // Parse the non-axial planes from the lump
+        if (offset + brushNumPlanes * 16 > endOffset) {
+          Con.Print('BSP29Loader: BRUSHLIST lump truncated at brush planes\n');
+          return;
+        }
+
+        for (let p = 0; p < brushNumPlanes; p++) {
+          const normal = new Vector(
+            view.getFloat32(offset, true),
+            view.getFloat32(offset + 4, true),
+            view.getFloat32(offset + 8, true),
+          );
+          const dist = view.getFloat32(offset + 12, true);
+          offset += 16;
+
+          const planeIdx = allBrushPlanes.length;
+          allBrushPlanes.push(makePlane(normal, dist));
+
+          const side = new BrushSide(loadmodel);
+          side.planenum = planeIdx;
+          allBrushSides.push(side);
+        }
+
+        planesRead += brushNumPlanes;
+
+        const brush = new Brush(loadmodel);
+        brush.firstside = firstside;
+        brush.numsides = 6 + brushNumPlanes; // axial + explicit
+        brush.contents = brushContents;
+        brush.mins = bmins;
+        brush.maxs = bmaxs;
+        allBrushes.push(brush);
+      }
+
+      if (planesRead !== numplanes) {
+        Con.Print(`BSP29Loader: BRUSHLIST plane count mismatch for model ${modelnum}: expected ${numplanes}, got ${planesRead}\n`);
+      }
+
+      modelBrushRanges.set(modelnum, { firstBrush, numBrushes: numbrushes });
+    }
+
+    if (allBrushes.length === 0) {
+      return;
+    }
+
+    // Assign brush data to the world model
+    loadmodel.brushes = allBrushes;
+    loadmodel.brushsides = allBrushSides;
+
+    // Use allBrushPlanes as a separate plane array for brush collision.
+    // These are stored alongside BSP planes but indexed separately by brushsides.
+    // We store them on the world model where BrushTrace can reference them.
+    loadmodel.planes = loadmodel.planes.concat(allBrushPlanes);
+
+    // Remap brushside plane indices to account for the offset into the combined array
+    const planeOffset = loadmodel.planes.length - allBrushPlanes.length;
+    for (const side of allBrushSides) {
+      side.planenum += planeOffset;
+    }
+
+    // Insert brushes into BSP leaf nodes by walking the node tree.
+    // Each model's brushes are only inserted under that model's headnode,
+    // so that world traces don't collide with submodel brushes (func_plat,
+    // trigger_*, func_door, etc.) and vice versa.
+
+    const leafIndexMap = new Map<Node, number>();
+    for (let i = 0; i < loadmodel.leafs.length; i++) {
+      leafIndexMap.set(loadmodel.leafs[i], i);
+    }
+
+    const leafBrushLists: number[][] = new Array(loadmodel.leafs.length);
+    for (let i = 0; i < loadmodel.leafs.length; i++) {
+      leafBrushLists[i] = [];
+    }
+
+    /** Recursively insert a brush into BSP leaf nodes whose bounds overlap. */
+    const insertBrushRecursive = (node: Node, brushIdx: number, brush: Brush): void => {
+      // Leaf node: add the brush here
+      if (node.contents < 0) {
+        const leafIndex = leafIndexMap.get(node);
+        if (leafIndex !== undefined) {
+          leafBrushLists[leafIndex].push(brushIdx);
+        }
+        return;
+      }
+
+      // Internal node: test brush AABB against splitting plane
+      const plane = node.plane;
+      let d1, d2;
+
+      if (plane.type < 3) {
+        // Axial plane: fast path
+        d1 = brush.maxs[plane.type] - plane.dist;
+        d2 = brush.mins[plane.type] - plane.dist;
+      } else {
+        // General plane: compute support points using worst-case AABB corners
+        const nx = plane.normal[0];
+        const ny = plane.normal[1];
+        const nz = plane.normal[2];
+
+        d1 = nx * (nx >= 0 ? brush.maxs[0] : brush.mins[0])
+           + ny * (ny >= 0 ? brush.maxs[1] : brush.mins[1])
+           + nz * (nz >= 0 ? brush.maxs[2] : brush.mins[2])
+           - plane.dist;
+        d2 = nx * (nx >= 0 ? brush.mins[0] : brush.maxs[0])
+           + ny * (ny >= 0 ? brush.mins[1] : brush.maxs[1])
+           + nz * (nz >= 0 ? brush.mins[2] : brush.maxs[2])
+           - plane.dist;
+      }
+
+      if (d1 >= 0) {
+        insertBrushRecursive(node.children[0], brushIdx, brush);
+      }
+      // Brushes that touch the split plane on their back-most extent must be
+      // inserted into both leaves. Otherwise exact-boundary player positions
+      // can miss a clip brush in one leaf and hit it only after a tiny move
+      // into the adjacent leaf, producing false stuck/allsolid behavior.
+      if (d2 <= 0) {
+        insertBrushRecursive(node.children[1], brushIdx, brush);
+      }
+    };
+
+    // Only insert world (model 0) brushes into leaf nodes.
+    // Submodel brushes must NOT be inserted into the BSP leaf-brush index
+    // because Q1 BSP leaf nodes are shared between the world tree and
+    // submodel subtrees — inserting submodel brushes would make them
+    // appear in world traces, causing phantom collisions with triggers,
+    // removed entities (func_fog), etc.
+    // Submodel collision is handled by brute-force testing against the
+    // submodel's brush range (see BrushTrace.boxTraceModel).
+    const worldRange = modelBrushRanges.get(0);
+    if (worldRange) {
+      const rootNode = loadmodel.nodes[0];
+      if (rootNode) {
+        for (let brushIdx = worldRange.firstBrush; brushIdx < worldRange.firstBrush + worldRange.numBrushes; brushIdx++) {
+          insertBrushRecursive(rootNode, brushIdx, allBrushes[brushIdx]);
+        }
+      }
+    }
+
+    // Store brush ranges on the world model for submodel propagation
+    loadmodel._brushRanges = modelBrushRanges;
+    if (worldRange) {
+      loadmodel.firstBrush = worldRange.firstBrush;
+      loadmodel.numBrushes = worldRange.numBrushes;
+    }
+
+    // Build the flat leafbrushes array from per-leaf lists
+    const leafbrushes: number[] = [];
+
+    for (let i = 0; i < loadmodel.leafs.length; i++) {
+      const leaf = loadmodel.leafs[i];
+      const list = leafBrushLists[i];
+      leaf.firstleafbrush = leafbrushes.length;
+      leaf.numleafbrushes = list.length;
+      for (const brushIdx of list) {
+        leafbrushes.push(brushIdx);
+      }
+    }
+
+    loadmodel.leafbrushes = leafbrushes;
+
+    Con.DPrint(`BSP29Loader: loaded BRUSHLIST with ${allBrushes.length} brushes, ${allBrushSides.length} sides, ${leafbrushes.length} leaf-brush refs\n`);
+  }
+
+  /**
+   * Load RGB colored lighting from BSPX lump if available.
+   */
+  #loadLightingRGB(loadmodel: BrushModel, buf: ArrayBuffer): void {
+    loadmodel.lightdata_rgb = null;
+
+    if (!loadmodel.bspxlumps || !loadmodel.bspxlumps['RGBLIGHTING']) {
+      return;
+    }
+
+    const { fileofs, filelen } = loadmodel.bspxlumps['RGBLIGHTING'];
+
+    if (filelen === 0) {
+      return;
+    }
+
+    loadmodel.lightdata_rgb = new Uint8Array(buf.slice(fileofs, fileofs + filelen));
+  }
+
+  /**
+   * Load external RGB lighting from .lit file if available.
+   */
+  async #loadExternalLighting(loadmodel: BrushModel, filename: string): Promise<void> {
+    const rgbFilename = filename.replace(/\.bsp$/i, '.lit');
+
+    const data = await COM.LoadFile(rgbFilename);
+
+    if (!data) {
+      Con.DPrint(`BSP29Loader: no external RGB lighting file found: ${rgbFilename}\n`);
+      return;
+    }
+
+    const dv = new DataView(data);
+
+    console.assert(dv.getUint32(0, true) === 0x54494C51, 'QLIT header');
+    console.assert(dv.getUint32(4, true) === 0x00000001, 'QLIT version 1');
+
+    loadmodel.lightdata_rgb = new Uint8Array(data.slice(8)); // Skip header
+  }
+
+  /**
+   * Load deluxemap (directional lighting normals) from BSPX lump if available.
+   */
+  #loadDeluxeMap(loadmodel: BrushModel, buf: ArrayBuffer): void {
+    loadmodel.deluxemap = null;
+
+    if (!loadmodel.bspxlumps || !loadmodel.bspxlumps['LIGHTINGDIR']) {
+      return;
+    }
+
+    const { fileofs, filelen } = loadmodel.bspxlumps['LIGHTINGDIR'];
+
+    if (filelen === 0) {
+      return;
+    }
+
+    loadmodel.deluxemap = new Uint8Array(buf.slice(fileofs, fileofs + filelen));
+  }
+
+  /**
+   * Load lightgrid octree from BSPX lump if available.
+   */
+  #loadLightgridOctree(loadmodel: BrushModel, buf: ArrayBuffer): void {
+    loadmodel.lightgrid = null;
+
+    if (!loadmodel.bspxlumps || !loadmodel.bspxlumps['LIGHTGRID_OCTREE']) {
+      return;
+    }
+
+    const { fileofs, filelen } = loadmodel.bspxlumps['LIGHTGRID_OCTREE'];
+
+    if (filelen === 0) {
+      return;
+    }
+
+    try {
+      const view = new DataView(buf);
+      let offset = fileofs;
+      const endOffset = fileofs + filelen;
+
+      // Minimum size check: vec3_t step (12) + ivec3_t size (12) + vec3_t mins (12) + byte numstyles (1) + uint32_t rootnode (4) + uint32_t numnodes (4) + uint32_t numleafs (4) = 49 bytes
+      if (filelen < 49) {
+        Con.DPrint('BSP29Loader: LIGHTGRID_OCTREE lump too small\n');
+        return;
+      }
+
+      // vec3_t step
+      const step = new Vector(
+        view.getFloat32(offset, true),
+        view.getFloat32(offset + 4, true),
+        view.getFloat32(offset + 8, true),
+      );
+      offset += 12;
+
+      // ivec3_t size
+      const size = [
+        view.getInt32(offset, true),
+        view.getInt32(offset + 4, true),
+        view.getInt32(offset + 8, true),
+      ];
+      offset += 12;
+
+      // vec3_t mins
+      const mins = new Vector(
+        view.getFloat32(offset, true),
+        view.getFloat32(offset + 4, true),
+        view.getFloat32(offset + 8, true),
+      );
+      offset += 12;
+
+      // byte numstyles (WARNING: misaligns the rest of the data)
+      const numstyles = view.getUint8(offset);
+      offset += 1;
+
+      // uint32_t rootnode
+      const rootnode = view.getUint32(offset, true);
+      offset += 4;
+
+      // uint32_t numnodes
+      const numnodes = view.getUint32(offset, true);
+      offset += 4;
+
+      // Check if we have enough data for nodes (each node is 44 bytes: 3*4 for mid + 8*4 for children)
+      if (offset + (numnodes * 44) > endOffset) {
+        Con.DPrint('BSP29Loader: LIGHTGRID_OCTREE nodes data truncated\n');
+        return;
+      }
+
+      // Parse nodes
+      const nodes = [];
+      for (let i = 0; i < numnodes; i++) {
+        const mid = [
+          view.getUint32(offset, true),
+          view.getUint32(offset + 4, true),
+          view.getUint32(offset + 8, true),
+        ];
+        offset += 12;
+
+        const child = [];
+        for (let j = 0; j < 8; j++) {
+          child[j] = view.getUint32(offset, true);
+          offset += 4;
+        }
+
+        nodes[i] = { mid, child };
+      }
+
+      // uint32_t numleafs
+      if (offset + 4 > endOffset) {
+        Con.DPrint('BSP29Loader: LIGHTGRID_OCTREE numleafs missing\n');
+        return;
+      }
+      const numleafs = view.getUint32(offset, true);
+      offset += 4;
+
+      // Parse leafs
+      const leafs = [];
+      for (let i = 0; i < numleafs; i++) {
+        // Check bounds for leaf header (mins + size = 24 bytes)
+        if (offset + 24 > endOffset) {
+          Con.DPrint(`BSP29Loader: LIGHTGRID_OCTREE leaf ${i} header truncated\n`);
+          return;
+        }
+
+        const leafMins = [
+          view.getInt32(offset, true),
+          view.getInt32(offset + 4, true),
+          view.getInt32(offset + 8, true),
+        ];
+        offset += 12;
+
+        const leafSize = [
+          view.getInt32(offset, true),
+          view.getInt32(offset + 4, true),
+          view.getInt32(offset + 8, true),
+        ];
+        offset += 12;
+
+        // Parse per-point data
+        const totalPoints = leafSize[0] * leafSize[1] * leafSize[2];
+        const points = [];
+
+        for (let p = 0; p < totalPoints; p++) {
+          // Check bounds for stylecount byte
+          if (offset >= endOffset) {
+            Con.DPrint(`BSP29Loader: LIGHTGRID_OCTREE leaf ${i} point ${p} truncated\n`);
+            return;
+          }
+
+          const stylecount = view.getUint8(offset);
+          offset += 1;
+
+          // Skip points with no data (stylecount = 0xff means missing)
+          if (stylecount === 0xff) {
+            points.push({ stylecount, styles: [] });
+            continue;
+          }
+
+          const styles = [];
+          for (let s = 0; s < stylecount; s++) {
+            // Check bounds for style data (1 byte stylenum + 3 bytes rgb = 4 bytes)
+            if (offset + 3 >= endOffset) {
+              Con.DPrint(`BSP29Loader: LIGHTGRID_OCTREE leaf ${i} point ${p} style ${s} truncated\n`);
+              return;
+            }
+
+            const stylenum = view.getUint8(offset);
+
+            offset += 1;
+
+            const rgb = [
+              view.getUint8(offset),
+              view.getUint8(offset + 1),
+              view.getUint8(offset + 2),
+            ];
+            offset += 3;
+
+            styles.push({ stylenum, rgb });
+          }
+
+          points.push({ stylecount, styles });
+        }
+
+        leafs.push({ mins: leafMins, size: leafSize, points });
+      }
+
+      loadmodel.lightgrid = {
+        step,
+        size,
+        mins,
+        numstyles,
+        rootnode,
+        nodes,
+        leafs,
+      };
+
+      Con.DPrint(`BSP29Loader: loaded LIGHTGRID_OCTREE with ${numnodes} nodes and ${numleafs} leafs\n`);
+    } catch (error) {
+      Con.DPrint(`BSP29Loader: error loading LIGHTGRID_OCTREE: ${error.message}\n`);
+      loadmodel.lightgrid = null;
+    }
+  }
+}
diff --git a/source/engine/common/model/loaders/BSP2Loader.mjs b/source/engine/common/model/loaders/BSP2Loader.mjs
index c8357b2a..ca543e10 100644
--- a/source/engine/common/model/loaders/BSP2Loader.mjs
+++ b/source/engine/common/model/loaders/BSP2Loader.mjs
@@ -1,8 +1,8 @@
 import Vector from '../../../../shared/Vector.ts';
 import { CorruptedResourceError } from '../../Errors.ts';
-import { BSP29Loader } from './BSP29Loader.mjs';
+import { BSP29Loader } from './BSP29Loader.ts';
 import { Face } from '../BaseModel.ts';
-import { BrushModel, Node } from '../BSP.mjs';
+import { BrushModel, Node } from '../BSP.ts';
 import { materialFlags } from '../../../client/renderer/Materials.mjs';
 
 /**
diff --git a/source/engine/common/model/loaders/BSP38Loader.mjs b/source/engine/common/model/loaders/BSP38Loader.mjs
index 2917307e..30089cb0 100644
--- a/source/engine/common/model/loaders/BSP38Loader.mjs
+++ b/source/engine/common/model/loaders/BSP38Loader.mjs
@@ -3,7 +3,7 @@ import Q from '../../../../shared/Q.ts';
 import Vector from '../../../../shared/Vector.ts';
 import { CRC16CCITT } from '../../CRC.ts';
 import { Plane } from '../BaseModel.ts';
-import { Brush, BrushModel, BrushSide, Node } from '../BSP.mjs';
+import { Brush, BrushModel, BrushSide, Node } from '../BSP.ts';
 import { ModelLoader } from '../ModelLoader.ts';
 
 /** @typedef {Record<number, DataView>} LumpViews */
diff --git a/source/engine/server/Edict.mjs b/source/engine/server/Edict.mjs
index 8dfe6f30..23db94c3 100644
--- a/source/engine/server/Edict.mjs
+++ b/source/engine/server/Edict.mjs
@@ -8,7 +8,7 @@ import Q from '../../shared/Q.ts';
 import { ConsoleCommand } from '../common/Cmd.ts';
 import { ClientEdict } from '../client/ClientEntities.mjs';
 import { OctreeNode } from '../../shared/Octree.ts';
-import { Visibility } from '../common/model/BSP.mjs';
+import { Visibility } from '../common/model/BSP.ts';
 
 /** @typedef {import('../../game/id1/entity/BaseEntity.mjs').default} BaseEntity */
 /** @typedef {import('../../game/id1/entity/Worldspawn.mjs').WorldspawnEntity} WorldspawnEntity */
diff --git a/test/common/model-cache.test.mjs b/test/common/model-cache.test.mjs
index dcfd7672..393199c7 100644
--- a/test/common/model-cache.test.mjs
+++ b/test/common/model-cache.test.mjs
@@ -4,7 +4,7 @@ import { describe, test } from 'node:test';
 import Mod from '../../source/engine/common/Mod.ts';
 import { AliasModel } from '../../source/engine/common/model/AliasModel.ts';
 import { Face } from '../../source/engine/common/model/BaseModel.ts';
-import { BrushModel, Node } from '../../source/engine/common/model/BSP.mjs';
+import { BrushModel, Node } from '../../source/engine/common/model/BSP.ts';
 import { eventBus, registry } from '../../source/engine/registry.mjs';
 import Vector from '../../source/shared/Vector.ts';
 
diff --git a/test/physics/brushtrace.test.mjs b/test/physics/brushtrace.test.mjs
index 7de530dc..db74e345 100644
--- a/test/physics/brushtrace.test.mjs
+++ b/test/physics/brushtrace.test.mjs
@@ -3,7 +3,7 @@ import assert from 'node:assert/strict';
 
 import Vector from '../../source/shared/Vector.ts';
 import { BrushTrace, DIST_EPSILON, Pmove } from '../../source/engine/common/Pmove.ts';
-import { BrushSide } from '../../source/engine/common/model/BSP.mjs';
+import { BrushSide } from '../../source/engine/common/model/BSP.ts';
 import { content } from '../../source/shared/Defs.ts';
 
 import {
@@ -15,7 +15,7 @@ import {
 
 /**
  * Build a minimal two-brush submodel fixture with a gap between brushes.
- * @returns {import('../../source/engine/common/model/BSP.mjs').BrushModel} brush model fixture
+ * @returns {import('../../source/engine/common/model/BSP.ts').BrushModel} brush model fixture
  */
 function createTwoBoxBrushModel() {
   const model = createBoxBrushModel({ center: [-32, 0, 0], halfExtents: [16, 16, 16] });
@@ -43,7 +43,7 @@ function createTwoBoxBrushModel() {
 /**
  * Build a wedge brush whose inferred axial bounds bevel competes with a
  * walkable ramp face at almost the same enter fraction.
- * @returns {import('../../source/engine/common/model/BSP.mjs').BrushModel} brush model fixture
+ * @returns {import('../../source/engine/common/model/BSP.ts').BrushModel} brush model fixture
  */
 function createRampBevelBrushModel() {
   const model = createBoxBrushModel({ center: [0, 0, 0], halfExtents: [32, 16, 32] });
@@ -68,7 +68,7 @@ function createRampBevelBrushModel() {
 /**
  * Build a world model with one nearby brush and one distant child leaf whose
  * bounds do not intersect the current sweep.
- * @returns {import('../../source/engine/common/model/BSP.mjs').BrushModel} world model fixture
+ * @returns {import('../../source/engine/common/model/BSP.ts').BrushModel} world model fixture
  */
 function createPrunedLeafWorldModel() {
   const model = createBoxBrushModel({ center: [64, -16, 0], halfExtents: [16, 16, 16], name: 'test-pruned-world', submodel: false });
@@ -90,14 +90,14 @@ function createPrunedLeafWorldModel() {
   model.brushes.push(distantBrush);
   model.numBrushes = model.brushes.length;
 
-  const frontLeaf = /** @type {import('../../source/engine/common/model/BSP.mjs').Node} */ ({
+  const frontLeaf = /** @type {import('../../source/engine/common/model/BSP.ts').Node} */ ({
     contents: content.CONTENT_EMPTY,
     firstleafbrush: 0,
     numleafbrushes: 1,
     mins: new Vector(192, 0, -32),
     maxs: new Vector(256, 32, 32),
   });
-  const backLeaf = /** @type {import('../../source/engine/common/model/BSP.mjs').Node} */ ({
+  const backLeaf = /** @type {import('../../source/engine/common/model/BSP.ts').Node} */ ({
     contents: content.CONTENT_EMPTY,
     firstleafbrush: 1,
     numleafbrushes: 1,
@@ -105,14 +105,14 @@ function createPrunedLeafWorldModel() {
     maxs: new Vector(96, 0, 32),
   });
 
-  model.nodes = /** @type {import('../../source/engine/common/model/BSP.mjs').Node[]} */ ([{
+  model.nodes = /** @type {import('../../source/engine/common/model/BSP.ts').Node[]} */ ([{
     contents: 0,
     plane: createAxisPlane([0, 1, 0], 0, 1),
     children: [frontLeaf, backLeaf],
     mins: new Vector(32, -32, -32),
     maxs: new Vector(256, 32, 32),
   }]);
-  model.leafs = /** @type {import('../../source/engine/common/model/BSP.mjs').Node[]} */ ([frontLeaf, backLeaf]);
+  model.leafs = /** @type {import('../../source/engine/common/model/BSP.ts').Node[]} */ ([frontLeaf, backLeaf]);
   model.leafbrushes = [1, 0];
 
   return model;
@@ -469,14 +469,14 @@ describe('BrushTrace', () => {
 
     test('does not inherit allsolid from solid BSP leaves on tangent brush clips', () => {
       const worldModel = createBoxBrushModel({ center: [0, 0, 0], halfExtents: [16, 16, 16], submodel: false });
-      const solidLeaf = /** @type {import('../../source/engine/common/model/BSP.mjs').Node} */ ({
+      const solidLeaf = /** @type {import('../../source/engine/common/model/BSP.ts').Node} */ ({
         contents: content.CONTENT_SOLID,
         firstleafbrush: 0,
         numleafbrushes: 1,
       });
 
-      worldModel.nodes = /** @type {import('../../source/engine/common/model/BSP.mjs').Node[]} */ ([solidLeaf]);
-      worldModel.leafs = /** @type {import('../../source/engine/common/model/BSP.mjs').Node[]} */ ([solidLeaf]);
+      worldModel.nodes = /** @type {import('../../source/engine/common/model/BSP.ts').Node[]} */ ([solidLeaf]);
+      worldModel.leafs = /** @type {import('../../source/engine/common/model/BSP.ts').Node[]} */ ([solidLeaf]);
       worldModel.leafbrushes = [0];
       worldModel.hulls = /** @type {typeof worldModel.hulls} */ ([{ firstclipnode: 0 }]);
 
@@ -501,7 +501,7 @@ describe('BrushTrace', () => {
     test('prunes BSP child bounds that miss a straddled world sweep', () => {
       const worldModel = createPrunedLeafWorldModel();
       const originalTraceToLeaf = BrushTrace._traceToLeaf;
-      /** @type {import('../../source/engine/common/model/BSP.mjs').Node[]} */
+      /** @type {import('../../source/engine/common/model/BSP.ts').Node[]} */
       const visitedLeafs = [];
 
       BrushTrace._traceToLeaf = (ctx, leaf) => {
diff --git a/test/physics/collision-regressions.test.mjs b/test/physics/collision-regressions.test.mjs
index 9423f2bd..c473ccde 100644
--- a/test/physics/collision-regressions.test.mjs
+++ b/test/physics/collision-regressions.test.mjs
@@ -3,9 +3,9 @@ import assert from 'node:assert/strict';
 
 import Vector from '../../source/shared/Vector.ts';
 import { content, flags, moveType, moveTypes, solid } from '../../source/shared/Defs.ts';
-import { Brush, BrushModel, BrushSide } from '../../source/engine/common/model/BSP.mjs';
+import { Brush, BrushModel, BrushSide } from '../../source/engine/common/model/BSP.ts';
 import { BrushTrace, Hull, PMF, Pmove, PmovePlayer, Trace } from '../../source/engine/common/Pmove.ts';
-import { BSP29Loader } from '../../source/engine/common/model/loaders/BSP29Loader.mjs';
+import { BSP29Loader } from '../../source/engine/common/model/loaders/BSP29Loader.ts';
 import { eventBus, registry } from '../../source/engine/registry.mjs';
 import { UserCmd } from '../../source/engine/network/Protocol.ts';
 import { ClientEdict } from '../../source/engine/client/ClientEntities.mjs';
@@ -14,7 +14,7 @@ import { ServerPhysics } from '../../source/engine/server/physics/ServerPhysics.
 import { ServerMovement } from '../../source/engine/server/physics/ServerMovement.mjs';
 import { BlockedFlags, MAX_BUMP_COUNT } from '../../source/engine/server/physics/Defs.mjs';
 
-test('PmovePlayer.DEBUG is disabled before Pmove.Init()', () => {
+void test('PmovePlayer.DEBUG is disabled before Pmove.Init()', () => {
   assert.equal(PmovePlayer.DEBUG, false);
 });
 
@@ -89,23 +89,23 @@ function createBrushWorldModel({ axis = 0, center = [64, 0, 0], halfExtents }) {
   axisNormal[axis] = 1;
   const roomMins = new Vector(-2048, -2048, -2048);
   const roomMaxs = new Vector(2048, 2048, 2048);
-  const frontLeaf = /** @type {import('../../source/engine/common/model/BSP.mjs').Node} */ ({
+  const frontLeaf = /** @type {import('../../source/engine/common/model/BSP.ts').Node} */ ({
     contents: content.CONTENT_EMPTY,
     firstleafbrush: 0,
     numleafbrushes: 1,
   });
-  const backLeaf = /** @type {import('../../source/engine/common/model/BSP.mjs').Node} */ ({
+  const backLeaf = /** @type {import('../../source/engine/common/model/BSP.ts').Node} */ ({
     contents: content.CONTENT_EMPTY,
     firstleafbrush: 1,
     numleafbrushes: 0,
   });
 
-  model.nodes = /** @type {import('../../source/engine/common/model/BSP.mjs').Node[]} */ ([{
+  model.nodes = /** @type {import('../../source/engine/common/model/BSP.ts').Node[]} */ ([{
     contents: 0,
     plane: createAxisPlane(axisNormal, 0, axis),
     children: [frontLeaf, backLeaf],
   }]);
-  model.leafs = /** @type {import('../../source/engine/common/model/BSP.mjs').Node[]} */ ([frontLeaf, backLeaf]);
+  model.leafs = /** @type {import('../../source/engine/common/model/BSP.ts').Node[]} */ ([frontLeaf, backLeaf]);
   model.leafbrushes = [0];
   model.hulls = /** @type {BrushModel['hulls']} */ ([
     createRoomHullFromBounds(roomMins, roomMaxs),
@@ -377,7 +377,7 @@ function withMockServerPhysics(callback) {
   });
 }
 
-test('BrushTrace.transformedTestPosition keeps exact face contact walkable', () => {
+void test('BrushTrace.transformedTestPosition keeps exact face contact walkable', () => {
   const model = createBoxBrushModel({ halfExtents: [16, 16, 16] });
   const origin = new Vector(100, 0, 0);
   const tangentPosition = new Vector(100, 0, 40);
@@ -408,7 +408,7 @@ test('BrushTrace.transformedTestPosition keeps exact face contact walkable', ()
   );
 });
 
-test('BrushTrace.transformedTestPosition keeps non-axial clip-brush edge contact walkable for player boxes', () => {
+void test('BrushTrace.transformedTestPosition keeps non-axial clip-brush edge contact walkable for player boxes', () => {
   const model = createBoxBrushModel({ center: [304, -124, 36], halfExtents: [8, 4, 36] });
   const slopedPlaneIndex = model.planes.length;
 
@@ -440,7 +440,7 @@ test('BrushTrace.transformedTestPosition keeps non-axial clip-brush edge contact
   );
 });
 
-test('BrushTrace.transformedTestPosition keeps single non-axial clip-brush face contact walkable for player boxes', () => {
+void test('BrushTrace.transformedTestPosition keeps single non-axial clip-brush face contact walkable for player boxes', () => {
   const model = createBoxBrushModel({ center: [336, -124, 36], halfExtents: [8, 4, 36] });
   const slopedPlaneIndex = model.planes.length;
 
@@ -472,7 +472,7 @@ test('BrushTrace.transformedTestPosition keeps single non-axial clip-brush face
   );
 });
 
-test('BrushTrace.transformedBoxTrace clips tangent sloped clip-brush starts without startsolid', () => {
+void test('BrushTrace.transformedBoxTrace clips tangent sloped clip-brush starts without startsolid', () => {
   const model = createBoxBrushModel({ center: [336, -124, 36], halfExtents: [8, 4, 36] });
   const slopedPlaneIndex = model.planes.length;
 
@@ -510,7 +510,7 @@ test('BrushTrace.transformedBoxTrace clips tangent sloped clip-brush starts with
   assert.deepEqual([...trace.endpos], [353.5, -108.80000305175781, 25]);
 });
 
-test('BrushTrace.transformedBoxTrace returns world-space impact points', () => {
+void test('BrushTrace.transformedBoxTrace returns world-space impact points', () => {
   const model = createBoxBrushModel({ halfExtents: [16, 16, 16] });
   const trace = BrushTrace.transformedBoxTrace(
     model,
@@ -529,7 +529,7 @@ test('BrushTrace.transformedBoxTrace returns world-space impact points', () => {
   assertNear(trace.endpos[2], 0);
 });
 
-test('BrushTrace.transformedBoxTrace keeps exact floor contact out of startsolid', () => {
+void test('BrushTrace.transformedBoxTrace keeps exact floor contact out of startsolid', () => {
   const model = createBoxBrushModel({ halfExtents: [16, 16, 16] });
   const origin = new Vector(100, 0, 0);
   const start = new Vector(100, 0, 40);
@@ -554,7 +554,7 @@ test('BrushTrace.transformedBoxTrace keeps exact floor contact out of startsolid
   assert.deepEqual([...trace.endpos], [...start]);
 });
 
-test('BrushTrace transformed tests honor rotated entity angles', () => {
+void test('BrushTrace transformed tests honor rotated entity angles', () => {
   const model = createBoxBrushModel({ halfExtents: [8, 32, 16] });
   const point = new Vector(20, 0, 0);
 
@@ -590,7 +590,7 @@ test('BrushTrace transformed tests honor rotated entity angles', () => {
   assert.ok(rotatedTrace.endpos[0] < unrotatedTrace.endpos[0] - 20);
 });
 
-test('BrushTrace.boxTrace traverses world brush lists through BSP nodes', () => {
+void test('BrushTrace.boxTrace traverses world brush lists through BSP nodes', () => {
   const worldModel = createBrushWorldModel({ halfExtents: [16, 16, 16] });
   const trace = BrushTrace.boxTrace(
     worldModel,
@@ -608,7 +608,7 @@ test('BrushTrace.boxTrace traverses world brush lists through BSP nodes', () =>
   assertNear(trace.endpos[2], 0);
 });
 
-test('BrushTrace.boxTrace returns a clean miss for empty world models', () => {
+void test('BrushTrace.boxTrace returns a clean miss for empty world models', () => {
   const worldModel = new BrushModel();
   worldModel.name = 'empty-world';
   worldModel.nodes = [];
@@ -623,7 +623,7 @@ test('BrushTrace.boxTrace returns a clean miss for empty world models', () => {
   assert.deepEqual([...trace.endpos], [...end]);
 });
 
-test('BrushTrace.transformedBoxTrace returns a clean miss for empty submodels', () => {
+void test('BrushTrace.transformedBoxTrace returns a clean miss for empty submodels', () => {
   const model = new BrushModel();
   model.name = '*empty';
   model.submodel = true;
@@ -649,7 +649,7 @@ test('BrushTrace.transformedBoxTrace returns a clean miss for empty submodels',
   assert.deepEqual([...trace.endpos], [...end]);
 });
 
-test('BrushTrace.testPosition traverses world brush lists through BSP nodes', () => {
+void test('BrushTrace.testPosition traverses world brush lists through BSP nodes', () => {
   const worldModel = createBrushWorldModel({ halfExtents: [16, 16, 16] });
 
   assert.equal(
@@ -675,7 +675,7 @@ test('BrushTrace.testPosition traverses world brush lists through BSP nodes', ()
   );
 });
 
-test('Pmove.clipPlayerMove keeps startsolid end positions in world space', () => {
+void test('Pmove.clipPlayerMove keeps startsolid end positions in world space', () => {
   const pmove = new Pmove();
 
   pmove.addEntity(createPmoveBoxEntity({
@@ -693,7 +693,7 @@ test('Pmove.clipPlayerMove keeps startsolid end positions in world space', () =>
   assert.deepEqual([...trace.endpos], [...start]);
 });
 
-test('Pmove.clipPlayerMove reports hull hits in world coordinates', () => {
+void test('Pmove.clipPlayerMove reports hull hits in world coordinates', () => {
   const pmove = new Pmove();
 
   pmove.addEntity(createPmoveBoxEntity({
@@ -711,7 +711,7 @@ test('Pmove.clipPlayerMove reports hull hits in world coordinates', () => {
   assertNear(trace.endpos[2], 0);
 });
 
-test('Pmove server-style smoke setup mirrors TestServerside assertions', () => {
+void test('Pmove server-style smoke setup mirrors TestServerside assertions', () => {
   const worldModel = createLegacyWorldModel(
     new Vector(-256, -256, -128),
     new Vector(256, 256, 128),
@@ -749,7 +749,7 @@ test('Pmove server-style smoke setup mirrors TestServerside assertions', () => {
   assert.equal(playerMoveTraceHigher.fraction, 1.0);
 });
 
-test('Pmove.traceStaticWorldPlayerMove traces world only and ignores dynamic physents', () => {
+void test('Pmove.traceStaticWorldPlayerMove traces world only and ignores dynamic physents', () => {
   const worldModel = createLegacyWorldModel(
     new Vector(-256, -256, -128),
     new Vector(256, 256, 128),
@@ -773,7 +773,7 @@ test('Pmove.traceStaticWorldPlayerMove traces world only and ignores dynamic phy
   assertNear(aggregateTrace.endpos[0], 31.96875, 0.001);
 });
 
-test('Pmove brush-list world path supports server-style vertical smoke checks', () => {
+void test('Pmove brush-list world path supports server-style vertical smoke checks', () => {
   const worldModel = createBrushWorldModel({ axis: 2, center: [0, 0, 144], halfExtents: [512, 512, 16] });
   const pmove = new Pmove();
   const entity = createPmoveBoxEntity({
@@ -801,7 +801,7 @@ test('Pmove brush-list world path supports server-style vertical smoke checks',
   assert.equal(playerMoveTraceHigher.fraction, 1.0);
 });
 
-test('Pmove.staticWorldContents uses brush-backed world solids before leaf contents', () => {
+void test('Pmove.staticWorldContents uses brush-backed world solids before leaf contents', () => {
   const worldModel = createBrushWorldModel({ center: [64, 0, 0], halfExtents: [16, 16, 16] });
   const pmove = new Pmove();
 
@@ -813,7 +813,7 @@ test('Pmove.staticWorldContents uses brush-backed world solids before leaf conte
   assert.equal(pmove.staticWorldContents(new Vector(8, 0, 0)), content.CONTENT_WATER);
 });
 
-test('Pmove.staticWorldContents normalizes brush-backed current leaves to water', () => {
+void test('Pmove.staticWorldContents normalizes brush-backed current leaves to water', () => {
   const worldModel = createBrushWorldModel({ center: [64, 0, 0], halfExtents: [16, 16, 16] });
   const pmove = new Pmove();
 
@@ -824,7 +824,7 @@ test('Pmove.staticWorldContents normalizes brush-backed current leaves to water'
   assert.equal(pmove.staticWorldContents(new Vector(8, 0, 0)), content.CONTENT_WATER);
 });
 
-test('PmovePlayer.move integrates one grounded movement frame against a world model', () => {
+void test('PmovePlayer.move integrates one grounded movement frame against a world model', () => {
   const worldModel = createBrushWorldModel({ axis: 2, center: [0, 0, -40], halfExtents: [512, 512, 16] });
   const pmove = new Pmove();
   const player = pmove.newPlayerMove();
@@ -847,7 +847,7 @@ test('PmovePlayer.move integrates one grounded movement frame against a world mo
   assert.ok(player.velocity[0] > 0);
 });
 
-test('ServerCollision stationary brush tests preserve exact resting contact', () => {
+void test('ServerCollision stationary brush tests preserve exact resting contact', () => {
   const collision = new ServerCollision();
   const model = createBoxBrushModel({ halfExtents: [16, 16, 16] });
   const position = new Vector(100, 0, 40);
@@ -868,7 +868,7 @@ test('ServerCollision stationary brush tests preserve exact resting contact', ()
   assert.deepEqual([...trace.endpos], [...position]);
 });
 
-test('ServerCollision.move traces world brush sweeps through shared brush state', () => {
+void test('ServerCollision.move traces world brush sweeps through shared brush state', () => {
   const collision = new ServerCollision();
   const worldModel = createBrushWorldModel({ halfExtents: [16, 16, 16] });
   const worldEntity = createMockEntity({
@@ -921,7 +921,7 @@ test('ServerCollision.move traces world brush sweeps through shared brush state'
   });
 });
 
-test('ServerCollision.move prefers a later legacy hull hit over an earlier world brush point hit', () => {
+void test('ServerCollision.move prefers a later legacy hull hit over an earlier world brush point hit', () => {
   const collision = new ServerCollision();
   const worldModel = createBoxBrushModel({ halfExtents: [16, 16, 16], name: 'world-brush' });
   const worldEntity = createMockEntity({
@@ -1003,7 +1003,7 @@ test('ServerCollision.move prefers a later legacy hull hit over an earlier world
   });
 });
 
-test('BSP29Loader builds legacy clipnode masks from a model headnode subtree', () => {
+void test('BSP29Loader builds legacy clipnode masks from a model headnode subtree', () => {
   const loader = new BSP29Loader();
   const clipnodes = [
     { planenum: 0, children: [1, 2] },
@@ -1022,27 +1022,27 @@ test('BSP29Loader builds legacy clipnode masks from a model headnode subtree', (
   assert.equal(loader._buildAllowedClipnodeMask(clipnodes, 99), null);
 });
 
-test('BSP29Loader inserts BRUSHLIST brushes into both leaves when they touch a BSP split plane', () => {
+void test('BSP29Loader inserts BRUSHLIST brushes into both leaves when they touch a BSP split plane', () => {
   const loader = new BSP29Loader();
   const loadmodel = new BrushModel();
-  const frontLeaf = /** @type {import('../../source/engine/common/model/BSP.mjs').Node} */ ({
+  const frontLeaf = /** @type {import('../../source/engine/common/model/BSP.ts').Node} */ ({
     contents: content.CONTENT_EMPTY,
     firstleafbrush: 0,
     numleafbrushes: 0,
   });
-  const backLeaf = /** @type {import('../../source/engine/common/model/BSP.mjs').Node} */ ({
+  const backLeaf = /** @type {import('../../source/engine/common/model/BSP.ts').Node} */ ({
     contents: content.CONTENT_EMPTY,
     firstleafbrush: 0,
     numleafbrushes: 0,
   });
 
   loadmodel.planes = [createAxisPlane([1, 0, 0], 0, 0)];
-  loadmodel.nodes = /** @type {import('../../source/engine/common/model/BSP.mjs').Node[]} */ ([{
+  loadmodel.nodes = /** @type {import('../../source/engine/common/model/BSP.ts').Node[]} */ ([{
     contents: 0,
     plane: loadmodel.planes[0],
     children: [frontLeaf, backLeaf],
   }]);
-  loadmodel.leafs = /** @type {import('../../source/engine/common/model/BSP.mjs').Node[]} */ ([frontLeaf, backLeaf]);
+  loadmodel.leafs = /** @type {import('../../source/engine/common/model/BSP.ts').Node[]} */ ([frontLeaf, backLeaf]);
   loadmodel.bspxlumps = {
     BRUSHLIST: {
       fileofs: 0,
@@ -1078,7 +1078,7 @@ test('BSP29Loader inserts BRUSHLIST brushes into both leaves when they touch a B
   assert.deepEqual(loadmodel.leafbrushes, [0, 0]);
 });
 
-test('ServerCollision.hullPointContents treats masked foreign clipnodes as empty space', () => {
+void test('ServerCollision.hullPointContents treats masked foreign clipnodes as empty space', () => {
   const collision = new ServerCollision();
   const hull = {
     clip_mins: new Vector(),
@@ -1102,7 +1102,7 @@ test('ServerCollision.hullPointContents treats masked foreign clipnodes as empty
   );
 });
 
-test('Hull respects allowed clipnode masks in point and sweep tests', () => {
+void test('Hull respects allowed clipnode masks in point and sweep tests', () => {
   const hull = Hull.fromModelHull({
     clip_mins: new Vector(),
     clip_maxs: new Vector(),
@@ -1132,7 +1132,7 @@ test('Hull respects allowed clipnode masks in point and sweep tests', () => {
   assert.deepEqual([...trace.endpos], [...end]);
 });
 
-test('ServerCollision.pointContents respects world hull ownership masks', () => {
+void test('ServerCollision.pointContents respects world hull ownership masks', () => {
   const collision = new ServerCollision();
   const worldHull = {
     clip_mins: new Vector(),
@@ -1175,7 +1175,7 @@ test('ServerCollision.pointContents respects world hull ownership masks', () =>
   });
 });
 
-test('ServerCollision.staticWorldContents uses brush-backed world solids before leaf contents', () => {
+void test('ServerCollision.staticWorldContents uses brush-backed world solids before leaf contents', () => {
   const collision = new ServerCollision();
   const worldModel = createBrushWorldModel({ halfExtents: [16, 16, 16] });
   const worldEdict = createMockEdict(createMockEntity({ solidType: solid.SOLID_BSP }));
@@ -1205,7 +1205,7 @@ test('ServerCollision.staticWorldContents uses brush-backed world solids before
   });
 });
 
-test('ServerCollision.staticWorldContents normalizes brush-backed current leaves to water', () => {
+void test('ServerCollision.staticWorldContents normalizes brush-backed current leaves to water', () => {
   const collision = new ServerCollision();
   const worldModel = createBrushWorldModel({ halfExtents: [16, 16, 16] });
   worldModel.leafs[1].contents = content.CONTENT_CURRENT_DOWN;
@@ -1235,7 +1235,7 @@ test('ServerCollision.staticWorldContents normalizes brush-backed current leaves
   });
 });
 
-test('ServerCollision.traceStaticWorldLine uses brush tracing for brush-backed world hull 0', () => {
+void test('ServerCollision.traceStaticWorldLine uses brush tracing for brush-backed world hull 0', () => {
   const collision = new ServerCollision();
   const worldModel = createBrushWorldModel({ halfExtents: [16, 16, 16] });
   const worldEdict = createMockEdict(createMockEntity({
@@ -1273,7 +1273,7 @@ test('ServerCollision.traceStaticWorldLine uses brush tracing for brush-backed w
   });
 });
 
-test('ServerCollision.move keeps legacy world hull traces out of foreign clipnode subtrees', () => {
+void test('ServerCollision.move keeps legacy world hull traces out of foreign clipnode subtrees', () => {
   const collision = new ServerCollision();
   const worldHull = {
     clip_mins: new Vector(),
@@ -1341,7 +1341,7 @@ test('ServerCollision.move keeps legacy world hull traces out of foreign clipnod
   });
 });
 
-test('ServerCollision.traceWorldLine keeps legacy world hull traces out of foreign clipnode subtrees', () => {
+void test('ServerCollision.traceWorldLine keeps legacy world hull traces out of foreign clipnode subtrees', () => {
   const collision = new ServerCollision();
   const worldHull = {
     clip_mins: new Vector(),
@@ -1402,8 +1402,8 @@ test('ServerCollision.traceWorldLine keeps legacy world hull traces out of forei
   });
 });
 
-describe('ServerCollision.move legacy hull recursion regressions', () => {
-  test('keeps outer legacy hull split points stable across deeper recursion', () => {
+void describe('ServerCollision.move legacy hull recursion regressions', () => {
+  void test('keeps outer legacy hull split points stable across deeper recursion', () => {
   const collision = new ServerCollision();
   const worldHull = {
     clip_mins: new Vector(),
@@ -1474,7 +1474,7 @@ describe('ServerCollision.move legacy hull recursion regressions', () => {
     });
   });
 
-  test('ServerCollision.move ignores zero-volume touched entities for boxed movers', () => {
+  void test('ServerCollision.move ignores zero-volume touched entities for boxed movers', () => {
     const collision = new ServerCollision();
     const worldModel = createBrushWorldModel({ center: [1024, 0, 0], halfExtents: [16, 16, 16] });
     const worldEdict = createMockEdict(createMockEntity({
@@ -1537,7 +1537,7 @@ describe('ServerCollision.move legacy hull recursion regressions', () => {
     });
   });
 
-  test('ServerCollision.move asserts when a touched entity returns a malformed trace', () => {
+  void test('ServerCollision.move asserts when a touched entity returns a malformed trace', () => {
     const collision = new ServerCollision();
     const worldModel = createBrushWorldModel({ center: [1024, 0, 0], halfExtents: [16, 16, 16] });
     const worldEdict = createMockEdict(createMockEntity({
@@ -1632,7 +1632,7 @@ describe('ServerCollision.move legacy hull recursion regressions', () => {
   });
 });
 
-test('ServerCollision.move prefers a later legacy hull hit over an earlier unrotated BSP entity brush point hit', () => {
+void test('ServerCollision.move prefers a later legacy hull hit over an earlier unrotated BSP entity brush point hit', () => {
   const collision = new ServerCollision();
   const worldModel = createBoxBrushModel({ halfExtents: [16, 16, 16], name: 'world-brush', submodel: false });
   const entityModel = createBoxBrushModel({ halfExtents: [8, 8, 8], name: '*clip-brush' });
@@ -1732,7 +1732,7 @@ test('ServerCollision.move prefers a later legacy hull hit over an earlier unrot
   });
 });
 
-test('ServerCollision.clipMoveToEntity keeps rotated BSP point traces on the brush path', () => {
+void test('ServerCollision.clipMoveToEntity keeps rotated BSP point traces on the brush path', () => {
   const collision = new ServerCollision();
   const entityModel = createBoxBrushModel({ halfExtents: [8, 8, 8], name: '*rotating-brush' });
   const bspEntity = createMockEntity({
@@ -1793,7 +1793,7 @@ test('ServerCollision.clipMoveToEntity keeps rotated BSP point traces on the bru
   });
 });
 
-test('ServerCollision.move expands missile traces for monster broadphase and narrowphase', () => {
+void test('ServerCollision.move expands missile traces for monster broadphase and narrowphase', () => {
   const collision = new ServerCollision();
   const worldEdict = createMockEdict(createMockEntity({ solidType: solid.SOLID_BSP }));
   const monsterEntity = createMockEntity({
@@ -1897,7 +1897,7 @@ test('ServerCollision.move expands missile traces for monster broadphase and nar
   });
 });
 
-test('ServerPhysics.checkVelocity clears NaNs and clamps to maxvelocity', () => {
+void test('ServerPhysics.checkVelocity clears NaNs and clamps to maxvelocity', () => {
   const serverPhysics = new ServerPhysics();
   const prints = [];
   const entity = createMockEntity({
@@ -1931,7 +1931,7 @@ test('ServerPhysics.checkVelocity clears NaNs and clamps to maxvelocity', () =>
   assert.equal(prints[1], 'Got a NaN velocity on test_entity\n');
 });
 
-test('ServerPhysics.pushEntity uses MOVE_MISSILE and preserves origin on allsolid', () => {
+void test('ServerPhysics.pushEntity uses MOVE_MISSILE and preserves origin on allsolid', () => {
   const serverPhysics = new ServerPhysics();
   const linkCalls = [];
   const moveCalls = [];
@@ -1993,7 +1993,7 @@ test('ServerPhysics.pushEntity uses MOVE_MISSILE and preserves origin on allsoli
   assert.equal(linkCalls[0], edict);
 });
 
-test('ServerMovement.checkBottom returns early when all four corners are solid', () => {
+void test('ServerMovement.checkBottom returns early when all four corners are solid', () => {
   const movement = new ServerMovement();
   const moveCalls = [];
   const cornerChecks = [];
@@ -2030,7 +2030,7 @@ test('ServerMovement.checkBottom returns early when all four corners are solid',
   assert.equal(moveCalls.length, 0);
 });
 
-test('ServerMovement.movestep preserves horizontal progress on partial ground fallback', () => {
+void test('ServerMovement.movestep preserves horizontal progress on partial ground fallback', () => {
   const movement = new ServerMovement();
   const linkCalls = [];
   const moveCalls = [];
@@ -2081,7 +2081,7 @@ test('ServerMovement.movestep preserves horizontal progress on partial ground fa
   assert.equal(linkCalls[0].touchTriggers, true);
 });
 
-test('ServerPhysics.flyMove clips against a wall and records steptrace', () => {
+void test('ServerPhysics.flyMove clips against a wall and records steptrace', () => {
   const serverPhysics = new ServerPhysics();
   const moveCalls = [];
   const impacts = [];
@@ -2137,7 +2137,7 @@ test('ServerPhysics.flyMove clips against a wall and records steptrace', () => {
   assert.deepEqual([...impacts[0].pushVector], [10, 0, 0]);
 });
 
-test('ServerPhysics.flyMove stops in a two-plane crease', () => {
+void test('ServerPhysics.flyMove stops in a two-plane crease', () => {
   const serverPhysics = new ServerPhysics();
   let moveCallCount = 0;
   const blockerA = createMockEdict(createMockEntity({ solidType: solid.SOLID_BBOX }));
@@ -2201,7 +2201,7 @@ test('ServerPhysics.flyMove stops in a two-plane crease', () => {
   assert.deepEqual([...edict.entity.velocity], [0, 0, 0]);
 });
 
-test('ServerPhysics.flyMove dead-stops when clipped by three non-coplanar planes', () => {
+void test('ServerPhysics.flyMove dead-stops when clipped by three non-coplanar planes', () => {
   const serverPhysics = new ServerPhysics();
   let moveCallCount = 0;
   const blockerA = createMockEdict(createMockEntity({ solidType: solid.SOLID_BBOX }));
@@ -2277,7 +2277,7 @@ test('ServerPhysics.flyMove dead-stops when clipped by three non-coplanar planes
   assert.deepEqual([...edict.entity.velocity], [0, 0, 0]);
 });
 
-test('ServerPhysics.flyMove keeps state finite when a degenerate wall normal repeats', () => {
+void test('ServerPhysics.flyMove keeps state finite when a degenerate wall normal repeats', () => {
   const serverPhysics = new ServerPhysics();
   let moveCallCount = 0;
   const impacts = [];
@@ -2336,7 +2336,7 @@ test('ServerPhysics.flyMove keeps state finite when a degenerate wall normal rep
   }
 });
 
-test('ServerMovement.stepDirection restores origin when yaw delta stays too large', () => {
+void test('ServerMovement.stepDirection restores origin when yaw delta stays too large', () => {
   const movement = new ServerMovement();
   const linkCalls = [];
   const entity = createMockEntity({
@@ -2377,7 +2377,7 @@ test('ServerMovement.stepDirection restores origin when yaw delta stays too larg
   assert.equal(linkCalls[0].touchTriggers, true);
 });
 
-test('ServerPhysics.pushEntity uses MOVE_NOMONSTERS for trigger and non-solid entities', () => {
+void test('ServerPhysics.pushEntity uses MOVE_NOMONSTERS for trigger and non-solid entities', () => {
   const serverPhysics = new ServerPhysics();
   const moveCalls = [];
   const touchCalls = [];
@@ -2445,7 +2445,7 @@ test('ServerPhysics.pushEntity uses MOVE_NOMONSTERS for trigger and non-solid en
   assert.equal(touchCalls[2][0], 'target');
 });
 
-test('ServerPhysics.checkAllEnts skips static entities and reports invalid dynamic positions', () => {
+void test('ServerPhysics.checkAllEnts skips static entities and reports invalid dynamic positions', () => {
   const serverPhysics = new ServerPhysics();
   const prints = [];
   const tested = [];
@@ -2488,7 +2488,7 @@ test('ServerPhysics.checkAllEnts skips static entities and reports invalid dynam
   assert.deepEqual(prints, ['entity in invalid position\n']);
 });
 
-test('ServerMovement.moveToGoal returns false when already close enough to a non-world enemy goal', () => {
+void test('ServerMovement.moveToGoal returns false when already close enough to a non-world enemy goal', () => {
   const movement = new ServerMovement();
   const actor = createMockEdict(createMockEntity({ flagsValue: flags.FL_ONGROUND }));
   const goal = createMockEdict(createMockEntity());
@@ -2509,7 +2509,7 @@ test('ServerMovement.moveToGoal returns false when already close enough to a non
   assert.equal(movement.moveToGoal(actor, 16), false);
 });
 
-test('ServerMovement.moveToGoal falls back to newChaseDir when stepDirection fails', () => {
+void test('ServerMovement.moveToGoal falls back to newChaseDir when stepDirection fails', () => {
   const movement = new ServerMovement();
   const actor = createMockEdict(createMockEntity({ flagsValue: flags.FL_ONGROUND }));
   const goal = createMockEdict(createMockEntity({ origin: new Vector(100, 50, 0) }));
@@ -2545,7 +2545,7 @@ test('ServerMovement.moveToGoal falls back to newChaseDir when stepDirection fai
   assert.equal(calls[1].dist, 24);
 });
 
-test('ServerMovement.newChaseDir restores old yaw and marks partial ground when every direction fails', () => {
+void test('ServerMovement.newChaseDir restores old yaw and marks partial ground when every direction fails', () => {
   const movement = new ServerMovement();
   const actor = createMockEdict(createMockEntity({
     origin: new Vector(0, 0, 0),
@@ -2579,7 +2579,7 @@ test('ServerMovement.newChaseDir restores old yaw and marks partial ground when
   assert.deepEqual(attemptedDirs, [45, 0, 90, 90, 315, 225, 180, 135, 90, 45, 0, 270]);
 });
 
-test('ServerMovement.walkMove returns false when entity is not grounded, flying, or swimming', () => {
+void test('ServerMovement.walkMove returns false when entity is not grounded, flying, or swimming', () => {
   const movement = new ServerMovement();
   const actor = createMockEdict(createMockEntity({ flagsValue: 0 }));
 
@@ -2590,7 +2590,7 @@ test('ServerMovement.walkMove returns false when entity is not grounded, flying,
   assert.equal(movement.walkMove(actor, 90, 16), false);
 });
 
-test('ServerMovement.changeYaw wraps and clamps using the shortest turn direction', () => {
+void test('ServerMovement.changeYaw wraps and clamps using the shortest turn direction', () => {
   const movement = new ServerMovement();
   const actor = createMockEdict(createMockEntity({ angles: new Vector(0, 350, 0) }));
   actor.entity.yaw_speed = 5;
@@ -2604,7 +2604,7 @@ test('ServerMovement.changeYaw wraps and clamps using the shortest turn directio
   assert.equal(movement.changeYaw(actor), 5);
 });
 
-test('ServerPhysics.runThink returns false when the entity frees itself during think', () => {
+void test('ServerPhysics.runThink returns false when the entity frees itself during think', () => {
   const serverPhysics = new ServerPhysics();
   let freed = false;
   let thinkCalls = 0;
@@ -2640,7 +2640,7 @@ test('ServerPhysics.runThink returns false when the entity frees itself during t
   assert.equal(entity.nextthink, 0.0);
 });
 
-test('ServerPhysics.runThink executes multiple thinks that become due within one frame', () => {
+void test('ServerPhysics.runThink executes multiple thinks that become due within one frame', () => {
   const serverPhysics = new ServerPhysics();
   const thinkTimes = [];
   const entity = createMockEntity();
@@ -2674,7 +2674,7 @@ test('ServerPhysics.runThink executes multiple thinks that become due within one
   assert.equal(entity.nextthink, 0.0);
 });
 
-test('ServerMovement.checkBottom rejects support when a corner drops more than step size', () => {
+void test('ServerMovement.checkBottom rejects support when a corner drops more than step size', () => {
   const movement = new ServerMovement();
   const moveCalls = [];
   let pointContentCalls = 0;
@@ -2722,7 +2722,7 @@ test('ServerMovement.checkBottom rejects support when a corner drops more than s
   assert.equal(moveCalls.length, 2);
 });
 
-test('ServerMovement.movestep returns false when both the raised trace and retry stay startsolid', () => {
+void test('ServerMovement.movestep returns false when both the raised trace and retry stay startsolid', () => {
   const movement = new ServerMovement();
   const linkCalls = [];
   const moveCalls = [];
@@ -2769,7 +2769,7 @@ test('ServerMovement.movestep returns false when both the raised trace and retry
   assert.equal(linkCalls.length, 0);
 });
 
-test('ServerPhysics.pushMove carries a grounded rider upward without blocked()', () => {
+void test('ServerPhysics.pushMove carries a grounded rider upward without blocked()', () => {
   withMockServerPhysics(({ serverPhysics, pusherEdict, riderEdict, moveCalls, testCalls, blockedCalls }) => {
     serverPhysics.pushMove(pusherEdict, 0.1);
 
@@ -2784,7 +2784,7 @@ test('ServerPhysics.pushMove carries a grounded rider upward without blocked()',
   });
 });
 
-test('ServerPhysics.pushMove rolls back and calls blocked() when rider remains stuck', () => {
+void test('ServerPhysics.pushMove rolls back and calls blocked() when rider remains stuck', () => {
   withMockServerPhysics(({ serverPhysics, pusherEdict, riderEdict, blockedCalls }) => {
     let testCount = 0;
     registry.SV.collision.testEntityPosition = (edict) => {
@@ -2804,7 +2804,7 @@ test('ServerPhysics.pushMove rolls back and calls blocked() when rider remains s
   });
 });
 
-test('ServerPhysics.pushMove restores earlier riders when a later rider blocks the push', () => {
+void test('ServerPhysics.pushMove restores earlier riders when a later rider blocks the push', () => {
   const linkCalls = [];
   const blockedCalls = [];
 
@@ -2896,7 +2896,7 @@ test('ServerPhysics.pushMove restores earlier riders when a later rider blocks t
   assert.ok(linkCalls.length >= 5);
 });
 
-test('ServerPhysics.pushMove collapses trigger bounds instead of rolling back the pusher', () => {
+void test('ServerPhysics.pushMove collapses trigger bounds instead of rolling back the pusher', () => {
   const blockedCalls = [];
 
   const pusherEntity = createMockEntity({
@@ -2974,7 +2974,7 @@ test('ServerPhysics.pushMove collapses trigger bounds instead of rolling back th
   assert.equal(pusherEdict.entity.ltime, 0.1);
 });
 
-test('ServerPhysics.pushMove rotates grounded riders around the pusher yaw axis', () => {
+void test('ServerPhysics.pushMove rotates grounded riders around the pusher yaw axis', () => {
   withMockServerPhysics(({ serverPhysics, pusherEdict, riderEdict, moveCalls, testCalls, blockedCalls }) => {
     pusherEdict.entity.velocity.clear();
     pusherEdict.entity.avelocity = new Vector(0, 900, 0);
@@ -3003,7 +3003,7 @@ test('ServerPhysics.pushMove rotates grounded riders around the pusher yaw axis'
   });
 });
 
-test('ServerPhysics.physicsPusher limits movement to nextthink and then runs think', () => {
+void test('ServerPhysics.physicsPusher limits movement to nextthink and then runs think', () => {
   const serverPhysics = new ServerPhysics();
   const moveTimes = [];
   let observedGameTime = -1;
@@ -3050,7 +3050,7 @@ test('ServerPhysics.physicsPusher limits movement to nextthink and then runs thi
   assert.equal(observedGameTime, 7.0);
 });
 
-test('ServerPhysics.physicsPusher keeps think deferred when nextthink is beyond this frame', () => {
+void test('ServerPhysics.physicsPusher keeps think deferred when nextthink is beyond this frame', () => {
   const serverPhysics = new ServerPhysics();
   const moveTimes = [];
   let observedGameTime = -1;
@@ -3097,7 +3097,7 @@ test('ServerPhysics.physicsPusher keeps think deferred when nextthink is beyond
   assert.equal(observedGameTime, 0);
 });
 
-test('ServerPhysics.checkStuck restores oldorigin when the saved position is clear', () => {
+void test('ServerPhysics.checkStuck restores oldorigin when the saved position is clear', () => {
   const serverPhysics = new ServerPhysics();
   const prints = [];
   const linkCalls = [];
@@ -3143,7 +3143,7 @@ test('ServerPhysics.checkStuck restores oldorigin when the saved position is cle
   assert.equal(linkCalls[0].touchTriggers, true);
 });
 
-test('ServerPhysics.checkStuck reports failure after exhausting all nudges', () => {
+void test('ServerPhysics.checkStuck reports failure after exhausting all nudges', () => {
   const serverPhysics = new ServerPhysics();
   const prints = [];
   const linkCalls = [];
@@ -3187,7 +3187,7 @@ test('ServerPhysics.checkStuck reports failure after exhausting all nudges', ()
   assert.deepEqual([...edict.entity.oldorigin], [1, 2, 3]);
 });
 
-test('ServerPhysics.checkWater leaves entities dry when feet probe is not water', () => {
+void test('ServerPhysics.checkWater leaves entities dry when feet probe is not water', () => {
   const serverPhysics = new ServerPhysics();
   const probes = [];
   const entity = createMockEntity({
@@ -3222,7 +3222,7 @@ test('ServerPhysics.checkWater leaves entities dry when feet probe is not water'
   assert.deepEqual([...probes[0]], [10, 20, 7]);
 });
 
-test('ServerPhysics.checkWater distinguishes feet waist and head submersion', () => {
+void test('ServerPhysics.checkWater distinguishes feet waist and head submersion', () => {
   const serverPhysics = new ServerPhysics();
   const feetEntity = createMockEntity({
     origin: new Vector(0, 0, 40),
@@ -3300,7 +3300,7 @@ test('ServerPhysics.checkWater distinguishes feet waist and head submersion', ()
   assert.equal(headResult, true);
 });
 
-test('ServerPhysics.addGravity and addBoyancy accumulate using entity gravity and frametime', () => {
+void test('ServerPhysics.addGravity and addBoyancy accumulate using entity gravity and frametime', () => {
   const serverPhysics = new ServerPhysics();
   const entity = createMockEntity({
     velocity: new Vector(0, 0, 10),
@@ -3325,7 +3325,7 @@ test('ServerPhysics.addGravity and addBoyancy accumulate using entity gravity an
   assert.deepEqual([...entity.velocity], [0, 0, -88]);
 });
 
-test('ServerPhysics.clipVelocity zeroes tiny residuals after clipping against an angled plane', () => {
+void test('ServerPhysics.clipVelocity zeroes tiny residuals after clipping against an angled plane', () => {
   const serverPhysics = new ServerPhysics();
   const out = new Vector();
 
@@ -3341,7 +3341,7 @@ test('ServerPhysics.clipVelocity zeroes tiny residuals after clipping against an
   assert.equal(out[2], 0.0);
 });
 
-test('ServerPhysics.physicsToss keeps a bounce entity moving after a hard floor impact', () => {
+void test('ServerPhysics.physicsToss keeps a bounce entity moving after a hard floor impact', () => {
   const serverPhysics = new ServerPhysics();
   const entity = createMockEntity({
     origin: new Vector(0, 0, 64),
@@ -3407,7 +3407,7 @@ test('ServerPhysics.physicsToss keeps a bounce entity moving after a hard floor
   assert.deepEqual([...entity.angles], [0, 0, 9]);
 });
 
-test('ServerPhysics.physicsToss settles non-bounce tosses on walkable ground', () => {
+void test('ServerPhysics.physicsToss settles non-bounce tosses on walkable ground', () => {
   const serverPhysics = new ServerPhysics();
   const entity = createMockEntity({
     origin: new Vector(0, 0, 64),
@@ -3473,7 +3473,7 @@ test('ServerPhysics.physicsToss settles non-bounce tosses on walkable ground', (
   assert.deepEqual([...entity.angles], [0, 1, 0]);
 });
 
-test('ServerPhysics.physics applies gravity and toss movement for one frame', () => {
+void test('ServerPhysics.physics applies gravity and toss movement for one frame', () => {
   const linkCalls = [];
   const moveCalls = [];
   let startFrameCount = 0;
diff --git a/test/physics/fixtures.mjs b/test/physics/fixtures.mjs
index 39af2ed3..b8273752 100644
--- a/test/physics/fixtures.mjs
+++ b/test/physics/fixtures.mjs
@@ -2,7 +2,7 @@ import assert from 'node:assert/strict';
 
 import Vector from '../../source/shared/Vector.ts';
 import { content, flags, moveType, solid } from '../../source/shared/Defs.ts';
-import { Brush, BrushModel, BrushSide } from '../../source/engine/common/model/BSP.mjs';
+import { Brush, BrushModel, BrushSide } from '../../source/engine/common/model/BSP.ts';
 import { eventBus, registry } from '../../source/engine/registry.mjs';
 import { ClientEdict } from '../../source/engine/client/ClientEntities.mjs';
 import { ServerPhysics } from '../../source/engine/server/physics/ServerPhysics.mjs';
@@ -159,23 +159,23 @@ export function createBrushWorldModel({ axis = 0, center = [64, 0, 0], halfExten
   axisNormal[axis] = 1;
   const roomMins = new Vector(-2048, -2048, -2048);
   const roomMaxs = new Vector(2048, 2048, 2048);
-  const frontLeaf = /** @type {import('../../source/engine/common/model/BSP.mjs').Node} */ ({
+  const frontLeaf = /** @type {import('../../source/engine/common/model/BSP.ts').Node} */ ({
     contents: content.CONTENT_EMPTY,
     firstleafbrush: 0,
     numleafbrushes: 1,
   });
-  const backLeaf = /** @type {import('../../source/engine/common/model/BSP.mjs').Node} */ ({
+  const backLeaf = /** @type {import('../../source/engine/common/model/BSP.ts').Node} */ ({
     contents: content.CONTENT_EMPTY,
     firstleafbrush: 1,
     numleafbrushes: 0,
   });
 
-  model.nodes = /** @type {import('../../source/engine/common/model/BSP.mjs').Node[]} */ ([{
+  model.nodes = /** @type {import('../../source/engine/common/model/BSP.ts').Node[]} */ ([{
     contents: 0,
     plane: createAxisPlane(axisNormal, 0, axis),
     children: [frontLeaf, backLeaf],
   }]);
-  model.leafs = /** @type {import('../../source/engine/common/model/BSP.mjs').Node[]} */ ([frontLeaf, backLeaf]);
+  model.leafs = /** @type {import('../../source/engine/common/model/BSP.ts').Node[]} */ ([frontLeaf, backLeaf]);
   model.leafbrushes = [0];
   model.hulls = /** @type {BrushModel['hulls']} */ ([
     createRoomHullFromBounds(roomMins, roomMaxs),
diff --git a/test/physics/pmove.test.mjs b/test/physics/pmove.test.mjs
index 318b6070..9bc99a6e 100644
--- a/test/physics/pmove.test.mjs
+++ b/test/physics/pmove.test.mjs
@@ -22,7 +22,7 @@ import {
  * Build a brush-backed world where a solid wall continues as a clip brush.
  * The seam at y=0 should remain slideable when the player is already tangent
  * to the shared x face of both brushes.
- * @returns {import('../../source/engine/common/model/BSP.mjs').BrushModel} world model fixture
+ * @returns {import('../../source/engine/common/model/BSP.ts').BrushModel} world model fixture
  */
 function createWallClipSeamWorldModel() {
   const model = createBrushWorldModel({ axis: 0, center: [24, -32, 0], halfExtents: [8, 32, 64] });
@@ -240,7 +240,7 @@ async function runMapFrames({
   Mod.Init();
 
   try {
-    const model = /** @type {import('../../source/engine/common/model/BSP.mjs').BrushModel} */ (await Mod.ForNameAsync(mapName, true));
+    const model = /** @type {import('../../source/engine/common/model/BSP.ts').BrushModel} */ (await Mod.ForNameAsync(mapName, true));
     const entities = parseMapEntities(model.entities);
     const spawn = requireMapEntity(entities, (entity) => entity.classname === 'info_player_start', 'spawn entity classname=info_player_start');
 
diff --git a/test/physics/server-collision.test.mjs b/test/physics/server-collision.test.mjs
index 594b19b6..dd54367f 100644
--- a/test/physics/server-collision.test.mjs
+++ b/test/physics/server-collision.test.mjs
@@ -3,9 +3,9 @@ import assert from 'node:assert/strict';
 
 import Vector from '../../source/shared/Vector.ts';
 import { content, flags, moveType, moveTypes, solid } from '../../source/shared/Defs.ts';
-import { BrushModel } from '../../source/engine/common/model/BSP.mjs';
-import { BrushTrace, Pmove } from '../../source/engine/common/Pmove.ts';
-import { BSP29Loader } from '../../source/engine/common/model/loaders/BSP29Loader.mjs';
+import { BrushModel } from '../../source/engine/common/model/BSP.ts';
+import { Pmove } from '../../source/engine/common/Pmove.ts';
+import { BSP29Loader } from '../../source/engine/common/model/loaders/BSP29Loader.ts';
 import { ServerCollision } from '../../source/engine/server/physics/ServerCollision.mjs';
 import { ServerArea } from '../../source/engine/server/physics/ServerArea.mjs';
 
@@ -20,8 +20,8 @@ import {
   withMockRegistry,
 } from './fixtures.mjs';
 
-describe('ServerCollision', () => {
-  test('stationary brush tests preserve exact resting contact', () => {
+void describe('ServerCollision', () => {
+  void test('stationary brush tests preserve exact resting contact', () => {
     const collision = new ServerCollision();
     const model = createBoxBrushModel({ halfExtents: [16, 16, 16] });
     const position = new Vector(100, 0, 40);
@@ -42,8 +42,8 @@ describe('ServerCollision', () => {
     assert.deepEqual([...trace.endpos], [...position]);
   });
 
-  describe('move', () => {
-    test('traces world brush sweeps through shared brush state', () => {
+  void describe('move', () => {
+    void test('traces world brush sweeps through shared brush state', () => {
       const collision = new ServerCollision();
       const worldModel = createBrushWorldModel({ halfExtents: [16, 16, 16] });
       const worldEntity = createMockEntity({
@@ -54,7 +54,7 @@ describe('ServerCollision', () => {
       });
       const worldEdict = createMockEdict(worldEntity);
 
-      withMockRegistry(defaultMockRegistry({
+      void withMockRegistry(defaultMockRegistry({
         area: {
           hullForEntity(_ent, _mins, _maxs, offset) {
             offset.clear();
@@ -89,7 +89,7 @@ describe('ServerCollision', () => {
       });
     });
 
-    test('prefers a later legacy hull hit over an earlier world brush point hit', () => {
+    void test('prefers a later legacy hull hit over an earlier world brush point hit', () => {
       const collision = new ServerCollision();
       const worldModel = createBoxBrushModel({ halfExtents: [16, 16, 16], name: 'world-brush' });
       const worldEntity = createMockEntity({
@@ -100,7 +100,7 @@ describe('ServerCollision', () => {
       });
       const worldEdict = createMockEdict(worldEntity);
 
-      withMockRegistry(defaultMockRegistry({
+      void withMockRegistry(defaultMockRegistry({
         area: {
           tree: {
             queryAABB() {
@@ -164,7 +164,7 @@ describe('ServerCollision', () => {
       });
     });
 
-    test('keeps legacy world hull traces out of foreign clipnode subtrees', () => {
+    void test('keeps legacy world hull traces out of foreign clipnode subtrees', () => {
       const collision = new ServerCollision();
       const worldHull = {
         clip_mins: new Vector(),
@@ -193,7 +193,7 @@ describe('ServerCollision', () => {
       });
       const worldEdict = createMockEdict(worldEntity);
 
-      withMockRegistry(defaultMockRegistry({
+      void withMockRegistry(defaultMockRegistry({
         area: {
           hullForEntity() {
             return worldHull;
@@ -225,7 +225,7 @@ describe('ServerCollision', () => {
       });
     });
 
-    test('keeps outer legacy hull split points stable across deeper recursion', () => {
+    void test('keeps outer legacy hull split points stable across deeper recursion', () => {
       const collision = new ServerCollision();
       const worldHull = {
         clip_mins: new Vector(),
@@ -255,7 +255,7 @@ describe('ServerCollision', () => {
       });
       const worldEdict = createMockEdict(worldEntity);
 
-      withMockRegistry(defaultMockRegistry({
+      void withMockRegistry(defaultMockRegistry({
         area: {
           hullForEntity() {
             return worldHull;
@@ -289,7 +289,7 @@ describe('ServerCollision', () => {
       });
     });
 
-    test('prefers a later legacy hull hit over an earlier unrotated BSP entity brush point hit', () => {
+    void test('prefers a later legacy hull hit over an earlier unrotated BSP entity brush point hit', () => {
       const collision = new ServerCollision();
       const worldModel = createBoxBrushModel({ halfExtents: [16, 16, 16], name: 'world-brush', submodel: false });
       const entityModel = createBoxBrushModel({ halfExtents: [8, 8, 8], name: '*clip-brush' });
@@ -303,7 +303,7 @@ describe('ServerCollision', () => {
       bspEntity.modelindex = 1;
       const bspEdict = createMockEdict(bspEntity);
 
-      withMockRegistry(defaultMockRegistry({
+      void withMockRegistry(defaultMockRegistry({
         area: {
           tree: {
             queryAABB() {
@@ -382,7 +382,7 @@ describe('ServerCollision', () => {
       });
     });
 
-    test('expands missile traces for monster broadphase and narrowphase', () => {
+    void test('expands missile traces for monster broadphase and narrowphase', () => {
       const collision = new ServerCollision();
       const worldEdict = createMockEdict(createMockEntity({ solidType: solid.SOLID_BSP }));
       const monsterEntity = createMockEntity({
@@ -403,7 +403,7 @@ describe('ServerCollision', () => {
       /** @type {{ ent: object, mins: Vector, maxs: Vector, end: Vector }[]} */
       const traceCalls = [];
 
-      withMockRegistry(defaultMockRegistry({
+      void withMockRegistry(defaultMockRegistry({
         area: {
           tree: {
             queryAABB(boxmins, boxmaxs) {
@@ -479,7 +479,7 @@ describe('ServerCollision', () => {
       });
     });
 
-    test('queries area-linked entities and filters skipped or out-of-bounds touches', () => {
+    void test('queries area-linked entities and filters skipped or out-of-bounds touches', () => {
       const collision = new ServerCollision();
       const worldEdict = createMockEdict(createMockEntity({ solidType: solid.SOLID_BSP }));
       const passedict = createMockEdict(createMockEntity({
@@ -511,7 +511,7 @@ describe('ServerCollision', () => {
       /** @type {object[]} */
       const traceCalls = [];
 
-      withMockRegistry(defaultMockRegistry({
+      void withMockRegistry(defaultMockRegistry({
         area: {
           tree: {
             queryAABB(boxmins, boxmaxs) {
@@ -582,7 +582,7 @@ describe('ServerCollision', () => {
       });
     });
 
-    test('keeps the nearest hit across multi-entity clip chains', () => {
+    void test('keeps the nearest hit across multi-entity clip chains', () => {
       const collision = new ServerCollision();
       const worldEdict = createMockEdict(createMockEntity({ solidType: solid.SOLID_BSP }));
       const farEdict = createMockEdict(createMockEntity({
@@ -601,7 +601,7 @@ describe('ServerCollision', () => {
       /** @type {object[]} */
       const traceCalls = [];
 
-      withMockRegistry(defaultMockRegistry({
+      void withMockRegistry(defaultMockRegistry({
         area: {
           tree: {
             queryAABB() {
@@ -670,8 +670,8 @@ describe('ServerCollision', () => {
     });
   });
 
-  describe('clipMoveToEntity', () => {
-    test('keeps rotated BSP point traces on the brush path', () => {
+  void describe('clipMoveToEntity', () => {
+    void test('keeps rotated BSP point traces on the brush path', () => {
       const collision = new ServerCollision();
       const entityModel = createBoxBrushModel({ halfExtents: [8, 8, 8], name: '*rotating-brush' });
       const bspEntity = createMockEntity({
@@ -683,7 +683,7 @@ describe('ServerCollision', () => {
       bspEntity.modelindex = 1;
       const bspEdict = createMockEdict(bspEntity);
 
-      withMockRegistry(defaultMockRegistry({
+      void withMockRegistry(defaultMockRegistry({
         area: {
           tree: {
             queryAABB() {
@@ -726,8 +726,8 @@ describe('ServerCollision', () => {
     });
   });
 
-  describe('hullPointContents', () => {
-    test('treats masked foreign clipnodes as empty space', () => {
+  void describe('hullPointContents', () => {
+    void test('treats masked foreign clipnodes as empty space', () => {
       const collision = new ServerCollision();
       const hull = {
         clip_mins: new Vector(),
@@ -752,8 +752,8 @@ describe('ServerCollision', () => {
     });
   });
 
-  describe('pointContents', () => {
-    test('respects world hull ownership masks', () => {
+  void describe('pointContents', () => {
+    void test('respects world hull ownership masks', () => {
       const collision = new ServerCollision();
       const worldHull = {
         clip_mins: new Vector(),
@@ -771,7 +771,7 @@ describe('ServerCollision', () => {
         ],
       };
 
-      withMockRegistry(defaultMockRegistry({
+      void withMockRegistry(defaultMockRegistry({
         area: {
           tree: {
             queryAABB() {
@@ -790,13 +790,13 @@ describe('ServerCollision', () => {
     });
   });
 
-  describe('staticWorldContents', () => {
-    test('uses brush-backed world solids before leaf contents', () => {
+  void describe('staticWorldContents', () => {
+    void test('uses brush-backed world solids before leaf contents', () => {
       const collision = new ServerCollision();
       const worldModel = createBrushWorldModel({ halfExtents: [16, 16, 16] });
       const worldEdict = createMockEdict(createMockEntity({ solidType: solid.SOLID_BSP }));
 
-      withMockRegistry(defaultMockRegistry({
+      void withMockRegistry(defaultMockRegistry({
         area: {
           tree: {
             queryAABB() {
@@ -814,13 +814,13 @@ describe('ServerCollision', () => {
       });
     });
 
-    test('normalizes brush-backed current leaves to water', () => {
+    void test('normalizes brush-backed current leaves to water', () => {
       const collision = new ServerCollision();
       const worldModel = createBrushWorldModel({ halfExtents: [16, 16, 16] });
       worldModel.leafs[1].contents = content.CONTENT_CURRENT_DOWN;
       const worldEdict = createMockEdict(createMockEntity({ solidType: solid.SOLID_BSP }));
 
-      withMockRegistry(defaultMockRegistry({
+      void withMockRegistry(defaultMockRegistry({
         area: {
           tree: {
             queryAABB() {
@@ -838,8 +838,8 @@ describe('ServerCollision', () => {
     });
   });
 
-  describe('traceStaticWorldLine', () => {
-    test('uses brush tracing for brush-backed world hull 0', () => {
+  void describe('traceStaticWorldLine', () => {
+    void test('uses brush tracing for brush-backed world hull 0', () => {
       const collision = new ServerCollision();
       const worldModel = createBrushWorldModel({ halfExtents: [16, 16, 16] });
       const worldEdict = createMockEdict(createMockEntity({
@@ -848,7 +848,7 @@ describe('ServerCollision', () => {
         solidType: solid.SOLID_BSP,
       }));
 
-      withMockRegistry(defaultMockRegistry({
+      void withMockRegistry(defaultMockRegistry({
         area: {
           tree: {
             queryAABB() {
@@ -870,11 +870,11 @@ describe('ServerCollision', () => {
       });
     });
 
-    test('uses the client worldmodel when no local server worldspawn exists', () => {
+    void test('uses the client worldmodel when no local server worldspawn exists', () => {
       const collision = new ServerCollision();
       const worldModel = createBrushWorldModel({ halfExtents: [16, 16, 16] });
 
-      withMockRegistry(defaultMockRegistry({
+      void withMockRegistry(defaultMockRegistry({
         area: {
           tree: {
             queryAABB() {
@@ -900,7 +900,7 @@ describe('ServerCollision', () => {
       });
     });
 
-    test('keeps legacy world hull traces out of foreign clipnode subtrees', () => {
+    void test('keeps legacy world hull traces out of foreign clipnode subtrees', () => {
       const collision = new ServerCollision();
       const worldHull = {
         clip_mins: new Vector(),
@@ -929,7 +929,7 @@ describe('ServerCollision', () => {
       });
       const worldEdict = createMockEdict(worldEntity);
 
-      withMockRegistry(defaultMockRegistry({
+      void withMockRegistry(defaultMockRegistry({
         area: {
           hullForEntity() {
             return worldHull;
@@ -956,8 +956,8 @@ describe('ServerCollision', () => {
   });
 });
 
-describe('ServerArea', () => {
-  test('resolves BSP hulls from the client model precache when the local server model table is empty', () => {
+void describe('ServerArea', () => {
+  void test('resolves BSP hulls from the client model precache when the local server model table is empty', () => {
     const area = new ServerArea();
     area.initBoxHull();
 
@@ -972,7 +972,7 @@ describe('ServerArea', () => {
     const movingEdict = createMockEdict(movingEntity);
     const offset = new Vector(1, 1, 1);
 
-    withMockRegistry(defaultMockRegistry({
+    void withMockRegistry(defaultMockRegistry({
       server: {
         edicts: [],
         models: [],
@@ -992,8 +992,8 @@ describe('ServerArea', () => {
   });
 });
 
-describe('BSP29Loader', () => {
-  test('builds legacy clipnode masks from a model headnode subtree', () => {
+void describe('BSP29Loader', () => {
+  void test('builds legacy clipnode masks from a model headnode subtree', () => {
     const loader = new BSP29Loader();
     const clipnodes = [
       { planenum: 0, children: [1, 2] },

From 61b7c7f3fb93fa9ca70b78d0e9f975a106964416 Mon Sep 17 00:00:00 2001
From: Christian R <github@chrisnew.de>
Date: Fri, 3 Apr 2026 00:50:12 +0300
Subject: [PATCH 27/67] TS: adopt the stricter guidelines

---
 source/engine/common/Pmove.ts           |  34 ++--
 source/engine/common/W.ts               |  12 +-
 source/engine/network/NetworkDrivers.ts | 254 ++++++++++++------------
 source/shared/ClientEdict.ts            |   3 +-
 source/shared/GameInterfaces.ts         |  14 +-
 5 files changed, 162 insertions(+), 155 deletions(-)

diff --git a/source/engine/common/Pmove.ts b/source/engine/common/Pmove.ts
index d533b7f4..87812b4f 100644
--- a/source/engine/common/Pmove.ts
+++ b/source/engine/common/Pmove.ts
@@ -9,14 +9,16 @@
 
 /* eslint-disable jsdoc/require-returns */
 
-import Vector from '../../shared/Vector.ts';
+import Vector, { type DirectionalVectors } from '../../shared/Vector.ts';
 import * as Protocol from '../network/Protocol.ts';
 import { content } from '../../shared/Defs.ts';
 import { BrushModel } from './Mod.ts';
 import Cvar from './Cvar.ts';
 import { PmoveConfiguration } from '../../shared/Pmove.ts';
-
-type DirectionalVectors = import('../../shared/Vector.ts').DirectionalVectors;
+import type { ClientEdict } from '../client/ClientEntities.mjs';
+import type { BaseEntity } from '../server/Edict.mjs';
+import type { Plane as BaseModelPlane } from './model/BaseModel.ts';
+import type { Brush, Node } from './model/BSP.ts';
 interface BrushTracePlaneLike {
   readonly normal: Vector;
   readonly type: number;
@@ -569,7 +571,7 @@ export class BrushTrace {
   /**
    * Check whether a brush AABB can possibly overlap the current swept move.
    */
-  static _brushMayAffectTrace(ctx: BrushTraceContext, brush: import('./model/BSP.ts').Brush): boolean {
+  static _brushMayAffectTrace(ctx: BrushTraceContext, brush: Brush): boolean {
     if (brush.mins === null || brush.mins === undefined || brush.maxs === null || brush.maxs === undefined) {
       return true;
     }
@@ -580,7 +582,7 @@ export class BrushTrace {
   /**
    * Check whether a brush AABB can possibly overlap the current position test.
    */
-  static _brushMayAffectPosition(brush: import('./model/BSP.ts').Brush, boundsMins: Vector, boundsMaxs: Vector): boolean {
+  static _brushMayAffectPosition(brush: Brush, boundsMins: Vector, boundsMaxs: Vector): boolean {
     if (brush.mins === null || brush.mins === undefined || brush.maxs === null || brush.maxs === undefined) {
       return true;
     }
@@ -593,7 +595,7 @@ export class BrushTrace {
    * enter a node's bounds. Used only for pruning; false negatives are avoided
    * by falling back when bounds are missing.
    */
-  static _estimateNodeEntryFraction(ctx: BrushTraceContext, node: import('./model/BSP.ts').Node): number {
+  static _estimateNodeEntryFraction(ctx: BrushTraceContext, node: Node): number {
     if (node.mins === null || node.mins === undefined || node.maxs === null || node.maxs === undefined) {
       return 0;
     }
@@ -637,7 +639,7 @@ export class BrushTrace {
   /**
    * Check whether a node can still affect the current trace.
    */
-  static _nodeMayAffectTrace(ctx: BrushTraceContext, node: import('./model/BSP.ts').Node): boolean {
+  static _nodeMayAffectTrace(ctx: BrushTraceContext, node: Node): boolean {
     if (node.mins === null || node.mins === undefined || node.maxs === null || node.maxs === undefined) {
       return true;
     }
@@ -947,7 +949,7 @@ export class BrushTrace {
    * Recursively walk the BSP tree for position testing, expanding by box
    * extents to visit all leaves the player box overlaps.
    */
-  static _testPositionRecursive(worldModel: BrushModel, node: import('./model/BSP.ts').Node, position: Vector, mins: Vector, maxs: Vector, boundsMins: Vector, boundsMaxs: Vector, extents: Vector, isPoint: boolean, checkCount: number): boolean {
+  static _testPositionRecursive(worldModel: BrushModel, node: Node, position: Vector, mins: Vector, maxs: Vector, boundsMins: Vector, boundsMaxs: Vector, extents: Vector, isPoint: boolean, checkCount: number): boolean {
     if (node.mins !== null && node.mins !== undefined && node.maxs !== null && node.maxs !== undefined
       && !BrushTrace._boundsOverlap(boundsMins, boundsMaxs, node.mins, node.maxs)) {
       return false;
@@ -1137,7 +1139,7 @@ export class BrushTrace {
   /**
    * Test if a player-sized box overlaps any solid brush in a leaf.
    */
-  static _testLeafSolid(worldModel: BrushModel, leaf: import('./model/BSP.ts').Node, position: Vector, mins: Vector, maxs: Vector, boundsMins: Vector, boundsMaxs: Vector, checkCount: number): boolean {
+  static _testLeafSolid(worldModel: BrushModel, leaf: Node, position: Vector, mins: Vector, maxs: Vector, boundsMins: Vector, boundsMaxs: Vector, checkCount: number): boolean {
     const brushes = worldModel.brushes;
     const leafbrushes = worldModel.leafbrushes;
 
@@ -1182,7 +1184,7 @@ export class BrushTrace {
   /**
    * Test if a box at origin is inside a brush. Equivalent to Q2’s CM_TestBoxInBrush.
    */
-  static _testBoxInBrush(worldModel: BrushModel, brush: import('./model/BSP.ts').Brush, position: Vector, mins: Vector, maxs: Vector): boolean {
+  static _testBoxInBrush(worldModel: BrushModel, brush: Brush, position: Vector, mins: Vector, maxs: Vector): boolean {
     const brushsides = worldModel.brushsides;
     const planes = worldModel.planes;
 
@@ -1224,7 +1226,7 @@ export class BrushTrace {
    * Recursively traverse the BSP node tree, expanding by trace extents.
    * At leaf nodes, test all brushes. Equivalent to Q2’s CM_RecursiveHullCheck.
    */
-  static _recursiveHullCheck(ctx: BrushTraceContext, node: import('./model/BSP.ts').Node, p1f: number, p2f: number, p1: Vector, p2: Vector, depth: number = 0) {
+  static _recursiveHullCheck(ctx: BrushTraceContext, node: Node, p1f: number, p2f: number, p1: Vector, p2: Vector, depth: number = 0) {
     if (!BrushTrace._nodeMayAffectTrace(ctx, node)) {
       return;
     }
@@ -1321,7 +1323,7 @@ export class BrushTrace {
    * Test all brushes in a leaf against the current trace.
    * Equivalent to Q2’s CM_TraceToLeaf.
    */
-  static _traceToLeaf(ctx: BrushTraceContext, leaf: import('./model/BSP.ts').Node) {
+  static _traceToLeaf(ctx: BrushTraceContext, leaf: Node) {
     // Q1 content classification for trace flags
     if (leaf.contents !== content.CONTENT_SOLID && leaf.contents !== content.CONTENT_SKY) {
       ctx.trace.allsolid = false;
@@ -1373,7 +1375,7 @@ export class BrushTrace {
    * Clip the trace against a single brush’s planes.
    * Equivalent to Q2’s CM_ClipBoxToBrush.
    */
-  static _clipBoxToBrush(ctx: BrushTraceContext, brush: import('./model/BSP.ts').Brush) {
+  static _clipBoxToBrush(ctx: BrushTraceContext, brush: Brush) {
     const brushsides = ctx.worldModel.brushsides;
     const planes = ctx.worldModel.planes;
     const moveDeltaX = ctx.end[0] - ctx.start[0];
@@ -1384,8 +1386,8 @@ export class BrushTrace {
 
     let enterfrac = -1;
     let leavefrac = 1;
-    let clipplane: import('./model/BaseModel.ts').Plane | null = null;
-    let tangentAxialPlane: import('./model/BaseModel.ts').Plane | null = null;
+    let clipplane: BaseModelPlane | null = null;
+    let tangentAxialPlane: BaseModelPlane | null = null;
     let tangentAxialMovesDeeper = false;
 
     let getout = false;
@@ -3742,7 +3744,7 @@ export class Pmove { // pmove_t
    * @param model - brush model to use for SOLID_BSP-style entities
    * @returns this pmove instance
    */
-  addEntity(entity: import('../server/Edict.mjs').BaseEntity | import('../client/ClientEntities.mjs').ClientEdict, model: BrushModel | null = null): Pmove {
+  addEntity(entity: BaseEntity | ClientEdict, model: BrushModel | null = null): Pmove {
     const pe = new PhysEnt(this);
 
     console.assert(model === null || model instanceof BrushModel, 'no model or brush model required');
diff --git a/source/engine/common/W.ts b/source/engine/common/W.ts
index 6c7f1508..96cae40a 100644
--- a/source/engine/common/W.ts
+++ b/source/engine/common/W.ts
@@ -264,7 +264,7 @@ class Wad3File extends WadFileInterface {
         new Uint8Array(lump).set(new Uint8Array(base, filepos, disksize));
       } else { // Compressed
         const compressedData = new Uint8Array(base, filepos, disksize);
-        const decompressed = Wad3File._decompressLZ(compressedData, size);
+        const decompressed = Wad3File.#decompressLZ(compressedData, size);
         new Uint8Array(lump).set(decompressed);
       }
 
@@ -279,7 +279,7 @@ class Wad3File extends WadFileInterface {
     }
   }
 
-  _parseQPicLump(name: string, data: ArrayBuffer, _mipmapLevel: number): WadLumpTexture {
+  #parseQPicLump(name: string, data: ArrayBuffer, _mipmapLevel: number): WadLumpTexture {
     const view = new DataView(data);
     const width = view.getUint32(0, true);
     const height = view.getUint32(4, true);
@@ -297,7 +297,7 @@ class Wad3File extends WadFileInterface {
     return new WadLumpTexture(name, width, height, rgba);
   }
 
-  _parseMiptexLump(name: string, data: ArrayBuffer, mipmapLevel: number): WadLumpTexture {
+  #parseMiptexLump(name: string, data: ArrayBuffer, mipmapLevel: number): WadLumpTexture {
     return readWad3Texture(data, name, mipmapLevel);
   }
 
@@ -329,10 +329,10 @@ class Wad3File extends WadFileInterface {
     switch (lumpInfo.type) {
       case 0x43: // miptex
       case 0x40: // spraydecal
-        return this._parseMiptexLump(lumpInfo.name, lumpInfo.data, mipmapLevel);
+        return this.#parseMiptexLump(lumpInfo.name, lumpInfo.data, mipmapLevel);
 
       case 0x42: // QPic
-        return this._parseQPicLump(lumpInfo.name, lumpInfo.data, mipmapLevel);
+        return this.#parseQPicLump(lumpInfo.name, lumpInfo.data, mipmapLevel);
 
       case 0x46: // font
         console.assert(false, 'Wad3File.getLumpMipmap: font handling not implemented');
@@ -346,7 +346,7 @@ class Wad3File extends WadFileInterface {
    * Decompress LZ-compressed data from GoldSrc WAD3 files
    * @returns the decompressed data
    */
-  static _decompressLZ(compressed: Uint8Array, uncompressedSize: number): Uint8Array {
+  static #decompressLZ(compressed: Uint8Array, uncompressedSize: number): Uint8Array {
     const output = new Uint8Array(uncompressedSize);
     let inPos = 0;
     let outPos = 0;
diff --git a/source/engine/network/NetworkDrivers.ts b/source/engine/network/NetworkDrivers.ts
index 682cb57f..da7c1712 100644
--- a/source/engine/network/NetworkDrivers.ts
+++ b/source/engine/network/NetworkDrivers.ts
@@ -631,10 +631,10 @@ export class WebSocketDriver extends BaseDriver {
     }
 
     const { webSocket: browserSocket } = socketState;
-    browserSocket.onerror = this._OnErrorClient;
-    browserSocket.onmessage = this._OnMessageClient;
-    browserSocket.onopen = this._OnOpenClient;
-    browserSocket.onclose = this._OnCloseClient;
+    browserSocket.onerror = this.#OnErrorClient;
+    browserSocket.onmessage = this.#OnMessageClient;
+    browserSocket.onopen = this.#OnOpenClient;
+    browserSocket.onclose = this.#OnCloseClient;
 
     browserSocket.qsocket = sock;
     sock.state = QSocket.STATE_CONNECTING;
@@ -682,7 +682,7 @@ export class WebSocketDriver extends BaseDriver {
     return type;
   }
 
-  _FlushSendBuffer(qsocket: QSocket): boolean {
+  #FlushSendBuffer(qsocket: QSocket): boolean {
     const socketState = getWebSocketState(qsocket);
 
     if (socketState === null) {
@@ -724,7 +724,7 @@ export class WebSocketDriver extends BaseDriver {
     return true;
   }
 
-  _SendRawMessage(qsocket: QSocket, data: Uint8Array): number {
+  #SendRawMessage(qsocket: QSocket, data: Uint8Array): number {
     const socketState = getWebSocketState(qsocket);
 
     if (socketState === null) {
@@ -732,7 +732,7 @@ export class WebSocketDriver extends BaseDriver {
     }
 
     socketState.sendQueue.push(data);
-    this._FlushSendBuffer(qsocket);
+    this.#FlushSendBuffer(qsocket);
     return qsocket.state !== QSocket.STATE_DISCONNECTED ? 1 : -1;
   }
 
@@ -743,7 +743,7 @@ export class WebSocketDriver extends BaseDriver {
     buffer[index++] = data.cursize & 0xff;
     buffer[index++] = (data.cursize >> 8) & 0xff;
     buffer.set(new Uint8Array(data.data, 0, data.cursize), index);
-    return this._SendRawMessage(qsocket, buffer);
+    return this.#SendRawMessage(qsocket, buffer);
   }
 
   SendUnreliableMessage(qsocket: QSocket, data: NetworkPayload): number {
@@ -753,21 +753,21 @@ export class WebSocketDriver extends BaseDriver {
     buffer[index++] = data.cursize & 0xff;
     buffer[index++] = (data.cursize >> 8) & 0xff;
     buffer.set(new Uint8Array(data.data, 0, data.cursize), index);
-    return this._SendRawMessage(qsocket, buffer);
+    return this.#SendRawMessage(qsocket, buffer);
   }
 
   Close(qsocket: QSocket): void {
     const socketState = getWebSocketState(qsocket);
 
     if (socketState !== null && this.CanSendMessage(qsocket)) {
-      this._FlushSendBuffer(qsocket);
+      this.#FlushSendBuffer(qsocket);
       socketState.webSocket.close(1000);
     }
 
     qsocket.state = QSocket.STATE_DISCONNECTED;
   }
 
-  _OnErrorClient(this: BrowserWebSocketWithSocket, _error: Event): void {
+  #OnErrorClient(this: BrowserWebSocketWithSocket, _error: Event): void {
     if (this.qsocket === undefined) {
       return;
     }
@@ -776,7 +776,7 @@ export class WebSocketDriver extends BaseDriver {
     this.qsocket.state = QSocket.STATE_DISCONNECTED;
   }
 
-  _OnMessageClient(this: BrowserWebSocketWithSocket, message: MessageEvent<string | ArrayBuffer>): void {
+  #OnMessageClient(this: BrowserWebSocketWithSocket, message: MessageEvent<string | ArrayBuffer>): void {
     if (this.qsocket === undefined) {
       return;
     }
@@ -803,13 +803,13 @@ export class WebSocketDriver extends BaseDriver {
     }, NET.delay_receive.value + (Math.random() - 0.5) * NET.delay_receive_jitter.value);
   }
 
-  _OnOpenClient(this: BrowserWebSocketWithSocket): void {
+  #OnOpenClient(this: BrowserWebSocketWithSocket): void {
     if (this.qsocket !== undefined) {
       this.qsocket.state = QSocket.STATE_CONNECTED;
     }
   }
 
-  _OnCloseClient(this: BrowserWebSocketWithSocket): void {
+  #OnCloseClient(this: BrowserWebSocketWithSocket): void {
     if (this.qsocket === undefined || this.qsocket.state !== QSocket.STATE_CONNECTED) {
       return;
     }
@@ -818,7 +818,7 @@ export class WebSocketDriver extends BaseDriver {
     this.qsocket.state = QSocket.STATE_DISCONNECTING;
   }
 
-  _OnConnectionServer(ws: NodeWebSocketLike, req: NodeIncomingMessageLike): void {
+  #OnConnectionServer(ws: NodeWebSocketLike, req: NodeIncomingMessageLike): void {
     Con.DPrint('WebSocketDriver._OnConnectionServer: received new connection\n');
 
     const sock = NET.NewQSocket(this);
@@ -889,7 +889,7 @@ export class WebSocketDriver extends BaseDriver {
     const nodeWebSocketModule = WebSocketModule as NodeWebSocketModuleLike;
 
     this.wss = new nodeWebSocketModule.WebSocketServer({ server: NET.server });
-    this.wss.on('connection', this._OnConnectionServer.bind(this));
+    this.wss.on('connection', this.#OnConnectionServer.bind(this));
     this.newConnections = [];
   }
 
@@ -972,7 +972,7 @@ export class WebRTCDriver extends BaseDriver {
       sessionId = host;
     }
 
-    if (!this._ConnectSignaling()) {
+    if (!this.#ConnectSignaling()) {
       Con.PrintError('WebRTCDriver.Connect: Failed to connect to signaling server\n');
       return null;
     }
@@ -984,9 +984,9 @@ export class WebRTCDriver extends BaseDriver {
 
     const onSignalingReady = () => {
       if (shouldCreateSession) {
-        this._CreateSession(sock);
+        this.#CreateSession(sock);
       } else {
-        this._JoinSession(sock, sessionId);
+        this.#JoinSession(sock, sessionId);
       }
     };
 
@@ -1003,7 +1003,7 @@ export class WebRTCDriver extends BaseDriver {
     return sock;
   }
 
-  _ConnectSignaling(): boolean {
+  #ConnectSignaling(): boolean {
     if (this.signalingWs !== null) {
       if (this.signalingWs.readyState === 1 || this.signalingWs.readyState === 0) {
         return true;
@@ -1021,10 +1021,10 @@ export class WebRTCDriver extends BaseDriver {
       this.signalingWs.onopen = () => {
         Con.DPrint(`WebRTCDriver: Connected to signaling server at ${this.signalingUrl}\n`);
         const previousSessionId = this.sessionId;
-        this._ProcessPendingSignaling();
+        this.#ProcessPendingSignaling();
 
         if (previousSessionId !== null && previousSessionId === this.sessionId) {
-          this._RestoreSession();
+          this.#RestoreSession();
         }
       };
 
@@ -1033,13 +1033,13 @@ export class WebRTCDriver extends BaseDriver {
           return;
         }
 
-        await this._OnSignalingMessage(JSON.parse(event.data) as SignalingMessage);
+        await this.#OnSignalingMessage(JSON.parse(event.data) as SignalingMessage);
       };
 
       this.signalingWs.onerror = (errorEvent: Event) => {
         console.debug('WebRTCDriver: Signaling WebSocket error', errorEvent);
         Con.DPrint(`WebRTCDriver: Signaling error: ${errorEvent}\n`);
-        this._OnSignalingError({ error: 'Signaling connection error', type: 'error' });
+        this.#OnSignalingError({ error: 'Signaling connection error', type: 'error' });
       };
 
       this.signalingWs.onclose = (closeEvent: CloseEvent) => {
@@ -1051,19 +1051,19 @@ export class WebRTCDriver extends BaseDriver {
           Con.PrintWarning(`Signaling server at ${this.signalingUrl} might be unavailable.\n`);
         }
 
-        this._OnSignalingError({ error: 'Signaling connection closed', type: 'error' });
-        this._ScheduleReconnect();
+        this.#OnSignalingError({ error: 'Signaling connection closed', type: 'error' });
+        this.#ScheduleReconnect();
       };
 
       return true;
     } catch (error) {
       Con.PrintError(`WebRTCDriver: Failed to connect to signaling at ${this.signalingUrl}:\n${getErrorMessage(error as Throwable)}\n`);
-      this._ScheduleReconnect();
+      this.#ScheduleReconnect();
       return false;
     }
   }
 
-  _ScheduleReconnect(): void {
+  #ScheduleReconnect(): void {
     if (this.reconnectTimer !== null) {
       return;
     }
@@ -1074,31 +1074,31 @@ export class WebRTCDriver extends BaseDriver {
     this.reconnectTimer = setTimeout(() => {
       this.reconnectTimer = null;
       Con.DPrint('WebRTCDriver: Attempting to reconnect...\n');
-      this._ConnectSignaling();
+      this.#ConnectSignaling();
     }, delay);
   }
 
-  _RestoreSession(): void {
+  #RestoreSession(): void {
     if (this.isHost) {
       Con.DPrint('WebRTCDriver: Restoring host session...\n');
-      this._SendSignaling({
+      this.#SendSignaling({
         type: 'create-session',
         sessionId: this.sessionId ?? undefined,
         hostToken: this.hostToken ?? undefined,
-        serverInfo: this._GatherServerInfo(),
-        isPublic: this._IsSessionPublic(),
+        serverInfo: this.#GatherServerInfo(),
+        isPublic: this.#IsSessionPublic(),
       });
       return;
     }
 
     Con.DPrint(`WebRTCDriver: Restoring client session ${this.sessionId}\n`);
-    this._SendSignaling({
+    this.#SendSignaling({
       type: 'join-session',
       sessionId: this.sessionId ?? undefined,
     });
   }
 
-  _ProcessPendingSignaling(): void {
+  #ProcessPendingSignaling(): void {
     for (const sock of NET.activeSockets) {
       const socketData = sock === undefined ? null : getWebRTCSocketState(sock);
 
@@ -1109,51 +1109,51 @@ export class WebRTCDriver extends BaseDriver {
     }
   }
 
-  _SendSignaling(message: SignalingMessage): void {
+  #SendSignaling(message: SignalingMessage): void {
     if (this.signalingWs !== null && this.signalingWs.readyState === 1) {
       this.signalingWs.send(JSON.stringify(message));
     }
   }
 
-  _StartPingInterval(): void {
+  #StartPingInterval(): void {
     if (!this.isHost) {
       return;
     }
 
-    this._StopPingInterval();
+    this.#StopPingInterval();
     this.pingInterval = setInterval(() => {
-      this._SendSignaling({ type: 'ping' });
+      this.#SendSignaling({ type: 'ping' });
     }, 30 * 1000);
-    this._SendSignaling({ type: 'ping' });
+    this.#SendSignaling({ type: 'ping' });
   }
 
-  _StopPingInterval(): void {
+  #StopPingInterval(): void {
     if (this.pingInterval !== null) {
       clearInterval(this.pingInterval);
       this.pingInterval = null;
     }
   }
 
-  _StartServerInfoSubscriptions(): void {
+  #StartServerInfoSubscriptions(): void {
     if (!this.isHost) {
       return;
     }
 
-    this._StopServerInfoSubscriptions();
-    this.serverEventSubscriptions.push(eventBus.subscribe('server.spawned', () => this._UpdateServerInfo()));
-    this.serverEventSubscriptions.push(eventBus.subscribe('server.client.connected', () => this._UpdateServerInfo()));
-    this.serverEventSubscriptions.push(eventBus.subscribe('server.client.disconnected', () => this._UpdateServerInfo()));
+    this.#StopServerInfoSubscriptions();
+    this.serverEventSubscriptions.push(eventBus.subscribe('server.spawned', () => this.#UpdateServerInfo()));
+    this.serverEventSubscriptions.push(eventBus.subscribe('server.client.connected', () => this.#UpdateServerInfo()));
+    this.serverEventSubscriptions.push(eventBus.subscribe('server.client.disconnected', () => this.#UpdateServerInfo()));
     this.serverEventSubscriptions.push(eventBus.subscribe('cvar.changed', (cvarName: string) => {
       const cvar = Cvar.FindVar(cvarName);
 
       if (cvar !== null && (cvar.flags & Cvar.FLAG.SERVER) !== 0) {
-        this._UpdateServerInfo();
+        this.#UpdateServerInfo();
       }
     }));
-    this._UpdateServerInfo();
+    this.#UpdateServerInfo();
   }
 
-  _StopServerInfoSubscriptions(): void {
+  #StopServerInfoSubscriptions(): void {
     while (this.serverEventSubscriptions.length > 0) {
       const unsubscribe = this.serverEventSubscriptions.pop();
 
@@ -1163,19 +1163,19 @@ export class WebRTCDriver extends BaseDriver {
     }
   }
 
-  _UpdateServerInfo(): void {
+  #UpdateServerInfo(): void {
     if (!this.isHost || this.sessionId === null) {
       return;
     }
 
-    this._SendSignaling({
+    this.#SendSignaling({
       type: 'update-server-info',
-      serverInfo: this._GatherServerInfo(),
-      isPublic: this._IsSessionPublic(),
+      serverInfo: this.#GatherServerInfo(),
+      isPublic: this.#IsSessionPublic(),
     });
   }
 
-  _GatherServerInfo(): ServerInfo {
+  #GatherServerInfo(): ServerInfo {
     const serverInfo: ServerInfo = {
       hostname: Cvar.FindVar('hostname')?.string ?? 'UNNAMED',
       maxPlayers: SV.svs.maxclients,
@@ -1192,12 +1192,12 @@ export class WebRTCDriver extends BaseDriver {
     return serverInfo;
   }
 
-  _IsSessionPublic(): boolean {
+  #IsSessionPublic(): boolean {
     return (Cvar.FindVar('sv_public')?.value ?? 0) !== 0;
   }
 
-  _CreateSession(sock: QSocket): void {
-    this._SendSignaling({ type: 'create-session' });
+  #CreateSession(sock: QSocket): void {
+    this.#SendSignaling({ type: 'create-session' });
     const socketState = getWebRTCSocketState(sock);
 
     if (socketState !== null) {
@@ -1207,8 +1207,8 @@ export class WebRTCDriver extends BaseDriver {
     this.isHost = true;
   }
 
-  _JoinSession(sock: QSocket, sessionId: string | null): void {
-    this._SendSignaling({
+  #JoinSession(sock: QSocket, sessionId: string | null): void {
+    this.#SendSignaling({
       type: 'join-session',
       sessionId: sessionId ?? undefined,
     });
@@ -1221,44 +1221,44 @@ export class WebRTCDriver extends BaseDriver {
     this.sessionId = sessionId;
   }
 
-  async _OnSignalingMessage(message: SignalingMessage): Promise<void> {
+  async #OnSignalingMessage(message: SignalingMessage): Promise<void> {
     switch (message.type) {
       case 'session-created':
-        this._OnSessionCreated(message);
+        this.#OnSessionCreated(message);
         return;
       case 'session-joined':
-        this._OnSessionJoined(message);
+        this.#OnSessionJoined(message);
         return;
       case 'peer-joined':
-        this._OnPeerJoined(message);
+        this.#OnPeerJoined(message);
         return;
       case 'peer-left':
-        this._OnPeerLeft(message);
+        this.#OnPeerLeft(message);
         return;
       case 'offer':
-        await this._OnOffer(message);
+        await this.#OnOffer(message);
         return;
       case 'answer':
-        await this._OnAnswer(message);
+        await this.#OnAnswer(message);
         return;
       case 'ice-candidate':
-        await this._OnIceCandidate(message);
+        await this.#OnIceCandidate(message);
         return;
       case 'session-closed':
-        this._OnSessionClosed(message);
+        this.#OnSessionClosed(message);
         return;
       case 'pong':
         return;
       case 'error':
         Con.DPrint(`WebRTCDriver: Signaling error: ${message.error}\n`);
-        this._OnSignalingError(message);
+        this.#OnSignalingError(message);
         return;
       default:
         Con.DPrint(`WebRTCDriver: Unknown signaling message: ${message.type}\n`);
     }
   }
 
-  _OnSignalingError(message: SignalingMessage): void {
+  #OnSignalingError(message: SignalingMessage): void {
     let failedSocket: QSocket | null = null;
 
     for (const sock of NET.activeSockets) {
@@ -1302,7 +1302,7 @@ export class WebRTCDriver extends BaseDriver {
     Con.PrintWarning(`WebRTCDriver: Signaling error (no matching socket): ${message.error}\n`);
   }
 
-  _OnSessionCreated(message: SignalingMessage): void {
+  #OnSessionCreated(message: SignalingMessage): void {
     this.sessionId = message.sessionId ?? null;
     this.peerId = message.peerId ?? null;
     this.isHost = message.isHost ?? false;
@@ -1324,7 +1324,7 @@ export class WebRTCDriver extends BaseDriver {
     }
 
     if (sock === null) {
-      sock = this._FindSocketBySession(this.sessionId);
+      sock = this.#FindSocketBySession(this.sessionId);
     }
 
     const socketData = sock === null ? null : getWebRTCSocketState(sock);
@@ -1334,14 +1334,14 @@ export class WebRTCDriver extends BaseDriver {
       sock.state = QSocket.STATE_CONNECTED;
       sock.address = `WebRTC Host (${this.sessionId})`;
       Con.DPrint('WebRTCDriver: Host socket ready for accepting peers\n');
-      this._StartPingInterval();
-      this._StartServerInfoSubscriptions();
+      this.#StartPingInterval();
+      this.#StartServerInfoSubscriptions();
 
       if (message.existingPeers !== undefined && message.existingPeers.length > 0) {
         Con.DPrint(`WebRTCDriver: Reconnecting to ${message.existingPeers.length} existing peers...\n`);
 
         for (const peerId of message.existingPeers) {
-          this._OnPeerJoined({ type: 'peer-joined', peerId });
+          this.#OnPeerJoined({ type: 'peer-joined', peerId });
         }
       }
 
@@ -1351,7 +1351,7 @@ export class WebRTCDriver extends BaseDriver {
     Con.PrintWarning(`WebRTCDriver: No socket found for session ${this.sessionId}\n`);
   }
 
-  _OnSessionJoined(message: SignalingMessage): void {
+  #OnSessionJoined(message: SignalingMessage): void {
     this.sessionId = message.sessionId ?? null;
     this.peerId = message.peerId ?? null;
     this.isHost = message.isHost ?? false;
@@ -1360,7 +1360,7 @@ export class WebRTCDriver extends BaseDriver {
     Con.DPrint(`WebRTCDriver: Your peer ID: ${this.peerId}\n`);
     Con.DPrint(`WebRTCDriver: Peers in session: ${message.peerCount}\n`);
 
-    const sock = this._FindSocketBySession(this.sessionId);
+    const sock = this.#FindSocketBySession(this.sessionId);
 
     if (sock !== null) {
       sock.address = `WebRTC Peer (${this.sessionId})`;
@@ -1371,7 +1371,7 @@ export class WebRTCDriver extends BaseDriver {
     Con.PrintWarning(`WebRTCDriver: No socket found for joined session ${this.sessionId}\n`);
   }
 
-  _OnPeerJoined(message: SignalingMessage): void {
+  #OnPeerJoined(message: SignalingMessage): void {
     if (message.peerId === undefined) {
       return;
     }
@@ -1388,34 +1388,34 @@ export class WebRTCDriver extends BaseDriver {
         peerId: message.peerId,
       });
 
-      this._CreatePeerConnection(peerSock, message.peerId, true);
+      this.#CreatePeerConnection(peerSock, message.peerId, true);
       this.newConnections.push(peerSock);
       Con.DPrint(`WebRTCDriver: Created socket for peer ${message.peerId}, added to new connections\n`);
     }
   }
 
-  _OnPeerLeft(message: SignalingMessage): void {
+  #OnPeerLeft(message: SignalingMessage): void {
     if (message.peerId !== undefined) {
       Con.DPrint(`WebRTCDriver: Peer ${message.peerId} left\n`);
-      this._ClosePeerConnection(message.peerId);
+      this.#ClosePeerConnection(message.peerId);
     }
   }
 
-  async _OnOffer(message: SignalingMessage): Promise<void> {
+  async #OnOffer(message: SignalingMessage): Promise<void> {
     if (message.fromPeerId === undefined || message.offer === undefined || message.offer === null) {
       return;
     }
 
     Con.DPrint(`WebRTCDriver: Received offer from ${message.fromPeerId}\n`);
 
-    const sock = this._FindSocketBySession(this.sessionId);
+    const sock = this.#FindSocketBySession(this.sessionId);
 
     if (sock === null) {
       Con.PrintWarning('WebRTCDriver._OnOffer: No socket found for session\n');
       return;
     }
 
-    const peerConnection = this._CreatePeerConnection(sock, message.fromPeerId, false);
+    const peerConnection = this.#CreatePeerConnection(sock, message.fromPeerId, false);
 
     if (peerConnection === null) {
       return;
@@ -1425,7 +1425,7 @@ export class WebRTCDriver extends BaseDriver {
       await peerConnection.setRemoteDescription(new RTCSessionDescription(message.offer));
       const answer = await peerConnection.createAnswer();
       await peerConnection.setLocalDescription(answer);
-      this._SendSignaling({
+      this.#SendSignaling({
         type: 'answer',
         targetPeerId: message.fromPeerId,
         answer: peerConnection.localDescription,
@@ -1435,14 +1435,14 @@ export class WebRTCDriver extends BaseDriver {
     }
   }
 
-  async _OnAnswer(message: SignalingMessage): Promise<void> {
+  async #OnAnswer(message: SignalingMessage): Promise<void> {
     if (message.fromPeerId === undefined || message.answer === undefined || message.answer === null) {
       return;
     }
 
     Con.DPrint(`WebRTCDriver: Received answer from ${message.fromPeerId}\n`);
 
-    const sock = this.isHost ? this._FindSocketByPeerId(message.fromPeerId) : this._FindSocketBySession(this.sessionId);
+    const sock = this.isHost ? this.#FindSocketByPeerId(message.fromPeerId) : this.#FindSocketBySession(this.sessionId);
 
     const socketData = sock === null ? null : getWebRTCSocketState(sock);
 
@@ -1466,12 +1466,12 @@ export class WebRTCDriver extends BaseDriver {
     }
   }
 
-  async _OnIceCandidate(message: SignalingMessage): Promise<void> {
+  async #OnIceCandidate(message: SignalingMessage): Promise<void> {
     if (message.fromPeerId === undefined) {
       return;
     }
 
-    const sock = this.isHost ? this._FindSocketByPeerId(message.fromPeerId) : this._FindSocketBySession(this.sessionId);
+    const sock = this.isHost ? this.#FindSocketByPeerId(message.fromPeerId) : this.#FindSocketBySession(this.sessionId);
 
     const socketData = sock === null ? null : getWebRTCSocketState(sock);
 
@@ -1494,10 +1494,10 @@ export class WebRTCDriver extends BaseDriver {
     }
   }
 
-  _OnSessionClosed(message: SignalingMessage): void {
+  #OnSessionClosed(message: SignalingMessage): void {
     Con.DPrint(`WebRTCDriver: Session closed: ${message.reason}\n`);
 
-    const sock = this._FindSocketBySession(this.sessionId);
+    const sock = this.#FindSocketBySession(this.sessionId);
 
     if (sock !== null) {
       sock.state = QSocket.STATE_DISCONNECTED;
@@ -1508,7 +1508,7 @@ export class WebRTCDriver extends BaseDriver {
     this.isHost = false;
   }
 
-  _CreatePeerConnection(sock: QSocket, peerId: string, initiator: boolean): RTCPeerConnection | null {
+  #CreatePeerConnection(sock: QSocket, peerId: string, initiator: boolean): RTCPeerConnection | null {
     console.assert(sock.transportState?.kind === 'webrtc', 'WebRTCDriver._CreatePeerConnection: Invalid socket');
 
     const socketData = getWebRTCSocketState(sock);
@@ -1530,7 +1530,7 @@ export class WebRTCDriver extends BaseDriver {
     peerConnection.onicecandidate = (event) => {
       if (event.candidate) {
         Con.DPrint(`WebRTCDriver: Sending ICE candidate to ${peerId}\n`);
-        this._SendSignaling({
+        this.#SendSignaling({
           type: 'ice-candidate',
           targetPeerId: peerId,
           candidate: event.candidate,
@@ -1552,19 +1552,19 @@ export class WebRTCDriver extends BaseDriver {
         Con.DPrint(`WebRTCDriver: P2P connection established with ${peerId}\n`);
       } else if (peerConnection.connectionState === 'failed' || peerConnection.connectionState === 'disconnected') {
         Con.DPrint(`WebRTCDriver: Connection ${peerConnection.connectionState} with ${peerId}\n`);
-        this._ClosePeerConnection(peerId);
+        this.#ClosePeerConnection(peerId);
       }
     };
 
     if (initiator) {
       const reliableChannel = peerConnection.createDataChannel('reliable', { ordered: true });
       const unreliableChannel = peerConnection.createDataChannel('unreliable', { ordered: false, maxRetransmits: 10 });
-      this._SetupDataChannel(sock, peerId, reliableChannel, unreliableChannel);
+      this.#SetupDataChannel(sock, peerId, reliableChannel, unreliableChannel);
 
       void peerConnection.createOffer()
         .then((offer) => peerConnection.setLocalDescription(offer))
         .then(() => {
-          this._SendSignaling({
+          this.#SendSignaling({
             type: 'offer',
             targetPeerId: peerId,
             offer: peerConnection.localDescription,
@@ -1595,10 +1595,10 @@ export class WebRTCDriver extends BaseDriver {
 
         if (channel.label === 'reliable') {
           channels.reliable = channel;
-          this._SetupDataChannelHandlers(sock, peerId, channel);
+          this.#SetupDataChannelHandlers(sock, peerId, channel);
         } else if (channel.label === 'unreliable') {
           channels.unreliable = channel;
-          this._SetupDataChannelHandlers(sock, peerId, channel);
+          this.#SetupDataChannelHandlers(sock, peerId, channel);
         }
       };
     }
@@ -1606,7 +1606,7 @@ export class WebRTCDriver extends BaseDriver {
     return peerConnection;
   }
 
-  _SetupDataChannel(sock: QSocket, peerId: string, reliableChannel: RTCDataChannel, unreliableChannel: RTCDataChannel): void {
+  #SetupDataChannel(sock: QSocket, peerId: string, reliableChannel: RTCDataChannel, unreliableChannel: RTCDataChannel): void {
     const socketData = getWebRTCSocketState(sock);
 
     if (socketData === null) {
@@ -1618,11 +1618,11 @@ export class WebRTCDriver extends BaseDriver {
       unreliable: unreliableChannel,
     });
 
-    this._SetupDataChannelHandlers(sock, peerId, reliableChannel);
-    this._SetupDataChannelHandlers(sock, peerId, unreliableChannel);
+    this.#SetupDataChannelHandlers(sock, peerId, reliableChannel);
+    this.#SetupDataChannelHandlers(sock, peerId, unreliableChannel);
   }
 
-  _SetupDataChannelHandlers(sock: QSocket, peerId: string, channel: RTCDataChannel): void {
+  #SetupDataChannelHandlers(sock: QSocket, peerId: string, channel: RTCDataChannel): void {
     channel.binaryType = 'arraybuffer';
 
     channel.onopen = () => {
@@ -1633,7 +1633,7 @@ export class WebRTCDriver extends BaseDriver {
         Con.DPrint('WebRTCDriver: Socket now CONNECTED (can send/receive data)\n');
       }
 
-      this._FlushSendBuffer(sock);
+      this.#FlushSendBuffer(sock);
     };
 
     channel.onclose = () => {
@@ -1655,8 +1655,8 @@ export class WebRTCDriver extends BaseDriver {
     };
   }
 
-  _ClosePeerConnection(peerId: string): void {
-    const sock = this.isHost ? this._FindSocketByPeerId(peerId) : this._FindSocketBySession(this.sessionId);
+  #ClosePeerConnection(peerId: string): void {
+    const sock = this.isHost ? this.#FindSocketByPeerId(peerId) : this.#FindSocketBySession(this.sessionId);
 
     const socketData = sock === null ? null : getWebRTCSocketState(sock);
 
@@ -1678,7 +1678,7 @@ export class WebRTCDriver extends BaseDriver {
     sock.state = QSocket.STATE_DISCONNECTED;
   }
 
-  _FindSocketBySession(sessionId: string | null): QSocket | null {
+  #FindSocketBySession(sessionId: string | null): QSocket | null {
     for (const sock of NET.activeSockets) {
       const socketData = sock === undefined ? null : getWebRTCSocketState(sock);
 
@@ -1690,7 +1690,7 @@ export class WebRTCDriver extends BaseDriver {
     return null;
   }
 
-  _FindSocketByPeerId(peerId: string): QSocket | null {
+  #FindSocketByPeerId(peerId: string): QSocket | null {
     for (const sock of NET.activeSockets) {
       const socketData = sock === undefined ? null : getWebRTCSocketState(sock);
 
@@ -1712,7 +1712,7 @@ export class WebRTCDriver extends BaseDriver {
     return sock;
   }
 
-  _FlushSendBuffer(qsocket: QSocket): void {
+  #FlushSendBuffer(qsocket: QSocket): void {
     const webRtcData = getWebRTCSocketState(qsocket);
 
     if (webRtcData === null) {
@@ -1738,7 +1738,7 @@ export class WebRTCDriver extends BaseDriver {
         break;
       }
 
-      const result = this._SendToAllPeers(qsocket, message.buffer, message.reliable);
+      const result = this.#SendToAllPeers(qsocket, message.buffer, message.reliable);
 
       if (result > 0) {
         queue.shift();
@@ -1749,7 +1749,7 @@ export class WebRTCDriver extends BaseDriver {
 
     if (queue.length === 0 && qsocket.state === QSocket.STATE_DISCONNECTING) {
       Con.DPrint(`WebRTCDriver._FlushSendBuffer: buffer drained, closing ${qsocket.address}\n`);
-      this._ForceClose(qsocket);
+      this.#ForceClose(qsocket);
     }
   }
 
@@ -1802,7 +1802,7 @@ export class WebRTCDriver extends BaseDriver {
     buffer[2] = (data.cursize >> 8) & 0xff;
     buffer.set(new Uint8Array(data.data, 0, data.cursize), 3);
     socketData.sendQueue.push({ buffer, reliable: true });
-    this._FlushSendBuffer(qsocket);
+    this.#FlushSendBuffer(qsocket);
     return 1;
   }
 
@@ -1819,11 +1819,11 @@ export class WebRTCDriver extends BaseDriver {
     buffer[2] = (data.cursize >> 8) & 0xff;
     buffer.set(new Uint8Array(data.data, 0, data.cursize), 3);
     socketData.sendQueue.push({ buffer, reliable: false });
-    this._FlushSendBuffer(qsocket);
+    this.#FlushSendBuffer(qsocket);
     return 1;
   }
 
-  _SendToAllPeers(qsocket: QSocket, buffer: Uint8Array, reliable: boolean): number {
+  #SendToAllPeers(qsocket: QSocket, buffer: Uint8Array, reliable: boolean): number {
     console.assert(qsocket.transportState?.kind === 'webrtc', 'WebRTCDriver._SendToAllPeers: Invalid socket');
 
     const socketData = getWebRTCSocketState(qsocket);
@@ -1882,7 +1882,7 @@ export class WebRTCDriver extends BaseDriver {
       return;
     }
 
-    this._FlushSendBuffer(qsocket);
+    this.#FlushSendBuffer(qsocket);
 
     if (socketData.sendQueue.length > 0 && qsocket.state !== QSocket.STATE_DISCONNECTED) {
       if (socketData.dataChannels.size > 0) {
@@ -1892,7 +1892,7 @@ export class WebRTCDriver extends BaseDriver {
         setTimeout(() => {
           if (qsocket.state === QSocket.STATE_DISCONNECTING) {
             Con.DPrint(`WebRTCDriver.Close: timeout waiting for flush, forcing close for ${qsocket.address}\n`);
-            this._ForceClose(qsocket);
+            this.#ForceClose(qsocket);
           }
         }, 5000);
 
@@ -1900,10 +1900,10 @@ export class WebRTCDriver extends BaseDriver {
       }
     }
 
-    this._ForceClose(qsocket);
+    this.#ForceClose(qsocket);
   }
 
-  _ForceClose(qsocket: QSocket): void {
+  #ForceClose(qsocket: QSocket): void {
     const socketData = getWebRTCSocketState(qsocket);
 
     if (socketData === null) {
@@ -1921,12 +1921,12 @@ export class WebRTCDriver extends BaseDriver {
     const isSessionSocket = socketData.isHost || (!this.isHost && socketData.sessionId === this.sessionId);
 
     if (socketData.isHost) {
-      this._StopPingInterval();
-      this._StopServerInfoSubscriptions();
+      this.#StopPingInterval();
+      this.#StopServerInfoSubscriptions();
     }
 
     if (isSessionSocket && this.sessionId !== null) {
-      this._SendSignaling({ type: 'leave-session' });
+      this.#SendSignaling({ type: 'leave-session' });
     }
 
     if (isSessionSocket) {
@@ -1959,7 +1959,7 @@ export class WebRTCDriver extends BaseDriver {
       Con.DPrint('WebRTCDriver: Starting WebRTC host session for listen server\n');
       this.creatingSession = true;
 
-      if (!this._ConnectSignaling()) {
+      if (!this.#ConnectSignaling()) {
         Con.PrintWarning('WebRTCDriver: Failed to connect to signaling server\n');
         this.creatingSession = false;
         return;
@@ -1971,10 +1971,10 @@ export class WebRTCDriver extends BaseDriver {
       sock.transportState = createWebRTCSocketState({ sessionId: null, isHost: true });
 
       const createSessionWhenReady = () => {
-        this._SendSignaling({
+        this.#SendSignaling({
           type: 'create-session',
-          serverInfo: this._GatherServerInfo(),
-          isPublic: this._IsSessionPublic(),
+          serverInfo: this.#GatherServerInfo(),
+          isPublic: this.#IsSessionPublic(),
         });
         Con.DPrint('WebRTCDriver: Session creation request sent\n');
       };
@@ -1995,8 +1995,8 @@ export class WebRTCDriver extends BaseDriver {
     }
 
     Con.DPrint('WebRTCDriver: Stopping listen server, tearing down session\n');
-    this._StopPingInterval();
-    this._StopServerInfoSubscriptions();
+    this.#StopPingInterval();
+    this.#StopServerInfoSubscriptions();
 
     for (let index = NET.activeSockets.length - 1; index >= 0; index--) {
       const sock = NET.activeSockets[index];
@@ -2014,7 +2014,7 @@ export class WebRTCDriver extends BaseDriver {
     }
 
     if (this.sessionId !== null) {
-      this._SendSignaling({ type: 'leave-session' });
+      this.#SendSignaling({ type: 'leave-session' });
     }
 
     if (this.signalingWs !== null) {
diff --git a/source/shared/ClientEdict.ts b/source/shared/ClientEdict.ts
index 75225e7e..4d1cc16e 100644
--- a/source/shared/ClientEdict.ts
+++ b/source/shared/ClientEdict.ts
@@ -1,6 +1,7 @@
 import type { ClientEdict } from '../engine/client/ClientEntities.mjs';
+import type { ClientEngineAPI as ClientEngineApiValue } from '../engine/common/GameAPIs.mjs';
 
-type ClientEngineAPI = typeof import('../engine/common/GameAPIs.mjs').ClientEngineAPI;
+type ClientEngineAPI = typeof ClientEngineApiValue;
 
 export class BaseClientEdictHandler {
   /**
diff --git a/source/shared/GameInterfaces.ts b/source/shared/GameInterfaces.ts
index 0dffafab..9a37b56a 100644
--- a/source/shared/GameInterfaces.ts
+++ b/source/shared/GameInterfaces.ts
@@ -1,7 +1,11 @@
 import type { BaseClientEdictHandler } from './ClientEdict.ts';
 import type { ClientEngineAPI as ClientEngineApiValue, ServerEngineAPI as ServerEngineApiValue } from '../engine/common/GameAPIs.mjs';
 import type { ServerEdict as ServerEdictValue } from '../engine/server/Edict.mjs';
+import type { GLTexture as GLTextureValue } from '../engine/client/GL.mjs';
+import type { SFX as SFXValue } from '../engine/client/Sound.mjs';
+import type CvarValue from '../engine/common/Cvar.ts';
 import type Vector from './Vector.ts';
+import type { PmoveConfiguration as PmoveConfigurationValue, PmoveQuake2Configuration as PmoveQuake2ConfigurationValue } from '../shared/Pmove.ts';
 import type { StartGameInterface } from '../engine/client/ClientLifecycle.mjs';
 import type { BaseModel } from '../engine/common/model/BaseModel.ts';
 
@@ -9,11 +13,11 @@ export type ClientEngineAPI = Readonly<typeof ClientEngineApiValue>;
 export type ServerEngineAPI = Readonly<typeof ServerEngineApiValue>;
 export type ServerEdict = Readonly<ServerEdictValue>;
 
-export type GLTexture = import('../engine/client/GL.mjs').GLTexture;
-export type Cvar = Readonly<import('../engine/common/Cvar.ts').default>;
+export type GLTexture = GLTextureValue;
+export type Cvar = Readonly<CvarValue>;
 
-export type PmoveConfiguration = Readonly<import('../shared/Pmove.ts').PmoveConfiguration>;
-export type PmoveQuake2Configuration = Readonly<import('../shared/Pmove.ts').PmoveQuake2Configuration>;
+export type PmoveConfiguration = Readonly<PmoveConfigurationValue>;
+export type PmoveQuake2Configuration = Readonly<PmoveQuake2ConfigurationValue>;
 
 export type SerializableType = string | number | boolean | Vector | ServerEdict | SerializableType[] | null;
 
@@ -22,7 +26,7 @@ export type ClientdataMap = Record<string, SerializableType>;
 export type EdictValueType = string | number | boolean | Vector | null;
 export type EdictData = Record<string, EdictValueType>;
 
-export type SFX = Readonly<import('../engine/client/Sound.mjs').SFX>;
+export type SFX = Readonly<SFXValue>;
 
 export type ViewmodelConfig = {
   visible: boolean;

From 61b68a5684e255ac4ecfe2c8956cff61ab8432b4 Mon Sep 17 00:00:00 2001
From: Christian R <github@chrisnew.de>
Date: Fri, 3 Apr 2026 01:26:43 +0300
Subject: [PATCH 28/67] TS: common/model/loaders/* and more

---
 .../typescript-port.instructions.md           |  72 +++
 source/engine/client/R.mjs                    |   2 +-
 source/engine/common/GameAPIs.mjs             |   2 +-
 source/engine/common/Mod.ts                   |  16 +-
 source/engine/common/model/AliasModel.ts      |   2 +
 .../{AliasMDLLoader.mjs => AliasMDLLoader.ts} | 361 +++++++------
 .../common/model/loaders/BSP29Loader.mjs      |   1 -
 .../common/model/loaders/BSP29Loader.ts       |   4 +-
 .../common/model/loaders/BSP2Loader.mjs       | 348 -------------
 .../engine/common/model/loaders/BSP2Loader.ts | 310 +++++++++++
 .../common/model/loaders/BSP38Loader.mjs      | 331 ------------
 .../common/model/loaders/BSP38Loader.ts       | 297 +++++++++++
 .../common/model/loaders/SpriteSPRLoader.mjs  | 151 ------
 .../common/model/loaders/SpriteSPRLoader.ts   | 138 +++++
 .../model/loaders/WavefrontOBJLoader.mjs      | 487 ------------------
 .../model/loaders/WavefrontOBJLoader.ts       | 469 +++++++++++++++++
 .../parsers/{ParsedQC.mjs => ParsedQC.ts}     |  38 +-
 test/common/alias-mdl-loader.test.mjs         |   8 +-
 18 files changed, 1517 insertions(+), 1520 deletions(-)
 rename source/engine/common/model/loaders/{AliasMDLLoader.mjs => AliasMDLLoader.ts} (64%)
 delete mode 100644 source/engine/common/model/loaders/BSP29Loader.mjs
 delete mode 100644 source/engine/common/model/loaders/BSP2Loader.mjs
 create mode 100644 source/engine/common/model/loaders/BSP2Loader.ts
 delete mode 100644 source/engine/common/model/loaders/BSP38Loader.mjs
 create mode 100644 source/engine/common/model/loaders/BSP38Loader.ts
 delete mode 100644 source/engine/common/model/loaders/SpriteSPRLoader.mjs
 create mode 100644 source/engine/common/model/loaders/SpriteSPRLoader.ts
 delete mode 100644 source/engine/common/model/loaders/WavefrontOBJLoader.mjs
 create mode 100644 source/engine/common/model/loaders/WavefrontOBJLoader.ts
 rename source/engine/common/model/parsers/{ParsedQC.mjs => ParsedQC.ts} (67%)

diff --git a/.github/instructions/typescript-port.instructions.md b/.github/instructions/typescript-port.instructions.md
index c28bd16d..cc107a4a 100644
--- a/.github/instructions/typescript-port.instructions.md
+++ b/.github/instructions/typescript-port.instructions.md
@@ -3,6 +3,8 @@
 
 When porting `.mjs` files to `.ts` (or polishing an earlier verbatim JS→TS port), apply every applicable rule below. The goal is idiomatic, type-safe TypeScript that relies on the compiler rather than JSDoc for type information.
 
+Files have to end with an empty line.
+
 ### Interfaces over Type Aliases
 
 - **Prefer `interface`** for object shapes. Only use `type` for unions, intersections, tuples, or mapped types.
@@ -204,6 +206,9 @@ Use this checklist when polishing a ported `.ts` file:
 11. [ ] No empty JSDoc blocks — every block has a description ending with a period.
 12. [ ] ESLint clean (`npx eslint <file>`).
 13. [ ] All tests pass (`npm run test`).
+14. [ ] All original comments preserved, especially TODOs and complex logic explanations.
+15. [ ] File ends with an empty line.
+16. [ ] If there is some important logic that is not covered by tests yet, add tests for it.
 
 ### Avoid inline import type annotations
 
@@ -230,3 +235,70 @@ const COM = comModule.COM as typeof import('../common/COM.ts');
 ```
 
 But this is a special case and should not be used as a general pattern for type imports!
+
+### Porting over comments
+
+Make sure to **always** carry over comments from the original `.mjs` file, especially those that explain complex logic or important context.
+
+However, **do not carry over comments that only describe types** (e.g., "Bounding radius for culling") since the TS types should be self-explanatory. Instead, add a JSDoc comment with a description if needed.
+
+For example, consider this original code snippet with helpful comments:
+
+```javascript
+…
+
+    // Calculate bounding box
+    this._calculateBounds(loadmodel);
+
+    // Generate tangents and bitangents for normal mapping
+    if (loadmodel.normals && loadmodel.texcoords) {
+      this._generateTangentSpace(loadmodel);
+    }
+
+    // Set texture name (convention: same as model name without .obj)
+    const baseName = name.replace(/\.obj$/i, '.png').replace(/^models\//i, 'textures/');
+    loadmodel.textureName = baseName;
+
+…
+```
+
+❌ Omitting comments:
+
+```typescript
+
+    this.#calculateBounds(loadmodel);
+
+    if (loadmodel.normals !== null && loadmodel.texcoords !== null) {
+      this.#generateTangentSpace(loadmodel);
+    }
+
+    const baseName = name.replace(/\.obj$/i, '.png').replace(/^models\//i, 'textures/');
+    loadmodel.textureName = baseName;
+
+```
+
+✅ With comments preserved and updated:
+
+```typescript
+
+    // Calculate bounding box for frustum culling
+    this.#calculateBounds(loadmodel);
+
+    // Generate tangents/bitangents needed for normal mapping
+    if (loadmodel.normals !== null && loadmodel.texcoords !== null) {
+      this.#generateTangentSpace(loadmodel);
+    }
+
+    // Derive texture name from model name (e.g. models/foo.obj → textures/foo.png)
+    const baseName = name.replace(/\.obj$/i, '.png').replace(/^models\//i, 'textures/');
+    loadmodel.textureName = baseName;
+
+```
+
+**Never ever delete TODO or FIXME unless the underlying issue has been fully resolved.** If the comment is no longer relevant, update it instead of deleting.
+
+### Adding missing tests
+
+If you encounter important logic that is not covered by tests, add new tests to cover it. This is especially critical for complex algorithms, edge cases, or any code that has caused bugs in the past.
+
+If code looks risky or has had bugs before, but there are no tests for it, that's a strong signal that tests should be added. Don't skip this step just to get the TS port done faster — the goal is not just to convert to TypeScript, but to improve code quality and maintainability overall.
diff --git a/source/engine/client/R.mjs b/source/engine/client/R.mjs
index 599913c8..4acf96a9 100644
--- a/source/engine/client/R.mjs
+++ b/source/engine/client/R.mjs
@@ -21,7 +21,7 @@ import BloomEffect from './renderer/BloomEffect.mjs';
 import WarpEffect from './renderer/WarpEffect.mjs';
 import ShadowMap from './renderer/ShadowMap.mjs';
 import { ClientDlight, ClientEdict } from './ClientEntities.mjs';
-import { avertexnormals } from '../common/model/loaders/AliasMDLLoader.mjs';
+import { avertexnormals } from '../common/model/loaders/AliasMDLLoader.ts';
 import { SkyRenderer } from './renderer/Sky.mjs';
 
 let { CL, Host, Mod, SCR, SV, Sys, V } = registry;
diff --git a/source/engine/common/GameAPIs.mjs b/source/engine/common/GameAPIs.mjs
index 179a85c9..9b6968c3 100644
--- a/source/engine/common/GameAPIs.mjs
+++ b/source/engine/common/GameAPIs.mjs
@@ -18,7 +18,7 @@ import W from './W.ts';
 /** @typedef {import('../client/GL.mjs').GLTexture} GLTexture */
 /** @typedef {import('../network/MSG.ts').SzBuffer} SzBuffer */
 /** @typedef {import('../server/Navigation.mjs').Navigation} Navigation */
-/** @typedef {import('./model/parsers/ParsedQC.mjs').default} ParsedQC */
+/** @typedef {import('./model/parsers/ParsedQC.ts').default} ParsedQC */
 /** @typedef {import('./model/BaseModel.ts').BaseModel} BaseModel */
 /** @typedef {import('../server/physics/ServerCollisionSupport.mjs').CollisionTrace} CollisionTrace */
 /**
diff --git a/source/engine/common/Mod.ts b/source/engine/common/Mod.ts
index d151beb0..e7785dfe 100644
--- a/source/engine/common/Mod.ts
+++ b/source/engine/common/Mod.ts
@@ -1,13 +1,13 @@
 import { eventBus, getClientRegistry, getCommonRegistry, registry } from '../registry.mjs';
 import { MissingResourceError } from './Errors.ts';
 import { ModelLoaderRegistry } from './model/ModelLoaderRegistry.ts';
-import { AliasMDLLoader } from './model/loaders/AliasMDLLoader.mjs';
-import { SpriteSPRLoader } from './model/loaders/SpriteSPRLoader.mjs';
+import { AliasMDLLoader } from './model/loaders/AliasMDLLoader.ts';
+import { SpriteSPRLoader } from './model/loaders/SpriteSPRLoader.ts';
 import { BSP29Loader } from './model/loaders/BSP29Loader.ts';
-import { BSP2Loader } from './model/loaders/BSP2Loader.mjs';
-import { WavefrontOBJLoader } from './model/loaders/WavefrontOBJLoader.mjs';
-import ParsedQC from './model/parsers/ParsedQC.mjs';
-import { BSP38Loader } from './model/loaders/BSP38Loader.mjs';
+import { BSP2Loader } from './model/loaders/BSP2Loader.ts';
+import { WavefrontOBJLoader } from './model/loaders/WavefrontOBJLoader.ts';
+import ParsedQC from './model/parsers/ParsedQC.ts';
+import { BSP38Loader } from './model/loaders/BSP38Loader.ts';
 import type { BaseModel } from './model/BaseModel.ts';
 
 let { COM } = getCommonRegistry();
@@ -41,6 +41,7 @@ export enum ModelHull {
 type ModelCache = Record<string, BaseModel>;
 
 // Re-export model classes for backward compatibility.
+// TODO: remove these!
 export { AliasModel } from './model/AliasModel.ts';
 export { BrushModel } from './model/BSP.ts';
 export { SpriteModel } from './model/SpriteModel.ts';
@@ -50,8 +51,11 @@ export { MeshModel } from './model/MeshModel.ts';
  * Shared model cache and loading entry point.
  */
 export default class Mod {
+  /** @deprecated use ModelType instead */
   static type = ModelType;
+  /** @deprecated use ModelScope instead */
   static scope = ModelScope;
+  /** @deprecated use ModelHull instead */
   static hull = ModelHull;
   static known: ModelCache = {};
   static clientKnown: ModelCache = {};
diff --git a/source/engine/common/model/AliasModel.ts b/source/engine/common/model/AliasModel.ts
index 01412b5b..6144c7ab 100644
--- a/source/engine/common/model/AliasModel.ts
+++ b/source/engine/common/model/AliasModel.ts
@@ -25,6 +25,7 @@ interface AliasSingleFrame {
   readonly bboxmax: Vector;
   readonly name: string;
   readonly v: AliasPoseVertex[];
+  readonly cmdofs?: number;
 }
 
 interface AliasGroupedFrameEntry {
@@ -33,6 +34,7 @@ interface AliasGroupedFrameEntry {
   readonly bboxmax: Vector;
   readonly name: string;
   readonly v: AliasPoseVertex[];
+  readonly cmdofs?: number;
 }
 
 interface AliasGroupedFrame {
diff --git a/source/engine/common/model/loaders/AliasMDLLoader.mjs b/source/engine/common/model/loaders/AliasMDLLoader.ts
similarity index 64%
rename from source/engine/common/model/loaders/AliasMDLLoader.mjs
rename to source/engine/common/model/loaders/AliasMDLLoader.ts
index b37dcc5e..03255da6 100644
--- a/source/engine/common/model/loaders/AliasMDLLoader.mjs
+++ b/source/engine/common/model/loaders/AliasMDLLoader.ts
@@ -1,31 +1,85 @@
 import Vector from '../../../../shared/Vector.ts';
 import Q from '../../../../shared/Q.ts';
 import GL, { GLTexture, resampleTexture8 } from '../../../client/GL.mjs';
-import W, { translateIndexToLuminanceRGBA, translateIndexToRGBA } from '../../W.ts';
-import { CRC16CCITT } from '../../CRC.ts';
 import { registry } from '../../../registry.mjs';
+import { CRC16CCITT } from '../../CRC.ts';
+import W, { translateIndexToLuminanceRGBA, translateIndexToRGBA } from '../../W.ts';
+import { AliasModel, type AliasFrame, type AliasSkin } from '../AliasModel.ts';
 import { ModelLoader } from '../ModelLoader.ts';
-import { AliasModel } from '../AliasModel.ts';
+
+interface AliasSkinLayers {
+  readonly diffuse: Uint8Array;
+  readonly luminance: Uint8Array;
+}
+
+
+interface MutableAliasSingleSkin {
+  group: false;
+  texturenum: GLTexture | null;
+  luminanceTexture: GLTexture | null;
+  translated?: Uint8Array;
+  playertexture?: GLTexture | null;
+}
+
+interface MutableAliasGroupedSkinEntry {
+  interval: number;
+  texturenum?: GLTexture | null;
+  luminanceTexture?: GLTexture | null;
+  translated?: Uint8Array;
+  playertexture?: GLTexture | null;
+}
+
+interface MutableAliasGroupedSkin {
+  group: true;
+  skins: MutableAliasGroupedSkinEntry[];
+}
+
+interface MutableAliasPoseVertex {
+  v: Vector;
+  lightnormalindex: number;
+}
+
+interface MutableAliasSingleFrame {
+  group: false;
+  bboxmin: Vector;
+  bboxmax: Vector;
+  name: string;
+  v: MutableAliasPoseVertex[];
+  cmdofs?: number;
+}
+
+interface MutableAliasGroupedFrameEntry {
+  interval: number;
+  bboxmin: Vector;
+  bboxmax: Vector;
+  name: string;
+  v: MutableAliasPoseVertex[];
+  cmdofs?: number;
+}
+
+interface MutableAliasGroupedFrame {
+  group: true;
+  bboxmin: Vector;
+  bboxmax: Vector;
+  frames: MutableAliasGroupedFrameEntry[];
+}
+
+type MutableAliasFrame = MutableAliasSingleFrame | MutableAliasGroupedFrame;
+type MutableAliasSkin = MutableAliasSingleSkin | MutableAliasGroupedSkin;
 
 /**
  * Builds the diffuse and luminance skin layers for a legacy alias model skin.
  * Fullbright indexed colors stay emissive-only in the luminance layer.
- * @param {Uint8Array} skin indexed Quake skin pixels
- * @param {number} width skin width
- * @param {number} height skin height
- * @param {Uint8Array} [palette] RGB palette data
- * @param {?number} [transparentColor] optional transparent palette index
- * @param {number} [fullbrightColorStart] first fullbright palette index
- * @returns {{diffuse: Uint8Array, luminance: Uint8Array}} translated texture layers
+ * @returns The translated diffuse and luminance texture layers.
  */
 export function buildAliasSkinLayers(
-  skin,
-  width,
-  height,
-  palette = W.d_8to24table_u8,
-  transparentColor = null,
+  skin: Uint8Array,
+  width: number,
+  height: number,
+  palette: Uint8Array = W.d_8to24table_u8,
+  transparentColor: number | null = null,
   fullbrightColorStart = 240,
-) {
+): AliasSkinLayers {
   return {
     diffuse: translateIndexToRGBA(skin, width, height, palette, transparentColor, fullbrightColorStart),
     luminance: translateIndexToLuminanceRGBA(skin, width, height, palette, transparentColor, fullbrightColorStart),
@@ -213,43 +267,28 @@ export const avertexnormals = new Float32Array([
 ]);
 
 /**
- * Loader for Quake Alias Model format (.mdl)
+ * Loader for Quake Alias Model format (.mdl).
  * Magic: 0x4f504449 ("IDPO")
  * Version: 6
  */
 export class AliasMDLLoader extends ModelLoader {
-  /**
-   * Get magic numbers that identify this format
-   * @returns {number[]} Array of magic numbers
-   */
-  getMagicNumbers() {
+  override getMagicNumbers(): number[] {
     return [0x4f504449]; // "IDPO"
   }
 
-  /**
-   * Get file extensions for this format
-   * @returns {string[]} Array of file extensions
-   */
-  getExtensions() {
+  override getExtensions(): string[] {
     return ['.mdl'];
   }
 
-  /**
-   * Get human-readable name of this loader
-   * @returns {string} Loader name
-   */
-  getName() {
+  override getName(): string {
     return 'Quake Alias';
   }
 
   /**
-   * Load an Alias MDL model from buffer
-   * @param {ArrayBuffer} buffer - The model file data
-   * @param {string} name - The model name/path
-   * @returns {Promise<AliasModel>} The loaded model
+   * Load an Alias MDL model from buffer.
+   * @returns The loaded alias model.
    */
-  // eslint-disable-next-line @typescript-eslint/require-await
-  async load(buffer, name) {
+  override load(buffer: ArrayBuffer, name: string): Promise<AliasModel> {
     const loadmodel = new AliasModel(name);
 
     loadmodel.type = 2; // Mod.type.alias
@@ -306,36 +345,32 @@ export class AliasMDLLoader extends ModelLoader {
     loadmodel.maxs = new Vector(16.0, 16.0, 16.0);
 
     // Load model data
-    let inmodel = this._loadAllSkins(loadmodel, buffer, 84);
-    inmodel = this._loadSTVerts(loadmodel, buffer, inmodel);
-    inmodel = this._loadTriangles(loadmodel, buffer, inmodel);
-    this._loadAllFrames(loadmodel, buffer, inmodel);
+    let inmodel = this.#loadAllSkins(loadmodel, buffer, 84);
+    inmodel = this.#loadSTVerts(loadmodel, buffer, inmodel);
+    inmodel = this.#loadTriangles(loadmodel, buffer, inmodel);
+    this.#loadAllFrames(loadmodel, buffer, inmodel);
 
     // Prepare rendering data (if not dedicated server)
     if (!registry.isDedicatedServer) {
-      this._buildRenderCommands(loadmodel);
+      this.#buildRenderCommands(loadmodel);
     }
 
     loadmodel.needload = false;
     loadmodel.checksum = CRC16CCITT.Block(new Uint8Array(buffer));
 
-    return loadmodel;
+    return Promise.resolve(loadmodel);
   }
 
   /**
-   * Load ST (texture coordinate) vertices
-   * @param {import('../AliasModel.ts').AliasModel} loadmodel - The model being loaded
-   * @param {ArrayBuffer} buffer - The model file data
-   * @param {number} inmodel - Current offset in buffer
-   * @returns {number} New offset after reading vertices
-   * @private
+   * Load ST (texture coordinate) vertices.
+   * @returns The next byte offset after the ST vertex block.
    */
-  _loadSTVerts(loadmodel, buffer, inmodel) {
+  #loadSTVerts(loadmodel: AliasModel, buffer: ArrayBuffer, inmodel: number): number {
     const view = new DataView(buffer);
     loadmodel._stverts.length = loadmodel._num_verts;
 
-    for (let i = 0; i < loadmodel._num_verts; i++) {
-      loadmodel._stverts[i] = {
+    for (let index = 0; index < loadmodel._num_verts; index++) {
+      loadmodel._stverts[index] = {
         onseam: view.getUint32(inmodel, true) !== 0,
         s: view.getUint32(inmodel + 4, true),
         t: view.getUint32(inmodel + 8, true),
@@ -347,19 +382,15 @@ export class AliasMDLLoader extends ModelLoader {
   }
 
   /**
-   * Load triangles
-   * @param {import('../AliasModel.ts').AliasModel} loadmodel - The model being loaded
-   * @param {ArrayBuffer} buffer - The model file data
-   * @param {number} inmodel - Current offset in buffer
-   * @returns {number} New offset after reading triangles
-   * @private
+   * Load triangles.
+   * @returns The next byte offset after the triangle block.
    */
-  _loadTriangles(loadmodel, buffer, inmodel) {
+  #loadTriangles(loadmodel: AliasModel, buffer: ArrayBuffer, inmodel: number): number {
     const view = new DataView(buffer);
     loadmodel._triangles.length = loadmodel._num_tris;
 
-    for (let i = 0; i < loadmodel._num_tris; i++) {
-      loadmodel._triangles[i] = {
+    for (let index = 0; index < loadmodel._num_tris; index++) {
+      loadmodel._triangles[index] = {
         facesfront: view.getUint32(inmodel, true) !== 0,
         vertindex: [
           view.getUint32(inmodel + 4, true),
@@ -374,12 +405,9 @@ export class AliasMDLLoader extends ModelLoader {
   }
 
   /**
-   * Flood fill skin to handle transparent areas
-   * @param {import('../AliasModel.ts').AliasModel} loadmodel - The model being loaded
-   * @param {Uint8Array} skin - The skin pixel data
-   * @private
+   * Flood fill skin to handle transparent areas.
    */
-  _floodFillSkin(loadmodel, skin) {
+  #floodFillSkin(loadmodel: AliasModel, skin: Uint8Array): void {
     const fillcolor = skin[0];
     const filledcolor = W.filledColor;
 
@@ -389,136 +417,126 @@ export class AliasMDLLoader extends ModelLoader {
 
     const width = loadmodel._skin_width;
     const height = loadmodel._skin_height;
+    const lifo: Array<[number, number]> = [[0, 0]];
 
-    const lifo = [[0, 0]];
-
-    for (let sp = 1; sp > 0;) {
-      const cur = lifo[--sp];
-      const x = cur[0];
-      const y = cur[1];
+    for (let stackPointer = 1; stackPointer > 0;) {
+      const [x, y] = lifo[--stackPointer];
       skin[y * width + x] = filledcolor;
 
       if (x > 0 && skin[y * width + x - 1] === fillcolor) {
-        lifo[sp++] = [x - 1, y];
+        lifo[stackPointer++] = [x - 1, y];
       }
       if (x < (width - 1) && skin[y * width + x + 1] === fillcolor) {
-        lifo[sp++] = [x + 1, y];
+        lifo[stackPointer++] = [x + 1, y];
       }
       if (y > 0 && skin[(y - 1) * width + x] === fillcolor) {
-        lifo[sp++] = [x, y - 1];
+        lifo[stackPointer++] = [x, y - 1];
       }
       if (y < (height - 1) && skin[(y + 1) * width + x] === fillcolor) {
-        lifo[sp++] = [x, y + 1];
+        lifo[stackPointer++] = [x, y + 1];
       }
     }
   }
 
   /**
-   * Translate player skin for color customization
-   * @param {import('../AliasModel.ts').AliasModel} loadmodel - The model being loaded
-   * @param {Uint8Array} data - The original skin data
-   * @param {*} skin - The skin object to store the result
-   * @private
+   * Translate player skin for color customization.
    */
-  _translatePlayerSkin(loadmodel, data, skin) {
+  #translatePlayerSkin(loadmodel: AliasModel, data: Uint8Array, skin: MutableAliasSkin): void {
     if (registry.isDedicatedServer) {
       return;
     }
 
-    if ((loadmodel._skin_width !== 512) || (loadmodel._skin_height !== 256)) {
+    if (loadmodel._skin_width !== 512 || loadmodel._skin_height !== 256) {
       data = resampleTexture8(data, loadmodel._skin_width, loadmodel._skin_height, 512, 256);
     }
 
-    const out = new Uint8Array(new ArrayBuffer(524288));
+    const out = new Uint8Array(524288);
 
-    for (let i = 0; i < 131072; i++) {
-      const original = data[i];
+    for (let index = 0; index < 131072; index++) {
+      const original = data[index];
       if ((original >> 4) === 1) {
-        out[i << 2] = (original & 15) * 17;
-        out[(i << 2) + 1] = 255;
+        out[index << 2] = (original & 15) * 17;
+        out[(index << 2) + 1] = 255;
       } else if ((original >> 4) === 6) {
-        out[(i << 2) + 2] = (original & 15) * 17;
-        out[(i << 2) + 3] = 255;
+        out[(index << 2) + 2] = (original & 15) * 17;
+        out[(index << 2) + 3] = 255;
       }
     }
 
-    skin.playertexture = GLTexture.Allocate(loadmodel.name + '_playerskin', 512, 256, out);
+    skin.playertexture = GLTexture.Allocate(`${loadmodel.name}_playerskin`, 512, 256, out);
   }
 
   /**
-   * Load all skins (textures) for the model
-   * @param {import('../AliasModel.ts').AliasModel} loadmodel - The model being loaded
-   * @param {ArrayBuffer} buffer - The model file data
-   * @param {number} inmodel - Current offset in buffer
-   * @returns {number} New offset after reading skins
-   * @private
+   * Load all skins (textures) for the model.
+   * @returns The next byte offset after the skin data.
    */
-  _loadAllSkins(loadmodel, buffer, inmodel) {
+  #loadAllSkins(loadmodel: AliasModel, buffer: ArrayBuffer, inmodel: number): number {
     loadmodel.skins.length = loadmodel._num_skins;
     const view = new DataView(buffer);
     const skinsize = loadmodel._skin_width * loadmodel._skin_height;
 
-    for (let i = 0; i < loadmodel._num_skins; i++) {
+    for (let skinIndex = 0; skinIndex < loadmodel._num_skins; skinIndex++) {
       inmodel += 4;
 
       if (view.getUint32(inmodel - 4, true) === 0) {
         // Single skin
         const skin = new Uint8Array(buffer, inmodel, skinsize);
-        this._floodFillSkin(loadmodel, skin);
+        this.#floodFillSkin(loadmodel, skin);
         const { diffuse, luminance } = buildAliasSkinLayers(skin, loadmodel._skin_width, loadmodel._skin_height);
-
-        loadmodel.skins[i] = {
+        const singleSkin: MutableAliasSingleSkin = {
           group: false,
           texturenum: !registry.isDedicatedServer
-            ? GLTexture.Allocate(loadmodel.name + '_' + i, loadmodel._skin_width, loadmodel._skin_height, diffuse)
+            ? GLTexture.Allocate(`${loadmodel.name}_${skinIndex}`, loadmodel._skin_width, loadmodel._skin_height, diffuse)
             : null,
           luminanceTexture: !registry.isDedicatedServer
-            ? GLTexture.Allocate(loadmodel.name + '_' + i + '_luma', loadmodel._skin_width, loadmodel._skin_height, luminance)
+            ? GLTexture.Allocate(`${loadmodel.name}_${skinIndex}_luma`, loadmodel._skin_width, loadmodel._skin_height, luminance)
             : null,
         };
 
+        loadmodel.skins[skinIndex] = singleSkin as AliasSkin;
+
         if (loadmodel.player === true) {
-          this._translatePlayerSkin(loadmodel, new Uint8Array(buffer, inmodel, skinsize), loadmodel.skins[i]);
+          this.#translatePlayerSkin(loadmodel, new Uint8Array(buffer, inmodel, skinsize), singleSkin);
         }
 
         inmodel += skinsize;
       } else {
         // Skin group (animated skins)
-        const group = {
+        const group: MutableAliasGroupedSkin = {
           group: true,
           skins: [],
         };
         const numskins = view.getUint32(inmodel, true);
         inmodel += 4;
 
-        for (let j = 0; j < numskins; j++) {
-          group.skins[j] = { interval: view.getFloat32(inmodel, true) };
-          if (group.skins[j].interval <= 0.0) {
+        for (let groupIndex = 0; groupIndex < numskins; groupIndex++) {
+          group.skins[groupIndex] = { interval: view.getFloat32(inmodel, true) };
+          if (group.skins[groupIndex].interval <= 0.0) {
             throw new Error('AliasMDLLoader: skin interval <= 0');
           }
           inmodel += 4;
         }
 
-        for (let j = 0; j < numskins; j++) {
+        for (let groupIndex = 0; groupIndex < numskins; groupIndex++) {
           const skin = new Uint8Array(buffer, inmodel, skinsize);
-          this._floodFillSkin(loadmodel, skin);
+          this.#floodFillSkin(loadmodel, skin);
           const { diffuse, luminance } = buildAliasSkinLayers(skin, loadmodel._skin_width, loadmodel._skin_height);
 
-          group.skins[j].texturenum = !registry.isDedicatedServer
-            ? GLTexture.Allocate(loadmodel.name + '_' + i + '_' + j, loadmodel._skin_width, loadmodel._skin_height, diffuse)
+          group.skins[groupIndex].texturenum = !registry.isDedicatedServer
+            ? GLTexture.Allocate(`${loadmodel.name}_${skinIndex}_${groupIndex}`, loadmodel._skin_width, loadmodel._skin_height, diffuse)
             : null;
-          group.skins[j].luminanceTexture = !registry.isDedicatedServer
-            ? GLTexture.Allocate(loadmodel.name + '_' + i + '_' + j + '_luma', loadmodel._skin_width, loadmodel._skin_height, luminance)
+          group.skins[groupIndex].luminanceTexture = !registry.isDedicatedServer
+            ? GLTexture.Allocate(`${loadmodel.name}_${skinIndex}_${groupIndex}_luma`, loadmodel._skin_width, loadmodel._skin_height, luminance)
             : null;
 
           if (loadmodel.player === true) {
-            this._translatePlayerSkin(loadmodel, new Uint8Array(buffer, inmodel, skinsize), group.skins[j]);
+            this.#translatePlayerSkin(loadmodel, new Uint8Array(buffer, inmodel, skinsize), group.skins[groupIndex]);
           }
 
           inmodel += skinsize;
         }
 
-        loadmodel.skins[i] = group;
+        loadmodel.skins[skinIndex] = group as AliasSkin;
       }
     }
 
@@ -526,22 +544,18 @@ export class AliasMDLLoader extends ModelLoader {
   }
 
   /**
-   * Load all animation frames
-   * @param {import('../AliasModel.ts').AliasModel} loadmodel - The model being loaded
-   * @param {ArrayBuffer} buffer - The model file data
-   * @param {number} inmodel - Current offset in buffer
-   * @private
+   * Load all animation frames.
    */
-  _loadAllFrames(loadmodel, buffer, inmodel) {
+  #loadAllFrames(loadmodel: AliasModel, buffer: ArrayBuffer, inmodel: number): void {
     loadmodel.frames = [];
     const view = new DataView(buffer);
 
-    for (let i = 0; i < loadmodel._frames; i++) {
+    for (let frameIndex = 0; frameIndex < loadmodel._frames; frameIndex++) {
       inmodel += 4;
 
       if (view.getUint32(inmodel - 4, true) === 0) {
         // Single frame
-        const frame = {
+        const frame: MutableAliasSingleFrame = {
           group: false,
           bboxmin: new Vector(view.getUint8(inmodel), view.getUint8(inmodel + 1), view.getUint8(inmodel + 2)),
           bboxmax: new Vector(view.getUint8(inmodel + 4), view.getUint8(inmodel + 5), view.getUint8(inmodel + 6)),
@@ -550,18 +564,18 @@ export class AliasMDLLoader extends ModelLoader {
         };
         inmodel += 24;
 
-        for (let j = 0; j < loadmodel._num_verts; j++) {
-          frame.v[j] = {
+        for (let vertexIndex = 0; vertexIndex < loadmodel._num_verts; vertexIndex++) {
+          frame.v[vertexIndex] = {
             v: new Vector(view.getUint8(inmodel), view.getUint8(inmodel + 1), view.getUint8(inmodel + 2)),
             lightnormalindex: view.getUint8(inmodel + 3),
           };
           inmodel += 4;
         }
 
-        loadmodel.frames[i] = frame;
+        loadmodel.frames[frameIndex] = frame as AliasFrame;
       } else {
         // Frame group (animated frames)
-        const group = {
+        const group: MutableAliasGroupedFrame = {
           group: true,
           bboxmin: new Vector(view.getUint8(inmodel + 4), view.getUint8(inmodel + 5), view.getUint8(inmodel + 6)),
           bboxmax: new Vector(view.getUint8(inmodel + 8), view.getUint8(inmodel + 9), view.getUint8(inmodel + 10)),
@@ -570,24 +584,30 @@ export class AliasMDLLoader extends ModelLoader {
         const numframes = view.getUint32(inmodel, true);
         inmodel += 12;
 
-        for (let j = 0; j < numframes; j++) {
-          group.frames[j] = { interval: view.getFloat32(inmodel, true) };
-          if (group.frames[j].interval <= 0.0) {
+        for (let groupIndex = 0; groupIndex < numframes; groupIndex++) {
+          group.frames[groupIndex] = {
+            interval: view.getFloat32(inmodel, true),
+            bboxmin: new Vector(),
+            bboxmax: new Vector(),
+            name: '',
+            v: [],
+          };
+          if (group.frames[groupIndex].interval <= 0.0) {
             throw new Error('AliasMDLLoader: frame interval <= 0');
           }
           inmodel += 4;
         }
 
-        for (let j = 0; j < numframes; j++) {
-          const frame = group.frames[j];
+        for (let groupIndex = 0; groupIndex < numframes; groupIndex++) {
+          const frame = group.frames[groupIndex];
           frame.bboxmin = new Vector(view.getUint8(inmodel), view.getUint8(inmodel + 1), view.getUint8(inmodel + 2));
           frame.bboxmax = new Vector(view.getUint8(inmodel + 4), view.getUint8(inmodel + 5), view.getUint8(inmodel + 6));
           frame.name = Q.memstr(new Uint8Array(buffer, inmodel + 8, 16));
           frame.v = [];
           inmodel += 24;
 
-          for (let k = 0; k < loadmodel._num_verts; k++) {
-            frame.v[k] = {
+          for (let vertexIndex = 0; vertexIndex < loadmodel._num_verts; vertexIndex++) {
+            frame.v[vertexIndex] = {
               v: new Vector(view.getUint8(inmodel), view.getUint8(inmodel + 1), view.getUint8(inmodel + 2)),
               lightnormalindex: view.getUint8(inmodel + 3),
             };
@@ -595,24 +615,29 @@ export class AliasMDLLoader extends ModelLoader {
           }
         }
 
-        loadmodel.frames[i] = group;
+        loadmodel.frames[frameIndex] = group as AliasFrame;
       }
     }
   }
 
   /**
-   * Build rendering commands (WebGL buffers) for efficient rendering
-   * @param {import('../AliasModel.ts').AliasModel} loadmodel - The model being loaded
-   * @private
+   * Build rendering commands (WebGL buffers) for efficient rendering.
    */
-  _buildRenderCommands(loadmodel) {
+  #buildRenderCommands(loadmodel: AliasModel): void {
     const gl = GL.gl;
-    const cmds = [];
+    const scale = loadmodel._scale;
+    const scaleOrigin = loadmodel._scale_origin;
 
-    // Build texture coordinates
+    console.assert(scale !== null && scaleOrigin !== null);
+    if (scale === null || scaleOrigin === null) {
+      return;
+    }
 
-    for (let i = 0; i < loadmodel._num_tris; i++) {
-      const triangle = loadmodel._triangles[i];
+    const cmds: number[] = [];
+
+    // Build texture coordinates
+    for (let triangleIndex = 0; triangleIndex < loadmodel._num_tris; triangleIndex++) {
+      const triangle = loadmodel._triangles[triangleIndex];
 
       if (triangle.facesfront === true) {
         const vert0 = loadmodel._stverts[triangle.vertindex[0]];
@@ -629,8 +654,8 @@ export class AliasMDLLoader extends ModelLoader {
         continue;
       }
 
-      for (let j = 0; j < 3; j++) {
-        const vert = loadmodel._stverts[triangle.vertindex[j]];
+      for (let vertexOffset = 0; vertexOffset < 3; vertexOffset++) {
+        const vert = loadmodel._stverts[triangle.vertindex[vertexOffset]];
         if (vert.onseam === true) {
           cmds.push((vert.s + loadmodel._skin_width / 2 + 0.5) / loadmodel._skin_width);
         } else {
@@ -641,24 +666,24 @@ export class AliasMDLLoader extends ModelLoader {
     }
 
     // Build vertex data for each frame
-    for (let i = 0; i < loadmodel.frames.length; i++) {
-      const group = loadmodel.frames[i];
+    for (let frameIndex = 0; frameIndex < loadmodel.frames.length; frameIndex++) {
+      const group = loadmodel.frames[frameIndex] as MutableAliasFrame;
 
       if (group.group === true) {
-        for (let j = 0; j < group.frames.length; j++) {
-          const frame = group.frames[j];
+        for (let groupIndex = 0; groupIndex < group.frames.length; groupIndex++) {
+          const frame = group.frames[groupIndex];
           frame.cmdofs = cmds.length * 4;
 
-          for (let k = 0; k < loadmodel._num_tris; k++) {
-            const triangle = loadmodel._triangles[k];
+          for (let triangleIndex = 0; triangleIndex < loadmodel._num_tris; triangleIndex++) {
+            const triangle = loadmodel._triangles[triangleIndex];
 
-            for (let l = 0; l < 3; l++) {
-              const vert = frame.v[triangle.vertindex[l]];
+            for (let vertexOffset = 0; vertexOffset < 3; vertexOffset++) {
+              const vert = frame.v[triangle.vertindex[vertexOffset]];
               console.assert(vert.lightnormalindex < avertexnormals.length / 3);
-              cmds.push(vert.v[0] * loadmodel._scale[0] + loadmodel._scale_origin[0]);
-              cmds.push(vert.v[1] * loadmodel._scale[1] + loadmodel._scale_origin[1]);
-              cmds.push(vert.v[2] * loadmodel._scale[2] + loadmodel._scale_origin[2]);
-              cmds.push(avertexnormals[vert.lightnormalindex * 3 + 0]);
+              cmds.push(vert.v[0] * scale[0] + scaleOrigin[0]);
+              cmds.push(vert.v[1] * scale[1] + scaleOrigin[1]);
+              cmds.push(vert.v[2] * scale[2] + scaleOrigin[2]);
+              cmds.push(avertexnormals[vert.lightnormalindex * 3]);
               cmds.push(avertexnormals[vert.lightnormalindex * 3 + 1]);
               cmds.push(avertexnormals[vert.lightnormalindex * 3 + 2]);
             }
@@ -670,16 +695,16 @@ export class AliasMDLLoader extends ModelLoader {
       const frame = group;
       frame.cmdofs = cmds.length * 4;
 
-      for (let j = 0; j < loadmodel._num_tris; j++) {
-        const triangle = loadmodel._triangles[j];
+      for (let triangleIndex = 0; triangleIndex < loadmodel._num_tris; triangleIndex++) {
+        const triangle = loadmodel._triangles[triangleIndex];
 
-        for (let k = 0; k < 3; k++) {
-          const vert = frame.v[triangle.vertindex[k]];
+        for (let vertexOffset = 0; vertexOffset < 3; vertexOffset++) {
+          const vert = frame.v[triangle.vertindex[vertexOffset]];
           console.assert(vert.lightnormalindex < avertexnormals.length / 3);
-          cmds.push(vert.v[0] * loadmodel._scale[0] + loadmodel._scale_origin[0]);
-          cmds.push(vert.v[1] * loadmodel._scale[1] + loadmodel._scale_origin[1]);
-          cmds.push(vert.v[2] * loadmodel._scale[2] + loadmodel._scale_origin[2]);
-          cmds.push(avertexnormals[vert.lightnormalindex * 3 + 0]);
+          cmds.push(vert.v[0] * scale[0] + scaleOrigin[0]);
+          cmds.push(vert.v[1] * scale[1] + scaleOrigin[1]);
+          cmds.push(vert.v[2] * scale[2] + scaleOrigin[2]);
+          cmds.push(avertexnormals[vert.lightnormalindex * 3]);
           cmds.push(avertexnormals[vert.lightnormalindex * 3 + 1]);
           cmds.push(avertexnormals[vert.lightnormalindex * 3 + 2]);
         }
diff --git a/source/engine/common/model/loaders/BSP29Loader.mjs b/source/engine/common/model/loaders/BSP29Loader.mjs
deleted file mode 100644
index d9fb6e2a..00000000
--- a/source/engine/common/model/loaders/BSP29Loader.mjs
+++ /dev/null
@@ -1 +0,0 @@
-export * from './BSP29Loader.ts';
diff --git a/source/engine/common/model/loaders/BSP29Loader.ts b/source/engine/common/model/loaders/BSP29Loader.ts
index 569511eb..34b310c2 100644
--- a/source/engine/common/model/loaders/BSP29Loader.ts
+++ b/source/engine/common/model/loaders/BSP29Loader.ts
@@ -73,7 +73,7 @@ export class BSP29Loader extends ModelLoader {
     // Load all BSP lumps
     this.#loadEntities(loadmodel, buffer);
     this.#loadVertexes(loadmodel, buffer);
-    this.#loadEdges(loadmodel, buffer);
+    this._loadEdges(loadmodel, buffer);
     this.#loadSurfedges(loadmodel, buffer);
     this.#loadTextures(loadmodel, buffer);
     await this.#loadMaterials(loadmodel);
@@ -1470,7 +1470,7 @@ export class BSP29Loader extends ModelLoader {
   /**
    * Load edges from BSP lump.
    */
-  #loadEdges(loadmodel: BrushModel, buf: ArrayBuffer): void {
+  protected _loadEdges(loadmodel: BrushModel, buf: ArrayBuffer): void {
     const view = new DataView(buf);
     const lump = BSP29Loader.#lump;
     let fileofs = view.getUint32((lump.edges << 3) + 4, true);
diff --git a/source/engine/common/model/loaders/BSP2Loader.mjs b/source/engine/common/model/loaders/BSP2Loader.mjs
deleted file mode 100644
index ca543e10..00000000
--- a/source/engine/common/model/loaders/BSP2Loader.mjs
+++ /dev/null
@@ -1,348 +0,0 @@
-import Vector from '../../../../shared/Vector.ts';
-import { CorruptedResourceError } from '../../Errors.ts';
-import { BSP29Loader } from './BSP29Loader.ts';
-import { Face } from '../BaseModel.ts';
-import { BrushModel, Node } from '../BSP.ts';
-import { materialFlags } from '../../../client/renderer/Materials.mjs';
-
-/**
- * Loader for BSP2 format (.bsp)
- * Magic: 'BSP2' (0x32425350 / 844124994 in little-endian)
- *
- * BSP2 is an extended version of BSP29 that uses 32-bit indices instead of 16-bit
- * to support larger maps with more vertices, edges, faces, etc.
- *
- * Key differences from BSP29:
- * - Faces: uint32 for planenum/numedges, int32 for side (28 bytes vs 20)
- * - Nodes: float for mins/maxs, int32 for children, uint32 for faces (44 bytes vs 24)
- * - Leafs: float for mins/maxs, uint32 for marksurfaces (44 bytes vs 28)
- * - Marksurfaces: uint32 indices instead of uint16
- * - Surfedges: same as BSP29 (int32)
- * - Clipnodes: int32 for child indices instead of int16
- * @augments BSP29Loader
- */
-// @ts-ignore - Method override is intentional for BSP2 format differences
-export class BSP2Loader extends BSP29Loader {
-  /**
-   * Get magic numbers that identify this format
-   * @returns {number[]} Array of magic numbers
-   */
-  getMagicNumbers() {
-    // 'BSP2' in little-endian = 0x32425350 = 844124994
-    return [844124994];
-  }
-
-  /**
-   * Get human-readable name of this loader
-   * @returns {string} Loader name
-   */
-  getName() {
-    return 'BSP2';
-  }
-
-  /**
-   * Load faces from BSP lump (BSP2 version with 32-bit indices)
-   * @protected
-   * @param {BrushModel} loadmodel - The model being loaded
-   * @param {ArrayBuffer} buf - The BSP file buffer
-   * @throws {CorruptedResourceError} If faces lump size is not a multiple of 28
-   */
-  _loadFaces(loadmodel, buf) {
-    const view = new DataView(buf);
-    // Use parent class lump enum (it's private, so we calculate offset same way)
-    const lumpIndex = 7; // faces lump
-    let fileofs = view.getUint32((lumpIndex << 3) + 4, true);
-    const filelen = view.getUint32((lumpIndex << 3) + 8, true);
-
-    // BSP2 faces are 28 bytes
-    if ((filelen % 28) !== 0) {
-      throw new CorruptedResourceError(loadmodel.name, 'BSP2Loader: faces lump size is not a multiple of 28');
-    }
-
-    const lmshift = loadmodel.worldspawnInfo._lightmap_scale ? Math.log2(parseInt(loadmodel.worldspawnInfo._lightmap_scale)) : 4;
-    const count = filelen / 28;
-    loadmodel.firstface = 0;
-    loadmodel.numfaces = count;
-    loadmodel.faces.length = count;
-
-    for (let i = 0; i < count; i++) {
-      const styles = new Uint8Array(buf, fileofs + 20, 4);
-      const out = Object.assign(new Face(), {
-        plane: loadmodel.planes[view.getUint32(fileofs, true)], // int planenum (offset 0)
-        planeBack: view.getInt32(fileofs + 4, true) !== 0, // int side (offset 4)
-        firstedge: view.getUint32(fileofs + 8, true), // int firstedge (offset 8)
-        numedges: view.getUint32(fileofs + 12, true), // int numedges (offset 12)
-        texinfo: view.getUint32(fileofs + 16, true), // int texinfo (offset 16)
-        lightofs: view.getInt32(fileofs + 24, true), // int lightofs (offset 24)
-        lmshift,
-      });
-
-      for (let j = 0; j < 4; j++) {
-        if (styles[j] !== 255) {
-          out.styles[j] = styles[j];
-        }
-      }
-
-      const mins = [Infinity, Infinity];
-      const maxs = [-Infinity, -Infinity];
-      const tex = loadmodel.texinfo[out.texinfo];
-      out.texture = tex.texture;
-
-      for (let j = 0; j < out.numedges; j++) {
-        const e = loadmodel.surfedges[out.firstedge + j];
-        const v = e >= 0
-          ? loadmodel.vertexes[loadmodel.edges[e][0]]
-          : loadmodel.vertexes[loadmodel.edges[-e][1]];
-
-        const val0 = v.dot(new Vector(...tex.vecs[0])) + tex.vecs[0][3];
-        const val1 = v.dot(new Vector(...tex.vecs[1])) + tex.vecs[1][3];
-
-        if (val0 < mins[0]) {
-          mins[0] = val0;
-        }
-
-        if (val0 > maxs[0]) {
-          maxs[0] = val0;
-        }
-
-        if (val1 < mins[1]) {
-          mins[1] = val1;
-        }
-
-        if (val1 > maxs[1]) {
-          maxs[1] = val1;
-        }
-      }
-
-      const lmscale = 1 << out.lmshift;
-      out.texturemins = [Math.floor(mins[0] / lmscale) * lmscale, Math.floor(mins[1] / lmscale) * lmscale];
-      out.extents = [Math.ceil(maxs[0] / lmscale) * lmscale - out.texturemins[0], Math.ceil(maxs[1] / lmscale) * lmscale - out.texturemins[1]];
-
-      if (loadmodel.textures[tex.texture].flags & materialFlags.MF_TURBULENT) {
-        out.turbulent = true;
-      } else if (loadmodel.textures[tex.texture].flags & materialFlags.MF_SKY) {
-        out.sky = true;
-      }
-
-      out.normal.set(out.plane.normal);
-      if (out.planeBack) {
-        out.normal.multiply(-1.0);
-      }
-
-      loadmodel.faces[i] = out;
-      fileofs += 28;
-    }
-    loadmodel.bspxoffset = Math.max(loadmodel.bspxoffset, fileofs);
-  }
-
-  /**
-   * Load BSP tree nodes from BSP lump (BSP2 version with 32-bit children indices)
-   * @protected
-   * @param {BrushModel} loadmodel - The model being loaded
-   * @param {ArrayBuffer} buf - The BSP file buffer
-   * @throws {CorruptedResourceError} If nodes lump is empty or incorrectly sized
-   */
-  _loadNodes(loadmodel, buf) {
-    const view = new DataView(buf);
-    const lumpIndex = 5; // nodes lump
-    let fileofs = view.getUint32((lumpIndex << 3) + 4, true);
-    const filelen = view.getUint32((lumpIndex << 3) + 8, true);
-
-    // BSP2 nodes are 44 bytes (vs 24 in BSP29):
-    // uint32 planenum, int32 children[2], float mins[3], float maxs[3],
-    // uint32 firstface, uint32 numfaces
-    if ((filelen === 0) || ((filelen % 44) !== 0)) {
-      throw new Error('BSP2Loader: nodes lump size is invalid in ' + loadmodel.name);
-    }
-    const count = filelen / 44;
-    loadmodel.nodes.length = count;
-
-    for (let i = 0; i < count; i++) {
-      loadmodel.nodes[i] = Object.assign(new Node(loadmodel), {
-        num: i,
-        planenum: view.getUint32(fileofs, true),
-        children: [view.getInt32(fileofs + 4, true), view.getInt32(fileofs + 8, true)], // int32 instead of int16
-        mins: new Vector(view.getFloat32(fileofs + 12, true), view.getFloat32(fileofs + 16, true), view.getFloat32(fileofs + 20, true)), // float instead of int16
-        maxs: new Vector(view.getFloat32(fileofs + 24, true), view.getFloat32(fileofs + 28, true), view.getFloat32(fileofs + 32, true)), // float instead of int16
-        firstface: view.getUint32(fileofs + 36, true), // uint32 instead of uint16
-        numfaces: view.getUint32(fileofs + 40, true), // uint32 instead of uint16
-      });
-      loadmodel.nodes[i].baseMins = loadmodel.nodes[i].mins.copy();
-      loadmodel.nodes[i].baseMaxs = loadmodel.nodes[i].maxs.copy();
-      fileofs += 44;
-    }
-
-    for (let i = 0; i < count; i++) {
-      const out = loadmodel.nodes[i];
-      out.plane = loadmodel.planes[out.planenum];
-      // At this point children contain indices, we convert them to Node references
-      const child0Idx = /** @type {number} */ (out.children[0]);
-      const child1Idx = /** @type {number} */ (out.children[1]);
-      out.children[0] = child0Idx >= 0
-        ? loadmodel.nodes[child0Idx]
-        : loadmodel.leafs[-1 - child0Idx];
-      out.children[1] = child1Idx >= 0
-        ? loadmodel.nodes[child1Idx]
-        : loadmodel.leafs[-1 - child1Idx];
-    }
-
-    // Set parent references recursively
-    const setParent = (node, parent) => {
-      node.parent = parent;
-      // Stop recursion at leaf nodes (contents < 0 or null children)
-      if (node.contents < 0 || !node.children[0] || !node.children[1]) {
-        return;
-      }
-      setParent(/** @type {Node} */(node.children[0]), node);
-      setParent(/** @type {Node} */(node.children[1]), node);
-    };
-    setParent(loadmodel.nodes[0], null);
-    loadmodel.bspxoffset = Math.max(loadmodel.bspxoffset, fileofs);
-  }
-
-  /**
-   * Load BSP leaf nodes from BSP lump (BSP2 version with 32-bit indices)
-   * @protected
-   * @param {BrushModel} loadmodel - The model being loaded
-   * @param {ArrayBuffer} buf - The BSP file buffer
-   * @throws {Error} If leafs lump size is not a multiple of 44
-   */
-  _loadLeafs(loadmodel, buf) {
-    const view = new DataView(buf);
-    const lumpIndex = 10; // leafs lump
-    let fileofs = view.getUint32((lumpIndex << 3) + 4, true);
-    const filelen = view.getUint32((lumpIndex << 3) + 8, true);
-
-    // BSP2 leafs are 44 bytes (vs 28 in BSP29):
-    // int32 contents, int32 visofs, float mins[3], float maxs[3],
-    // uint32 firstmarksurface, uint32 nummarksurfaces, uint8 ambient_level[4]
-    if ((filelen % 44) !== 0) {
-      throw new Error('BSP2Loader: leafs lump size is not a multiple of 44 in ' + loadmodel.name);
-    }
-    const count = filelen / 44;
-    loadmodel.leafs.length = count;
-
-    for (let i = 0; i < count; i++) {
-      loadmodel.leafs[i] = Object.assign(new Node(loadmodel), {
-        num: i,
-        contents: view.getInt32(fileofs, true),
-        visofs: view.getInt32(fileofs + 4, true),
-        cluster: i > 0 ? i - 1 : -1,
-        mins: new Vector(view.getFloat32(fileofs + 8, true), view.getFloat32(fileofs + 12, true), view.getFloat32(fileofs + 16, true)), // float instead of int16
-        maxs: new Vector(view.getFloat32(fileofs + 20, true), view.getFloat32(fileofs + 24, true), view.getFloat32(fileofs + 28, true)), // float instead of int16
-        firstmarksurface: view.getUint32(fileofs + 32, true), // uint32 instead of uint16
-        nummarksurfaces: view.getUint32(fileofs + 36, true), // uint32 instead of uint16
-        ambient_level: [
-          view.getUint8(fileofs + 40),
-          view.getUint8(fileofs + 41),
-          view.getUint8(fileofs + 42),
-          view.getUint8(fileofs + 43),
-        ],
-      });
-      loadmodel.leafs[i].baseMins = loadmodel.leafs[i].mins.copy();
-      loadmodel.leafs[i].baseMaxs = loadmodel.leafs[i].maxs.copy();
-      fileofs += 44;
-    }
-    loadmodel.bspxoffset = Math.max(loadmodel.bspxoffset, fileofs);
-  }
-
-  /**
-   * Load marksurfaces from BSP lump (BSP2 version with 32-bit indices)
-   * @protected
-   * @param {BrushModel} loadmodel - The model being loaded
-   * @param {ArrayBuffer} buf - The BSP file buffer
-   * @throws {CorruptedResourceError} If marksurfaces lump size is not a multiple of 4
-   */
-  _loadMarksurfaces(loadmodel, buf) {
-    const view = new DataView(buf);
-    const lumpIndex = 11; // marksurfaces lump
-    let fileofs = view.getUint32((lumpIndex << 3) + 4, true);
-    const filelen = view.getUint32((lumpIndex << 3) + 8, true);
-
-    // BSP2 uses uint32 for marksurfaces (vs uint16 in BSP29)
-    if ((filelen & 3) !== 0) {
-      throw new CorruptedResourceError(loadmodel.name, 'BSP2Loader: marksurfaces lump size is not a multiple of 4');
-    }
-    const count = filelen >> 2;
-    loadmodel.marksurfaces.length = count;
-
-    for (let i = 0; i < count; i++) {
-      loadmodel.marksurfaces[i] = view.getUint32(fileofs, true); // uint32 instead of uint16
-      fileofs += 4;
-    }
-    loadmodel.bspxoffset = Math.max(loadmodel.bspxoffset, fileofs);
-  }
-
-  /**
-   * Load collision clipnodes and initialize physics hulls (BSP2 version with 32-bit children)
-   * @protected
-   * @param {BrushModel} loadmodel - The model being loaded
-   * @param {ArrayBuffer} buf - The BSP file buffer
-   */
-  _loadClipnodes(loadmodel, buf) {
-    const view = new DataView(buf);
-    const lumpIndex = 9; // clipnodes lump
-    let fileofs = view.getUint32((lumpIndex << 3) + 4, true);
-    const filelen = view.getUint32((lumpIndex << 3) + 8, true);
-
-    // BSP2 clipnodes are 12 bytes (vs 8 in BSP29):
-    // int32 planenum, int32 children[2]
-    if ((filelen % 12) !== 0) {
-      throw new Error('BSP2Loader: clipnodes lump size is not a multiple of 12 in ' + loadmodel.name);
-    }
-    const count = filelen / 12;
-    loadmodel.clipnodes.length = count;
-
-    // Initialize hulls (same as BSP29)
-    loadmodel.hulls.length = 3;
-    loadmodel.hulls[1] = {
-      clipnodes: loadmodel.clipnodes,
-      firstclipnode: 0,
-      lastclipnode: count - 1,
-      planes: loadmodel.planes,
-      clip_mins: new Vector(-16.0, -16.0, -24.0),
-      clip_maxs: new Vector(16.0, 16.0, 32.0),
-    };
-    loadmodel.hulls[2] = {
-      clipnodes: loadmodel.clipnodes,
-      firstclipnode: 0,
-      lastclipnode: count - 1,
-      planes: loadmodel.planes,
-      clip_mins: new Vector(-32.0, -32.0, -24.0),
-      clip_maxs: new Vector(32.0, 32.0, 64.0),
-    };
-
-    for (let i = 0; i < count; i++) {
-      loadmodel.clipnodes[i] = {
-        planenum: view.getInt32(fileofs, true),
-        children: [view.getInt32(fileofs + 4, true), view.getInt32(fileofs + 8, true)], // int32 instead of int16
-      };
-      fileofs += 12;
-    }
-    loadmodel.bspxoffset = Math.max(loadmodel.bspxoffset, fileofs);
-  }
-
-  /**
-   * Load edges from BSP lump
-   * @protected
-   * @param {BrushModel} loadmodel - The model being loaded
-   * @param {ArrayBuffer} buf - The BSP file buffer
-   * @throws {CorruptedResourceError} If edge lump size is not a multiple of 8
-   */
-  _loadEdges(loadmodel, buf) {
-    const view = new DataView(buf);
-    const lump = 12; // edges lump
-    let fileofs = view.getUint32((lump << 3) + 4, true);
-    const filelen = view.getUint32((lump << 3) + 8, true);
-    if ((filelen % 8) !== 0) {
-      throw new CorruptedResourceError(loadmodel.name, 'BSP2Loader: edges lump size is not a multiple of 8');
-    }
-    const count = filelen >> 3;
-    loadmodel.edges.length = count;
-    for (let i = 0; i < count; i++) {
-      loadmodel.edges[i] = [view.getUint32(fileofs, true), view.getUint32(fileofs + 4, true)];
-      fileofs += 8;
-    }
-    loadmodel.bspxoffset = Math.max(loadmodel.bspxoffset, fileofs);
-  }
-}
diff --git a/source/engine/common/model/loaders/BSP2Loader.ts b/source/engine/common/model/loaders/BSP2Loader.ts
new file mode 100644
index 00000000..ff2ad4d9
--- /dev/null
+++ b/source/engine/common/model/loaders/BSP2Loader.ts
@@ -0,0 +1,310 @@
+import Vector from '../../../../shared/Vector.ts';
+import { CorruptedResourceError } from '../../Errors.ts';
+import { Face } from '../BaseModel.ts';
+import { BrushModel, Node } from '../BSP.ts';
+import { materialFlags } from '../../../client/renderer/Materials.mjs';
+import { BSP29Loader } from './BSP29Loader.ts';
+
+/**
+ * Loader for BSP2 format (.bsp).
+ *
+ * BSP2 is an extended version of BSP29 that uses 32-bit indices instead of
+ * 16-bit indices for larger maps.
+ */
+export class BSP2Loader extends BSP29Loader {
+  /** BSP2 lump indices used by the overridden readers below. */
+  static readonly #lump = Object.freeze({
+    faces: 7,
+    nodes: 5,
+    clipnodes: 9,
+    leafs: 10,
+    marksurfaces: 11,
+    edges: 12,
+  });
+
+  override getMagicNumbers(): number[] {
+    return [844124994];
+  }
+
+  override getName(): string {
+    return 'BSP2';
+  }
+
+  /**
+   * Load faces from the BSP2 faces lump.
+   */
+  protected override _loadFaces(loadmodel: BrushModel, buf: ArrayBuffer): void {
+    const view = new DataView(buf);
+    const lump = BSP2Loader.#lump;
+    let fileofs = view.getUint32((lump.faces << 3) + 4, true);
+    const filelen = view.getUint32((lump.faces << 3) + 8, true);
+
+    if ((filelen % 28) !== 0) {
+      throw new CorruptedResourceError(loadmodel.name, 'BSP2Loader: faces lump size is not a multiple of 28');
+    }
+
+    const lmshift = loadmodel.worldspawnInfo._lightmap_scale ? Math.log2(parseInt(loadmodel.worldspawnInfo._lightmap_scale, 10)) : 4;
+    const count = filelen / 28;
+    loadmodel.firstface = 0;
+    loadmodel.numfaces = count;
+    loadmodel.faces.length = count;
+
+    for (let i = 0; i < count; i++) {
+      const styles = new Uint8Array(buf, fileofs + 20, 4);
+      const face = Object.assign(new Face(), {
+        plane: loadmodel.planes[view.getUint32(fileofs, true)],
+        planeBack: view.getInt32(fileofs + 4, true) !== 0,
+        firstedge: view.getUint32(fileofs + 8, true),
+        numedges: view.getUint32(fileofs + 12, true),
+        texinfo: view.getUint32(fileofs + 16, true),
+        lightofs: view.getInt32(fileofs + 24, true),
+        lmshift,
+      });
+
+      for (let j = 0; j < 4; j++) {
+        if (styles[j] !== 255) {
+          face.styles[j] = styles[j];
+        }
+      }
+
+      const mins = [Infinity, Infinity];
+      const maxs = [-Infinity, -Infinity];
+      const tex = loadmodel.texinfo[face.texinfo];
+      face.texture = tex.texture;
+
+      for (let j = 0; j < face.numedges; j++) {
+        const edgeIndex = loadmodel.surfedges[face.firstedge + j];
+        const vertex = edgeIndex >= 0
+          ? loadmodel.vertexes[loadmodel.edges[edgeIndex][0]]
+          : loadmodel.vertexes[loadmodel.edges[-edgeIndex][1]];
+
+        const val0 = vertex.dot(new Vector(...tex.vecs[0])) + tex.vecs[0][3];
+        const val1 = vertex.dot(new Vector(...tex.vecs[1])) + tex.vecs[1][3];
+
+        if (val0 < mins[0]) {
+          mins[0] = val0;
+        }
+        if (val0 > maxs[0]) {
+          maxs[0] = val0;
+        }
+        if (val1 < mins[1]) {
+          mins[1] = val1;
+        }
+        if (val1 > maxs[1]) {
+          maxs[1] = val1;
+        }
+      }
+
+      const lmscale = 1 << face.lmshift;
+      face.texturemins = [Math.floor(mins[0] / lmscale) * lmscale, Math.floor(mins[1] / lmscale) * lmscale];
+      face.extents = [Math.ceil(maxs[0] / lmscale) * lmscale - face.texturemins[0], Math.ceil(maxs[1] / lmscale) * lmscale - face.texturemins[1]];
+
+      if ((loadmodel.textures[tex.texture].flags & materialFlags.MF_TURBULENT) !== 0) {
+        face.turbulent = true;
+      } else if ((loadmodel.textures[tex.texture].flags & materialFlags.MF_SKY) !== 0) {
+        face.sky = true;
+      }
+
+      face.normal.set(face.plane.normal);
+      if (face.planeBack) {
+        face.normal.multiply(-1.0);
+      }
+
+      loadmodel.faces[i] = face;
+      fileofs += 28;
+    }
+
+    loadmodel.bspxoffset = Math.max(loadmodel.bspxoffset, fileofs);
+  }
+
+  /**
+   * Load BSP tree nodes from the BSP2 nodes lump.
+   */
+  protected override _loadNodes(loadmodel: BrushModel, buf: ArrayBuffer): void {
+    const view = new DataView(buf);
+    const lump = BSP2Loader.#lump;
+    let fileofs = view.getUint32((lump.nodes << 3) + 4, true);
+    const filelen = view.getUint32((lump.nodes << 3) + 8, true);
+
+    if ((filelen === 0) || ((filelen % 44) !== 0)) {
+      throw new Error(`BSP2Loader: nodes lump size is invalid in ${loadmodel.name}`);
+    }
+
+    const count = filelen / 44;
+    loadmodel.nodes.length = count;
+
+    for (let i = 0; i < count; i++) {
+      loadmodel.nodes[i] = Object.assign(new Node(loadmodel), {
+        num: i,
+        planenum: view.getUint32(fileofs, true),
+        children: [view.getInt32(fileofs + 4, true), view.getInt32(fileofs + 8, true)],
+        mins: new Vector(view.getFloat32(fileofs + 12, true), view.getFloat32(fileofs + 16, true), view.getFloat32(fileofs + 20, true)),
+        maxs: new Vector(view.getFloat32(fileofs + 24, true), view.getFloat32(fileofs + 28, true), view.getFloat32(fileofs + 32, true)),
+        firstface: view.getUint32(fileofs + 36, true),
+        numfaces: view.getUint32(fileofs + 40, true),
+      });
+      loadmodel.nodes[i].baseMins = loadmodel.nodes[i].mins.copy();
+      loadmodel.nodes[i].baseMaxs = loadmodel.nodes[i].maxs.copy();
+      fileofs += 44;
+    }
+
+    for (let i = 0; i < count; i++) {
+      const node = loadmodel.nodes[i];
+      node.plane = loadmodel.planes[node.planenum];
+      const child0Idx = node.children[0] as number;
+      const child1Idx = node.children[1] as number;
+      node.children[0] = child0Idx >= 0 ? loadmodel.nodes[child0Idx] : loadmodel.leafs[-1 - child0Idx];
+      node.children[1] = child1Idx >= 0 ? loadmodel.nodes[child1Idx] : loadmodel.leafs[-1 - child1Idx];
+    }
+
+    /**
+     * Rebuild parent links after BSP2 child indices are resolved.
+     */
+    function setParent(node: Node, parent: Node | null): void {
+      node.parent = parent;
+
+      if (node.contents < 0 || !node.children[0] || !node.children[1]) {
+        return;
+      }
+
+      setParent(node.children[0] as Node, node);
+      setParent(node.children[1] as Node, node);
+    }
+
+    setParent(loadmodel.nodes[0], null);
+    loadmodel.bspxoffset = Math.max(loadmodel.bspxoffset, fileofs);
+  }
+
+  /**
+   * Load BSP leaf nodes from the BSP2 leafs lump.
+   */
+  protected override _loadLeafs(loadmodel: BrushModel, buf: ArrayBuffer): void {
+    const view = new DataView(buf);
+    const lump = BSP2Loader.#lump;
+    let fileofs = view.getUint32((lump.leafs << 3) + 4, true);
+    const filelen = view.getUint32((lump.leafs << 3) + 8, true);
+
+    if ((filelen % 44) !== 0) {
+      throw new Error(`BSP2Loader: leafs lump size is not a multiple of 44 in ${loadmodel.name}`);
+    }
+
+    const count = filelen / 44;
+    loadmodel.leafs.length = count;
+
+    for (let i = 0; i < count; i++) {
+      loadmodel.leafs[i] = Object.assign(new Node(loadmodel), {
+        num: i,
+        contents: view.getInt32(fileofs, true),
+        visofs: view.getInt32(fileofs + 4, true),
+        cluster: i > 0 ? i - 1 : -1,
+        mins: new Vector(view.getFloat32(fileofs + 8, true), view.getFloat32(fileofs + 12, true), view.getFloat32(fileofs + 16, true)),
+        maxs: new Vector(view.getFloat32(fileofs + 20, true), view.getFloat32(fileofs + 24, true), view.getFloat32(fileofs + 28, true)),
+        firstmarksurface: view.getUint32(fileofs + 32, true),
+        nummarksurfaces: view.getUint32(fileofs + 36, true),
+        ambient_level: [
+          view.getUint8(fileofs + 40),
+          view.getUint8(fileofs + 41),
+          view.getUint8(fileofs + 42),
+          view.getUint8(fileofs + 43),
+        ],
+      });
+      loadmodel.leafs[i].baseMins = loadmodel.leafs[i].mins.copy();
+      loadmodel.leafs[i].baseMaxs = loadmodel.leafs[i].maxs.copy();
+      fileofs += 44;
+    }
+
+    loadmodel.bspxoffset = Math.max(loadmodel.bspxoffset, fileofs);
+  }
+
+  /**
+   * Load marksurfaces from the BSP2 marksurfaces lump.
+   */
+  protected override _loadMarksurfaces(loadmodel: BrushModel, buf: ArrayBuffer): void {
+    const view = new DataView(buf);
+    const lump = BSP2Loader.#lump;
+    let fileofs = view.getUint32((lump.marksurfaces << 3) + 4, true);
+    const filelen = view.getUint32((lump.marksurfaces << 3) + 8, true);
+
+    if ((filelen & 3) !== 0) {
+      throw new CorruptedResourceError(loadmodel.name, 'BSP2Loader: marksurfaces lump size is not a multiple of 4');
+    }
+
+    const count = filelen >> 2;
+    loadmodel.marksurfaces.length = count;
+
+    for (let i = 0; i < count; i++) {
+      loadmodel.marksurfaces[i] = view.getUint32(fileofs, true);
+      fileofs += 4;
+    }
+
+    loadmodel.bspxoffset = Math.max(loadmodel.bspxoffset, fileofs);
+  }
+
+  /**
+   * Load clipnodes from the BSP2 clipnodes lump.
+   */
+  protected override _loadClipnodes(loadmodel: BrushModel, buf: ArrayBuffer): void {
+    const view = new DataView(buf);
+    const lump = BSP2Loader.#lump;
+    let fileofs = view.getUint32((lump.clipnodes << 3) + 4, true);
+    const filelen = view.getUint32((lump.clipnodes << 3) + 8, true);
+
+    if ((filelen % 12) !== 0) {
+      throw new Error(`BSP2Loader: clipnodes lump size is not a multiple of 12 in ${loadmodel.name}`);
+    }
+
+    const count = filelen / 12;
+    loadmodel.clipnodes.length = count;
+    loadmodel.hulls.length = 3;
+    loadmodel.hulls[1] = {
+      clipnodes: loadmodel.clipnodes,
+      firstclipnode: 0,
+      lastclipnode: count - 1,
+      planes: loadmodel.planes,
+      clip_mins: new Vector(-16.0, -16.0, -24.0),
+      clip_maxs: new Vector(16.0, 16.0, 32.0),
+    };
+    loadmodel.hulls[2] = {
+      clipnodes: loadmodel.clipnodes,
+      firstclipnode: 0,
+      lastclipnode: count - 1,
+      planes: loadmodel.planes,
+      clip_mins: new Vector(-32.0, -32.0, -24.0),
+      clip_maxs: new Vector(32.0, 32.0, 64.0),
+    };
+
+    for (let i = 0; i < count; i++) {
+      loadmodel.clipnodes[i] = {
+        planenum: view.getInt32(fileofs, true),
+        children: [view.getInt32(fileofs + 4, true), view.getInt32(fileofs + 8, true)],
+      };
+      fileofs += 12;
+    }
+
+    loadmodel.bspxoffset = Math.max(loadmodel.bspxoffset, fileofs);
+  }
+
+  /**
+   * Load edges from the BSP2 edges lump.
+   */
+  protected override _loadEdges(loadmodel: BrushModel, buf: ArrayBuffer): void {
+    const view = new DataView(buf);
+    const lump = BSP2Loader.#lump;
+    let fileofs = view.getUint32((lump.edges << 3) + 4, true);
+    const filelen = view.getUint32((lump.edges << 3) + 8, true);
+
+    if ((filelen % 8) !== 0) {
+      throw new CorruptedResourceError(loadmodel.name, 'BSP2Loader: edges lump size is not a multiple of 8');
+    }
+
+    const count = filelen >> 3;
+    loadmodel.edges.length = count;
+
+    for (let i = 0; i < count; i++) {
+      loadmodel.edges[i] = [view.getUint32(fileofs, true), view.getUint32(fileofs + 4, true)];
+      fileofs += 8;
+    }
+
+    loadmodel.bspxoffset = Math.max(loadmodel.bspxoffset, fileofs);
+  }
+}
diff --git a/source/engine/common/model/loaders/BSP38Loader.mjs b/source/engine/common/model/loaders/BSP38Loader.mjs
deleted file mode 100644
index 30089cb0..00000000
--- a/source/engine/common/model/loaders/BSP38Loader.mjs
+++ /dev/null
@@ -1,331 +0,0 @@
-import { content } from '../../../../shared/Defs.ts';
-import Q from '../../../../shared/Q.ts';
-import Vector from '../../../../shared/Vector.ts';
-import { CRC16CCITT } from '../../CRC.ts';
-import { Plane } from '../BaseModel.ts';
-import { Brush, BrushModel, BrushSide, Node } from '../BSP.ts';
-import { ModelLoader } from '../ModelLoader.ts';
-
-/** @typedef {Record<number, DataView>} LumpViews */
-
-const BSP_MAGIC = 1347633737; // 'IBSP' little-endian
-const BSP_VERSION = 38;
-
-const lumps = Object.freeze({
-  LUMP_ENTITIES: 0,
-  LUMP_PLANES: 1,
-  LUMP_VERTEXES: 2,
-  LUMP_VISIBILITY: 3,
-  LUMP_NODES: 4,
-  LUMP_TEXINFO: 5,
-  LUMP_FACES: 6,
-  LUMP_LIGHTING: 7,
-  LUMP_LEAFS: 8,
-  LUMP_LEAFFACES: 9,
-  LUMP_LEAFBRUSHES: 10,
-  LUMP_EDGES: 11,
-  LUMP_SURFEDGES: 12,
-  LUMP_MODELS: 13,
-  LUMP_BRUSHES: 14,
-  LUMP_BRUSHSIDES: 15,
-  LUMP_POP: 16,
-  LUMP_AREAS: 17,
-  LUMP_AREAPORTALS: 18,
-});
-
-export class BSP38Loader extends ModelLoader {
-  static #contentsMap = Object.freeze({
-    0: content.CONTENT_EMPTY,
-    1: content.CONTENT_SOLID,
-    2: content.CONTENT_SOLID, // window
-    4: content.CONTENT_EMPTY, // aux
-    8: content.CONTENT_LAVA,
-    16: content.CONTENT_SLIME,
-    32: content.CONTENT_WATER,
-    64: content.CONTENT_EMPTY, // fog
-
-    0x08000: content.CONTENT_EMPTY, // area portal
-    0x10000: content.CONTENT_EMPTY, // player clip
-    0x20000: content.CONTENT_EMPTY, // monster clip
-
-    0x040000: content.CONTENT_CURRENT_0,
-    0x080000: content.CONTENT_CURRENT_90,
-    0x100000: content.CONTENT_CURRENT_180,
-    0x200000: content.CONTENT_CURRENT_270,
-    0x400000: content.CONTENT_CURRENT_UP,
-    0x800000: content.CONTENT_CURRENT_DOWN,
-
-    0x10000000: content.CONTENT_EMPTY, // translucent
-    0x20000000: content.CONTENT_EMPTY, // ladder
-  });
-
-  getMagicNumbers() {
-    return [BSP_MAGIC];
-  }
-
-  getExtensions() {
-    return ['.bsp'];
-  }
-
-  getName() {
-    return 'Quake 2 BSP38';
-  }
-
-  canLoad(buffer, filename) {
-    const view = new DataView(buffer);
-
-    return super.canLoad(buffer, filename) && view.getUint32(4, true) === BSP_VERSION;
-  }
-
-  _loadLumps(buffer) {
-    /** @type {LumpViews} */
-    const lumpViews = {};
-
-    const dv = new DataView(buffer);
-
-    for (let i = 0; i < Object.keys(lumps).length; i++) {
-      const offset = dv.getUint32(8 + i * 8, true);
-      const length = dv.getUint32(8 + i * 8 + 4, true);
-
-      lumpViews[i] = new DataView(buffer, offset, length);
-    }
-
-    return lumpViews;
-  }
-
-  /**
-   * Reads a null-terminated string from a DataView.
-   * @param {DataView} dataView data view to read from
-   * @param {number} offset optional, offset to start reading
-   * @param {number} length optional, length of the string to read
-   * @returns {string} string, null-terminated or up to length
-   */
-  _readString(dataView, offset = 0, length = dataView.byteLength - offset) {
-    return Q.memstr(new Uint8Array(dataView.buffer, dataView.byteOffset + offset, length));
-  }
-
-  /**
-   * @param {DataView} entitiesLump data view of entities lump
-   * @param {BrushModel} loadmodel brush model
-   */
-  _loadEntities(entitiesLump, loadmodel) {
-    loadmodel.entities = this._readString(entitiesLump, 0, entitiesLump.byteLength);
-  }
-
-  /**
-   * @param {DataView} texinfoLump data view of texinfo lump
-   * @param {BrushModel} loadmodel brush model
-   */
-  _loadSurfaces(texinfoLump, loadmodel) {
-    loadmodel.texinfo.length = 0;
-
-    // float		vecs[2][4];		// [s/t][xyz offset]
-    // int32		flags;			// miptex flags + overrides
-    // int32		value;			// light emission, etc
-    // char		texture[32];	// texture name (textures/*.wal)
-    // int32		nexttexinfo;	// for animations, -1 = end of chain
-
-    const stride = 76;
-    const length = texinfoLump.byteLength / stride;
-    for (let i = 0; i < length; i++) {
-      const offset = i * stride;
-
-      // TODO: class
-      loadmodel.texinfo.push({
-        vecs: [
-          [
-            texinfoLump.getFloat32(offset + 0, true),
-            texinfoLump.getFloat32(offset + 4, true),
-            texinfoLump.getFloat32(offset + 8, true),
-            texinfoLump.getFloat32(offset + 12, true),
-          ],
-          [
-            texinfoLump.getFloat32(offset + 16, true),
-            texinfoLump.getFloat32(offset + 20, true),
-            texinfoLump.getFloat32(offset + 24, true),
-            texinfoLump.getFloat32(offset + 28, true),
-          ],
-        ],
-        flags: texinfoLump.getInt32(offset + 32, true),
-        value: texinfoLump.getInt32(offset + 36, true),
-        texture: this._readString(texinfoLump, offset + 40, 32),
-        nexttexinfo: texinfoLump.getInt32(offset + 72, true),
-      });
-    }
-  }
-
-  /**
-   * @param {number} contents Quake2 contents
-   * @returns {number} translated contents
-   */
-  _translateQ2Contents(contents) {
-    console.assert(contents in BSP38Loader.#contentsMap);
-    return BSP38Loader.#contentsMap[contents];
-  }
-
-  /**
-   * @param {DataView} leafsLump data view of leafs lump
-   * @param {BrushModel} loadmodel brush model
-   */
-  _loadLeafs(leafsLump, loadmodel) {
-    loadmodel.leafs.length = 0;
-
-    // int32			contents;			// OR of all brushes (not needed?)
-    // int16			cluster;
-    // int16			area;
-    // int16			mins[3];			// for frustum culling
-    // int16			maxs[3];
-    // uint16			firstleafface;
-    // uint16			numleaffaces;
-    // uint16			firstleafbrush;
-    // uint16			numleafbrushes;
-
-    const stride = 28;
-    const length = leafsLump.byteLength / stride;
-    for (let i = 0; i < length; i++) {
-      const offset = i * stride;
-
-      loadmodel.leafs.push(/** @type {Node} */(Object.assign(new Node(loadmodel), {
-        num: i,
-        contents: this._translateQ2Contents(leafsLump.getInt32(offset + 0, true)),
-        cluster: leafsLump.getInt16(offset + 4, true),
-        area: leafsLump.getInt16(offset + 6, true),
-        mins: new Vector(
-          leafsLump.getInt16(offset + 8, true),
-          leafsLump.getInt16(offset + 10, true),
-          leafsLump.getInt16(offset + 12, true),
-        ),
-        maxs: new Vector(
-          leafsLump.getInt16(offset + 14, true),
-          leafsLump.getInt16(offset + 16, true),
-          leafsLump.getInt16(offset + 18, true),
-        ),
-        firstmarksurface: leafsLump.getUint16(offset + 20, true),
-        nummarksurfaces: leafsLump.getUint16(offset + 22, true),
-        firstleafbrush: leafsLump.getUint16(offset + 24, true),
-        numleafbrushes: leafsLump.getUint16(offset + 26, true),
-      })));
-    }
-  }
-
-  /**
-   * @param {DataView} leafbrushesLump data view of leafbrushes lump
-   * @param {BrushModel} loadmodel brush model
-   */
-  _loadLeafBrushes(leafbrushesLump, loadmodel) {
-    const count = leafbrushesLump.byteLength / 2; // all uint16
-    loadmodel.leafbrushes = new Array(count);
-
-    for (let i = 0; i < count; i++) {
-      loadmodel.leafbrushes[i] = leafbrushesLump.getUint16(i * 2, true);
-    }
-  }
-
-  /**
-   * @param {DataView} planesLump data view of planes lump
-   * @param {BrushModel} loadmodel brush model
-   */
-  _loadPlanes(planesLump, loadmodel) {
-    loadmodel.planes.length = 0;
-
-    // float	normal[3];
-    // float	dist;
-    // int32	type;		// PLANE_X - PLANE_ANYZ ?remove? trivial to regenerate
-
-    const stride = 20;
-    const length = planesLump.byteLength / stride;
-    for (let i = 0; i < length; i++) {
-      const offset = i * stride;
-
-      loadmodel.planes.push(new Plane(
-        new Vector(
-          planesLump.getFloat32(offset + 0, true),
-          planesLump.getFloat32(offset + 4, true),
-          planesLump.getFloat32(offset + 8, true),
-        ),
-        planesLump.getFloat32(offset + 12, true),
-      ));
-
-      // CR: not reading in type
-    }
-  }
-
-  /**
-   * @param {DataView} brushesLump data view of brushes lump
-   * @param {BrushModel} loadmodel brush model
-   */
-  _loadBrushes(brushesLump, loadmodel) {
-    // int32			firstside;
-    // int32			numsides;
-    // int32			contents;
-
-    const stride = 12;
-    const length = brushesLump.byteLength / stride;
-
-    loadmodel.brushes = new Array(length);
-
-    for (let i = 0; i < length; i++) {
-      const offset = i * stride;
-
-      loadmodel.brushes[i] = Object.assign(new Brush(loadmodel), {
-        firstside: brushesLump.getInt32(offset + 0, true),
-        numsides: brushesLump.getInt32(offset + 4, true),
-        contents: this._translateQ2Contents(brushesLump.getInt32(offset + 8, true)),
-      });
-    }
-  }
-
-  _loadBrushSides(brushsidesLump, loadmodel) {
-    // uint16	planenum;		// facing out of the leaf
-    // int16	texinfo;
-
-    const stride = 4;
-    const length = brushsidesLump.byteLength / stride;
-    loadmodel.brushsides = new Array(length);
-
-    for (let i = 0; i < length; i++) {
-      const offset = i * stride;
-
-      loadmodel.brushsides[i] = /** @type {BrushSide} */ (Object.assign(new BrushSide(loadmodel), {
-        planenum: brushsidesLump.getUint16(offset + 0, true),
-        texinfo: brushsidesLump.getInt16(offset + 2, true),
-      }));
-    }
-  }
-
-  _loadSubmodels(modelsLump, loadmodel) {
-    // float		mins[3], maxs[3];
-    // float		origin[3];		// for sounds or lights
-    // int32		headnode;
-    // int32		firstface, numfaces;	// submodels just draw faces
-    //                   // without walking the bsp tree
-
-    void modelsLump;
-    loadmodel.submodels.length = 0;
-
-
-  }
-
-  load(buffer, name) {
-    const loadmodel = new BrushModel(name);
-
-    loadmodel.version = BSP_VERSION;
-
-    const lviews = this._loadLumps(buffer);
-    this._loadEntities(lviews[lumps.LUMP_ENTITIES], loadmodel);
-    this._loadSurfaces(lviews[lumps.LUMP_TEXINFO], loadmodel);
-    this._loadLeafs(lviews[lumps.LUMP_LEAFS], loadmodel);
-    this._loadLeafBrushes(lviews[lumps.LUMP_LEAFBRUSHES], loadmodel);
-    this._loadPlanes(lviews[lumps.LUMP_PLANES], loadmodel);
-    this._loadBrushes(lviews[lumps.LUMP_BRUSHES], loadmodel);
-    this._loadBrushSides(lviews[lumps.LUMP_BRUSHSIDES], loadmodel);
-    this._loadSubmodels(lviews[lumps.LUMP_MODELS], loadmodel);
-
-    loadmodel.needload = false;
-    loadmodel.checksum = CRC16CCITT.Block(new Uint8Array(buffer));
-
-    return Promise.resolve(loadmodel);
-  }
-};
-
-
diff --git a/source/engine/common/model/loaders/BSP38Loader.ts b/source/engine/common/model/loaders/BSP38Loader.ts
new file mode 100644
index 00000000..c5481e75
--- /dev/null
+++ b/source/engine/common/model/loaders/BSP38Loader.ts
@@ -0,0 +1,297 @@
+import { content } from '../../../../shared/Defs.ts';
+import Q from '../../../../shared/Q.ts';
+import Vector from '../../../../shared/Vector.ts';
+import { CRC16CCITT } from '../../CRC.ts';
+import { Plane } from '../BaseModel.ts';
+import { Brush, BrushModel, BrushSide, Node } from '../BSP.ts';
+import { ModelLoader } from '../ModelLoader.ts';
+
+interface LumpViews {
+  [index: number]: DataView;
+}
+
+enum BSP38Lump {
+  ENTITIES = 0,
+  PLANES = 1,
+  VERTEXES = 2,
+  VISIBILITY = 3,
+  NODES = 4,
+  TEXINFO = 5,
+  FACES = 6,
+  LIGHTING = 7,
+  LEAFS = 8,
+  LEAFFACES = 9,
+  LEAFBRUSHES = 10,
+  EDGES = 11,
+  SURFEDGES = 12,
+  MODELS = 13,
+  BRUSHES = 14,
+  BRUSHSIDES = 15,
+  POP = 16,
+  AREAS = 17,
+  AREAPORTALS = 18,
+}
+
+const BSP_MAGIC = 1347633737;
+const BSP_VERSION = 38;
+
+/**
+ * Loader for Quake 2 BSP38 format (.bsp).
+ */
+export class BSP38Loader extends ModelLoader {
+  static readonly #contentsMap: Record<number, number> = Object.freeze({
+    0: content.CONTENT_EMPTY,
+    1: content.CONTENT_SOLID,
+    2: content.CONTENT_SOLID,
+    4: content.CONTENT_EMPTY,
+    8: content.CONTENT_LAVA,
+    16: content.CONTENT_SLIME,
+    32: content.CONTENT_WATER,
+    64: content.CONTENT_EMPTY,
+
+    0x08000: content.CONTENT_EMPTY,
+    0x10000: content.CONTENT_EMPTY,
+    0x20000: content.CONTENT_EMPTY,
+
+    0x040000: content.CONTENT_CURRENT_0,
+    0x080000: content.CONTENT_CURRENT_90,
+    0x100000: content.CONTENT_CURRENT_180,
+    0x200000: content.CONTENT_CURRENT_270,
+    0x400000: content.CONTENT_CURRENT_UP,
+    0x800000: content.CONTENT_CURRENT_DOWN,
+
+    0x10000000: content.CONTENT_EMPTY,
+    0x20000000: content.CONTENT_EMPTY,
+  });
+
+  override getMagicNumbers(): number[] {
+    return [BSP_MAGIC];
+  }
+
+  override getExtensions(): string[] {
+    return ['.bsp'];
+  }
+
+  override getName(): string {
+    return 'Quake 2 BSP38';
+  }
+
+  override canLoad(buffer: ArrayBuffer, filename: string): boolean {
+    const view = new DataView(buffer);
+
+    return super.canLoad(buffer, filename) && view.getUint32(4, true) === BSP_VERSION;
+  }
+
+  override load(buffer: ArrayBuffer, name: string): Promise<BrushModel> {
+    const loadmodel = new BrushModel(name);
+
+    loadmodel.version = BSP_VERSION;
+
+    const lumpViews = this.#loadLumps(buffer);
+    this.#loadEntities(lumpViews[BSP38Lump.ENTITIES], loadmodel);
+    this.#loadSurfaces(lumpViews[BSP38Lump.TEXINFO], loadmodel);
+    this.#loadLeafs(lumpViews[BSP38Lump.LEAFS], loadmodel);
+    this.#loadLeafBrushes(lumpViews[BSP38Lump.LEAFBRUSHES], loadmodel);
+    this.#loadPlanes(lumpViews[BSP38Lump.PLANES], loadmodel);
+    this.#loadBrushes(lumpViews[BSP38Lump.BRUSHES], loadmodel);
+    this.#loadBrushSides(lumpViews[BSP38Lump.BRUSHSIDES], loadmodel);
+    this.#loadSubmodels(lumpViews[BSP38Lump.MODELS], loadmodel);
+
+    loadmodel.needload = false;
+    loadmodel.checksum = CRC16CCITT.Block(new Uint8Array(buffer));
+
+    return Promise.resolve(loadmodel);
+  }
+
+  /**
+   * Slice all BSP38 lumps into DataViews.
+   * @returns Per-lump DataViews indexed by BSP38 lump number.
+   */
+  #loadLumps(buffer: ArrayBuffer): LumpViews {
+    const lumpViews: LumpViews = {};
+    const view = new DataView(buffer);
+
+    for (let lumpIndex = BSP38Lump.ENTITIES; lumpIndex <= BSP38Lump.AREAPORTALS; lumpIndex++) {
+      const offset = view.getUint32(8 + lumpIndex * 8, true);
+      const length = view.getUint32(8 + lumpIndex * 8 + 4, true);
+      lumpViews[lumpIndex] = new DataView(buffer, offset, length);
+    }
+
+    return lumpViews;
+  }
+
+  /**
+   * Read a null-terminated string from a lump view.
+   * @returns The decoded lump string.
+   */
+  #readString(dataView: DataView, offset = 0, length = dataView.byteLength - offset): string {
+    return Q.memstr(new Uint8Array(dataView.buffer, dataView.byteOffset + offset, length));
+  }
+
+  /**
+   * Load entity text from the BSP38 entities lump.
+   */
+  #loadEntities(entitiesLump: DataView, loadmodel: BrushModel): void {
+    loadmodel.entities = this.#readString(entitiesLump, 0, entitiesLump.byteLength);
+  }
+
+  /**
+   * Load BSP38 texinfo entries.
+   */
+  #loadSurfaces(texinfoLump: DataView, loadmodel: BrushModel): void {
+    loadmodel.texinfo.length = 0;
+
+    const stride = 76;
+    const length = texinfoLump.byteLength / stride;
+
+    for (let index = 0; index < length; index++) {
+      const offset = index * stride;
+
+      loadmodel.texinfo.push({
+        vecs: [
+          [
+            texinfoLump.getFloat32(offset + 0, true),
+            texinfoLump.getFloat32(offset + 4, true),
+            texinfoLump.getFloat32(offset + 8, true),
+            texinfoLump.getFloat32(offset + 12, true),
+          ],
+          [
+            texinfoLump.getFloat32(offset + 16, true),
+            texinfoLump.getFloat32(offset + 20, true),
+            texinfoLump.getFloat32(offset + 24, true),
+            texinfoLump.getFloat32(offset + 28, true),
+          ],
+        ],
+        flags: texinfoLump.getInt32(offset + 32, true),
+        value: texinfoLump.getInt32(offset + 36, true),
+        texture: this.#readString(texinfoLump, offset + 40, 32),
+        nexttexinfo: texinfoLump.getInt32(offset + 72, true),
+      });
+    }
+  }
+
+  /**
+   * Translate Quake 2 brush contents to Quake contents constants.
+   * @returns The translated Quake contents constant.
+   */
+  #translateQ2Contents(q2Contents: number): number {
+    console.assert(q2Contents in BSP38Loader.#contentsMap);
+    return BSP38Loader.#contentsMap[q2Contents];
+  }
+
+  /**
+   * Load BSP38 leafs.
+   */
+  #loadLeafs(leafsLump: DataView, loadmodel: BrushModel): void {
+    loadmodel.leafs.length = 0;
+
+    const stride = 28;
+    const length = leafsLump.byteLength / stride;
+
+    for (let index = 0; index < length; index++) {
+      const offset = index * stride;
+
+      loadmodel.leafs.push(Object.assign(new Node(loadmodel), {
+        num: index,
+        contents: this.#translateQ2Contents(leafsLump.getInt32(offset + 0, true)),
+        cluster: leafsLump.getInt16(offset + 4, true),
+        area: leafsLump.getInt16(offset + 6, true),
+        mins: new Vector(
+          leafsLump.getInt16(offset + 8, true),
+          leafsLump.getInt16(offset + 10, true),
+          leafsLump.getInt16(offset + 12, true),
+        ),
+        maxs: new Vector(
+          leafsLump.getInt16(offset + 14, true),
+          leafsLump.getInt16(offset + 16, true),
+          leafsLump.getInt16(offset + 18, true),
+        ),
+        firstmarksurface: leafsLump.getUint16(offset + 20, true),
+        nummarksurfaces: leafsLump.getUint16(offset + 22, true),
+        firstleafbrush: leafsLump.getUint16(offset + 24, true),
+        numleafbrushes: leafsLump.getUint16(offset + 26, true),
+      }));
+    }
+  }
+
+  /**
+   * Load BSP38 leafbrush links.
+   */
+  #loadLeafBrushes(leafbrushesLump: DataView, loadmodel: BrushModel): void {
+    const count = leafbrushesLump.byteLength / 2;
+    loadmodel.leafbrushes = new Array(count);
+
+    for (let index = 0; index < count; index++) {
+      loadmodel.leafbrushes[index] = leafbrushesLump.getUint16(index * 2, true);
+    }
+  }
+
+  /**
+   * Load BSP38 planes.
+   */
+  #loadPlanes(planesLump: DataView, loadmodel: BrushModel): void {
+    loadmodel.planes.length = 0;
+
+    const stride = 20;
+    const length = planesLump.byteLength / stride;
+
+    for (let index = 0; index < length; index++) {
+      const offset = index * stride;
+
+      loadmodel.planes.push(new Plane(
+        new Vector(
+          planesLump.getFloat32(offset + 0, true),
+          planesLump.getFloat32(offset + 4, true),
+          planesLump.getFloat32(offset + 8, true),
+        ),
+        planesLump.getFloat32(offset + 12, true),
+      ));
+    }
+  }
+
+  /**
+   * Load BSP38 brushes.
+   */
+  #loadBrushes(brushesLump: DataView, loadmodel: BrushModel): void {
+    const stride = 12;
+    const length = brushesLump.byteLength / stride;
+
+    loadmodel.brushes = new Array(length);
+
+    for (let index = 0; index < length; index++) {
+      const offset = index * stride;
+
+      loadmodel.brushes[index] = Object.assign(new Brush(loadmodel), {
+        firstside: brushesLump.getInt32(offset + 0, true),
+        numsides: brushesLump.getInt32(offset + 4, true),
+        contents: this.#translateQ2Contents(brushesLump.getInt32(offset + 8, true)),
+      });
+    }
+  }
+
+  /**
+   * Load BSP38 brush sides.
+   */
+  #loadBrushSides(brushsidesLump: DataView, loadmodel: BrushModel): void {
+    const stride = 4;
+    const length = brushsidesLump.byteLength / stride;
+    loadmodel.brushsides = new Array(length);
+
+    for (let index = 0; index < length; index++) {
+      const offset = index * stride;
+
+      loadmodel.brushsides[index] = Object.assign(new BrushSide(loadmodel), {
+        planenum: brushsidesLump.getUint16(offset + 0, true),
+        texinfo: brushsidesLump.getInt16(offset + 2, true),
+      });
+    }
+  }
+
+  /**
+   * Load BSP38 submodels.
+   */
+  #loadSubmodels(modelsLump: DataView, loadmodel: BrushModel): void {
+    void modelsLump;
+    loadmodel.submodels.length = 0;
+  }
+}
diff --git a/source/engine/common/model/loaders/SpriteSPRLoader.mjs b/source/engine/common/model/loaders/SpriteSPRLoader.mjs
deleted file mode 100644
index b7d58e44..00000000
--- a/source/engine/common/model/loaders/SpriteSPRLoader.mjs
+++ /dev/null
@@ -1,151 +0,0 @@
-import Vector from '../../../../shared/Vector.ts';
-import { GLTexture } from '../../../client/GL.mjs';
-import W, { translateIndexToRGBA } from '../../W.ts';
-import { CRC16CCITT } from '../../CRC.ts';
-import { registry } from '../../../registry.mjs';
-import { ModelLoader } from '../ModelLoader.ts';
-import { SpriteModel } from '../SpriteModel.ts';
-
-/**
- * Loader for Quake Sprite format (.spr)
- * Magic: 0x50534449 ("IDSP")
- * Version: 1
- */
-export class SpriteSPRLoader extends ModelLoader {
-  /**
-   * Get magic numbers that identify this format
-   * @returns {number[]} Array of magic numbers
-   */
-  getMagicNumbers() {
-    return [0x50534449]; // "IDSP"
-  }
-
-  /**
-   * Get file extensions for this format
-   * @returns {string[]} Array of file extensions
-   */
-  getExtensions() {
-    return ['.spr'];
-  }
-
-  /**
-   * Get human-readable name of this loader
-   * @returns {string} Loader name
-   */
-  getName() {
-    return 'Quake Sprite';
-  }
-
-  /**
-   * Load a Sprite SPR model from buffer
-   * @param {ArrayBuffer} buffer - The model file data
-   * @param {string} name - The model name/path
-   * @returns {Promise<SpriteModel>} The loaded model
-   */
-  // eslint-disable-next-line @typescript-eslint/require-await
-  async load(buffer, name) {
-    const loadmodel = new SpriteModel(name);
-
-    loadmodel.type = 1; // Mod.type.sprite
-
-    const view = new DataView(buffer);
-    const version = view.getUint32(4, true);
-
-    if (version !== 1) {
-      throw new Error(`${name} has wrong version number (${version} should be 1)`);
-    }
-
-    loadmodel.oriented = view.getUint32(8, true) === 3;
-    loadmodel.boundingradius = view.getFloat32(12, true);
-    loadmodel.width = view.getUint32(16, true);
-    loadmodel.height = view.getUint32(20, true);
-    loadmodel._frames = view.getUint32(24, true);
-
-    if (loadmodel._frames === 0) {
-      throw new Error(`model ${name} has no frames`);
-    }
-
-    loadmodel.random = view.getUint32(32, true) === 1;
-    loadmodel.numframes = loadmodel._frames;
-    loadmodel.mins = new Vector(
-      loadmodel.width * -0.5,
-      loadmodel.width * -0.5,
-      loadmodel.height * -0.5,
-    );
-    loadmodel.maxs = new Vector(
-      loadmodel.width * 0.5,
-      loadmodel.width * 0.5,
-      loadmodel.height * 0.5,
-    );
-
-    loadmodel.frames.length = loadmodel._frames;
-    let inframe = 36;
-
-    for (let i = 0; i < loadmodel._frames; i++) {
-      inframe += 4;
-
-      if (view.getUint32(inframe - 4, true) === 0) {
-        // Single frame
-        const frame = { group: false };
-        loadmodel.frames[i] = frame;
-        inframe = this._loadSpriteFrame(name + '_' + i, buffer, inframe, frame);
-      } else {
-        // Frame group (animated frames)
-        const group = {
-          group: true,
-          frames: [],
-        };
-        loadmodel.frames[i] = group;
-        const numframes = view.getUint32(inframe, true);
-        inframe += 4;
-
-        for (let j = 0; j < numframes; j++) {
-          group.frames[j] = { interval: view.getFloat32(inframe, true) };
-          if (group.frames[j].interval <= 0.0) {
-            throw new Error('SpriteSPRLoader: interval <= 0');
-          }
-          inframe += 4;
-        }
-
-        for (let j = 0; j < numframes; j++) {
-          inframe = this._loadSpriteFrame(name + '_' + i + '_' + j, buffer, inframe, group.frames[j]);
-        }
-      }
-    }
-
-    loadmodel.needload = false;
-    loadmodel.checksum = CRC16CCITT.Block(new Uint8Array(buffer));
-
-    return loadmodel;
-  }
-
-  /**
-   * Load a single sprite frame from buffer
-   * @protected
-   * @param {string} identifier - Frame texture identifier
-   * @param {ArrayBuffer} buffer - The model file data
-   * @param {number} inframe - Current offset in buffer
-   * @param {object} frame - Frame object to populate with texture data
-   * @returns {number|null} New offset after reading frame, or null if dedicated server
-   */
-  _loadSpriteFrame(identifier, buffer, inframe, frame) {
-    if (registry.isDedicatedServer) {
-      return null;
-    }
-
-    const view = new DataView(buffer);
-    frame.origin = [view.getInt32(inframe, true), -view.getInt32(inframe + 4, true)];
-    frame.width = view.getUint32(inframe + 8, true);
-    frame.height = view.getUint32(inframe + 12, true);
-
-    const data = new Uint8Array(buffer, inframe + 16, frame.width * frame.height);
-
-    const rgba = translateIndexToRGBA(data, frame.width, frame.height, W.d_8to24table_u8, 255);
-    const glt = GLTexture.Allocate(identifier, frame.width, frame.height, rgba);
-
-    frame.glt = glt;
-    frame.texturenum = glt.texnum;
-
-    return inframe + 16 + frame.width * frame.height;
-  }
-}
diff --git a/source/engine/common/model/loaders/SpriteSPRLoader.ts b/source/engine/common/model/loaders/SpriteSPRLoader.ts
new file mode 100644
index 00000000..e479cf05
--- /dev/null
+++ b/source/engine/common/model/loaders/SpriteSPRLoader.ts
@@ -0,0 +1,138 @@
+import Vector from '../../../../shared/Vector.ts';
+import { GLTexture } from '../../../client/GL.mjs';
+import { registry } from '../../../registry.mjs';
+import { CRC16CCITT } from '../../CRC.ts';
+import W, { translateIndexToRGBA } from '../../W.ts';
+import { ModelLoader } from '../ModelLoader.ts';
+import { SpriteModel, type SpriteFrame } from '../SpriteModel.ts';
+
+interface MutableSpriteFrameImage {
+  interval?: number;
+  origin: [number, number];
+  width: number;
+  height: number;
+  glt: GLTexture;
+  texturenum: number;
+}
+
+interface MutableSpriteSingleFrame extends MutableSpriteFrameImage {
+  group: false;
+}
+
+interface MutableSpriteFrameGroup {
+  group: true;
+  frames: MutableSpriteFrameImage[];
+}
+
+/**
+ * Loader for Quake Sprite format (.spr).
+ */
+export class SpriteSPRLoader extends ModelLoader {
+  override getMagicNumbers(): number[] {
+    return [0x50534449];
+  }
+
+  override getExtensions(): string[] {
+    return ['.spr'];
+  }
+
+  override getName(): string {
+    return 'Quake Sprite';
+  }
+
+  override load(buffer: ArrayBuffer, name: string): Promise<SpriteModel> {
+    const loadmodel = new SpriteModel(name);
+    const view = new DataView(buffer);
+    const version = view.getUint32(4, true);
+
+    if (version !== 1) {
+      throw new Error(`${name} has wrong version number (${version} should be 1)`);
+    }
+
+    loadmodel.oriented = view.getUint32(8, true) === 3;
+    loadmodel.boundingradius = view.getFloat32(12, true);
+    loadmodel.width = view.getUint32(16, true);
+    loadmodel.height = view.getUint32(20, true);
+    loadmodel._frames = view.getUint32(24, true);
+
+    if (loadmodel._frames === 0) {
+      throw new Error(`model ${name} has no frames`);
+    }
+
+    loadmodel.random = view.getUint32(32, true) === 1;
+    loadmodel.numframes = loadmodel._frames;
+    loadmodel.mins = new Vector(
+      loadmodel.width * -0.5,
+      loadmodel.width * -0.5,
+      loadmodel.height * -0.5,
+    );
+    loadmodel.maxs = new Vector(
+      loadmodel.width * 0.5,
+      loadmodel.width * 0.5,
+      loadmodel.height * 0.5,
+    );
+
+    loadmodel.frames.length = loadmodel._frames;
+    let inframe = 36;
+
+    for (let i = 0; i < loadmodel._frames; i++) {
+      inframe += 4;
+
+      if (view.getUint32(inframe - 4, true) === 0) {
+        const frame = { group: false } as MutableSpriteSingleFrame;
+        loadmodel.frames[i] = frame as SpriteFrame;
+        inframe = this.#loadSpriteFrame(`${name}_${i}`, buffer, inframe, frame)!;
+        continue;
+      }
+
+      const group: MutableSpriteFrameGroup = {
+        group: true,
+        frames: [],
+      };
+      loadmodel.frames[i] = group as SpriteFrame;
+      const numframes = view.getUint32(inframe, true);
+      inframe += 4;
+
+      for (let j = 0; j < numframes; j++) {
+        group.frames[j] = { interval: view.getFloat32(inframe, true) } as MutableSpriteFrameImage;
+        if ((group.frames[j].interval ?? 0) <= 0.0) {
+          throw new Error('SpriteSPRLoader: interval <= 0');
+        }
+        inframe += 4;
+      }
+
+      for (let j = 0; j < numframes; j++) {
+        inframe = this.#loadSpriteFrame(`${name}_${i}_${j}`, buffer, inframe, group.frames[j])!;
+      }
+    }
+
+    loadmodel.needload = false;
+    loadmodel.checksum = CRC16CCITT.Block(new Uint8Array(buffer));
+
+    return Promise.resolve(loadmodel);
+  }
+
+  /**
+   * Load a single sprite frame from the SPR data.
+   * @returns The next byte offset after the frame, or null on dedicated server.
+   */
+  #loadSpriteFrame(identifier: string, buffer: ArrayBuffer, inframe: number, frame: MutableSpriteFrameImage): number | null {
+    if (registry.isDedicatedServer) {
+      return null;
+    }
+
+    const view = new DataView(buffer);
+    frame.origin = [view.getInt32(inframe, true), -view.getInt32(inframe + 4, true)];
+    frame.width = view.getUint32(inframe + 8, true);
+    frame.height = view.getUint32(inframe + 12, true);
+
+    const data = new Uint8Array(buffer, inframe + 16, frame.width * frame.height);
+    const rgba = translateIndexToRGBA(data, frame.width, frame.height, W.d_8to24table_u8, 255);
+    const texture = GLTexture.Allocate(identifier, frame.width, frame.height, rgba);
+
+    frame.glt = texture;
+    frame.texturenum = texture.texnum;
+
+    return inframe + 16 + frame.width * frame.height;
+  }
+}
diff --git a/source/engine/common/model/loaders/WavefrontOBJLoader.mjs b/source/engine/common/model/loaders/WavefrontOBJLoader.mjs
deleted file mode 100644
index d6841a98..00000000
--- a/source/engine/common/model/loaders/WavefrontOBJLoader.mjs
+++ /dev/null
@@ -1,487 +0,0 @@
-import { registry } from '../../../registry.mjs';
-
-import Vector from '../../../../shared/Vector.ts';
-import { ModelLoader } from '../ModelLoader.ts';
-import { MeshModel } from '../MeshModel.ts';
-import { PBRMaterial } from '../../../client/renderer/Materials.mjs';
-import { GLTexture } from '../../../client/GL.mjs';
-
-/**
- * Loader for Wavefront OBJ format (.obj)
- * Supports vertices, normals, texture coordinates, and triangulated faces.
- * Does not yet support materials (.mtl), groups, or advanced features.
- */
-export class WavefrontOBJLoader extends ModelLoader {
-  /**
-   * Get magic numbers that identify this format
-   * OBJ is text-based, so no magic number
-   * @returns {number[]} Empty array
-   */
-  getMagicNumbers() {
-    return [];
-  }
-
-  /**
-   * Get file extensions for this format
-   * @returns {string[]} Array of file extensions
-   */
-  getExtensions() {
-    return ['.obj'];
-  }
-
-  /**
-   * Get human-readable name of this loader
-   * @returns {string} Loader name
-   */
-  getName() {
-    return 'Wavefront .obj';
-  }
-
-  /**
-   * Check if this loader can handle the given file
-   * @param {ArrayBuffer} buffer The file buffer
-   * @param {string} filename The filename
-   * @returns {boolean} True if this loader can handle the file
-   */
-  canLoad(buffer, filename) {
-    // Check file extension
-    if (filename.toLowerCase().endsWith('.obj')) {
-      return true;
-    }
-
-    // Could also check for OBJ text markers in the buffer
-    // But extension check is sufficient for now
-    return false;
-  }
-
-  /**
-   * Load a Wavefront OBJ model from buffer
-   * @param {ArrayBuffer} buffer The model file data
-   * @param {string} name The model name/path
-   * @returns {Promise<MeshModel>} The loaded model
-   */
-  async load(buffer, name) {
-    const loadmodel = new MeshModel(name);
-
-    // Convert ArrayBuffer to text
-    const decoder = new TextDecoder('utf-8');
-    const text = decoder.decode(buffer);
-
-    // Parse OBJ format
-    const objData = this._parseOBJ(text);
-
-    // Build vertex arrays for WebGL (expand indexed format to flat arrays)
-    const meshData = this._buildMeshData(objData);
-
-    // Store in model
-    loadmodel.vertices = meshData.vertices;
-    loadmodel.normals = meshData.normals;
-    loadmodel.texcoords = meshData.texcoords;
-    loadmodel.indices = meshData.indices;
-    loadmodel.numVertices = meshData.vertices.length / 3;
-    loadmodel.numTriangles = meshData.indices.length / 3;
-
-    // Calculate bounding box
-    this._calculateBounds(loadmodel);
-
-    // Generate tangents and bitangents for normal mapping
-    if (loadmodel.normals && loadmodel.texcoords) {
-      this._generateTangentSpace(loadmodel);
-    }
-
-    // Set texture name (convention: same as model name without .obj)
-    const baseName = name.replace(/\.obj$/i, '.png').replace(/^models\//i, 'textures/');
-    loadmodel.textureName = baseName;
-
-    if (!registry.isDedicatedServer) {
-      const mat = new PBRMaterial(baseName, 256, 256); // Placeholder material
-      mat.diffuse = await GLTexture.FromImageFile(baseName);
-      mat.width = mat.diffuse.width;
-      mat.height = mat.diffuse.height;
-      loadmodel.texture = mat;
-    }
-
-    loadmodel.needload = false;
-
-    return loadmodel;
-  }
-
-  /**
-   * Parse OBJ text format into indexed data
-   * @protected
-   * @param {string} text OBJ file content
-   * @returns {object} Parsed OBJ data with positions, texcoords, normals, faces
-   */
-  _parseOBJ(text) {
-    const positions = [];  // v entries
-    const texcoords = [];  // vt entries
-    const normals = [];    // vn entries
-    const faces = [];      // f entries
-
-    const lines = text.split('\n');
-
-    for (let line of lines) {
-      // Remove comments and trim whitespace
-      const commentIndex = line.indexOf('#');
-      if (commentIndex >= 0) {
-        line = line.substring(0, commentIndex);
-      }
-      line = line.trim();
-
-      if (line.length === 0) {
-        continue;
-      }
-
-      const parts = line.split(/\s+/);
-      const type = parts[0];
-
-      switch (type) {
-        case 'v': // Vertex position
-          if (parts.length >= 4) {
-            // Convert from OBJ convention to Quake's coordinate system
-            // OBJ: X=right, Y=up, Z=back
-            // Quake: X=forward, Y=left, Z=up
-            // Transformation: Quake(x,y,z) = OBJ(x, -z, y)
-            const x = parseFloat(parts[1]);
-            const y = parseFloat(parts[2]);
-            const z = parseFloat(parts[3]);
-            positions.push(
-              x,   // OBJ X -> Quake X (forward)
-              -z,  // OBJ -Z -> Quake Y (left)
-              y,   // OBJ Y -> Quake Z (up)
-            );
-          }
-          break;
-
-        case 'vt': // Texture coordinate
-          if (parts.length >= 3) {
-            texcoords.push(
-              parseFloat(parts[1]),
-              parseFloat(parts[2]),
-            );
-          }
-          break;
-
-        case 'vn': // Normal
-          if (parts.length >= 4) {
-            // Convert normals from OBJ to Quake coordinate system
-            // Same transformation as positions: Quake(x,y,z) = OBJ(x, -z, y)
-            const nx = parseFloat(parts[1]);
-            const ny = parseFloat(parts[2]);
-            const nz = parseFloat(parts[3]);
-            normals.push(
-              nx,   // OBJ X -> Quake X
-              -nz,  // OBJ -Z -> Quake Y
-              ny,   // OBJ Y -> Quake Z
-            );
-          }
-          break;
-
-        case 'f': // Face
-          if (parts.length >= 4) {
-            // Parse face vertices
-            const faceVertices = [];
-            for (let i = 1; i < parts.length; i++) {
-              faceVertices.push(this._parseFaceVertex(parts[i]));
-            }
-
-            // Triangulate if needed (quad or n-gon)
-            if (faceVertices.length === 3) {
-              // Already a triangle
-              faces.push(faceVertices);
-            } else if (faceVertices.length === 4) {
-              // Quad - split into two triangles
-              faces.push([faceVertices[0], faceVertices[1], faceVertices[2]]);
-              faces.push([faceVertices[0], faceVertices[2], faceVertices[3]]);
-            } else if (faceVertices.length > 4) {
-              // N-gon - fan triangulation
-              for (let i = 1; i < faceVertices.length - 1; i++) {
-                faces.push([faceVertices[0], faceVertices[i], faceVertices[i + 1]]);
-              }
-            }
-          }
-          break;
-
-        // Ignore other types (g, o, mtllib, usemtl, s, etc.)
-        default:
-          break;
-      }
-    }
-
-    return { positions, texcoords, normals, faces };
-  }
-
-  /**
-   * Parse a face vertex specification (v, v/vt, v/vt/vn, v//vn)
-   * @protected
-   * @param {string} spec Face vertex specification
-   * @returns {object} Object with v, vt, vn indices (1-based, can be negative)
-   */
-  _parseFaceVertex(spec) {
-    const parts = spec.split('/');
-    return {
-      v: parts[0] ? parseInt(parts[0], 10) : 0,
-      vt: parts[1] ? parseInt(parts[1], 10) : 0,
-      vn: parts[2] ? parseInt(parts[2], 10) : 0,
-    };
-  }
-
-  /**
-   * Build mesh data from parsed OBJ (expand indices to flat arrays)
-   * @protected
-   * @param {object} objData Parsed OBJ data
-   * @returns {object} Mesh data with flat vertices, normals, texcoords, indices
-   */
-  _buildMeshData(objData) {
-    const vertices = [];
-    const normals = [];
-    const texcoords = [];
-    const indices = [];
-
-    const hasNormals = objData.normals.length > 0;
-    const hasTexcoords = objData.texcoords.length > 0;
-
-    // Vertex deduplication using a map
-    const vertexMap = new Map();
-    let nextIndex = 0;
-
-    for (const face of objData.faces) {
-      for (const fv of face) {
-        // Convert OBJ 1-based indices to 0-based
-        // Handle negative indices (count from end)
-        const vIdx = this._resolveIndex(fv.v, objData.positions.length / 3);
-        const vtIdx = hasTexcoords ? this._resolveIndex(fv.vt, objData.texcoords.length / 2) : -1;
-        const vnIdx = hasNormals ? this._resolveIndex(fv.vn, objData.normals.length / 3) : -1;
-
-        // Create unique key for this vertex combination
-        const key = `${vIdx}/${vtIdx}/${vnIdx}`;
-
-        if (vertexMap.has(key)) {
-          // Reuse existing vertex
-          indices.push(vertexMap.get(key));
-        } else {
-          // Add new vertex
-          const index = nextIndex++;
-          vertexMap.set(key, index);
-          indices.push(index);
-
-          // Add position
-          if (vIdx >= 0) {
-            vertices.push(
-              objData.positions[vIdx * 3],
-              objData.positions[vIdx * 3 + 1],
-              objData.positions[vIdx * 3 + 2],
-            );
-          } else {
-            vertices.push(0, 0, 0);
-          }
-
-          // Add texcoord
-          if (vtIdx >= 0) {
-            texcoords.push(
-              objData.texcoords[vtIdx * 2],
-              objData.texcoords[vtIdx * 2 + 1],
-            );
-          } else {
-            texcoords.push(0, 0);
-          }
-
-          // Add normal
-          if (vnIdx >= 0) {
-            normals.push(
-              objData.normals[vnIdx * 3],
-              objData.normals[vnIdx * 3 + 1],
-              objData.normals[vnIdx * 3 + 2],
-            );
-          } else {
-            normals.push(0, 0, 1); // Default up normal
-          }
-        }
-      }
-    }
-
-    // Convert to typed arrays
-    return {
-      vertices: new Float32Array(vertices),
-      normals: hasNormals ? new Float32Array(normals) : null,
-      texcoords: hasTexcoords ? new Float32Array(texcoords) : null,
-      indices: nextIndex < 65536 ? new Uint16Array(indices) : new Uint32Array(indices),
-    };
-  }
-
-  /**
-   * Resolve OBJ index (1-based, negative) to 0-based array index
-   * @protected
-   * @param {number} index OBJ index
-   * @param {number} arrayLength Length of the array being indexed
-   * @returns {number} 0-based array index, or -1 if invalid
-   */
-  _resolveIndex(index, arrayLength) {
-    if (index === 0) {
-      return -1; // Invalid
-    }
-    if (index > 0) {
-      return index - 1; // Convert 1-based to 0-based
-    }
-    // Negative index: count from end
-    return arrayLength + index;
-  }
-
-  /**
-   * Calculate bounding box for the model
-   * @protected
-   * @param {import('../MeshModel.ts').MeshModel} model The model
-   */
-  _calculateBounds(model) {
-    if (!model.vertices || model.vertices.length === 0) {
-      return;
-    }
-
-    let minX = Infinity, minY = Infinity, minZ = Infinity;
-    let maxX = -Infinity, maxY = -Infinity, maxZ = -Infinity;
-
-    for (let i = 0; i < model.vertices.length; i += 3) {
-      const x = model.vertices[i];
-      const y = model.vertices[i + 1];
-      const z = model.vertices[i + 2];
-
-      minX = Math.min(minX, x);
-      minY = Math.min(minY, y);
-      minZ = Math.min(minZ, z);
-      maxX = Math.max(maxX, x);
-      maxY = Math.max(maxY, y);
-      maxZ = Math.max(maxZ, z);
-    }
-
-    model.mins = new Vector(minX, minY, minZ);
-    model.maxs = new Vector(maxX, maxY, maxZ);
-
-    // Calculate bounding radius (distance from origin to furthest point)
-    let maxDist = 0;
-    for (let i = 0; i < model.vertices.length; i += 3) {
-      const x = model.vertices[i];
-      const y = model.vertices[i + 1];
-      const z = model.vertices[i + 2];
-      maxDist = Math.max(maxDist, Math.hypot(x, y, z));
-    }
-    model.boundingradius = maxDist;
-  }
-
-  /**
-   * Generate tangent and bitangent vectors for normal mapping
-   * Based on "Lengyel's Method" for computing tangent space basis
-   * @protected
-   * @param {import('../MeshModel.ts').MeshModel} model The model
-   */
-  _generateTangentSpace(model) {
-    const numVerts = model.numVertices;
-    const tangents = new Float32Array(numVerts * 3);
-    const bitangents = new Float32Array(numVerts * 3);
-
-    // Accumulate tangents and bitangents for each vertex
-    const tan1 = new Float32Array(numVerts * 3);
-    const tan2 = new Float32Array(numVerts * 3);
-
-    // Calculate tangent and bitangent for each triangle
-    for (let i = 0; i < model.indices.length; i += 3) {
-      const i1 = model.indices[i];
-      const i2 = model.indices[i + 1];
-      const i3 = model.indices[i + 2];
-
-      const v1 = [model.vertices[i1 * 3], model.vertices[i1 * 3 + 1], model.vertices[i1 * 3 + 2]];
-      const v2 = [model.vertices[i2 * 3], model.vertices[i2 * 3 + 1], model.vertices[i2 * 3 + 2]];
-      const v3 = [model.vertices[i3 * 3], model.vertices[i3 * 3 + 1], model.vertices[i3 * 3 + 2]];
-
-      const w1 = [model.texcoords[i1 * 2], model.texcoords[i1 * 2 + 1]];
-      const w2 = [model.texcoords[i2 * 2], model.texcoords[i2 * 2 + 1]];
-      const w3 = [model.texcoords[i3 * 2], model.texcoords[i3 * 2 + 1]];
-
-      const x1 = v2[0] - v1[0];
-      const x2 = v3[0] - v1[0];
-      const y1 = v2[1] - v1[1];
-      const y2 = v3[1] - v1[1];
-      const z1 = v2[2] - v1[2];
-      const z2 = v3[2] - v1[2];
-
-      const s1 = w2[0] - w1[0];
-      const s2 = w3[0] - w1[0];
-      const t1 = w2[1] - w1[1];
-      const t2 = w3[1] - w1[1];
-
-      const denom = (s1 * t2 - s2 * t1);
-      const r = denom !== 0 ? 1.0 / denom : 0;
-
-      const sdir = [
-        (t2 * x1 - t1 * x2) * r,
-        (t2 * y1 - t1 * y2) * r,
-        (t2 * z1 - t1 * z2) * r,
-      ];
-
-      const tdir = [
-        (s1 * x2 - s2 * x1) * r,
-        (s1 * y2 - s2 * y1) * r,
-        (s1 * z2 - s2 * z1) * r,
-      ];
-
-      // Accumulate
-      for (const idx of [i1, i2, i3]) {
-        tan1[idx * 3] += sdir[0];
-        tan1[idx * 3 + 1] += sdir[1];
-        tan1[idx * 3 + 2] += sdir[2];
-
-        tan2[idx * 3] += tdir[0];
-        tan2[idx * 3 + 1] += tdir[1];
-        tan2[idx * 3 + 2] += tdir[2];
-      }
-    }
-
-    // Orthogonalize and normalize
-    for (let i = 0; i < numVerts; i++) {
-      const n = [
-        model.normals[i * 3],
-        model.normals[i * 3 + 1],
-        model.normals[i * 3 + 2],
-      ];
-
-      const t = [
-        tan1[i * 3],
-        tan1[i * 3 + 1],
-        tan1[i * 3 + 2],
-      ];
-
-      // Gram-Schmidt orthogonalize
-      const dot = n[0] * t[0] + n[1] * t[1] + n[2] * t[2];
-      const tangent = [
-        t[0] - n[0] * dot,
-        t[1] - n[1] * dot,
-        t[2] - n[2] * dot,
-      ];
-
-      // Normalize tangent
-      const tLen = Math.hypot(tangent[0], tangent[1], tangent[2]);
-      if (tLen > 0) {
-        tangent[0] /= tLen;
-        tangent[1] /= tLen;
-        tangent[2] /= tLen;
-      }
-
-      tangents[i * 3] = tangent[0];
-      tangents[i * 3 + 1] = tangent[1];
-      tangents[i * 3 + 2] = tangent[2];
-
-      // Calculate bitangent (cross product of normal and tangent)
-      const bitangent = [
-        n[1] * tangent[2] - n[2] * tangent[1],
-        n[2] * tangent[0] - n[0] * tangent[2],
-        n[0] * tangent[1] - n[1] * tangent[0],
-      ];
-
-      bitangents[i * 3] = bitangent[0];
-      bitangents[i * 3 + 1] = bitangent[1];
-      bitangents[i * 3 + 2] = bitangent[2];
-    }
-
-    model.tangents = tangents;
-    model.bitangents = bitangents;
-  }
-}
diff --git a/source/engine/common/model/loaders/WavefrontOBJLoader.ts b/source/engine/common/model/loaders/WavefrontOBJLoader.ts
new file mode 100644
index 00000000..22ba99f3
--- /dev/null
+++ b/source/engine/common/model/loaders/WavefrontOBJLoader.ts
@@ -0,0 +1,469 @@
+import { registry } from '../../../registry.mjs';
+
+import Vector from '../../../../shared/Vector.ts';
+import { GLTexture } from '../../../client/GL.mjs';
+import { PBRMaterial } from '../../../client/renderer/Materials.mjs';
+import { MeshModel } from '../MeshModel.ts';
+import { ModelLoader } from '../ModelLoader.ts';
+
+type TriangleVertexIndices = [number, number, number];
+type TextureCoordinate = [number, number];
+
+interface FaceVertex {
+  readonly v: number;
+  readonly vt: number;
+  readonly vn: number;
+}
+
+interface ParsedOBJData {
+  readonly positions: number[];
+  readonly texcoords: number[];
+  readonly normals: number[];
+  readonly faces: FaceVertex[][];
+}
+
+interface MeshBuildData {
+  readonly vertices: Float32Array;
+  readonly normals: Float32Array | null;
+  readonly texcoords: Float32Array | null;
+  readonly indices: Uint16Array | Uint32Array;
+}
+
+/**
+ * Loader for Wavefront OBJ format (.obj).
+ * Supports vertices, normals, texture coordinates, and triangulated faces.
+ * Does not yet support materials (.mtl), groups, or advanced features.
+ */
+export class WavefrontOBJLoader extends ModelLoader {
+  override getMagicNumbers(): number[] {
+    return [];
+  }
+
+  override getExtensions(): string[] {
+    return ['.obj'];
+  }
+
+  override getName(): string {
+    return 'Wavefront .obj';
+  }
+
+  override canLoad(buffer: ArrayBuffer, filename: string): boolean {
+    if (filename.toLowerCase().endsWith('.obj')) {
+      return true;
+    }
+
+    return super.canLoad(buffer, filename);
+  }
+
+  override async load(buffer: ArrayBuffer, name: string): Promise<MeshModel> {
+    const loadmodel = new MeshModel(name);
+    const decoder = new TextDecoder('utf-8');
+    const text = decoder.decode(buffer);
+    const objData = this.#parseOBJ(text);
+    const meshData = this.#buildMeshData(objData);
+
+    loadmodel.vertices = meshData.vertices;
+    loadmodel.normals = meshData.normals;
+    loadmodel.texcoords = meshData.texcoords;
+    loadmodel.indices = meshData.indices;
+    loadmodel.numVertices = meshData.vertices.length / 3;
+    loadmodel.numTriangles = meshData.indices.length / 3;
+
+    this.#calculateBounds(loadmodel);
+
+    if (loadmodel.normals !== null && loadmodel.texcoords !== null) {
+      this.#generateTangentSpace(loadmodel);
+    }
+
+    const baseName = name.replace(/\.obj$/i, '.png').replace(/^models\//i, 'textures/');
+    loadmodel.textureName = baseName;
+
+    if (!registry.isDedicatedServer) {
+      const material = new PBRMaterial(baseName, 256, 256);
+      material.diffuse = await GLTexture.FromImageFile(baseName);
+      material.width = material.diffuse.width;
+      material.height = material.diffuse.height;
+      loadmodel.texture = material;
+    }
+
+    loadmodel.needload = false;
+
+    return loadmodel;
+  }
+
+  /**
+   * Parse OBJ text format into indexed mesh data.
+   * @returns Parsed OBJ positions, texture coordinates, normals, and faces.
+   */
+  #parseOBJ(text: string): ParsedOBJData {
+    const positions: number[] = [];
+    const texcoords: number[] = [];
+    const normals: number[] = [];
+    const faces: FaceVertex[][] = [];
+    const lines = text.split('\n');
+
+    for (let line of lines) {
+      const commentIndex = line.indexOf('#');
+      if (commentIndex >= 0) {
+        line = line.substring(0, commentIndex);
+      }
+      line = line.trim();
+
+      if (line.length === 0) {
+        continue;
+      }
+
+      const parts = line.split(/\s+/);
+      const type = parts[0];
+
+      switch (type) {
+        case 'v':
+          if (parts.length >= 4) {
+            const x = parseFloat(parts[1]);
+            const y = parseFloat(parts[2]);
+            const z = parseFloat(parts[3]);
+            positions.push(x, -z, y);
+          }
+          break;
+
+        case 'vt':
+          if (parts.length >= 3) {
+            texcoords.push(parseFloat(parts[1]), parseFloat(parts[2]));
+          }
+          break;
+
+        case 'vn':
+          if (parts.length >= 4) {
+            const nx = parseFloat(parts[1]);
+            const ny = parseFloat(parts[2]);
+            const nz = parseFloat(parts[3]);
+            normals.push(nx, -nz, ny);
+          }
+          break;
+
+        case 'f':
+          if (parts.length >= 4) {
+            this.#parseFace(parts, faces);
+          }
+          break;
+
+        default:
+          break;
+      }
+    }
+
+    return { positions, texcoords, normals, faces };
+  }
+
+  /**
+   * Parse a face record and append triangulated faces.
+   */
+  #parseFace(parts: string[], faces: FaceVertex[][]): void {
+    const faceVertices: FaceVertex[] = [];
+
+    for (let index = 1; index < parts.length; index++) {
+      faceVertices.push(this.#parseFaceVertex(parts[index]));
+    }
+
+    if (faceVertices.length === 3) {
+      faces.push(faceVertices);
+      return;
+    }
+
+    if (faceVertices.length === 4) {
+      faces.push([faceVertices[0], faceVertices[1], faceVertices[2]]);
+      faces.push([faceVertices[0], faceVertices[2], faceVertices[3]]);
+      return;
+    }
+
+    for (let index = 1; index < faceVertices.length - 1; index++) {
+      faces.push([faceVertices[0], faceVertices[index], faceVertices[index + 1]]);
+    }
+  }
+
+  /**
+   * Parse a face vertex specification (`v`, `v/vt`, `v/vt/vn`, `v//vn`).
+   * @returns Parsed OBJ face indices.
+   */
+  #parseFaceVertex(spec: string): FaceVertex {
+    const parts = spec.split('/');
+
+    return {
+      v: parts[0] ? parseInt(parts[0], 10) : 0,
+      vt: parts[1] ? parseInt(parts[1], 10) : 0,
+      vn: parts[2] ? parseInt(parts[2], 10) : 0,
+    };
+  }
+
+  /**
+   * Build flat mesh buffers from parsed indexed OBJ data.
+   * @returns Flat mesh buffers ready for upload to WebGL.
+   */
+  #buildMeshData(objData: ParsedOBJData): MeshBuildData {
+    const vertices: number[] = [];
+    const normals: number[] = [];
+    const texcoords: number[] = [];
+    const indices: number[] = [];
+    const hasNormals = objData.normals.length > 0;
+    const hasTexcoords = objData.texcoords.length > 0;
+    const vertexMap = new Map<string, number>();
+    let nextIndex = 0;
+
+    for (const face of objData.faces) {
+      for (const faceVertex of face) {
+        const vIdx = this.#resolveIndex(faceVertex.v, objData.positions.length / 3);
+        const vtIdx = hasTexcoords ? this.#resolveIndex(faceVertex.vt, objData.texcoords.length / 2) : -1;
+        const vnIdx = hasNormals ? this.#resolveIndex(faceVertex.vn, objData.normals.length / 3) : -1;
+        const key = `${vIdx}/${vtIdx}/${vnIdx}`;
+        const existingIndex = vertexMap.get(key);
+
+        if (existingIndex !== undefined) {
+          indices.push(existingIndex);
+          continue;
+        }
+
+        const index = nextIndex++;
+        vertexMap.set(key, index);
+        indices.push(index);
+
+        this.#appendPosition(vertices, objData.positions, vIdx);
+        this.#appendTexcoord(texcoords, objData.texcoords, vtIdx);
+        this.#appendNormal(normals, objData.normals, vnIdx);
+      }
+    }
+
+    return {
+      vertices: new Float32Array(vertices),
+      normals: hasNormals ? new Float32Array(normals) : null,
+      texcoords: hasTexcoords ? new Float32Array(texcoords) : null,
+      indices: nextIndex < 65536 ? new Uint16Array(indices) : new Uint32Array(indices),
+    };
+  }
+
+  /**
+   * Resolve an OBJ index to a zero-based array index.
+   * @returns The zero-based index, or `-1` when the OBJ index is invalid.
+   */
+  #resolveIndex(index: number, arrayLength: number): number {
+    if (index === 0) {
+      return -1;
+    }
+
+    if (index > 0) {
+      return index - 1;
+    }
+
+    return arrayLength + index;
+  }
+
+  /**
+   * Append a position triplet or a default origin.
+   */
+  #appendPosition(vertices: number[], positions: number[], vertexIndex: number): void {
+    if (vertexIndex < 0) {
+      vertices.push(0, 0, 0);
+      return;
+    }
+
+    vertices.push(
+      positions[vertexIndex * 3],
+      positions[vertexIndex * 3 + 1],
+      positions[vertexIndex * 3 + 2],
+    );
+  }
+
+  /**
+   * Append a texture coordinate pair or a default zero coordinate.
+   */
+  #appendTexcoord(texcoords: number[], sourceTexcoords: number[], texcoordIndex: number): void {
+    if (texcoordIndex < 0) {
+      texcoords.push(0, 0);
+      return;
+    }
+
+    texcoords.push(
+      sourceTexcoords[texcoordIndex * 2],
+      sourceTexcoords[texcoordIndex * 2 + 1],
+    );
+  }
+
+  /**
+   * Append a normal triplet or a default up normal.
+   */
+  #appendNormal(normals: number[], sourceNormals: number[], normalIndex: number): void {
+    if (normalIndex < 0) {
+      normals.push(0, 0, 1);
+      return;
+    }
+
+    normals.push(
+      sourceNormals[normalIndex * 3],
+      sourceNormals[normalIndex * 3 + 1],
+      sourceNormals[normalIndex * 3 + 2],
+    );
+  }
+
+  /**
+   * Calculate the mesh bounding box and radius.
+   */
+  #calculateBounds(model: MeshModel): void {
+    if (model.vertices === null || model.vertices.length === 0) {
+      return;
+    }
+
+    let minX = Infinity;
+    let minY = Infinity;
+    let minZ = Infinity;
+    let maxX = -Infinity;
+    let maxY = -Infinity;
+    let maxZ = -Infinity;
+
+    for (let index = 0; index < model.vertices.length; index += 3) {
+      const x = model.vertices[index];
+      const y = model.vertices[index + 1];
+      const z = model.vertices[index + 2];
+
+      minX = Math.min(minX, x);
+      minY = Math.min(minY, y);
+      minZ = Math.min(minZ, z);
+      maxX = Math.max(maxX, x);
+      maxY = Math.max(maxY, y);
+      maxZ = Math.max(maxZ, z);
+    }
+
+    model.mins = new Vector(minX, minY, minZ);
+    model.maxs = new Vector(maxX, maxY, maxZ);
+
+    let maxDistance = 0;
+    for (let index = 0; index < model.vertices.length; index += 3) {
+      const x = model.vertices[index];
+      const y = model.vertices[index + 1];
+      const z = model.vertices[index + 2];
+      maxDistance = Math.max(maxDistance, Math.hypot(x, y, z));
+    }
+
+    model.boundingradius = maxDistance;
+  }
+
+  /**
+   * Generate tangent and bitangent buffers for normal mapping.
+   */
+  #generateTangentSpace(model: MeshModel): void {
+    if (model.vertices === null || model.normals === null || model.texcoords === null || model.indices === null) {
+      return;
+    }
+
+    const numVerts = model.numVertices;
+    const tangents = new Float32Array(numVerts * 3);
+    const bitangents = new Float32Array(numVerts * 3);
+    const tan1 = new Float32Array(numVerts * 3);
+    const tan2 = new Float32Array(numVerts * 3);
+
+    for (let index = 0; index < model.indices.length; index += 3) {
+      const i1 = model.indices[index];
+      const i2 = model.indices[index + 1];
+      const i3 = model.indices[index + 2];
+
+      const v1 = this.#readTriangleVertex(model.vertices, i1);
+      const v2 = this.#readTriangleVertex(model.vertices, i2);
+      const v3 = this.#readTriangleVertex(model.vertices, i3);
+      const w1 = this.#readTextureCoordinate(model.texcoords, i1);
+      const w2 = this.#readTextureCoordinate(model.texcoords, i2);
+      const w3 = this.#readTextureCoordinate(model.texcoords, i3);
+
+      const x1 = v2[0] - v1[0];
+      const x2 = v3[0] - v1[0];
+      const y1 = v2[1] - v1[1];
+      const y2 = v3[1] - v1[1];
+      const z1 = v2[2] - v1[2];
+      const z2 = v3[2] - v1[2];
+      const s1 = w2[0] - w1[0];
+      const s2 = w3[0] - w1[0];
+      const t1 = w2[1] - w1[1];
+      const t2 = w3[1] - w1[1];
+      const denom = s1 * t2 - s2 * t1;
+      const reciprocal = denom !== 0 ? 1 / denom : 0;
+
+      const sdir: TriangleVertexIndices = [
+        (t2 * x1 - t1 * x2) * reciprocal,
+        (t2 * y1 - t1 * y2) * reciprocal,
+        (t2 * z1 - t1 * z2) * reciprocal,
+      ];
+      const tdir: TriangleVertexIndices = [
+        (s1 * x2 - s2 * x1) * reciprocal,
+        (s1 * y2 - s2 * y1) * reciprocal,
+        (s1 * z2 - s2 * z1) * reciprocal,
+      ];
+
+      for (const vertexIndex of [i1, i2, i3]) {
+        tan1[vertexIndex * 3] += sdir[0];
+        tan1[vertexIndex * 3 + 1] += sdir[1];
+        tan1[vertexIndex * 3 + 2] += sdir[2];
+
+        tan2[vertexIndex * 3] += tdir[0];
+        tan2[vertexIndex * 3 + 1] += tdir[1];
+        tan2[vertexIndex * 3 + 2] += tdir[2];
+      }
+    }
+
+    for (let index = 0; index < numVerts; index++) {
+      const normal = this.#readTriangleVertex(model.normals, index);
+      const accumulatedTangent = this.#readTriangleVertex(tan1, index);
+      const dot = normal[0] * accumulatedTangent[0]
+        + normal[1] * accumulatedTangent[1]
+        + normal[2] * accumulatedTangent[2];
+      const tangent: TriangleVertexIndices = [
+        accumulatedTangent[0] - normal[0] * dot,
+        accumulatedTangent[1] - normal[1] * dot,
+        accumulatedTangent[2] - normal[2] * dot,
+      ];
+      const tangentLength = Math.hypot(tangent[0], tangent[1], tangent[2]);
+
+      if (tangentLength > 0) {
+        tangent[0] /= tangentLength;
+        tangent[1] /= tangentLength;
+        tangent[2] /= tangentLength;
+      }
+
+      tangents[index * 3] = tangent[0];
+      tangents[index * 3 + 1] = tangent[1];
+      tangents[index * 3 + 2] = tangent[2];
+
+      const bitangent: TriangleVertexIndices = [
+        normal[1] * tangent[2] - normal[2] * tangent[1],
+        normal[2] * tangent[0] - normal[0] * tangent[2],
+        normal[0] * tangent[1] - normal[1] * tangent[0],
+      ];
+
+      bitangents[index * 3] = bitangent[0];
+      bitangents[index * 3 + 1] = bitangent[1];
+      bitangents[index * 3 + 2] = bitangent[2];
+    }
+
+    model.tangents = tangents;
+    model.bitangents = bitangents;
+  }
+
+  /**
+   * Read a packed `x, y, z` triplet from a flat float buffer.
+   * @returns The vertex triplet at the requested index.
+   */
+  #readTriangleVertex(values: Float32Array, vertexIndex: number): TriangleVertexIndices {
+    return [
+      values[vertexIndex * 3],
+      values[vertexIndex * 3 + 1],
+      values[vertexIndex * 3 + 2],
+    ];
+  }
+
+  /**
+   * Read a packed `u, v` pair from a flat float buffer.
+   * @returns The texture coordinate pair at the requested index.
+   */
+  #readTextureCoordinate(values: Float32Array, vertexIndex: number): TextureCoordinate {
+    return [
+      values[vertexIndex * 2],
+      values[vertexIndex * 2 + 1],
+    ];
+  }
+}
diff --git a/source/engine/common/model/parsers/ParsedQC.mjs b/source/engine/common/model/parsers/ParsedQC.ts
similarity index 67%
rename from source/engine/common/model/parsers/ParsedQC.mjs
rename to source/engine/common/model/parsers/ParsedQC.ts
index 29207976..6a5aa0a5 100644
--- a/source/engine/common/model/parsers/ParsedQC.mjs
+++ b/source/engine/common/model/parsers/ParsedQC.ts
@@ -1,28 +1,25 @@
+import type { ParsedQC as ParsedQCShape } from '../../../../shared/GameInterfaces.ts';
+
 import Q from '../../../../shared/Q.ts';
 import Vector from '../../../../shared/Vector.ts';
 
-/** @typedef {import('../../../../shared/GameInterfaces').ParsedQC} IParsedQC */
-/** @augments IParsedQC */
-export default class ParsedQC {
-  /** @type {string} */
-  cd = null;
+/**
+ * Parsed representation of a QuakeC model `.qc` source file.
+ */
+export default class ParsedQC implements ParsedQCShape {
+  cd = '';
   origin = new Vector();
-  /** @type {string} */
-  base = null;
-  /** @type {string} */
-  skin = null;
-  /** @type {string[]} */
-  frames = [];
-  /** @type {Record<string, number[]>} */
-  animations = {};
-  /** @type {number} */
+  base: string | null = null;
+  skin: string | null = null;
+  frames: string[] = [];
+  animations: Record<string, number[]> = {};
   scale = 1.0;
 
   /**
-   * @param {string} qcContent qc model source
-   * @returns {this} this
+   * Parse QC model source into a structured representation.
+   * @returns This parsed QC instance.
    */
-  parseQC(qcContent) {
+  parseQC(qcContent: string): this {
     console.assert(typeof qcContent === 'string', 'qcContent must be a string');
 
     const lines = qcContent.trim().split('\n');
@@ -33,7 +30,8 @@ export default class ParsedQC {
       }
 
       const parts = line.split(/\s+/);
-      const [key, value] = [parts.shift(), parts.join(' ')];
+      const key = parts.shift();
+      const value = parts.join(' ');
 
       switch (key) {
         case '$cd':
@@ -41,7 +39,7 @@ export default class ParsedQC {
           break;
 
         case '$origin':
-          this.origin = new Vector(...value.split(/\s+/).map((n) => Q.atof(n)));
+          this.origin = new Vector(...value.split(/\s+/).map((component) => Q.atof(component)));
           break;
 
         case '$base':
@@ -82,4 +80,4 @@ export default class ParsedQC {
 
     return this;
   }
-};
+}
diff --git a/test/common/alias-mdl-loader.test.mjs b/test/common/alias-mdl-loader.test.mjs
index 15f12c1e..bed2586d 100644
--- a/test/common/alias-mdl-loader.test.mjs
+++ b/test/common/alias-mdl-loader.test.mjs
@@ -1,10 +1,10 @@
 import assert from 'node:assert/strict';
 import { describe, test } from 'node:test';
 
-import { buildAliasSkinLayers } from '../../source/engine/common/model/loaders/AliasMDLLoader.mjs';
+import { buildAliasSkinLayers } from '../../source/engine/common/model/loaders/AliasMDLLoader.ts';
 
-describe('buildAliasSkinLayers', () => {
-  test('splits legacy alias fullbright pixels into diffuse and luminance layers', () => {
+void describe('buildAliasSkinLayers', () => {
+  void test('splits legacy alias fullbright pixels into diffuse and luminance layers', () => {
     const palette = new Uint8Array(256 * 3);
     palette[16 * 3] = 1;
     palette[16 * 3 + 1] = 2;
@@ -25,7 +25,7 @@ describe('buildAliasSkinLayers', () => {
     ]);
   });
 
-  test('respects transparent pixels when building alias luminance layers', () => {
+  void test('respects transparent pixels when building alias luminance layers', () => {
     const palette = new Uint8Array(256 * 3);
     palette[255 * 3] = 70;
     palette[255 * 3 + 1] = 80;

From 29c80004a77e6ba312e6e464791b2e0e27e6f830 Mon Sep 17 00:00:00 2001
From: Christian R <github@chrisnew.de>
Date: Fri, 3 Apr 2026 09:47:39 +0300
Subject: [PATCH 29/67] TS: common/GameAPIs, common/CollisionModelSource

---
 source/engine/client/ClientEntities.mjs       |    2 +-
 source/engine/client/ClientLifecycle.mjs      |    2 +-
 .../client/ClientServerCommandHandlers.mjs    |    4 +-
 source/engine/client/Draw.mjs                 |    2 +-
 source/engine/client/menu/Multiplayer.mjs     |    2 +-
 source/engine/common/CollisionModelSource.mjs |   93 --
 source/engine/common/CollisionModelSource.ts  |  105 ++
 source/engine/common/Console.ts               |    2 +-
 source/engine/common/GameAPIs.mjs             | 1164 -----------------
 source/engine/common/GameAPIs.ts              | 1103 ++++++++++++++++
 source/engine/common/Host.ts                  |    2 +-
 source/engine/server/Navigation.mjs           |    2 +-
 source/engine/server/Progs.mjs                |    2 +-
 source/engine/server/ProgsAPI.mjs             |    2 +-
 source/engine/server/Server.mjs               |    4 +-
 source/engine/server/physics/ServerArea.mjs   |    2 +-
 .../engine/server/physics/ServerCollision.mjs |    2 +-
 source/shared/ClientEdict.ts                  |    2 +-
 source/shared/GameInterfaces.ts               |    2 +-
 test/common/collision-model-source.test.mjs   |   76 ++
 test/common/game-apis.test.mjs                |   23 +-
 21 files changed, 1309 insertions(+), 1289 deletions(-)
 delete mode 100644 source/engine/common/CollisionModelSource.mjs
 create mode 100644 source/engine/common/CollisionModelSource.ts
 delete mode 100644 source/engine/common/GameAPIs.mjs
 create mode 100644 source/engine/common/GameAPIs.ts
 create mode 100644 test/common/collision-model-source.test.mjs

diff --git a/source/engine/client/ClientEntities.mjs b/source/engine/client/ClientEntities.mjs
index 2379731f..fd37709e 100644
--- a/source/engine/client/ClientEntities.mjs
+++ b/source/engine/client/ClientEntities.mjs
@@ -5,7 +5,7 @@ import { content, effect, solid } from '../../shared/Defs.ts';
 import Chase from './Chase.mjs';
 import { DefaultClientEdictHandler } from './ClientLegacy.mjs';
 import { BaseClientEdictHandler } from '../../shared/ClientEdict.ts';
-import { ClientEngineAPI } from '../common/GameAPIs.mjs';
+import { ClientEngineAPI } from '../common/GameAPIs.ts';
 import { SFX } from './Sound.mjs';
 import { Node, revealedVisibility } from '../common/model/BSP.ts';
 import { BaseModel } from '../common/model/BaseModel.ts';
diff --git a/source/engine/client/ClientLifecycle.mjs b/source/engine/client/ClientLifecycle.mjs
index b68fa5a9..b3b20102 100644
--- a/source/engine/client/ClientLifecycle.mjs
+++ b/source/engine/client/ClientLifecycle.mjs
@@ -6,7 +6,7 @@ import ClientInput from './ClientInput.mjs';
 import CL from './CL.mjs';
 import { clientRuntimeState } from './ClientState.mjs';
 import { MoveVars, Pmove } from '../common/Pmove.ts';
-import { ClientEngineAPI } from '../common/GameAPIs.mjs';
+import { ClientEngineAPI } from '../common/GameAPIs.ts';
 import { eventBus, registry } from '../registry.mjs';
 
 let { Host, PR, S } = registry;
diff --git a/source/engine/client/ClientServerCommandHandlers.mjs b/source/engine/client/ClientServerCommandHandlers.mjs
index 4af8f9e7..875bf973 100644
--- a/source/engine/client/ClientServerCommandHandlers.mjs
+++ b/source/engine/client/ClientServerCommandHandlers.mjs
@@ -4,8 +4,8 @@ import Cmd from '../common/Cmd.ts';
 import { HostError } from '../common/Errors.ts';
 import { gameCapabilities } from '../../shared/Defs.ts';
 import Vector from '../../shared/Vector.ts';
-import { ClientEngineAPI } from '../common/GameAPIs.mjs';
-import { sharedCollisionModelSource } from '../common/CollisionModelSource.mjs';
+import { ClientEngineAPI } from '../common/GameAPIs.ts';
+import { sharedCollisionModelSource } from '../common/CollisionModelSource.ts';
 import { eventBus, registry } from '../registry.mjs';
 import { ScoreSlot } from './ClientState.mjs';
 
diff --git a/source/engine/client/Draw.mjs b/source/engine/client/Draw.mjs
index 2157f21a..ee87273f 100644
--- a/source/engine/client/Draw.mjs
+++ b/source/engine/client/Draw.mjs
@@ -6,7 +6,7 @@ import W, { WadFileInterface, WadLumpTexture } from '../common/W.ts';
 
 import { eventBus, registry } from '../registry.mjs';
 import GL, { GLTexture } from './GL.mjs';
-import { ClientEngineAPI } from '../common/GameAPIs.mjs';
+import { ClientEngineAPI } from '../common/GameAPIs.ts';
 
 let { Host } = registry;
 
diff --git a/source/engine/client/menu/Multiplayer.mjs b/source/engine/client/menu/Multiplayer.mjs
index 96047af2..415e4c07 100644
--- a/source/engine/client/menu/Multiplayer.mjs
+++ b/source/engine/client/menu/Multiplayer.mjs
@@ -4,7 +4,7 @@ import Cmd from '../../common/Cmd.ts';
 import { eventBus, registry } from '../../registry.mjs';
 import { Action, Label, Spacer } from './MenuItem.mjs';
 import { MenuPage, VerticalLayout } from './MenuPage.mjs';
-import { ServerEngineAPI } from '../../common/GameAPIs.mjs';
+import { ServerEngineAPI } from '../../common/GameAPIs.ts';
 
 let { M } = registry;
 
diff --git a/source/engine/common/CollisionModelSource.mjs b/source/engine/common/CollisionModelSource.mjs
deleted file mode 100644
index 969ecbec..00000000
--- a/source/engine/common/CollisionModelSource.mjs
+++ /dev/null
@@ -1,93 +0,0 @@
-import { registry } from '../registry.mjs';
-
-/** @typedef {import('../server/Client.mjs').ServerEdict} ServerEdict */
-
-/**
- * Runtime-neutral model and world resolver for collision code.
- * Server and client bootstrap code inject live accessors so physics classes do
- * not need to know where model caches or world state live.
- */
-export class CollisionModelSource {
-  /** @type {() => ServerEdict|null} */
-  #getServerWorldEntity = () => null;
-
-  /** @type {() => import('./Mod.ts').BrushModel|null} */
-  #getServerWorldModel = () => null;
-
-  /** @type {() => Array<import('./Mod.ts').BrushModel|object|null>|null} */
-  #getServerModels = () => null;
-
-  /** @type {() => import('./Mod.ts').BrushModel|null} */
-  #getClientWorldModel = () => null;
-
-  /** @type {() => Array<import('./Mod.ts').BrushModel|object|null>|null} */
-  #getClientModels = () => null;
-
-  /**
-   * Install live server accessors.
-   * @param {{getWorldEntity?: () => ServerEdict|null, getWorldModel?: () => import('./Mod.ts').BrushModel|null, getModels?: () => Array<import('./Mod.ts').BrushModel|object|null>|null}} accessors server accessors
-   */
-  configureServer(accessors = {}) {
-    this.#getServerWorldEntity = accessors.getWorldEntity ?? (() => null);
-    this.#getServerWorldModel = accessors.getWorldModel ?? (() => null);
-    this.#getServerModels = accessors.getModels ?? (() => null);
-  }
-
-  /**
-   * Install live client accessors.
-   * @param {{getWorldModel?: () => import('./Mod.ts').BrushModel|null, getModels?: () => Array<import('./Mod.ts').BrushModel|object|null>|null}} accessors client accessors
-   */
-  configureClient(accessors = {}) {
-    this.#getClientWorldModel = accessors.getWorldModel ?? (() => null);
-    this.#getClientModels = accessors.getModels ?? (() => null);
-  }
-
-  /** @returns {ServerEdict|null} active static-world entity, if any */
-  getWorldEntity() {
-    return this.#getServerWorldEntity();
-  }
-
-  /** @returns {import('./Mod.ts').BrushModel|null} active static-world model */
-  getWorldModel() {
-    return this.#getServerWorldModel()
-      ?? this.#getClientWorldModel()
-      ?? this.#getClientModels()?.[1]
-      ?? null;
-  }
-
-  /**
-   * Resolve a model from the active runtime's model cache.
-   * @param {number} modelIndex precached model index
-   * @returns {import('./Mod.ts').BrushModel|object|null} resolved model, if any
-   */
-  getModelByIndex(modelIndex) {
-    return this.#getServerModels()?.[modelIndex]
-      ?? this.#getClientModels()?.[modelIndex]
-      ?? null;
-  }
-}
-
-/**
- * Compatibility adapter for tests and legacy call sites that still construct
- * collision helpers directly without explicit injection.
- * @returns {CollisionModelSource} registry-backed collision model source
- */
-export function createRegistryCollisionModelSource() {
-  const modelSource = new CollisionModelSource();
-
-  modelSource.configureServer({
-    getWorldEntity: () => registry.SV?.server?.edicts?.[0] ?? null,
-    getWorldModel: () => registry.SV?.server?.worldmodel ?? null,
-    getModels: () => registry.SV?.server?.models ?? null,
-  });
-  modelSource.configureClient({
-    getWorldModel: () => registry.CL?.state?.worldmodel ?? null,
-    getModels: () => registry.CL?.state?.model_precache ?? null,
-  });
-
-  return modelSource;
-}
-
-export const sharedCollisionModelSource = new CollisionModelSource();
-
-export default CollisionModelSource;
diff --git a/source/engine/common/CollisionModelSource.ts b/source/engine/common/CollisionModelSource.ts
new file mode 100644
index 00000000..57d40814
--- /dev/null
+++ b/source/engine/common/CollisionModelSource.ts
@@ -0,0 +1,105 @@
+import { eventBus, registry } from '../registry.mjs';
+
+import type { ServerEdict } from '../server/Edict.mjs';
+import type { BrushModel } from './model/BSP.ts';
+
+interface ServerCollisionModelAccessors {
+  readonly getWorldEntity?: () => ServerEdict | null;
+  readonly getWorldModel?: () => BrushModel | null;
+  readonly getModels?: () => Array<BrushModel | object | null> | null;
+}
+
+interface ClientCollisionModelAccessors {
+  readonly getWorldModel?: () => BrushModel | null;
+  readonly getModels?: () => Array<BrushModel | object | null> | null;
+}
+
+let { CL, SV } = registry;
+
+eventBus.subscribe('registry.frozen', () => {
+  ({ CL, SV } = registry);
+});
+
+/**
+ * Runtime-neutral model and world resolver for collision code.
+ * Server and client bootstrap code inject live accessors so physics classes do
+ * not need to know where model caches or world state live.
+ */
+export class CollisionModelSource {
+  #getServerWorldEntity: () => ServerEdict | null = () => null;
+  #getServerWorldModel: () => BrushModel | null = () => null;
+  #getServerModels: () => Array<BrushModel | object | null> | null = () => null;
+  #getClientWorldModel: () => BrushModel | null = () => null;
+  #getClientModels: () => Array<BrushModel | object | null> | null = () => null;
+
+  /**
+   * Install live server accessors.
+   */
+  configureServer(accessors: ServerCollisionModelAccessors = {}): void {
+    this.#getServerWorldEntity = accessors.getWorldEntity ?? (() => null);
+    this.#getServerWorldModel = accessors.getWorldModel ?? (() => null);
+    this.#getServerModels = accessors.getModels ?? (() => null);
+  }
+
+  /**
+   * Install live client accessors.
+   */
+  configureClient(accessors: ClientCollisionModelAccessors = {}): void {
+    this.#getClientWorldModel = accessors.getWorldModel ?? (() => null);
+    this.#getClientModels = accessors.getModels ?? (() => null);
+  }
+
+  /**
+   * Return the active static-world entity, if any.
+   * @returns The current server world entity.
+   */
+  getWorldEntity(): ServerEdict | null {
+    return this.#getServerWorldEntity();
+  }
+
+  /**
+   * Return the active static-world model.
+   * @returns The current server or client world model.
+   */
+  getWorldModel(): BrushModel | null {
+    return this.#getServerWorldModel()
+      ?? this.#getClientWorldModel()
+      ?? this.#getClientModels()?.[1]
+      ?? null;
+  }
+
+  /**
+   * Resolve a model from the active runtime's model cache.
+   * @returns The resolved model, if any.
+   */
+  getModelByIndex(modelIndex: number): BrushModel | object | null {
+    return this.#getServerModels()?.[modelIndex]
+      ?? this.#getClientModels()?.[modelIndex]
+      ?? null;
+  }
+}
+
+/**
+ * Compatibility adapter for tests and legacy call sites that still construct
+ * collision helpers directly without explicit injection.
+ * @returns A registry-backed collision model source.
+ */
+export function createRegistryCollisionModelSource(): CollisionModelSource {
+  const modelSource = new CollisionModelSource();
+
+  modelSource.configureServer({
+    getWorldEntity: () => SV?.server?.edicts?.[0] ?? null,
+    getWorldModel: () => SV?.server?.worldmodel ?? null,
+    getModels: () => SV?.server?.models ?? null,
+  });
+  modelSource.configureClient({
+    getWorldModel: () => CL?.state?.worldmodel ?? null,
+    getModels: () => CL?.state?.model_precache ?? null,
+  });
+
+  return modelSource;
+}
+
+export const sharedCollisionModelSource = new CollisionModelSource();
+
+export default CollisionModelSource;
diff --git a/source/engine/common/Console.ts b/source/engine/common/Console.ts
index fb927ea5..6f71d1c2 100644
--- a/source/engine/common/Console.ts
+++ b/source/engine/common/Console.ts
@@ -4,7 +4,7 @@ import Cvar from './Cvar.ts';
 import Cmd from './Cmd.ts';
 import VID from '../client/VID.mjs';
 import { clientConnectionState } from './Def.ts';
-import { ClientEngineAPI } from './GameAPIs.mjs';
+import { ClientEngineAPI } from './GameAPIs.ts';
 
 let { CL, Draw, Host, Key, M, SCR } = getClientRegistry();
 
diff --git a/source/engine/common/GameAPIs.mjs b/source/engine/common/GameAPIs.mjs
deleted file mode 100644
index 9b6968c3..00000000
--- a/source/engine/common/GameAPIs.mjs
+++ /dev/null
@@ -1,1164 +0,0 @@
-import { PmoveConfiguration } from '../../shared/Pmove.ts';
-import Vector from '../../shared/Vector.ts';
-import { solid } from '../../shared/Defs.ts';
-import Key from '../client/Key.mjs';
-import { SFX } from '../client/Sound.mjs';
-import VID from '../client/VID.mjs';
-import * as Protocol from '../network/Protocol.ts';
-import { EventBus, eventBus, registry } from '../registry.mjs';
-import { ED, ServerEdict } from '../server/Edict.mjs';
-import Cmd from './Cmd.ts';
-import Cvar from './Cvar.ts';
-import { HostError } from './Errors.ts';
-import Mod from './Mod.ts';
-import W from './W.ts';
-
-/** @typedef {import('../client/ClientEntities.mjs').ClientEdict} ClientEdict */
-/** @typedef {import('../client/ClientEntities.mjs').ClientDlight} ClientDlight */
-/** @typedef {import('../client/GL.mjs').GLTexture} GLTexture */
-/** @typedef {import('../network/MSG.ts').SzBuffer} SzBuffer */
-/** @typedef {import('../server/Navigation.mjs').Navigation} Navigation */
-/** @typedef {import('./model/parsers/ParsedQC.ts').default} ParsedQC */
-/** @typedef {import('./model/BaseModel.ts').BaseModel} BaseModel */
-/** @typedef {import('../server/physics/ServerCollisionSupport.mjs').CollisionTrace} CollisionTrace */
-/**
- * @typedef ClientTraceOptions
- * @property {boolean} [includeEntities] include current client entities in addition to static world geometry
- * @property {?number} [passEntityId] client entity number to skip during entity tracing
- * @property {?((entity: ClientEdict) => boolean)} [filter] optional candidate filter for entity tracing
- */
-/**
- * @typedef GameTrace
- * @property {{ all: boolean, start: boolean }} solid solid hit flags
- * @property {number} fraction completed trace fraction
- * @property {{ normal: Vector, distance: number }} plane impact plane
- * @property {{ inOpen: boolean, inWater: boolean }} contents terminal contents flags
- * @property {Vector} point final trace point
- * @property {import('../../game/id1/entity/BaseEntity.mjs').default|ClientEdict|null} entity hit entity, if any
- */
-
-let { CL, Con, Draw, Host, R, S, SCR, SV, V} = registry;
-
-eventBus.subscribe('registry.frozen', () => {
-  CL = registry.CL;
-  Con = registry.Con;
-  Draw = registry.Draw;
-  Host = registry.Host;
-  R = registry.R;
-  S = registry.S;
-  SCR = registry.SCR;
-  SV = registry.SV;
-  V = registry.V;
-});
-
-eventBus.subscribe('com.ready', () => {
-  const COM = registry.COM;
-
-  if (!COM.registered) {
-    CommonEngineAPI.gameFlavors.push(GameFlavors.shareware);
-  }
-
-  if (COM.hipnotic) {
-    CommonEngineAPI.gameFlavors.push(GameFlavors.hipnotic);
-  }
-
-  if (COM.rogue) {
-    CommonEngineAPI.gameFlavors.push(GameFlavors.rogue);
-  }
-
-  if (COM.registered.value === 1) {
-    ServerEngineAPI.registered = true;
-    ClientEngineAPI.registered = true;
-  }
-});
-
-/** @enum {string} */
-export const GameFlavors = Object.freeze({
-  hipnotic: 'hipnotic',
-  rogue: 'rogue',
-  shareware: 'shareware',
-});
-
-// eslint-disable-next-line jsdoc/require-jsdoc
-function internalTraceToGameTrace(trace) {
-  return {
-    solid: {
-      /** @type {boolean} */
-      all: trace.allsolid,
-      /** @type {boolean} */
-      start: trace.startsolid,
-    },
-    /** @type {number} */
-    fraction: trace.fraction,
-    plane: {
-      /** @type {Vector} */
-      normal: trace.plane.normal,
-      /** @type {number} */
-      distance: trace.plane.dist,
-    },
-    contents: {
-      /** @type {boolean} */
-      inOpen: !!trace.inopen,
-      /** @type {boolean} */
-      inWater: !!trace.inwater,
-    },
-    /** @type {Vector} final position of the line */
-    point: trace.endpos,
-    /** @type {?import('../../game/id1/entity/BaseEntity.mjs').default} entity */
-    entity: trace.ent ? trace.ent.entity : null,
-  };
-}
-
-/**
- * @param {ClientEdict} entity client entity candidate
- * @returns {boolean} true when the entity can be traced against
- */
-function isTraceableClientSolid(entity) {
-  return entity.solid === solid.SOLID_BBOX
-    || entity.solid === solid.SOLID_SLIDEBOX
-    || entity.solid === solid.SOLID_BSP
-    || entity.solid === solid.SOLID_MESH;
-}
-
-/**
- * @param {ClientEdict} entity client entity candidate
- * @returns {{ mins: Vector, maxs: Vector }} extents used for tracing this entity
- */
-function getClientTraceExtents(entity) {
-  if (entity.model !== null && entity.mins.isOrigin() && entity.maxs.isOrigin()) {
-    return {
-      mins: entity.model.mins,
-      maxs: entity.model.maxs,
-    };
-  }
-
-  return {
-    mins: entity.mins,
-    maxs: entity.maxs,
-  };
-}
-
-/**
- * @param {ClientEdict} entity client entity candidate
- * @param {Vector} absmin output minimum bounds
- * @param {Vector} absmax output maximum bounds
- */
-function computeClientTraceBounds(entity, absmin, absmax) {
-  const { mins, maxs } = getClientTraceExtents(entity);
-
-  if (!entity.angles.isOrigin()) {
-    const basis = entity.angles.toRotationMatrix();
-    const forward = new Vector(basis[0], basis[1], basis[2]);
-    const right = new Vector(basis[3], basis[4], basis[5]);
-    const up = new Vector(basis[6], basis[7], basis[8]);
-
-    const centerX = (mins[0] + maxs[0]) * 0.5;
-    const centerY = (mins[1] + maxs[1]) * 0.5;
-    const centerZ = (mins[2] + maxs[2]) * 0.5;
-    const extentsX = (maxs[0] - mins[0]) * 0.5;
-    const extentsY = (maxs[1] - mins[1]) * 0.5;
-    const extentsZ = (maxs[2] - mins[2]) * 0.5;
-
-    const worldCenter = entity.origin.copy()
-      .add(forward.copy().multiply(centerX))
-      .add(right.copy().multiply(centerY))
-      .add(up.copy().multiply(centerZ));
-
-    const worldExtentX = Math.abs(forward[0]) * extentsX + Math.abs(right[0]) * extentsY + Math.abs(up[0]) * extentsZ;
-    const worldExtentY = Math.abs(forward[1]) * extentsX + Math.abs(right[1]) * extentsY + Math.abs(up[1]) * extentsZ;
-    const worldExtentZ = Math.abs(forward[2]) * extentsX + Math.abs(right[2]) * extentsY + Math.abs(up[2]) * extentsZ;
-
-    absmin.setTo(
-      worldCenter[0] - worldExtentX,
-      worldCenter[1] - worldExtentY,
-      worldCenter[2] - worldExtentZ,
-    );
-    absmax.setTo(
-      worldCenter[0] + worldExtentX,
-      worldCenter[1] + worldExtentY,
-      worldCenter[2] + worldExtentZ,
-    );
-    return;
-  }
-
-  absmin.set(entity.origin).add(mins);
-  absmax.set(entity.origin).add(maxs);
-}
-
-/**
- * @param {Vector} traceMins trace minimum bounds
- * @param {Vector} traceMaxs trace maximum bounds
- * @param {Vector} entityMins entity minimum bounds
- * @param {Vector} entityMaxs entity maximum bounds
- * @returns {boolean} true when the AABBs overlap
- */
-function traceBoundsOverlap(traceMins, traceMaxs, entityMins, entityMaxs) {
-  return !(
-    traceMins[0] > entityMaxs[0]
-    || traceMins[1] > entityMaxs[1]
-    || traceMins[2] > entityMaxs[2]
-    || traceMaxs[0] < entityMins[0]
-    || traceMaxs[1] < entityMins[1]
-    || traceMaxs[2] < entityMins[2]
-  );
-}
-
-/**
- * @param {Vector} start trace start
- * @param {Vector} end trace end
- * @param {CollisionTrace} worldTrace current static-world trace result
- * @param {ClientTraceOptions} options client trace options
- * @returns {CollisionTrace} best trace including eligible client entities
- */
-function traceClientEntities(start, end, worldTrace, options) {
-  const traceMins = new Vector(
-    Math.min(start[0], worldTrace.endpos[0]),
-    Math.min(start[1], worldTrace.endpos[1]),
-    Math.min(start[2], worldTrace.endpos[2]),
-  );
-  const traceMaxs = new Vector(
-    Math.max(start[0], worldTrace.endpos[0]),
-    Math.max(start[1], worldTrace.endpos[1]),
-    Math.max(start[2], worldTrace.endpos[2]),
-  );
-  const entityMins = new Vector();
-  const entityMaxs = new Vector();
-
-  /** @type {CollisionTrace} */
-  let bestTrace = worldTrace;
-
-  for (const entity of CL.state.clientEntities.getEntities()) {
-    if (entity.num === 0 || entity.free || entity.origin.isInfinite() || entity.model === null) {
-      continue;
-    }
-
-    if (!isTraceableClientSolid(entity)) {
-      continue;
-    }
-
-    if (options.passEntityId !== null && options.passEntityId !== undefined && entity.num === options.passEntityId) {
-      continue;
-    }
-
-    if (options.filter !== null && options.filter !== undefined && !options.filter(entity)) {
-      continue;
-    }
-
-    computeClientTraceBounds(entity, entityMins, entityMaxs);
-
-    if (!traceBoundsOverlap(traceMins, traceMaxs, entityMins, entityMaxs)) {
-      continue;
-    }
-
-    const trace = SV.collision.clipMoveToEntity({
-      // @ts-ignore Client tracing reuses shared narrow-phase helpers with a lightweight ClientEdict adapter.
-      entity,
-      num: entity.num,
-      equals(other) {
-        return this === other;
-      },
-    }, start, Vector.origin, Vector.origin, bestTrace.endpos);
-
-    if (trace.allsolid || trace.startsolid || trace.fraction < bestTrace.fraction) {
-      bestTrace = trace;
-    }
-  }
-
-  return bestTrace;
-}
-
-export class CommonEngineAPI {
-  /**
-   * Indicates whether the game is registered (not shareware).
-   * @type {boolean} true if the game is registered, false if it is shareware
-   */
-  static registered = false;
-
-  /** @type {GameFlavors[]} */
-  static gameFlavors = [];
-
-  /**
-   * Appends text to the command buffer.
-   * @param {string} text command strings to be added to the Cmd.text buffer
-   */
-  static AppendConsoleText(text) {
-    Cmd.text += text;
-  }
-
-  /**
-   * Gets a cvar by name.
-   * @param {string} name name of the variable
-   * @returns {Cvar} the variable
-   */
-  static GetCvar(name) {
-    return Cvar.FindVar(name);
-  }
-
-  /**
-   * Changes the value of a cvar.
-   * @param {string} name name of the variable
-   * @param {string} value value
-   * @returns {Cvar} the modified variable
-   */
-  static SetCvar(name, value) {
-    return Cvar.Set(name, value);
-  }
-
-  /**
-   * Make sure to free the variable in shutdown().
-   * @see {@link Cvar}
-   * @param {string} name name of the variable
-   * @param {string} value value
-   * @param {number} flags optional flags
-   * @param {?string} description optional description
-   * @returns {Cvar} the created variable
-   */
-  static RegisterCvar(name, value, flags = 0, description = null) {
-    return new Cvar(name, value, flags | Cvar.FLAG.GAME, description);
-  }
-
-  static ConsolePrint(msg, color = new Vector(1.0, 1.0, 1.0)) {
-    Con.Print(msg, color);
-  }
-
-  static ConsoleWarning(msg) {
-    Con.PrintWarning(msg);
-  }
-
-  static ConsoleError(msg) {
-    Con.PrintError(msg);
-  }
-
-  static ConsoleDebug(str) {
-    Con.DPrint(str);
-  }
-
-  /**
-   * Parses QuakeC for model animation information.
-   * @param {string} qcContent qc content
-   * @returns {ParsedQC} parsed QC content
-   */
-  static ParseQC(qcContent) {
-    return Mod.ParseQC(qcContent);
-  }
-};
-
-export class ServerEngineAPI extends CommonEngineAPI {
-  /**
-   * Make sure to free the variable in shutdown().
-   * @see {@link Cvar}
-   * @param {string} name name of the variable
-   * @param {string} value value
-   * @param {number} flags optional flags
-   * @param {?string} description optional description
-   * @returns {Cvar} the created variable
-   */
-  static RegisterCvar(name, value, flags = 0, description = null) {
-    return new Cvar(name, value, flags | Cvar.FLAG.GAME | Cvar.FLAG.SERVER, description);
-  }
-
-  static BroadcastPrint(str) {
-    Host.BroadcastPrint(str);
-  }
-
-  static StartParticles(origin, direction, color, count) {
-    SV.messages.startParticle(origin, direction, color, count);
-  }
-
-  static SpawnAmbientSound(origin, sfxName, volume, attenuation) {
-    let i = 0;
-
-    for (; i < SV.server.soundPrecache.length; i++) {
-      if (SV.server.soundPrecache[i] === sfxName) {
-        break;
-      }
-    }
-
-    if (i === SV.server.soundPrecache.length) {
-      Con.Print('no precache: ' + sfxName + '\n');
-      return false;
-    }
-
-    const signon = SV.server.signon;
-    signon.writeByte(Protocol.svc.spawnstaticsound);
-    signon.writeCoordVector(origin);
-    signon.writeByte(i);
-    signon.writeByte(volume * 255.0);
-    signon.writeByte(attenuation * 64.0);
-
-    return true;
-  }
-
-  static StartSound(edict, channel, sfxName, volume, attenuation) {
-    SV.messages.startSound(edict, channel, sfxName, volume * 255.0, attenuation);
-
-    return true;
-  }
-
-  static Traceline(start, end, noMonsters, passEdict, mins = null, maxs = null) {
-    const nullVec = Vector.origin;
-    const trace = SV.collision.move(start, mins ? mins : nullVec, maxs ? maxs : nullVec, end, noMonsters, passEdict);
-    return internalTraceToGameTrace(trace);
-  }
-
-  static TracelineLegacy(start, end, noMonsters, passEdict, mins = null, maxs = null) {
-    const nullVec = Vector.origin;
-    return SV.collision.move(start, mins ? mins : nullVec, maxs ? maxs : nullVec, end, noMonsters, passEdict);
-  }
-
-  /**
-   * Defines a lightstyle (e.g. aazzaa).
-   * It will also send an update to all connected clients.
-   * @param {number} styleId
-   * @param {string} sequenceString
-   */
-  static Lightstyle(styleId, sequenceString) {
-    SV.server.lightstyles[styleId] = sequenceString;
-
-    if (SV.server.loading) {
-      return;
-    }
-
-    for (const client of SV.svs.spawnedClients()) {
-      client.message.writeByte(Protocol.svc.lightstyle);
-      client.message.writeByte(styleId);
-      client.message.writeString(sequenceString);
-    }
-  }
-
-  /**
-   * Finds out what contents the given point is in, using the active world
-   * collision backend.
-   * @param {Vector} origin point in space
-   * @returns {number} contents
-   */
-  static DetermineStaticWorldContents(origin) {
-    return SV.collision.staticWorldContents(origin);
-  }
-
-  /**
-   * Compatibility alias for DetermineStaticWorldContents.
-   * @param {Vector} origin point in space
-   * @returns {number} contents
-   */
-  static DetermineWorldContents(origin) {
-    return this.DetermineStaticWorldContents(origin);
-  }
-
-  /**
-   * Finds out what contents the given point is in.
-   * @param {Vector} origin point in space
-   * @returns {number} contents
-   */
-  static DeterminePointContents(origin) {
-    return this.DetermineStaticWorldContents(origin);
-  }
-
-  /**
-   * Set an area portal's open/close state.
-   * Call this when a door or platform opens/closes to control sound propagation
-   * and area connectivity. Uses reference counting: multiple entities can hold
-   * the same portal open.
-   * @param {number} portalNum portal index (from the BSP area portals lump)
-   * @param {boolean} open true to open (increment ref count), false to close (decrement)
-   */
-  static SetAreaPortalState(portalNum, open) {
-    if (SV.server.worldmodel === null) {
-      return;
-    }
-
-    SV.server.worldmodel.areaPortals.setPortalState(portalNum, open);
-
-    for (const client of SV.svs.spawnedClients()) {
-      client.message.writeByte(Protocol.svc.setportalstate);
-      client.message.writeShort(portalNum);
-      client.message.writeByte(open ? 1 : 0);
-    }
-  }
-
-  /**
-   * Check if two areas are connected through open portals.
-   * @param {number} area0 first area index
-   * @param {number} area1 second area index
-   * @returns {boolean} true if the areas are connected
-   */
-  static AreasConnected(area0, area1) {
-    if (SV.server.worldmodel === null) {
-      return true;
-    }
-
-    return SV.server.worldmodel.areaPortals.areasConnected(area0, area1);
-  }
-
-  /**
-   * Get the auto-assigned portal number for a brush model.
-   * Returns -1 if the model has no associated portal.
-   * @param {string} modelName brush model name (e.g. "*1")
-   * @returns {number} portal number, or -1 if none
-   */
-  static GetModelPortal(modelName) {
-    if (SV.server.worldmodel === null) {
-      return -1;
-    }
-
-    return SV.server.worldmodel.modelPortalMap[modelName] ?? -1;
-  }
-
-  static ChangeLevel(mapname) {
-    if (SV.svs.changelevelIssued) {
-      return;
-    }
-
-    Cmd.text += `changelevel ${mapname}\n`;
-  }
-
-  /**
-   * Finds all edicts around origin in given radius.
-   * @param {Vector} origin point in space
-   * @param {number} radius not really a radius, it’s used for creating an axis-aligned bounding box
-   * @param {(ent: ServerEdict) => boolean} filterFn optional filter function, if provided, will be used to filter entities
-   * @returns {ServerEdict[]} matching edict
-   */
-  static FindInRadius(origin, radius, filterFn = null) {
-    const vradius = new Vector(radius, radius, radius);
-    const mins = origin.copy().subtract(vradius);
-    const maxs = origin.copy().add(vradius);
-
-    /** @type {ServerEdict[]} */
-    const edicts = [];
-
-    for (const ent of SV.area.tree.queryAABB(mins, maxs)) {
-      if (ent.num === 0 || ent.isFree()) {
-        continue;
-      }
-
-      const eorg = origin.copy().subtract(ent.entity.origin.copy().add(ent.entity.mins.copy().add(ent.entity.maxs).multiply(0.5)));
-
-      if (eorg.len() > radius) {
-        continue;
-      }
-
-      if (!filterFn || filterFn(ent)) {
-        edicts.push(ent);
-      }
-    }
-
-    return edicts; // used to be a generator, but we need to return an array due to changing linked lists in between
-  }
-
-  /**
-   * @param {string} field field name to inspect on each entity
-   * @param {import('../../shared/GameInterfaces').EdictValueType} value target field value
-   * @param {number} startEdictId entity number to start searching from
-   * @deprecated use FindAllByFieldAndValue instead
-   * @returns {ServerEdict|null} first matching edict, if any
-   */
-  static FindByFieldAndValue(field, value, startEdictId = 0) { // FIXME: startEdictId should be edict? not 100% happy about this
-    for (let i = startEdictId; i < SV.server.num_edicts; i++) {
-      /** @type {ServerEdict} */
-      const ent = SV.server.edicts[i];
-
-      if (ent.isFree()) {
-        continue;
-      }
-
-      if (ent.entity[field] === value) {
-        return ent; // FIXME: turn it into yield
-      }
-    }
-
-    return null;
-  }
-
-  // TODO: optimize lookups by using maps for fields such as targetname, etc.
-  static *FindAllByFieldAndValue(field, value, startEdictId = 0) { // FIXME: startEdictId should be edict? not 100% happy about this
-    for (let i = startEdictId; i < SV.server.num_edicts; i++) {
-      /** @type {ServerEdict} */
-      const ent = SV.server.edicts[i];
-
-      if (ent.isFree()) {
-        continue;
-      }
-
-      if (ent.entity[field] === value) {
-        yield ent;
-      }
-    }
-  }
-
-  /**
-   * @param {function(ServerEdict): boolean} filterFn
-   * @param {number} startEdictId
-   * @yields {ServerEdict}
-   */
-  static *FindAllByFilter(filterFn = null, startEdictId = 0) { // FIXME: startEdictId should be edict? not 100% happy about this
-    for (let i = startEdictId; i < SV.server.num_edicts; i++) {
-      const ent = SV.server.edicts[i];
-
-      if (ent.isFree()) {
-        continue;
-      }
-
-      if (!filterFn || filterFn(ent)) {
-        yield ent;
-      }
-    }
-  }
-
-  static *GetClients() {
-    for (const client of SV.svs.spawnedClients()) {
-      yield client.edict;
-    }
-  }
-
-  static GetEdictById(edictId) {
-    if (edictId < 0 || edictId >= SV.server.num_edicts) {
-      return null;
-    }
-
-    return SV.server.edicts[edictId];
-  }
-
-  static PrecacheSound(sfxName) {
-    console.assert(typeof(sfxName) === 'string', 'sfxName must be a string');
-
-    if (SV.server.soundPrecache.includes(sfxName)) {
-      return;
-    }
-
-    SV.server.soundPrecache.push(sfxName);
-  }
-
-  static PrecacheModel(modelName) {
-    console.assert(typeof(modelName) === 'string', 'modelName must be a string');
-
-    if (SV.server.modelPrecache.includes(modelName)) {
-      return;
-    }
-
-    SV.server.modelPrecache.push(modelName);
-    SV.server.models.push(Mod.ForNameAsync(modelName, true, Mod.scope.server)); // will cause promises in the array
-  }
-
-  /**
-   * Spawns an Edict, not an entity.
-   * @param {string} classname classname of the entity to spawn, needs to be registered
-   * @param {Record<string, any>} initialData key-value pairs to initialize the entity with, will be handled by the game code
-   * @returns {ServerEdict|null} the spawned edict (NOT ENTITY), or null on failure
-   */
-  static SpawnEntity(classname, initialData = {}) {
-    const edict = ED.Alloc();
-
-    try {
-      if (!SV.server.gameAPI.prepareEntity(edict, classname, initialData)) {
-        edict.freeEdict();
-        return null;
-      }
-
-      if (!SV.server.gameAPI.spawnPreparedEntity(edict)) {
-        edict.freeEdict();
-        return null;
-      }
-    } catch (e) {
-      edict.freeEdict();
-      throw e;
-    }
-
-    return edict;
-  }
-
-  static IsLoading() {
-    return SV.server.loading;
-  }
-
-  /**
-   * @param {number} tempEntityId temporary entity protocol id
-   * @param {Vector} origin event origin
-   * @deprecated use client events instead
-   */
-  static DispatchTempEntityEvent(tempEntityId, origin) {
-    SV.server.datagram.writeByte(Protocol.svc.temp_entity);
-    SV.server.datagram.writeByte(tempEntityId);
-    SV.server.datagram.writeCoordVector(origin);
-  }
-
-  /**
-   * @param {number} beamId beam protocol id
-   * @param {number} edictId source entity id
-   * @param {Vector} startOrigin beam start position
-   * @param {Vector} endOrigin beam end position
-   * @deprecated use client events instead
-   */
-  static DispatchBeamEvent(beamId, edictId, startOrigin, endOrigin) {
-    SV.server.datagram.writeByte(Protocol.svc.temp_entity); // FIXME: unhappy about this
-    SV.server.datagram.writeByte(beamId);
-    SV.server.datagram.writeShort(edictId);
-    SV.server.datagram.writeCoordVector(startOrigin);
-    SV.server.datagram.writeCoordVector(endOrigin);
-  }
-
-  /**
-   * Makes all clients play the specified audio track.
-   * @param {number} track audio track number
-   */
-  static PlayTrack(track) {
-    SV.server.datagram.writeByte(Protocol.svc.cdtrack);
-    SV.server.datagram.writeByte(track);
-    SV.server.datagram.writeByte(0); // unused
-  }
-
-  /**
-   * Shows the shareware sell screen to all clients.
-   * Used when completing shareware episode 1.
-   */
-  static ShowSellScreen() {
-    SV.server.reliable_datagram.writeByte(Protocol.svc.sellscreen);
-  }
-
-  /**
-   * Dispatches a client event to the specified receiver.
-   * NOTE: Events are written to the datagram AFTER an entity update, so referring to an entity that will be removed in the same frame will not work!
-   * @param {SzBuffer} destination destination to write the event to, can be SV.server.datagram or a client message buffer
-   * @param {number} eventCode event code, must be understood by the client
-   * @param  {...import('../../shared/GameInterfaces').SerializableType} args any arguments to pass to the client event, will be serialized
-   */
-  static #DispatchClientEventOnDestination(destination, eventCode, ...args) {
-    console.assert(typeof eventCode === 'number', 'eventCode must be a number');
-
-    destination.writeByte(Protocol.svc.clientevent);
-    destination.writeByte(eventCode);
-
-    destination.writeSerializables(args);
-  }
-
-  /**
-   * Dispatches a client event to everyone
-   * @param {boolean} expedited if true, the event will be sent before the next entity update, otherwise it will be sent after the next entity update
-   * @param {number} eventCode event code, must be understood by the client
-   * @param  {...import('../../shared/GameInterfaces').SerializableType} args any arguments to pass to the client event, will be serialized
-   */
-  static BroadcastClientEvent(expedited, eventCode, ...args) {
-    this.#DispatchClientEventOnDestination(expedited ? SV.server.datagram : SV.server.expedited_datagram, eventCode, ...args);
-  }
-
-  /**
-   * Dispatches a client event to the specified receiver.
-   * @param {ServerEdict} receiverPlayerEdict the edict of the player to send the event to
-   * @param {boolean} expedited if true, the event will be sent before the next entity update, otherwise it will be sent after the next entity update
-   * @param {number} eventCode event code, must be understood by the client
-   * @param  {...import('../../shared/GameInterfaces').SerializableType} args any arguments to pass to the client event, will be serialized
-   */
-  static DispatchClientEvent(receiverPlayerEdict, expedited, eventCode, ...args) {
-    console.assert(receiverPlayerEdict instanceof ServerEdict && receiverPlayerEdict.isClient(), 'emitterEdict must be a ServerEdict connected to a client');
-
-    const destination = expedited ? receiverPlayerEdict.getClient().expedited_message : receiverPlayerEdict.getClient().message;
-
-    this.#DispatchClientEventOnDestination(destination, eventCode, ...args);
-  }
-
-  /**
-   * Will return a series of waypoints from start to end.
-   * @param {Vector} start start point
-   * @param {Vector} end end point
-   * @returns {Vector[]} array of waypoints from start to end, including start and end
-   */
-  static Navigate(start, end) {
-    return SV.server.navigation.findPath(start, end);
-  }
-
-  /**
-   * Will return a series of waypoints from start to end.
-   * @param {Vector} start start point
-   * @param {Vector} end end point
-   * @returns {Promise<Vector[]>} array of waypoints from start to end, including start and end
-   */
-  static async NavigateAsync(start, end) {
-    return SV.server.navigation.findPathAsync(start, end);
-  }
-
-  static GetPHS(origin) {
-    return SV.server.worldmodel.getPhsByPoint(origin);
-  }
-
-  static GetPVS(origin) {
-    return SV.server.worldmodel.getPvsByPoint(origin);
-  }
-
-  /**
-   * Get the area index for a world position.
-   * @param {Vector} origin world position
-   * @returns {number} area index (0 = outside/invalid)
-   */
-  static GetAreaForPoint(origin) {
-    return SV.server.worldmodel.getLeafForPoint(origin).area;
-  }
-
-  /**
-   * Sets the player movement configuration. This is used by the PMove code to determine how the player should move.
-   * @param {PmoveConfiguration} config pmove profile
-   */
-  static SetPmoveConfiguration(config) {
-    console.assert(config instanceof PmoveConfiguration, 'config must be an instance of PmoveConfiguration');
-
-    SV.pmove.configuration = config;
-  }
-
-  static get maxplayers() {
-    return SV.svs.maxclients;
-  }
-
-  /**
-   * Server game event bus, will be reset on every map load.
-   * @returns {EventBus} event bus
-   */
-  static get eventBus() {
-    return SV.server.eventBus;
-  }
-};
-
-export class ClientEngineAPI extends CommonEngineAPI {
-  /**
-   * Make sure to free the variable in shutdown().
-   * @see {@link Cvar}
-   * @param {string} name name of the variable
-   * @param {string} value value
-   * @param {number} flags optional flags
-   * @param {?string} description optional description
-   * @returns {Cvar} the created variable
-   */
-  static RegisterCvar(name, value, flags = 0, description = null) {
-    return new Cvar(name, value, flags | Cvar.FLAG.GAME | Cvar.FLAG.CLIENT, description);
-  }
-
-  /**
-   * @param {string} name command name
-   * @param {Function} callback callback function
-   */
-  static RegisterCommand(name, callback) {
-    Cmd.AddCommand(name, callback);
-  }
-
-  // eslint-disable-next-line no-unused-vars
-  static UnregisterCommand(name) {
-    // TODO: implement
-    console.assert(false, 'UnregisterCommand is not implemented yet');
-  }
-
-  /**
-   * Loads texture from lump.
-   * @param {string} name lump name
-   * @returns {GLTexture} texture
-   */
-  static LoadPicFromLump(name) {
-    return Draw.LoadPicFromLumpDeferred(name);
-  }
-
-  /**
-   * Loads texture from WAD.
-   * @param {string} name lump name
-   * @returns {GLTexture} texture
-   */
-  static LoadPicFromWad(name) {
-    return Draw.LoadPicFromWad(name);
-  }
-
-  /**
-   * Loads texture from file.
-   * @param {string} filename texture filename
-   * @returns {Promise<GLTexture>} texture
-   */
-  static async LoadPicFromFile(filename) {
-    return await Draw.LoadPicFromFile(filename);
-  }
-
-  /**
-   * Plays a sound effect.
-   * @param {SFX} sfx sound effect
-   */
-  static PlaySound(sfx) {
-    S.LocalSound(sfx);
-  }
-
-  /**
-   * Loads a sound effect. Can be used with PlaySound.
-   * @param {string} sfxName sound effect name, e.g. "misc/talk.wav"
-   * @returns {SFX} sound effect
-   */
-  static LoadSound(sfxName) {
-    return S.PrecacheSound(sfxName);
-  }
-
-  /**
-   * Draws a picture at the specified position.
-   * @param {number} x x position
-   * @param {number} y y position
-   * @param {GLTexture} pic pic texture to draw
-   * @param {number} scale optional scale (default: 1.0)
-   */
-  static DrawPic(x, y, pic, scale = 1.0) {
-    Draw.Pic(x, y, pic, scale);
-  }
-
-  /**
-   * Draws a string on the screen at the specified position.
-   * @param {number} x x position
-   * @param {number} y y position
-   * @param {string} str string
-   * @param {number} scale optional scale (default: 1.0)
-   * @param {Vector} color optional color in RGB format (default: white)
-   */
-  static DrawString(x, y, str, scale = 1.0, color = new Vector(1.0, 1.0, 1.0)) {
-    Draw.String(x, y, str, scale, color);
-  }
-
-  /**
-   * Fills a rectangle with a solid color.
-   * @param {number} x The x position.
-   * @param {number} y The y position.
-   * @param {number} w The width of the rectangle.
-   * @param {number} h The height of the rectangle.
-   * @param {Vector} c The color index.
-   * @param {number} a Optional alpha value (default is 1.0).
-   */
-  static DrawRect(x, y, w, h, c, a = 1.0) {
-    Draw.Fill(x, y, w, h, c, a);
-  }
-
-  /**
-   * @param {number} index index on the palette, must be in range [0, 255]
-   * @returns {Vector} RGB color vector
-   */
-  static IndexToRGB(index) {
-    console.assert(typeof index === 'number', 'index must be a number');
-    console.assert(index >= 0 && index < 256, 'index must be in range [0, 255]');
-
-    return new Vector(
-      W.d_8to24table_u8[index * 3] / 256,
-      W.d_8to24table_u8[index * 3 + 1] / 256,
-      W.d_8to24table_u8[index * 3 + 2] / 256,
-    );
-  }
-
-  /**
-   * Translates world coordinates to screen coordinates.
-   * @param {Vector} origin position in world coordinates
-   * @returns {Vector|null} position in screen coordinates, or null if the point is behind the camera
-   */
-  static WorldToScreen(origin) {
-    return R.WorldToScreen(origin);
-  }
-
-  /**
-   * Gets all entities in the game. Both client-only and server entities.
-   * @param {(ent: ClientEdict) => boolean} filter filter function, if provided, will be used to filter entities
-   * @yields {ClientEdict} entity
-   */
-  static *GetEntities(filter = null) {
-    for (const entity of CL.state.clientEntities.getEntities()) {
-      if (filter && !filter(entity)) {
-        continue;
-      }
-
-      yield entity;
-    }
-  }
-
-  /**
-   * Gets all entities staged for rendering. Both client-only and server entities.
-   * @param {(ent: ClientEdict) => boolean} filter filter function, if provided, will be used to filter entities
-   * @yields {ClientEdict} entity
-   */
-  static *GetVisibleEntities(filter = null) {
-    for (const entity of CL.state.clientEntities.getVisibleEntities()) {
-      if (filter && !filter(entity)) {
-        continue;
-      }
-
-      yield entity;
-    }
-  }
-
-  /**
-   * Performs a trace line in the client game world.
-   * By default this traces static world geometry only.
-   * Keep this legacy entry point aligned with the server-side Traceline name so
-   * client tracing can grow into entity-aware behavior later without another API
-   * rename.
-   * @param {Vector} start start position
-   * @param {Vector} end end position
-   * @param {ClientTraceOptions} [options] optional entity-tracing options
-   * @returns {GameTrace} trace result
-   */
-  static Traceline(start, end, options = null) {
-    const worldTrace = SV.collision.traceWorldLine(start, end);
-
-    if (options === null || options.includeEntities !== true) {
-      return internalTraceToGameTrace(worldTrace);
-    }
-
-    return internalTraceToGameTrace(traceClientEntities(start, end, worldTrace, options));
-  }
-
-  /**
-   * Allocates a dynamic light for the given entity Id.
-   * @param {number} entityId entity Id, can be 0
-   * @returns {ClientDlight} dynamic light instance
-   */
-  static AllocDlight(entityId) {
-    return CL.state.clientEntities.allocateDynamicLight(entityId);
-  }
-
-  /**
-   * Allocates a new client entity.
-   * This is a client-side entity, not a server-side edict.
-   * Make sure to invoke spawn() when ready.
-   * Make sure to use setOrigin() to set the position of the entity.
-   * @returns {ClientEdict} a new client entity
-   */
-  static AllocEntity() {
-    return CL.state.clientEntities.allocateClientEntity();
-  }
-
-  /**
-   * Spawns a rocket trail effect from start to end
-   * @param {Vector} start e.g. previous origin
-   * @param {Vector} end e.g. current origin
-   * @param {number} type type of the trail
-   */
-  static RocketTrail(start, end, type) {
-    R.RocketTrail(start, end, type);
-  }
-
-  /**
-   * Places a decal in the world.
-   * @param {Vector} origin position to place decal at
-   * @param {Vector} normal normal/orientation
-   * @param {GLTexture} texture texture to place
-   */
-  static PlaceDecal(origin, normal, texture) {
-    R.PlaceDecal(origin, normal, texture);
-  }
-
-  /**
-   * Gets model by name. Must be precached first.
-   * @param {string} modelName model name
-   * @returns {BaseModel} model index
-   */
-  static ModForName(modelName) {
-    console.assert(typeof modelName === 'string', 'modelName must be a string');
-
-    for (let i = 1; i < CL.state.model_precache.length; i++) {
-      if (CL.state.model_precache[i].name === modelName) {
-        return CL.state.model_precache[i];
-      }
-    }
-
-    throw new HostError(`ClientEngineAPI.ModForName: ${modelName} not precached`);
-  }
-
-  static ModById(id) {
-    console.assert(typeof id === 'number' && id > 0, 'id must be a number and greater than 0');
-
-    if (CL.state.model_precache[id]) {
-      return CL.state.model_precache[id];
-    }
-
-    throw new HostError(`ClientEngineAPI.ModById: ${id} not found`);
-  }
-
-  /**
-   * @param {number} slot see Def.contentShift
-   * @param {Vector} color RGB color vector
-   * @param {number} alpha alpha value, default is 0.5
-   */
-  static ContentShift(slot, color, alpha = 0.5) {
-    V.ContentShift(slot + 4, color, alpha);
-  }
-
-  /**
-   * Sets the player movement configuration. This is used by the PMove code to determine how the player will move.
-   * @param {PmoveConfiguration} config pmove profile
-   */
-  static SetPmoveConfiguration(config) {
-    console.assert(config instanceof PmoveConfiguration, 'config must be an instance of PmoveConfiguration');
-
-    CL.pmove.configuration = config;
-  }
-
-  static M = null;
-
-  static CL = {
-    get viewangles() {
-      return CL.state.viewangles.copy();
-    },
-    get vieworigin() {
-      return CL.state.viewent.origin.copy();
-    },
-    get maxclients() {
-      return CL.state.maxclients;
-    },
-    get levelname() {
-      return CL.state.levelname;
-    },
-    get entityNum() {
-      return CL.state.viewentity;
-    },
-    /**
-     * local time, not game time! If you are looking for SV.server.time, check gametime
-     * @returns {number} local time
-     */
-    get time() { // FIXME: rename to localtime to make the distinction clearer
-      return CL.state.time;
-    },
-    /**
-     * latest SV.server.time, NOT local time!
-     * @returns {number} game time
-     */
-    get gametime() {
-      return CL.state.clientMessages.mtime[0];
-    },
-    get frametime() {
-      return Host.frametime;
-    },
-    get intermission() {
-      return CL.state.intermission > 0;
-    },
-    set intermission(value) {
-      CL.state.intermission = value ? 1 : 0;
-    },
-    score(/** @type {number} */ num) {
-      return CL.state.scores[num];
-    },
-    get serverInfo() {
-      return CL.cls.serverInfo;
-    },
-  };
-
-  static VID = {
-    get width() { return VID.width; },
-    get height() { return VID.height; },
-    get pixelRatio() { return VID.pixelRatio; },
-  };
-
-  static Key = {
-    /**
-     * Gets the string representation of a key binding, e.g. "+attack" -> "mouse1"
-     * @param {string} binding key binding string
-     * @returns {string|null} string representation of the key binding, or null if not found
-     */
-    getKeyForBinding(binding) {
-      return Key.BindingToString(binding);
-    },
-  };
-
-  static SCR = {
-    /**
-     * @returns {number} the current view size (important ones for the status bar are 100, 110, 120)
-     */
-    get viewsize() { return /** @type {number} */ (SCR.viewsize.value); },
-  };
-
-  static get eventBus() {
-    return CL.state.eventBus;
-  };
-};
diff --git a/source/engine/common/GameAPIs.ts b/source/engine/common/GameAPIs.ts
new file mode 100644
index 00000000..927668cc
--- /dev/null
+++ b/source/engine/common/GameAPIs.ts
@@ -0,0 +1,1103 @@
+import type BaseEntity from '../../game/id1/entity/BaseEntity.mjs';
+import type { EdictValueType, SerializableType } from '../../shared/GameInterfaces.ts';
+import type { ClientDlight, ClientEdict } from '../client/ClientEntities.mjs';
+import type { GLTexture } from '../client/GL.mjs';
+import type { SzBuffer } from '../network/MSG.ts';
+import type ParsedQC from './model/parsers/ParsedQC.ts';
+import type { BaseModel } from './model/BaseModel.ts';
+import type { Visibility } from './model/BSP.ts';
+
+import { PmoveConfiguration } from '../../shared/Pmove.ts';
+import Vector from '../../shared/Vector.ts';
+import { solid } from '../../shared/Defs.ts';
+import Key from '../client/Key.mjs';
+import { SFX as SFXValue } from '../client/Sound.mjs';
+import VID from '../client/VID.mjs';
+import * as Protocol from '../network/Protocol.ts';
+import { EventBus, eventBus, registry } from '../registry.mjs';
+import { ED, ServerEdict as ServerEdictValue } from '../server/Edict.mjs';
+import Cmd from './Cmd.ts';
+import Cvar from './Cvar.ts';
+import { HostError } from './Errors.ts';
+import Mod from './Mod.ts';
+import W from './W.ts';
+
+type ServerEdict = ServerEdictValue;
+
+interface ClientTraceOptions {
+  readonly includeEntities?: boolean;
+  readonly passEntityId?: number | null;
+  readonly filter?: ((entity: ClientEdict) => boolean) | null;
+}
+
+interface GameTrace {
+  readonly solid: {
+    readonly all: boolean;
+    readonly start: boolean;
+  };
+  readonly fraction: number;
+  readonly plane: {
+    readonly normal: Vector;
+    readonly distance: number;
+  };
+  readonly contents: {
+    readonly inOpen: boolean;
+    readonly inWater: boolean;
+  };
+  readonly point: Vector;
+  readonly entity: BaseEntity | ClientEdict | null;
+}
+
+interface InternalTraceLike {
+  readonly allsolid: boolean;
+  readonly startsolid: boolean;
+  readonly fraction: number;
+  readonly plane: {
+    readonly normal: Vector;
+    readonly dist: number;
+  };
+  readonly inopen: boolean;
+  readonly inwater: boolean;
+  readonly endpos: Vector;
+  readonly ent: {
+    readonly entity: BaseEntity | ClientEdict;
+  } | null;
+}
+
+interface ClientTraceEntityAdapter {
+  readonly entity: ClientEdict;
+  readonly num: number;
+  equals(other: unknown): boolean;
+}
+
+type ServerEntityFilter = ((entity: ServerEdict) => boolean) | null;
+type ClientEntityFilter = ((entity: ClientEdict) => boolean) | null;
+type CommandCallback = (...args: string[]) => void | Promise<void>;
+
+let { CL, COM, Con, Draw, Host, R, S, SCR, SV, V } = registry;
+
+eventBus.subscribe('registry.frozen', () => {
+  ({ CL, COM, Con, Draw, Host, R, S, SCR, SV, V } = registry);
+});
+
+eventBus.subscribe('com.ready', () => {
+  if (!COM.registered) {
+    CommonEngineAPI.gameFlavors.push(GameFlavors.shareware);
+  }
+
+  if (COM.hipnotic) {
+    CommonEngineAPI.gameFlavors.push(GameFlavors.hipnotic);
+  }
+
+  if (COM.rogue) {
+    CommonEngineAPI.gameFlavors.push(GameFlavors.rogue);
+  }
+
+  if (COM.registered.value === 1) {
+    ServerEngineAPI.registered = true;
+    ClientEngineAPI.registered = true;
+  }
+});
+
+export enum GameFlavors {
+  hipnotic = 'hipnotic',
+  rogue = 'rogue',
+  shareware = 'shareware',
+}
+
+// eslint-disable-next-line jsdoc/require-jsdoc
+function internalTraceToGameTrace(trace: InternalTraceLike): GameTrace {
+  return {
+    solid: {
+      all: trace.allsolid,
+      start: trace.startsolid,
+    },
+    fraction: trace.fraction,
+    plane: {
+      normal: trace.plane.normal,
+      distance: trace.plane.dist,
+    },
+    contents: {
+      inOpen: !!trace.inopen,
+      inWater: !!trace.inwater,
+    },
+    point: trace.endpos,
+    entity: trace.ent ? trace.ent.entity : null,
+  };
+}
+
+/**
+ * Return whether the entity can be traced against.
+ * @returns True when the entity can be traced against.
+ */
+function isTraceableClientSolid(entity: ClientEdict): boolean {
+  return entity.solid === solid.SOLID_BBOX
+    || entity.solid === solid.SOLID_SLIDEBOX
+    || entity.solid === solid.SOLID_BSP
+    || entity.solid === solid.SOLID_MESH;
+}
+
+/**
+ * Return the extents used for tracing the entity.
+ * @returns The mins/maxs extents used for tracing.
+ */
+function getClientTraceExtents(entity: ClientEdict): { mins: Vector; maxs: Vector } {
+  if (entity.model !== null && entity.mins.isOrigin() && entity.maxs.isOrigin()) {
+    return {
+      mins: entity.model.mins,
+      maxs: entity.model.maxs,
+    };
+  }
+
+  return {
+    mins: entity.mins,
+    maxs: entity.maxs,
+  };
+}
+
+/**
+ * Compute the client's world-space trace bounds.
+ */
+function computeClientTraceBounds(entity: ClientEdict, absmin: Vector, absmax: Vector): void {
+  const { mins, maxs } = getClientTraceExtents(entity);
+
+  if (!entity.angles.isOrigin()) {
+    const basis = entity.angles.toRotationMatrix();
+    const forward = new Vector(basis[0], basis[1], basis[2]);
+    const right = new Vector(basis[3], basis[4], basis[5]);
+    const up = new Vector(basis[6], basis[7], basis[8]);
+
+    const centerX = (mins[0] + maxs[0]) * 0.5;
+    const centerY = (mins[1] + maxs[1]) * 0.5;
+    const centerZ = (mins[2] + maxs[2]) * 0.5;
+    const extentsX = (maxs[0] - mins[0]) * 0.5;
+    const extentsY = (maxs[1] - mins[1]) * 0.5;
+    const extentsZ = (maxs[2] - mins[2]) * 0.5;
+
+    const worldCenter = entity.origin.copy()
+      .add(forward.copy().multiply(centerX))
+      .add(right.copy().multiply(centerY))
+      .add(up.copy().multiply(centerZ));
+
+    const worldExtentX = Math.abs(forward[0]) * extentsX + Math.abs(right[0]) * extentsY + Math.abs(up[0]) * extentsZ;
+    const worldExtentY = Math.abs(forward[1]) * extentsX + Math.abs(right[1]) * extentsY + Math.abs(up[1]) * extentsZ;
+    const worldExtentZ = Math.abs(forward[2]) * extentsX + Math.abs(right[2]) * extentsY + Math.abs(up[2]) * extentsZ;
+
+    absmin.setTo(
+      worldCenter[0] - worldExtentX,
+      worldCenter[1] - worldExtentY,
+      worldCenter[2] - worldExtentZ,
+    );
+    absmax.setTo(
+      worldCenter[0] + worldExtentX,
+      worldCenter[1] + worldExtentY,
+      worldCenter[2] + worldExtentZ,
+    );
+    return;
+  }
+
+  absmin.set(entity.origin).add(mins);
+  absmax.set(entity.origin).add(maxs);
+}
+
+/**
+ * Return whether the two AABBs overlap.
+ * @returns True when the AABBs overlap.
+ */
+function traceBoundsOverlap(traceMins: Vector, traceMaxs: Vector, entityMins: Vector, entityMaxs: Vector): boolean {
+  return !(
+    traceMins[0] > entityMaxs[0]
+    || traceMins[1] > entityMaxs[1]
+    || traceMins[2] > entityMaxs[2]
+    || traceMaxs[0] < entityMins[0]
+    || traceMaxs[1] < entityMins[1]
+    || traceMaxs[2] < entityMins[2]
+  );
+}
+
+/**
+ * Resolve the best trace including eligible client entities.
+ * @returns The best trace including eligible client entities.
+ */
+function traceClientEntities(
+  start: Vector,
+  end: Vector,
+  worldTrace: InternalTraceLike,
+  options: ClientTraceOptions,
+): InternalTraceLike {
+  const traceMins = new Vector(
+    Math.min(start[0], worldTrace.endpos[0]),
+    Math.min(start[1], worldTrace.endpos[1]),
+    Math.min(start[2], worldTrace.endpos[2]),
+  );
+  const traceMaxs = new Vector(
+    Math.max(start[0], worldTrace.endpos[0]),
+    Math.max(start[1], worldTrace.endpos[1]),
+    Math.max(start[2], worldTrace.endpos[2]),
+  );
+  const entityMins = new Vector();
+  const entityMaxs = new Vector();
+
+  let bestTrace: InternalTraceLike = worldTrace;
+
+  for (const entity of CL.state.clientEntities.getEntities()) {
+    if (entity.num === 0 || entity.free || entity.origin.isInfinite() || entity.model === null) {
+      continue;
+    }
+
+    if (!isTraceableClientSolid(entity)) {
+      continue;
+    }
+
+    if (options.passEntityId !== null && options.passEntityId !== undefined && entity.num === options.passEntityId) {
+      continue;
+    }
+
+    if (options.filter !== null && options.filter !== undefined && !options.filter(entity)) {
+      continue;
+    }
+
+    computeClientTraceBounds(entity, entityMins, entityMaxs);
+
+    if (!traceBoundsOverlap(traceMins, traceMaxs, entityMins, entityMaxs)) {
+      continue;
+    }
+
+    const adapter: ClientTraceEntityAdapter = {
+      entity,
+      num: entity.num,
+      equals(other: unknown): boolean {
+        return this === other;
+      },
+    };
+    const trace = SV.collision.clipMoveToEntity(
+      // @ts-ignore Client tracing reuses shared narrow-phase helpers with a lightweight ClientEdict adapter.
+      adapter,
+      start,
+      Vector.origin,
+      Vector.origin,
+      bestTrace.endpos,
+    ) as InternalTraceLike;
+
+    if (trace.allsolid || trace.startsolid || trace.fraction < bestTrace.fraction) {
+      bestTrace = trace;
+    }
+  }
+
+  return bestTrace;
+}
+
+export class CommonEngineAPI {
+  static registered = false;
+  static gameFlavors: GameFlavors[] = [];
+
+  /**
+   * Append text to the command buffer.
+   */
+  static AppendConsoleText(text: string): void {
+    Cmd.text += text;
+  }
+
+  /**
+   * Return a cvar by name.
+   * @returns The variable.
+   */
+  static GetCvar(name: string): Cvar | null {
+    return Cvar.FindVar(name);
+  }
+
+  /**
+   * Change the value of a cvar.
+   * @returns The modified variable.
+   */
+  static SetCvar(name: string, value: string): Cvar {
+    return Cvar.Set(name, value);
+  }
+
+  /**
+   * Make sure to free the variable in shutdown().
+   * @see {@link Cvar}
+   * @returns The created variable.
+   */
+  static RegisterCvar(name: string, value: string, flags = 0, description: string | null = null): Cvar {
+    return new Cvar(name, value, flags | Cvar.FLAG.GAME, description);
+  }
+
+  static ConsolePrint(msg: string, color = new Vector(1.0, 1.0, 1.0)): void {
+    Con.Print(msg, color);
+  }
+
+  static ConsoleWarning(msg: string): void {
+    Con.PrintWarning(msg);
+  }
+
+  static ConsoleError(msg: string): void {
+    Con.PrintError(msg);
+  }
+
+  static ConsoleDebug(str: string): void {
+    Con.DPrint(str);
+  }
+
+  /**
+   * Parse QuakeC for model animation information.
+   * @returns Parsed QC content.
+   */
+  static ParseQC(qcContent: string): ParsedQC {
+    return Mod.ParseQC(qcContent);
+  }
+}
+
+export class ServerEngineAPI extends CommonEngineAPI {
+  /**
+   * Make sure to free the variable in shutdown().
+   * @see {@link Cvar}
+   * @returns The created variable.
+   */
+  static override RegisterCvar(name: string, value: string, flags = 0, description: string | null = null): Cvar {
+    return new Cvar(name, value, flags | Cvar.FLAG.GAME | Cvar.FLAG.SERVER, description);
+  }
+
+  static BroadcastPrint(str: string): void {
+    Host.BroadcastPrint(str);
+  }
+
+  static StartParticles(origin: Vector, direction: Vector, color: number, count: number): void {
+    SV.messages.startParticle(origin, direction, color, count);
+  }
+
+  static SpawnAmbientSound(origin: Vector, sfxName: string, volume: number, attenuation: number): boolean {
+    let index = 0;
+
+    for (; index < SV.server.soundPrecache.length; index++) {
+      if (SV.server.soundPrecache[index] === sfxName) {
+        break;
+      }
+    }
+
+    if (index === SV.server.soundPrecache.length) {
+      Con.Print(`no precache: ${sfxName}\n`);
+      return false;
+    }
+
+    const signon = SV.server.signon;
+    signon.writeByte(Protocol.svc.spawnstaticsound);
+    signon.writeCoordVector(origin);
+    signon.writeByte(index);
+    signon.writeByte(volume * 255.0);
+    signon.writeByte(attenuation * 64.0);
+
+    return true;
+  }
+
+  static StartSound(edict: ServerEdict, channel: number, sfxName: string, volume: number, attenuation: number): boolean {
+    SV.messages.startSound(edict, channel, sfxName, volume * 255.0, attenuation);
+
+    return true;
+  }
+
+  static Traceline(
+    start: Vector,
+    end: Vector,
+    noMonsters: boolean,
+    passEdict: ServerEdict | null,
+    mins: Vector | null = null,
+    maxs: Vector | null = null,
+  ): GameTrace {
+    const nullVec = Vector.origin;
+    const trace = SV.collision.move(start, mins ? mins : nullVec, maxs ? maxs : nullVec, end, noMonsters, passEdict) as InternalTraceLike;
+    return internalTraceToGameTrace(trace);
+  }
+
+  static TracelineLegacy(
+    start: Vector,
+    end: Vector,
+    noMonsters: boolean,
+    passEdict: ServerEdict | null,
+    mins: Vector | null = null,
+    maxs: Vector | null = null,
+  ): InternalTraceLike {
+    const nullVec = Vector.origin;
+    return SV.collision.move(start, mins ? mins : nullVec, maxs ? maxs : nullVec, end, noMonsters, passEdict) as InternalTraceLike;
+  }
+
+  /**
+   * Define a lightstyle (e.g. aazzaa).
+   * It will also send an update to all connected clients.
+   */
+  static Lightstyle(styleId: number, sequenceString: string): void {
+    SV.server.lightstyles[styleId] = sequenceString;
+
+    if (SV.server.loading) {
+      return;
+    }
+
+    for (const client of SV.svs.spawnedClients()) {
+      client.message.writeByte(Protocol.svc.lightstyle);
+      client.message.writeByte(styleId);
+      client.message.writeString(sequenceString);
+    }
+  }
+
+  /**
+   * Find what contents the given point is in, using the active world collision backend.
+   * @returns The contents constant.
+   */
+  static DetermineStaticWorldContents(origin: Vector): number {
+    return SV.collision.staticWorldContents(origin);
+  }
+
+  /**
+   * Compatibility alias for DetermineStaticWorldContents.
+   * @returns The contents constant.
+   */
+  static DetermineWorldContents(origin: Vector): number {
+    return this.DetermineStaticWorldContents(origin);
+  }
+
+  /**
+   * Find what contents the given point is in.
+   * @returns The contents constant.
+   */
+  static DeterminePointContents(origin: Vector): number {
+    return this.DetermineStaticWorldContents(origin);
+  }
+
+  /**
+   * Set an area portal's open or close state.
+   */
+  static SetAreaPortalState(portalNum: number, open: boolean): void {
+    if (SV.server.worldmodel === null) {
+      return;
+    }
+
+    SV.server.worldmodel.areaPortals.setPortalState(portalNum, open);
+
+    for (const client of SV.svs.spawnedClients()) {
+      client.message.writeByte(Protocol.svc.setportalstate);
+      client.message.writeShort(portalNum);
+      client.message.writeByte(open ? 1 : 0);
+    }
+  }
+
+  /**
+   * Check whether two areas are connected through open portals.
+   * @returns True when the areas are connected.
+   */
+  static AreasConnected(area0: number, area1: number): boolean {
+    if (SV.server.worldmodel === null) {
+      return true;
+    }
+
+    return SV.server.worldmodel.areaPortals.areasConnected(area0, area1);
+  }
+
+  /**
+   * Return the auto-assigned portal number for a brush model.
+   * @returns The portal number, or `-1` when none exists.
+   */
+  static GetModelPortal(modelName: string): number {
+    if (SV.server.worldmodel === null) {
+      return -1;
+    }
+
+    return SV.server.worldmodel.modelPortalMap[modelName] ?? -1;
+  }
+
+  static ChangeLevel(mapname: string): void {
+    if (SV.svs.changelevelIssued) {
+      return;
+    }
+
+    Cmd.text += `changelevel ${mapname}\n`;
+  }
+
+  /**
+   * Find all edicts around the origin within the given radius.
+   * @returns Matching edicts.
+   */
+  static FindInRadius(origin: Vector, radius: number, filterFn: ServerEntityFilter = null): ServerEdict[] {
+    const vradius = new Vector(radius, radius, radius);
+    const mins = origin.copy().subtract(vradius);
+    const maxs = origin.copy().add(vradius);
+    const edicts: ServerEdict[] = [];
+
+    for (const ent of SV.area.tree.queryAABB(mins, maxs)) {
+      if (ent.num === 0 || ent.isFree()) {
+        continue;
+      }
+
+      const eorg = origin.copy().subtract(ent.entity.origin.copy().add(ent.entity.mins.copy().add(ent.entity.maxs).multiply(0.5)));
+
+      if (eorg.len() > radius) {
+        continue;
+      }
+
+      if (!filterFn || filterFn(ent)) {
+        edicts.push(ent);
+      }
+    }
+
+    return edicts; // used to be a generator, but we need to return an array due to changing linked lists in between
+  }
+
+  /**
+   * Find the first edict that matches the field value.
+   * @deprecated use FindAllByFieldAndValue instead
+   * @returns The first matching edict, if any.
+   */
+  static FindByFieldAndValue(field: string, value: EdictValueType, startEdictId = 0): ServerEdict | null {
+    for (let index = startEdictId; index < SV.server.num_edicts; index++) {
+      const ent = SV.server.edicts[index] as ServerEdict;
+
+      if (ent.isFree()) {
+        continue;
+      }
+
+      if (ent.entity[field] === value) {
+        return ent; // FIXME: turn it into yield
+      }
+    }
+
+    return null;
+  }
+
+  // TODO: optimize lookups by using maps for fields such as targetname, etc.
+  /**
+   * Yield all edicts whose field matches the supplied value.
+   * @yields Matching edicts.
+   */
+  static *FindAllByFieldAndValue(field: string, value: EdictValueType, startEdictId = 0): Generator<ServerEdict, void, void> { // FIXME: startEdictId should be edict? not 100% happy about this
+    for (let index = startEdictId; index < SV.server.num_edicts; index++) {
+      const ent = SV.server.edicts[index] as ServerEdict;
+
+      if (ent.isFree()) {
+        continue;
+      }
+
+      if (ent.entity[field] === value) {
+        yield ent;
+      }
+    }
+  }
+
+  /**
+   * Yield all edicts that match the filter.
+   * @yields Matching edicts.
+   */
+  static *FindAllByFilter(filterFn: ServerEntityFilter = null, startEdictId = 0): Generator<ServerEdict, void, void> { // FIXME: startEdictId should be edict? not 100% happy about this
+    for (let index = startEdictId; index < SV.server.num_edicts; index++) {
+      const ent = SV.server.edicts[index] as ServerEdict;
+
+      if (ent.isFree()) {
+        continue;
+      }
+
+      if (!filterFn || filterFn(ent)) {
+        yield ent;
+      }
+    }
+  }
+
+  /**
+   * Yield all connected client edicts.
+   * @yields Connected client edicts.
+   */
+  static *GetClients(): Generator<ServerEdict, void, void> {
+    for (const client of SV.svs.spawnedClients()) {
+      yield client.edict;
+    }
+  }
+
+  static GetEdictById(edictId: number): ServerEdict | null {
+    if (edictId < 0 || edictId >= SV.server.num_edicts) {
+      return null;
+    }
+
+    return SV.server.edicts[edictId];
+  }
+
+  static PrecacheSound(sfxName: string): void {
+    console.assert(typeof sfxName === 'string', 'sfxName must be a string');
+
+    if (SV.server.soundPrecache.includes(sfxName)) {
+      return;
+    }
+
+    SV.server.soundPrecache.push(sfxName);
+  }
+
+  static PrecacheModel(modelName: string): void {
+    console.assert(typeof modelName === 'string', 'modelName must be a string');
+
+    if (SV.server.modelPrecache.includes(modelName)) {
+      return;
+    }
+
+    SV.server.modelPrecache.push(modelName);
+    SV.server.models.push(Mod.ForNameAsync(modelName, true, Mod.scope.server)); // will cause promises in the array
+  }
+
+  /**
+   * Spawn an Edict, not an entity.
+   * @returns The spawned edict, or `null` on failure.
+   */
+  static SpawnEntity(classname: string, initialData: Record<string, EdictValueType> = {}): ServerEdict | null {
+    const edict = ED.Alloc();
+
+    try {
+      if (!SV.server.gameAPI.prepareEntity(edict, classname, initialData)) {
+        edict.freeEdict();
+        return null;
+      }
+
+      if (!SV.server.gameAPI.spawnPreparedEntity(edict)) {
+        edict.freeEdict();
+        return null;
+      }
+    } catch (e) {
+      edict.freeEdict();
+      throw e;
+    }
+
+    return edict;
+  }
+
+  static IsLoading(): boolean {
+    return SV.server.loading;
+  }
+
+  /**
+   * Dispatch a temporary entity protocol event.
+   * @deprecated use client events instead
+   */
+  static DispatchTempEntityEvent(tempEntityId: number, origin: Vector): void {
+    SV.server.datagram.writeByte(Protocol.svc.temp_entity);
+    SV.server.datagram.writeByte(tempEntityId);
+    SV.server.datagram.writeCoordVector(origin);
+  }
+
+  /**
+   * Dispatch a beam protocol event.
+   * @deprecated use client events instead
+   */
+  static DispatchBeamEvent(beamId: number, edictId: number, startOrigin: Vector, endOrigin: Vector): void {
+    SV.server.datagram.writeByte(Protocol.svc.temp_entity); // FIXME: unhappy about this
+    SV.server.datagram.writeByte(beamId);
+    SV.server.datagram.writeShort(edictId);
+    SV.server.datagram.writeCoordVector(startOrigin);
+    SV.server.datagram.writeCoordVector(endOrigin);
+  }
+
+  /**
+   * Make all clients play the specified audio track.
+   */
+  static PlayTrack(track: number): void {
+    SV.server.datagram.writeByte(Protocol.svc.cdtrack);
+    SV.server.datagram.writeByte(track);
+    SV.server.datagram.writeByte(0); // unused
+  }
+
+  /**
+   * Show the shareware sell screen to all clients.
+   */
+  static ShowSellScreen(): void {
+    SV.server.reliable_datagram.writeByte(Protocol.svc.sellscreen);
+  }
+
+  /**
+   * Dispatch a client event to the specified destination buffer.
+   */
+  static #DispatchClientEventOnDestination(destination: SzBuffer, eventCode: number, ...args: SerializableType[]): void {
+    console.assert(typeof eventCode === 'number', 'eventCode must be a number');
+
+    destination.writeByte(Protocol.svc.clientevent);
+    destination.writeByte(eventCode);
+
+    destination.writeSerializables(args);
+  }
+
+  /**
+   * Dispatch a client event to everyone.
+   */
+  static BroadcastClientEvent(expedited: boolean, eventCode: number, ...args: SerializableType[]): void {
+    this.#DispatchClientEventOnDestination(expedited ? SV.server.datagram : SV.server.expedited_datagram, eventCode, ...args);
+  }
+
+  /**
+   * Dispatch a client event to the specified receiver.
+   */
+  static DispatchClientEvent(receiverPlayerEdict: ServerEdict, expedited: boolean, eventCode: number, ...args: SerializableType[]): void {
+    console.assert(receiverPlayerEdict instanceof ServerEdictValue && receiverPlayerEdict.isClient(), 'emitterEdict must be a ServerEdict connected to a client');
+
+    const destination = expedited ? receiverPlayerEdict.getClient().expedited_message : receiverPlayerEdict.getClient().message;
+
+    this.#DispatchClientEventOnDestination(destination, eventCode, ...args);
+  }
+
+  /**
+   * Return a series of waypoints from start to end.
+   * @returns Waypoints from start to end, including start and end.
+   */
+  static Navigate(start: Vector, end: Vector): Vector[] {
+    return SV.server.navigation.findPath(start, end);
+  }
+
+  /**
+   * Return a series of waypoints from start to end asynchronously.
+   * @returns Waypoints from start to end, including start and end.
+   */
+  static NavigateAsync(start: Vector, end: Vector): Promise<Vector[]> {
+    return SV.server.navigation.findPathAsync(start, end);
+  }
+
+  static GetPHS(origin: Vector): Visibility {
+    return SV.server.worldmodel.getPhsByPoint(origin);
+  }
+
+  static GetPVS(origin: Vector): Visibility {
+    return SV.server.worldmodel.getPvsByPoint(origin);
+  }
+
+  /**
+   * Get the area index for a world position.
+   * @returns The area index, where `0` means outside or invalid.
+   */
+  static GetAreaForPoint(origin: Vector): number {
+    return SV.server.worldmodel.getLeafForPoint(origin).area;
+  }
+
+  /**
+   * Set the player movement configuration. This is used by the PMove code to determine how the player should move.
+   */
+  static SetPmoveConfiguration(config: PmoveConfiguration): void {
+    console.assert(config instanceof PmoveConfiguration, 'config must be an instance of PmoveConfiguration');
+
+    SV.pmove.configuration = config;
+  }
+
+  static get maxplayers(): number {
+    return SV.svs.maxclients;
+  }
+
+  /**
+   * Server game event bus, reset on every map load.
+   * @returns The active server event bus.
+   */
+  static get eventBus(): EventBus {
+    return SV.server.eventBus;
+  }
+}
+
+export class ClientEngineAPI extends CommonEngineAPI {
+  /**
+   * Make sure to free the variable in shutdown().
+   * @see {@link Cvar}
+   * @returns The created variable.
+   */
+  static override RegisterCvar(name: string, value: string, flags = 0, description: string | null = null): Cvar {
+    return new Cvar(name, value, flags | Cvar.FLAG.GAME | Cvar.FLAG.CLIENT, description);
+  }
+
+  static RegisterCommand(name: string, callback: CommandCallback): void {
+    Cmd.AddCommand(name, callback);
+  }
+
+  static UnregisterCommand(name: string): void {
+    void name;
+    // TODO: implement
+    console.assert(false, 'UnregisterCommand is not implemented yet');
+  }
+
+  /**
+   * Load a texture from a lump.
+   * @returns The loaded texture.
+   */
+  static LoadPicFromLump(name: string): GLTexture {
+    return Draw.LoadPicFromLumpDeferred(name);
+  }
+
+  /**
+   * Load a texture from a WAD.
+   * @returns The loaded texture.
+   */
+  static LoadPicFromWad(name: string): GLTexture {
+    return Draw.LoadPicFromWad(name);
+  }
+
+  /**
+   * Load a texture from a file.
+   * @returns The loaded texture.
+   */
+  static LoadPicFromFile(filename: string): Promise<GLTexture> {
+    return Draw.LoadPicFromFile(filename);
+  }
+
+  /**
+   * Play a sound effect.
+   */
+  static PlaySound(sfx: SFXValue): void {
+    S.LocalSound(sfx);
+  }
+
+  /**
+   * Load a sound effect. Can be used with PlaySound.
+   * @returns The loaded sound effect.
+   */
+  static LoadSound(sfxName: string): SFXValue {
+    return S.PrecacheSound(sfxName);
+  }
+
+  /**
+   * Draw a picture at the specified position.
+   */
+  static DrawPic(x: number, y: number, pic: GLTexture, scale = 1.0): void {
+    Draw.Pic(x, y, pic, scale);
+  }
+
+  /**
+   * Draw a string on the screen at the specified position.
+   */
+  static DrawString(x: number, y: number, str: string, scale = 1.0, color = new Vector(1.0, 1.0, 1.0)): void {
+    Draw.String(x, y, str, scale, color);
+  }
+
+  /**
+   * Fill a rectangle with a solid color.
+   */
+  static DrawRect(x: number, y: number, w: number, h: number, c: Vector, a = 1.0): void {
+    Draw.Fill(x, y, w, h, c, a);
+  }
+
+  /**
+   * Translate a palette index into an RGB color vector.
+   * @returns The RGB color vector.
+   */
+  static IndexToRGB(index: number): Vector {
+    console.assert(typeof index === 'number', 'index must be a number');
+    console.assert(index >= 0 && index < 256, 'index must be in range [0, 255]');
+
+    return new Vector(
+      W.d_8to24table_u8[index * 3] / 256,
+      W.d_8to24table_u8[index * 3 + 1] / 256,
+      W.d_8to24table_u8[index * 3 + 2] / 256,
+    );
+  }
+
+  /**
+   * Translate world coordinates to screen coordinates.
+   * @returns Screen coordinates, or `null` if the point is behind the camera.
+   */
+  static WorldToScreen(origin: Vector): Vector | null {
+    return R.WorldToScreen(origin);
+  }
+
+  /**
+   * Get all entities in the game. Both client-only and server entities.
+   * @yields Client entities.
+   */
+  static *GetEntities(filter: ClientEntityFilter = null): Generator<ClientEdict, void, void> {
+    for (const entity of CL.state.clientEntities.getEntities()) {
+      if (filter && !filter(entity)) {
+        continue;
+      }
+
+      yield entity;
+    }
+  }
+
+  /**
+   * Get all entities staged for rendering. Both client-only and server entities.
+   * @yields Visible client entities.
+   */
+  static *GetVisibleEntities(filter: ClientEntityFilter = null): Generator<ClientEdict, void, void> {
+    for (const entity of CL.state.clientEntities.getVisibleEntities()) {
+      if (filter && !filter(entity)) {
+        continue;
+      }
+
+      yield entity;
+    }
+  }
+
+  /**
+   * Perform a trace line in the client game world.
+   * By default this traces static world geometry only.
+   * Keep this legacy entry point aligned with the server-side Traceline name so
+   * client tracing can grow into entity-aware behavior later without another API
+   * rename.
+   * @returns The trace result.
+   */
+  static Traceline(start: Vector, end: Vector, options: ClientTraceOptions | null = null): GameTrace {
+    const worldTrace = SV.collision.traceWorldLine(start, end) as InternalTraceLike;
+
+    if (options === null || options.includeEntities !== true) {
+      return internalTraceToGameTrace(worldTrace);
+    }
+
+    return internalTraceToGameTrace(traceClientEntities(start, end, worldTrace, options));
+  }
+
+  /**
+   * Allocate a dynamic light for the given entity Id.
+   * @returns The dynamic light instance.
+   */
+  static AllocDlight(entityId: number): ClientDlight {
+    return CL.state.clientEntities.allocateDynamicLight(entityId);
+  }
+
+  /**
+   * Allocate a new client entity.
+   * This is a client-side entity, not a server-side edict.
+   * Make sure to invoke spawn() when ready.
+   * Make sure to use setOrigin() to set the position of the entity.
+   * @returns A new client entity.
+   */
+  static AllocEntity(): ClientEdict {
+    return CL.state.clientEntities.allocateClientEntity();
+  }
+
+  /**
+   * Spawn a rocket trail effect from start to end.
+   */
+  static RocketTrail(start: Vector, end: Vector, type: number): void {
+    R.RocketTrail(start, end, type);
+  }
+
+  /**
+   * Place a decal in the world.
+   */
+  static PlaceDecal(origin: Vector, normal: Vector, texture: GLTexture): void {
+    R.PlaceDecal(origin, normal, texture);
+  }
+
+  /**
+   * Get a model by name. Must be precached first.
+   * @returns The model.
+   */
+  static ModForName(modelName: string): BaseModel {
+    console.assert(typeof modelName === 'string', 'modelName must be a string');
+
+    for (let index = 1; index < CL.state.model_precache.length; index++) {
+      if (CL.state.model_precache[index].name === modelName) {
+        return CL.state.model_precache[index];
+      }
+    }
+
+    throw new HostError(`ClientEngineAPI.ModForName: ${modelName} not precached`);
+  }
+
+  /**
+   * Get a model by id.
+   * @returns The model.
+   */
+  static ModById(id: number): BaseModel {
+    console.assert(typeof id === 'number' && id > 0, 'id must be a number and greater than 0');
+
+    if (CL.state.model_precache[id]) {
+      return CL.state.model_precache[id];
+    }
+
+    throw new HostError(`ClientEngineAPI.ModById: ${id} not found`);
+  }
+
+  /**
+   * Apply a content shift.
+   */
+  static ContentShift(slot: number, color: Vector, alpha = 0.5): void {
+    V.ContentShift(slot + 4, color, alpha);
+  }
+
+  /**
+   * Set the player movement configuration. This is used by the PMove code to determine how the player will move.
+   */
+  static SetPmoveConfiguration(config: PmoveConfiguration): void {
+    console.assert(config instanceof PmoveConfiguration, 'config must be an instance of PmoveConfiguration');
+
+    CL.pmove.configuration = config;
+  }
+
+  static M: object | null = null;
+
+  static readonly CL = {
+    get viewangles(): Vector {
+      return CL.state.viewangles.copy();
+    },
+    get vieworigin(): Vector {
+      return CL.state.viewent.origin.copy();
+    },
+    get maxclients(): number {
+      return CL.state.maxclients;
+    },
+    get levelname(): string {
+      return CL.state.levelname;
+    },
+    get entityNum(): number {
+      return CL.state.viewentity;
+    },
+    /**
+     * local time, not game time! If you are looking for SV.server.time, check gametime
+     * @returns Local time.
+     */
+    get time(): number { // FIXME: rename to localtime to make the distinction clearer
+      return CL.state.time;
+    },
+    /**
+     * latest SV.server.time, NOT local time!
+     * @returns Game time.
+     */
+    get gametime(): number {
+      return CL.state.clientMessages.mtime[0];
+    },
+    get frametime(): number {
+      return Host.frametime;
+    },
+    get intermission(): boolean {
+      return CL.state.intermission > 0;
+    },
+    set intermission(value: boolean) {
+      CL.state.intermission = value ? 1 : 0;
+    },
+    score(num: number) {
+      return CL.state.scores[num];
+    },
+    get serverInfo() {
+      return CL.cls.serverInfo;
+    },
+  };
+
+  static readonly VID = {
+    get width(): number {
+      return VID.width;
+    },
+    get height(): number {
+      return VID.height;
+    },
+    get pixelRatio(): number {
+      return VID.pixelRatio;
+    },
+  };
+
+  static readonly Key = {
+    /**
+     * Get the string representation of a key binding, e.g. "+attack" -> "mouse1".
+     * @returns The bound key string, or `null` when not found.
+     */
+    getKeyForBinding(binding: string): string | null {
+      return Key.BindingToString(binding);
+    },
+  };
+
+  static readonly SCR = {
+    /**
+     * @returns The current view size.
+     */
+    get viewsize(): number {
+      return SCR.viewsize.value as number;
+    },
+  };
+
+  static get eventBus(): EventBus {
+    return CL.state.eventBus;
+  }
+}
diff --git a/source/engine/common/Host.ts b/source/engine/common/Host.ts
index b3717966..ff5b7dd1 100644
--- a/source/engine/common/Host.ts
+++ b/source/engine/common/Host.ts
@@ -18,7 +18,7 @@ import { eventBus, getClientRegistry, getCommonRegistry, registry } from '../reg
 import Vector from '../../shared/Vector.ts';
 import Q from '../../shared/Q.ts';
 import { ServerClient } from '../server/Client.mjs';
-import { ServerEngineAPI } from './GameAPIs.mjs';
+import { ServerEngineAPI } from './GameAPIs.ts';
 import Chase from '../client/Chase.mjs';
 import VID from '../client/VID.mjs';
 import { HostError } from './Errors.ts';
diff --git a/source/engine/server/Navigation.mjs b/source/engine/server/Navigation.mjs
index da222d81..de4dc880 100644
--- a/source/engine/server/Navigation.mjs
+++ b/source/engine/server/Navigation.mjs
@@ -6,7 +6,7 @@ import Cmd from '../common/Cmd.ts';
 // import Cmd, { ConsoleCommand } from '../common/Cmd.ts';
 import Cvar from '../common/Cvar.ts';
 import { CorruptedResourceError, MissingResourceError } from '../common/Errors.ts';
-import { ServerEngineAPI } from '../common/GameAPIs.mjs';
+import { ServerEngineAPI } from '../common/GameAPIs.ts';
 import { BrushModel } from '../common/Mod.ts';
 import { MIN_STEP_NORMAL, STEPSIZE } from '../common/Pmove.ts';
 import { Face } from '../common/model/BaseModel.ts';
diff --git a/source/engine/server/Progs.mjs b/source/engine/server/Progs.mjs
index 7e873a85..b563eadd 100644
--- a/source/engine/server/Progs.mjs
+++ b/source/engine/server/Progs.mjs
@@ -6,7 +6,7 @@ import Q from '../../shared/Q.ts';
 import Vector from '../../shared/Vector.ts';
 import { eventBus, registry } from '../registry.mjs';
 import { ED, ServerEdict } from './Edict.mjs';
-import { ServerEngineAPI } from '../common/GameAPIs.mjs';
+import { ServerEngineAPI } from '../common/GameAPIs.ts';
 import PF, { etype, ofs } from './ProgsAPI.mjs';
 import { gameCapabilities } from '../../shared/Defs.ts';
 import { loadGameModule } from './GameLoader.mjs';
diff --git a/source/engine/server/ProgsAPI.mjs b/source/engine/server/ProgsAPI.mjs
index c5efc8bf..e5a823b0 100644
--- a/source/engine/server/ProgsAPI.mjs
+++ b/source/engine/server/ProgsAPI.mjs
@@ -1,7 +1,7 @@
 import Vector from '../../shared/Vector.ts';
 import Cmd from '../common/Cmd.ts';
 import { HostError } from '../common/Errors.ts';
-import { ServerEngineAPI } from '../common/GameAPIs.mjs';
+import { ServerEngineAPI } from '../common/GameAPIs.ts';
 import { eventBus, registry } from '../registry.mjs';
 import { ED, ServerEdict } from './Edict.mjs';
 
diff --git a/source/engine/server/Server.mjs b/source/engine/server/Server.mjs
index f342c912..1f053cb2 100644
--- a/source/engine/server/Server.mjs
+++ b/source/engine/server/Server.mjs
@@ -7,7 +7,7 @@ import * as Def from './../common/Def.ts';
 import Cmd, { ConsoleCommand } from '../common/Cmd.ts';
 import { ED, ServerEdict } from './Edict.mjs';
 import { EventBus, eventBus, registry } from '../registry.mjs';
-import { ServerEngineAPI } from '../common/GameAPIs.mjs';
+import { ServerEngineAPI } from '../common/GameAPIs.ts';
 import * as Defs from '../../shared/Defs.ts';
 import { Navigation } from './Navigation.mjs';
 import { ServerPhysics } from './physics/ServerPhysics.mjs';
@@ -16,7 +16,7 @@ import { ServerMessages } from './ServerMessages.mjs';
 import { ServerMovement } from './physics/ServerMovement.mjs';
 import { ServerArea } from './physics/ServerArea.mjs';
 import { ServerCollision } from './physics/ServerCollision.mjs';
-import { sharedCollisionModelSource } from '../common/CollisionModelSource.mjs';
+import { sharedCollisionModelSource } from '../common/CollisionModelSource.ts';
 import { BrushModel } from '../common/Mod.ts';
 import { ServerClient } from './Client.mjs';
 
diff --git a/source/engine/server/physics/ServerArea.mjs b/source/engine/server/physics/ServerArea.mjs
index 25e6d4eb..ae2dfbeb 100644
--- a/source/engine/server/physics/ServerArea.mjs
+++ b/source/engine/server/physics/ServerArea.mjs
@@ -2,7 +2,7 @@ import Vector from '../../../shared/Vector.ts';
 import * as Defs from '../../../shared/Defs.ts';
 import { Octree } from '../../../shared/Octree.ts';
 import { eventBus, registry } from '../../registry.mjs';
-import CollisionModelSource, { createRegistryCollisionModelSource } from '../../common/CollisionModelSource.mjs';
+import CollisionModelSource, { createRegistryCollisionModelSource } from '../../common/CollisionModelSource.ts';
 import { BrushModel } from '../../../engine/common/Mod.ts';
 
 let { SV } = registry;
diff --git a/source/engine/server/physics/ServerCollision.mjs b/source/engine/server/physics/ServerCollision.mjs
index 29032c48..7ceec252 100644
--- a/source/engine/server/physics/ServerCollision.mjs
+++ b/source/engine/server/physics/ServerCollision.mjs
@@ -1,6 +1,6 @@
 import Vector from '../../../shared/Vector.ts';
 import * as Defs from '../../../shared/Defs.ts';
-import CollisionModelSource, { createRegistryCollisionModelSource } from '../../common/CollisionModelSource.mjs';
+import CollisionModelSource, { createRegistryCollisionModelSource } from '../../common/CollisionModelSource.ts';
 import Mod, { BrushModel } from '../../common/Mod.ts';
 import { BrushTrace, DIST_EPSILON, Trace as SharedTrace } from '../../common/Pmove.ts';
 import { eventBus, registry } from '../../registry.mjs';
diff --git a/source/shared/ClientEdict.ts b/source/shared/ClientEdict.ts
index 4d1cc16e..ca1017ce 100644
--- a/source/shared/ClientEdict.ts
+++ b/source/shared/ClientEdict.ts
@@ -1,5 +1,5 @@
 import type { ClientEdict } from '../engine/client/ClientEntities.mjs';
-import type { ClientEngineAPI as ClientEngineApiValue } from '../engine/common/GameAPIs.mjs';
+import type { ClientEngineAPI as ClientEngineApiValue } from '../engine/common/GameAPIs.ts';
 
 type ClientEngineAPI = typeof ClientEngineApiValue;
 
diff --git a/source/shared/GameInterfaces.ts b/source/shared/GameInterfaces.ts
index 9a37b56a..33de8a84 100644
--- a/source/shared/GameInterfaces.ts
+++ b/source/shared/GameInterfaces.ts
@@ -1,5 +1,5 @@
 import type { BaseClientEdictHandler } from './ClientEdict.ts';
-import type { ClientEngineAPI as ClientEngineApiValue, ServerEngineAPI as ServerEngineApiValue } from '../engine/common/GameAPIs.mjs';
+import type { ClientEngineAPI as ClientEngineApiValue, ServerEngineAPI as ServerEngineApiValue } from '../engine/common/GameAPIs.ts';
 import type { ServerEdict as ServerEdictValue } from '../engine/server/Edict.mjs';
 import type { GLTexture as GLTextureValue } from '../engine/client/GL.mjs';
 import type { SFX as SFXValue } from '../engine/client/Sound.mjs';
diff --git a/test/common/collision-model-source.test.mjs b/test/common/collision-model-source.test.mjs
new file mode 100644
index 00000000..beeb9c26
--- /dev/null
+++ b/test/common/collision-model-source.test.mjs
@@ -0,0 +1,76 @@
+import assert from 'node:assert/strict';
+import { describe, test } from 'node:test';
+
+import CollisionModelSource, { createRegistryCollisionModelSource } from '../../source/engine/common/CollisionModelSource.ts';
+import { createBoxBrushModel, defaultMockRegistry, withMockRegistry } from '../physics/fixtures.mjs';
+
+void describe('CollisionModelSource', () => {
+  void test('uses injected server accessors before client fallbacks', () => {
+    const source = new CollisionModelSource();
+    const worldEntity = { num: 0 };
+    const worldModel = createBoxBrushModel({ name: 'server-world', halfExtents: [16, 16, 16] });
+    const clientWorldModel = createBoxBrushModel({ name: 'client-world', halfExtents: [24, 24, 24] });
+    const serverModel = { name: 'server-model' };
+    const clientModel = { name: 'client-model' };
+
+    source.configureServer({
+      getWorldEntity: () => worldEntity,
+      getWorldModel: () => worldModel,
+      getModels: () => [null, serverModel],
+    });
+    source.configureClient({
+      getWorldModel: () => clientWorldModel,
+      getModels: () => [null, clientModel],
+    });
+
+    assert.equal(source.getWorldEntity(), worldEntity);
+    assert.equal(source.getWorldModel(), worldModel);
+    assert.equal(source.getModelByIndex(1), serverModel);
+  });
+
+  void test('falls back to client world model and client precache when server world is unavailable', () => {
+    const clientWorldModel = createBoxBrushModel({ name: 'client-world', halfExtents: [32, 32, 32] });
+    const clientModel = { name: 'client-model' };
+
+    void withMockRegistry(defaultMockRegistry({
+      server: {
+        edicts: [],
+        worldmodel: null,
+        models: null,
+      },
+    }, {
+      state: {
+        worldmodel: clientWorldModel,
+        model_precache: [null, clientModel],
+      },
+    }), () => {
+      const source = createRegistryCollisionModelSource();
+
+      assert.equal(source.getWorldEntity(), null);
+      assert.equal(source.getWorldModel(), clientWorldModel);
+      assert.equal(source.getModelByIndex(1), clientModel);
+    });
+  });
+
+  void test('falls back to client precache slot 1 when the client world model is missing', () => {
+    const clientWorldFromPrecache = createBoxBrushModel({ name: 'client-precache-world', halfExtents: [48, 48, 48] });
+
+    void withMockRegistry(defaultMockRegistry({
+      server: {
+        edicts: [],
+        worldmodel: null,
+        models: null,
+      },
+    }, {
+      state: {
+        worldmodel: null,
+        model_precache: [null, clientWorldFromPrecache],
+      },
+    }), () => {
+      const source = createRegistryCollisionModelSource();
+
+      assert.equal(source.getWorldModel(), clientWorldFromPrecache);
+      assert.equal(source.getModelByIndex(1), clientWorldFromPrecache);
+    });
+  });
+});
diff --git a/test/common/game-apis.test.mjs b/test/common/game-apis.test.mjs
index 89c0c20a..0929a279 100644
--- a/test/common/game-apis.test.mjs
+++ b/test/common/game-apis.test.mjs
@@ -4,19 +4,12 @@ import assert from 'node:assert/strict';
 import Vector from '../../source/shared/Vector.ts';
 import { solid } from '../../source/shared/Defs.ts';
 import { ClientEdict } from '../../source/engine/client/ClientEntities.mjs';
-import { ClientEngineAPI } from '../../source/engine/common/GameAPIs.mjs';
+import { ClientEngineAPI } from '../../source/engine/common/GameAPIs.ts';
 import { ServerArea } from '../../source/engine/server/physics/ServerArea.mjs';
 import { ServerCollision } from '../../source/engine/server/physics/ServerCollision.mjs';
 import { CollisionTrace } from '../../source/engine/server/physics/ServerCollisionSupport.mjs';
 import { defaultMockRegistry, withMockRegistry } from '../physics/fixtures.mjs';
 
-/**
- *
- * @param num
- * @param origin
- * @param mins
- * @param maxs
- */
 /**
  * @param {number} num entity number
  * @param {Vector} origin entity origin
@@ -38,11 +31,11 @@ function createClientTraceEntity(num, origin, mins, maxs) {
   return entity;
 }
 
-describe('ClientEngineAPI.Traceline', () => {
-  test('keeps the default client trace static-world only', () => {
+void describe('ClientEngineAPI.Traceline', () => {
+  void test('keeps the default client trace static-world only', () => {
     let clipMoveCalls = 0;
 
-    withMockRegistry(defaultMockRegistry({
+    void withMockRegistry(defaultMockRegistry({
       collision: {
         traceWorldLine(_start, end) {
           return CollisionTrace.empty(end);
@@ -68,7 +61,7 @@ describe('ClientEngineAPI.Traceline', () => {
     });
   });
 
-  test('can trace current client entities on demand', () => {
+  void test('can trace current client entities on demand', () => {
     const collision = new ServerCollision();
     const area = new ServerArea();
     area.initBoxHull();
@@ -80,7 +73,7 @@ describe('ClientEngineAPI.Traceline', () => {
       new Vector(16, 16, 32),
     );
 
-    withMockRegistry(defaultMockRegistry({
+    void withMockRegistry(defaultMockRegistry({
       area,
       collision: {
         traceWorldLine(_start, end) {
@@ -108,7 +101,7 @@ describe('ClientEngineAPI.Traceline', () => {
     });
   });
 
-  test('supports skipping and filtering client trace candidates', () => {
+  void test('supports skipping and filtering client trace candidates', () => {
     const collision = new ServerCollision();
     const area = new ServerArea();
     area.initBoxHull();
@@ -126,7 +119,7 @@ describe('ClientEngineAPI.Traceline', () => {
       new Vector(16, 16, 32),
     );
 
-    withMockRegistry(defaultMockRegistry({
+    void withMockRegistry(defaultMockRegistry({
       area,
       collision: {
         traceWorldLine(_start, end) {

From 66e22caf0a1d71a68c652921a24c1eac213686be Mon Sep 17 00:00:00 2001
From: Christian R <github@chrisnew.de>
Date: Fri, 3 Apr 2026 12:38:54 +0300
Subject: [PATCH 30/67] TS: server/physics/

---
 .../typescript-port.instructions.md           | 124 ++++
 source/engine/common/CollisionModelSource.ts  |   8 +-
 source/engine/common/GameAPIs.ts              | 113 +++-
 source/engine/common/PlatformWorker.ts        |   6 +-
 .../common/model/loaders/AliasMDLLoader.ts    |  18 +-
 .../common/model/loaders/BSP29Loader.ts       |   6 +-
 source/engine/network/Network.ts              |   6 +-
 source/engine/server/Navigation.mjs           |   2 +-
 source/engine/server/Server.mjs               |  10 +-
 .../server/physics/{Defs.mjs => Defs.ts}      |  32 +-
 .../physics/{ServerArea.mjs => ServerArea.ts} | 215 ++++---
 ...ientPhysics.mjs => ServerClientPhysics.ts} | 155 ++---
 ...ServerCollision.mjs => ServerCollision.ts} | 533 ++++++++----------
 .../server/physics/ServerCollisionSupport.mjs | 336 -----------
 .../server/physics/ServerCollisionSupport.ts  | 388 +++++++++++++
 ...ision.mjs => ServerLegacyHullCollision.ts} | 100 ++--
 .../engine/server/physics/ServerMovement.mjs  | 333 -----------
 .../engine/server/physics/ServerMovement.ts   | 369 ++++++++++++
 .../{ServerPhysics.mjs => ServerPhysics.ts}   | 456 ++++++++-------
 test/common/game-apis.test.mjs                |  74 ++-
 test/physics/collision-regressions.test.mjs   |   8 +-
 test/physics/fixtures.mjs                     |   2 +-
 test/physics/func-door.test.mjs               |   4 +-
 test/physics/quake-entity-ai.test.mjs         | 128 +++++
 test/physics/server-client-physics.test.mjs   |  21 +-
 test/physics/server-collision.test.mjs        |  47 +-
 test/physics/server-movement.test.mjs         |   2 +-
 test/physics/server-physics.test.mjs          | 223 +++++---
 28 files changed, 2125 insertions(+), 1594 deletions(-)
 rename source/engine/server/physics/{Defs.mjs => Defs.ts} (71%)
 rename source/engine/server/physics/{ServerArea.mjs => ServerArea.ts} (56%)
 rename source/engine/server/physics/{ServerClientPhysics.mjs => ServerClientPhysics.ts} (68%)
 rename source/engine/server/physics/{ServerCollision.mjs => ServerCollision.ts} (51%)
 delete mode 100644 source/engine/server/physics/ServerCollisionSupport.mjs
 create mode 100644 source/engine/server/physics/ServerCollisionSupport.ts
 rename source/engine/server/physics/{ServerLegacyHullCollision.mjs => ServerLegacyHullCollision.ts} (62%)
 delete mode 100644 source/engine/server/physics/ServerMovement.mjs
 create mode 100644 source/engine/server/physics/ServerMovement.ts
 rename source/engine/server/physics/{ServerPhysics.mjs => ServerPhysics.ts} (53%)
 create mode 100644 test/physics/quake-entity-ai.test.mjs

diff --git a/.github/instructions/typescript-port.instructions.md b/.github/instructions/typescript-port.instructions.md
index cc107a4a..a48c4554 100644
--- a/.github/instructions/typescript-port.instructions.md
+++ b/.github/instructions/typescript-port.instructions.md
@@ -163,6 +163,22 @@ constructor() {
 // ✅ Just omit it
 ```
 
+### Avoid typeof to check existence of functions
+
+```typescript
+
+// ❌ Avoid this pattern
+…
+if (typeof someModule.someFunction === 'function') {
+…
+const attachedClient = typeof ent.getClient === 'function' ? ent.getClient() : null;
+…
+
+// ✅ Instead, use optional chaining and nullish coalescing
+if (sometype instanceof SomeClass) {
+…
+```
+
 ### Template Literals
 
 Replace string concatenation with template literals for readability.
@@ -302,3 +318,111 @@ For example, consider this original code snippet with helpful comments:
 If you encounter important logic that is not covered by tests, add new tests to cover it. This is especially critical for complex algorithms, edge cases, or any code that has caused bugs in the past.
 
 If code looks risky or has had bugs before, but there are no tests for it, that's a strong signal that tests should be added. Don't skip this step just to get the TS port done faster — the goal is not just to convert to TypeScript, but to improve code quality and maintainability overall.
+
+### Initialize the registry properly
+
+```typescript
+
+// ❌ This will cause static analysis regarding e.g. Con being undefined:
+
+let { Con } = registry;
+
+eventBus.subscribe('registry.frozen', () => {
+  ({ Con } = registry);
+});
+
+// ✅ Instead, initialize with the helper function that has the correct typing and will be updated when the registry is frozen:
+
+let { Con } = getCommonRegistry();
+
+eventBus.subscribe('registry.frozen', () => {
+  ({ Con } = getCommonRegistry());
+});
+
+```
+
+### Potential null and undefined values
+
+When porting, if you encounter a variable that is initialized to `null` or `undefined` and later assigned an object, make sure to update the type annotation to reflect this. For example:
+
+```typescript
+
+// ❌ Original JS with JSDoc cast
+let model = /** @type {BaseModel} */ (null);
+
+// ✅ TS with explicit nullability
+let model: BaseModel | null = null;
+
+```
+
+There are cases where the variable is initialized to `null` but is guaranteed to be assigned a non-null value before it is used. In such cases, you can use the non-null assertion operator (`!`) when accessing the variable, or you can refactor the code to ensure that the variable is properly initialized before use.
+
+```typescript
+// Example of using non-null assertion
+let model: BaseModel | null = null;
+
+function initializeModel() {
+  model = new BaseModel();
+}
+
+function useModel() {
+  console.assert(model !== null, 'Model must be initialized before use');
+
+  model!.doSomething(); // Using non-null assertion
+}
+```
+
+**Note**: When in doubt, always combine a console.assert() check with the non-null assertion to ensure that the assumption holds true at runtime. This way, if there is a case where the variable is accessed before being initialized, it will throw an error with a clear message. Prefer console.assert() over if-checks that throw errors, as it is more concise and clearly indicates that this is an invariant assumption rather than normal control flow. It will also be stripped out in production builds, so it won't have any performance impact.
+
+#### Avoiding unnecessary null checks together with indirections
+
+Another important optimization while porting over code and in regards to nullability is to **avoid unnecessary null checks**. If you have a variable that is initialized to `null` but is guaranteed to be assigned a non-null value before it is used, you can safely use the non-null assertion operator (`!`) without adding redundant null checks throughout the code.
+
+```typescript
+
+// ❌ ent.entity is guaranteed to be non-null, so the null check would be redundant and add unnecessary complexity
+
+for (const ent of SV.area.tree.queryAABB(mins, maxs)) {
+  if (ent.num === 0 || ent.isFree()) {
+    continue;
+  }
+
+  const eorg = origin.copy().subtract(ent.entity.origin.copy().add(ent.entity.mins.copy().add(ent.entity.maxs).multiply(0.5)));
+
+  if (eorg.len() > radius) {
+    continue;
+  }
+
+  if (!filterFn || filterFn(ent)) {
+    edicts.push(ent);
+  }
+}
+
+// ✅ Instead, use non-null assertion and add a console.assert to ensure the assumption holds
+
+for (const ent of SV.area.tree.queryAABB(mins, maxs)) {
+  if (ent.num === 0 || ent.isFree()) {
+    continue;
+  }
+
+  const entity = ent.entity!; // Non-null assertion
+  console.assert(entity !== null, 'Entity must be initialized before use');
+
+  const eorg = origin.copy().subtract(entity.origin.copy().add(entity.mins.copy().add(entity.maxs).multiply(0.5)));
+
+  if (eorg.len() > radius) {
+    continue;
+  }
+
+  if (!filterFn || filterFn(ent)) {
+    edicts.push(ent);
+  }
+}
+
+```
+
+In absolutely guaranteed non-null cases, avoid the console.assert as well.
+
+### Do not touch game code unless necessary
+
+When porting the engine code, try to avoid making changes to the core game logic or mechanics unless it is necessary for the TypeScript conversion. Before making any changes, raise a question or discussion to clarify whether the change is necessary and beneficial for the overall codebase. If a change is needed, make sure to add tests to cover the new behavior and ensure that all existing tests still pass.
diff --git a/source/engine/common/CollisionModelSource.ts b/source/engine/common/CollisionModelSource.ts
index 57d40814..f889a0c7 100644
--- a/source/engine/common/CollisionModelSource.ts
+++ b/source/engine/common/CollisionModelSource.ts
@@ -1,4 +1,4 @@
-import { eventBus, registry } from '../registry.mjs';
+import { eventBus, getClientRegistry, getCommonRegistry } from '../registry.mjs';
 
 import type { ServerEdict } from '../server/Edict.mjs';
 import type { BrushModel } from './model/BSP.ts';
@@ -14,10 +14,12 @@ interface ClientCollisionModelAccessors {
   readonly getModels?: () => Array<BrushModel | object | null> | null;
 }
 
-let { CL, SV } = registry;
+let { SV } = getCommonRegistry();
+let { CL } = getClientRegistry();
 
 eventBus.subscribe('registry.frozen', () => {
-  ({ CL, SV } = registry);
+  ({ SV } = getCommonRegistry());
+  ({ CL } = getClientRegistry());
 });
 
 /**
diff --git a/source/engine/common/GameAPIs.ts b/source/engine/common/GameAPIs.ts
index 927668cc..ca60655d 100644
--- a/source/engine/common/GameAPIs.ts
+++ b/source/engine/common/GameAPIs.ts
@@ -9,12 +9,12 @@ import type { Visibility } from './model/BSP.ts';
 
 import { PmoveConfiguration } from '../../shared/Pmove.ts';
 import Vector from '../../shared/Vector.ts';
-import { solid } from '../../shared/Defs.ts';
+import { moveTypes, solid } from '../../shared/Defs.ts';
 import Key from '../client/Key.mjs';
 import { SFX as SFXValue } from '../client/Sound.mjs';
 import VID from '../client/VID.mjs';
 import * as Protocol from '../network/Protocol.ts';
-import { EventBus, eventBus, registry } from '../registry.mjs';
+import { EventBus, eventBus, getClientRegistry, getCommonRegistry } from '../registry.mjs';
 import { ED, ServerEdict as ServerEdictValue } from '../server/Edict.mjs';
 import Cmd from './Cmd.ts';
 import Cvar from './Cvar.ts';
@@ -74,10 +74,12 @@ type ServerEntityFilter = ((entity: ServerEdict) => boolean) | null;
 type ClientEntityFilter = ((entity: ClientEdict) => boolean) | null;
 type CommandCallback = (...args: string[]) => void | Promise<void>;
 
-let { CL, COM, Con, Draw, Host, R, S, SCR, SV, V } = registry;
+let { COM, Con, Host, SV, V } = getCommonRegistry();
+let { CL, Draw, R, S, SCR } = getClientRegistry();
 
 eventBus.subscribe('registry.frozen', () => {
-  ({ CL, COM, Con, Draw, Host, R, S, SCR, SV, V } = registry);
+  ({ COM, Con, Host, SV, V } = getCommonRegistry());
+  ({ CL, Draw, R, S, SCR } = getClientRegistry());
 });
 
 eventBus.subscribe('com.ready', () => {
@@ -93,7 +95,9 @@ eventBus.subscribe('com.ready', () => {
     CommonEngineAPI.gameFlavors.push(GameFlavors.rogue);
   }
 
-  if (COM.registered.value === 1) {
+  console.assert(COM.registered !== null, 'COM.registered must exist after com.ready');
+
+  if (COM.registered!.value === 1) {
     ServerEngineAPI.registered = true;
     ClientEngineAPI.registered = true;
   }
@@ -311,7 +315,11 @@ export class CommonEngineAPI {
    * @returns The modified variable.
    */
   static SetCvar(name: string, value: string): Cvar {
-    return Cvar.Set(name, value);
+    const variable = Cvar.Set(name, value);
+
+    console.assert(variable !== null, 'Cvar.Set requires a registered variable', name);
+
+    return variable!;
   }
 
   /**
@@ -405,7 +413,25 @@ export class ServerEngineAPI extends CommonEngineAPI {
     maxs: Vector | null = null,
   ): GameTrace {
     const nullVec = Vector.origin;
-    const trace = SV.collision.move(start, mins ? mins : nullVec, maxs ? maxs : nullVec, end, noMonsters, passEdict) as InternalTraceLike;
+    const moveType = noMonsters ? moveTypes.MOVE_NOMONSTERS : moveTypes.MOVE_NORMAL;
+    const collision = SV.collision as {
+      move(
+        start: Vector,
+        mins: Vector,
+        maxs: Vector,
+        end: Vector,
+        type: moveTypes,
+        passedict: ServerEdict | null,
+      ): InternalTraceLike;
+    };
+    const trace = collision.move(
+      start,
+      mins ? mins : nullVec,
+      maxs ? maxs : nullVec,
+      end,
+      moveType,
+      passEdict,
+    );
     return internalTraceToGameTrace(trace);
   }
 
@@ -418,7 +444,25 @@ export class ServerEngineAPI extends CommonEngineAPI {
     maxs: Vector | null = null,
   ): InternalTraceLike {
     const nullVec = Vector.origin;
-    return SV.collision.move(start, mins ? mins : nullVec, maxs ? maxs : nullVec, end, noMonsters, passEdict) as InternalTraceLike;
+    const moveType = noMonsters ? moveTypes.MOVE_NOMONSTERS : moveTypes.MOVE_NORMAL;
+    const collision = SV.collision as {
+      move(
+        start: Vector,
+        mins: Vector,
+        maxs: Vector,
+        end: Vector,
+        type: moveTypes,
+        passedict: ServerEdict | null,
+      ): InternalTraceLike;
+    };
+    return collision.move(
+      start,
+      mins ? mins : nullVec,
+      maxs ? maxs : nullVec,
+      end,
+      moveType,
+      passEdict,
+    );
   }
 
   /**
@@ -426,9 +470,11 @@ export class ServerEngineAPI extends CommonEngineAPI {
    * It will also send an update to all connected clients.
    */
   static Lightstyle(styleId: number, sequenceString: string): void {
-    SV.server.lightstyles[styleId] = sequenceString;
+    const server = SV.server as typeof SV.server & { lightstyles: string[]; loading: boolean };
+
+    server.lightstyles[styleId] = sequenceString;
 
-    if (SV.server.loading) {
+    if (server.loading) {
       return;
     }
 
@@ -521,13 +567,17 @@ export class ServerEngineAPI extends CommonEngineAPI {
     const mins = origin.copy().subtract(vradius);
     const maxs = origin.copy().add(vradius);
     const edicts: ServerEdict[] = [];
+    const tree = SV.area.tree;
 
-    for (const ent of SV.area.tree.queryAABB(mins, maxs)) {
+    console.assert(tree !== null, 'SV.area.tree must be initialized before radius queries');
+
+    for (const ent of tree!.queryAABB(mins, maxs)) {
       if (ent.num === 0 || ent.isFree()) {
         continue;
       }
 
-      const eorg = origin.copy().subtract(ent.entity.origin.copy().add(ent.entity.mins.copy().add(ent.entity.maxs).multiply(0.5)));
+      const entity = ent.entity!;
+      const eorg = origin.copy().subtract(entity.origin.copy().add(entity.mins.copy().add(entity.maxs).multiply(0.5)));
 
       if (eorg.len() > radius) {
         continue;
@@ -554,7 +604,9 @@ export class ServerEngineAPI extends CommonEngineAPI {
         continue;
       }
 
-      if (ent.entity[field] === value) {
+      const entity = ent.entity! as BaseEntity & Record<string, EdictValueType>;
+
+      if (entity[field] === value) {
         return ent; // FIXME: turn it into yield
       }
     }
@@ -575,7 +627,9 @@ export class ServerEngineAPI extends CommonEngineAPI {
         continue;
       }
 
-      if (ent.entity[field] === value) {
+      const entity = ent.entity! as BaseEntity & Record<string, EdictValueType>;
+
+      if (entity[field] === value) {
         yield ent;
       }
     }
@@ -664,7 +718,7 @@ export class ServerEngineAPI extends CommonEngineAPI {
   }
 
   static IsLoading(): boolean {
-    return SV.server.loading;
+    return (SV.server as typeof SV.server & { loading: boolean }).loading;
   }
 
   /**
@@ -729,25 +783,27 @@ export class ServerEngineAPI extends CommonEngineAPI {
    */
   static DispatchClientEvent(receiverPlayerEdict: ServerEdict, expedited: boolean, eventCode: number, ...args: SerializableType[]): void {
     console.assert(receiverPlayerEdict instanceof ServerEdictValue && receiverPlayerEdict.isClient(), 'emitterEdict must be a ServerEdict connected to a client');
+    console.assert(receiverPlayerEdict.getClient() !== null, 'receiverPlayerEdict must have a client');
 
-    const destination = expedited ? receiverPlayerEdict.getClient().expedited_message : receiverPlayerEdict.getClient().message;
+    const receiverClient = receiverPlayerEdict.getClient()!;
+    const destination = expedited ? receiverClient.expedited_message : receiverClient.message;
 
     this.#DispatchClientEventOnDestination(destination, eventCode, ...args);
   }
 
   /**
    * Return a series of waypoints from start to end.
-   * @returns Waypoints from start to end, including start and end.
+   * @returns The waypoints from start to end, or `null` when no path could be found.
    */
-  static Navigate(start: Vector, end: Vector): Vector[] {
+  static Navigate(start: Vector, end: Vector): Vector[] | null {
     return SV.server.navigation.findPath(start, end);
   }
 
   /**
    * Return a series of waypoints from start to end asynchronously.
-   * @returns Waypoints from start to end, including start and end.
+   * @returns The waypoints from start to end, or `null` when no path could be found.
    */
-  static NavigateAsync(start: Vector, end: Vector): Promise<Vector[]> {
+  static NavigateAsync(start: Vector, end: Vector): Promise<Vector[] | null> {
     return SV.server.navigation.findPathAsync(start, end);
   }
 
@@ -772,8 +828,9 @@ export class ServerEngineAPI extends CommonEngineAPI {
    */
   static SetPmoveConfiguration(config: PmoveConfiguration): void {
     console.assert(config instanceof PmoveConfiguration, 'config must be an instance of PmoveConfiguration');
+    console.assert(SV.pmove !== null, 'SV.pmove must exist before setting configuration');
 
-    SV.pmove.configuration = config;
+    SV.pmove!.configuration = config;
   }
 
   static get maxplayers(): number {
@@ -845,7 +902,11 @@ export class ClientEngineAPI extends CommonEngineAPI {
    * @returns The loaded sound effect.
    */
   static LoadSound(sfxName: string): SFXValue {
-    return S.PrecacheSound(sfxName);
+    const sfx = S.PrecacheSound(sfxName);
+
+    console.assert(sfx !== null, 'sound must be precached before being returned', sfxName);
+
+    return sfx!;
   }
 
   /**
@@ -1024,13 +1085,15 @@ export class ClientEngineAPI extends CommonEngineAPI {
       return CL.state.viewangles.copy();
     },
     get vieworigin(): Vector {
-      return CL.state.viewent.origin.copy();
+      console.assert(CL.state.viewent !== null, 'client view entity must exist when reading vieworigin');
+
+      return CL.state.viewent!.origin.copy();
     },
     get maxclients(): number {
       return CL.state.maxclients;
     },
     get levelname(): string {
-      return CL.state.levelname;
+      return CL.state.levelname ?? '';
     },
     get entityNum(): number {
       return CL.state.viewentity;
@@ -1093,7 +1156,7 @@ export class ClientEngineAPI extends CommonEngineAPI {
      * @returns The current view size.
      */
     get viewsize(): number {
-      return SCR.viewsize.value as number;
+      return (SCR as typeof SCR & { viewsize: Cvar }).viewsize.value as number;
     },
   };
 
diff --git a/source/engine/common/PlatformWorker.ts b/source/engine/common/PlatformWorker.ts
index 8c79e3ef..e95c97b0 100644
--- a/source/engine/common/PlatformWorker.ts
+++ b/source/engine/common/PlatformWorker.ts
@@ -1,10 +1,10 @@
-import { registry, eventBus } from '../registry.mjs';
+import { eventBus, getCommonRegistry } from '../registry.mjs';
 import { BaseWorker, type WorkerMessageListener } from './Sys.ts';
 
-let { Host } = registry;
+let { Host } = getCommonRegistry();
 
 eventBus.subscribe('registry.frozen', () => {
-  ({ Host } = registry);
+  ({ Host } = getCommonRegistry());
 });
 
 const isNode = typeof process !== 'undefined' && process.versions?.node !== undefined;
diff --git a/source/engine/common/model/loaders/AliasMDLLoader.ts b/source/engine/common/model/loaders/AliasMDLLoader.ts
index 03255da6..5d36fe09 100644
--- a/source/engine/common/model/loaders/AliasMDLLoader.ts
+++ b/source/engine/common/model/loaders/AliasMDLLoader.ts
@@ -629,9 +629,9 @@ export class AliasMDLLoader extends ModelLoader {
     const scaleOrigin = loadmodel._scale_origin;
 
     console.assert(scale !== null && scaleOrigin !== null);
-    if (scale === null || scaleOrigin === null) {
-      return;
-    }
+
+    const activeScale = scale!;
+    const activeScaleOrigin = scaleOrigin!;
 
     const cmds: number[] = [];
 
@@ -680,9 +680,9 @@ export class AliasMDLLoader extends ModelLoader {
             for (let vertexOffset = 0; vertexOffset < 3; vertexOffset++) {
               const vert = frame.v[triangle.vertindex[vertexOffset]];
               console.assert(vert.lightnormalindex < avertexnormals.length / 3);
-              cmds.push(vert.v[0] * scale[0] + scaleOrigin[0]);
-              cmds.push(vert.v[1] * scale[1] + scaleOrigin[1]);
-              cmds.push(vert.v[2] * scale[2] + scaleOrigin[2]);
+              cmds.push(vert.v[0] * activeScale[0] + activeScaleOrigin[0]);
+              cmds.push(vert.v[1] * activeScale[1] + activeScaleOrigin[1]);
+              cmds.push(vert.v[2] * activeScale[2] + activeScaleOrigin[2]);
               cmds.push(avertexnormals[vert.lightnormalindex * 3]);
               cmds.push(avertexnormals[vert.lightnormalindex * 3 + 1]);
               cmds.push(avertexnormals[vert.lightnormalindex * 3 + 2]);
@@ -701,9 +701,9 @@ export class AliasMDLLoader extends ModelLoader {
         for (let vertexOffset = 0; vertexOffset < 3; vertexOffset++) {
           const vert = frame.v[triangle.vertindex[vertexOffset]];
           console.assert(vert.lightnormalindex < avertexnormals.length / 3);
-          cmds.push(vert.v[0] * scale[0] + scaleOrigin[0]);
-          cmds.push(vert.v[1] * scale[1] + scaleOrigin[1]);
-          cmds.push(vert.v[2] * scale[2] + scaleOrigin[2]);
+          cmds.push(vert.v[0] * activeScale[0] + activeScaleOrigin[0]);
+          cmds.push(vert.v[1] * activeScale[1] + activeScaleOrigin[1]);
+          cmds.push(vert.v[2] * activeScale[2] + activeScaleOrigin[2]);
           cmds.push(avertexnormals[vert.lightnormalindex * 3]);
           cmds.push(avertexnormals[vert.lightnormalindex * 3 + 1]);
           cmds.push(avertexnormals[vert.lightnormalindex * 3 + 2]);
diff --git a/source/engine/common/model/loaders/BSP29Loader.ts b/source/engine/common/model/loaders/BSP29Loader.ts
index 34b310c2..1df427b1 100644
--- a/source/engine/common/model/loaders/BSP29Loader.ts
+++ b/source/engine/common/model/loaders/BSP29Loader.ts
@@ -5,7 +5,7 @@ import { GLTexture } from '../../../client/GL.mjs';
 import W, { readWad3Texture, translateIndexToLuminanceRGBA, translateIndexToRGBA } from '../../W.ts';
 import { CRC16CCITT } from '../../CRC.ts';
 import { CorruptedResourceError } from '../../Errors.ts';
-import { eventBus, registry } from '../../../registry.mjs';
+import { eventBus, getCommonRegistry, registry } from '../../../registry.mjs';
 import { ModelLoader } from '../ModelLoader.ts';
 import { Brush, BrushModel, BrushSide, Node, type BSPXLumps, type Clipnode, type Hull } from '../BSP.ts';
 import { Face, Plane } from '../BaseModel.ts';
@@ -13,10 +13,10 @@ import { materialFlags, noTextureMaterial, PBRMaterial, QuakeMaterial } from '..
 import { Quake1Sky, SimpleSkyBox } from '../../../client/renderer/Sky.mjs';
 
 // Get registry references (will be set by eventBus)
-let { COM, Con } = registry;
+let { COM, Con } = getCommonRegistry();
 
 eventBus.subscribe('registry.frozen', () => {
-  ({ COM, Con } = registry);
+  ({ COM, Con } = getCommonRegistry());
 });
 
 interface AllowedClipnodeHull extends Hull {
diff --git a/source/engine/network/Network.ts b/source/engine/network/Network.ts
index cd0bba3c..f5b96621 100644
--- a/source/engine/network/Network.ts
+++ b/source/engine/network/Network.ts
@@ -288,16 +288,16 @@ export default class NET {
 
 eventBus.subscribe('server.spawned', () => {
   if (SV.svs.maxclients === 1 && NET.listening) {
-    Cmd.ExecuteString('listen 0');
+    void Cmd.ExecuteString('listen 0');
   }
 
   if (SV.svs.maxclients > 1 && !NET.listening) {
-    Cmd.ExecuteString('listen 1');
+    void Cmd.ExecuteString('listen 1');
   }
 });
 
 eventBus.subscribe('server.shutdown', () => {
   if (NET.listening) {
-    Cmd.ExecuteString('listen 0');
+    void Cmd.ExecuteString('listen 0');
   }
 });
diff --git a/source/engine/server/Navigation.mjs b/source/engine/server/Navigation.mjs
index de4dc880..4845335b 100644
--- a/source/engine/server/Navigation.mjs
+++ b/source/engine/server/Navigation.mjs
@@ -686,7 +686,7 @@ export class Navigation {
   /**
    * @param {Vector} startpos stand origin
    * @param {Vector} endpos stand origin
-   * @returns {import('./physics/ServerCollisionSupport.mjs').CollisionTrace} collision result
+   * @returns {import('./physics/ServerCollisionSupport.ts').CollisionTrace} collision result
    */
   #traceWalkerStatic(startpos, endpos) {
     return SV.collision.traceStaticWorld(
diff --git a/source/engine/server/Server.mjs b/source/engine/server/Server.mjs
index 1f053cb2..7bde8bbe 100644
--- a/source/engine/server/Server.mjs
+++ b/source/engine/server/Server.mjs
@@ -10,12 +10,12 @@ import { EventBus, eventBus, registry } from '../registry.mjs';
 import { ServerEngineAPI } from '../common/GameAPIs.ts';
 import * as Defs from '../../shared/Defs.ts';
 import { Navigation } from './Navigation.mjs';
-import { ServerPhysics } from './physics/ServerPhysics.mjs';
-import { ServerClientPhysics } from './physics/ServerClientPhysics.mjs';
+import { ServerPhysics } from './physics/ServerPhysics.ts';
+import { ServerClientPhysics } from './physics/ServerClientPhysics.ts';
 import { ServerMessages } from './ServerMessages.mjs';
-import { ServerMovement } from './physics/ServerMovement.mjs';
-import { ServerArea } from './physics/ServerArea.mjs';
-import { ServerCollision } from './physics/ServerCollision.mjs';
+import { ServerMovement } from './physics/ServerMovement.ts';
+import { ServerArea } from './physics/ServerArea.ts';
+import { ServerCollision } from './physics/ServerCollision.ts';
 import { sharedCollisionModelSource } from '../common/CollisionModelSource.ts';
 import { BrushModel } from '../common/Mod.ts';
 import { ServerClient } from './Client.mjs';
diff --git a/source/engine/server/physics/Defs.mjs b/source/engine/server/physics/Defs.ts
similarity index 71%
rename from source/engine/server/physics/Defs.mjs
rename to source/engine/server/physics/Defs.ts
index e856528e..fe3c06e9 100644
--- a/source/engine/server/physics/Defs.mjs
+++ b/source/engine/server/physics/Defs.ts
@@ -1,13 +1,11 @@
 /**
  * Minimum ground angle normal (Z component) to be considered "on ground".
  * Normal vectors with Z >= this value are walkable slopes.
- * @constant {number}
  */
 export const GROUND_ANGLE_THRESHOLD = 0.7;
 
 /**
  * Maximum step height an entity can climb automatically (in units).
- * @constant {number}
  */
 export const STEP_HEIGHT = 18.0;
 
@@ -22,47 +20,37 @@ export const VELOCITY_EPSILON = 0.1;
  */
 export const WATER_SPEED_FACTOR = 0.7;
 
-/**
- * Number of bump iterations allowed in fly/move physics.
- */
-
 /**
  * Overbounce factor for wall/floor collisions.
  * Values > 1.0 make objects bounce slightly, < 1.0 absorb energy.
- * @constant {number}
  */
 export const BOUNCE_OVERBOUNCE = 1.0;
 
 /**
  * Overbounce factor for stopping movement.
- * @constant {number}
  */
 export const STOP_OVERBOUNCE = 1.0;
 
 /**
  * Maximum number of collision planes to slide against in flyMove.
- * @constant {number}
  */
 export const MAX_CLIP_PLANES = 5;
 
 /**
  * Maximum number of bump iterations in flyMove.
- * @constant {number}
  */
 export const MAX_BUMP_COUNT = 4;
 
 /**
  * Blocked flags for movement traces.
- * @readonly
- * @enum {number}
  */
-export const BlockedFlags = {
-  /** Movement not blocked */
-  NONE: 0,
-  /** Blocked by floor */
-  FLOOR: 1,
-  /** Blocked by wall/step */
-  WALL: 2,
-  /** Blocked by floor and wall */
-  BOTH: 3,
-};
+export enum BlockedFlags {
+  /** Movement not blocked. */
+  NONE = 0,
+  /** Blocked by floor. */
+  FLOOR = 1,
+  /** Blocked by wall/step. */
+  WALL = 2,
+  /** Blocked by floor and wall. */
+  BOTH = 3,
+}
diff --git a/source/engine/server/physics/ServerArea.mjs b/source/engine/server/physics/ServerArea.ts
similarity index 56%
rename from source/engine/server/physics/ServerArea.mjs
rename to source/engine/server/physics/ServerArea.ts
index ae2dfbeb..11c6f246 100644
--- a/source/engine/server/physics/ServerArea.mjs
+++ b/source/engine/server/physics/ServerArea.ts
@@ -1,14 +1,35 @@
+import type { Hull, Node } from '../../common/model/BSP.ts';
+import type { BaseEntity, ServerEdict } from '../Edict.mjs';
+
 import Vector from '../../../shared/Vector.ts';
 import * as Defs from '../../../shared/Defs.ts';
 import { Octree } from '../../../shared/Octree.ts';
-import { eventBus, registry } from '../../registry.mjs';
+import { eventBus, getCommonRegistry } from '../../registry.mjs';
 import CollisionModelSource, { createRegistryCollisionModelSource } from '../../common/CollisionModelSource.ts';
-import { BrushModel } from '../../../engine/common/Mod.ts';
+import { BrushModel } from '../../common/Mod.ts';
+
+interface BoxClipNode {
+  planenum: number;
+  children: number[];
+}
+
+interface BoxPlane {
+  type: number;
+  normal: Vector;
+  dist: number;
+}
+
+interface BoxHull {
+  clipnodes: BoxClipNode[];
+  planes: BoxPlane[];
+  firstclipnode: number;
+  lastclipnode: number;
+}
 
-let { SV } = registry;
+let { SV } = getCommonRegistry();
 
 eventBus.subscribe('registry.frozen', () => {
-  SV = registry.SV;
+  ({ SV } = getCommonRegistry());
 });
 
 /**
@@ -16,42 +37,46 @@ eventBus.subscribe('registry.frozen', () => {
  * Handles the area node BSP tree used for spatial queries.
  */
 export class ServerArea {
-  /** @type {?Octree<import('../Edict.mjs').ServerEdict>} */
-  tree = null;
+  tree: Octree<ServerEdict> | null = null;
+  box_clipnodes: BoxClipNode[] = [];
+  box_planes: BoxPlane[] = [];
+  box_hull: BoxHull | null = null;
+  readonly _modelSource: CollisionModelSource;
 
   /**
-   * @param {CollisionModelSource} [modelSource] runtime model resolver
+   * @param modelSource Runtime model resolver.
    */
-  constructor(modelSource = createRegistryCollisionModelSource()) {
+  constructor(modelSource: CollisionModelSource = createRegistryCollisionModelSource()) {
     this._modelSource = modelSource;
   }
 
   /**
    * Resolve a collision model by model index from either the active server or
    * the client precache populated during signon.
-   * @param {number} modelIndex precached model index
-   * @returns {BrushModel|object|null} resolved model, if any
+   * @param modelIndex Precached model index.
+   * @returns Resolved model, if any.
    */
-  _getModelByIndex(modelIndex) {
+  _getModelByIndex(modelIndex: number): ReturnType<CollisionModelSource['getModelByIndex']> {
     return this._modelSource.getModelByIndex(modelIndex);
   }
 
   /**
    * Compute entity world bounds, expanding rotated BSP bounds into a world AABB.
-   * @param {import('../Edict.mjs').ServerEdict} ent entity being linked
-   * @param {Vector} absmin output minimum bounds
-   * @param {Vector} absmax output maximum bounds
+   * @param ent Entity being linked.
+   * @param absmin Output minimum bounds.
+   * @param absmax Output maximum bounds.
    */
-  _computeEntityBounds(ent, absmin, absmax) {
-    const origin = ent.entity.origin;
-    const mins = ent.entity.mins;
-    const maxs = ent.entity.maxs;
-    const model = this._getModelByIndex(ent.entity.modelindex);
-
-    if (ent.entity.solid === Defs.solid.SOLID_BSP
+  _computeEntityBounds(ent: ServerEdict, absmin: Vector, absmax: Vector): void {
+    const entity = ent.entity!;
+    const origin = entity.origin;
+    const mins = entity.mins;
+    const maxs = entity.maxs;
+    const model = this._getModelByIndex(entity.modelindex);
+
+    if (entity.solid === Defs.solid.SOLID_BSP
       && model instanceof BrushModel
-      && !ent.entity.angles.isOrigin()) {
-      const basis = ent.entity.angles.toRotationMatrix();
+      && !entity.angles.isOrigin()) {
+      const basis = entity.angles.toRotationMatrix();
       const forward = new Vector(basis[0], basis[1], basis[2]);
       const right = new Vector(basis[3], basis[4], basis[5]);
       const up = new Vector(basis[6], basis[7], basis[8]);
@@ -92,7 +117,7 @@ export class ServerArea {
   /**
    * Initializes the temporary hull data used for axis-aligned clipping.
    */
-  initBoxHull() {
+  initBoxHull(): void {
     this.box_clipnodes = [];
     this.box_planes = [];
     this.box_hull = {
@@ -102,42 +127,45 @@ export class ServerArea {
       lastclipnode: 5,
     };
 
-    for (let i = 0; i <= 5; i++) {
-      const node = {};
-      this.box_clipnodes[i] = node;
-      node.planenum = i;
-      node.children = [];
-      node.children[i & 1] = Defs.content.CONTENT_EMPTY;
-      if (i !== 5) {
-        node.children[1 - (i & 1)] = i + 1;
+    for (let index = 0; index <= 5; index++) {
+      const node: BoxClipNode = {
+        planenum: index,
+        children: [],
+      };
+      this.box_clipnodes[index] = node;
+      node.children[index & 1] = Defs.content.CONTENT_EMPTY;
+      if (index !== 5) {
+        node.children[1 - (index & 1)] = index + 1;
       } else {
-        node.children[1 - (i & 1)] = Defs.content.CONTENT_SOLID;
+        node.children[1 - (index & 1)] = Defs.content.CONTENT_SOLID;
       }
 
-      const plane = {};
-      this.box_planes[i] = plane;
-      plane.type = i >> 1;
-      plane.normal = new Vector();
-      plane.normal[i >> 1] = 1.0;
-      plane.dist = 0.0;
+      const plane: BoxPlane = {
+        type: index >> 1,
+        normal: new Vector(),
+        dist: 0.0,
+      };
+      this.box_planes[index] = plane;
+      plane.normal[index >> 1] = 1.0;
     }
   }
 
   /**
    * Resolves the hull that should be used when clipping against a given entity.
-   * @param {import('../Edict.mjs').ServerEdict} ent edict to create a hull for
-   * @param {Vector} mins minimum extents of the moving object
-   * @param {Vector} maxs maximum extents of the moving object
-   * @param {Vector} out_offset receives the hull offset relative to entity origin
-   * @returns {*} the hull structure used for collision tests
+   * @param ent Edict to create a hull for.
+   * @param mins Minimum extents of the moving object.
+   * @param maxs Maximum extents of the moving object.
+   * @param out_offset Receives the hull offset relative to entity origin.
+   * @returns The hull structure used for collision tests.
    */
-  hullForEntity(ent, mins, maxs, out_offset) {
-    const model = this._getModelByIndex(ent.entity.modelindex);
-    const origin = ent.entity.origin;
-
-    if (ent.entity.solid !== Defs.solid.SOLID_BSP || !(model instanceof BrushModel)) { // CR: don’t ask
-      const emaxs = ent.entity.maxs;
-      const emins = ent.entity.mins;
+  hullForEntity(ent: ServerEdict, mins: Vector, maxs: Vector, out_offset: Vector): Hull | BoxHull {
+    const entity = ent.entity!;
+    const model = this._getModelByIndex(entity.modelindex);
+    const origin = entity.origin;
+
+    if (entity.solid !== Defs.solid.SOLID_BSP || !(model instanceof BrushModel)) { // CR: don’t ask
+      const emaxs = entity.maxs;
+      const emins = entity.mins;
       // FIXME: create a new hull for this instead of mutating the box hull planes (which could cause issues if multiple entities use it at the same time)
       this.box_planes[0].dist = emaxs[0] - mins[0];
       this.box_planes[1].dist = emins[0] - maxs[0];
@@ -146,20 +174,20 @@ export class ServerArea {
       this.box_planes[4].dist = emaxs[2] - mins[2];
       this.box_planes[5].dist = emins[2] - maxs[2];
       out_offset.set(origin);
-      return this.box_hull;
+      return this.box_hull!;
     }
 
-    console.assert(ent.entity.movetype !== Defs.moveType.MOVETYPE_NONE,
+    console.assert(entity.movetype !== Defs.moveType.MOVETYPE_NONE,
       'requires SOLID_BSP with MOVETYPE_NONE, use MOVETYPE_PUSH instead');
 
     const size = maxs[0] - mins[0];
-    let hull;
+    let hull: Hull;
     if (size < 3.0) {
-      hull = model.hulls[0];
+      hull = model.hulls[0]!;
     } else if (size <= 32.0) {
-      hull = model.hulls[1];
+      hull = model.hulls[1]!;
     } else {
-      hull = model.hulls[2];
+      hull = model.hulls[2]!;
     }
 
     out_offset.setTo(
@@ -173,10 +201,10 @@ export class ServerArea {
 
   /**
    * Recursively builds the area node BSP used for spatial queries.
-   * @param {Vector} mins minimum bounds
-   * @param {Vector} maxs maximum bounds
+   * @param mins Minimum bounds.
+   * @param maxs Maximum bounds.
    */
-  initOctree(mins, maxs) {
+  initOctree(mins: Vector, maxs: Vector): void {
     // center is the midpoint of mins/maxs
     const center = mins.copy().add(maxs).multiply(0.5);
 
@@ -194,14 +222,14 @@ export class ServerArea {
 
     const halfSize = pow2 / 2;
 
-    this.tree = /** @type {Octree<import('../Edict.mjs').ServerEdict>} */ (new Octree(center, halfSize, 16, 64));
+    this.tree = new Octree(center, halfSize, 16, 64);
   }
 
   /**
    * Removes an edict from any area lists it is currently linked to.
-   * @param {import('../Edict.mjs').ServerEdict} ent edict to unlink
+   * @param ent Edict to unlink.
    */
-  unlinkEdict(ent) {
+  unlinkEdict(ent: ServerEdict): void {
     if (ent.octreeNode) {
       ent.octreeNode.remove(ent);
       ent.octreeNode = null;
@@ -210,32 +238,43 @@ export class ServerArea {
 
   /**
    * Iterates all trigger edicts that potentially overlap the provided entity.
-   * @param {import('../Edict.mjs').ServerEdict} ent subject edict
+   * @param ent Subject edict.
    */
-  touchLinks(ent) {
-    const absmin = ent.entity.absmin;
-    const absmax = ent.entity.absmax;
+  touchLinks(ent: ServerEdict): void {
+    const tree = this.tree;
+    const entity = ent.entity!;
+    const gameAPI = SV.server.gameAPI as typeof SV.server.gameAPI & { time: number };
+
+    console.assert(tree !== null, 'ServerArea tree must be initialized before touchLinks');
+
+    const activeTree = tree!;
+
+    const absmin = entity.absmin;
+    const absmax = entity.absmax;
 
-    for (const touch of this.tree.queryAABB(absmin, absmax)) {
+    for (const touch of activeTree.queryAABB(absmin, absmax)) {
       if (touch === ent) {
         continue;
       }
 
-      if (!touch.entity.touch || touch.entity.solid !== Defs.solid.SOLID_TRIGGER) {
+      const touchEntity = touch.entity!;
+      if (!touchEntity.touch || touchEntity.solid !== Defs.solid.SOLID_TRIGGER) {
         continue;
       }
 
-      SV.server.gameAPI.time = SV.server.time;
-      touch.entity.touch(!ent.isFree() ? ent.entity : null);
+      const touchFn = touchEntity.touch as (this: BaseEntity, other: BaseEntity | null) => void;
+
+      gameAPI.time = SV.server.time;
+      touchFn.call(touchEntity, !ent.isFree() ? ent.entity : null);
     }
   }
 
   /**
    * Populates the leaf list for an entity by traversing the BSP tree.
-   * @param {import('../Edict.mjs').ServerEdict} ent subject edict
-   * @param {*} node current BSP node
+   * @param ent Subject edict.
+   * @param node Current BSP node.
    */
-  findTouchedLeafs(ent, node) {
+  findTouchedLeafs(ent: ServerEdict, node: Node): void {
     if (node.contents === Defs.content.CONTENT_SOLID) {
       return;
     }
@@ -249,33 +288,33 @@ export class ServerArea {
       return;
     }
 
-    const entity = /** @type {import('../Edict.mjs').BaseEntity} */ (ent.entity);
-    console.assert(entity !== null);
+    console.assert(ent.entity !== null);
+    const entity = ent.entity! as BaseEntity;
 
-    const sides = Vector.boxOnPlaneSide(entity.absmin, entity.absmax, node.plane);
+    const sides = Vector.boxOnPlaneSide(entity.absmin, entity.absmax, node.plane!);
 
     if ((sides & 1) !== 0) {
-      this.findTouchedLeafs(ent, node.children[0]);
+      this.findTouchedLeafs(ent, node.children[0] as Node);
     }
 
     if ((sides & 2) !== 0) {
-      this.findTouchedLeafs(ent, node.children[1]);
+      this.findTouchedLeafs(ent, node.children[1] as Node);
     }
   }
 
   /**
    * Inserts an edict into the area lists and optionally processes trigger touches.
    * NOTE: absmin/absmax will be reset.
-   * @param {import('../Edict.mjs').ServerEdict} ent edict to link
-   * @param {boolean} touchTriggers whether triggers should be evaluated
+   * @param ent Edict to link.
+   * @param touchTriggers Whether triggers should be evaluated.
    */
-  linkEdict(ent, touchTriggers = false) {
+  linkEdict(ent: ServerEdict, touchTriggers = false): void {
     if (ent.equals(SV.server.edicts[0]) || ent.isFree()) {
       return;
     }
 
-    const entity = /** @type {import('../Edict.mjs').BaseEntity} */ (ent.entity);
-    console.assert(entity !== null);
+    console.assert(ent.entity !== null);
+    const entity = ent.entity! as BaseEntity;
 
     SV.server.navigation.relinkEdict(ent);
     this.unlinkEdict(ent);
@@ -307,7 +346,13 @@ export class ServerArea {
       return;
     }
 
-    const node = this.tree.insert(ent);
+    const tree = this.tree;
+
+    console.assert(tree !== null, 'ServerArea tree must be initialized before linkEdict');
+
+    const activeTree = tree!;
+
+    const node = activeTree.insert(ent);
     ent.octreeNode = node;
 
     if (entity.movetype !== Defs.moveType.MOVETYPE_NOCLIP && touchTriggers) {
diff --git a/source/engine/server/physics/ServerClientPhysics.mjs b/source/engine/server/physics/ServerClientPhysics.ts
similarity index 68%
rename from source/engine/server/physics/ServerClientPhysics.mjs
rename to source/engine/server/physics/ServerClientPhysics.ts
index f994716f..edb1c850 100644
--- a/source/engine/server/physics/ServerClientPhysics.mjs
+++ b/source/engine/server/physics/ServerClientPhysics.ts
@@ -1,19 +1,19 @@
+import type { ServerEdict } from '../Edict.mjs';
+
 import Vector from '../../../shared/Vector.ts';
 import * as Defs from '../../../shared/Defs.ts';
-import { eventBus, registry } from '../../registry.mjs';
+import { eventBus, getCommonRegistry } from '../../registry.mjs';
 import {
   VELOCITY_EPSILON,
-} from './Defs.mjs';
+} from './Defs.ts';
 import { ServerClient } from '../Client.mjs';
 import { PM_TYPE } from '../../common/Pmove.ts';
 import { BrushModel } from '../../common/Mod.ts';
 
-let { Host, SV, V } = registry;
+let { Host, SV, V } = getCommonRegistry();
 
 eventBus.subscribe('registry.frozen', () => {
-  Host = registry.Host;
-  SV = registry.SV;
-  V = registry.V;
+  ({ Host, SV, V } = getCommonRegistry());
 });
 
 /**
@@ -23,9 +23,6 @@ eventBus.subscribe('registry.frozen', () => {
  * and server authoritative movement use the exact same code path.
  */
 export class ServerClientPhysics {
-  constructor() {
-  }
-
   // =========================================================================
   // Shared PmovePlayer integration
   // =========================================================================
@@ -33,14 +30,18 @@ export class ServerClientPhysics {
   /**
    * Populates SV.pmove physents with solid entities near the player.
    * Must be called before running a PmovePlayer for a client.
-   * @param {import('../Edict.mjs').ServerEdict} playerEdict player edict (excluded from list)
+   * @param playerEdict Player edict (excluded from list).
    */
-  _setupPhysents(playerEdict) {
+  _setupPhysents(playerEdict: ServerEdict): void {
     const pm = SV.pmove;
-    pm.clearEntities();
+    console.assert(pm !== null, 'SV.pmove must be initialized before setting up physents');
+
+    const activePmove = pm!;
+
+    activePmove.clearEntities();
 
-    for (let i = 1; i < SV.server.num_edicts; i++) {
-      const edict = SV.server.edicts[i];
+    for (let index = 1; index < SV.server.num_edicts; index++) {
+      const edict = SV.server.edicts[index];
       if (!edict || edict.isFree() || edict === playerEdict) {
         continue;
       }
@@ -50,17 +51,17 @@ export class ServerClientPhysics {
         continue;
       }
 
-      const s = entity.solid;
+      const solidType = entity.solid;
 
-      if (s !== Defs.solid.SOLID_BSP && s !== Defs.solid.SOLID_BBOX && s !== Defs.solid.SOLID_SLIDEBOX) {
+      if (solidType !== Defs.solid.SOLID_BSP && solidType !== Defs.solid.SOLID_BBOX && solidType !== Defs.solid.SOLID_SLIDEBOX) {
         continue;
       }
 
-      const model = (s === Defs.solid.SOLID_BSP && entity.modelindex)
+      const model = solidType === Defs.solid.SOLID_BSP && entity.modelindex
         ? SV.server.models[entity.modelindex]
         : null;
 
-      pm.addEntity(entity, /** @type {BrushModel} */ (model instanceof BrushModel ? model : null));
+      activePmove.addEntity(entity, model instanceof BrushModel ? model : null);
     }
   }
 
@@ -69,20 +70,23 @@ export class ServerClientPhysics {
    * the entity and client objects. This replaces the old server-side
    * walkMove/airMove/waterMove/friction/accelerate code with the same
    * movement code the client uses for prediction.
-   * @param {import('../Edict.mjs').ServerEdict} ent player edict
-   * @param {ServerClient} client client connection
+   * @param ent Player edict.
+   * @param client Client connection.
    */
-  _runSharedPmove(ent, client) {
-    const entity = ent.entity;
+  _runSharedPmove(ent: ServerEdict, client: ServerClient): void {
+    const entity = ent.entity!;
     const pm = SV.pmove;
+    console.assert(pm !== null, 'SV.pmove must be initialized before running shared pmove');
+
+    const activePmove = pm!;
 
     // --- Set up physents ---
     this._setupPhysents(ent);
 
     // --- Create a fresh player mover ---
-    const pmove = pm.newPlayerMove();
+    const pmove = activePmove.newPlayerMove();
 
-    // --- Copy entity state → pmove ---
+    // --- Copy entity state -> pmove ---
     pmove.origin.set(entity.origin);
     pmove.velocity.set(entity.velocity);
     pmove.angles.set(entity.v_angle ?? entity.angles);
@@ -136,17 +140,19 @@ export class ServerClientPhysics {
       pmove.move();
     }
 
-    // --- Copy results back → entity ---
+    // --- Copy results back -> entity ---
     entity.origin = entity.origin.set(pmove.origin);
     entity.velocity = entity.velocity.set(pmove.velocity);
 
     // Ground entity
     if (pmove.onground !== null) {
       entity.flags |= Defs.flags.FL_ONGROUND;
-      if (pmove.onground > 0 && pmove.onground < pm.physents.length) {
-        const pe = pm.physents[pmove.onground];
-        if (pe.edictId !== undefined && pe.edictId < SV.server.num_edicts) {
-          entity.groundentity = SV.server.edicts[pe.edictId].entity;
+      if (pmove.onground > 0 && pmove.onground < activePmove.physents.length) {
+        const physent = activePmove.physents[pmove.onground]!;
+        const edictId = physent.edictId;
+
+        if (edictId !== undefined && edictId !== null && edictId < SV.server.num_edicts) {
+          entity.groundentity = SV.server.edicts[edictId].entity;
         } else {
           entity.groundentity = null;
         }
@@ -177,15 +183,17 @@ export class ServerClientPhysics {
     client.pmFlags = pmove.pmFlags;
     client.pmTime = pmove.pmTime;
 
-    // Touched entities — fire touch functions via SV.physics.impact
+    // Touched entities - fire touch functions via SV.physics.impact
     // to match the bidirectional touch semantics used by SV_FlyMove.
-    const touchedSet = new Set();
-    for (const idx of pmove.touchindices) {
-      if (idx > 0 && idx < pm.physents.length && !touchedSet.has(idx)) {
-        touchedSet.add(idx);
-        const pe = pm.physents[idx];
-        if (pe.edictId !== undefined && pe.edictId < SV.server.num_edicts) {
-          const touchEdict = SV.server.edicts[pe.edictId];
+    const touchedSet = new Set<number>();
+    for (const index of pmove.touchindices) {
+      if (index > 0 && index < activePmove.physents.length && !touchedSet.has(index)) {
+        touchedSet.add(index);
+        const physent = activePmove.physents[index]!;
+        const edictId = physent.edictId;
+
+        if (edictId !== undefined && edictId !== null && edictId < SV.server.num_edicts) {
+          const touchEdict = SV.server.edicts[edictId];
           if (!touchEdict.isFree()) {
             SV.physics.impact(ent, touchEdict, entity.velocity.copy());
           }
@@ -200,24 +208,25 @@ export class ServerClientPhysics {
 
   /**
    * Updates the ideal pitch for a client when standing on the ground.
-   * @param {import('../Edict.mjs').ServerEdict} ent player entity
+   * @param ent Player entity.
    */
-  setIdealPitch(ent) {
-    if (!ent || (ent.entity.flags & Defs.flags.FL_ONGROUND) === 0) {
+  setIdealPitch(ent: ServerEdict): void {
+    if (!ent || (ent.entity!.flags & Defs.flags.FL_ONGROUND) === 0) {
       return;
     }
 
-    const origin = ent.entity.origin;
-    const angleval = ent.entity.angles[1] * (Math.PI / 180.0);
+    const entity = ent.entity!;
+    const origin = entity.origin;
+    const angleval = entity.angles[1] * (Math.PI / 180.0);
     const sinval = Math.sin(angleval);
     const cosval = Math.cos(angleval);
-    const top = new Vector(0.0, 0.0, origin[2] + ent.entity.view_ofs[2]);
+    const top = new Vector(0.0, 0.0, origin[2] + entity.view_ofs[2]);
     const bottom = new Vector(0.0, 0.0, top[2] - 160.0);
-    const z = [];
+    const z: number[] = [];
 
-    for (let i = 0; i < 6; i++) {
-      top[0] = bottom[0] = origin[0] + cosval * (i + 3) * 12.0;
-      top[1] = bottom[1] = origin[1] + sinval * (i + 3) * 12.0;
+    for (let index = 0; index < 6; index++) {
+      top[0] = bottom[0] = origin[0] + cosval * (index + 3) * 12.0;
+      top[1] = bottom[1] = origin[1] + sinval * (index + 3) * 12.0;
 
       const tr = SV.collision.move(top, Vector.origin, Vector.origin, bottom, 1, ent);
 
@@ -225,14 +234,14 @@ export class ServerClientPhysics {
         return;
       }
 
-      z[i] = top[2] - tr.fraction * 160.0;
+      z[index] = top[2] - tr.fraction * 160.0;
     }
 
     let dir = 0.0;
     let steps = 0;
 
-    for (let i = 1; i < 6; i++) {
-      const step = z[i] - z[i - 1];
+    for (let index = 1; index < 6; index++) {
+      const step = z[index] - z[index - 1];
 
       if (Math.abs(step) <= VELOCITY_EPSILON) {
         continue;
@@ -247,28 +256,30 @@ export class ServerClientPhysics {
     }
 
     if (dir === 0.0) {
-      ent.entity.idealpitch = 0.0;
+      entity.idealpitch = 0.0;
       return;
     }
 
     if (steps >= 2) {
-      ent.entity.idealpitch = -dir * SV.idealpitchscale.value;
+      entity.idealpitch = -dir * SV.idealpitchscale.value;
     }
   }
 
   // =========================================================================
-  // Client think — punchangle decay and visual angle setup
+  // Client think - punchangle decay and visual angle setup
   // =========================================================================
 
   /**
    * Executes per-frame input processing for a client.
-   * Movement is NOT done here — it runs through PmovePlayer in physicsClient.
+   * Movement is NOT done here - it runs through PmovePlayer in physicsClient.
    * This only handles punchangle decay and visual angle updates.
-   * @param {import('../Edict.mjs').ServerEdict} edict client edict
-   * @param {ServerClient} client client connection (unused, movement runs in physicsClient)
+   * @param edict Client edict.
+   * @param _client Client connection (unused, movement runs in physicsClient).
    */
-  clientThink(edict, client) { // eslint-disable-line no-unused-vars
-    const entity = edict.entity;
+  clientThink(edict: ServerEdict, _client: ServerClient): void {
+    void _client;
+
+    const entity = edict.entity!;
 
     if (!edict || entity.movetype === Defs.moveType.MOVETYPE_NONE) {
       return;
@@ -315,20 +326,24 @@ export class ServerClientPhysics {
    * move commands can arrive in a single server frame. We process each
    * queued command individually with its original msec so the server
    * movement matches the client-side prediction (QW-style).
-   * @param {import('../Edict.mjs').ServerEdict} ent edict
+   * @param ent Edict.
    */
-  physicsClient(ent) {
+  physicsClient(ent: ServerEdict): void {
     const client = ent.getClient();
+    console.assert(client !== null, 'client edict must have an attached server client');
+
+    const activeClient = client!;
+    const gameAPI = SV.server.gameAPI as typeof SV.server.gameAPI & { time: number };
 
-    if (client.state < ServerClient.STATE.CONNECTED) {
+    if (activeClient.state < ServerClient.STATE.CONNECTED) {
       return;
     }
 
-    SV.server.gameAPI.time = SV.server.time;
+    gameAPI.time = SV.server.time;
     SV.server.gameAPI.PlayerPreThink(ent);
     SV.physics.checkVelocity(ent);
-    const movetype = ent.entity.movetype >> 0;
-    if ((movetype === Defs.moveType.MOVETYPE_TOSS) || (movetype === Defs.moveType.MOVETYPE_BOUNCE)) {
+    const movetype = ent.entity!.movetype >> 0;
+    if (movetype === Defs.moveType.MOVETYPE_TOSS || movetype === Defs.moveType.MOVETYPE_BOUNCE) {
       SV.physics.physicsToss(ent);
     } else {
       if (!SV.physics.runThink(ent)) {
@@ -347,21 +362,21 @@ export class ServerClientPhysics {
           // smooth and the next packet will catch up. Running with the
           // last known cmd would add phantom movement, making the
           // remote player appear to move faster than the host.
-          for (const cmd of client.pendingCmds) {
-            client.cmd.set(cmd);
-            this._runSharedPmove(ent, client);
+          for (const cmd of activeClient.pendingCmds) {
+            activeClient.cmd.set(cmd);
+            this._runSharedPmove(ent, activeClient);
           }
-          client.pendingCmds.length = 0;
+          activeClient.pendingCmds.length = 0;
           break;
         case Defs.moveType.MOVETYPE_FLY:
           SV.physics.flyMove(ent, Host.frametime);
           break;
         default:
-          throw new Error('SV.Physics_Client: bad movetype ' + movetype);
+          throw new Error(`SV.Physics_Client: bad movetype ${movetype}`);
       }
     }
     SV.area.linkEdict(ent, true);
-    SV.server.gameAPI.time = SV.server.time;
+    gameAPI.time = SV.server.time;
     SV.server.gameAPI.PlayerPostThink(ent);
   }
 }
diff --git a/source/engine/server/physics/ServerCollision.mjs b/source/engine/server/physics/ServerCollision.ts
similarity index 51%
rename from source/engine/server/physics/ServerCollision.mjs
rename to source/engine/server/physics/ServerCollision.ts
index 7ceec252..5023da89 100644
--- a/source/engine/server/physics/ServerCollision.mjs
+++ b/source/engine/server/physics/ServerCollision.ts
@@ -1,9 +1,12 @@
+import type { Hull } from '../../common/model/BSP.ts';
+import type { ServerEdict } from '../Edict.mjs';
+
 import Vector from '../../../shared/Vector.ts';
 import * as Defs from '../../../shared/Defs.ts';
 import CollisionModelSource, { createRegistryCollisionModelSource } from '../../common/CollisionModelSource.ts';
-import Mod, { BrushModel } from '../../common/Mod.ts';
+import { BrushModel, MeshModel } from '../../common/Mod.ts';
 import { BrushTrace, DIST_EPSILON, Trace as SharedTrace } from '../../common/Pmove.ts';
-import { eventBus, registry } from '../../registry.mjs';
+import { eventBus, getCommonRegistry } from '../../registry.mjs';
 import {
   BrushCollisionState,
   CollisionState,
@@ -13,22 +16,29 @@ import {
   MeshTraceContext,
   MeshTriangle,
   MoveClip,
-} from './ServerCollisionSupport.mjs';
+} from './ServerCollisionSupport.ts';
 import {
   hullPointContents as legacyHullPointContents,
   pointContents as legacyPointContents,
   recursiveHullCheck as legacyRecursiveHullCheck,
-} from './ServerLegacyHullCollision.mjs';
+} from './ServerLegacyHullCollision.ts';
+
+type CollisionModel = BrushModel | MeshModel | object | null;
 
-let { Con, SV } = registry;
+interface StaticWorldSource {
+  readonly worldEntity: ServerEdict | null;
+  readonly worldModel: BrushModel | null;
+}
 
-/** @typedef {import('../Client.mjs').ServerEdict} ServerEdict */
+interface TraceExtents {
+  readonly mins: Vector;
+  readonly maxs: Vector;
+}
 
-/** @typedef {import('../../common/Pmove.ts').Trace} SharedBrushTrace */
+let { Con, SV } = getCommonRegistry();
 
 eventBus.subscribe('registry.frozen', () => {
-  Con = registry.Con;
-  SV = registry.SV;
+  ({ Con, SV } = getCommonRegistry());
 });
 
 /**
@@ -37,60 +47,59 @@ eventBus.subscribe('registry.frozen', () => {
  * falling back to legacy hull traces otherwise.
  */
 export class ServerCollision {
-  static MISSILE_MINS = new Vector(-15.0, -15.0, -15.0);
-  static MISSILE_MAXS = new Vector(15.0, 15.0, 15.0);
+  static readonly MISSILE_MINS = new Vector(-15.0, -15.0, -15.0);
+  static readonly MISSILE_MAXS = new Vector(15.0, 15.0, 15.0);
+
+  private readonly _modelSource: CollisionModelSource;
 
   /**
-   * @param {CollisionModelSource} [modelSource] runtime model resolver
+   * Resolve a collision model by model index from either the active server or
+   * the client precache populated by server signon data.
    */
-  constructor(modelSource = createRegistryCollisionModelSource()) {
+  constructor(modelSource: CollisionModelSource = createRegistryCollisionModelSource()) {
     this._modelSource = modelSource;
   }
 
   /**
    * Resolve a collision model by model index from either the active server or
    * the client precache populated by server signon data.
-   * @param {number} modelIndex precached model index
-   * @returns {BrushModel|object|null} resolved model, if any
    */
-  _getModelByIndex(modelIndex) {
+  _getModelByIndex(modelIndex: number): CollisionModel {
     return this._modelSource.getModelByIndex(modelIndex);
   }
 
   /**
    * Resolve the model used by an entity for collision.
-   * @param {ServerEdict} ent entity being tested
-   * @returns {BrushModel|object|null} collision model, if any
    */
-  _getEntityModel(ent) {
+  _getEntityModel(ent: ServerEdict): CollisionModel {
     if (ent === SV.server?.edicts?.[0]) {
       return this._getStaticWorldSource().worldModel;
     }
 
-    return this._getModelByIndex(ent.entity.modelindex);
+    return this._getModelByIndex(ent.entity!.modelindex);
   }
 
   /**
    * Resolve the collision state used by an entity during tracing.
-   * @param {ServerEdict} ent entity being tested
-   * @returns {CollisionState|null} collision state
    */
-  _getEntityCollisionState(ent) {
-    if (ent.entity.solid === Defs.solid.SOLID_MESH) {
+  _getEntityCollisionState(ent: ServerEdict): CollisionState | null {
+    const entity = ent.entity!;
+
+    if (entity.solid === Defs.solid.SOLID_MESH) {
       const model = this._getEntityModel(ent);
-      return model === null || model === undefined
-        ? null
-        : new MeshCollisionState(ent, model);
+      return this._isMeshModel(model)
+        ? new MeshCollisionState(ent, model)
+        : null;
     }
 
-    if (ent.entity.solid === Defs.solid.SOLID_BSP) {
+    if (entity.solid === Defs.solid.SOLID_BSP) {
       const model = this._getEntityModel(ent);
 
-      if (!(model instanceof BrushModel) || !model.hasBrushData) {
+      if (!this._isBrushModel(model) || !model.hasBrushData) {
         return new HullCollisionState(ent);
       }
 
-      return new BrushCollisionState(ent, model, ent.entity.origin, ent.entity.angles);
+      return new BrushCollisionState(ent, model, entity.origin, entity.angles);
     }
 
     return new HullCollisionState(ent);
@@ -98,19 +107,16 @@ export class ServerCollision {
 
   /**
    * Build a hull fallback state for callers that want a guaranteed collision mode.
-   * @param {ServerEdict} ent entity being tested
-   * @returns {HullCollisionState} hull collision state
    */
-  _getHullFallbackState(ent) {
+  _getHullFallbackState(ent: ServerEdict): HullCollisionState {
     return new HullCollisionState(ent);
   }
 
   /**
    * Resolve the active static-world model for traces that can run on either a
    * local server or a pure client connection.
-   * @returns {{ worldEntity: ServerEdict|null, worldModel: BrushModel|null }} static world source
    */
-  _getStaticWorldSource() {
+  _getStaticWorldSource(): StaticWorldSource {
     return {
       worldEntity: this._modelSource.getWorldEntity(),
       worldModel: this._modelSource.getWorldModel(),
@@ -119,33 +125,54 @@ export class ServerCollision {
 
   /**
    * Convert a shared brush trace result into the server collision trace shape.
-   * @param {import('../../common/Pmove.ts').Trace} brushTrace shared brush trace result
-   * @param {ServerEdict} ent entity that owns the brush model
-   * @returns {CollisionTrace} server collision trace
    */
-  _toServerTrace(brushTrace, ent) {
-    return CollisionTrace.fromSharedTrace(brushTrace, ent);
+  _toServerTrace(brushTrace: SharedTrace, ent: ServerEdict | null): CollisionTrace {
+    if (ent !== null) {
+      return CollisionTrace.fromSharedTrace(brushTrace, ent);
+    }
+
+    const trace = new CollisionTrace(brushTrace.endpos.copy(), {
+      fraction: brushTrace.fraction,
+      allsolid: brushTrace.allsolid,
+      startsolid: brushTrace.startsolid,
+      plane: { normal: brushTrace.plane.normal.copy(), dist: brushTrace.plane.dist },
+      inopen: brushTrace.inopen,
+      inwater: brushTrace.inwater,
+    });
+
+    if (trace.allsolid) {
+      trace.startsolid = true;
+    }
+
+    return trace;
+  }
+
+  /**
+   * Returns true when the provided model is a brush model.
+   */
+  _isBrushModel(model: CollisionModel): model is BrushModel {
+    return model instanceof BrushModel;
+  }
+
+  /**
+   * Returns true when the provided model is a mesh model.
+   */
+  _isMeshModel(model: CollisionModel): model is MeshModel {
+    return model instanceof MeshModel;
   }
 
   /**
-   * @param {Vector} mins minimum extents of the moving box
-   * @param {Vector} maxs maximum extents of the moving box
-   * @returns {boolean} true when the trace is point-sized
+   * Determine whether a trace is point-sized.
    */
-  _isPointTrace(mins, maxs) {
+  _isPointTrace(mins: Vector, maxs: Vector): boolean {
     return mins.isOrigin() && maxs.isOrigin();
   }
 
   /**
    * Emit a developer-only summary for point-trace hits so live repros can
    * distinguish world hull issues from dynamic-entity hits.
-   * @param {CollisionTrace} trace final trace result
-   * @param {Vector} start trace start
-   * @param {Vector} end trace end
-   * @param {Vector} mins trace mins
-   * @param {Vector} maxs trace maxs
    */
-  _debugLogPointTraceHit(trace, start, end, mins, maxs) {
+  _debugLogPointTraceHit(trace: CollisionTrace, start: Vector, end: Vector, mins: Vector, maxs: Vector): void {
     if (!this._isPointTrace(mins, maxs)) {
       return;
     }
@@ -154,14 +181,19 @@ export class ServerCollision {
       return;
     }
 
-    const hitEntity = trace.ent.entity;
+    console.assert(trace.ent.entity !== null, 'point trace hit entity must resolve to a live entity');
+    const hitEntity = trace.ent.entity!;
     const model = this._getEntityModel(trace.ent);
-    const modelName = model && typeof model.name === 'string' ? model.name : '<none>';
+    const modelName = model !== null
+      && typeof model === 'object'
+      && 'name' in model
+      && typeof model.name === 'string'
+      ? model.name
+      : '<none>';
     const classname = typeof hitEntity.classname === 'string' ? hitEntity.classname : '<no classname>';
 
     Con.DPrint(
-      'ServerCollision.move point trace hit '
-      + `ent=${trace.ent.num} classname=${classname} solid=${hitEntity.solid} movetype=${hitEntity.movetype} `
+      `ServerCollision.move point trace hit ent=${trace.ent.num} classname=${classname} solid=${hitEntity.solid} movetype=${hitEntity.movetype} `
       + `modelindex=${hitEntity.modelindex} model=${modelName} fraction=${trace.fraction.toFixed(4)} `
       + `start=(${start[0].toFixed(1)} ${start[1].toFixed(1)} ${start[2].toFixed(1)}) `
       + `end=(${end[0].toFixed(1)} ${end[1].toFixed(1)} ${end[2].toFixed(1)}) `
@@ -172,13 +204,8 @@ export class ServerCollision {
   /**
    * Legacy hull point traces remain the compatibility baseline when brush and
    * hull BSP paths disagree about the first finite hit.
-   * When the brush path reports an earlier finite hit than the legacy hull path,
-   * prefer the later hull impact to avoid terminating on traversal-only planes.
-   * @param {CollisionTrace} brushTrace brush-based trace result
-   * @param {CollisionTrace} hullTrace hull-based trace result
-   * @returns {boolean} true when the hull result should replace the brush result
    */
-  _shouldPreferHullPointTrace(brushTrace, hullTrace) {
+  _shouldPreferHullPointTrace(brushTrace: CollisionTrace, hullTrace: CollisionTrace): boolean {
     if (hullTrace.fraction >= 1.0) {
       return false;
     }
@@ -197,12 +224,8 @@ export class ServerCollision {
   /**
    * Hull fallback is only safe for point traces whose BSP entity is not rotated,
    * because the legacy hull path does not apply entity angles.
-   * @param {BrushCollisionState} state brush collision state
-   * @param {Vector} mins minimum extents of the moving box
-   * @param {Vector} maxs maximum extents of the moving box
-   * @returns {boolean} true when the brush trace can be cross-checked with hulls
    */
-  _canUseHullPointFallback(state, mins, maxs) {
+  _canUseHullPointFallback(state: BrushCollisionState, mins: Vector, maxs: Vector): boolean {
     if (!this._isPointTrace(mins, maxs)) {
       return false;
     }
@@ -217,14 +240,14 @@ export class ServerCollision {
   /**
    * Trace a BSP entity through the shared brush path and cross-check supported
    * point traces against the legacy hull path to avoid false early hits.
-   * @param {BrushCollisionState} state brush collision state
-   * @param {Vector} start world-space start position
-   * @param {Vector} mins minimum extents of the moving box
-   * @param {Vector} maxs maximum extents of the moving box
-   * @param {Vector} end world-space end position
-   * @returns {CollisionTrace} collision result
-   */
-  _clipMoveToBrushStateWithHullFallback(state, start, mins, maxs, end) {
+   */
+  _clipMoveToBrushStateWithHullFallback(
+    state: BrushCollisionState,
+    start: Vector,
+    mins: Vector,
+    maxs: Vector,
+    end: Vector,
+  ): CollisionTrace {
     const brushTrace = this._traceBrushModel(
       state.model,
       start,
@@ -252,16 +275,16 @@ export class ServerCollision {
   /**
    * Run the shared brush trace path for a BSP entity, including zero-length
    * position tests that must avoid swept-trace startsolid artifacts.
-   * @param {BrushModel} model brush collision model
-   * @param {Vector} start world-space start position
-   * @param {Vector} mins box mins
-   * @param {Vector} maxs box maxs
-   * @param {Vector} end world-space end position
-   * @param {Vector} origin entity origin
-   * @param {Vector} angles entity angles
-   * @returns {SharedTrace} shared trace result
-   */
-  _traceBrushModel(model, start, mins, maxs, end, origin, angles) {
+   */
+  _traceBrushModel(
+    model: BrushModel,
+    start: Vector,
+    mins: Vector,
+    maxs: Vector,
+    end: Vector,
+    origin: Vector,
+    angles: Vector,
+  ): SharedTrace {
     if (start.equals(end)) {
       const blocked = !BrushTrace.transformedTestPosition(
         model,
@@ -297,27 +320,15 @@ export class ServerCollision {
 
   /**
    * Trace against an entity through the shared brush path.
-   * @param {BrushCollisionState} state brush collision state
-   * @param {Vector} start world-space start position
-   * @param {Vector} mins minimum extents of the moving box
-   * @param {Vector} maxs maximum extents of the moving box
-   * @param {Vector} end world-space end position
-   * @returns {CollisionTrace} collision result
-   */
-  _clipMoveToBrushState(state, start, mins, maxs, end) {
+   */
+  _clipMoveToBrushState(state: BrushCollisionState, start: Vector, mins: Vector, maxs: Vector, end: Vector): CollisionTrace {
     return this._clipMoveToBrushStateWithHullFallback(state, start, mins, maxs, end);
   }
 
   /**
    * Trace against an entity through the legacy hull path.
-   * @param {HullCollisionState} state hull collision state
-   * @param {Vector} start world-space start position
-   * @param {Vector} mins minimum extents of the moving box
-   * @param {Vector} maxs maximum extents of the moving box
-   * @param {Vector} end world-space end position
-   * @returns {CollisionTrace} collision result
-   */
-  _clipMoveToHullState(state, start, mins, maxs, end) {
+   */
+  _clipMoveToHullState(state: HullCollisionState, start: Vector, mins: Vector, maxs: Vector, end: Vector): CollisionTrace {
     const trace = CollisionTrace.hullInitial(end);
 
     const offset = new Vector();
@@ -325,7 +336,7 @@ export class ServerCollision {
     const startLocal = start.copy().subtract(offset);
     const endLocal = end.copy().subtract(offset);
 
-    this.recursiveHullCheck(hull, hull.firstclipnode, 0.0, 1.0, startLocal, endLocal, trace);
+    this.recursiveHullCheck(hull, hull.firstclipnode ?? 0, 0.0, 1.0, startLocal, endLocal, trace);
 
     if (trace.fraction !== 1.0) {
       trace.endpos.add(offset);
@@ -341,34 +352,24 @@ export class ServerCollision {
   /**
    * Trace a line through a specific legacy hull without exposing clipnode walks
    * to higher-level callers.
-   * @param {*} hull hull to trace against
-   * @param {Vector} start start position in hull space
-   * @param {Vector} end end position in hull space
-   * @returns {CollisionTrace} collision result
    */
-  _traceLegacyHullLine(hull, start, end) {
+  _traceLegacyHullLine(hull: Hull, start: Vector, end: Vector): CollisionTrace {
     const trace = CollisionTrace.hullInitial(end);
-    this.recursiveHullCheck(hull, hull.firstclipnode, 0.0, 1.0, start, end, trace);
+    this.recursiveHullCheck(hull, hull.firstclipnode ?? 0, 0.0, 1.0, start, end, trace);
     return trace;
   }
 
   /**
    * Determines the contents inside a hull by descending the clipnode tree.
-   * @param {*} hull hull data to test against
-   * @param {number} num starting clipnode index
-   * @param {Vector} p point to classify
-   * @returns {number} content type for the point
    */
-  hullPointContents(hull, num, p) {
+  hullPointContents(hull: Hull, num: number, p: Vector): number {
     return legacyHullPointContents(hull, num, p);
   }
 
   /**
    * Normalize static-world contents values so current volumes behave like water.
-   * @param {number} contents raw contents value
-   * @returns {number} normalized static-world contents value
    */
-  _normalizeStaticWorldContents(contents) {
+  _normalizeStaticWorldContents(contents: number): number {
     if ((contents <= Defs.content.CONTENT_CURRENT_0) && (contents >= Defs.content.CONTENT_CURRENT_DOWN)) {
       return Defs.content.CONTENT_WATER;
     }
@@ -379,11 +380,8 @@ export class ServerCollision {
   /**
    * Sample the contents of a brush-backed world without exposing brush internals
    * to higher-level callers.
-   * @param {BrushModel} worldModel brush-backed world model
-   * @param {Vector} point position to sample
-   * @returns {number} world contents value
    */
-  _pointContentsBrushStaticWorld(worldModel, point) {
+  _pointContentsBrushStaticWorld(worldModel: BrushModel, point: Vector): number {
     if (!BrushTrace.transformedTestPosition(
       worldModel,
       point,
@@ -400,21 +398,16 @@ export class ServerCollision {
 
   /**
    * Sample static-world contents using the best collision backend for the
-   * active map. This queries worldspawn only; BSP entities such as doors are
-   * not included here. Hull 0 may dispatch to brush contents when available,
-   * while explicit non-zero hull queries stay on the legacy compatibility path.
-   * @param {Vector} point position to sample
-   * @param {number} [hullNum] explicit world hull index for legacy compatibility
-   * @returns {number} static-world contents value
-   */
-  staticWorldContents(point, hullNum = 0) {
+   * active map.
+   */
+  staticWorldContents(point: Vector, hullNum = 0): number {
     const { worldModel } = this._getStaticWorldSource();
 
     if (worldModel === null) {
       return Defs.content.CONTENT_EMPTY;
     }
 
-    if (hullNum === 0 && worldModel instanceof BrushModel && worldModel.hasBrushData) {
+    if (hullNum === 0 && worldModel.hasBrushData) {
       return this._pointContentsBrushStaticWorld(worldModel, point);
     }
 
@@ -423,47 +416,33 @@ export class ServerCollision {
 
   /**
    * Compatibility alias for staticWorldContents.
-   * @param {Vector} point position to sample
-   * @param {number} [hullNum] explicit world hull index for legacy compatibility
-   * @returns {number} static-world contents value
    */
-  worldContents(point, hullNum = 0) {
+  worldContents(point: Vector, hullNum = 0): number {
     return this.staticWorldContents(point, hullNum);
   }
 
   /**
    * Compatibility alias for staticWorldContents.
-   * @param {Vector} p position to sample
-   * @param {number} [hullNum] explicit world hull index for legacy compatibility
-   * @returns {number} static-world content
    */
-  pointContents(p, hullNum = 0) {
+  pointContents(p: Vector, hullNum = 0): number {
     return this.staticWorldContents(p, hullNum);
   }
 
   /**
    * Trace static-world geometry using the best collision backend for the active
-   * map. This traces worldspawn only; BSP entities such as doors are excluded.
-   * Hull 0 can dispatch to shared brush tracing when brush data is available,
-   * while explicit non-zero hull queries remain on the legacy compatibility path.
-   * @param {Vector} start start position
-   * @param {Vector} mins minimum extents of the moving box
-   * @param {Vector} maxs maximum extents of the moving box
-   * @param {Vector} end end position
-   * @param {number} [hullNum] explicit world hull index for legacy compatibility
-   * @returns {CollisionTrace} collision result against static world geometry
-   */
-  traceStaticWorld(start, mins, maxs, end, hullNum = 0) {
+   * map.
+   */
+  traceStaticWorld(start: Vector, mins: Vector, maxs: Vector, end: Vector, hullNum = 0): CollisionTrace {
     const { worldEntity, worldModel } = this._getStaticWorldSource();
 
     if (worldModel === null) {
       return CollisionTrace.empty(end);
     }
 
-    if (hullNum === 0 && worldModel instanceof BrushModel && worldModel.hasBrushData) {
+    if (hullNum === 0 && worldModel.hasBrushData) {
       return this._toServerTrace(
         this._traceBrushModel(worldModel, start, mins, maxs, end, Vector.origin, Vector.origin),
-        worldEntity ?? /** @type {ServerEdict} */ (null),
+        worldEntity,
       );
     }
 
@@ -484,68 +463,48 @@ export class ServerCollision {
 
   /**
    * Compatibility alias for traceStaticWorld.
-   * @param {Vector} start start position
-   * @param {Vector} mins minimum extents of the moving box
-   * @param {Vector} maxs maximum extents of the moving box
-   * @param {Vector} end end position
-   * @param {number} [hullNum] explicit world hull index for legacy compatibility
-   * @returns {CollisionTrace} collision result against static world geometry
-   */
-  traceWorld(start, mins, maxs, end, hullNum = 0) {
+   */
+  traceWorld(start: Vector, mins: Vector, maxs: Vector, end: Vector, hullNum = 0): CollisionTrace {
     return this.traceStaticWorld(start, mins, maxs, end, hullNum);
   }
 
   /**
    * Trace a point-sized line against the static world.
-   * @param {Vector} start start position
-   * @param {Vector} end end position
-   * @param {number} [hullNum] explicit world hull index for legacy compatibility
-   * @returns {CollisionTrace} collision result against static world geometry
    */
-  traceStaticWorldLine(start, end, hullNum = 0) {
+  traceStaticWorldLine(start: Vector, end: Vector, hullNum = 0): CollisionTrace {
     return this.traceStaticWorld(start, Vector.origin, Vector.origin, end, hullNum);
   }
 
   /**
    * Compatibility alias for traceStaticWorldLine.
-   * @param {Vector} start start position
-   * @param {Vector} end end position
-   * @param {number} [hullNum] explicit world hull index for legacy compatibility
-   * @returns {CollisionTrace} collision result against static world geometry
    */
-  traceWorldLine(start, end, hullNum = 0) {
+  traceWorldLine(start: Vector, end: Vector, hullNum = 0): CollisionTrace {
     return this.traceStaticWorldLine(start, end, hullNum);
   }
 
   /**
    * Recursively tests a swept hull against the world and aggregates the trace result.
-   * @param {*} hull hull to trace against
-   * @param {number} num clipnode index
-   * @param {number} p1f fraction at the start point
-   * @param {number} p2f fraction at the end point
-   * @param {Vector} p1 start point
-   * @param {Vector} p2 end point
-   * @param {CollisionTrace} trace trace accumulator
-   * @param {number} [depth] recursion depth for scratch-vector reuse
-   * @returns {boolean} true if traversal should continue downward
-   */
-  recursiveHullCheck(hull, num, p1f, p2f, p1, p2, trace, depth = 0) {
+   */
+  recursiveHullCheck(
+    hull: Hull,
+    num: number,
+    p1f: number,
+    p2f: number,
+    p1: Vector,
+    p2: Vector,
+    trace: CollisionTrace,
+    depth = 0,
+  ): boolean {
     return legacyRecursiveHullCheck(hull, num, p1f, p2f, p1, p2, trace, depth);
   }
 
   /**
    * Tests whether a point lies inside a triangle using cross-product winding.
-   * @param {Vector} p point to test (should lie on the triangle plane)
-   * @param {Vector} v0 first vertex
-   * @param {Vector} v1 second vertex
-   * @param {Vector} v2 third vertex
-   * @param {Vector} normal unit face normal of the triangle
-   * @returns {boolean} true if the point is inside the triangle
-   */
-  _pointInTriangle(p, v0, v1, v2, normal) {
+   */
+  _pointInTriangle(p: Vector, v0: Vector, v1: Vector, v2: Vector, normal: Vector): boolean {
     // Small negative tolerance closes micro-gaps between adjacent triangles.
     // The cross product magnitude scales with edge length, so for typical
-    // game triangles (edges ~5-50 units) this allows roughly 0.01–0.025 units
+    // game triangles (edges ~5-50 units) this allows roughly 0.01-0.025 units
     // of perpendicular tolerance per edge.
     const EDGE_TOLERANCE = -0.125;
 
@@ -558,14 +517,15 @@ export class ServerCollision {
 
   /**
    * Update a trace with start-solid information for a mesh triangle.
-   * @param {CollisionTrace} trace current trace result
-   * @param {MeshTraceContext} meshTrace mesh tracing context
-   * @param {MeshTriangle} triangle transformed triangle
-   * @param {number} startDistance signed start distance to the expanded plane
-   * @param {number} supportRadius projected box support radius
-   * @param {number} approach rate of approach toward the face
-   */
-  _updateMeshStartSolid(trace, meshTrace, triangle, startDistance, supportRadius, approach) {
+   */
+  _updateMeshStartSolid(
+    trace: CollisionTrace,
+    meshTrace: MeshTraceContext,
+    triangle: MeshTriangle,
+    startDistance: number,
+    supportRadius: number,
+    approach: number,
+  ): void {
     if (startDistance < -supportRadius) {
       return;
     }
@@ -583,13 +543,14 @@ export class ServerCollision {
 
   /**
    * Try to record a nearer face impact from a mesh triangle.
-   * @param {CollisionTrace} trace current trace result
-   * @param {MeshTraceContext} meshTrace mesh tracing context
-   * @param {MeshTriangle} triangle transformed triangle
-   * @param {number} startDistance signed start distance to the expanded plane
-   * @param {number} approach rate of approach toward the face
    */
-  _updateMeshImpact(trace, meshTrace, triangle, startDistance, approach) {
+  _updateMeshImpact(
+    trace: CollisionTrace,
+    meshTrace: MeshTraceContext,
+    triangle: MeshTriangle,
+    startDistance: number,
+    approach: number,
+  ): void {
     if (approach < DIST_EPSILON) {
       return;
     }
@@ -615,25 +576,14 @@ export class ServerCollision {
 
   /**
    * Build a mesh tracing context if the target entity has usable mesh data.
-   * @param {ServerEdict} ent entity to collide with
-   * @param {Vector} start start position
-   * @param {Vector} mins minimum extents of the moving box
-   * @param {Vector} maxs maximum extents of the moving box
-   * @param {Vector} end end position
-   * @returns {MeshTraceContext|null} mesh tracing context, or null when mesh tracing is not available
-   */
-  _createMeshTraceContext(ent, start, mins, maxs, end) {
+   */
+  _createMeshTraceContext(ent: ServerEdict, start: Vector, mins: Vector, maxs: Vector, end: Vector): MeshTraceContext | null {
     const model = this._getEntityModel(ent);
-    if (!model || model.type !== Mod.type.mesh) {
+    if (!this._isMeshModel(model) || model.indices === null || model.vertices === null || model.numTriangles === 0) {
       return null;
     }
 
-    const meshModel = /** @type {import('../../common/model/MeshModel.ts').MeshModel} */ (model);
-    if (!meshModel.indices || !meshModel.vertices || meshModel.numTriangles === 0) {
-      return null;
-    }
-
-    return new MeshTraceContext(ent, meshModel, start, mins, maxs, end);
+    return new MeshTraceContext(ent, model, start, mins, maxs, end);
   }
 
   /**
@@ -641,16 +591,9 @@ export class ServerCollision {
    * Each triangle face is expanded outward by the box's support radius
    * (Minkowski sum) and tested for ray intersection. A DIST_EPSILON push-back
    * keeps the endpoint slightly in front of the surface, preventing the next
-   * frame's trace from starting on or inside the plane (which causes
-   * wall-sticking during slides).
-   * @param {ServerEdict} ent entity to collide with
-   * @param {Vector} start start position
-   * @param {Vector} mins minimum extents of the moving box
-   * @param {Vector} maxs maximum extents of the moving box
-   * @param {Vector} end end position
-   * @returns {CollisionTrace} collision result
-   */
-  clipMoveToMesh(ent, start, mins, maxs, end) {
+   * frame's trace from starting on or inside the plane.
+   */
+  clipMoveToMesh(ent: ServerEdict, start: Vector, mins: Vector, maxs: Vector, end: Vector): CollisionTrace {
     const trace = CollisionTrace.empty(end);
 
     const meshTrace = this._createMeshTraceContext(ent, start, mins, maxs, end);
@@ -658,8 +601,8 @@ export class ServerCollision {
       return trace;
     }
 
-    for (let i = 0; i < meshTrace.model.numTriangles; i++) {
-      const triangle = MeshTriangle.fromMesh(meshTrace, i);
+    for (let index = 0; index < meshTrace.model.numTriangles; index++) {
+      const triangle = MeshTriangle.fromMesh(meshTrace, index);
       if (triangle === null) {
         continue;
       }
@@ -685,14 +628,8 @@ export class ServerCollision {
 
   /**
    * Traces a moving box against a target entity.
-   * @param {ServerEdict} ent entity to collide with
-   * @param {Vector} start start position
-   * @param {Vector} mins minimum extents of the moving box
-   * @param {Vector} maxs maximum extents of the moving box
-   * @param {Vector} end end position
-   * @returns {CollisionTrace} collision result
-   */
-  clipMoveToEntity(ent, start, mins, maxs, end) {
+   */
+  clipMoveToEntity(ent: ServerEdict, start: Vector, mins: Vector, maxs: Vector, end: Vector): CollisionTrace {
     const state = this._getEntityCollisionState(ent) ?? this._getHullFallbackState(ent);
 
     return this._clipMoveToEntityWithState(state, start, mins, maxs, end);
@@ -700,14 +637,8 @@ export class ServerCollision {
 
   /**
    * Trace against a target entity using its pre-resolved collision state.
-   * @param {CollisionState} state collision state
-   * @param {Vector} start start position
-   * @param {Vector} mins minimum extents of the moving box
-   * @param {Vector} maxs maximum extents of the moving box
-   * @param {Vector} end end position
-   * @returns {CollisionTrace} collision result
-   */
-  _clipMoveToEntityWithState(state, start, mins, maxs, end) {
+   */
+  _clipMoveToEntityWithState(state: CollisionState, start: Vector, mins: Vector, maxs: Vector, end: Vector): CollisionTrace {
     if (state instanceof MeshCollisionState) {
       return this.clipMoveToMesh(state.ent, start, mins, maxs, end);
     }
@@ -722,12 +653,9 @@ export class ServerCollision {
   /**
    * Select the extents used to trace against a touched entity.
    * Missiles expand only against monsters.
-   * @param {MoveClip} clip move clip state
-   * @param {ServerEdict} touch touched entity candidate
-   * @returns {{mins: Vector, maxs: Vector}} trace extents for this interaction
    */
-  _getTouchTraceExtents(clip, touch) {
-    if ((touch.entity.flags & Defs.flags.FL_MONSTER) !== 0) {
+  _getTouchTraceExtents(clip: MoveClip, touch: ServerEdict): TraceExtents {
+    if ((touch.entity!.flags & Defs.flags.FL_MONSTER) !== 0) {
       return { mins: clip.mins2, maxs: clip.maxs2 };
     }
 
@@ -736,33 +664,32 @@ export class ServerCollision {
 
   /**
    * Determine whether a touched entity should be skipped before narrow-phase tracing.
-   * @param {MoveClip} clip move clip state
-   * @param {ServerEdict} touch touched entity candidate
-   * @returns {boolean} true when the touched entity should be ignored
    */
-  _shouldSkipTouch(clip, touch) {
+  _shouldSkipTouch(clip: MoveClip, touch: ServerEdict): boolean {
+    const touchEntity = touch.entity!;
+
     if (touch === clip.passedict) {
       return true;
     }
 
-    if (touch.entity.solid === Defs.solid.SOLID_NOT || touch.entity.solid === Defs.solid.SOLID_TRIGGER) {
+    if (touchEntity.solid === Defs.solid.SOLID_NOT || touchEntity.solid === Defs.solid.SOLID_TRIGGER) {
       return true;
     }
 
-    if (clip.type === Defs.moveTypes.MOVE_NOMONSTERS && touch.entity.solid !== Defs.solid.SOLID_BSP) {
+    if (clip.type === Defs.moveTypes.MOVE_NOMONSTERS && touchEntity.solid !== Defs.solid.SOLID_BSP) {
       return true;
     }
 
-    if (clip.passedict && clip.passedict.entity.size[0] && !touch.entity.size[0]) {
+    if (clip.passedict && clip.passedict.entity!.size[0] && !touchEntity.size[0]) {
       return true;
     }
 
     if (clip.passedict) {
-      if (touch.entity.owner && touch.entity.owner.equals(clip.passedict)) {
+      if (touchEntity.owner && touchEntity.owner.equals(clip.passedict)) {
         return true;
       }
 
-      if (clip.passedict.entity.owner && clip.passedict.entity.owner.equals(touch)) {
+      if (clip.passedict.entity!.owner && clip.passedict.entity!.owner.equals(touch)) {
         return true;
       }
     }
@@ -772,28 +699,24 @@ export class ServerCollision {
 
   /**
    * Check whether a touched entity overlaps the clip broadphase box.
-   * @param {MoveClip} clip move clip state
-   * @param {ServerEdict} touch touched entity candidate
-   * @returns {boolean} true when the entity overlaps the broadphase bounds
    */
-  _touchOverlapsClipBounds(clip, touch) {
+  _touchOverlapsClipBounds(clip: MoveClip, touch: ServerEdict): boolean {
+    const touchEntity = touch.entity!;
+
     return !(
-      clip.boxmins[0] > touch.entity.absmax[0]
-      || clip.boxmins[1] > touch.entity.absmax[1]
-      || clip.boxmins[2] > touch.entity.absmax[2]
-      || clip.boxmaxs[0] < touch.entity.absmin[0]
-      || clip.boxmaxs[1] < touch.entity.absmin[1]
-      || clip.boxmaxs[2] < touch.entity.absmin[2]
+      clip.boxmins[0] > touchEntity.absmax[0]
+      || clip.boxmins[1] > touchEntity.absmax[1]
+      || clip.boxmins[2] > touchEntity.absmax[2]
+      || clip.boxmaxs[0] < touchEntity.absmin[0]
+      || clip.boxmaxs[1] < touchEntity.absmin[1]
+      || clip.boxmaxs[2] < touchEntity.absmin[2]
     );
   }
 
   /**
    * Run narrow-phase tracing against a touched entity using the correct extents.
-   * @param {MoveClip} clip move clip state
-   * @param {ServerEdict} touch touched entity candidate
-   * @returns {CollisionTrace} trace result against the entity
    */
-  _traceTouch(clip, touch) {
+  _traceTouch(clip: MoveClip, touch: ServerEdict): CollisionTrace {
     const touchState = this._getEntityCollisionState(touch) ?? this._getHullFallbackState(touch);
     const { mins, maxs } = this._getTouchTraceExtents(clip, touch);
     const trace = this._clipMoveToEntityWithState(touchState, clip.start, mins, maxs, clip.end);
@@ -815,11 +738,8 @@ export class ServerCollision {
 
   /**
    * Replace the current best clip trace when a touched entity produced a nearer hit.
-   * @param {MoveClip} clip move clip state
-   * @param {ServerEdict} touch touched entity candidate
-   * @param {CollisionTrace} trace candidate trace result
    */
-  _updateClipTrace(clip, touch, trace) {
+  _updateClipTrace(clip: MoveClip, touch: ServerEdict, trace: CollisionTrace): void {
     if (trace.allsolid || trace.startsolid || trace.fraction < clip.trace.fraction) {
       trace.ent = touch;
       clip.trace = trace;
@@ -828,31 +748,30 @@ export class ServerCollision {
 
   /**
    * Fill the broadphase AABB used to query touched entities for a trace.
-   * @param {MoveClip} clip move clip state
    */
-  _updateClipBounds(clip) {
-    for (let i = 0; i < 3; i++) {
-      if (clip.end[i] > clip.start[i]) {
-        clip.boxmins[i] = clip.start[i] + clip.mins2[i] - 1.0;
-        clip.boxmaxs[i] = clip.end[i] + clip.maxs2[i] + 1.0;
+  _updateClipBounds(clip: MoveClip): void {
+    for (let index = 0; index < 3; index++) {
+      if (clip.end[index] > clip.start[index]) {
+        clip.boxmins[index] = clip.start[index] + clip.mins2[index] - 1.0;
+        clip.boxmaxs[index] = clip.end[index] + clip.maxs2[index] + 1.0;
       } else {
-        clip.boxmins[i] = clip.end[i] + clip.mins2[i] - 1.0;
-        clip.boxmaxs[i] = clip.start[i] + clip.maxs2[i] + 1.0;
+        clip.boxmins[index] = clip.end[index] + clip.mins2[index] - 1.0;
+        clip.boxmaxs[index] = clip.start[index] + clip.maxs2[index] + 1.0;
       }
     }
   }
 
   /**
    * Build the clip context used to trace a move through the world and dynamic entities.
-   * @param {Vector} start start position
-   * @param {Vector} mins minimum extents of the moving box
-   * @param {Vector} maxs maximum extents of the moving box
-   * @param {Vector} end end position
-   * @param {number} type move type constant from Defs.moveTypes
-   * @param {ServerEdict|null} passedict entity to skip
-   * @returns {MoveClip} initialized move clip context
-   */
-  _createMoveClip(start, mins, maxs, end, type, passedict) {
+   */
+  _createMoveClip(
+    start: Vector,
+    mins: Vector,
+    maxs: Vector,
+    end: Vector,
+    type: number,
+    passedict: ServerEdict | null,
+  ): MoveClip {
     const worldEdict = SV.server.edicts[0];
     const worldState = this._getEntityCollisionState(worldEdict) ?? this._getHullFallbackState(worldEdict);
     const worldTrace = this._clipMoveToEntityWithState(worldState, start, mins, maxs, end);
@@ -886,9 +805,8 @@ export class ServerCollision {
 
   /**
    * Recursively checks the links in the area node BSP for collision.
-   * @param {MoveClip} clip clip data
    */
-  clipToLinks(clip) {
+  clipToLinks(clip: MoveClip): void {
     for (const touch of SV.area.tree.queryAABB(clip.boxmins, clip.boxmaxs)) {
       if (this._shouldSkipTouch(clip, touch)) {
         continue;
@@ -913,15 +831,15 @@ export class ServerCollision {
 
   /**
    * Fully traces a moving box through the world.
-   * @param {Vector} start start position
-   * @param {Vector} mins minimum extents of the moving box
-   * @param {Vector} maxs minimum extents of the moving box
-   * @param {Vector} end end position
-   * @param {Defs.moveTypes} type move type constant from Defs.moveTypes
-   * @param {ServerEdict} passedict entity to skip
-   * @returns {CollisionTrace} collision result
-   */
-  move(start, mins, maxs, end, type, passedict) {
+   */
+  move(
+    start: Vector,
+    mins: Vector,
+    maxs: Vector,
+    end: Vector,
+    type: number,
+    passedict: ServerEdict | null,
+  ): CollisionTrace {
     const clip = this._createMoveClip(start, mins, maxs, end, type, passedict);
 
     this.clipToLinks(clip);
@@ -931,11 +849,10 @@ export class ServerCollision {
 
   /**
    * Tests whether an entity is currently stuck in solid geometry.
-   * @param {ServerEdict} ent entity to test
-   * @returns {boolean} true if the entity is stuck
    */
-  testEntityPosition(ent) {
-    const origin = ent.entity.origin.copy();
-    return this.move(origin, ent.entity.mins, ent.entity.maxs, origin, 0, ent).startsolid;
+  testEntityPosition(ent: ServerEdict): boolean {
+    const entity = ent.entity!;
+    const origin = entity.origin.copy();
+    return this.move(origin, entity.mins, entity.maxs, origin, 0, ent).startsolid;
   }
 }
diff --git a/source/engine/server/physics/ServerCollisionSupport.mjs b/source/engine/server/physics/ServerCollisionSupport.mjs
deleted file mode 100644
index f85704de..00000000
--- a/source/engine/server/physics/ServerCollisionSupport.mjs
+++ /dev/null
@@ -1,336 +0,0 @@
-import Vector from '../../../shared/Vector.ts';
-
-/** @typedef {import('../Client.mjs').ServerEdict} ServerEdict */
-
-export class CollisionState {
-  /**
-   * @param {ServerEdict} ent entity being traced against
-   */
-  constructor(ent) {
-    this.ent = ent;
-  }
-}
-
-export class MeshCollisionState extends CollisionState {
-  /**
-   * @param {ServerEdict} ent entity being traced against
-   * @param {object} model collision model for the mesh entity
-   */
-  constructor(ent, model) {
-    super(ent);
-    this.model = model;
-  }
-}
-
-export class BrushCollisionState extends CollisionState {
-  /**
-   * @param {ServerEdict} ent entity being traced against
-   * @param {import('../../common/Mod.ts').BrushModel} model brush collision model
-   * @param {Vector} origin brush-model origin
-   * @param {Vector} angles brush-model angles
-   */
-  constructor(ent, model, origin, angles) {
-    super(ent);
-    this.model = model;
-    this.origin = origin;
-    this.angles = angles;
-  }
-}
-
-export class HullCollisionState extends CollisionState {
-}
-
-export class MoveClip {
-  /**
-   * @param {CollisionTrace} trace current best trace result
-   * @param {Vector} start world-space trace start
-   * @param {Vector} end world-space trace end
-   * @param {Vector} mins default tracing mins
-   * @param {Vector} mins2 alternate mins used for missile-vs-monster checks
-   * @param {Vector} maxs default tracing maxs
-   * @param {Vector} maxs2 alternate maxs used for missile-vs-monster checks
-   * @param {number} type move type constant from Defs.moveTypes
-   * @param {ServerEdict|null} passedict entity to skip during tracing
-   */
-  constructor(trace, start, end, mins, mins2, maxs, maxs2, type, passedict) {
-    this.trace = trace;
-    this.start = start;
-    this.end = end;
-    this.mins = mins;
-    this.mins2 = mins2;
-    this.maxs = maxs;
-    this.maxs2 = maxs2;
-    this.type = type;
-    this.passedict = passedict;
-    this.boxmins = new Vector();
-    this.boxmaxs = new Vector();
-  }
-}
-
-export class CollisionPlane {
-  /**
-   * @param {Vector} [normal] collision normal
-   * @param {number} [dist] plane distance from origin
-   */
-  constructor(normal = new Vector(), dist = 0.0) {
-    this.normal = normal;
-    this.dist = dist;
-  }
-
-  /**
-   * @param {{normal: Vector, dist: number}} plane source plane
-   * @returns {CollisionPlane} copied collision plane
-   */
-  static fromPlane(plane) {
-    return new CollisionPlane(plane.normal.copy(), plane.dist);
-  }
-}
-
-export class CollisionTrace {
-  /**
-   * @param {Vector} endpos final trace end position
-   * @param {{fraction?: number, allsolid?: boolean, startsolid?: boolean, plane?: CollisionPlane, ent?: ServerEdict|null, inopen?: boolean, inwater?: boolean}} [options] trace initialization options
-   */
-  constructor(endpos, options = {}) {
-    this.fraction = options.fraction ?? 1.0;
-    this.allsolid = options.allsolid ?? false;
-    this.startsolid = options.startsolid ?? false;
-    this.endpos = endpos;
-    this.plane = options.plane ?? new CollisionPlane();
-    this.ent = options.ent ?? null;
-    this.inopen = options.inopen ?? false;
-    this.inwater = options.inwater ?? false;
-  }
-
-  /**
-   * @param {Vector} end end position
-   * @returns {CollisionTrace} empty trace
-   */
-  static empty(end) {
-    return new CollisionTrace(end.copy());
-  }
-
-  /**
-   * @param {Vector} end end position
-   * @returns {CollisionTrace} hull-initialized trace
-   */
-  static hullInitial(end) {
-    return new CollisionTrace(end.copy(), { allsolid: true });
-  }
-
-  /**
-   * @param {import('../../common/Pmove.ts').Trace} brushTrace shared brush trace result
-   * @param {ServerEdict} ent entity that owns the brush model
-   * @returns {CollisionTrace} server collision trace
-   */
-  static fromSharedTrace(brushTrace, ent) {
-    const trace = new CollisionTrace(brushTrace.endpos.copy(), {
-      fraction: brushTrace.fraction,
-      allsolid: brushTrace.allsolid,
-      startsolid: brushTrace.startsolid,
-      plane: CollisionPlane.fromPlane(brushTrace.plane),
-      inopen: brushTrace.inopen,
-      inwater: brushTrace.inwater,
-    });
-
-    if (trace.allsolid) {
-      trace.startsolid = true;
-    }
-
-    if (trace.fraction < 1.0 || trace.startsolid) {
-      trace.ent = ent;
-    }
-
-    return trace;
-  }
-}
-
-export class MeshTraceContext {
-  /** @type {ServerEdict} */
-  ent;
-  /** @type {import('../../common/model/MeshModel.ts').MeshModel} */
-  model;
-  /** @type {Vector} */
-  start;
-  /** @type {Vector} */
-  end;
-  /** @type {Vector} */
-  origin;
-  /** @type {Vector} */
-  moveDir;
-  /** @type {Vector} */
-  startCenter;
-  /** @type {Vector} */
-  boxExtents;
-  /** @type {Vector} */
-  forward;
-  /** @type {Vector} */
-  right;
-  /** @type {Vector} */
-  up;
-
-  /**
-   * @param {ServerEdict} ent entity being traced against
-   * @param {import('../../common/model/MeshModel.ts').MeshModel} model mesh collision model
-   * @param {Vector} start start position
-   * @param {Vector} mins minimum extents of the moving box
-   * @param {Vector} maxs maximum extents of the moving box
-   * @param {Vector} end end position
-   */
-  constructor(ent, model, start, mins, maxs, end) {
-    this.ent = ent;
-    this.model = model;
-    this.start = start;
-    this.end = end;
-    this.origin = ent.entity.origin;
-
-    const mat = ent.entity.angles.toRotationMatrix();
-    this.forward = new Vector(mat[0], mat[1], mat[2]);
-    this.right = new Vector(mat[3], mat[4], mat[5]);
-    this.up = new Vector(mat[6], mat[7], mat[8]);
-    this.moveDir = end.copy().subtract(start);
-    this.boxExtents = maxs.copy().subtract(mins).multiply(0.5);
-    this.startCenter = start.copy().add(mins.copy().add(maxs).multiply(0.5));
-  }
-
-  /**
-   * Transform a model-space vertex into world space.
-   * @param {number} x x component in model space
-   * @param {number} y y component in model space
-   * @param {number} z z component in model space
-   * @returns {Vector} transformed world-space vertex
-   */
-  transformVertex(x, y, z) {
-    return this.origin.copy()
-      .add(this.forward.copy().multiply(x))
-      .add(this.right.copy().multiply(y))
-      .add(this.up.copy().multiply(z));
-  }
-
-  /**
-   * Project a point onto a plane.
-   * @param {Vector} point point to project
-   * @param {Vector} normal plane normal
-   * @param {number} planeDist plane distance from origin
-   * @returns {Vector} projected point on the plane
-   */
-  projectPointOntoPlane(point, normal, planeDist) {
-    const height = normal.dot(point) - planeDist;
-    return new Vector(
-      point[0] - normal[0] * height,
-      point[1] - normal[1] * height,
-      point[2] - normal[2] * height,
-    );
-  }
-
-  /**
-   * Compute the box support radius along a plane normal.
-   * @param {Vector} normal plane normal
-   * @returns {number} support radius along the normal
-   */
-  getBoxSupportRadius(normal) {
-    return this.boxExtents[0] * Math.abs(normal[0])
-      + this.boxExtents[1] * Math.abs(normal[1])
-      + this.boxExtents[2] * Math.abs(normal[2]);
-  }
-
-  /**
-   * Compute the box-center position at a trace fraction.
-   * @param {number} fraction trace fraction
-   * @returns {Vector} center position at the fraction
-   */
-  getCenterAtFraction(fraction) {
-    return new Vector(
-      this.startCenter[0] + this.moveDir[0] * fraction,
-      this.startCenter[1] + this.moveDir[1] * fraction,
-      this.startCenter[2] + this.moveDir[2] * fraction,
-    );
-  }
-
-  /**
-   * Compute the trace endpoint at a trace fraction.
-   * @param {number} fraction trace fraction
-   * @returns {Vector} end position at the fraction
-   */
-  getTraceEndAtFraction(fraction) {
-    return new Vector(
-      this.start[0] + this.moveDir[0] * fraction,
-      this.start[1] + this.moveDir[1] * fraction,
-      this.start[2] + this.moveDir[2] * fraction,
-    );
-  }
-}
-
-export class MeshTriangle {
-  /** @type {Vector} */
-  v0;
-  /** @type {Vector} */
-  v1;
-  /** @type {Vector} */
-  v2;
-  /** @type {Vector} */
-  normal;
-  /** @type {number} */
-  planeDist;
-
-  /**
-   * @param {Vector} v0 first world-space vertex
-   * @param {Vector} v1 second world-space vertex
-   * @param {Vector} v2 third world-space vertex
-   * @param {Vector} normal unit face normal
-   * @param {number} planeDist plane distance from origin
-   */
-  constructor(v0, v1, v2, normal, planeDist) {
-    this.v0 = v0;
-    this.v1 = v1;
-    this.v2 = v2;
-    this.normal = normal;
-    this.planeDist = planeDist;
-  }
-
-  /**
-   * Build a world-space triangle from mesh data.
-   * @param {MeshTraceContext} meshTrace mesh tracing context
-   * @param {number} triangleIndex triangle index within the mesh
-   * @returns {MeshTriangle|null} transformed triangle, or null for degenerate faces
-   */
-  static fromMesh(meshTrace, triangleIndex) {
-    const idx0 = meshTrace.model.indices[triangleIndex * 3];
-    const idx1 = meshTrace.model.indices[triangleIndex * 3 + 1];
-    const idx2 = meshTrace.model.indices[triangleIndex * 3 + 2];
-
-    const v0 = meshTrace.transformVertex(
-      meshTrace.model.vertices[idx0 * 3],
-      meshTrace.model.vertices[idx0 * 3 + 1],
-      meshTrace.model.vertices[idx0 * 3 + 2],
-    );
-    const v1 = meshTrace.transformVertex(
-      meshTrace.model.vertices[idx1 * 3],
-      meshTrace.model.vertices[idx1 * 3 + 1],
-      meshTrace.model.vertices[idx1 * 3 + 2],
-    );
-    const v2 = meshTrace.transformVertex(
-      meshTrace.model.vertices[idx2 * 3],
-      meshTrace.model.vertices[idx2 * 3 + 1],
-      meshTrace.model.vertices[idx2 * 3 + 2],
-    );
-
-    const normal = v1.copy().subtract(v0).cross(v2.copy().subtract(v0));
-    const lenSq = normal.dot(normal);
-    if (lenSq < 1e-12) {
-      return null;
-    }
-
-    normal.multiply(1.0 / Math.sqrt(lenSq));
-    return new MeshTriangle(v0, v1, v2, normal, normal.dot(v0));
-  }
-
-  /**
-   * Compute the approach speed of a sweep against this triangle face.
-   * @param {Vector} moveDir sweep direction in world space
-   * @returns {number} positive when moving toward the front face
-   */
-  getApproach(moveDir) {
-    return -(this.normal[0] * moveDir[0] + this.normal[1] * moveDir[1] + this.normal[2] * moveDir[2]);
-  }
-}
diff --git a/source/engine/server/physics/ServerCollisionSupport.ts b/source/engine/server/physics/ServerCollisionSupport.ts
new file mode 100644
index 00000000..d353ae88
--- /dev/null
+++ b/source/engine/server/physics/ServerCollisionSupport.ts
@@ -0,0 +1,388 @@
+import type { Trace as SharedBrushTrace } from '../../common/Pmove.ts';
+import type { BrushModel } from '../../common/model/BSP.ts';
+import type { MeshModel } from '../../common/model/MeshModel.ts';
+import type { ServerEdict } from '../Edict.mjs';
+
+import Vector from '../../../shared/Vector.ts';
+
+interface CollisionPlaneSource {
+  readonly normal: Vector;
+  readonly dist: number;
+}
+
+interface CollisionTraceOptions {
+  readonly fraction?: number;
+  readonly allsolid?: boolean;
+  readonly startsolid?: boolean;
+  readonly plane?: CollisionPlane;
+  readonly ent?: ServerEdict | null;
+  readonly inopen?: boolean;
+  readonly inwater?: boolean;
+}
+
+export class CollisionState {
+  readonly ent: ServerEdict;
+
+  /**
+   * @param ent Entity being traced against.
+   */
+  constructor(ent: ServerEdict) {
+    this.ent = ent;
+  }
+}
+
+export class MeshCollisionState extends CollisionState {
+  readonly model: MeshModel;
+
+  /**
+   * @param ent Entity being traced against.
+   * @param model Collision model for the mesh entity.
+   */
+  constructor(ent: ServerEdict, model: MeshModel) {
+    super(ent);
+    this.model = model;
+  }
+}
+
+export class BrushCollisionState extends CollisionState {
+  readonly model: BrushModel;
+  readonly origin: Vector;
+  readonly angles: Vector;
+
+  /**
+   * @param ent Entity being traced against.
+   * @param model Brush collision model.
+   * @param origin Brush-model origin.
+   * @param angles Brush-model angles.
+   */
+  constructor(ent: ServerEdict, model: BrushModel, origin: Vector, angles: Vector) {
+    super(ent);
+    this.model = model;
+    this.origin = origin;
+    this.angles = angles;
+  }
+}
+
+export class HullCollisionState extends CollisionState {
+}
+
+export class MoveClip {
+  trace: CollisionTrace;
+  start: Vector;
+  end: Vector;
+  mins: Vector;
+  mins2: Vector;
+  maxs: Vector;
+  maxs2: Vector;
+  type: number;
+  passedict: ServerEdict | null;
+  boxmins: Vector;
+  boxmaxs: Vector;
+
+  /**
+   * @param trace Current best trace result.
+   * @param start World-space trace start.
+   * @param end World-space trace end.
+   * @param mins Default tracing mins.
+   * @param mins2 Alternate mins used for missile-vs-monster checks.
+   * @param maxs Default tracing maxs.
+   * @param maxs2 Alternate maxs used for missile-vs-monster checks.
+   * @param type Move type constant from Defs.moveTypes.
+   * @param passedict Entity to skip during tracing.
+   */
+  constructor(
+    trace: CollisionTrace,
+    start: Vector,
+    end: Vector,
+    mins: Vector,
+    mins2: Vector,
+    maxs: Vector,
+    maxs2: Vector,
+    type: number,
+    passedict: ServerEdict | null,
+  ) {
+    this.trace = trace;
+    this.start = start;
+    this.end = end;
+    this.mins = mins;
+    this.mins2 = mins2;
+    this.maxs = maxs;
+    this.maxs2 = maxs2;
+    this.type = type;
+    this.passedict = passedict;
+    this.boxmins = new Vector();
+    this.boxmaxs = new Vector();
+  }
+}
+
+export class CollisionPlane {
+  normal: Vector;
+  dist: number;
+
+  /**
+   * @param normal Collision normal.
+   * @param dist Plane distance from origin.
+   */
+  constructor(normal: Vector = new Vector(), dist = 0.0) {
+    this.normal = normal;
+    this.dist = dist;
+  }
+
+  /**
+   * @param plane Source plane.
+   * @returns Copied collision plane.
+   */
+  static fromPlane(plane: CollisionPlaneSource): CollisionPlane {
+    return new CollisionPlane(plane.normal.copy(), plane.dist);
+  }
+}
+
+export class CollisionTrace {
+  fraction: number;
+  allsolid: boolean;
+  startsolid: boolean;
+  endpos: Vector;
+  plane: CollisionPlane;
+  ent: ServerEdict | null;
+  inopen: boolean;
+  inwater: boolean;
+
+  /**
+   * @param endpos Final trace end position.
+   * @param options Trace initialization options.
+   */
+  constructor(endpos: Vector, options: CollisionTraceOptions = {}) {
+    this.fraction = options.fraction ?? 1.0;
+    this.allsolid = options.allsolid ?? false;
+    this.startsolid = options.startsolid ?? false;
+    this.endpos = endpos;
+    this.plane = options.plane ?? new CollisionPlane();
+    this.ent = options.ent ?? null;
+    this.inopen = options.inopen ?? false;
+    this.inwater = options.inwater ?? false;
+  }
+
+  /**
+   * @param end End position.
+   * @returns Empty trace.
+   */
+  static empty(end: Vector): CollisionTrace {
+    return new CollisionTrace(end.copy());
+  }
+
+  /**
+   * @param end End position.
+   * @returns Hull-initialized trace.
+   */
+  static hullInitial(end: Vector): CollisionTrace {
+    return new CollisionTrace(end.copy(), { allsolid: true });
+  }
+
+  /**
+   * @param brushTrace Shared brush trace result.
+   * @param ent Entity that owns the brush model.
+   * @returns Server collision trace.
+   */
+  static fromSharedTrace(brushTrace: SharedBrushTrace, ent: ServerEdict): CollisionTrace {
+    const trace = new CollisionTrace(brushTrace.endpos.copy(), {
+      fraction: brushTrace.fraction,
+      allsolid: brushTrace.allsolid,
+      startsolid: brushTrace.startsolid,
+      plane: CollisionPlane.fromPlane(brushTrace.plane),
+      inopen: brushTrace.inopen,
+      inwater: brushTrace.inwater,
+    });
+
+    if (trace.allsolid) {
+      trace.startsolid = true;
+    }
+
+    if (trace.fraction < 1.0 || trace.startsolid) {
+      trace.ent = ent;
+    }
+
+    return trace;
+  }
+}
+
+export class MeshTraceContext {
+  readonly ent: ServerEdict;
+  readonly model: MeshModel;
+  readonly start: Vector;
+  readonly end: Vector;
+  readonly origin: Vector;
+  readonly moveDir: Vector;
+  readonly startCenter: Vector;
+  readonly boxExtents: Vector;
+  readonly forward: Vector;
+  readonly right: Vector;
+  readonly up: Vector;
+
+  /**
+   * @param ent Entity being traced against.
+   * @param model Mesh collision model.
+   * @param start Start position.
+   * @param mins Minimum extents of the moving box.
+   * @param maxs Maximum extents of the moving box.
+   * @param end End position.
+   */
+  constructor(ent: ServerEdict, model: MeshModel, start: Vector, mins: Vector, maxs: Vector, end: Vector) {
+    this.ent = ent;
+    this.model = model;
+    this.start = start;
+    this.end = end;
+    this.origin = ent.entity!.origin;
+
+    const mat = ent.entity!.angles.toRotationMatrix();
+    this.forward = new Vector(mat[0], mat[1], mat[2]);
+    this.right = new Vector(mat[3], mat[4], mat[5]);
+    this.up = new Vector(mat[6], mat[7], mat[8]);
+    this.moveDir = end.copy().subtract(start);
+    this.boxExtents = maxs.copy().subtract(mins).multiply(0.5);
+    this.startCenter = start.copy().add(mins.copy().add(maxs).multiply(0.5));
+  }
+
+  /**
+   * Transform a model-space vertex into world space.
+   * @param x X component in model space.
+   * @param y Y component in model space.
+   * @param z Z component in model space.
+   * @returns Transformed world-space vertex.
+   */
+  transformVertex(x: number, y: number, z: number): Vector {
+    return this.origin.copy()
+      .add(this.forward.copy().multiply(x))
+      .add(this.right.copy().multiply(y))
+      .add(this.up.copy().multiply(z));
+  }
+
+  /**
+   * Project a point onto a plane.
+   * @param point Point to project.
+   * @param normal Plane normal.
+   * @param planeDist Plane distance from origin.
+   * @returns Projected point on the plane.
+   */
+  projectPointOntoPlane(point: Vector, normal: Vector, planeDist: number): Vector {
+    const height = normal.dot(point) - planeDist;
+    return new Vector(
+      point[0] - normal[0] * height,
+      point[1] - normal[1] * height,
+      point[2] - normal[2] * height,
+    );
+  }
+
+  /**
+   * Compute the box support radius along a plane normal.
+   * @param normal Plane normal.
+   * @returns Support radius along the normal.
+   */
+  getBoxSupportRadius(normal: Vector): number {
+    return this.boxExtents[0] * Math.abs(normal[0])
+      + this.boxExtents[1] * Math.abs(normal[1])
+      + this.boxExtents[2] * Math.abs(normal[2]);
+  }
+
+  /**
+   * Compute the box-center position at a trace fraction.
+   * @param fraction Trace fraction.
+   * @returns Center position at the fraction.
+   */
+  getCenterAtFraction(fraction: number): Vector {
+    return new Vector(
+      this.startCenter[0] + this.moveDir[0] * fraction,
+      this.startCenter[1] + this.moveDir[1] * fraction,
+      this.startCenter[2] + this.moveDir[2] * fraction,
+    );
+  }
+
+  /**
+   * Compute the trace endpoint at a trace fraction.
+   * @param fraction Trace fraction.
+   * @returns End position at the fraction.
+   */
+  getTraceEndAtFraction(fraction: number): Vector {
+    return new Vector(
+      this.start[0] + this.moveDir[0] * fraction,
+      this.start[1] + this.moveDir[1] * fraction,
+      this.start[2] + this.moveDir[2] * fraction,
+    );
+  }
+}
+
+export class MeshTriangle {
+  readonly v0: Vector;
+  readonly v1: Vector;
+  readonly v2: Vector;
+  readonly normal: Vector;
+  readonly planeDist: number;
+
+  /**
+   * @param v0 First world-space vertex.
+   * @param v1 Second world-space vertex.
+   * @param v2 Third world-space vertex.
+   * @param normal Unit face normal.
+   * @param planeDist Plane distance from origin.
+   */
+  constructor(v0: Vector, v1: Vector, v2: Vector, normal: Vector, planeDist: number) {
+    this.v0 = v0;
+    this.v1 = v1;
+    this.v2 = v2;
+    this.normal = normal;
+    this.planeDist = planeDist;
+  }
+
+  /**
+   * Build a world-space triangle from mesh data.
+   * @param meshTrace Mesh tracing context.
+   * @param triangleIndex Triangle index within the mesh.
+   * @returns Transformed triangle, or null for degenerate faces.
+   */
+  static fromMesh(meshTrace: MeshTraceContext, triangleIndex: number): MeshTriangle | null {
+    const indices = meshTrace.model.indices;
+    const vertices = meshTrace.model.vertices;
+
+    console.assert(indices !== null && vertices !== null, 'mesh collision model must have vertices and indices');
+
+    const liveIndices = indices!;
+    const liveVertices = vertices!;
+
+    const idx0 = liveIndices[triangleIndex * 3];
+    const idx1 = liveIndices[triangleIndex * 3 + 1];
+    const idx2 = liveIndices[triangleIndex * 3 + 2];
+
+    const v0 = meshTrace.transformVertex(
+      liveVertices[idx0 * 3],
+      liveVertices[idx0 * 3 + 1],
+      liveVertices[idx0 * 3 + 2],
+    );
+    const v1 = meshTrace.transformVertex(
+      liveVertices[idx1 * 3],
+      liveVertices[idx1 * 3 + 1],
+      liveVertices[idx1 * 3 + 2],
+    );
+    const v2 = meshTrace.transformVertex(
+      liveVertices[idx2 * 3],
+      liveVertices[idx2 * 3 + 1],
+      liveVertices[idx2 * 3 + 2],
+    );
+
+    const normal = v1.copy().subtract(v0).cross(v2.copy().subtract(v0));
+    const lenSq = normal.dot(normal);
+    if (lenSq < 1e-12) {
+      return null;
+    }
+
+    normal.multiply(1.0 / Math.sqrt(lenSq));
+    return new MeshTriangle(v0, v1, v2, normal, normal.dot(v0));
+  }
+
+  /**
+   * Compute the approach speed of a sweep against this triangle face.
+   * @param moveDir Sweep direction in world space.
+   * @returns Positive when moving toward the front face.
+   */
+  getApproach(moveDir: Vector): number {
+    return -(this.normal[0] * moveDir[0] + this.normal[1] * moveDir[1] + this.normal[2] * moveDir[2]);
+  }
+}
diff --git a/source/engine/server/physics/ServerLegacyHullCollision.mjs b/source/engine/server/physics/ServerLegacyHullCollision.ts
similarity index 62%
rename from source/engine/server/physics/ServerLegacyHullCollision.mjs
rename to source/engine/server/physics/ServerLegacyHullCollision.ts
index cb5d178f..3a70aff5 100644
--- a/source/engine/server/physics/ServerLegacyHullCollision.mjs
+++ b/source/engine/server/physics/ServerLegacyHullCollision.ts
@@ -1,37 +1,42 @@
+import type { BrushModel, Hull } from '../../common/model/BSP.ts';
+import type { CollisionTrace } from './ServerCollisionSupport.ts';
+
 import Vector from '../../../shared/Vector.ts';
 import * as Defs from '../../../shared/Defs.ts';
 import { DIST_EPSILON } from '../../common/Pmove.ts';
-import { eventBus, registry } from '../../registry.mjs';
+import { eventBus, getCommonRegistry } from '../../registry.mjs';
+
+interface LegacyHull extends Hull {
+  readonly firstclipnode: number;
+  readonly allowedClipNodes?: Uint8Array | null;
+}
 
-let { Con } = registry;
+let { Con } = getCommonRegistry();
 
 eventBus.subscribe('registry.frozen', () => {
-  ({ Con } = registry);
+  ({ Con } = getCommonRegistry());
 });
 
-/** @typedef {import('./ServerCollisionSupport.mjs').CollisionTrace} CollisionTrace */
-/** @typedef {import('../../common/Mod.ts').BrushModel} BrushModel */
-
 /**
  * Check whether a clipnode belongs to the owning legacy hull subtree.
  * BSP29 hull arrays are shared across models, so foreign clipnodes must be
  * ignored to keep world traces from wandering into inline trigger geometry.
- * @param {{allowedClipNodes?: Uint8Array|null}} hull hull descriptor
- * @param {number} num clipnode index
- * @returns {boolean} true when the clipnode belongs to the active hull subtree
+ * @param hull Hull descriptor.
+ * @param num Clipnode index.
+ * @returns True when the clipnode belongs to the active hull subtree.
  */
-export function isHullNodeAllowed(hull, num) {
+export function isHullNodeAllowed(hull: LegacyHull, num: number): boolean {
   const allowedClipNodes = hull.allowedClipNodes;
   return allowedClipNodes === undefined || allowedClipNodes === null || allowedClipNodes[num] === 1;
 }
 
 /**
  * Compute the signed distance from a point to a hull plane.
- * @param {{type: number, dist: number, normal: Vector}} plane hull plane
- * @param {Vector} point point to test
- * @returns {number} signed distance to the plane
+ * @param plane Hull plane.
+ * @param point Point to test.
+ * @returns Signed distance to the plane.
  */
-export function getHullPlaneDistance(plane, point) {
+export function getHullPlaneDistance(plane: Hull['planes'][number], point: Vector): number {
   if (plane.type < 3) {
     return point[plane.type] - plane.dist;
   }
@@ -41,11 +46,11 @@ export function getHullPlaneDistance(plane, point) {
 
 /**
  * Update trace state after reaching a terminal hull leaf.
- * @param {number} contents terminal hull contents value
- * @param {CollisionTrace} trace trace accumulator
- * @returns {boolean} true when traversal should continue upward
+ * @param contents Terminal hull contents value.
+ * @param trace Trace accumulator.
+ * @returns True when traversal should continue upward.
  */
-export function classifyHullLeaf(contents, trace) {
+export function classifyHullLeaf(contents: number, trace: CollisionTrace): boolean {
   if (contents !== Defs.content.CONTENT_SOLID) {
     trace.allsolid = false;
     if (contents === Defs.content.CONTENT_EMPTY) {
@@ -62,20 +67,20 @@ export function classifyHullLeaf(contents, trace) {
 
 /**
  * Determines the contents inside a hull by descending the clipnode tree.
- * @param {*} hull hull data to test against
- * @param {number} num starting clipnode index
- * @param {Vector} p point to classify
- * @returns {number} content type for the point
+ * @param hull Hull data to test against.
+ * @param num Starting clipnode index.
+ * @param p Point to classify.
+ * @returns Content type for the point.
  */
-export function hullPointContents(hull, num, p) {
+export function hullPointContents(hull: LegacyHull, num: number, p: Vector): number {
   while (num >= 0) {
     if (!isHullNodeAllowed(hull, num)) {
       return Defs.content.CONTENT_EMPTY;
     }
 
     console.assert(num >= hull.firstclipnode && num <= hull.lastclipnode, 'valid node number', num);
-    const node = hull.clipnodes[num];
-    const plane = hull.planes[node.planenum];
+    const node = hull.clipnodes[num]!;
+    const plane = hull.planes[node.planenum]!;
     const d = getHullPlaneDistance(plane, p);
 
     if (d < 0) {
@@ -90,13 +95,13 @@ export function hullPointContents(hull, num, p) {
 
 /**
  * Returns the contents at the specified world position.
- * @param {BrushModel} worldmodel world model that owns hull 0
- * @param {Vector} p position to sample
- * @returns {number} world content
+ * @param worldmodel World model that owns hull 0.
+ * @param p Position to sample.
+ * @returns World content.
  */
-export function pointContents(worldmodel, p) {
-  const cont = hullPointContents(worldmodel.hulls[0], 0, p);
-  if ((cont <= Defs.content.CONTENT_CURRENT_0) && (cont >= Defs.content.CONTENT_CURRENT_DOWN)) {
+export function pointContents(worldmodel: BrushModel, p: Vector): number {
+  const cont = hullPointContents(worldmodel.hulls[0] as LegacyHull, 0, p);
+  if (cont <= Defs.content.CONTENT_CURRENT_0 && cont >= Defs.content.CONTENT_CURRENT_DOWN) {
     return Defs.content.CONTENT_WATER;
   }
   return cont;
@@ -104,17 +109,26 @@ export function pointContents(worldmodel, p) {
 
 /**
  * Recursively tests a swept hull against the world and aggregates the trace result.
- * @param {*} hull hull to trace against
- * @param {number} num clipnode index
- * @param {number} p1f fraction at the start point
- * @param {number} p2f fraction at the end point
- * @param {Vector} p1 start point
- * @param {Vector} p2 end point
- * @param {CollisionTrace} trace trace accumulator
- * @param {number} [depth] recursion depth reserved for API compatibility
- * @returns {boolean} true if traversal should continue downward
+ * @param hull Hull to trace against.
+ * @param num Clipnode index.
+ * @param p1f Fraction at the start point.
+ * @param p2f Fraction at the end point.
+ * @param p1 Start point.
+ * @param p2 End point.
+ * @param trace Trace accumulator.
+ * @param depth Recursion depth reserved for API compatibility.
+ * @returns True if traversal should continue downward.
  */
-export function recursiveHullCheck(hull, num, p1f, p2f, p1, p2, trace, depth = 0) {
+export function recursiveHullCheck(
+  hull: LegacyHull,
+  num: number,
+  p1f: number,
+  p2f: number,
+  p1: Vector,
+  p2: Vector,
+  trace: CollisionTrace,
+  depth = 0,
+): boolean {
   void depth;
 
   if (trace.fraction <= p1f) {
@@ -131,8 +145,8 @@ export function recursiveHullCheck(hull, num, p1f, p2f, p1, p2, trace, depth = 0
 
   console.assert(num >= hull.firstclipnode && num <= hull.lastclipnode, 'valid node number', num);
 
-  const node = hull.clipnodes[num];
-  const plane = hull.planes[node.planenum];
+  const node = hull.clipnodes[num]!;
+  const plane = hull.planes[node.planenum]!;
   const t1 = getHullPlaneDistance(plane, p1);
   const t2 = getHullPlaneDistance(plane, p2);
 
diff --git a/source/engine/server/physics/ServerMovement.mjs b/source/engine/server/physics/ServerMovement.mjs
deleted file mode 100644
index 3521c517..00000000
--- a/source/engine/server/physics/ServerMovement.mjs
+++ /dev/null
@@ -1,333 +0,0 @@
-import Vector from '../../../shared/Vector.ts';
-import * as Defs from '../../../shared/Defs.ts';
-import { STEPSIZE } from '../../common/Pmove.ts';
-import { ServerEdict } from '../Edict.mjs';
-import { eventBus, registry } from '../../registry.mjs';
-
-let { SV } = registry;
-
-eventBus.subscribe('registry.frozen', () => {
-  SV = registry.SV;
-});
-
-/**
- * Everything related to moving entities around.
- */
-export class ServerMovement {
-  constructor() {
-  }
-
-  /**
-   * Checks if an entity has solid ground beneath all four bottom corners.
-   * If all corners are solid, returns true immediately. Otherwise performs
-   * a more detailed trace check to validate the ground surface.
-   * @param {import('../Edict.mjs').ServerEdict} ent entity to check
-   * @returns {boolean} true if entity has solid ground beneath it
-   */
-  checkBottom(ent) {
-    const mins = ent.entity.origin.copy().add(ent.entity.mins);
-    const maxs = ent.entity.origin.copy().add(ent.entity.maxs);
-
-    // Quick check: if all four corners are solid, we're definitely on ground
-    const allCornersSolid =
-      SV.collision.pointContents(new Vector(mins[0], mins[1], mins[2] - 1.0)) === Defs.content.CONTENT_SOLID &&
-      SV.collision.pointContents(new Vector(mins[0], maxs[1], mins[2] - 1.0)) === Defs.content.CONTENT_SOLID &&
-      SV.collision.pointContents(new Vector(maxs[0], mins[1], mins[2] - 1.0)) === Defs.content.CONTENT_SOLID &&
-      SV.collision.pointContents(new Vector(maxs[0], maxs[1], mins[2] - 1.0)) === Defs.content.CONTENT_SOLID;
-
-    if (allCornersSolid) {
-      return true;
-    }
-
-    // Not all corners solid - do detailed trace check
-    const start = ent.entity.origin.copy().add(new Vector(0.0, 0.0, ent.entity.mins[2] + 1.0));
-    const stop = start.copy().add(new Vector(0.0, 0.0, -2.0 * STEPSIZE));
-
-    let trace = SV.collision.move(start, Vector.origin, Vector.origin, stop, Defs.moveTypes.MOVE_NOMONSTERS, ent);
-    if (trace.fraction === 1.0) {
-      return false;
-    }
-    let bottom = trace.endpos[2];
-    const mid = bottom;
-    for (let x = 0; x <= 1; x++) {
-      for (let y = 0; y <= 1; y++) {
-        start[0] = stop[0] = (x !== 0) ? maxs[0] : mins[0];
-        start[1] = stop[1] = (y !== 0) ? maxs[1] : mins[1];
-        trace = SV.collision.move(start, Vector.origin, Vector.origin, stop, Defs.moveTypes.MOVE_NOMONSTERS, ent);
-        if ((trace.fraction !== 1.0) && (trace.endpos[2] > bottom)) {
-          bottom = trace.endpos[2];
-        }
-        if ((trace.fraction === 1.0) || ((mid - trace.endpos[2]) > STEPSIZE)) {
-          return false;
-        }
-      }
-    }
-    return true;
-  }
-
-  movestep(ent, move, relink) {
-    const oldorg = ent.entity.origin.copy();
-    const mins = ent.entity.mins;
-    const maxs = ent.entity.maxs;
-    if ((ent.entity.flags & (Defs.flags.FL_SWIM | Defs.flags.FL_FLY)) !== 0) {
-      const enemy = ent.entity.enemy;
-      const neworg = new Vector();
-      for (let i = 0; i <= 1; i++) {
-        const origin = ent.entity.origin.copy();
-        neworg[0] = origin[0] + move[0];
-        neworg[1] = origin[1] + move[1];
-        neworg[2] = origin[2];
-        if (i === 0 && enemy) {
-          const enemyEntity = enemy instanceof ServerEdict ? enemy.entity : enemy;
-          const dz = ent.entity.origin[2] - enemyEntity.origin[2];
-          if (dz > 40.0) {
-            neworg[2] -= 8.0;
-          } else if (dz < 30.0) {
-            neworg[2] += 8.0;
-          }
-        }
-        const trace = SV.collision.move(ent.entity.origin, mins, maxs, neworg, Defs.moveTypes.MOVE_NORMAL, ent);
-        if (trace.fraction === 1.0) {
-          if (((ent.entity.flags & Defs.flags.FL_SWIM) !== 0) && (SV.collision.pointContents(trace.endpos) === Defs.content.CONTENT_EMPTY)) {
-            return false;
-          }
-          ent.entity.origin = trace.endpos.copy();
-          if (relink) {
-            SV.area.linkEdict(ent, true);
-          }
-          return true;
-        }
-        if (!enemy) {
-          return false;
-        }
-      }
-      return false;
-    }
-    const neworg = ent.entity.origin.copy();
-    neworg[0] += move[0];
-    neworg[1] += move[1];
-    neworg[2] += STEPSIZE;
-    const end = neworg.copy();
-    end[2] -= STEPSIZE * 2.0;
-    let trace = SV.collision.move(neworg, mins, maxs, end, Defs.moveTypes.MOVE_NORMAL, ent);
-    if (trace.allsolid === true) {
-      return false;
-    }
-    if (trace.startsolid === true) {
-      neworg[2] -= STEPSIZE;
-      trace = SV.collision.move(neworg, mins, maxs, end, Defs.moveTypes.MOVE_NORMAL, ent);
-      if ((trace.allsolid === true) || (trace.startsolid === true)) {
-        return false;
-      }
-    }
-    if (trace.fraction === 1.0) {
-      if ((ent.entity.flags & Defs.flags.FL_PARTIALGROUND) !== 0) {
-        const fallback = ent.entity.origin.copy();
-        fallback[0] += move[0];
-        fallback[1] += move[1];
-        ent.entity.origin = fallback;
-        if (relink) {
-          SV.area.linkEdict(ent, true);
-        }
-        ent.entity.flags &= (~Defs.flags.FL_ONGROUND);
-        return true;
-      }
-      return false;
-    }
-    ent.entity.origin = trace.endpos.copy();
-    if (!this.checkBottom(ent)) {
-      if ((ent.entity.flags & Defs.flags.FL_PARTIALGROUND) !== 0) {
-        if (relink) {
-          SV.area.linkEdict(ent, true);
-        }
-        return true;
-      }
-      ent.entity.origin = ent.entity.origin.set(oldorg);
-      return false;
-    }
-    ent.entity.flags &= ~Defs.flags.FL_PARTIALGROUND;
-    ent.entity.groundentity = trace.ent.entity;
-    if (relink) {
-      SV.area.linkEdict(ent, true);
-    }
-    return true;
-  }
-
-  walkMove(ent, yaw, dist) {
-    if ((ent.entity.flags & (Defs.flags.FL_ONGROUND | Defs.flags.FL_FLY | Defs.flags.FL_SWIM)) === 0) {
-      return false;
-    }
-
-    const radians = yaw * (Math.PI / 180.0);
-    return this.movestep(ent, new Vector(Math.cos(radians) * dist, Math.sin(radians) * dist, 0.0), true);
-  }
-
-  moveToGoal(ent, dist, target = null) {
-
-    if ((ent.entity.flags & (Defs.flags.FL_ONGROUND | Defs.flags.FL_FLY | Defs.flags.FL_SWIM)) === 0) {
-      return false;
-    }
-
-    const resolveEdict = (value) => {
-      if (!value) {
-        return null;
-      }
-      if (value instanceof ServerEdict) {
-        return value;
-      }
-      return value.edict || null;
-    };
-
-    const goalEdict = resolveEdict(ent.entity.goalentity);
-    const enemyEdict = resolveEdict(ent.entity.enemy);
-
-    console.assert(goalEdict !== null, 'must have goal for moveToGoal');
-
-    const goalTarget = target ?? goalEdict.entity.origin;
-
-    if (enemyEdict !== null && !enemyEdict.isWorld() && this.closeEnough(ent, goalEdict, dist)) {
-      return false;
-    }
-
-    // TODO: consider reintroducing direct movestep steering toward goal to reduce chase ping-pong.
-    if (Math.random() >= 0.75 || !this.stepDirection(ent, ent.entity.ideal_yaw, dist)) {
-      this.newChaseDir(ent, goalTarget, dist);
-      return true;
-    }
-
-    return false;
-  }
-
-  changeYaw(edict) {
-    const angle1 = edict.entity.angles[1];
-    const current = Vector.anglemod(angle1);
-    const ideal = edict.entity.ideal_yaw;
-
-    if (current === ideal) {
-      return angle1;
-    }
-
-    let move = ideal - current;
-
-    if (ideal > current) {
-      if (move >= 180.0) {
-        move -= 360.0;
-      }
-    } else if (move <= -180.0) {
-      move += 360.0;
-    }
-
-    const speed = edict.entity.yaw_speed || 0;
-
-    if (move > 0.0) {
-      if (move > speed) {
-        move = speed;
-      }
-    } else if (move < -speed) {
-      move = -speed;
-    }
-
-    return Vector.anglemod(current + move);
-  }
-
-  stepDirection(ent, yaw, dist) {
-    ent.entity.ideal_yaw = yaw;
-    ent.entity.angles = new Vector(ent.entity.angles[0], this.changeYaw(ent), ent.entity.angles[2]);
-    const radians = yaw * (Math.PI / 180.0);
-    const oldorigin = ent.entity.origin.copy();
-    if (this.movestep(ent, new Vector(Math.cos(radians) * dist, Math.sin(radians) * dist, 0.0), false)) {
-      const delta = ent.entity.angles[1] - ent.entity.ideal_yaw;
-      if ((delta > 45.0) && (delta < 315.0)) {
-        ent.entity.origin = ent.entity.origin.set(oldorigin);
-      }
-      SV.area.linkEdict(ent, true);
-      return true;
-    }
-    SV.area.linkEdict(ent, true);
-    return false;
-  }
-
-  newChaseDir(actor, endpos, dist) {
-    const olddir = Vector.anglemod(((actor.entity.ideal_yaw / 45.0) >> 0) * 45.0);
-    const turnaround = Vector.anglemod(olddir - 180.0);
-    const deltax = endpos[0] - actor.entity.origin[0];
-    const deltay = endpos[1] - actor.entity.origin[1];
-    let dx;
-    let dy;
-    if (deltax > 10.0) {
-      dx = 0.0;
-    } else if (deltax < -10.0) {
-      dx = 180.0;
-    } else {
-      dx = -1;
-    }
-    if (deltay < -10.0) {
-      dy = 270.0;
-    } else if (deltay > 10.0) {
-      dy = 90.0;
-    } else {
-      dy = -1;
-    }
-    let tdir;
-    if ((dx !== -1) && (dy !== -1)) {
-      if (dx === 0.0) {
-        tdir = (dy === 90.0) ? 45.0 : 315.0;
-      } else {
-        tdir = (dy === 90.0) ? 135.0 : 215.0;
-      }
-      if ((tdir !== turnaround) && this.stepDirection(actor, tdir, dist)) {
-        return;
-      }
-    }
-    if ((Math.random() >= 0.25) || (Math.abs(deltay) > Math.abs(deltax))) {
-      tdir = dx;
-      dx = dy;
-      dy = tdir;
-    }
-    if ((dx !== -1) && (dx !== turnaround) && this.stepDirection(actor, dx, dist)) {
-      return;
-    }
-    if ((dy !== -1) && (dy !== turnaround) && this.stepDirection(actor, dy, dist)) {
-      return;
-    }
-    if ((olddir !== -1) && this.stepDirection(actor, olddir, dist)) {
-      return;
-    }
-    if (Math.random() >= 0.5) {
-      for (tdir = 0.0; tdir <= 315.0; tdir += 45.0) {
-        if ((tdir !== turnaround) && this.stepDirection(actor, tdir, dist)) {
-          return;
-        }
-      }
-    } else {
-      for (tdir = 315.0; tdir >= 0.0; tdir -= 45.0) {
-        if ((tdir !== turnaround) && this.stepDirection(actor, tdir, dist)) {
-          return;
-        }
-      }
-    }
-    if ((turnaround !== -1) && this.stepDirection(actor, turnaround, dist)) {
-      return;
-    }
-    actor.entity.ideal_yaw = olddir;
-    if (!this.checkBottom(actor)) {
-      actor.entity.flags |= Defs.flags.FL_PARTIALGROUND;
-    }
-  }
-
-  closeEnough(ent, goal, dist) {
-    const absmin = ent.entity.absmin;
-    const absmax = ent.entity.absmax;
-    const absminGoal = goal.entity.absmin;
-    const absmaxGoal = goal.entity.absmax;
-    for (let i = 0; i < 3; i++) {
-      if (absminGoal[i] > (absmax[i] + dist)) {
-        return false;
-      }
-      if (absmaxGoal[i] < (absmin[i] - dist)) {
-        return false;
-      }
-    }
-    return true;
-  }
-};
diff --git a/source/engine/server/physics/ServerMovement.ts b/source/engine/server/physics/ServerMovement.ts
new file mode 100644
index 00000000..f4db502b
--- /dev/null
+++ b/source/engine/server/physics/ServerMovement.ts
@@ -0,0 +1,369 @@
+import type BaseEntity from '../../../game/id1/entity/BaseEntity.mjs';
+import type { ServerEdict } from '../Edict.mjs';
+
+import Vector from '../../../shared/Vector.ts';
+import * as Defs from '../../../shared/Defs.ts';
+import { STEPSIZE } from '../../common/Pmove.ts';
+import { eventBus, getCommonRegistry } from '../../registry.mjs';
+
+interface EdictReferenceLike {
+  readonly edict?: ServerEdict | null;
+}
+
+let { SV } = getCommonRegistry();
+
+eventBus.subscribe('registry.frozen', () => {
+  ({ SV } = getCommonRegistry());
+});
+
+/**
+ * Everything related to moving entities around.
+ */
+export class ServerMovement {
+  /**
+   * Checks if an entity has solid ground beneath all four bottom corners.
+   * If all corners are solid, returns true immediately. Otherwise performs
+   * a more detailed trace check to validate the ground surface.
+   * @param ent Entity to check.
+   * @returns True if entity has solid ground beneath it.
+   */
+  checkBottom(ent: ServerEdict): boolean {
+    const entity = ent.entity!;
+    const mins = entity.origin.copy().add(entity.mins);
+    const maxs = entity.origin.copy().add(entity.maxs);
+
+    // Quick check: if all four corners are solid, we're definitely on ground
+    const allCornersSolid =
+      SV.collision.pointContents(new Vector(mins[0], mins[1], mins[2] - 1.0)) === Defs.content.CONTENT_SOLID &&
+      SV.collision.pointContents(new Vector(mins[0], maxs[1], mins[2] - 1.0)) === Defs.content.CONTENT_SOLID &&
+      SV.collision.pointContents(new Vector(maxs[0], mins[1], mins[2] - 1.0)) === Defs.content.CONTENT_SOLID &&
+      SV.collision.pointContents(new Vector(maxs[0], maxs[1], mins[2] - 1.0)) === Defs.content.CONTENT_SOLID;
+
+    if (allCornersSolid) {
+      return true;
+    }
+
+    // Not all corners solid - do detailed trace check
+    const start = entity.origin.copy().add(new Vector(0.0, 0.0, entity.mins[2] + 1.0));
+    const stop = start.copy().add(new Vector(0.0, 0.0, -2.0 * STEPSIZE));
+
+    let trace = SV.collision.move(start, Vector.origin, Vector.origin, stop, Defs.moveTypes.MOVE_NOMONSTERS, ent);
+    if (trace.fraction === 1.0) {
+      return false;
+    }
+
+    let bottom = trace.endpos[2];
+    const mid = bottom;
+    for (let x = 0; x <= 1; x++) {
+      for (let y = 0; y <= 1; y++) {
+        start[0] = stop[0] = x !== 0 ? maxs[0] : mins[0];
+        start[1] = stop[1] = y !== 0 ? maxs[1] : mins[1];
+        trace = SV.collision.move(start, Vector.origin, Vector.origin, stop, Defs.moveTypes.MOVE_NOMONSTERS, ent);
+        if (trace.fraction !== 1.0 && trace.endpos[2] > bottom) {
+          bottom = trace.endpos[2];
+        }
+        if (trace.fraction === 1.0 || (mid - trace.endpos[2]) > STEPSIZE) {
+          return false;
+        }
+      }
+    }
+
+    return true;
+  }
+
+  movestep(ent: ServerEdict, move: Vector, relink: boolean): boolean {
+    const entity = ent.entity!;
+    const oldorg = entity.origin.copy();
+    const mins = entity.mins;
+    const maxs = entity.maxs;
+
+    if ((entity.flags & (Defs.flags.FL_SWIM | Defs.flags.FL_FLY)) !== 0) {
+      const enemy = entity.enemy;
+      const neworg = new Vector();
+      for (let index = 0; index <= 1; index++) {
+        const origin = entity.origin.copy();
+        neworg[0] = origin[0] + move[0];
+        neworg[1] = origin[1] + move[1];
+        neworg[2] = origin[2];
+        if (index === 0 && enemy) {
+          const enemyEntity = this.#resolveEntity(enemy);
+          console.assert(enemyEntity !== null, 'enemy must resolve to an entity when steering swim/fly movement');
+
+          const dz = entity.origin[2] - enemyEntity!.origin[2];
+          if (dz > 40.0) {
+            neworg[2] -= 8.0;
+          } else if (dz < 30.0) {
+            neworg[2] += 8.0;
+          }
+        }
+        const trace = SV.collision.move(entity.origin, mins, maxs, neworg, Defs.moveTypes.MOVE_NORMAL, ent);
+        if (trace.fraction === 1.0) {
+          if ((entity.flags & Defs.flags.FL_SWIM) !== 0 && SV.collision.pointContents(trace.endpos) === Defs.content.CONTENT_EMPTY) {
+            return false;
+          }
+          entity.origin = trace.endpos.copy();
+          if (relink) {
+            SV.area.linkEdict(ent, true);
+          }
+          return true;
+        }
+        if (!enemy) {
+          return false;
+        }
+      }
+      return false;
+    }
+
+    const neworg = entity.origin.copy();
+    neworg[0] += move[0];
+    neworg[1] += move[1];
+    neworg[2] += STEPSIZE;
+    const end = neworg.copy();
+    end[2] -= STEPSIZE * 2.0;
+    let trace = SV.collision.move(neworg, mins, maxs, end, Defs.moveTypes.MOVE_NORMAL, ent);
+    if (trace.allsolid === true) {
+      return false;
+    }
+    if (trace.startsolid === true) {
+      neworg[2] -= STEPSIZE;
+      trace = SV.collision.move(neworg, mins, maxs, end, Defs.moveTypes.MOVE_NORMAL, ent);
+      if (trace.allsolid === true || trace.startsolid === true) {
+        return false;
+      }
+    }
+    if (trace.fraction === 1.0) {
+      if ((entity.flags & Defs.flags.FL_PARTIALGROUND) !== 0) {
+        const fallback = entity.origin.copy();
+        fallback[0] += move[0];
+        fallback[1] += move[1];
+        entity.origin = fallback;
+        if (relink) {
+          SV.area.linkEdict(ent, true);
+        }
+        entity.flags &= ~Defs.flags.FL_ONGROUND;
+        return true;
+      }
+      return false;
+    }
+    entity.origin = trace.endpos.copy();
+    if (!this.checkBottom(ent)) {
+      if ((entity.flags & Defs.flags.FL_PARTIALGROUND) !== 0) {
+        if (relink) {
+          SV.area.linkEdict(ent, true);
+        }
+        return true;
+      }
+      entity.origin = entity.origin.set(oldorg);
+      return false;
+    }
+    console.assert(trace.ent !== null, 'ground trace must have an entity when movestep succeeds');
+    entity.flags &= ~Defs.flags.FL_PARTIALGROUND;
+    entity.groundentity = trace.ent!.entity;
+    if (relink) {
+      SV.area.linkEdict(ent, true);
+    }
+    return true;
+  }
+
+  walkMove(ent: ServerEdict, yaw: number, dist: number): boolean {
+    const entity = ent.entity!;
+
+    if ((entity.flags & (Defs.flags.FL_ONGROUND | Defs.flags.FL_FLY | Defs.flags.FL_SWIM)) === 0) {
+      return false;
+    }
+
+    const radians = yaw * (Math.PI / 180.0);
+    return this.movestep(ent, new Vector(Math.cos(radians) * dist, Math.sin(radians) * dist, 0.0), true);
+  }
+
+  moveToGoal(ent: ServerEdict, dist: number, target: Vector | null = null): boolean {
+    const entity = ent.entity!;
+
+    if ((entity.flags & (Defs.flags.FL_ONGROUND | Defs.flags.FL_FLY | Defs.flags.FL_SWIM)) === 0) {
+      return false;
+    }
+
+    const goalEdict = this.#resolveEdict(entity.goalentity);
+    const enemyEdict = this.#resolveEdict(entity.enemy);
+
+    console.assert(goalEdict !== null, 'must have goal for moveToGoal');
+
+    const goalTarget = target ?? goalEdict!.entity!.origin;
+
+    if (enemyEdict !== null && !enemyEdict.isWorld() && this.closeEnough(ent, goalEdict!, dist)) {
+      return false;
+    }
+
+    // TODO: consider reintroducing direct movestep steering toward goal to reduce chase ping-pong.
+    if (Math.random() >= 0.75 || !this.stepDirection(ent, entity.ideal_yaw, dist)) {
+      this.newChaseDir(ent, goalTarget, dist);
+      return true;
+    }
+
+    return false;
+  }
+
+  changeYaw(edict: ServerEdict): number {
+    const entity = edict.entity!;
+    const angle1 = entity.angles[1];
+    const current = Vector.anglemod(angle1);
+    const ideal = entity.ideal_yaw;
+
+    if (current === ideal) {
+      return angle1;
+    }
+
+    let move = ideal - current;
+
+    if (ideal > current) {
+      if (move >= 180.0) {
+        move -= 360.0;
+      }
+    } else if (move <= -180.0) {
+      move += 360.0;
+    }
+
+    const speed = entity.yaw_speed || 0;
+
+    if (move > 0.0) {
+      if (move > speed) {
+        move = speed;
+      }
+    } else if (move < -speed) {
+      move = -speed;
+    }
+
+    return Vector.anglemod(current + move);
+  }
+
+  stepDirection(ent: ServerEdict, yaw: number, dist: number): boolean {
+    const entity = ent.entity!;
+
+    entity.ideal_yaw = yaw;
+    entity.angles = new Vector(entity.angles[0], this.changeYaw(ent), entity.angles[2]);
+    const radians = yaw * (Math.PI / 180.0);
+    const oldorigin = entity.origin.copy();
+    if (this.movestep(ent, new Vector(Math.cos(radians) * dist, Math.sin(radians) * dist, 0.0), false)) {
+      const delta = entity.angles[1] - entity.ideal_yaw;
+      if (delta > 45.0 && delta < 315.0) {
+        entity.origin = entity.origin.set(oldorigin);
+      }
+      SV.area.linkEdict(ent, true);
+      return true;
+    }
+    SV.area.linkEdict(ent, true);
+    return false;
+  }
+
+  newChaseDir(actor: ServerEdict, endpos: Vector, dist: number): void {
+    const entity = actor.entity!;
+    const olddir = Vector.anglemod(((entity.ideal_yaw / 45.0) >> 0) * 45.0);
+    const turnaround = Vector.anglemod(olddir - 180.0);
+    const deltax = endpos[0] - entity.origin[0];
+    const deltay = endpos[1] - entity.origin[1];
+    let dx: number;
+    let dy: number;
+    if (deltax > 10.0) {
+      dx = 0.0;
+    } else if (deltax < -10.0) {
+      dx = 180.0;
+    } else {
+      dx = -1;
+    }
+    if (deltay < -10.0) {
+      dy = 270.0;
+    } else if (deltay > 10.0) {
+      dy = 90.0;
+    } else {
+      dy = -1;
+    }
+    let tdir: number;
+    if (dx !== -1 && dy !== -1) {
+      if (dx === 0.0) {
+        tdir = dy === 90.0 ? 45.0 : 315.0;
+      } else {
+        tdir = dy === 90.0 ? 135.0 : 215.0;
+      }
+      if (tdir !== turnaround && this.stepDirection(actor, tdir, dist)) {
+        return;
+      }
+    }
+    if (Math.random() >= 0.25 || Math.abs(deltay) > Math.abs(deltax)) {
+      tdir = dx;
+      dx = dy;
+      dy = tdir;
+    }
+    if (dx !== -1 && dx !== turnaround && this.stepDirection(actor, dx, dist)) {
+      return;
+    }
+    if (dy !== -1 && dy !== turnaround && this.stepDirection(actor, dy, dist)) {
+      return;
+    }
+    if (olddir !== -1 && this.stepDirection(actor, olddir, dist)) {
+      return;
+    }
+    if (Math.random() >= 0.5) {
+      for (tdir = 0.0; tdir <= 315.0; tdir += 45.0) {
+        if (tdir !== turnaround && this.stepDirection(actor, tdir, dist)) {
+          return;
+        }
+      }
+    } else {
+      for (tdir = 315.0; tdir >= 0.0; tdir -= 45.0) {
+        if (tdir !== turnaround && this.stepDirection(actor, tdir, dist)) {
+          return;
+        }
+      }
+    }
+    if (turnaround !== -1 && this.stepDirection(actor, turnaround, dist)) {
+      return;
+    }
+    entity.ideal_yaw = olddir;
+    if (!this.checkBottom(actor)) {
+      entity.flags |= Defs.flags.FL_PARTIALGROUND;
+    }
+  }
+
+  closeEnough(ent: ServerEdict, goal: ServerEdict, dist: number): boolean {
+    const absmin = ent.entity!.absmin;
+    const absmax = ent.entity!.absmax;
+    const absminGoal = goal.entity!.absmin;
+    const absmaxGoal = goal.entity!.absmax;
+    for (let index = 0; index < 3; index++) {
+      if (absminGoal[index] > absmax[index] + dist) {
+        return false;
+      }
+      if (absmaxGoal[index] < absmin[index] - dist) {
+        return false;
+      }
+    }
+    return true;
+  }
+
+  #resolveEdict(value: BaseEntity | EdictReferenceLike | ServerEdict | null): ServerEdict | null {
+    if (!value) {
+      return null;
+    }
+    if (this.#isServerEdictLike(value)) {
+      return value;
+    }
+    return value.edict ?? null;
+  }
+
+  #resolveEntity(value: BaseEntity | EdictReferenceLike | ServerEdict | null): BaseEntity | null {
+    if (!value) {
+      return null;
+    }
+    if (this.#isServerEdictLike(value)) {
+      return value.entity;
+    }
+    if ('origin' in value) {
+      return value;
+    }
+    return value.edict?.entity ?? null;
+  }
+
+  #isServerEdictLike(value: BaseEntity | EdictReferenceLike | ServerEdict): value is ServerEdict {
+    return 'entity' in value && typeof value.isWorld === 'function';
+  }
+}
diff --git a/source/engine/server/physics/ServerPhysics.mjs b/source/engine/server/physics/ServerPhysics.ts
similarity index 53%
rename from source/engine/server/physics/ServerPhysics.mjs
rename to source/engine/server/physics/ServerPhysics.ts
index e8b51af7..2d5cb02b 100644
--- a/source/engine/server/physics/ServerPhysics.mjs
+++ b/source/engine/server/physics/ServerPhysics.ts
@@ -1,37 +1,43 @@
+import type { ServerEdict } from '../Edict.mjs';
+import type { CollisionTrace } from './ServerCollisionSupport.ts';
+
 import Vector from '../../../shared/Vector.ts';
 import * as Defs from '../../../shared/Defs.ts';
 import Q from '../../../shared/Q.ts';
-import { eventBus, registry } from '../../registry.mjs';
+import { eventBus, getCommonRegistry } from '../../registry.mjs';
 import {
   GROUND_ANGLE_THRESHOLD,
   VELOCITY_EPSILON,
   MAX_BUMP_COUNT,
   BlockedFlags,
-} from './Defs.mjs';
+} from './Defs.ts';
+
+interface FlyMoveResult {
+  readonly blocked: number;
+  readonly steptrace: CollisionTrace | null;
+}
 
-let { Con, Host, SV } = registry;
+interface MovedEntityState {
+  readonly origin: Vector;
+  readonly angles: Vector;
+  readonly edict: ServerEdict;
+}
+
+let { Con, Host, SV } = getCommonRegistry();
 
 eventBus.subscribe('registry.frozen', () => {
-  Con = registry.Con;
-  Host = registry.Host;
-  SV = registry.SV;
+  ({ Con, Host, SV } = getCommonRegistry());
 });
 
 /**
  * Handles core physics simulation, entity movement, and collision handling.
  */
 export class ServerPhysics {
-  constructor() {
-  }
-
   /**
    * Convert a world-space point into local pusher space using an orthonormal basis.
-   * @param {Vector} point point in world space
-   * @param {Vector} origin transform origin
-   * @param {number[]} basis 3x3 rotation basis from Vector.toRotationMatrix()
-   * @returns {Vector} point in local space
+   * @returns Point in local space.
    */
-  static _transformPointToLocal(point, origin, basis) {
+  static _transformPointToLocal(point: Vector, origin: Vector, basis: number[]): Vector {
     const delta = point.copy().subtract(origin);
     const forward = new Vector(basis[0], basis[1], basis[2]);
     const right = new Vector(basis[3], basis[4], basis[5]);
@@ -46,12 +52,9 @@ export class ServerPhysics {
 
   /**
    * Convert a local-space point back into world space using an orthonormal basis.
-   * @param {Vector} point point in local space
-   * @param {Vector} origin transform origin
-   * @param {number[]} basis 3x3 rotation basis from Vector.toRotationMatrix()
-   * @returns {Vector} point in world space
+   * @returns Point in world space.
    */
-  static _transformPointToWorld(point, origin, basis) {
+  static _transformPointToWorld(point: Vector, origin: Vector, basis: number[]): Vector {
     const forward = new Vector(basis[0], basis[1], basis[2]);
     const right = new Vector(basis[3], basis[4], basis[5]);
     const up = new Vector(basis[6], basis[7], basis[8]);
@@ -65,14 +68,14 @@ export class ServerPhysics {
   /**
    * Iterates all non-static entities to ensure none start inside solid space.
    */
-  checkAllEnts() {
-    for (let e = 1; e < SV.server.num_edicts; e++) {
-      const check = SV.server.edicts[e];
+  checkAllEnts(): void {
+    for (let index = 1; index < SV.server.num_edicts; index++) {
+      const check = SV.server.edicts[index];
       if (check.isFree()) {
         continue;
       }
 
-      switch (check.entity.movetype) {
+      switch (check.entity!.movetype) {
         case Defs.moveType.MOVETYPE_PUSH:
         case Defs.moveType.MOVETYPE_NONE:
         case Defs.moveType.MOVETYPE_NOCLIP:
@@ -88,23 +91,23 @@ export class ServerPhysics {
 
   /**
    * Clamps velocity/origin components and guards against NaN values.
-   * @param {import('../Edict.mjs').ServerEdict} ent entity to validate
    */
-  checkVelocity(ent) {
-    const velo = ent.entity.velocity;
-    const origin = ent.entity.origin;
+  checkVelocity(ent: ServerEdict): void {
+    const entity = ent.entity!;
+    const velo = entity.velocity;
+    const origin = entity.origin;
 
-    for (let i = 0; i < 3; i++) {
-      let component = velo[i];
+    for (let index = 0; index < 3; index++) {
+      let component = velo[index];
 
       if (Q.isNaN(component)) {
-        Con.Print('Got a NaN velocity on ' + ent.entity.classname + '\n');
+        Con.Print(`Got a NaN velocity on ${entity.classname}\n`);
         component = 0.0;
       }
 
-      if (Q.isNaN(origin[i])) {
-        Con.Print('Got a NaN origin on ' + ent.entity.classname + '\n');
-        origin[i] = 0.0;
+      if (Q.isNaN(origin[index])) {
+        Con.Print(`Got a NaN origin on ${entity.classname}\n`);
+        origin[index] = 0.0;
       }
 
       if (component > SV.maxvelocity.value) {
@@ -113,21 +116,22 @@ export class ServerPhysics {
         component = -SV.maxvelocity.value;
       }
 
-      velo[i] = component;
+      velo[index] = component;
     }
 
-    ent.entity.origin = ent.entity.origin.set(origin);
-    ent.entity.velocity = ent.entity.velocity.set(velo);
+    entity.origin = entity.origin.set(origin);
+    entity.velocity = entity.velocity.set(velo);
   }
 
   /**
    * Executes pending thinks for an entity until caught up with server time.
-   * @param {import('../Edict.mjs').ServerEdict} ent entity to process
-   * @returns {boolean} false if the entity was freed during thinking
+   * @returns False if the entity was freed during thinking.
    */
-  runThink(ent) {
+  runThink(ent: ServerEdict): boolean {
+    const entity = ent.entity!;
+
     while (true) {
-      let thinktime = ent.entity.nextthink;
+      let thinktime = entity.nextthink;
 
       if (thinktime <= 0.0 || thinktime > (SV.server.time + Host.frametime)) {
         return true;
@@ -137,9 +141,9 @@ export class ServerPhysics {
         thinktime = SV.server.time;
       }
 
-      ent.entity.nextthink = 0.0;
+      entity.nextthink = 0.0;
       SV.server.gameAPI.time = thinktime;
-      ent.entity.think();
+      entity.think();
 
       if (ent.isFree()) {
         return false;
@@ -149,15 +153,12 @@ export class ServerPhysics {
 
   /**
    * Invokes touch callbacks between two entities.
-   * @param {import('../Edict.mjs').ServerEdict} e1 first entity
-   * @param {import('../Edict.mjs').ServerEdict} e2 second entity
-   * @param {Vector} pushVector vector representing the push force
    */
-  impact(e1, e2, pushVector) {
+  impact(e1: ServerEdict, e2: ServerEdict, pushVector: Vector): void {
     SV.server.gameAPI.time = SV.server.time;
 
-    const ent1 = /** @type {import('../Edict.mjs').BaseEntity} */ (e1.entity);
-    const ent2 = /** @type {import('../Edict.mjs').BaseEntity} */ (e2.entity);
+    const ent1 = e1.entity!;
+    const ent2 = e2.entity!;
 
     if (ent1.touch && ent1.solid !== Defs.solid.SOLID_NOT) {
       ent1.touch(ent2, pushVector);
@@ -170,12 +171,8 @@ export class ServerPhysics {
 
   /**
    * Clips the velocity vector against a collision plane.
-   * @param {Vector} vec incoming velocity
-   * @param {Vector} normal collision normal
-   * @param {Vector} out output velocity
-   * @param {number} overbounce overbounce factor
    */
-  clipVelocity(vec, normal, out, overbounce) {
+  clipVelocity(vec: Vector, normal: Vector, out: Vector, overbounce: number): void {
     const backoff = vec.dot(normal) * overbounce;
 
     out[0] = vec[0] - normal[0] * backoff;
@@ -196,35 +193,34 @@ export class ServerPhysics {
 
   /**
    * Performs sliding movement with up to four collision planes.
-   * @param {import('../Edict.mjs').ServerEdict} ent entity to move
-   * @param {number} time frame time slice
-   * @returns {{blocked: number, steptrace: import('./ServerCollision.mjs').Trace | null}} result with blocked flags and optional wall trace
+   * @returns Blocked flags and an optional wall trace.
    */
-  flyMove(ent, time) {
-    const planes = [];
-    const primalVelocity = ent.entity.velocity.copy();
+  flyMove(ent: ServerEdict, time: number): FlyMoveResult {
+    const entity = ent.entity!;
+    const planes: Vector[] = [];
+    const primalVelocity = entity.velocity.copy();
     let originalVelocity = primalVelocity.copy();
     const newVelocity = new Vector();
     let timeLeft = time;
     let blocked = BlockedFlags.NONE;
-    let steptrace = null;
+    let steptrace: CollisionTrace | null = null;
 
     for (let bumpCount = 0; bumpCount < MAX_BUMP_COUNT; bumpCount++) {
-      if (ent.entity.velocity.isOrigin()) {
+      if (entity.velocity.isOrigin()) {
         break;
       }
 
-      const end = ent.entity.origin.copy().add(ent.entity.velocity.copy().multiply(timeLeft));
-      const trace = SV.collision.move(ent.entity.origin, ent.entity.mins, ent.entity.maxs, end, 0, ent);
+      const end = entity.origin.copy().add(entity.velocity.copy().multiply(timeLeft));
+      const trace = SV.collision.move(entity.origin, entity.mins, entity.maxs, end, 0, ent);
 
       if (trace.allsolid) {
-        ent.entity.velocity = new Vector();
+        entity.velocity = new Vector();
         return { blocked: BlockedFlags.BOTH, steptrace };
       }
 
       if (trace.fraction > 0.0) {
-        ent.entity.origin = ent.entity.origin.set(trace.endpos);
-        originalVelocity = ent.entity.velocity.copy();
+        entity.origin = entity.origin.set(trace.endpos);
+        originalVelocity = entity.velocity.copy();
         planes.length = 0;
         if (trace.fraction === 1.0) {
           break;
@@ -232,21 +228,22 @@ export class ServerPhysics {
       }
 
       console.assert(trace.ent !== null, 'trace.ent must not be null');
+      const traceEnt = trace.ent!;
 
       if (trace.plane.normal[2] > GROUND_ANGLE_THRESHOLD) {
         blocked |= BlockedFlags.FLOOR;
-        if (trace.ent.entity.solid === Defs.solid.SOLID_BSP ||
-            trace.ent.entity.solid === Defs.solid.SOLID_BBOX ||
-            trace.ent.entity.solid === Defs.solid.SOLID_MESH) {
-          ent.entity.flags |= Defs.flags.FL_ONGROUND;
-          ent.entity.groundentity = trace.ent.entity;
+        if (traceEnt.entity!.solid === Defs.solid.SOLID_BSP
+            || traceEnt.entity!.solid === Defs.solid.SOLID_BBOX
+            || traceEnt.entity!.solid === Defs.solid.SOLID_MESH) {
+          entity.flags |= Defs.flags.FL_ONGROUND;
+          entity.groundentity = traceEnt.entity!;
         }
       } else if (trace.plane.normal[2] === 0.0) {
         blocked |= BlockedFlags.WALL;
         steptrace = trace;
       }
 
-      this.impact(ent, trace.ent, ent.entity.velocity.copy());
+      this.impact(ent, traceEnt, entity.velocity.copy());
 
       if (ent.isFree()) {
         break;
@@ -255,42 +252,42 @@ export class ServerPhysics {
       timeLeft -= timeLeft * trace.fraction;
 
       if (planes.length >= 5) {
-        ent.entity.velocity = new Vector();
+        entity.velocity = new Vector();
         return { blocked: 3, steptrace };
       }
 
       planes.push(trace.plane.normal.copy());
 
-      let i;
-      let j;
-      for (i = 0; i < planes.length; i++) {
-        this.clipVelocity(originalVelocity, planes[i], newVelocity, 1.0);
-        for (j = 0; j < planes.length; j++) {
-          if (j !== i) {
-            const plane = planes[j];
+      let planeIndex: number;
+      let otherPlaneIndex: number;
+      for (planeIndex = 0; planeIndex < planes.length; planeIndex++) {
+        this.clipVelocity(originalVelocity, planes[planeIndex], newVelocity, 1.0);
+        for (otherPlaneIndex = 0; otherPlaneIndex < planes.length; otherPlaneIndex++) {
+          if (otherPlaneIndex !== planeIndex) {
+            const plane = planes[otherPlaneIndex];
             if ((newVelocity[0] * plane[0] + newVelocity[1] * plane[1] + newVelocity[2] * plane[2]) < 0.0) {
               break;
             }
           }
         }
-        if (j === planes.length) {
+        if (otherPlaneIndex === planes.length) {
           break;
         }
       }
 
-      if (i !== planes.length) {
-        ent.entity.velocity = newVelocity.copy();
+      if (planeIndex !== planes.length) {
+        entity.velocity = newVelocity.copy();
       } else {
         if (planes.length !== 2) {
-          ent.entity.velocity = new Vector();
+          entity.velocity = new Vector();
           return { blocked: 7, steptrace };
         }
         const dir = planes[0].cross(planes[1]);
-        ent.entity.velocity = dir.multiply(dir.dot(ent.entity.velocity));
+        entity.velocity = dir.multiply(dir.dot(entity.velocity));
       }
 
-      if (ent.entity.velocity.dot(primalVelocity) <= 0.0) {
-        ent.entity.velocity = new Vector();
+      if (entity.velocity.dot(primalVelocity) <= 0.0) {
+        entity.velocity = new Vector();
         return { blocked, steptrace };
       }
     }
@@ -300,37 +297,35 @@ export class ServerPhysics {
 
   /**
    * Applies gravity to an entity taking custom gravity into account.
-   * @param {import('../Edict.mjs').ServerEdict} ent entity to influence
    */
-  addGravity(ent) {
-    const entGravity = typeof(ent.entity.gravity) === 'number' ? ent.entity.gravity : 1.0;
-    const velocity = ent.entity.velocity;
+  addGravity(ent: ServerEdict): void {
+    const entity = ent.entity!;
+    const entGravity = typeof entity.gravity === 'number' ? entity.gravity : 1.0;
+    const velocity = entity.velocity;
     velocity[2] += entGravity * SV.gravity.value * Host.frametime * -1.0;
-    ent.entity.velocity = velocity;
+    entity.velocity = velocity;
   }
 
   /**
    * Applies a small upward force used for buoyancy.
-   * @param {import('../Edict.mjs').ServerEdict} ent entity to influence
    */
-  addBuoyancy(ent) {
-    const velocity = ent.entity.velocity;
+  addBuoyancy(ent: ServerEdict): void {
+    const velocity = ent.entity!.velocity;
     velocity[2] += SV.gravity.value * Host.frametime * 0.01;
-    ent.entity.velocity = velocity;
+    ent.entity!.velocity = velocity;
   }
 
   /**
    * Pushes an entity by the provided vector and performs collision handling.
-   * @param {import('../Edict.mjs').ServerEdict} ent entity to move
-   * @param {Vector} pushVector movement vector
-   * @returns {import('./ServerCollision.mjs').Trace} resulting trace
+   * @returns Resulting trace.
    */
-  pushEntity(ent, pushVector) {
-    const end = ent.entity.origin.copy().add(pushVector);
-    const solid = ent.entity.solid;
+  pushEntity(ent: ServerEdict, pushVector: Vector): CollisionTrace {
+    const entity = ent.entity!;
+    const end = entity.origin.copy().add(pushVector);
+    const solid = entity.solid;
 
-    let nomonsters;
-    if (ent.entity.movetype === Defs.moveType.MOVETYPE_FLYMISSILE) {
+    let nomonsters: number;
+    if (entity.movetype === Defs.moveType.MOVETYPE_FLYMISSILE) {
       nomonsters = Defs.moveTypes.MOVE_MISSILE;
     } else if (solid === Defs.solid.SOLID_TRIGGER || solid === Defs.solid.SOLID_NOT) {
       nomonsters = Defs.moveTypes.MOVE_NOMONSTERS;
@@ -338,13 +333,13 @@ export class ServerPhysics {
       nomonsters = Defs.moveTypes.MOVE_NORMAL;
     }
 
-    const trace = SV.collision.move(ent.entity.origin, ent.entity.mins, ent.entity.maxs, end, nomonsters, ent);
+    const trace = SV.collision.move(entity.origin, entity.mins, entity.maxs, end, nomonsters, ent);
 
     // CR: Only move the entity if the trace made progress. When allsolid is true,
     // the entity started and remained entirely in solid (e.g. spawned inside a wall),
     // so we keep it at its current position to prevent falling out of world.
     if (!trace.allsolid) {
-      ent.entity.origin = ent.entity.origin.set(trace.endpos);
+      entity.origin = entity.origin.set(trace.endpos);
     }
     SV.area.linkEdict(ent, true);
 
@@ -357,48 +352,49 @@ export class ServerPhysics {
 
   /**
    * Moves a pusher entity and resolves collisions with touched entities.
-   * @param {import('../Edict.mjs').ServerEdict} pusher pusher entity
-   * @param {number} movetime time to move
    */
-  pushMove(pusher, movetime) {
-    if (pusher.entity.velocity.isOrigin() && pusher.entity.avelocity.isOrigin()) {
-      pusher.entity.ltime += movetime;
+  pushMove(pusher: ServerEdict, movetime: number): void {
+    const pusherEntity = pusher.entity!;
+
+    if (pusherEntity.velocity.isOrigin() && pusherEntity.avelocity.isOrigin()) {
+      pusherEntity.ltime += movetime;
       return;
     }
 
-    const move = pusher.entity.velocity.copy().multiply(movetime);
-    const rotation = pusher.entity.avelocity.copy().multiply(movetime);
-    const mins = pusher.entity.absmin.copy().add(move);
-    const maxs = pusher.entity.absmax.copy().add(move);
-    const pushorig = pusher.entity.origin.copy();
-    const pushangles = pusher.entity.angles.copy();
+    const move = pusherEntity.velocity.copy().multiply(movetime);
+    const rotation = pusherEntity.avelocity.copy().multiply(movetime);
+    const mins = pusherEntity.absmin.copy().add(move);
+    const maxs = pusherEntity.absmax.copy().add(move);
+    const pushorig = pusherEntity.origin.copy();
+    const pushangles = pusherEntity.angles.copy();
     const pushbasis = pushangles.isOrigin() ? null : pushangles.toRotationMatrix();
 
-    pusher.entity.origin = pusher.entity.origin.copy().add(move);
-    pusher.entity.angles = pusher.entity.angles.copy().add(rotation);
-    const finalbasis = pusher.entity.angles.isOrigin() ? null : pusher.entity.angles.toRotationMatrix();
-    pusher.entity.ltime += movetime;
+    pusherEntity.origin = pusherEntity.origin.copy().add(move);
+    pusherEntity.angles = pusherEntity.angles.copy().add(rotation);
+    const finalbasis = pusherEntity.angles.isOrigin() ? null : pusherEntity.angles.toRotationMatrix();
+    pusherEntity.ltime += movetime;
     SV.area.linkEdict(pusher);
 
-    const moved = [];
+    const moved: MovedEntityState[] = [];
 
-    for (let e = 1; e < SV.server.num_edicts; e++) {
-      const check = SV.server.edicts[e];
+    for (let index = 1; index < SV.server.num_edicts; index++) {
+      const check = SV.server.edicts[index];
       if (check.isFree()) {
         continue;
       }
 
-      const movetype = check.entity.movetype;
+      const checkEntity = check.entity!;
+      const movetype = checkEntity.movetype;
       if (movetype === Defs.moveType.MOVETYPE_PUSH || movetype === Defs.moveType.MOVETYPE_NONE || movetype === Defs.moveType.MOVETYPE_NOCLIP) {
         continue;
       }
 
-      const wasGroundedOnPusher = (check.entity.flags & Defs.flags.FL_ONGROUND) !== 0 &&
-        check.entity.groundentity !== null &&
-        check.entity.groundentity.equals(pusher.entity);
+      const wasGroundedOnPusher = (checkEntity.flags & Defs.flags.FL_ONGROUND) !== 0
+        && checkEntity.groundentity !== null
+        && checkEntity.groundentity.equals(pusherEntity);
 
       if (!wasGroundedOnPusher) {
-        if (!check.entity.absmin.lt(maxs) || !check.entity.absmax.gt(mins)) {
+        if (!checkEntity.absmin.lt(maxs) || !checkEntity.absmax.gt(mins)) {
           continue;
         }
 
@@ -408,71 +404,70 @@ export class ServerPhysics {
       }
 
       if (movetype !== Defs.moveType.MOVETYPE_WALK) {
-        check.entity.flags &= ~Defs.flags.FL_ONGROUND;
+        checkEntity.flags &= ~Defs.flags.FL_ONGROUND;
       }
 
-      const entorig = check.entity.origin.copy();
-      const entangles = check.entity.angles.copy();
-      moved[moved.length] = [entorig, entangles, check];
-      pusher.entity.solid = Defs.solid.SOLID_NOT;
+      const entorig = checkEntity.origin.copy();
+      const entangles = checkEntity.angles.copy();
+      moved.push({ origin: entorig, angles: entangles, edict: check });
+      pusherEntity.solid = Defs.solid.SOLID_NOT;
 
       let finalMove = move.copy();
 
       if (!rotation.isOrigin()) {
         const localOffset = pushbasis === null
-          ? check.entity.origin.copy().subtract(pushorig)
-          : ServerPhysics._transformPointToLocal(check.entity.origin, pushorig, pushbasis);
+          ? checkEntity.origin.copy().subtract(pushorig)
+          : ServerPhysics._transformPointToLocal(checkEntity.origin, pushorig, pushbasis);
         const newPos = finalbasis === null
-          ? pusher.entity.origin.copy().add(localOffset)
-          : ServerPhysics._transformPointToWorld(localOffset, pusher.entity.origin, finalbasis);
+          ? pusherEntity.origin.copy().add(localOffset)
+          : ServerPhysics._transformPointToWorld(localOffset, pusherEntity.origin, finalbasis);
 
-        finalMove = newPos.subtract(check.entity.origin);
+        finalMove = newPos.subtract(checkEntity.origin);
 
-        check.entity.angles = check.entity.angles.copy().add(rotation);
+        checkEntity.angles = checkEntity.angles.copy().add(rotation);
       }
 
       this.pushEntity(check, finalMove);
-      pusher.entity.solid = Defs.solid.SOLID_BSP;
+      pusherEntity.solid = Defs.solid.SOLID_BSP;
 
       if (SV.collision.testEntityPosition(check)) {
         if (wasGroundedOnPusher) {
-          pusher.entity.solid = Defs.solid.SOLID_NOT;
+          pusherEntity.solid = Defs.solid.SOLID_NOT;
           const blockedByOtherSolid = SV.collision.testEntityPosition(check);
-          pusher.entity.solid = Defs.solid.SOLID_BSP;
+          pusherEntity.solid = Defs.solid.SOLID_BSP;
 
           if (!blockedByOtherSolid) {
             continue;
           }
         }
 
-        const cmins = check.entity.mins;
-        const cmaxs = check.entity.maxs;
+        const cmins = checkEntity.mins;
+        const cmaxs = checkEntity.maxs;
         if (cmins[0] === cmaxs[0]) {
           continue;
         }
-        if (check.entity.solid === Defs.solid.SOLID_NOT || check.entity.solid === Defs.solid.SOLID_TRIGGER) {
+        if (checkEntity.solid === Defs.solid.SOLID_NOT || checkEntity.solid === Defs.solid.SOLID_TRIGGER) {
           cmins[0] = cmaxs[0] = 0.0;
           cmins[1] = cmaxs[1] = 0.0;
           cmaxs[2] = cmins[2];
-          check.entity.mins = cmins;
-          check.entity.maxs = cmaxs;
+          checkEntity.mins = cmins;
+          checkEntity.maxs = cmaxs;
           continue;
         }
-        check.entity.origin = entorig;
-        check.entity.angles = entangles;
+        checkEntity.origin = entorig;
+        checkEntity.angles = entangles;
         SV.area.linkEdict(check, true);
-        pusher.entity.origin = pusher.entity.origin.set(pushorig);
-        pusher.entity.angles = pusher.entity.angles.set(pushangles);
+        pusherEntity.origin = pusherEntity.origin.set(pushorig);
+        pusherEntity.angles = pusherEntity.angles.set(pushangles);
         SV.area.linkEdict(pusher);
-        pusher.entity.ltime -= movetime;
-        if (pusher.entity.blocked) {
-          pusher.entity.blocked(check.entity);
+        pusherEntity.ltime -= movetime;
+        if (pusherEntity.blocked) {
+          pusherEntity.blocked(checkEntity);
         }
-        for (let i = 0; i < moved.length; i++) { // FIXME: rewrite
-          const movedEdict = moved[i];
-          movedEdict[2].entity.origin = movedEdict[0];
-          movedEdict[2].entity.angles = movedEdict[1];
-          SV.area.linkEdict(movedEdict[2]);
+        for (const movedEdict of moved) { // FIXME: rewrite
+          movedEdict.edict.entity!.origin = movedEdict.origin;
+          movedEdict.edict.entity!.angles = movedEdict.angles;
+          SV.area.linkEdict(movedEdict.edict);
         }
         return;
       }
@@ -481,12 +476,12 @@ export class ServerPhysics {
 
   /**
    * Applies motion to MOVETYPE_PUSH entities.
-   * @param {import('../Edict.mjs').ServerEdict} ent entity to process
    */
-  physicsPusher(ent) {
-    const oldltime = ent.entity.ltime;
-    const thinktime = ent.entity.nextthink;
-    let movetime;
+  physicsPusher(ent: ServerEdict): void {
+    const entity = ent.entity!;
+    const oldltime = entity.ltime;
+    const thinktime = entity.nextthink;
+    let movetime: number;
 
     if (thinktime > 0.0 && thinktime < (oldltime + Host.frametime)) {
       movetime = Math.max(thinktime - oldltime, 0.0);
@@ -498,37 +493,38 @@ export class ServerPhysics {
       this.pushMove(ent, movetime);
     }
 
-    if (thinktime <= oldltime || thinktime > ent.entity.ltime) {
+    if (thinktime <= oldltime || thinktime > entity.ltime) {
       return;
     }
 
-    ent.entity.nextthink = 0.0;
+    entity.nextthink = 0.0;
     SV.server.gameAPI.time = SV.server.time;
-    ent.entity.think();
+    entity.think();
   }
 
   /**
    * Attempts to resolve a stuck player by nudging the entity around.
-   * @param {import('../Edict.mjs').ServerEdict} ent entity to fix
    */
-  checkStuck(ent) {
+  checkStuck(ent: ServerEdict): void {
+    const entity = ent.entity!;
+
     if (!SV.collision.testEntityPosition(ent)) {
-      ent.entity.oldorigin = ent.entity.oldorigin.set(ent.entity.origin);
+      entity.oldorigin = entity.oldorigin.set(entity.origin);
       return;
     }
 
-    ent.entity.origin = ent.entity.origin.set(ent.entity.oldorigin);
+    entity.origin = entity.origin.set(entity.oldorigin);
     if (!SV.collision.testEntityPosition(ent)) {
       Con.DPrint('Unstuck.\n');
       SV.area.linkEdict(ent, true);
       return;
     }
 
-    const norg = ent.entity.origin.copy();
+    const norg = entity.origin.copy();
     for (norg[2] = 0.0; norg[2] <= 17.0; norg[2]++) {
       for (norg[0] = -1.0; norg[0] <= 1.0; norg[0]++) {
         for (norg[1] = -1.0; norg[1] <= 1.0; norg[1]++) {
-          ent.entity.origin = ent.entity.origin.set(norg).add(norg);
+          entity.origin = entity.origin.set(norg).add(norg);
           if (!SV.collision.testEntityPosition(ent)) {
             Con.DPrint('Unstuck.\n');
             SV.area.linkEdict(ent, true);
@@ -543,11 +539,10 @@ export class ServerPhysics {
 
   /**
    * Inspects the entity position to determine water level and type.
-   * @param {import('../Edict.mjs').ServerEdict} ent entity to inspect
-   * @returns {boolean} true if entity is largely underwater
+   * @returns True if entity is largely underwater.
    */
-  checkWater(ent) {
-    const entity = ent.entity;
+  checkWater(ent: ServerEdict): boolean {
+    const entity = ent.entity!;
     const point = entity.origin.copy().add(new Vector(0.0, 0.0, entity.mins[2] + 1.0));
     entity.waterlevel = Defs.waterlevel.WATERLEVEL_NONE;
     entity.watertype = Defs.content.CONTENT_EMPTY;
@@ -574,42 +569,41 @@ export class ServerPhysics {
 
   /**
    * Emits splash sounds when transitioning between water and air.
-   * @param {import('../Edict.mjs').ServerEdict} ent entity to update
    */
-  checkWaterTransition(ent) {
-    const cont = SV.collision.pointContents(ent.entity.origin);
+  checkWaterTransition(ent: ServerEdict): void {
+    const entity = ent.entity!;
+    const cont = SV.collision.pointContents(entity.origin);
 
-    if (!ent.entity.watertype) { // just spawned here
-      ent.entity.watertype = cont;
-      ent.entity.waterlevel = Defs.waterlevel.WATERLEVEL_FEET;
+    if (!entity.watertype) {
+      entity.watertype = cont;
+      entity.waterlevel = Defs.waterlevel.WATERLEVEL_FEET;
       return;
     }
 
     if (cont <= Defs.content.CONTENT_WATER) {
-      if (ent.entity.watertype === Defs.content.CONTENT_EMPTY) {
+      if (entity.watertype === Defs.content.CONTENT_EMPTY) {
         SV.messages.startSound(ent, 0, 'misc/h2ohit1.wav', 255, 1.0);
       }
-      ent.entity.watertype = cont;
-      ent.entity.waterlevel = Defs.waterlevel.WATERLEVEL_WAIST;
+      entity.watertype = cont;
+      entity.waterlevel = Defs.waterlevel.WATERLEVEL_WAIST;
       return;
     }
 
-    if (ent.entity.watertype !== Defs.content.CONTENT_EMPTY) {
+    if (entity.watertype !== Defs.content.CONTENT_EMPTY) {
       // just walked into water
       SV.messages.startSound(ent, 0, 'misc/h2ohit1.wav', 255, 1.0);
     }
 
-    ent.entity.watertype = Defs.content.CONTENT_EMPTY;
-    ent.entity.waterlevel = cont; // CR: I’m not sure whether this is correct or should be e.g. WATERLEVEL_NONE
+    entity.watertype = Defs.content.CONTENT_EMPTY;
+    entity.waterlevel = cont; // CR: I’m not sure whether this is correct or should be e.g. WATERLEVEL_NONE
   }
 
   /**
    * Applies wall friction to prevent jittering when sliding along geometry.
-   * @param {import('../Edict.mjs').ServerEdict} ent entity to modify
-   * @param {{plane: {normal: Vector}}} trace collision trace
    */
-  wallFriction(ent, trace) {
-    const viewAngles = ent.entity.v_angle ?? ent.entity.angles;
+  wallFriction(ent: ServerEdict, trace: CollisionTrace): void {
+    const entity = ent.entity!;
+    const viewAngles = entity.v_angle ?? entity.angles;
     const { forward } = viewAngles.angleVectors();
     const normal = trace.plane.normal;
     let d = normal.dot(forward) + 0.5;
@@ -617,23 +611,22 @@ export class ServerPhysics {
       return;
     }
     d += 1.0;
-    const velo = ent.entity.velocity;
+    const velo = entity.velocity;
     velo[0] = (velo[0] - normal[0] * normal.dot(velo)) * d;
     velo[1] = (velo[1] - normal[1] * normal.dot(velo)) * d;
-    ent.entity.velocity = velo;
+    entity.velocity = velo;
   }
 
   /**
    * Attempts to unstick an entity by trying small offsets.
-   * @param {import('../Edict.mjs').ServerEdict} ent entity to adjust
-   * @param {Vector} oldvel previous velocity
-   * @returns {number} resulting clip flags
+   * @returns Resulting clip flags.
    */
-  tryUnstick(ent, oldvel) {
-    const oldorg = ent.entity.origin.copy();
+  tryUnstick(ent: ServerEdict, oldvel: Vector): number {
+    const entity = ent.entity!;
+    const oldorg = entity.origin.copy();
     const dir = new Vector(2.0, 0.0, 0.0);
-    for (let i = 0; i <= 7; i++) {
-      switch (i) {
+    for (let index = 0; index <= 7; index++) {
+      switch (index) {
         case 1: dir[0] = 0.0; dir[1] = 2.0; break;
         case 2: dir[0] = -2.0; dir[1] = 0.0; break;
         case 3: dir[0] = 0.0; dir[1] = -2.0; break;
@@ -644,45 +637,46 @@ export class ServerPhysics {
         default: break;
       }
       this.pushEntity(ent, dir);
-      ent.entity.velocity = new Vector(oldvel[0], oldvel[1], 0.0);
+      entity.velocity = new Vector(oldvel[0], oldvel[1], 0.0);
       const result = this.flyMove(ent, VELOCITY_EPSILON);
-      const curorg = ent.entity.origin;
+      const curorg = entity.origin;
       if (Math.abs(oldorg[1] - curorg[1]) > 4.0 || Math.abs(oldorg[0] - curorg[0]) > 4.0) {
         return result.blocked;
       }
-      ent.entity.origin = ent.entity.origin.set(oldorg);
+      entity.origin = entity.origin.set(oldorg);
     }
-    ent.entity.velocity = new Vector();
+    entity.velocity = new Vector();
     return 7;
   }
 
   /**
    * Simulates toss/bounce style movement.
-   * @param {import('../Edict.mjs').ServerEdict} ent entity to update
    */
-  physicsToss(ent) {
+  physicsToss(ent: ServerEdict): void {
+    const entity = ent.entity!;
+
     if (!this.runThink(ent)) {
       return;
     }
-    if ((ent.entity.flags & Defs.flags.FL_ONGROUND) !== 0) {
+    if ((entity.flags & Defs.flags.FL_ONGROUND) !== 0) {
       return;
     }
 
     this.checkVelocity(ent);
-    const movetype = ent.entity.movetype;
+    const movetype = entity.movetype;
     if (movetype !== Defs.moveType.MOVETYPE_FLY && movetype !== Defs.moveType.MOVETYPE_FLYMISSILE) {
       this.addGravity(ent);
     }
 
-    ent.entity.angles = ent.entity.angles.add(ent.entity.avelocity.copy().multiply(Host.frametime));
-    const trace = this.pushEntity(ent, ent.entity.velocity.copy().multiply(Host.frametime));
+    entity.angles = entity.angles.add(entity.avelocity.copy().multiply(Host.frametime));
+    const trace = this.pushEntity(ent, entity.velocity.copy().multiply(Host.frametime));
 
     // CR: If entity started and stayed entirely in solid (e.g. spawned inside a wall),
     // stop movement to prevent falling out of world. This commonly happens when items
     // are dropped by monsters dying near walls.
     if (trace.allsolid) {
-      ent.entity.velocity = new Vector();
-      ent.entity.avelocity = new Vector();
+      entity.velocity = new Vector();
+      entity.avelocity = new Vector();
       return;
     }
 
@@ -691,15 +685,16 @@ export class ServerPhysics {
     }
 
     const velocity = new Vector();
-    this.clipVelocity(ent.entity.velocity, trace.plane.normal, velocity, movetype === Defs.moveType.MOVETYPE_BOUNCE ? 1.5 : 1.0);
-    ent.entity.velocity = velocity;
+    this.clipVelocity(entity.velocity, trace.plane.normal, velocity, movetype === Defs.moveType.MOVETYPE_BOUNCE ? 1.5 : 1.0);
+    entity.velocity = velocity;
 
     if (trace.plane.normal[2] > GROUND_ANGLE_THRESHOLD) {
-      if (ent.entity.velocity[2] < 60.0 || movetype !== Defs.moveType.MOVETYPE_BOUNCE) {
-        ent.entity.flags |= Defs.flags.FL_ONGROUND;
-        ent.entity.groundentity = trace.ent.entity;
-        ent.entity.velocity = new Vector();
-        ent.entity.avelocity = new Vector();
+      if (entity.velocity[2] < 60.0 || movetype !== Defs.moveType.MOVETYPE_BOUNCE) {
+        console.assert(trace.ent !== null, 'grounding toss trace must resolve a hit entity');
+        entity.flags |= Defs.flags.FL_ONGROUND;
+        entity.groundentity = trace.ent!.entity!;
+        entity.velocity = new Vector();
+        entity.avelocity = new Vector();
       }
     }
 
@@ -708,12 +703,11 @@ export class ServerPhysics {
 
   /**
    * Handles MOVETYPE_STEP entities (most monsters).
-   * @param {import('../Edict.mjs').ServerEdict} ent entity to update
    */
-  physicsStep(ent) {
-    const entity = ent.entity;
+  physicsStep(ent: ServerEdict): void {
+    const entity = ent.entity!;
     if ((entity.flags & (Defs.flags.FL_ONGROUND | Defs.flags.FL_FLY | Defs.flags.FL_SWIM)) === 0) {
-      const hitsound = (ent.entity.velocity[2] < (SV.gravity.value * -VELOCITY_EPSILON));
+      const hitsound = entity.velocity[2] < (SV.gravity.value * -VELOCITY_EPSILON);
       this.addGravity(ent);
       this.checkVelocity(ent);
       this.flyMove(ent, Host.frametime);
@@ -729,12 +723,12 @@ export class ServerPhysics {
   /**
    * Runs the main entity physics step for the server.
    */
-  physics() {
+  physics(): void {
     SV.server.gameAPI.time = SV.server.time;
     SV.server.gameAPI.startFrame();
 
-    for (let i = 0; i < SV.server.num_edicts; i++) {
-      const ent = SV.server.edicts[i];
+    for (let index = 0; index < SV.server.num_edicts; index++) {
+      const ent = SV.server.edicts[index];
       if (ent.isFree()) {
         continue;
       }
@@ -747,7 +741,7 @@ export class ServerPhysics {
         SV.clientPhysics.physicsClient(ent);
         continue;
       }
-      switch (ent.entity.movetype) {
+      switch (ent.entity!.movetype) {
         case Defs.moveType.MOVETYPE_PUSH:
           this.physicsPusher(ent);
           continue;
@@ -767,7 +761,7 @@ export class ServerPhysics {
           this.physicsToss(ent);
           continue;
         default:
-          throw new Error('SV.Physics: bad movetype ' + (ent.entity.movetype >> 0));
+          throw new Error(`SV.Physics: bad movetype ${ent.entity!.movetype >> 0}`);
       }
     }
 
diff --git a/test/common/game-apis.test.mjs b/test/common/game-apis.test.mjs
index 0929a279..158be8fd 100644
--- a/test/common/game-apis.test.mjs
+++ b/test/common/game-apis.test.mjs
@@ -2,12 +2,12 @@ import { describe, test } from 'node:test';
 import assert from 'node:assert/strict';
 
 import Vector from '../../source/shared/Vector.ts';
-import { solid } from '../../source/shared/Defs.ts';
+import { moveTypes, solid } from '../../source/shared/Defs.ts';
 import { ClientEdict } from '../../source/engine/client/ClientEntities.mjs';
-import { ClientEngineAPI } from '../../source/engine/common/GameAPIs.ts';
-import { ServerArea } from '../../source/engine/server/physics/ServerArea.mjs';
-import { ServerCollision } from '../../source/engine/server/physics/ServerCollision.mjs';
-import { CollisionTrace } from '../../source/engine/server/physics/ServerCollisionSupport.mjs';
+import { ClientEngineAPI, ServerEngineAPI } from '../../source/engine/common/GameAPIs.ts';
+import { ServerArea } from '../../source/engine/server/physics/ServerArea.ts';
+import { ServerCollision } from '../../source/engine/server/physics/ServerCollision.ts';
+import { CollisionTrace } from '../../source/engine/server/physics/ServerCollisionSupport.ts';
 import { defaultMockRegistry, withMockRegistry } from '../physics/fixtures.mjs';
 
 /**
@@ -152,3 +152,67 @@ void describe('ClientEngineAPI.Traceline', () => {
     });
   });
 });
+
+void describe('ServerEngineAPI.Traceline', () => {
+  void test('calls collision.move with the collision instance bound as this', () => {
+    const collision = {
+      calls: [],
+      move(start, mins, maxs, end, type, passedict) {
+        this.calls.push({ start, mins, maxs, end, type, passedict });
+        return CollisionTrace.empty(end);
+      },
+    };
+
+    void withMockRegistry(defaultMockRegistry({
+      collision,
+    }), () => {
+      const trace = ServerEngineAPI.Traceline(
+        new Vector(1, 2, 3),
+        new Vector(4, 5, 6),
+        true,
+        null,
+      );
+
+      assert.equal(trace.fraction, 1.0);
+    });
+
+    assert.equal(collision.calls.length, 1);
+    assert.equal(collision.calls[0].type, moveTypes.MOVE_NOMONSTERS);
+    assert.deepEqual([...collision.calls[0].start], [1, 2, 3]);
+    assert.deepEqual([...collision.calls[0].end], [4, 5, 6]);
+  });
+});
+
+void describe('ServerEngineAPI.Navigate', () => {
+  void test('passes through a missing synchronous path as null', () => {
+    void withMockRegistry(defaultMockRegistry({
+      server: {
+        navigation: {
+          findPath() {
+            return null;
+          },
+        },
+      },
+    }), () => {
+      const path = ServerEngineAPI.Navigate(new Vector(1, 2, 3), new Vector(4, 5, 6));
+
+      assert.equal(path, null);
+    });
+  });
+
+  void test('passes through a missing asynchronous path as null', async () => {
+    await withMockRegistry(defaultMockRegistry({
+      server: {
+        navigation: {
+          findPathAsync() {
+            return Promise.resolve(null);
+          },
+        },
+      },
+    }), async () => {
+      const path = await ServerEngineAPI.NavigateAsync(new Vector(1, 2, 3), new Vector(4, 5, 6));
+
+      assert.equal(path, null);
+    });
+  });
+});
diff --git a/test/physics/collision-regressions.test.mjs b/test/physics/collision-regressions.test.mjs
index c473ccde..d6d3828e 100644
--- a/test/physics/collision-regressions.test.mjs
+++ b/test/physics/collision-regressions.test.mjs
@@ -9,10 +9,10 @@ import { BSP29Loader } from '../../source/engine/common/model/loaders/BSP29Loade
 import { eventBus, registry } from '../../source/engine/registry.mjs';
 import { UserCmd } from '../../source/engine/network/Protocol.ts';
 import { ClientEdict } from '../../source/engine/client/ClientEntities.mjs';
-import { ServerCollision } from '../../source/engine/server/physics/ServerCollision.mjs';
-import { ServerPhysics } from '../../source/engine/server/physics/ServerPhysics.mjs';
-import { ServerMovement } from '../../source/engine/server/physics/ServerMovement.mjs';
-import { BlockedFlags, MAX_BUMP_COUNT } from '../../source/engine/server/physics/Defs.mjs';
+import { ServerCollision } from '../../source/engine/server/physics/ServerCollision.ts';
+import { ServerPhysics } from '../../source/engine/server/physics/ServerPhysics.ts';
+import { ServerMovement } from '../../source/engine/server/physics/ServerMovement.ts';
+import { BlockedFlags, MAX_BUMP_COUNT } from '../../source/engine/server/physics/Defs.ts';
 
 void test('PmovePlayer.DEBUG is disabled before Pmove.Init()', () => {
   assert.equal(PmovePlayer.DEBUG, false);
diff --git a/test/physics/fixtures.mjs b/test/physics/fixtures.mjs
index b8273752..acf43844 100644
--- a/test/physics/fixtures.mjs
+++ b/test/physics/fixtures.mjs
@@ -5,7 +5,7 @@ import { content, flags, moveType, solid } from '../../source/shared/Defs.ts';
 import { Brush, BrushModel, BrushSide } from '../../source/engine/common/model/BSP.ts';
 import { eventBus, registry } from '../../source/engine/registry.mjs';
 import { ClientEdict } from '../../source/engine/client/ClientEntities.mjs';
-import { ServerPhysics } from '../../source/engine/server/physics/ServerPhysics.mjs';
+import { ServerPhysics } from '../../source/engine/server/physics/ServerPhysics.ts';
 
 // ── Typedefs ────────────────────────────────────────────────────────────────
 
diff --git a/test/physics/func-door.test.mjs b/test/physics/func-door.test.mjs
index 5af5d22e..d58540d1 100644
--- a/test/physics/func-door.test.mjs
+++ b/test/physics/func-door.test.mjs
@@ -89,8 +89,8 @@ function createDoorEntityFixture() {
   return { entity, gameAPI };
 }
 
-describe('DoorEntity', () => {
-  test('resets the scheduled go-down think when reopening a door that is already at the top', () => {
+void describe('DoorEntity', () => {
+  void test('resets the scheduled go-down think when reopening a door that is already at the top', () => {
     const { entity } = createDoorEntityFixture();
     const activator = { centerPoint: null };
 
diff --git a/test/physics/quake-entity-ai.test.mjs b/test/physics/quake-entity-ai.test.mjs
new file mode 100644
index 00000000..f7f2a5bd
--- /dev/null
+++ b/test/physics/quake-entity-ai.test.mjs
@@ -0,0 +1,128 @@
+import { describe, test } from 'node:test';
+import assert from 'node:assert/strict';
+
+import { worldType } from '../../source/game/id1/Defs.mjs';
+import { entityClasses } from '../../source/game/id1/GameAPI.mjs';
+
+const OgreEntity = entityClasses.find((entityClass) => entityClass.classname === 'monster_ogre');
+
+assert.ok(OgreEntity, 'monster_ogre must be registered in GameAPI');
+
+/**
+ * @returns {InstanceType<typeof OgreEntity>} monster fixture with a minimal engine API
+ */
+function createMonsterVisibilityFixture() {
+  const edict = {
+    num: 1,
+    entity: null,
+    equals(other) {
+      return this === other;
+    },
+    freeEdict() {},
+    setOrigin() {},
+    setModel() {},
+    setMinMaxSize() {},
+    walkMove() {
+      return false;
+    },
+    changeYaw() {
+      return 0;
+    },
+    dropToFloor() {
+      return true;
+    },
+    isOnTheFloor() {
+      return false;
+    },
+    makeStatic() {},
+    aim() {
+      return null;
+    },
+    getNextBestClient() {
+      return null;
+    },
+  };
+
+  const engine = {
+    IsLoading() {
+      return false;
+    },
+    PrecacheModel() {},
+    PrecacheSound() {},
+    StartSound() {},
+    SpawnAmbientSound() {},
+    SpawnEntity() {
+      return { entity: null };
+    },
+    FindByFieldAndValue() {
+      return null;
+    },
+    FindAllByFieldAndValue() {
+      return [];
+    },
+    ParseQC() {
+      return null;
+    },
+    Traceline() {
+      return null;
+    },
+    SetAreaPortalState() {},
+    GetCvar() {
+      return { value: 0 };
+    },
+    eventBus: {
+      publish() {},
+    },
+  };
+
+  const gameAPI = {
+    engine,
+    time: 0,
+    worldspawn: {
+      worldtype: worldType.MEDIEVAL,
+    },
+    gameAI: {
+      _sightEntity: null,
+      _sightEntityTime: 0,
+    },
+  };
+
+  const entity = new OgreEntity(edict, gameAPI);
+  edict.entity = entity;
+
+  return entity;
+}
+
+void describe('QuakeEntityAI._isVisible', () => {
+  void test('treats a clear ignoreMonsters traceline as visible even when no entity is returned', () => {
+    const entity = createMonsterVisibilityFixture();
+    const target = createMonsterVisibilityFixture();
+
+    entity.engine.Traceline = () => ({
+      fraction: 1.0,
+      entity: null,
+      contents: {
+        inOpen: false,
+        inWater: false,
+      },
+    });
+
+    assert.equal(entity._ai._isVisible(target), true);
+  });
+
+  void test('rejects blocked sight lines when the trace stops short', () => {
+    const entity = createMonsterVisibilityFixture();
+    const target = createMonsterVisibilityFixture();
+
+    entity.engine.Traceline = () => ({
+      fraction: 0.5,
+      entity: null,
+      contents: {
+        inOpen: false,
+        inWater: false,
+      },
+    });
+
+    assert.equal(entity._ai._isVisible(target), false);
+  });
+});
diff --git a/test/physics/server-client-physics.test.mjs b/test/physics/server-client-physics.test.mjs
index b4a8912a..a5fa2c51 100644
--- a/test/physics/server-client-physics.test.mjs
+++ b/test/physics/server-client-physics.test.mjs
@@ -4,9 +4,8 @@ import assert from 'node:assert/strict';
 import Vector from '../../source/shared/Vector.ts';
 import { flags, moveType, solid } from '../../source/shared/Defs.ts';
 import { UserCmd } from '../../source/engine/network/Protocol.ts';
-import { eventBus, registry } from '../../source/engine/registry.mjs';
 import { ServerClient } from '../../source/engine/server/Client.mjs';
-import { ServerClientPhysics } from '../../source/engine/server/physics/ServerClientPhysics.mjs';
+import { ServerClientPhysics } from '../../source/engine/server/physics/ServerClientPhysics.ts';
 
 import {
   createBoxBrushModel,
@@ -30,9 +29,9 @@ function createUserCmd(options = {}) {
   return cmd;
 }
 
-describe('ServerClientPhysics', () => {
-  describe('_runSharedPmove', () => {
-    test('syncs pmove state, splits long commands, and deduplicates touch impacts', () => {
+void describe('ServerClientPhysics', () => {
+  void describe('_runSharedPmove', () => {
+    void test('syncs pmove state, splits long commands, and deduplicates touch impacts', () => {
       const clientPhysics = new ServerClientPhysics();
       const impacts = [];
       const addEntityCalls = [];
@@ -165,7 +164,7 @@ describe('ServerClientPhysics', () => {
       client.pmFlags = 2;
       client.pmTime = 3;
 
-      withMockRegistry(defaultMockRegistry({
+      void withMockRegistry(defaultMockRegistry({
         pmove,
         physics: {
           impact(ent, touchEdict, pushVector) {
@@ -214,8 +213,8 @@ describe('ServerClientPhysics', () => {
     });
   });
 
-  describe('physicsClient', () => {
-    test('drains queued walk commands and links once per frame', () => {
+  void describe('physicsClient', () => {
+    void test('drains queued walk commands and links once per frame', () => {
       const clientPhysics = new ServerClientPhysics();
       const events = [];
       const entity = createMockEntity({
@@ -231,7 +230,7 @@ describe('ServerClientPhysics', () => {
       ];
       edict.getClient = () => client;
 
-      withMockRegistry(defaultMockRegistry({
+      void withMockRegistry(defaultMockRegistry({
         area: {
           linkEdict(linkedEdict, touchTriggers) {
             events.push(['linkEdict', linkedEdict, touchTriggers]);
@@ -288,7 +287,7 @@ describe('ServerClientPhysics', () => {
       assert.equal(client.pendingCmds.length, 0);
     });
 
-    test('skips movement when no walk commands are queued', () => {
+    void test('skips movement when no walk commands are queued', () => {
       const clientPhysics = new ServerClientPhysics();
       const events = [];
       const entity = createMockEntity({
@@ -300,7 +299,7 @@ describe('ServerClientPhysics', () => {
       client.state = ServerClient.STATE.CONNECTED;
       edict.getClient = () => client;
 
-      withMockRegistry(defaultMockRegistry({
+      void withMockRegistry(defaultMockRegistry({
         area: {
           linkEdict() {
             events.push('linkEdict');
diff --git a/test/physics/server-collision.test.mjs b/test/physics/server-collision.test.mjs
index dd54367f..47d3ce35 100644
--- a/test/physics/server-collision.test.mjs
+++ b/test/physics/server-collision.test.mjs
@@ -6,8 +6,8 @@ import { content, flags, moveType, moveTypes, solid } from '../../source/shared/
 import { BrushModel } from '../../source/engine/common/model/BSP.ts';
 import { Pmove } from '../../source/engine/common/Pmove.ts';
 import { BSP29Loader } from '../../source/engine/common/model/loaders/BSP29Loader.ts';
-import { ServerCollision } from '../../source/engine/server/physics/ServerCollision.mjs';
-import { ServerArea } from '../../source/engine/server/physics/ServerArea.mjs';
+import { ServerCollision } from '../../source/engine/server/physics/ServerCollision.ts';
+import { ServerArea } from '../../source/engine/server/physics/ServerArea.ts';
 
 import {
   assertNear,
@@ -990,6 +990,49 @@ void describe('ServerArea', () => {
       assert.deepEqual([...offset], [...worldModel.hulls[0].clip_mins]);
     });
   });
+
+  void test('invokes trigger touch with the trigger entity bound as this', () => {
+    const area = new ServerArea();
+    const subjectEntity = createMockEntity({
+      origin: new Vector(8, 0, 0),
+      mins: new Vector(-16, -16, -24),
+      maxs: new Vector(16, 16, 32),
+      solidType: solid.SOLID_BBOX,
+    });
+    const subjectEdict = createMockEdict(subjectEntity);
+    const touchedEntities = [];
+    const triggerEntity = createMockEntity({
+      origin: new Vector(),
+      mins: new Vector(-32, -32, -32),
+      maxs: new Vector(32, 32, 32),
+      solidType: solid.SOLID_TRIGGER,
+    });
+    const triggerEdict = createMockEdict(triggerEntity);
+
+    triggerEntity.spawnflags = 1234;
+    triggerEntity.touch = function(other) {
+      touchedEntities.push({ spawnflags: this.spawnflags, other });
+    };
+
+    area.tree = {
+      queryAABB() {
+        return [subjectEdict, triggerEdict];
+      },
+    };
+
+    void withMockRegistry(defaultMockRegistry({
+      server: {
+        time: 4.2,
+        gameAPI: { time: 0 },
+      },
+    }), () => {
+      area.touchLinks(subjectEdict);
+    });
+
+    assert.equal(touchedEntities.length, 1);
+    assert.equal(touchedEntities[0].spawnflags, 1234);
+    assert.equal(touchedEntities[0].other, subjectEntity);
+  });
 });
 
 void describe('BSP29Loader', () => {
diff --git a/test/physics/server-movement.test.mjs b/test/physics/server-movement.test.mjs
index 96ba81b8..323a17ac 100644
--- a/test/physics/server-movement.test.mjs
+++ b/test/physics/server-movement.test.mjs
@@ -3,7 +3,7 @@ import assert from 'node:assert/strict';
 
 import Vector from '../../source/shared/Vector.ts';
 import { content, flags, solid } from '../../source/shared/Defs.ts';
-import { ServerMovement } from '../../source/engine/server/physics/ServerMovement.mjs';
+import { ServerMovement } from '../../source/engine/server/physics/ServerMovement.ts';
 
 import {
   assertNear,
diff --git a/test/physics/server-physics.test.mjs b/test/physics/server-physics.test.mjs
index f773d705..d0480736 100644
--- a/test/physics/server-physics.test.mjs
+++ b/test/physics/server-physics.test.mjs
@@ -4,10 +4,10 @@ import assert from 'node:assert/strict';
 import Vector from '../../source/shared/Vector.ts';
 import { content, flags, gameCapabilities, moveType, moveTypes, solid } from '../../source/shared/Defs.ts';
 import { eventBus, registry } from '../../source/engine/registry.mjs';
-import { ServerArea } from '../../source/engine/server/physics/ServerArea.mjs';
-import { ServerCollision } from '../../source/engine/server/physics/ServerCollision.mjs';
-import { ServerPhysics } from '../../source/engine/server/physics/ServerPhysics.mjs';
-import { BlockedFlags, MAX_BUMP_COUNT } from '../../source/engine/server/physics/Defs.mjs';
+import { ServerArea } from '../../source/engine/server/physics/ServerArea.ts';
+import { ServerCollision } from '../../source/engine/server/physics/ServerCollision.ts';
+import { ServerPhysics } from '../../source/engine/server/physics/ServerPhysics.ts';
+import { BlockedFlags, MAX_BUMP_COUNT } from '../../source/engine/server/physics/Defs.ts';
 
 import {
   assertNear,
@@ -20,9 +20,9 @@ import {
   withMockServerPhysics,
 } from './fixtures.mjs';
 
-describe('ServerPhysics', () => {
-  describe('checkVelocity', () => {
-    test('clears NaNs and clamps to maxvelocity', () => {
+void describe('ServerPhysics', () => {
+  void describe('checkVelocity', () => {
+    void test('clears NaNs and clamps to maxvelocity', () => {
       const serverPhysics = new ServerPhysics();
       const prints = [];
       const entity = createMockEntity({
@@ -34,7 +34,7 @@ describe('ServerPhysics', () => {
       entity.classname = 'test_entity';
       const edict = createMockEdict(entity);
 
-      withMockRegistry({
+      void withMockRegistry({
         ...defaultMockRegistry({ maxvelocity: { value: 2000 } }),
         Con: {
           Print(message) {
@@ -54,8 +54,8 @@ describe('ServerPhysics', () => {
     });
   });
 
-  describe('pushEntity', () => {
-    test('uses MOVE_MISSILE and preserves origin on allsolid', () => {
+  void describe('pushEntity', () => {
+    void test('uses MOVE_MISSILE and preserves origin on allsolid', () => {
       const serverPhysics = new ServerPhysics();
       const linkCalls = [];
       const moveCalls = [];
@@ -68,7 +68,7 @@ describe('ServerPhysics', () => {
       });
       const edict = createMockEdict(entity);
 
-      withMockRegistry(defaultMockRegistry({
+      void withMockRegistry(defaultMockRegistry({
         area: {
           linkEdict(linkedEdict) {
             linkCalls.push(linkedEdict);
@@ -110,7 +110,7 @@ describe('ServerPhysics', () => {
       assert.equal(linkCalls[0], edict);
     });
 
-    test('uses MOVE_NOMONSTERS for trigger and non-solid entities', () => {
+    void test('uses MOVE_NOMONSTERS for trigger and non-solid entities', () => {
       const serverPhysics = new ServerPhysics();
       const moveCalls = [];
       const touchCalls = [];
@@ -134,7 +134,7 @@ describe('ServerPhysics', () => {
         };
         const edict = createMockEdict(entity);
 
-        withMockRegistry(defaultMockRegistry({
+        void withMockRegistry(defaultMockRegistry({
           area: {
             linkEdict() {},
           },
@@ -172,8 +172,8 @@ describe('ServerPhysics', () => {
     });
   });
 
-  describe('flyMove', () => {
-    test('clips against a wall and records steptrace', () => {
+  void describe('flyMove', () => {
+    void test('clips against a wall and records steptrace', () => {
       const serverPhysics = new ServerPhysics();
       const moveCalls = [];
       const impacts = [];
@@ -187,7 +187,7 @@ describe('ServerPhysics', () => {
       });
       const edict = createMockEdict(entity);
 
-      withMockRegistry(defaultMockRegistry({
+      void withMockRegistry(defaultMockRegistry({
         collision: {
           move(start, mins, maxs, end, type, passedict) {
             moveCalls.push({ start: start.copy(), end: end.copy(), type, passedict });
@@ -222,7 +222,7 @@ describe('ServerPhysics', () => {
       assert.deepEqual([...impacts[0].pushVector], [10, 0, 0]);
     });
 
-    test('stops in a two-plane crease', () => {
+    void test('stops in a two-plane crease', () => {
       const serverPhysics = new ServerPhysics();
       let moveCallCount = 0;
       const blockerA = createMockEdict(createMockEntity({ solidType: solid.SOLID_BBOX }));
@@ -236,7 +236,7 @@ describe('ServerPhysics', () => {
       });
       const edict = createMockEdict(entity);
 
-      withMockRegistry(defaultMockRegistry({
+      void withMockRegistry(defaultMockRegistry({
         collision: {
           move() {
             moveCallCount += 1;
@@ -279,7 +279,7 @@ describe('ServerPhysics', () => {
       assert.deepEqual([...edict.entity.velocity], [0, 0, 0]);
     });
 
-    test('dead-stops when clipped by three non-coplanar planes', () => {
+    void test('dead-stops when clipped by three non-coplanar planes', () => {
       const serverPhysics = new ServerPhysics();
       let moveCallCount = 0;
       const blockerA = createMockEdict(createMockEntity({ solidType: solid.SOLID_BBOX }));
@@ -294,7 +294,7 @@ describe('ServerPhysics', () => {
       });
       const edict = createMockEdict(entity);
 
-      withMockRegistry(defaultMockRegistry({
+      void withMockRegistry(defaultMockRegistry({
         collision: {
           move() {
             moveCallCount += 1;
@@ -348,7 +348,7 @@ describe('ServerPhysics', () => {
       assert.deepEqual([...edict.entity.velocity], [0, 0, 0]);
     });
 
-    test('keeps state finite when a degenerate wall normal repeats', () => {
+    void test('keeps state finite when a degenerate wall normal repeats', () => {
       const serverPhysics = new ServerPhysics();
       let moveCallCount = 0;
       const impacts = [];
@@ -362,7 +362,7 @@ describe('ServerPhysics', () => {
       });
       const edict = createMockEdict(entity);
 
-      withMockRegistry(defaultMockRegistry({
+      void withMockRegistry(defaultMockRegistry({
         collision: {
           move() {
             moveCallCount += 1;
@@ -401,8 +401,8 @@ describe('ServerPhysics', () => {
     });
   });
 
-  describe('checkAllEnts', () => {
-    test('skips static entities and reports invalid dynamic positions', () => {
+  void describe('checkAllEnts', () => {
+    void test('skips static entities and reports invalid dynamic positions', () => {
       const serverPhysics = new ServerPhysics();
       const prints = [];
       const tested = [];
@@ -417,7 +417,7 @@ describe('ServerPhysics', () => {
       const walkEdict = createMockEdict(walkEntity);
       walkEdict.num = 5;
 
-      withMockRegistry({
+      void withMockRegistry({
         ...defaultMockRegistry({
           collision: {
             testEntityPosition(edict) {
@@ -445,8 +445,8 @@ describe('ServerPhysics', () => {
     });
   });
 
-  describe('runThink', () => {
-    test('returns false when the entity frees itself during think', () => {
+  void describe('runThink', () => {
+    void test('returns false when the entity frees itself during think', () => {
       const serverPhysics = new ServerPhysics();
       let freed = false;
       let thinkCalls = 0;
@@ -459,7 +459,7 @@ describe('ServerPhysics', () => {
       const edict = createMockEdict(entity);
       edict.isFree = () => freed;
 
-      withMockRegistry(defaultMockRegistry({
+      void withMockRegistry(defaultMockRegistry({
         server: {
           time: 1.0,
           gameAPI: { time: 0 },
@@ -475,7 +475,7 @@ describe('ServerPhysics', () => {
       assert.equal(entity.nextthink, 0.0);
     });
 
-    test('executes multiple thinks that become due within one frame', () => {
+    void test('executes multiple thinks that become due within one frame', () => {
       const serverPhysics = new ServerPhysics();
       const thinkTimes = [];
       const entity = createMockEntity();
@@ -486,7 +486,7 @@ describe('ServerPhysics', () => {
       };
       const edict = createMockEdict(entity);
 
-      withMockRegistry({
+      void withMockRegistry({
         ...defaultMockRegistry({
           server: {
             time: 1.0,
@@ -506,8 +506,8 @@ describe('ServerPhysics', () => {
     });
   });
 
-  describe('pushMove', () => {
-    test('carries a grounded rider upward without blocked()', () => {
+  void describe('pushMove', () => {
+    void test('carries a grounded rider upward without blocked()', () => {
       withMockServerPhysics(({ serverPhysics, pusherEdict, riderEdict, moveCalls, testCalls, blockedCalls }) => {
         serverPhysics.pushMove(pusherEdict, 0.1);
 
@@ -522,7 +522,7 @@ describe('ServerPhysics', () => {
       });
     });
 
-    test('rolls back and calls blocked() when rider remains stuck', () => {
+    void test('rolls back and calls blocked() when rider remains stuck', () => {
       withMockServerPhysics(({ serverPhysics, pusherEdict, riderEdict, blockedCalls }) => {
         let testCount = 0;
         registry.SV.collision.testEntityPosition = (edict) => {
@@ -542,7 +542,7 @@ describe('ServerPhysics', () => {
       });
     });
 
-    test('restores earlier riders when a later rider blocks the push', () => {
+    void test('restores earlier riders when a later rider blocks the push', () => {
       const linkCalls = [];
       const blockedCalls = [];
 
@@ -584,7 +584,7 @@ describe('ServerPhysics', () => {
       const riderBEdict = createMockEdict(riderBEntity);
       riderBEdict.num = 3;
 
-      withMockRegistry(defaultMockRegistry({
+      void withMockRegistry(defaultMockRegistry({
         maxvelocity: { value: 2000 },
         area: {
           linkEdict(edict) {
@@ -627,7 +627,7 @@ describe('ServerPhysics', () => {
       assert.ok(linkCalls.length >= 5);
     });
 
-    test('collapses trigger bounds instead of rolling back the pusher', () => {
+    void test('collapses trigger bounds instead of rolling back the pusher', () => {
       const blockedCalls = [];
 
       const pusherEntity = createMockEntity({
@@ -657,7 +657,7 @@ describe('ServerPhysics', () => {
       const triggerEdict = createMockEdict(triggerEntity);
       triggerEdict.num = 2;
 
-      withMockRegistry(defaultMockRegistry({
+      void withMockRegistry(defaultMockRegistry({
         maxvelocity: { value: 2000 },
         area: {
           linkEdict(edict) {
@@ -698,7 +698,7 @@ describe('ServerPhysics', () => {
       assert.equal(pusherEdict.entity.ltime, 0.1);
     });
 
-    test('rotates grounded riders around the pusher yaw axis', () => {
+    void test('rotates grounded riders around the pusher yaw axis', () => {
       withMockServerPhysics(({ serverPhysics, pusherEdict, riderEdict, moveCalls, testCalls, blockedCalls }) => {
         pusherEdict.entity.velocity.clear();
         pusherEdict.entity.avelocity = new Vector(0, 900, 0);
@@ -727,7 +727,7 @@ describe('ServerPhysics', () => {
       });
     });
 
-    test('ignores rider overlap that only collides with the current pusher after the move', () => {
+    void test('ignores rider overlap that only collides with the current pusher after the move', () => {
       const testCalls = [];
       const blockedCalls = [];
 
@@ -762,7 +762,7 @@ describe('ServerPhysics', () => {
 
       let testPositionCall = 0;
 
-      withMockRegistry(defaultMockRegistry({
+      void withMockRegistry(defaultMockRegistry({
         area: {
           linkEdict() {},
         },
@@ -812,7 +812,7 @@ describe('ServerPhysics', () => {
       assert.deepEqual([...riderEdict.entity.origin], [0, 0, 50]);
     });
 
-    test('keeps non-rider overlaps with the current pusher blocking the move', () => {
+    void test('keeps non-rider overlaps with the current pusher blocking the move', () => {
       const testCalls = [];
       const blockedCalls = [];
 
@@ -843,7 +843,7 @@ describe('ServerPhysics', () => {
       const blockerEdict = createMockEdict(blockerEntity);
       blockerEdict.num = 2;
 
-      withMockRegistry(defaultMockRegistry({
+      void withMockRegistry(defaultMockRegistry({
         area: {
           linkEdict() {},
         },
@@ -883,7 +883,7 @@ describe('ServerPhysics', () => {
       assert.deepEqual([...blockerEdict.entity.origin], [0, 0, 0]);
     });
 
-    test('combines translation with non-yaw rotation when carrying riders', () => {
+    void test('combines translation with non-yaw rotation when carrying riders', () => {
       const transformPointToLocal = (point, origin, basis) => {
         const delta = point.copy().subtract(origin);
         const forward = new Vector(basis[0], basis[1], basis[2]);
@@ -945,7 +945,7 @@ describe('ServerPhysics', () => {
       });
     });
 
-    test('does not call blocked() for a rider resting within sub-epsilon top contact on a BSP pusher', () => {
+    void test('does not call blocked() for a rider resting within sub-epsilon top contact on a BSP pusher', () => {
       const blockedCalls = [];
       const pusherModel = createBoxBrushModel({ halfExtents: [64, 64, 16], name: '*plat' });
       const worldModel = createBrushWorldModel({ center: [4096, 0, 0], halfExtents: [16, 16, 16] });
@@ -999,7 +999,7 @@ describe('ServerPhysics', () => {
       const riderEdict = createMockEdict(riderEntity);
       riderEdict.num = 2;
 
-      withMockRegistry(defaultMockRegistry({
+      void withMockRegistry(defaultMockRegistry({
         maxvelocity: { value: 2000 },
         area,
         collision,
@@ -1037,8 +1037,8 @@ describe('ServerPhysics', () => {
     });
   });
 
-  describe('physicsPusher', () => {
-    test('limits movement to nextthink and then runs think', () => {
+  void describe('physicsPusher', () => {
+    void test('limits movement to nextthink and then runs think', () => {
       const serverPhysics = new ServerPhysics();
       const moveTimes = [];
       let observedGameTime = -1;
@@ -1054,7 +1054,7 @@ describe('ServerPhysics', () => {
       };
       const edict = createMockEdict(entity);
 
-      withMockRegistry(defaultMockRegistry({
+      void withMockRegistry(defaultMockRegistry({
         server: {
           time: 7.0,
           gameAPI: { time: 0 },
@@ -1078,7 +1078,7 @@ describe('ServerPhysics', () => {
       assert.equal(observedGameTime, 7.0);
     });
 
-    test('keeps think deferred when nextthink is beyond this frame', () => {
+    void test('keeps think deferred when nextthink is beyond this frame', () => {
       const serverPhysics = new ServerPhysics();
       const moveTimes = [];
       let observedGameTime = -1;
@@ -1094,7 +1094,7 @@ describe('ServerPhysics', () => {
       };
       const edict = createMockEdict(entity);
 
-      withMockRegistry(defaultMockRegistry({
+      void withMockRegistry(defaultMockRegistry({
         server: {
           time: 8.0,
           gameAPI: { time: 0 },
@@ -1118,7 +1118,7 @@ describe('ServerPhysics', () => {
       assert.equal(observedGameTime, 0);
     });
 
-    test('moves pushers for a full frame when no think is scheduled', () => {
+    void test('moves pushers for a full frame when no think is scheduled', () => {
       const serverPhysics = new ServerPhysics();
       const moveTimes = [];
       let thinkCalls = 0;
@@ -1134,7 +1134,7 @@ describe('ServerPhysics', () => {
       };
       const edict = createMockEdict(entity);
 
-      withMockRegistry(defaultMockRegistry({
+      void withMockRegistry(defaultMockRegistry({
         Host: { frametime: 0.1 },
         server: {
           time: 9.0,
@@ -1159,8 +1159,8 @@ describe('ServerPhysics', () => {
     });
   });
 
-  describe('checkStuck', () => {
-    test('restores oldorigin when the saved position is clear', () => {
+  void describe('checkStuck', () => {
+    void test('restores oldorigin when the saved position is clear', () => {
       const serverPhysics = new ServerPhysics();
       const prints = [];
       const linkCalls = [];
@@ -1173,7 +1173,7 @@ describe('ServerPhysics', () => {
       entity.oldorigin = new Vector(1, 2, 3);
       const edict = createMockEdict(entity);
 
-      withMockRegistry({
+      void withMockRegistry({
         ...defaultMockRegistry({
           area: {
             linkEdict(linkedEdict, touchTriggers) {
@@ -1206,7 +1206,7 @@ describe('ServerPhysics', () => {
     });
 
     // checkStuck tries: 1 (current pos) + 1 (oldorigin) + 18 z-levels * 3 x * 3 y = 164
-    test('reports failure after exhausting all nudges', () => {
+    void test('reports failure after exhausting all nudges', () => {
       const serverPhysics = new ServerPhysics();
       const prints = [];
       const linkCalls = [];
@@ -1219,7 +1219,7 @@ describe('ServerPhysics', () => {
       entity.oldorigin = new Vector(1, 2, 3);
       const edict = createMockEdict(entity);
 
-      withMockRegistry({
+      void withMockRegistry({
         ...defaultMockRegistry({
           area: {
             linkEdict(linkedEdict, touchTriggers) {
@@ -1250,8 +1250,8 @@ describe('ServerPhysics', () => {
     });
   });
 
-  describe('checkWater', () => {
-    test('leaves entities dry when feet probe is not water', () => {
+  void describe('checkWater', () => {
+    void test('leaves entities dry when feet probe is not water', () => {
       const serverPhysics = new ServerPhysics();
       const probes = [];
       const entity = createMockEntity({
@@ -1262,7 +1262,7 @@ describe('ServerPhysics', () => {
       entity.view_ofs = new Vector(0, 0, 22);
       const edict = createMockEdict(entity);
 
-      withMockRegistry(defaultMockRegistry({
+      void withMockRegistry(defaultMockRegistry({
         collision: {
           pointContents(point) {
             probes.push(point.copy());
@@ -1279,7 +1279,7 @@ describe('ServerPhysics', () => {
       assert.deepEqual([...probes[0]], [10, 20, 7]);
     });
 
-    test('distinguishes feet waist and head submersion', () => {
+    void test('distinguishes feet waist and head submersion', () => {
       const serverPhysics = new ServerPhysics();
       const feetEntity = createMockEntity({
         origin: new Vector(0, 0, 40),
@@ -1303,7 +1303,7 @@ describe('ServerPhysics', () => {
       const runCase = (entity, contents) => {
         let probeIndex = 0;
 
-        withMockRegistry(defaultMockRegistry({
+        void withMockRegistry(defaultMockRegistry({
           collision: {
             pointContents() {
               const result = contents[probeIndex];
@@ -1321,7 +1321,7 @@ describe('ServerPhysics', () => {
       const headResult = (() => {
         let result;
 
-        withMockRegistry(defaultMockRegistry({
+        void withMockRegistry(defaultMockRegistry({
           collision: {
             pointContents() {
               return content.CONTENT_WATER;
@@ -1344,8 +1344,8 @@ describe('ServerPhysics', () => {
     });
   });
 
-  describe('checkWaterTransition', () => {
-    test('plays a splash and marks waist-deep water when entering from air', () => {
+  void describe('checkWaterTransition', () => {
+    void test('plays a splash and marks waist-deep water when entering from air', () => {
       const serverPhysics = new ServerPhysics();
       const startSoundCalls = [];
       const entity = createMockEntity({
@@ -1355,7 +1355,7 @@ describe('ServerPhysics', () => {
       entity.waterlevel = 0;
       const edict = createMockEdict(entity);
 
-      withMockRegistry(defaultMockRegistry({
+      void withMockRegistry(defaultMockRegistry({
         collision: {
           pointContents() {
             return content.CONTENT_WATER;
@@ -1377,7 +1377,7 @@ describe('ServerPhysics', () => {
       assert.equal(entity.waterlevel, 2);
     });
 
-    test('plays a splash and clears watertype when leaving water', () => {
+    void test('plays a splash and clears watertype when leaving water', () => {
       const serverPhysics = new ServerPhysics();
       const startSoundCalls = [];
       const entity = createMockEntity({
@@ -1387,7 +1387,7 @@ describe('ServerPhysics', () => {
       entity.waterlevel = 2;
       const edict = createMockEdict(entity);
 
-      withMockRegistry(defaultMockRegistry({
+      void withMockRegistry(defaultMockRegistry({
         collision: {
           pointContents() {
             return content.CONTENT_EMPTY;
@@ -1410,8 +1410,8 @@ describe('ServerPhysics', () => {
     });
   });
 
-  describe('wallFriction', () => {
-    test('damps tangential speed when the player is steering into a wall', () => {
+  void describe('wallFriction', () => {
+    void test('damps tangential speed when the player is steering into a wall', () => {
       const serverPhysics = new ServerPhysics();
       const entity = createMockEntity({
         velocity: new Vector(10, 4, 3),
@@ -1428,8 +1428,8 @@ describe('ServerPhysics', () => {
     });
   });
 
-  describe('addGravity / addBuoyancy', () => {
-    test('accumulate using entity gravity and frametime', () => {
+  void describe('addGravity / addBuoyancy', () => {
+    void test('accumulate using entity gravity and frametime', () => {
       const serverPhysics = new ServerPhysics();
       const entity = createMockEntity({
         velocity: new Vector(0, 0, 10),
@@ -1437,7 +1437,7 @@ describe('ServerPhysics', () => {
       entity.gravity = 0.5;
       const edict = createMockEdict(entity);
 
-      withMockRegistry({
+      void withMockRegistry({
         ...defaultMockRegistry({ gravity: { value: 800 } }),
         Host: { frametime: 0.25 },
       }, () => {
@@ -1449,8 +1449,8 @@ describe('ServerPhysics', () => {
     });
   });
 
-  describe('clipVelocity', () => {
-    test('zeroes tiny residuals after clipping against an angled plane', () => {
+  void describe('clipVelocity', () => {
+    void test('zeroes tiny residuals after clipping against an angled plane', () => {
       const serverPhysics = new ServerPhysics();
       const out = new Vector();
 
@@ -1467,8 +1467,8 @@ describe('ServerPhysics', () => {
     });
   });
 
-  describe('physicsToss', () => {
-    test('keeps a bounce entity moving after a hard floor impact', () => {
+  void describe('physicsToss', () => {
+    void test('keeps a bounce entity moving after a hard floor impact', () => {
       const serverPhysics = new ServerPhysics();
       const entity = createMockEntity({
         origin: new Vector(0, 0, 64),
@@ -1488,7 +1488,7 @@ describe('ServerPhysics', () => {
       const floorEdict = createMockEdict(floorEntity);
       const edict = createMockEdict(entity);
 
-      withMockRegistry(defaultMockRegistry({
+      void withMockRegistry(defaultMockRegistry({
         gravity: { value: 800 },
         maxvelocity: { value: 2000 },
         area: {
@@ -1527,7 +1527,7 @@ describe('ServerPhysics', () => {
       assert.deepEqual([...entity.angles], [0, 0, 9]);
     });
 
-    test('settles non-bounce tosses on walkable ground', () => {
+    void test('settles non-bounce tosses on walkable ground', () => {
       const serverPhysics = new ServerPhysics();
       const entity = createMockEntity({
         origin: new Vector(0, 0, 64),
@@ -1547,7 +1547,7 @@ describe('ServerPhysics', () => {
       const floorEdict = createMockEdict(floorEntity);
       const edict = createMockEdict(entity);
 
-      withMockRegistry(defaultMockRegistry({
+      void withMockRegistry(defaultMockRegistry({
         gravity: { value: 800 },
         maxvelocity: { value: 2000 },
         area: {
@@ -1587,8 +1587,8 @@ describe('ServerPhysics', () => {
     });
   });
 
-  describe('physicsStep', () => {
-    test('applies airborne step movement, links, and plays the landing sound', () => {
+  void describe('physicsStep', () => {
+    void test('applies airborne step movement, links, and plays the landing sound', () => {
       const serverPhysics = new ServerPhysics();
       const soundCalls = [];
       const linkCalls = [];
@@ -1601,7 +1601,7 @@ describe('ServerPhysics', () => {
       });
       const edict = createMockEdict(entity);
 
-      withMockRegistry({
+      void withMockRegistry({
         ...defaultMockRegistry({
           gravity: { value: 800 },
           area: {
@@ -1647,7 +1647,7 @@ describe('ServerPhysics', () => {
       assert.equal(soundCalls[0][2], 'demon/dland2.wav');
     });
 
-    test('still runs think and water transition while already grounded', () => {
+    void test('still runs think and water transition while already grounded', () => {
       const serverPhysics = new ServerPhysics();
       const sequence = [];
       const entity = createMockEntity({
@@ -1657,7 +1657,7 @@ describe('ServerPhysics', () => {
       });
       const edict = createMockEdict(entity);
 
-      withMockRegistry(defaultMockRegistry({
+      void withMockRegistry(defaultMockRegistry({
         area: {
           linkEdict() {
             sequence.push('linkEdict');
@@ -1694,8 +1694,8 @@ describe('ServerPhysics', () => {
     });
   });
 
-  describe('physics', () => {
-    test('applies gravity and toss movement for one frame', () => {
+  void describe('physics', () => {
+    void test('applies gravity and toss movement for one frame', () => {
       const linkCalls = [];
       const moveCalls = [];
       let startFrameCount = 0;
@@ -1719,7 +1719,7 @@ describe('ServerPhysics', () => {
       const tossEdict = createMockEdict(tossEntity);
       tossEdict.num = 1;
 
-      withMockRegistry(defaultMockRegistry({
+      void withMockRegistry(defaultMockRegistry({
         gravity: { value: 800 },
         maxvelocity: { value: 2000 },
         area: {
@@ -1775,5 +1775,52 @@ describe('ServerPhysics', () => {
         assert.equal(linkCalls.length, 1);
       });
     });
+
+    void test('does not treat reserved client slots as attached clients for non-client edicts', () => {
+      let startFrameCount = 0;
+      let pusherCalls = 0;
+      const worldEdict = createMockEdict(createMockEntity({ movetype: moveType.MOVETYPE_NONE }));
+      const doorEdict = createMockEdict(createMockEntity({
+        movetype: moveType.MOVETYPE_PUSH,
+        solidType: solid.SOLID_BSP,
+      }));
+
+      doorEdict.num = 16;
+      doorEdict.isClient = () => false;
+      doorEdict.getClient = () => ({ state: 0 });
+
+      void withMockRegistry(defaultMockRegistry({
+        area: {
+          linkEdict() {},
+        },
+        clientPhysics: {
+          physicsClient() {
+            throw new Error('non-client edict should not run through client physics just because a reserved slot exists');
+          },
+        },
+        server: {
+          time: 0,
+          num_edicts: 2,
+          edicts: [worldEdict, doorEdict],
+          gameAPI: {
+            time: 0,
+            force_retouch: 0,
+            startFrame() {
+              startFrameCount += 1;
+            },
+          },
+        },
+      }), () => {
+        const serverPhysics = new ServerPhysics();
+        serverPhysics.physicsPusher = (edict) => {
+          pusherCalls += 1;
+          assert.equal(edict, doorEdict);
+        };
+        serverPhysics.physics();
+      });
+
+      assert.equal(startFrameCount, 1);
+      assert.equal(pusherCalls, 1);
+    });
   });
 });

From 7c47db3b6c04dd0c631cb82b561aa8dfe1b0384e Mon Sep 17 00:00:00 2001
From: Christian R <github@chrisnew.de>
Date: Fri, 3 Apr 2026 12:42:13 +0300
Subject: [PATCH 31/67] TS: added missing JSDocs

---
 source/engine/common/model/ModelLoader.ts     |  5 +++
 .../common/model/ModelLoaderRegistry.ts       |  2 +
 .../engine/server/physics/ServerCollision.ts  | 39 +++++++++++++++++++
 3 files changed, 46 insertions(+)

diff --git a/source/engine/common/model/ModelLoader.ts b/source/engine/common/model/ModelLoader.ts
index 9029d7f1..2d5ac38a 100644
--- a/source/engine/common/model/ModelLoader.ts
+++ b/source/engine/common/model/ModelLoader.ts
@@ -10,16 +10,19 @@ export abstract class ModelLoader {
   /**
    * Returns the magic numbers that identify this format.
    * Magic numbers are read from the first four bytes of the file.
+   * @returns The magic numbers recognized by this loader.
    */
   abstract getMagicNumbers(): number[];
 
   /**
    * Returns the file extensions supported by this loader.
+   * @returns The supported file extensions.
    */
   abstract getExtensions(): string[];
 
   /**
    * Returns a human-readable loader name.
+   * @returns The loader display name.
    */
   abstract getName(): string;
 
@@ -28,6 +31,7 @@ export abstract class ModelLoader {
    *
    * The default implementation requires both a matching extension and a
    * matching magic number.
+   * @returns True when the loader can handle the supplied file.
    */
   canLoad(buffer: ArrayBuffer, filename: string): boolean {
     const view = new DataView(buffer);
@@ -39,6 +43,7 @@ export abstract class ModelLoader {
 
   /**
    * Loads a model from the supplied file buffer.
+   * @returns A promise resolving to the loaded model.
    */
   abstract load(buffer: ArrayBuffer, name: string): Promise<BaseModel>;
 }
diff --git a/source/engine/common/model/ModelLoaderRegistry.ts b/source/engine/common/model/ModelLoaderRegistry.ts
index c47f98fb..29d8dfd9 100644
--- a/source/engine/common/model/ModelLoaderRegistry.ts
+++ b/source/engine/common/model/ModelLoaderRegistry.ts
@@ -20,6 +20,7 @@ export class ModelLoaderRegistry {
 
   /**
    * Finds a loader that can handle the given file.
+   * @returns The first matching loader, or `null` when none can load the file.
    */
   findLoader(buffer: ArrayBuffer, filename: string): ModelLoader | null {
     for (const loader of this.loaders) {
@@ -33,6 +34,7 @@ export class ModelLoaderRegistry {
 
   /**
    * Loads a model using the first compatible registered loader.
+   * @returns A promise resolving to the loaded model.
    */
   async load(buffer: ArrayBuffer, name: string): Promise<BaseModel> {
     const loader = this.findLoader(buffer, name);
diff --git a/source/engine/server/physics/ServerCollision.ts b/source/engine/server/physics/ServerCollision.ts
index 5023da89..5c5b9885 100644
--- a/source/engine/server/physics/ServerCollision.ts
+++ b/source/engine/server/physics/ServerCollision.ts
@@ -63,6 +63,7 @@ export class ServerCollision {
   /**
    * Resolve a collision model by model index from either the active server or
    * the client precache populated by server signon data.
+   * @returns The resolved collision model, if any.
    */
   _getModelByIndex(modelIndex: number): CollisionModel {
     return this._modelSource.getModelByIndex(modelIndex);
@@ -70,6 +71,7 @@ export class ServerCollision {
 
   /**
    * Resolve the model used by an entity for collision.
+   * @returns The collision model associated with the entity.
    */
   _getEntityModel(ent: ServerEdict): CollisionModel {
     if (ent === SV.server?.edicts?.[0]) {
@@ -81,6 +83,7 @@ export class ServerCollision {
 
   /**
    * Resolve the collision state used by an entity during tracing.
+   * @returns The resolved collision state, or `null` when the entity cannot be traced.
    */
   _getEntityCollisionState(ent: ServerEdict): CollisionState | null {
     const entity = ent.entity!;
@@ -107,6 +110,7 @@ export class ServerCollision {
 
   /**
    * Build a hull fallback state for callers that want a guaranteed collision mode.
+   * @returns The legacy hull collision state for the entity.
    */
   _getHullFallbackState(ent: ServerEdict): HullCollisionState {
     return new HullCollisionState(ent);
@@ -115,6 +119,7 @@ export class ServerCollision {
   /**
    * Resolve the active static-world model for traces that can run on either a
    * local server or a pure client connection.
+   * @returns The active world entity and world model.
    */
   _getStaticWorldSource(): StaticWorldSource {
     return {
@@ -125,6 +130,7 @@ export class ServerCollision {
 
   /**
    * Convert a shared brush trace result into the server collision trace shape.
+   * @returns The server collision trace derived from the shared brush trace.
    */
   _toServerTrace(brushTrace: SharedTrace, ent: ServerEdict | null): CollisionTrace {
     if (ent !== null) {
@@ -149,6 +155,7 @@ export class ServerCollision {
 
   /**
    * Returns true when the provided model is a brush model.
+   * @returns True when the model is a brush model.
    */
   _isBrushModel(model: CollisionModel): model is BrushModel {
     return model instanceof BrushModel;
@@ -156,6 +163,7 @@ export class ServerCollision {
 
   /**
    * Returns true when the provided model is a mesh model.
+   * @returns True when the model is a mesh model.
    */
   _isMeshModel(model: CollisionModel): model is MeshModel {
     return model instanceof MeshModel;
@@ -163,6 +171,7 @@ export class ServerCollision {
 
   /**
    * Determine whether a trace is point-sized.
+   * @returns True when the trace extents represent a point trace.
    */
   _isPointTrace(mins: Vector, maxs: Vector): boolean {
     return mins.isOrigin() && maxs.isOrigin();
@@ -204,6 +213,7 @@ export class ServerCollision {
   /**
    * Legacy hull point traces remain the compatibility baseline when brush and
    * hull BSP paths disagree about the first finite hit.
+   * @returns True when the legacy hull result should override the brush result.
    */
   _shouldPreferHullPointTrace(brushTrace: CollisionTrace, hullTrace: CollisionTrace): boolean {
     if (hullTrace.fraction >= 1.0) {
@@ -224,6 +234,7 @@ export class ServerCollision {
   /**
    * Hull fallback is only safe for point traces whose BSP entity is not rotated,
    * because the legacy hull path does not apply entity angles.
+   * @returns True when the legacy hull fallback is safe for this trace.
    */
   _canUseHullPointFallback(state: BrushCollisionState, mins: Vector, maxs: Vector): boolean {
     if (!this._isPointTrace(mins, maxs)) {
@@ -240,6 +251,7 @@ export class ServerCollision {
   /**
    * Trace a BSP entity through the shared brush path and cross-check supported
    * point traces against the legacy hull path to avoid false early hits.
+   * @returns The preferred collision trace for the BSP entity.
    */
   _clipMoveToBrushStateWithHullFallback(
     state: BrushCollisionState,
@@ -275,6 +287,7 @@ export class ServerCollision {
   /**
    * Run the shared brush trace path for a BSP entity, including zero-length
    * position tests that must avoid swept-trace startsolid artifacts.
+   * @returns The shared brush trace result.
    */
   _traceBrushModel(
     model: BrushModel,
@@ -320,6 +333,7 @@ export class ServerCollision {
 
   /**
    * Trace against an entity through the shared brush path.
+   * @returns The collision trace against the brush-backed entity.
    */
   _clipMoveToBrushState(state: BrushCollisionState, start: Vector, mins: Vector, maxs: Vector, end: Vector): CollisionTrace {
     return this._clipMoveToBrushStateWithHullFallback(state, start, mins, maxs, end);
@@ -327,6 +341,7 @@ export class ServerCollision {
 
   /**
    * Trace against an entity through the legacy hull path.
+   * @returns The collision trace against the legacy hull-backed entity.
    */
   _clipMoveToHullState(state: HullCollisionState, start: Vector, mins: Vector, maxs: Vector, end: Vector): CollisionTrace {
     const trace = CollisionTrace.hullInitial(end);
@@ -352,6 +367,7 @@ export class ServerCollision {
   /**
    * Trace a line through a specific legacy hull without exposing clipnode walks
    * to higher-level callers.
+   * @returns The collision trace through the legacy hull.
    */
   _traceLegacyHullLine(hull: Hull, start: Vector, end: Vector): CollisionTrace {
     const trace = CollisionTrace.hullInitial(end);
@@ -361,6 +377,7 @@ export class ServerCollision {
 
   /**
    * Determines the contents inside a hull by descending the clipnode tree.
+   * @returns The contents value at the point within the hull.
    */
   hullPointContents(hull: Hull, num: number, p: Vector): number {
     return legacyHullPointContents(hull, num, p);
@@ -368,6 +385,7 @@ export class ServerCollision {
 
   /**
    * Normalize static-world contents values so current volumes behave like water.
+   * @returns The normalized contents value.
    */
   _normalizeStaticWorldContents(contents: number): number {
     if ((contents <= Defs.content.CONTENT_CURRENT_0) && (contents >= Defs.content.CONTENT_CURRENT_DOWN)) {
@@ -380,6 +398,7 @@ export class ServerCollision {
   /**
    * Sample the contents of a brush-backed world without exposing brush internals
    * to higher-level callers.
+   * @returns The contents sampled from the brush-backed world.
    */
   _pointContentsBrushStaticWorld(worldModel: BrushModel, point: Vector): number {
     if (!BrushTrace.transformedTestPosition(
@@ -399,6 +418,7 @@ export class ServerCollision {
   /**
    * Sample static-world contents using the best collision backend for the
    * active map.
+   * @returns The static-world contents at the sampled point.
    */
   staticWorldContents(point: Vector, hullNum = 0): number {
     const { worldModel } = this._getStaticWorldSource();
@@ -416,6 +436,7 @@ export class ServerCollision {
 
   /**
    * Compatibility alias for staticWorldContents.
+   * @returns The static-world contents at the sampled point.
    */
   worldContents(point: Vector, hullNum = 0): number {
     return this.staticWorldContents(point, hullNum);
@@ -423,6 +444,7 @@ export class ServerCollision {
 
   /**
    * Compatibility alias for staticWorldContents.
+   * @returns The static-world contents at the sampled point.
    */
   pointContents(p: Vector, hullNum = 0): number {
     return this.staticWorldContents(p, hullNum);
@@ -431,6 +453,7 @@ export class ServerCollision {
   /**
    * Trace static-world geometry using the best collision backend for the active
    * map.
+   * @returns The collision trace through static world geometry.
    */
   traceStaticWorld(start: Vector, mins: Vector, maxs: Vector, end: Vector, hullNum = 0): CollisionTrace {
     const { worldEntity, worldModel } = this._getStaticWorldSource();
@@ -463,6 +486,7 @@ export class ServerCollision {
 
   /**
    * Compatibility alias for traceStaticWorld.
+   * @returns The collision trace through static world geometry.
    */
   traceWorld(start: Vector, mins: Vector, maxs: Vector, end: Vector, hullNum = 0): CollisionTrace {
     return this.traceStaticWorld(start, mins, maxs, end, hullNum);
@@ -470,6 +494,7 @@ export class ServerCollision {
 
   /**
    * Trace a point-sized line against the static world.
+   * @returns The collision trace through the static world line segment.
    */
   traceStaticWorldLine(start: Vector, end: Vector, hullNum = 0): CollisionTrace {
     return this.traceStaticWorld(start, Vector.origin, Vector.origin, end, hullNum);
@@ -477,6 +502,7 @@ export class ServerCollision {
 
   /**
    * Compatibility alias for traceStaticWorldLine.
+   * @returns The collision trace through the static world line segment.
    */
   traceWorldLine(start: Vector, end: Vector, hullNum = 0): CollisionTrace {
     return this.traceStaticWorldLine(start, end, hullNum);
@@ -484,6 +510,7 @@ export class ServerCollision {
 
   /**
    * Recursively tests a swept hull against the world and aggregates the trace result.
+   * @returns True when traversal should continue.
    */
   recursiveHullCheck(
     hull: Hull,
@@ -500,6 +527,7 @@ export class ServerCollision {
 
   /**
    * Tests whether a point lies inside a triangle using cross-product winding.
+   * @returns True when the point lies inside the triangle.
    */
   _pointInTriangle(p: Vector, v0: Vector, v1: Vector, v2: Vector, normal: Vector): boolean {
     // Small negative tolerance closes micro-gaps between adjacent triangles.
@@ -576,6 +604,7 @@ export class ServerCollision {
 
   /**
    * Build a mesh tracing context if the target entity has usable mesh data.
+   * @returns The mesh trace context, or `null` when mesh tracing is unavailable.
    */
   _createMeshTraceContext(ent: ServerEdict, start: Vector, mins: Vector, maxs: Vector, end: Vector): MeshTraceContext | null {
     const model = this._getEntityModel(ent);
@@ -592,6 +621,7 @@ export class ServerCollision {
    * (Minkowski sum) and tested for ray intersection. A DIST_EPSILON push-back
    * keeps the endpoint slightly in front of the surface, preventing the next
    * frame's trace from starting on or inside the plane.
+   * @returns The collision trace against the mesh entity.
    */
   clipMoveToMesh(ent: ServerEdict, start: Vector, mins: Vector, maxs: Vector, end: Vector): CollisionTrace {
     const trace = CollisionTrace.empty(end);
@@ -628,6 +658,7 @@ export class ServerCollision {
 
   /**
    * Traces a moving box against a target entity.
+   * @returns The collision trace against the target entity.
    */
   clipMoveToEntity(ent: ServerEdict, start: Vector, mins: Vector, maxs: Vector, end: Vector): CollisionTrace {
     const state = this._getEntityCollisionState(ent) ?? this._getHullFallbackState(ent);
@@ -637,6 +668,7 @@ export class ServerCollision {
 
   /**
    * Trace against a target entity using its pre-resolved collision state.
+   * @returns The collision trace against the target entity.
    */
   _clipMoveToEntityWithState(state: CollisionState, start: Vector, mins: Vector, maxs: Vector, end: Vector): CollisionTrace {
     if (state instanceof MeshCollisionState) {
@@ -653,6 +685,7 @@ export class ServerCollision {
   /**
    * Select the extents used to trace against a touched entity.
    * Missiles expand only against monsters.
+   * @returns The mins and maxs used for the narrow-phase trace.
    */
   _getTouchTraceExtents(clip: MoveClip, touch: ServerEdict): TraceExtents {
     if ((touch.entity!.flags & Defs.flags.FL_MONSTER) !== 0) {
@@ -664,6 +697,7 @@ export class ServerCollision {
 
   /**
    * Determine whether a touched entity should be skipped before narrow-phase tracing.
+   * @returns True when the touched entity should be ignored.
    */
   _shouldSkipTouch(clip: MoveClip, touch: ServerEdict): boolean {
     const touchEntity = touch.entity!;
@@ -699,6 +733,7 @@ export class ServerCollision {
 
   /**
    * Check whether a touched entity overlaps the clip broadphase box.
+   * @returns True when the touched entity overlaps the broadphase bounds.
    */
   _touchOverlapsClipBounds(clip: MoveClip, touch: ServerEdict): boolean {
     const touchEntity = touch.entity!;
@@ -715,6 +750,7 @@ export class ServerCollision {
 
   /**
    * Run narrow-phase tracing against a touched entity using the correct extents.
+   * @returns The collision trace against the touched entity.
    */
   _traceTouch(clip: MoveClip, touch: ServerEdict): CollisionTrace {
     const touchState = this._getEntityCollisionState(touch) ?? this._getHullFallbackState(touch);
@@ -763,6 +799,7 @@ export class ServerCollision {
 
   /**
    * Build the clip context used to trace a move through the world and dynamic entities.
+   * @returns The initialized move clip context.
    */
   _createMoveClip(
     start: Vector,
@@ -831,6 +868,7 @@ export class ServerCollision {
 
   /**
    * Fully traces a moving box through the world.
+   * @returns The final collision trace for the move.
    */
   move(
     start: Vector,
@@ -849,6 +887,7 @@ export class ServerCollision {
 
   /**
    * Tests whether an entity is currently stuck in solid geometry.
+   * @returns True when the entity starts in solid.
    */
   testEntityPosition(ent: ServerEdict): boolean {
     const entity = ent.entity!;

From c80732cbf7219d3378126d481dc3f4bbc5dbad82 Mon Sep 17 00:00:00 2001
From: Christian R <github@chrisnew.de>
Date: Fri, 3 Apr 2026 12:59:08 +0300
Subject: [PATCH 32/67] TS: server/ part 1

---
 source/engine/server/Client.mjs            |  2 +-
 source/engine/server/DummyWorker.mjs       | 31 +------
 source/engine/server/DummyWorker.ts        | 31 +++++++
 source/engine/server/GameLoader.d.ts       | 18 ----
 source/engine/server/GameLoader.mjs        | 31 +------
 source/engine/server/GameLoader.ts         | 48 +++++++++++
 source/engine/server/NavigationWorker.mjs  | 32 +-------
 source/engine/server/NavigationWorker.ts   | 33 ++++++++
 source/engine/server/Server.mjs            | 69 +---------------
 source/engine/server/ServerEntityState.mjs | 70 +---------------
 source/engine/server/ServerEntityState.ts  | 95 ++++++++++++++++++++++
 test/physics/server-entity-state.test.mjs  | 41 ++++++++++
 12 files changed, 255 insertions(+), 246 deletions(-)
 create mode 100644 source/engine/server/DummyWorker.ts
 delete mode 100644 source/engine/server/GameLoader.d.ts
 create mode 100644 source/engine/server/GameLoader.ts
 create mode 100644 source/engine/server/NavigationWorker.ts
 create mode 100644 source/engine/server/ServerEntityState.ts
 create mode 100644 test/physics/server-entity-state.test.mjs

diff --git a/source/engine/server/Client.mjs b/source/engine/server/Client.mjs
index 96d0abf0..b3870b38 100644
--- a/source/engine/server/Client.mjs
+++ b/source/engine/server/Client.mjs
@@ -5,7 +5,7 @@ import { SzBuffer } from '../network/MSG.ts';
 import { QSocket } from '../network/NetworkDrivers.ts';
 import * as Protocol from '../network/Protocol.ts';
 import { eventBus, registry } from '../registry.mjs';
-import { ServerEntityState } from './Server.mjs';
+import { ServerEntityState } from './ServerEntityState.mjs';
 
 let { SV } = registry;
 
diff --git a/source/engine/server/DummyWorker.mjs b/source/engine/server/DummyWorker.mjs
index 4c90b5a0..4d396172 100644
--- a/source/engine/server/DummyWorker.mjs
+++ b/source/engine/server/DummyWorker.mjs
@@ -1,31 +1,2 @@
-import WorkerFramework from '../common/WorkerFramework.ts';
-import { eventBus, registry } from '../registry.mjs';
+import './DummyWorker.ts';
 
-await WorkerFramework.Init();
-
-const { Con } = registry;
-
-eventBus.subscribe('worker.test', (message) => {
-  if (message) {
-    Con.Print(`Reading back: ${message}\n`);
-  }
-
-  Con.Print('Dummy Worker reporting back!\n');
-});
-
-eventBus.subscribe('worker.busy', (timeInMillis) => {
-  const start = Date.now();
-
-  let number = 0;
-
-  while (Date.now() - start < +timeInMillis) {
-    // Busy wait
-    number += Math.sqrt(Math.random());
-  }
-
-  Con.Print(`Dummy Worker finished busy work of ${timeInMillis} ms, calculated number: ${number}\n`);
-});
-
-eventBus.subscribe('worker.error', () => {
-  throw new Error('This is a test error from the Dummy Worker!');
-});
diff --git a/source/engine/server/DummyWorker.ts b/source/engine/server/DummyWorker.ts
new file mode 100644
index 00000000..717c1715
--- /dev/null
+++ b/source/engine/server/DummyWorker.ts
@@ -0,0 +1,31 @@
+import WorkerFramework from '../common/WorkerFramework.ts';
+import { eventBus, registry } from '../registry.mjs';
+
+await WorkerFramework.Init();
+
+const { Con } = registry;
+
+eventBus.subscribe('worker.test', (message: string | null) => {
+  if (message) {
+    Con.Print(`Reading back: ${message}\n`);
+  }
+
+  Con.Print('Dummy Worker reporting back!\n');
+});
+
+eventBus.subscribe('worker.busy', (timeInMillis: number | string) => {
+  const start = Date.now();
+  const duration = Number(timeInMillis);
+  let number = 0;
+
+  while (Date.now() - start < duration) {
+    // Busy wait
+    number += Math.sqrt(Math.random());
+  }
+
+  Con.Print(`Dummy Worker finished busy work of ${duration} ms, calculated number: ${number}\n`);
+});
+
+eventBus.subscribe('worker.error', () => {
+  throw new Error('This is a test error from the Dummy Worker!');
+});
diff --git a/source/engine/server/GameLoader.d.ts b/source/engine/server/GameLoader.d.ts
deleted file mode 100644
index 18c65642..00000000
--- a/source/engine/server/GameLoader.d.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import { ClientGameConstructor, ServerGameConstructor } from '../../shared/GameInterfaces.ts';
-import { gameCapabilities } from '../../shared/Defs.ts';
-
-export interface GameModuleIdentification {
-  name: string;
-  author: string;
-  version: [number, number, number];
-  capabilities: gameCapabilities[];
-}
-
-export interface GameModuleInterface {
-  identification: GameModuleIdentification,
-  ServerGameAPI: ServerGameConstructor;
-  ClientGameAPI: ClientGameConstructor;
-};
-
-export async function loadGameModule(gameDir: string): Promise<GameModuleInterface>;
-
diff --git a/source/engine/server/GameLoader.mjs b/source/engine/server/GameLoader.mjs
index 254f0321..92b0ff46 100644
--- a/source/engine/server/GameLoader.mjs
+++ b/source/engine/server/GameLoader.mjs
@@ -1,31 +1,2 @@
-let gameModules = {};
+export { loadGameModule } from './GameLoader.ts';
 
-// CR: dear future self, do not try to optimize this import.meta.glob usage further.
-try {
-  // @ts-ignore - import.meta.glob is a Vite-specific feature
-  gameModules = import.meta.glob('../../game/**/main.mjs');
-// eslint-disable-next-line no-unused-vars
-} catch (e) {
-  // Not in Vite environment
-}
-
-/**
- * Loads a game module by directory name
- * @param {string} gameDir - The game directory name (e.g., 'id1', etc.)
- * @returns {Promise<import("./GameLoader").GameModuleInterface>} The loaded game module
- */
-export async function loadGameModule(gameDir) {
-  const modulePath = `../../game/${gameDir}/main.mjs`;
-
-  // Try the pre-bundled modules first (Vite production build)
-  if (gameModules[modulePath]) {
-    return await gameModules[modulePath]();
-  }
-
-  // Fallback to dynamic import
-  try {
-    return await import(/* @vite-ignore */ modulePath);
-  } catch (e) {
-    throw new Error(`Game module not found: ${gameDir} (${e.message})`);
-  }
-};
diff --git a/source/engine/server/GameLoader.ts b/source/engine/server/GameLoader.ts
new file mode 100644
index 00000000..f0bf8774
--- /dev/null
+++ b/source/engine/server/GameLoader.ts
@@ -0,0 +1,48 @@
+import type { ClientGameConstructor, ServerGameConstructor } from '../../shared/GameInterfaces.ts';
+
+import { gameCapabilities } from '../../shared/Defs.ts';
+
+export interface GameModuleIdentification {
+  readonly name: string;
+  readonly author: string;
+  readonly version: readonly [number, number, number];
+  readonly capabilities: readonly gameCapabilities[];
+}
+
+export interface GameModuleInterface {
+  readonly identification: GameModuleIdentification;
+  readonly ServerGameAPI: ServerGameConstructor;
+  readonly ClientGameAPI: ClientGameConstructor;
+}
+
+type GameModuleLoader = () => Promise<GameModuleInterface>;
+
+let gameModules: Record<string, GameModuleLoader> = {};
+
+// CR: dear future self, do not try to optimize this import.meta.glob usage further.
+try {
+  gameModules = import.meta.glob('../../game/**/main.mjs') as Record<string, GameModuleLoader>;
+} catch (_error) {
+  // Not in Vite environment
+}
+
+/**
+ * Loads a game module by directory name.
+ * @returns The loaded game module.
+ */
+export async function loadGameModule(gameDir: string): Promise<GameModuleInterface> {
+  const modulePath = `../../game/${gameDir}/main.mjs`;
+
+  // Try the pre-bundled modules first (Vite production build)
+  if (gameModules[modulePath]) {
+    return await gameModules[modulePath]();
+  }
+
+  // Fallback to dynamic import
+  try {
+    return await import(/* @vite-ignore */ modulePath) as GameModuleInterface;
+  } catch (error) {
+    const message = error instanceof Error ? error.message : String(error);
+    throw new Error(`Game module not found: ${gameDir} (${message})`);
+  }
+}
diff --git a/source/engine/server/NavigationWorker.mjs b/source/engine/server/NavigationWorker.mjs
index d169d678..667f48ed 100644
--- a/source/engine/server/NavigationWorker.mjs
+++ b/source/engine/server/NavigationWorker.mjs
@@ -1,33 +1,3 @@
-import WorkerFramework from '../common/WorkerFramework.ts';
-import { eventBus, registry } from '../registry.mjs';
+import './NavigationWorker.ts';
 
-import { Navigation, NavMeshOutOfDateException } from './Navigation.mjs';
-import Vector from '../../shared/Vector.ts';
-
-await WorkerFramework.Init();
-
-const { Con } = registry;
-
-const navigation = new Navigation();
-
-eventBus.subscribe('nav.load', async (mapname, checksum) => {
-  Con.DPrint('Navigation: loading navigation graph...\n');
-
-  try {
-    await navigation.load(mapname, checksum);
-
-    Con.DPrint('Navigation: navigation graph loaded on worker thread!\n');
-  } catch (e) {
-    // unusable navmesh, trigger a rebuild
-    if (e instanceof NavMeshOutOfDateException) {
-      WorkerFramework.Publish('nav.build');
-    }
-  }
-});
-
-eventBus.subscribe('nav.path.request', (id, start, end) => {
-  const path = navigation.findPath(new Vector(...start), new Vector(...end));
-
-  WorkerFramework.Publish('nav.path.response', id, path);
-});
 
diff --git a/source/engine/server/NavigationWorker.ts b/source/engine/server/NavigationWorker.ts
new file mode 100644
index 00000000..623d83ff
--- /dev/null
+++ b/source/engine/server/NavigationWorker.ts
@@ -0,0 +1,33 @@
+import WorkerFramework from '../common/WorkerFramework.ts';
+import { eventBus, registry } from '../registry.mjs';
+
+import { Navigation, NavMeshOutOfDateException } from './Navigation.mjs';
+import Vector from '../../shared/Vector.ts';
+
+type WorkerVectorLike = ArrayLike<number>;
+
+await WorkerFramework.Init();
+
+const { Con } = registry;
+const navigation = new Navigation();
+
+eventBus.subscribe('nav.load', async (mapname: string, checksum: number | null) => {
+  Con.DPrint('Navigation: loading navigation graph...\n');
+
+  try {
+    await navigation.load(mapname, checksum);
+
+    Con.DPrint('Navigation: navigation graph loaded on worker thread!\n');
+  } catch (error) {
+    // unusable navmesh, trigger a rebuild
+    if (error instanceof NavMeshOutOfDateException) {
+      WorkerFramework.Publish('nav.build');
+    }
+  }
+});
+
+eventBus.subscribe('nav.path.request', (id: string, start: WorkerVectorLike, end: WorkerVectorLike) => {
+  const path = navigation.findPath(new Vector(...start), new Vector(...end));
+
+  WorkerFramework.Publish('nav.path.response', id, path);
+});
diff --git a/source/engine/server/Server.mjs b/source/engine/server/Server.mjs
index 7bde8bbe..e04e7825 100644
--- a/source/engine/server/Server.mjs
+++ b/source/engine/server/Server.mjs
@@ -1,6 +1,5 @@
 import Cvar from '../common/Cvar.ts';
 import { MoveVars, Pmove } from '../common/Pmove.ts';
-import Vector from '../../shared/Vector.ts';
 import { SzBuffer } from '../network/MSG.ts';
 import * as Protocol from '../network/Protocol.ts';
 import * as Def from './../common/Def.ts';
@@ -19,6 +18,7 @@ import { ServerCollision } from './physics/ServerCollision.ts';
 import { sharedCollisionModelSource } from '../common/CollisionModelSource.ts';
 import { BrushModel } from '../common/Mod.ts';
 import { ServerClient } from './Client.mjs';
+export { ServerEntityState } from './ServerEntityState.mjs';
 
 let { COM, Con, Host, Mod, NET, PR } = registry;
 
@@ -38,7 +38,7 @@ eventBus.subscribe('registry.frozen', () => {
       startsolid: boolean;
       endpos: any;
       plane: {
-          normal: Vector;
+      normal: import('../../shared/Vector.ts').Vector;
           dist: number;
       };
       ent: any;
@@ -71,71 +71,6 @@ const ALLOWED_CLIENT_COMMANDS = [
   'ban',
 ];
 
-export class ServerEntityState { // TODO: extends Protocol.EntityState
-  constructor(num = null) {
-    this.num = num;
-    this.flags = 0;
-    this.origin = new Vector(Infinity, Infinity, Infinity);
-    this.angles = new Vector(Infinity, Infinity, Infinity);
-    this.modelindex = 0;
-    this.frame = 0;
-    this.colormap = 0;
-    this.skin = 0;
-    this.effects = 0;
-    this.alpha = 1.0;
-    this.solid = 0;
-    this.free = false;
-    this.classname = null;
-    this.mins = new Vector();
-    this.maxs = new Vector();
-    this.velocity = new Vector(0, 0, 0);
-    this.nextthink = 0;
-
-    /** @type {Record<string, SerializableType>} */
-    this.extended = {};
-  }
-
-  /** @param {ServerEntityState} other other state to copy */
-  set(other) {
-    this.num = other.num;
-    this.flags = other.flags;
-    this.origin.set(other.origin);
-    this.angles.set(other.angles);
-    this.velocity.set(other.velocity);
-    this.modelindex = other.modelindex;
-    this.frame = other.frame;
-    this.colormap = other.colormap;
-    this.skin = other.skin;
-    this.effects = other.effects;
-    this.solid = other.solid;
-    this.free = other.free;
-    this.classname = other.classname;
-    this.mins.set(other.mins);
-    this.maxs.set(other.maxs);
-    this.nextthink = other.nextthink;
-
-    for (const [key, value] of Object.entries(other.extended)) {
-      this.extended[key] = value;
-    }
-  }
-
-  freeEdict() {
-    this.free = true;
-    this.flags = 0;
-    this.angles.setTo(Infinity, Infinity, Infinity);
-    this.origin.setTo(Infinity, Infinity, Infinity);
-    this.velocity.setTo(0, 0, 0);
-    this.nextthink = 0;
-    this.modelindex = 0;
-    this.frame = 0;
-    this.colormap = 0;
-    this.skin = 0;
-    this.effects = 0;
-    this.solid = 0;
-    this.classname = null;
-  }
-}
-
 /**
  * Main server class with all server-related functionality.
  * All properties and methods are static.
diff --git a/source/engine/server/ServerEntityState.mjs b/source/engine/server/ServerEntityState.mjs
index 6879543a..5d615b9d 100644
--- a/source/engine/server/ServerEntityState.mjs
+++ b/source/engine/server/ServerEntityState.mjs
@@ -1,70 +1,2 @@
-import Vector from '../../shared/Vector.ts';
+export { ServerEntityState } from './ServerEntityState.ts';
 
-/** @typedef {import('../../shared/GameInterfaces').SerializableType} SerializableType */
-
-export class ServerEntityState {
-  constructor(num = null) {
-    this.num = num;
-    this.flags = 0;
-    this.origin = new Vector(Infinity, Infinity, Infinity);
-    this.angles = new Vector(Infinity, Infinity, Infinity);
-    this.modelindex = 0;
-    this.frame = 0;
-    this.colormap = 0;
-    this.skin = 0;
-    this.effects = 0;
-    this.alpha = 1;
-    this.solid = 0;
-    this.free = false;
-    this.classname = null;
-    this.mins = new Vector();
-    this.maxs = new Vector();
-    this.velocity = new Vector(0, 0, 0);
-    this.nextthink = 0;
-
-    /** @type {Record<string, SerializableType>} */
-    this.extended = {};
-  }
-
-  /** @param {ServerEntityState} other other state to copy */
-  set(other) {
-    this.num = other.num;
-    this.flags = other.flags;
-    this.origin.set(other.origin);
-    this.angles.set(other.angles);
-    this.velocity.set(other.velocity);
-    this.modelindex = other.modelindex;
-    this.frame = other.frame;
-    this.colormap = other.colormap;
-    this.skin = other.skin;
-    this.effects = other.effects;
-    this.alpha = other.alpha;
-    this.solid = other.solid;
-    this.free = other.free;
-    this.classname = other.classname;
-    this.mins.set(other.mins);
-    this.maxs.set(other.maxs);
-    this.nextthink = other.nextthink;
-
-    for (const [key, value] of Object.entries(other.extended)) {
-      this.extended[key] = value;
-    }
-  }
-
-  freeEdict() {
-    this.free = true;
-    this.flags = 0;
-    this.angles.setTo(Infinity, Infinity, Infinity);
-    this.origin.setTo(Infinity, Infinity, Infinity);
-    this.velocity.setTo(0, 0, 0);
-    this.nextthink = 0;
-    this.modelindex = 0;
-    this.frame = 0;
-    this.colormap = 0;
-    this.skin = 0;
-    this.effects = 0;
-    this.alpha = 1;
-    this.solid = 0;
-    this.classname = null;
-  }
-};
diff --git a/source/engine/server/ServerEntityState.ts b/source/engine/server/ServerEntityState.ts
new file mode 100644
index 00000000..a0cf38de
--- /dev/null
+++ b/source/engine/server/ServerEntityState.ts
@@ -0,0 +1,95 @@
+import type { SerializableType } from '../../shared/GameInterfaces.ts';
+
+import Vector from '../../shared/Vector.ts';
+
+/**
+ * Stores the per-entity network state used for delta compression.
+ */
+export class ServerEntityState {
+  num: number | null;
+  flags: number;
+  readonly origin: Vector;
+  readonly angles: Vector;
+  modelindex: number;
+  frame: number;
+  colormap: number;
+  skin: number;
+  effects: number;
+  alpha: number;
+  solid: number;
+  free: boolean;
+  classname: string | null;
+  readonly mins: Vector;
+  readonly maxs: Vector;
+  readonly velocity: Vector;
+  nextthink: number;
+  readonly extended: Record<string, SerializableType>;
+
+  constructor(num: number | null = null) {
+    this.num = num;
+    this.flags = 0;
+    this.origin = new Vector(Infinity, Infinity, Infinity);
+    this.angles = new Vector(Infinity, Infinity, Infinity);
+    this.modelindex = 0;
+    this.frame = 0;
+    this.colormap = 0;
+    this.skin = 0;
+    this.effects = 0;
+    this.alpha = 1.0;
+    this.solid = 0;
+    this.free = false;
+    this.classname = null;
+    this.mins = new Vector();
+    this.maxs = new Vector();
+    this.velocity = new Vector(0, 0, 0);
+    this.nextthink = 0;
+    this.extended = {};
+  }
+
+  /**
+   * Copies the full state from another entity snapshot.
+   */
+  set(other: ServerEntityState): void {
+    this.num = other.num;
+    this.flags = other.flags;
+    this.origin.set(other.origin);
+    this.angles.set(other.angles);
+    this.velocity.set(other.velocity);
+    this.modelindex = other.modelindex;
+    this.frame = other.frame;
+    this.colormap = other.colormap;
+    this.skin = other.skin;
+    this.effects = other.effects;
+    this.alpha = other.alpha;
+    this.solid = other.solid;
+    this.free = other.free;
+    this.classname = other.classname;
+    this.mins.set(other.mins);
+    this.maxs.set(other.maxs);
+    this.nextthink = other.nextthink;
+
+    for (const [key, value] of Object.entries(other.extended)) {
+      this.extended[key] = value;
+    }
+  }
+
+  /**
+   * Marks the state as free and restores the default baseline values.
+   */
+  freeEdict(): void {
+    this.free = true;
+    this.flags = 0;
+    this.angles.setTo(Infinity, Infinity, Infinity);
+    this.origin.setTo(Infinity, Infinity, Infinity);
+    this.velocity.setTo(0, 0, 0);
+    this.nextthink = 0;
+    this.modelindex = 0;
+    this.frame = 0;
+    this.colormap = 0;
+    this.skin = 0;
+    this.effects = 0;
+    this.alpha = 1.0;
+    this.solid = 0;
+    this.classname = null;
+  }
+}
diff --git a/test/physics/server-entity-state.test.mjs b/test/physics/server-entity-state.test.mjs
new file mode 100644
index 00000000..2b24ff00
--- /dev/null
+++ b/test/physics/server-entity-state.test.mjs
@@ -0,0 +1,41 @@
+import { describe, test } from 'node:test';
+import assert from 'node:assert/strict';
+
+import { ServerEntityState as ReExportedServerEntityState } from '../../source/engine/server/Server.mjs';
+import { ServerEntityState } from '../../source/engine/server/ServerEntityState.mjs';
+
+void describe('ServerEntityState', () => {
+  void test('re-exports the canonical implementation from Server.mjs', () => {
+    assert.equal(ReExportedServerEntityState, ServerEntityState);
+  });
+
+  void test('copies and resets alpha with the rest of the entity state', () => {
+    const sourceState = new ServerEntityState(12);
+    sourceState.flags = 4;
+    sourceState.origin.setTo(1, 2, 3);
+    sourceState.angles.setTo(4, 5, 6);
+    sourceState.velocity.setTo(7, 8, 9);
+    sourceState.alpha = 0.25;
+    sourceState.nextthink = 0.3;
+    sourceState.classname = 'func_door';
+    sourceState.extended.renderfx = 7;
+
+    const copiedState = new ServerEntityState();
+    copiedState.set(sourceState);
+
+    assert.equal(copiedState.alpha, 0.25);
+    assert.equal(copiedState.nextthink, 0.3);
+    assert.equal(copiedState.classname, 'func_door');
+    assert.deepEqual([...copiedState.origin], [1, 2, 3]);
+    assert.deepEqual([...copiedState.velocity], [7, 8, 9]);
+    assert.equal(copiedState.extended.renderfx, 7);
+
+    copiedState.freeEdict();
+
+    assert.equal(copiedState.free, true);
+    assert.equal(copiedState.alpha, 1.0);
+    assert.equal(copiedState.classname, null);
+    assert.deepEqual([...copiedState.origin], [Infinity, Infinity, Infinity]);
+    assert.deepEqual([...copiedState.velocity], [0, 0, 0]);
+  });
+});

From fb21fb36c75ec7b447cf090c076bc272dbbcd37d Mon Sep 17 00:00:00 2001
From: Christian R <github@chrisnew.de>
Date: Fri, 3 Apr 2026 13:39:18 +0300
Subject: [PATCH 33/67] TS: server/ part 2

---
 source/engine/common/Host.ts       |    2 +-
 source/engine/server/Client.mjs    |  231 +-----
 source/engine/server/Client.ts     |  250 +++++++
 source/engine/server/Edict.mjs     |  699 +-----------------
 source/engine/server/Edict.ts      |  819 +++++++++++++++++++++
 source/engine/server/Server.mjs    | 1101 +---------------------------
 source/engine/server/Server.ts     | 1055 ++++++++++++++++++++++++++
 test/physics/server-edict.test.mjs |   28 +
 test/physics/server.test.mjs       |    6 +-
 9 files changed, 2161 insertions(+), 2030 deletions(-)
 create mode 100644 source/engine/server/Client.ts
 create mode 100644 source/engine/server/Edict.ts
 create mode 100644 source/engine/server/Server.ts
 create mode 100644 test/physics/server-edict.test.mjs

diff --git a/source/engine/common/Host.ts b/source/engine/common/Host.ts
index ff5b7dd1..a77335ad 100644
--- a/source/engine/common/Host.ts
+++ b/source/engine/common/Host.ts
@@ -733,7 +733,7 @@ export default class Host {
         Q.secsToTime(NET.time - client.netconnection.connecttime).padEnd(9),
         client.ping.toFixed(0).padStart(4),
         Number(0).toFixed(0).padStart(4), // TODO: add loss
-        ServerClient.STATE.toKey(client.state).padEnd(10),
+        (ServerClient.STATE[client.state] ?? `unknown (${client.state})`).padEnd(10),
         client.netconnection.address,
       ];
 
diff --git a/source/engine/server/Client.mjs b/source/engine/server/Client.mjs
index b3870b38..4c9b7e38 100644
--- a/source/engine/server/Client.mjs
+++ b/source/engine/server/Client.mjs
@@ -1,230 +1 @@
-import { enumHelpers } from '../../shared/Q.ts';
-import { gameCapabilities } from '../../shared/Defs.ts';
-import Vector from '../../shared/Vector.ts';
-import { SzBuffer } from '../network/MSG.ts';
-import { QSocket } from '../network/NetworkDrivers.ts';
-import * as Protocol from '../network/Protocol.ts';
-import { eventBus, registry } from '../registry.mjs';
-import { ServerEntityState } from './ServerEntityState.mjs';
-
-let { SV } = registry;
-
-eventBus.subscribe('registry.frozen', () => {
-  SV = registry.SV;
-});
-
-/** @typedef {import('./Edict.mjs').ServerEdict} ServerEdict */
-/** @typedef {import('../../shared/GameInterfaces').PlayerEntitySpawnParamsDynamic} PlayerEntitySpawnParamsDynamic */
-
-export class ServerClient {
-  static STATE = Object.freeze({
-    /** drop client as soon as possible */
-    DROPASAP: -1,
-    /** free client slot, can be reused for a new connection */
-    FREE: 0,
-    /** client is connecting, but not yet fully connected (signon = 1) */
-    CONNECTING: 1,
-    /** has been assigned to a client, but not in game yet (signon = 2) */
-    CONNECTED: 2,
-    /** client is fully in game */
-    SPAWNED: 3,
-
-    ...enumHelpers,
-  });
-
-  /**
-   * @param {number} num client number
-   */
-  constructor(num) {
-    /** @type {number} @see {ServerClient.STATE} */
-    this.state = ServerClient.STATE.FREE;
-    this.num = num;
-    /** @type {SzBuffer} messages sent after an entity update run */
-    this.message = new SzBuffer(16000, 'ServerClient ' + num);
-    this.message.allowoverflow = true;
-    /** @type {SzBuffer} messages sent before an entity update run */
-    this.expedited_message = new SzBuffer(4000, 'ServerClient expedited ' + num);
-    this.expedited_message.allowoverflow = true;
-    this.colors = 0;
-    this.old_frags = 0;
-    /** @type {number} last update sent to the client */
-    this.last_update = 0;
-    /** @type {number} last Host.realtime when all ping times have been sent */
-    this.last_ping_update = 0;
-    this.ping_times = new Array(16);
-    this.num_pings = 0;
-    /** @type {?QSocket} */
-    this.netconnection = null;
-
-    /** @type {number} the SV.server.time when the last command was processed */
-    this.local_time = 0.0;
-
-    /** @type {number} SV.server.time read back from the client */
-    this.sync_time = 0.0;
-
-    /** spawn parms are carried from level to level */
-    this.spawn_parms = null;
-
-    this.cmd = new Protocol.UserCmd();
-    this.lastcmd = new Protocol.UserCmd();
-    this.frames = [];
-
-    /**
-     * Queued move commands received since the last physics tick.
-     * In remote multiplayer the client may send several commands between
-     * server frames, each is pushed here and drained by physicsClient
-     * so that every command is simulated with its original msec,
-     * matching client-side prediction exactly (QW-style).
-     * @type {Protocol.UserCmd[]}
-     */
-    this.pendingCmds = [];
-
-    /** @type {Map<string,ServerEntityState>} olds entity states for this player only @private */
-    this._entityStates = new Map();
-
-    this.wishdir = new Vector();
-
-    /** @type {number} Q2-style player movement flags (PMF bitmask), persisted across frames */
-    this.pmFlags = 0;
-    /** @type {number} Q2-style timing counter for special states (msec/8 units) */
-    this.pmTime = 0;
-    /** @type {number} previous frame button state for edge detection */
-    this.pmOldButtons = 0;
-    /** @type {number} last received move command sequence (0-255, for prediction ack) */
-    this.lastMoveSequence = 0;
-
-    // Object.seal(this);
-  }
-
-  toString() {
-    return `ServerClient (${this.num}, ${this.netconnection})`;
-  }
-
-  /** @type {ServerEdict} */
-  get edict() {
-    // clients are mapped to edicts with ids from 1 to maxclients
-    return SV.server.edicts[this.num + 1];
-  }
-
-  get entity() {
-    return this.edict.entity;
-  }
-
-  clear() {
-    this.state = ServerClient.STATE.FREE;
-    this.netconnection = null;
-    this.message.clear();
-    this.wishdir.clear();
-    this.colors = 0;
-    this.old_frags = 0;
-    this.last_ping_update = 0.0;
-    this.num_pings = 0;
-    this.ping_times.fill(0);
-    this.cmd.reset();
-    this.lastcmd.reset();
-    this.pendingCmds.length = 0;
-    this.last_update = 0.0;
-    this.sync_time = 0;
-    this._entityStates = new Map();
-    this.pmFlags = 0;
-    this.pmTime = 0;
-    this.pmOldButtons = 0;
-    this.lastMoveSequence = 0;
-
-    if (SV.server.gameCapabilities.includes(gameCapabilities.CAP_SPAWNPARMS_LEGACY)) {
-      this.spawn_parms = new Array(16);
-    } else {
-      this.spawn_parms = null;
-    }
-  }
-
-  /**
-   * Issues a changelevel to the specified map for this client.
-   * @param {string} mapname map name
-   */
-  changelevel(mapname) {
-    const reconnect = new SzBuffer(128);
-    reconnect.writeByte(Protocol.svc.changelevel);
-    reconnect.writeString(mapname);
-    this.netconnection.SendMessage(reconnect);
-
-    this._entityStates.clear();
-    this.cmd.reset();
-    this.lastcmd.reset();
-    this.pendingCmds.length = 0;
-    this.pmFlags = 0;
-    this.pmTime = 0;
-    this.pmOldButtons = 0;
-    this.lastMoveSequence = 0;
-  }
-
-  /**
-   * @param {number} num edict Id
-   * @returns {ServerEntityState} entity state
-   */
-  getEntityState(num) {
-    const key = num.toString();
-
-    if (!this._entityStates.has(key)) {
-      this._entityStates.set(key, new ServerEntityState(num));
-    }
-
-    return this._entityStates.get(key);
-  }
-
-  set name(/** @type {string} */ name) {
-    this.edict.entity.netname = name;
-  }
-
-  get name() {
-    if (this.state !== ServerClient.STATE.CONNECTED && this.state !== ServerClient.STATE.SPAWNED) {
-      return '';
-    }
-
-    console.assert('netname' in this.edict.entity, 'entity needs netname');
-
-    return this.edict.entity.netname ?? `client #${this.num}`;
-  }
-
-  get uniqueId() {
-    return 'N/A'; // TODO
-  }
-
-  get ping() {
-    return Math.round((this.ping_times.reduce((sum, elem) => sum + elem) / this.ping_times.length) * 1000) || 0;
-  }
-
-  saveSpawnparms() {
-    if (SV.server.gameCapabilities.includes(gameCapabilities.CAP_SPAWNPARMS_DYNAMIC)) {
-      this.spawn_parms = (this.edict.entity).saveSpawnParameters();
-      return;
-    }
-
-    if (SV.server.gameCapabilities.includes(gameCapabilities.CAP_SPAWNPARMS_LEGACY)) {
-      SV.server.gameAPI.SetChangeParms(this.edict);
-
-      this.spawn_parms = new Array(16);
-
-      for (let i = 0; i < this.spawn_parms.length; i++) {
-        this.spawn_parms[i] =  SV.server.gameAPI[`parm${i + 1}`];
-      }
-
-      return;
-    }
-  }
-
-  consolePrint(/** @type {string} */ message) {
-    this.message.writeByte(Protocol.svc.print);
-    this.message.writeString(message);
-  }
-
-  centerPrint(/** @type {string} */ message) {
-    this.message.writeByte(Protocol.svc.centerprint);
-    this.message.writeString(message);
-  }
-
-  sendConsoleCommands(/** @type {string} */ commandline) {
-    this.message.writeByte(Protocol.svc.stufftext);
-    this.message.writeString(commandline);
-  }
-};
+export { ServerClient } from './Client.ts';
diff --git a/source/engine/server/Client.ts b/source/engine/server/Client.ts
new file mode 100644
index 00000000..73caa94f
--- /dev/null
+++ b/source/engine/server/Client.ts
@@ -0,0 +1,250 @@
+import type { PlayerEntitySpawnParamsDynamic } from '../../shared/GameInterfaces.ts';
+import type { QSocket } from '../network/NetworkDrivers.ts';
+import type { BaseEntity, ServerEdict } from './Edict.mjs';
+
+import { gameCapabilities } from '../../shared/Defs.ts';
+import Vector from '../../shared/Vector.ts';
+import { SzBuffer } from '../network/MSG.ts';
+import * as Protocol from '../network/Protocol.ts';
+import { eventBus, getCommonRegistry } from '../registry.mjs';
+import { ServerEntityState } from './ServerEntityState.mjs';
+
+interface LegacySpawnParmsGameAPI {
+  SetChangeParms(clientEdict: ServerEdict): void;
+  [key: `parm${number}`]: number;
+}
+
+let { SV } = getCommonRegistry();
+
+eventBus.subscribe('registry.frozen', () => {
+  ({ SV } = getCommonRegistry());
+});
+
+export enum ServerClientState {
+  /** drop client as soon as possible */
+  DROPASAP = -1,
+  /** free client slot, can be reused for a new connection */
+  FREE = 0,
+  /** client is connecting, but not yet fully connected (signon = 1) */
+  CONNECTING = 1,
+  /** has been assigned to a client, but not in game yet (signon = 2) */
+  CONNECTED = 2,
+  /** client is fully in game */
+  SPAWNED = 3,
+}
+
+type ServerClientSpawnParameters = number[] | ReturnType<PlayerEntitySpawnParamsDynamic['saveSpawnParameters']> | null;
+type ServerClientEntity = BaseEntity & { netname?: string | null };
+type DynamicSpawnClientEntity = ServerClientEntity & PlayerEntitySpawnParamsDynamic;
+
+/**
+ * Runtime state for one connected or connectable server client slot.
+ */
+export class ServerClient {
+  static readonly STATE = ServerClientState;
+
+  state: ServerClientState;
+  readonly num: number;
+  readonly message: SzBuffer;
+  readonly expedited_message: SzBuffer;
+  colors: number;
+  old_frags: number;
+  last_update: number;
+  last_ping_update: number;
+  readonly ping_times: number[];
+  num_pings: number;
+  netconnection: QSocket | null;
+  local_time: number;
+  sync_time: number;
+  spawn_parms: ServerClientSpawnParameters;
+  readonly cmd: Protocol.UserCmd;
+  readonly lastcmd: Protocol.UserCmd;
+  readonly frames: number[];
+  readonly pendingCmds: Protocol.UserCmd[];
+  protected _entityStates: Map<string, ServerEntityState>;
+  readonly wishdir: Vector;
+  pmFlags: number;
+  pmTime: number;
+  pmOldButtons: number;
+  lastMoveSequence: number;
+
+  constructor(num: number) {
+    this.state = ServerClient.STATE.FREE;
+    this.num = num;
+    this.message = new SzBuffer(16000, `ServerClient ${num}`);
+    this.message.allowoverflow = true;
+    this.expedited_message = new SzBuffer(4000, `ServerClient expedited ${num}`);
+    this.expedited_message.allowoverflow = true;
+    this.colors = 0;
+    this.old_frags = 0;
+    this.last_update = 0;
+    this.last_ping_update = 0;
+    this.ping_times = new Array(16);
+    this.num_pings = 0;
+    this.netconnection = null;
+    this.local_time = 0.0;
+    this.sync_time = 0.0;
+    this.spawn_parms = null;
+    this.cmd = new Protocol.UserCmd();
+    this.lastcmd = new Protocol.UserCmd();
+    this.frames = [];
+    this.pendingCmds = [];
+    this._entityStates = new Map();
+    this.wishdir = new Vector();
+    this.pmFlags = 0;
+    this.pmTime = 0;
+    this.pmOldButtons = 0;
+    this.lastMoveSequence = 0;
+  }
+
+  toString(): string {
+    return `ServerClient (${this.num}, ${this.netconnection})`;
+  }
+
+  /**
+   * Returns the player edict assigned to this client slot.
+   * @returns The client edict.
+   */
+  get edict(): ServerEdict {
+    return SV.server.edicts[this.num + 1] as ServerEdict;
+  }
+
+  /**
+   * Returns the game entity owned by this client slot.
+   * @returns The linked game entity.
+   */
+  get entity(): ServerClientEntity {
+    const entity = this.edict.entity;
+
+    console.assert(entity !== null, 'ServerClient.entity requires a linked edict entity');
+
+    return entity as ServerClientEntity;
+  }
+
+  clear(): void {
+    this.state = ServerClient.STATE.FREE;
+    this.netconnection = null;
+    this.message.clear();
+    this.wishdir.clear();
+    this.colors = 0;
+    this.old_frags = 0;
+    this.last_ping_update = 0.0;
+    this.num_pings = 0;
+    this.ping_times.fill(0);
+    this.cmd.reset();
+    this.lastcmd.reset();
+    this.pendingCmds.length = 0;
+    this.last_update = 0.0;
+    this.sync_time = 0;
+    this._entityStates = new Map();
+    this.pmFlags = 0;
+    this.pmTime = 0;
+    this.pmOldButtons = 0;
+    this.lastMoveSequence = 0;
+
+    if (SV.server.gameCapabilities.includes(gameCapabilities.CAP_SPAWNPARMS_LEGACY)) {
+      this.spawn_parms = new Array(16);
+    } else {
+      this.spawn_parms = null;
+    }
+  }
+
+  /**
+   * Issues a changelevel to the specified map for this client.
+   */
+  changelevel(mapname: string): void {
+    const reconnect = new SzBuffer(128);
+    reconnect.writeByte(Protocol.svc.changelevel);
+    reconnect.writeString(mapname);
+
+    console.assert(this.netconnection !== null, 'ServerClient.changelevel requires a live connection');
+    this.netconnection?.SendMessage(reconnect);
+
+    this._entityStates.clear();
+    this.cmd.reset();
+    this.lastcmd.reset();
+    this.pendingCmds.length = 0;
+    this.pmFlags = 0;
+    this.pmTime = 0;
+    this.pmOldButtons = 0;
+    this.lastMoveSequence = 0;
+  }
+
+  /**
+   * Returns the per-entity delta baseline for this client.
+   * @returns The cached state for the requested entity.
+   */
+  getEntityState(num: number): ServerEntityState {
+    const key = num.toString();
+
+    if (!this._entityStates.has(key)) {
+      this._entityStates.set(key, new ServerEntityState(num));
+    }
+
+    return this._entityStates.get(key) as ServerEntityState;
+  }
+
+  set name(name: string) {
+    this.entity.netname = name;
+  }
+
+  get name(): string {
+    if (this.state !== ServerClient.STATE.CONNECTED && this.state !== ServerClient.STATE.SPAWNED) {
+      return '';
+    }
+
+    console.assert('netname' in this.entity, 'entity needs netname');
+
+    return this.entity.netname ?? `client #${this.num}`;
+  }
+
+  get uniqueId(): string {
+    return 'N/A';
+  }
+
+  get ping(): number {
+    return Math.round((this.ping_times.reduce((sum, elem) => sum + elem) / this.ping_times.length) * 1000) || 0;
+  }
+
+  saveSpawnparms(): void {
+    if (SV.server.gameCapabilities.includes(gameCapabilities.CAP_SPAWNPARMS_DYNAMIC)) {
+      this.spawn_parms = (this.entity as DynamicSpawnClientEntity).saveSpawnParameters();
+      return;
+    }
+
+    if (SV.server.gameCapabilities.includes(gameCapabilities.CAP_SPAWNPARMS_LEGACY)) {
+      const gameAPI = SV.server.gameAPI as unknown as LegacySpawnParmsGameAPI;
+      gameAPI.SetChangeParms(this.edict);
+
+      this.spawn_parms = new Array(16);
+
+      for (let i = 0; i < this.spawn_parms.length; i++) {
+        this.spawn_parms[i] = gameAPI[`parm${i + 1}`];
+      }
+    }
+  }
+
+  /**
+   * Queues a console print for this client.
+   */
+  consolePrint(message: string): void {
+    this.message.writeByte(Protocol.svc.print);
+    this.message.writeString(message);
+  }
+
+  /**
+   * Queues a centerprint for this client.
+   */
+  centerPrint(message: string): void {
+    this.message.writeByte(Protocol.svc.centerprint);
+    this.message.writeString(message);
+  }
+
+  /**
+   * Queues server-issued console commands for this client.
+   */
+  sendConsoleCommands(commandline: string): void {
+    this.message.writeByte(Protocol.svc.stufftext);
+    this.message.writeString(commandline);
+  }
+}
diff --git a/source/engine/server/Edict.mjs b/source/engine/server/Edict.mjs
index 23db94c3..42acf15f 100644
--- a/source/engine/server/Edict.mjs
+++ b/source/engine/server/Edict.mjs
@@ -1,697 +1,4 @@
-import Vector from '../../shared/Vector.ts';
-import { SzBuffer, registerSerializableType } from '../network/MSG.ts';
-import * as Protocol from '../network/Protocol.ts';
-import * as Def from '../common/Def.ts';
-import * as Defs from '../../shared/Defs.ts';
-import { eventBus, registry } from '../registry.mjs';
-import Q from '../../shared/Q.ts';
-import { ConsoleCommand } from '../common/Cmd.ts';
-import { ClientEdict } from '../client/ClientEntities.mjs';
-import { OctreeNode } from '../../shared/Octree.ts';
-import { Visibility } from '../common/model/BSP.ts';
+/** @typedef {import('./Edict.ts').BaseEntity} BaseEntity */
+/** @typedef {import('./Edict.ts').WorldspawnEntity} WorldspawnEntity */
 
-/** @typedef {import('../../game/id1/entity/BaseEntity.mjs').default} BaseEntity */
-/** @typedef {import('../../game/id1/entity/Worldspawn.mjs').WorldspawnEntity} WorldspawnEntity */
-
-let { CL, COM, Con, Host, NET, PR, SV } = registry;
-
-eventBus.subscribe('registry.frozen', () => {
-  ({ CL, COM, Con, Host, NET, PR, SV } = registry);
-});
-
-/** @typedef {import('./Client.mjs').ServerClient} ServerClient */
-
-export class ED {
-  /** @param {ServerEdict} ed edict */
-  static ClearEdict(ed) { // TODO: move to SV.Edict
-    if (ed.entity) {
-      ed.entity.free();
-      ed.entity = null;
-    }
-    ed.clear();
-    ed.free = false;
-  }
-
-  static Alloc() { // TODO: move to SV?
-    let i;
-    /** @type {ServerEdict} */
-    let e;
-    for (i = SV.svs.maxclients + 1; i < SV.server.num_edicts; i++) {
-      e = SV.server.edicts[i];
-      if ((e.free === true) && ((e.freetime < 2.0) || ((SV.server.time - e.freetime) > 0.5))) {
-        ED.ClearEdict(e);
-        return e;
-      }
-    }
-    if ((i % Def.limits.edicts) === 0) {
-      // allocate another block
-      SV.server.edicts.length += Def.limits.edicts;
-      for (let j = i; j < SV.server.edicts.length; j++) {
-        SV.server.edicts[j] = new ServerEdict(j);
-      }
-      Con.DPrint(`ED.Alloc triggered Def.limits.edicts (${Def.limits.edicts})\n`);
-    }
-    e = SV.server.edicts[SV.server.num_edicts++];
-    ED.ClearEdict(e);
-    return e;
-  }
-
-  /** @param {ServerEdict} ed edict */
-  static Free(ed) { // TODO: move to SV.Edict
-    SV.area.unlinkEdict(ed);
-    // mark as free, it will be cleared later
-    ed.free = true;
-    if (ed.entity) {
-      // only reset the data, not free the entire entity yet
-      // freeing the entity is done in ED.ClearEdict
-      ed.entity.clear();
-    }
-    ed.freetime = SV.server.time;
-  }
-
-  /** @param {ServerEdict} ed edict */
-  static Print(ed) {
-    if (ed.isFree()) {
-      return;
-    }
-    Con.Print('\nEDICT ' + ed.num + ':\n');
-
-    for (let i = 1; i < PR.fielddefs.length; i++) {
-      const d = PR.fielddefs[i];
-      const name = PR.GetString(d.name);
-
-      if (/_[xyz]$/.test(name)) {
-        continue;
-      }
-
-      Con.Print(`${name.padStart(24, '.')}: ${ed.entity[name]}\n`);
-    }
-  }
-
-  static PrintEdicts() {
-    if (!SV.server.active) {
-      return;
-    }
-
-    Con.Print(`${SV.server.num_edicts} entities\n`);
-    SV.server.edicts.forEach(ED.Print);
-  }
-
-  static PrintEdict_f = class extends ConsoleCommand {
-    run(id) {
-      if (SV.server.active !== true) {
-        return;
-      }
-      if (id === undefined) {
-        Con.Print(`Usage: ${this.command} <num>\n`);
-        return;
-      }
-      const i = Q.atoi(id);
-      if ((i >= 0) && (i < SV.server.num_edicts)) {
-        ED.Print(SV.server.edicts[i]);
-      }
-    }
-  };
-
-  static Count() {
-    if (SV.server.active !== true) {
-      return;
-    }
-    let active = 0, models = 0, solid = 0, step = 0;
-    for (let i = 0; i < SV.server.num_edicts; i++) {
-      const ent = SV.server.edicts[i];
-      if (ent.isFree() === true) {
-        continue;
-      }
-      active++;
-      if (ent.entity.solid) {
-        solid++;
-      }
-      if (ent.entity.model) {
-        models++;
-      }
-      if (ent.entity.movetype === Defs.moveType.MOVETYPE_STEP) {
-        step++;
-      }
-    }
-    const num_edicts = SV.server.num_edicts;
-    Con.Print('num_edicts:' + (num_edicts <= 9 ? '  ' : (num_edicts <= 99 ? ' ' : '')) + num_edicts + '\n');
-    Con.Print('active    :' + (active <= 9 ? '  ' : (active <= 99 ? ' ' : '')) + active + '\n');
-    Con.Print('view      :' + (models <= 9 ? '  ' : (models <= 99 ? ' ' : '')) + models + '\n');
-    Con.Print('touch     :' + (solid <= 9 ? '  ' : (solid <= 99 ? ' ' : '')) + solid + '\n');
-    Con.Print('step      :' + (step <= 9 ? '  ' : (step <= 99 ? ' ' : '')) + step + '\n');
-  }
-
-  static ParseEdict(data, ent, initialData = {}) {
-    // If not the world entity, clear the entity data
-    // CR: this is required, otherwise we would overwrite data SV.SpawnServer had set prior
-    if (ent.num > 0) {
-      ent.clear();
-    }
-
-    let keyname;
-    let anglehack;
-    let init = false;
-
-    // Parse until closing brace
-    while (true) {
-      const parsedKey = COM.Parse(data);
-
-      data = parsedKey.data;
-
-      if (parsedKey.token.charCodeAt(0) === 125) {
-        // Closing brace found
-        break;
-      }
-
-      if (data === null) {
-        throw new Error('ED.ParseEdict: EOF without closing brace');
-      }
-
-      if (parsedKey.token === 'angle') {
-        keyname = 'angles';
-        anglehack = true;
-      } else {
-        keyname = parsedKey.token;
-        anglehack = false;
-
-        if (keyname === 'light') {
-          keyname = 'light_lev'; // Quake 1 convention
-        }
-      }
-
-      // Remove trailing spaces in keyname
-      keyname = keyname.trimEnd();
-
-      // Parse the value
-      const parsedValue = COM.Parse(data);
-
-      data = parsedValue.data;
-
-      if (data === null) {
-        throw new Error('ED.ParseEdict: EOF without closing brace');
-      }
-
-      if (parsedValue.token.charCodeAt(0) === 125) {
-        throw new Error('ED.ParseEdict: Closing brace without data');
-      }
-
-      if (keyname.startsWith('_')) {
-        // Ignore keys starting with "_"
-        continue;
-      }
-
-      if (anglehack) {
-        parsedValue.token = `0 ${parsedValue.token} 0`;
-      }
-
-      initialData[keyname] = parsedValue.token.replace(/\\n/g, '\n');
-
-      init = true;
-    }
-
-    // Mark the entity as free if no valid initialization occurred
-    if (!init) {
-      ent.free = true;
-    }
-
-    return data;
-  }
-
-  /**
-   * Loads entities from a file.
-   * @param {string} data - The data to load.
-   */
-  static async LoadFromFile(data) {
-    let inhibit = 0;
-    let ent = null;
-    SV.server.gameAPI.time = SV.server.time;
-
-    while (true) {
-      const parsed = COM.Parse(data);
-
-      if (!parsed.data) {
-        break;
-      }
-
-      data = parsed.data;
-
-      if (parsed.token !== '{') {
-        throw new Error(`ED.LoadFromFile: found ${parsed.token} when expecting {`);
-      }
-
-      /** @type {import('source/shared/GameInterfaces').EdictData} */
-      const initialData = {};
-      ent = ent ? ED.Alloc() : SV.server.edicts[0];
-      data = ED.ParseEdict(data, ent, initialData);
-
-      if (!initialData.classname) {
-        Con.Print(`No classname for edict ${ent.num}\n`);
-        ED.Free(ent);
-        continue;
-      }
-
-      // console.assert(ent.num === 0 && initialData.classname === 'worldspawn', 'Edict 0 must be worldspawn');
-
-      const maySpawn = SV.server.gameAPI.prepareEntity(ent, /** @type {string} */(initialData.classname), initialData);
-
-      if (!maySpawn) {
-        ED.Free(ent);
-        inhibit++;
-        continue;
-      }
-
-      await SV.WaitForPrecachedResources();
-
-      const spawned = SV.server.gameAPI.spawnPreparedEntity(ent);
-
-      if (!spawned) {
-        Con.Print(`Could not spawn entity for edict ${ent.num}:\n`);
-        ED.Print(ent);
-        ED.Free(ent);
-        continue;
-      }
-    }
-
-    Con.DPrint(`${inhibit} entities inhibited\n`);
-  }
-}
-
-export class ServerEdict {
-  static #lastcheckpvs = /** @type {Visibility|null} */ (null);
-
-  /**
-   * @param {number} num edict number
-   */
-  constructor(num) {
-    this.num = num;
-    this.free = false;
-    /** @type {OctreeNode|null} used for fast lookup */
-    this.octreeNode = null;
-    /** @type {number[]} used for PXS lookup */
-    this.leafnums = [];
-    this.freetime = 0.0;
-    /** @type {BaseEntity|null} entity managed by the game code */
-    this.entity = null;
-  }
-
-  clear() {
-    if (this.entity) {
-      this.entity.free();
-      this.entity = null;
-    }
-  }
-
-  /**
-   * Edict is no longer in use
-   * @returns {boolean} true when freed/unused
-   */
-  isFree() {
-    return this.free || !this.entity;
-  }
-
-  get origin() { // for Octree use
-    return this.entity ? this.entity.origin : null;
-  }
-
-  get absmin() { // for Octree use
-    return this.entity ? this.entity.absmin : null;
-  }
-
-  get absmax() { // for Octree use
-    return this.entity ? this.entity.absmax : null;
-  }
-
-  toString() {
-    if (this.isFree()) {
-      return `unused (${this.num})`;
-    }
-
-    return `Edict (${this.entity.classname}, num: ${this.num}, origin: ${this.entity.origin})`;
-  }
-
-  /**
-   * Gives up this edict and can be reused differently later.
-   */
-  freeEdict() {
-    ED.Free(this);
-  }
-
-  /**
-   *
-   * @param {ServerEdict} otherEdict other edict
-   * @returns {boolean} whether it’s equal
-   */
-  equals(otherEdict) {
-    return otherEdict && this.num === otherEdict.num;
-  }
-
-  /**
-   * @param {Vector} min min
-   * @param {Vector} max max
-   */
-  setMinMaxSize(min, max) {
-    // FIXME: console.assert this check
-    if (min[0] > max[0] || min[1] > max[1] || min[2] > max[2]) {
-      throw new Error('Edict.setMinMaxSize: backwards mins/maxs');
-    }
-
-    this.entity.mins = min.copy();
-    this.entity.maxs = max.copy();
-    this.entity.size = max.copy().subtract(min);
-    this.linkEdict(true);
-  }
-
-  /**
-   * @param {Vector} vec origin
-   */
-  setOrigin(vec) {
-    this.entity.origin = vec.copy();
-    this.linkEdict(false);
-  }
-
-  linkEdict(touchTriggers = false) {
-    SV.area.linkEdict(this, touchTriggers);
-  }
-
-  /**
-   * Sets the model, also sets mins/maxs when applicable.
-   * Model has to be precached, otherwise an Error is thrown.
-   * @throws {Error} Model not precached.
-   * @param {string} model path to the model, e.g. progs/player.mdl
-   */
-  setModel(model) {
-    let i;
-
-    for (i = 0; i < SV.server.modelPrecache.length; i++) {
-      if (SV.server.modelPrecache[i] === model) {
-        break;
-      }
-    }
-
-    if (i === SV.server.modelPrecache.length) {
-      throw new Error('Edict.setModel: ' + model + ' not precached');
-    }
-
-    this.entity.model = model;
-    this.entity.modelindex = i;
-
-    const mod = SV.server.models[i];
-
-    if (mod instanceof Promise) {
-      // model is not yet loaded, this happens when spawning an entity and it’s calling precache AND setmodel right after (QuakeC jank)
-      void mod.then((loadedModel) => {
-        this.setMinMaxSize(loadedModel.mins, loadedModel.maxs);
-      });
-      return;
-    }
-
-    if (mod) {
-      this.setMinMaxSize(mod.mins, mod.maxs);
-    } else {
-      this.setMinMaxSize(Vector.origin, Vector.origin);
-    }
-
-    // CR: dear future me, investigate the fun issues with entities with SOLID_BSP and non-brush models, right now it breaks Pmove and a few other things.
-    if (this.entity.solid === Defs.solid.SOLID_BSP) {
-      console.assert(mod && mod.type === 0, 'Edict.setModel: not a brush model for SOLID_BSP');
-    }
-  }
-
-  /**
-   * Moves self in the given direction. Returns success as a boolean.
-   * @param {number} yaw yaw in degrees
-   * @param {number} dist distance to move
-   * @returns {boolean} true, when walking was successful
-   */
-  walkMove(yaw, dist) {
-    return SV.movement.walkMove(this, yaw, dist);
-  }
-
-  /**
-   * Makes sure the entity is settled on the ground.
-   * @param {number} z maximum distance to look down to check
-   * @returns {boolean} true, when the dropping succeeded
-   */
-  dropToFloor(z = -2048.0) {
-    const end = this.entity.origin.copy().add(new Vector(0.0, 0.0, z));
-    const trace = SV.collision.move(this.entity.origin, this.entity.mins, this.entity.maxs, end, 0, this);
-
-    if (trace.fraction === 1.0 || trace.allsolid) {
-      return false;
-    }
-
-    this.setOrigin(trace.endpos);
-    this.entity.flags |= Defs.flags.FL_ONGROUND;
-    this.entity.groundentity = trace.ent.entity;
-
-    return true;
-  }
-
-  /**
-   * Checks if the entity is standing on the ground.
-   * @returns {boolean} true, when edict touches the ground
-   */
-  isOnTheFloor() {
-    return SV.movement.checkBottom(this);
-  }
-
-  /**
-   * It will send a svc_spawnstatic upon signon to make clients register a static entity.
-   * Also this will free and release this Edict.
-   */
-  makeStatic() {
-    const message = SV.server.signon;
-    message.writeByte(Protocol.svc.spawnstatic);
-    message.writeString(this.entity.classname); // FIXME: compress this, it’s ballooning the signon buffer.
-    message.writeByte(SV.ModelIndex(this.entity.model));
-    message.writeByte(this.entity.frame || 0);
-    message.writeByte(this.entity.colormap || 0);
-    message.writeByte(this.entity.skin || 0);
-    message.writeByte(this.entity.effects || 0);
-    message.writeByte(Math.floor(this.entity.alpha * 255.0));
-    message.writeByte(this.entity.solid || 0);
-    message.writeAngleVector(this.entity.angles);
-    message.writeCoordVector(this.entity.origin);
-    this.freeEdict();
-  }
-
-  /**
-   * Returns client (or object that has a client enemy) that would be a valid target. If there are more than one
-   * valid options, they are cycled each frame. If (self.origin + self.viewofs) is not in the PVS of the target, null is returned.
-   * @returns {ServerEdict} Edict when client found, null otherwise
-   */
-  getNextBestClient() { // TODO: move to GameAPI, this is not interesting for edicts
-    // refresh check cache
-    if (SV.server.time - SV.server.lastchecktime >= 0.1) {
-      let check = SV.server.lastcheck;
-      if (check <= 0) {
-        check = 1;
-      } else if (check > SV.svs.maxclients) {
-        check = SV.svs.maxclients;
-      }
-      let i = 1;
-      if (check !== SV.svs.maxclients) {
-        i += check;
-      }
-      let ent;
-      for (; ; i++) {
-        if (i === SV.svs.maxclients + 1) {
-          i = 1;
-        }
-        ent = SV.server.edicts[i];
-        if (i === check) {
-          break;
-        }
-        if (ent.isFree()) {
-          continue;
-        }
-        if (ent.entity.health <= 0.0 || (ent.entity.flags & Defs.flags.FL_NOTARGET) !== 0) {
-          continue;
-        }
-        break;
-      }
-      SV.server.lastcheck = i;
-      ServerEdict.#lastcheckpvs = SV.server.worldmodel.getPvsByPoint(ent.entity.origin.copy().add(ent.entity.view_ofs));
-      SV.server.lastchecktime = SV.server.time;
-    }
-
-    const ent = SV.server.edicts[SV.server.lastcheck];
-
-    if (ent.isFree() || ent.entity.health <= 0.0) { // TODO: better interface, not health
-      // not interesting anymore
-      return null;
-    }
-
-    const l = SV.server.worldmodel.getLeafForPoint(this.entity.origin.copy().add(this.entity.view_ofs)).num;
-
-    if (l === 0 || !ServerEdict.#lastcheckpvs.isRevealed(l)) {
-      // outside leaf (sentinel) or leaf is not visible according to PVS
-      return null;
-    }
-
-    return ent;
-  }
-
-  /**
-   * Checks if this entity is in the given PHS/PVS.
-   * @param {Visibility} pxs PHS/PVS to check against
-   * @returns {boolean} true, when this entity is in the PVS
-   */
-  isInPXS(pxs) {
-    return pxs.areRevealed(this.leafnums);
-  }
-
-  /**
-   * Move this entity toward its goal. Used for monsters.
-   * @param {number} dist distance to move
-   * @param {Vector | null} target optional target position, otherwise .goalentity is used
-   * @returns {boolean} true, when successful
-   */
-  moveToGoal(dist, target = null) {
-    return SV.movement.moveToGoal(this, dist, target);
-  }
-
-  /**
-   * Returns a vector along which this entity can shoot.
-   * Usually, this entity is a player, and the vector returned is calculated by auto aiming to the closest enemy entity.
-   * NOTE: The original code and unofficial QuakeC reference docs say there’s an argument (speed/misslespeed), but it’s unused.
-   * @param {Vector} direction e.g. forward
-   * @returns {Vector} aim direction
-   */
-  aim(direction) {
-    const dir = direction.copy();
-    const origin = this.entity.origin.copy();
-    const start = origin.add(new Vector(0.0, 0.0, 20.0));
-
-    const end = new Vector(start[0] + 2048.0 * dir[0], start[1] + 2048.0 * dir[1], start[2] + 2048.0 * dir[2]);
-    const tr = SV.collision.move(start, Vector.origin, Vector.origin, end, 0, this);
-    if (tr.ent !== null) {
-      if ((tr.ent.entity.takedamage === Defs.damage.DAMAGE_AIM) && (!Host.teamplay.value || this.entity.team <= 0 || this.entity.team !== tr.ent.entity.team)) { // Legacy cvars
-        return dir;
-      }
-    }
-    const bestdir = dir.copy();
-    let bestdist = SV.aim.value;
-    let bestent = null;
-    for (let i = 1; i < SV.server.num_edicts; i++) {
-      const check = SV.server.edicts[i];
-      if (check.isFree()) {
-        continue;
-      }
-      if (check.entity.takedamage !== Defs.damage.DAMAGE_AIM) {
-        continue;
-      }
-      if (check.equals(this)) {
-        continue;
-      }
-      if ((Host.teamplay.value !== 0) && (this.entity.team > 0) && (this.entity.team === check.entity.team)) { // Legacy cvars
-        continue;
-      }
-      const corigin = check.entity.origin, cmins = check.entity.mins, cmaxs = check.entity.maxs;
-      end.set(corigin).add(cmins.copy().add(cmaxs).multiply(0.5));
-      dir.set(end).subtract(start);
-      dir.normalize();
-      let dist = dir.dot(bestdir);
-      if (dist < bestdist) {
-        continue;
-      }
-      const tr = SV.collision.move(start, Vector.origin, Vector.origin, end, 0, this);
-      if (tr.ent === check) {
-        bestdist = dist;
-        bestent = check;
-      }
-    }
-    if (bestent !== null) {
-      dir.set(bestent.entity.origin).subtract(this.entity.origin);
-      const dist = dir.dot(bestdir);
-      end[0] = bestdir[0] * dist;
-      end[1] = bestdir[1] * dist;
-      end[2] = dir[2];
-      end.normalize();
-      return end;
-    }
-    return bestdir;
-  }
-
-  /**
-   * Returns entity that is just after this in the entity list.
-   * Useful to browse the list of entities, because it skips the undefined ones.
-   * @returns {ServerEdict | null} next edict, or null if there are no more entities
-   */
-  nextEdict() {
-    for (let i = this.num + 1; i < SV.server.num_edicts; i++) {
-      if (!SV.server.edicts[i].isFree()) {
-        return SV.server.edicts[i];
-      }
-    }
-
-    return null;
-  }
-
-  /**
-   * Change the horizontal orientation of this entity. Turns towards .ideal_yaw at .yaw_speed. Called every 0.1 sec by monsters.
-   * @returns {number} new yaw angle
-   */
-  changeYaw() {
-    const angles = this.entity.angles;
-    angles[1] = SV.movement.changeYaw(this);
-    this.entity.angles = angles;
-
-    return angles[1];
-  }
-
-  /**
-   * returns the corresponding client object
-   * @returns {ServerClient | null} client object, if edict is actually a client edict
-   */
-  getClient() {
-    return SV.svs.clients[this.num - 1] || null;
-  }
-
-  /**
-   * check if edict is a client edict
-   * @returns {boolean} true, when edict is a client edict
-   */
-  isClient() {
-    return (this.num > 0) && (this.num <= SV.svs.maxclients);
-  }
-
-  /**
-   * checks if this entity is worldspawn
-   * @returns {boolean} true, when edict represents world
-   */
-  isWorld() {
-    return this.num === 0;
-  }
-};
-
-registerSerializableType(ServerEdict, {
-  /**
-   * @param {SzBuffer} sz serialization buffer
-   * @param {ServerEdict} object edict to serialize
-   */
-  serialize(sz, object) {
-    sz.writeShort(object.num);
-  },
-
-  /**
-   * @param {SzBuffer} sz serialization buffer
-   * @returns {ServerEdict} deserialized edict
-   */
-  // eslint-disable-next-line no-unused-vars
-  deserializeOnServer(sz) {
-    const num = NET.message.readShort();
-    console.assert(num >= 0 && num < SV.server.num_edicts, `ServerEdict.deserialize: invalid edict number ${num}`);
-    return SV.server.edicts[num];
-  },
-
-  /**
-   * @param {SzBuffer} sz serialization buffer
-   * @returns {ClientEdict} deserialized edict
-   */
-  // eslint-disable-next-line no-unused-vars
-  deserializeOnClient(sz) {
-    return CL.state.clientEntities.getEntity(NET.message.readShort());
-  },
-});
+export { ED, ServerEdict } from './Edict.ts';
diff --git a/source/engine/server/Edict.ts b/source/engine/server/Edict.ts
new file mode 100644
index 00000000..d1c389c4
--- /dev/null
+++ b/source/engine/server/Edict.ts
@@ -0,0 +1,819 @@
+import type { EdictData } from '../../shared/GameInterfaces.ts';
+import type { WorldspawnEntity as WorldspawnEntityValue } from '../../game/id1/entity/Worldspawn.mjs';
+import type { OctreeNode } from '../../shared/Octree.ts';
+import type { Visibility } from '../common/model/BSP.ts';
+import type { ClientEdict } from '../client/ClientEntities.mjs';
+import type { ServerClient } from './Client.mjs';
+
+import Vector from '../../shared/Vector.ts';
+import { SzBuffer, registerSerializableType } from '../network/MSG.ts';
+import * as Protocol from '../network/Protocol.ts';
+import * as Def from '../common/Def.ts';
+import * as Defs from '../../shared/Defs.ts';
+import { eventBus, registry } from '../registry.mjs';
+import Q from '../../shared/Q.ts';
+import { ConsoleCommand } from '../common/Cmd.ts';
+
+export interface BaseEntity {
+  classname: string;
+  alpha: number;
+  angles: Vector;
+  avelocity: Vector;
+  absmax: Vector;
+  absmin: Vector;
+  clear(): void;
+  colormap: number;
+  effects: number;
+  flags: number;
+  frame: number;
+  free(): void;
+  groundentity: BaseEntity | null;
+  health: number;
+  mins: Vector;
+  maxs: Vector;
+  model: string | null;
+  modelindex: number;
+  movetype: number;
+  netname?: string | null;
+  origin: Vector;
+  punchangle: Vector;
+  size: Vector;
+  skin: number;
+  solid: number;
+  takedamage: number;
+  team: number;
+  velocity: Vector;
+  view_ofs: Vector;
+  v_angle: Vector;
+}
+
+export type WorldspawnEntity = WorldspawnEntityValue;
+
+let { CL, COM, Con, Host, NET, PR, SV } = registry;
+
+eventBus.subscribe('registry.frozen', () => {
+  ({ CL, COM, Con, Host, NET, PR, SV } = registry);
+});
+
+/**
+ * Server-side edict allocation, parsing, and debugging helpers.
+ */
+export class ED {
+  /**
+   * Clears an edict for reuse.
+   */
+  static ClearEdict(ed: ServerEdict): void {
+    if (ed.entity) {
+      ed.entity.free();
+      ed.entity = null;
+    }
+
+    ed.clear();
+    ed.free = false;
+  }
+
+  /**
+   * Allocates a reusable edict slot.
+   * @returns The allocated edict.
+   */
+  static Alloc(): ServerEdict {
+    let i: number;
+    let edict: ServerEdict;
+
+    for (i = SV.svs.maxclients + 1; i < SV.server.num_edicts; i++) {
+      edict = SV.server.edicts[i] as ServerEdict;
+
+      if (edict.free === true && (edict.freetime < 2.0 || SV.server.time - edict.freetime > 0.5)) {
+        ED.ClearEdict(edict);
+        return edict;
+      }
+    }
+
+    if (i % Def.limits.edicts === 0) {
+      SV.server.edicts.length += Def.limits.edicts;
+
+      for (let j = i; j < SV.server.edicts.length; j++) {
+        SV.server.edicts[j] = new ServerEdict(j);
+      }
+
+      Con.DPrint(`ED.Alloc triggered Def.limits.edicts (${Def.limits.edicts})\n`);
+    }
+
+    edict = SV.server.edicts[SV.server.num_edicts++] as ServerEdict;
+    ED.ClearEdict(edict);
+    return edict;
+  }
+
+  /**
+   * Marks an edict free so it can be reused later.
+   */
+  static Free(ed: ServerEdict): void {
+    SV.area.unlinkEdict(ed);
+    ed.free = true;
+
+    if (ed.entity) {
+      ed.entity.clear();
+    }
+
+    ed.freetime = SV.server.time;
+  }
+
+  /**
+   * Prints an edict's fields to the console.
+   */
+  static Print(ed: ServerEdict): void {
+    if (ed.isFree()) {
+      return;
+    }
+
+    const entity = ed.entity;
+
+    console.assert(entity !== null, 'ED.Print requires a live entity');
+
+    Con.Print(`\nEDICT ${ed.num}:\n`);
+
+    for (let i = 1; i < PR.fielddefs.length; i++) {
+      const fieldDef = PR.fielddefs[i];
+      const name = PR.GetString(fieldDef.name);
+
+      if (/_[xyz]$/.test(name)) {
+        continue;
+      }
+
+      const printableEntity = entity as Record<string, string | number | boolean | Vector | BaseEntity | null | undefined>;
+      Con.Print(`${name.padStart(24, '.')}: ${printableEntity[name]}\n`);
+    }
+  }
+
+  /**
+   * Prints all active edicts.
+   */
+  static PrintEdicts(): void {
+    if (!SV.server.active) {
+      return;
+    }
+
+    Con.Print(`${SV.server.num_edicts} entities\n`);
+    SV.server.edicts.forEach((edict: ServerEdict) => {
+      ED.Print(edict);
+    });
+  }
+
+  static PrintEdict_f = class PrintEdictCommand extends ConsoleCommand {
+    run(id?: string): void {
+      if (SV.server.active !== true) {
+        return;
+      }
+
+      if (id === undefined) {
+        Con.Print(`Usage: ${this.command} <num>\n`);
+        return;
+      }
+
+      const index = Q.atoi(id);
+
+      if (index >= 0 && index < SV.server.num_edicts) {
+        ED.Print(SV.server.edicts[index] as ServerEdict);
+      }
+    }
+  };
+
+  /**
+   * Prints an edict usage summary.
+   */
+  static Count(): void {
+    if (SV.server.active !== true) {
+      return;
+    }
+
+    let active = 0;
+    let models = 0;
+    let solid = 0;
+    let step = 0;
+
+    for (let i = 0; i < SV.server.num_edicts; i++) {
+      const ent = SV.server.edicts[i] as ServerEdict;
+
+      if (ent.isFree() === true) {
+        continue;
+      }
+
+      const entity = ent.entity;
+
+      console.assert(entity !== null, 'ED.Count requires a live entity');
+
+      active++;
+
+      if (entity.solid) {
+        solid++;
+      }
+
+      if (entity.model) {
+        models++;
+      }
+
+      if (entity.movetype === Defs.moveType.MOVETYPE_STEP) {
+        step++;
+      }
+    }
+
+    const numEdicts = SV.server.num_edicts;
+
+    Con.Print(`num_edicts:${numEdicts <= 9 ? '  ' : numEdicts <= 99 ? ' ' : ''}${numEdicts}\n`);
+    Con.Print(`active    :${active <= 9 ? '  ' : active <= 99 ? ' ' : ''}${active}\n`);
+    Con.Print(`view      :${models <= 9 ? '  ' : models <= 99 ? ' ' : ''}${models}\n`);
+    Con.Print(`touch     :${solid <= 9 ? '  ' : solid <= 99 ? ' ' : ''}${solid}\n`);
+    Con.Print(`step      :${step <= 9 ? '  ' : step <= 99 ? ' ' : ''}${step}\n`);
+  }
+
+  /**
+   * Parses one edict block from entity text.
+   * @returns The remaining entity data after the parsed block.
+   */
+  static ParseEdict(data: string, ent: ServerEdict, initialData: EdictData = {}): string {
+    if (ent.num > 0) {
+      ent.clear();
+    }
+
+    let keyname = '';
+    let anglehack = false;
+    let init = false;
+
+    while (true) {
+      const parsedKey = COM.Parse(data);
+
+      data = parsedKey.data;
+
+      if (parsedKey.token.charCodeAt(0) === 125) {
+        break;
+      }
+
+      if (data === null) {
+        throw new Error('ED.ParseEdict: EOF without closing brace');
+      }
+
+      if (parsedKey.token === 'angle') {
+        keyname = 'angles';
+        anglehack = true;
+      } else {
+        keyname = parsedKey.token;
+        anglehack = false;
+
+        if (keyname === 'light') {
+          keyname = 'light_lev';
+        }
+      }
+
+      keyname = keyname.trimEnd();
+
+      const parsedValue = COM.Parse(data);
+
+      data = parsedValue.data;
+
+      if (data === null) {
+        throw new Error('ED.ParseEdict: EOF without closing brace');
+      }
+
+      if (parsedValue.token.charCodeAt(0) === 125) {
+        throw new Error('ED.ParseEdict: Closing brace without data');
+      }
+
+      if (keyname.startsWith('_')) {
+        continue;
+      }
+
+      if (anglehack) {
+        parsedValue.token = `0 ${parsedValue.token} 0`;
+      }
+
+      initialData[keyname] = parsedValue.token.replace(/\\n/g, '\n');
+      init = true;
+    }
+
+    if (!init) {
+      ent.free = true;
+    }
+
+    return data;
+  }
+
+  /**
+   * Loads all entities from the worldspawn entity lump.
+   */
+  static async LoadFromFile(data: string): Promise<void> {
+    let inhibit = 0;
+    let ent: ServerEdict | null = null;
+    SV.server.gameAPI.time = SV.server.time;
+
+    while (true) {
+      const parsed = COM.Parse(data);
+
+      if (!parsed.data) {
+        break;
+      }
+
+      data = parsed.data;
+
+      if (parsed.token !== '{') {
+        throw new Error(`ED.LoadFromFile: found ${parsed.token} when expecting {`);
+      }
+
+      const initialData: EdictData = {};
+      ent = ent ? ED.Alloc() : (SV.server.edicts[0] as ServerEdict);
+      data = ED.ParseEdict(data, ent, initialData);
+
+      if (!initialData.classname) {
+        Con.Print(`No classname for edict ${ent.num}\n`);
+        ED.Free(ent);
+        continue;
+      }
+
+      const maySpawn = SV.server.gameAPI.prepareEntity(ent, initialData.classname as string, initialData);
+
+      if (!maySpawn) {
+        ED.Free(ent);
+        inhibit++;
+        continue;
+      }
+
+      await SV.WaitForPrecachedResources();
+
+      const spawned = SV.server.gameAPI.spawnPreparedEntity(ent);
+
+      if (!spawned) {
+        Con.Print(`Could not spawn entity for edict ${ent.num}:\n`);
+        ED.Print(ent);
+        ED.Free(ent);
+      }
+    }
+
+    Con.DPrint(`${inhibit} entities inhibited\n`);
+  }
+}
+
+/**
+ * Mutable server-side wrapper around a game entity instance.
+ */
+export class ServerEdict {
+  static #lastcheckpvs: Visibility | null = null;
+
+  readonly num: number;
+  free: boolean;
+  octreeNode: OctreeNode<ServerEdict> | null;
+  readonly leafnums: number[];
+  freetime: number;
+  entity: BaseEntity | null;
+
+  constructor(num: number) {
+    this.num = num;
+    this.free = false;
+    this.octreeNode = null;
+    this.leafnums = [];
+    this.freetime = 0.0;
+    this.entity = null;
+  }
+
+  private _requireEntity(): BaseEntity {
+    if (this.entity === null) {
+      throw new Error(`Edict ${this.num} has no entity`);
+    }
+
+    return this.entity;
+  }
+
+  /**
+   * Clears the currently linked entity instance.
+   */
+  clear(): void {
+    if (this.entity) {
+      this.entity.free();
+      this.entity = null;
+    }
+  }
+
+  /**
+   * Edict is no longer in use.
+   * @returns True when the edict has no live entity.
+   */
+  isFree(): boolean {
+    return this.free || !this.entity;
+  }
+
+  /**
+   * Returns the current origin for octree bookkeeping.
+   * @returns The entity origin, or null if the edict is unused.
+   */
+  get origin(): Vector | null {
+    return this.entity ? this.entity.origin : null;
+  }
+
+  /**
+   * Returns the current absolute mins for octree bookkeeping.
+   * @returns The entity mins, or null if the edict is unused.
+   */
+  get absmin(): Vector | null {
+    return this.entity ? this.entity.absmin : null;
+  }
+
+  /**
+   * Returns the current absolute maxs for octree bookkeeping.
+   * @returns The entity maxs, or null if the edict is unused.
+   */
+  get absmax(): Vector | null {
+    return this.entity ? this.entity.absmax : null;
+  }
+
+  toString(): string {
+    if (this.isFree()) {
+      return `unused (${this.num})`;
+    }
+
+    const entity = this._requireEntity();
+    return `Edict (${entity.classname}, num: ${this.num}, origin: ${entity.origin})`;
+  }
+
+  /**
+   * Gives up this edict so it can be reused later.
+   */
+  freeEdict(): void {
+    ED.Free(this);
+  }
+
+  /**
+   * Compares edicts by slot number.
+   * @returns True when both edicts reference the same slot.
+   */
+  equals(otherEdict: ServerEdict | null): boolean {
+    return otherEdict !== null && this.num === otherEdict.num;
+  }
+
+  /**
+   * Updates mins, maxs, and size for this entity.
+   */
+  setMinMaxSize(min: Vector, max: Vector): void {
+    if (min[0] > max[0] || min[1] > max[1] || min[2] > max[2]) {
+      throw new Error('Edict.setMinMaxSize: backwards mins/maxs');
+    }
+
+    const entity = this._requireEntity();
+    entity.mins = min.copy();
+    entity.maxs = max.copy();
+    entity.size = max.copy().subtract(min);
+    this.linkEdict(true);
+  }
+
+  /**
+   * Moves the entity to a new origin and relinks it.
+   */
+  setOrigin(vec: Vector): void {
+    this._requireEntity().origin = vec.copy();
+    this.linkEdict(false);
+  }
+
+  /**
+   * Relinks the edict in the area tree.
+   */
+  linkEdict(touchTriggers = false): void {
+    SV.area.linkEdict(this, touchTriggers);
+  }
+
+  /**
+   * Sets the model, also setting mins/maxs when applicable.
+   */
+  setModel(model: string): void {
+    let i: number;
+
+    for (i = 0; i < SV.server.modelPrecache.length; i++) {
+      if (SV.server.modelPrecache[i] === model) {
+        break;
+      }
+    }
+
+    if (i === SV.server.modelPrecache.length) {
+      throw new Error(`Edict.setModel: ${model} not precached`);
+    }
+
+    const entity = this._requireEntity();
+    entity.model = model;
+    entity.modelindex = i;
+
+    const mod = SV.server.models[i];
+
+    if (mod instanceof Promise) {
+      void mod.then((loadedModel) => {
+        this.setMinMaxSize(loadedModel.mins, loadedModel.maxs);
+      });
+      return;
+    }
+
+    if (mod) {
+      this.setMinMaxSize(mod.mins, mod.maxs);
+    } else {
+      this.setMinMaxSize(Vector.origin, Vector.origin);
+    }
+
+    if (entity.solid === Defs.solid.SOLID_BSP) {
+      console.assert(mod && mod.type === 0, 'Edict.setModel: not a brush model for SOLID_BSP');
+    }
+  }
+
+  /**
+   * Moves self in the given direction.
+   * @returns True when walking succeeded.
+   */
+  walkMove(yaw: number, dist: number): boolean {
+    return SV.movement.walkMove(this, yaw, dist);
+  }
+
+  /**
+   * Makes sure the entity is settled on the ground.
+   * @returns True when the drop succeeded.
+   */
+  dropToFloor(z = -2048.0): boolean {
+    const entity = this._requireEntity();
+    const end = entity.origin.copy().add(new Vector(0.0, 0.0, z));
+    const trace = SV.collision.move(entity.origin, entity.mins, entity.maxs, end, 0, this);
+
+    if (trace.fraction === 1.0 || trace.allsolid) {
+      return false;
+    }
+
+    this.setOrigin(trace.endpos);
+    entity.flags |= Defs.flags.FL_ONGROUND;
+    entity.groundentity = trace.ent!.entity;
+    return true;
+  }
+
+  /**
+   * Checks if the entity is standing on the ground.
+   * @returns True when the edict touches the ground.
+   */
+  isOnTheFloor(): boolean {
+    return SV.movement.checkBottom(this);
+  }
+
+  /**
+   * Converts this edict into a static entity for client signon.
+   */
+  makeStatic(): void {
+    const entity = this._requireEntity();
+    const message = SV.server.signon;
+    message.writeByte(Protocol.svc.spawnstatic);
+    message.writeString(entity.classname);
+    message.writeByte(SV.ModelIndex(entity.model));
+    message.writeByte(entity.frame || 0);
+    message.writeByte(entity.colormap || 0);
+    message.writeByte(entity.skin || 0);
+    message.writeByte(entity.effects || 0);
+    message.writeByte(Math.floor(entity.alpha * 255.0));
+    message.writeByte(entity.solid || 0);
+    message.writeAngleVector(entity.angles);
+    message.writeCoordVector(entity.origin);
+    this.freeEdict();
+  }
+
+  /**
+   * Returns the next client that is a valid auto-aim/AI target.
+   * @returns The selected client edict, or null when none is visible.
+   */
+  getNextBestClient(): ServerEdict | null {
+    if (SV.server.time - SV.server.lastchecktime >= 0.1) {
+      let check = SV.server.lastcheck;
+
+      if (check <= 0) {
+        check = 1;
+      } else if (check > SV.svs.maxclients) {
+        check = SV.svs.maxclients;
+      }
+
+      let i = 1;
+
+      if (check !== SV.svs.maxclients) {
+        i += check;
+      }
+
+      let ent: ServerEdict;
+
+      for (;; i++) {
+        if (i === SV.svs.maxclients + 1) {
+          i = 1;
+        }
+
+        ent = SV.server.edicts[i] as ServerEdict;
+
+        if (i === check) {
+          break;
+        }
+
+        if (ent.isFree()) {
+          continue;
+        }
+
+        const entity = ent._requireEntity();
+
+        if (entity.health <= 0.0 || (entity.flags & Defs.flags.FL_NOTARGET) !== 0) {
+          continue;
+        }
+
+        break;
+      }
+
+      SV.server.lastcheck = i;
+      ServerEdict.#lastcheckpvs = SV.server.worldmodel.getPvsByPoint(ent._requireEntity().origin.copy().add(ent._requireEntity().view_ofs));
+      SV.server.lastchecktime = SV.server.time;
+    }
+
+    const ent = SV.server.edicts[SV.server.lastcheck] as ServerEdict;
+    const entity = ent.entity;
+
+    if (ent.isFree() || entity === null || entity.health <= 0.0) {
+      return null;
+    }
+
+    const lastcheckpvs = ServerEdict.#lastcheckpvs;
+
+    if (lastcheckpvs === null) {
+      return null;
+    }
+
+    const leaf = SV.server.worldmodel.getLeafForPoint(this._requireEntity().origin.copy().add(this._requireEntity().view_ofs)).num;
+
+    if (leaf === 0 || !lastcheckpvs.isRevealed(leaf)) {
+      return null;
+    }
+
+    return ent;
+  }
+
+  /**
+   * Checks if this entity is in the given PHS/PVS.
+   * @returns True when this entity is in the supplied visibility set.
+   */
+  isInPXS(pxs: Visibility): boolean {
+    return pxs.areRevealed(this.leafnums);
+  }
+
+  /**
+   * Move this entity toward its goal.
+   * @returns True when the move succeeded.
+   */
+  moveToGoal(dist: number, target: Vector | null = null): boolean {
+    return SV.movement.moveToGoal(this, dist, target);
+  }
+
+  /**
+   * Returns an auto-aim direction for this entity.
+   * @returns The resolved aim direction.
+   */
+  aim(direction: Vector): Vector {
+    const entity = this._requireEntity();
+    const dir = direction.copy();
+    const origin = entity.origin.copy();
+    const start = origin.add(new Vector(0.0, 0.0, 20.0));
+    const end = new Vector(start[0] + 2048.0 * dir[0], start[1] + 2048.0 * dir[1], start[2] + 2048.0 * dir[2]);
+    const trace = SV.collision.move(start, Vector.origin, Vector.origin, end, 0, this);
+
+    if (trace.ent !== null) {
+      const hitEntity = trace.ent.entity;
+
+      if (hitEntity !== null && hitEntity.takedamage === Defs.damage.DAMAGE_AIM && (!Host.teamplay.value || entity.team <= 0 || entity.team !== hitEntity.team)) {
+        return dir;
+      }
+    }
+
+    const bestdir = dir.copy();
+    let bestdist = SV.aim.value;
+    let bestent: ServerEdict | null = null;
+
+    for (let i = 1; i < SV.server.num_edicts; i++) {
+      const check = SV.server.edicts[i] as ServerEdict;
+
+      if (check.isFree()) {
+        continue;
+      }
+
+      const checkEntity = check.entity;
+
+      if (checkEntity === null || checkEntity.takedamage !== Defs.damage.DAMAGE_AIM) {
+        continue;
+      }
+
+      if (check.equals(this)) {
+        continue;
+      }
+
+      if (Host.teamplay.value !== 0 && entity.team > 0 && entity.team === checkEntity.team) {
+        continue;
+      }
+
+      const center = checkEntity.origin.copy().add(checkEntity.mins.copy().add(checkEntity.maxs).multiply(0.5));
+      dir.set(center).subtract(start);
+      dir.normalize();
+
+      const dist = dir.dot(bestdir);
+
+      if (dist < bestdist) {
+        continue;
+      }
+
+      const trace = SV.collision.move(start, Vector.origin, Vector.origin, center, 0, this);
+
+      if (trace.ent === check) {
+        bestdist = dist;
+        bestent = check;
+      }
+    }
+
+    if (bestent !== null) {
+      const bestEntity = bestent._requireEntity();
+      dir.set(bestEntity.origin).subtract(entity.origin);
+      const dist = dir.dot(bestdir);
+      end[0] = bestdir[0] * dist;
+      end[1] = bestdir[1] * dist;
+      end[2] = dir[2];
+      end.normalize();
+      return end;
+    }
+
+    return bestdir;
+  }
+
+  /**
+   * Returns the next non-free edict in the list.
+   * @returns The next active edict, or null if there are no more.
+   */
+  nextEdict(): ServerEdict | null {
+    for (let i = this.num + 1; i < SV.server.num_edicts; i++) {
+      const edict = SV.server.edicts[i] as ServerEdict;
+
+      if (!edict.isFree()) {
+        return edict;
+      }
+    }
+
+    return null;
+  }
+
+  /**
+   * Turns toward ideal_yaw at yaw_speed.
+   * @returns The new yaw angle.
+   */
+  changeYaw(): number {
+    const entity = this._requireEntity();
+    const angles = entity.angles;
+    angles[1] = SV.movement.changeYaw(this);
+    entity.angles = angles;
+    return angles[1];
+  }
+
+  /**
+   * Returns the corresponding client object.
+   * @returns The mapped client slot, or null when none exists.
+   */
+  getClient(): ServerClient | null {
+    return (SV.svs.clients[this.num - 1] as ServerClient | undefined) ?? null;
+  }
+
+  /**
+   * Checks whether this edict is a player-client slot.
+   * @returns True when the edict is within the active client slot range.
+   */
+  isClient(): boolean {
+    return this.num > 0 && this.num <= SV.svs.maxclients;
+  }
+
+  /**
+   * Checks whether this edict is worldspawn.
+   * @returns True when the edict represents the world.
+   */
+  isWorld(): boolean {
+    return this.num === 0;
+  }
+}
+
+registerSerializableType(ServerEdict, {
+  /**
+   * Serializes a server edict reference.
+   */
+  serialize(sz: SzBuffer, object: ServerEdict): void {
+    sz.writeShort(object.num);
+  },
+
+  /**
+   * Deserializes a server edict reference on the server.
+   * @returns The referenced server edict.
+   */
+  deserializeOnServer(_sz: SzBuffer): ServerEdict {
+    const num = NET.message.readShort();
+    console.assert(num >= 0 && num < SV.server.num_edicts, `ServerEdict.deserialize: invalid edict number ${num}`);
+    return SV.server.edicts[num] as ServerEdict;
+  },
+
+  /**
+   * Deserializes a server edict reference on the client.
+   * @returns The client-side edict proxy.
+   */
+  deserializeOnClient(_sz: SzBuffer): ClientEdict {
+    return CL.state.clientEntities.getEntity(NET.message.readShort()) as ClientEdict;
+  },
+});
diff --git a/source/engine/server/Server.mjs b/source/engine/server/Server.mjs
index e04e7825..7bb99a51 100644
--- a/source/engine/server/Server.mjs
+++ b/source/engine/server/Server.mjs
@@ -1,1100 +1 @@
-import Cvar from '../common/Cvar.ts';
-import { MoveVars, Pmove } from '../common/Pmove.ts';
-import { SzBuffer } from '../network/MSG.ts';
-import * as Protocol from '../network/Protocol.ts';
-import * as Def from './../common/Def.ts';
-import Cmd, { ConsoleCommand } from '../common/Cmd.ts';
-import { ED, ServerEdict } from './Edict.mjs';
-import { EventBus, eventBus, registry } from '../registry.mjs';
-import { ServerEngineAPI } from '../common/GameAPIs.ts';
-import * as Defs from '../../shared/Defs.ts';
-import { Navigation } from './Navigation.mjs';
-import { ServerPhysics } from './physics/ServerPhysics.ts';
-import { ServerClientPhysics } from './physics/ServerClientPhysics.ts';
-import { ServerMessages } from './ServerMessages.mjs';
-import { ServerMovement } from './physics/ServerMovement.ts';
-import { ServerArea } from './physics/ServerArea.ts';
-import { ServerCollision } from './physics/ServerCollision.ts';
-import { sharedCollisionModelSource } from '../common/CollisionModelSource.ts';
-import { BrushModel } from '../common/Mod.ts';
-import { ServerClient } from './Client.mjs';
-export { ServerEntityState } from './ServerEntityState.mjs';
-
-let { COM, Con, Host, Mod, NET, PR } = registry;
-
-eventBus.subscribe('registry.frozen', () => {
-  COM = registry.COM;
-  Con = registry.Con;
-  Host = registry.Host;
-  Mod = registry.Mod;
-  NET = registry.NET;
-  PR = registry.PR;
-});
-
-/**
- * @typedef {{
-      fraction: number;
-      allsolid: boolean;
-      startsolid: boolean;
-      endpos: any;
-      plane: {
-      normal: import('../../shared/Vector.ts').Vector;
-          dist: number;
-      };
-      ent: any;
-      inopen?: boolean;
-      inwater?: boolean;
-  }} Trace
- */
-
-/** @typedef {import('../../shared/GameInterfaces').SerializableType} SerializableType */
-
-const ALLOWED_CLIENT_COMMANDS = [
-  'status',
-  'god',
-  'notarget',
-  'fly',
-  'name',
-  'noclip',
-  'say',
-  'say_team',
-  'tell',
-  'color',
-  'kill',
-  'pause',
-  'spawn',
-  'begin',
-  'prespawn',
-  'kick',
-  'ping',
-  'give',
-  'ban',
-];
-
-/**
- * Main server class with all server-related functionality.
- * All properties and methods are static.
- */
-export default class SV {
-  /** current server state */
-  static server = {
-    time: 0,
-    num_edicts: 0,
-    datagram: new SzBuffer(16384, 'SV.server.datagram'),
-    expedited_datagram: new SzBuffer(16384, 'SV.server.expedited_datagram'),
-    reliable_datagram: new SzBuffer(16384, 'SV.server.reliable_datagram'),
-    /** sent during client prespawn */
-    signon: new SzBuffer(16384, 'SV.server.signon'),
-    edicts: /** @type {ServerEdict[]} */ ([]),
-    mapname: /** @type {string} */ (null),
-    worldmodel: /** @type {BrushModel} */ (null),
-    /** server game event bus, will be reset on every map load */
-    eventBus: new EventBus('server-game'),
-    /** @type {Navigation} navigation graph management */
-    navigation: null,
-    /** @type {import('../../shared/GameInterfaces').ServerGameInterface} */
-    gameAPI: null,
-    /** @type {string?} game version string */
-    gameVersion: null,
-    /** @type {string?} game identification (e.g. Quake) */
-    gameName: null,
-    /** @type {Defs.gameCapabilities[]} game capability flags */
-    gameCapabilities: [],
-    /** @type {string[]} clientdata field names */
-    clientdataFields: [],
-    /** @type {'writeByte' | 'writeShort' | 'writeLong' | null} */
-    clientdataFieldsBitsWriter: null,
-    /** @type {Record<string, { fields: string[], bitsWriter: 'writeByte' | 'writeShort' | 'writeLong'}>} maps classname to its fields and the apropriate bits writer */
-    clientEntityFields: {},
-    /** @type {import('../common/Mod.ts').BaseModel[]} */
-    models: [],
-    /** @type {string[]} */
-    soundPrecache: [],
-    /** @type {string[]} */
-    modelPrecache: [],
-    active: false,
-  };
-
-  /** server static, state across maps */
-  static svs = {
-    changelevelIssued: false,
-    /** @type {ServerClient[]} */
-    clients: [],
-    maxclients: 0,
-    maxclientslimit: 32,
-    /** gamestate across maps */
-    gamestate: null,
-
-    /** @type {string[]} list of maps */
-    maplist: [],
-
-    *spawnedClients() {
-      for (const client of this.clients) {
-        if (client.state === ServerClient.STATE.SPAWNED) {
-          yield client;
-        }
-      }
-    },
-  };
-
-  // Class instances for modular functionality
-  static physics = new ServerPhysics();
-  static clientPhysics = new ServerClientPhysics();
-  static messages = new ServerMessages();
-  static movement = new ServerMovement();
-  static area = new ServerArea(sharedCollisionModelSource);
-  static collision = new ServerCollision(sharedCollisionModelSource);
-
-  /** @type {?Pmove} shared player-move collision context */
-  static pmove = null;
-
-  // Cvars (initialized in Init())
-  static maxvelocity = /** @type {Cvar} */ (null);
-  static edgefriction = /** @type {Cvar} */ (null);
-  static stopspeed = /** @type {Cvar} */ (null);
-  static accelerate = /** @type {Cvar} */ (null);
-  static idealpitchscale = /** @type {Cvar} */ (null);
-  static aim = /** @type {Cvar} */ (null);
-  static nostep = /** @type {Cvar} */ (null);
-  static cheats = /** @type {Cvar} */ (null);
-  static gravity = /** @type {Cvar} */ (null);
-  static friction = /** @type {Cvar} */ (null);
-  static maxspeed = /** @type {Cvar} */ (null);
-  static airaccelerate = /** @type {Cvar} */ (null);
-  static wateraccelerate = /** @type {Cvar} */ (null);
-  static spectatormaxspeed = /** @type {Cvar} */ (null);
-  static waterfriction = /** @type {Cvar} */ (null);
-  static rcon_password = /** @type {Cvar} */ (null);
-  static maplist = /** @type {Cvar} */ (null);
-  static nextmap = /** @type {Cvar} */ (null);
-  static public = /** @type {Cvar} */ (null);
-
-  /** Scheduled game commands */
-  static _scheduledGameCommands = [];
-
-  // ===== STATIC METHODS =====
-
-  static InitPmove() {
-    SV.pmove = new Pmove();
-    SV.pmove.movevars = new PlayerMoveCvars();
-  }
-
-  static Init() {
-    SV.maxvelocity = new Cvar('sv_maxvelocity', '2000', Cvar.FLAG.SERVER);
-    SV.edgefriction = new Cvar('edgefriction', '2', Cvar.FLAG.SERVER);
-    SV.stopspeed = new Cvar('sv_stopspeed', '100', Cvar.FLAG.SERVER);
-    SV.accelerate = new Cvar('sv_accelerate', '10', Cvar.FLAG.SERVER);
-    SV.idealpitchscale = new Cvar('sv_idealpitchscale', '0.8');
-    SV.aim = new Cvar('sv_aim', '0.93');
-    SV.nostep = new Cvar('sv_nostep', '0');
-    SV.cheats = new Cvar('sv_cheats', '0', Cvar.FLAG.SERVER);
-    SV.gravity = new Cvar('sv_gravity', '800', Cvar.FLAG.SERVER);
-    SV.friction = new Cvar('sv_friction', '4', Cvar.FLAG.SERVER);
-    SV.maxspeed = new Cvar('sv_maxspeed', '320', Cvar.FLAG.SERVER);
-    SV.airaccelerate = new Cvar('sv_airaccelerate', '0.7', Cvar.FLAG.SERVER);
-    SV.wateraccelerate = new Cvar('sv_wateraccelerate', '10', Cvar.FLAG.SERVER);
-    SV.spectatormaxspeed = new Cvar('sv_spectatormaxspeed', '500', Cvar.FLAG.SERVER);
-    SV.waterfriction = new Cvar('sv_waterfriction', '4', Cvar.FLAG.SERVER);
-    SV.rcon_password = new Cvar('sv_rcon_password', '', Cvar.FLAG.ARCHIVE);
-    SV.public = new Cvar('sv_public', '1', Cvar.FLAG.ARCHIVE | Cvar.FLAG.SERVER, 'Make this server publicly listed in the master server');
-
-    Navigation.Init();
-
-    Cmd.AddCommand('nav', class extends ConsoleCommand {
-      run() {
-        if (!SV.server.navigation) {
-          Con.Print('navigation not initialized, you have to spawn a server first\n');
-          return;
-        }
-
-        SV.server.navigation.build();
-      }
-    });
-
-    eventBus.subscribe('cvar.changed', (name) => {
-      const cvar = Cvar.FindVar(name);
-
-      if ((cvar.flags & Cvar.FLAG.SERVER) && SV.server.active) {
-        SV.CvarChanged(cvar);
-      }
-    });
-
-    SV.InitNextmapStuff();
-
-    // TODO: we need to observe changes to those pmove vars and resend them to all clients when changed
-
-    SV.InitPmove();
-
-    SV.area.initBoxHull(); // pmove, remove
-  }
-
-  // =============================================================================
-  // GAME COMMANDS & SCHEDULING
-  // Schedule and run commands from the game logic
-  // =============================================================================
-
-  /**
-   * Provides functionality for cycling through maps after each map change, based on sv_maplist and sv_nextmap cvars.
-   * The server game code doesn’t really have a state and this helps the game code with managing map cycling.
-   */
-  static InitNextmapStuff() {
-    SV.maplist = new Cvar('sv_maplist', '', Cvar.FLAG.NONE, 'Comma-separated list of maps to cycle through after each map change');
-    SV.nextmap = new Cvar('sv_nextmap', '', Cvar.FLAG.SERVER, 'Next map to change to after the current one, will be autopopulated with the next map in sv_maplist after each map change');
-
-    eventBus.subscribe('cvar.changed.sv_maplist', () => {
-      if (SV.maplist.string.trim() === '') {
-        SV.svs.maplist.length = 0;
-        return;
-      }
-
-      SV.svs.maplist = SV.maplist.string.split(',').map((s) => s.trim()).filter((s) => s.length > 0);
-    });
-
-    eventBus.subscribe('server.spawning', ({ mapname }) => {
-      if (SV.svs.maplist.length === 0) {
-        return;
-      }
-
-      if (!SV.svs.maplist.includes(mapname)) {
-        SV.nextmap.set(SV.svs.maplist[0]);
-        return;
-      }
-
-      const currentIndex = SV.svs.maplist.indexOf(mapname);
-      const nextIndex = (currentIndex + 1) % SV.svs.maplist.length;
-
-      SV.nextmap.set(SV.svs.maplist[nextIndex]);
-    });
-
-    eventBus.subscribe('server.shutdown', () => {
-      SV.nextmap.reset();
-    });
-  }
-
-  static RunScheduledGameCommands() {
-    while (SV._scheduledGameCommands.length > 0) {
-      const command = SV._scheduledGameCommands.shift();
-
-      command();
-    }
-  }
-
-  static ScheduleGameCommand(command) {
-    SV._scheduledGameCommands.push(command);
-  }
-
-  static ConnectClient(client, netconnection) {
-    Con.DPrint('Client ' + netconnection.address + ' connected\n');
-
-    const old_spawn_parms = SV.server.loadgame ? client.spawn_parms : null;
-
-    client.clear();
-    client.name = 'unconnected';
-    client.netconnection = netconnection;
-    client.state = ServerClient.STATE.CONNECTING;
-
-    client.old_frags = Infinity; // trigger a update frags
-
-    if (SV.server.gameCapabilities.includes(Defs.gameCapabilities.CAP_SPAWNPARMS_DYNAMIC)) {
-      client.entity.restoreSpawnParameters(old_spawn_parms);
-    } else if (SV.server.gameCapabilities.includes(Defs.gameCapabilities.CAP_SPAWNPARMS_LEGACY)) {
-      if (SV.server.loadgame) {
-        console.assert(old_spawn_parms instanceof Array, 'old_spawn_parms is an array');
-
-        for (let i = 0; i < client.spawn_parms.length; i++) {
-          client.spawn_parms[i] = old_spawn_parms[i];
-        }
-      } else {
-        SV.server.gameAPI.SetNewParms();
-        for (let i = 0; i < client.spawn_parms.length; i++) {
-          client.spawn_parms[i] = SV.server.gameAPI[`parm${i + 1}`];
-        }
-      }
-    }
-
-    SV.messages.sendServerData(client);
-  }
-
-  static CheckForNewClients() {
-    while (true) {
-      const ret = NET.CheckNewConnections();
-      if (!ret) {
-        return;
-      }
-      let i;
-      for (i = 0; i < SV.svs.maxclients; i++) {
-        if (SV.svs.clients[i].state < ServerClient.STATE.CONNECTED) {
-          break;
-        }
-      }
-      if (i === SV.svs.maxclients) {
-        Con.Print('SV.CheckForNewClients: Server is full\n');
-        const message = new SzBuffer(32);
-        message.writeByte(Protocol.svc.disconnect);
-        message.writeString('Server is full');
-        NET.SendUnreliableMessage(ret, message);
-        NET.Close(ret);
-        return;
-      }
-      const client = SV.svs.clients[i];
-      SV.ConnectClient(client, ret);
-      NET.activeconnections++;
-      eventBus.publish('server.client.connected', client.num, client.name);
-    }
-  }
-
-  // =============================================================================
-  // UTILITIES & HELPERS
-  // Miscellaneous helper functions for models, spawn parameters, etc.
-  // =============================================================================
-
-  static ModelIndex(name) {
-    if (!name) {
-      return 0;
-    }
-    for (let i = 0; i < SV.server.modelPrecache.length; i++) {
-      if (SV.server.modelPrecache[i] === name) {
-        return i;
-      }
-    }
-    console.assert(false, 'model must be precached', name);
-    return null;
-  }
-
-  static SaveSpawnparms() {
-    if ('serverflags' in SV.server.gameAPI) {
-      SV.svs.serverflags = SV.server.gameAPI.serverflags;
-    }
-
-    for (let i = 0; i < SV.svs.maxclients; i++) {
-      /** @type {ServerClient} */
-      const client = SV.svs.clients[i];
-
-      if (client.state < ServerClient.STATE.CONNECTED) {
-        continue;
-      }
-
-      client.saveSpawnparms();
-    }
-  }
-
-  static HasMap(mapname) {
-    console.trace('SV.HasMap called');
-    return Mod.known['maps/' + mapname + '.bsp'] !== undefined;
-  }
-
-  static async SpawnServer(mapname) {
-    // Ensure hostname is set
-    if (NET.hostname.string.trim() === '') {
-      NET.hostname.set('UNNAMED');
-    }
-
-    eventBus.publish('server.spawning', { mapname });
-    Con.DPrint('SpawnServer: ' + mapname + '\n');
-
-    // If server is already active, notify clients about map change
-    if (SV.server.active) {
-      SV.#notifyClientsOfMapChange(mapname);
-    }
-
-    // Clear memory and load game progs
-    Con.DPrint('Clearing memory\n');
-    Mod.ClearAll(Mod.scope.server);
-    await SV.#loadGameProgs();
-
-    // Initialize edicts and server state
-    SV.#initializeEdicts();
-
-    // Load world model
-    if (!await SV.#loadWorldModel(mapname)) {
-      return false;
-    }
-
-    // Initialize shared player-move collision context
-    SV.pmove.setWorldmodel(SV.server.worldmodel);
-
-    // Setup area nodes for spatial partitioning
-    SV.area.initOctree(SV.server.worldmodel.mins, SV.server.worldmodel.maxs);
-
-    // Setup model and sound precache
-    SV.#setupModelPrecache();
-
-    // Setup player entities
-    if (!SV.#setupPlayerEntities()) {
-      return false;
-    }
-
-    // Initialize light styles
-    SV.#initializeLightStyles();
-
-    // Setup dynamic field compression
-    SV.#setupClientDataFields();
-    SV.#setupExtendedEntityFields();
-
-    // Reset event bus subscriptions
-    SV.server.eventBus.unsubscribeAll();
-
-    // Initialize navigation graph
-    SV.server.navigation = new Navigation(SV.server.worldmodel);
-
-    // Initialize the game
-    SV.server.gameAPI.init(mapname, SV.svs.serverflags);
-
-    // Spawn worldspawn entity
-    if (!SV.#spawnWorldspawnEntity()) {
-      return false;
-    }
-
-    // Wait on all precached models to load
-    await SV.WaitForPrecachedResources();
-
-    // Populate all edicts by the entities file
-    await ED.LoadFromFile(SV.server.worldmodel.entities);
-
-    // Finalize and notify clients
-    SV.#finalizeServerSpawn(mapname);
-
-    SV.svs.changelevelIssued = false;
-
-    return true;
-  }
-
-  static ShutdownServer(isCrashShutdown) {
-    // tell the game we are shutting down the game
-    SV.server.gameAPI.shutdown(isCrashShutdown);
-
-    // make sure all references are dropped
-    SV.server.active = false;
-    SV.server.loading = false;
-    SV.server.worldmodel = null;
-    SV.server.gameAPI = null;
-
-    // unlink all edicts from client structures, reset data
-    for (const client of SV.svs.clients) {
-      client.clear();
-    }
-
-    // purge out all edicts
-    for (const edict of SV.server.edicts) {
-      // explicitly tell entities to free memory
-      edict.clear();
-      edict.freeEdict();
-    }
-
-    SV.server.edicts.length = 0;
-    SV.server.num_edicts = 0;
-
-    for (const model of SV.server.models) {
-      if (model instanceof Promise) {
-        // still loading, cannot reset
-        /** @type {Promise} */ void (model).then((m) => m.reset());
-        continue;
-      }
-
-      if (model) {
-        model.reset(); // TODO: should be .free() in future
-      }
-    }
-
-    SV.server.models.length = 0;
-
-    if (SV.server.navigation) {
-      SV.server.navigation.shutdown();
-      SV.server.navigation = null;
-    }
-
-    SV.server.eventBus.unsubscribeAll();
-
-    // reset all static server state
-    SV.svs.changelevelIssued = false;
-
-    if (isCrashShutdown) {
-      Con.PrintWarning('Server shut down due to a crash!\n');
-      return;
-    }
-
-    Con.DPrint('Server shut down.\n');
-
-    // TODO: send event
-  }
-
-  /**
-   * Writes a cvar to a message stream.
-   * @param {SzBuffer} msg message stream
-   * @param {Cvar} cvar cvar to write
-   */
-  static WriteCvar(msg, cvar) {
-    if (cvar.flags & Cvar.FLAG.SECRET) {
-      msg.writeString(cvar.name);
-      msg.writeString(cvar.string ? 'REDACTED' : '');
-    } else {
-      msg.writeString(cvar.name);
-      msg.writeString(cvar.string);
-    }
-  }
-
-  /**
-   * Called when a cvar changes.
-   * @param {Cvar} cvar cvar that changed
-   */
-  static CvarChanged(cvar) {
-    for (let i = 0; i < SV.svs.maxclients; i++) {
-      const client = SV.svs.clients[i];
-      if (client.state < ServerClient.STATE.CONNECTED) {
-        continue;
-      }
-
-      client.message.writeByte(Protocol.svc.cvar);
-      client.message.writeByte(1);
-      SV.WriteCvar(client.message, cvar);
-    }
-  }
-
-  // =============================================================================
-  // CLIENT COMMUNICATION
-  // Functions for reading client input and handling client messages
-  // =============================================================================
-
-  /**
-   * Reads the movement command from a client.
-   * @param {ServerClient} client client
-   */
-  static ReadClientMove(client) {
-    const cmd = new Protocol.UserCmd();
-    cmd.msec = NET.message.readByte();
-    cmd.angles = NET.message.readAngleVector();
-    cmd.forwardmove = NET.message.readShort();
-    cmd.sidemove = NET.message.readShort();
-    cmd.upmove = NET.message.readShort();
-    cmd.buttons = NET.message.readByte();
-    cmd.impulse = NET.message.readByte();
-    const seq = NET.message.readByte();
-
-    // Apply entity-side fields from the latest command (QuakeC compatibility)
-    client.edict.entity.button0 = (cmd.buttons & Protocol.button.attack) === 1;
-    client.edict.entity.button1 = ((cmd.buttons & Protocol.button.use) >> 2) === 1;
-    client.edict.entity.button2 = ((cmd.buttons & Protocol.button.jump) >> 1) === 1;
-    client.edict.entity.v_angle = cmd.angles;
-    if (cmd.impulse !== 0) {
-      client.edict.entity.impulse = cmd.impulse;
-    }
-
-    // While paused, keep the latest command/entity-side compatibility fields
-    // in sync, but do not enqueue movement for later replay.
-    if (SV.server.paused) {
-      client.cmd.set(cmd);
-      client.lastMoveSequence = seq;
-      return;
-    }
-
-    // Queue the command for per-command processing in physicsClient
-    // (QW-style: each command is simulated individually so msec matches
-    // what the client predicted, even when multiple arrive in one frame).
-    client.pendingCmds.push(cmd);
-
-    // Keep client.cmd as the latest for backwards-compat code paths
-    client.cmd.set(cmd);
-    client.lastMoveSequence = seq;
-  }
-
-  /**
-   * Handles a rcon request from a client.
-   * @param {ServerClient} client client
-   */
-  static HandleRconRequest(client) {
-    const message = client.message;
-
-    const password = NET.message.readString();
-    const cmd = NET.message.readString();
-
-    const rconPassword = SV.rcon_password.string;
-
-    if (rconPassword === '' || rconPassword !== password) {
-      message.writeByte(Protocol.svc.print);
-      message.writeString('Wrong rcon password!\n');
-      if (rconPassword === '') {
-        Con.Print(`SV.HandleRconRequest: rcon attempted by ${client.name} from ${client.netconnection.address}: ${cmd}\n`);
-      }
-      return;
-    }
-
-    Con.Print(`[${client.name}@${client.netconnection.address}] ${cmd}\n`);
-
-    Con.StartCapturing();
-    void Cmd.ExecuteString(cmd);
-
-    const response = Con.StopCapturing();
-    message.writeByte(Protocol.svc.print);
-    message.writeString(response);
-  }
-
-  /**
-   * Reads the movement command from a client.
-   * @param {ServerClient} client client
-   * @returns {boolean} true if successful, false if failed
-   */
-  static ReadClientMessage(client) {
-    // Process all pending network messages
-    while (true) {
-      const ret = NET.GetMessage(client.netconnection);
-
-      if (ret === -1) {
-        Con.DPrint(`SV.ReadClientMessage: NET.GetMessage from ${client.name} (${client.netconnection.address}) failed\n`);
-        return false;
-      }
-
-      if (ret === 0) {
-        return true; // No more messages
-      }
-
-      NET.message.beginReading();
-
-      // Process all commands in this message
-      while (true) {
-        if (client.state < ServerClient.STATE.CONNECTED) {
-          return false;
-        }
-
-        if (NET.message.badread) {
-          Con.Print('SV.ReadClientMessage: badread\n');
-          return false;
-        }
-
-        // Update client ping time
-        client.ping_times[client.num_pings++ % client.ping_times.length] = SV.server.time - client.sync_time;
-
-        const cmd = NET.message.readChar();
-
-        if (cmd === -1) {
-          break; // End of message
-        }
-
-        if (!SV.#processClientCommand(client, cmd)) {
-          return false; // Client should disconnect
-        }
-      }
-    }
-  }
-
-  static RunClients() {
-    for (let i = 0; i < SV.svs.maxclients; i++) {
-      const client = SV.svs.clients[i];
-      if (client.state < ServerClient.STATE.CONNECTED) {
-        continue;
-      }
-      if (!SV.ReadClientMessage(client)) {
-        Host.DropClient(client, false, 'Connectivity issues, failed to read message');
-        continue;
-      }
-      if (client.state < ServerClient.STATE.CONNECTED) {
-        client.cmd.reset();
-        continue;
-      }
-      // TODO: drop clients without an update
-      SV.clientPhysics.clientThink(client.edict, client);
-    }
-  }
-
-  /**
-   * Finds a client by name.
-   * @param {string} name name of the client
-   * @returns {ServerClient|null} the client if found, null otherwise
-   */
-  static FindClientByName(name) {
-    return SV.svs.clients
-      .filter((client) => client.state >= ServerClient.STATE.CONNECTED)
-      .find((client) => client.name === name) || null;
-  }
-
-  /**
-   * Notifies all connected clients about a map change and resets their state.
-   * @param {string} mapname name of the new map
-   */
-  static #notifyClientsOfMapChange(mapname) {
-    // Make sure that all client states are partially reset and ready for a new map
-    for (const client of SV.svs.clients) {
-      if (client.state < ServerClient.STATE.CONNECTED) {
-        continue;
-      }
-
-      client.changelevel(mapname);
-    }
-
-    // Shut down navigation, since map has changed
-    if (SV.server.navigation) {
-      SV.server.navigation.shutdown();
-      SV.server.navigation = null;
-    }
-  }
-
-  /**
-   * Loads the game progs and initializes game API.
-   * Sets up gameAPI, gameVersion, gameName, and gameCapabilities.
-   */
-  static async #loadGameProgs() {
-    SV.server.gameAPI = PR.QuakeJS ? new PR.QuakeJS.ServerGameAPI(ServerEngineAPI) : await PR.LoadProgs();
-    SV.server.gameVersion = `${(PR.QuakeJS ? `${PR.QuakeJS.identification.version.join('.')} QuakeJS` : `${PR.crc} CRC`)}`;
-    SV.server.gameName = PR.QuakeJS ? PR.QuakeJS.identification.name : COM.game;
-    SV.server.gameCapabilities = PR.QuakeJS ? PR.QuakeJS.identification.capabilities : PR.capabilities;
-
-    Con.DPrint('Game progs loaded\n');
-  }
-
-  /**
-   * Initializes the edict array and server state.
-   * Preallocates edicts and resets server state variables.
-   */
-  static #initializeEdicts() {
-    SV.server.edicts.length = 0;
-
-    // Preallocating up to Def.limits.edicts, we can extend that later during runtime
-    for (let i = 0; i < Def.limits.edicts; i++) {
-      SV.server.edicts[i] = new ServerEdict(i);
-    }
-
-    // Clear message buffers
-    SV.server.datagram.clear();
-    SV.server.reliable_datagram.clear();
-    SV.server.signon.clear();
-
-    // Hooking up the edicts reserved for clients
-    SV.server.num_edicts = SV.svs.maxclients + 1;
-
-    // Reset server state
-    SV.server.loading = true;
-    SV.server.paused = false;
-    SV.server.loadgame = false;
-    SV.server.time = 1.0;
-    SV.server.lastcheck = 0;
-    SV.server.lastchecktime = 0.0;
-
-    Con.DPrint('Edicts initialized\n');
-  }
-
-  /**
-   * Loads and initializes the world model for the given map.
-   * @param {string} mapname name of the map to load
-   * @returns {Promise<boolean>} true if successful, false if map couldn't be loaded
-   */
-  static async #loadWorldModel(mapname) {
-    SV.server.mapname = mapname;
-    SV.server.worldmodel = /** @type {BrushModel} */ (await Mod.ForNameAsync('maps/' + mapname + '.bsp', false, Mod.scope.server));
-
-    if (SV.server.worldmodel === null) {
-      Con.PrintWarning('SV.SpawnServer: Cannot start server, unable to load map ' + mapname + '\n');
-      SV.server.active = false;
-      return false;
-    }
-
-    Con.DPrint('World model loaded\n');
-
-    return true;
-  }
-
-  /**
-   * Sets up model precache array including world model and submodels.
-   */
-  static #setupModelPrecache() {
-    SV.server.models.length = 2;
-    SV.server.models[0] = null; // null model
-    SV.server.models[1] = SV.server.worldmodel;
-
-    SV.server.soundPrecache.length = 1;
-    SV.server.soundPrecache[0] = ''; // null sound
-
-    SV.server.modelPrecache.length = 2 + SV.server.worldmodel.submodels.length;
-    SV.server.modelPrecache[0] = ''; // null model
-    SV.server.modelPrecache[1] = SV.server.worldmodel.name;
-
-    // Precache all submodels (brushes connected to entities like doors)
-    for (let i = 1; i <= SV.server.worldmodel.submodels.length; i++) {
-      SV.server.modelPrecache[i + 1] = '*' + i;
-      SV.server.models[i + 1] = Mod.ForName('*' + i, Mod.scope.server);
-    }
-
-    Con.DPrint('Model precache setup complete\n');
-  }
-
-  /**
-   * Prepares player entities in the client edict slots.
-   * @returns {boolean} true if successful, false if game doesn't support player entities
-   */
-  static #setupPlayerEntities() {
-    for (let i = 0; i < SV.svs.maxclients; i++) {
-      const ent = SV.server.edicts[i + 1];
-
-      // We need to spawn the player entity in those client edict slots
-      if (!SV.server.gameAPI.prepareEntity(ent, 'player')) {
-        Con.PrintWarning('SV.SpawnServer: Cannot start server, because game does not know what a player entity is.\n');
-        SV.server.active = false;
-        return false;
-      }
-    }
-
-    Con.DPrint('Player entities setup complete\n');
-
-    return true;
-  }
-
-  /**
-   * Initializes light styles array.
-   */
-  static #initializeLightStyles() {
-    SV.server.lightstyles = [];
-    for (let i = 0; i <= Def.limits.lightstyles; i++) {
-      SV.server.lightstyles[i] = '';
-    }
-
-    Con.DPrint('Light styles initialized\n');
-  }
-
-  /**
-   * Configures clientdata compression fields for dynamic entity serialization.
-   */
-  static #setupClientDataFields() {
-    if (SV.server.gameCapabilities.includes(Defs.gameCapabilities.CAP_CLIENTDATA_DYNAMIC)) {
-      console.assert('clientdataFields' in SV.server.edicts[1].entity, 'CAP_CLIENTDATA_DYNAMIC requires clientdataFields on PlayerEntity');
-
-      const fields = SV.server.edicts[1].entity.clientdataFields;
-
-      console.assert(fields instanceof Array, 'clientdataFields must be an array');
-
-      // Configure clientdata fields
-      SV.server.clientdataFields.length = 0;
-      SV.server.clientdataFields.push(...fields);
-      console.assert(SV.server.clientdataFields.length <= 32, 'clientdata must not have more than 32 fields');
-
-      // Select appropriate bits writer based on field count
-      if (fields.length <= 8) {
-        SV.server.clientdataFieldsBitsWriter = 'writeByte';
-      } else if (fields.length <= 16) {
-        SV.server.clientdataFieldsBitsWriter = 'writeShort';
-      } else if (fields.length <= 32) {
-        SV.server.clientdataFieldsBitsWriter = 'writeLong';
-      }
-
-      // Double check that all fields are actually defined
-      for (const field of fields) {
-        console.assert(SV.server.edicts[1].entity[field] !== undefined, `Undefined clientdata field ${field}`);
-      }
-    }
-
-    Con.DPrint('Clientdata fields setup complete\n');
-  }
-
-  /**
-   * Configures extended entity field compression for client-side entities.
-   */
-  static #setupExtendedEntityFields() {
-    if (SV.server.gameCapabilities.includes(Defs.gameCapabilities.CAP_ENTITY_EXTENDED)) {
-      const fields = SV.server.gameAPI.getClientEntityFields();
-
-      for (const [classname, extendedFields] of Object.entries(fields)) {
-        const clientEntityField = {
-          fields: [],
-          bitsWriter: null,
-        };
-
-        clientEntityField.fields.push(...extendedFields);
-
-        // Select appropriate bits writer based on field count
-        if (extendedFields.length <= 8) {
-          clientEntityField.bitsWriter = 'writeByte';
-        } else if (extendedFields.length <= 16) {
-          clientEntityField.bitsWriter = 'writeShort';
-        } else if (extendedFields.length <= 32) {
-          clientEntityField.bitsWriter = 'writeLong';
-        }
-
-        SV.server.clientEntityFields[classname] = clientEntityField;
-      }
-    }
-
-    Con.DPrint('Extended entity fields setup complete\n');
-  }
-
-  /**
-   * Spawns the worldspawn entity (edict 0).
-   * @returns {boolean} true if successful, false if worldspawn couldn't be created
-   */
-  static #spawnWorldspawnEntity() {
-    const ent = SV.server.edicts[0];
-
-    if (!SV.server.gameAPI.prepareEntity(ent, 'worldspawn', {
-      model: SV.server.worldmodel.name,
-      modelindex: 1,
-      solid: Defs.solid.SOLID_BSP,
-      movetype: Defs.moveType.MOVETYPE_PUSH,
-    })) {
-      Con.PrintWarning('SV.SpawnServer: Cannot start server, because the game does not know what a worldspawn entity is.\n');
-      SV.server.active = false;
-      return false;
-    }
-
-    // Invoke the spawn function for the worldspawn
-    SV.server.gameAPI.spawnPreparedEntity(ent);
-
-    Con.DPrint('Worldspawn entity spawned\n');
-
-    return true;
-  }
-
-  static async WaitForPrecachedResources() {
-    for (let i = 0; i < SV.server.models.length; i++) {
-      const model = SV.server.models[i];
-
-      if (model instanceof Promise) {
-        // eslint-disable-next-line require-atomic-updates
-        SV.server.models[i] = await model;
-      }
-    }
-
-    Con.DPrint('Pending precached resources loaded\n');
-  }
-
-  /**
-   * Finalizes server spawn by loading entities and notifying clients.
-   * @param {string} mapname name of the spawned map
-   */
-  static #finalizeServerSpawn(mapname) {
-    SV.server.active = true;
-    SV.server.loading = false;
-
-    // Run physics twice to settle entities
-    Host.frametime = 0.1;
-    SV.physics.physics();
-    SV.physics.physics();
-
-    // Notify all active clients about the new map
-    for (let i = 0; i < SV.svs.maxclients; i++) {
-      const client = SV.svs.clients[i];
-      if (client.state >= ServerClient.STATE.CONNECTED) {
-        SV.messages.sendServerData(client);
-      }
-    }
-
-    // Initialize navigation
-    SV.server.navigation.init();
-
-    eventBus.publish('server.spawned', { mapname });
-    Con.PrintSuccess('Server spawned.\n');
-  }
-
-  /**
-   * Handles a string command from the client.
-   * @param {ServerClient} client client sending the command
-   * @param {string} input command string
-   */
-  static #handleClientStringCommand(client, input) {
-    const matchedCommand = ALLOWED_CLIENT_COMMANDS.find((command) =>
-      input.toLowerCase().startsWith(command),
-    );
-
-    if (matchedCommand) {
-      void Cmd.ExecuteString(input, client);
-    } else {
-      Con.Print(`${client.name} tried to ${input}!\n`);
-    }
-  }
-
-  /**
-   * Processes a single client command from the message buffer.
-   * @param {ServerClient} client client
-   * @param {number} cmd command type
-   * @returns {boolean} false if client should disconnect, true otherwise
-   */
-  static #processClientCommand(client, cmd) {
-    switch (cmd) {
-      case Protocol.clc.nop:
-        Con.DPrint(`${client.netconnection.address} sent a nop\n`);
-        return true;
-
-      case Protocol.clc.stringcmd: {
-        const input = NET.message.readString();
-        SV.#handleClientStringCommand(client, input);
-        return true;
-      }
-
-      case Protocol.clc.sync:
-        client.sync_time = NET.message.readFloat();
-        return true;
-
-      case Protocol.clc.rconcmd:
-        SV.HandleRconRequest(client);
-        return true;
-
-      case Protocol.clc.disconnect:
-        return false; // Client disconnect
-
-      case Protocol.clc.move:
-        SV.ReadClientMove(client);
-        return true;
-
-      default:
-        Con.DPrint(`SV.ReadClientMessage: unknown command ${cmd} from ${client.netconnection.address}\n`);
-        return false;
-    }
-  }
-};
-
-/**
- * Simple class hooking up all movevars with corresponding cvars.
- */
-class PlayerMoveCvars extends MoveVars {
-  // @ts-ignore
-  get gravity() { return SV.gravity.value; }
-  // @ts-ignore
-  get stopspeed() { return SV.stopspeed.value; }
-  // @ts-ignore
-  get maxspeed() { return SV.maxspeed.value; }
-  // @ts-ignore
-  get spectatormaxspeed() { return SV.spectatormaxspeed.value; }
-  // @ts-ignore
-  get accelerate() { return SV.accelerate.value; }
-  // @ts-ignore
-  get airaccelerate() { return SV.airaccelerate.value; }
-  // @ts-ignore
-  get wateraccelerate() { return SV.wateraccelerate.value; }
-  // @ts-ignore
-  get friction() { return SV.friction.value; }
-  // @ts-ignore
-  get waterfriction() { return SV.waterfriction.value; }
-  // @ts-ignore
-  get edgefriction() { return SV.edgefriction.value; }
-
-  set gravity(_value) { }
-  set stopspeed(_value) { }
-  set maxspeed(_value) { }
-  set spectatormaxspeed(_value) { }
-  set accelerate(_value) { }
-  set airaccelerate(_value) { }
-  set wateraccelerate(_value) { }
-  set friction(_value) { }
-  set waterfriction(_value) { }
-  set edgefriction(_value) { }
-
-  /**
-   * Writes the movevars to the client.
-   * @param {SzBuffer} message message stream
-   */
-  sendToClient(message) {
-    message.writeFloat(this.gravity);
-    message.writeFloat(this.stopspeed);
-    message.writeFloat(this.maxspeed);
-    message.writeFloat(this.spectatormaxspeed);
-    message.writeFloat(this.accelerate);
-    message.writeFloat(this.airaccelerate);
-    message.writeFloat(this.wateraccelerate);
-    message.writeFloat(this.friction);
-    message.writeFloat(this.waterfriction);
-    message.writeFloat(this.entgravity);
-  }
-
-  // CR: leaving out entgravity, it's entity specific
-}
-
-sharedCollisionModelSource.configureServer({
-  getWorldEntity: () => SV.server?.edicts?.[0] ?? null,
-  getWorldModel: () => SV.server?.worldmodel ?? null,
-  getModels: () => SV.server?.models ?? null,
-});
+export { default, ServerEntityState } from './Server.ts';
diff --git a/source/engine/server/Server.ts b/source/engine/server/Server.ts
new file mode 100644
index 00000000..cf79338b
--- /dev/null
+++ b/source/engine/server/Server.ts
@@ -0,0 +1,1055 @@
+import type { ServerGameInterface } from '../../shared/GameInterfaces.ts';
+import type { BaseModel } from '../common/model/BaseModel.ts';
+import type { QSocket } from '../network/NetworkDrivers.ts';
+
+import Cvar from '../common/Cvar.ts';
+import { MoveVars, Pmove } from '../common/Pmove.ts';
+import { SzBuffer } from '../network/MSG.ts';
+import * as Protocol from '../network/Protocol.ts';
+import * as Def from './../common/Def.ts';
+import Cmd, { ConsoleCommand } from '../common/Cmd.ts';
+import { ED, ServerEdict } from './Edict.mjs';
+import { EventBus, eventBus, getCommonRegistry } from '../registry.mjs';
+import { ServerEngineAPI } from '../common/GameAPIs.ts';
+import * as Defs from '../../shared/Defs.ts';
+import { Navigation } from './Navigation.mjs';
+import { ServerPhysics } from './physics/ServerPhysics.ts';
+import { ServerClientPhysics } from './physics/ServerClientPhysics.ts';
+import { ServerMessages } from './ServerMessages.mjs';
+import { ServerMovement } from './physics/ServerMovement.ts';
+import { ServerArea } from './physics/ServerArea.ts';
+import { ServerCollision } from './physics/ServerCollision.ts';
+import { sharedCollisionModelSource } from '../common/CollisionModelSource.ts';
+import { BrushModel } from '../common/Mod.ts';
+import { ServerClient } from './Client.mjs';
+
+export { ServerEntityState } from './ServerEntityState.mjs';
+
+let { COM, Con, Host, Mod, NET, PR } = getCommonRegistry();
+
+eventBus.subscribe('registry.frozen', () => {
+  ({ COM, Con, Host, Mod, NET, PR } = getCommonRegistry());
+});
+
+type BitsWriter = 'writeByte' | 'writeShort' | 'writeLong';
+type ScheduledGameCommand = () => void;
+type ServerClientSpawnParameters = ServerClient['spawn_parms'];
+type ServerModel = BaseModel | null | Promise<BaseModel>;
+type DynamicSpawnClientEntity = ServerClient['entity'] & {
+  restoreSpawnParameters(data: string | null): void;
+};
+type PlayerClientdataEntity = ServerClient['entity'] & {
+  clientdataFields: string[];
+} & Record<string, unknown>;
+
+interface ServerRuntimeGameAPI extends ServerGameInterface {
+  frametime: number;
+  time: number;
+  serverflags?: number;
+}
+
+interface LegacySpawnParmsGameAPI extends ServerRuntimeGameAPI {
+  SetNewParms(): void;
+  [key: `parm${number}`]: number;
+}
+
+interface ClientEntityFieldConfig {
+  fields: string[];
+  bitsWriter: BitsWriter | null;
+}
+
+interface ServerState {
+  time: number;
+  num_edicts: number;
+  datagram: SzBuffer;
+  expedited_datagram: SzBuffer;
+  reliable_datagram: SzBuffer;
+  signon: SzBuffer;
+  edicts: ServerEdict[];
+  mapname: string | null;
+  worldmodel: BrushModel | null;
+  eventBus: EventBus;
+  navigation: Navigation | null;
+  gameAPI: ServerRuntimeGameAPI | null;
+  gameVersion: string | null;
+  gameName: string | null;
+  gameCapabilities: Defs.gameCapabilities[];
+  clientdataFields: string[];
+  clientdataFieldsBitsWriter: BitsWriter | null;
+  clientEntityFields: Record<string, ClientEntityFieldConfig>;
+  models: ServerModel[];
+  soundPrecache: string[];
+  modelPrecache: string[];
+  lightstyles: string[];
+  active: boolean;
+  loading: boolean;
+  paused: boolean;
+  loadgame: boolean;
+  lastcheck: number;
+  lastchecktime: number;
+}
+
+interface ServerStaticState {
+  changelevelIssued: boolean;
+  clients: ServerClient[];
+  maxclients: number;
+  maxclientslimit: number;
+  gamestate: null;
+  maplist: string[];
+  serverflags: number;
+  spawnedClients(): Generator<ServerClient, void, void>;
+}
+
+const ALLOWED_CLIENT_COMMANDS = Object.freeze([
+  'status',
+  'god',
+  'notarget',
+  'fly',
+  'name',
+  'noclip',
+  'say',
+  'say_team',
+  'tell',
+  'color',
+  'kill',
+  'pause',
+  'spawn',
+  'begin',
+  'prespawn',
+  'kick',
+  'ping',
+  'give',
+  'ban',
+] as const);
+
+/**
+ * Main server class with all server-related functionality.
+ * All properties and methods are static.
+ */
+export default class SV {
+  /** current server state */
+  static server: ServerState = {
+    time: 0,
+    num_edicts: 0,
+    datagram: new SzBuffer(16384, 'SV.server.datagram'),
+    expedited_datagram: new SzBuffer(16384, 'SV.server.expedited_datagram'),
+    reliable_datagram: new SzBuffer(16384, 'SV.server.reliable_datagram'),
+    signon: new SzBuffer(16384, 'SV.server.signon'),
+    edicts: [],
+    mapname: null,
+    worldmodel: null,
+    eventBus: new EventBus('server-game'),
+    navigation: null,
+    gameAPI: null,
+    gameVersion: null,
+    gameName: null,
+    gameCapabilities: [],
+    clientdataFields: [],
+    clientdataFieldsBitsWriter: null,
+    clientEntityFields: {},
+    models: [],
+    soundPrecache: [],
+    modelPrecache: [],
+    lightstyles: [],
+    active: false,
+    loading: false,
+    paused: false,
+    loadgame: false,
+    lastcheck: 0,
+    lastchecktime: 0,
+  };
+
+  /** server static, state across maps */
+  static svs: ServerStaticState = {
+    changelevelIssued: false,
+    clients: [],
+    maxclients: 0,
+    maxclientslimit: 32,
+    gamestate: null,
+    maplist: [],
+    serverflags: 0,
+
+    *spawnedClients() {
+      for (const client of this.clients) {
+        if (client.state === ServerClient.STATE.SPAWNED) {
+          yield client;
+        }
+      }
+    },
+  };
+
+  static physics = new ServerPhysics();
+  static clientPhysics = new ServerClientPhysics();
+  static messages = new ServerMessages();
+  static movement = new ServerMovement();
+  static area = new ServerArea(sharedCollisionModelSource);
+  static collision = new ServerCollision(sharedCollisionModelSource);
+
+  /** shared player-move collision context */
+  static pmove: Pmove | null = null;
+
+  static maxvelocity: Cvar | null = null;
+  static edgefriction: Cvar | null = null;
+  static stopspeed: Cvar | null = null;
+  static accelerate: Cvar | null = null;
+  static idealpitchscale: Cvar | null = null;
+  static aim: Cvar | null = null;
+  static nostep: Cvar | null = null;
+  static cheats: Cvar | null = null;
+  static gravity: Cvar | null = null;
+  static friction: Cvar | null = null;
+  static maxspeed: Cvar | null = null;
+  static airaccelerate: Cvar | null = null;
+  static wateraccelerate: Cvar | null = null;
+  static spectatormaxspeed: Cvar | null = null;
+  static waterfriction: Cvar | null = null;
+  static rcon_password: Cvar | null = null;
+  static maplist: Cvar | null = null;
+  static nextmap: Cvar | null = null;
+  static ['public']: Cvar | null = null;
+
+  /** Scheduled game commands. */
+  static _scheduledGameCommands: ScheduledGameCommand[] = [];
+
+  static #requireGameAPI(): ServerRuntimeGameAPI {
+    if (SV.server.gameAPI === null) {
+      throw new Error('SV.server.gameAPI is not initialized');
+    }
+
+    return SV.server.gameAPI;
+  }
+
+  static #requireWorldModel(): BrushModel {
+    if (SV.server.worldmodel === null) {
+      throw new Error('SV.server.worldmodel is not initialized');
+    }
+
+    return SV.server.worldmodel;
+  }
+
+  static #requirePmove(): Pmove {
+    if (SV.pmove === null) {
+      throw new Error('SV.pmove is not initialized');
+    }
+
+    return SV.pmove;
+  }
+
+  static #requireNavigation(): Navigation {
+    if (SV.server.navigation === null) {
+      throw new Error('SV.server.navigation is not initialized');
+    }
+
+    return SV.server.navigation;
+  }
+
+  static #getLegacySpawnParmsGameAPI(): LegacySpawnParmsGameAPI {
+    return SV.#requireGameAPI() as unknown as LegacySpawnParmsGameAPI;
+  }
+
+  static InitPmove(): void {
+    SV.pmove = new Pmove();
+    SV.pmove.movevars = new PlayerMoveCvars();
+  }
+
+  static Init(): void {
+    SV.maxvelocity = new Cvar('sv_maxvelocity', '2000', Cvar.FLAG.SERVER);
+    SV.edgefriction = new Cvar('edgefriction', '2', Cvar.FLAG.SERVER);
+    SV.stopspeed = new Cvar('sv_stopspeed', '100', Cvar.FLAG.SERVER);
+    SV.accelerate = new Cvar('sv_accelerate', '10', Cvar.FLAG.SERVER);
+    SV.idealpitchscale = new Cvar('sv_idealpitchscale', '0.8');
+    SV.aim = new Cvar('sv_aim', '0.93');
+    SV.nostep = new Cvar('sv_nostep', '0');
+    SV.cheats = new Cvar('sv_cheats', '0', Cvar.FLAG.SERVER);
+    SV.gravity = new Cvar('sv_gravity', '800', Cvar.FLAG.SERVER);
+    SV.friction = new Cvar('sv_friction', '4', Cvar.FLAG.SERVER);
+    SV.maxspeed = new Cvar('sv_maxspeed', '320', Cvar.FLAG.SERVER);
+    SV.airaccelerate = new Cvar('sv_airaccelerate', '0.7', Cvar.FLAG.SERVER);
+    SV.wateraccelerate = new Cvar('sv_wateraccelerate', '10', Cvar.FLAG.SERVER);
+    SV.spectatormaxspeed = new Cvar('sv_spectatormaxspeed', '500', Cvar.FLAG.SERVER);
+    SV.waterfriction = new Cvar('sv_waterfriction', '4', Cvar.FLAG.SERVER);
+    SV.rcon_password = new Cvar('sv_rcon_password', '', Cvar.FLAG.ARCHIVE);
+    SV.public = new Cvar('sv_public', '1', Cvar.FLAG.ARCHIVE | Cvar.FLAG.SERVER, 'Make this server publicly listed in the master server');
+
+    Navigation.Init();
+
+    Cmd.AddCommand('nav', class NavCommand extends ConsoleCommand {
+      run(): void {
+        if (!SV.server.navigation) {
+          Con.Print('navigation not initialized, you have to spawn a server first\n');
+          return;
+        }
+
+        SV.server.navigation.build();
+      }
+    });
+
+    eventBus.subscribe('cvar.changed', (name: string) => {
+      const cvar = Cvar.FindVar(name)!;
+
+      if ((cvar.flags & Cvar.FLAG.SERVER) && SV.server.active) {
+        SV.CvarChanged(cvar);
+      }
+    });
+
+    SV.InitNextmapStuff();
+    SV.InitPmove();
+    SV.area.initBoxHull();
+  }
+
+  static InitNextmapStuff(): void {
+    SV.maplist = new Cvar('sv_maplist', '', Cvar.FLAG.NONE, 'Comma-separated list of maps to cycle through after each map change');
+    SV.nextmap = new Cvar('sv_nextmap', '', Cvar.FLAG.SERVER, 'Next map to change to after the current one, will be autopopulated with the next map in sv_maplist after each map change');
+
+    eventBus.subscribe('cvar.changed.sv_maplist', () => {
+      if (SV.maplist!.string.trim() === '') {
+        SV.svs.maplist.length = 0;
+        return;
+      }
+
+      SV.svs.maplist = SV.maplist!.string.split(',').map((value) => value.trim()).filter((value) => value.length > 0);
+    });
+
+    eventBus.subscribe('server.spawning', ({ mapname }: { mapname: string }) => {
+      if (SV.svs.maplist.length === 0) {
+        return;
+      }
+
+      if (!SV.svs.maplist.includes(mapname)) {
+        SV.nextmap!.set(SV.svs.maplist[0]);
+        return;
+      }
+
+      const currentIndex = SV.svs.maplist.indexOf(mapname);
+      const nextIndex = (currentIndex + 1) % SV.svs.maplist.length;
+      SV.nextmap!.set(SV.svs.maplist[nextIndex]);
+    });
+
+    eventBus.subscribe('server.shutdown', () => {
+      SV.nextmap!.reset();
+    });
+  }
+
+  static RunScheduledGameCommands(): void {
+    while (SV._scheduledGameCommands.length > 0) {
+      const command = SV._scheduledGameCommands.shift();
+
+      command?.();
+    }
+  }
+
+  static ScheduleGameCommand(command: ScheduledGameCommand): void {
+    SV._scheduledGameCommands.push(command);
+  }
+
+  static ConnectClient(client: ServerClient, netconnection: QSocket): void {
+    Con.DPrint(`Client ${netconnection.address} connected\n`);
+
+    const oldSpawnParms: ServerClientSpawnParameters = SV.server.loadgame ? client.spawn_parms : null;
+
+    client.clear();
+    client.name = 'unconnected';
+    client.netconnection = netconnection;
+    client.state = ServerClient.STATE.CONNECTING;
+    client.old_frags = Infinity;
+
+    if (SV.server.gameCapabilities.includes(Defs.gameCapabilities.CAP_SPAWNPARMS_DYNAMIC)) {
+      const entity = client.entity as DynamicSpawnClientEntity;
+      entity.restoreSpawnParameters(typeof oldSpawnParms === 'string' ? oldSpawnParms : null);
+    } else if (SV.server.gameCapabilities.includes(Defs.gameCapabilities.CAP_SPAWNPARMS_LEGACY)) {
+      const spawnParms = client.spawn_parms as number[];
+
+      if (SV.server.loadgame) {
+        console.assert(oldSpawnParms instanceof Array, 'old_spawn_parms is an array');
+
+        for (let i = 0; i < spawnParms.length; i++) {
+          spawnParms[i] = oldSpawnParms![i] as number;
+        }
+      } else {
+        const gameAPI = SV.#getLegacySpawnParmsGameAPI();
+        gameAPI.SetNewParms();
+
+        for (let i = 0; i < spawnParms.length; i++) {
+          spawnParms[i] = gameAPI[`parm${i + 1}`];
+        }
+      }
+    }
+
+    SV.messages.sendServerData(client);
+  }
+
+  static CheckForNewClients(): void {
+    while (true) {
+      const ret = NET.CheckNewConnections();
+
+      if (!ret) {
+        return;
+      }
+
+      let i: number;
+
+      for (i = 0; i < SV.svs.maxclients; i++) {
+        if (SV.svs.clients[i].state < ServerClient.STATE.CONNECTED) {
+          break;
+        }
+      }
+
+      if (i === SV.svs.maxclients) {
+        Con.Print('SV.CheckForNewClients: Server is full\n');
+        const message = new SzBuffer(32);
+        message.writeByte(Protocol.svc.disconnect);
+        message.writeString('Server is full');
+        NET.SendUnreliableMessage(ret, message);
+        NET.Close(ret);
+        return;
+      }
+
+      const client = SV.svs.clients[i];
+      SV.ConnectClient(client, ret);
+      NET.activeconnections++;
+      eventBus.publish('server.client.connected', client.num, client.name);
+    }
+  }
+
+  static ModelIndex(name: string | null): number | null {
+    if (!name) {
+      return 0;
+    }
+
+    for (let i = 0; i < SV.server.modelPrecache.length; i++) {
+      if (SV.server.modelPrecache[i] === name) {
+        return i;
+      }
+    }
+
+    console.assert(false, 'model must be precached', name);
+    return null;
+  }
+
+  static SaveSpawnparms(): void {
+    const gameAPI = SV.#requireGameAPI();
+
+    if ('serverflags' in gameAPI) {
+      SV.svs.serverflags = gameAPI.serverflags ?? 0;
+    }
+
+    for (let i = 0; i < SV.svs.maxclients; i++) {
+      const client = SV.svs.clients[i];
+
+      if (client.state < ServerClient.STATE.CONNECTED) {
+        continue;
+      }
+
+      client.saveSpawnparms();
+    }
+  }
+
+  static HasMap(mapname: string): boolean {
+    console.trace('SV.HasMap called');
+    return Mod.known[`maps/${mapname}.bsp`] !== undefined;
+  }
+
+  static async SpawnServer(mapname: string): Promise<boolean> {
+    if (NET.hostname.string.trim() === '') {
+      NET.hostname.set('UNNAMED');
+    }
+
+    eventBus.publish('server.spawning', { mapname });
+    Con.DPrint(`SpawnServer: ${mapname}\n`);
+
+    if (SV.server.active) {
+      SV.#notifyClientsOfMapChange(mapname);
+    }
+
+    Con.DPrint('Clearing memory\n');
+    Mod.ClearAll(Mod.scope.server);
+    await SV.#loadGameProgs();
+
+    SV.#initializeEdicts();
+
+    if (!await SV.#loadWorldModel(mapname)) {
+      return false;
+    }
+
+    const worldmodel = SV.#requireWorldModel();
+    const pmove = SV.#requirePmove();
+    pmove.setWorldmodel(worldmodel);
+
+    SV.area.initOctree(worldmodel.mins, worldmodel.maxs);
+    SV.#setupModelPrecache();
+
+    if (!SV.#setupPlayerEntities()) {
+      return false;
+    }
+
+    SV.#initializeLightStyles();
+    SV.#setupClientDataFields();
+    SV.#setupExtendedEntityFields();
+
+    SV.server.eventBus.unsubscribeAll();
+    SV.server.navigation = new Navigation(worldmodel);
+
+    const gameAPI = SV.#requireGameAPI();
+    gameAPI.init(mapname, SV.svs.serverflags);
+
+    if (!SV.#spawnWorldspawnEntity()) {
+      return false;
+    }
+
+    await SV.WaitForPrecachedResources();
+    await ED.LoadFromFile(worldmodel.entities!);
+    SV.#finalizeServerSpawn(mapname);
+    SV.svs.changelevelIssued = false;
+
+    return true;
+  }
+
+  static ShutdownServer(isCrashShutdown: boolean): void {
+    SV.server.gameAPI?.shutdown(isCrashShutdown);
+
+    SV.server.active = false;
+    SV.server.loading = false;
+    SV.server.worldmodel = null;
+    SV.server.gameAPI = null;
+
+    for (const client of SV.svs.clients) {
+      client.clear();
+    }
+
+    for (const edict of SV.server.edicts) {
+      edict.clear();
+      edict.freeEdict();
+    }
+
+    SV.server.edicts.length = 0;
+    SV.server.num_edicts = 0;
+
+    for (const model of SV.server.models) {
+      if (model instanceof Promise) {
+        void model.then((loadedModel) => loadedModel.reset());
+        continue;
+      }
+
+      model?.reset();
+    }
+
+    SV.server.models.length = 0;
+
+    if (SV.server.navigation) {
+      SV.server.navigation.shutdown();
+      SV.server.navigation = null;
+    }
+
+    SV.server.eventBus.unsubscribeAll();
+    SV.svs.changelevelIssued = false;
+
+    if (isCrashShutdown) {
+      Con.PrintWarning('Server shut down due to a crash!\n');
+      return;
+    }
+
+    Con.DPrint('Server shut down.\n');
+  }
+
+  static WriteCvar(msg: SzBuffer, cvar: Cvar): void {
+    if (cvar.flags & Cvar.FLAG.SECRET) {
+      msg.writeString(cvar.name);
+      msg.writeString(cvar.string ? 'REDACTED' : '');
+      return;
+    }
+
+    msg.writeString(cvar.name);
+    msg.writeString(cvar.string);
+  }
+
+  static CvarChanged(cvar: Cvar): void {
+    for (let i = 0; i < SV.svs.maxclients; i++) {
+      const client = SV.svs.clients[i];
+
+      if (client.state < ServerClient.STATE.CONNECTED) {
+        continue;
+      }
+
+      client.message.writeByte(Protocol.svc.cvar);
+      client.message.writeByte(1);
+      SV.WriteCvar(client.message, cvar);
+    }
+  }
+
+  static ReadClientMove(client: ServerClient): void {
+    const cmd = new Protocol.UserCmd();
+    cmd.msec = NET.message.readByte();
+    cmd.angles = NET.message.readAngleVector();
+    cmd.forwardmove = NET.message.readShort();
+    cmd.sidemove = NET.message.readShort();
+    cmd.upmove = NET.message.readShort();
+    cmd.buttons = NET.message.readByte();
+    cmd.impulse = NET.message.readByte();
+    const seq = NET.message.readByte();
+
+    console.assert(client.edict.entity !== null, 'ServerClient.entity requires a linked edict entity');
+
+    const entity = client.edict.entity as PlayerClientdataEntity;
+
+    entity.button0 = (cmd.buttons & Protocol.button.attack) === 1;
+    entity.button1 = ((cmd.buttons & Protocol.button.use) >> 2) === 1;
+    entity.button2 = ((cmd.buttons & Protocol.button.jump) >> 1) === 1;
+    entity.v_angle = cmd.angles;
+
+    if (cmd.impulse !== 0) {
+      entity.impulse = cmd.impulse;
+    }
+
+    if (SV.server.paused) {
+      client.cmd.set(cmd);
+      client.lastMoveSequence = seq;
+      return;
+    }
+
+    client.pendingCmds.push(cmd);
+    client.cmd.set(cmd);
+    client.lastMoveSequence = seq;
+  }
+
+  static HandleRconRequest(client: ServerClient): void {
+    const message = client.message;
+    const netconnection = client.netconnection;
+
+    if (netconnection === null) {
+      return;
+    }
+
+    const password = NET.message.readString();
+    const cmd = NET.message.readString();
+    const rconPassword = SV.rcon_password!.string;
+
+    if (rconPassword === '' || rconPassword !== password) {
+      message.writeByte(Protocol.svc.print);
+      message.writeString('Wrong rcon password!\n');
+
+      if (rconPassword === '') {
+        Con.Print(`SV.HandleRconRequest: rcon attempted by ${client.name} from ${netconnection.address}: ${cmd}\n`);
+      }
+
+      return;
+    }
+
+    Con.Print(`[${client.name}@${netconnection.address}] ${cmd}\n`);
+
+    Con.StartCapturing();
+    void Cmd.ExecuteString(cmd);
+
+    const response = Con.StopCapturing();
+    message.writeByte(Protocol.svc.print);
+    message.writeString(response);
+  }
+
+  static ReadClientMessage(client: ServerClient): boolean {
+    const netconnection = client.netconnection;
+
+    if (netconnection === null) {
+      return false;
+    }
+
+    while (true) {
+      const ret = NET.GetMessage(netconnection);
+
+      if (ret === -1) {
+        Con.DPrint(`SV.ReadClientMessage: NET.GetMessage from ${client.name} (${netconnection.address}) failed\n`);
+        return false;
+      }
+
+      if (ret === 0) {
+        return true;
+      }
+
+      NET.message.beginReading();
+
+      while (true) {
+        if (client.state < ServerClient.STATE.CONNECTED) {
+          return false;
+        }
+
+        if (NET.message.badread) {
+          Con.Print('SV.ReadClientMessage: badread\n');
+          return false;
+        }
+
+        client.ping_times[client.num_pings++ % client.ping_times.length] = SV.server.time - client.sync_time;
+
+        const cmd = NET.message.readChar();
+
+        if (cmd === -1) {
+          break;
+        }
+
+        if (!SV.#processClientCommand(client, cmd)) {
+          return false;
+        }
+      }
+    }
+  }
+
+  static RunClients(): void {
+    for (let i = 0; i < SV.svs.maxclients; i++) {
+      const client = SV.svs.clients[i];
+
+      if (client.state < ServerClient.STATE.CONNECTED) {
+        continue;
+      }
+
+      if (!SV.ReadClientMessage(client)) {
+        Host.DropClient(client, false, 'Connectivity issues, failed to read message');
+        continue;
+      }
+
+      if (client.state < ServerClient.STATE.CONNECTED) {
+        client.cmd.reset();
+        continue;
+      }
+
+      SV.clientPhysics.clientThink(client.edict, client);
+    }
+  }
+
+  static FindClientByName(name: string): ServerClient | null {
+    return SV.svs.clients
+      .filter((client) => client.state >= ServerClient.STATE.CONNECTED)
+      .find((client) => client.name === name) ?? null;
+  }
+
+  static #notifyClientsOfMapChange(mapname: string): void {
+    for (const client of SV.svs.clients) {
+      if (client.state < ServerClient.STATE.CONNECTED) {
+        continue;
+      }
+
+      client.changelevel(mapname);
+    }
+
+    if (SV.server.navigation) {
+      SV.server.navigation.shutdown();
+      SV.server.navigation = null;
+    }
+  }
+
+  static async #loadGameProgs(): Promise<void> {
+    const gameAPI = PR.QuakeJS ? new PR.QuakeJS.ServerGameAPI(ServerEngineAPI) : await PR.LoadProgs();
+
+    SV.server.gameAPI = gameAPI as ServerRuntimeGameAPI;
+    SV.server.gameVersion = PR.QuakeJS ? `${PR.QuakeJS.identification.version.join('.')} QuakeJS` : `${PR.crc} CRC`;
+    SV.server.gameName = PR.QuakeJS ? PR.QuakeJS.identification.name : COM.game;
+    SV.server.gameCapabilities = PR.QuakeJS ? PR.QuakeJS.identification.capabilities : PR.capabilities;
+
+    Con.DPrint('Game progs loaded\n');
+  }
+
+  static #initializeEdicts(): void {
+    SV.server.edicts.length = 0;
+
+    for (let i = 0; i < Def.limits.edicts; i++) {
+      SV.server.edicts[i] = new ServerEdict(i);
+    }
+
+    SV.server.datagram.clear();
+    SV.server.reliable_datagram.clear();
+    SV.server.signon.clear();
+    SV.server.num_edicts = SV.svs.maxclients + 1;
+    SV.server.loading = true;
+    SV.server.paused = false;
+    SV.server.loadgame = false;
+    SV.server.time = 1.0;
+    SV.server.lastcheck = 0;
+    SV.server.lastchecktime = 0.0;
+
+    Con.DPrint('Edicts initialized\n');
+  }
+
+  static async #loadWorldModel(mapname: string): Promise<boolean> {
+    SV.server.mapname = mapname;
+    SV.server.worldmodel = await Mod.ForNameAsync(`maps/${mapname}.bsp`, false, Mod.scope.server) as BrushModel | null;
+
+    if (SV.server.worldmodel === null) {
+      Con.PrintWarning(`SV.SpawnServer: Cannot start server, unable to load map ${mapname}\n`);
+      SV.server.active = false;
+      return false;
+    }
+
+    Con.DPrint('World model loaded\n');
+    return true;
+  }
+
+  static #setupModelPrecache(): void {
+    const worldmodel = SV.#requireWorldModel();
+
+    SV.server.models.length = 2;
+    SV.server.models[0] = null;
+    SV.server.models[1] = worldmodel;
+
+    SV.server.soundPrecache.length = 1;
+    SV.server.soundPrecache[0] = '';
+
+    SV.server.modelPrecache.length = 2 + worldmodel.submodels.length;
+    SV.server.modelPrecache[0] = '';
+    SV.server.modelPrecache[1] = worldmodel.name;
+
+    for (let i = 1; i <= worldmodel.submodels.length; i++) {
+      SV.server.modelPrecache[i + 1] = `*${i}`;
+      SV.server.models[i + 1] = Mod.ForName(`*${i}`, Mod.scope.server) as BaseModel;
+    }
+
+    Con.DPrint('Model precache setup complete\n');
+  }
+
+  static #setupPlayerEntities(): boolean {
+    const gameAPI = SV.#requireGameAPI();
+
+    for (let i = 0; i < SV.svs.maxclients; i++) {
+      const ent = SV.server.edicts[i + 1] as ServerEdict;
+
+      if (!gameAPI.prepareEntity(ent, 'player')) {
+        Con.PrintWarning('SV.SpawnServer: Cannot start server, because game does not know what a player entity is.\n');
+        SV.server.active = false;
+        return false;
+      }
+    }
+
+    Con.DPrint('Player entities setup complete\n');
+    return true;
+  }
+
+  static #initializeLightStyles(): void {
+    SV.server.lightstyles = [];
+
+    for (let i = 0; i <= Def.limits.lightstyles; i++) {
+      SV.server.lightstyles[i] = '';
+    }
+
+    Con.DPrint('Light styles initialized\n');
+  }
+
+  static #setupClientDataFields(): void {
+    if (SV.server.gameCapabilities.includes(Defs.gameCapabilities.CAP_CLIENTDATA_DYNAMIC)) {
+      const playerEntity = SV.server.edicts[1]?.entity;
+
+      console.assert(playerEntity !== null, 'CAP_CLIENTDATA_DYNAMIC requires player entity');
+      console.assert(playerEntity !== null && 'clientdataFields' in playerEntity, 'CAP_CLIENTDATA_DYNAMIC requires clientdataFields on PlayerEntity');
+
+      const typedPlayerEntity = playerEntity as PlayerClientdataEntity;
+      const fields = typedPlayerEntity.clientdataFields;
+
+      console.assert(fields instanceof Array, 'clientdataFields must be an array');
+
+      SV.server.clientdataFields.length = 0;
+      SV.server.clientdataFields.push(...fields);
+      console.assert(SV.server.clientdataFields.length <= 32, 'clientdata must not have more than 32 fields');
+
+      if (fields.length <= 8) {
+        SV.server.clientdataFieldsBitsWriter = 'writeByte';
+      } else if (fields.length <= 16) {
+        SV.server.clientdataFieldsBitsWriter = 'writeShort';
+      } else if (fields.length <= 32) {
+        SV.server.clientdataFieldsBitsWriter = 'writeLong';
+      }
+
+      for (const field of fields) {
+        console.assert(typedPlayerEntity[field] !== undefined, `Undefined clientdata field ${field}`);
+      }
+    }
+
+    Con.DPrint('Clientdata fields setup complete\n');
+  }
+
+  static #setupExtendedEntityFields(): void {
+    if (SV.server.gameCapabilities.includes(Defs.gameCapabilities.CAP_ENTITY_EXTENDED)) {
+      const fields = SV.#requireGameAPI().getClientEntityFields();
+
+      for (const [classname, extendedFields] of Object.entries(fields)) {
+        const clientEntityField: ClientEntityFieldConfig = {
+          fields: [],
+          bitsWriter: null,
+        };
+
+        clientEntityField.fields.push(...extendedFields);
+
+        if (extendedFields.length <= 8) {
+          clientEntityField.bitsWriter = 'writeByte';
+        } else if (extendedFields.length <= 16) {
+          clientEntityField.bitsWriter = 'writeShort';
+        } else if (extendedFields.length <= 32) {
+          clientEntityField.bitsWriter = 'writeLong';
+        }
+
+        SV.server.clientEntityFields[classname] = clientEntityField;
+      }
+    }
+
+    Con.DPrint('Extended entity fields setup complete\n');
+  }
+
+  static #spawnWorldspawnEntity(): boolean {
+    const ent = SV.server.edicts[0] as ServerEdict;
+    const worldmodel = SV.#requireWorldModel();
+    const gameAPI = SV.#requireGameAPI();
+
+    if (!gameAPI.prepareEntity(ent, 'worldspawn', {
+      model: worldmodel.name,
+      modelindex: 1,
+      solid: Defs.solid.SOLID_BSP,
+      movetype: Defs.moveType.MOVETYPE_PUSH,
+    })) {
+      Con.PrintWarning('SV.SpawnServer: Cannot start server, because the game does not know what a worldspawn entity is.\n');
+      SV.server.active = false;
+      return false;
+    }
+
+    gameAPI.spawnPreparedEntity(ent);
+    Con.DPrint('Worldspawn entity spawned\n');
+    return true;
+  }
+
+  static async WaitForPrecachedResources(): Promise<void> {
+    const resolvedModels: Array<BaseModel | null> = [];
+
+    for (const model of SV.server.models) {
+      if (model instanceof Promise) {
+        resolvedModels.push(await model);
+        continue;
+      }
+
+      resolvedModels.push(model);
+    }
+
+    SV.server.models.length = 0;
+
+    for (const model of resolvedModels) {
+      SV.server.models.push(model);
+    }
+
+    Con.DPrint('Pending precached resources loaded\n');
+  }
+
+  static #finalizeServerSpawn(mapname: string): void {
+    SV.server.active = true;
+    SV.server.loading = false;
+
+    Host.frametime = 0.1;
+    SV.physics.physics();
+    SV.physics.physics();
+
+    for (let i = 0; i < SV.svs.maxclients; i++) {
+      const client = SV.svs.clients[i];
+
+      if (client.state >= ServerClient.STATE.CONNECTED) {
+        SV.messages.sendServerData(client);
+      }
+    }
+
+    SV.#requireNavigation().init();
+    eventBus.publish('server.spawned', { mapname });
+    Con.PrintSuccess('Server spawned.\n');
+  }
+
+  static #handleClientStringCommand(client: ServerClient, input: string): void {
+    const matchedCommand = ALLOWED_CLIENT_COMMANDS.find((command) => input.toLowerCase().startsWith(command));
+
+    if (matchedCommand) {
+      void Cmd.ExecuteString(input, client);
+      return;
+    }
+
+    Con.Print(`${client.name} tried to ${input}!\n`);
+  }
+
+  static #processClientCommand(client: ServerClient, cmd: number): boolean {
+    switch (cmd) {
+      case Protocol.clc.nop:
+        Con.DPrint(`${client.netconnection?.address ?? 'unknown'} sent a nop\n`);
+        return true;
+
+      case Protocol.clc.stringcmd: {
+        const input = NET.message.readString();
+        SV.#handleClientStringCommand(client, input);
+        return true;
+      }
+
+      case Protocol.clc.sync:
+        client.sync_time = NET.message.readFloat();
+        return true;
+
+      case Protocol.clc.rconcmd:
+        SV.HandleRconRequest(client);
+        return true;
+
+      case Protocol.clc.disconnect:
+        return false;
+
+      case Protocol.clc.move:
+        SV.ReadClientMove(client);
+        return true;
+
+      default:
+        Con.DPrint(`SV.ReadClientMessage: unknown command ${cmd} from ${client.netconnection?.address ?? 'unknown'}\n`);
+        return false;
+    }
+  }
+}
+
+/**
+ * Simple class hooking up all movevars with corresponding cvars.
+ */
+class PlayerMoveCvars extends MoveVars {
+  // @ts-ignore
+  get gravity(): number { return SV.gravity!.value; }
+  // @ts-ignore
+  get stopspeed(): number { return SV.stopspeed!.value; }
+  // @ts-ignore
+  get maxspeed(): number { return SV.maxspeed!.value; }
+  // @ts-ignore
+  get spectatormaxspeed(): number { return SV.spectatormaxspeed!.value; }
+  // @ts-ignore
+  get accelerate(): number { return SV.accelerate!.value; }
+  // @ts-ignore
+  get airaccelerate(): number { return SV.airaccelerate!.value; }
+  // @ts-ignore
+  get wateraccelerate(): number { return SV.wateraccelerate!.value; }
+  // @ts-ignore
+  get friction(): number { return SV.friction!.value; }
+  // @ts-ignore
+  get waterfriction(): number { return SV.waterfriction!.value; }
+  // @ts-ignore
+  get edgefriction(): number { return SV.edgefriction!.value; }
+
+  set gravity(_value: number) {}
+  set stopspeed(_value: number) {}
+  set maxspeed(_value: number) {}
+  set spectatormaxspeed(_value: number) {}
+  set accelerate(_value: number) {}
+  set airaccelerate(_value: number) {}
+  set wateraccelerate(_value: number) {}
+  set friction(_value: number) {}
+  set waterfriction(_value: number) {}
+  set edgefriction(_value: number) {}
+
+  /**
+   * Writes the movevars to the client.
+   */
+  sendToClient(message: SzBuffer): void {
+    message.writeFloat(this.gravity);
+    message.writeFloat(this.stopspeed);
+    message.writeFloat(this.maxspeed);
+    message.writeFloat(this.spectatormaxspeed);
+    message.writeFloat(this.accelerate);
+    message.writeFloat(this.airaccelerate);
+    message.writeFloat(this.wateraccelerate);
+    message.writeFloat(this.friction);
+    message.writeFloat(this.waterfriction);
+    message.writeFloat(this.entgravity);
+  }
+}
+
+sharedCollisionModelSource.configureServer({
+  getWorldEntity: () => SV.server.edicts[0] ?? null,
+  getWorldModel: () => SV.server.worldmodel,
+  getModels: () => SV.server.models,
+});
diff --git a/test/physics/server-edict.test.mjs b/test/physics/server-edict.test.mjs
new file mode 100644
index 00000000..fbe056f8
--- /dev/null
+++ b/test/physics/server-edict.test.mjs
@@ -0,0 +1,28 @@
+import { describe, test } from 'node:test';
+import assert from 'node:assert/strict';
+
+import { ServerEdict } from '../../source/engine/server/Edict.mjs';
+
+import { defaultMockRegistry, withMockRegistry } from './fixtures.mjs';
+
+void describe('ServerEdict', () => {
+  void test('keeps getClient slot mapping separate from isClient semantics', () => {
+    const reservedSlotClient = { state: 0 };
+
+    void withMockRegistry(defaultMockRegistry({
+      svs: {
+        maxclients: 4,
+        clients: [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, reservedSlotClient],
+      },
+      server: {
+        num_edicts: 32,
+        edicts: [],
+      },
+    }), () => {
+      const reservedWorldEdict = new ServerEdict(16);
+
+      assert.equal(reservedWorldEdict.isClient(), false);
+      assert.equal(reservedWorldEdict.getClient(), reservedSlotClient);
+    });
+  });
+});
diff --git a/test/physics/server.test.mjs b/test/physics/server.test.mjs
index 91319edd..8e871a10 100644
--- a/test/physics/server.test.mjs
+++ b/test/physics/server.test.mjs
@@ -73,8 +73,8 @@ function installReadClientMoveContext({ paused }) {
   };
 }
 
-describe('SV.ReadClientMove', () => {
-  test('queues movement commands while the server is running', () => {
+void describe('SV.ReadClientMove', () => {
+  void test('queues movement commands while the server is running', () => {
     const context = installReadClientMoveContext({ paused: false });
 
     try {
@@ -93,7 +93,7 @@ describe('SV.ReadClientMove', () => {
     }
   });
 
-  test('does not enqueue paused movement backlog', () => {
+  void test('does not enqueue paused movement backlog', () => {
     const context = installReadClientMoveContext({ paused: true });
 
     try {

From 9975502b688ec6d75c453be0590d3adfe4636b89 Mon Sep 17 00:00:00 2001
From: Christian R <github@chrisnew.de>
Date: Fri, 3 Apr 2026 13:58:36 +0300
Subject: [PATCH 34/67] QuakeC support: fallback value for alpha

---
 source/engine/server/ServerMessages.mjs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/source/engine/server/ServerMessages.mjs b/source/engine/server/ServerMessages.mjs
index ec1f22de..927086cb 100644
--- a/source/engine/server/ServerMessages.mjs
+++ b/source/engine/server/ServerMessages.mjs
@@ -423,7 +423,7 @@ export class ServerMessages {
 
     if (bits & Protocol.u.effects) {
       msg.writeByte(to.effects);
-      msg.writeByte(Math.floor(to.alpha * 255.0));
+      msg.writeByte(Math.floor((to.alpha || 1) * 255.0)); // CR: QuakeC may not have alpha
     }
 
     if (bits & Protocol.u.solid) {

From 964debf66f1629a6237d4c23b73b962965c23f6b Mon Sep 17 00:00:00 2001
From: Christian R <github@chrisnew.de>
Date: Fri, 3 Apr 2026 14:00:14 +0300
Subject: [PATCH 35/67] TS: server/ part 3

---
 source/engine/server/Progs.mjs | 1548 +-----------------------------
 source/engine/server/Progs.ts  | 1643 ++++++++++++++++++++++++++++++++
 2 files changed, 1644 insertions(+), 1547 deletions(-)
 create mode 100644 source/engine/server/Progs.ts

diff --git a/source/engine/server/Progs.mjs b/source/engine/server/Progs.mjs
index b563eadd..7d62c3f9 100644
--- a/source/engine/server/Progs.mjs
+++ b/source/engine/server/Progs.mjs
@@ -1,1547 +1 @@
-import Cmd from '../common/Cmd.ts';
-import { CRC16CCITT } from '../common/CRC.ts';
-import Cvar from '../common/Cvar.ts';
-import { HostError, MissingResourceError } from '../common/Errors.ts';
-import Q from '../../shared/Q.ts';
-import Vector from '../../shared/Vector.ts';
-import { eventBus, registry } from '../registry.mjs';
-import { ED, ServerEdict } from './Edict.mjs';
-import { ServerEngineAPI } from '../common/GameAPIs.ts';
-import PF, { etype, ofs } from './ProgsAPI.mjs';
-import { gameCapabilities } from '../../shared/Defs.ts';
-import { loadGameModule } from './GameLoader.mjs';
-
-const PR = {};
-
-export default PR;
-
-let { COM, Con, SV } = registry;
-
-eventBus.subscribe('registry.frozen', () => {
-  COM = registry.COM;
-  Con = registry.Con;
-  SV = registry.SV;
-});
-
-PR.saveglobal = (1<<15);
-
-PR.op = Object.freeze({
-  done: 0,
-  mul_f: 1, mul_v: 2, mul_fv: 3, mul_vf: 4,
-  div_f: 5,
-  add_f: 6, add_v: 7,
-  sub_f: 8, sub_v: 9,
-  eq_f: 10, eq_v: 11, eq_s: 12, eq_e: 13, eq_fnc: 14,
-  ne_f: 15, ne_v: 16, ne_s: 17, ne_e: 18, ne_fnc: 19,
-  le: 20, ge: 21, lt: 22, gt: 23,
-  load_f: 24, load_v: 25, load_s: 26, load_ent: 27, load_fld: 28, load_fnc: 29,
-  address: 30,
-  store_f: 31, store_v: 32, store_s: 33, store_ent: 34, store_fld: 35, store_fnc: 36,
-  storep_f: 37, storep_v: 38, storep_s: 39, storep_ent: 40, storep_fld: 41, storep_fnc: 42,
-  ret: 43,
-  not_f: 44, not_v: 45, not_s: 46, not_ent: 47, not_fnc: 48,
-  jnz: 49, jz: 50,
-  call0: 51, call1: 52, call2: 53, call3: 54, call4: 55, call5: 56, call6: 57, call7: 58, call8: 59,
-  state: 60,
-  jump: 61,
-  and: 62, or: 63,
-  bitand: 64, bitor: 65,
-});
-
-PR.version = 6;
-PR.max_parms = 8;
-
-PR.globalvars = Object.freeze({
-  self: 28, // edict
-  other: 29, // edict
-  time: 31, // float
-});
-
-PR.entvars = {
-  modelindex: 0, // float
-  absmin: 1, // vec3
-  absmin1: 2,
-  absmin2: 3,
-  absmax: 4, // vec3
-  absmax1: 5,
-  absmax2: 6,
-  ltime: 7, // float
-  movetype: 8, // float
-  solid: 9, // float
-  origin: 10, // vec3
-  origin1: 11,
-  origin2: 12,
-  oldorigin: 13, // vec3
-  oldorigin1: 14,
-  oldorigin2: 15,
-  velocity: 16, // vec3
-  velocity1: 17,
-  velocity2: 18,
-  angles: 19, // vec3
-  angles1: 20,
-  angles2: 21,
-  avelocity: 22, // vec3
-  avelocity1: 23,
-  avelocity2: 24,
-  punchangle: 25, // vec3
-  punchangle1: 26,
-  punchangle2: 27,
-  classname: 28, // string
-  model: 29, // string
-  frame: 30, // float
-  skin: 31, // float
-  effects: 32, // float
-  mins: 33, // vec3
-  mins1: 34,
-  mins2: 35,
-  maxs: 36, // vec3
-  maxs1: 37,
-  maxs2: 38,
-  size: 39, // vec3
-  size1: 40,
-  size2: 41,
-  touch: 42, // func
-  use: 43, // func
-  think: 44, // func
-  blocked: 45, // func
-  nextthink: 46, // float
-  groundentity: 47, // edict
-  health: 48, // float
-  frags: 49, // float
-  weapon: 50, // float
-  weaponmodel: 51, // string
-  weaponframe: 52, // float
-  currentammo: 53, // float
-  ammo_shells: 54, // float
-  ammo_nails: 55, // float
-  ammo_rockets: 56, // float
-  ammo_cells: 57, // float
-  items: 58, // float
-  takedamage: 59, // float
-  chain: 60, // edict
-  deadflag: 61, // float
-  view_ofs: 62, // vec3
-  view_ofs1: 63,
-  view_ofs2: 64,
-  button0: 65, // float
-  button1: 66, // float
-  button2: 67, // float
-  impulse: 68, // float
-  fixangle: 69, // float
-  v_angle: 70, // vec3
-  v_angle1: 71,
-  v_angle2: 72,
-  idealpitch: 73, // float
-  netname: 74, // string
-  enemy: 75, // edict
-  flags: 76, // float
-  colormap: 77, // float
-  team: 78, // float
-  max_health: 79, // float
-  teleport_time: 80, // float
-  armortype: 81, // float
-  armorvalue: 82, // float
-  waterlevel: 83, // float
-  watertype: 84, // float
-  ideal_yaw: 85, // float
-  yaw_speed: 86, // float
-  aiment: 87, // edict
-  goalentity: 88, // edict
-  spawnflags: 89, // float
-  target: 90, // string
-  targetname: 91, // string
-  dmg_take: 92, // float
-  dmg_save: 93, // float
-  dmg_inflictor: 94, // edict
-  owner: 95, // edict
-  movedir: 96, // vec3
-  movedir1: 97,
-  movedir2: 98,
-  message: 99, // string
-  sounds: 100, // float
-  noise: 101, // string
-  noise1: 102, // string
-  noise2: 103, // string
-  noise3: 104, // string
-};
-
-PR.ofs = ofs;
-
-PR.progheader_crc = 5927;
-
-// classes
-
-/**
- * FIXME: function proxies need to become cached
- */
-class ProgsFunctionProxy extends Function {
-  static proxyCache = [];
-
-  constructor(fnc, ent = null, settings = {}) {
-    super();
-
-    this.fnc = fnc;
-    this.ent = ent;
-    this._signature = null;
-    this._settings = settings;
-
-    const f = PR.functions[this.fnc];
-    const name = PR.GetString(f.name);
-
-    Object.defineProperty(this, 'name', {
-      value: name,
-      writable: false,
-    });
-
-    Object.freeze(this);
-  }
-
-  toString() {
-    return `${PR.GetString(PR.functions[this.fnc].name)} (ProgsFunctionProxy(${this.fnc}))`;
-  }
-
-  static create(fnc, ent, settings = {}) {
-    const cacheId = `${fnc}-${ent ? ent.num : 'null'}`;
-
-    if (ProgsFunctionProxy.proxyCache[cacheId]) {
-      return ProgsFunctionProxy.proxyCache[cacheId];
-    }
-
-    const obj = new ProgsFunctionProxy(fnc, ent, settings);
-
-    // such an ugly hack to make objects actually callable
-    ProgsFunctionProxy.proxyCache[cacheId] = new Proxy(obj, {
-      apply(target, thisArg, args) {
-        return obj.call.apply(obj, args);
-      },
-    });
-
-    return ProgsFunctionProxy.proxyCache[cacheId];
-  }
-
-  static _getEdictId(ent) {
-    if (!ent) {
-      return 0;
-    }
-
-    if (ent instanceof ProgsEntity) {
-      return ent._edictNum;
-    }
-
-    return ent.num;
-  }
-
-  /**
-   * calls
-   * @param {*} self (optional) the edict for self
-   */
-  call(self) {
-    const old_self = PR.globals_int[PR.globalvars.self];
-    const old_other = PR.globals_int[PR.globalvars.other];
-
-    if (this.ent && !this.ent.isFree()) {
-      // in case this is a function bound to an entity, we need to set it to self
-      PR.globals_int[PR.globalvars.self] = ProgsFunctionProxy._getEdictId(this.ent);
-
-      // fun little hack, we always assume self being other if this is called on an ent
-      PR.globals_int[PR.globalvars.other] = ProgsFunctionProxy._getEdictId(self);
-    } else if (self) {
-      // in case it’s a global function, we need to set self to the first argument
-      PR.globals_int[PR.globalvars.self] = ProgsFunctionProxy._getEdictId(self);
-    }
-
-    if (this._settings.resetOther) {
-      PR.globals_int[PR.globalvars.other] = 0;
-    }
-
-    PR.ExecuteProgram(this.fnc);
-
-    if (this._settings.backupSelfAndOther) {
-      PR.globals_int[PR.globalvars.self] = old_self;
-      PR.globals_int[PR.globalvars.other] = old_other;
-    }
-
-    return PR.Value(etype.ev_float, PR.globals, 1); // assume float
-  }
-};
-
-// PR._stats = {
-//   edict: {},
-//   global: {},
-// };
-
-class ProgsEntity {
-  static SERIALIZATION_TYPE_EDICT = 'E';
-  static SERIALIZATION_TYPE_FUNCTION = 'F';
-  static SERIALIZATION_TYPE_VECTOR = 'V';
-  static SERIALIZATION_TYPE_PRIMITIVE = 'P';
-
-  /**
-   *
-   * @param {*} ed can be null, then it’s global
-   */
-  constructor(ed) {
-    // const stats = ed ? PR._stats.edict : PR._stats.global;
-    const defs = ed ? PR.fielddefs : PR.globaldefs;
-
-    if (ed) {
-      this._edictNum = ed.num;
-      this._v = new ArrayBuffer(PR.entityfields * 4);
-      this._v_float = new Float32Array(this._v);
-      this._v_int = new Int32Array(this._v);
-    }
-
-    this._serializableFields = [];
-
-    for (let i = 1; i < defs.length; i++) {
-      const d = defs[i];
-      const name = PR.GetString(d.name);
-
-      if (name.charCodeAt(name.length - 2) === 95) {
-        // skip _x, _y, _z
-        continue;
-      }
-
-      const [type, val, ofs] = [d.type & ~PR.saveglobal, ed ? this._v : PR.globals, d.ofs];
-
-      if ((type & ~PR.saveglobal) === 0) {
-        continue;
-      }
-
-      if (!ed && (d.type & ~PR.saveglobal) !== 0 && [etype.ev_string, etype.ev_float, etype.ev_entity].includes(type)) {
-        this._serializableFields.push(name);
-      } else if (ed) {
-        this._serializableFields.push(name);
-      }
-
-      const val_float = new Float32Array(val);
-      const val_int = new Int32Array(val);
-
-      const assignedFunctions = [];
-
-      switch (type) {
-        case etype.ev_string:
-          Object.defineProperty(this, name, {
-            get: function() {
-              return val_int[ofs] > 0 ? PR.GetString(val_int[ofs]) : null;
-            },
-            set: function(value) {
-              val_int[ofs] = value !== null && value !== '' ? PR.SetString(val_int[ofs], value) : 0;
-            },
-            configurable: true,
-            enumerable: true,
-          });
-          break;
-        case etype.ev_entity: // TODO: actually accept entity instead of edict and vice-versa
-          Object.defineProperty(this, name, {
-            get: function() {
-              if (!SV.server?.edicts || !SV.server.edicts[val_int[ofs]]) {
-                return null;
-              }
-
-              return SV.server.edicts[val_int[ofs]] || null;
-            },
-            set: function(value) {
-              if (value === null) {
-                val_int[ofs] = 0;
-                return;
-              }
-              if (value === 0) { // making fixing stuff easier, though this is a breakpoint trap as well
-                val_int[ofs] = 0;
-                return;
-              }
-              if (typeof(value.edictId) !== 'undefined') { // TODO: Entity class
-                val_int[ofs] = value.edictId;
-                return;
-              }
-              if (typeof(value._edictNum) !== 'undefined') { // TODO: Edict class
-                val_int[ofs] = value.edictId;
-                return;
-              }
-              if (typeof(value.num) !== 'undefined') { // TODO: Edict class
-                val_int[ofs] = value.num;
-                return;
-              }
-              throw new TypeError('Expected Edict');
-            },
-            configurable: true,
-            enumerable: true,
-          });
-          break;
-        case etype.ev_function:
-          Object.defineProperty(this, name, {
-            get: function() {
-              const id = val_int[ofs];
-              if (id < 0 && assignedFunctions[(-id) - 1] instanceof Function) {
-                return assignedFunctions[(-id) - 1];
-              }
-              return id > 0 ? ProgsFunctionProxy.create(id, ed, {
-                // some QuakeC related idiosyncrasis we need to take care of
-                backupSelfAndOther: ['touch'].includes(name),
-                resetOther: ['StartFrame'].includes(name),
-              }) : null;
-            },
-            set: function(value) {
-              if (value === null) {
-                val_int[ofs] = 0;
-                return;
-              }
-              if (value instanceof Function) {
-                assignedFunctions.push(value);
-                val_int[ofs] = -assignedFunctions.length;
-                return;
-              }
-              if (value instanceof ProgsFunctionProxy) {
-                val_int[ofs] = value.fnc;
-                return;
-              }
-              if (typeof(value) === 'string') { // this is used by ED.ParseEdict etc. when parsing entities and setting fields
-                const d = PR.FindFunction(value);
-                if (!d) {
-                  throw new TypeError('Invalid function: ' + value);
-                }
-                val_int[ofs] = d;
-                return;
-              }
-              if (typeof(value.fnc) !== 'undefined') {
-                val_int[ofs] = value.fnc;
-                return;
-              }
-              throw new TypeError('EdictProxy.' + name + ': Expected FunctionProxy, function name or function ID');
-            },
-            configurable: true,
-            enumerable: true,
-          });
-          break;
-        case etype.ev_pointer: // unused and irrelevant
-          break;
-        case etype.ev_field:
-          Object.defineProperty(this, name, {
-            get: function() {
-              return val_int[ofs];
-            },
-            set: function(value) {
-              if (typeof(value.ofs) !== 'undefined') {
-                val_int[ofs] = value.ofs;
-                return;
-              }
-              val_int[ofs] = value;
-            },
-            configurable: true,
-            enumerable: true,
-          });
-          break;
-        case etype.ev_float:
-          Object.defineProperty(this, name, {
-            get: function() {
-              return val_float[ofs];
-            },
-            set: function(value) {
-              if (value === undefined || Q.isNaN(value)) {
-                throw new TypeError('EdictProxy.' + name + ': invalid value for ev_float passed: ' + value);
-              }
-              val_float[ofs] = value;
-            },
-            configurable: true,
-            enumerable: true,
-          });
-          break;
-        case etype.ev_vector: // TODO: Proxy for Vector?
-          Object.defineProperty(this, name, {
-            get: function() {
-              return new Vector(val_float[ofs], val_float[ofs + 1], val_float[ofs + 2]);
-            },
-            set: function(value) {
-              val_float[ofs] = value[0];
-              val_float[ofs+1] = value[1];
-              val_float[ofs+2] = value[2];
-            },
-            configurable: true,
-            enumerable: true,
-          });
-          break;
-      }
-    }
-  }
-
-  serialize() {
-    const data = {};
-
-    for (const field of this._serializableFields) {
-      const value = this[field];
-
-      switch (true) {
-        case value === null:
-          data[field] = [ProgsEntity.SERIALIZATION_TYPE_PRIMITIVE, null];
-          break;
-
-        case value instanceof ProgsEntity:
-          data[field] = [ProgsEntity.SERIALIZATION_TYPE_EDICT, value._edictNum];
-          break;
-
-        case value instanceof ProgsFunctionProxy:
-          data[field] = [ProgsEntity.SERIALIZATION_TYPE_FUNCTION, value.fnc];
-          break;
-
-        case value instanceof Vector:
-          data[field] = [ProgsEntity.SERIALIZATION_TYPE_VECTOR, ...value];
-          break;
-
-        case typeof value === 'number':
-        case typeof value === 'boolean':
-        case typeof value === 'string':
-          data[field] = [ProgsEntity.SERIALIZATION_TYPE_PRIMITIVE, value];
-          break;
-      }
-    }
-
-    return data;
-  }
-
-  deserialize(obj) {
-    for (const [key, value] of Object.entries(obj)) {
-      console.assert(this._serializableFields.includes(key));
-
-      const [type, ...data] = value;
-
-      switch (type) {
-        case ProgsEntity.SERIALIZATION_TYPE_EDICT:
-          this[key] = SV.server.edicts[data[0]];
-          break;
-
-        case ProgsEntity.SERIALIZATION_TYPE_FUNCTION:
-          this[key] = {fnc: data[0]};
-          break;
-
-        case ProgsEntity.SERIALIZATION_TYPE_VECTOR:
-          this[key] = new Vector(...data);
-          break;
-
-        case ProgsEntity.SERIALIZATION_TYPE_PRIMITIVE:
-          this[key] = data[0];
-          break;
-      }
-    }
-
-    return this;
-  }
-
-  clear() {
-    if (this._v) {
-      const int32 = new Int32Array(this._v);
-      for (let i = 0; i < PR.entityfields; i++) {
-        int32[i] = 0;
-      }
-    }
-  }
-
-  free() {
-    this.clear();
-  }
-
-  equals(other) {
-    return other && other._edictNum === this._edictNum;
-  }
-
-  spawn() {
-    // QuakeC is different, the actual spawn function is called by its classname
-    SV.server.gameAPI[this.classname]({num: this._edictNum});
-  }
-
-  get edictId() {
-    return this._edictNum;
-  }
-};
-
-// edict
-
-/**
- * Retrieves the global definition at the specified offset.
- * @param {number} ofs - The offset to retrieve.
- * @returns {object|null} - The global definition.
- */
-PR.GlobalAtOfs = function(ofs) {
-  return PR.globaldefs.find((def) => def.ofs === ofs) || null;
-};
-
-/**
- * Retrieves the field definition at the specified offset.
- * @param {number} ofs - The offset to retrieve.
- * @returns {object|null} - The field definition.
- */
-PR.FieldAtOfs = function(ofs) {
-  return PR.fielddefs.find((def) => def.ofs === ofs) || null;
-};
-
-/**
- * Finds a field definition by name.
- * @param {string} name - The field name.
- * @returns {object|null} - The field definition.
- */
-PR.FindField = function(name) {
-  return PR.fielddefs.find((def) => PR.GetString(def.name) === name) || null;
-};
-
-/**
- * Finds a global definition by name.
- * @param {string} name - The global name.
- * @returns {object|null} - The global definition.
- */
-PR.FindGlobal = function(name) {
-  return PR.globaldefs.find((def) => PR.GetString(def.name) === name) || null;
-};
-
-/**
- * Finds a function definition by name.
- * @param {string} name - The function name.
- * @returns {number} - The function index.
- */
-PR.FindFunction = function(name) {
-  return PR.functions.findIndex((func) => PR.GetString(func.name) === name);
-};
-
-PR.ValueString = function(type, val, ofs) {
-  const val_float = new Float32Array(val);
-  const val_int = new Int32Array(val);
-  type &= ~PR.saveglobal;
-  switch (type) {
-    case etype.ev_string:
-      return PR.GetString(val_int[ofs]);
-    case etype.ev_entity:
-      return 'entity ' + val_int[ofs];
-    case etype.ev_function:
-      return PR.GetString(PR.functions[val_int[ofs]].name) + '()';
-    case etype.ev_field: {
-        const def = PR.FieldAtOfs(val_int[ofs]);
-        if (def !== null) {
-          return '.' + PR.GetString(def.name);
-        }
-        return '.';
-      }
-    case etype.ev_void:
-      return 'void';
-    case etype.ev_float:
-      return val_float[ofs].toFixed(1);
-    case etype.ev_vector:
-      return '\'' + val_float[ofs].toFixed(1) +
-              ' ' + val_float[ofs + 1].toFixed(1) +
-              ' ' + val_float[ofs + 2].toFixed(1) + '\'';
-    case etype.ev_pointer:
-      return 'pointer';
-  }
-  return 'bad type ' + type;
-};
-
-PR.Value = function(type, val, ofs) {
-  const val_float = new Float32Array(val);
-  const val_int = new Int32Array(val);
-  type &= ~PR.saveglobal;
-  switch (type) {
-    case etype.ev_string:
-      return PR.GetString(val_int[ofs]);
-    case etype.ev_pointer:
-    case etype.ev_entity:
-    case etype.ev_field:
-      return val_int[ofs];
-      // case etype.ev_field: {
-      //     const def = PR.FieldAtOfs(val_int[ofs]);
-      //     if (def != null) {
-      //       return '.' + PR.GetString(def.name);
-      //     }
-      //     return '.';
-      //   }
-    case etype.ev_function:
-      return PR.GetString(PR.functions[val_int[ofs]].name) + '()';
-    case etype.ev_void:
-      return null;
-    case etype.ev_float:
-      return val_float[ofs];
-    case etype.ev_vector:
-      return [val_float[ofs],
-              val_float[ofs + 1],
-              val_float[ofs + 2]];
-  }
-  throw new TypeError('bad PR etype ' + type);
-};
-
-PR.UglyValueString = function(type, val, ofs) {
-  const val_float = new Float32Array(val);
-  const val_int = new Int32Array(val);
-  type &= ~PR.saveglobal;
-  switch (type) {
-    case etype.ev_string:
-      return PR.GetString(val_int[ofs]);
-    case etype.ev_entity:
-      return val_int[ofs].toString();
-    case etype.ev_function:
-      return PR.GetString(PR.functions[val_int[ofs]].name);
-    case etype.ev_field: {
-        const def = PR.FieldAtOfs(val_int[ofs]);
-        if (def !== null) {
-          return PR.GetString(def.name);
-        }
-        return '';
-      }
-    case etype.ev_void:
-      return 'void';
-    case etype.ev_float:
-      return val_float[ofs].toFixed(6);
-    case etype.ev_vector:
-      return val_float[ofs].toFixed(6) +
-    ' ' + val_float[ofs + 1].toFixed(6) +
-    ' ' + val_float[ofs + 2].toFixed(6);
-  }
-  return 'bad type ' + type;
-};
-
-PR.GlobalString = function(ofs) {
-  const def = PR.GlobalAtOfs(ofs); let line;
-  if (def !== null) {
-    line = ofs + '(' + PR.GetString(def.name) + ')' + PR.ValueString(def.type, PR.globals, ofs);
-  } else {
-    line = ofs + '(???)';
-  }
-  for (; line.length <= 20; ) {
-    line += ' ';
-  }
-  return line;
-};
-
-PR.GlobalStringNoContents = function(ofs) {
-  const def = PR.GlobalAtOfs(ofs); let line;
-  if (def !== null) {
-    line = ofs + '(' + PR.GetString(def.name) + ')';
-  } else {
-    line = ofs + '(???)';
-  }
-  for (; line.length <= 20; ) {
-    line += ' ';
-  }
-  return line;
-};
-
-PR.LoadProgs = async function() {
-  const progs = await COM.LoadFile('progs.dat');
-  if (progs === null) {
-    throw new MissingResourceError('progs.dat');
-  }
-  Con.DPrint('Programs occupy ' + (progs.byteLength >> 10) + 'K.\n');
-  const view = new DataView(progs);
-
-  let i = view.getUint32(0, true);
-  if (i !== PR.version) {
-    throw new Error('progs.dat has wrong version number (' + i + ' should be ' + PR.version + ')');
-  }
-
-  if (view.getUint32(4, true) !== PR.progheader_crc) {
-    throw new Error('progs.dat system vars have been modified, PR.js is out of date');
-  }
-
-  PR.crc = CRC16CCITT.Block(new Uint8Array(progs));
-
-  PR.stack = [];
-  PR.depth = 0;
-
-  PR.localstack = [];
-  for (i = 0; i < PR.localstack_size; i++) {
-    PR.localstack[i] = 0;
-  }
-  PR.localstack_used = 0;
-
-  let ofs; let num;
-
-  ofs = view.getUint32(8, true);
-  num = view.getUint32(12, true);
-  PR.statements = [];
-  for (i = 0; i < num; i++) {
-    PR.statements[i] = {
-      op: view.getUint16(ofs, true),
-      a: view.getInt16(ofs + 2, true),
-      b: view.getInt16(ofs + 4, true),
-      c: view.getInt16(ofs + 6, true),
-    };
-    ofs += 8;
-  }
-
-  ofs = view.getUint32(16, true);
-  num = view.getUint32(20, true);
-  PR.globaldefs = [];
-  for (i = 0; i < num; i++) {
-    PR.globaldefs[i] = {
-      type: view.getUint16(ofs, true),
-      ofs: view.getUint16(ofs + 2, true),
-      name: view.getUint32(ofs + 4, true),
-    };
-    ofs += 8;
-  }
-
-  ofs = view.getUint32(24, true);
-  num = view.getUint32(28, true);
-  PR.fielddefs = [];
-  for (i = 0; i < num; i++) {
-    PR.fielddefs[i] = {
-      type: view.getUint16(ofs, true),
-      ofs: view.getUint16(ofs + 2, true),
-      name: view.getUint32(ofs + 4, true),
-    };
-    ofs += 8;
-  }
-
-  ofs = view.getUint32(32, true);
-  num = view.getUint32(36, true);
-  PR.functions = [];
-  for (i = 0; i < num; i++) {
-    PR.functions[i] = {
-      first_statement: view.getInt32(ofs, true),
-      parm_start: view.getUint32(ofs + 4, true),
-      locals: view.getUint32(ofs + 8, true),
-      profile: view.getUint32(ofs + 12, true),
-      name: view.getUint32(ofs + 16, true),
-      file: view.getUint32(ofs + 20, true),
-      numparms: view.getUint32(ofs + 24, true),
-      parm_size: [
-        view.getUint8(ofs + 28), view.getUint8(ofs + 29),
-        view.getUint8(ofs + 30), view.getUint8(ofs + 31),
-        view.getUint8(ofs + 32), view.getUint8(ofs + 33),
-        view.getUint8(ofs + 34), view.getUint8(ofs + 35),
-      ],
-    };
-    ofs += 36;
-  }
-
-  ofs = view.getUint32(40, true);
-  num = view.getUint32(44, true);
-  PR.strings = [];
-  for (i = 0; i < num; i++) {
-    PR.strings[i] = view.getUint8(ofs + i);
-  }
-  PR.string_temp = PR.NewString('', 1024); // allocates 1024 bytes for temp strings
-  PR.string_heap_start = PR.strings.length + 4;
-  PR.string_heap_current = PR.string_heap_start;
-
-  ofs = view.getUint32(48, true);
-  num = view.getUint32(52, true);
-  PR.globals = new ArrayBuffer(num << 2);
-  PR.globals_float = new Float32Array(PR.globals);
-  PR.globals_int = new Int32Array(PR.globals);
-  for (i = 0; i < num; i++) {
-    PR.globals_int[i] = view.getInt32(ofs + (i << 2), true);
-  }
-
-  PR.entityfields = view.getUint32(56, true);
-  PR.edict_size = 96 + (PR.entityfields << 2);
-
-  const fields = [
-    'ammo_shells1',
-    'ammo_nails1',
-    'ammo_lava_nails',
-    'ammo_rockets1',
-    'ammo_multi_rockets',
-    'ammo_cells1',
-    'ammo_plasma',
-    'gravity',
-    'items2',
-  ];
-  for (i = 0; i < fields.length; i++) {
-    const field = fields[i];
-    const def = PR.FindField(field);
-    PR.entvars[field] = (def !== null) ? def.ofs : null;
-  }
-  ProgsFunctionProxy.proxyCache = []; // free all cached functions
-  // hook up progs.dat with our proxies
-
-  const progsAPI = new ProgsEntity(null);
-
-  const deathmatch = Cvar.FindVar('deathmatch');
-  const skill = Cvar.FindVar('skill');
-  const coop = Cvar.FindVar('coop');
-
-  const gameAPI = Object.assign(progsAPI, {
-    prepareEntity(edict, classname, initialData = {}) {
-      if (!edict.entity) { // do not use isFree(), check for unset entity property
-        edict.entity = new ProgsEntity(edict);
-        Object.freeze(edict.entity);
-      }
-
-      // yet another hack, always be successful during a loadgame
-      if (SV.server.loadgame) {
-        return true;
-      }
-
-      // special case for QuakeC: empty entity
-      if (classname === null) {
-        return true;
-      }
-
-      // another special case for QuakeC: player has no spawn function
-      if (classname === 'player') {
-        return true;
-      }
-
-      if (!SV.server.gameAPI[classname]) {
-        Con.PrintWarning(`No spawn function for edict ${edict.num}: ${classname}\n`);
-        // debugger;
-        return false;
-      }
-
-      initialData.classname = classname;
-
-      for (const [key, value] of Object.entries(initialData)) {
-        const field = PR.FindField(key);
-
-        if (!field) {
-          Con.PrintWarning(`'${key}' is not a field\n`);
-          continue;
-        }
-
-        switch (field.type & 0x7fff) {
-          case etype.ev_entity:
-            edict.entity[key] = value instanceof ServerEdict ? value : {num: Q.atoi(value)};
-            break;
-
-          case etype.ev_vector:
-            edict.entity[key] = value instanceof Vector ? value : new Vector(...value.split(' ').map((x) => Q.atof(x)));
-            break;
-
-          case etype.ev_field: {
-            const d = PR.FindField(value);
-            if (!d) {
-              Con.PrintWarning(`Can't find field: ${value}\n`);
-              break;
-            }
-            edict.entity[key] = d;
-            break;
-          }
-
-          case etype.ev_function: {
-            edict.entity[key] = {fnc: value};
-            break;
-          }
-
-          default:
-            edict.entity[key] = value;
-        }
-      }
-
-      // these are quake specific things happening during loading
-
-      const spawnflags = edict.entity.spawnflags || 0;
-
-      if (deathmatch.value !== 0 && (spawnflags & 2048)) {
-        return false;
-      }
-
-      const skillFlags = [256, 512, 1024, 1024];
-
-      if (spawnflags & skillFlags[Math.max(0, Math.min(skillFlags.length, skill.value))]) {
-        return false;
-      }
-
-      return true;
-    },
-
-    spawnPreparedEntity(edict) {
-      if (!edict.entity) {
-        Con.PrintError('PR.LoadProgs.spawnPreparedEntity: no entity class instance set!\n');
-        return false;
-      }
-
-      // another special case for QuakeC: player has no spawn function
-      if (edict.entity.classname === 'player') {
-        return true;
-      }
-
-      edict.entity.spawn();
-
-      return true;
-    },
-
-    init(mapname, serverflags) {
-      gameAPI.mapname = mapname;
-      gameAPI.serverflags = serverflags;
-
-      // coop automatically disables deathmatch
-      if (coop.value) {
-        coop.set(true);
-        deathmatch.set(false);
-      }
-
-      // make sure skill is in range
-      skill.set(Math.max(0, Math.min(3, Math.floor(skill.value))));
-
-      gameAPI.coop = coop.value;
-      gameAPI.deathmatch = deathmatch.value;
-    },
-
-    // eslint-disable-next-line no-unused-vars
-    shutdown(isCrashShutdown) {
-    },
-
-    startFrame() {
-      // pass to the VM
-      // @ts-ignore
-      progsAPI.StartFrame(null);
-    },
-  });
-
-  Object.freeze(gameAPI);
-
-  return gameAPI;
-};
-
-/** @type {Cvar[]} */
-PR._cvars = [];
-
-/** @type {import('./GameLoader').GameModuleInterface|null} */
-PR.QuakeJS = null;
-
-PR.Init = async function() {
-  try {
-    if (COM.CheckParm('-noquakejs')) {
-      Con.PrintWarning('PR.Init: QuakeJS disabled by request\n');
-      PR.QuakeJS = null;
-    } else {
-      // try to get the game API
-      PR.QuakeJS = await loadGameModule(COM.gamedir[0].filename);
-      PR.QuakeJS.ServerGameAPI.Init(ServerEngineAPI);
-
-      const identification = PR.QuakeJS.identification;
-      Con.Print(`PR.Init: ${identification.name} v${identification.version.join('.')} by ${identification.author} loaded.\n`);
-    return;
-    }
-  } catch (e) {
-    if (typeof(e.code) === 'string' && e.code !== 'ERR_MODULE_NOT_FOUND') { // only catch module not found errors
-      throw e;
-    }
-
-    // CR: stupidest error convention ever, check https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Operators/import#return_value
-
-    Con.PrintWarning('PR.Init: Falling back to QuakeC, failed to initialize QuakeJS server code: ' + e.message +'.\n');
-
-    PR.QuakeJS = null;
-  }
-
-  // CR: we do not need any of this when running QuakeJS
-  Cmd.AddCommand('edict', ED.PrintEdict_f);
-  Cmd.AddCommand('edicts', ED.PrintEdicts);
-  Cmd.AddCommand('edictcount', ED.Count);
-  Cmd.AddCommand('profile', PR.Profile_f);
-  PR._cvars.push(new Cvar('gamecfg', '0'));
-  PR._cvars.push(new Cvar('scratch1', '0'));
-  PR._cvars.push(new Cvar('scratch2', '0'));
-  PR._cvars.push(new Cvar('scratch3', '0'));
-  PR._cvars.push(new Cvar('scratch4', '0'));
-  PR._cvars.push(new Cvar('savedgamecfg', '0', Cvar.FLAG.ARCHIVE));
-  PR._cvars.push(new Cvar('saved1', '0', Cvar.FLAG.ARCHIVE));
-  PR._cvars.push(new Cvar('saved2', '0', Cvar.FLAG.ARCHIVE));
-  PR._cvars.push(new Cvar('saved3', '0', Cvar.FLAG.ARCHIVE));
-  PR._cvars.push(new Cvar('saved4', '0', Cvar.FLAG.ARCHIVE));
-
-  PR._cvars.push(new Cvar('nomonsters', '0', Cvar.FLAG.SERVER));
-  PR._cvars.push(new Cvar('fraglimit', '0', Cvar.FLAG.SERVER));
-  PR._cvars.push(new Cvar('timelimit', '0', Cvar.FLAG.SERVER));
-  PR._cvars.push(new Cvar('samelevel', '0', Cvar.FLAG.SERVER, 'Set to 1 to stay on the same map even the map is over'));
-  PR._cvars.push(new Cvar('noexit', '0', Cvar.FLAG.SERVER));
-  PR._cvars.push(new Cvar('skill', '1', Cvar.FLAG.SERVER));
-  PR._cvars.push(new Cvar('deathmatch', '0', Cvar.FLAG.SERVER));
-  PR._cvars.push(new Cvar('coop', '0', Cvar.FLAG.SERVER));
-};
-
-// exec
-
-PR.localstack_size = 2048;
-
-PR.opnames = [
-  'DONE',
-  'MUL_F', 'MUL_V', 'MUL_FV', 'MUL_VF',
-  'DIV',
-  'ADD_F', 'ADD_V',
-  'SUB_F', 'SUB_V',
-  'EQ_F', 'EQ_V', 'EQ_S', 'EQ_E', 'EQ_FNC',
-  'NE_F', 'NE_V', 'NE_S', 'NE_E', 'NE_FNC',
-  'LE', 'GE', 'LT', 'GT',
-  'INDIRECT', 'INDIRECT', 'INDIRECT', 'INDIRECT', 'INDIRECT', 'INDIRECT',
-  'ADDRESS',
-  'STORE_F', 'STORE_V', 'STORE_S', 'STORE_ENT', 'STORE_FLD', 'STORE_FNC',
-  'STOREP_F', 'STOREP_V', 'STOREP_S', 'STOREP_ENT', 'STOREP_FLD', 'STOREP_FNC',
-  'RETURN',
-  'NOT_F', 'NOT_V', 'NOT_S', 'NOT_ENT', 'NOT_FNC',
-  'IF', 'IFNOT',
-  'CALL0', 'CALL1', 'CALL2', 'CALL3', 'CALL4', 'CALL5', 'CALL6', 'CALL7', 'CALL8',
-  'STATE',
-  'GOTO',
-  'AND', 'OR',
-  'BITAND', 'BITOR',
-];
-
-// PR.executions = [];
-
-PR.PrintStatement = function(s) {
-  let text;
-  if (s.op < PR.opnames.length) {
-    text = PR.opnames[s.op] + ' ';
-    for (; text.length <= 9; ) {
-      text += ' ';
-    }
-  } else {
-    text = '';
-  }
-  if ((s.op === PR.op.jnz) || (s.op === PR.op.jz)) {
-    text += PR.GlobalString(s.a) + 'branch ' + s.b;
-  } else if (s.op === PR.op.jump) {
-    text += 'branch ' + s.a;
-  } else if ((s.op >= PR.op.store_f) && (s.op <= PR.op.store_fnc)) {
-    text += PR.GlobalString(s.a) + PR.GlobalStringNoContents(s.b);
-  } else {
-    if (s.a !== 0) {
-      text += PR.GlobalString(s.a);
-    }
-    if (s.b !== 0) {
-      text += PR.GlobalString(s.b);
-    }
-    if (s.c !== 0) {
-      text += PR.GlobalStringNoContents(s.c);
-    }
-  }
-  Con.Print(text + '\n');
-  // if (PR.executions.length > 50) {
-  //   PR.executions.shift();
-  // }
-  // PR.executions.push(text);
-};
-
-PR.StackTrace = function() {
-  if (PR.depth === 0) {
-    Con.Print('<NO STACK>\n');
-    return;
-  }
-  PR.stack[PR.depth] = [PR.xstatement, PR.xfunction];
-  let f; let file;
-  for (; PR.depth >= 0; PR.depth--) {
-    f = PR.stack[PR.depth][1];
-    if (!f) {
-      Con.Print('<NO FUNCTION>\n');
-      continue;
-    }
-    file = PR.GetString(f.file);
-    for (; file.length <= 11; ) {
-      file += ' ';
-    }
-    Con.Print(file + ' : ' + PR.GetString(f.name) + '\n');
-  }
-  PR.depth = 0;
-};
-
-PR.Profile_f = function() {
-  if (SV.server.active !== true) {
-    return;
-  }
-  let num = 0; let max; let best; let i; let f; let profile;
-  while (true) {
-    max = 0;
-    best = null;
-    for (i = 0; i < PR.functions.length; i++) {
-      f = PR.functions[i];
-      if (f.profile > max) {
-        max = f.profile;
-        best = f;
-      }
-    }
-    if (best === null) {
-      return;
-    }
-    if (num < 10) {
-      profile = best.profile.toString();
-      for (; profile.length <= 6; ) {
-        profile = ' ' + profile;
-      }
-      Con.Print(profile + ' ' + PR.GetString(best.name) + '\n');
-    }
-    num++;
-    best.profile = 0;
-  }
-};
-
-PR.RunError = function(error) {
-  PR.PrintStatement(PR.statements[PR.xstatement]);
-  PR.StackTrace();
-  Con.PrintError(error + '\n');
-  throw new HostError('Program error');
-};
-
-PR.EnterFunction = function(f) {
-  PR.stack[PR.depth++] = [PR.xstatement, PR.xfunction];
-  const c = f.locals;
-  if ((PR.localstack_used + c) > PR.localstack_size) {
-    PR.RunError('PR.EnterFunction: locals stack overflow\n');
-  }
-  let i;
-  for (i = 0; i < c; i++) {
-    PR.localstack[PR.localstack_used + i] = PR.globals_int[f.parm_start + i];
-  }
-  PR.localstack_used += c;
-  let o = f.parm_start; let j;
-  for (i = 0; i < f.numparms; i++) {
-    for (j = 0; j < f.parm_size[i]; j++) {
-      PR.globals_int[o++] = PR.globals_int[4 + i * 3 + j];
-    }
-  }
-  PR.xfunction = f;
-  return f.first_statement - 1;
-};
-
-PR.LeaveFunction = function() {
-  if (PR.depth <= 0) {
-    throw new Error('prog stack underflow');
-  }
-  let c = PR.xfunction.locals;
-  PR.localstack_used -= c;
-  if (PR.localstack_used < 0) {
-    PR.RunError('PR.LeaveFunction: locals stack underflow\n');
-  }
-  for (--c; c >= 0; --c) {
-    PR.globals_int[PR.xfunction.parm_start + c] = PR.localstack[PR.localstack_used + c];
-  }
-  PR.xfunction = PR.stack[--PR.depth][1];
-  return PR.stack[PR.depth][0];
-};
-
-PR.ExecuteProgram = function(fnum) {
-  if ((fnum === 0) || (fnum >= PR.functions.length)) {
-    if (PR.globals_int[PR.globalvars.self] !== 0) {
-      ED.Print(SV.server.edicts[PR.globals_int[PR.globalvars.self]]);
-    }
-    throw new HostError('PR.ExecuteProgram: NULL function');
-  }
-  let runaway = 100000;
-  const exitdepth = PR.depth;
-  let s = PR.EnterFunction(PR.functions[fnum]);
-  let st; let ed; let ptr; let newf;
-
-  while (true) {
-    s++;
-    st = PR.statements[s];
-    if (--runaway === 0) {
-      PR.RunError('runaway loop error');
-    }
-    PR.xfunction.profile++;
-    PR.xstatement = s;
-    if (PR.trace) {
-      PR.PrintStatement(st);
-    }
-    switch (st.op) {
-      case PR.op.add_f:
-        PR.globals_float[st.c] = PR.globals_float[st.a] + PR.globals_float[st.b];
-        continue;
-      case PR.op.add_v:
-        PR.globals_float[st.c] = PR.globals_float[st.a] + PR.globals_float[st.b];
-        PR.globals_float[st.c + 1] = PR.globals_float[st.a + 1] + PR.globals_float[st.b + 1];
-        PR.globals_float[st.c + 2] = PR.globals_float[st.a + 2] + PR.globals_float[st.b + 2];
-        continue;
-      case PR.op.sub_f:
-        PR.globals_float[st.c] = PR.globals_float[st.a] - PR.globals_float[st.b];
-        continue;
-      case PR.op.sub_v:
-        PR.globals_float[st.c] = PR.globals_float[st.a] - PR.globals_float[st.b];
-        PR.globals_float[st.c + 1] = PR.globals_float[st.a + 1] - PR.globals_float[st.b + 1];
-        PR.globals_float[st.c + 2] = PR.globals_float[st.a + 2] - PR.globals_float[st.b + 2];
-        continue;
-      case PR.op.mul_f:
-        PR.globals_float[st.c] = PR.globals_float[st.a] * PR.globals_float[st.b];
-        continue;
-      case PR.op.mul_v:
-        PR.globals_float[st.c] = PR.globals_float[st.a] * PR.globals_float[st.b] +
-        PR.globals_float[st.a + 1] * PR.globals_float[st.b + 1] +
-        PR.globals_float[st.a + 2] * PR.globals_float[st.b + 2];
-        continue;
-      case PR.op.mul_fv:
-        PR.globals_float[st.c] = PR.globals_float[st.a] * PR.globals_float[st.b];
-        PR.globals_float[st.c + 1] = PR.globals_float[st.a] * PR.globals_float[st.b + 1];
-        PR.globals_float[st.c + 2] = PR.globals_float[st.a] * PR.globals_float[st.b + 2];
-        continue;
-      case PR.op.mul_vf:
-        PR.globals_float[st.c] = PR.globals_float[st.b] * PR.globals_float[st.a];
-        PR.globals_float[st.c + 1] = PR.globals_float[st.b] * PR.globals_float[st.a + 1];
-        PR.globals_float[st.c + 2] = PR.globals_float[st.b] * PR.globals_float[st.a + 2];
-        continue;
-      case PR.op.div_f:
-        PR.globals_float[st.c] = PR.globals_float[st.a] / PR.globals_float[st.b];
-        continue;
-      case PR.op.bitand:
-        PR.globals_float[st.c] = PR.globals_float[st.a] & PR.globals_float[st.b];
-        continue;
-      case PR.op.bitor:
-        PR.globals_float[st.c] = PR.globals_float[st.a] | PR.globals_float[st.b];
-        continue;
-      case PR.op.ge:
-        PR.globals_float[st.c] = (PR.globals_float[st.a] >= PR.globals_float[st.b]) ? 1.0 : 0.0;
-        continue;
-      case PR.op.le:
-        PR.globals_float[st.c] = (PR.globals_float[st.a] <= PR.globals_float[st.b]) ? 1.0 : 0.0;
-        continue;
-      case PR.op.gt:
-        PR.globals_float[st.c] = (PR.globals_float[st.a] > PR.globals_float[st.b]) ? 1.0 : 0.0;
-        continue;
-      case PR.op.lt:
-        PR.globals_float[st.c] = (PR.globals_float[st.a] < PR.globals_float[st.b]) ? 1.0 : 0.0;
-        continue;
-      case PR.op.and:
-        PR.globals_float[st.c] = ((PR.globals_float[st.a] !== 0.0) && (PR.globals_float[st.b] !== 0.0)) ? 1.0 : 0.0;
-        continue;
-      case PR.op.or:
-        PR.globals_float[st.c] = ((PR.globals_float[st.a] !== 0.0) || (PR.globals_float[st.b] !== 0.0)) ? 1.0 : 0.0;
-        continue;
-      case PR.op.not_f:
-        PR.globals_float[st.c] = (PR.globals_float[st.a] === 0.0) ? 1.0 : 0.0;
-        continue;
-      case PR.op.not_v:
-        PR.globals_float[st.c] = ((PR.globals_float[st.a] === 0.0) &&
-        (PR.globals_float[st.a + 1] === 0.0) &&
-        (PR.globals_float[st.a + 2] === 0.0)) ? 1.0 : 0.0;
-        continue;
-      case PR.op.not_s:
-        if (PR.globals_int[st.a] !== 0) {
-          PR.globals_float[st.c] = (PR.strings[PR.globals_int[st.a]] === 0) ? 1.0 : 0.0;
-        } else {
-          PR.globals_float[st.c] = 1.0;
-        }
-        continue;
-      case PR.op.not_fnc:
-      case PR.op.not_ent:
-        PR.globals_float[st.c] = (PR.globals_int[st.a] === 0) ? 1.0 : 0.0;
-        continue;
-      case PR.op.eq_f:
-        PR.globals_float[st.c] = (PR.globals_float[st.a] === PR.globals_float[st.b]) ? 1.0 : 0.0;
-        continue;
-      case PR.op.eq_v:
-        PR.globals_float[st.c] = ((PR.globals_float[st.a] === PR.globals_float[st.b]) &&
-        (PR.globals_float[st.a + 1] === PR.globals_float[st.b + 1]) &&
-        (PR.globals_float[st.a + 2] === PR.globals_float[st.b + 2])) ? 1.0 : 0.0;
-        continue;
-      case PR.op.eq_s:
-        PR.globals_float[st.c] = (PR.GetString(PR.globals_int[st.a]) === PR.GetString(PR.globals_int[st.b])) ? 1.0 : 0.0;
-        continue;
-      case PR.op.eq_e:
-      case PR.op.eq_fnc:
-        PR.globals_float[st.c] = (PR.globals_int[st.a] === PR.globals_int[st.b]) ? 1.0 : 0.0;
-        continue;
-      case PR.op.ne_f:
-        PR.globals_float[st.c] = (PR.globals_float[st.a] !== PR.globals_float[st.b]) ? 1.0 : 0.0;
-        continue;
-      case PR.op.ne_v:
-        PR.globals_float[st.c] = ((PR.globals_float[st.a] !== PR.globals_float[st.b]) ||
-        (PR.globals_float[st.a + 1] !== PR.globals_float[st.b + 1]) ||
-        (PR.globals_float[st.a + 2] !== PR.globals_float[st.b + 2])) ? 1.0 : 0.0;
-        continue;
-      case PR.op.ne_s:
-        PR.globals_float[st.c] = (PR.GetString(PR.globals_int[st.a]) !== PR.GetString(PR.globals_int[st.b])) ? 1.0 : 0.0;
-        continue;
-      case PR.op.ne_e:
-      case PR.op.ne_fnc:
-        PR.globals_float[st.c] = (PR.globals_int[st.a] !== PR.globals_int[st.b]) ? 1.0 : 0.0;
-        continue;
-      case PR.op.store_f:
-      case PR.op.store_ent:
-      case PR.op.store_fld:
-      case PR.op.store_s:
-      case PR.op.store_fnc:
-        PR.globals_int[st.b] = PR.globals_int[st.a];
-        continue;
-      case PR.op.store_v:
-        PR.globals_int[st.b] = PR.globals_int[st.a];
-        PR.globals_int[st.b + 1] = PR.globals_int[st.a + 1];
-        PR.globals_int[st.b + 2] = PR.globals_int[st.a + 2];
-        continue;
-      case PR.op.storep_f:
-      case PR.op.storep_ent:
-      case PR.op.storep_fld:
-      case PR.op.storep_s:
-      case PR.op.storep_fnc:
-        ptr = PR.globals_int[st.b];
-        SV.server.edicts[Math.floor(ptr / PR.edict_size)].entity._v_int[((ptr % PR.edict_size) - 96) >> 2] = PR.globals_int[st.a];
-        continue;
-      case PR.op.storep_v:
-        ed = SV.server.edicts[Math.floor(PR.globals_int[st.b] / PR.edict_size)];
-        ptr = ((PR.globals_int[st.b] % PR.edict_size) - 96) >> 2;
-        ed.entity._v_int[ptr] = PR.globals_int[st.a];
-        ed.entity._v_int[ptr + 1] = PR.globals_int[st.a + 1];
-        ed.entity._v_int[ptr + 2] = PR.globals_int[st.a + 2];
-        continue;
-      case PR.op.address:
-        ed = PR.globals_int[st.a];
-        if ((ed === 0) && (SV.server.loading !== true)) {
-          PR.RunError('assignment to world entity');
-        }
-        PR.globals_int[st.c] = ed * PR.edict_size + 96 + (PR.globals_int[st.b] << 2);
-        continue;
-      case PR.op.load_f:
-      case PR.op.load_fld:
-      case PR.op.load_ent:
-      case PR.op.load_s:
-      case PR.op.load_fnc:
-        PR.globals_int[st.c] = SV.server.edicts[PR.globals_int[st.a]].entity._v_int[PR.globals_int[st.b]];
-        continue;
-      case PR.op.load_v:
-        ed = SV.server.edicts[PR.globals_int[st.a]];
-        ptr = PR.globals_int[st.b];
-        PR.globals_int[st.c] = ed.entity._v_int[ptr];
-        PR.globals_int[st.c + 1] = ed.entity._v_int[ptr + 1];
-        PR.globals_int[st.c + 2] = ed.entity._v_int[ptr + 2];
-        continue;
-      case PR.op.jz:
-        if (PR.globals_int[st.a] === 0) {
-          s += st.b - 1;
-        }
-        continue;
-      case PR.op.jnz:
-        if (PR.globals_int[st.a] !== 0) {
-          s += st.b - 1;
-        }
-        continue;
-      case PR.op.jump:
-        s += st.a - 1;
-        continue;
-      case PR.op.call0:
-      case PR.op.call1:
-      case PR.op.call2:
-      case PR.op.call3:
-      case PR.op.call4:
-      case PR.op.call5:
-      case PR.op.call6:
-      case PR.op.call7:
-      case PR.op.call8:
-        PR.argc = st.op - PR.op.call0;
-        if (PR.globals_int[st.a] === 0) {
-          PR.RunError('NULL function');
-        }
-        if (PR.globals_int[st.a] < 0) {
-          console.debug('special function called');
-          continue;
-        }
-        newf = PR.functions[PR.globals_int[st.a]];
-        if (newf.first_statement < 0) {
-          ptr = -newf.first_statement;
-          if (ptr >= PF.builtin.length) {
-            PR.RunError('Bad builtin call number');
-          }
-          // PF.builtin[ptr];
-          // try {
-            PF.builtin[ptr]();
-          // } catch (e) {
-          //   PR.RunError(e.message);
-          //   throw e;
-          // }
-          continue;
-        }
-        s = PR.EnterFunction(newf);
-        continue;
-      case PR.op.done:
-      case PR.op.ret:
-        PR.globals_int[PR.ofs.OFS_RETURN] = PR.globals_int[st.a];
-        PR.globals_int[PR.ofs.OFS_RETURN + 1] = PR.globals_int[st.a + 1];
-        PR.globals_int[PR.ofs.OFS_RETURN + 2] = PR.globals_int[st.a + 2];
-        s = PR.LeaveFunction();
-        if (PR.depth === exitdepth) {
-          return;
-        }
-        continue;
-      case PR.op.state:
-        ed = SV.server.edicts[PR.globals_int[PR.globalvars.self]];
-        ed.entity._v_float[PR.entvars.nextthink] = PR.globals_float[PR.globalvars.time] + 0.1;
-        ed.entity._v_float[PR.entvars.frame] = PR.globals_float[st.a];
-        ed.entity._v_int[PR.entvars.think] = PR.globals_int[st.b];
-        continue;
-    }
-    PR.RunError('Bad opcode ' + st.op);
-  }
-};
-
-PR.GetString = function(num) {
-  let string = '';
-  for (; num < PR.strings.length; num++) {
-    if (PR.strings[num] === 0) {
-      break;
-    }
-    string += String.fromCharCode(PR.strings[num]);
-  }
-  return string;
-};
-
-PR._StringLength = function(ofs) {
-  let len = 0;
-
-  while(PR.strings[ofs+len]) {
-    len++;
-  }
-
-  return len;
-};
-
-PR.SetString = function(ofs, s, length = null) {
-  // shortcut: empty strings are located at 0x0000
-  if (s === '') {
-    return 0;
-  }
-
-  const size = (length !== null ? Math.max(s.length, length || 0) : s.length) + 1;
-
-  // check if it’s going to overwrite a constant (ofs < PR.string_heap_start)
-  // check if we can overwrite in place (s.length < &PR.strings[ofs].length)
-  if (ofs === null || ofs < PR.string_heap_start || PR._StringLength(ofs) <= size) {
-    ofs = PR.string_heap_current;
-    PR.string_heap_current += size;
-  }
-
-  // overwrite found spot with s
-  for (let i = 0; i < s.length; i++) {
-    PR.strings[ofs + i] = s.charCodeAt(i);
-  }
-
-  // add 0-byte string terminator
-  PR.strings[ofs + s.length] = 0;
-
-  return ofs;
-};
-
-/**
- * @param s
- * @param length
- */
-PR.NewString = function(s, length) {
-  const ofs = PR.strings.length;
-  let i;
-  if (s.length >= length) {
-    for (i = 0; i < (length - 1); i++) {
-      PR.strings[PR.strings.length] = s.charCodeAt(i);
-    }
-    PR.strings[PR.strings.length] = 0;
-    return ofs;
-  }
-  for (i = 0; i < s.length; i++) {
-    PR.strings[PR.strings.length] = s.charCodeAt(i);
-  }
-  length -= s.length;
-  for (i = 0; i < length; i++) {
-    PR.strings[PR.strings.length] = 0;
-  }
-  return ofs;
-};
-
-PR.TempString = function(string) {
-  if (string.length > 1023) {
-    string = string.substring(0, 1023);
-  }
-  for (let i = 0; i < string.length; i++) {
-    PR.strings[PR.string_temp + i] = string.charCodeAt(i);
-  }
-  PR.strings[PR.string_temp + string.length] = 0;
-
-  return PR.string_temp;
-};
-
-PR.capabilities = [
-  gameCapabilities.CAP_CLIENTDATA_UPDATESTAT,
-  gameCapabilities.CAP_CLIENTDATA_LEGACY,
-  gameCapabilities.CAP_SPAWNPARMS_LEGACY,
-  gameCapabilities.CAP_ENTITY_BBOX_ADJUSTMENTS_DURING_LINK,
-];
+export { default } from './Progs.ts';
diff --git a/source/engine/server/Progs.ts b/source/engine/server/Progs.ts
new file mode 100644
index 00000000..781baa59
--- /dev/null
+++ b/source/engine/server/Progs.ts
@@ -0,0 +1,1643 @@
+import type { ServerGameInterface } from '../../shared/GameInterfaces.ts';
+import type { GameModuleInterface } from './GameLoader.ts';
+
+import Cmd from '../common/Cmd.ts';
+import { CRC16CCITT } from '../common/CRC.ts';
+import Cvar from '../common/Cvar.ts';
+import { HostError, MissingResourceError } from '../common/Errors.ts';
+import Q from '../../shared/Q.ts';
+import Vector from '../../shared/Vector.ts';
+import { eventBus, registry } from '../registry.mjs';
+import { ED, ServerEdict } from './Edict.mjs';
+import { ServerEngineAPI } from '../common/GameAPIs.ts';
+import PF, { etype, ofs } from './ProgsAPI.mjs';
+import { gameCapabilities } from '../../shared/Defs.ts';
+import { loadGameModule } from './GameLoader.mjs';
+
+interface ProgsStatement {
+  op: number;
+  a: number;
+  b: number;
+  c: number;
+}
+
+interface ProgsDefinition {
+  type: number;
+  ofs: number;
+  name: number;
+}
+
+interface ProgsFunctionDefinition {
+  first_statement: number;
+  parm_start: number;
+  locals: number;
+  profile: number;
+  name: number;
+  file: number;
+  numparms: number;
+  parm_size: number[];
+}
+
+type ProgsValue = string | number | boolean | number[] | null;
+type ProgsStackEntry = [number, ProgsFunctionDefinition | null];
+
+const PROGS_OP = Object.freeze({
+  done: 0,
+  mul_f: 1, mul_v: 2, mul_fv: 3, mul_vf: 4,
+  div_f: 5,
+  add_f: 6, add_v: 7,
+  sub_f: 8, sub_v: 9,
+  eq_f: 10, eq_v: 11, eq_s: 12, eq_e: 13, eq_fnc: 14,
+  ne_f: 15, ne_v: 16, ne_s: 17, ne_e: 18, ne_fnc: 19,
+  le: 20, ge: 21, lt: 22, gt: 23,
+  load_f: 24, load_v: 25, load_s: 26, load_ent: 27, load_fld: 28, load_fnc: 29,
+  address: 30,
+  store_f: 31, store_v: 32, store_s: 33, store_ent: 34, store_fld: 35, store_fnc: 36,
+  storep_f: 37, storep_v: 38, storep_s: 39, storep_ent: 40, storep_fld: 41, storep_fnc: 42,
+  ret: 43,
+  not_f: 44, not_v: 45, not_s: 46, not_ent: 47, not_fnc: 48,
+  jnz: 49, jz: 50,
+  call0: 51, call1: 52, call2: 53, call3: 54, call4: 55, call5: 56, call6: 57, call7: 58, call8: 59,
+  state: 60,
+  jump: 61,
+  and: 62, or: 63,
+  bitand: 64, bitor: 65,
+});
+
+const PROGS_GLOBALVARS = Object.freeze({
+  self: 28,
+  other: 29,
+  time: 31,
+});
+
+interface ProgsModule {
+  saveglobal: number;
+  op: typeof PROGS_OP;
+  version: number;
+  max_parms: number;
+  globalvars: typeof PROGS_GLOBALVARS;
+  entvars: Record<string, number | null>;
+  ofs: typeof ofs;
+  progheader_crc: number;
+  crc: number;
+  stack: ProgsStackEntry[];
+  depth: number;
+  localstack: number[];
+  localstack_used: number;
+  localstack_size: number;
+  statements: ProgsStatement[];
+  globaldefs: ProgsDefinition[];
+  fielddefs: ProgsDefinition[];
+  functions: ProgsFunctionDefinition[];
+  strings: number[];
+  string_temp: number;
+  string_heap_start: number;
+  string_heap_current: number;
+  globals: ArrayBuffer;
+  globals_float: Float32Array;
+  globals_int: Int32Array;
+  entityfields: number;
+  edict_size: number;
+  _cvars: Cvar[];
+  QuakeJS: GameModuleInterface | null;
+  opnames: string[];
+  trace: boolean;
+  argc: number;
+  xstatement: number;
+  xfunction: ProgsFunctionDefinition;
+  capabilities: gameCapabilities[];
+  GlobalAtOfs(ofs: number): ProgsDefinition | null;
+  FieldAtOfs(ofs: number): ProgsDefinition | null;
+  FindField(name: string): ProgsDefinition | null;
+  FindGlobal(name: string): ProgsDefinition | null;
+  FindFunction(name: string): number;
+  ValueString(type: number, val: ArrayBuffer, ofs: number): string;
+  Value(type: number, val: ArrayBuffer, ofs: number): ProgsValue;
+  UglyValueString(type: number, val: ArrayBuffer, ofs: number): string;
+  GlobalString(ofs: number): string;
+  GlobalStringNoContents(ofs: number): string;
+  LoadProgs(): Promise<ServerGameInterface>;
+  Init(): Promise<void>;
+  PrintStatement(s: ProgsStatement): void;
+  StackTrace(): void;
+  Profile_f(): void;
+  RunError(error: string): never;
+  EnterFunction(f: ProgsFunctionDefinition): number;
+  LeaveFunction(): number;
+  ExecuteProgram(fnum: number): void;
+  GetString(num: number): string;
+  _StringLength(ofs: number): number;
+  SetString(ofs: number | null, s: string, length?: number | null): number;
+  NewString(s: string, length: number): number;
+  TempString(string: string): number;
+}
+
+const PR = {} as ProgsModule;
+
+export default PR;
+
+let { COM, Con, SV } = registry;
+
+eventBus.subscribe('registry.frozen', () => {
+  COM = registry.COM;
+  Con = registry.Con;
+  SV = registry.SV;
+});
+
+PR.saveglobal = (1<<15);
+
+PR.op = PROGS_OP;
+
+PR.version = 6;
+PR.max_parms = 8;
+
+PR.globalvars = PROGS_GLOBALVARS;
+
+PR.entvars = {
+  modelindex: 0, // float
+  absmin: 1, // vec3
+  absmin1: 2,
+  absmin2: 3,
+  absmax: 4, // vec3
+  absmax1: 5,
+  absmax2: 6,
+  ltime: 7, // float
+  movetype: 8, // float
+  solid: 9, // float
+  origin: 10, // vec3
+  origin1: 11,
+  origin2: 12,
+  oldorigin: 13, // vec3
+  oldorigin1: 14,
+  oldorigin2: 15,
+  velocity: 16, // vec3
+  velocity1: 17,
+  velocity2: 18,
+  angles: 19, // vec3
+  angles1: 20,
+  angles2: 21,
+  avelocity: 22, // vec3
+  avelocity1: 23,
+  avelocity2: 24,
+  punchangle: 25, // vec3
+  punchangle1: 26,
+  punchangle2: 27,
+  classname: 28, // string
+  model: 29, // string
+  frame: 30, // float
+  skin: 31, // float
+  effects: 32, // float
+  mins: 33, // vec3
+  mins1: 34,
+  mins2: 35,
+  maxs: 36, // vec3
+  maxs1: 37,
+  maxs2: 38,
+  size: 39, // vec3
+  size1: 40,
+  size2: 41,
+  touch: 42, // func
+  use: 43, // func
+  think: 44, // func
+  blocked: 45, // func
+  nextthink: 46, // float
+  groundentity: 47, // edict
+  health: 48, // float
+  frags: 49, // float
+  weapon: 50, // float
+  weaponmodel: 51, // string
+  weaponframe: 52, // float
+  currentammo: 53, // float
+  ammo_shells: 54, // float
+  ammo_nails: 55, // float
+  ammo_rockets: 56, // float
+  ammo_cells: 57, // float
+  items: 58, // float
+  takedamage: 59, // float
+  chain: 60, // edict
+  deadflag: 61, // float
+  view_ofs: 62, // vec3
+  view_ofs1: 63,
+  view_ofs2: 64,
+  button0: 65, // float
+  button1: 66, // float
+  button2: 67, // float
+  impulse: 68, // float
+  fixangle: 69, // float
+  v_angle: 70, // vec3
+  v_angle1: 71,
+  v_angle2: 72,
+  idealpitch: 73, // float
+  netname: 74, // string
+  enemy: 75, // edict
+  flags: 76, // float
+  colormap: 77, // float
+  team: 78, // float
+  max_health: 79, // float
+  teleport_time: 80, // float
+  armortype: 81, // float
+  armorvalue: 82, // float
+  waterlevel: 83, // float
+  watertype: 84, // float
+  ideal_yaw: 85, // float
+  yaw_speed: 86, // float
+  aiment: 87, // edict
+  goalentity: 88, // edict
+  spawnflags: 89, // float
+  target: 90, // string
+  targetname: 91, // string
+  dmg_take: 92, // float
+  dmg_save: 93, // float
+  dmg_inflictor: 94, // edict
+  owner: 95, // edict
+  movedir: 96, // vec3
+  movedir1: 97,
+  movedir2: 98,
+  message: 99, // string
+  sounds: 100, // float
+  noise: 101, // string
+  noise1: 102, // string
+  noise2: 103, // string
+  noise3: 104, // string
+};
+
+PR.ofs = ofs;
+
+PR.progheader_crc = 5927;
+
+// classes
+
+/**
+ * FIXME: function proxies need to become cached
+ */
+class ProgsFunctionProxy extends Function {
+  static proxyCache = [];
+
+  constructor(fnc, ent = null, settings = {}) {
+    super();
+
+    this.fnc = fnc;
+    this.ent = ent;
+    this._signature = null;
+    this._settings = settings;
+
+    const f = PR.functions[this.fnc];
+    const name = PR.GetString(f.name);
+
+    Object.defineProperty(this, 'name', {
+      value: name,
+      writable: false,
+    });
+
+    Object.freeze(this);
+  }
+
+  toString() {
+    return `${PR.GetString(PR.functions[this.fnc].name)} (ProgsFunctionProxy(${this.fnc}))`;
+  }
+
+  static create(fnc, ent, settings = {}) {
+    const cacheId = `${fnc}-${ent ? ent.num : 'null'}`;
+
+    if (ProgsFunctionProxy.proxyCache[cacheId]) {
+      return ProgsFunctionProxy.proxyCache[cacheId];
+    }
+
+    const obj = new ProgsFunctionProxy(fnc, ent, settings);
+
+    // such an ugly hack to make objects actually callable
+    ProgsFunctionProxy.proxyCache[cacheId] = new Proxy(obj, {
+      apply(target, thisArg, args) {
+        return obj.call.apply(obj, args);
+      },
+    });
+
+    return ProgsFunctionProxy.proxyCache[cacheId];
+  }
+
+  static _getEdictId(ent) {
+    if (!ent) {
+      return 0;
+    }
+
+    if (ent instanceof ProgsEntity) {
+      return ent._edictNum;
+    }
+
+    return ent.num;
+  }
+
+  /**
+   * Calls the proxied QuakeC function.
+   * @returns The QuakeC function return value interpreted as a float.
+   */
+  call(self) {
+    const old_self = PR.globals_int[PR.globalvars.self];
+    const old_other = PR.globals_int[PR.globalvars.other];
+
+    if (this.ent && !this.ent.isFree()) {
+      // in case this is a function bound to an entity, we need to set it to self
+      PR.globals_int[PR.globalvars.self] = ProgsFunctionProxy._getEdictId(this.ent);
+
+      // fun little hack, we always assume self being other if this is called on an ent
+      PR.globals_int[PR.globalvars.other] = ProgsFunctionProxy._getEdictId(self);
+    } else if (self) {
+      // in case it’s a global function, we need to set self to the first argument
+      PR.globals_int[PR.globalvars.self] = ProgsFunctionProxy._getEdictId(self);
+    }
+
+    if (this._settings.resetOther) {
+      PR.globals_int[PR.globalvars.other] = 0;
+    }
+
+    PR.ExecuteProgram(this.fnc);
+
+    if (this._settings.backupSelfAndOther) {
+      PR.globals_int[PR.globalvars.self] = old_self;
+      PR.globals_int[PR.globalvars.other] = old_other;
+    }
+
+    return PR.Value(etype.ev_float, PR.globals, 1); // assume float
+  }
+};
+
+// PR._stats = {
+//   edict: {},
+//   global: {},
+// };
+
+class ProgsEntity {
+  static SERIALIZATION_TYPE_EDICT = 'E';
+  static SERIALIZATION_TYPE_FUNCTION = 'F';
+  static SERIALIZATION_TYPE_VECTOR = 'V';
+  static SERIALIZATION_TYPE_PRIMITIVE = 'P';
+
+  /**
+   *
+   * @param {*} ed can be null, then it’s global
+   */
+  constructor(ed) {
+    // const stats = ed ? PR._stats.edict : PR._stats.global;
+    const defs = ed ? PR.fielddefs : PR.globaldefs;
+
+    if (ed) {
+      this._edictNum = ed.num;
+      this._v = new ArrayBuffer(PR.entityfields * 4);
+      this._v_float = new Float32Array(this._v);
+      this._v_int = new Int32Array(this._v);
+    }
+
+    this._serializableFields = [];
+
+    for (let i = 1; i < defs.length; i++) {
+      const d = defs[i];
+      const name = PR.GetString(d.name);
+
+      if (name.charCodeAt(name.length - 2) === 95) {
+        // skip _x, _y, _z
+        continue;
+      }
+
+      const [type, val, ofs] = [d.type & ~PR.saveglobal, ed ? this._v : PR.globals, d.ofs];
+
+      if ((type & ~PR.saveglobal) === 0) {
+        continue;
+      }
+
+      if (!ed && (d.type & ~PR.saveglobal) !== 0 && [etype.ev_string, etype.ev_float, etype.ev_entity].includes(type)) {
+        this._serializableFields.push(name);
+      } else if (ed) {
+        this._serializableFields.push(name);
+      }
+
+      const val_float = new Float32Array(val);
+      const val_int = new Int32Array(val);
+
+      const assignedFunctions = [];
+
+      switch (type) {
+        case etype.ev_string:
+          Object.defineProperty(this, name, {
+            get: function() {
+              return val_int[ofs] > 0 ? PR.GetString(val_int[ofs]) : null;
+            },
+            set: function(value) {
+              val_int[ofs] = value !== null && value !== '' ? PR.SetString(val_int[ofs], value) : 0;
+            },
+            configurable: true,
+            enumerable: true,
+          });
+          break;
+        case etype.ev_entity: // TODO: actually accept entity instead of edict and vice-versa
+          Object.defineProperty(this, name, {
+            get: function() {
+              if (!SV.server?.edicts || !SV.server.edicts[val_int[ofs]]) {
+                return null;
+              }
+
+              return SV.server.edicts[val_int[ofs]] || null;
+            },
+            set: function(value) {
+              if (value === null) {
+                val_int[ofs] = 0;
+                return;
+              }
+              if (value === 0) { // making fixing stuff easier, though this is a breakpoint trap as well
+                val_int[ofs] = 0;
+                return;
+              }
+              if (typeof(value.edictId) !== 'undefined') { // TODO: Entity class
+                val_int[ofs] = value.edictId;
+                return;
+              }
+              if (typeof(value._edictNum) !== 'undefined') { // TODO: Edict class
+                val_int[ofs] = value.edictId;
+                return;
+              }
+              if (typeof(value.num) !== 'undefined') { // TODO: Edict class
+                val_int[ofs] = value.num;
+                return;
+              }
+              throw new TypeError('Expected Edict');
+            },
+            configurable: true,
+            enumerable: true,
+          });
+          break;
+        case etype.ev_function:
+          Object.defineProperty(this, name, {
+            get: function() {
+              const id = val_int[ofs];
+              if (id < 0 && assignedFunctions[(-id) - 1] instanceof Function) {
+                return assignedFunctions[(-id) - 1];
+              }
+              return id > 0 ? ProgsFunctionProxy.create(id, ed, {
+                // some QuakeC related idiosyncrasis we need to take care of
+                backupSelfAndOther: ['touch'].includes(name),
+                resetOther: ['StartFrame'].includes(name),
+              }) : null;
+            },
+            set: function(value) {
+              if (value === null) {
+                val_int[ofs] = 0;
+                return;
+              }
+              if (value instanceof Function) {
+                assignedFunctions.push(value);
+                val_int[ofs] = -assignedFunctions.length;
+                return;
+              }
+              if (value instanceof ProgsFunctionProxy) {
+                val_int[ofs] = value.fnc;
+                return;
+              }
+              if (typeof(value) === 'string') { // this is used by ED.ParseEdict etc. when parsing entities and setting fields
+                const d = PR.FindFunction(value);
+                if (!d) {
+                  throw new TypeError('Invalid function: ' + value);
+                }
+                val_int[ofs] = d;
+                return;
+              }
+              if (typeof(value.fnc) !== 'undefined') {
+                val_int[ofs] = value.fnc;
+                return;
+              }
+              throw new TypeError('EdictProxy.' + name + ': Expected FunctionProxy, function name or function ID');
+            },
+            configurable: true,
+            enumerable: true,
+          });
+          break;
+        case etype.ev_pointer: // unused and irrelevant
+          break;
+        case etype.ev_field:
+          Object.defineProperty(this, name, {
+            get: function() {
+              return val_int[ofs];
+            },
+            set: function(value) {
+              if (typeof(value.ofs) !== 'undefined') {
+                val_int[ofs] = value.ofs;
+                return;
+              }
+              val_int[ofs] = value;
+            },
+            configurable: true,
+            enumerable: true,
+          });
+          break;
+        case etype.ev_float:
+          Object.defineProperty(this, name, {
+            get: function() {
+              return val_float[ofs];
+            },
+            set: function(value) {
+              if (value === undefined || Q.isNaN(value)) {
+                throw new TypeError('EdictProxy.' + name + ': invalid value for ev_float passed: ' + value);
+              }
+              val_float[ofs] = value;
+            },
+            configurable: true,
+            enumerable: true,
+          });
+          break;
+        case etype.ev_vector: // TODO: Proxy for Vector?
+          Object.defineProperty(this, name, {
+            get: function() {
+              return new Vector(val_float[ofs], val_float[ofs + 1], val_float[ofs + 2]);
+            },
+            set: function(value) {
+              val_float[ofs] = value[0];
+              val_float[ofs+1] = value[1];
+              val_float[ofs+2] = value[2];
+            },
+            configurable: true,
+            enumerable: true,
+          });
+          break;
+      }
+    }
+  }
+
+  serialize() {
+    const data = {};
+
+    for (const field of this._serializableFields) {
+      const value = this[field];
+
+      switch (true) {
+        case value === null:
+          data[field] = [ProgsEntity.SERIALIZATION_TYPE_PRIMITIVE, null];
+          break;
+
+        case value instanceof ProgsEntity:
+          data[field] = [ProgsEntity.SERIALIZATION_TYPE_EDICT, value._edictNum];
+          break;
+
+        case value instanceof ProgsFunctionProxy:
+          data[field] = [ProgsEntity.SERIALIZATION_TYPE_FUNCTION, value.fnc];
+          break;
+
+        case value instanceof Vector:
+          data[field] = [ProgsEntity.SERIALIZATION_TYPE_VECTOR, ...value];
+          break;
+
+        case typeof value === 'number':
+        case typeof value === 'boolean':
+        case typeof value === 'string':
+          data[field] = [ProgsEntity.SERIALIZATION_TYPE_PRIMITIVE, value];
+          break;
+      }
+    }
+
+    return data;
+  }
+
+  deserialize(obj) {
+    for (const [key, value] of Object.entries(obj)) {
+      console.assert(this._serializableFields.includes(key));
+
+      const [type, ...data] = value;
+
+      switch (type) {
+        case ProgsEntity.SERIALIZATION_TYPE_EDICT:
+          this[key] = SV.server.edicts[data[0]];
+          break;
+
+        case ProgsEntity.SERIALIZATION_TYPE_FUNCTION:
+          this[key] = {fnc: data[0]};
+          break;
+
+        case ProgsEntity.SERIALIZATION_TYPE_VECTOR:
+          this[key] = new Vector(...data);
+          break;
+
+        case ProgsEntity.SERIALIZATION_TYPE_PRIMITIVE:
+          this[key] = data[0];
+          break;
+      }
+    }
+
+    return this;
+  }
+
+  clear() {
+    if (this._v) {
+      const int32 = new Int32Array(this._v);
+      for (let i = 0; i < PR.entityfields; i++) {
+        int32[i] = 0;
+      }
+    }
+  }
+
+  free() {
+    this.clear();
+  }
+
+  equals(other) {
+    return other && other._edictNum === this._edictNum;
+  }
+
+  spawn() {
+    // QuakeC is different, the actual spawn function is called by its classname
+    SV.server.gameAPI[this.classname]({num: this._edictNum});
+  }
+
+  get edictId() {
+    return this._edictNum;
+  }
+};
+
+// edict
+
+/**
+ * Retrieves the global definition at the specified offset.
+ * @param {number} ofs - The offset to retrieve.
+ * @returns {object|null} - The global definition.
+ */
+PR.GlobalAtOfs = function(ofs) {
+  return PR.globaldefs.find((def) => def.ofs === ofs) || null;
+};
+
+/**
+ * Retrieves the field definition at the specified offset.
+ * @param {number} ofs - The offset to retrieve.
+ * @returns {object|null} - The field definition.
+ */
+PR.FieldAtOfs = function(ofs) {
+  return PR.fielddefs.find((def) => def.ofs === ofs) || null;
+};
+
+/**
+ * Finds a field definition by name.
+ * @param {string} name - The field name.
+ * @returns {object|null} - The field definition.
+ */
+PR.FindField = function(name) {
+  return PR.fielddefs.find((def) => PR.GetString(def.name) === name) || null;
+};
+
+/**
+ * Finds a global definition by name.
+ * @param {string} name - The global name.
+ * @returns {object|null} - The global definition.
+ */
+PR.FindGlobal = function(name) {
+  return PR.globaldefs.find((def) => PR.GetString(def.name) === name) || null;
+};
+
+/**
+ * Finds a function definition by name.
+ * @param {string} name - The function name.
+ * @returns {number} - The function index.
+ */
+PR.FindFunction = function(name) {
+  return PR.functions.findIndex((func) => PR.GetString(func.name) === name);
+};
+
+PR.ValueString = function(type, val, ofs) {
+  const val_float = new Float32Array(val);
+  const val_int = new Int32Array(val);
+  type &= ~PR.saveglobal;
+  switch (type) {
+    case etype.ev_string:
+      return PR.GetString(val_int[ofs]);
+    case etype.ev_entity:
+      return 'entity ' + val_int[ofs];
+    case etype.ev_function:
+      return PR.GetString(PR.functions[val_int[ofs]].name) + '()';
+    case etype.ev_field: {
+        const def = PR.FieldAtOfs(val_int[ofs]);
+        if (def !== null) {
+          return '.' + PR.GetString(def.name);
+        }
+        return '.';
+      }
+    case etype.ev_void:
+      return 'void';
+    case etype.ev_float:
+      return val_float[ofs].toFixed(1);
+    case etype.ev_vector:
+      return '\'' + val_float[ofs].toFixed(1) +
+              ' ' + val_float[ofs + 1].toFixed(1) +
+              ' ' + val_float[ofs + 2].toFixed(1) + '\'';
+    case etype.ev_pointer:
+      return 'pointer';
+  }
+  return 'bad type ' + type;
+};
+
+PR.Value = function(type, val, ofs) {
+  const val_float = new Float32Array(val);
+  const val_int = new Int32Array(val);
+  type &= ~PR.saveglobal;
+  switch (type) {
+    case etype.ev_string:
+      return PR.GetString(val_int[ofs]);
+    case etype.ev_pointer:
+    case etype.ev_entity:
+    case etype.ev_field:
+      return val_int[ofs];
+      // case etype.ev_field: {
+      //     const def = PR.FieldAtOfs(val_int[ofs]);
+      //     if (def != null) {
+      //       return '.' + PR.GetString(def.name);
+      //     }
+      //     return '.';
+      //   }
+    case etype.ev_function:
+      return PR.GetString(PR.functions[val_int[ofs]].name) + '()';
+    case etype.ev_void:
+      return null;
+    case etype.ev_float:
+      return val_float[ofs];
+    case etype.ev_vector:
+      return [val_float[ofs],
+              val_float[ofs + 1],
+              val_float[ofs + 2]];
+  }
+  throw new TypeError('bad PR etype ' + type);
+};
+
+PR.UglyValueString = function(type, val, ofs) {
+  const val_float = new Float32Array(val);
+  const val_int = new Int32Array(val);
+  type &= ~PR.saveglobal;
+  switch (type) {
+    case etype.ev_string:
+      return PR.GetString(val_int[ofs]);
+    case etype.ev_entity:
+      return val_int[ofs].toString();
+    case etype.ev_function:
+      return PR.GetString(PR.functions[val_int[ofs]].name);
+    case etype.ev_field: {
+        const def = PR.FieldAtOfs(val_int[ofs]);
+        if (def !== null) {
+          return PR.GetString(def.name);
+        }
+        return '';
+      }
+    case etype.ev_void:
+      return 'void';
+    case etype.ev_float:
+      return val_float[ofs].toFixed(6);
+    case etype.ev_vector:
+      return val_float[ofs].toFixed(6) +
+    ' ' + val_float[ofs + 1].toFixed(6) +
+    ' ' + val_float[ofs + 2].toFixed(6);
+  }
+  return 'bad type ' + type;
+};
+
+PR.GlobalString = function(ofs) {
+  const def = PR.GlobalAtOfs(ofs); let line;
+  if (def !== null) {
+    line = ofs + '(' + PR.GetString(def.name) + ')' + PR.ValueString(def.type, PR.globals, ofs);
+  } else {
+    line = ofs + '(???)';
+  }
+  for (; line.length <= 20; ) {
+    line += ' ';
+  }
+  return line;
+};
+
+PR.GlobalStringNoContents = function(ofs) {
+  const def = PR.GlobalAtOfs(ofs); let line;
+  if (def !== null) {
+    line = ofs + '(' + PR.GetString(def.name) + ')';
+  } else {
+    line = ofs + '(???)';
+  }
+  for (; line.length <= 20; ) {
+    line += ' ';
+  }
+  return line;
+};
+
+PR.LoadProgs = async function() {
+  const progs = await COM.LoadFile('progs.dat');
+  if (progs === null) {
+    throw new MissingResourceError('progs.dat');
+  }
+  Con.DPrint('Programs occupy ' + (progs.byteLength >> 10) + 'K.\n');
+  const view = new DataView(progs);
+
+  let i = view.getUint32(0, true);
+  if (i !== PR.version) {
+    throw new Error('progs.dat has wrong version number (' + i + ' should be ' + PR.version + ')');
+  }
+
+  if (view.getUint32(4, true) !== PR.progheader_crc) {
+    throw new Error('progs.dat system vars have been modified, PR.js is out of date');
+  }
+
+  PR.crc = CRC16CCITT.Block(new Uint8Array(progs));
+
+  PR.stack = [];
+  PR.depth = 0;
+
+  PR.localstack = [];
+  for (i = 0; i < PR.localstack_size; i++) {
+    PR.localstack[i] = 0;
+  }
+  PR.localstack_used = 0;
+
+  let ofs; let num;
+
+  ofs = view.getUint32(8, true);
+  num = view.getUint32(12, true);
+  PR.statements = [];
+  for (i = 0; i < num; i++) {
+    PR.statements[i] = {
+      op: view.getUint16(ofs, true),
+      a: view.getInt16(ofs + 2, true),
+      b: view.getInt16(ofs + 4, true),
+      c: view.getInt16(ofs + 6, true),
+    };
+    ofs += 8;
+  }
+
+  ofs = view.getUint32(16, true);
+  num = view.getUint32(20, true);
+  PR.globaldefs = [];
+  for (i = 0; i < num; i++) {
+    PR.globaldefs[i] = {
+      type: view.getUint16(ofs, true),
+      ofs: view.getUint16(ofs + 2, true),
+      name: view.getUint32(ofs + 4, true),
+    };
+    ofs += 8;
+  }
+
+  ofs = view.getUint32(24, true);
+  num = view.getUint32(28, true);
+  PR.fielddefs = [];
+  for (i = 0; i < num; i++) {
+    PR.fielddefs[i] = {
+      type: view.getUint16(ofs, true),
+      ofs: view.getUint16(ofs + 2, true),
+      name: view.getUint32(ofs + 4, true),
+    };
+    ofs += 8;
+  }
+
+  ofs = view.getUint32(32, true);
+  num = view.getUint32(36, true);
+  PR.functions = [];
+  for (i = 0; i < num; i++) {
+    PR.functions[i] = {
+      first_statement: view.getInt32(ofs, true),
+      parm_start: view.getUint32(ofs + 4, true),
+      locals: view.getUint32(ofs + 8, true),
+      profile: view.getUint32(ofs + 12, true),
+      name: view.getUint32(ofs + 16, true),
+      file: view.getUint32(ofs + 20, true),
+      numparms: view.getUint32(ofs + 24, true),
+      parm_size: [
+        view.getUint8(ofs + 28), view.getUint8(ofs + 29),
+        view.getUint8(ofs + 30), view.getUint8(ofs + 31),
+        view.getUint8(ofs + 32), view.getUint8(ofs + 33),
+        view.getUint8(ofs + 34), view.getUint8(ofs + 35),
+      ],
+    };
+    ofs += 36;
+  }
+
+  ofs = view.getUint32(40, true);
+  num = view.getUint32(44, true);
+  PR.strings = [];
+  for (i = 0; i < num; i++) {
+    PR.strings[i] = view.getUint8(ofs + i);
+  }
+  PR.string_temp = PR.NewString('', 1024); // allocates 1024 bytes for temp strings
+  PR.string_heap_start = PR.strings.length + 4;
+  PR.string_heap_current = PR.string_heap_start;
+
+  ofs = view.getUint32(48, true);
+  num = view.getUint32(52, true);
+  PR.globals = new ArrayBuffer(num << 2);
+  PR.globals_float = new Float32Array(PR.globals);
+  PR.globals_int = new Int32Array(PR.globals);
+  for (i = 0; i < num; i++) {
+    PR.globals_int[i] = view.getInt32(ofs + (i << 2), true);
+  }
+
+  PR.entityfields = view.getUint32(56, true);
+  PR.edict_size = 96 + (PR.entityfields << 2);
+
+  const fields = [
+    'ammo_shells1',
+    'ammo_nails1',
+    'ammo_lava_nails',
+    'ammo_rockets1',
+    'ammo_multi_rockets',
+    'ammo_cells1',
+    'ammo_plasma',
+    'gravity',
+    'items2',
+  ];
+  for (i = 0; i < fields.length; i++) {
+    const field = fields[i];
+    const def = PR.FindField(field);
+    PR.entvars[field] = (def !== null) ? def.ofs : null;
+  }
+  ProgsFunctionProxy.proxyCache = []; // free all cached functions
+  // hook up progs.dat with our proxies
+
+  const progsAPI = new ProgsEntity(null);
+
+  const deathmatch = Cvar.FindVar('deathmatch');
+  const skill = Cvar.FindVar('skill');
+  const coop = Cvar.FindVar('coop');
+
+  const gameAPI = Object.assign(progsAPI, {
+    prepareEntity(edict, classname, initialData = {}) {
+      if (!edict.entity) { // do not use isFree(), check for unset entity property
+        edict.entity = new ProgsEntity(edict);
+        Object.freeze(edict.entity);
+      }
+
+      // yet another hack, always be successful during a loadgame
+      if (SV.server.loadgame) {
+        return true;
+      }
+
+      // special case for QuakeC: empty entity
+      if (classname === null) {
+        return true;
+      }
+
+      // another special case for QuakeC: player has no spawn function
+      if (classname === 'player') {
+        return true;
+      }
+
+      if (!SV.server.gameAPI[classname]) {
+        Con.PrintWarning(`No spawn function for edict ${edict.num}: ${classname}\n`);
+        // debugger;
+        return false;
+      }
+
+      initialData.classname = classname;
+
+      for (const [key, value] of Object.entries(initialData)) {
+        const field = PR.FindField(key);
+
+        if (!field) {
+          Con.PrintWarning(`'${key}' is not a field\n`);
+          continue;
+        }
+
+        switch (field.type & 0x7fff) {
+          case etype.ev_entity:
+            edict.entity[key] = value instanceof ServerEdict ? value : {num: Q.atoi(value)};
+            break;
+
+          case etype.ev_vector:
+            edict.entity[key] = value instanceof Vector ? value : new Vector(...value.split(' ').map((x) => Q.atof(x)));
+            break;
+
+          case etype.ev_field: {
+            const d = PR.FindField(value);
+            if (!d) {
+              Con.PrintWarning(`Can't find field: ${value}\n`);
+              break;
+            }
+            edict.entity[key] = d;
+            break;
+          }
+
+          case etype.ev_function: {
+            edict.entity[key] = {fnc: value};
+            break;
+          }
+
+          default:
+            edict.entity[key] = value;
+        }
+      }
+
+      // these are quake specific things happening during loading
+
+      const spawnflags = edict.entity.spawnflags || 0;
+
+      if (deathmatch.value !== 0 && (spawnflags & 2048)) {
+        return false;
+      }
+
+      const skillFlags = [256, 512, 1024, 1024];
+
+      if (spawnflags & skillFlags[Math.max(0, Math.min(skillFlags.length, skill.value))]) {
+        return false;
+      }
+
+      return true;
+    },
+
+    spawnPreparedEntity(edict) {
+      if (!edict.entity) {
+        Con.PrintError('PR.LoadProgs.spawnPreparedEntity: no entity class instance set!\n');
+        return false;
+      }
+
+      // another special case for QuakeC: player has no spawn function
+      if (edict.entity.classname === 'player') {
+        return true;
+      }
+
+      edict.entity.spawn();
+
+      return true;
+    },
+
+    init(mapname, serverflags) {
+      gameAPI.mapname = mapname;
+      gameAPI.serverflags = serverflags;
+
+      // coop automatically disables deathmatch
+      if (coop.value) {
+        coop.set(true);
+        deathmatch.set(false);
+      }
+
+      // make sure skill is in range
+      skill.set(Math.max(0, Math.min(3, Math.floor(skill.value))));
+
+      gameAPI.coop = coop.value;
+      gameAPI.deathmatch = deathmatch.value;
+    },
+
+
+    shutdown(_isCrashShutdown) {
+    },
+
+    startFrame() {
+      // pass to the VM
+      // @ts-ignore
+      progsAPI.StartFrame(null);
+    },
+  });
+
+  Object.freeze(gameAPI);
+
+  return gameAPI;
+};
+
+/** @type {Cvar[]} */
+PR._cvars = [];
+
+/** @type {import('./GameLoader').GameModuleInterface|null} */
+PR.QuakeJS = null;
+
+PR.Init = async function() {
+  try {
+    if (COM.CheckParm('-noquakejs')) {
+      Con.PrintWarning('PR.Init: QuakeJS disabled by request\n');
+      PR.QuakeJS = null;
+    } else {
+      // try to get the game API
+      PR.QuakeJS = await loadGameModule(COM.gamedir[0].filename);
+      PR.QuakeJS.ServerGameAPI.Init(ServerEngineAPI);
+
+      const identification = PR.QuakeJS.identification;
+      Con.Print(`PR.Init: ${identification.name} v${identification.version.join('.')} by ${identification.author} loaded.\n`);
+    return;
+    }
+  } catch (e) {
+    if (typeof(e.code) === 'string' && e.code !== 'ERR_MODULE_NOT_FOUND') { // only catch module not found errors
+      throw e;
+    }
+
+    // CR: stupidest error convention ever, check https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Operators/import#return_value
+
+    Con.PrintWarning('PR.Init: Falling back to QuakeC, failed to initialize QuakeJS server code: ' + e.message +'.\n');
+
+    PR.QuakeJS = null;
+  }
+
+  // CR: we do not need any of this when running QuakeJS
+  Cmd.AddCommand('edict', ED.PrintEdict_f);
+  Cmd.AddCommand('edicts', ED.PrintEdicts);
+  Cmd.AddCommand('edictcount', ED.Count);
+  Cmd.AddCommand('profile', PR.Profile_f);
+  PR._cvars.push(new Cvar('gamecfg', '0'));
+  PR._cvars.push(new Cvar('scratch1', '0'));
+  PR._cvars.push(new Cvar('scratch2', '0'));
+  PR._cvars.push(new Cvar('scratch3', '0'));
+  PR._cvars.push(new Cvar('scratch4', '0'));
+  PR._cvars.push(new Cvar('savedgamecfg', '0', Cvar.FLAG.ARCHIVE));
+  PR._cvars.push(new Cvar('saved1', '0', Cvar.FLAG.ARCHIVE));
+  PR._cvars.push(new Cvar('saved2', '0', Cvar.FLAG.ARCHIVE));
+  PR._cvars.push(new Cvar('saved3', '0', Cvar.FLAG.ARCHIVE));
+  PR._cvars.push(new Cvar('saved4', '0', Cvar.FLAG.ARCHIVE));
+
+  PR._cvars.push(new Cvar('nomonsters', '0', Cvar.FLAG.SERVER));
+  PR._cvars.push(new Cvar('fraglimit', '0', Cvar.FLAG.SERVER));
+  PR._cvars.push(new Cvar('timelimit', '0', Cvar.FLAG.SERVER));
+  PR._cvars.push(new Cvar('samelevel', '0', Cvar.FLAG.SERVER, 'Set to 1 to stay on the same map even the map is over'));
+  PR._cvars.push(new Cvar('noexit', '0', Cvar.FLAG.SERVER));
+  PR._cvars.push(new Cvar('skill', '1', Cvar.FLAG.SERVER));
+  PR._cvars.push(new Cvar('deathmatch', '0', Cvar.FLAG.SERVER));
+  PR._cvars.push(new Cvar('coop', '0', Cvar.FLAG.SERVER));
+};
+
+// exec
+
+PR.localstack_size = 2048;
+
+PR.opnames = [
+  'DONE',
+  'MUL_F', 'MUL_V', 'MUL_FV', 'MUL_VF',
+  'DIV',
+  'ADD_F', 'ADD_V',
+  'SUB_F', 'SUB_V',
+  'EQ_F', 'EQ_V', 'EQ_S', 'EQ_E', 'EQ_FNC',
+  'NE_F', 'NE_V', 'NE_S', 'NE_E', 'NE_FNC',
+  'LE', 'GE', 'LT', 'GT',
+  'INDIRECT', 'INDIRECT', 'INDIRECT', 'INDIRECT', 'INDIRECT', 'INDIRECT',
+  'ADDRESS',
+  'STORE_F', 'STORE_V', 'STORE_S', 'STORE_ENT', 'STORE_FLD', 'STORE_FNC',
+  'STOREP_F', 'STOREP_V', 'STOREP_S', 'STOREP_ENT', 'STOREP_FLD', 'STOREP_FNC',
+  'RETURN',
+  'NOT_F', 'NOT_V', 'NOT_S', 'NOT_ENT', 'NOT_FNC',
+  'IF', 'IFNOT',
+  'CALL0', 'CALL1', 'CALL2', 'CALL3', 'CALL4', 'CALL5', 'CALL6', 'CALL7', 'CALL8',
+  'STATE',
+  'GOTO',
+  'AND', 'OR',
+  'BITAND', 'BITOR',
+];
+
+// PR.executions = [];
+
+PR.PrintStatement = function(s) {
+  let text;
+  if (s.op < PR.opnames.length) {
+    text = PR.opnames[s.op] + ' ';
+    for (; text.length <= 9; ) {
+      text += ' ';
+    }
+  } else {
+    text = '';
+  }
+  if ((s.op === PR.op.jnz) || (s.op === PR.op.jz)) {
+    text += PR.GlobalString(s.a) + 'branch ' + s.b;
+  } else if (s.op === PR.op.jump) {
+    text += 'branch ' + s.a;
+  } else if ((s.op >= PR.op.store_f) && (s.op <= PR.op.store_fnc)) {
+    text += PR.GlobalString(s.a) + PR.GlobalStringNoContents(s.b);
+  } else {
+    if (s.a !== 0) {
+      text += PR.GlobalString(s.a);
+    }
+    if (s.b !== 0) {
+      text += PR.GlobalString(s.b);
+    }
+    if (s.c !== 0) {
+      text += PR.GlobalStringNoContents(s.c);
+    }
+  }
+  Con.Print(text + '\n');
+  // if (PR.executions.length > 50) {
+  //   PR.executions.shift();
+  // }
+  // PR.executions.push(text);
+};
+
+PR.StackTrace = function() {
+  if (PR.depth === 0) {
+    Con.Print('<NO STACK>\n');
+    return;
+  }
+  PR.stack[PR.depth] = [PR.xstatement, PR.xfunction];
+  let f; let file;
+  for (; PR.depth >= 0; PR.depth--) {
+    f = PR.stack[PR.depth][1];
+    if (!f) {
+      Con.Print('<NO FUNCTION>\n');
+      continue;
+    }
+    file = PR.GetString(f.file);
+    for (; file.length <= 11; ) {
+      file += ' ';
+    }
+    Con.Print(file + ' : ' + PR.GetString(f.name) + '\n');
+  }
+  PR.depth = 0;
+};
+
+PR.Profile_f = function() {
+  if (SV.server.active !== true) {
+    return;
+  }
+  let num = 0; let max; let best; let i; let f; let profile;
+  while (true) {
+    max = 0;
+    best = null;
+    for (i = 0; i < PR.functions.length; i++) {
+      f = PR.functions[i];
+      if (f.profile > max) {
+        max = f.profile;
+        best = f;
+      }
+    }
+    if (best === null) {
+      return;
+    }
+    if (num < 10) {
+      profile = best.profile.toString();
+      for (; profile.length <= 6; ) {
+        profile = ' ' + profile;
+      }
+      Con.Print(profile + ' ' + PR.GetString(best.name) + '\n');
+    }
+    num++;
+    best.profile = 0;
+  }
+};
+
+PR.RunError = function(error) {
+  PR.PrintStatement(PR.statements[PR.xstatement]);
+  PR.StackTrace();
+  Con.PrintError(error + '\n');
+  throw new HostError('Program error');
+};
+
+PR.EnterFunction = function(f) {
+  PR.stack[PR.depth++] = [PR.xstatement, PR.xfunction];
+  const c = f.locals;
+  if ((PR.localstack_used + c) > PR.localstack_size) {
+    PR.RunError('PR.EnterFunction: locals stack overflow\n');
+  }
+  let i;
+  for (i = 0; i < c; i++) {
+    PR.localstack[PR.localstack_used + i] = PR.globals_int[f.parm_start + i];
+  }
+  PR.localstack_used += c;
+  let o = f.parm_start; let j;
+  for (i = 0; i < f.numparms; i++) {
+    for (j = 0; j < f.parm_size[i]; j++) {
+      PR.globals_int[o++] = PR.globals_int[4 + i * 3 + j];
+    }
+  }
+  PR.xfunction = f;
+  return f.first_statement - 1;
+};
+
+PR.LeaveFunction = function() {
+  if (PR.depth <= 0) {
+    throw new Error('prog stack underflow');
+  }
+  let c = PR.xfunction.locals;
+  PR.localstack_used -= c;
+  if (PR.localstack_used < 0) {
+    PR.RunError('PR.LeaveFunction: locals stack underflow\n');
+  }
+  for (--c; c >= 0; --c) {
+    PR.globals_int[PR.xfunction.parm_start + c] = PR.localstack[PR.localstack_used + c];
+  }
+  PR.xfunction = PR.stack[--PR.depth][1];
+  return PR.stack[PR.depth][0];
+};
+
+PR.ExecuteProgram = function(fnum) {
+  if ((fnum === 0) || (fnum >= PR.functions.length)) {
+    if (PR.globals_int[PR.globalvars.self] !== 0) {
+      ED.Print(SV.server.edicts[PR.globals_int[PR.globalvars.self]]);
+    }
+    throw new HostError('PR.ExecuteProgram: NULL function');
+  }
+  let runaway = 100000;
+  const exitdepth = PR.depth;
+  let s = PR.EnterFunction(PR.functions[fnum]);
+  let st; let ed; let ptr; let newf;
+
+  while (true) {
+    s++;
+    st = PR.statements[s];
+    if (--runaway === 0) {
+      PR.RunError('runaway loop error');
+    }
+    PR.xfunction.profile++;
+    PR.xstatement = s;
+    if (PR.trace) {
+      PR.PrintStatement(st);
+    }
+    switch (st.op) {
+      case PR.op.add_f:
+        PR.globals_float[st.c] = PR.globals_float[st.a] + PR.globals_float[st.b];
+        continue;
+      case PR.op.add_v:
+        PR.globals_float[st.c] = PR.globals_float[st.a] + PR.globals_float[st.b];
+        PR.globals_float[st.c + 1] = PR.globals_float[st.a + 1] + PR.globals_float[st.b + 1];
+        PR.globals_float[st.c + 2] = PR.globals_float[st.a + 2] + PR.globals_float[st.b + 2];
+        continue;
+      case PR.op.sub_f:
+        PR.globals_float[st.c] = PR.globals_float[st.a] - PR.globals_float[st.b];
+        continue;
+      case PR.op.sub_v:
+        PR.globals_float[st.c] = PR.globals_float[st.a] - PR.globals_float[st.b];
+        PR.globals_float[st.c + 1] = PR.globals_float[st.a + 1] - PR.globals_float[st.b + 1];
+        PR.globals_float[st.c + 2] = PR.globals_float[st.a + 2] - PR.globals_float[st.b + 2];
+        continue;
+      case PR.op.mul_f:
+        PR.globals_float[st.c] = PR.globals_float[st.a] * PR.globals_float[st.b];
+        continue;
+      case PR.op.mul_v:
+        PR.globals_float[st.c] = PR.globals_float[st.a] * PR.globals_float[st.b] +
+        PR.globals_float[st.a + 1] * PR.globals_float[st.b + 1] +
+        PR.globals_float[st.a + 2] * PR.globals_float[st.b + 2];
+        continue;
+      case PR.op.mul_fv:
+        PR.globals_float[st.c] = PR.globals_float[st.a] * PR.globals_float[st.b];
+        PR.globals_float[st.c + 1] = PR.globals_float[st.a] * PR.globals_float[st.b + 1];
+        PR.globals_float[st.c + 2] = PR.globals_float[st.a] * PR.globals_float[st.b + 2];
+        continue;
+      case PR.op.mul_vf:
+        PR.globals_float[st.c] = PR.globals_float[st.b] * PR.globals_float[st.a];
+        PR.globals_float[st.c + 1] = PR.globals_float[st.b] * PR.globals_float[st.a + 1];
+        PR.globals_float[st.c + 2] = PR.globals_float[st.b] * PR.globals_float[st.a + 2];
+        continue;
+      case PR.op.div_f:
+        PR.globals_float[st.c] = PR.globals_float[st.a] / PR.globals_float[st.b];
+        continue;
+      case PR.op.bitand:
+        PR.globals_float[st.c] = PR.globals_float[st.a] & PR.globals_float[st.b];
+        continue;
+      case PR.op.bitor:
+        PR.globals_float[st.c] = PR.globals_float[st.a] | PR.globals_float[st.b];
+        continue;
+      case PR.op.ge:
+        PR.globals_float[st.c] = (PR.globals_float[st.a] >= PR.globals_float[st.b]) ? 1.0 : 0.0;
+        continue;
+      case PR.op.le:
+        PR.globals_float[st.c] = (PR.globals_float[st.a] <= PR.globals_float[st.b]) ? 1.0 : 0.0;
+        continue;
+      case PR.op.gt:
+        PR.globals_float[st.c] = (PR.globals_float[st.a] > PR.globals_float[st.b]) ? 1.0 : 0.0;
+        continue;
+      case PR.op.lt:
+        PR.globals_float[st.c] = (PR.globals_float[st.a] < PR.globals_float[st.b]) ? 1.0 : 0.0;
+        continue;
+      case PR.op.and:
+        PR.globals_float[st.c] = ((PR.globals_float[st.a] !== 0.0) && (PR.globals_float[st.b] !== 0.0)) ? 1.0 : 0.0;
+        continue;
+      case PR.op.or:
+        PR.globals_float[st.c] = ((PR.globals_float[st.a] !== 0.0) || (PR.globals_float[st.b] !== 0.0)) ? 1.0 : 0.0;
+        continue;
+      case PR.op.not_f:
+        PR.globals_float[st.c] = (PR.globals_float[st.a] === 0.0) ? 1.0 : 0.0;
+        continue;
+      case PR.op.not_v:
+        PR.globals_float[st.c] = ((PR.globals_float[st.a] === 0.0) &&
+        (PR.globals_float[st.a + 1] === 0.0) &&
+        (PR.globals_float[st.a + 2] === 0.0)) ? 1.0 : 0.0;
+        continue;
+      case PR.op.not_s:
+        if (PR.globals_int[st.a] !== 0) {
+          PR.globals_float[st.c] = (PR.strings[PR.globals_int[st.a]] === 0) ? 1.0 : 0.0;
+        } else {
+          PR.globals_float[st.c] = 1.0;
+        }
+        continue;
+      case PR.op.not_fnc:
+      case PR.op.not_ent:
+        PR.globals_float[st.c] = (PR.globals_int[st.a] === 0) ? 1.0 : 0.0;
+        continue;
+      case PR.op.eq_f:
+        PR.globals_float[st.c] = (PR.globals_float[st.a] === PR.globals_float[st.b]) ? 1.0 : 0.0;
+        continue;
+      case PR.op.eq_v:
+        PR.globals_float[st.c] = ((PR.globals_float[st.a] === PR.globals_float[st.b]) &&
+        (PR.globals_float[st.a + 1] === PR.globals_float[st.b + 1]) &&
+        (PR.globals_float[st.a + 2] === PR.globals_float[st.b + 2])) ? 1.0 : 0.0;
+        continue;
+      case PR.op.eq_s:
+        PR.globals_float[st.c] = (PR.GetString(PR.globals_int[st.a]) === PR.GetString(PR.globals_int[st.b])) ? 1.0 : 0.0;
+        continue;
+      case PR.op.eq_e:
+      case PR.op.eq_fnc:
+        PR.globals_float[st.c] = (PR.globals_int[st.a] === PR.globals_int[st.b]) ? 1.0 : 0.0;
+        continue;
+      case PR.op.ne_f:
+        PR.globals_float[st.c] = (PR.globals_float[st.a] !== PR.globals_float[st.b]) ? 1.0 : 0.0;
+        continue;
+      case PR.op.ne_v:
+        PR.globals_float[st.c] = ((PR.globals_float[st.a] !== PR.globals_float[st.b]) ||
+        (PR.globals_float[st.a + 1] !== PR.globals_float[st.b + 1]) ||
+        (PR.globals_float[st.a + 2] !== PR.globals_float[st.b + 2])) ? 1.0 : 0.0;
+        continue;
+      case PR.op.ne_s:
+        PR.globals_float[st.c] = (PR.GetString(PR.globals_int[st.a]) !== PR.GetString(PR.globals_int[st.b])) ? 1.0 : 0.0;
+        continue;
+      case PR.op.ne_e:
+      case PR.op.ne_fnc:
+        PR.globals_float[st.c] = (PR.globals_int[st.a] !== PR.globals_int[st.b]) ? 1.0 : 0.0;
+        continue;
+      case PR.op.store_f:
+      case PR.op.store_ent:
+      case PR.op.store_fld:
+      case PR.op.store_s:
+      case PR.op.store_fnc:
+        PR.globals_int[st.b] = PR.globals_int[st.a];
+        continue;
+      case PR.op.store_v:
+        PR.globals_int[st.b] = PR.globals_int[st.a];
+        PR.globals_int[st.b + 1] = PR.globals_int[st.a + 1];
+        PR.globals_int[st.b + 2] = PR.globals_int[st.a + 2];
+        continue;
+      case PR.op.storep_f:
+      case PR.op.storep_ent:
+      case PR.op.storep_fld:
+      case PR.op.storep_s:
+      case PR.op.storep_fnc:
+        ptr = PR.globals_int[st.b];
+        SV.server.edicts[Math.floor(ptr / PR.edict_size)].entity._v_int[((ptr % PR.edict_size) - 96) >> 2] = PR.globals_int[st.a];
+        continue;
+      case PR.op.storep_v:
+        ed = SV.server.edicts[Math.floor(PR.globals_int[st.b] / PR.edict_size)];
+        ptr = ((PR.globals_int[st.b] % PR.edict_size) - 96) >> 2;
+        ed.entity._v_int[ptr] = PR.globals_int[st.a];
+        ed.entity._v_int[ptr + 1] = PR.globals_int[st.a + 1];
+        ed.entity._v_int[ptr + 2] = PR.globals_int[st.a + 2];
+        continue;
+      case PR.op.address:
+        ed = PR.globals_int[st.a];
+        if ((ed === 0) && (SV.server.loading !== true)) {
+          PR.RunError('assignment to world entity');
+        }
+        PR.globals_int[st.c] = ed * PR.edict_size + 96 + (PR.globals_int[st.b] << 2);
+        continue;
+      case PR.op.load_f:
+      case PR.op.load_fld:
+      case PR.op.load_ent:
+      case PR.op.load_s:
+      case PR.op.load_fnc:
+        PR.globals_int[st.c] = SV.server.edicts[PR.globals_int[st.a]].entity._v_int[PR.globals_int[st.b]];
+        continue;
+      case PR.op.load_v:
+        ed = SV.server.edicts[PR.globals_int[st.a]];
+        ptr = PR.globals_int[st.b];
+        PR.globals_int[st.c] = ed.entity._v_int[ptr];
+        PR.globals_int[st.c + 1] = ed.entity._v_int[ptr + 1];
+        PR.globals_int[st.c + 2] = ed.entity._v_int[ptr + 2];
+        continue;
+      case PR.op.jz:
+        if (PR.globals_int[st.a] === 0) {
+          s += st.b - 1;
+        }
+        continue;
+      case PR.op.jnz:
+        if (PR.globals_int[st.a] !== 0) {
+          s += st.b - 1;
+        }
+        continue;
+      case PR.op.jump:
+        s += st.a - 1;
+        continue;
+      case PR.op.call0:
+      case PR.op.call1:
+      case PR.op.call2:
+      case PR.op.call3:
+      case PR.op.call4:
+      case PR.op.call5:
+      case PR.op.call6:
+      case PR.op.call7:
+      case PR.op.call8:
+        PR.argc = st.op - PR.op.call0;
+        if (PR.globals_int[st.a] === 0) {
+          PR.RunError('NULL function');
+        }
+        if (PR.globals_int[st.a] < 0) {
+          console.debug('special function called');
+          continue;
+        }
+        newf = PR.functions[PR.globals_int[st.a]];
+        if (newf.first_statement < 0) {
+          ptr = -newf.first_statement;
+          if (ptr >= PF.builtin.length) {
+            PR.RunError('Bad builtin call number');
+          }
+          // PF.builtin[ptr];
+          // try {
+            PF.builtin[ptr]();
+          // } catch (e) {
+          //   PR.RunError(e.message);
+          //   throw e;
+          // }
+          continue;
+        }
+        s = PR.EnterFunction(newf);
+        continue;
+      case PR.op.done:
+      case PR.op.ret:
+        PR.globals_int[PR.ofs.OFS_RETURN] = PR.globals_int[st.a];
+        PR.globals_int[PR.ofs.OFS_RETURN + 1] = PR.globals_int[st.a + 1];
+        PR.globals_int[PR.ofs.OFS_RETURN + 2] = PR.globals_int[st.a + 2];
+        s = PR.LeaveFunction();
+        if (PR.depth === exitdepth) {
+          return;
+        }
+        continue;
+      case PR.op.state:
+        ed = SV.server.edicts[PR.globals_int[PR.globalvars.self]];
+        ed.entity._v_float[PR.entvars.nextthink] = PR.globals_float[PR.globalvars.time] + 0.1;
+        ed.entity._v_float[PR.entvars.frame] = PR.globals_float[st.a];
+        ed.entity._v_int[PR.entvars.think] = PR.globals_int[st.b];
+        continue;
+    }
+    PR.RunError('Bad opcode ' + st.op);
+  }
+};
+
+PR.GetString = function(num) {
+  let string = '';
+  for (; num < PR.strings.length; num++) {
+    if (PR.strings[num] === 0) {
+      break;
+    }
+    string += String.fromCharCode(PR.strings[num]);
+  }
+  return string;
+};
+
+PR._StringLength = function(ofs) {
+  let len = 0;
+
+  while(PR.strings[ofs+len]) {
+    len++;
+  }
+
+  return len;
+};
+
+PR.SetString = function(ofs, s, length = null) {
+  // shortcut: empty strings are located at 0x0000
+  if (s === '') {
+    return 0;
+  }
+
+  const size = (length !== null ? Math.max(s.length, length || 0) : s.length) + 1;
+
+  // check if it’s going to overwrite a constant (ofs < PR.string_heap_start)
+  // check if we can overwrite in place (s.length < &PR.strings[ofs].length)
+  if (ofs === null || ofs < PR.string_heap_start || PR._StringLength(ofs) <= size) {
+    ofs = PR.string_heap_current;
+    PR.string_heap_current += size;
+  }
+
+  // overwrite found spot with s
+  for (let i = 0; i < s.length; i++) {
+    PR.strings[ofs + i] = s.charCodeAt(i);
+  }
+
+  // add 0-byte string terminator
+  PR.strings[ofs + s.length] = 0;
+
+  return ofs;
+};
+
+/**
+ * Allocates a new string in the VM string heap.
+ * @returns The offset of the allocated string.
+ */
+PR.NewString = function(s, length) {
+  const ofs = PR.strings.length;
+  let i;
+  if (s.length >= length) {
+    for (i = 0; i < (length - 1); i++) {
+      PR.strings[PR.strings.length] = s.charCodeAt(i);
+    }
+    PR.strings[PR.strings.length] = 0;
+    return ofs;
+  }
+  for (i = 0; i < s.length; i++) {
+    PR.strings[PR.strings.length] = s.charCodeAt(i);
+  }
+  length -= s.length;
+  for (i = 0; i < length; i++) {
+    PR.strings[PR.strings.length] = 0;
+  }
+  return ofs;
+};
+
+PR.TempString = function(string) {
+  if (string.length > 1023) {
+    string = string.substring(0, 1023);
+  }
+  for (let i = 0; i < string.length; i++) {
+    PR.strings[PR.string_temp + i] = string.charCodeAt(i);
+  }
+  PR.strings[PR.string_temp + string.length] = 0;
+
+  return PR.string_temp;
+};
+
+PR.capabilities = [
+  gameCapabilities.CAP_CLIENTDATA_UPDATESTAT,
+  gameCapabilities.CAP_CLIENTDATA_LEGACY,
+  gameCapabilities.CAP_SPAWNPARMS_LEGACY,
+  gameCapabilities.CAP_ENTITY_BBOX_ADJUSTMENTS_DURING_LINK,
+];

From 289eed1c49dcdd6a96cb722221d0b1bf157f6b26 Mon Sep 17 00:00:00 2001
From: Christian R <github@chrisnew.de>
Date: Fri, 3 Apr 2026 14:18:52 +0300
Subject: [PATCH 36/67] TS: server/ part 4

---
 source/engine/server/ServerMessages.mjs | 847 +--------------------
 source/engine/server/ServerMessages.ts  | 932 ++++++++++++++++++++++++
 test/physics/server-messages.test.mjs   |  91 +++
 3 files changed, 1024 insertions(+), 846 deletions(-)
 create mode 100644 source/engine/server/ServerMessages.ts
 create mode 100644 test/physics/server-messages.test.mjs

diff --git a/source/engine/server/ServerMessages.mjs b/source/engine/server/ServerMessages.mjs
index 927086cb..df6e4829 100644
--- a/source/engine/server/ServerMessages.mjs
+++ b/source/engine/server/ServerMessages.mjs
@@ -1,846 +1 @@
-import { SzBuffer } from '../network/MSG.ts';
-import * as Protocol from '../network/Protocol.ts';
-import * as Defs from '../../shared/Defs.ts';
-import Cvar from '../common/Cvar.ts';
-import { eventBus, registry } from '../registry.mjs';
-import { ServerClient } from './Client.mjs';
-import { ServerEntityState } from './ServerEntityState.mjs';
-
-let { COM, Con, Host, NET, PR, SV } = registry;
-
-eventBus.subscribe('registry.frozen', () => {
-  COM = registry.COM;
-  Con = registry.Con;
-  Host = registry.Host;
-  NET = registry.NET;
-  PR = registry.PR;
-  SV = registry.SV;
-});
-
-/**
- * Handles all server to client message assembly and related helpers.
- */
-export class ServerMessages {
-  constructor() {
-    this.nullcmd = new Protocol.UserCmd();
-  }
-
-  startParticle(org, dir, color, count) {
-    const datagram = SV.server.datagram;
-    if (datagram.cursize >= 1009) {
-      return;
-    }
-    datagram.writeByte(Protocol.svc.particle);
-    datagram.writeCoordVector(org);
-    datagram.writeCoordVector(dir);
-    datagram.writeByte(Math.min(count, 255));
-    datagram.writeByte(color);
-  }
-
-  startSound(edict, channel, sample, volume, attenuation) {
-    console.assert(volume >= 0 && volume <= 255, 'volume out of range', volume);
-    console.assert(attenuation >= 0.0 && attenuation <= 4.0, 'attenuation out of range', attenuation);
-    console.assert(channel >= 0 && channel <= 7, 'channel out of range', channel);
-
-    const datagram = SV.server.datagram;
-    if (datagram.cursize >= 1009) {
-      return;
-    }
-
-    let i;
-    for (i = 1; i < SV.server.soundPrecache.length; i++) {
-      if (sample === SV.server.soundPrecache[i]) {
-        break;
-      }
-    }
-    if (i >= SV.server.soundPrecache.length) {
-      Con.Print('SV.StartSound: ' + sample + ' was not precached\n');
-      SV.server.soundPrecache.push(sample);
-      datagram.writeByte(Protocol.svc.loadsound);
-      datagram.writeByte(i);
-      datagram.writeString(sample);
-    }
-
-    let fieldMask = 0;
-
-    if (volume !== 255) {
-      fieldMask |= 1;
-    }
-    if (attenuation !== 1.0) {
-      fieldMask |= 2;
-    }
-
-    datagram.writeByte(Protocol.svc.sound);
-    datagram.writeByte(fieldMask);
-    if ((fieldMask & 1) !== 0) {
-      datagram.writeByte(volume);
-    }
-    if ((fieldMask & 2) !== 0) {
-      datagram.writeByte(Math.floor(attenuation * 64.0));
-    }
-    datagram.writeShort((edict.num << 3) + channel);
-    datagram.writeByte(i);
-    datagram.writeCoordVector(edict.entity.origin.copy().add(edict.entity.mins.copy().add(edict.entity.maxs).multiply(0.5)));
-  }
-
-  /**
-   * Sends the serverdata message to a specific client.
-   * Needs to be done in order to complete the signon process step 1.
-   * @param {ServerClient} client client
-   */
-  sendServerData(client) {
-    const message = client.message;
-
-    message.writeByte(Protocol.svc.print);
-    message.writeString(`\x02\nVERSION ${Host.version.string} SERVER (${SV.server.gameVersion})\n`);
-
-    message.writeByte(Protocol.svc.serverdata);
-    message.writeByte(Protocol.version);
-
-    if (PR.QuakeJS?.ClientGameAPI) {
-      const { author, name, version } = PR.QuakeJS.identification;
-      message.writeByte(1);
-      message.writeString(name);
-      message.writeString(author);
-      message.writeByte(version[0]);
-      message.writeByte(version[1]);
-      message.writeByte(version[2]);
-    } else {
-      message.writeByte(0);
-      message.writeString(COM.game);
-    }
-
-    message.writeByte(SV.svs.maxclients);
-    message.writeString(SV.server.edicts[0].entity.message || SV.server.mapname);
-    // SV.pmove.movevars.sendToClient(message);
-    for (let i = 1; i < SV.server.modelPrecache.length; i++) {
-      message.writeString(SV.server.modelPrecache[i]);
-    }
-    message.writeByte(0);
-    for (let i = 1; i < SV.server.soundPrecache.length; i++) {
-      message.writeString(SV.server.soundPrecache[i]);
-    }
-    message.writeByte(0);
-
-    if (SV.server.gameCapabilities.includes(Defs.gameCapabilities.CAP_CLIENTDATA_DYNAMIC)) {
-      for (const field of SV.server.clientdataFields) {
-        message.writeString(field);
-      }
-      message.writeByte(0);
-    }
-
-    if (SV.server.gameCapabilities.includes(Defs.gameCapabilities.CAP_ENTITY_EXTENDED)) {
-      for (const [classname, { fields }] of Object.entries(SV.server.clientEntityFields)) {
-        message.writeString(classname);
-        for (const field of fields) {
-          message.writeString(field);
-        }
-        message.writeByte(0);
-      }
-      message.writeByte(0);
-    }
-
-    // sounds on worldspawn defines the cd track
-    const cdtrack = /** @type {number} */ (/** @type {import('./Edict.mjs').WorldspawnEntity} */(SV.server.edicts[0].entity).sounds);
-
-    // only play cd track automatically if set in worldspawn
-    if (typeof cdtrack === 'number') {
-      message.writeByte(Protocol.svc.cdtrack);
-      message.writeByte(cdtrack);
-      message.writeByte(0); // unused
-    }
-
-    message.writeByte(Protocol.svc.setview);
-    message.writeShort(client.edict.num);
-
-    const serverCvars = Array.from(Cvar.Filter((/** @type {Cvar} */ cvar) => (cvar.flags & Cvar.FLAG.SERVER) !== 0));
-    if (serverCvars.length > 0) {
-      client.message.writeByte(Protocol.svc.cvar);
-      client.message.writeByte(serverCvars.length);
-      for (const serverCvar of serverCvars) {
-        this.writeCvar(client.message, serverCvar);
-      }
-    }
-
-    // make sure the client knows about the paused state
-    if (SV.server.paused) {
-      client.message.writeByte(Protocol.svc.setpause);
-      client.message.writeByte(1);
-    }
-
-    message.writeByte(Protocol.svc.signonnum);
-    message.writeByte(1);
-
-    client.state = ServerClient.STATE.CONNECTED;
-  }
-
-  writeCvar(msg, cvar) {
-    if (cvar.flags & Cvar.FLAG.SECRET) {
-      msg.writeString(cvar.name);
-      msg.writeString(cvar.string ? 'REDACTED' : '');
-    } else {
-      msg.writeString(cvar.name);
-      msg.writeString(cvar.string);
-    }
-  }
-
-  cvarChanged(cvar) {
-    for (let i = 0; i < SV.svs.maxclients; i++) {
-      const client = SV.svs.clients[i];
-      if (client.state < ServerClient.STATE.CONNECTED) {
-        continue;
-      }
-
-      client.message.writeByte(Protocol.svc.cvar);
-      client.message.writeByte(1);
-      this.writeCvar(client.message, cvar);
-    }
-  }
-
-  *traversePVS(pvs, ignoreEdictIds = [], alwaysIncludeEdictIds = [], includeFree = false) {
-    for (let e = 1; e < SV.server.num_edicts; e++) {
-      const ent = SV.server.edicts[e];
-
-      if (alwaysIncludeEdictIds.includes(e)) {
-        yield ent;
-        continue;
-      }
-
-      if (!includeFree && ent.isFree()) {
-        continue;
-      }
-
-      if (ignoreEdictIds.includes(e)) {
-        continue;
-      }
-
-      if (!ent.isInPXS(pvs)) {
-        continue;
-      }
-
-      yield ent;
-    }
-  }
-
-  writePlayersToClient(clientEdict, pvs, msg) {
-    let changes = false;
-
-    for (let i = 0; i < SV.svs.maxclients; i++) {
-      const cl = SV.svs.clients[i];
-      const playerEntity = cl.edict.entity;
-
-      if (cl.state !== ServerClient.STATE.SPAWNED) {
-        continue;
-      }
-
-      if (!clientEdict.equals(cl.edict) && !clientEdict.isInPXS(pvs)) {
-        continue;
-      }
-
-      let pflags = Protocol.pf.PF_MSEC | Protocol.pf.PF_COMMAND;
-
-      if (playerEntity.model !== 'progs/player.mdl') {
-        pflags |= Protocol.pf.PF_MODEL;
-      }
-
-      if (!playerEntity.velocity.isOrigin()) {
-        pflags |= Protocol.pf.PF_VELOCITY;
-      }
-
-      if (playerEntity.effects) {
-        pflags |= Protocol.pf.PF_EFFECTS;
-      }
-
-      if (playerEntity.skin) {
-        pflags |= Protocol.pf.PF_SKINNUM;
-      }
-
-      if (playerEntity.health <= 0) {
-        pflags |= Protocol.pf.PF_DEAD;
-      }
-
-      if (clientEdict.equals(cl.edict)) {
-        pflags &= ~(Protocol.pf.PF_MSEC | Protocol.pf.PF_COMMAND);
-
-        if (playerEntity.weaponframe) {
-          pflags |= Protocol.pf.PF_WEAPONFRAME;
-        }
-      }
-
-      msg.writeByte(Protocol.svc.playerinfo);
-      msg.writeByte(i);
-      msg.writeShort(pflags);
-
-      msg.writeCoordVector(playerEntity.origin);
-      msg.writeByte(playerEntity.frame);
-
-      if (pflags & Protocol.pf.PF_MSEC) {
-        const msec = 1000 * (SV.server.time - cl.local_time);
-        msg.writeByte(Math.max(0, Math.min(msec, 255)));
-      }
-
-      if (pflags & Protocol.pf.PF_COMMAND) {
-        const cmd = cl.cmd;
-
-        if (pflags & Protocol.pf.PF_DEAD) {
-          cmd.angles.setTo(0, playerEntity.angles[1], 0);
-        }
-
-        cmd.buttons = 0;
-        cmd.impulse = 0;
-
-        msg.writeDeltaUsercmd(this.nullcmd, cmd);
-      }
-
-      if (pflags & Protocol.pf.PF_VELOCITY) {
-        msg.writeCoordVector(playerEntity.velocity);
-      }
-
-      if (pflags & Protocol.pf.PF_MODEL) {
-        msg.writeByte(playerEntity.modelindex);
-      }
-
-      if (pflags & Protocol.pf.PF_EFFECTS) {
-        msg.writeByte(playerEntity.effects);
-      }
-
-      if (pflags & Protocol.pf.PF_SKINNUM) {
-        msg.writeByte(playerEntity.skin);
-      }
-
-      if (pflags & Protocol.pf.PF_WEAPONFRAME) {
-        msg.writeByte(playerEntity.weaponframe);
-      }
-
-      changes = true;
-    }
-
-    return changes;
-  }
-
-  /**
-   * Writes delta between two entity states to the message.
-   * @param {SzBuffer} msg The message to write to
-   * @param {ServerEntityState} from The previous entity state
-   * @param {ServerEntityState} to The new entity state
-   * @returns {boolean} true if any data was written, false otherwise
-   */
-  writeDeltaEntity(msg, from, to) {
-    const EPSILON = 0.01;
-
-    let bits = 0;
-
-    if (from.classname !== to.classname) {
-      bits |= Protocol.u.classname;
-    }
-
-    if (from.free !== to.free) {
-      bits |= Protocol.u.free;
-    }
-
-    if (from.modelindex !== to.modelindex) {
-      bits |= Protocol.u.model;
-    }
-
-    if (from.frame !== to.frame) {
-      bits |= Protocol.u.frame;
-    }
-
-    if ((from.colormap || 0) !== (to.colormap || 0)) {
-      bits |= Protocol.u.colormap;
-    }
-
-    if (from.skin !== to.skin) {
-      bits |= Protocol.u.skin;
-    }
-
-    if (from.alpha !== to.alpha || from.effects !== to.effects) {
-      bits |= Protocol.u.effects;
-    }
-
-    if (from.solid !== to.solid) {
-      bits |= Protocol.u.solid;
-    }
-
-    if (to.nextthink >= SV.server.time && (to.nextthink - from.nextthink) > 0.001) {
-      bits |= Protocol.u.nextthink;
-    }
-
-    for (let i = 0; i < 3; i++) {
-      if (isFinite(to.origin[i]) && Math.abs(from.origin[i] - to.origin[i]) > EPSILON) {
-        bits |= Protocol.u.origin1 << i;
-      }
-
-      if (isFinite(to.angles[i]) && Math.abs(from.angles[i] - to.angles[i]) > EPSILON) {
-        bits |= Protocol.u.angle1 << i;
-      }
-
-      if (isFinite(to.velocity[i]) && Math.abs(from.velocity[i] - to.velocity[i]) > EPSILON) {
-        bits |= Protocol.u.angle1 << i;
-      }
-    }
-
-    if (!from.maxs.equals(to.maxs)) {
-      bits |= Protocol.u.size;
-    }
-
-    if (!from.mins.equals(to.mins)) {
-      bits |= Protocol.u.size;
-    }
-
-    if (bits === 0) {
-      return false;
-    }
-
-    console.assert(to.num > 0, 'valid entity num', to.num);
-
-    msg.writeUint16(to.num);
-    msg.writeUint16(bits);
-
-    if (bits & Protocol.u.classname) {
-      msg.writeString(to.classname);
-    }
-
-    if (bits & Protocol.u.free) {
-      msg.writeByte(to.free ? 1 : 0);
-    }
-
-    if (bits & Protocol.u.frame) {
-      msg.writeByte(to.frame);
-    }
-
-    if (bits & Protocol.u.model) {
-      msg.writeByte(to.modelindex);
-    }
-
-    if (bits & Protocol.u.colormap) {
-      msg.writeByte(to.colormap);
-    }
-
-    if (bits & Protocol.u.skin) {
-      msg.writeByte(to.skin);
-    }
-
-    if (bits & Protocol.u.effects) {
-      msg.writeByte(to.effects);
-      msg.writeByte(Math.floor((to.alpha || 1) * 255.0)); // CR: QuakeC may not have alpha
-    }
-
-    if (bits & Protocol.u.solid) {
-      msg.writeByte(to.solid);
-    }
-
-    for (let i = 0; i < 3; i++) {
-      if (bits & (Protocol.u.origin1 << i)) {
-        msg.writeCoord(to.origin[i]);
-      }
-
-      if (bits & (Protocol.u.angle1 << i)) {
-        msg.writeAngle(isFinite(to.angles[i]) ? to.angles[i] : 0);
-        msg.writeCoord(to.velocity[i]);
-      }
-    }
-
-    if (bits & Protocol.u.size) {
-      msg.writeCoordVector(to.maxs);
-      msg.writeCoordVector(to.mins);
-    }
-
-    if (bits & Protocol.u.nextthink) {
-      if (from.nextthink <= 0) {
-        from.nextthink = SV.server.time;
-      }
-      msg.writeByte(to.nextthink - from.nextthink < 0.250 ? Math.min(255, (to.nextthink - from.nextthink) * 255.0) : 0);
-    }
-
-    if (SV.server.gameCapabilities.includes(Defs.gameCapabilities.CAP_ENTITY_EXTENDED)) {
-      if (SV.server.clientEntityFields[to.classname]) {
-        const entityFields = SV.server.clientEntityFields[to.classname];
-        const fields = entityFields.fields;
-        const bitsWriter = entityFields.bitsWriter;
-
-        let fieldbits = 0;
-        const values = [];
-
-        for (const field of fields) {
-          if (from.extended[field] !== to.extended[field]) {
-            fieldbits |= 1 << fields.indexOf(field);
-            values.push(to.extended[field]);
-          }
-        }
-
-        msg[bitsWriter](fieldbits);
-
-        if (fieldbits > 0) {
-          msg.writeSerializables(values);
-        }
-      }
-    }
-
-    return true;
-  }
-
-  writeEntitiesToClient(clientEdict, msg) {
-    const origin = clientEdict.entity.origin.copy().add(clientEdict.entity.view_ofs);
-    const pvs = SV.server.worldmodel.getFatPvsByPoint(origin);
-
-    let changes = this.writePlayersToClient(clientEdict, pvs, msg) ? 1 : 0;
-
-    const cl = SV.svs.clients[clientEdict.num - 1];
-
-    msg.writeByte(Protocol.svc.deltapacketentities);
-
-    const visedicts = [];
-
-    for (const ent of this.traversePVS(pvs, [], [clientEdict.num])) {
-      if ((msg.data.byteLength - msg.cursize) < 16) {
-        Con.PrintWarning('SV.WriteEntitiesToClient: packet overflow, not writing more entities\n');
-        break;
-      }
-
-      const toState = new ServerEntityState(ent.num);
-      toState.classname = ent.entity.classname;
-      toState.modelindex = ent.entity.model ? ent.entity.modelindex : 0;
-      toState.frame = ent.entity.frame;
-      toState.colormap = ent.entity?.colormap || 0;
-      toState.skin = ent.entity.skin;
-      toState.solid = ent.entity.solid;
-      toState.origin.set(ent.entity.origin);
-      toState.angles.set(ent.entity.angles);
-      toState.velocity.set(ent.entity.velocity);
-      toState.effects = ent.entity.effects;
-      toState.alpha = ent.entity.alpha;
-      toState.free = false;
-      toState.maxs.set(ent.entity.maxs);
-      toState.mins.set(ent.entity.mins);
-      toState.nextthink = ent.entity.nextthink || 0;
-
-      if (SV.server.gameCapabilities.includes(Defs.gameCapabilities.CAP_ENTITY_EXTENDED)) {
-        if (SV.server.clientEntityFields[ent.entity.classname]) {
-          const entityFields = SV.server.clientEntityFields[ent.entity.classname];
-          const fields = entityFields.fields;
-
-          for (const field of fields) {
-            toState.extended[field] = ent.entity[field];
-          }
-        }
-      }
-
-      const fromState = cl.getEntityState(ent.num);
-
-      changes |= this.writeDeltaEntity(msg, fromState, toState) ? 1 : 0;
-
-      fromState.set(toState);
-
-      visedicts.push(ent.num);
-    }
-
-    for (let i = 1; i < SV.server.num_edicts; i++) {
-      const ent = SV.server.edicts[i];
-
-      if (visedicts.includes(ent.num)) {
-        continue;
-      }
-
-      const fromState = cl.getEntityState(ent.num);
-      const toState = new ServerEntityState(ent.num);
-      toState.freeEdict();
-
-      changes |= this.writeDeltaEntity(msg, fromState, toState) ? 1 : 0;
-      fromState.set(toState);
-    }
-
-    msg.writeShort(0);
-
-    return changes > 0;
-  }
-
-  writeClientdataToMessage(client, msg) {
-    const clientEdict = client.edict;
-    if ((clientEdict.entity.dmg_take || clientEdict.entity.dmg_save) && clientEdict.entity.dmg_inflictor) {
-      const other = clientEdict.entity.dmg_inflictor.edict ? clientEdict.entity.dmg_inflictor.edict : clientEdict.entity.dmg_inflictor;
-      const vec = !other.isFree() ? other.entity.origin.copy().add(other.entity.mins.copy().add(other.entity.maxs).multiply(0.5)) : clientEdict.entity.origin;
-      msg.writeByte(Protocol.svc.damage);
-      msg.writeByte(Math.min(255, clientEdict.entity.dmg_save));
-      msg.writeByte(Math.min(255, clientEdict.entity.dmg_take));
-      msg.writeCoordVector(vec);
-      clientEdict.entity.dmg_take = 0.0;
-      clientEdict.entity.dmg_save = 0.0;
-    }
-
-    if (clientEdict.entity.fixangle) {
-      msg.writeByte(Protocol.svc.setangle);
-      msg.writeAngleVector(clientEdict.entity.angles);
-      clientEdict.entity.fixangle = false;
-    }
-
-    let bits = Protocol.su.items | Protocol.su.weapon | Protocol.su.moveack;
-    if (clientEdict.entity.view_ofs[2] !== Protocol.default_viewheight) {
-      bits |= Protocol.su.viewheight;
-    }
-    if (clientEdict.entity.idealpitch !== 0.0) {
-      bits |= Protocol.su.idealpitch;
-    }
-
-    const serverflags = SV.server.gameAPI?.serverflags ?? 0;
-
-    let items;
-    if (clientEdict.entity.items2 !== undefined) {
-      if (clientEdict.entity.items2 !== 0.0) {
-        items = (clientEdict.entity.items >> 0) + ((clientEdict.entity.items2 << 23) >>> 0);
-      } else {
-        items = (clientEdict.entity.items >> 0) + ((serverflags << 28) >>> 0);
-      }
-    } else {
-      items = (clientEdict.entity.items >> 0) + ((serverflags << 28) >>> 0);
-    }
-
-    if (clientEdict.entity.flags & Defs.flags.FL_ONGROUND) {
-      bits |= Protocol.su.onground;
-    }
-    if (clientEdict.entity.waterlevel >= Defs.waterlevel.WATERLEVEL_WAIST) {
-      bits |= Protocol.su.inwater;
-    }
-
-    const punchangle = clientEdict.entity.punchangle;
-
-    if (punchangle[0] !== 0.0) {
-      bits |= Protocol.su.punch1;
-    }
-    if (punchangle[1] !== 0.0) {
-      bits |= Protocol.su.punch2;
-    }
-    if (punchangle[2] !== 0.0) {
-      bits |= Protocol.su.punch3;
-    }
-
-    if (clientEdict.entity.weaponframe !== 0.0) {
-      bits |= Protocol.su.weaponframe;
-    }
-    if (clientEdict.entity.armorvalue !== 0.0) {
-      bits |= Protocol.su.armor;
-    }
-
-    msg.writeByte(Protocol.svc.clientdata);
-    msg.writeShort(bits);
-    if ((bits & Protocol.su.viewheight) !== 0) {
-      msg.writeChar(clientEdict.entity.view_ofs[2]);
-    }
-    if ((bits & Protocol.su.idealpitch) !== 0) {
-      msg.writeChar(clientEdict.entity.idealpitch);
-    }
-
-    if ((bits & Protocol.su.punch1) !== 0) {
-      msg.writeShort(punchangle[0] * 90);
-    }
-    if ((bits & Protocol.su.punch2) !== 0) {
-      msg.writeShort(punchangle[1] * 90.0);
-    }
-    if ((bits & Protocol.su.punch3) !== 0) {
-      msg.writeShort(punchangle[2] * 90.0);
-    }
-
-    if ((bits & Protocol.su.moveack) !== 0) {
-      msg.writeByte(client.lastMoveSequence);
-      // send authoritative PM state alongside the move ack so the client
-      // can start prediction replay from the correct pmFlags / pmTime
-      msg.writeByte(client.pmFlags);
-      msg.writeByte(client.pmTime);
-      msg.writeByte(client.pmOldButtons);
-    }
-
-    if (SV.server.gameCapabilities.includes(Defs.gameCapabilities.CAP_CLIENTDATA_LEGACY)) {
-      msg.writeLong(items);
-      if ((bits & Protocol.su.weaponframe) !== 0) {
-        msg.writeByte(clientEdict.entity.weaponframe);
-      }
-      if ((bits & Protocol.su.armor) !== 0) {
-        msg.writeByte(clientEdict.entity.armorvalue);
-      }
-      msg.writeByte(SV.ModelIndex(clientEdict.entity.weaponmodel));
-      msg.writeShort(clientEdict.entity.health);
-      msg.writeByte(clientEdict.entity.currentammo);
-      msg.writeByte(clientEdict.entity.ammo_shells);
-      msg.writeByte(clientEdict.entity.ammo_nails);
-      msg.writeByte(clientEdict.entity.ammo_rockets);
-      msg.writeByte(clientEdict.entity.ammo_cells);
-      if (COM.standard_quake === true) {
-        msg.writeByte(clientEdict.entity.weapon & 0xff);
-      } else {
-        const weapon = clientEdict.entity.weapon;
-        for (let i = 0; i <= 31; i++) {
-          if ((weapon & (1 << i)) !== 0) {
-            msg.writeByte(i);
-            break;
-          }
-        }
-      }
-    }
-
-    if (SV.server.gameCapabilities.includes(Defs.gameCapabilities.CAP_CLIENTDATA_DYNAMIC)) {
-      const clientdataFields = SV.server.clientdataFields;
-      const destination = msg;
-
-      let fieldbits = 0;
-      const values = [];
-
-      for (let i = 0; i < clientdataFields.length; i++) {
-        const field = clientdataFields[i];
-        const value = clientEdict.entity[field];
-
-        if (!value) {
-          continue;
-        }
-
-        fieldbits |= (1 << i);
-        values.push(value);
-      }
-
-      const bitsWriter = SV.server.clientdataFieldsBitsWriter;
-      console.assert(bitsWriter, 'clientdataFieldsBitsWriter must be configured when CAP_CLIENTDATA_DYNAMIC is enabled');
-      if (bitsWriter) {
-        destination[bitsWriter](fieldbits);
-        destination.writeSerializables(values);
-      }
-    }
-
-    return true;
-  }
-
-  /**
-   * Sends a datagram to a specific client.
-   * @param {import('./Client.mjs').ServerClient} client client to send to
-   * @returns {boolean} success
-   */
-  sendClientDatagram(client) {
-    const msg = new SzBuffer(16000, 'SV.SendClientDatagram');
-    msg.writeByte(Protocol.svc.time);
-    msg.writeFloat(SV.server.time);
-
-    let changes = 0;
-
-    if (Host.realtime - client.last_ping_update >= 1) {
-      for (let i = 0; i < SV.svs.clients.length; i++) {
-        const pingClient = SV.svs.clients[i];
-
-        if (pingClient.state < ServerClient.STATE.CONNECTED) {
-          continue;
-        }
-
-        msg.writeByte(Protocol.svc.updatepings);
-        msg.writeByte(i);
-        msg.writeShort(Math.max(0, Math.min(Math.round(pingClient.ping * 10), 30000)));
-
-        changes |= 1;
-      }
-
-      client.last_ping_update = Host.realtime;
-    }
-
-    if (client.expedited_message.cursize > 0 && (msg.cursize + client.expedited_message.cursize) < msg.data.byteLength) {
-      msg.write(new Uint8Array(client.expedited_message.data), client.expedited_message.cursize);
-      client.expedited_message.clear();
-      changes |= 1;
-    }
-
-    if ((msg.cursize + SV.server.expedited_datagram.cursize) < msg.data.byteLength) {
-      msg.write(new Uint8Array(SV.server.expedited_datagram.data), SV.server.expedited_datagram.cursize);
-      changes |= 1;
-    }
-
-    changes |= this.writeClientdataToMessage(client, msg) ? 1 : 0;
-    changes |= this.writeEntitiesToClient(client.edict, msg) ? 1 : 0;
-
-    if (client.state !== ServerClient.STATE.SPAWNED) {
-      Con.DPrint('SV.SendClientDatagram: not spawned\n');
-      return true;
-    }
-
-    if (!changes) {
-      Con.DPrint('SV.SendClientDatagram: no changes for client ' + client.num + '\n');
-    }
-
-    client.last_update = SV.server.time;
-
-    if ((msg.cursize + SV.server.datagram.cursize) < msg.data.byteLength) {
-      msg.write(new Uint8Array(SV.server.datagram.data), SV.server.datagram.cursize);
-    }
-
-    if (NET.SendUnreliableMessage(client.netconnection, msg) === -1) {
-      Host.DropClient(client, true, 'Connectivity issues');
-      return false;
-    }
-    return true;
-  }
-
-  updateToReliableMessages() {
-    for (let i = 0; i < SV.svs.maxclients; i++) {
-      const currentClient = SV.svs.clients[i];
-      const frags = currentClient.edict.entity ? currentClient.edict.entity.frags | 0 : 0;
-      if (currentClient.old_frags === frags) {
-        continue;
-      }
-      for (let j = 0; j < SV.svs.maxclients; j++) {
-        const client = SV.svs.clients[j];
-        if (client.state < ServerClient.STATE.CONNECTED) {
-          continue;
-        }
-        client.message.writeByte(Protocol.svc.updatefrags);
-        client.message.writeByte(i);
-        client.message.writeShort(frags);
-      }
-      currentClient.old_frags = frags;
-    }
-
-    for (let i = 0; i < SV.svs.maxclients; i++) {
-      const client = SV.svs.clients[i];
-      if (client.state >= ServerClient.STATE.CONNECTED) {
-        client.message.write(new Uint8Array(SV.server.reliable_datagram.data), SV.server.reliable_datagram.cursize);
-      }
-    }
-
-    SV.server.reliable_datagram.clear();
-  }
-
-  sendClientMessages() {
-    this.updateToReliableMessages();
-
-    for (let i = 0; i < SV.svs.maxclients; i++) {
-      const client = SV.svs.clients[i];
-      if (client.state < ServerClient.STATE.CONNECTED) {
-        continue;
-      }
-      if (client.state === ServerClient.STATE.SPAWNED) {
-        if (!this.sendClientDatagram(client)) {
-          continue;
-        }
-      }
-      if (client.message.overflowed) {
-        Host.DropClient(client, true, 'Connectivity issues, too many messages');
-        client.message.overflowed = false;
-        continue;
-      }
-      if (client.state === ServerClient.STATE.DROPASAP) {
-        if (NET.CanSendMessage(client.netconnection)) {
-          Host.DropClient(client, false, 'Connectivity issues, ASAP drop requested');
-        }
-      } else if (client.message.cursize !== 0) {
-        if (!NET.CanSendMessage(client.netconnection)) {
-          continue;
-        }
-        if (NET.SendMessage(client.netconnection, client.message) === -1) {
-          Host.DropClient(client, true, 'Connectivity issues, failed to send message');
-        }
-        client.message.clear();
-      }
-    }
-
-    for (let i = 1; i < SV.server.num_edicts; i++) {
-      if (SV.server.edicts[i].isFree()) {
-        continue;
-      }
-
-      SV.server.edicts[i].entity.effects &= ~Defs.effect.EF_MUZZLEFLASH;
-    }
-  }
-};
+export { ServerMessages } from './ServerMessages.ts';
diff --git a/source/engine/server/ServerMessages.ts b/source/engine/server/ServerMessages.ts
new file mode 100644
index 00000000..344437e6
--- /dev/null
+++ b/source/engine/server/ServerMessages.ts
@@ -0,0 +1,932 @@
+import type { Visibility } from '../common/model/BSP.ts';
+import type Vector from '../../shared/Vector.ts';
+import type { BaseEntity, ServerEdict, WorldspawnEntity } from './Edict.mjs';
+
+import { SzBuffer } from '../network/MSG.ts';
+import * as Protocol from '../network/Protocol.ts';
+import * as Defs from '../../shared/Defs.ts';
+import Cvar from '../common/Cvar.ts';
+import { eventBus, getCommonRegistry } from '../registry.mjs';
+import { ServerClient } from './Client.mjs';
+import { ServerEntityState } from './ServerEntityState.mjs';
+
+type BitsWriter = 'writeByte' | 'writeShort' | 'writeLong';
+type EntityFieldValue = string | number | boolean | Vector | null | ServerEdict | BaseEntity | undefined;
+
+interface DamageInflictorEntityLike {
+  edict?: ServerEdict;
+  isFree(): boolean;
+  entity: ServerMessageEntity;
+}
+
+interface ServerMessageEntity extends BaseEntity, Record<string, EntityFieldValue> {
+  alpha: number;
+  ammo_cells: number;
+  ammo_nails: number;
+  ammo_rockets: number;
+  ammo_shells: number;
+  armorvalue: number;
+  classname: string;
+  colormap?: number;
+  currentammo: number;
+  dmg_inflictor: DamageInflictorEntityLike | ServerEdict | null;
+  dmg_save: number;
+  dmg_take: number;
+  effects: number;
+  fixangle: boolean;
+  flags: number;
+  frame: number;
+  health: number;
+  idealpitch: number;
+  items: number;
+  items2?: number;
+  message?: string | null;
+  mins: Vector;
+  maxs: Vector;
+  model: string | null;
+  modelindex: number;
+  nextthink?: number;
+  origin: Vector;
+  punchangle: Vector;
+  skin: number;
+  solid: number;
+  sounds?: number;
+  velocity: Vector;
+  view_ofs: Vector;
+  waterlevel: number;
+  weapon: number;
+  weaponframe: number;
+  weaponmodel: string | null;
+}
+
+let { COM, Con, Host, NET, PR, SV } = getCommonRegistry();
+
+eventBus.subscribe('registry.frozen', () => {
+  ({ COM, Con, Host, NET, PR, SV } = getCommonRegistry());
+});
+
+/**
+ * Returns a live entity view for an edict.
+ * @returns The typed entity bound to the edict.
+ */
+function requireEntity(edict: ServerEdict): ServerMessageEntity {
+  const entity = edict.entity;
+
+  console.assert(entity !== null, 'ServerMessages requires a live edict entity');
+
+  return entity as ServerMessageEntity;
+}
+
+/**
+ * Returns the initialized worldspawn entity.
+ * @returns The current worldspawn entity.
+ */
+function requireWorldspawnEntity(): WorldspawnEntity {
+  const entity = SV.server.edicts[0]?.entity;
+
+  console.assert(entity !== null, 'ServerMessages requires a worldspawn entity');
+
+  return entity as WorldspawnEntity;
+}
+
+/**
+ * Handles all server to client message assembly and related helpers.
+ */
+export class ServerMessages {
+  readonly nullcmd: Protocol.UserCmd;
+
+  constructor() {
+    this.nullcmd = new Protocol.UserCmd();
+  }
+
+  startParticle(org: Vector, dir: Vector, color: number, count: number): void {
+    const datagram = SV.server.datagram;
+    if (datagram.cursize >= 1009) {
+      return;
+    }
+    datagram.writeByte(Protocol.svc.particle);
+    datagram.writeCoordVector(org);
+    datagram.writeCoordVector(dir);
+    datagram.writeByte(Math.min(count, 255));
+    datagram.writeByte(color);
+  }
+
+  startSound(edict: ServerEdict, channel: number, sample: string, volume: number, attenuation: number): void {
+    console.assert(volume >= 0 && volume <= 255, 'volume out of range', volume);
+    console.assert(attenuation >= 0.0 && attenuation <= 4.0, 'attenuation out of range', attenuation);
+    console.assert(channel >= 0 && channel <= 7, 'channel out of range', channel);
+
+    const datagram = SV.server.datagram;
+    if (datagram.cursize >= 1009) {
+      return;
+    }
+
+    let i;
+    for (i = 1; i < SV.server.soundPrecache.length; i++) {
+      if (sample === SV.server.soundPrecache[i]) {
+        break;
+      }
+    }
+    if (i >= SV.server.soundPrecache.length) {
+      Con.Print('SV.StartSound: ' + sample + ' was not precached\n');
+      SV.server.soundPrecache.push(sample);
+      datagram.writeByte(Protocol.svc.loadsound);
+      datagram.writeByte(i);
+      datagram.writeString(sample);
+    }
+
+    let fieldMask = 0;
+
+    if (volume !== 255) {
+      fieldMask |= 1;
+    }
+    if (attenuation !== 1.0) {
+      fieldMask |= 2;
+    }
+
+    datagram.writeByte(Protocol.svc.sound);
+    datagram.writeByte(fieldMask);
+    if ((fieldMask & 1) !== 0) {
+      datagram.writeByte(volume);
+    }
+    if ((fieldMask & 2) !== 0) {
+      datagram.writeByte(Math.floor(attenuation * 64.0));
+    }
+    const entity = requireEntity(edict);
+
+    datagram.writeShort((edict.num << 3) + channel);
+    datagram.writeByte(i);
+    datagram.writeCoordVector(entity.origin.copy().add(entity.mins.copy().add(entity.maxs).multiply(0.5)));
+  }
+
+  /**
+   * Sends the serverdata message to a specific client.
+   * Needs to be done in order to complete the signon process step 1.
+   * @param {ServerClient} client client
+   */
+  sendServerData(client: ServerClient): void {
+    const message = client.message;
+    const worldspawnEntity = requireWorldspawnEntity();
+
+    message.writeByte(Protocol.svc.print);
+    message.writeString(`\x02\nVERSION ${Host.version.string} SERVER (${SV.server.gameVersion})\n`);
+
+    message.writeByte(Protocol.svc.serverdata);
+    message.writeByte(Protocol.version);
+
+    if (PR.QuakeJS?.ClientGameAPI) {
+      const { author, name, version } = PR.QuakeJS.identification;
+      message.writeByte(1);
+      message.writeString(name);
+      message.writeString(author);
+      message.writeByte(version[0]);
+      message.writeByte(version[1]);
+      message.writeByte(version[2]);
+    } else {
+      message.writeByte(0);
+      message.writeString(COM.game);
+    }
+
+    message.writeByte(SV.svs.maxclients);
+    message.writeString(worldspawnEntity.message || SV.server.mapname);
+    // SV.pmove.movevars.sendToClient(message);
+    for (let i = 1; i < SV.server.modelPrecache.length; i++) {
+      message.writeString(SV.server.modelPrecache[i]);
+    }
+    message.writeByte(0);
+    for (let i = 1; i < SV.server.soundPrecache.length; i++) {
+      message.writeString(SV.server.soundPrecache[i]);
+    }
+    message.writeByte(0);
+
+    if (SV.server.gameCapabilities.includes(Defs.gameCapabilities.CAP_CLIENTDATA_DYNAMIC)) {
+      for (const field of SV.server.clientdataFields) {
+        message.writeString(field);
+      }
+      message.writeByte(0);
+    }
+
+    if (SV.server.gameCapabilities.includes(Defs.gameCapabilities.CAP_ENTITY_EXTENDED)) {
+      for (const [classname, { fields }] of Object.entries(SV.server.clientEntityFields)) {
+        message.writeString(classname);
+        for (const field of fields) {
+          message.writeString(field);
+        }
+        message.writeByte(0);
+      }
+      message.writeByte(0);
+    }
+
+    // sounds on worldspawn defines the cd track
+    const cdtrack = worldspawnEntity.sounds;
+
+    // only play cd track automatically if set in worldspawn
+    if (typeof cdtrack === 'number') {
+      message.writeByte(Protocol.svc.cdtrack);
+      message.writeByte(cdtrack);
+      message.writeByte(0); // unused
+    }
+
+    message.writeByte(Protocol.svc.setview);
+    message.writeShort(client.edict.num);
+
+    const serverCvars = Array.from(Cvar.Filter((/** @type {Cvar} */ cvar) => (cvar.flags & Cvar.FLAG.SERVER) !== 0));
+    if (serverCvars.length > 0) {
+      client.message.writeByte(Protocol.svc.cvar);
+      client.message.writeByte(serverCvars.length);
+      for (const serverCvar of serverCvars) {
+        this.writeCvar(client.message, serverCvar);
+      }
+    }
+
+    // make sure the client knows about the paused state
+    if (SV.server.paused) {
+      client.message.writeByte(Protocol.svc.setpause);
+      client.message.writeByte(1);
+    }
+
+    message.writeByte(Protocol.svc.signonnum);
+    message.writeByte(1);
+
+    client.state = ServerClient.STATE.CONNECTED;
+  }
+
+  writeCvar(msg: SzBuffer, cvar: Cvar): void {
+    if (cvar.flags & Cvar.FLAG.SECRET) {
+      msg.writeString(cvar.name);
+      msg.writeString(cvar.string ? 'REDACTED' : '');
+    } else {
+      msg.writeString(cvar.name);
+      msg.writeString(cvar.string);
+    }
+  }
+
+  cvarChanged(cvar: Cvar): void {
+    for (let i = 0; i < SV.svs.maxclients; i++) {
+      const client = SV.svs.clients[i];
+      if (client.state < ServerClient.STATE.CONNECTED) {
+        continue;
+      }
+
+      client.message.writeByte(Protocol.svc.cvar);
+      client.message.writeByte(1);
+      this.writeCvar(client.message, cvar);
+    }
+  }
+
+  *traversePVS(pvs: Visibility, ignoreEdictIds: number[] = [], alwaysIncludeEdictIds: number[] = [], includeFree = false): Generator<ServerEdict, void, void> {
+    for (let e = 1; e < SV.server.num_edicts; e++) {
+      const ent = SV.server.edicts[e];
+
+      if (alwaysIncludeEdictIds.includes(e)) {
+        yield ent;
+        continue;
+      }
+
+      if (!includeFree && ent.isFree()) {
+        continue;
+      }
+
+      if (ignoreEdictIds.includes(e)) {
+        continue;
+      }
+
+      if (!ent.isInPXS(pvs)) {
+        continue;
+      }
+
+      yield ent;
+    }
+  }
+
+  writePlayersToClient(clientEdict: ServerEdict, pvs: Visibility, msg: SzBuffer): boolean {
+    let changes = false;
+
+    for (let i = 0; i < SV.svs.maxclients; i++) {
+      const cl = SV.svs.clients[i];
+      const playerEntity = requireEntity(cl.edict);
+
+      if (cl.state !== ServerClient.STATE.SPAWNED) {
+        continue;
+      }
+
+      if (!clientEdict.equals(cl.edict) && !clientEdict.isInPXS(pvs)) {
+        continue;
+      }
+
+      let pflags = Protocol.pf.PF_MSEC | Protocol.pf.PF_COMMAND;
+
+      if (playerEntity.model !== 'progs/player.mdl') {
+        pflags |= Protocol.pf.PF_MODEL;
+      }
+
+      if (!playerEntity.velocity.isOrigin()) {
+        pflags |= Protocol.pf.PF_VELOCITY;
+      }
+
+      if (playerEntity.effects) {
+        pflags |= Protocol.pf.PF_EFFECTS;
+      }
+
+      if (playerEntity.skin) {
+        pflags |= Protocol.pf.PF_SKINNUM;
+      }
+
+      if (playerEntity.health <= 0) {
+        pflags |= Protocol.pf.PF_DEAD;
+      }
+
+      if (clientEdict.equals(cl.edict)) {
+        pflags &= ~(Protocol.pf.PF_MSEC | Protocol.pf.PF_COMMAND);
+
+        if (playerEntity.weaponframe) {
+          pflags |= Protocol.pf.PF_WEAPONFRAME;
+        }
+      }
+
+      msg.writeByte(Protocol.svc.playerinfo);
+      msg.writeByte(i);
+      msg.writeShort(pflags);
+
+      msg.writeCoordVector(playerEntity.origin);
+      msg.writeByte(playerEntity.frame);
+
+      if (pflags & Protocol.pf.PF_MSEC) {
+        const msec = 1000 * (SV.server.time - cl.local_time);
+        msg.writeByte(Math.max(0, Math.min(msec, 255)));
+      }
+
+      if (pflags & Protocol.pf.PF_COMMAND) {
+        const cmd = cl.cmd;
+
+        if (pflags & Protocol.pf.PF_DEAD) {
+          cmd.angles.setTo(0, playerEntity.angles[1], 0);
+        }
+
+        cmd.buttons = 0;
+        cmd.impulse = 0;
+
+        msg.writeDeltaUsercmd(this.nullcmd, cmd);
+      }
+
+      if (pflags & Protocol.pf.PF_VELOCITY) {
+        msg.writeCoordVector(playerEntity.velocity);
+      }
+
+      if (pflags & Protocol.pf.PF_MODEL) {
+        msg.writeByte(playerEntity.modelindex);
+      }
+
+      if (pflags & Protocol.pf.PF_EFFECTS) {
+        msg.writeByte(playerEntity.effects);
+      }
+
+      if (pflags & Protocol.pf.PF_SKINNUM) {
+        msg.writeByte(playerEntity.skin);
+      }
+
+      if (pflags & Protocol.pf.PF_WEAPONFRAME) {
+        msg.writeByte(playerEntity.weaponframe);
+      }
+
+      changes = true;
+    }
+
+    return changes;
+  }
+
+  /**
+   * Writes delta between two entity states to the message.
+   * @param {SzBuffer} msg The message to write to
+   * @param {ServerEntityState} from The previous entity state
+   * @param {ServerEntityState} to The new entity state
+   * @returns {boolean} true if any data was written, false otherwise
+   */
+  writeDeltaEntity(msg: SzBuffer, from: ServerEntityState, to: ServerEntityState): boolean {
+    const EPSILON = 0.01;
+
+    let bits = 0;
+
+    if (from.classname !== to.classname) {
+      bits |= Protocol.u.classname;
+    }
+
+    if (from.free !== to.free) {
+      bits |= Protocol.u.free;
+    }
+
+    if (from.modelindex !== to.modelindex) {
+      bits |= Protocol.u.model;
+    }
+
+    if (from.frame !== to.frame) {
+      bits |= Protocol.u.frame;
+    }
+
+    if ((from.colormap || 0) !== (to.colormap || 0)) {
+      bits |= Protocol.u.colormap;
+    }
+
+    if (from.skin !== to.skin) {
+      bits |= Protocol.u.skin;
+    }
+
+    if (from.alpha !== to.alpha || from.effects !== to.effects) {
+      bits |= Protocol.u.effects;
+    }
+
+    if (from.solid !== to.solid) {
+      bits |= Protocol.u.solid;
+    }
+
+    if (to.nextthink >= SV.server.time && (to.nextthink - from.nextthink) > 0.001) {
+      bits |= Protocol.u.nextthink;
+    }
+
+    for (let i = 0; i < 3; i++) {
+      if (isFinite(to.origin[i]) && Math.abs(from.origin[i] - to.origin[i]) > EPSILON) {
+        bits |= Protocol.u.origin1 << i;
+      }
+
+      if (isFinite(to.angles[i]) && Math.abs(from.angles[i] - to.angles[i]) > EPSILON) {
+        bits |= Protocol.u.angle1 << i;
+      }
+
+      if (isFinite(to.velocity[i]) && Math.abs(from.velocity[i] - to.velocity[i]) > EPSILON) {
+        bits |= Protocol.u.angle1 << i;
+      }
+    }
+
+    if (!from.maxs.equals(to.maxs)) {
+      bits |= Protocol.u.size;
+    }
+
+    if (!from.mins.equals(to.mins)) {
+      bits |= Protocol.u.size;
+    }
+
+    if (bits === 0) {
+      return false;
+    }
+
+    console.assert(to.num > 0, 'valid entity num', to.num);
+
+    msg.writeUint16(to.num);
+    msg.writeUint16(bits);
+
+    if (bits & Protocol.u.classname) {
+      msg.writeString(to.classname);
+    }
+
+    if (bits & Protocol.u.free) {
+      msg.writeByte(to.free ? 1 : 0);
+    }
+
+    if (bits & Protocol.u.frame) {
+      msg.writeByte(to.frame);
+    }
+
+    if (bits & Protocol.u.model) {
+      msg.writeByte(to.modelindex);
+    }
+
+    if (bits & Protocol.u.colormap) {
+      msg.writeByte(to.colormap);
+    }
+
+    if (bits & Protocol.u.skin) {
+      msg.writeByte(to.skin);
+    }
+
+    if (bits & Protocol.u.effects) {
+      msg.writeByte(to.effects);
+      msg.writeByte(Math.floor((to.alpha || 1) * 255.0)); // CR: QuakeC may not have alpha
+    }
+
+    if (bits & Protocol.u.solid) {
+      msg.writeByte(to.solid);
+    }
+
+    for (let i = 0; i < 3; i++) {
+      if (bits & (Protocol.u.origin1 << i)) {
+        msg.writeCoord(to.origin[i]);
+      }
+
+      if (bits & (Protocol.u.angle1 << i)) {
+        msg.writeAngle(isFinite(to.angles[i]) ? to.angles[i] : 0);
+        msg.writeCoord(to.velocity[i]);
+      }
+    }
+
+    if (bits & Protocol.u.size) {
+      msg.writeCoordVector(to.maxs);
+      msg.writeCoordVector(to.mins);
+    }
+
+    if (bits & Protocol.u.nextthink) {
+      if (from.nextthink <= 0) {
+        from.nextthink = SV.server.time;
+      }
+      msg.writeByte(to.nextthink - from.nextthink < 0.250 ? Math.min(255, (to.nextthink - from.nextthink) * 255.0) : 0);
+    }
+
+    if (SV.server.gameCapabilities.includes(Defs.gameCapabilities.CAP_ENTITY_EXTENDED)) {
+      if (SV.server.clientEntityFields[to.classname]) {
+        const entityFields = SV.server.clientEntityFields[to.classname];
+        const fields = entityFields.fields;
+        const bitsWriter = entityFields.bitsWriter as BitsWriter | null;
+
+        let fieldbits = 0;
+        const values = [];
+
+        for (const field of fields) {
+          if (from.extended[field] !== to.extended[field]) {
+            fieldbits |= 1 << fields.indexOf(field);
+            values.push(to.extended[field]);
+          }
+        }
+
+        if (bitsWriter) {
+          msg[bitsWriter](fieldbits);
+        }
+
+        if (bitsWriter && fieldbits > 0) {
+          msg.writeSerializables(values);
+        }
+      }
+    }
+
+    return true;
+  }
+
+  writeEntitiesToClient(clientEdict: ServerEdict, msg: SzBuffer): boolean {
+    const clientEntity = requireEntity(clientEdict);
+    const origin = clientEntity.origin.copy().add(clientEntity.view_ofs);
+    const pvs = SV.server.worldmodel.getFatPvsByPoint(origin);
+
+    let changes = this.writePlayersToClient(clientEdict, pvs, msg) ? 1 : 0;
+
+    const cl = SV.svs.clients[clientEdict.num - 1];
+
+    msg.writeByte(Protocol.svc.deltapacketentities);
+
+    const visedicts = [];
+
+    for (const ent of this.traversePVS(pvs, [], [clientEdict.num])) {
+      if ((msg.data.byteLength - msg.cursize) < 16) {
+        Con.PrintWarning('SV.WriteEntitiesToClient: packet overflow, not writing more entities\n');
+        break;
+      }
+
+      const entity = requireEntity(ent);
+      const toState = new ServerEntityState(ent.num);
+      toState.classname = entity.classname;
+      toState.modelindex = entity.model ? entity.modelindex : 0;
+      toState.frame = entity.frame;
+      toState.colormap = entity.colormap || 0;
+      toState.skin = entity.skin;
+      toState.solid = entity.solid;
+      toState.origin.set(entity.origin);
+      toState.angles.set(entity.angles);
+      toState.velocity.set(entity.velocity);
+      toState.effects = entity.effects;
+      toState.alpha = entity.alpha;
+      toState.free = false;
+      toState.maxs.set(entity.maxs);
+      toState.mins.set(entity.mins);
+      toState.nextthink = entity.nextthink || 0;
+
+      if (SV.server.gameCapabilities.includes(Defs.gameCapabilities.CAP_ENTITY_EXTENDED)) {
+        if (SV.server.clientEntityFields[entity.classname]) {
+          const entityFields = SV.server.clientEntityFields[entity.classname];
+          const fields = entityFields.fields;
+
+          for (const field of fields) {
+            toState.extended[field] = entity[field];
+          }
+        }
+      }
+
+      const fromState = cl.getEntityState(ent.num);
+
+      changes |= this.writeDeltaEntity(msg, fromState, toState) ? 1 : 0;
+
+      fromState.set(toState);
+
+      visedicts.push(ent.num);
+    }
+
+    for (let i = 1; i < SV.server.num_edicts; i++) {
+      const ent = SV.server.edicts[i];
+
+      if (visedicts.includes(ent.num)) {
+        continue;
+      }
+
+      const fromState = cl.getEntityState(ent.num);
+      const toState = new ServerEntityState(ent.num);
+      toState.freeEdict();
+
+      changes |= this.writeDeltaEntity(msg, fromState, toState) ? 1 : 0;
+      fromState.set(toState);
+    }
+
+    msg.writeShort(0);
+
+    return changes > 0;
+  }
+
+  writeClientdataToMessage(client: ServerClient, msg: SzBuffer): boolean {
+    const clientEdict = client.edict;
+    const clientEntity = requireEntity(clientEdict);
+
+    if ((clientEntity.dmg_take || clientEntity.dmg_save) && clientEntity.dmg_inflictor) {
+      const inflictor = clientEntity.dmg_inflictor;
+      const other = 'edict' in inflictor && inflictor.edict ? inflictor.edict : inflictor;
+      const otherEntity = requireEntity(other as ServerEdict);
+      const vec = !other.isFree() ? otherEntity.origin.copy().add(otherEntity.mins.copy().add(otherEntity.maxs).multiply(0.5)) : clientEntity.origin;
+      msg.writeByte(Protocol.svc.damage);
+      msg.writeByte(Math.min(255, clientEntity.dmg_save));
+      msg.writeByte(Math.min(255, clientEntity.dmg_take));
+      msg.writeCoordVector(vec);
+      clientEntity.dmg_take = 0.0;
+      clientEntity.dmg_save = 0.0;
+    }
+
+    if (clientEntity.fixangle) {
+      msg.writeByte(Protocol.svc.setangle);
+      msg.writeAngleVector(clientEntity.angles);
+      clientEntity.fixangle = false;
+    }
+
+    let bits = Protocol.su.items | Protocol.su.weapon | Protocol.su.moveack;
+    if (clientEntity.view_ofs[2] !== Protocol.default_viewheight) {
+      bits |= Protocol.su.viewheight;
+    }
+    if (clientEntity.idealpitch !== 0.0) {
+      bits |= Protocol.su.idealpitch;
+    }
+
+    const serverflags = SV.server.gameAPI?.serverflags ?? 0;
+
+    let items;
+    if (clientEntity.items2 !== undefined) {
+      if (clientEntity.items2 !== 0.0) {
+        items = (clientEntity.items >> 0) + ((clientEntity.items2 << 23) >>> 0);
+      } else {
+        items = (clientEntity.items >> 0) + ((serverflags << 28) >>> 0);
+      }
+    } else {
+      items = (clientEntity.items >> 0) + ((serverflags << 28) >>> 0);
+    }
+
+    if (clientEntity.flags & Defs.flags.FL_ONGROUND) {
+      bits |= Protocol.su.onground;
+    }
+    if (clientEntity.waterlevel >= Defs.waterlevel.WATERLEVEL_WAIST) {
+      bits |= Protocol.su.inwater;
+    }
+
+    const punchangle = clientEntity.punchangle;
+
+    if (punchangle[0] !== 0.0) {
+      bits |= Protocol.su.punch1;
+    }
+    if (punchangle[1] !== 0.0) {
+      bits |= Protocol.su.punch2;
+    }
+    if (punchangle[2] !== 0.0) {
+      bits |= Protocol.su.punch3;
+    }
+
+    if (clientEntity.weaponframe !== 0.0) {
+      bits |= Protocol.su.weaponframe;
+    }
+    if (clientEntity.armorvalue !== 0.0) {
+      bits |= Protocol.su.armor;
+    }
+
+    msg.writeByte(Protocol.svc.clientdata);
+    msg.writeShort(bits);
+    if ((bits & Protocol.su.viewheight) !== 0) {
+      msg.writeChar(clientEntity.view_ofs[2]);
+    }
+    if ((bits & Protocol.su.idealpitch) !== 0) {
+      msg.writeChar(clientEntity.idealpitch);
+    }
+
+    if ((bits & Protocol.su.punch1) !== 0) {
+      msg.writeShort(punchangle[0] * 90);
+    }
+    if ((bits & Protocol.su.punch2) !== 0) {
+      msg.writeShort(punchangle[1] * 90.0);
+    }
+    if ((bits & Protocol.su.punch3) !== 0) {
+      msg.writeShort(punchangle[2] * 90.0);
+    }
+
+    if ((bits & Protocol.su.moveack) !== 0) {
+      msg.writeByte(client.lastMoveSequence);
+      // send authoritative PM state alongside the move ack so the client
+      // can start prediction replay from the correct pmFlags / pmTime
+      msg.writeByte(client.pmFlags);
+      msg.writeByte(client.pmTime);
+      msg.writeByte(client.pmOldButtons);
+    }
+
+    if (SV.server.gameCapabilities.includes(Defs.gameCapabilities.CAP_CLIENTDATA_LEGACY)) {
+      msg.writeLong(items);
+      if ((bits & Protocol.su.weaponframe) !== 0) {
+        msg.writeByte(clientEntity.weaponframe);
+      }
+      if ((bits & Protocol.su.armor) !== 0) {
+        msg.writeByte(clientEntity.armorvalue);
+      }
+      const weaponModelIndex = SV.ModelIndex(clientEntity.weaponmodel);
+      msg.writeByte(weaponModelIndex ?? 0);
+      msg.writeShort(clientEntity.health);
+      msg.writeByte(clientEntity.currentammo);
+      msg.writeByte(clientEntity.ammo_shells);
+      msg.writeByte(clientEntity.ammo_nails);
+      msg.writeByte(clientEntity.ammo_rockets);
+      msg.writeByte(clientEntity.ammo_cells);
+      if (COM.standard_quake === true) {
+        msg.writeByte(clientEntity.weapon & 0xff);
+      } else {
+        const weapon = clientEntity.weapon;
+        for (let i = 0; i <= 31; i++) {
+          if ((weapon & (1 << i)) !== 0) {
+            msg.writeByte(i);
+            break;
+          }
+        }
+      }
+    }
+
+    if (SV.server.gameCapabilities.includes(Defs.gameCapabilities.CAP_CLIENTDATA_DYNAMIC)) {
+      const clientdataFields = SV.server.clientdataFields;
+      const destination = msg;
+
+      let fieldbits = 0;
+      const values = [];
+
+      for (let i = 0; i < clientdataFields.length; i++) {
+        const field = clientdataFields[i];
+        const value = clientEntity[field];
+
+        if (!value) {
+          continue;
+        }
+
+        fieldbits |= (1 << i);
+        values.push(value);
+      }
+
+      const bitsWriter = SV.server.clientdataFieldsBitsWriter as BitsWriter | null;
+      console.assert(bitsWriter, 'clientdataFieldsBitsWriter must be configured when CAP_CLIENTDATA_DYNAMIC is enabled');
+      if (bitsWriter) {
+        destination[bitsWriter](fieldbits);
+        destination.writeSerializables(values);
+      }
+    }
+
+    return true;
+  }
+
+  /**
+   * Sends a datagram to a specific client.
+   * @param {import('./Client.mjs').ServerClient} client client to send to
+   * @returns {boolean} success
+   */
+  sendClientDatagram(client: ServerClient): boolean {
+    const msg = new SzBuffer(16000, 'SV.SendClientDatagram');
+    msg.writeByte(Protocol.svc.time);
+    msg.writeFloat(SV.server.time);
+
+    let changes = 0;
+
+    if (Host.realtime - client.last_ping_update >= 1) {
+      for (let i = 0; i < SV.svs.clients.length; i++) {
+        const pingClient = SV.svs.clients[i];
+
+        if (pingClient.state < ServerClient.STATE.CONNECTED) {
+          continue;
+        }
+
+        msg.writeByte(Protocol.svc.updatepings);
+        msg.writeByte(i);
+        msg.writeShort(Math.max(0, Math.min(Math.round(pingClient.ping * 10), 30000)));
+
+        changes |= 1;
+      }
+
+      client.last_ping_update = Host.realtime;
+    }
+
+    if (client.expedited_message.cursize > 0 && (msg.cursize + client.expedited_message.cursize) < msg.data.byteLength) {
+      msg.write(new Uint8Array(client.expedited_message.data), client.expedited_message.cursize);
+      client.expedited_message.clear();
+      changes |= 1;
+    }
+
+    if ((msg.cursize + SV.server.expedited_datagram.cursize) < msg.data.byteLength) {
+      msg.write(new Uint8Array(SV.server.expedited_datagram.data), SV.server.expedited_datagram.cursize);
+      changes |= 1;
+    }
+
+    changes |= this.writeClientdataToMessage(client, msg) ? 1 : 0;
+    changes |= this.writeEntitiesToClient(client.edict, msg) ? 1 : 0;
+
+    if (client.state !== ServerClient.STATE.SPAWNED) {
+      Con.DPrint('SV.SendClientDatagram: not spawned\n');
+      return true;
+    }
+
+    if (!changes) {
+      Con.DPrint('SV.SendClientDatagram: no changes for client ' + client.num + '\n');
+    }
+
+    client.last_update = SV.server.time;
+
+    if ((msg.cursize + SV.server.datagram.cursize) < msg.data.byteLength) {
+      msg.write(new Uint8Array(SV.server.datagram.data), SV.server.datagram.cursize);
+    }
+
+    if (NET.SendUnreliableMessage(client.netconnection, msg) === -1) {
+      Host.DropClient(client, true, 'Connectivity issues');
+      return false;
+    }
+    return true;
+  }
+
+  updateToReliableMessages(): void {
+    for (let i = 0; i < SV.svs.maxclients; i++) {
+      const currentClient = SV.svs.clients[i];
+      const frags = currentClient.edict.entity ? currentClient.edict.entity.frags | 0 : 0;
+      if (currentClient.old_frags === frags) {
+        continue;
+      }
+      for (let j = 0; j < SV.svs.maxclients; j++) {
+        const client = SV.svs.clients[j];
+        if (client.state < ServerClient.STATE.CONNECTED) {
+          continue;
+        }
+        client.message.writeByte(Protocol.svc.updatefrags);
+        client.message.writeByte(i);
+        client.message.writeShort(frags);
+      }
+      currentClient.old_frags = frags;
+    }
+
+    for (let i = 0; i < SV.svs.maxclients; i++) {
+      const client = SV.svs.clients[i];
+      if (client.state >= ServerClient.STATE.CONNECTED) {
+        client.message.write(new Uint8Array(SV.server.reliable_datagram.data), SV.server.reliable_datagram.cursize);
+      }
+    }
+
+    SV.server.reliable_datagram.clear();
+  }
+
+  sendClientMessages(): void {
+    this.updateToReliableMessages();
+
+    for (let i = 0; i < SV.svs.maxclients; i++) {
+      const client = SV.svs.clients[i];
+      if (client.state < ServerClient.STATE.CONNECTED) {
+        continue;
+      }
+      if (client.state === ServerClient.STATE.SPAWNED) {
+        if (!this.sendClientDatagram(client)) {
+          continue;
+        }
+      }
+      if (client.message.overflowed) {
+        Host.DropClient(client, true, 'Connectivity issues, too many messages');
+        client.message.overflowed = false;
+        continue;
+      }
+      if (client.state === ServerClient.STATE.DROPASAP) {
+        if (NET.CanSendMessage(client.netconnection)) {
+          Host.DropClient(client, false, 'Connectivity issues, ASAP drop requested');
+        }
+      } else if (client.message.cursize !== 0) {
+        if (!NET.CanSendMessage(client.netconnection)) {
+          continue;
+        }
+        if (NET.SendMessage(client.netconnection, client.message) === -1) {
+          Host.DropClient(client, true, 'Connectivity issues, failed to send message');
+        }
+        client.message.clear();
+      }
+    }
+
+    for (let i = 1; i < SV.server.num_edicts; i++) {
+      if (SV.server.edicts[i].isFree()) {
+        continue;
+      }
+
+      requireEntity(SV.server.edicts[i] as ServerEdict).effects &= ~Defs.effect.EF_MUZZLEFLASH;
+    }
+  }
+}
diff --git a/test/physics/server-messages.test.mjs b/test/physics/server-messages.test.mjs
new file mode 100644
index 00000000..b9dcb52a
--- /dev/null
+++ b/test/physics/server-messages.test.mjs
@@ -0,0 +1,91 @@
+import { describe, test } from 'node:test';
+import assert from 'node:assert/strict';
+
+import { eventBus, registry } from '../../source/engine/registry.mjs';
+import * as Protocol from '../../source/engine/network/Protocol.ts';
+import { SzBuffer } from '../../source/engine/network/MSG.ts';
+import SV from '../../source/engine/server/Server.mjs';
+import { ServerEntityState } from '../../source/engine/server/ServerEntityState.mjs';
+import { ServerMessages } from '../../source/engine/server/ServerMessages.mjs';
+
+/**
+ * Installs a minimal server registry context for delta-entity message tests.
+ * @returns {{ restore: () => void }} A restore handle for the mocked registry state.
+ */
+function installWriteDeltaEntityContext() {
+  const previousCon = registry.Con;
+  const previousHost = registry.Host;
+  const previousSV = registry.SV;
+  const previousServer = SV.server;
+
+  registry.Con = { Print() {}, DPrint() {}, PrintWarning() {} };
+  registry.Host = { frametime: 0.1 };
+
+  SV.server = {
+    ...SV.server,
+    time: 1,
+    gameCapabilities: [],
+    clientEntityFields: {},
+  };
+
+  registry.SV = SV;
+  eventBus.publish('registry.frozen');
+
+  return {
+    restore() {
+      registry.Con = previousCon;
+      registry.Host = previousHost;
+      registry.SV = previousSV;
+      SV.server = previousServer;
+      eventBus.publish('registry.frozen');
+    },
+  };
+}
+
+void describe('ServerMessages.writeDeltaEntity', () => {
+  void test('preserves the legacy opaque alpha fallback for falsy alpha values', () => {
+    const context = installWriteDeltaEntityContext();
+
+    try {
+      const messages = new ServerMessages();
+      const from = new ServerEntityState(1);
+      const to = new ServerEntityState(1);
+      const buffer = new SzBuffer(64, 'ServerMessages.writeDeltaEntity alpha fallback');
+
+      to.effects = 7;
+      to.alpha = 0;
+
+      assert.equal(messages.writeDeltaEntity(buffer, from, to), true);
+
+      const view = new DataView(buffer.data);
+      assert.equal(view.getUint16(0, true), 1);
+      assert.equal(view.getUint16(2, true), Protocol.u.effects);
+      assert.equal(view.getUint8(4), 7);
+      assert.equal(view.getUint8(5), 255);
+    } finally {
+      context.restore();
+    }
+  });
+
+  void test('writes scaled alpha bytes when alpha is explicitly set', () => {
+    const context = installWriteDeltaEntityContext();
+
+    try {
+      const messages = new ServerMessages();
+      const from = new ServerEntityState(1);
+      const to = new ServerEntityState(1);
+      const buffer = new SzBuffer(64, 'ServerMessages.writeDeltaEntity alpha scaling');
+
+      to.effects = 5;
+      to.alpha = 0.5;
+
+      assert.equal(messages.writeDeltaEntity(buffer, from, to), true);
+
+      const view = new DataView(buffer.data);
+      assert.equal(view.getUint8(4), 5);
+      assert.equal(view.getUint8(5), Math.floor(0.5 * 255.0));
+    } finally {
+      context.restore();
+    }
+  });
+});

From a50cf9a820ea846cc16af951491afdb2fd38d704 Mon Sep 17 00:00:00 2001
From: Christian R <github@chrisnew.de>
Date: Fri, 3 Apr 2026 14:40:34 +0300
Subject: [PATCH 37/67] TS: server/Com, server/Sys

---
 source/engine/server/Com.mjs             | 208 +----------------
 source/engine/server/Com.ts              | 203 +++++++++++++++++
 source/engine/server/Sys.mjs             | 252 +--------------------
 source/engine/server/Sys.ts              | 271 +++++++++++++++++++++++
 test/common/server-module-shims.test.mjs |  25 +++
 5 files changed, 501 insertions(+), 458 deletions(-)
 create mode 100644 source/engine/server/Com.ts
 create mode 100644 source/engine/server/Sys.ts
 create mode 100644 test/common/server-module-shims.test.mjs

diff --git a/source/engine/server/Com.mjs b/source/engine/server/Com.mjs
index 7a0359b4..7526a79e 100644
--- a/source/engine/server/Com.mjs
+++ b/source/engine/server/Com.mjs
@@ -1,207 +1 @@
-/* global Buffer */
-
-import { promises as fsPromises, existsSync, writeFileSync, constants } from 'fs';
-
-import Q from '../../shared/Q.ts';
-import { CRC16CCITT as CRC } from '../common/CRC.ts';
-import COM from '../common/Com.ts';
-
-import { CorruptedResourceError } from '../common/Errors.ts';
-import { registry, eventBus } from '../registry.mjs';
-
-let { Con, Sys } = registry;
-
-eventBus.subscribe('registry.frozen', () => {
-  Con = registry.Con;
-  Sys = registry.Sys;
-});
-
-// @ts-ignore
-export default class NodeCOM extends COM {
-
-  /**
-   * Loads a file, searching through registered search paths and packs.
-   * @param {string} filename - The name of the file to load.
-   * @returns {Promise<ArrayBuffer|null>} - The file content as an ArrayBuffer or undefined if not found.
-   */
-  static async LoadFile(filename) {
-    filename = filename.toLowerCase();
-
-    // Loop over search paths in reverse
-    for (let i = this.searchpaths.length - 1; i >= 0; i--) {
-      const search = this.searchpaths[i];
-      const netpath = search.filename ? `${search.filename}/${filename}` : filename;
-
-      // 1) Search within pack files
-      for (let j = search.pack.length - 1; j >= 0; j--) {
-        const pak = search.pack[j];
-
-        for (const file of pak) {
-          if (file.name !== filename) {
-            continue;
-          }
-
-          // Found a matching file in the PAK metadata
-          if (file.filelen === 0) {
-            // The file length is zero, return an empty buffer
-            return new ArrayBuffer(0);
-          }
-
-          const packPath = `data/${search.filename !== '' ? search.filename + '/' : ''}pak${j}.pak`;
-
-          let fd;
-          try {
-            // Open the .pak file
-            fd = await fsPromises.open(packPath, 'r');
-
-            // Read the bytes
-            const buffer = Buffer.alloc(file.filelen);
-            await fd.read(buffer, 0, file.filelen, file.filepos);
-
-            Sys.Print(`PackFile: ${packPath} : ${filename}\n`);
-            return new Uint8Array(buffer).buffer;
-            // eslint-disable-next-line no-unused-vars
-          } catch (err) {
-            // If we can't open or read from the PAK, just continue searching
-          } finally {
-            if (fd) {
-              await fd.close();
-            }
-          }
-        }
-      }
-
-      // 2) Search directly on the filesystem
-      const directPath = `data/${netpath}`;
-
-      try {
-        // Check if file is accessible
-        await fsPromises.access(directPath, constants.F_OK);
-
-        // If we got here, the file exists—read and return its contents
-        const buffer = await fsPromises.readFile(directPath);
-        Sys.Print(`FindFile: ${netpath}\n`);
-        return new Uint8Array(buffer).buffer;
-        // eslint-disable-next-line no-unused-vars
-      } catch (err) {
-        // Not accessible or doesn't exist—keep searching
-      }
-    }
-
-    // If we exhaust all search paths and files, the file was not found
-    Sys.Print(`FindFile: can't find ${filename}\n`);
-    return null;
-  };
-
-  static Shutdown() {
-  };
-
-  /**
-   * Loads and parses a pack file.
-   * @param {string} packfile - The path to the pack file.
-   * @returns {Promise<Array<object> | null>} - The parsed pack file entries or null if the file doesn't exist.
-   */
-  static async LoadPackFile(packfile) {
-    if (!existsSync(`data/${packfile}`)) { // CR: wanna see something ugly? check out the async version of existsSync…
-      return null;
-    }
-
-    const fd = await fsPromises.open(`data/${packfile}`, 'r');
-
-    try {
-      // Read and validate the pack file header
-      const headerBuffer = Buffer.alloc(12);
-      await fd.read(headerBuffer, 0, 12, 0);
-
-      const header = new DataView(new Uint8Array(headerBuffer).buffer);
-      if (header.getUint32(0, true) !== 0x4b434150) { // "PACK" magic number
-        throw new CorruptedResourceError(packfile, 'not a valid pack file');
-      }
-
-      const dirofs = header.getUint32(4, true);
-      const dirlen = header.getUint32(8, true);
-      const numpackfiles = dirlen >> 6; // Each entry is 64 bytes
-
-      if (numpackfiles !== 339) {
-        this.modified = true;
-      }
-
-      const pack = [];
-
-      if (numpackfiles > 0) {
-        const infoBuffer = Buffer.alloc(dirlen);
-        await fd.read(infoBuffer, 0, dirlen, dirofs);
-
-        const uint8ArrayInfo = new Uint8Array(infoBuffer);
-        if (CRC.Block(uint8ArrayInfo) !== 32981) {
-          this.modified = true;
-        }
-
-        const dv = new DataView(uint8ArrayInfo.buffer);
-
-        for (let i = 0; i < numpackfiles; i++) {
-          const offset = i << 6; // 64 bytes per entry
-
-          pack.push({
-            name: Q.memstr(uint8ArrayInfo.slice(offset, offset + 56)).toLowerCase(),
-            filepos: dv.getUint32(offset + 56, true),
-            filelen: dv.getUint32(offset + 60, true),
-          });
-        }
-      }
-
-      Con.Print(`Added packfile ${packfile} (${numpackfiles} files)\n`);
-
-      return pack;
-    } finally {
-      await fd.close();
-    }
-  }
-
-  // eslint-disable-next-line no-unused-vars
-  static async WriteFile(filename, data, len) { // FIXME: len is actually required, needs to be async
-    const filepath = `data/${this.searchpaths[this.searchpaths.length - 1].filename}/${filename.toLowerCase()}`;
-
-    try {
-      await fsPromises.writeFile(filepath, data);
-    } catch (e) {
-      Sys.Print('COM.WriteFile: failed on ' + filename + ', ' + e.message + '\n');
-      return false;
-    }
-    Sys.Print('COM.WriteFile: ' + filename + '\n');
-    return true;
-  }
-
-  static WriteTextFile(filename, data) {
-    const filepath = `data/${this.searchpaths[this.searchpaths.length - 1].filename}/${filename.toLowerCase()}`;
-
-    try {
-      writeFileSync(filepath, data);
-    } catch (e) {
-      Sys.Print('COM.WriteTextFile: failed on ' + filename + ', ' + e.message + '\n');
-      return false;
-    }
-    Sys.Print('COM.WriteTextFile: ' + filename + '\n');
-    return true;
-  }
-
-  static async AddGameDirectory(dir) {
-    const search = { filename: dir, pack: [] };
-    for (let i = 0; ; i++) {
-      const pak = await this.LoadPackFile((dir !== '' ? dir + '/' : '') + 'pak' + i + '.pak');
-      if (pak === null) {
-        break;
-      }
-      search.pack[search.pack.length] = pak;
-    }
-    this.searchpaths[this.searchpaths.length] = search;
-  }
-
-  static Path_f() {
-    Con.Print('Current search path:\n');
-    for (let i = NodeCOM.searchpaths.length - 1; i >= 0; i--) {
-      const s = NodeCOM.searchpaths[i];
-      Con.Print(`  ${s.filename}/ (virtual Quake filesystem)\n`);
-    }
-  }
-};
+export { default } from './Com.ts';
diff --git a/source/engine/server/Com.ts b/source/engine/server/Com.ts
new file mode 100644
index 00000000..fed68f9d
--- /dev/null
+++ b/source/engine/server/Com.ts
@@ -0,0 +1,203 @@
+/* global Buffer */
+
+import { promises as fsPromises, existsSync, writeFileSync, constants } from 'fs';
+
+import Q from '../../shared/Q.ts';
+import { CRC16CCITT as CRC } from '../common/CRC.ts';
+import COM, { type PackFileEntry, type SearchPath } from '../common/Com.ts';
+
+import { CorruptedResourceError } from '../common/Errors.ts';
+import { eventBus, getCommonRegistry } from '../registry.mjs';
+
+let { Con, Sys } = getCommonRegistry();
+
+eventBus.subscribe('registry.frozen', () => {
+  ({ Con, Sys } = getCommonRegistry());
+});
+
+export default class NodeCOM extends COM {
+
+  /**
+   * Loads a file, searching through registered search paths and packs.
+    * @returns The file contents, or null when the file cannot be found.
+   */
+  static override async LoadFile(filename: string): Promise<ArrayBuffer | null> {
+    filename = filename.toLowerCase();
+
+    // Loop over search paths in reverse
+    for (let i = this.searchpaths.length - 1; i >= 0; i--) {
+      const search = this.searchpaths[i];
+      const netpath = search.filename ? `${search.filename}/${filename}` : filename;
+
+      // 1) Search within pack files
+      for (let j = search.pack.length - 1; j >= 0; j--) {
+        const pak = search.pack[j];
+
+        for (const file of pak) {
+          if (file.name !== filename) {
+            continue;
+          }
+
+          // Found a matching file in the PAK metadata
+          if (file.filelen === 0) {
+            // The file length is zero, return an empty buffer
+            return new ArrayBuffer(0);
+          }
+
+          const packPath = `data/${search.filename !== '' ? search.filename + '/' : ''}pak${j}.pak`;
+
+          let fd: Awaited<ReturnType<typeof fsPromises.open>> | undefined;
+          try {
+            // Open the .pak file
+            fd = await fsPromises.open(packPath, 'r');
+
+            // Read the bytes
+            const buffer = Buffer.alloc(file.filelen);
+            await fd.read(buffer, 0, file.filelen, file.filepos);
+
+            Sys.Print(`PackFile: ${packPath} : ${filename}\n`);
+            return new Uint8Array(buffer).buffer;
+          } catch (_error) {
+            // If we can't open or read from the PAK, just continue searching
+          } finally {
+            if (fd) {
+              await fd.close();
+            }
+          }
+        }
+      }
+
+      // 2) Search directly on the filesystem
+      const directPath = `data/${netpath}`;
+
+      try {
+        // Check if file is accessible
+        await fsPromises.access(directPath, constants.F_OK);
+
+        // If we got here, the file exists—read and return its contents
+        const buffer = await fsPromises.readFile(directPath);
+        Sys.Print(`FindFile: ${netpath}\n`);
+        return new Uint8Array(buffer).buffer;
+      } catch (_error) {
+        // Not accessible or doesn't exist—keep searching
+      }
+    }
+
+    // If we exhaust all search paths and files, the file was not found
+    Sys.Print(`FindFile: can't find ${filename}\n`);
+    return null;
+  }
+
+  static override Shutdown(): void {
+  }
+
+  /**
+   * Loads and parses a pack file.
+    * @returns The parsed pack entries, or null when the pack file does not exist.
+   */
+  static async LoadPackFile(packfile: string): Promise<PackFileEntry[] | null> {
+    if (!existsSync(`data/${packfile}`)) { // CR: wanna see something ugly? check out the async version of existsSync…
+      return null;
+    }
+
+    const fd = await fsPromises.open(`data/${packfile}`, 'r');
+
+    try {
+      // Read and validate the pack file header
+      const headerBuffer = Buffer.alloc(12);
+      await fd.read(headerBuffer, 0, 12, 0);
+
+      const header = new DataView(new Uint8Array(headerBuffer).buffer);
+      if (header.getUint32(0, true) !== 0x4b434150) { // "PACK" magic number
+        throw new CorruptedResourceError(packfile, 'not a valid pack file');
+      }
+
+      const dirofs = header.getUint32(4, true);
+      const dirlen = header.getUint32(8, true);
+      const numpackfiles = dirlen >> 6; // Each entry is 64 bytes
+
+      if (numpackfiles !== 339) {
+        this.modified = true;
+      }
+
+      const pack: PackFileEntry[] = [];
+
+      if (numpackfiles > 0) {
+        const infoBuffer = Buffer.alloc(dirlen);
+        await fd.read(infoBuffer, 0, dirlen, dirofs);
+
+        const uint8ArrayInfo = new Uint8Array(infoBuffer);
+        if (CRC.Block(uint8ArrayInfo) !== 32981) {
+          this.modified = true;
+        }
+
+        const dv = new DataView(uint8ArrayInfo.buffer);
+
+        for (let i = 0; i < numpackfiles; i++) {
+          const offset = i << 6; // 64 bytes per entry
+
+          pack.push({
+            name: Q.memstr(uint8ArrayInfo.slice(offset, offset + 56)).toLowerCase(),
+            filepos: dv.getUint32(offset + 56, true),
+            filelen: dv.getUint32(offset + 60, true),
+          });
+        }
+      }
+
+      Con.Print(`Added packfile ${packfile} (${numpackfiles} files)\n`);
+
+      return pack;
+    } finally {
+      await fd.close();
+    }
+  }
+
+  static override async WriteFile(filename: string, data: ArrayLike<number>, _len: number): Promise<boolean> { // FIXME: len is actually required, needs to be async
+    const filepath = `data/${this.searchpaths[this.searchpaths.length - 1].filename}/${filename.toLowerCase()}`;
+
+    try {
+      await fsPromises.writeFile(filepath, data);
+    } catch (e) {
+      const message = e instanceof Error ? e.message : String(e);
+      Sys.Print(`COM.WriteFile: failed on ${filename}, ${message}\n`);
+      return false;
+    }
+    Sys.Print(`COM.WriteFile: ${filename}\n`);
+    return true;
+  }
+
+  static override WriteTextFile(filename: string, data: string): boolean {
+    const filepath = `data/${this.searchpaths[this.searchpaths.length - 1].filename}/${filename.toLowerCase()}`;
+
+    try {
+      writeFileSync(filepath, data);
+    } catch (e) {
+      const message = e instanceof Error ? e.message : String(e);
+      Sys.Print(`COM.WriteTextFile: failed on ${filename}, ${message}\n`);
+      return false;
+    }
+    Sys.Print(`COM.WriteTextFile: ${filename}\n`);
+    return true;
+  }
+
+  static override async AddGameDirectory(dir: string): Promise<void> {
+    const search: SearchPath = { filename: dir, pack: [] };
+    for (let i = 0; ; i++) {
+      const pak = await this.LoadPackFile(`${dir !== '' ? dir + '/' : ''}pak${i}.pak`);
+      if (pak === null) {
+        break;
+      }
+      search.pack[search.pack.length] = pak;
+    }
+    this.searchpaths[this.searchpaths.length] = search;
+  }
+
+  static override Path_f(): void {
+    Con.Print('Current search path:\n');
+    for (let i = NodeCOM.searchpaths.length - 1; i >= 0; i--) {
+      const s = NodeCOM.searchpaths[i];
+      Con.Print(`  ${s.filename}/ (virtual Quake filesystem)\n`);
+    }
+  }
+}
+
diff --git a/source/engine/server/Sys.mjs b/source/engine/server/Sys.mjs
index 36cdf2fa..4c7ba0be 100644
--- a/source/engine/server/Sys.mjs
+++ b/source/engine/server/Sys.mjs
@@ -1,252 +1,2 @@
-/* global Buffer */
-
-import { argv, stdout, exit } from 'node:process';
-import { start } from 'repl';
-
-import express from 'express';
-import { join } from 'path';
-import { createServer } from 'http';
-
-import { registry, eventBus } from '../registry.mjs';
-import Cvar from '../common/Cvar.ts';
-/** @typedef {import('node:repl').REPLServer} REPLServer */
-import Cmd from '../common/Cmd.ts';
-import Q from '../../shared/Q.ts';
-import WorkerManager from '../common/WorkerManager.ts';
-import workerFactories from '../common/WorkerFactories.ts';
-
-let { COM, Host, NET } = registry;
-
-eventBus.subscribe('registry.frozen', () => {
-  COM = registry.COM;
-  Host = registry.Host;
-  NET = registry.NET;
-});
-
-eventBus.subscribe('host.crash', (e) => {
-  console.error(e);
-  exit(1);
-});
-
-const mainLoop = {
-  _resolve: null,
-  sleep() {
-    return new Promise((resolve) => {
-      this._resolve = resolve;
-    });
-  },
-  notify() {
-    if (this._resolve) {
-      this._resolve();
-      this._resolve = null;
-    }
-  },
-};
-
-eventBus.subscribe('net.connection.accepted', () => {
-  mainLoop.notify();
-});
-
-/**
- * System class to manage initialization, quitting, and REPL functionality.
- */
-export default class Sys {
-  static #oldtime = 0;
-  static #isRunning = false;
-
-  /** @type {REPLServer} */
-  static #repl = null;
-
-  /**
-   * Initializes the low-level system.
-   */
-  static async Init() {
-    // Initialize command-line arguments
-    COM.InitArgv(argv);
-
-    eventBus.subscribe('console.print-line', (line) => {
-      stdout.write(line + '\n');
-    });
-
-    // Record the initial time
-    Sys.#oldtime = Date.now() * 0.001;
-
-    // Start worker manager
-    WorkerManager.Init(workerFactories);
-
-    // Start webserver
-    await Sys.StartWebserver();
-
-    Sys.Print('Host.Init\n');
-    await Host.Init();
-
-    // Start a REPL instance (if stdout is a TTY)
-    if (stdout && stdout.isTTY) {
-      Sys.#repl = start({
-        prompt: '] ',
-        eval(command, context, filename, callback) {
-          mainLoop.notify();
-          this.clearBufferedCommand();
-          Cmd.text += command;
-          setTimeout(() => callback(null), 20); // we have to wait at least one frame before expecting a result
-        },
-        completer(line) {
-          const completions = [
-            ...Cmd.GetCommandNames(),
-            ...Cvar.GetVariableNames(),
-          ];
-
-          const hits = completions.filter((c) => c.startsWith(line));
-          return [hits.length ? hits : completions, line];
-        },
-      });
-
-      Sys.#repl.on('exit', () => Sys.Quit());
-    }
-
-    Sys.#isRunning = true;
-
-    if (Host.refreshrate.value === 0) {
-      Host.refreshrate.set(60);
-    }
-
-    // Main loop
-    while (Sys.#isRunning) {
-      const startTime = Date.now();
-
-      await Host.Frame();
-
-      const dtime = Date.now() - startTime;
-
-      if (dtime > 100) {
-        Sys.Print(`Host.Frame took too long: ${dtime} ms\n`);
-      }
-
-      await Q.sleep(Math.max(0, 1000.0 / Math.min(300, Math.max(60, Host.refreshrate.value)) - dtime));
-
-      // when there are no more commands to process and no active connections, we can sleep indefinitely
-      if (NET.activeconnections === 0 && Host._scheduledForNextFrame.length === 0 && !Cmd.HasPendingCommands()) {
-        await mainLoop.sleep();
-      }
-    }
-  }
-
-  /**
-   * Handles quitting the system gracefully.
-   */
-  static Quit() {
-    Sys.#isRunning = false;
-
-    Host.Shutdown();
-    Sys.Print('Sys.Quit: exitting process\n');
-    exit(0);
-  }
-
-  /**
-   * Prints a message to the console.
-   * @param {string} text - The text to print.
-   */
-  static Print(text) {
-    stdout.write(String(text).trim() + '\n');
-  }
-
-  /**
-   * Returns the time elapsed since initialization.
-   * @returns {number} - Elapsed time in seconds.
-   */
-  static FloatTime() {
-    return Date.now() * 0.001 - Sys.#oldtime;
-  }
-
-  /**
-   * Returns the time elapsed since initialization in milliseconds.
-   * @returns {number} - Elapsed time in milliseconds.
-   */
-  static FloatMilliTime() {
-    return performance.now();
-  }
-
-  /** @private */
-  static async StartWebserver() {
-    if (COM.CheckParm('-noserver')) {
-      Sys.Print('Webserver disabled via -noserver\n');
-      return;
-    }
-
-    const app = express();
-
-    const basepath = COM.GetParm('-basepath') || '';
-
-    const listenPort = COM.GetParm('-port') || 3000;
-    const listenAddress = COM.GetParm('-ip');
-
-    Sys.Print(`Webserver will listen on ${listenAddress || 'all interfaces'} on port ${listenPort}\n`);
-
-    const __dirname = import.meta.dirname + '/../..';
-
-    const distHeaders = (res) => {
-      res.set('Cross-Origin-Opener-Policy', 'same-origin');
-      res.set('Cross-Origin-Embedder-Policy', 'require-corp');
-    };
-
-    if (basepath !== '') {
-      app.use(basepath, express.static(join(__dirname + '/..', 'dist/browser'), { setHeaders: distHeaders }));
-      app.use(basepath + '/data', express.static(join(__dirname + '/..', 'data')));
-      app.use(basepath + '/source', express.static(join(__dirname + '/..', 'source')));
-    } else {
-      app.use(express.static(join(__dirname + '/..', 'dist/browser'), { setHeaders: distHeaders }));
-      app.use('/data', express.static(join(__dirname + '/..', 'data')));
-      app.use('/source', express.static(join(__dirname + '/..', 'source')));
-    }
-
-    const skipChars = (basepath + '/qfs/').length;
-    app.get(basepath + '/qfs/*', async (req, res) => {
-      try {
-        // Remove the leading "/data/" to get the relative filename
-        // e.g. "/data/id1/progs/player.mdl" -> "id1/progs/player.mdl"
-        const requestedPath = req.path.substring(skipChars);
-
-        const fileData = await COM.LoadFile(requestedPath);
-
-        if (!fileData) {
-          // File not found or empty result
-          return res.status(404).send('File not found');
-        }
-
-        // Set headers and send the file data
-        res.setHeader('Content-Type', 'application/octet-stream');
-        res.setHeader('Cache-Control', Host.developer.value ? 'private, max-age=0' : 'public, max-age=86400');
-
-        // Convert ArrayBuffer -> Buffer before sending
-        return res.send(Buffer.from(fileData));
-      } catch (error) {
-        console.error('Error serving file:', error);
-        return res.status(500).send('Internal Server Error');
-      }
-    });
-
-    const server = createServer(app);
-
-    await new Promise((resolve, reject) => {
-      server.once('error', (error) => {
-        if ('code' in error && error.code === 'EADDRINUSE') {
-          reject(new Error(`Webserver failed to start: port ${listenPort} is already in use`, { cause: error }));
-          return;
-        }
-
-        reject(new Error('Webserver failed to start', { cause: error }));
-      });
-
-      server.listen({
-        port: listenPort,
-        host: listenAddress || undefined,
-      }, () => {
-        Sys.Print(`Webserver listening on port ${listenPort} (${listenAddress || 'all interfaces'})\n`);
-
-        NET.server = server;
-        resolve();
-      });
-    });
-  }
-};
+export { default } from './Sys.ts';
 
diff --git a/source/engine/server/Sys.ts b/source/engine/server/Sys.ts
new file mode 100644
index 00000000..bdca6b51
--- /dev/null
+++ b/source/engine/server/Sys.ts
@@ -0,0 +1,271 @@
+/* global Buffer */
+
+import type { AddressInfo } from 'node:net';
+import type { REPLEval } from 'node:repl';
+import { argv, stdout, exit } from 'node:process';
+import { start } from 'repl';
+
+import express from 'express';
+import { join } from 'path';
+import { createServer } from 'http';
+
+import { eventBus, getCommonRegistry } from '../registry.mjs';
+import Cvar from '../common/Cvar.ts';
+import Cmd from '../common/Cmd.ts';
+import Q from '../../shared/Q.ts';
+import BaseSys from '../common/Sys.ts';
+import WorkerManager from '../common/WorkerManager.ts';
+import workerFactories from '../common/WorkerFactories.ts';
+
+type MainLoopResolver = (() => void) | null;
+type CrashReason =
+  | Error
+  | string
+  | null
+  | undefined
+  | {
+      readonly name?: string;
+      readonly message?: string;
+      readonly constructor?: { readonly name?: string };
+    };
+
+let { COM, Host, NET } = getCommonRegistry();
+
+eventBus.subscribe('registry.frozen', () => {
+  ({ COM, Host, NET } = getCommonRegistry());
+});
+
+eventBus.subscribe('host.crash', (error: CrashReason) => {
+  console.error(error);
+  exit(1);
+});
+
+class MainLoop {
+  static #resolve: MainLoopResolver = null;
+
+  static sleep(): Promise<void> {
+    return new Promise<void>((resolve) => {
+      this.#resolve = resolve;
+    });
+  }
+
+  static notify(): void {
+    if (this.#resolve !== null) {
+      this.#resolve();
+      this.#resolve = null;
+    }
+  }
+}
+
+const evaluateReplCommand: REPLEval = function(command, _context, _filename, callback): void {
+  MainLoop.notify();
+  this.clearBufferedCommand();
+  Cmd.text += command;
+  setTimeout(() => callback(null), 20); // we have to wait at least one frame before expecting a result
+};
+
+eventBus.subscribe('net.connection.accepted', () => {
+  MainLoop.notify();
+});
+
+/**
+ * System class to manage initialization, quitting, and REPL functionality.
+ */
+export default class Sys extends BaseSys {
+  static #oldtime = 0;
+  static #isRunning = false;
+
+  /**
+   * Initializes the low-level system.
+   */
+  static override async Init(): Promise<void> {
+    // Initialize command-line arguments
+    COM.InitArgv(argv);
+
+    eventBus.subscribe('console.print-line', (line: string) => {
+      stdout.write(line + '\n');
+    });
+
+    // Record the initial time
+    Sys.#oldtime = Date.now() * 0.001;
+
+    // Start worker manager
+    WorkerManager.Init(workerFactories);
+
+    // Start webserver
+    await Sys.#startWebserver();
+
+    Sys.Print('Host.Init\n');
+    await Host.Init();
+
+    // Start a REPL instance (if stdout is a TTY)
+    if (stdout && stdout.isTTY) {
+      const repl = start({
+        prompt: '] ',
+        eval: evaluateReplCommand,
+        completer(line: string): [string[], string] {
+          const completions = [
+            ...Cmd.GetCommandNames(),
+            ...Cvar.GetVariableNames(),
+          ];
+
+          const hits = completions.filter((c) => c.startsWith(line));
+          return [hits.length ? hits : completions, line];
+        },
+      });
+
+      repl.on('exit', () => Sys.Quit());
+    }
+
+    // eslint-disable-next-line require-atomic-updates
+    Sys.#isRunning = true;
+
+    if (Host.refreshrate.value === 0) {
+      Host.refreshrate.set(60);
+    }
+
+    // Main loop
+    while (Sys.#isRunning) {
+      const startTime = Date.now();
+
+      await Host.Frame();
+
+      const dtime = Date.now() - startTime;
+
+      if (dtime > 100) {
+        Sys.Print(`Host.Frame took too long: ${dtime} ms\n`);
+      }
+
+      await Q.sleep(Math.max(0, 1000.0 / Math.min(300, Math.max(60, Host.refreshrate.value)) - dtime));
+
+      // when there are no more commands to process and no active connections, we can sleep indefinitely
+      if (NET.activeconnections === 0 && Host._scheduledForNextFrame.length === 0 && !Cmd.HasPendingCommands()) {
+        await MainLoop.sleep();
+      }
+    }
+  }
+
+  /**
+   * Handles quitting the system gracefully.
+   */
+  static override Quit(): never {
+    Sys.#isRunning = false;
+
+    Host.Shutdown();
+    Sys.Print('Sys.Quit: exitting process\n');
+    exit(0);
+  }
+
+  /**
+   * Prints a message to the console.
+   */
+  static override Print(text: string): void {
+    stdout.write(String(text).trim() + '\n');
+  }
+
+  /**
+   * Returns the time elapsed since initialization.
+    * @returns The elapsed time in seconds.
+   */
+  static override FloatTime(): number {
+    return Date.now() * 0.001 - Sys.#oldtime;
+  }
+
+  /**
+   * Returns the time elapsed since initialization in milliseconds.
+    * @returns The elapsed time in milliseconds.
+   */
+  static override FloatMilliTime(): number {
+    return performance.now();
+  }
+
+  /**
+   * Starts the dedicated server web frontend.
+   */
+  static async #startWebserver(): Promise<void> {
+    if (COM.CheckParm('-noserver')) {
+      Sys.Print('Webserver disabled via -noserver\n');
+      return;
+    }
+
+    const app = express();
+
+    const basepath = COM.GetParm('-basepath') || '';
+
+    const listenPort = Number(COM.GetParm('-port') || 3000);
+    const listenAddress = COM.GetParm('-ip');
+
+    Sys.Print(`Webserver will listen on ${listenAddress || 'all interfaces'} on port ${listenPort}\n`);
+
+    const __dirname = import.meta.dirname + '/../..';
+
+    const distHeaders = (res: express.Response): void => {
+      res.set('Cross-Origin-Opener-Policy', 'same-origin');
+      res.set('Cross-Origin-Embedder-Policy', 'require-corp');
+    };
+
+    if (basepath !== '') {
+      app.use(basepath, express.static(join(__dirname + '/..', 'dist/browser'), { setHeaders: distHeaders }));
+      app.use(basepath + '/data', express.static(join(__dirname + '/..', 'data')));
+      app.use(basepath + '/source', express.static(join(__dirname + '/..', 'source')));
+    } else {
+      app.use(express.static(join(__dirname + '/..', 'dist/browser'), { setHeaders: distHeaders }));
+      app.use('/data', express.static(join(__dirname + '/..', 'data')));
+      app.use('/source', express.static(join(__dirname + '/..', 'source')));
+    }
+
+    const skipChars = (basepath + '/qfs/').length;
+    app.get(basepath + '/qfs/*', async (req: express.Request, res: express.Response) => {
+      try {
+        // Remove the leading "/data/" to get the relative filename
+        // e.g. "/data/id1/progs/player.mdl" -> "id1/progs/player.mdl"
+        const requestedPath = req.path.substring(skipChars);
+
+        const fileData = await COM.LoadFile(requestedPath);
+
+        if (!fileData) {
+          // File not found or empty result
+          return res.status(404).send('File not found');
+        }
+
+        // Set headers and send the file data
+        res.setHeader('Content-Type', 'application/octet-stream');
+        res.setHeader('Cache-Control', Host.developer.value ? 'private, max-age=0' : 'public, max-age=86400');
+
+        // Convert ArrayBuffer -> Buffer before sending
+        return res.send(Buffer.from(fileData));
+      } catch (error) {
+        console.error('Error serving file:', error);
+        return res.status(500).send('Internal Server Error');
+      }
+    });
+
+    const server = createServer(app);
+
+    await new Promise<void>((resolve, reject) => {
+      server.once('error', (error: NodeJS.ErrnoException) => {
+        if ('code' in error && error.code === 'EADDRINUSE') {
+          reject(new Error(`Webserver failed to start: port ${listenPort} is already in use`, { cause: error }));
+          return;
+        }
+
+        reject(new Error('Webserver failed to start', { cause: error }));
+      });
+
+      server.listen({
+        port: listenPort,
+        host: listenAddress || undefined,
+      }, () => {
+        const address = server.address() as AddressInfo | string | null;
+        const boundAddress = typeof address === 'object' && address !== null ? address.address : (listenAddress || 'all interfaces');
+
+        Sys.Print(`Webserver listening on port ${listenPort} (${boundAddress})\n`);
+
+        NET.server = server;
+        resolve();
+      });
+    });
+  }
+}
+
+
diff --git a/test/common/server-module-shims.test.mjs b/test/common/server-module-shims.test.mjs
new file mode 100644
index 00000000..bee2f8a9
--- /dev/null
+++ b/test/common/server-module-shims.test.mjs
@@ -0,0 +1,25 @@
+import test from 'node:test';
+import assert from 'node:assert/strict';
+
+import BaseCom from '../../source/engine/common/Com.ts';
+import BaseSys from '../../source/engine/common/Sys.ts';
+import ComMjs from '../../source/engine/server/Com.mjs';
+import ComTs from '../../source/engine/server/Com.ts';
+import SysMjs from '../../source/engine/server/Sys.mjs';
+import SysTs from '../../source/engine/server/Sys.ts';
+
+void test('server Com shim re-exports the TypeScript implementation', () => {
+  assert.strictEqual(ComMjs, ComTs);
+});
+
+void test('server Sys shim re-exports the TypeScript implementation', () => {
+  assert.strictEqual(SysMjs, SysTs);
+});
+
+void test('server Com inherits the common COM base class', () => {
+  assert.strictEqual(Object.getPrototypeOf(ComTs), BaseCom);
+});
+
+void test('server Sys inherits the common Sys base class', () => {
+  assert.strictEqual(Object.getPrototypeOf(SysTs), BaseSys);
+});

From 367935591824c9315bae5c5c62e71093a090df20 Mon Sep 17 00:00:00 2001
From: Christian R <github@chrisnew.de>
Date: Fri, 3 Apr 2026 23:03:47 +0300
Subject: [PATCH 38/67] TS: server/ part 5

---
 source/engine/server/Com.ts              |    4 +-
 source/engine/server/Navigation.mjs      | 1818 +--------------------
 source/engine/server/Navigation.ts       | 1863 ++++++++++++++++++++++
 source/engine/server/Progs.ts            |   30 +-
 source/engine/server/ProgsAPI.mjs        |  549 +------
 source/engine/server/ProgsAPI.ts         |  645 ++++++++
 source/engine/server/ServerMessages.ts   |   11 +-
 source/engine/server/Sys.ts              |    4 +-
 test/common/server-module-shims.test.mjs |    8 +
 test/physics/navigation.test.mjs         |   24 +-
 10 files changed, 2547 insertions(+), 2409 deletions(-)
 create mode 100644 source/engine/server/Navigation.ts
 create mode 100644 source/engine/server/ProgsAPI.ts

diff --git a/source/engine/server/Com.ts b/source/engine/server/Com.ts
index fed68f9d..fc723b76 100644
--- a/source/engine/server/Com.ts
+++ b/source/engine/server/Com.ts
@@ -19,7 +19,7 @@ export default class NodeCOM extends COM {
 
   /**
    * Loads a file, searching through registered search paths and packs.
-    * @returns The file contents, or null when the file cannot be found.
+   * @returns The file contents, or null when the file cannot be found.
    */
   static override async LoadFile(filename: string): Promise<ArrayBuffer | null> {
     filename = filename.toLowerCase();
@@ -93,7 +93,7 @@ export default class NodeCOM extends COM {
 
   /**
    * Loads and parses a pack file.
-    * @returns The parsed pack entries, or null when the pack file does not exist.
+   * @returns The parsed pack entries, or null when the pack file does not exist.
    */
   static async LoadPackFile(packfile: string): Promise<PackFileEntry[] | null> {
     if (!existsSync(`data/${packfile}`)) { // CR: wanna see something ugly? check out the async version of existsSync…
diff --git a/source/engine/server/Navigation.mjs b/source/engine/server/Navigation.mjs
index 4845335b..8fa28c94 100644
--- a/source/engine/server/Navigation.mjs
+++ b/source/engine/server/Navigation.mjs
@@ -1,1817 +1 @@
-// import sampleBSpline from '../../shared/BSpline.ts';
-import * as Def from '../../shared/Defs.ts';
-import { Octree } from '../../shared/Octree.ts';
-import Vector from '../../shared/Vector.ts';
-import Cmd from '../common/Cmd.ts';
-// import Cmd, { ConsoleCommand } from '../common/Cmd.ts';
-import Cvar from '../common/Cvar.ts';
-import { CorruptedResourceError, MissingResourceError } from '../common/Errors.ts';
-import { ServerEngineAPI } from '../common/GameAPIs.ts';
-import { BrushModel } from '../common/Mod.ts';
-import { MIN_STEP_NORMAL, STEPSIZE } from '../common/Pmove.ts';
-import { Face } from '../common/model/BaseModel.ts';
-import PlatformWorker from '../common/PlatformWorker.ts';
-import WorkerManager from '../common/WorkerManager.ts';
-import { eventBus, registry } from '../registry.mjs';
-import { ServerEdict } from './Edict.mjs';
-
-/** @typedef {import('./Edict.mjs').BaseEntity} ServerEntity */
-
-let { CL, COM, Con, R, SV } = registry;
-
-eventBus.subscribe('registry.frozen', () => {
-  CL = registry.CL;
-  COM = registry.COM;
-  Con = registry.Con;
-  R = registry.R;
-  SV = registry.SV;
-});
-
-class Waypoint {
-  origin = new Vector();
-  /** available clearance on the Z-axis */
-  availableHeight = Infinity; // space above the waypoint that is free
-  /** whether waypoint is near a ledge */
-  nearLedge = false;
-  /** whether waypoint is intersection something solid */
-  isClipping = false;
-  /** whether the point is sitting in the air */
-  isFloating = false;
-
-  /** @param {Vector} origin waypoint’s position */
-  constructor(origin) {
-    this.origin.set(origin);
-  }
-
-  serialize() {
-    return [
-      [...this.origin],
-      this.availableHeight,
-      this.nearLedge,
-      this.isClipping,
-      this.isFloating,
-    ];
-  }
-
-  static deserialize(data) {
-    const wp = new Waypoint(new Vector(...data[0]));
-    wp.availableHeight = data[1];
-    wp.nearLedge = data[2];
-    wp.isClipping = data[3];
-    wp.isFloating = data[4];
-    return wp;
-  }
-}
-
-class WalkableSurface {
-  /** @type {number} dot product of downwards and plane’s normal, e.g. 1 = flat, down to ~0.7 = slope */
-  stability = 0;
-  /** @type {Vector} surface’s normal vector */
-  normal = new Vector();
-  /** @type {Face} */
-  face = null;
-  /** @type {Waypoint[]} */
-  waypoints = [];
-
-  /**
-   * @param {Face} face face
-   * @param {number} index face index in the worldmodel
-   */
-  constructor(face, index) {
-    this.face = face;
-    this.faceIndex = index;
-  }
-
-  serialize() {
-    return [
-      this.stability,
-      [...this.normal],
-      this.faceIndex,
-      this.waypoints.map((wp) => wp.serialize()),
-    ];
-  }
-
-  static deserialize(data, navigation) {
-    const faceIndex = data[2];
-    const face = navigation.worldmodel.faces[faceIndex];
-    const surface = new WalkableSurface(face, faceIndex);
-    surface.stability = data[0];
-    surface.normal = new Vector(...data[1]);
-    surface.waypoints = data[3].map((wpData) => Waypoint.deserialize(wpData));
-    return surface;
-  }
-};
-
-/**
- * Navigation graph node
- */
-class Node {
-  id = -1;
-  origin = new Vector();
-  absmin = /** @type {Vector} */(null);
-  absmax = /** @type {Vector} */(null);
-  octreeNode = null;
-  availableHeight = 0; // average available height from all waypoints
-  nearLedge = false;
-  isClipping = false;
-  isFloating = false;
-  /** @type {?Set<WalkableSurface>} */
-  surfaces = new Set();
-  /** @type {number[][]} list of [id, cost, temporary cost adjustment] */
-  neighbors = [];
-
-  /**
-   * @param {number} id node ID
-   * @param {Vector} origin node position
-   */
-  constructor(id, origin) {
-    this.id = id;
-    this.origin.set(origin);
-  }
-
-  serialize() {
-    return [
-      this.id,
-      [...this.origin],
-      this.availableHeight,
-      this.nearLedge,
-      this.isClipping,
-      this.isFloating,
-      Array.from(this.surfaces).map((s) => s.serialize()),
-      this.neighbors.slice(),
-    ];
-  }
-
-  /**
-   * @param {any[]} data serialized data
-   * @param {Navigation} navigation navigation instance
-   * @returns {Node} deserialized node
-   */
-  // eslint-disable-next-line no-unused-vars
-  static deserialize(data, navigation) {
-    const node = new Node(data[0], new Vector(...data[1]));
-
-    node.availableHeight = data[2];
-    node.nearLedge = data[3];
-    node.isClipping = data[4];
-    node.isFloating = data[5];
-    // node.surfaces = new Set(data[6].map((id) => WalkableSurface.deserialize(id, navigation)));
-    node.neighbors = data[7].slice();
-
-    return node;
-  }
-}
-
-/**
- * Binary min-heap keyed by fScore for efficient A* open-set extraction.
- */
-class MinHeap {
-  /** @type {number[]} node IDs stored in heap order */
-  #data = [];
-  /** @type {Float64Array} fScore reference, indexed by node ID */
-  #keys;
-  /** @type {Int32Array} heap index of each node ID (-1 = not in heap) */
-  #index;
-
-  /** @param {number} capacity maximum node count */
-  constructor(capacity) {
-    this.#keys = new Float64Array(capacity).fill(Infinity);
-    this.#index = new Int32Array(capacity).fill(-1);
-  }
-
-  /** @returns {number} number of items in the heap */
-  get size() {
-    return this.#data.length;
-  }
-
-  /**
-   * Insert or update a node's priority.
-   * @param {number} id node ID
-   * @param {number} priority fScore value
-   */
-  pushOrDecrease(id, priority) {
-    this.#keys[id] = priority;
-
-    if (this.#index[id] !== -1) {
-      this.#bubbleUp(this.#index[id]);
-      return;
-    }
-
-    this.#data.push(id);
-    this.#index[id] = this.#data.length - 1;
-    this.#bubbleUp(this.#data.length - 1);
-  }
-
-  /**
-   * Extract the node with the smallest fScore.
-   * @returns {number} node ID with the lowest priority
-   */
-  pop() {
-    const top = this.#data[0];
-    const last = this.#data.pop();
-
-    this.#index[top] = -1;
-
-    if (this.#data.length > 0) {
-      this.#data[0] = last;
-      this.#index[last] = 0;
-      this.#sinkDown(0);
-    }
-
-    return top;
-  }
-
-  /**
-   * @param {number} i heap array index to bubble up
-   */
-  #bubbleUp(i) {
-    const data = this.#data;
-    const keys = this.#keys;
-    const idx = this.#index;
-
-    while (i > 0) {
-      const parent = (i - 1) >> 1;
-
-      if (keys[data[i]] >= keys[data[parent]]) {
-        break;
-      }
-
-      const tmp = data[i];
-      data[i] = data[parent];
-      data[parent] = tmp;
-      idx[data[i]] = i;
-      idx[data[parent]] = parent;
-      i = parent;
-    }
-  }
-
-  /**
-   * @param {number} i heap array index to sink down
-   */
-  #sinkDown(i) {
-    const data = this.#data;
-    const keys = this.#keys;
-    const idx = this.#index;
-    const n = data.length;
-
-    while (true) {
-      let smallest = i;
-      const left = 2 * i + 1;
-      const right = 2 * i + 2;
-
-      if (left < n && keys[data[left]] < keys[data[smallest]]) {
-        smallest = left;
-      }
-
-      if (right < n && keys[data[right]] < keys[data[smallest]]) {
-        smallest = right;
-      }
-
-      if (smallest === i) {
-        break;
-      }
-
-      const tmp = data[i];
-      data[i] = data[smallest];
-      data[smallest] = tmp;
-      idx[data[i]] = i;
-      idx[data[smallest]] = smallest;
-      i = smallest;
-    }
-  }
-}
-
-export class NavMeshOutOfDateException extends CorruptedResourceError {}
-
-// TODO: in future we could build graphs per entity type (e.g. monster navmesh with tighter clearances, flying monster navmesh that ignores ground support, etc.)
-
-const NAV_FILE_VERSION = 3;
-const NAV_MONSTER_MINS = new Vector(-16.0, -16.0, -24.0);
-const NAV_MONSTER_MAXS = new Vector(16.0, 16.0, 40.0);
-const NAV_LINK_STEP_DISTANCE = 8.0;
-
-export class Navigation {
-  /** @type {Cvar} */
-  static nav_save_waypoints = null;
-  /** @type {Cvar} */
-  static nav_debug_waypoints = null;
-  /** @type {Cvar} */
-  static nav_debug_graph = null;
-  /** @type {Cvar} */
-  static nav_debug_path = null;
-  /** @type {Cvar|null} NOTE: unavailable outside of dedicated server */
-  static nav_build_process = null;
-
-  /** maximum slope that is passable */
-  maxSlope = MIN_STEP_NORMAL;
-  walkerMins = NAV_MONSTER_MINS.copy();
-  walkerMaxs = NAV_MONSTER_MAXS.copy();
-  /** units of headroom required above waypoint */
-  requiredHeight = NAV_MONSTER_MAXS[2] - NAV_MONSTER_MINS[2];
-  requiredRadius = Math.max(
-    NAV_MONSTER_MAXS[0],
-    NAV_MONSTER_MAXS[1],
-    -NAV_MONSTER_MINS[0],
-    -NAV_MONSTER_MINS[1],
-  );
-
-  /** @type {Record<string,(path:Vector[]|null)=>(void)>} holds pending requests for the worker thread */
-  #requests = {};
-
-  /** @type {PlatformWorker} worker thread handling navigation lookups */
-  #worker = null;
-
-  /** @type {Function?} unsubscribe from nav.path.request */
-  #pathRequestEventListener = null;
-
-  /** @type {Function?} unsubscribe from nav.path.response */
-  #pathResponseEventListener = null;
-
-  /** @type {Function?} unsubscribe from nav_debug_graph changes */
-  #debugGraphEventListener = null;
-
-  /** @type {Function?} unsubscribe from nav_debug_waypoints changes */
-  #debugWaypointsEventListener = null;
-
-  constructor(worldmodel) {
-    /** @type {BrushModel?} */
-    this.worldmodel = worldmodel;
-    this.graph = {
-      /** @type {Node[]} */
-      nodes: [],
-      /** @type {?Octree<Node>} */
-      octree: null,
-    };
-
-    this.geometry = {
-      /** @type {WalkableSurface[]} */
-      walkableSurfaces: [],
-    };
-  }
-
-  static Init() {
-    if (registry.isDedicatedServer) {
-      this.nav_build_process = new Cvar('nav_build_process', '0', Cvar.FLAG.NONE, 'if set to 1, it will force build the nav mesh and quit');
-    }
-
-    this.nav_save_waypoints = new Cvar('nav_save_waypoints', '0', Cvar.FLAG.NONE, 'deprecated, extracted waypoints stay in memory and are not written to nav files');
-    this.nav_debug_graph = new Cvar('nav_debug_graph', '0', Cvar.FLAG.NONE, 'if set to 1, will render the navigation graph for debugging');
-    this.nav_debug_waypoints = new Cvar('nav_debug_waypoints', '0', Cvar.FLAG.NONE, 'if set to 1, will render all waypoints for debugging');
-    this.nav_debug_path = new Cvar('nav_debug_path', '0', Cvar.FLAG.NONE | Cvar.FLAG.CHEAT, 'if set to 1, will render the last computed path for debugging');
-
-    // worker thread -> main thread: mesh probably out of date
-    eventBus.subscribe('nav.build', () => {
-      if (SV.server.navigation) {
-        SV.server.navigation.build();
-      }
-    });
-
-    eventBus.subscribe('nav.debug.emit-dot.temporarily', (position, colors, ttl) => {
-      this.#emitDotFrontend(new Vector(...position), colors, ttl);
-    });
-
-    eventBus.subscribe('nav.debug.emit-dot.permanently', (position, colors) => {
-      this.#emitDotFrontend(new Vector(...position), colors, Infinity);
-    });
-  }
-
-  #initWorker() {
-    this.#worker = WorkerManager.SpawnWorker('server/NavigationWorker.mjs', [
-      'nav.load',
-      'nav.path.request',
-    ]);
-  }
-
-  #shutdownWorker() {
-    if (this.#worker) {
-      this.#worker.shutdown().catch((err) => {
-        Con.PrintError(`Failed to shutdown the navigation worker: ${err}\n`);
-      });
-
-      this.#worker = null;
-    }
-  }
-
-  #subscribePathResponse() {
-    this.#pathResponseEventListener = eventBus.subscribe('nav.path.response', (/** @type {string} */ id, /** @type {Vector[]} */ path) => {
-      const vecpath = path ? path.map((p) => new Vector(...p)) : null;
-
-      if (vecpath && Navigation.nav_debug_path?.value) {
-        this.#debugPath(vecpath);
-      }
-
-      // since all events are global, we need to check what’s intended for us
-      if (id in this.#requests) {
-        this.#requests[id](vecpath);
-        delete this.#requests[id];
-      }
-    });
-  }
-
-  #subscribeDebugCvars() {
-    this.#debugGraphEventListener = eventBus.subscribe('cvar.changed.nav_debug_graph', (/** @type {Cvar} */ cvar) => {
-      if (cvar.value !== 0) {
-        this.#scheduleDebugRefresh();
-      }
-    });
-
-    this.#debugWaypointsEventListener = eventBus.subscribe('cvar.changed.nav_debug_waypoints', (/** @type {Cvar} */ cvar) => {
-      if (cvar.value !== 0) {
-        this.#scheduleDebugRefresh();
-      }
-    });
-  }
-
-  #scheduleDebugRefresh() {
-    if (!R) {
-      return;
-    }
-
-    setTimeout(() => {
-      this.#debugWaypoints();
-      this.#debugNavigation();
-    }, 1000);
-  }
-
-  init() {
-    Con.DPrint('Navigation: initializing navigation graph...\n');
-
-    if (Navigation.nav_build_process?.value) {
-      this.build();
-    }
-
-    this.#initWorker();
-    this.#subscribePathResponse();
-    this.#subscribeDebugCvars();
-    eventBus.publish('nav.load', SV.server.mapname, SV.server.worldmodel.checksum);
-  }
-
-  shutdown() {
-    for (const timeout of Object.values(this.relinkEdictCooldown)) {
-      clearTimeout(timeout);
-    }
-
-    this.#shutdownWorker();
-
-    if (this.#pathRequestEventListener) {
-      this.#pathRequestEventListener();
-      this.#pathRequestEventListener = null;
-    }
-
-    if (this.#pathResponseEventListener) {
-      this.#pathResponseEventListener();
-      this.#pathResponseEventListener = null;
-    }
-
-    if (this.#debugGraphEventListener) {
-      this.#debugGraphEventListener();
-      this.#debugGraphEventListener = null;
-    }
-
-    if (this.#debugWaypointsEventListener) {
-      this.#debugWaypointsEventListener();
-      this.#debugWaypointsEventListener = null;
-    }
-
-    Con.DPrint('Navigation: shutdown complete.\n');
-  }
-
-  async load(mapname, expectedChecksum = null) {
-    console.assert(this.worldmodel || expectedChecksum, 'Navigation: worldmodel or expectedChecksum is required');
-
-    const filename = `maps/${mapname}.nav`;
-
-    this.graph.nodes.length = 0;
-    this.graph.octree = null;
-    this.relinkSkiplist.clear();
-
-    // Try to load binary file first (ArrayBuffer). Fallback to text JSON for older files.
-    const buf = await COM.LoadFile(filename);
-
-    if (!buf) {
-      throw new MissingResourceError(filename);
-    }
-
-    const dv = new DataView(buf);
-    let off = 0;
-
-    const readBytes = (/** @type {number} */ n) => {
-      const out = new Uint8Array(buf, off, n);
-      off += n;
-      return out;
-    };
-
-    const readUint8 = () => dv.getUint8(off++);
-    const readUint32 = () => { const v = dv.getUint32(off, true); off += 4; return v; };
-    const readInt32 = () => { const v = dv.getInt32(off, true); off += 4; return v; };
-    const readFloat32 = () => { const v = dv.getFloat32(off, true); off += 4; return v; };
-
-    // magic: 4 bytes
-    const magic = String.fromCharCode(...readBytes(4));
-    if (magic !== 'QSNM') {
-      throw new CorruptedResourceError(filename, 'invalid binary magic');
-    }
-
-    const version = readUint32();
-    if (version !== NAV_FILE_VERSION) {
-      throw new CorruptedResourceError(filename, 'invalid binary version');
-    }
-
-    // worldmodel name (uint16 length + utf8 bytes)
-    const nameLen = dv.getUint16(off, true); off += 2;
-    const nameBytes = readBytes(nameLen);
-    const worldName = new TextDecoder().decode(nameBytes);
-
-    const checksum = readUint32();
-    const requiredHeight = readFloat32();
-    const requiredRadius = readFloat32();
-
-    if (worldName !== mapname) {
-      throw new CorruptedResourceError(filename, 'wrong map');
-    }
-
-    if (expectedChecksum !== null) {
-      if (checksum !== expectedChecksum) {
-        throw new NavMeshOutOfDateException(filename, 'outdated map');
-      }
-    } else if (checksum !== this.worldmodel.checksum) {
-      throw new NavMeshOutOfDateException(filename, 'outdated map');
-    }
-
-    if (requiredHeight !== this.requiredHeight || requiredRadius !== this.requiredRadius) {
-      throw new NavMeshOutOfDateException(filename, 'configuration changed');
-    }
-
-    // relink skiplist
-    const relinkCount = readUint32();
-    for (let i = 0; i < relinkCount; i++) {
-      this.relinkSkiplist.add(readUint32());
-    }
-
-    // nodes
-    const nodeCount = readUint32();
-    for (let ni = 0; ni < nodeCount; ni++) {
-      const id = readInt32();
-      const ox = readFloat32(); const oy = readFloat32(); const oz = readFloat32();
-      const node = new Node(id, new Vector(ox, oy, oz));
-      node.availableHeight = readFloat32();
-      node.nearLedge = !!readUint8();
-      node.isClipping = !!readUint8();
-      node.isFloating = !!readUint8();
-
-      // surfaces (optional)
-      const surfCount = readUint32();
-      if (surfCount > 0) {
-        for (let si = 0; si < surfCount; si++) {
-          readFloat32();
-          readFloat32(); readFloat32(); readFloat32();
-          readUint32();
-          const wpCount = readUint32();
-          for (let wi = 0; wi < wpCount; wi++) {
-            readFloat32(); readFloat32(); readFloat32();
-            readFloat32();
-            readUint8();
-            readUint8();
-            readUint8();
-          }
-        }
-      }
-
-      // neighbors
-      const nbCount = readUint32();
-      const nbs = [];
-      for (let k = 0; k < nbCount; k++) {
-        const nid = readInt32();
-        const cost = readFloat32();
-        const adj = readFloat32();
-        nbs.push([nid, cost, adj]);
-      }
-      node.neighbors = nbs;
-
-      this.graph.nodes.push(node);
-    }
-
-    this.#buildOctree();
-    this.#scheduleDebugRefresh();
-  }
-
-  async save() {
-    console.assert(Boolean(this.worldmodel), 'Navigation: worldmodel is required');
-
-    const filename = `maps/${SV.server.mapname}.nav`;
-
-    const bytes = [];
-    const tmp = new ArrayBuffer(8);
-    const tdv = new DataView(tmp);
-
-    const pushUint8 = (v) => { bytes.push(v & 0xff); };
-    const pushUint16 = (v) => { bytes.push(v & 0xff); bytes.push((v >>> 8) & 0xff); };
-    const pushUint32 = (v) => {
-      bytes.push(v & 0xff);
-      bytes.push((v >>> 8) & 0xff);
-      bytes.push((v >>> 16) & 0xff);
-      bytes.push((v >>> 24) & 0xff);
-    };
-    const pushInt32 = (v) => pushUint32(v >>> 0);
-    const pushFloat32 = (f) => { tdv.setFloat32(0, f, true); const bv = new Uint8Array(tmp, 0, 4); bytes.push(bv[0], bv[1], bv[2], bv[3]); };
-    const pushBytes = (arr) => { for (let i = 0; i < arr.length; i++) { bytes.push(arr[i]); } };
-
-    // header magic
-    pushBytes(new TextEncoder().encode('QSNM'));
-    pushUint32(NAV_FILE_VERSION);
-
-    // world name
-    const nameBytes = new TextEncoder().encode(SV.server.mapname);
-    pushUint16(nameBytes.length);
-    pushBytes(nameBytes);
-
-    pushUint32(this.worldmodel.checksum);
-    pushFloat32(this.requiredHeight);
-    pushFloat32(this.requiredRadius);
-
-    // relink skiplist
-    pushUint32(this.relinkSkiplist.size);
-    for (const v of this.relinkSkiplist) {
-      pushUint32(v);
-    }
-
-    // nodes
-    pushUint32(this.graph.nodes.length);
-    for (const n of this.graph.nodes) {
-      pushInt32(n.id);
-      pushFloat32(n.origin[0]); pushFloat32(n.origin[1]); pushFloat32(n.origin[2]);
-      pushFloat32(n.availableHeight);
-      pushUint8(n.nearLedge ? 1 : 0);
-      pushUint8(n.isClipping ? 1 : 0);
-      pushUint8(n.isFloating ? 1 : 0);
-
-      // waypoints are build-only debug data and are intentionally not serialized
-      pushUint32(0);
-
-      // neighbors
-      pushUint32(n.neighbors.length);
-      for (const nb of n.neighbors) {
-        pushInt32(nb[0]);
-        pushFloat32(nb[1]);
-        pushFloat32(nb[2]);
-      }
-    }
-
-    const out = new Uint8Array(bytes);
-    await COM.WriteFile(filename, out, out.length);
-
-    // Keep the worker in sync after every successful rebuild, including listen-server sessions.
-    eventBus.publish('nav.load', SV.server.mapname, this.worldmodel.checksum);
-  }
-
-  #newWalkerStandOffset() {
-    return new Vector(0, 0, -this.walkerMins[2]);
-  }
-
-  /**
-   * @param {Vector} position stand origin
-   * @returns {boolean} true when the player-sized box fits at the given origin
-   */
-  #isValidStandOrigin(position) {
-    const trace = SV.collision.traceStaticWorld(
-      position.copy(),
-      this.walkerMins,
-      this.walkerMaxs,
-      position.copy(),
-    );
-
-    return !trace.startsolid && !trace.allsolid;
-  }
-
-  /**
-   * @param {Vector} startpos stand origin
-   * @param {Vector} endpos stand origin
-   * @returns {import('./physics/ServerCollisionSupport.ts').CollisionTrace} collision result
-   */
-  #traceWalkerStatic(startpos, endpos) {
-    return SV.collision.traceStaticWorld(
-      startpos.copy(),
-      this.walkerMins,
-      this.walkerMaxs,
-      endpos.copy(),
-    );
-  }
-
-  /**
-   * @param {Vector} position stand origin
-   * @returns {boolean} true when the walker has enough floor support at the position
-   */
-  #hasGroundSupport(position) {
-    const mins = position.copy().add(this.walkerMins);
-    const maxs = position.copy().add(this.walkerMaxs);
-
-    const allCornersSolid =
-      SV.collision.pointContents(new Vector(mins[0], mins[1], mins[2] - 1.0)) === Def.content.CONTENT_SOLID
-      && SV.collision.pointContents(new Vector(mins[0], maxs[1], mins[2] - 1.0)) === Def.content.CONTENT_SOLID
-      && SV.collision.pointContents(new Vector(maxs[0], mins[1], mins[2] - 1.0)) === Def.content.CONTENT_SOLID
-      && SV.collision.pointContents(new Vector(maxs[0], maxs[1], mins[2] - 1.0)) === Def.content.CONTENT_SOLID;
-
-    if (allCornersSolid) {
-      return true;
-    }
-
-    const start = position.copy().add(new Vector(0.0, 0.0, this.walkerMins[2] + 1.0));
-    const stop = start.copy().add(new Vector(0.0, 0.0, -2.0 * STEPSIZE));
-
-    let trace = SV.collision.move(start, Vector.origin, Vector.origin, stop, Def.moveTypes.MOVE_NOMONSTERS, null);
-
-    if (trace.fraction === 1.0) {
-      return false;
-    }
-
-    let bottom = trace.endpos[2];
-    const mid = bottom;
-
-    for (let x = 0; x <= 1; x++) {
-      for (let y = 0; y <= 1; y++) {
-        start[0] = stop[0] = x !== 0 ? maxs[0] : mins[0];
-        start[1] = stop[1] = y !== 0 ? maxs[1] : mins[1];
-
-        trace = SV.collision.move(start, Vector.origin, Vector.origin, stop, Def.moveTypes.MOVE_NOMONSTERS, null);
-
-        if (trace.fraction !== 1.0 && trace.endpos[2] > bottom) {
-          bottom = trace.endpos[2];
-        }
-
-        if (trace.fraction === 1.0 || (mid - trace.endpos[2]) > STEPSIZE) {
-          return false;
-        }
-      }
-    }
-
-    return true;
-  }
-
-  /**
-   * @param {Vector} position stand origin
-   * @param {number} [probeHeight] upward probe distance
-   * @returns {number} free vertical movement before the player box hits something
-   */
-  #measureAvailableHeight(position, probeHeight = this.requiredHeight) {
-    const trace = this.#traceWalkerStatic(position, position.copy().add(new Vector(0, 0, probeHeight)));
-    return Math.max(0.0, trace.endpos[2] - position[2]);
-  }
-
-  /**
-   * @param {WalkableSurface} surface surface to use for projection
-   * @returns {Vector} a point on the surface plane
-   */
-  #getSurfacePoint(surface) {
-    const surfedge = this.worldmodel.surfedges[surface.face.firstedge];
-
-    if (surfedge > 0) {
-      return new Vector().set(this.worldmodel.vertexes[this.worldmodel.edges[surfedge][0]]);
-    }
-
-    return new Vector().set(this.worldmodel.vertexes[this.worldmodel.edges[-surfedge][1]]);
-  }
-
-  /**
-   * @param {Vector} point point to project
-   * @param {WalkableSurface} surface target surface
-   * @returns {Vector} point projected onto the surface plane
-   */
-  #projectPointOntoSurface(point, surface) {
-    const surfacePoint = this.#getSurfacePoint(surface);
-    const pointToSurface = point.copy().subtract(surfacePoint);
-    const distanceToPlane = pointToSurface.dot(surface.normal);
-
-    return point.copy().subtract(surface.normal.copy().multiply(distanceToPlane));
-  }
-
-  /**
-   * @param {Vector} standOrigin stand origin to project
-   * @param {WalkableSurface} surface target surface
-   * @returns {Vector} stand origin snapped back onto the supporting plane
-   */
-  #projectStandOriginOntoSurface(standOrigin, surface) {
-    const floorPoint = standOrigin.copy();
-    floorPoint[2] += this.walkerMins[2];
-
-    return this.#projectPointOntoSurface(floorPoint, surface).add(this.#newWalkerStandOffset());
-  }
-
-  /**
-   * @param {Vector} origin base stand origin
-   * @param {WalkableSurface} surface target surface
-   * @param {number} x x offset
-   * @param {number} y y offset
-   * @returns {Vector} stand origin offset around the waypoint while following the surface plane
-   */
-  #offsetStandOrigin(origin, surface, x, y) {
-    const floorPoint = origin.copy();
-    floorPoint[2] += this.walkerMins[2];
-    floorPoint[0] += x;
-    floorPoint[1] += y;
-
-    return this.#projectPointOntoSurface(floorPoint, surface).add(this.#newWalkerStandOffset());
-  }
-
-  /**
-   * @param {Vector} startOrigin start stand origin
-   * @param {Vector} endOrigin end stand origin
-   * @returns {{ok: boolean, reason: string}} traversal result for static-world stand sampling
-   */
-  #evaluateTraversalBetween(startOrigin, endOrigin) {
-    if (!this.#isValidStandOrigin(startOrigin)) {
-      return { ok: false, reason: 'start-fit' };
-    }
-
-    if (!this.#isValidStandOrigin(endOrigin)) {
-      return { ok: false, reason: 'end-fit' };
-    }
-
-    if (!this.#hasGroundSupport(startOrigin) || !this.#hasGroundSupport(endOrigin)) {
-      return {
-        ok: false,
-        reason: !this.#hasGroundSupport(startOrigin) ? 'start-support' : 'end-support',
-      };
-    }
-
-    const delta = endOrigin.copy().subtract(startOrigin);
-    delta[2] = 0.0;
-
-    const totalDistance = delta.len();
-
-    if (totalDistance === 0.0) {
-      return {
-        ok: Math.abs(endOrigin[2] - startOrigin[2]) <= STEPSIZE,
-        reason: 'same-spot',
-      };
-    }
-
-    const stepDistance = Math.min(NAV_LINK_STEP_DISTANCE, totalDistance);
-    const direction = delta.copy().multiply(1.0 / totalDistance);
-    let previousOrigin = startOrigin;
-
-    for (let travelled = stepDistance; travelled < totalDistance; travelled += stepDistance) {
-      const t = travelled / totalDistance;
-      const sampleOrigin = startOrigin.copy().add(direction.copy().multiply(travelled));
-      sampleOrigin[2] = startOrigin[2] + (endOrigin[2] - startOrigin[2]) * t;
-
-      if (Math.abs(sampleOrigin[2] - previousOrigin[2]) > STEPSIZE + 1.0) {
-        return { ok: false, reason: 'height-mismatch' };
-      }
-
-      if (!this.#isValidStandOrigin(sampleOrigin)) {
-        return { ok: false, reason: 'step-fit' };
-      }
-
-      if (!this.#hasGroundSupport(sampleOrigin)) {
-        return { ok: false, reason: 'step-support' };
-      }
-
-      previousOrigin = sampleOrigin;
-    }
-
-    if (Math.abs(endOrigin[2] - previousOrigin[2]) > STEPSIZE + 1.0) {
-      return { ok: false, reason: 'height-mismatch' };
-    }
-
-    return { ok: true, reason: 'ok' };
-  }
-
-  #extractWalkableSurfaces() {
-    const walkableSurfaces = [];
-    let sampledWaypointCount = 0;
-    let retainedWaypointCount = 0;
-
-    const upwards = new Vector(0, 0, 1);
-    const sidewards = new Vector(0, 1, 0);
-
-    // Pass 1: collect all potentially walkable surfaces
-    for (let i = 0; i < this.worldmodel.faces.length; i++) {
-      const face = this.worldmodel.faces[i];
-
-      if (face.numedges < 3) {
-        continue;
-      }
-
-      const walkableSurface = new WalkableSurface(face, i);
-
-      // Only accept surfaces whose normals point upward and do not exceed a 45 degrees incline.
-      const faceNormal = face.normal;
-
-      walkableSurface.stability = faceNormal.dot(upwards);
-
-      if (walkableSurface.stability < this.maxSlope) {
-        continue;
-      }
-
-      // Ignore special surfaces, also submodel faces
-      if (face.turbulent === true || face.sky === true || face.submodel === true) {
-        continue;
-      }
-
-      walkableSurface.normal.set(faceNormal);
-
-      walkableSurfaces.push(walkableSurface);
-    }
-
-    // Pass 2: check if the walkable surfaces are really walkable by sampling points on them
-    // - create sample points across each walkable face (interior sampling)
-    // - approach: build ordered 3D vertex list for the face, project to a local 2D basis
-    // - grid-sample the face bounding box and keep points that lie inside the polygon
-    for (const surface of walkableSurfaces) {
-      const face = surface.face;
-      /** @type {Vector[]} collect ordered vertices for this face */
-      const verts3 = [];
-      for (let i = 0; i < face.numedges; i++) {
-        const vec = new Vector();
-        const surfedge = this.worldmodel.surfedges[face.firstedge + i];
-
-        if (surfedge > 0) {
-          vec.set(this.worldmodel.vertexes[this.worldmodel.edges[surfedge][0]]);
-        } else {
-          vec.set(this.worldmodel.vertexes[this.worldmodel.edges[-surfedge][1]]);
-        }
-
-        verts3.push(vec);
-      }
-
-      /** face plane normal */
-      const n = surface.normal.copy();
-
-      /** pick arbitrary axis not parallel to normal */
-      const arbitrary = Math.abs(n[2]) < 0.9 ? upwards : sidewards;
-
-      // build local orthonormal basis (u, v) on the face plane
-      const u = n.cross(arbitrary);
-      const uLen = u.normalize();
-
-      if (uLen === 0) {
-        continue;
-      }
-
-      const v = n.cross(u);
-      const vLen = v.normalize();
-
-      if (vLen === 0) {
-        continue;
-      }
-
-      const origin = verts3[0];
-
-      // project verts to 2D coordinates in [u, v] basis
-      const verts2 = verts3.map((p3) => {
-        const rel = p3.copy().subtract(origin);
-        return [rel.dot(u), rel.dot(v)];
-      });
-
-      // compute bounding box in 2D
-      let minX = Infinity, minY = Infinity;
-      let maxX = -Infinity, maxY = -Infinity;
-
-      for (const p of verts2) {
-        if (p[0] < minX) {
-          minX = p[0];
-        }
-        if (p[0] > maxX) {
-          maxX = p[0];
-        }
-        if (p[1] < minY) {
-          minY = p[1];
-        }
-        if (p[1] > maxY) {
-          maxY = p[1];
-        }
-      }
-
-      /**
-       * point-in-polygon (ray crossing)
-       * @param {number[]} pt 2D point
-       * @param {number[][]} poly polygon
-       * @returns {boolean} true if inside
-       */
-      const pointInPoly = (pt, poly) => {
-        let inside = false;
-        for (let i = 0, j = poly.length - 1; i < poly.length; j = i++) {
-          const xi = poly[i][0];
-          const yi = poly[i][1];
-          const xj = poly[j][0];
-          const yj = poly[j][1];
-          const intersect = ((yi > pt[1]) !== (yj > pt[1])) && (pt[0] < (xj - xi) * (pt[1] - yi) / (yj - yi + 0.0) + xi);
-          if (intersect) {
-            inside = !inside;
-          }
-        }
-        return inside;
-      };
-
-      // sample the actor center lane instead of the full polygon so narrow stairs and ledges
-      // can still produce valid points without relying on later support pruning alone.
-
-      // sampling resolution (units between samples on the face)
-      const step = 8;
-
-      const startX = Math.floor(minX / step) * step + (step * 0.5);
-      const startY = Math.floor(minY / step) * step + (step * 0.5);
-
-      // grid-sample the bounding box and test inclusion
-      for (let sx = startX; sx <= Math.ceil(maxX); sx += step) {
-        for (let sy = startY; sy <= Math.ceil(maxY); sy += step) {
-          const pt2 = [sx, sy];
-          if (!pointInPoly(pt2, verts2)) {
-            continue;
-          }
-
-          // map 2D point back to 3D: origin + u * x + v * y, then lift to a player stand origin
-          const worldPoint = origin.copy().add(u.copy().multiply(pt2[0])).add(v.copy().multiply(pt2[1]));
-          const standOrigin = worldPoint.add(this.#newWalkerStandOffset());
-
-          surface.waypoints.push(new Waypoint(standOrigin));
-          sampledWaypointCount++;
-        }
-      }
-    }
-
-    // Pass 3: prune waypoints that do not have enough player-sized clearance
-    const rr = this.requiredRadius;
-    const sideOffsets = [
-      [-rr * 1.4, -rr], [0.0, -rr], [rr * 1.4, -rr],
-      [-rr, 0.0], [rr, 0.0],
-      [-rr * 1.4, rr], [0.0, rr], [rr * 1.4, rr],
-    ];
-    const pruneStats = {
-      invalidFit: 0,
-      lowHeight: 0,
-      unsupported: 0,
-      retained: 0,
-    };
-
-    for (const surface of walkableSurfaces) {
-      for (const wp of surface.waypoints) {
-        if (!this.#isValidStandOrigin(wp.origin)) {
-          wp.availableHeight = 0;
-          wp.isClipping = true;
-          pruneStats.invalidFit++;
-          continue;
-        }
-
-        wp.availableHeight = this.#measureAvailableHeight(wp.origin);
-
-        if (wp.availableHeight < this.requiredHeight) {
-          wp.availableHeight = 0;
-          pruneStats.lowHeight++;
-          continue;
-        }
-
-        if (!this.#hasGroundSupport(wp.origin)) {
-          wp.isFloating = true;
-          pruneStats.unsupported++;
-          continue;
-        }
-
-        for (const [x, y] of sideOffsets) {
-          const sideOrigin = this.#offsetStandOrigin(wp.origin, surface, x, y);
-
-          if (!this.#isValidStandOrigin(sideOrigin)) {
-            continue;
-          }
-
-          if (!this.#hasGroundSupport(sideOrigin)) {
-            wp.nearLedge = true;
-            break;
-          }
-        }
-      }
-    }
-
-    // Pass 4: filter out unsuitable waypoints and store the rest
-    for (const surface of walkableSurfaces) {
-      /** @type {Waypoint[]} */
-      const suitableWaypoints = [];
-
-      for (const wp of surface.waypoints) {
-        if ((wp.availableHeight >= this.walkerMaxs[2] - this.walkerMins[2]) && !wp.isClipping && !wp.isFloating) {
-          suitableWaypoints.push(wp);
-          pruneStats.retained++;
-        }
-      }
-
-      if (suitableWaypoints.length === 0) {
-        continue;
-      }
-
-      surface.waypoints = suitableWaypoints;
-      retainedWaypointCount += suitableWaypoints.length;
-
-      this.geometry.walkableSurfaces.push(surface);
-    }
-
-    Con.DPrint(
-      `Navigation: walkable surfaces=${walkableSurfaces.length}, sampled waypoints=${sampledWaypointCount}, retained waypoints=${retainedWaypointCount}, retained surfaces=${this.geometry.walkableSurfaces.length}, invalidFit=${pruneStats.invalidFit}, lowHeight=${pruneStats.lowHeight}, unsupported=${pruneStats.unsupported}\n`,
-    );
-  }
-
-  #buildNavigationGraph() {
-    // Build a simple navgraph from the extracted waypoints.
-    // Steps:
-    // 1) collect all waypoints
-    // 2) merge nearby waypoints into graph nodes
-    // 3) connect nodes with unobstructed links (trace check)
-
-    const mergeRadius = 24; // units to merge nearby waypoints
-    const linkRadius = 64; // max distance to attempt a link
-
-    // 1) collect all waypoints into flat list
-    const allWaypoints = [];
-    for (const surface of this.geometry.walkableSurfaces) {
-      for (const wp of surface.waypoints) {
-        allWaypoints.push({ wp, surface });
-      }
-    }
-
-    // 2) merge nearby waypoints into nodes using surface-aware clustering
-    /** @type {Node[]} */
-    const nodes = this.graph.nodes;
-    nodes.length = 0;
-
-    const distance = (/** @type {Vector} */ a, /** @type {Vector} */ b) => Math.hypot(a[0] - b[0], a[1] - b[1]);
-
-    // Group waypoints that should be merged together
-    /** @type {{seedOrigin: Vector, items: {wp: Waypoint, surface: WalkableSurface, index: number}[]}[]} */
-    const waypointGroups = [];
-
-    for (let i = 0; i < allWaypoints.length; i++) {
-      const current = allWaypoints[i];
-      let bestGroup = null;
-      let bestDistance = Infinity;
-
-      for (const group of waypointGroups) {
-        const d = distance(group.seedOrigin, current.wp.origin);
-        const heightDiff = Math.abs(group.seedOrigin[2] - current.wp.origin[2]);
-
-        if (d > mergeRadius || heightDiff > STEPSIZE) {
-          continue;
-        }
-
-        if (d < bestDistance) {
-          bestDistance = d;
-          bestGroup = group;
-        }
-      }
-
-      if (bestGroup === null) {
-        waypointGroups.push({
-          seedOrigin: current.wp.origin.copy(),
-          items: [{ ...current, index: i }],
-        });
-        continue;
-      }
-
-      bestGroup.items.push({ ...current, index: i });
-    }
-
-    // Create nodes from waypoint groups
-    for (const group of waypointGroups) {
-      const id = nodes.length;
-
-      // Compute centroid of all waypoints in the group
-      const centroid = new Vector();
-      let representativeOrigin = /** @type {Vector|null} */ (null);
-      let representativeDistance = Infinity;
-      let minAvailableHeight = Infinity;
-      let nearLedge = false;
-      let isClipping = false;
-      let isFloating = false;
-      /** @type {Set<WalkableSurface>} */
-      const surfaces = new Set();
-
-      for (const { wp, surface } of group.items) {
-        centroid.add(wp.origin);
-        minAvailableHeight = Math.min(minAvailableHeight, wp.availableHeight);
-        nearLedge = nearLedge || wp.nearLedge;
-        isClipping = isClipping || wp.isClipping;
-        isFloating = isFloating || wp.isFloating;
-        surfaces.add(surface);
-      }
-
-      centroid.multiply(1.0 / group.items.length);
-
-      // If all waypoints are on the same surface, project centroid onto that surface
-      if (surfaces.size === 1) {
-        const surface = surfaces.values().next().value;
-        centroid.set(this.#projectStandOriginOntoSurface(centroid, surface));
-      }
-
-      for (const { wp } of group.items) {
-        const d = wp.origin.distanceTo(centroid);
-
-        if (d < representativeDistance) {
-          representativeDistance = d;
-          representativeOrigin = wp.origin;
-        }
-      }
-
-      const node = new Node(id, representativeOrigin ?? centroid);
-      node.availableHeight = Number.isFinite(minAvailableHeight) ? minAvailableHeight : 0.0;
-      node.nearLedge = nearLedge;
-      node.isClipping = isClipping;
-      node.isFloating = isFloating;
-      node.surfaces = surfaces;
-
-      nodes.push(node);
-    }
-
-    // 3) build spatial index before linking to accelerate neighbor search
-    this.#buildOctree();
-
-    // 4) connect nodes: attempt links between nearby, unobstructed node pairs
-    const linkStats = {
-      considered: 0,
-      linked: 0,
-      startFit: 0,
-      endFit: 0,
-      startSupport: 0,
-      endSupport: 0,
-      stepFit: 0,
-      stepSupport: 0,
-      heightMismatch: 0,
-    };
-
-    // track already-evaluated pairs to avoid duplicate work
-    const evaluatedPairs = new Set();
-
-    for (const a of nodes) {
-      for (const b of this.#findNearestNodes(a.origin, linkRadius)) {
-        if (a.id === b.id) {
-          continue;
-        }
-
-        // ensure each pair is evaluated only once
-        const lo = Math.min(a.id, b.id);
-        const hi = Math.max(a.id, b.id);
-        const pairKey = lo * nodes.length + hi;
-
-        if (evaluatedPairs.has(pairKey)) {
-          continue;
-        }
-
-        evaluatedPairs.add(pairKey);
-
-        const dist = b.origin.distanceTo(a.origin);
-
-        linkStats.considered++;
-
-        const aToB = this.#evaluateTraversalBetween(a.origin, b.origin);
-        const bToA = this.#evaluateTraversalBetween(b.origin, a.origin);
-
-        if (!aToB.ok && !bToA.ok) {
-          const reasons = [aToB.reason, bToA.reason];
-
-          if (reasons.includes('start-fit')) {
-            linkStats.startFit++;
-          } else if (reasons.includes('end-fit')) {
-            linkStats.endFit++;
-          } else if (reasons.includes('start-support')) {
-            linkStats.startSupport++;
-          } else if (reasons.includes('end-support')) {
-            linkStats.endSupport++;
-          } else if (reasons.includes('step-fit')) {
-            linkStats.stepFit++;
-          } else if (reasons.includes('step-support')) {
-            linkStats.stepSupport++;
-          } else {
-            linkStats.heightMismatch++;
-          }
-
-          continue;
-        }
-
-        if (aToB.ok) {
-          let cost = dist + Math.max(0.0, b.origin[2] - a.origin[2]);
-
-          if (a.nearLedge) {
-            cost += 96;
-          }
-
-          if (b.nearLedge) {
-            cost += 96;
-          }
-
-          a.neighbors.push([b.id, cost, 0]);
-          linkStats.linked++;
-        }
-
-        if (bToA.ok) {
-          let cost = dist + Math.max(0.0, a.origin[2] - b.origin[2]);
-
-          if (b.nearLedge) {
-            cost += 96;
-          }
-
-          if (a.nearLedge) {
-            cost += 96;
-          }
-
-          b.neighbors.push([a.id, cost, 0]);
-          linkStats.linked++;
-        }
-      }
-    }
-
-    Con.DPrint(
-      `Navigation: merged ${allWaypoints.length} waypoints into ${waypointGroups.length} waypoint groups\n`,
-    );
-    Con.PrintWarning(
-      `Navigation: link stats considered=${linkStats.considered} linked=${linkStats.linked} `
-      + `startFit=${linkStats.startFit} endFit=${linkStats.endFit} `
-      + `startSupport=${linkStats.startSupport} endSupport=${linkStats.endSupport} `
-      + `stepFit=${linkStats.stepFit} stepSupport=${linkStats.stepSupport} heightMismatch=${linkStats.heightMismatch}\n`,
-    );
-  }
-
-  /** @type {Record<number,*>} edict number to timeout, we cool down incoming updates here */
-  relinkEdictCooldown = {};
-
-  /** @type {Record<number,Node>} */
-  relinkEdictLinks = {};
-
-  /** @type {Set<number>} edict numbers not interesting for relinking (e.g. func_door) */
-  relinkSkiplist = new Set();
-
-  /**
-   * updates navigation links based on entity position
-   * @param {ServerEdict} edict edict to relink
-   */
-  relinkEdict(edict) {
-    /** @type {?ServerEntity} */
-    const entity = edict.entity;
-
-    if (!entity) {
-      return;
-    }
-
-    // only care about world and large static brushes for now
-    if (entity.solid !== Def.solid.SOLID_BSP) {
-      return;
-    }
-
-    // this edict got flagged as not interesting earlier
-    if (this.relinkSkiplist.has(edict.num)) {
-      return;
-    }
-
-    if (this.relinkEdictCooldown[edict.num]) {
-      clearTimeout(this.relinkEdictCooldown[edict.num]);
-    }
-
-    this.relinkEdictCooldown[edict.num] = setTimeout(() => {
-      delete this.relinkEdictCooldown[edict.num];
-      this.#relinkEdict(edict);
-    }, 1000);
-  }
-
-  /**
-   * updates navigation links based on entity position
-   * @param {ServerEdict} edict edict to relink
-   */
-  #relinkEdict(edict) {
-    if (edict.isFree()) {
-      return;
-    }
-
-    // TODO: adjust the nav graph accordingly
-  }
-
-  #relinkAll() {
-    for (let i = 0; i < SV.server.num_edicts; i++) {
-      const edict = SV.server.edicts[i];
-
-      if (edict.isFree()) {
-        continue;
-      }
-
-      this.#relinkEdict(edict);
-    }
-  }
-
-  #buildSpecialConnections() {
-    this.#buildTeleporterLinks();
-    this.#buildDoorLinks();
-    this.#relinkAll();
-  }
-
-  #buildTeleporterLinks() {
-    // looking for teleporters
-    for (const teleporterEdict of ServerEngineAPI.FindAllByFieldAndValue('classname', 'trigger_teleport')) {
-      /** @type {?ServerEntity} */
-      const source = teleporterEdict.entity;
-
-      if (!source) {
-        continue;
-      }
-
-      if (!source.target) {
-        continue;
-      }
-
-      const destinationEdict = Array.from(ServerEngineAPI.FindAllByFieldAndValue('targetname', source.target))[0];
-      /** @type {?ServerEntity} */
-      const destination = destinationEdict?.entity ?? null;
-
-      if (!destination) {
-        Con.PrintWarning(`Navigation: teleporter without a valid target: ${source.classname}\n`);
-        continue;
-      }
-
-      const sp = source.centerPoint.copy(), dp = destination.centerPoint.copy();
-
-      Con.DPrint(`Navigation: found teleporter [${sp}] --> [${dp}]\n`);
-
-      const destNode = this.#findNearestNode(dp, 96); // Just grab one in proximity of the destination
-
-      if (!destNode) {
-        Con.PrintWarning('Navigation: teleporter destination has no nearby navnode\n');
-        continue;
-      }
-
-      const cost = 0; // no cost for teleporters, since traveling is instant
-
-      // insert a new node here to smooth out the path to the teleporter trigger
-      const sourceNode = new Node(this.graph.nodes.length, sp);
-      sourceNode.availableHeight = source.maxs[2] - source.mins[2];
-      this.graph.nodes.push(sourceNode);
-      Con.DPrint(`Navigation: adding teleporter source node ${sourceNode.id}\n`);
-
-      // link the new node to its neighbors
-      for (const sourceNodeNeighbor of this.#findNearestNodes(sp, 64)) {
-        Con.DPrint(`Navigation: linking teleporter nodes ${sourceNodeNeighbor.id} --> ${sourceNode.id}\n`);
-        sourceNodeNeighbor.neighbors.push([sourceNode.id, cost, 0]); // one-way link
-        // this.graph.edges.push([ sourceNodeNeighbor.id, sourceNode.id, cost ]);
-      }
-
-      // link the new node to the destination node
-      Con.DPrint(`Navigation: linking teleporter nodes ${sourceNode.id} --> ${destNode.id}\n`);
-      sourceNode.neighbors.push([destNode.id, cost, 0]); // one-way link
-      // this.graph.edges.push([ sourceNode.id, destNode.id, cost ]);
-    }
-  }
-
-  #buildDoorLinks() {
-    // looking for simple doors
-    for (const doorEdict of ServerEngineAPI.FindAllByFieldAndValue('classname', 'func_door')) {
-      /** @type {?ServerEntity} */
-      const door = doorEdict.entity;
-
-      if (!door) {
-        continue;
-      }
-
-      if (door.targetname) { // remote controlled door, skip for now
-        continue;
-      }
-
-      this.relinkSkiplist.add(doorEdict.num);
-    }
-  }
-
-  #buildOctree() {
-    if (this.graph.nodes.length === 0) {
-      this.graph.octree = null;
-      return;
-    }
-
-    // compute bounding box of node origins
-    let minX = Infinity, minY = Infinity, minZ = Infinity;
-    let maxX = -Infinity, maxY = -Infinity, maxZ = -Infinity;
-
-    for (const n of this.graph.nodes) {
-      const o = n.origin;
-      if (o[0] < minX) { minX = o[0]; }
-      if (o[1] < minY) { minY = o[1]; }
-      if (o[2] < minZ) { minZ = o[2]; }
-      if (o[0] > maxX) { maxX = o[0]; }
-      if (o[1] > maxY) { maxY = o[1]; }
-      if (o[2] > maxZ) { maxZ = o[2]; }
-    }
-
-    const cx = (minX + maxX) / 2;
-    const cy = (minY + maxY) / 2;
-    const cz = (minZ + maxZ) / 2;
-    const extentX = maxX - minX;
-    const extentY = maxY - minY;
-    const extentZ = maxZ - minZ;
-    const halfSize = Math.max(extentX, extentY, extentZ) / 2 + 1;
-
-    const center = new Vector(cx, cy, cz);
-    this.graph.octree = /** @type {Octree<Node>} */(new Octree(center, halfSize, 12, 8));
-
-    for (const n of this.graph.nodes) {
-      this.graph.octree.insert(n);
-    }
-  }
-
-  /**
-   * Find nearest graph node to a world position.
-   * @param {Vector} position world-space position to query
-   * @param {number} maxDist maximum search distance in world units
-   * @returns {Node|null} node if found, null if none within maxDist or graph is empty
-   */
-  #findNearestNode(position, maxDist = 512) {
-    if (this.graph.nodes.length === 0) {
-      return null;
-    }
-
-    // first try octree lookup, if available (linking specials won’t have access to the Octree yet)
-    if (this.graph.octree) {
-      const n = this.graph.octree.nearest(position, maxDist);
-
-      if (n) {
-        return n;
-      }
-    }
-
-    // fallthrough to full scan if nothing found within maxDist in octree
-    Con.DPrint('Navigation: nearest node not found in octree, falling back to linear scan\n');
-
-    let best = null;
-    let bestDist = Infinity;
-
-    for (const node of this.graph.nodes) {
-      const d = position.distanceTo(node.origin);
-      if (d < bestDist && d <= maxDist) {
-        bestDist = d;
-        best = node;
-      }
-    }
-
-    return best;
-  }
-
-  /**
-   * Find all graph nodes within maxDist of a world position.
-   * Uses the octree when available, falls back to linear scan.
-   * @param {Vector} position world-space position to query
-   * @param {number} maxDist maximum search distance in world units
-   * @yields {Node} nodes within range
-   */
-  *#findNearestNodes(position, maxDist = 512) {
-    if (this.graph.octree) {
-      for (const [, node] of this.graph.octree.root.querySphere(position, maxDist)) {
-        yield node;
-      }
-      return;
-    }
-
-    for (const node of this.graph.nodes) {
-      const d = position.distanceTo(node.origin);
-      if (d <= maxDist) {
-        yield node;
-      }
-    }
-  }
-
-  /**
-   * Find path between two world positions using A* over the navgraph.
-   * Returns an array of Vector positions (node origins) or null if no path.
-   * Using this async version will offload the pathfinding to another worker thread and it will not recover during save/load games!
-   * @param {Vector} startPos start position
-   * @param {Vector} goalPos goal position
-   * @returns {Promise<Vector[]|null>} path made out of waypoints, or null if no path found, it will include start and end positions
-   */
-  findPathAsync(startPos, goalPos) {
-    return new Promise((resolve) => {
-      const id = Math.random().toString(36).substring(2, 10);
-
-      this.#requests[id] = resolve;
-
-      eventBus.publish('nav.path.request', id, startPos, goalPos);
-    });
-  }
-
-  /**
-   * Find path between two world positions using A* over the navgraph.
-   * Returns an array of Vector positions (node origins) or null if no path.
-   * @param {Vector} startPos start position
-   * @param {Vector} goalPos goal position
-   * @returns {Vector[]|null} path made out of waypoints, or null if no path found, it will include start and end positions
-   */
-  findPath(startPos, goalPos) {
-    if (!this.graph || !this.graph.nodes || this.graph.nodes.length === 0) {
-      return null;
-    }
-
-    const startNode = this.#findNearestNode(startPos, 512);
-    const goalNode = this.#findNearestNode(goalPos, 512);
-
-    if (!startNode || !goalNode) {
-      Con.DPrint('Navigation: no start or goal node found\n');
-      return null;
-    }
-
-    if (startNode.id === goalNode.id) {
-      const path = [startPos.copy(), goalPos.copy()];
-      return path;
-    }
-
-    const nodeCount = this.graph.nodes.length;
-    const gScore = new Float64Array(nodeCount).fill(Infinity);
-    const cameFrom = new Int32Array(nodeCount).fill(-1);
-    const openSet = new MinHeap(nodeCount);
-
-    gScore[startNode.id] = 0;
-    openSet.pushOrDecrease(startNode.id, startNode.origin.distanceTo(goalNode.origin));
-
-    while (openSet.size > 0) {
-      const currentId = openSet.pop();
-
-      if (currentId === goalNode.id) {
-        const path = [];
-        let cur = currentId;
-
-        while (cur !== -1) {
-          path.push(this.graph.nodes[cur].origin.copy());
-          cur = cameFrom[cur];
-        }
-
-        path.reverse();
-        path[0] = startPos.copy();
-        path.push(goalPos.copy());
-        return path;
-      }
-
-      const currentG = gScore[currentId];
-
-      for (const nb of this.graph.nodes[currentId].neighbors) {
-        const nbId = nb[0];
-        const tentativeG = currentG + nb[1] + nb[2];
-
-        if (tentativeG < gScore[nbId]) {
-          cameFrom[nbId] = currentId;
-          gScore[nbId] = tentativeG;
-          openSet.pushOrDecrease(nbId, tentativeG + this.graph.nodes[nbId].origin.distanceTo(goalNode.origin));
-        }
-      }
-    }
-
-    return null;
-  }
-
-  #emitDot(position, color = 15, ttl = Infinity) {
-    if (Number.isFinite(ttl)) {
-      eventBus.publish('nav.debug.emit-dot.temporarily', position, color, ttl);
-    } else {
-      eventBus.publish('nav.debug.emit-dot.permanently', position, color);
-    }
-  }
-
-  static #emitDotFrontend(position, color = 15, ttl = Infinity) {
-    if (!R) {
-      return;
-    }
-
-    const pn = R.AllocParticles(1);
-
-    if (pn.length !== 1) {
-      Con.PrintWarning(`Navigation: failed to allocate particle for debug dot at [${position}]\n`);
-      return;
-    }
-
-    const p = R.particles[pn[0]];
-    p.die = CL.state.time + ttl;
-    p.color = color;
-    p.vel = new Vector(0, 0, 0);
-    p.org = position.copy();
-    p.type = R.ptype.tracer;
-  }
-
-  #debugNavigation() {
-    if (!Navigation.nav_debug_graph.value) {
-      return;
-    }
-
-    for (const node of this.graph.nodes) {
-      let color = 144;
-
-      if (node.nearLedge) {
-        color = 251;
-      }
-
-      this.#emitDot(node.origin.copy().add(new Vector(0, 0, 16)), color);
-    }
-  }
-
-  /**
-   * @param {Vector[]} vectors waypoints
-   * @param {number} color indexed color
-   */
-  #debugPath(vectors, color = 251) {
-    if (!vectors || vectors.length === 0) {
-      return;
-    }
-
-    const viewOffset = new Vector(0, 0, 22);
-
-    for (let i = 0; i < vectors.length - 1; i++) {
-      const start = vectors[i].copy().add(viewOffset);
-      const end = vectors[i + 1].copy().add(viewOffset);
-      const diff = end.copy().subtract(start);
-      const totalDistance = diff.len();
-      const stepLength = 4;
-      diff.normalize();
-
-      // Sample along the segment every 5 units
-      for (let dist = 0; dist <= totalDistance; dist += stepLength) {
-        const samplePoint = start.copy().add(diff.copy().multiply(dist));
-        this.#emitDot(samplePoint, color, 10);
-      }
-    }
-  }
-
-  #debugWaypoints() {
-    if (!Navigation.nav_debug_waypoints.value) {
-      return;
-    }
-
-    if (this.geometry.walkableSurfaces.length === 0) {
-      Con.PrintWarning('Navigation: waypoint debug is only available immediately after a local nav build. Nav files do not include waypoint data.\n');
-      return;
-    }
-
-    /** @type {{origin: Vector, color: number, surface: WalkableSurface}[]} */
-    const debugPoints = [];
-    let waypoints = 0;
-
-    for (const surface of this.geometry.walkableSurfaces) {
-      for (const wp of surface.waypoints) {
-        let color = 15;
-
-        if (wp.nearLedge && surface.stability !== 1) {
-          color = 47;
-        } else if (wp.nearLedge) {
-          color = 251;
-        } else if (surface.stability !== 1) {
-          color = 192;
-        }
-
-        debugPoints.push({ origin: wp.origin, color, surface });
-        waypoints++;
-      }
-    }
-
-    Con.DPrint(`Navigation: debug waypoints: ${waypoints}\n`);
-    Con.DPrint(`Navigation: extracted walkable surfaces: ${this.geometry.walkableSurfaces.length}\n`);
-
-    for (const { color, origin } of debugPoints) {
-      this.#emitDot(origin, color);
-    }
-  }
-
-  // #debugKnownTestNavMeshProbes() {
-  //   if (SV.server.mapname !== 'test_nav_mesh') {
-  //     return;
-  //   }
-
-  //   const probes = [
-  //     ['knight-start', new Vector(-160.0, -112.0, -160.0)],
-  //     ['player-start', new Vector(352.0, -120.0, 40.0)],
-  //     ['tele-dest-1', new Vector(352.0, -24.0, 24.0)],
-  //     ['tele-dest-2', new Vector(-168.0, -416.0, -168.0)],
-  //   ];
-
-  //   for (const [label, origin] of probes) {
-  //     Con.PrintWarning(
-  //       `Navigation: probe ${label} fit=${this.#isValidStandOrigin(origin)} support=${this.#hasGroundSupport(origin)} height=${this.#measureAvailableHeight(origin)}\n`,
-  //     );
-  //   }
-  // }
-
-  build() {
-    console.assert(Boolean(this.worldmodel), 'Navigation: worldmodel is required');
-
-    this.graph.octree = null;
-    this.graph.nodes.length = 0;
-    this.geometry.walkableSurfaces.length = 0;
-    this.relinkSkiplist.clear();
-    this.relinkEdictLinks = {};
-
-    Con.PrintWarning('Navigation: node graph out of date, rebuilding...\n');
-
-    // this.#debugKnownTestNavMeshProbes();
-
-    this.#extractWalkableSurfaces();
-    this.#buildNavigationGraph();
-    this.#buildSpecialConnections();
-    this.#buildOctree();
-
-    Con.DPrint('Navigation: node graph built with ' + this.graph.nodes.length + ' nodes.\n');
-
-    void this.save()
-      .then(() => {
-        Con.PrintSuccess('Navigation: navigation graph saved!\n');
-        if (Navigation.nav_build_process?.value) {
-          void Cmd.ExecuteString('quit');
-        }
-      })
-      .catch((err) => Con.PrintError('Navigation: failed to save navigation graph: ' + err + '\n'));
-
-    this.#scheduleDebugRefresh();
-  }
-}
+export { Navigation, NavMeshOutOfDateException } from './Navigation.ts';
diff --git a/source/engine/server/Navigation.ts b/source/engine/server/Navigation.ts
new file mode 100644
index 00000000..557e1091
--- /dev/null
+++ b/source/engine/server/Navigation.ts
@@ -0,0 +1,1863 @@
+// import sampleBSpline from '../../shared/BSpline.ts';
+import * as Def from '../../shared/Defs.ts';
+import { Octree, type OctreeNode } from '../../shared/Octree.ts';
+import Vector from '../../shared/Vector.ts';
+import Cmd from '../common/Cmd.ts';
+// import Cmd, { ConsoleCommand } from '../common/Cmd.ts';
+import Cvar from '../common/Cvar.ts';
+import { CorruptedResourceError, MissingResourceError } from '../common/Errors.ts';
+import { ServerEngineAPI } from '../common/GameAPIs.ts';
+import type { BrushModel } from '../common/Mod.ts';
+import { MIN_STEP_NORMAL, STEPSIZE } from '../common/Pmove.ts';
+import type { Face } from '../common/model/BaseModel.ts';
+import type PlatformWorker from '../common/PlatformWorker.ts';
+import WorkerManager from '../common/WorkerManager.ts';
+import { eventBus, registry } from '../registry.mjs';
+import type { BaseEntity, ServerEdict } from './Edict.mjs';
+import type { CollisionTrace } from './physics/ServerCollisionSupport.ts';
+
+type VectorTuple = [number, number, number];
+type PlanePoint = [number, number];
+type WorkerVectorLike = Vector | VectorTuple;
+type WorkerPath = WorkerVectorLike[] | null;
+type NeighborLink = [id: number, cost: number, temporaryCostAdjustment: number];
+type SerializedWaypoint = [origin: VectorTuple, availableHeight: number, nearLedge: boolean, isClipping: boolean, isFloating: boolean];
+type SerializedWalkableSurface = [stability: number, normal: VectorTuple, faceIndex: number, waypoints: SerializedWaypoint[]];
+type SerializedNode = [
+  id: number,
+  origin: VectorTuple,
+  availableHeight: number,
+  nearLedge: boolean,
+  isClipping: boolean,
+  isFloating: boolean,
+  surfaces: SerializedWalkableSurface[],
+  neighbors: NeighborLink[],
+];
+type PathRequestResolver = (path: Vector[] | null) => void;
+type EventUnsubscribe = (() => void) | null;
+type TimeoutHandle = ReturnType<typeof setTimeout>;
+
+interface NavigationGraph {
+  readonly nodes: Node[];
+  octree: Octree<Node> | null;
+}
+
+interface NavigationGeometry {
+  walkableSurfaces: WalkableSurface[];
+}
+
+interface TraversalResult {
+  readonly ok: boolean;
+  readonly reason: string;
+}
+
+interface WaypointGroupItem {
+  readonly wp: Waypoint;
+  readonly surface: WalkableSurface;
+  readonly index: number;
+}
+
+interface WaypointGroup {
+  seedOrigin: Vector;
+  items: WaypointGroupItem[];
+}
+
+interface DebugPoint {
+  readonly origin: Vector;
+  readonly color: number;
+  readonly surface: WalkableSurface;
+}
+
+interface ServerEntity extends BaseEntity {
+  readonly centerPoint: Vector;
+  target?: string | null;
+  targetname?: string | null;
+}
+
+/**
+ * Converts a vector to a serializable tuple.
+ * @returns The vector components as a tuple.
+ */
+function vectorToTuple(vector: Vector): VectorTuple {
+  return [vector[0], vector[1], vector[2]];
+}
+
+let { CL, COM, Con, R, SV } = registry;
+
+eventBus.subscribe('registry.frozen', () => {
+  ({ CL, COM, Con, R, SV } = registry);
+});
+
+class Waypoint {
+  origin: Vector = new Vector();
+  /** available clearance on the Z-axis */
+  availableHeight = Infinity; // space above the waypoint that is free
+  /** whether waypoint is near a ledge */
+  nearLedge = false;
+  /** whether waypoint is intersection something solid */
+  isClipping = false;
+  /** whether the point is sitting in the air */
+  isFloating = false;
+
+  /**
+   * Creates a sampled waypoint on a walkable surface.
+   */
+  constructor(origin: Vector) {
+    this.origin.set(origin);
+  }
+
+  serialize(): SerializedWaypoint {
+    return [
+      vectorToTuple(this.origin),
+      this.availableHeight,
+      this.nearLedge,
+      this.isClipping,
+      this.isFloating,
+    ];
+  }
+
+  static deserialize(data: SerializedWaypoint): Waypoint {
+    const wp = new Waypoint(new Vector(...data[0]));
+    wp.availableHeight = data[1];
+    wp.nearLedge = data[2];
+    wp.isClipping = data[3];
+    wp.isFloating = data[4];
+    return wp;
+  }
+}
+
+class WalkableSurface {
+  /** dot product of downwards and plane’s normal, e.g. 1 = flat, down to ~0.7 = slope */
+  stability = 0;
+  /** surface’s normal vector. */
+  normal: Vector = new Vector();
+  face: Face;
+  readonly faceIndex: number;
+  waypoints: Waypoint[] = [];
+
+  /**
+   * Creates a walkable-face wrapper used during nav extraction.
+   */
+  constructor(face: Face, index: number) {
+    this.face = face;
+    this.faceIndex = index;
+  }
+
+  serialize(): SerializedWalkableSurface {
+    return [
+      this.stability,
+      vectorToTuple(this.normal),
+      this.faceIndex,
+      this.waypoints.map((wp) => wp.serialize()),
+    ];
+  }
+
+  static deserialize(data: SerializedWalkableSurface, navigation: Navigation): WalkableSurface {
+    const faceIndex = data[2];
+    const face = navigation.worldmodel?.faces[faceIndex];
+
+    console.assert(face, 'Navigation requires a worldmodel when deserializing surfaces');
+
+    const surface = new WalkableSurface(face, faceIndex);
+    surface.stability = data[0];
+    surface.normal = new Vector(...data[1]);
+    surface.waypoints = data[3].map((wpData) => Waypoint.deserialize(wpData));
+    return surface;
+  }
+};
+
+/**
+ * Navigation graph node
+ */
+class Node {
+  id = -1;
+  origin: Vector = new Vector();
+  absmin: Vector | null = null;
+  absmax: Vector | null = null;
+  octreeNode: OctreeNode<Node> | null = null;
+  availableHeight = 0; // average available height from all waypoints
+  nearLedge = false;
+  isClipping = false;
+  isFloating = false;
+  surfaces: Set<WalkableSurface> = new Set();
+  /** list of [id, cost, temporary cost adjustment]. */
+  neighbors: NeighborLink[] = [];
+
+  /**
+   * Creates a graph node representing one merged walkable region.
+   */
+  constructor(id: number, origin: Vector) {
+    this.id = id;
+    this.origin.set(origin);
+  }
+
+  serialize(): SerializedNode {
+    return [
+      this.id,
+      vectorToTuple(this.origin),
+      this.availableHeight,
+      this.nearLedge,
+      this.isClipping,
+      this.isFloating,
+      Array.from(this.surfaces).map((s) => s.serialize()),
+      this.neighbors.slice(),
+    ];
+  }
+
+  /**
+   * Rebuilds a node from nav-file data.
+   * @returns The reconstructed navigation node.
+   */
+  static deserialize(data: SerializedNode, _navigation: Navigation): Node {
+    const node = new Node(data[0], new Vector(...data[1]));
+
+    node.availableHeight = data[2];
+    node.nearLedge = data[3];
+    node.isClipping = data[4];
+    node.isFloating = data[5];
+    // node.surfaces = new Set(data[6].map((id) => WalkableSurface.deserialize(id, navigation)));
+    node.neighbors = data[7].slice();
+
+    return node;
+  }
+}
+
+/**
+ * Binary min-heap keyed by fScore for efficient A* open-set extraction.
+ */
+class MinHeap {
+  /** node IDs stored in heap order. */
+  #data: number[] = [];
+  /** fScore reference, indexed by node ID. */
+  #keys: Float64Array;
+  /** heap index of each node ID (-1 = not in heap). */
+  #index: Int32Array;
+
+  /**
+   * Creates the A* open-set heap for a bounded node count.
+   */
+  constructor(capacity: number) {
+    this.#keys = new Float64Array(capacity).fill(Infinity);
+    this.#index = new Int32Array(capacity).fill(-1);
+  }
+
+  /**
+   * Returns the number of queued node IDs.
+   * @returns The current heap size.
+   */
+  get size(): number {
+    return this.#data.length;
+  }
+
+  /**
+   * Insert or update a node's priority.
+   */
+  pushOrDecrease(id: number, priority: number): void {
+    this.#keys[id] = priority;
+
+    if (this.#index[id] !== -1) {
+      this.#bubbleUp(this.#index[id]);
+      return;
+    }
+
+    this.#data.push(id);
+    this.#index[id] = this.#data.length - 1;
+    this.#bubbleUp(this.#data.length - 1);
+  }
+
+  /**
+   * Extract the node with the smallest fScore.
+   * @returns The node ID with the smallest priority.
+   */
+  pop(): number {
+    const top = this.#data[0]!;
+    const last = this.#data.pop()!;
+
+    this.#index[top] = -1;
+
+    if (this.#data.length > 0) {
+      this.#data[0] = last;
+      this.#index[last] = 0;
+      this.#sinkDown(0);
+    }
+
+    return top;
+  }
+
+  /**
+   * Bubbles a node up until the heap invariant is restored.
+   */
+    #bubbleUp(i: number): void {
+    const data = this.#data;
+    const keys = this.#keys;
+    const idx = this.#index;
+
+    while (i > 0) {
+      const parent = (i - 1) >> 1;
+
+      if (keys[data[i]] >= keys[data[parent]]) {
+        break;
+      }
+
+      const tmp = data[i];
+      data[i] = data[parent];
+      data[parent] = tmp;
+      idx[data[i]] = i;
+      idx[data[parent]] = parent;
+      i = parent;
+    }
+  }
+
+  /**
+   * Sinks a node down until the heap invariant is restored.
+   */
+    #sinkDown(i: number): void {
+    const data = this.#data;
+    const keys = this.#keys;
+    const idx = this.#index;
+    const n = data.length;
+
+    while (true) {
+      let smallest = i;
+      const left = 2 * i + 1;
+      const right = 2 * i + 2;
+
+      if (left < n && keys[data[left]] < keys[data[smallest]]) {
+        smallest = left;
+      }
+
+      if (right < n && keys[data[right]] < keys[data[smallest]]) {
+        smallest = right;
+      }
+
+      if (smallest === i) {
+        break;
+      }
+
+      const tmp = data[i];
+      data[i] = data[smallest];
+      data[smallest] = tmp;
+      idx[data[i]] = i;
+      idx[data[smallest]] = smallest;
+      i = smallest;
+    }
+  }
+}
+
+export class NavMeshOutOfDateException extends CorruptedResourceError {}
+
+// TODO: in future we could build graphs per entity type (e.g. monster navmesh with tighter clearances, flying monster navmesh that ignores ground support, etc.)
+
+const NAV_FILE_VERSION = 3;
+const NAV_MONSTER_MINS = new Vector(-16.0, -16.0, -24.0);
+const NAV_MONSTER_MAXS = new Vector(16.0, 16.0, 40.0);
+const NAV_LINK_STEP_DISTANCE = 8.0;
+
+export class Navigation {
+  static nav_save_waypoints: Cvar | null = null;
+  static nav_debug_waypoints: Cvar | null = null;
+  static nav_debug_graph: Cvar | null = null;
+  static nav_debug_path: Cvar | null = null;
+  /** unavailable outside of the dedicated server. */
+  static nav_build_process: Cvar | null = null;
+
+  /** maximum slope that is passable */
+  readonly maxSlope = MIN_STEP_NORMAL;
+  readonly walkerMins: Vector = NAV_MONSTER_MINS.copy();
+  readonly walkerMaxs: Vector = NAV_MONSTER_MAXS.copy();
+  /** units of headroom required above waypoint */
+  requiredHeight = NAV_MONSTER_MAXS[2] - NAV_MONSTER_MINS[2];
+  requiredRadius = Math.max(
+    NAV_MONSTER_MAXS[0],
+    NAV_MONSTER_MAXS[1],
+    -NAV_MONSTER_MINS[0],
+    -NAV_MONSTER_MINS[1],
+  );
+
+  /** holds pending requests for the worker thread. */
+  #requests: Record<string, PathRequestResolver> = {};
+
+  /** worker thread handling navigation lookups. */
+  #worker: PlatformWorker | null = null;
+
+  /** unsubscribe from nav.path.request. */
+  #pathRequestEventListener: EventUnsubscribe = null;
+
+  /** unsubscribe from nav.path.response. */
+  #pathResponseEventListener: EventUnsubscribe = null;
+
+  /** unsubscribe from nav_debug_graph changes. */
+  #debugGraphEventListener: EventUnsubscribe = null;
+
+  /** unsubscribe from nav_debug_waypoints changes. */
+  #debugWaypointsEventListener: EventUnsubscribe = null;
+
+  worldmodel: BrushModel | null;
+  graph: NavigationGraph;
+  geometry: NavigationGeometry;
+
+  relinkEdictCooldown: Record<number, TimeoutHandle> = {};
+  relinkEdictLinks: Record<number, Node> = {};
+  relinkSkiplist: Set<number> = new Set();
+
+  /**
+   * Creates a navigation graph builder/runtime for a worldmodel.
+   */
+  constructor(worldmodel: BrushModel | null) {
+    this.worldmodel = worldmodel;
+    this.graph = {
+      nodes: [],
+      octree: null,
+    };
+
+    this.geometry = {
+      walkableSurfaces: [],
+    };
+  }
+
+  static Init(): void {
+    if (registry.isDedicatedServer) {
+      this.nav_build_process = new Cvar('nav_build_process', '0', Cvar.FLAG.NONE, 'if set to 1, it will force build the nav mesh and quit');
+    }
+
+    this.nav_save_waypoints = new Cvar('nav_save_waypoints', '0', Cvar.FLAG.NONE, 'deprecated, extracted waypoints stay in memory and are not written to nav files');
+    this.nav_debug_graph = new Cvar('nav_debug_graph', '0', Cvar.FLAG.NONE, 'if set to 1, will render the navigation graph for debugging');
+    this.nav_debug_waypoints = new Cvar('nav_debug_waypoints', '0', Cvar.FLAG.NONE, 'if set to 1, will render all waypoints for debugging');
+    this.nav_debug_path = new Cvar('nav_debug_path', '0', Cvar.FLAG.NONE | Cvar.FLAG.CHEAT, 'if set to 1, will render the last computed path for debugging');
+
+    // worker thread -> main thread: mesh probably out of date
+    eventBus.subscribe('nav.build', (): void => {
+      if (SV.server.navigation) {
+        SV.server.navigation.build();
+      }
+    });
+
+    eventBus.subscribe('nav.debug.emit-dot.temporarily', (position: WorkerVectorLike, color: number, ttl: number): void => {
+      this.#emitDotFrontend(new Vector(...position), color, ttl);
+    });
+
+    eventBus.subscribe('nav.debug.emit-dot.permanently', (position: WorkerVectorLike, color: number): void => {
+      this.#emitDotFrontend(new Vector(...position), color, Infinity);
+    });
+  }
+
+  #initWorker(): void {
+    this.#worker = WorkerManager.SpawnWorker('server/NavigationWorker.mjs', [
+      'nav.load',
+      'nav.path.request',
+    ]);
+  }
+
+  #shutdownWorker(): void {
+    if (this.#worker) {
+      this.#worker.shutdown().catch((err) => {
+        Con.PrintError(`Failed to shutdown the navigation worker: ${err}\n`);
+      });
+
+      this.#worker = null;
+    }
+  }
+
+  #subscribePathResponse(): void {
+    this.#pathResponseEventListener = eventBus.subscribe('nav.path.response', (id: string, path: WorkerPath): void => {
+      const vecpath = path ? path.map((point) => new Vector(...point)) : null;
+
+      if (vecpath && Navigation.nav_debug_path?.value) {
+        this.#debugPath(vecpath);
+      }
+
+      // since all events are global, we need to check what’s intended for us
+      if (id in this.#requests) {
+        this.#requests[id](vecpath);
+        delete this.#requests[id];
+      }
+    });
+  }
+
+  #subscribeDebugCvars(): void {
+    this.#debugGraphEventListener = eventBus.subscribe('cvar.changed.nav_debug_graph', (cvar: Cvar): void => {
+      if (cvar.value !== 0) {
+        this.#scheduleDebugRefresh();
+      }
+    });
+
+    this.#debugWaypointsEventListener = eventBus.subscribe('cvar.changed.nav_debug_waypoints', (cvar: Cvar): void => {
+      if (cvar.value !== 0) {
+        this.#scheduleDebugRefresh();
+      }
+    });
+  }
+
+  #scheduleDebugRefresh(): void {
+    if (!R) {
+      return;
+    }
+
+    setTimeout((): void => {
+      this.#debugWaypoints();
+      this.#debugNavigation();
+    }, 1000);
+  }
+
+  init(): void {
+    Con.DPrint('Navigation: initializing navigation graph...\n');
+
+    if (Navigation.nav_build_process?.value) {
+      this.build();
+    }
+
+    this.#initWorker();
+    this.#subscribePathResponse();
+    this.#subscribeDebugCvars();
+    eventBus.publish('nav.load', SV.server.mapname, SV.server.worldmodel.checksum);
+  }
+
+  shutdown(): void {
+    for (const timeout of Object.values(this.relinkEdictCooldown)) {
+      clearTimeout(timeout);
+    }
+
+    this.#shutdownWorker();
+
+    if (this.#pathRequestEventListener) {
+      this.#pathRequestEventListener();
+      this.#pathRequestEventListener = null;
+    }
+
+    if (this.#pathResponseEventListener) {
+      this.#pathResponseEventListener();
+      this.#pathResponseEventListener = null;
+    }
+
+    if (this.#debugGraphEventListener) {
+      this.#debugGraphEventListener();
+      this.#debugGraphEventListener = null;
+    }
+
+    if (this.#debugWaypointsEventListener) {
+      this.#debugWaypointsEventListener();
+      this.#debugWaypointsEventListener = null;
+    }
+
+    Con.DPrint('Navigation: shutdown complete.\n');
+  }
+
+  async load(mapname: string, expectedChecksum: number | null = null): Promise<void> {
+    console.assert(this.worldmodel || expectedChecksum, 'Navigation: worldmodel or expectedChecksum is required');
+
+    const filename = `maps/${mapname}.nav`;
+
+    this.graph.nodes.length = 0;
+    this.graph.octree = null;
+    this.relinkSkiplist.clear();
+
+    // Try to load binary file first (ArrayBuffer). Fallback to text JSON for older files.
+    const buf = await COM.LoadFile(filename);
+
+    if (!buf) {
+      throw new MissingResourceError(filename);
+    }
+
+    const dv = new DataView(buf);
+    let off = 0;
+
+    const readBytes = (n: number): Uint8Array => {
+      const out = new Uint8Array(buf, off, n);
+      off += n;
+      return out;
+    };
+
+    const readUint8 = (): number => dv.getUint8(off++);
+    const readUint32 = (): number => {
+      const value = dv.getUint32(off, true);
+      off += 4;
+      return value;
+    };
+    const readInt32 = (): number => {
+      const value = dv.getInt32(off, true);
+      off += 4;
+      return value;
+    };
+    const readFloat32 = (): number => {
+      const value = dv.getFloat32(off, true);
+      off += 4;
+      return value;
+    };
+
+    // magic: 4 bytes
+    const magic = String.fromCharCode(...readBytes(4));
+    if (magic !== 'QSNM') {
+      throw new CorruptedResourceError(filename, 'invalid binary magic');
+    }
+
+    const version = readUint32();
+    if (version !== NAV_FILE_VERSION) {
+      throw new CorruptedResourceError(filename, 'invalid binary version');
+    }
+
+    // worldmodel name (uint16 length + utf8 bytes)
+    const nameLen = dv.getUint16(off, true); off += 2;
+    const nameBytes = readBytes(nameLen);
+    const worldName = new TextDecoder().decode(nameBytes);
+
+    const checksum = readUint32();
+    const requiredHeight = readFloat32();
+    const requiredRadius = readFloat32();
+
+    if (worldName !== mapname) {
+      throw new CorruptedResourceError(filename, 'wrong map');
+    }
+
+    if (expectedChecksum !== null) {
+      if (checksum !== expectedChecksum) {
+        throw new NavMeshOutOfDateException(filename, 'outdated map');
+      }
+    } else if (checksum !== this.worldmodel.checksum) {
+      throw new NavMeshOutOfDateException(filename, 'outdated map');
+    }
+
+    if (requiredHeight !== this.requiredHeight || requiredRadius !== this.requiredRadius) {
+      throw new NavMeshOutOfDateException(filename, 'configuration changed');
+    }
+
+    // relink skiplist
+    const relinkCount = readUint32();
+    for (let i = 0; i < relinkCount; i++) {
+      this.relinkSkiplist.add(readUint32());
+    }
+
+    // nodes
+    const nodeCount = readUint32();
+    for (let ni = 0; ni < nodeCount; ni++) {
+      const id = readInt32();
+      const ox = readFloat32(); const oy = readFloat32(); const oz = readFloat32();
+      const node = new Node(id, new Vector(ox, oy, oz));
+      node.availableHeight = readFloat32();
+      node.nearLedge = !!readUint8();
+      node.isClipping = !!readUint8();
+      node.isFloating = !!readUint8();
+
+      // surfaces (optional)
+      const surfCount = readUint32();
+      if (surfCount > 0) {
+        for (let si = 0; si < surfCount; si++) {
+          readFloat32();
+          readFloat32(); readFloat32(); readFloat32();
+          readUint32();
+          const wpCount = readUint32();
+          for (let wi = 0; wi < wpCount; wi++) {
+            readFloat32(); readFloat32(); readFloat32();
+            readFloat32();
+            readUint8();
+            readUint8();
+            readUint8();
+          }
+        }
+      }
+
+      // neighbors
+      const nbCount = readUint32();
+      const nbs: NeighborLink[] = [];
+      for (let k = 0; k < nbCount; k++) {
+        const nid = readInt32();
+        const cost = readFloat32();
+        const adj = readFloat32();
+        nbs.push([nid, cost, adj]);
+      }
+      node.neighbors = nbs;
+
+      this.graph.nodes.push(node);
+    }
+
+    this.#buildOctree();
+    this.#scheduleDebugRefresh();
+  }
+
+  async save(): Promise<void> {
+    console.assert(Boolean(this.worldmodel), 'Navigation: worldmodel is required');
+
+    const filename = `maps/${SV.server.mapname}.nav`;
+
+    const bytes: number[] = [];
+    const tmp = new ArrayBuffer(8);
+    const tdv = new DataView(tmp);
+
+    const pushUint8 = (value: number): void => { bytes.push(value & 0xff); };
+    const pushUint16 = (value: number): void => { bytes.push(value & 0xff); bytes.push((value >>> 8) & 0xff); };
+    const pushUint32 = (value: number): void => {
+      bytes.push(value & 0xff);
+      bytes.push((value >>> 8) & 0xff);
+      bytes.push((value >>> 16) & 0xff);
+      bytes.push((value >>> 24) & 0xff);
+    };
+    const pushInt32 = (value: number): void => pushUint32(value >>> 0);
+    const pushFloat32 = (value: number): void => {
+      tdv.setFloat32(0, value, true);
+      const byteView = new Uint8Array(tmp, 0, 4);
+      bytes.push(byteView[0], byteView[1], byteView[2], byteView[3]);
+    };
+    const pushBytes = (values: Uint8Array): void => {
+      for (let i = 0; i < values.length; i++) {
+        bytes.push(values[i]);
+      }
+    };
+
+    // header magic
+    pushBytes(new TextEncoder().encode('QSNM'));
+    pushUint32(NAV_FILE_VERSION);
+
+    // world name
+    const nameBytes = new TextEncoder().encode(SV.server.mapname);
+    pushUint16(nameBytes.length);
+    pushBytes(nameBytes);
+
+    pushUint32(this.worldmodel.checksum);
+    pushFloat32(this.requiredHeight);
+    pushFloat32(this.requiredRadius);
+
+    // relink skiplist
+    pushUint32(this.relinkSkiplist.size);
+    for (const v of this.relinkSkiplist) {
+      pushUint32(v);
+    }
+
+    // nodes
+    pushUint32(this.graph.nodes.length);
+    for (const n of this.graph.nodes) {
+      pushInt32(n.id);
+      pushFloat32(n.origin[0]); pushFloat32(n.origin[1]); pushFloat32(n.origin[2]);
+      pushFloat32(n.availableHeight);
+      pushUint8(n.nearLedge ? 1 : 0);
+      pushUint8(n.isClipping ? 1 : 0);
+      pushUint8(n.isFloating ? 1 : 0);
+
+      // waypoints are build-only debug data and are intentionally not serialized
+      pushUint32(0);
+
+      // neighbors
+      pushUint32(n.neighbors.length);
+      for (const nb of n.neighbors) {
+        pushInt32(nb[0]);
+        pushFloat32(nb[1]);
+        pushFloat32(nb[2]);
+      }
+    }
+
+    const out = new Uint8Array(bytes);
+    await COM.WriteFile(filename, out, out.length);
+
+    // Keep the worker in sync after every successful rebuild, including listen-server sessions.
+    eventBus.publish('nav.load', SV.server.mapname, this.worldmodel.checksum);
+  }
+
+  #newWalkerStandOffset(): Vector {
+    return new Vector(0, 0, -this.walkerMins[2]);
+  }
+
+  /**
+   * Returns whether the player-sized walker fits at the given stand origin.
+   * @returns True when the walker box does not start in solid.
+   */
+  #isValidStandOrigin(position: Vector): boolean {
+    const trace = SV.collision.traceStaticWorld(
+      position.copy(),
+      this.walkerMins,
+      this.walkerMaxs,
+      position.copy(),
+    );
+
+    return !trace.startsolid && !trace.allsolid;
+  }
+
+  /**
+   * Traces the player-sized walker through the static world.
+   * @returns The resulting static-world collision trace.
+   */
+  #traceWalkerStatic(startpos: Vector, endpos: Vector): CollisionTrace {
+    return SV.collision.traceStaticWorld(
+      startpos.copy(),
+      this.walkerMins,
+      this.walkerMaxs,
+      endpos.copy(),
+    );
+  }
+
+  /**
+   * Returns whether the walker has enough floor support at the stand origin.
+   * @returns True when the walker can stand on the sampled floor.
+   */
+  #hasGroundSupport(position: Vector): boolean {
+    const mins = position.copy().add(this.walkerMins);
+    const maxs = position.copy().add(this.walkerMaxs);
+
+    const allCornersSolid =
+      SV.collision.pointContents(new Vector(mins[0], mins[1], mins[2] - 1.0)) === Def.content.CONTENT_SOLID
+      && SV.collision.pointContents(new Vector(mins[0], maxs[1], mins[2] - 1.0)) === Def.content.CONTENT_SOLID
+      && SV.collision.pointContents(new Vector(maxs[0], mins[1], mins[2] - 1.0)) === Def.content.CONTENT_SOLID
+      && SV.collision.pointContents(new Vector(maxs[0], maxs[1], mins[2] - 1.0)) === Def.content.CONTENT_SOLID;
+
+    if (allCornersSolid) {
+      return true;
+    }
+
+    const start = position.copy().add(new Vector(0.0, 0.0, this.walkerMins[2] + 1.0));
+    const stop = start.copy().add(new Vector(0.0, 0.0, -2.0 * STEPSIZE));
+
+    let trace = SV.collision.move(start, Vector.origin, Vector.origin, stop, Def.moveTypes.MOVE_NOMONSTERS, null);
+
+    if (trace.fraction === 1.0) {
+      return false;
+    }
+
+    let bottom = trace.endpos[2];
+    const mid = bottom;
+
+    for (let x = 0; x <= 1; x++) {
+      for (let y = 0; y <= 1; y++) {
+        start[0] = stop[0] = x !== 0 ? maxs[0] : mins[0];
+        start[1] = stop[1] = y !== 0 ? maxs[1] : mins[1];
+
+        trace = SV.collision.move(start, Vector.origin, Vector.origin, stop, Def.moveTypes.MOVE_NOMONSTERS, null);
+
+        if (trace.fraction !== 1.0 && trace.endpos[2] > bottom) {
+          bottom = trace.endpos[2];
+        }
+
+        if (trace.fraction === 1.0 || (mid - trace.endpos[2]) > STEPSIZE) {
+          return false;
+        }
+      }
+    }
+
+    return true;
+  }
+
+  /**
+   * Measures the free vertical space above a stand origin.
+   * @returns The available vertical distance before colliding overhead.
+   */
+  #measureAvailableHeight(position: Vector, probeHeight = this.requiredHeight): number {
+    const trace = this.#traceWalkerStatic(position, position.copy().add(new Vector(0, 0, probeHeight)));
+    return Math.max(0.0, trace.endpos[2] - position[2]);
+  }
+
+  /**
+   * Returns a point on the surface plane.
+   * @returns A point lying on the given surface plane.
+   */
+  #getSurfacePoint(surface: WalkableSurface): Vector {
+    const surfedge = this.worldmodel.surfedges[surface.face.firstedge];
+
+    if (surfedge > 0) {
+      return new Vector().set(this.worldmodel.vertexes[this.worldmodel.edges[surfedge][0]]);
+    }
+
+    return new Vector().set(this.worldmodel.vertexes[this.worldmodel.edges[-surfedge][1]]);
+  }
+
+  /**
+   * Projects a world point onto the supporting surface plane.
+   * @returns The projected point on the target surface.
+   */
+  #projectPointOntoSurface(point: Vector, surface: WalkableSurface): Vector {
+    const surfacePoint = this.#getSurfacePoint(surface);
+    const pointToSurface = point.copy().subtract(surfacePoint);
+    const distanceToPlane = pointToSurface.dot(surface.normal);
+
+    return point.copy().subtract(surface.normal.copy().multiply(distanceToPlane));
+  }
+
+  /**
+   * Projects a stand origin back onto the supporting surface plane.
+   * @returns The projected stand origin.
+   */
+  #projectStandOriginOntoSurface(standOrigin: Vector, surface: WalkableSurface): Vector {
+    const floorPoint = standOrigin.copy();
+    floorPoint[2] += this.walkerMins[2];
+
+    return this.#projectPointOntoSurface(floorPoint, surface).add(this.#newWalkerStandOffset());
+  }
+
+  /**
+   * Offsets a stand origin along a surface plane.
+   * @returns The offset stand origin following the surface plane.
+   */
+  #offsetStandOrigin(origin: Vector, surface: WalkableSurface, x: number, y: number): Vector {
+    const floorPoint = origin.copy();
+    floorPoint[2] += this.walkerMins[2];
+    floorPoint[0] += x;
+    floorPoint[1] += y;
+
+    return this.#projectPointOntoSurface(floorPoint, surface).add(this.#newWalkerStandOffset());
+  }
+
+  /**
+   * Evaluates whether a walker can traverse between two stand origins.
+   * @returns The traversal decision and failure reason.
+   */
+  #evaluateTraversalBetween(startOrigin: Vector, endOrigin: Vector): TraversalResult {
+    if (!this.#isValidStandOrigin(startOrigin)) {
+      return { ok: false, reason: 'start-fit' };
+    }
+
+    if (!this.#isValidStandOrigin(endOrigin)) {
+      return { ok: false, reason: 'end-fit' };
+    }
+
+    if (!this.#hasGroundSupport(startOrigin) || !this.#hasGroundSupport(endOrigin)) {
+      return {
+        ok: false,
+        reason: !this.#hasGroundSupport(startOrigin) ? 'start-support' : 'end-support',
+      };
+    }
+
+    const delta = endOrigin.copy().subtract(startOrigin);
+    delta[2] = 0.0;
+
+    const totalDistance = delta.len();
+
+    if (totalDistance === 0.0) {
+      return {
+        ok: Math.abs(endOrigin[2] - startOrigin[2]) <= STEPSIZE,
+        reason: 'same-spot',
+      };
+    }
+
+    const stepDistance = Math.min(NAV_LINK_STEP_DISTANCE, totalDistance);
+    const direction = delta.copy().multiply(1.0 / totalDistance);
+    let previousOrigin = startOrigin;
+
+    for (let travelled = stepDistance; travelled < totalDistance; travelled += stepDistance) {
+      const t = travelled / totalDistance;
+      const sampleOrigin = startOrigin.copy().add(direction.copy().multiply(travelled));
+      sampleOrigin[2] = startOrigin[2] + (endOrigin[2] - startOrigin[2]) * t;
+
+      if (Math.abs(sampleOrigin[2] - previousOrigin[2]) > STEPSIZE + 1.0) {
+        return { ok: false, reason: 'height-mismatch' };
+      }
+
+      if (!this.#isValidStandOrigin(sampleOrigin)) {
+        return { ok: false, reason: 'step-fit' };
+      }
+
+      if (!this.#hasGroundSupport(sampleOrigin)) {
+        return { ok: false, reason: 'step-support' };
+      }
+
+      previousOrigin = sampleOrigin;
+    }
+
+    if (Math.abs(endOrigin[2] - previousOrigin[2]) > STEPSIZE + 1.0) {
+      return { ok: false, reason: 'height-mismatch' };
+    }
+
+    return { ok: true, reason: 'ok' };
+  }
+
+  #extractWalkableSurfaces(): void {
+    const walkableSurfaces = [];
+    let sampledWaypointCount = 0;
+    let retainedWaypointCount = 0;
+
+    const upwards = new Vector(0, 0, 1);
+    const sidewards = new Vector(0, 1, 0);
+
+    // Pass 1: collect all potentially walkable surfaces
+    for (let i = 0; i < this.worldmodel.faces.length; i++) {
+      const face = this.worldmodel.faces[i];
+
+      if (face.numedges < 3) {
+        continue;
+      }
+
+      const walkableSurface = new WalkableSurface(face, i);
+
+      // Only accept surfaces whose normals point upward and do not exceed a 45 degrees incline.
+      const faceNormal = face.normal;
+
+      walkableSurface.stability = faceNormal.dot(upwards);
+
+      if (walkableSurface.stability < this.maxSlope) {
+        continue;
+      }
+
+      // Ignore special surfaces, also submodel faces
+      if (face.turbulent === true || face.sky === true || face.submodel === true) {
+        continue;
+      }
+
+      walkableSurface.normal.set(faceNormal);
+
+      walkableSurfaces.push(walkableSurface);
+    }
+
+    // Pass 2: check if the walkable surfaces are really walkable by sampling points on them
+    // - create sample points across each walkable face (interior sampling)
+    // - approach: build ordered 3D vertex list for the face, project to a local 2D basis
+    // - grid-sample the face bounding box and keep points that lie inside the polygon
+    for (const surface of walkableSurfaces) {
+      const face = surface.face;
+      const verts3: Vector[] = [];
+      for (let i = 0; i < face.numedges; i++) {
+        const vec = new Vector();
+        const surfedge = this.worldmodel.surfedges[face.firstedge + i];
+
+        if (surfedge > 0) {
+          vec.set(this.worldmodel.vertexes[this.worldmodel.edges[surfedge][0]]);
+        } else {
+          vec.set(this.worldmodel.vertexes[this.worldmodel.edges[-surfedge][1]]);
+        }
+
+        verts3.push(vec);
+      }
+
+      /** face plane normal */
+      const n = surface.normal.copy();
+
+      /** pick arbitrary axis not parallel to normal */
+      const arbitrary = Math.abs(n[2]) < 0.9 ? upwards : sidewards;
+
+      // build local orthonormal basis (u, v) on the face plane
+      const u = n.cross(arbitrary);
+      const uLen = u.normalize();
+
+      if (uLen === 0) {
+        continue;
+      }
+
+      const v = n.cross(u);
+      const vLen = v.normalize();
+
+      if (vLen === 0) {
+        continue;
+      }
+
+      const origin = verts3[0];
+
+      // project verts to 2D coordinates in [u, v] basis
+      const verts2 = verts3.map((p3): PlanePoint => {
+        const rel = p3.copy().subtract(origin);
+        return [rel.dot(u), rel.dot(v)];
+      });
+
+      // compute bounding box in 2D
+      let minX = Infinity, minY = Infinity;
+      let maxX = -Infinity, maxY = -Infinity;
+
+      for (const p of verts2) {
+        if (p[0] < minX) {
+          minX = p[0];
+        }
+        if (p[0] > maxX) {
+          maxX = p[0];
+        }
+        if (p[1] < minY) {
+          minY = p[1];
+        }
+        if (p[1] > maxY) {
+          maxY = p[1];
+        }
+      }
+
+      /**
+       * point-in-polygon (ray crossing)
+       * @returns True when the point lies inside the polygon.
+       */
+      const pointInPoly = (pt: PlanePoint, poly: PlanePoint[]): boolean => {
+        let inside = false;
+        for (let i = 0, j = poly.length - 1; i < poly.length; j = i++) {
+          const xi = poly[i][0];
+          const yi = poly[i][1];
+          const xj = poly[j][0];
+          const yj = poly[j][1];
+          const intersect = ((yi > pt[1]) !== (yj > pt[1])) && (pt[0] < (xj - xi) * (pt[1] - yi) / (yj - yi + 0.0) + xi);
+          if (intersect) {
+            inside = !inside;
+          }
+        }
+        return inside;
+      };
+
+      // sample the actor center lane instead of the full polygon so narrow stairs and ledges
+      // can still produce valid points without relying on later support pruning alone.
+
+      // sampling resolution (units between samples on the face)
+      const step = 8;
+
+      const startX = Math.floor(minX / step) * step + (step * 0.5);
+      const startY = Math.floor(minY / step) * step + (step * 0.5);
+
+      // grid-sample the bounding box and test inclusion
+      for (let sx = startX; sx <= Math.ceil(maxX); sx += step) {
+        for (let sy = startY; sy <= Math.ceil(maxY); sy += step) {
+          const pt2 = [sx, sy];
+          if (!pointInPoly(pt2, verts2)) {
+            continue;
+          }
+
+          // map 2D point back to 3D: origin + u * x + v * y, then lift to a player stand origin
+          const worldPoint = origin.copy().add(u.copy().multiply(pt2[0])).add(v.copy().multiply(pt2[1]));
+          const standOrigin = worldPoint.add(this.#newWalkerStandOffset());
+
+          surface.waypoints.push(new Waypoint(standOrigin));
+          sampledWaypointCount++;
+        }
+      }
+    }
+
+    // Pass 3: prune waypoints that do not have enough player-sized clearance
+    const rr = this.requiredRadius;
+    const sideOffsets = [
+      [-rr * 1.4, -rr], [0.0, -rr], [rr * 1.4, -rr],
+      [-rr, 0.0], [rr, 0.0],
+      [-rr * 1.4, rr], [0.0, rr], [rr * 1.4, rr],
+    ];
+    const pruneStats = {
+      invalidFit: 0,
+      lowHeight: 0,
+      unsupported: 0,
+      retained: 0,
+    };
+
+    for (const surface of walkableSurfaces) {
+      for (const wp of surface.waypoints) {
+        if (!this.#isValidStandOrigin(wp.origin)) {
+          wp.availableHeight = 0;
+          wp.isClipping = true;
+          pruneStats.invalidFit++;
+          continue;
+        }
+
+        wp.availableHeight = this.#measureAvailableHeight(wp.origin);
+
+        if (wp.availableHeight < this.requiredHeight) {
+          wp.availableHeight = 0;
+          pruneStats.lowHeight++;
+          continue;
+        }
+
+        if (!this.#hasGroundSupport(wp.origin)) {
+          wp.isFloating = true;
+          pruneStats.unsupported++;
+          continue;
+        }
+
+        for (const [x, y] of sideOffsets) {
+          const sideOrigin = this.#offsetStandOrigin(wp.origin, surface, x, y);
+
+          if (!this.#isValidStandOrigin(sideOrigin)) {
+            continue;
+          }
+
+          if (!this.#hasGroundSupport(sideOrigin)) {
+            wp.nearLedge = true;
+            break;
+          }
+        }
+      }
+    }
+
+    // Pass 4: filter out unsuitable waypoints and store the rest
+    for (const surface of walkableSurfaces) {
+      const suitableWaypoints: Waypoint[] = [];
+
+      for (const wp of surface.waypoints) {
+        if ((wp.availableHeight >= this.walkerMaxs[2] - this.walkerMins[2]) && !wp.isClipping && !wp.isFloating) {
+          suitableWaypoints.push(wp);
+          pruneStats.retained++;
+        }
+      }
+
+      if (suitableWaypoints.length === 0) {
+        continue;
+      }
+
+      surface.waypoints = suitableWaypoints;
+      retainedWaypointCount += suitableWaypoints.length;
+
+      this.geometry.walkableSurfaces.push(surface);
+    }
+
+    Con.DPrint(
+      `Navigation: walkable surfaces=${walkableSurfaces.length}, sampled waypoints=${sampledWaypointCount}, retained waypoints=${retainedWaypointCount}, retained surfaces=${this.geometry.walkableSurfaces.length}, invalidFit=${pruneStats.invalidFit}, lowHeight=${pruneStats.lowHeight}, unsupported=${pruneStats.unsupported}\n`,
+    );
+  }
+
+  #buildNavigationGraph(): void {
+    // Build a simple navgraph from the extracted waypoints.
+    // Steps:
+    // 1) collect all waypoints
+    // 2) merge nearby waypoints into graph nodes
+    // 3) connect nodes with unobstructed links (trace check)
+
+    const mergeRadius = 24; // units to merge nearby waypoints
+    const linkRadius = 64; // max distance to attempt a link
+
+    // 1) collect all waypoints into flat list
+    const allWaypoints: Array<{ wp: Waypoint; surface: WalkableSurface }> = [];
+    for (const surface of this.geometry.walkableSurfaces) {
+      for (const wp of surface.waypoints) {
+        allWaypoints.push({ wp, surface });
+      }
+    }
+
+    // 2) merge nearby waypoints into nodes using surface-aware clustering
+    const nodes = this.graph.nodes;
+    nodes.length = 0;
+
+    const distance = (a: Vector, b: Vector): number => Math.hypot(a[0] - b[0], a[1] - b[1]);
+
+    // Group waypoints that should be merged together
+    const waypointGroups: WaypointGroup[] = [];
+
+    for (let i = 0; i < allWaypoints.length; i++) {
+      const current = allWaypoints[i];
+      let bestGroup: WaypointGroup | null = null;
+      let bestDistance = Infinity;
+
+      for (const group of waypointGroups) {
+        const d = distance(group.seedOrigin, current.wp.origin);
+        const heightDiff = Math.abs(group.seedOrigin[2] - current.wp.origin[2]);
+
+        if (d > mergeRadius || heightDiff > STEPSIZE) {
+          continue;
+        }
+
+        if (d < bestDistance) {
+          bestDistance = d;
+          bestGroup = group;
+        }
+      }
+
+      if (bestGroup === null) {
+        waypointGroups.push({
+          seedOrigin: current.wp.origin.copy(),
+          items: [{ ...current, index: i }],
+        });
+        continue;
+      }
+
+      bestGroup.items.push({ ...current, index: i });
+    }
+
+    // Create nodes from waypoint groups
+    for (const group of waypointGroups) {
+      const id = nodes.length;
+
+      // Compute centroid of all waypoints in the group
+      const centroid = new Vector();
+      let representativeOrigin: Vector | null = null;
+      let representativeDistance = Infinity;
+      let minAvailableHeight = Infinity;
+      let nearLedge = false;
+      let isClipping = false;
+      let isFloating = false;
+      const surfaces = new Set();
+
+      for (const { wp, surface } of group.items) {
+        centroid.add(wp.origin);
+        minAvailableHeight = Math.min(minAvailableHeight, wp.availableHeight);
+        nearLedge = nearLedge || wp.nearLedge;
+        isClipping = isClipping || wp.isClipping;
+        isFloating = isFloating || wp.isFloating;
+        surfaces.add(surface);
+      }
+
+      centroid.multiply(1.0 / group.items.length);
+
+      // If all waypoints are on the same surface, project centroid onto that surface
+      if (surfaces.size === 1) {
+        const surface = surfaces.values().next().value as WalkableSurface;
+        centroid.set(this.#projectStandOriginOntoSurface(centroid, surface));
+      }
+
+      for (const { wp } of group.items) {
+        const d = wp.origin.distanceTo(centroid);
+
+        if (d < representativeDistance) {
+          representativeDistance = d;
+          representativeOrigin = wp.origin;
+        }
+      }
+
+      const node = new Node(id, representativeOrigin ?? centroid);
+      node.availableHeight = Number.isFinite(minAvailableHeight) ? minAvailableHeight : 0.0;
+      node.nearLedge = nearLedge;
+      node.isClipping = isClipping;
+      node.isFloating = isFloating;
+      node.surfaces = surfaces;
+
+      nodes.push(node);
+    }
+
+    // 3) build spatial index before linking to accelerate neighbor search
+    this.#buildOctree();
+
+    // 4) connect nodes: attempt links between nearby, unobstructed node pairs
+    const linkStats = {
+      considered: 0,
+      linked: 0,
+      startFit: 0,
+      endFit: 0,
+      startSupport: 0,
+      endSupport: 0,
+      stepFit: 0,
+      stepSupport: 0,
+      heightMismatch: 0,
+    };
+
+    // track already-evaluated pairs to avoid duplicate work
+    const evaluatedPairs = new Set();
+
+    for (const a of nodes) {
+      for (const b of this.#findNearestNodes(a.origin, linkRadius)) {
+        if (a.id === b.id) {
+          continue;
+        }
+
+        // ensure each pair is evaluated only once
+        const lo = Math.min(a.id, b.id);
+        const hi = Math.max(a.id, b.id);
+        const pairKey = lo * nodes.length + hi;
+
+        if (evaluatedPairs.has(pairKey)) {
+          continue;
+        }
+
+        evaluatedPairs.add(pairKey);
+
+        const dist = b.origin.distanceTo(a.origin);
+
+        linkStats.considered++;
+
+        const aToB = this.#evaluateTraversalBetween(a.origin, b.origin);
+        const bToA = this.#evaluateTraversalBetween(b.origin, a.origin);
+
+        if (!aToB.ok && !bToA.ok) {
+          const reasons = [aToB.reason, bToA.reason];
+
+          if (reasons.includes('start-fit')) {
+            linkStats.startFit++;
+          } else if (reasons.includes('end-fit')) {
+            linkStats.endFit++;
+          } else if (reasons.includes('start-support')) {
+            linkStats.startSupport++;
+          } else if (reasons.includes('end-support')) {
+            linkStats.endSupport++;
+          } else if (reasons.includes('step-fit')) {
+            linkStats.stepFit++;
+          } else if (reasons.includes('step-support')) {
+            linkStats.stepSupport++;
+          } else {
+            linkStats.heightMismatch++;
+          }
+
+          continue;
+        }
+
+        if (aToB.ok) {
+          let cost = dist + Math.max(0.0, b.origin[2] - a.origin[2]);
+
+          if (a.nearLedge) {
+            cost += 96;
+          }
+
+          if (b.nearLedge) {
+            cost += 96;
+          }
+
+          a.neighbors.push([b.id, cost, 0]);
+          linkStats.linked++;
+        }
+
+        if (bToA.ok) {
+          let cost = dist + Math.max(0.0, a.origin[2] - b.origin[2]);
+
+          if (b.nearLedge) {
+            cost += 96;
+          }
+
+          if (a.nearLedge) {
+            cost += 96;
+          }
+
+          b.neighbors.push([a.id, cost, 0]);
+          linkStats.linked++;
+        }
+      }
+    }
+
+    Con.DPrint(
+      `Navigation: merged ${allWaypoints.length} waypoints into ${waypointGroups.length} waypoint groups\n`,
+    );
+    Con.PrintWarning(
+      `Navigation: link stats considered=${linkStats.considered} linked=${linkStats.linked} `
+      + `startFit=${linkStats.startFit} endFit=${linkStats.endFit} `
+      + `startSupport=${linkStats.startSupport} endSupport=${linkStats.endSupport} `
+      + `stepFit=${linkStats.stepFit} stepSupport=${linkStats.stepSupport} heightMismatch=${linkStats.heightMismatch}\n`,
+    );
+  }
+
+  /**
+   * updates navigation links based on entity position
+   */
+  relinkEdict(edict: ServerEdict): void {
+    const entity = edict.entity as ServerEntity | null;
+
+    if (!entity) {
+      return;
+    }
+
+    // only care about world and large static brushes for now
+    if (entity.solid !== Def.solid.SOLID_BSP) {
+      return;
+    }
+
+    // this edict got flagged as not interesting earlier
+    if (this.relinkSkiplist.has(edict.num)) {
+      return;
+    }
+
+    if (this.relinkEdictCooldown[edict.num]) {
+      clearTimeout(this.relinkEdictCooldown[edict.num]);
+    }
+
+    this.relinkEdictCooldown[edict.num] = setTimeout(() => {
+      delete this.relinkEdictCooldown[edict.num];
+      this.#relinkEdict(edict);
+    }, 1000);
+  }
+
+  /**
+   * updates navigation links based on entity position
+   */
+  #relinkEdict(edict: ServerEdict): void {
+    if (edict.isFree()) {
+      return;
+    }
+
+    // TODO: adjust the nav graph accordingly
+  }
+
+  #relinkAll(): void {
+    for (let i = 0; i < SV.server.num_edicts; i++) {
+      const edict = SV.server.edicts[i];
+
+      if (edict.isFree()) {
+        continue;
+      }
+
+      this.#relinkEdict(edict);
+    }
+  }
+
+  #buildSpecialConnections(): void {
+    this.#buildTeleporterLinks();
+    this.#buildDoorLinks();
+    this.#relinkAll();
+  }
+
+  #buildTeleporterLinks(): void {
+    // looking for teleporters
+    for (const teleporterEdict of ServerEngineAPI.FindAllByFieldAndValue('classname', 'trigger_teleport')) {
+      const source = teleporterEdict.entity as ServerEntity | null;
+
+      if (!source) {
+        continue;
+      }
+
+      if (!source.target) {
+        continue;
+      }
+
+      const destinationEdict = Array.from(ServerEngineAPI.FindAllByFieldAndValue('targetname', source.target))[0];
+  const destination = destinationEdict?.entity as ServerEntity | null;
+
+      if (!destination) {
+        Con.PrintWarning(`Navigation: teleporter without a valid target: ${source.classname}\n`);
+        continue;
+      }
+
+      const sp = source.centerPoint.copy(), dp = destination.centerPoint.copy();
+
+      Con.DPrint(`Navigation: found teleporter [${sp}] --> [${dp}]\n`);
+
+      const destNode = this.#findNearestNode(dp, 96); // Just grab one in proximity of the destination
+
+      if (!destNode) {
+        Con.PrintWarning('Navigation: teleporter destination has no nearby navnode\n');
+        continue;
+      }
+
+      const cost = 0; // no cost for teleporters, since traveling is instant
+
+      // insert a new node here to smooth out the path to the teleporter trigger
+      const sourceNode = new Node(this.graph.nodes.length, sp);
+      sourceNode.availableHeight = source.maxs[2] - source.mins[2];
+      this.graph.nodes.push(sourceNode);
+      Con.DPrint(`Navigation: adding teleporter source node ${sourceNode.id}\n`);
+
+      // link the new node to its neighbors
+      for (const sourceNodeNeighbor of this.#findNearestNodes(sp, 64)) {
+        Con.DPrint(`Navigation: linking teleporter nodes ${sourceNodeNeighbor.id} --> ${sourceNode.id}\n`);
+        sourceNodeNeighbor.neighbors.push([sourceNode.id, cost, 0]); // one-way link
+        // this.graph.edges.push([ sourceNodeNeighbor.id, sourceNode.id, cost ]);
+      }
+
+      // link the new node to the destination node
+      Con.DPrint(`Navigation: linking teleporter nodes ${sourceNode.id} --> ${destNode.id}\n`);
+      sourceNode.neighbors.push([destNode.id, cost, 0]); // one-way link
+      // this.graph.edges.push([ sourceNode.id, destNode.id, cost ]);
+    }
+  }
+
+  #buildDoorLinks(): void {
+    // looking for simple doors
+    for (const doorEdict of ServerEngineAPI.FindAllByFieldAndValue('classname', 'func_door')) {
+      const door = doorEdict.entity as ServerEntity | null;
+
+      if (!door) {
+        continue;
+      }
+
+      if (door.targetname) { // remote controlled door, skip for now
+        continue;
+      }
+
+      this.relinkSkiplist.add(doorEdict.num);
+    }
+  }
+
+  #buildOctree(): void {
+    if (this.graph.nodes.length === 0) {
+      this.graph.octree = null;
+      return;
+    }
+
+    // compute bounding box of node origins
+    let minX = Infinity, minY = Infinity, minZ = Infinity;
+    let maxX = -Infinity, maxY = -Infinity, maxZ = -Infinity;
+
+    for (const n of this.graph.nodes) {
+      const o = n.origin;
+      if (o[0] < minX) { minX = o[0]; }
+      if (o[1] < minY) { minY = o[1]; }
+      if (o[2] < minZ) { minZ = o[2]; }
+      if (o[0] > maxX) { maxX = o[0]; }
+      if (o[1] > maxY) { maxY = o[1]; }
+      if (o[2] > maxZ) { maxZ = o[2]; }
+    }
+
+    const cx = (minX + maxX) / 2;
+    const cy = (minY + maxY) / 2;
+    const cz = (minZ + maxZ) / 2;
+    const extentX = maxX - minX;
+    const extentY = maxY - minY;
+    const extentZ = maxZ - minZ;
+    const halfSize = Math.max(extentX, extentY, extentZ) / 2 + 1;
+
+    const center = new Vector(cx, cy, cz);
+  this.graph.octree = new Octree<Node>(center, halfSize, 12, 8);
+
+    for (const n of this.graph.nodes) {
+      this.graph.octree.insert(n);
+    }
+  }
+
+  /**
+   * Find nearest graph node to a world position.
+   * @returns The nearest node within the search radius, or null.
+   */
+    #findNearestNode(position: Vector, maxDist = 512): Node | null {
+    if (this.graph.nodes.length === 0) {
+      return null;
+    }
+
+    // first try octree lookup, if available (linking specials won’t have access to the Octree yet)
+    if (this.graph.octree) {
+      const n = this.graph.octree.nearest(position, maxDist);
+
+      if (n) {
+        return n;
+      }
+    }
+
+    // fallthrough to full scan if nothing found within maxDist in octree
+    Con.DPrint('Navigation: nearest node not found in octree, falling back to linear scan\n');
+
+    let best = null;
+    let bestDist = Infinity;
+
+    for (const node of this.graph.nodes) {
+      const d = position.distanceTo(node.origin);
+      if (d < bestDist && d <= maxDist) {
+        bestDist = d;
+        best = node;
+      }
+    }
+
+    return best;
+  }
+
+  /**
+   * Find all graph nodes within maxDist of a world position.
+   * Uses the octree when available, falls back to linear scan.
+   * @yields Nodes within the requested radius.
+   */
+  *#findNearestNodes(position: Vector, maxDist = 512): Generator<Node, void, undefined> {
+    if (this.graph.octree) {
+      for (const [, node] of this.graph.octree.root.querySphere(position, maxDist)) {
+        yield node;
+      }
+      return;
+    }
+
+    for (const node of this.graph.nodes) {
+      const d = position.distanceTo(node.origin);
+      if (d <= maxDist) {
+        yield node;
+      }
+    }
+  }
+
+  /**
+   * Find path between two world positions using A* over the navgraph.
+   * Returns an array of Vector positions (node origins) or null if no path.
+   * Using this async version will offload the pathfinding to another worker thread and it will not recover during save/load games!
+   * @returns A promised path containing the start and goal positions, or null.
+   */
+  findPathAsync(startPos: Vector, goalPos: Vector): Promise<Vector[] | null> {
+    return new Promise<Vector[] | null>((resolve) => {
+      const id = Math.random().toString(36).substring(2, 10);
+
+      this.#requests[id] = resolve;
+
+      eventBus.publish('nav.path.request', id, startPos, goalPos);
+    });
+  }
+
+  /**
+   * Find path between two world positions using A* over the navgraph.
+   * Returns an array of Vector positions (node origins) or null if no path.
+   * @returns A path containing the start and goal positions, or null.
+   */
+    findPath(startPos: Vector, goalPos: Vector): Vector[] | null {
+    if (!this.graph || !this.graph.nodes || this.graph.nodes.length === 0) {
+      return null;
+    }
+
+    const startNode = this.#findNearestNode(startPos, 512);
+    const goalNode = this.#findNearestNode(goalPos, 512);
+
+    if (!startNode || !goalNode) {
+      Con.DPrint('Navigation: no start or goal node found\n');
+      return null;
+    }
+
+    if (startNode.id === goalNode.id) {
+      const path = [startPos.copy(), goalPos.copy()];
+      return path;
+    }
+
+    const nodeCount = this.graph.nodes.length;
+    const gScore = new Float64Array(nodeCount).fill(Infinity);
+    const cameFrom = new Int32Array(nodeCount).fill(-1);
+    const openSet = new MinHeap(nodeCount);
+
+    gScore[startNode.id] = 0;
+    openSet.pushOrDecrease(startNode.id, startNode.origin.distanceTo(goalNode.origin));
+
+    while (openSet.size > 0) {
+      const currentId = openSet.pop();
+
+      if (currentId === goalNode.id) {
+        const path = [];
+        let cur = currentId;
+
+        while (cur !== -1) {
+          path.push(this.graph.nodes[cur].origin.copy());
+          cur = cameFrom[cur];
+        }
+
+        path.reverse();
+        path[0] = startPos.copy();
+        path.push(goalPos.copy());
+        return path;
+      }
+
+      const currentG = gScore[currentId];
+
+      for (const nb of this.graph.nodes[currentId].neighbors) {
+        const nbId = nb[0];
+        const tentativeG = currentG + nb[1] + nb[2];
+
+        if (tentativeG < gScore[nbId]) {
+          cameFrom[nbId] = currentId;
+          gScore[nbId] = tentativeG;
+          openSet.pushOrDecrease(nbId, tentativeG + this.graph.nodes[nbId].origin.distanceTo(goalNode.origin));
+        }
+      }
+    }
+
+    return null;
+  }
+
+  #emitDot(position: Vector, color = 15, ttl = Infinity): void {
+    if (Number.isFinite(ttl)) {
+      eventBus.publish('nav.debug.emit-dot.temporarily', position, color, ttl);
+    } else {
+      eventBus.publish('nav.debug.emit-dot.permanently', position, color);
+    }
+  }
+
+  static #emitDotFrontend(position: Vector, color = 15, ttl = Infinity): void {
+    if (!R) {
+      return;
+    }
+
+    const pn = R.AllocParticles(1);
+
+    if (pn.length !== 1) {
+      Con.PrintWarning(`Navigation: failed to allocate particle for debug dot at [${position}]\n`);
+      return;
+    }
+
+    const p = R.particles[pn[0]];
+    p.die = CL.state.time + ttl;
+    p.color = color;
+    p.vel = new Vector(0, 0, 0);
+    p.org = position.copy();
+    p.type = R.ptype.tracer;
+  }
+
+  #debugNavigation(): void {
+    if (!Navigation.nav_debug_graph.value) {
+      return;
+    }
+
+    for (const node of this.graph.nodes) {
+      let color = 144;
+
+      if (node.nearLedge) {
+        color = 251;
+      }
+
+      this.#emitDot(node.origin.copy().add(new Vector(0, 0, 16)), color);
+    }
+  }
+
+  /**
+   * Emits a short-lived dotted debug path in the renderer.
+   */
+  #debugPath(vectors: Vector[], color = 251): void {
+    if (!vectors || vectors.length === 0) {
+      return;
+    }
+
+    const viewOffset = new Vector(0, 0, 22);
+
+    for (let i = 0; i < vectors.length - 1; i++) {
+      const start = vectors[i].copy().add(viewOffset);
+      const end = vectors[i + 1].copy().add(viewOffset);
+      const diff = end.copy().subtract(start);
+      const totalDistance = diff.len();
+      const stepLength = 4;
+      diff.normalize();
+
+      // Sample along the segment every 5 units
+      for (let dist = 0; dist <= totalDistance; dist += stepLength) {
+        const samplePoint = start.copy().add(diff.copy().multiply(dist));
+        this.#emitDot(samplePoint, color, 10);
+      }
+    }
+  }
+
+  #debugWaypoints(): void {
+    if (!Navigation.nav_debug_waypoints.value) {
+      return;
+    }
+
+    if (this.geometry.walkableSurfaces.length === 0) {
+      Con.PrintWarning('Navigation: waypoint debug is only available immediately after a local nav build. Nav files do not include waypoint data.\n');
+      return;
+    }
+
+    const debugPoints: DebugPoint[] = [];
+    let waypoints = 0;
+
+    for (const surface of this.geometry.walkableSurfaces) {
+      for (const wp of surface.waypoints) {
+        let color = 15;
+
+        if (wp.nearLedge && surface.stability !== 1) {
+          color = 47;
+        } else if (wp.nearLedge) {
+          color = 251;
+        } else if (surface.stability !== 1) {
+          color = 192;
+        }
+
+        debugPoints.push({ origin: wp.origin, color, surface });
+        waypoints++;
+      }
+    }
+
+    Con.DPrint(`Navigation: debug waypoints: ${waypoints}\n`);
+    Con.DPrint(`Navigation: extracted walkable surfaces: ${this.geometry.walkableSurfaces.length}\n`);
+
+    for (const { color, origin } of debugPoints) {
+      this.#emitDot(origin, color);
+    }
+  }
+
+  // #debugKnownTestNavMeshProbes() {
+  //   if (SV.server.mapname !== 'test_nav_mesh') {
+  //     return;
+  //   }
+
+  //   const probes = [
+  //     ['knight-start', new Vector(-160.0, -112.0, -160.0)],
+  //     ['player-start', new Vector(352.0, -120.0, 40.0)],
+  //     ['tele-dest-1', new Vector(352.0, -24.0, 24.0)],
+  //     ['tele-dest-2', new Vector(-168.0, -416.0, -168.0)],
+  //   ];
+
+  //   for (const [label, origin] of probes) {
+  //     Con.PrintWarning(
+  //       `Navigation: probe ${label} fit=${this.#isValidStandOrigin(origin)} support=${this.#hasGroundSupport(origin)} height=${this.#measureAvailableHeight(origin)}\n`,
+  //     );
+  //   }
+  // }
+
+  build(): void {
+    console.assert(Boolean(this.worldmodel), 'Navigation: worldmodel is required');
+
+    this.graph.octree = null;
+    this.graph.nodes.length = 0;
+    this.geometry.walkableSurfaces.length = 0;
+    this.relinkSkiplist.clear();
+    this.relinkEdictLinks = {};
+
+    Con.PrintWarning('Navigation: node graph out of date, rebuilding...\n');
+
+    // this.#debugKnownTestNavMeshProbes();
+
+    this.#extractWalkableSurfaces();
+    this.#buildNavigationGraph();
+    this.#buildSpecialConnections();
+    this.#buildOctree();
+
+    Con.DPrint(`Navigation: node graph built with ${this.graph.nodes.length} nodes.\n`);
+
+    void this.save()
+      .then(() => {
+        Con.PrintSuccess('Navigation: navigation graph saved!\n');
+        if (Navigation.nav_build_process?.value) {
+          void Cmd.ExecuteString('quit');
+        }
+      })
+      .catch((err) => Con.PrintError(`Navigation: failed to save navigation graph: ${err}\n`));
+
+    this.#scheduleDebugRefresh();
+  }
+}
diff --git a/source/engine/server/Progs.ts b/source/engine/server/Progs.ts
index 781baa59..26129dba 100644
--- a/source/engine/server/Progs.ts
+++ b/source/engine/server/Progs.ts
@@ -7,7 +7,7 @@ import Cvar from '../common/Cvar.ts';
 import { HostError, MissingResourceError } from '../common/Errors.ts';
 import Q from '../../shared/Q.ts';
 import Vector from '../../shared/Vector.ts';
-import { eventBus, registry } from '../registry.mjs';
+import { eventBus, getCommonRegistry } from '../registry.mjs';
 import { ED, ServerEdict } from './Edict.mjs';
 import { ServerEngineAPI } from '../common/GameAPIs.ts';
 import PF, { etype, ofs } from './ProgsAPI.mjs';
@@ -136,12 +136,10 @@ const PR = {} as ProgsModule;
 
 export default PR;
 
-let { COM, Con, SV } = registry;
+let { COM, Con, SV } = getCommonRegistry();
 
 eventBus.subscribe('registry.frozen', () => {
-  COM = registry.COM;
-  Con = registry.Con;
-  SV = registry.SV;
+  ({ COM, Con, SV } = getCommonRegistry());
 });
 
 PR.saveglobal = (1<<15);
@@ -373,10 +371,9 @@ class ProgsEntity {
   static SERIALIZATION_TYPE_PRIMITIVE = 'P';
 
   /**
-   *
-   * @param {*} ed can be null, then it’s global
+   * Creates a QuakeC entity view backed by an edict or the globals table.
    */
-  constructor(ed) {
+    constructor(ed: ServerEdict | null) {
     // const stats = ed ? PR._stats.edict : PR._stats.global;
     const defs = ed ? PR.fielddefs : PR.globaldefs;
 
@@ -653,8 +650,7 @@ class ProgsEntity {
 
 /**
  * Retrieves the global definition at the specified offset.
- * @param {number} ofs - The offset to retrieve.
- * @returns {object|null} - The global definition.
+ * @returns The matching global definition, or null when none exists.
  */
 PR.GlobalAtOfs = function(ofs) {
   return PR.globaldefs.find((def) => def.ofs === ofs) || null;
@@ -662,8 +658,7 @@ PR.GlobalAtOfs = function(ofs) {
 
 /**
  * Retrieves the field definition at the specified offset.
- * @param {number} ofs - The offset to retrieve.
- * @returns {object|null} - The field definition.
+ * @returns The matching field definition, or null when none exists.
  */
 PR.FieldAtOfs = function(ofs) {
   return PR.fielddefs.find((def) => def.ofs === ofs) || null;
@@ -671,8 +666,7 @@ PR.FieldAtOfs = function(ofs) {
 
 /**
  * Finds a field definition by name.
- * @param {string} name - The field name.
- * @returns {object|null} - The field definition.
+ * @returns The matching field definition, or null when none exists.
  */
 PR.FindField = function(name) {
   return PR.fielddefs.find((def) => PR.GetString(def.name) === name) || null;
@@ -680,8 +674,7 @@ PR.FindField = function(name) {
 
 /**
  * Finds a global definition by name.
- * @param {string} name - The global name.
- * @returns {object|null} - The global definition.
+ * @returns The matching global definition, or null when none exists.
  */
 PR.FindGlobal = function(name) {
   return PR.globaldefs.find((def) => PR.GetString(def.name) === name) || null;
@@ -689,8 +682,7 @@ PR.FindGlobal = function(name) {
 
 /**
  * Finds a function definition by name.
- * @param {string} name - The function name.
- * @returns {number} - The function index.
+ * @returns The function index, or `-1` when the function cannot be found.
  */
 PR.FindFunction = function(name) {
   return PR.functions.findIndex((func) => PR.GetString(func.name) === name);
@@ -1085,10 +1077,8 @@ PR.LoadProgs = async function() {
   return gameAPI;
 };
 
-/** @type {Cvar[]} */
 PR._cvars = [];
 
-/** @type {import('./GameLoader').GameModuleInterface|null} */
 PR.QuakeJS = null;
 
 PR.Init = async function() {
diff --git a/source/engine/server/ProgsAPI.mjs b/source/engine/server/ProgsAPI.mjs
index e5a823b0..697e2408 100644
--- a/source/engine/server/ProgsAPI.mjs
+++ b/source/engine/server/ProgsAPI.mjs
@@ -1,548 +1 @@
-import Vector from '../../shared/Vector.ts';
-import Cmd from '../common/Cmd.ts';
-import { HostError } from '../common/Errors.ts';
-import { ServerEngineAPI } from '../common/GameAPIs.ts';
-import { eventBus, registry } from '../registry.mjs';
-import { ED, ServerEdict } from './Edict.mjs';
-
-const PF = {};
-
-export default PF;
-
-let { Con, PR, SV } = registry;
-
-eventBus.subscribe('registry.frozen', () => {
-  Con = registry.Con;
-  PR = registry.PR;
-  SV = registry.SV;
-});
-
-PF._assertTrue = function _assertTrue(check, message) {
-  if (!check) {
-    throw new Error('Program assert failed: ' + message);
-  }
-};
-
-/**
- * PR.fielddefs[].type
- * @enum {number}
- * @readonly
- */
-export const etype = Object.freeze({
-  ev_void: 0,
-  ev_string: 1,
-  ev_float: 2,
-  ev_vector: 3,
-  ev_entity: 4,
-  ev_field: 5,
-  ev_function: 6,
-  ev_pointer: 7,
-
-  ev_strings: 101,
-  ev_integer: 102,
-  ev_string_not_empty: 103,
-  ev_entity_client: 104,
-  ev_bool: 200,
-});
-
-/**
- * @enum {number}
- * @readonly
- */
-export const ofs = Object.freeze({
-  OFS_NULL: 0,
-  OFS_RETURN: 1,
-  OFS_PARM0: 4, // leave 3 ofs for each parm to hold vectors
-  OFS_PARM1: 7,
-  OFS_PARM2: 10,
-  OFS_PARM3: 13,
-  OFS_PARM4: 16,
-  OFS_PARM5: 19,
-  OFS_PARM6: 22,
-  OFS_PARM7: 25,
-});
-
-/**
- * Will generate a function that can be exposed to the QuakeC VM (so called built-in function)
- * @param {string} name
- * @param {Function} func
- * @param {etype[]} argTypes
- * @param {etype} returnType
- * @returns {Function}
- */
-function _PF_GenerateBuiltinFunction(name, func, argTypes = [], returnType = etype.ev_void) {
-  if (!(func instanceof Function)) {
-    throw new TypeError('func must be a Function!');
-  }
-
-  const args = [];
-  const asserts = [];
-
-  for (const argType of argTypes) {
-    const parmNum = args.length;
-    const parmName = `PR.ofs.OFS_PARM${parmNum}`;
-
-    switch (argType) {
-      case etype.ev_entity_client:
-        asserts.push({check: `PR.globals_int[${parmName}] > 0 && PR.globals_int[${parmName}] <= SV.svs.maxclients`, message: 'edict points to a non-client'});
-      // eslint-disable-next-line no-fallthrough
-      case etype.ev_entity:
-        args.push(`SV.server.edicts[PR.globals_int[${parmName}]]`);
-        break;
-
-      case etype.ev_vector:
-        args.push(`new Vector(PR.globals_float[${parmName}], PR.globals_float[${parmName} + 1], PR.globals_float[${parmName} + 2])`);
-        break;
-
-      case etype.ev_float:
-        args.push(`PR.globals_float[${parmName}]`);
-        break;
-
-      case etype.ev_integer:
-        args.push(`PR.globals_float[${parmName}] >> 0`);
-        break;
-
-      case etype.ev_bool:
-        args.push(`!!PR.globals_float[${parmName}]`);
-        break;
-
-      case etype.ev_string_not_empty:
-        asserts.push({check: `PR.globals_int[${parmName}]`, message: 'string must not be empty'});
-        // eslint-disable-next-line no-fallthrough
-      case etype.ev_string:
-        args.push(`PR.GetString(PR.globals_int[${parmName}])`);
-        break;
-
-      case etype.ev_strings:
-        args.push(`PF._VarString(${args.length})`);
-        break;
-
-      case etype.ev_field:
-        args.push(`Object.entries(PR.entvars).find((entry) => entry[1] === PR.globals_int[${parmName}])[0]`);
-        break;
-
-      case etype.ev_void:
-        args.push(null);
-        break;
-
-      default:
-        throw new TypeError('unsupported arg type: ' + argType);
-    }
-  }
-
-  let returnCode = '';
-
-  switch (returnType) {
-    case etype.ev_vector:
-      asserts.push({check: 'returnValue instanceof Vector', message: 'returnValue must be a Vector'});
-      asserts.push({check: '!Number.isNaN(returnValue[0])', message: 'returnValue[0] must not be NaN'});
-      asserts.push({check: '!Number.isNaN(returnValue[1])', message: 'returnValue[1] must not be NaN'});
-      asserts.push({check: '!Number.isNaN(returnValue[2])', message: 'returnValue[2] must not be NaN'});
-      returnCode = `
-        PR.globals_float[${ofs.OFS_RETURN + 0}] = returnValue[0];
-        PR.globals_float[${ofs.OFS_RETURN + 1}] = returnValue[1];
-        PR.globals_float[${ofs.OFS_RETURN + 2}] = returnValue[2];
-      `;
-      break;
-
-    case etype.ev_entity_client:
-      asserts.push({check: 'returnValue === null || (returnValue.num > 0 && returnValue.num <= SV.svs.maxclients)', message: 'edict points to a non-client'});
-    // eslint-disable-next-line no-fallthrough
-    case etype.ev_entity:
-      // additional sanity check: the returnValue _must_ be an Edict or null, otherwise chaos will ensue
-      asserts.push({check: 'returnValue === null || returnValue instanceof ServerEdict', message: 'returnValue must be an Edict or null'});
-      returnCode = `PR.globals_int[${ofs.OFS_RETURN}] = returnValue ? returnValue.num : 0;`;
-      break;
-
-    case etype.ev_integer:
-      asserts.push({check: '!Number.isNaN(returnValue)', message: 'returnValue must not be NaN'});
-      returnCode = `PR.globals_float[${ofs.OFS_RETURN}] = returnValue >> 0;`;
-      break;
-
-    case etype.ev_float:
-      asserts.push({check: '!Number.isNaN(returnValue)', message: 'returnValue must not be NaN'});
-      returnCode = `PR.globals_float[${ofs.OFS_RETURN}] = returnValue;`;
-      break;
-
-    case etype.ev_bool:
-      asserts.push({check: 'typeof(returnValue) === \'boolean\'', message: 'returnValue must be bool'});
-      returnCode = `PR.globals_float[${ofs.OFS_RETURN}] = returnValue;`;
-      break;
-
-    case etype.ev_void:
-      returnCode = '/* no return value */';
-      break;
-
-    case etype.ev_string_not_empty:
-      asserts.push({check: 'returnValue !== null && returnValue !== \'\'', message: 'string must not be empty'});
-      // eslint-disable-next-line no-fallthrough
-    case etype.ev_string:
-      returnCode = `PR.globals_int[${ofs.OFS_RETURN}] = PR.TempString(returnValue);`;
-      break;
-
-    default:
-      throw new TypeError('unsupported return type: ' + returnType);
-  }
-
-  // TODO: do not pass on `asserts` when not in debug mode or developer mode
-
-  const code = `return function ${name}() {
-  const { PR, SV } = registry;
-
-  ${args.map((def, index) => `  const arg${index} = ${def};`).join('\n')}
-
-  const returnValue = _${name}(${args.map((_, index) => `arg${index}`).join(', ')});
-
-  ${asserts.map(({check, message}) => `  PF._assertTrue(${check}, ${JSON.stringify(message)});`).join('\n')}
-
-  ${returnCode}
-}`;
-
-  return (new Function('ED', 'PF', 'ServerEdict', 'Vector', 'registry', '_' + name, code))(ED, PF, ServerEdict, Vector, registry, func);
-};
-
-PF._VarString = function _VarString(first) {
-  let i; let out = '';
-  for (i = first; i < PR.argc; i++) {
-    out += PR.GetString(PR.globals_int[ofs.OFS_PARM0 + i * 3]);
-  }
-  return out;
-};
-
-PF.error = _PF_GenerateBuiltinFunction('error', function (str) {
-  Con.PrintError('======SERVER ERROR in ' + PR.GetString(PR.xfunction.name) + '\n' + str + '\n');
-  ED.Print(SV.server.gameAPI.self);
-  throw new HostError('Program error: ' + str);
-}, [etype.ev_strings]);
-
-PF.objerror = _PF_GenerateBuiltinFunction('objerror', function (str) {
-  Con.PrintError('======OBJECT ERROR in ' + PR.GetString(PR.xfunction.name) + '\n' + str + '\n');
-  ED.Print(SV.server.gameAPI.self);
-  throw new HostError('Program error: ' + str);
-}, [etype.ev_strings]);
-
-PF.makevectors = _PF_GenerateBuiltinFunction('makevectors', function (vec) {
-  const {forward, right, up} = vec.angleVectors();
-  SV.server.gameAPI.v_forward = forward;
-  SV.server.gameAPI.v_right = right;
-  SV.server.gameAPI.v_up = up;
-}, [etype.ev_vector]);
-
-PF.setorigin = _PF_GenerateBuiltinFunction('setorigin', (edict, vec)  => edict.setOrigin(vec), [etype.ev_entity, etype.ev_vector], etype.ev_void);
-
-PF.setsize = _PF_GenerateBuiltinFunction('setsize', (edict, min, max) => edict.setMinMaxSize(min, max), [etype.ev_entity, etype.ev_vector, etype.ev_vector], etype.ev_void);
-
-PF.setmodel = _PF_GenerateBuiltinFunction('setmodel', function(ed, model) {
-  ed.setModel(model);
-}, [etype.ev_entity, etype.ev_string]);
-
-PF.bprint = _PF_GenerateBuiltinFunction('bprint', ServerEngineAPI.BroadcastPrint, [etype.ev_strings]);
-
-PF.sprint = _PF_GenerateBuiltinFunction('sprint', (clientEdict, message) => clientEdict.getClient().consolePrint(message), [etype.ev_entity_client, etype.ev_strings]);
-
-PF.centerprint = _PF_GenerateBuiltinFunction('centerprint', (clientEdict, message) => clientEdict.getClient().centerPrint(message), [etype.ev_entity_client, etype.ev_strings]);
-
-PF.normalize = _PF_GenerateBuiltinFunction('normalize', function (vec) {
-  vec.normalize();
-
-  return vec;
-}, [etype.ev_vector], etype.ev_vector);
-
-PF.vlen = _PF_GenerateBuiltinFunction('vlen', (vec) => vec.len(), [etype.ev_vector], etype.ev_float);
-
-PF.vectoyaw = _PF_GenerateBuiltinFunction('vectoyaw', (vec) => vec.toYaw(), [etype.ev_vector], etype.ev_float);
-
-PF.vectoangles = _PF_GenerateBuiltinFunction('vectoangles', (vec) => vec.toAngles(), [etype.ev_vector], etype.ev_vector);
-
-PF.random = _PF_GenerateBuiltinFunction('random', Math.random, [], etype.ev_float);
-
-PF.particle = _PF_GenerateBuiltinFunction('particle', ServerEngineAPI.StartParticles, [etype.ev_vector, etype.ev_vector, etype.ev_integer, etype.ev_integer]);
-
-PF.ambientsound = _PF_GenerateBuiltinFunction('ambientsound', ServerEngineAPI.SpawnAmbientSound, [
-  etype.ev_vector,
-  etype.ev_string_not_empty,
-  etype.ev_float,
-  etype.ev_float,
-], etype.ev_bool);
-
-PF.sound = _PF_GenerateBuiltinFunction('sound', ServerEngineAPI.StartSound, [
-  etype.ev_entity,
-  etype.ev_integer,
-  etype.ev_string_not_empty,
-  etype.ev_float,
-  etype.ev_float,
-], etype.ev_bool);
-
-PF.breakstatement = function breakstatement() { // PR
-  Con.Print('break statement\n');
-};
-
-PF.traceline = _PF_GenerateBuiltinFunction('traceline', function(start, end, noMonsters, passEdict) {
-  const trace = ServerEngineAPI.TracelineLegacy(start, end, noMonsters, passEdict);
-
-  SV.server.gameAPI.trace_allsolid = (trace.allsolid === true) ? 1.0 : 0.0;
-  SV.server.gameAPI.trace_startsolid = (trace.startsolid === true) ? 1.0 : 0.0;
-  SV.server.gameAPI.trace_fraction = trace.fraction;
-  SV.server.gameAPI.trace_inwater = (trace.inwater === true) ? 1.0 : 0.0;
-  SV.server.gameAPI.trace_inopen = (trace.inopen === true) ? 1.0 : 0.0;
-  SV.server.gameAPI.trace_endpos = trace.endpos;
-  SV.server.gameAPI.trace_plane_normal = trace.plane.normal;
-  SV.server.gameAPI.trace_plane_dist = trace.plane.dist;
-  SV.server.gameAPI.trace_ent = trace.ent || null;
-}, [
-  etype.ev_vector,
-  etype.ev_vector,
-  etype.ev_integer,
-  etype.ev_entity,
-]);
-
-PF.checkclient = _PF_GenerateBuiltinFunction('checkclient', () => SV.server.gameAPI.self.getNextBestClient(), [], etype.ev_entity_client);
-
-PF.stuffcmd = _PF_GenerateBuiltinFunction('stuffcmd', function(clientEdict, cmd) {
-  clientEdict.getClient().sendConsoleCommands(cmd);
-}, [etype.ev_entity_client, etype.ev_string]);
-
-PF.localcmd = _PF_GenerateBuiltinFunction('localcmd', function(cmd) {
-  Cmd.text += cmd;
-}, [etype.ev_string]);
-
-PF.cvar = _PF_GenerateBuiltinFunction('cvar', function(name) {
-  const cvar = ServerEngineAPI.GetCvar(name);
-  return cvar ? cvar.value : 0.0;
-}, [etype.ev_string], etype.ev_float);
-
-PF.cvar_set = _PF_GenerateBuiltinFunction('cvar_set', ServerEngineAPI.SetCvar, [etype.ev_string, etype.ev_string]);
-
-PF.findradius = _PF_GenerateBuiltinFunction('findradius', (origin, radius) => {
-  const edicts = ServerEngineAPI.FindInRadius(origin, radius);
-
-  // doing the chain dance
-  let chain = SV.server.edicts[0]; // starts with worldspawn
-
-  // iterate over the list of edicts
-  for (const edict of edicts) {
-    edict.entity.chain = chain;
-    chain = edict;
-  }
-
-  return chain;
-}, [etype.ev_vector, etype.ev_float], etype.ev_entity);
-
-PF.dprint = _PF_GenerateBuiltinFunction('dprint', (str) => ServerEngineAPI.ConsoleDebug(str), [etype.ev_strings]);
-
-PF.ftos = _PF_GenerateBuiltinFunction('ftos', (f) => (+f|0) === +f ? f.toString() : f.toFixed(1), [etype.ev_float], etype.ev_string);
-
-PF.fabs = _PF_GenerateBuiltinFunction('fabs', Math.abs, [etype.ev_float], etype.ev_float);
-
-PF.vtos = _PF_GenerateBuiltinFunction('vtos', (vec) => vec.toString(), [etype.ev_vector], etype.ev_string);
-
-PF.Spawn = _PF_GenerateBuiltinFunction('Spawn', () => {
-  // this is a special null entity we spawn for the QuakeC
-  // it will be automatically populated with an EdictProxy
-  // the JS Game is supposed to use ServerEngineAPI.SpawnEntity
-  const edict = ED.Alloc();
-  SV.server.gameAPI.prepareEntity(edict, null, {});
-  return edict;
-}, [], etype.ev_entity);
-
-PF.Remove = _PF_GenerateBuiltinFunction('Remove', (edict) => edict.freeEdict(), [etype.ev_entity]);
-
-PF.Find = _PF_GenerateBuiltinFunction('Find', (edict, field, value) => ServerEngineAPI.FindByFieldAndValue(field, value, edict.num + 1), [etype.ev_entity, etype.ev_field, etype.ev_string], etype.ev_entity);
-
-PF.MoveToGoal = _PF_GenerateBuiltinFunction('MoveToGoal', (dist) => SV.server.gameAPI.self.moveToGoal(dist), [etype.ev_float], etype.ev_bool);
-
-PF.precache_file = _PF_GenerateBuiltinFunction('precache_file', (integer) =>
-   integer // dummy behavior
-, [etype.ev_integer], etype.ev_integer);
-
-PF.precache_sound = _PF_GenerateBuiltinFunction('precache_sound', (sfxName) => ServerEngineAPI.PrecacheSound(sfxName), [etype.ev_string_not_empty]);
-
-PF.precache_model = _PF_GenerateBuiltinFunction('precache_model', (modelName) =>
-  // FIXME: handle this more gracefully
-  // if (SV.server.loading !== true) {
-  //   PR.RunError('PF.Precache_*: Precache can only be done in spawn functions');
-  // }
-
-   ServerEngineAPI.PrecacheModel(modelName)
-, [etype.ev_string_not_empty]);
-
-PF.coredump = function coredump() {
-  ED.PrintEdicts();
-};
-
-PF.traceon = function traceon() {
-  PR.trace = true;
-};
-
-PF.traceoff = function traceoff() {
-  PR.trace = false;
-};
-
-PF.eprint = function eprint() {
-  ED.Print(SV.server.edicts[PR.globals_float[4]]);
-};
-
-PF.walkmove = _PF_GenerateBuiltinFunction('walkmove', function(yaw, dist) {
-  const oldf = PR.xfunction; // ???
-  const res = SV.server.gameAPI.self.walkMove(yaw, dist);
-  PR.xfunction = oldf; // ???
-
-  return res;
-}, [etype.ev_float, etype.ev_float], etype.ev_bool);
-
-PF.droptofloor = _PF_GenerateBuiltinFunction('droptofloor', () => SV.server.gameAPI.self.dropToFloor(-256.0), [], etype.ev_bool);
-
-PF.lightstyle = _PF_GenerateBuiltinFunction('lightstyle', ServerEngineAPI.Lightstyle, [etype.ev_integer, etype.ev_string]);
-
-PF.rint = _PF_GenerateBuiltinFunction('rint', (f) => (f >= 0.0 ? f + 0.5 : f - 0.5), [etype.ev_float], etype.ev_integer);
-
-PF.floor = _PF_GenerateBuiltinFunction('floor', Math.floor, [etype.ev_float], etype.ev_float);
-
-PF.ceil = _PF_GenerateBuiltinFunction('ceil', Math.ceil, [etype.ev_float], etype.ev_float);
-
-PF.checkbottom = _PF_GenerateBuiltinFunction('checkbottom', (edict) => edict.isOnTheFloor(), [etype.ev_entity], etype.ev_bool);
-
-PF.pointcontents = _PF_GenerateBuiltinFunction('pointcontents', ServerEngineAPI.DeterminePointContents, [etype.ev_vector], etype.ev_float);
-
-PF.nextent = _PF_GenerateBuiltinFunction('nextent', (edict) => edict.nextEdict(), [etype.ev_entity], etype.ev_entity);
-
-PF.aim = _PF_GenerateBuiltinFunction('aim', (edict) => {
-  // CR: `makevectors(self.v_angle);` is called in `W_Attack` and propagates all the way down here
-  const dir = SV.server.gameAPI.v_forward;
-  return edict.aim(dir);
-}, [etype.ev_entity], etype.ev_vector);
-
-PF.changeyaw = _PF_GenerateBuiltinFunction('changeyaw', () => SV.server.gameAPI.self.changeYaw(), []);
-
-// eslint-disable-next-line jsdoc/require-jsdoc
-function WriteGeneric(dest) {
-  switch (dest) {
-    case 0: // broadcast
-      return SV.server.datagram;
-    case 1: { // one
-        // CR: I’m not happy with the structure of the code, Write* needs to be on Edict as well
-        const msg_entity = SV.server.gameAPI.msg_entity;
-        const entnum = msg_entity.num;
-        if (!msg_entity.isClient()) {
-          throw new Error('WriteGeneric: not a client ' + entnum);
-        }
-        return msg_entity.getClient().message;
-      }
-    case 2: // all
-      return SV.server.reliable_datagram;
-    case 3: // init
-      return SV.server.signon;
-  }
-  throw new Error('WriteGeneric: bad destination ' + dest);
-};
-
-for (const [fn, method] of [['WriteByte', 'writeByte'], ['WriteChar', 'writeChar'], ['WriteShort', 'writeShort'], ['WriteLong', 'writeLong'], ['WriteAngle', 'writeAngle'], ['WriteCoord', 'writeCoord']]) {
-  PF[fn] = _PF_GenerateBuiltinFunction(fn, (dest, val) => WriteGeneric(dest)[method](val), [etype.ev_integer, etype.ev_float]);
-}
-
-PF.WriteString = _PF_GenerateBuiltinFunction('WriteString', (dest, val) => WriteGeneric(dest).writeString(val), [etype.ev_integer, etype.ev_string]);
-
-PF.WriteEntity = _PF_GenerateBuiltinFunction('WriteEntity', (dest, val) => WriteGeneric(dest).writeShort(val.num), [etype.ev_integer, etype.ev_entity]);
-
-PF.makestatic = _PF_GenerateBuiltinFunction('makestatic', (edict) => edict.makeStatic(), [etype.ev_entity]);
-
-PF.setspawnparms = _PF_GenerateBuiltinFunction('setspawnparms', function (clientEdict) {
-  const spawn_parms = clientEdict.getClient().spawn_parms;
-
-  for (let i = 0; i <= 15; i++) {
-    SV.server.gameAPI[`parm${i + 1}`] = spawn_parms[i];
-  }
-}, [etype.ev_entity_client]);
-
-PF.changelevel = _PF_GenerateBuiltinFunction('changelevel', ServerEngineAPI.ChangeLevel, [etype.ev_string]);
-
-PF.Fixme = function Fixme() {
-  throw new Error('unimplemented builtin');
-};
-
-PF.builtin = [
-  PF.Fixme,
-  PF.makevectors,
-  PF.setorigin,
-  PF.setmodel,
-  PF.setsize,
-  PF.Fixme,
-  PF.breakstatement,
-  PF.random,
-  PF.sound,
-  PF.normalize,
-  PF.error,
-  PF.objerror,
-  PF.vlen,
-  PF.vectoyaw,
-  PF.Spawn,
-  PF.Remove,
-  PF.traceline,
-  PF.checkclient,
-  PF.Find,
-  PF.precache_sound,
-  PF.precache_model,
-  PF.stuffcmd,
-  PF.findradius,
-  PF.bprint,
-  PF.sprint,
-  PF.dprint,
-  PF.ftos,
-  PF.vtos,
-  PF.coredump,
-  PF.traceon,
-  PF.traceoff,
-  PF.eprint,
-  PF.walkmove,
-  PF.Fixme,
-  PF.droptofloor,
-  PF.lightstyle,
-  PF.rint,
-  PF.floor,
-  PF.ceil,
-  PF.Fixme,
-  PF.checkbottom,
-  PF.pointcontents,
-  PF.Fixme,
-  PF.fabs,
-  PF.aim,
-  PF.cvar,
-  PF.localcmd,
-  PF.nextent,
-  PF.particle,
-  PF.changeyaw,
-  PF.Fixme,
-  PF.vectoangles,
-  PF.WriteByte,
-  PF.WriteChar,
-  PF.WriteShort,
-  PF.WriteLong,
-  PF.WriteCoord,
-  PF.WriteAngle,
-  PF.WriteString,
-  PF.WriteEntity,
-  PF.Fixme,
-  PF.Fixme,
-  PF.Fixme,
-  PF.Fixme,
-  PF.Fixme,
-  PF.Fixme,
-  PF.Fixme,
-  PF.MoveToGoal,
-  PF.precache_file,
-  PF.makestatic,
-  PF.changelevel,
-  PF.Fixme,
-  PF.cvar_set,
-  PF.centerprint,
-  PF.ambientsound,
-  PF.precache_model,
-  PF.precache_sound,
-  PF.precache_file,
-  PF.setspawnparms,
-
-  PF.Fixme, // PF.logfrag,
-  PF.Fixme, // PF.infokey,
-  PF.Fixme, // PF.stof,
-  PF.Fixme, // PF.multicast,
-];
+export { default, etype, ofs } from './ProgsAPI.ts';
diff --git a/source/engine/server/ProgsAPI.ts b/source/engine/server/ProgsAPI.ts
new file mode 100644
index 00000000..79457a0e
--- /dev/null
+++ b/source/engine/server/ProgsAPI.ts
@@ -0,0 +1,645 @@
+import type { SzBuffer } from '../network/MSG.ts';
+
+import Vector from '../../shared/Vector.ts';
+import Cmd from '../common/Cmd.ts';
+import { HostError } from '../common/Errors.ts';
+import { ServerEngineAPI } from '../common/GameAPIs.ts';
+import { eventBus, getCommonRegistry, registry } from '../registry.mjs';
+import { ED, ServerEdict } from './Edict.mjs';
+
+type BuiltinValue = string | number | boolean | Vector | ServerEdict | null;
+type BuiltinImplementation = (...args: BuiltinValue[]) => BuiltinValue | void;
+type BuiltinFunction = () => void;
+
+interface GeneratedAssert {
+  readonly check: string;
+  readonly message: string;
+}
+
+interface ProgsAPI {
+  _assertTrue(check: boolean, message: string): void;
+  _VarString(first: number): string;
+  builtin: BuiltinFunction[];
+}
+
+const PF: ProgsAPI = {
+  _assertTrue(check: boolean, message: string): void {
+    if (!check) {
+      throw new Error(`Program assert failed: ${message}`);
+    }
+  },
+
+  _VarString(first: number): string {
+    let out = '';
+
+    for (let i = first; i < PR.argc; i++) {
+      out += PR.GetString(PR.globals_int[ofs.OFS_PARM0 + i * 3]);
+    }
+
+    return out;
+  },
+
+  builtin: [],
+};
+
+export default PF;
+
+let { Con, PR, SV } = getCommonRegistry();
+
+eventBus.subscribe('registry.frozen', () => {
+  ({ Con, PR, SV } = getCommonRegistry());
+});
+
+/**
+ * QuakeC field definition types from `PR.fielddefs[].type`.
+ */
+export enum etype {
+  ev_void = 0,
+  ev_string = 1,
+  ev_float = 2,
+  ev_vector = 3,
+  ev_entity = 4,
+  ev_field = 5,
+  ev_function = 6,
+  ev_pointer = 7,
+
+  ev_strings = 101,
+  ev_integer = 102,
+  ev_string_not_empty = 103,
+  ev_entity_client = 104,
+  ev_bool = 200,
+}
+
+/**
+ * QuakeC global parameter offsets.
+ */
+export enum ofs {
+  OFS_NULL = 0,
+  OFS_RETURN = 1,
+  OFS_PARM0 = 4,
+  OFS_PARM1 = 7,
+  OFS_PARM2 = 10,
+  OFS_PARM3 = 13,
+  OFS_PARM4 = 16,
+  OFS_PARM5 = 19,
+  OFS_PARM6 = 22,
+  OFS_PARM7 = 25,
+}
+
+/**
+ * Generates a function that can be exposed to the QuakeC VM as a builtin.
+ * @returns The VM-facing builtin wrapper.
+ */
+function generateBuiltinFunction(name: string, func: BuiltinImplementation, argTypes: readonly etype[] = [], returnType: etype = etype.ev_void): BuiltinFunction {
+  if (!(func instanceof Function)) {
+    throw new TypeError('func must be a Function!');
+  }
+
+  const args: Array<string | null> = [];
+  const asserts: GeneratedAssert[] = [];
+
+  for (const argType of argTypes) {
+    const parmNum = args.length;
+    const parmName = `PR.ofs.OFS_PARM${parmNum}`;
+
+    switch (argType) {
+      case etype.ev_entity_client:
+        asserts.push({ check: `PR.globals_int[${parmName}] > 0 && PR.globals_int[${parmName}] <= SV.svs.maxclients`, message: 'edict points to a non-client' });
+      // eslint-disable-next-line no-fallthrough
+      case etype.ev_entity:
+        args.push(`SV.server.edicts[PR.globals_int[${parmName}]]`);
+        break;
+
+      case etype.ev_vector:
+        args.push(`new Vector(PR.globals_float[${parmName}], PR.globals_float[${parmName} + 1], PR.globals_float[${parmName} + 2])`);
+        break;
+
+      case etype.ev_float:
+        args.push(`PR.globals_float[${parmName}]`);
+        break;
+
+      case etype.ev_integer:
+        args.push(`PR.globals_float[${parmName}] >> 0`);
+        break;
+
+      case etype.ev_bool:
+        args.push(`!!PR.globals_float[${parmName}]`);
+        break;
+
+      case etype.ev_string_not_empty:
+        asserts.push({ check: `PR.globals_int[${parmName}]`, message: 'string must not be empty' });
+      // eslint-disable-next-line no-fallthrough
+      case etype.ev_string:
+        args.push(`PR.GetString(PR.globals_int[${parmName}])`);
+        break;
+
+      case etype.ev_strings:
+        args.push(`PF._VarString(${args.length})`);
+        break;
+
+      case etype.ev_field:
+        args.push(`Object.entries(PR.entvars).find((entry) => entry[1] === PR.globals_int[${parmName}])[0]`);
+        break;
+
+      case etype.ev_void:
+        args.push(null);
+        break;
+
+      default:
+        throw new TypeError(`unsupported arg type: ${argType}`);
+    }
+  }
+
+  let returnCode = '';
+
+  switch (returnType) {
+    case etype.ev_vector:
+      asserts.push({ check: 'returnValue instanceof Vector', message: 'returnValue must be a Vector' });
+      asserts.push({ check: '!Number.isNaN(returnValue[0])', message: 'returnValue[0] must not be NaN' });
+      asserts.push({ check: '!Number.isNaN(returnValue[1])', message: 'returnValue[1] must not be NaN' });
+      asserts.push({ check: '!Number.isNaN(returnValue[2])', message: 'returnValue[2] must not be NaN' });
+      returnCode = `
+        PR.globals_float[${ofs.OFS_RETURN + 0}] = returnValue[0];
+        PR.globals_float[${ofs.OFS_RETURN + 1}] = returnValue[1];
+        PR.globals_float[${ofs.OFS_RETURN + 2}] = returnValue[2];
+      `;
+      break;
+
+    case etype.ev_entity_client:
+      asserts.push({ check: 'returnValue === null || (returnValue.num > 0 && returnValue.num <= SV.svs.maxclients)', message: 'edict points to a non-client' });
+    // eslint-disable-next-line no-fallthrough
+    case etype.ev_entity:
+      asserts.push({ check: 'returnValue === null || returnValue instanceof ServerEdict', message: 'returnValue must be an Edict or null' });
+      returnCode = `PR.globals_int[${ofs.OFS_RETURN}] = returnValue ? returnValue.num : 0;`;
+      break;
+
+    case etype.ev_integer:
+      asserts.push({ check: '!Number.isNaN(returnValue)', message: 'returnValue must not be NaN' });
+      returnCode = `PR.globals_float[${ofs.OFS_RETURN}] = returnValue >> 0;`;
+      break;
+
+    case etype.ev_float:
+      asserts.push({ check: '!Number.isNaN(returnValue)', message: 'returnValue must not be NaN' });
+      returnCode = `PR.globals_float[${ofs.OFS_RETURN}] = returnValue;`;
+      break;
+
+    case etype.ev_bool:
+      asserts.push({ check: 'typeof(returnValue) === \'boolean\'', message: 'returnValue must be bool' });
+      returnCode = `PR.globals_float[${ofs.OFS_RETURN}] = returnValue;`;
+      break;
+
+    case etype.ev_void:
+      returnCode = '/* no return value */';
+      break;
+
+    case etype.ev_string_not_empty:
+      asserts.push({ check: 'returnValue !== null && returnValue !== \'\'', message: 'string must not be empty' });
+    // eslint-disable-next-line no-fallthrough
+    case etype.ev_string:
+      returnCode = `PR.globals_int[${ofs.OFS_RETURN}] = PR.TempString(returnValue);`;
+      break;
+
+    default:
+      throw new TypeError(`unsupported return type: ${returnType}`);
+  }
+
+  const code = `return function ${name}() {
+  const { PR, SV } = registry;
+
+  ${args.map((definition, index) => `  const arg${index} = ${definition};`).join('\n')}
+
+  const returnValue = _${name}(${args.map((_, index) => `arg${index}`).join(', ')});
+
+  ${asserts.map(({ check, message }) => `  PF._assertTrue(${check}, ${JSON.stringify(message)});`).join('\n')}
+
+  ${returnCode}
+}`;
+
+  return new Function('ED', 'PF', 'ServerEdict', 'Vector', 'registry', `_${name}`, code)(ED, PF, ServerEdict, Vector, registry, func) as BuiltinFunction;
+}
+
+const error = generateBuiltinFunction('error', (str: string): never => {
+  Con.PrintError(`======SERVER ERROR in ${PR.GetString(PR.xfunction.name)}\n${str}\n`);
+  ED.Print(SV.server.gameAPI.self);
+  throw new HostError(`Program error: ${str}`);
+}, [etype.ev_strings]);
+
+const objerror = generateBuiltinFunction('objerror', (str: string): never => {
+  Con.PrintError(`======OBJECT ERROR in ${PR.GetString(PR.xfunction.name)}\n${str}\n`);
+  ED.Print(SV.server.gameAPI.self);
+  throw new HostError(`Program error: ${str}`);
+}, [etype.ev_strings]);
+
+const makevectors = generateBuiltinFunction('makevectors', (vec: Vector): void => {
+  const { forward, right, up } = vec.angleVectors();
+  SV.server.gameAPI.v_forward = forward;
+  SV.server.gameAPI.v_right = right;
+  SV.server.gameAPI.v_up = up;
+}, [etype.ev_vector]);
+
+const setorigin = generateBuiltinFunction('setorigin', (edict: ServerEdict, vec: Vector): void => edict.setOrigin(vec), [etype.ev_entity, etype.ev_vector], etype.ev_void);
+const setsize = generateBuiltinFunction('setsize', (edict: ServerEdict, min: Vector, max: Vector): void => edict.setMinMaxSize(min, max), [etype.ev_entity, etype.ev_vector, etype.ev_vector], etype.ev_void);
+
+const setmodel = generateBuiltinFunction('setmodel', (edict: ServerEdict, model: string): void => {
+  edict.setModel(model);
+}, [etype.ev_entity, etype.ev_string]);
+
+const bprint = generateBuiltinFunction('bprint', (message: string): void => {
+  ServerEngineAPI.BroadcastPrint(message);
+}, [etype.ev_strings]);
+
+const sprint = generateBuiltinFunction('sprint', (clientEdict: ServerEdict, message: string): void => {
+  clientEdict.getClient().consolePrint(message);
+}, [etype.ev_entity_client, etype.ev_strings]);
+
+const centerprint = generateBuiltinFunction('centerprint', (clientEdict: ServerEdict, message: string): void => {
+  clientEdict.getClient().centerPrint(message);
+}, [etype.ev_entity_client, etype.ev_strings]);
+
+const normalize = generateBuiltinFunction('normalize', (vec: Vector): Vector => {
+  vec.normalize();
+  return vec;
+}, [etype.ev_vector], etype.ev_vector);
+
+const vlen = generateBuiltinFunction('vlen', (vec: Vector): number => vec.len(), [etype.ev_vector], etype.ev_float);
+const vectoyaw = generateBuiltinFunction('vectoyaw', (vec: Vector): number => vec.toYaw(), [etype.ev_vector], etype.ev_float);
+const vectoangles = generateBuiltinFunction('vectoangles', (vec: Vector): Vector => vec.toAngles(), [etype.ev_vector], etype.ev_vector);
+const random = generateBuiltinFunction('random', (): number => Math.random(), [], etype.ev_float);
+
+const particle = generateBuiltinFunction('particle', (origin: Vector, direction: Vector, color: number, count: number): void => {
+  ServerEngineAPI.StartParticles(origin, direction, color, count);
+}, [etype.ev_vector, etype.ev_vector, etype.ev_integer, etype.ev_integer]);
+
+const ambientsound = generateBuiltinFunction('ambientsound', (origin: Vector, sample: string, volume: number, attenuation: number): boolean => ServerEngineAPI.SpawnAmbientSound(origin, sample, volume, attenuation), [
+  etype.ev_vector,
+  etype.ev_string_not_empty,
+  etype.ev_float,
+  etype.ev_float,
+], etype.ev_bool);
+
+const sound = generateBuiltinFunction('sound', (edict: ServerEdict, channel: number, sample: string, volume: number, attenuation: number): boolean => ServerEngineAPI.StartSound(edict, channel, sample, volume, attenuation), [
+  etype.ev_entity,
+  etype.ev_integer,
+  etype.ev_string_not_empty,
+  etype.ev_float,
+  etype.ev_float,
+], etype.ev_bool);
+
+const breakstatement: BuiltinFunction = function breakstatement() {
+  Con.Print('break statement\n');
+};
+
+const traceline = generateBuiltinFunction('traceline', (start: Vector, end: Vector, noMonsters: number, passEdict: ServerEdict | null): void => {
+  const trace = ServerEngineAPI.TracelineLegacy(start, end, noMonsters, passEdict);
+
+  SV.server.gameAPI.trace_allsolid = trace.allsolid === true ? 1.0 : 0.0;
+  SV.server.gameAPI.trace_startsolid = trace.startsolid === true ? 1.0 : 0.0;
+  SV.server.gameAPI.trace_fraction = trace.fraction;
+  SV.server.gameAPI.trace_inwater = trace.inwater === true ? 1.0 : 0.0;
+  SV.server.gameAPI.trace_inopen = trace.inopen === true ? 1.0 : 0.0;
+  SV.server.gameAPI.trace_endpos = trace.endpos;
+  SV.server.gameAPI.trace_plane_normal = trace.plane.normal;
+  SV.server.gameAPI.trace_plane_dist = trace.plane.dist;
+  SV.server.gameAPI.trace_ent = trace.ent || null;
+}, [etype.ev_vector, etype.ev_vector, etype.ev_integer, etype.ev_entity]);
+
+const checkclient = generateBuiltinFunction('checkclient', (): ServerEdict | null => SV.server.gameAPI.self.getNextBestClient(), [], etype.ev_entity_client);
+
+const stuffcmd = generateBuiltinFunction('stuffcmd', (clientEdict: ServerEdict, command: string): void => {
+  clientEdict.getClient().sendConsoleCommands(command);
+}, [etype.ev_entity_client, etype.ev_string]);
+
+const localcmd = generateBuiltinFunction('localcmd', (command: string): void => {
+  Cmd.text += command;
+}, [etype.ev_string]);
+
+const cvar = generateBuiltinFunction('cvar', (name: string): number => {
+  const cvarValue = ServerEngineAPI.GetCvar(name);
+  return cvarValue ? cvarValue.value : 0.0;
+}, [etype.ev_string], etype.ev_float);
+
+const cvar_set = generateBuiltinFunction('cvar_set', (name: string, value: string): void => {
+  ServerEngineAPI.SetCvar(name, value);
+}, [etype.ev_string, etype.ev_string]);
+
+const findradius = generateBuiltinFunction('findradius', (origin: Vector, radius: number): ServerEdict => {
+  const edicts = ServerEngineAPI.FindInRadius(origin, radius);
+  let chain = SV.server.edicts[0];
+
+  for (const edict of edicts) {
+    edict.entity.chain = chain;
+    chain = edict;
+  }
+
+  return chain;
+}, [etype.ev_vector, etype.ev_float], etype.ev_entity);
+
+const dprint = generateBuiltinFunction('dprint', (message: string): void => {
+  ServerEngineAPI.ConsoleDebug(message);
+}, [etype.ev_strings]);
+
+const ftos = generateBuiltinFunction('ftos', (value: number): string => ((+value | 0) === +value ? value.toString() : value.toFixed(1)), [etype.ev_float], etype.ev_string);
+const fabs = generateBuiltinFunction('fabs', (value: number): number => Math.abs(value), [etype.ev_float], etype.ev_float);
+const vtos = generateBuiltinFunction('vtos', (vec: Vector): string => vec.toString(), [etype.ev_vector], etype.ev_string);
+
+const Spawn = generateBuiltinFunction('Spawn', (): ServerEdict => {
+  const edict = ED.Alloc();
+  SV.server.gameAPI.prepareEntity(edict, null, {});
+  return edict;
+}, [], etype.ev_entity);
+
+const Remove = generateBuiltinFunction('Remove', (edict: ServerEdict): void => {
+  edict.freeEdict();
+}, [etype.ev_entity]);
+
+const Find = generateBuiltinFunction('Find', (edict: ServerEdict, field: string, value: string): ServerEdict | null => ServerEngineAPI.FindByFieldAndValue(field, value, edict.num + 1), [etype.ev_entity, etype.ev_field, etype.ev_string], etype.ev_entity);
+const MoveToGoal = generateBuiltinFunction('MoveToGoal', (dist: number): boolean => SV.server.gameAPI.self.moveToGoal(dist), [etype.ev_float], etype.ev_bool);
+const precache_file = generateBuiltinFunction('precache_file', (value: number): number => value, [etype.ev_integer], etype.ev_integer);
+
+const precache_sound = generateBuiltinFunction('precache_sound', (sfxName: string): void => {
+  ServerEngineAPI.PrecacheSound(sfxName);
+}, [etype.ev_string_not_empty]);
+
+const precache_model = generateBuiltinFunction('precache_model', (modelName: string): void => {
+  ServerEngineAPI.PrecacheModel(modelName);
+}, [etype.ev_string_not_empty]);
+
+const coredump: BuiltinFunction = function coredump() {
+  ED.PrintEdicts();
+};
+
+const traceon: BuiltinFunction = function traceon() {
+  PR.trace = true;
+};
+
+const traceoff: BuiltinFunction = function traceoff() {
+  PR.trace = false;
+};
+
+const eprint: BuiltinFunction = function eprint() {
+  ED.Print(SV.server.edicts[PR.globals_float[4]]);
+};
+
+const walkmove = generateBuiltinFunction('walkmove', (yaw: number, dist: number): boolean => {
+  const oldFunction = PR.xfunction;
+  const result = SV.server.gameAPI.self.walkMove(yaw, dist);
+  PR.xfunction = oldFunction;
+  return result;
+}, [etype.ev_float, etype.ev_float], etype.ev_bool);
+
+const droptofloor = generateBuiltinFunction('droptofloor', (): boolean => SV.server.gameAPI.self.dropToFloor(-256.0), [], etype.ev_bool);
+
+const lightstyle = generateBuiltinFunction('lightstyle', (style: number, value: string): void => {
+  ServerEngineAPI.Lightstyle(style, value);
+}, [etype.ev_integer, etype.ev_string]);
+
+const rint = generateBuiltinFunction('rint', (value: number): number => (value >= 0.0 ? value + 0.5 : value - 0.5), [etype.ev_float], etype.ev_integer);
+const floor = generateBuiltinFunction('floor', (value: number): number => Math.floor(value), [etype.ev_float], etype.ev_float);
+const ceil = generateBuiltinFunction('ceil', (value: number): number => Math.ceil(value), [etype.ev_float], etype.ev_float);
+const checkbottom = generateBuiltinFunction('checkbottom', (edict: ServerEdict): boolean => edict.isOnTheFloor(), [etype.ev_entity], etype.ev_bool);
+const pointcontents = generateBuiltinFunction('pointcontents', (point: Vector): number => ServerEngineAPI.DeterminePointContents(point), [etype.ev_vector], etype.ev_float);
+const nextent = generateBuiltinFunction('nextent', (edict: ServerEdict): ServerEdict | null => edict.nextEdict(), [etype.ev_entity], etype.ev_entity);
+
+const aim = generateBuiltinFunction('aim', (edict: ServerEdict): Vector => {
+  const direction = SV.server.gameAPI.v_forward;
+  return edict.aim(direction);
+}, [etype.ev_entity], etype.ev_vector);
+
+const changeyaw = generateBuiltinFunction('changeyaw', (): void => {
+  SV.server.gameAPI.self.changeYaw();
+}, []);
+
+/**
+ * Resolves a Quake message destination to a concrete buffer.
+ * @returns The destination message buffer.
+ */
+function WriteGeneric(dest: number): SzBuffer {
+  switch (dest) {
+    case 0:
+      return SV.server.datagram;
+
+    case 1: {
+      const messageEntity = SV.server.gameAPI.msg_entity;
+      const entityNumber = messageEntity.num;
+
+      if (!messageEntity.isClient()) {
+        throw new Error(`WriteGeneric: not a client ${entityNumber}`);
+      }
+
+      return messageEntity.getClient().message;
+    }
+
+    case 2:
+      return SV.server.reliable_datagram;
+
+    case 3:
+      return SV.server.signon;
+
+    default:
+      throw new Error(`WriteGeneric: bad destination ${dest}`);
+  }
+}
+
+const WriteByte = generateBuiltinFunction('WriteByte', (dest: number, value: number): void => {
+  WriteGeneric(dest).writeByte(value);
+}, [etype.ev_integer, etype.ev_float]);
+
+const WriteChar = generateBuiltinFunction('WriteChar', (dest: number, value: number): void => {
+  WriteGeneric(dest).writeChar(value);
+}, [etype.ev_integer, etype.ev_float]);
+
+const WriteShort = generateBuiltinFunction('WriteShort', (dest: number, value: number): void => {
+  WriteGeneric(dest).writeShort(value);
+}, [etype.ev_integer, etype.ev_float]);
+
+const WriteLong = generateBuiltinFunction('WriteLong', (dest: number, value: number): void => {
+  WriteGeneric(dest).writeLong(value);
+}, [etype.ev_integer, etype.ev_float]);
+
+const WriteAngle = generateBuiltinFunction('WriteAngle', (dest: number, value: number): void => {
+  WriteGeneric(dest).writeAngle(value);
+}, [etype.ev_integer, etype.ev_float]);
+
+const WriteCoord = generateBuiltinFunction('WriteCoord', (dest: number, value: number): void => {
+  WriteGeneric(dest).writeCoord(value);
+}, [etype.ev_integer, etype.ev_float]);
+
+const WriteString = generateBuiltinFunction('WriteString', (dest: number, value: string): void => {
+  WriteGeneric(dest).writeString(value);
+}, [etype.ev_integer, etype.ev_string]);
+
+const WriteEntity = generateBuiltinFunction('WriteEntity', (dest: number, value: ServerEdict): void => {
+  WriteGeneric(dest).writeShort(value.num);
+}, [etype.ev_integer, etype.ev_entity]);
+
+const makestatic = generateBuiltinFunction('makestatic', (edict: ServerEdict): void => {
+  edict.makeStatic();
+}, [etype.ev_entity]);
+
+const setspawnparms = generateBuiltinFunction('setspawnparms', (clientEdict: ServerEdict): void => {
+  const spawnParameters = clientEdict.getClient().spawn_parms;
+
+  for (let i = 0; i <= 15; i++) {
+    SV.server.gameAPI[`parm${i + 1}`] = spawnParameters[i];
+  }
+}, [etype.ev_entity_client]);
+
+const changelevel = generateBuiltinFunction('changelevel', (levelName: string): void => {
+  ServerEngineAPI.ChangeLevel(levelName);
+}, [etype.ev_string]);
+
+const Fixme: BuiltinFunction = function Fixme() {
+  throw new Error('unimplemented builtin');
+};
+
+Object.assign(PF, {
+  error,
+  objerror,
+  makevectors,
+  setorigin,
+  setsize,
+  setmodel,
+  bprint,
+  sprint,
+  centerprint,
+  normalize,
+  vlen,
+  vectoyaw,
+  vectoangles,
+  random,
+  particle,
+  ambientsound,
+  sound,
+  breakstatement,
+  traceline,
+  checkclient,
+  stuffcmd,
+  localcmd,
+  cvar,
+  cvar_set,
+  findradius,
+  dprint,
+  ftos,
+  fabs,
+  vtos,
+  Spawn,
+  Remove,
+  Find,
+  MoveToGoal,
+  precache_file,
+  precache_sound,
+  precache_model,
+  coredump,
+  traceon,
+  traceoff,
+  eprint,
+  walkmove,
+  droptofloor,
+  lightstyle,
+  rint,
+  floor,
+  ceil,
+  checkbottom,
+  pointcontents,
+  nextent,
+  aim,
+  changeyaw,
+  WriteByte,
+  WriteChar,
+  WriteShort,
+  WriteLong,
+  WriteAngle,
+  WriteCoord,
+  WriteString,
+  WriteEntity,
+  makestatic,
+  setspawnparms,
+  changelevel,
+  Fixme,
+});
+
+PF.builtin = [
+  Fixme,
+  makevectors,
+  setorigin,
+  setmodel,
+  setsize,
+  Fixme,
+  breakstatement,
+  random,
+  sound,
+  normalize,
+  error,
+  objerror,
+  vlen,
+  vectoyaw,
+  Spawn,
+  Remove,
+  traceline,
+  checkclient,
+  Find,
+  precache_sound,
+  precache_model,
+  stuffcmd,
+  findradius,
+  bprint,
+  sprint,
+  dprint,
+  ftos,
+  vtos,
+  coredump,
+  traceon,
+  traceoff,
+  eprint,
+  walkmove,
+  Fixme,
+  droptofloor,
+  lightstyle,
+  rint,
+  floor,
+  ceil,
+  Fixme,
+  checkbottom,
+  pointcontents,
+  Fixme,
+  fabs,
+  aim,
+  cvar,
+  localcmd,
+  nextent,
+  particle,
+  changeyaw,
+  Fixme,
+  vectoangles,
+  WriteByte,
+  WriteChar,
+  WriteShort,
+  WriteLong,
+  WriteCoord,
+  WriteAngle,
+  WriteString,
+  WriteEntity,
+  Fixme,
+  Fixme,
+  Fixme,
+  Fixme,
+  Fixme,
+  Fixme,
+  Fixme,
+  MoveToGoal,
+  precache_file,
+  makestatic,
+  changelevel,
+  Fixme,
+  cvar_set,
+  centerprint,
+  ambientsound,
+  precache_model,
+  precache_sound,
+  precache_file,
+  setspawnparms,
+  Fixme,
+  Fixme,
+  Fixme,
+  Fixme,
+];
diff --git a/source/engine/server/ServerMessages.ts b/source/engine/server/ServerMessages.ts
index 344437e6..501ddc86 100644
--- a/source/engine/server/ServerMessages.ts
+++ b/source/engine/server/ServerMessages.ts
@@ -162,7 +162,6 @@ export class ServerMessages {
   /**
    * Sends the serverdata message to a specific client.
    * Needs to be done in order to complete the signon process step 1.
-   * @param {ServerClient} client client
    */
   sendServerData(client: ServerClient): void {
     const message = client.message;
@@ -230,7 +229,7 @@ export class ServerMessages {
     message.writeByte(Protocol.svc.setview);
     message.writeShort(client.edict.num);
 
-    const serverCvars = Array.from(Cvar.Filter((/** @type {Cvar} */ cvar) => (cvar.flags & Cvar.FLAG.SERVER) !== 0));
+    const serverCvars = Array.from(Cvar.Filter((cvar: Cvar) => (cvar.flags & Cvar.FLAG.SERVER) !== 0));
     if (serverCvars.length > 0) {
       client.message.writeByte(Protocol.svc.cvar);
       client.message.writeByte(serverCvars.length);
@@ -397,10 +396,7 @@ export class ServerMessages {
 
   /**
    * Writes delta between two entity states to the message.
-   * @param {SzBuffer} msg The message to write to
-   * @param {ServerEntityState} from The previous entity state
-   * @param {ServerEntityState} to The new entity state
-   * @returns {boolean} true if any data was written, false otherwise
+   * @returns True when any entity state data was written.
    */
   writeDeltaEntity(msg: SzBuffer, from: ServerEntityState, to: ServerEntityState): boolean {
     const EPSILON = 0.01;
@@ -795,8 +791,7 @@ export class ServerMessages {
 
   /**
    * Sends a datagram to a specific client.
-   * @param {import('./Client.mjs').ServerClient} client client to send to
-   * @returns {boolean} success
+   * @returns True when the datagram contained any replicated changes.
    */
   sendClientDatagram(client: ServerClient): boolean {
     const msg = new SzBuffer(16000, 'SV.SendClientDatagram');
diff --git a/source/engine/server/Sys.ts b/source/engine/server/Sys.ts
index bdca6b51..d4d19b05 100644
--- a/source/engine/server/Sys.ts
+++ b/source/engine/server/Sys.ts
@@ -165,7 +165,7 @@ export default class Sys extends BaseSys {
 
   /**
    * Returns the time elapsed since initialization.
-    * @returns The elapsed time in seconds.
+   * @returns The elapsed time in seconds.
    */
   static override FloatTime(): number {
     return Date.now() * 0.001 - Sys.#oldtime;
@@ -173,7 +173,7 @@ export default class Sys extends BaseSys {
 
   /**
    * Returns the time elapsed since initialization in milliseconds.
-    * @returns The elapsed time in milliseconds.
+   * @returns The elapsed time in milliseconds.
    */
   static override FloatMilliTime(): number {
     return performance.now();
diff --git a/test/common/server-module-shims.test.mjs b/test/common/server-module-shims.test.mjs
index bee2f8a9..11a04b47 100644
--- a/test/common/server-module-shims.test.mjs
+++ b/test/common/server-module-shims.test.mjs
@@ -5,6 +5,8 @@ import BaseCom from '../../source/engine/common/Com.ts';
 import BaseSys from '../../source/engine/common/Sys.ts';
 import ComMjs from '../../source/engine/server/Com.mjs';
 import ComTs from '../../source/engine/server/Com.ts';
+import ProgsAPIMjs, { etype as etypeMjs, ofs as ofsMjs } from '../../source/engine/server/ProgsAPI.mjs';
+import ProgsAPITs, { etype as etypeTs, ofs as ofsTs } from '../../source/engine/server/ProgsAPI.ts';
 import SysMjs from '../../source/engine/server/Sys.mjs';
 import SysTs from '../../source/engine/server/Sys.ts';
 
@@ -16,6 +18,12 @@ void test('server Sys shim re-exports the TypeScript implementation', () => {
   assert.strictEqual(SysMjs, SysTs);
 });
 
+void test('server ProgsAPI shim re-exports the TypeScript implementation', () => {
+  assert.strictEqual(ProgsAPIMjs, ProgsAPITs);
+  assert.strictEqual(etypeMjs, etypeTs);
+  assert.strictEqual(ofsMjs, ofsTs);
+});
+
 void test('server Com inherits the common COM base class', () => {
   assert.strictEqual(Object.getPrototypeOf(ComTs), BaseCom);
 });
diff --git a/test/physics/navigation.test.mjs b/test/physics/navigation.test.mjs
index 3fa18fad..140c26f4 100644
--- a/test/physics/navigation.test.mjs
+++ b/test/physics/navigation.test.mjs
@@ -277,8 +277,8 @@ function readNavSurfaceCounts(data) {
   return { nodeCount, surfaceCounts };
 }
 
-describe('Navigation.build', () => {
-  test('uses monster-sized static-world traces and stores stand origins', async () => {
+void describe('Navigation.build', () => {
+  void test('uses monster-sized static-world traces and stores stand origins', async () => {
     const worldmodel = createNavigationWorldModel();
     let boxTraceCount = 0;
     let lineTraceCount = 0;
@@ -345,7 +345,7 @@ describe('Navigation.build', () => {
     }
   });
 
-  test('clears previously extracted surfaces before rebuilding', async () => {
+  void test('clears previously extracted surfaces before rebuilding', async () => {
     const worldmodel = createNavigationWorldModel();
     const collision = {
       traceStaticWorld(start, mins, maxs, end) {
@@ -404,7 +404,7 @@ describe('Navigation.build', () => {
     });
   });
 
-  test('does not collapse a large walkable region into a single node', async () => {
+  void test('does not collapse a large walkable region into a single node', async () => {
     const worldmodel = createNavigationWorldModel();
     const collision = {
       traceStaticWorld(start, mins, maxs, end) {
@@ -459,7 +459,7 @@ describe('Navigation.build', () => {
     assert.ok(navigation.graph.nodes.some((node) => node.neighbors.length > 0));
   });
 
-  test('rejects walkable samples that lack monster-style corner support', async () => {
+  void test('rejects walkable samples that lack monster-style corner support', async () => {
     const worldmodel = createNavigationWorldModel();
     const collision = {
       traceStaticWorld(start, mins, maxs, end) {
@@ -527,7 +527,7 @@ describe('Navigation.build', () => {
     assert.equal(navigation.geometry.walkableSurfaces.length, 0);
   });
 
-  test('does not persist extracted waypoints into nav files', async () => {
+  void test('does not persist extracted waypoints into nav files', async () => {
     const worldmodel = createNavigationWorldModel();
     let writtenData = null;
 
@@ -593,7 +593,7 @@ describe('Navigation.build', () => {
     assert.ok(surfaceCounts.every((count) => count === 0));
   });
 
-  test('publishes nav.load after saving a rebuilt graph in listen-server mode', async () => {
+  void test('publishes nav.load after saving a rebuilt graph in listen-server mode', async () => {
     const worldmodel = createNavigationWorldModel();
     const publishedLoads = [];
 
@@ -659,8 +659,8 @@ describe('Navigation.build', () => {
   });
 });
 
-describe('Navigation.findPath', () => {
-  test('returns direct path when start and goal share the nearest node', async () => {
+void describe('Navigation.findPath', () => {
+  void test('returns direct path when start and goal share the nearest node', async () => {
     const worldmodel = createNavigationWorldModel();
     const collision = {
       traceStaticWorld(start, mins, maxs, end) {
@@ -706,7 +706,7 @@ describe('Navigation.findPath', () => {
     assert.deepEqual([...path[1]], [...goal]);
   });
 
-  test('finds a multi-hop path across connected nodes', async () => {
+  void test('finds a multi-hop path across connected nodes', async () => {
     const worldmodel = createNavigationWorldModel();
     const collision = {
       traceStaticWorld(start, mins, maxs, end) {
@@ -760,7 +760,7 @@ describe('Navigation.findPath', () => {
     }
   });
 
-  test('returns null when graph is empty', () => {
+  void test('returns null when graph is empty', () => {
     const navigation = new Navigation(null);
 
     Navigation.nav_debug_path = { value: 0 };
@@ -769,7 +769,7 @@ describe('Navigation.findPath', () => {
     assert.equal(path, null);
   });
 
-  test('returns null when start or goal has no nearby node', async () => {
+  void test('returns null when start or goal has no nearby node', async () => {
     const worldmodel = createNavigationWorldModel();
     const collision = {
       traceStaticWorld(start, mins, maxs, end) {

From e214d3197a834304764860abb0830257b385b1cf Mon Sep 17 00:00:00 2001
From: Christian R <github@chrisnew.de>
Date: Sat, 4 Apr 2026 00:47:53 +0300
Subject: [PATCH 39/67] TS: entrypoints

---
 dedicated.mjs => dedicated.ts                 |  3 +-
 eslint.config.mjs                             |  2 -
 index.html                                    |  2 +-
 package.json                                  |  4 +-
 .../{main-browser.mjs => main-browser.ts}     | 38 +++++++++----------
 .../{main-dedicated.mjs => main-dedicated.ts} | 34 ++++++++---------
 source/engine/registry.mjs                    |  8 ++--
 test/common/runtime-entrypoints.test.mjs      | 15 ++++++++
 vite.config.dedicated.mjs                     |  4 +-
 9 files changed, 60 insertions(+), 50 deletions(-)
 rename dedicated.mjs => dedicated.ts (78%)
 mode change 100755 => 100644
 rename source/engine/{main-browser.mjs => main-browser.ts} (77%)
 rename source/engine/{main-dedicated.mjs => main-dedicated.ts} (70%)
 create mode 100644 test/common/runtime-entrypoints.test.mjs

diff --git a/dedicated.mjs b/dedicated.ts
old mode 100755
new mode 100644
similarity index 78%
rename from dedicated.mjs
rename to dedicated.ts
index 791729ea..68cc7370
--- a/dedicated.mjs
+++ b/dedicated.ts
@@ -1,6 +1,7 @@
 #!/usr/bin/env node --experimental-transform-types
 import process from 'node:process';
-import EngineLauncher from './source/engine/main-dedicated.mjs';
+
+import EngineLauncher from './source/engine/main-dedicated.ts';
 
 // make sure working directory is the directory of this script
 process.chdir(new URL('./', import.meta.url).pathname);
diff --git a/eslint.config.mjs b/eslint.config.mjs
index 25c3e939..b01d7901 100644
--- a/eslint.config.mjs
+++ b/eslint.config.mjs
@@ -133,7 +133,6 @@ export default defineConfig([
   },
   {
     files: [
-      'dedicated.mjs',
       'dedicated.ts',
       'eslint.config.mjs',
       'eslint.config.ts',
@@ -141,7 +140,6 @@ export default defineConfig([
       'vite.config.ts',
       'vite.config.dedicated.mjs',
       'vite.config.dedicated.ts',
-      'source/engine/main-dedicated.mjs',
       'source/engine/main-dedicated.ts',
       'source/engine/server/**/*.{mjs,ts,mts,cts}',
       'source/engine/common/**/*.{mjs,ts,mts,cts}',
diff --git a/index.html b/index.html
index 263dae8a..5fdd6bdf 100644
--- a/index.html
+++ b/index.html
@@ -34,7 +34,7 @@
 		</div>
 
 		<script type="module">
-			import('./source/engine/main-browser.mjs').then((module) => {
+			import('./source/engine/main-browser.ts').then((module) => {
 				// Build configuration, these variables are replaced at build time
 				// NOTE: These are bare identifiers that get replaced by Vite’s define
 				const signalingURL = __BUILD_SIGNALING_URL__;
diff --git a/package.json b/package.json
index b36669bf..e5702b71 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "quakeshack",
   "version": "1.0.0",
-  "main": "dedicated.mjs",
+  "main": "dedicated.ts",
   "type": "module",
   "repository": "https://github.com/chrisnew/quakeshack",
   "license": "GPL-2.0-only",
@@ -49,7 +49,7 @@
     "dedicated:dev": "vite build --watch --mode development --config vite.config.dedicated.mjs",
     "dedicated:build": "vite build --config vite.config.dedicated.mjs",
     "dedicated:build:production": "vite build --config vite.config.dedicated.mjs --mode production",
-    "dedicated:start": "node --experimental-transform-types ./dedicated.mjs +exec server.cfg",
+    "dedicated:start": "node --experimental-transform-types ./dedicated.ts +exec server.cfg",
     "dedicated:start:production": "node ./dist/dedicated/dedicated.mjs +exec server.cfg"
   }
 }
diff --git a/source/engine/main-browser.mjs b/source/engine/main-browser.ts
similarity index 77%
rename from source/engine/main-browser.mjs
rename to source/engine/main-browser.ts
index 335318ce..cf0df440 100644
--- a/source/engine/main-browser.mjs
+++ b/source/engine/main-browser.ts
@@ -1,31 +1,27 @@
-import { registry, freeze as registryFreeze } from './registry.mjs';
+import type { BuildConfig, URLs } from './build-config';
 
+import CL from './client/CL.mjs';
+import Draw from './client/Draw.mjs';
+import IN from './client/IN.mjs';
+import Key from './client/Key.mjs';
+import M from './client/Menu.mjs';
+import R from './client/R.mjs';
+import S from './client/Sound.mjs';
 import Sys from './client/Sys.mjs';
+import V from './client/V.mjs';
+import Sbar from './client/Sbar.mjs';
+import SCR from './client/SCR.mjs';
 import COM from './common/Com.ts';
 import Con from './common/Console.ts';
 import Host from './common/Host.ts';
-import V from './client/V.mjs';
-import NET from './network/Network.ts';
-import SV from './server/Server.mjs';
-import PR from './server/Progs.mjs';
 import Mod from './common/Mod.ts';
-import Key from './client/Key.mjs';
-import CL from './client/CL.mjs';
-import S from './client/Sound.mjs';
-import Draw from './client/Draw.mjs';
-import R from './client/R.mjs';
-import M from './client/Menu.mjs';
-import SCR from './client/SCR.mjs';
-import Sbar from './client/Sbar.mjs';
-import IN from './client/IN.mjs';
+import NET from './network/Network.ts';
+import { freeze as registryFreeze, registry } from './registry.mjs';
+import PR from './server/Progs.ts';
+import SV from './server/Server.ts';
 
 export default class EngineLauncher {
-  /**
-   * @param {typeof registry.urls} urls URL builder functions
-   * @param {typeof registry.buildConfig} buildConfig build information from Vite
-   * @returns {Promise<import("./registry.mjs").registry>} engine registry
-   */
-  static async Launch(urls, buildConfig) {
+  static async Launch(urls: URLs, buildConfig: BuildConfig): Promise<typeof registry> {
     console.info('Launching engine in browser mode...');
 
     registry.urls = urls;
@@ -64,4 +60,4 @@ export default class EngineLauncher {
 
     return registry;
   }
-};
+}
diff --git a/source/engine/main-dedicated.mjs b/source/engine/main-dedicated.ts
similarity index 70%
rename from source/engine/main-dedicated.mjs
rename to source/engine/main-dedicated.ts
index 19be2500..715a13ac 100644
--- a/source/engine/main-dedicated.mjs
+++ b/source/engine/main-dedicated.ts
@@ -1,33 +1,31 @@
-
 import { Worker } from 'node:worker_threads';
-import { registry, freeze as registryFreeze } from './registry.mjs';
+import * as WebSocketModule from 'ws';
 
-// Polyfill Worker global for Node.js so that WorkerFactories.ts
-// (which uses the browser-compatible `new Worker(url)` pattern for
-// Vite static analysis) works identically in unbundled Node.js.
-// @ts-ignore — Node.js worker_threads.Worker is API-compatible at runtime
-globalThis.Worker = Worker;
-
-import Sys from './server/Sys.mjs';
-import NodeCOM from './server/Com.mjs';
 import Con from './common/Console.ts';
 import Host from './common/Host.ts';
-import V from './client/V.mjs';
-import NET from './network/Network.ts';
-import SV from './server/Server.mjs';
-import PR from './server/Progs.mjs';
 import Mod from './common/Mod.ts';
-import * as WebSocket from 'ws';
+import NET from './network/Network.ts';
+import { freeze as registryFreeze, registry } from './registry.mjs';
+import V from './client/V.mjs';
+import NodeCOM from './server/Com.ts';
+import PR from './server/Progs.ts';
+import SV from './server/Server.ts';
+import Sys from './server/Sys.ts';
+
+// Polyfill Worker global for Node.js so that WorkerFactories.ts
+// (which uses the browser-compatible `new Worker(url)` pattern for
+// Vite static analysis) works identically in unbundled Node.js.
+globalThis.Worker = Worker as typeof globalThis.Worker;
 
 export default class EngineLauncher {
-  static async Launch() {
+  static async Launch(): Promise<typeof registry> {
     console.info('Launching engine as dedicated server...');
 
     // set some global flags
     registry.isDedicatedServer = true;
 
     // inject some external dependencies
-    registry.WebSocket = WebSocket;
+    registry.WebSocket = WebSocketModule;
 
     // hooking up all required components
     registry.Sys = Sys;
@@ -47,4 +45,4 @@ export default class EngineLauncher {
 
     return registry;
   }
-};
+}
diff --git a/source/engine/registry.mjs b/source/engine/registry.mjs
index 1ccb4961..989f09ed 100644
--- a/source/engine/registry.mjs
+++ b/source/engine/registry.mjs
@@ -17,7 +17,9 @@
 /** @typedef {typeof import('./client/Sound.mjs').default} SoundModule */
 /** @typedef {typeof import('./client/Menu.mjs').default} MenuModule */
 /** @typedef {typeof import('./client/IN.mjs').default} InputModule */
-/** @typedef {typeof import('ws').default} WebSocketClass */
+/** @typedef {typeof globalThis.WebSocket} BrowserWebSocketClass */
+/** @typedef {typeof import('ws')} NodeWebSocketModule */
+/** @typedef {BrowserWebSocketClass | NodeWebSocketModule} WebSocketDependency */
 /** @typedef {import('./build-config').BuildConfig} BuildConfig */
 /** @typedef {import('./build-config').URLs} URLs */
 /**
@@ -43,7 +45,7 @@
  * @property {SbarModule | undefined} Sbar status bar module
  * @property {SoundModule | undefined} S audio module
  * @property {MenuModule | undefined} M menu module
- * @property {WebSocketClass | undefined} WebSocket injected WebSocket constructor
+ * @property {WebSocketDependency | undefined} WebSocket injected websocket dependency
  * @property {URLs | undefined} urls runtime URL providers
  * @property {BuildConfig | undefined} buildConfig build-time configuration snapshot
  * @property {boolean} isDedicatedServer true when running in server mode
@@ -61,7 +63,7 @@
  *   SV: ServerModule,
  *   Mod: ModModule,
  *   PR: ProgsModule,
- *   WebSocket: WebSocketClass,
+ *   WebSocket: WebSocketDependency,
  * }} CommonRegistry
  */
 /**
diff --git a/test/common/runtime-entrypoints.test.mjs b/test/common/runtime-entrypoints.test.mjs
new file mode 100644
index 00000000..930542ad
--- /dev/null
+++ b/test/common/runtime-entrypoints.test.mjs
@@ -0,0 +1,15 @@
+import assert from 'node:assert/strict';
+import fs from 'node:fs/promises';
+import test from 'node:test';
+
+import DedicatedLauncherTs from '../../source/engine/main-dedicated.ts';
+
+void test('main-dedicated exports a launcher with a static Launch method', () => {
+  assert.equal(typeof DedicatedLauncherTs.Launch, 'function');
+});
+
+void test('index.html loads the TypeScript browser entrypoint directly', async () => {
+  const html = await fs.readFile(new URL('../../index.html', import.meta.url), 'utf8');
+
+  assert.match(html, /main-browser\.ts/);
+});
diff --git a/vite.config.dedicated.mjs b/vite.config.dedicated.mjs
index 7f31a3c0..9a74008c 100644
--- a/vite.config.dedicated.mjs
+++ b/vite.config.dedicated.mjs
@@ -24,7 +24,7 @@ function dedicatedServerPathsPlugin() {
     transform(code, id) {
       // In the entry point, strip the shebang (added back in renderChunk)
       // and adjust process.chdir to navigate up from dist/dedicated/ to project root
-      if (id.endsWith('/dedicated.mjs')) {
+      if (id.endsWith('/dedicated.ts')) {
         return {
           code: code
             .replace(/^#!.*\n/, '')
@@ -182,7 +182,7 @@ export default defineConfig(({ mode }) => ({
     pure: mode === 'production' ? ['console.log', 'console.debug', 'console.info', 'console.assert', 'console.trace'] : [],
   },
   build: {
-    ssr: resolve(__dirname, 'dedicated.mjs'),
+    ssr: resolve(__dirname, 'dedicated.ts'),
     outDir: resolve(__dirname, 'dist/dedicated'),
     emptyOutDir: true,
     target: 'node24',

From 21fbbdeff7c6ee3183fe749a541d4c724899c169 Mon Sep 17 00:00:00 2001
From: Christian R <github@chrisnew.de>
Date: Sat, 4 Apr 2026 00:58:10 +0300
Subject: [PATCH 40/67] TS: removing shims

---
 .github/instructions/workers.instructions.md  | 20 +++++------
 source/engine/client/menu/Multiplayer.mjs     |  6 ++--
 source/engine/common/Cmd.ts                   |  2 +-
 source/engine/common/CollisionModelSource.ts  |  2 +-
 source/engine/common/Com.ts                   |  2 +-
 source/engine/common/GameAPIs.ts              |  2 +-
 source/engine/common/Host.ts                  |  4 +--
 source/engine/common/Pmove.ts                 |  2 +-
 source/engine/common/WorkerFactories.ts       |  4 +--
 source/engine/common/WorkerFramework.ts       |  2 +-
 source/engine/common/WorkerManager.ts         |  4 +--
 source/engine/registry.mjs                    |  4 +--
 source/engine/server/Client.mjs               |  1 -
 source/engine/server/Client.ts                |  4 +--
 source/engine/server/Com.mjs                  |  1 -
 source/engine/server/DummyWorker.mjs          |  2 --
 source/engine/server/Edict.mjs                |  4 ---
 source/engine/server/Edict.ts                 |  2 +-
 source/engine/server/GameLoader.mjs           |  2 --
 source/engine/server/Navigation.mjs           |  1 -
 source/engine/server/Navigation.ts            |  4 +--
 source/engine/server/NavigationWorker.mjs     |  3 --
 source/engine/server/NavigationWorker.ts      |  2 +-
 source/engine/server/Progs.mjs                |  1 -
 source/engine/server/Progs.ts                 |  7 ++--
 source/engine/server/ProgsAPI.mjs             |  1 -
 source/engine/server/ProgsAPI.ts              |  2 +-
 source/engine/server/Server.mjs               |  1 -
 source/engine/server/Server.ts                | 10 +++---
 source/engine/server/ServerEntityState.mjs    |  2 --
 source/engine/server/ServerMessages.mjs       |  1 -
 source/engine/server/ServerMessages.ts        |  6 ++--
 source/engine/server/Sys.mjs                  |  2 --
 source/engine/server/physics/ServerArea.ts    |  2 +-
 .../server/physics/ServerClientPhysics.ts     |  4 +--
 .../engine/server/physics/ServerCollision.ts  |  2 +-
 .../server/physics/ServerCollisionSupport.ts  |  2 +-
 .../engine/server/physics/ServerMovement.ts   |  2 +-
 source/engine/server/physics/ServerPhysics.ts |  2 +-
 source/shared/GameInterfaces.ts               |  2 +-
 test/common/server-module-shims.test.mjs      | 33 -------------------
 test/common/workers.test.mjs                  |  8 ++---
 test/physics/navigation.test.mjs              |  2 +-
 test/physics/server-client-physics.test.mjs   |  2 +-
 test/physics/server-collision.test.mjs        |  2 +-
 test/physics/server-edict.test.mjs            |  2 +-
 test/physics/server-entity-state.test.mjs     |  6 ++--
 test/physics/server-messages.test.mjs         |  6 ++--
 test/physics/server.test.mjs                  |  4 +--
 vite.config.dedicated.mjs                     | 28 ++++++++--------
 50 files changed, 83 insertions(+), 139 deletions(-)
 delete mode 100644 source/engine/server/Client.mjs
 delete mode 100644 source/engine/server/Com.mjs
 delete mode 100644 source/engine/server/DummyWorker.mjs
 delete mode 100644 source/engine/server/Edict.mjs
 delete mode 100644 source/engine/server/GameLoader.mjs
 delete mode 100644 source/engine/server/Navigation.mjs
 delete mode 100644 source/engine/server/NavigationWorker.mjs
 delete mode 100644 source/engine/server/Progs.mjs
 delete mode 100644 source/engine/server/ProgsAPI.mjs
 delete mode 100644 source/engine/server/Server.mjs
 delete mode 100644 source/engine/server/ServerEntityState.mjs
 delete mode 100644 source/engine/server/ServerMessages.mjs
 delete mode 100644 source/engine/server/Sys.mjs
 delete mode 100644 test/common/server-module-shims.test.mjs

diff --git a/.github/instructions/workers.instructions.md b/.github/instructions/workers.instructions.md
index 2bf424b6..24a0ba19 100644
--- a/.github/instructions/workers.instructions.md
+++ b/.github/instructions/workers.instructions.md
@@ -8,28 +8,28 @@ sends back responses.
 
 ### Key files
 
-- `source/engine/common/PlatformWorker.mjs` — Single worker wrapper that detects the
+- `source/engine/common/PlatformWorker.ts` — Single worker wrapper that detects the
   platform at module load and normalises message, error, and shutdown APIs.
-- `source/engine/common/WorkerFactories.mjs` — Maps worker names to factory functions
+- `source/engine/common/WorkerFactories.ts` — Maps worker names to factory functions
   using the `new Worker(new URL(...))` pattern for Vite static analysis. New workers
   **must** be registered here.
-- `source/engine/common/WorkerManager.mjs` — Orchestrator that spawns workers and
+- `source/engine/common/WorkerManager.ts` — Orchestrator that spawns workers and
   bridges the eventBus between the main thread and worker threads.
-- `source/engine/common/WorkerFramework.mjs` — Bootstrap code that runs **inside** a
+- `source/engine/common/WorkerFramework.ts` — Bootstrap code that runs **inside** a
   worker thread; sets up a lean registry, Con proxy, and message bridge.
 
 ### Adding a new worker
 
-1. Create the worker script in `source/engine/server/` (see `DummyWorker.mjs` for an example).
-   The filename **must** end in `Worker.mjs`.
-2. Register it in `WorkerFactories.mjs` with a `new Worker(new URL(...))` factory.
+1. Create the worker script in `source/engine/server/` (see `DummyWorker.ts` for an example).
+  The filename **must** end in `Worker.ts`.
+2. Register it in `WorkerFactories.ts` with a `new Worker(new URL(...))` factory.
 
-The dedicated build automatically discovers `*Worker.mjs` files and bundles them
+The dedicated build automatically discovers `*Worker.ts` files and bundles them
 into `dist/dedicated/workers/` via a secondary Rollup pass
 (`dedicatedWorkerBundlePlugin` in `vite.config.dedicated.mjs`).
 
 ### How the Worker global works in Node.js
 
-The dedicated server entry (`main-dedicated.mjs`) polyfills `globalThis.Worker` with
-`worker_threads.Worker` so that `WorkerFactories.mjs` can use the same
+The dedicated server entry (`main-dedicated.ts`) polyfills `globalThis.Worker` with
+`worker_threads.Worker` so that `WorkerFactories.ts` can use the same
 `new Worker(url, opts)` constructor on every platform.
diff --git a/source/engine/client/menu/Multiplayer.mjs b/source/engine/client/menu/Multiplayer.mjs
index 415e4c07..b54db712 100644
--- a/source/engine/client/menu/Multiplayer.mjs
+++ b/source/engine/client/menu/Multiplayer.mjs
@@ -1,4 +1,4 @@
-import PR from '../../server/Progs.mjs';
+import PR from '../../server/Progs.ts';
 import { K } from '../../../shared/Keys.ts';
 import Cmd from '../../common/Cmd.ts';
 import { eventBus, registry } from '../../registry.mjs';
@@ -74,7 +74,7 @@ export default class MultiplayerMainMenu extends MenuPage {
         label: 'Join local game',
         action() {
           M.CloseMenu();
-          Cmd.ExecuteString('connect self');
+          void Cmd.ExecuteString('connect self');
         },
       }));
     }
@@ -139,7 +139,7 @@ export default class MultiplayerMainMenu extends MenuPage {
           label: `${map} near ${[info.colo || null, info.country].filter(Boolean).join(', ')} [${players}]`,
           action() {
             M.CloseMenu();
-            Cmd.ExecuteString(`connect webrtc://${session.sessionId}`);
+            void Cmd.ExecuteString(`connect webrtc://${session.sessionId}`);
           },
         }));
       }
diff --git a/source/engine/common/Cmd.ts b/source/engine/common/Cmd.ts
index 730b3080..e3a8589c 100644
--- a/source/engine/common/Cmd.ts
+++ b/source/engine/common/Cmd.ts
@@ -1,4 +1,4 @@
-import type { ServerClient } from '../server/Client.mjs';
+import type { ServerClient } from '../server/Client.ts';
 
 import * as Protocol from '../network/Protocol.ts';
 import { eventBus, getClientRegistry, getCommonRegistry, registry } from '../registry.mjs';
diff --git a/source/engine/common/CollisionModelSource.ts b/source/engine/common/CollisionModelSource.ts
index f889a0c7..e721a69f 100644
--- a/source/engine/common/CollisionModelSource.ts
+++ b/source/engine/common/CollisionModelSource.ts
@@ -1,6 +1,6 @@
 import { eventBus, getClientRegistry, getCommonRegistry } from '../registry.mjs';
 
-import type { ServerEdict } from '../server/Edict.mjs';
+import type { ServerEdict } from '../server/Edict.ts';
 import type { BrushModel } from './model/BSP.ts';
 
 interface ServerCollisionModelAccessors {
diff --git a/source/engine/common/Com.ts b/source/engine/common/Com.ts
index cac7ae54..97621a3d 100644
--- a/source/engine/common/Com.ts
+++ b/source/engine/common/Com.ts
@@ -38,7 +38,7 @@ export interface ParseResult {
  * Common file system, command line, and string parsing utilities.
  *
  * This is the base class shared by both the browser client and the Node.js
- * dedicated server (`server/Com.mjs` extends this as `NodeCOM`).
+ * dedicated server (`server/Com.ts` extends this as `NodeCOM`).
  */
 export default class COM {
   static argv: string[] = [];
diff --git a/source/engine/common/GameAPIs.ts b/source/engine/common/GameAPIs.ts
index ca60655d..a7676c8a 100644
--- a/source/engine/common/GameAPIs.ts
+++ b/source/engine/common/GameAPIs.ts
@@ -15,7 +15,7 @@ import { SFX as SFXValue } from '../client/Sound.mjs';
 import VID from '../client/VID.mjs';
 import * as Protocol from '../network/Protocol.ts';
 import { EventBus, eventBus, getClientRegistry, getCommonRegistry } from '../registry.mjs';
-import { ED, ServerEdict as ServerEdictValue } from '../server/Edict.mjs';
+import { ED, ServerEdict as ServerEdictValue } from '../server/Edict.ts';
 import Cmd from './Cmd.ts';
 import Cvar from './Cvar.ts';
 import { HostError } from './Errors.ts';
diff --git a/source/engine/common/Host.ts b/source/engine/common/Host.ts
index a77335ad..ed0e9a1b 100644
--- a/source/engine/common/Host.ts
+++ b/source/engine/common/Host.ts
@@ -8,7 +8,7 @@
 
 /* eslint-disable jsdoc/require-returns */
 
-import type { ServerEdict } from '../server/Edict.mjs';
+import type { ServerEdict } from '../server/Edict.ts';
 
 import Cvar from './Cvar.ts';
 import * as Protocol from '../network/Protocol.ts';
@@ -17,7 +17,7 @@ import Cmd, { ConsoleCommand } from './Cmd.ts';
 import { eventBus, getClientRegistry, getCommonRegistry, registry } from '../registry.mjs';
 import Vector from '../../shared/Vector.ts';
 import Q from '../../shared/Q.ts';
-import { ServerClient } from '../server/Client.mjs';
+import { ServerClient } from '../server/Client.ts';
 import { ServerEngineAPI } from './GameAPIs.ts';
 import Chase from '../client/Chase.mjs';
 import VID from '../client/VID.mjs';
diff --git a/source/engine/common/Pmove.ts b/source/engine/common/Pmove.ts
index 87812b4f..a44295ea 100644
--- a/source/engine/common/Pmove.ts
+++ b/source/engine/common/Pmove.ts
@@ -16,7 +16,7 @@ import { BrushModel } from './Mod.ts';
 import Cvar from './Cvar.ts';
 import { PmoveConfiguration } from '../../shared/Pmove.ts';
 import type { ClientEdict } from '../client/ClientEntities.mjs';
-import type { BaseEntity } from '../server/Edict.mjs';
+import type { BaseEntity } from '../server/Edict.ts';
 import type { Plane as BaseModelPlane } from './model/BaseModel.ts';
 import type { Brush, Node } from './model/BSP.ts';
 interface BrushTracePlaneLike {
diff --git a/source/engine/common/WorkerFactories.ts b/source/engine/common/WorkerFactories.ts
index 645f1ade..1dfb1670 100644
--- a/source/engine/common/WorkerFactories.ts
+++ b/source/engine/common/WorkerFactories.ts
@@ -4,8 +4,8 @@ import type { WorkerFactoryRegistry } from './PlatformWorker.ts';
  * Add new worker scripts here when creating additional workers.
  */
 const workerFactories: WorkerFactoryRegistry = {
-  'server/DummyWorker.mjs': (name) => new Worker(new URL('../server/DummyWorker.mjs', import.meta.url), { name, type: 'module' }),
-  'server/NavigationWorker.mjs': (name) => new Worker(new URL('../server/NavigationWorker.mjs', import.meta.url), { name, type: 'module' }),
+  'server/DummyWorker.ts': (name) => new Worker(new URL('../server/DummyWorker.ts', import.meta.url), { name, type: 'module' }),
+  'server/NavigationWorker.ts': (name) => new Worker(new URL('../server/NavigationWorker.ts', import.meta.url), { name, type: 'module' }),
 };
 
 export default workerFactories;
diff --git a/source/engine/common/WorkerFramework.ts b/source/engine/common/WorkerFramework.ts
index 3d3fc654..7529028d 100644
--- a/source/engine/common/WorkerFramework.ts
+++ b/source/engine/common/WorkerFramework.ts
@@ -103,7 +103,7 @@ export default class WorkerFramework {
       const workerThreadsId = ['node', 'worker_threads'].join(':');
       const { parentPort } = await import(/* @vite-ignore */ workerThreadsId);
       this.port = parentPort as WorkerFrameworkPort;
-      const serverComId = ['..', 'server', 'Com.mjs'].join('/');
+      const serverComId = ['..', 'server', 'Com.ts'].join('/');
       const comModule = await import(/* @vite-ignore */ serverComId);
       workerCom = comModule.default as typeof COM;
 
diff --git a/source/engine/common/WorkerManager.ts b/source/engine/common/WorkerManager.ts
index 768e9c3b..c5582ba8 100644
--- a/source/engine/common/WorkerManager.ts
+++ b/source/engine/common/WorkerManager.ts
@@ -26,7 +26,7 @@ export default class WorkerManager {
    *
    * Factories are passed in at runtime (rather than statically imported)
    * to avoid a circular module dependency: worker scripts transitively
-   * import WorkerManager via Navigation.mjs, and WorkerFactories.ts
+   * import WorkerManager via Navigation.ts, and WorkerFactories.ts
    * references those same worker scripts.
    */
   static Init(factories: WorkerFactoryRegistry) {
@@ -34,7 +34,7 @@ export default class WorkerManager {
     // eventBus.subscribe('com.ready', () => {
     //   console.info('WorkerManager: Spawning dummy worker for initialization test.');
 
-    //   const worker = this.SpawnWorker('server/DummyWorker.mjs', ['worker.test', 'worker.busy', 'worker.error']);
+    //   const worker = this.SpawnWorker('server/DummyWorker.ts', ['worker.test', 'worker.busy', 'worker.error']);
 
     //   const sab = new SharedArrayBuffer(4);
 
diff --git a/source/engine/registry.mjs b/source/engine/registry.mjs
index 989f09ed..42545dfe 100644
--- a/source/engine/registry.mjs
+++ b/source/engine/registry.mjs
@@ -5,8 +5,8 @@
 /** @typedef {typeof import('./common/Host.ts').default} HostModule */
 /** @typedef {typeof import('./client/V.mjs').default} VModule */
 /** @typedef {typeof import('./network/Network').default} NetModule */
-/** @typedef {typeof import('./server/Server.mjs').default} ServerModule */
-/** @typedef {typeof import('./server/Progs.mjs').default} ProgsModule */
+/** @typedef {typeof import('./server/Server.ts').default} ServerModule */
+/** @typedef {typeof import('./server/Progs.ts').default} ProgsModule */
 /** @typedef {typeof import('./common/Mod.ts').default} ModModule */
 /** @typedef {typeof import('./client/CL.mjs').default} ClientModule */
 /** @typedef {typeof import('./client/SCR.mjs').default} ScrModule */
diff --git a/source/engine/server/Client.mjs b/source/engine/server/Client.mjs
deleted file mode 100644
index 4c9b7e38..00000000
--- a/source/engine/server/Client.mjs
+++ /dev/null
@@ -1 +0,0 @@
-export { ServerClient } from './Client.ts';
diff --git a/source/engine/server/Client.ts b/source/engine/server/Client.ts
index 73caa94f..ba93bd6a 100644
--- a/source/engine/server/Client.ts
+++ b/source/engine/server/Client.ts
@@ -1,13 +1,13 @@
 import type { PlayerEntitySpawnParamsDynamic } from '../../shared/GameInterfaces.ts';
 import type { QSocket } from '../network/NetworkDrivers.ts';
-import type { BaseEntity, ServerEdict } from './Edict.mjs';
+import type { BaseEntity, ServerEdict } from './Edict.ts';
 
 import { gameCapabilities } from '../../shared/Defs.ts';
 import Vector from '../../shared/Vector.ts';
 import { SzBuffer } from '../network/MSG.ts';
 import * as Protocol from '../network/Protocol.ts';
 import { eventBus, getCommonRegistry } from '../registry.mjs';
-import { ServerEntityState } from './ServerEntityState.mjs';
+import { ServerEntityState } from './ServerEntityState.ts';
 
 interface LegacySpawnParmsGameAPI {
   SetChangeParms(clientEdict: ServerEdict): void;
diff --git a/source/engine/server/Com.mjs b/source/engine/server/Com.mjs
deleted file mode 100644
index 7526a79e..00000000
--- a/source/engine/server/Com.mjs
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from './Com.ts';
diff --git a/source/engine/server/DummyWorker.mjs b/source/engine/server/DummyWorker.mjs
deleted file mode 100644
index 4d396172..00000000
--- a/source/engine/server/DummyWorker.mjs
+++ /dev/null
@@ -1,2 +0,0 @@
-import './DummyWorker.ts';
-
diff --git a/source/engine/server/Edict.mjs b/source/engine/server/Edict.mjs
deleted file mode 100644
index 42acf15f..00000000
--- a/source/engine/server/Edict.mjs
+++ /dev/null
@@ -1,4 +0,0 @@
-/** @typedef {import('./Edict.ts').BaseEntity} BaseEntity */
-/** @typedef {import('./Edict.ts').WorldspawnEntity} WorldspawnEntity */
-
-export { ED, ServerEdict } from './Edict.ts';
diff --git a/source/engine/server/Edict.ts b/source/engine/server/Edict.ts
index d1c389c4..d0eb1f41 100644
--- a/source/engine/server/Edict.ts
+++ b/source/engine/server/Edict.ts
@@ -3,7 +3,7 @@ import type { WorldspawnEntity as WorldspawnEntityValue } from '../../game/id1/e
 import type { OctreeNode } from '../../shared/Octree.ts';
 import type { Visibility } from '../common/model/BSP.ts';
 import type { ClientEdict } from '../client/ClientEntities.mjs';
-import type { ServerClient } from './Client.mjs';
+import type { ServerClient } from './Client.ts';
 
 import Vector from '../../shared/Vector.ts';
 import { SzBuffer, registerSerializableType } from '../network/MSG.ts';
diff --git a/source/engine/server/GameLoader.mjs b/source/engine/server/GameLoader.mjs
deleted file mode 100644
index 92b0ff46..00000000
--- a/source/engine/server/GameLoader.mjs
+++ /dev/null
@@ -1,2 +0,0 @@
-export { loadGameModule } from './GameLoader.ts';
-
diff --git a/source/engine/server/Navigation.mjs b/source/engine/server/Navigation.mjs
deleted file mode 100644
index 8fa28c94..00000000
--- a/source/engine/server/Navigation.mjs
+++ /dev/null
@@ -1 +0,0 @@
-export { Navigation, NavMeshOutOfDateException } from './Navigation.ts';
diff --git a/source/engine/server/Navigation.ts b/source/engine/server/Navigation.ts
index 557e1091..143535ca 100644
--- a/source/engine/server/Navigation.ts
+++ b/source/engine/server/Navigation.ts
@@ -13,7 +13,7 @@ import type { Face } from '../common/model/BaseModel.ts';
 import type PlatformWorker from '../common/PlatformWorker.ts';
 import WorkerManager from '../common/WorkerManager.ts';
 import { eventBus, registry } from '../registry.mjs';
-import type { BaseEntity, ServerEdict } from './Edict.mjs';
+import type { BaseEntity, ServerEdict } from './Edict.ts';
 import type { CollisionTrace } from './physics/ServerCollisionSupport.ts';
 
 type VectorTuple = [number, number, number];
@@ -442,7 +442,7 @@ export class Navigation {
   }
 
   #initWorker(): void {
-    this.#worker = WorkerManager.SpawnWorker('server/NavigationWorker.mjs', [
+    this.#worker = WorkerManager.SpawnWorker('server/NavigationWorker.ts', [
       'nav.load',
       'nav.path.request',
     ]);
diff --git a/source/engine/server/NavigationWorker.mjs b/source/engine/server/NavigationWorker.mjs
deleted file mode 100644
index 667f48ed..00000000
--- a/source/engine/server/NavigationWorker.mjs
+++ /dev/null
@@ -1,3 +0,0 @@
-import './NavigationWorker.ts';
-
-
diff --git a/source/engine/server/NavigationWorker.ts b/source/engine/server/NavigationWorker.ts
index 623d83ff..3353bb2b 100644
--- a/source/engine/server/NavigationWorker.ts
+++ b/source/engine/server/NavigationWorker.ts
@@ -1,7 +1,7 @@
 import WorkerFramework from '../common/WorkerFramework.ts';
 import { eventBus, registry } from '../registry.mjs';
 
-import { Navigation, NavMeshOutOfDateException } from './Navigation.mjs';
+import { Navigation, NavMeshOutOfDateException } from './Navigation.ts';
 import Vector from '../../shared/Vector.ts';
 
 type WorkerVectorLike = ArrayLike<number>;
diff --git a/source/engine/server/Progs.mjs b/source/engine/server/Progs.mjs
deleted file mode 100644
index 7d62c3f9..00000000
--- a/source/engine/server/Progs.mjs
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from './Progs.ts';
diff --git a/source/engine/server/Progs.ts b/source/engine/server/Progs.ts
index 26129dba..124e8a2e 100644
--- a/source/engine/server/Progs.ts
+++ b/source/engine/server/Progs.ts
@@ -1,5 +1,4 @@
 import type { ServerGameInterface } from '../../shared/GameInterfaces.ts';
-import type { GameModuleInterface } from './GameLoader.ts';
 
 import Cmd from '../common/Cmd.ts';
 import { CRC16CCITT } from '../common/CRC.ts';
@@ -8,11 +7,11 @@ import { HostError, MissingResourceError } from '../common/Errors.ts';
 import Q from '../../shared/Q.ts';
 import Vector from '../../shared/Vector.ts';
 import { eventBus, getCommonRegistry } from '../registry.mjs';
-import { ED, ServerEdict } from './Edict.mjs';
+import { ED, ServerEdict } from './Edict.ts';
 import { ServerEngineAPI } from '../common/GameAPIs.ts';
-import PF, { etype, ofs } from './ProgsAPI.mjs';
+import PF, { etype, ofs } from './ProgsAPI.ts';
 import { gameCapabilities } from '../../shared/Defs.ts';
-import { loadGameModule } from './GameLoader.mjs';
+import { loadGameModule, type GameModuleInterface } from './GameLoader.ts';
 
 interface ProgsStatement {
   op: number;
diff --git a/source/engine/server/ProgsAPI.mjs b/source/engine/server/ProgsAPI.mjs
deleted file mode 100644
index 697e2408..00000000
--- a/source/engine/server/ProgsAPI.mjs
+++ /dev/null
@@ -1 +0,0 @@
-export { default, etype, ofs } from './ProgsAPI.ts';
diff --git a/source/engine/server/ProgsAPI.ts b/source/engine/server/ProgsAPI.ts
index 79457a0e..fd1e064d 100644
--- a/source/engine/server/ProgsAPI.ts
+++ b/source/engine/server/ProgsAPI.ts
@@ -5,7 +5,7 @@ import Cmd from '../common/Cmd.ts';
 import { HostError } from '../common/Errors.ts';
 import { ServerEngineAPI } from '../common/GameAPIs.ts';
 import { eventBus, getCommonRegistry, registry } from '../registry.mjs';
-import { ED, ServerEdict } from './Edict.mjs';
+import { ED, ServerEdict } from './Edict.ts';
 
 type BuiltinValue = string | number | boolean | Vector | ServerEdict | null;
 type BuiltinImplementation = (...args: BuiltinValue[]) => BuiltinValue | void;
diff --git a/source/engine/server/Server.mjs b/source/engine/server/Server.mjs
deleted file mode 100644
index 7bb99a51..00000000
--- a/source/engine/server/Server.mjs
+++ /dev/null
@@ -1 +0,0 @@
-export { default, ServerEntityState } from './Server.ts';
diff --git a/source/engine/server/Server.ts b/source/engine/server/Server.ts
index cf79338b..788c04c4 100644
--- a/source/engine/server/Server.ts
+++ b/source/engine/server/Server.ts
@@ -8,22 +8,22 @@ import { SzBuffer } from '../network/MSG.ts';
 import * as Protocol from '../network/Protocol.ts';
 import * as Def from './../common/Def.ts';
 import Cmd, { ConsoleCommand } from '../common/Cmd.ts';
-import { ED, ServerEdict } from './Edict.mjs';
+import { ED, ServerEdict } from './Edict.ts';
 import { EventBus, eventBus, getCommonRegistry } from '../registry.mjs';
 import { ServerEngineAPI } from '../common/GameAPIs.ts';
 import * as Defs from '../../shared/Defs.ts';
-import { Navigation } from './Navigation.mjs';
+import { Navigation } from './Navigation.ts';
 import { ServerPhysics } from './physics/ServerPhysics.ts';
 import { ServerClientPhysics } from './physics/ServerClientPhysics.ts';
-import { ServerMessages } from './ServerMessages.mjs';
+import { ServerMessages } from './ServerMessages.ts';
 import { ServerMovement } from './physics/ServerMovement.ts';
 import { ServerArea } from './physics/ServerArea.ts';
 import { ServerCollision } from './physics/ServerCollision.ts';
 import { sharedCollisionModelSource } from '../common/CollisionModelSource.ts';
 import { BrushModel } from '../common/Mod.ts';
-import { ServerClient } from './Client.mjs';
+import { ServerClient } from './Client.ts';
 
-export { ServerEntityState } from './ServerEntityState.mjs';
+export { ServerEntityState } from './ServerEntityState.ts';
 
 let { COM, Con, Host, Mod, NET, PR } = getCommonRegistry();
 
diff --git a/source/engine/server/ServerEntityState.mjs b/source/engine/server/ServerEntityState.mjs
deleted file mode 100644
index 5d615b9d..00000000
--- a/source/engine/server/ServerEntityState.mjs
+++ /dev/null
@@ -1,2 +0,0 @@
-export { ServerEntityState } from './ServerEntityState.ts';
-
diff --git a/source/engine/server/ServerMessages.mjs b/source/engine/server/ServerMessages.mjs
deleted file mode 100644
index df6e4829..00000000
--- a/source/engine/server/ServerMessages.mjs
+++ /dev/null
@@ -1 +0,0 @@
-export { ServerMessages } from './ServerMessages.ts';
diff --git a/source/engine/server/ServerMessages.ts b/source/engine/server/ServerMessages.ts
index 501ddc86..d9369513 100644
--- a/source/engine/server/ServerMessages.ts
+++ b/source/engine/server/ServerMessages.ts
@@ -1,14 +1,14 @@
 import type { Visibility } from '../common/model/BSP.ts';
 import type Vector from '../../shared/Vector.ts';
-import type { BaseEntity, ServerEdict, WorldspawnEntity } from './Edict.mjs';
+import type { BaseEntity, ServerEdict, WorldspawnEntity } from './Edict.ts';
 
 import { SzBuffer } from '../network/MSG.ts';
 import * as Protocol from '../network/Protocol.ts';
 import * as Defs from '../../shared/Defs.ts';
 import Cvar from '../common/Cvar.ts';
 import { eventBus, getCommonRegistry } from '../registry.mjs';
-import { ServerClient } from './Client.mjs';
-import { ServerEntityState } from './ServerEntityState.mjs';
+import { ServerClient } from './Client.ts';
+import { ServerEntityState } from './ServerEntityState.ts';
 
 type BitsWriter = 'writeByte' | 'writeShort' | 'writeLong';
 type EntityFieldValue = string | number | boolean | Vector | null | ServerEdict | BaseEntity | undefined;
diff --git a/source/engine/server/Sys.mjs b/source/engine/server/Sys.mjs
deleted file mode 100644
index 4c7ba0be..00000000
--- a/source/engine/server/Sys.mjs
+++ /dev/null
@@ -1,2 +0,0 @@
-export { default } from './Sys.ts';
-
diff --git a/source/engine/server/physics/ServerArea.ts b/source/engine/server/physics/ServerArea.ts
index 11c6f246..63252f38 100644
--- a/source/engine/server/physics/ServerArea.ts
+++ b/source/engine/server/physics/ServerArea.ts
@@ -1,5 +1,5 @@
 import type { Hull, Node } from '../../common/model/BSP.ts';
-import type { BaseEntity, ServerEdict } from '../Edict.mjs';
+import type { BaseEntity, ServerEdict } from '../Edict.ts';
 
 import Vector from '../../../shared/Vector.ts';
 import * as Defs from '../../../shared/Defs.ts';
diff --git a/source/engine/server/physics/ServerClientPhysics.ts b/source/engine/server/physics/ServerClientPhysics.ts
index edb1c850..9da7c898 100644
--- a/source/engine/server/physics/ServerClientPhysics.ts
+++ b/source/engine/server/physics/ServerClientPhysics.ts
@@ -1,4 +1,4 @@
-import type { ServerEdict } from '../Edict.mjs';
+import type { ServerEdict } from '../Edict.ts';
 
 import Vector from '../../../shared/Vector.ts';
 import * as Defs from '../../../shared/Defs.ts';
@@ -6,7 +6,7 @@ import { eventBus, getCommonRegistry } from '../../registry.mjs';
 import {
   VELOCITY_EPSILON,
 } from './Defs.ts';
-import { ServerClient } from '../Client.mjs';
+import { ServerClient } from '../Client.ts';
 import { PM_TYPE } from '../../common/Pmove.ts';
 import { BrushModel } from '../../common/Mod.ts';
 
diff --git a/source/engine/server/physics/ServerCollision.ts b/source/engine/server/physics/ServerCollision.ts
index 5c5b9885..3d8c2002 100644
--- a/source/engine/server/physics/ServerCollision.ts
+++ b/source/engine/server/physics/ServerCollision.ts
@@ -1,5 +1,5 @@
 import type { Hull } from '../../common/model/BSP.ts';
-import type { ServerEdict } from '../Edict.mjs';
+import type { ServerEdict } from '../Edict.ts';
 
 import Vector from '../../../shared/Vector.ts';
 import * as Defs from '../../../shared/Defs.ts';
diff --git a/source/engine/server/physics/ServerCollisionSupport.ts b/source/engine/server/physics/ServerCollisionSupport.ts
index d353ae88..18c2f8b5 100644
--- a/source/engine/server/physics/ServerCollisionSupport.ts
+++ b/source/engine/server/physics/ServerCollisionSupport.ts
@@ -1,7 +1,7 @@
 import type { Trace as SharedBrushTrace } from '../../common/Pmove.ts';
 import type { BrushModel } from '../../common/model/BSP.ts';
 import type { MeshModel } from '../../common/model/MeshModel.ts';
-import type { ServerEdict } from '../Edict.mjs';
+import type { ServerEdict } from '../Edict.ts';
 
 import Vector from '../../../shared/Vector.ts';
 
diff --git a/source/engine/server/physics/ServerMovement.ts b/source/engine/server/physics/ServerMovement.ts
index f4db502b..7d889164 100644
--- a/source/engine/server/physics/ServerMovement.ts
+++ b/source/engine/server/physics/ServerMovement.ts
@@ -1,5 +1,5 @@
 import type BaseEntity from '../../../game/id1/entity/BaseEntity.mjs';
-import type { ServerEdict } from '../Edict.mjs';
+import type { ServerEdict } from '../Edict.ts';
 
 import Vector from '../../../shared/Vector.ts';
 import * as Defs from '../../../shared/Defs.ts';
diff --git a/source/engine/server/physics/ServerPhysics.ts b/source/engine/server/physics/ServerPhysics.ts
index 2d5cb02b..1f34bacb 100644
--- a/source/engine/server/physics/ServerPhysics.ts
+++ b/source/engine/server/physics/ServerPhysics.ts
@@ -1,4 +1,4 @@
-import type { ServerEdict } from '../Edict.mjs';
+import type { ServerEdict } from '../Edict.ts';
 import type { CollisionTrace } from './ServerCollisionSupport.ts';
 
 import Vector from '../../../shared/Vector.ts';
diff --git a/source/shared/GameInterfaces.ts b/source/shared/GameInterfaces.ts
index 33de8a84..3ebda6a1 100644
--- a/source/shared/GameInterfaces.ts
+++ b/source/shared/GameInterfaces.ts
@@ -1,6 +1,6 @@
 import type { BaseClientEdictHandler } from './ClientEdict.ts';
 import type { ClientEngineAPI as ClientEngineApiValue, ServerEngineAPI as ServerEngineApiValue } from '../engine/common/GameAPIs.ts';
-import type { ServerEdict as ServerEdictValue } from '../engine/server/Edict.mjs';
+import type { ServerEdict as ServerEdictValue } from '../engine/server/Edict.ts';
 import type { GLTexture as GLTextureValue } from '../engine/client/GL.mjs';
 import type { SFX as SFXValue } from '../engine/client/Sound.mjs';
 import type CvarValue from '../engine/common/Cvar.ts';
diff --git a/test/common/server-module-shims.test.mjs b/test/common/server-module-shims.test.mjs
deleted file mode 100644
index 11a04b47..00000000
--- a/test/common/server-module-shims.test.mjs
+++ /dev/null
@@ -1,33 +0,0 @@
-import test from 'node:test';
-import assert from 'node:assert/strict';
-
-import BaseCom from '../../source/engine/common/Com.ts';
-import BaseSys from '../../source/engine/common/Sys.ts';
-import ComMjs from '../../source/engine/server/Com.mjs';
-import ComTs from '../../source/engine/server/Com.ts';
-import ProgsAPIMjs, { etype as etypeMjs, ofs as ofsMjs } from '../../source/engine/server/ProgsAPI.mjs';
-import ProgsAPITs, { etype as etypeTs, ofs as ofsTs } from '../../source/engine/server/ProgsAPI.ts';
-import SysMjs from '../../source/engine/server/Sys.mjs';
-import SysTs from '../../source/engine/server/Sys.ts';
-
-void test('server Com shim re-exports the TypeScript implementation', () => {
-  assert.strictEqual(ComMjs, ComTs);
-});
-
-void test('server Sys shim re-exports the TypeScript implementation', () => {
-  assert.strictEqual(SysMjs, SysTs);
-});
-
-void test('server ProgsAPI shim re-exports the TypeScript implementation', () => {
-  assert.strictEqual(ProgsAPIMjs, ProgsAPITs);
-  assert.strictEqual(etypeMjs, etypeTs);
-  assert.strictEqual(ofsMjs, ofsTs);
-});
-
-void test('server Com inherits the common COM base class', () => {
-  assert.strictEqual(Object.getPrototypeOf(ComTs), BaseCom);
-});
-
-void test('server Sys inherits the common Sys base class', () => {
-  assert.strictEqual(Object.getPrototypeOf(SysTs), BaseSys);
-});
diff --git a/test/common/workers.test.mjs b/test/common/workers.test.mjs
index f43baec4..3d8bec77 100644
--- a/test/common/workers.test.mjs
+++ b/test/common/workers.test.mjs
@@ -110,7 +110,7 @@ void describe('PlatformWorker', () => {
 
     await withWorkerRegistry(consoleCapture, async () => {
       const rawWorker = new FakeNodeWorker();
-      const worker = new PlatformWorker('server/DummyWorker.mjs', rawWorker);
+      const worker = new PlatformWorker('server/DummyWorker.ts', rawWorker);
       const messages = [];
       let shutdownCalls = 0;
 
@@ -137,7 +137,7 @@ void describe('PlatformWorker', () => {
 
     await withWorkerRegistry(consoleCapture, async () => {
       const rawWorker = new FakeNodeWorker();
-      const worker = new PlatformWorker('server/DummyWorker.mjs', rawWorker);
+      const worker = new PlatformWorker('server/DummyWorker.ts', rawWorker);
       const error = new Error('worker boom');
 
       rawWorker.emit('error', error);
@@ -157,10 +157,10 @@ void describe('WorkerManager', () => {
       const rawWorker = new FakeNodeWorker();
 
       WorkerManager.Init({
-        'server/DummyWorker.mjs': () => rawWorker,
+        'server/DummyWorker.ts': () => rawWorker,
       });
 
-      const worker = WorkerManager.SpawnWorker('server/DummyWorker.mjs', ['nav.build']);
+      const worker = WorkerManager.SpawnWorker('server/DummyWorker.ts', ['nav.build']);
 
       assert.deepEqual(rawWorker.messages[0], {
         event: 'worker.framework.init',
diff --git a/test/physics/navigation.test.mjs b/test/physics/navigation.test.mjs
index 140c26f4..194a2251 100644
--- a/test/physics/navigation.test.mjs
+++ b/test/physics/navigation.test.mjs
@@ -3,7 +3,7 @@ import { describe, test } from 'node:test';
 
 import Vector from '../../source/shared/Vector.ts';
 import { eventBus, registry } from '../../source/engine/registry.mjs';
-import { Navigation } from '../../source/engine/server/Navigation.mjs';
+import { Navigation } from '../../source/engine/server/Navigation.ts';
 
 const NAV_MONSTER_MINS = new Vector(-16.0, -16.0, -24.0);
 const NAV_MONSTER_MAXS = new Vector(16.0, 16.0, 40.0);
diff --git a/test/physics/server-client-physics.test.mjs b/test/physics/server-client-physics.test.mjs
index a5fa2c51..80b4ef83 100644
--- a/test/physics/server-client-physics.test.mjs
+++ b/test/physics/server-client-physics.test.mjs
@@ -4,7 +4,7 @@ import assert from 'node:assert/strict';
 import Vector from '../../source/shared/Vector.ts';
 import { flags, moveType, solid } from '../../source/shared/Defs.ts';
 import { UserCmd } from '../../source/engine/network/Protocol.ts';
-import { ServerClient } from '../../source/engine/server/Client.mjs';
+import { ServerClient } from '../../source/engine/server/Client.ts';
 import { ServerClientPhysics } from '../../source/engine/server/physics/ServerClientPhysics.ts';
 
 import {
diff --git a/test/physics/server-collision.test.mjs b/test/physics/server-collision.test.mjs
index 47d3ce35..593b3175 100644
--- a/test/physics/server-collision.test.mjs
+++ b/test/physics/server-collision.test.mjs
@@ -563,7 +563,7 @@ void describe('ServerCollision', () => {
           maxs,
           end,
           moveTypes.MOVE_NORMAL,
-          /** @type {import('../../source/engine/server/Client.mjs').ServerEdict} */ (passedict),
+          /** @type {import('../../source/engine/server/Client.ts').ServerEdict} */ (passedict),
         );
 
         assert.equal(queryCalls.length, 1);
diff --git a/test/physics/server-edict.test.mjs b/test/physics/server-edict.test.mjs
index fbe056f8..8ddea5bd 100644
--- a/test/physics/server-edict.test.mjs
+++ b/test/physics/server-edict.test.mjs
@@ -1,7 +1,7 @@
 import { describe, test } from 'node:test';
 import assert from 'node:assert/strict';
 
-import { ServerEdict } from '../../source/engine/server/Edict.mjs';
+import { ServerEdict } from '../../source/engine/server/Edict.ts';
 
 import { defaultMockRegistry, withMockRegistry } from './fixtures.mjs';
 
diff --git a/test/physics/server-entity-state.test.mjs b/test/physics/server-entity-state.test.mjs
index 2b24ff00..a7944423 100644
--- a/test/physics/server-entity-state.test.mjs
+++ b/test/physics/server-entity-state.test.mjs
@@ -1,11 +1,11 @@
 import { describe, test } from 'node:test';
 import assert from 'node:assert/strict';
 
-import { ServerEntityState as ReExportedServerEntityState } from '../../source/engine/server/Server.mjs';
-import { ServerEntityState } from '../../source/engine/server/ServerEntityState.mjs';
+import { ServerEntityState as ReExportedServerEntityState } from '../../source/engine/server/Server.ts';
+import { ServerEntityState } from '../../source/engine/server/ServerEntityState.ts';
 
 void describe('ServerEntityState', () => {
-  void test('re-exports the canonical implementation from Server.mjs', () => {
+  void test('re-exports the canonical implementation from Server.ts', () => {
     assert.equal(ReExportedServerEntityState, ServerEntityState);
   });
 
diff --git a/test/physics/server-messages.test.mjs b/test/physics/server-messages.test.mjs
index b9dcb52a..9a1b7b63 100644
--- a/test/physics/server-messages.test.mjs
+++ b/test/physics/server-messages.test.mjs
@@ -4,9 +4,9 @@ import assert from 'node:assert/strict';
 import { eventBus, registry } from '../../source/engine/registry.mjs';
 import * as Protocol from '../../source/engine/network/Protocol.ts';
 import { SzBuffer } from '../../source/engine/network/MSG.ts';
-import SV from '../../source/engine/server/Server.mjs';
-import { ServerEntityState } from '../../source/engine/server/ServerEntityState.mjs';
-import { ServerMessages } from '../../source/engine/server/ServerMessages.mjs';
+import SV from '../../source/engine/server/Server.ts';
+import { ServerEntityState } from '../../source/engine/server/ServerEntityState.ts';
+import { ServerMessages } from '../../source/engine/server/ServerMessages.ts';
 
 /**
  * Installs a minimal server registry context for delta-entity message tests.
diff --git a/test/physics/server.test.mjs b/test/physics/server.test.mjs
index 8e871a10..e6f23f8e 100644
--- a/test/physics/server.test.mjs
+++ b/test/physics/server.test.mjs
@@ -4,8 +4,8 @@ import assert from 'node:assert/strict';
 import Vector from '../../source/shared/Vector.ts';
 import * as Protocol from '../../source/engine/network/Protocol.ts';
 import { eventBus, registry } from '../../source/engine/registry.mjs';
-import SV from '../../source/engine/server/Server.mjs';
-import { ServerClient } from '../../source/engine/server/Client.mjs';
+import SV from '../../source/engine/server/Server.ts';
+import { ServerClient } from '../../source/engine/server/Client.ts';
 
 import {
   createMockEdict,
diff --git a/vite.config.dedicated.mjs b/vite.config.dedicated.mjs
index 9a74008c..1c4bbe29 100644
--- a/vite.config.dedicated.mjs
+++ b/vite.config.dedicated.mjs
@@ -36,12 +36,12 @@ function dedicatedServerPathsPlugin() {
         };
       }
 
-      // In Sys.mjs, the __dirname calculation needs adjusting:
+      // In Sys.ts, the __dirname calculation needs adjusting:
       // Unbundled: import.meta.dirname = <root>/source/engine/server (3 levels deep)
       //   + '/../..' goes up 2, then later code does + '/..' for a total of 3 up = root
       // Bundled: import.meta.dirname = <root>/dist/dedicated (2 levels deep)
       //   + '/..' goes up 1, then later code does + '/..' for a total of 2 up = root
-      if (id.includes('/source/engine/server/Sys.mjs')) {
+      if (id.includes('/source/engine/server/Sys.ts')) {
         return {
           code: code.replace(
             "import.meta.dirname + '/../..'",
@@ -51,12 +51,12 @@ function dedicatedServerPathsPlugin() {
         };
       }
 
-      // In WorkerFactories.mjs, rewrite worker URLs to point at self-contained
+      // In WorkerFactories.ts, rewrite worker URLs to point at self-contained
       // bundles that will be placed alongside the dedicated server output by
       // dedicatedWorkerBundlePlugin (see below).
-      if (id.includes('WorkerFactories.mjs')) {
+      if (id.includes('WorkerFactories.ts')) {
         return {
-          code: code.replace(/'\.\.\/server\//g, "'./workers/"),
+          code: code.replace(/\.\.\/server\/([^']+)\.ts/g, './workers/$1.mjs'),
           map: null,
         };
       }
@@ -80,10 +80,10 @@ function dedicatedServerPathsPlugin() {
  * Worker threads in Node.js load their own module graph independently,
  * so they cannot share chunks with the main SSR bundle.  This plugin
  * runs a secondary Rollup build after the main one completes, producing
- * a standalone bundle for every *Worker.mjs file under source/engine/server/.
+ * a standalone bundle for every *Worker.ts file under source/engine/server/.
  *
  * The output lands in dist/dedicated/workers/ which the rewritten URLs
- * in WorkerFactories.mjs (see dedicatedServerPathsPlugin) point at.
+ * in WorkerFactories.ts (see dedicatedServerPathsPlugin) point at.
  * @param {string} mode Vite build mode (development / production)
  * @returns {import('vite').Plugin} Vite plugin
  */
@@ -98,7 +98,7 @@ function dedicatedWorkerBundlePlugin(mode) {
       const outDir = resolve(__dirname, 'dist/dedicated/workers');
 
       const workerPaths = [];
-      for await (const entry of glob('*Worker.mjs', { cwd: workerDir })) {
+      for await (const entry of glob('*Worker.ts', { cwd: workerDir })) {
         workerPaths.push(resolve(workerDir, entry));
       }
 
@@ -108,7 +108,7 @@ function dedicatedWorkerBundlePlugin(mode) {
 
       const bundle = await rollup({
         input: Object.fromEntries(
-          workerPaths.map((p) => [basename(p, '.mjs'), p]),
+          workerPaths.map((p) => [basename(p, '.ts'), p]),
         ),
         // Node built-ins stay external (both prefixed and bare); everything else is inlined
         external: [/^node:/, 'fs', 'path', 'os', 'url', 'util', 'crypto', 'stream', 'events', 'buffer', 'http', 'https', 'net', 'tls', 'child_process', 'worker_threads'],
@@ -129,8 +129,8 @@ function dedicatedWorkerBundlePlugin(mode) {
             },
           },
           {
-            // WorkerFramework.mjs constructs dynamic import paths at runtime
-            // to evade Vite's static analysis (e.g. ['..','server','Com.mjs'].join('/')).
+            // WorkerFramework.ts constructs dynamic import paths at runtime
+            // to evade Vite's static analysis (e.g. ['..','server','Com.ts'].join('/')).
             // We undo that here so Rollup can resolve and bundle them.
             name: 'resolve-worker-dynamic-imports',
             transform(code, id) {
@@ -145,7 +145,7 @@ function dedicatedWorkerBundlePlugin(mode) {
                   )
                   .replace(
                     /const serverComId\s*=\s*\[.*?\]\.join\([^)]+\);\s*const comModule = await import\(\/\* @vite-ignore \*\/ serverComId\)/s,
-                    "const comModule = await import('../server/Com.mjs')",
+                    "const comModule = await import('../server/Com.ts')",
                   ),
                 map: null,
               };
@@ -194,9 +194,9 @@ export default defineConfig(({ mode }) => ({
         entryFileNames: '[name].mjs',
         chunkFileNames: '[name]-[hash].mjs',
         // Extract shared engine/library code into a separate chunk so that
-        // both the entry (dedicated.mjs) and game module chunks import from
+        // both the entry (dedicated.ts) and game module chunks import from
         // it. Without this, Rollup puts shared code into the entry chunk,
-        // causing game module chunks to import from dedicated.mjs — which
+        // causing game module chunks to import from dedicated.ts — which
         // has a top-level await and creates an ESM evaluation deadlock.
         manualChunks(id) {
           if (id.includes('/source/engine/') || id.includes('/source/shared/')) {

From ad248be74f82c87b0ee7c535504406c15c5af3cd Mon Sep 17 00:00:00 2001
From: Christian R <github@chrisnew.de>
Date: Sat, 4 Apr 2026 10:41:06 +0300
Subject: [PATCH 41/67] TS: client/ part 1

---
 .../engine/client/{CDAudio.mjs => CDAudio.ts} |  77 +--
 source/engine/client/CL.mjs                   |  12 +-
 source/engine/client/{Chase.mjs => Chase.ts}  |  34 +-
 ...ientConnection.mjs => ClientConnection.ts} | 145 +++--
 .../{ClientDemos.mjs => ClientDemos.ts}       | 154 +++---
 source/engine/client/ClientEntities.mjs       |   4 +-
 .../{ClientInput.mjs => ClientInput.ts}       | 215 ++++----
 ...ClientLifecycle.mjs => ClientLifecycle.ts} |  45 +-
 .../{ClientMessages.mjs => ClientMessages.ts} | 128 +++--
 .../client/ClientServerCommandHandlers.mjs    |   6 +-
 .../{ClientState.mjs => ClientState.ts}       | 194 ++++---
 source/engine/client/Draw.mjs                 |   2 +-
 source/engine/client/GL.mjs                   |   2 +-
 source/engine/client/IN.mjs                   | 139 -----
 source/engine/client/IN.ts                    | 133 +++++
 source/engine/client/LegacyServerCommands.mjs |   4 +-
 source/engine/client/Menu.mjs                 |   8 +-
 source/engine/client/R.mjs                    |   4 +-
 source/engine/client/SCR.mjs                  |   2 +-
 source/engine/client/Sbar.mjs                 |   2 +-
 source/engine/client/Sys.mjs                  | 295 ----------
 source/engine/client/Sys.ts                   | 374 +++++++++++++
 source/engine/client/Tools.mjs                | 117 ----
 source/engine/client/Tools.ts                 | 167 ++++++
 source/engine/client/V.mjs                    |   2 +-
 source/engine/client/{VID.mjs => VID.ts}      |  48 +-
 source/engine/client/menu/MenuItem.mjs        | 493 -----------------
 source/engine/client/menu/MenuItem.ts         | 503 ++++++++++++++++++
 .../client/menu/{MenuPage.mjs => MenuPage.ts} | 201 ++++---
 source/engine/client/menu/MenuStack.mjs       | 145 -----
 source/engine/client/menu/MenuStack.ts        | 136 +++++
 .../menu/{Multiplayer.mjs => Multiplayer.ts}  |  71 ++-
 source/engine/client/renderer/BloomEffect.mjs |   2 +-
 source/engine/client/renderer/PostProcess.mjs |   2 +-
 source/engine/common/Console.ts               |   2 +-
 source/engine/common/GameAPIs.ts              |   2 +-
 source/engine/common/Host.ts                  |   8 +-
 source/engine/main-browser.ts                 |   4 +-
 source/engine/network/MSG.ts                  |   7 +-
 source/engine/registry.mjs                    |   4 +-
 source/shared/GameInterfaces.ts               |  10 +-
 41 files changed, 2140 insertions(+), 1763 deletions(-)
 rename source/engine/client/{CDAudio.mjs => CDAudio.ts} (73%)
 rename source/engine/client/{Chase.mjs => Chase.ts} (80%)
 rename source/engine/client/{ClientConnection.mjs => ClientConnection.ts} (65%)
 rename source/engine/client/{ClientDemos.mjs => ClientDemos.ts} (56%)
 rename source/engine/client/{ClientInput.mjs => ClientInput.ts} (57%)
 rename source/engine/client/{ClientLifecycle.mjs => ClientLifecycle.ts} (81%)
 rename source/engine/client/{ClientMessages.mjs => ClientMessages.ts} (78%)
 rename source/engine/client/{ClientState.mjs => ClientState.ts} (62%)
 delete mode 100644 source/engine/client/IN.mjs
 create mode 100644 source/engine/client/IN.ts
 delete mode 100644 source/engine/client/Sys.mjs
 create mode 100644 source/engine/client/Sys.ts
 delete mode 100644 source/engine/client/Tools.mjs
 create mode 100644 source/engine/client/Tools.ts
 rename source/engine/client/{VID.mjs => VID.ts} (59%)
 delete mode 100644 source/engine/client/menu/MenuItem.mjs
 create mode 100644 source/engine/client/menu/MenuItem.ts
 rename source/engine/client/menu/{MenuPage.mjs => MenuPage.ts} (53%)
 delete mode 100644 source/engine/client/menu/MenuStack.mjs
 create mode 100644 source/engine/client/menu/MenuStack.ts
 rename source/engine/client/menu/{Multiplayer.mjs => Multiplayer.ts} (75%)

diff --git a/source/engine/client/CDAudio.mjs b/source/engine/client/CDAudio.ts
similarity index 73%
rename from source/engine/client/CDAudio.mjs
rename to source/engine/client/CDAudio.ts
index 51794b70..96c57c66 100644
--- a/source/engine/client/CDAudio.mjs
+++ b/source/engine/client/CDAudio.ts
@@ -1,40 +1,38 @@
 import Cmd from '../common/Cmd.ts';
 import Cvar from '../common/Cvar.ts';
 import Q from '../../shared/Q.ts';
-import { eventBus, registry } from '../registry.mjs';
+import { eventBus, getClientRegistry } from '../registry.mjs';
 
-let { COM, Con, S } = registry;
+let { COM, Con, S } = getClientRegistry();
 
 eventBus.subscribe('registry.frozen', () => {
-  ({ COM, Con, S } = registry);
+  ({ COM, Con, S } = getClientRegistry());
 });
 
 export default class CDAudio {
-  /** @type {Array<() => void>} */
-  static #eventListeners = [];
+  static readonly #eventListeners: Array<() => void> = [];
   static initialized = false;
   static enabled = false;
-  /** @type {number | null} */
-  static playTrack = null;
-  /** @type {HTMLAudioElement | null} */
-  static cd = null;
+  static playTrack: number | null = null;
+  static cd: HTMLAudioElement | null = null;
   static cdvolume = 1.0;
 
-  static #playCurrentTrack() {
+  static #playCurrentTrack(): void {
     if (CDAudio.cd === null || CDAudio.playTrack === null) {
       return;
     }
 
-    CDAudio.cd.play().catch((error) => {
-      Con.PrintWarning(`Could not play track ${CDAudio.playTrack}: ${error}\n`);
+    CDAudio.cd.play().catch((error: unknown) => {
+      Con.PrintWarning(`Could not play track ${CDAudio.playTrack}: ${String(error)}\n`);
       CDAudio.Stop();
     });
   }
 
-  static Play(track, looping) {
+  static Play(track: number, looping: boolean): void {
     if (!CDAudio.initialized || !CDAudio.enabled) {
       return;
     }
+
     if (CDAudio.playTrack === track) {
       if (CDAudio.cd !== null) {
         CDAudio.cd.loop = looping;
@@ -44,6 +42,7 @@ export default class CDAudio {
       }
       return;
     }
+
     CDAudio.Stop();
     CDAudio.playTrack = track;
     CDAudio.cd = new Audio(COM.GetNetpath(`music/${track}.opus`));
@@ -52,41 +51,44 @@ export default class CDAudio {
     CDAudio.#playCurrentTrack();
   }
 
-  static Stop() {
+  static Stop(): void {
     if (!CDAudio.initialized || !CDAudio.enabled) {
       return;
     }
+
     if (CDAudio.cd !== null) {
       CDAudio.cd.pause();
     }
+
     CDAudio.playTrack = null;
     CDAudio.cd = null;
   }
 
-  static Pause() {
+  static Pause(): void {
     if (!CDAudio.initialized || !CDAudio.enabled) {
       return;
     }
-    if (CDAudio.cd !== null) {
-      CDAudio.cd.pause();
-    }
+
+    CDAudio.cd?.pause();
   }
 
-  static Resume() {
+  static Resume(): void {
     if (!CDAudio.initialized || !CDAudio.enabled) {
       return;
     }
+
     if (CDAudio.cd !== null) {
       CDAudio.#playCurrentTrack();
     }
   }
 
-  static CD_f(command, track) {
+  static CD_f(command?: string, track?: string): void {
     if (!CDAudio.initialized) {
       Con.PrintWarning('CD Audio not initialized\n');
       return;
     }
-    switch (String(command).toLowerCase()) {
+
+    switch ((command ?? '').toLowerCase()) {
       case 'on':
         CDAudio.enabled = true;
         return;
@@ -95,10 +97,10 @@ export default class CDAudio {
         CDAudio.enabled = false;
         return;
       case 'play':
-        CDAudio.Play(Q.atoi(track), false);
+        CDAudio.Play(Q.atoi(track ?? ''), false);
         return;
       case 'loop':
-        CDAudio.Play(Q.atoi(track), true);
+        CDAudio.Play(Q.atoi(track ?? ''), true);
         return;
       case 'stop':
         CDAudio.Stop();
@@ -110,12 +112,10 @@ export default class CDAudio {
         CDAudio.Resume();
         return;
       case 'info':
-        if (CDAudio.cd !== null) {
-          if (!CDAudio.cd.paused) {
-            const playbackMode = CDAudio.cd.loop ? 'looping' : 'playing';
-            const path = new URL(CDAudio.cd.src).pathname;
-            Con.Print(`Currently ${playbackMode} ${path}\n`);
-          }
+        if (CDAudio.cd !== null && !CDAudio.cd.paused) {
+          const playbackMode = CDAudio.cd.loop ? 'looping' : 'playing';
+          const path = new URL(CDAudio.cd.src).pathname;
+          Con.Print(`Currently ${playbackMode} ${path}\n`);
         }
         Con.Print(`Volume is ${CDAudio.cdvolume}\n`);
         return;
@@ -125,48 +125,55 @@ export default class CDAudio {
     }
   }
 
-  static Update() {
+  static Update(): void {
     if (!CDAudio.initialized || !CDAudio.enabled) {
       return;
     }
+
     if (S.bgmvolume.value === CDAudio.cdvolume) {
       return;
     }
+
     if (S.bgmvolume.value < 0.0) {
       Cvar.Set('bgmvolume', 0.0);
     } else if (S.bgmvolume.value > 1.0) {
       Cvar.Set('bgmvolume', 1.0);
     }
+
     CDAudio.cdvolume = S.bgmvolume.value;
     if (CDAudio.cd !== null) {
       CDAudio.cd.volume = CDAudio.cdvolume;
     }
   }
 
-  static Init() {
+  static Init(): void {
     Cmd.AddCommand('cd', CDAudio.CD_f.bind(CDAudio));
     if (COM.CheckParm('-nocdaudio') || COM.CheckParm('-nosound')) {
       return;
     }
-    CDAudio.initialized = CDAudio.enabled = true;
+
+    CDAudio.initialized = true;
+    CDAudio.enabled = true;
     CDAudio.Update();
-    CDAudio.#eventListeners.push(eventBus.subscribe('client.cdtrack', (track) => CDAudio.Play(track, true)));
+    CDAudio.#eventListeners.push(eventBus.subscribe('client.cdtrack', (track: number) => CDAudio.Play(track, true)));
     CDAudio.#eventListeners.push(eventBus.subscribe('client.paused', () => CDAudio.Pause()));
     CDAudio.#eventListeners.push(eventBus.subscribe('client.unpaused', () => CDAudio.Resume()));
     CDAudio.#eventListeners.push(eventBus.subscribe('client.disconnected', () => CDAudio.Stop()));
     Con.DPrint('CD Audio Initialized\n');
   }
 
-  static Shutdown() {
+  static Shutdown(): void {
     for (const unsubscribe of CDAudio.#eventListeners) {
       unsubscribe();
     }
+
     if (CDAudio.cd !== null) {
       CDAudio.cd.pause();
       CDAudio.cd = null;
     }
+
     CDAudio.playTrack = null;
     CDAudio.initialized = false;
     CDAudio.enabled = false;
   }
-};
+}
diff --git a/source/engine/client/CL.mjs b/source/engine/client/CL.mjs
index 9fffd086..05d3b6a3 100644
--- a/source/engine/client/CL.mjs
+++ b/source/engine/client/CL.mjs
@@ -6,12 +6,12 @@ import Cvar from '../common/Cvar.ts';
 import { Pmove, PmovePlayer } from '../common/Pmove.ts';
 import { eventBus, registry } from '../registry.mjs';
 import { gameCapabilities, solid } from '../../shared/Defs.ts';
-import ClientDemos from './ClientDemos.mjs';
-import { ClientPlayerState } from './ClientMessages.mjs';
-import VID from './VID.mjs';
-import { clientRuntimeState, clientStaticState } from './ClientState.mjs';
-import ClientConnection from './ClientConnection.mjs';
-import ClientLifecycle from './ClientLifecycle.mjs';
+import ClientDemos from './ClientDemos.ts';
+import { ClientPlayerState } from './ClientMessages.ts';
+import VID from './VID.ts';
+import { clientRuntimeState, clientStaticState } from './ClientState.ts';
+import ClientConnection from './ClientConnection.ts';
+import ClientLifecycle from './ClientLifecycle.ts';
 import { BrushModel } from '../common/Mod.ts';
 // import { materialFlags, PBRMaterial, QuakeMaterial } from './renderer/Materials.mjs';
 /** @typedef {import('./Sound.mjs').SFX} SFX */
diff --git a/source/engine/client/Chase.mjs b/source/engine/client/Chase.ts
similarity index 80%
rename from source/engine/client/Chase.mjs
rename to source/engine/client/Chase.ts
index 4c4c9ca2..88ae90a6 100644
--- a/source/engine/client/Chase.mjs
+++ b/source/engine/client/Chase.ts
@@ -1,40 +1,35 @@
 import Vector from '../../shared/Vector.ts';
 import Cvar from '../common/Cvar.ts';
-import { eventBus, registry } from '../registry.mjs';
+import { eventBus, getClientRegistry } from '../registry.mjs';
 
-let { CL, R, SV } = registry;
+let { CL, R, SV } = getClientRegistry();
 
 eventBus.subscribe('registry.frozen', () => {
-  CL = registry.CL;
-  R = registry.R;
-  SV = registry.SV;
+  ({ CL, R, SV } = getClientRegistry());
 });
 
 export default class Chase {
-  /** @type {Cvar} */
-  static back = null;
-  /** @type {Cvar} */
-  static up = null;
-  /** @type {Cvar} */
-  static right = null;
-  /** @type {Cvar} */
-  static active = null;
+  static back: Cvar;
+  static up: Cvar;
+  static right: Cvar;
+  static active: Cvar;
 
-  static Init() {
+  static Init(): void {
     Chase.back = new Cvar('chase_back', '100');
     Chase.up = new Cvar('chase_up', '16');
     Chase.right = new Cvar('chase_right', '0');
     Chase.active = new Cvar('chase_active', '0');
   }
 
-  static Update2() { // side scroller style
+  static Update2(): void {
     const { forward, right } = CL.state.viewangles.angleVectors();
     const back = forward.copy().subtract(new Vector(0.0, 128.0, 0.0));
     const org = R.refdef.vieworg;
     const trace = SV.collision.traceStaticWorldLine(org, new Vector(
       org[0] + 4096.0 * right[0],
       org[1] + 4096.0 * right[1],
-      org[2] + 4096.0 * right[2]));
+      org[2] + 4096.0 * right[2],
+    ));
     const stop = trace.endpos;
     stop[2] -= org[2];
     const dist = Math.max(1.0, (stop[0] - org[0]) * right[0] + (stop[1] - org[1]) * right[1] + stop[2] * right[2]);
@@ -46,13 +41,14 @@ export default class Chase {
     org.subtract(back);
   }
 
-  static Update() {
+  static Update(): void {
     const { forward, right } = CL.state.viewangles.angleVectors();
     const org = R.refdef.vieworg;
     const trace = SV.collision.traceStaticWorldLine(org, new Vector(
       org[0] + 4096.0 * forward[0],
       org[1] + 4096.0 * forward[1],
-      org[2] + 4096.0 * forward[2]));
+      org[2] + 4096.0 * forward[2],
+    ));
     const stop = trace.endpos;
     stop[2] -= org[2];
     let dist = (stop[0] - org[0]) * forward[0] + (stop[1] - org[1]) * forward[1] + stop[2] * forward[2];
@@ -71,4 +67,4 @@ export default class Chase {
       org.set(org2);
     }
   }
-};
+}
diff --git a/source/engine/client/ClientConnection.mjs b/source/engine/client/ClientConnection.ts
similarity index 65%
rename from source/engine/client/ClientConnection.mjs
rename to source/engine/client/ClientConnection.ts
index bf2a53b4..16c6bd08 100644
--- a/source/engine/client/ClientConnection.mjs
+++ b/source/engine/client/ClientConnection.ts
@@ -1,29 +1,36 @@
 import * as Protocol from '../network/Protocol.ts';
-import { HostError } from '../common/Errors.ts';
+import * as Def from '../common/Def.ts';
 import Cvar from '../common/Cvar.ts';
 import Cmd from '../common/Cmd.ts';
-import ClientInput from './ClientInput.mjs';
-import { clientRuntimeState, clientStaticState } from './ClientState.mjs';
-import { eventBus, registry } from '../registry.mjs';
-import * as Def from '../common/Def.ts';
+import ClientInput from './ClientInput.ts';
+import type ClientDemos from './ClientDemos.ts';
+import { clientRuntimeState, clientStaticState, type ClientRuntimeState, type ClientStaticState } from './ClientState.ts';
+import { eventBus, getClientRegistry } from '../registry.mjs';
+import { HostError } from '../common/Errors.ts';
 import { QSocket } from '../network/NetworkDrivers.ts';
 import { parseServerMessage as parseServerCommandMessage } from './ClientServerCommandHandlers.mjs';
 
-let { Con, Host, IN, Mod, NET, SCR, S, SV } = registry;
+type IdentityCvars = {
+  name: Cvar | null;
+  color: Cvar | null;
+  rcon_password: Cvar | null;
+};
+
+let { Con, Host, IN, Mod, NET, SCR, S, SV } = getClientRegistry();
 
 eventBus.subscribe('registry.frozen', () => {
-  Con = registry.Con;
-  Host = registry.Host;
-  IN = registry.IN;
-  Mod = registry.Mod;
-  NET = registry.NET;
-  SCR = registry.SCR;
-  S = registry.S;
-  SV = registry.SV;
+  ({ Con, Host, IN, Mod, NET, SCR, S, SV } = getClientRegistry());
 });
 
 export default class ClientConnection {
-  constructor({ clientDemos }) {
+  cls: ClientStaticState;
+  state: ClientRuntimeState;
+  clientDemos: ClientDemos;
+  identityCvars: IdentityCvars;
+  processingServerDataState: number;
+  lastServerMessages: string[];
+
+  constructor({ clientDemos }: { clientDemos: ClientDemos }) {
     this.cls = clientStaticState;
     this.state = clientRuntimeState;
     this.clientDemos = clientDemos;
@@ -36,18 +43,22 @@ export default class ClientConnection {
     this.lastServerMessages = [];
   }
 
-  configureIdentityCvars({ name, color, rcon_password }) {
+  configureIdentityCvars({ name, color, rcon_password }: IdentityCvars): void {
     this.identityCvars.name = name;
     this.identityCvars.color = color;
     this.identityCvars.rcon_password = rcon_password;
   }
 
-  setConnectingStep(percentage, message) {
+  setConnectingStep(percentage: number | null, message: string | null): void {
     if (percentage === null && message === null) {
       this.cls.connecting = null;
       return;
     }
 
+    if (percentage === null || message === null) {
+      throw new HostError('Connecting step percentage and message must both be provided');
+    }
+
     Con.DPrint(`${percentage.toFixed(0).padStart(3, ' ')}% ${message}\n`);
     SCR.con_current = 0;
 
@@ -59,21 +70,27 @@ export default class ClientConnection {
     };
   }
 
-  getMessage() {
+  getMessage(): number {
     if (this.clientDemos.demoplayback === true) {
       return this.clientDemos.getMessage();
     }
 
-    let r = null;
+    const netcon = this.cls.netcon;
+
+    if (netcon === null) {
+      throw new HostError('CL.GetMessage: no active connection');
+    }
+
+    let result = 0;
 
     while (true) {
-      r = NET.GetMessage(this.cls.netcon);
+      result = NET.GetMessage(netcon);
 
-      if (r !== 1 && r !== 2) {
-        return r;
+      if (result !== 1 && result !== 2) {
+        return result;
       }
 
-      if (NET.message.cursize === 1 && (new Uint8Array(NET.message.data, 0, 1))[0] === Protocol.svc.nop) {
+      if (NET.message.cursize === 1 && new Uint8Array(NET.message.data, 0, 1)[0] === Protocol.svc.nop) {
         Con.DPrint('<-- server to client keepalive\n');
       } else {
         break;
@@ -84,10 +101,10 @@ export default class ClientConnection {
       this.clientDemos.writeDemoMessage();
     }
 
-    return r;
+    return result;
   }
 
-  sendCmd() {
+  sendCmd(): void {
     if (this.cls.state === Def.clientConnectionState.disconnected) {
       return;
     }
@@ -112,12 +129,18 @@ export default class ClientConnection {
       return;
     }
 
-    if (NET.CanSendMessage(this.cls.netcon) !== true) {
+    const netcon = this.cls.netcon;
+
+    if (netcon === null) {
+      throw new HostError('CL.SendCmd: no active connection');
+    }
+
+    if (NET.CanSendMessage(netcon) !== true) {
       Con.DPrint('CL.SendCmd: can\'t send\n');
       return;
     }
 
-    if (NET.SendMessage(this.cls.netcon, this.cls.message) === -1) {
+    if (NET.SendMessage(netcon, this.cls.message) === -1) {
       throw new HostError('CL.SendCmd: lost server connection');
     }
 
@@ -125,13 +148,13 @@ export default class ClientConnection {
     this.cls.lastcmdsent = Host.realtime;
   }
 
-  resetCheatCvars() {
-    for (const cvar of Cvar.Filter((cvar) => (cvar.flags & Cvar.FLAG.CHEAT) !== 0)) {
+  resetCheatCvars(): void {
+    for (const cvar of Cvar.Filter((candidate) => (candidate.flags & Cvar.FLAG.CHEAT) !== 0)) {
       cvar.reset();
     }
   }
 
-  clearState() {
+  clearState(): void {
     S.StopAllSounds();
 
     Con.DPrint('Clearing client model views\n');
@@ -146,11 +169,11 @@ export default class ClientConnection {
     this.lastServerMessages.length = 0;
   }
 
-  disconnect() {
+  disconnect(): void {
     this.setConnectingStep(null, null);
     S.StopAllSounds();
 
-    if (this.state.gameAPI) {
+    if (this.state.gameAPI !== null) {
       this.state.gameAPI.shutdown();
       this.state.gameAPI = null;
     }
@@ -162,14 +185,18 @@ export default class ClientConnection {
       this.cls.message.clear();
     } else if (this.cls.state === Def.clientConnectionState.connected) {
       if (this.cls.demorecording === true) {
-        Cmd.ExecuteString('stopdemo\n');
+        void Cmd.ExecuteString('stopdemo\n');
       }
       Con.DPrint('Sending clc_disconnect\n');
       this.cls.message.clear();
       this.cls.message.writeByte(Protocol.clc.disconnect);
-      NET.SendUnreliableMessage(this.cls.netcon, this.cls.message);
+      if (this.cls.netcon !== null) {
+        NET.SendUnreliableMessage(this.cls.netcon, this.cls.message);
+      }
       this.cls.message.clear();
-      NET.Close(this.cls.netcon);
+      if (this.cls.netcon !== null) {
+        NET.Close(this.cls.netcon);
+      }
       this.cls.state = Def.clientConnectionState.disconnected;
       if (SV.server.active === true) {
         Host.ShutdownServer();
@@ -183,17 +210,21 @@ export default class ClientConnection {
     eventBus.publish('client.disconnected');
   }
 
-  checkConnectingState() {
+  checkConnectingState(): void {
     const sock = this.cls.netcon;
 
+    if (sock === null) {
+      throw new HostError('CL.CheckConnectingState: no active connection');
+    }
+
     switch (sock.state) {
       case QSocket.STATE_CONNECTED:
         this.cls.lastcmdsent = Host.realtime;
-        Con.DPrint('CL.Connect: connected to ' + sock.address + '\n');
+        Con.DPrint(`CL.Connect: connected to ${sock.address}\n`);
         this.cls.demonum = -1;
         this.cls.state = Def.clientConnectionState.connected;
         this.cls.signon = 0;
-        this.setConnectingStep(10, 'Connecting to ' + sock.address);
+        this.setConnectingStep(10, `Connecting to ${sock.address}`);
         eventBus.publish('client.connected', sock.address);
         break;
 
@@ -205,15 +236,15 @@ export default class ClientConnection {
     }
   }
 
-  connect(host) {
+  connect(host: string): void {
     if (this.cls.demoplayback === true) {
       return;
     }
 
     this.disconnect();
-    this.setConnectingStep(5, 'Connecting to ' + host);
+    this.setConnectingStep(5, `Connecting to ${host}`);
 
-    this.cls.isLocalGame = (host === 'local');
+    this.cls.isLocalGame = host === 'local';
     this.cls.state = Def.clientConnectionState.connecting;
     this.cls.lastcmdsent = Host.realtime;
 
@@ -228,8 +259,8 @@ export default class ClientConnection {
     this.cls.netcon = sock;
   }
 
-  signonReply() {
-    Con.DPrint('CL.SignonReply: ' + this.cls.signon + '\n');
+  signonReply(): void {
+    Con.DPrint(`CL.SignonReply: ${this.cls.signon}\n`);
 
     switch (this.cls.signon) {
       case 1:
@@ -237,16 +268,24 @@ export default class ClientConnection {
         this.cls.message.writeByte(Protocol.clc.stringcmd);
         this.cls.message.writeString('prespawn');
         break;
-      case 2:
+      case 2: {
+        const name = this.identityCvars.name;
+        const color = this.identityCvars.color;
+
+        if (name === null || color === null) {
+          throw new HostError('Client identity cvars must be configured before signon');
+        }
+
         eventBus.publish('client.server-info.ready', Object.assign({}, this.cls.serverInfo));
         this.setConnectingStep(95, 'Setting client state');
         this.cls.message.writeByte(Protocol.clc.stringcmd);
-        this.cls.message.writeString('name "' + this.identityCvars.name.string + '"\n');
+        this.cls.message.writeString(`name "${name.string}"\n`);
         this.cls.message.writeByte(Protocol.clc.stringcmd);
-        this.cls.message.writeString('color ' + (this.identityCvars.color.value >> 4) + ' ' + (this.identityCvars.color.value & 15) + '\n');
+        this.cls.message.writeString(`color ${color.value >> 4} ${color.value & 15}\n`);
         this.cls.message.writeByte(Protocol.clc.stringcmd);
-        this.cls.message.writeString('spawn ' + this.cls.spawnparms);
+        this.cls.message.writeString(`spawn ${this.cls.spawnparms}`);
         break;
+      }
       case 3:
         this.setConnectingStep(100, 'Joining the game!');
         this.cls.message.writeByte(Protocol.clc.stringcmd);
@@ -261,19 +300,19 @@ export default class ClientConnection {
         S.LoadPendingFiles();
         break;
       default:
-        throw new HostError('Received invalid signon state: ' + this.cls.signon);
+        throw new HostError(`Received invalid signon state: ${this.cls.signon}`);
     }
 
     eventBus.publish('client.signon', this.cls.signon);
   }
 
-  readFromServer() {
+  readFromServer(): void {
     while (true) {
       if (this.processingServerDataState === 1) {
         return;
       }
 
-      let ret;
+      let ret = 0;
       if (this.processingServerDataState === 2) {
         this.processingServerDataState = 3;
       } else {
@@ -294,18 +333,18 @@ export default class ClientConnection {
     }
   }
 
-  parseServerMessage() {
+  parseServerMessage(): void {
     parseServerCommandMessage();
   }
 
-  printLastServerMessages() {
+  printLastServerMessages(): void {
     if (this.lastServerMessages.length === 0) {
       return;
     }
 
     Con.Print('Last server messages:\n');
     for (const cmd of this.lastServerMessages) {
-      Con.Print(' ' + cmd + '\n');
+      Con.Print(` ${cmd}\n`);
     }
   }
 }
diff --git a/source/engine/client/ClientDemos.mjs b/source/engine/client/ClientDemos.ts
similarity index 56%
rename from source/engine/client/ClientDemos.mjs
rename to source/engine/client/ClientDemos.ts
index 7fe9a801..979bc804 100644
--- a/source/engine/client/ClientDemos.mjs
+++ b/source/engine/client/ClientDemos.ts
@@ -1,30 +1,30 @@
-
 import { clientConnectionState } from '../common/Def.ts';
-import { eventBus, registry } from '../registry.mjs';
+import { eventBus, getClientRegistry } from '../registry.mjs';
 import * as Protocol from '../network/Protocol.ts';
 import { HostError } from '../common/Errors.ts';
 
-let { CL, COM, Con, Host, NET } = registry;
+let { CL, COM, Con, Host, NET } = getClientRegistry();
 
 eventBus.subscribe('registry.frozen', () => {
-  CL = registry.CL;
-  COM = registry.COM;
-  Con = registry.Con;
-  Host = registry.Host;
-  NET = registry.NET;
+  ({ CL, COM, Con, Host, NET } = getClientRegistry());
 });
 
+/**
+ * Returns a readable error message for demo playback failures.
+ * @returns Readable error message.
+ */
+function getErrorMessage(error: unknown): string {
+  return error instanceof Error ? error.message : String(error);
+}
+
 export default class ClientDemos {
-  /** @type {string} */
-  demoname = null;
+  demoname: string | null = null;
   demonum = 0;
   demoplayback = false;
   demorecording = false;
-  /** @type {string[]} */
-  demos = [];
+  demos: string[] = [];
 
-  /** @type {ArrayBuffer} */
-  demofile = null;
+  demofile: ArrayBuffer | null = null;
   demoofs = 0;
   demosize = 0;
   timedemo = false;
@@ -33,31 +33,42 @@ export default class ClientDemos {
   td_lastframe = -1;
   forcetrack = -1;
 
-  /** @type {number|null} Host.realtime when gameplay (signon 4) first began */
-  demoBaseRealtime = null;
-  /** @type {number} server time (clientMessages.mtime[0]) at demoBaseRealtime */
+  /** Host.realtime when gameplay (signon 4) first began. */
+  demoBaseRealtime: number | null = null;
+
+  /** Server time (clientMessages.mtime[0]) at demoBaseRealtime. */
   demoBaseServertime = 0;
 
-  writeDemoMessage() {
+  #getDemoFile(): ArrayBuffer {
+    if (this.demofile === null) {
+      throw new HostError('demo file is not open');
+    }
+
+    return this.demofile;
+  }
+
+  writeDemoMessage(): void {
+    const currentFile = this.#getDemoFile();
     const len = this.demoofs + 16 + NET.message.cursize;
 
-    if (this.demofile.byteLength < len) {
-      const src = new Uint8Array(this.demofile, 0, this.demoofs);
-      this.demofile = new ArrayBuffer(this.demofile.byteLength + 16384);
-      (new Uint8Array(this.demofile)).set(src);
+    if (currentFile.byteLength < len) {
+      const src = new Uint8Array(currentFile, 0, this.demoofs);
+      this.demofile = new ArrayBuffer(currentFile.byteLength + 16384);
+      new Uint8Array(this.demofile).set(src);
     }
 
-    const f = new DataView(this.demofile, this.demoofs, 16);
-    f.setInt32(0, NET.message.cursize, true);
-    f.setFloat32(4, CL.state.viewangles[0], true);
-    f.setFloat32(8, CL.state.viewangles[1], true);
-    f.setFloat32(12, CL.state.viewangles[2], true);
-    (new Uint8Array(this.demofile)).set(new Uint8Array(NET.message.data, 0, NET.message.cursize), this.demoofs + 16);
+    const demoFile = this.#getDemoFile();
+    const view = new DataView(demoFile, this.demoofs, 16);
+    view.setInt32(0, NET.message.cursize, true);
+    view.setFloat32(4, CL.state.viewangles[0], true);
+    view.setFloat32(8, CL.state.viewangles[1], true);
+    view.setFloat32(12, CL.state.viewangles[2], true);
+    new Uint8Array(demoFile).set(new Uint8Array(NET.message.data, 0, NET.message.cursize), this.demoofs + 16);
 
     this.demoofs = len;
-  };
+  }
 
-  getMessage() {
+  getMessage(): 0 | 1 {
     console.assert(this.demoplayback, 'must be in playback mode to get message');
 
     if (CL.cls.signon === 4) {
@@ -91,14 +102,19 @@ export default class ClientDemos {
       return 0;
     }
 
-    const view = new DataView(this.demofile);
+    const demoFile = this.#getDemoFile();
+    const view = new DataView(demoFile);
     NET.message.cursize = view.getUint32(this.demoofs, true);
 
     if (NET.message.cursize > 8000) {
       throw new HostError('Demo message > MAX_MSGLEN');
     }
 
-    CL.state.viewangles.setTo(view.getFloat32(this.demoofs + 4, true), view.getFloat32(this.demoofs + 8, true), view.getFloat32(this.demoofs + 12, true));
+    CL.state.viewangles.setTo(
+      view.getFloat32(this.demoofs + 4, true),
+      view.getFloat32(this.demoofs + 8, true),
+      view.getFloat32(this.demoofs + 12, true),
+    );
 
     this.demoofs += 16;
 
@@ -107,11 +123,11 @@ export default class ClientDemos {
       return 0;
     }
 
-    const src = new Uint8Array(this.demofile, this.demoofs, NET.message.cursize);
+    const src = new Uint8Array(demoFile, this.demoofs, NET.message.cursize);
     const dest = new Uint8Array(NET.message.data, 0, NET.message.cursize);
 
-    for (let i = 0; i < NET.message.cursize; i++) {
-      dest[i] = src[i];
+    for (let index = 0; index < NET.message.cursize; index++) {
+      dest[index] = src[index];
     }
 
     this.demoofs += NET.message.cursize;
@@ -119,42 +135,42 @@ export default class ClientDemos {
     return 1;
   }
 
-  async startPlayback(demoname, timedemo = false) {
+  async startPlayback(demoname: string, timedemo = false): Promise<void> {
     console.assert(CL.cls.state === clientConnectionState.disconnected, 'must be disconnected to start playback');
     console.assert(!this.demoplayback, 'must not be in playback mode');
 
     const name = COM.DefaultExtension(demoname, '.dem');
-    Con.Print('Playing demo from ' + name + '.\n');
+    Con.Print(`Playing demo from ${name}.\n`);
 
     this.demofile = await COM.LoadFile(name);
     if (this.demofile === null) {
-      Con.PrintError('ERROR: couldn\'t open ' + demoname + '\n');
+      Con.PrintError(`ERROR: couldn't open ${demoname}\n`);
       this.demonum = -1;
       // TODO: SCR.disabled_for_loading = false;
       return;
     }
 
-    const demofile_u8 = new Uint8Array(this.demofile);
-    this.demosize = demofile_u8.length;
+    const demoFileBytes = new Uint8Array(this.demofile);
+    this.demosize = demoFileBytes.length;
     this.demoplayback = true;
     // eslint-disable-next-line require-atomic-updates
     CL.cls.state = clientConnectionState.connected;
     this.forcetrack = 0;
 
-    let i;
+    let index: number;
     let neg = false;
 
-    for (i = 0; i < demofile_u8.length; i++) {
-      const c = demofile_u8[i];
+    for (index = 0; index < demoFileBytes.length; index++) {
+      const character = demoFileBytes[index];
 
-      if (c === 10) {
+      if (character === 10) {
         break;
       }
 
-      if (c === 45) {
+      if (character === 45) {
         neg = true;
       } else {
-        this.forcetrack = this.forcetrack * 10 + c - 48;
+        this.forcetrack = this.forcetrack * 10 + character - 48;
       }
     }
 
@@ -162,7 +178,7 @@ export default class ClientDemos {
       this.forcetrack = -this.forcetrack;
     }
 
-    this.demoofs = i + 1;
+    this.demoofs = index + 1;
 
     this.demoBaseRealtime = null;
     this.demoBaseServertime = 0;
@@ -174,7 +190,7 @@ export default class ClientDemos {
     }
   }
 
-  stopPlayback() {
+  stopPlayback(): void {
     if (!this.demoplayback) {
       return;
     }
@@ -188,9 +204,9 @@ export default class ClientDemos {
     if (this.timedemo) {
       this.#finishTimeDemo();
     }
-  };
+  }
 
-  startRecording(demoname, forcetrack = -1) {
+  startRecording(demoname: string, forcetrack = -1): void {
     console.assert(CL.cls.state === clientConnectionState.connected, 'must be connected to start recording a demo');
 
     if (forcetrack !== -1) {
@@ -201,22 +217,22 @@ export default class ClientDemos {
 
     this.demoname = COM.DefaultExtension(demoname, '.dem');
 
-    Con.PrintSuccess('recording to ' + this.demoname + '.\n');
+    Con.PrintSuccess(`recording to ${this.demoname}.\n`);
 
     this.demofile = new ArrayBuffer(16384);
 
-    const trackstr = this.forcetrack.toString() + '\n';
-    const dest = new Uint8Array(this.demofile, 0, trackstr.length);
+    const trackString = `${this.forcetrack.toString()}\n`;
+    const dest = new Uint8Array(this.demofile, 0, trackString.length);
 
-    for (let i = 0; i < trackstr.length; i++) {
-      dest[i] = trackstr.charCodeAt(i);
+    for (let index = 0; index < trackString.length; index++) {
+      dest[index] = trackString.charCodeAt(index);
     }
 
-    this.demoofs = trackstr.length;
+    this.demoofs = trackString.length;
     this.demorecording = true;
   }
 
-  async stopRecording() {
+  async stopRecording(): Promise<boolean> {
     if (!this.demorecording) {
       Con.Print('Not recording a demo.\n');
       return false;
@@ -228,8 +244,14 @@ export default class ClientDemos {
 
     this.writeDemoMessage();
 
-    if (!await COM.WriteFile(this.demoname, new Uint8Array(this.demofile), this.demoofs)) {
-      Con.PrintError(`ERROR: couldn't write demo file ${this.demoname}!`);
+    const demoname = this.demoname;
+    const demoFile = this.demofile;
+    if (demoname === null || demoFile === null) {
+      throw new HostError('demo recording state is incomplete');
+    }
+
+    if (!await COM.WriteFile(demoname, new Uint8Array(demoFile), this.demoofs)) {
+      Con.PrintError(`ERROR: couldn't write demo file ${demoname}!`);
       return false;
     }
 
@@ -241,7 +263,7 @@ export default class ClientDemos {
     return true;
   }
 
-  startDemos(demos) {
+  startDemos(demos: string[]): void {
     this.demos.length = 0;
     this.demos.push(...demos);
 
@@ -253,7 +275,7 @@ export default class ClientDemos {
     }
   }
 
-  playNext() {
+  playNext(): void {
     if (this.demonum === -1) {
       return;
     }
@@ -269,17 +291,17 @@ export default class ClientDemos {
     }
 
     this.stopPlayback();
-    this.startPlayback(this.demos[this.demonum++]).catch((e) => {
-      Con.PrintError('Failed to start playback: ' + e.message + '\n');
+    this.startPlayback(this.demos[this.demonum++]).catch((error: unknown) => {
+      Con.PrintError(`Failed to start playback: ${getErrorMessage(error)}\n`);
     });
   }
 
-  #finishTimeDemo() {
+  #finishTimeDemo(): void {
     this.timedemo = false;
 
     const frames = Host.framecount - this.td_startframe - 1;
     const time = Math.max(1, Host.realtime - this.td_starttime);
 
-    Con.Print(frames + ' frames ' + time.toFixed(1) + ' seconds ' + (frames / time).toFixed(1) + ' fps\n');
+    Con.Print(`${frames} frames ${time.toFixed(1)} seconds ${(frames / time).toFixed(1)} fps\n`);
   }
-};
+}
diff --git a/source/engine/client/ClientEntities.mjs b/source/engine/client/ClientEntities.mjs
index fd37709e..0cd37b18 100644
--- a/source/engine/client/ClientEntities.mjs
+++ b/source/engine/client/ClientEntities.mjs
@@ -2,7 +2,7 @@ import Vector from '../../shared/Vector.ts';
 import { eventBus, registry } from '../registry.mjs';
 import * as Def from '../common/Def.ts';
 import { content, effect, solid } from '../../shared/Defs.ts';
-import Chase from './Chase.mjs';
+import Chase from './Chase.ts';
 import { DefaultClientEdictHandler } from './ClientLegacy.mjs';
 import { BaseClientEdictHandler } from '../../shared/ClientEdict.ts';
 import { ClientEngineAPI } from '../common/GameAPIs.ts';
@@ -132,7 +132,7 @@ export class ClientEdict { // TODO: extends Protocol.EntityState
     this.nextthink = -1;
     this.maxs = new Vector();
     this.mins = new Vector();
-    /** @type {Record<string, import('../../shared/GameInterfaces').SerializableType>} entity fields pushed by the server */
+    /** @type {Record<string, import('../../shared/GameInterfaces').ClientEventValue>} entity fields pushed by the server */
     this.extended = {};
     /** server time when this entity was last updated (legacy demo playback only) */
     this.msgtime = 0.0;
diff --git a/source/engine/client/ClientInput.mjs b/source/engine/client/ClientInput.ts
similarity index 57%
rename from source/engine/client/ClientInput.mjs
rename to source/engine/client/ClientInput.ts
index 2f5afac6..25e26e1b 100644
--- a/source/engine/client/ClientInput.mjs
+++ b/source/engine/client/ClientInput.ts
@@ -2,119 +2,152 @@ import Vector from '../../shared/Vector.ts';
 import * as Protocol from '../network/Protocol.ts';
 import Q from '../../shared/Q.ts';
 import { SzBuffer } from '../network/MSG.ts';
-import Cmd from '../common/Cmd.ts';
-import { eventBus, registry } from '../registry.mjs';
+import Cmd, { type ConsoleCommand } from '../common/Cmd.ts';
+import { eventBus, getClientRegistry } from '../registry.mjs';
 import { HostError } from '../common/Errors.ts';
 
-let { Con, CL, Host, NET, V } = registry;
+interface KButtonState {
+  down: [number, number];
+  state: number;
+}
+
+/**
+ * Legacy key button indices.
+ */
+export enum kbutton {
+  mlook = 0,
+  klook = 1,
+  left = 2,
+  right = 3,
+  forward = 4,
+  back = 5,
+  lookup = 6,
+  lookdown = 7,
+  moveleft = 8,
+  moveright = 9,
+  strafe = 10,
+  speed = 11,
+  use = 12,
+  jump = 13,
+  attack = 14,
+  moveup = 15,
+  movedown = 16,
+}
+
+const kbuttonByName = Object.freeze({
+  mlook: kbutton.mlook,
+  klook: kbutton.klook,
+  left: kbutton.left,
+  right: kbutton.right,
+  forward: kbutton.forward,
+  back: kbutton.back,
+  lookup: kbutton.lookup,
+  lookdown: kbutton.lookdown,
+  moveleft: kbutton.moveleft,
+  moveright: kbutton.moveright,
+  strafe: kbutton.strafe,
+  speed: kbutton.speed,
+  use: kbutton.use,
+  jump: kbutton.jump,
+  attack: kbutton.attack,
+  moveup: kbutton.moveup,
+  movedown: kbutton.movedown,
+});
+
+const KBUTTON_COUNT = Object.keys(kbuttonByName).length;
+
+let { CL, Con, Host, NET, V } = getClientRegistry();
 
 eventBus.subscribe('registry.frozen', () => {
-  Con = registry.Con;
-  CL = registry.CL;
-  Host = registry.Host;
-  NET = registry.NET;
-  V = registry.V;
+  ({ CL, Con, Host, NET, V } = getClientRegistry());
 });
 
 /**
- * @enum {number}
- * @readonly
+ * Resolves a console command suffix to a legacy button index.
+ * @returns Button index or null when the name is unknown.
  */
-export const kbutton = Object.freeze({
-    mlook: 0,
-    klook: 1,
-    left: 2,
-    right: 3,
-    forward: 4,
-    back: 5,
-    lookup: 6,
-    lookdown: 7,
-    moveleft: 8,
-    moveright: 9,
-    strafe: 10,
-    speed: 11,
-    use: 12,
-    jump: 13,
-    attack: 14,
-    moveup: 15,
-    movedown: 16,
-});
+function getButtonIndex(name: string): kbutton | null {
+  return kbuttonByName[name as keyof typeof kbuttonByName] ?? null;
+}
 
-/** @type {{down: number[], state: number}[]} */
-export const kbuttons = new Array(Object.keys(kbutton).length);
+export const kbuttons: KButtonState[] = new Array(KBUTTON_COUNT);
 
 export default class ClientInput {
   static impulse = 0;
 
-  /** @this {import('../common/Cmd.ts').ConsoleCommand} */
-  static KeyDown_f(cmd) { // private
-    let b = kbutton[this.command.substring(1)];
-    if (b === undefined) {
+  private static KeyDown_f(this: ConsoleCommand, cmd?: string): void {
+    const command = this.command;
+    if (command === null) {
       return;
     }
-    b = kbuttons[b];
 
-    let k;
-    if (cmd !== undefined) {
-      k = Q.atoi(cmd);
-    } else {
-      k = -1;
+    const buttonIndex = getButtonIndex(command.substring(1));
+    if (buttonIndex === null) {
+      return;
     }
 
-    if ((k === b.down[0]) || (k === b.down[1])) {
+    const button = kbuttons[buttonIndex];
+
+    const key = cmd !== undefined ? Q.atoi(cmd) : -1;
+
+    if (key === button.down[0] || key === button.down[1]) {
       return;
     }
 
-    if (b.down[0] === 0) {
-      b.down[0] = k;
-    } else if (b.down[1] === 0) {
-      b.down[1] = k;
+    if (button.down[0] === 0) {
+      button.down[0] = key;
+    } else if (button.down[1] === 0) {
+      button.down[1] = key;
     } else {
       Con.DPrint('Three keys down for a button!\n');
       return;
     }
 
-    if ((b.state & 1) === 0) {
-      b.state |= 3;
+    if ((button.state & 1) === 0) {
+      button.state |= 3;
     }
   }
 
-  /** @this {import('../common/Cmd.ts').ConsoleCommand} */
-  static KeyUp_f(cmd) { // private
-    let b = kbutton[this.command.substring(1)];
+  private static KeyUp_f(this: ConsoleCommand, cmd?: string): void {
+    const command = this.command;
+    if (command === null) {
+      return;
+    }
 
-    if (b === undefined) {
+    const buttonIndex = getButtonIndex(command.substring(1));
+    if (buttonIndex === null) {
       return;
     }
 
-    b = kbuttons[b];
+    const button = kbuttons[buttonIndex];
 
-    let k;
-    if (cmd !== undefined) {
-      k = Q.atoi(cmd);
-    } else {
-      b.down[0] = b.down[1] = 0;
-      b.state = 4;
+    if (cmd === undefined) {
+      button.down[0] = 0;
+      button.down[1] = 0;
+      button.state = 4;
       return;
     }
 
-    if (b.down[0] === k) {
-      b.down[0] = 0;
-    } else if (b.down[1] === k) {
-      b.down[1] = 0;
+    const key = Q.atoi(cmd);
+
+    if (button.down[0] === key) {
+      button.down[0] = 0;
+    } else if (button.down[1] === key) {
+      button.down[1] = 0;
     } else {
       return;
     }
-    if ((b.down[0] !== 0) || (b.down[1] !== 0)) {
+
+    if (button.down[0] !== 0 || button.down[1] !== 0) {
       return;
     }
 
-    if ((b.state & 1) !== 0) {
-      b.state = (b.state - 1) | 4;
+    if ((button.state & 1) !== 0) {
+      button.state = (button.state - 1) | 4;
     }
   }
 
-  static MLookUp_f(cmd) { // private
+  private static MLookUp_f(this: ConsoleCommand, cmd?: string): void {
     ClientInput.KeyUp_f.call(this, cmd);
 
     if (((kbuttons[kbutton.mlook].state & 1) === 0) && (CL.lookspring.value !== 0)) {
@@ -122,7 +155,7 @@ export default class ClientInput {
     }
   }
 
-  static Impulse_f(code) { // private
+  private static Impulse_f(code?: string): void {
     if (code === undefined) {
       Con.Print('Usage: impulse <code>\n');
       return;
@@ -131,23 +164,23 @@ export default class ClientInput {
     ClientInput.impulse = Q.atoi(code);
   }
 
-  static KeyState(key) { // private
-    key = kbuttons[key];
-    const down = key.state & 1;
-    key.state &= 1;
-    if ((key.state & 2) !== 0) {
-      if ((key.state & 4) !== 0) {
-        return (down !== 0) ? 0.75 : 0.25;
+  private static KeyState(key: kbutton): number {
+    const button = kbuttons[key];
+    const down = button.state & 1;
+    button.state &= 1;
+    if ((button.state & 2) !== 0) {
+      if ((button.state & 4) !== 0) {
+        return down !== 0 ? 0.75 : 0.25;
       }
-      return (down !== 0) ? 0.5 : 0.0;
+      return down !== 0 ? 0.5 : 0.0;
     }
-    if ((key.state & 4) !== 0) {
+    if ((button.state & 4) !== 0) {
       return 0.0;
     }
-    return (down !== 0) ? 1.0 : 0.0;
+    return down !== 0 ? 1.0 : 0.0;
   }
 
-  static AdjustAngles() { // private
+  private static AdjustAngles(): void {
     let speed = Host.frametime;
     if ((kbuttons[kbutton.speed].state & 1) !== 0) {
       speed *= CL.anglespeedkey.value;
@@ -164,7 +197,8 @@ export default class ClientInput {
       angles[0] += speed * CL.pitchspeed.value * (ClientInput.KeyState(kbutton.back) - ClientInput.KeyState(kbutton.forward));
     }
 
-    const up = ClientInput.KeyState(kbutton.lookup); const down = ClientInput.KeyState(kbutton.lookdown);
+    const up = ClientInput.KeyState(kbutton.lookup);
+    const down = ClientInput.KeyState(kbutton.lookdown);
     if ((up !== 0.0) || (down !== 0.0)) {
       angles[0] += speed * CL.pitchspeed.value * (down - up);
       V.StopPitchDrift();
@@ -183,7 +217,7 @@ export default class ClientInput {
     }
   }
 
-  static BaseMove() { // private
+  static BaseMove(): void {
     if (CL.cls.signon !== 4) {
       return;
     }
@@ -218,7 +252,7 @@ export default class ClientInput {
     ClientInput.impulse = 0;
   }
 
-  static SendMove() { // private
+  static SendMove(): void {
     CL.state.cmd.buttons = 0;
 
     if ((kbuttons[kbutton.attack].state & 3) !== 0) {
@@ -268,27 +302,28 @@ export default class ClientInput {
     }
   }
 
-  static Init() {
-    const commands = ['moveup', 'movedown', 'left', 'right',
+  static Init(): void {
+    const commands = [
+      'moveup', 'movedown', 'left', 'right',
       'forward', 'back', 'lookup', 'lookdown',
       'strafe', 'moveleft', 'moveright', 'speed',
       'attack', 'use', 'jump', 'klook',
     ];
 
-    for (let i = 0; i < commands.length; i++) {
-      Cmd.AddCommand('+' + commands[i], ClientInput.KeyDown_f);
-      Cmd.AddCommand('-' + commands[i], ClientInput.KeyUp_f);
+    for (let index = 0; index < commands.length; index++) {
+      Cmd.AddCommand(`+${commands[index]}`, ClientInput.KeyDown_f);
+      Cmd.AddCommand(`-${commands[index]}`, ClientInput.KeyUp_f);
     }
 
     Cmd.AddCommand('impulse', ClientInput.Impulse_f);
     Cmd.AddCommand('+mlook', ClientInput.KeyDown_f);
     Cmd.AddCommand('-mlook', ClientInput.MLookUp_f);
 
-    for (let i = 0; i < Object.keys(kbutton).length; i++) {
-      kbuttons[i] = {
+    for (let index = 0; index < KBUTTON_COUNT; index++) {
+      kbuttons[index] = {
         down: [0, 0],
         state: 0,
       };
     }
   }
-};
+}
diff --git a/source/engine/client/ClientLifecycle.mjs b/source/engine/client/ClientLifecycle.ts
similarity index 81%
rename from source/engine/client/ClientLifecycle.mjs
rename to source/engine/client/ClientLifecycle.ts
index b3b20102..51f44812 100644
--- a/source/engine/client/ClientLifecycle.mjs
+++ b/source/engine/client/ClientLifecycle.ts
@@ -2,46 +2,43 @@ import Cvar from '../common/Cvar.ts';
 import Cmd, { ConsoleCommand } from '../common/Cmd.ts';
 import * as Def from '../common/Def.ts';
 import { gameCapabilities } from '../../shared/Defs.ts';
-import ClientInput from './ClientInput.mjs';
+import ClientInput from './ClientInput.ts';
 import CL from './CL.mjs';
-import { clientRuntimeState } from './ClientState.mjs';
+import { clientRuntimeState } from './ClientState.ts';
 import { MoveVars, Pmove } from '../common/Pmove.ts';
 import { ClientEngineAPI } from '../common/GameAPIs.ts';
-import { eventBus, registry } from '../registry.mjs';
+import { eventBus, getClientRegistry } from '../registry.mjs';
 
-let { Host, PR, S } = registry;
+let { Host, PR, S } = getClientRegistry();
 
 eventBus.subscribe('registry.frozen', () => {
-  Host = registry.Host;
-  PR = registry.PR;
-  S = registry.S;
+  ({ Host, PR, S } = getClientRegistry());
 });
 
 /** The client game can tell the menu what to do when a new game is requested. */
 export class StartGameInterface {
-  startSingleplayerGame() {
+  startSingleplayerGame(): void {
   }
 
-  // eslint-disable-next-line no-unused-vars
-  startMultiplayerGame(/** @type {string} */ mapname) {
+  startMultiplayerGame(_mapname: string): void {
   }
-};
+}
 
-/** Quake 1 default start game entries */
+/** Quake 1 default start game entries. */
 export class DefaultStartGameFunctions extends StartGameInterface {
-  startSingleplayerGame() {
+  override startSingleplayerGame(): void {
     void Cmd.ExecuteString('map start');
   }
 
-  startMultiplayerGame(/** @type {string} */ mapname) {
+  override startMultiplayerGame(mapname: string): void {
     void Cmd.ExecuteString(`map ${mapname}`);
   }
-};
+}
 
 export default class ClientLifecycle {
-  static startGame = /** @type {StartGameInterface} */ (null);
+  static startGame: StartGameInterface | null = null;
 
-  static async init() {
+  static async init(): Promise<void> {
     CL.ClearState();
     ClientInput.Init();
     CL.pmove = new Pmove();
@@ -55,8 +52,8 @@ export default class ClientLifecycle {
     CL.sbarDisabled = CL.gameCapabilities.includes(gameCapabilities.CAP_HUD_INCLUDES_SBAR);
   }
 
-  static initGame() {
-    CL.gameCapabilities = PR.capabilities;
+  static initGame(): void {
+    CL.gameCapabilities = [...PR.capabilities];
 
     if (!PR.QuakeJS?.identification) {
       document.title = `${Def.productName} (${Host.version.string})`;
@@ -75,15 +72,15 @@ export default class ClientLifecycle {
       this.startGame = new DefaultStartGameFunctions();
     }
 
-    CL.gameCapabilities = PR.QuakeJS.identification.capabilities;
+    CL.gameCapabilities = [...PR.QuakeJS.identification.capabilities];
   }
 
-  static resumeGame(clientdata, particles) {
+  static resumeGame(clientdata: string | null, particles: string | null): void {
     CL.Connect('local');
     clientRuntimeState.loadClientData = [clientdata, particles];
   }
 
-  static #registerCvars() {
+  static #registerCvars(): void {
     CL.name = new Cvar('_cl_name', 'player', Cvar.FLAG.ARCHIVE);
     CL.color = new Cvar('_cl_color', '0', Cvar.FLAG.ARCHIVE);
     CL.upspeed = new Cvar('cl_upspeed', '200');
@@ -109,9 +106,9 @@ export default class ClientLifecycle {
     CL.areaportals = new Cvar('cl_areaportals', '0', Cvar.FLAG.ARCHIVE, 'Enables/disables client-side area portal culling');
   }
 
-  static #registerCommands() {
+  static #registerCommands(): void {
     Cmd.AddCommand('entities', class EntitiesCommand extends ConsoleCommand {
-      run() {
+      override run(): void {
         clientRuntimeState.clientEntities.printEntities();
       }
     });
diff --git a/source/engine/client/ClientMessages.mjs b/source/engine/client/ClientMessages.ts
similarity index 78%
rename from source/engine/client/ClientMessages.mjs
rename to source/engine/client/ClientMessages.ts
index 0811a0e8..f071dd75 100644
--- a/source/engine/client/ClientMessages.mjs
+++ b/source/engine/client/ClientMessages.ts
@@ -1,16 +1,18 @@
 import * as Protocol from '../network/Protocol.ts';
 import * as Def from '../common/Def.ts';
-import { eventBus, registry } from '../registry.mjs';
-import { HostError } from '../common/Errors.ts';
 import Vector from '../../shared/Vector.ts';
 import { PmovePlayer } from '../common/Pmove.ts';
 import { gameCapabilities } from '../../shared/Defs.ts';
+import { eventBus, getClientRegistry } from '../registry.mjs';
+import { HostError } from '../common/Errors.ts';
 import { ClientEdict } from './ClientEntities.mjs';
 
-let { CL, COM, NET } = registry;
+type ClientdataBitsReader = 'readLong' | 'readShort' | 'readByte';
+
+let { CL, COM, NET } = getClientRegistry();
 
 eventBus.subscribe('registry.frozen', () => {
-  ({ CL, COM, NET } = registry);
+  ({ CL, COM, NET } = getClientRegistry());
 });
 
 /**
@@ -18,41 +20,51 @@ eventBus.subscribe('registry.frozen', () => {
  * to do move prediction and to generate a drawable entity
  */
 export class ClientPlayerState extends Protocol.EntityState {
-  /**
-   * @param {PmovePlayer} pmove pmove for player
-   */
-  constructor(pmove) {
+  /** last command for prediction */
+  command: Protocol.UserCmd;
+
+  /** all player's won't be updated each frame */
+  messagenum: number;
+
+  /** not the same as the packet time, because player commands come asyncronously */
+  stateTime: number;
+
+  declare origin: Vector;
+  velocity: Vector;
+  weaponframe: number;
+  waterjumptime: number;
+
+  /** null in air, else pmove entity number */
+  onground: number | null;
+
+  oldbuttons: number;
+
+  /** Q2-style player movement flags (PMF bitmask) */
+  pmFlags: number;
+
+  /** Q2-style timing counter for special states */
+  pmTime: number;
+  pmove: PmovePlayer;
+
+  constructor(pmove: PmovePlayer) {
     super();
-    /** @type {Protocol.UserCmd} last command for prediction */
     this.command = new Protocol.UserCmd();
-
-    /** all player's won't be updated each frame */
     this.messagenum = 0;
-
-    /** not the same as the packet time, because player commands come asyncronously */
     this.stateTime = 0.0;
-
     this.origin = new Vector();
     this.velocity = new Vector();
-
     this.weaponframe = 0;
-
     this.waterjumptime = 0.0;
-    /** @type {?number} null in air, else pmove entity number */
     this.onground = null;
     this.oldbuttons = 0;
-
-    /** @type {number} Q2-style player movement flags (PMF bitmask) */
     this.pmFlags = 0;
-    /** @type {number} Q2-style timing counter for special states */
     this.pmTime = 0;
-
     this.pmove = pmove;
 
     Object.seal(this);
   }
 
-  readFromMessage() {
+  readFromMessage(): void {
     this.flags = NET.message.readShort();
     this.origin.set(NET.message.readCoordVector());
     this.frame = NET.message.readByte();
@@ -61,7 +73,7 @@ export class ClientPlayerState extends Protocol.EntityState {
 
     if (this.flags & Protocol.pf.PF_MSEC) {
       const msec = NET.message.readByte();
-      this.stateTime -= (msec / 1000.0);
+      this.stateTime -= msec / 1000.0;
     }
 
     // TODO: stateTime, parsecounttime
@@ -83,32 +95,31 @@ export class ClientPlayerState extends Protocol.EntityState {
     }
 
     if (this.flags & Protocol.pf.PF_SKINNUM) {
-      this.skin = NET.message.readByte();
+      this.skinnum = NET.message.readByte();
     }
 
     if (this.flags & Protocol.pf.PF_WEAPONFRAME) {
       this.weaponframe = NET.message.readByte();
     }
   }
-};
+}
 
 /**
  * Handles player movement and entity related messages.
  */
 export class ClientMessages {
-  /** @type {number[]} current received time, last received time */
-  mtime = [0.0, 0.0];
+  /** current received time, last received time */
+  mtime: [number, number] = [0.0, 0.0];
 
-  /** @type {ClientPlayerState[]} */
-  playerstates = [];
+  playerstates: ClientPlayerState[] = [];
 
-  /** @type {string[]} additional private player fields whose values are getting updated each frame */
-  #clientdataFields = [];
+  /** additional private player fields whose values are getting updated each frame */
+  #clientdataFields: string[] = [];
 
-  /** @type {'readLong'|'readShort'|'readByte'} shortcut to read the current amount of clientdata field bits */
-  #readClientdataFieldsBits = null;
+  /** shortcut to read the current amount of clientdata field bits */
+  #readClientdataFieldsBits: ClientdataBitsReader | null = null;
 
-  set clientdataFields(fields) {
+  set clientdataFields(fields: string[]) {
     this.#clientdataFields.length = 0;
     this.#clientdataFields.push(...fields);
 
@@ -126,7 +137,7 @@ export class ClientMessages {
   /**
    * Parses Protocol.svc.time message.
    */
-  parseTime() {
+  parseTime(): void {
     // This is the time of the last message received from the server.
     this.mtime[1] = this.mtime[0];
     // This is the current time we got from the server.
@@ -135,9 +146,9 @@ export class ClientMessages {
 
   /**
    * General client data parsing.
-   * @param {number} bits bitmask from Protocol.su describing which general client fields follow
+   * @param bits bitmask from Protocol.su describing which general client fields follow
    */
-  #parseClientGeneral(bits) {
+  #parseClientGeneral(bits: number): void {
     // Parse the general client data.
 
     CL.state.viewheight = ((bits & Protocol.su.viewheight) !== 0) ? NET.message.readChar() : Protocol.default_viewheight;
@@ -167,9 +178,9 @@ export class ClientMessages {
   /**
    * Client data parsing for Quake 1.
    * This will fill CL.state.stats and CL.state.items.
-   * @param {number} bits bitmask from Protocol.su describing which legacy client fields follow
+   * @param bits bitmask from Protocol.su describing which legacy client fields follow
    */
-  #parseClientLegacy(bits) {
+  #parseClientLegacy(bits: number): void {
     const item = NET.message.readLong();
     if (CL.state.items !== item) {
       for (let j = 0; j < CL.state.item_gettime.length; j++) {
@@ -199,15 +210,23 @@ export class ClientMessages {
   /**
    * Client data parsing for QuakeJS based games.
    */
-  #parseClientdata() {
+  #parseClientdata(): void {
+    if (this.#readClientdataFieldsBits === null) {
+      throw new HostError('Clientdata field bits reader not initialized');
+    }
+
     const fieldbits = NET.message[this.#readClientdataFieldsBits]();
 
-    const fields = [];
-    const fieldsToNull = [];
+    const fields: string[] = [];
+    const fieldsToNull: string[] = [];
 
     for (let i = 0; i < this.#clientdataFields.length; i++) {
       const field = this.#clientdataFields[i];
 
+      if (field === undefined) {
+        continue;
+      }
+
       if ((fieldbits & (1 << i)) !== 0) {
         fields.push(field);
       } else {
@@ -220,6 +239,10 @@ export class ClientMessages {
     // we are writing directly into clientdata object
     const clientdata = CL.state.gameAPI.clientdata;
 
+    if (clientdata === null) {
+      throw new HostError('Client game API clientdata is not initialized');
+    }
+
     while (true) {
       const dataType = NET.message.readByte();
 
@@ -229,7 +252,10 @@ export class ClientMessages {
 
       const field = fields[counter++];
 
-      console.assert(field !== undefined, `Unknown clientdata field index ${counter - 1} for data type ${dataType}`);
+      if (field === undefined) {
+        throw new HostError(`Unknown clientdata field index ${counter - 1} for data type ${dataType}`);
+      }
+
       console.assert(clientdata[field] !== undefined, `Unknown clientdata field ${field} for data type ${dataType}`);
 
       switch (dataType) {
@@ -294,7 +320,7 @@ export class ClientMessages {
     }
   }
 
-  parseClientEvent() {
+  parseClientEvent(): void {
     const eventCode = NET.message.readByte();
     const args = NET.message.readSerializablesOnClient();
 
@@ -304,7 +330,7 @@ export class ClientMessages {
   /**
    * Parses Protocol.svc.clientdata message.
    */
-  parseClient() {
+  parseClient(): void {
     const bits = NET.message.readShort();
 
     this.#parseClientGeneral(bits);
@@ -316,26 +342,30 @@ export class ClientMessages {
     }
   }
 
-  parsePlayer() {
+  parsePlayer(): void {
     const num = NET.message.readByte();
 
     if (num > CL.state.maxclients) {
       throw new HostError('CL.ParsePlayerinfo: num > maxclients');
     }
 
-    if (!this.playerstates[num]) {
+    if (this.playerstates[num] === undefined) {
       this.playerstates[num] = new ClientPlayerState(CL.pmove.newPlayerMove());
     }
 
     const state = this.playerstates[num];
 
+    if (state === undefined) {
+      throw new HostError(`Missing client player state ${num}`);
+    }
+
     state.number = num;
     state.readFromMessage();
     state.angles.set(state.command.angles);
   }
 
-  clear() {
+  clear(): void {
     this.mtime.fill(0.0);
     this.playerstates.length = 0;
   }
-};
+}
diff --git a/source/engine/client/ClientServerCommandHandlers.mjs b/source/engine/client/ClientServerCommandHandlers.mjs
index 875bf973..67923920 100644
--- a/source/engine/client/ClientServerCommandHandlers.mjs
+++ b/source/engine/client/ClientServerCommandHandlers.mjs
@@ -7,12 +7,12 @@ import Vector from '../../shared/Vector.ts';
 import { ClientEngineAPI } from '../common/GameAPIs.ts';
 import { sharedCollisionModelSource } from '../common/CollisionModelSource.ts';
 import { eventBus, registry } from '../registry.mjs';
-import { ScoreSlot } from './ClientState.mjs';
+import { ScoreSlot } from './ClientState.ts';
 
 import { legacyServerCommandHandlers, handleLegacyEntityUpdate } from './LegacyServerCommands.mjs';
 
 /** @typedef {typeof import('./CL.mjs').default} ClientLayer */
-/** @typedef {import('./ClientMessages.mjs').ClientMessages} ClientMessages */
+/** @typedef {import('./ClientMessages.ts').ClientMessages} ClientMessages */
 
 let { CL, Con, SCR, S, R, V, Host, SV, NET, Mod, PR, COM } = registry;
 
@@ -202,7 +202,7 @@ function parseServerData() {
     CL.state.sound_precache.push(...sounds);
 
     CL.connection.processingServerDataState = 2;
-    CL.state.worldmodel = CL.state.model_precache[1];
+    CL.state.worldmodel = /** @type {import('../common/Mod.ts').BrushModel} */ (CL.state.model_precache[1]);
     CL.pmove.setWorldmodel(CL.state.worldmodel);
     const ent = CL.state.clientEntities.getEntity(0);
     ent.classname = 'worldspawn';
diff --git a/source/engine/client/ClientState.mjs b/source/engine/client/ClientState.ts
similarity index 62%
rename from source/engine/client/ClientState.mjs
rename to source/engine/client/ClientState.ts
index 2e23a681..ab8d5169 100644
--- a/source/engine/client/ClientState.mjs
+++ b/source/engine/client/ClientState.ts
@@ -3,22 +3,48 @@ import { QSocket } from '../network/NetworkDrivers.ts';
 import * as Protocol from '../network/Protocol.ts';
 import * as Def from '../common/Def.ts';
 import Vector from '../../shared/Vector.ts';
-import { EventBus, eventBus, registry } from '../registry.mjs';
+import type { BaseModel } from '../common/model/BaseModel.ts';
+import type { BrushModel } from '../common/Mod.ts';
+import type { ClientGameInterface, ClientSerializableType, SFX } from '../../shared/GameInterfaces.ts';
+import type ClientDemos from './ClientDemos.ts';
+import { EventBus, eventBus, getClientRegistry } from '../registry.mjs';
 import ClientEntities, { ClientEdict } from './ClientEntities.mjs';
-import { ClientMessages } from './ClientMessages.mjs';
-import { BrushModel } from '../common/Mod.ts';
+import { ClientMessages } from './ClientMessages.ts';
 
-let { CL } = registry;
+type ClientConnectionProgress = {
+  message: string;
+  percentage: number;
+};
+
+type ClientChatMessage = {
+  name: string;
+  message: string;
+  direct: boolean;
+};
+
+type ClientEntityFieldDefinition = {
+  fields: string[];
+  bitsReader: 'readByte' | 'readShort' | 'readLong';
+};
+
+type ClientMoveCommand = {
+  cmd: Protocol.UserCmd;
+  msec: number;
+};
+
+type ClientLoadData = [string | null, string | null];
+
+let { CL } = getClientRegistry();
 
 eventBus.subscribe('registry.frozen', () => {
-  CL = registry.CL;
+  ({ CL } = getClientRegistry());
 });
 
 /**
  * Create a stats array sized to the numeric legacy stat entries.
- * @returns {number[]} Fresh zeroed stat slots.
+ * @returns Fresh zeroed stat slots.
  */
-function createLegacyStatsArray() {
+function createLegacyStatsArray(): number[] {
   return Object.values(Def.stat).filter((value) => typeof value === 'number').map(() => 0);
 }
 
@@ -35,82 +61,77 @@ const clientGameEvents = [
   'client.server-info.updated',
   'client.damage',
   'client.chat.message',
-];
+] as const;
 
 class ClientStaticState {
   signon = 0;
-  /** @type {Def.clientConnectionState} */
-  state = 0;
+  state: Def.clientConnectionState = Def.clientConnectionState.disconnected;
   spawnparms = '';
   changelevel = false;
   message = new SzBuffer(8192, 'CL.cls.message');
-  /** @type {QSocket|null} */
-  netcon = null;
-  /** @type {{ message: string, percentage: number } | null} */
-  connecting = null;
-  /** @type {Record<string, string>} */
-  serverInfo = {};
+  netcon: QSocket | null = null;
+  connecting: ClientConnectionProgress | null = null;
+  serverInfo: Record<string, string> = {};
   lastcmdsent = 0;
   isLocalGame = false;
-  movearound = null;
-  /** @type {boolean} will enable the legacy network protocol (15) for old demos */
+  movearound: ReturnType<typeof setInterval> | null = null;
+  /** will enable the legacy network protocol (15) for old demos */
   legacy_demo = false;
-  /** @type {import('./ClientDemos.mjs').default|null} */
-  #clientDemos = null;
-  /** @type {ClientRuntimeState|null} */
-  #runtimeState = null;
+  #clientDemos: ClientDemos | null = null;
+  #runtimeState: ClientRuntimeState | null = null;
 
-  bindClientDemos(clientDemos) {
+  bindClientDemos(clientDemos: ClientDemos): void {
     this.#clientDemos = clientDemos;
   }
 
-  bindRuntimeState(runtimeState) {
+  bindRuntimeState(runtimeState: ClientRuntimeState): void {
     this.#runtimeState = runtimeState;
   }
 
-  get demoplayback() {
+  get demoplayback(): boolean {
     return this.#clientDemos?.demoplayback ?? false;
   }
 
-  get demorecording() {
+  get demorecording(): boolean {
     return this.#clientDemos?.demorecording ?? false;
   }
 
-  get demonum() {
+  get demonum(): number {
     return this.#clientDemos?.demonum ?? -1;
   }
 
-  set demonum(value) {
-    if (this.#clientDemos) {
+  set demonum(value: number) {
+    if (this.#clientDemos !== null) {
       this.#clientDemos.demonum = value;
     }
   }
 
-  get forcetrack() {
+  get forcetrack(): number {
     return this.#clientDemos?.forcetrack ?? -1;
   }
 
-  set forcetrack(value) {
-    if (this.#clientDemos) {
+  set forcetrack(value: number) {
+    if (this.#clientDemos !== null) {
       this.#clientDemos.forcetrack = value;
     }
   }
 
-  get latency() {
-    if (!this.#runtimeState) {
+  get latency(): number {
+    if (this.#runtimeState === null) {
       return 0;
     }
+
     const player = this.#runtimeState.playernum;
     const slot = this.#runtimeState.scores[player];
     return slot?.ping ?? 0;
   }
 
-  clear() {
+  clear(): void {
     this.message.clear();
     this.serverInfo = {};
     this.lastcmdsent = 0;
     this.legacy_demo = false;
-    if (this.movearound) {
+    if (this.movearound !== null) {
       clearInterval(this.movearound);
       this.movearound = null;
     }
@@ -118,21 +139,22 @@ class ClientStaticState {
 }
 
 export class ScoreSlot {
-  constructor(index) {
-    this.index = index;
-  }
-
+  index: number;
   name = '';
   entertime = 0.0;
   frags = 0;
   colors = 0;
   ping = 0;
 
-  get isActive() {
+  constructor(index: number) {
+    this.index = index;
+  }
+
+  get isActive(): boolean {
     return this.name !== '';
   }
 
-  get entity() {
+  get entity(): ClientEdict | null {
     return CL.state.clientEntities.getEntity(this.index + 1);
   }
 }
@@ -140,36 +162,34 @@ export class ScoreSlot {
 class ClientRuntimeState {
   clientEntities = new ClientEntities();
   clientMessages = new ClientMessages();
-  /** @type {Record<string,{fields: string[], bitsReader: 'readByte' | 'readShort' | 'readLong'}>} */
-  clientEntityFields = {};
-  /** @type {Record<string, import('../../shared/GameInterfaces').SerializableType>} */
-  clientdata = {};
+  clientEntityFields: Record<string, ClientEntityFieldDefinition> = {};
+  clientdata: Record<string, ClientSerializableType> = {};
   movemessages = 0;
   cmd = new Protocol.UserCmd();
   lastcmd = new Protocol.UserCmd();
 
   // --- prediction state ---
-  /** @type {number} incrementing move sequence counter (wraps at 256) */
+  /** incrementing move sequence counter (wraps at 256) */
   moveSequence = 0;
-  /** @type {number} last move sequence acknowledged by the server */
+  /** last move sequence acknowledged by the server */
   acknowledgedMoveSequence = 0;
-  /** @type {{cmd: Protocol.UserCmd, msec: number}[]} ring buffer of commands indexed by (moveSequence & CMD_BUFFER_MASK) */
+  /** ring buffer of commands indexed by (moveSequence & CMD_BUFFER_MASK) */
   cmdBuffer = ClientRuntimeState.#createCmdBuffer();
-  /** @type {boolean} true when prediction ran this frame (prevents emit from overwriting) */
+  /** true when prediction ran this frame (prevents emit from overwriting) */
   predicted = false;
 
-  /** @type {number} server-acknowledged pmFlags (PMF bitmask) */
+  /** server-acknowledged pmFlags (PMF bitmask) */
   ackedPmFlags = 0;
-  /** @type {number} server-acknowledged pmTime (timing counter) */
+  /** server-acknowledged pmTime (timing counter) */
   ackedPmTime = 0;
-  /** @type {number} server-acknowledged old button state */
+  /** server-acknowledged old button state */
   ackedPmOldButtons = 0;
 
   stats = createLegacyStatsArray();
   items = 0;
   item_gettime = new Array(32).fill(0.0);
-  faceanimtime = 0.0;
   cshifts = Array.from({ length: 8 }, () => [0.0, 0.0, 0.0, 0.0]);
+  faceanimtime = 0.0;
   viewangles = new Vector();
   punchangle = new Vector();
   idealpitch = 0.0;
@@ -181,68 +201,68 @@ class ClientRuntimeState {
   time = 0.0;
   latency = 0.0;
   last_received_message = 0.0;
-  /** @type {number} effectively the player’s edict number */
+  /** effectively the player’s edict number */
   viewentity = 0;
-  /** @type {ClientEdict|null} view model reference (TODO: rename to viewmodel) */
-  viewent = null;
+  /** view model reference (TODO: rename to viewmodel) */
+  viewent: ClientEdict | null = null;
   cdtrack = 0;
   looptrack = 0;
-  chatlog = [];
-  model_precache = [];
-  sound_precache = [];
-  levelname = null;
+  chatlog: ClientChatMessage[] = [];
+  model_precache: BaseModel[] = [];
+  sound_precache: SFX[] = [];
+  levelname: string | null = null;
   gametype = 0;
   onground = false;
   maxclients = 1;
-  /** @type {ScoreSlot[]} */
-  scores = [];
-  /** @type {BrushModel|null} */
-  worldmodel = null;
+  scores: ScoreSlot[] = [];
+  worldmodel: BrushModel | null = null;
   viewheight = 0;
   inwater = false;
   nodrift = false;
-  /** @type {import('../../shared/GameInterfaces').ClientGameInterface|null} */
-  gameAPI = null;
+  gameAPI: ClientGameInterface | null = null;
+  paused = false;
+  /** event bus solely for engine-game communication */
+  eventBus = new EventBus('client-game');
+  #proxyEventListeners: Array<() => void> = [];
+  /** stores client-game state waiting for signon 4 */
+  loadClientData: ClientLoadData | null = null;
+  #clientGameEvents: readonly string[];
 
-  /** @returns {{cmd: Protocol.UserCmd, msec: number}[]} fresh command ring buffer */
-  static #createCmdBuffer() {
+  /**
+   * @returns Fresh command ring buffer.
+   */
+  static #createCmdBuffer(): ClientMoveCommand[] {
     return new Array(Protocol.CMD_BUFFER_SIZE).fill(null).map(() => ({
       cmd: new Protocol.UserCmd(),
       msec: 0,
     }));
   }
-  paused = false;
-  /** event bus solely for engine-game communication */
-  eventBus = new EventBus('client-game');
-  /** @type {Function[]} */
-  #proxyEventListeners = [];
-  /** stores client-game state waiting for signon 4 */
-  loadClientData = null;
-  /** @type {string[]} */
-  #clientGameEvents;
 
-  constructor({ clientGameEvents }) {
+  constructor({ clientGameEvents }: { clientGameEvents: readonly string[] }) {
     this.#clientGameEvents = clientGameEvents;
   }
 
-  get playernum() {
+  get playernum(): number {
     return this.viewentity - 1;
   }
 
+  /**
+   * @returns Current player state for prediction.
+   */
   get playerstate() {
     return this.clientMessages.playerstates[this.playernum];
   }
 
-  get playerentity() {
+  get playerentity(): ClientEdict | null {
     return this.clientEntities.getEntity(this.viewentity);
   }
 
-  get velocity() {
+  get velocity(): Vector {
     const entity = this.playerentity;
     return entity ? entity.velocity : Vector.origin;
   }
 
-  clear() {
+  clear(): void {
     this.clientMessages.clear();
     this.clientEntities.clear();
     this.movemessages = 0;
@@ -258,6 +278,9 @@ class ClientRuntimeState {
     this.stats = createLegacyStatsArray();
     this.items = 0;
     this.item_gettime.fill(0.0);
+    for (const cshift of this.cshifts) {
+      cshift.fill(0.0);
+    }
     this.faceanimtime = 0.0;
     this.viewangles = new Vector();
     this.punchangle = new Vector();
@@ -286,9 +309,6 @@ class ClientRuntimeState {
     this.inwater = false;
     this.nodrift = false;
     this.paused = false;
-    for (const cshift of this.cshifts) {
-      cshift.fill(0.0);
-    }
     for (const key of Object.keys(this.clientEntityFields)) {
       delete this.clientEntityFields[key];
     }
@@ -300,7 +320,7 @@ class ClientRuntimeState {
     this.#configureProxyEvents();
   }
 
-  #configureProxyEvents() {
+  #configureProxyEvents(): void {
     for (const event of this.#clientGameEvents) {
       this.#proxyEventListeners.push(eventBus.subscribe(event, (...args) => this.eventBus.publish(event, ...args)));
     }
diff --git a/source/engine/client/Draw.mjs b/source/engine/client/Draw.mjs
index ee87273f..9864b2af 100644
--- a/source/engine/client/Draw.mjs
+++ b/source/engine/client/Draw.mjs
@@ -1,7 +1,7 @@
 import Vector from '../../shared/Vector.ts';
 import { MissingResourceError } from '../common/Errors.ts';
 
-import VID from './VID.mjs';
+import VID from './VID.ts';
 import W, { WadFileInterface, WadLumpTexture } from '../common/W.ts';
 
 import { eventBus, registry } from '../registry.mjs';
diff --git a/source/engine/client/GL.mjs b/source/engine/client/GL.mjs
index 44ae10ef..5034fcb5 100644
--- a/source/engine/client/GL.mjs
+++ b/source/engine/client/GL.mjs
@@ -3,7 +3,7 @@ import Cvar from '../common/Cvar.ts';
 import { MissingResourceError } from '../common/Errors.ts';
 import { WadLumpTexture } from '../common/W.ts';
 import { eventBus, registry } from '../registry.mjs';
-import VID from './VID.mjs';
+import VID from './VID.ts';
 
 /** @type {Record<string, string>|null} */
 let shaderSources = /** @type {Record<string, string>|null} */ (null);
diff --git a/source/engine/client/IN.mjs b/source/engine/client/IN.mjs
deleted file mode 100644
index a24a4128..00000000
--- a/source/engine/client/IN.mjs
+++ /dev/null
@@ -1,139 +0,0 @@
-import { K } from '../../shared/Keys.ts';
-import Cvar from '../common/Cvar.ts';
-import { eventBus, registry } from '../registry.mjs';
-import { kbutton, kbuttons } from './ClientInput.mjs';
-import VID from './VID.mjs';
-
-let { CL, COM, Con, Host, Key, V } = registry;
-
-eventBus.subscribe('registry.frozen', () => {
-  CL = registry.CL;
-  COM = registry.COM;
-  Con = registry.Con;
-  Host = registry.Host;
-  Key = registry.Key;
-  V = registry.V;
-});
-
-const IN = {};
-
-export default IN;
-
-IN.mouse_x = 0.0;
-IN.mouse_y = 0.0;
-IN.old_mouse_x = 0.0;
-IN.old_mouse_y = 0.0;
-
-IN.StartupMouse = function() {
-  IN.m_filter = new Cvar('m_filter', '1', Cvar.FLAG.ARCHIVE);
-  if (COM.CheckParm('-nomouse')) {
-    return;
-  }
-  if (VID.mainwindow.requestPointerLock) {
-    IN.movementX = 'movementX';
-    IN.movementY = 'movementY';
-    IN.pointerLockElement = 'pointerLockElement';
-    IN.requestPointerLock = 'requestPointerLock';
-    IN.pointerlockchange = 'onpointerlockchange';
-  } else {
-    Con.PrintWarning('IN.StartupMouse: Pointer Lock API (requestPointerLock) not available, cannot make use of mouse movement\n');
-    return;
-  }
-  VID.mainwindow.onclick = IN.onclick;
-  document.onmousemove = IN.onmousemove;
-  document[IN.pointerlockchange] = IN.onpointerlockchange;
-  IN.mouse_avail = true;
-};
-
-IN.Init = function() {
-  IN.StartupMouse();
-};
-
-IN.Shutdown = function() {
-  if (IN.mouse_avail === true) {
-    VID.mainwindow.onclick = null;
-    document.onmousemove = null;
-    document[IN.pointerlockchange] = null;
-  }
-};
-
-IN.MouseMove = function() {
-  if (IN.mouse_avail !== true) {
-    return;
-  }
-
-  let mouse_x; let mouse_y;
-  if (IN.m_filter.value !== 0) {
-    mouse_x = (IN.mouse_x + IN.old_mouse_x) * 0.5;
-    mouse_y = (IN.mouse_y + IN.old_mouse_y) * 0.5;
-  } else {
-    mouse_x = IN.mouse_x;
-    mouse_y = IN.mouse_y;
-  }
-  IN.old_mouse_x = IN.mouse_x;
-  IN.old_mouse_y = IN.mouse_y;
-  mouse_x *= CL.sensitivity.value;
-  mouse_y *= CL.sensitivity.value;
-
-  const strafe = kbuttons[kbutton.strafe].state & 1;
-  const mlook = kbuttons[kbutton.mlook].state & 1;
-  const angles = CL.state.viewangles;
-
-  if ((strafe !== 0) || ((CL.lookstrafe.value !== 0) && (mlook !== 0))) {
-    CL.state.cmd.sidemove += CL.m_side.value * mouse_x;
-  } else {
-    angles[1] -= CL.m_yaw.value * mouse_x;
-  }
-
-  if (mlook !== 0) {
-    V.StopPitchDrift();
-  }
-
-  if ((mlook !== 0) && (strafe === 0)) {
-    angles[0] += CL.m_pitch.value * mouse_y;
-    if (angles[0] > 80.0) {
-      angles[0] = 80.0;
-    } else if (angles[0] < -70.0) {
-      angles[0] = -70.0;
-    }
-  } else {
-    if ((strafe !== 0) && (Host.noclip_anglehack === true)) {
-      CL.state.cmd.upmove -= CL.m_forward.value * mouse_y;
-    } else {
-      CL.state.cmd.forwardmove -= CL.m_forward.value * mouse_y;
-    }
-  }
-
-  IN.mouse_x = IN.mouse_y = 0;
-};
-
-IN.Move = function() {
-  // do not interpret input during demo playback
-  if (CL.cls.demoplayback) {
-    return;
-  }
-
-  IN.MouseMove();
-};
-
-IN.onclick = function() {
-  if (document[IN.pointerLockElement] !== this) {
-    this[IN.requestPointerLock]();
-  }
-};
-
-IN.onmousemove = function(e) {
-  if (document[IN.pointerLockElement] !== VID.mainwindow) {
-    return;
-  }
-  IN.mouse_x += e[IN.movementX];
-  IN.mouse_y += e[IN.movementY];
-};
-
-IN.onpointerlockchange = function() {
-  if (document[IN.pointerLockElement] === VID.mainwindow) {
-    return;
-  }
-  Key.Event(K.ESCAPE, true);
-  Key.Event(K.ESCAPE);
-};
diff --git a/source/engine/client/IN.ts b/source/engine/client/IN.ts
new file mode 100644
index 00000000..e13c9d6e
--- /dev/null
+++ b/source/engine/client/IN.ts
@@ -0,0 +1,133 @@
+import { K } from '../../shared/Keys.ts';
+import Cvar from '../common/Cvar.ts';
+import { eventBus, getClientRegistry } from '../registry.mjs';
+import { kbutton, kbuttons } from './ClientInput.ts';
+import VID from './VID.ts';
+
+let { CL, COM, Con, Host, Key, V } = getClientRegistry();
+
+eventBus.subscribe('registry.frozen', () => {
+  ({ CL, COM, Con, Host, Key, V } = getClientRegistry());
+});
+
+export default class IN {
+  static mouse_x = 0.0;
+  static mouse_y = 0.0;
+  static old_mouse_x = 0.0;
+  static old_mouse_y = 0.0;
+  static m_filter: Cvar;
+  static mouse_avail = false;
+
+  static StartupMouse(): void {
+    IN.m_filter = new Cvar('m_filter', '1', Cvar.FLAG.ARCHIVE);
+    if (COM.CheckParm('-nomouse')) {
+      return;
+    }
+    if (!VID.mainwindow.requestPointerLock) {
+      Con.PrintWarning('IN.StartupMouse: Pointer Lock API (requestPointerLock) not available, cannot make use of mouse movement\n');
+      return;
+    }
+
+    VID.mainwindow.addEventListener('click', IN.onclick);
+    document.addEventListener('mousemove', IN.onmousemove);
+    document.addEventListener('pointerlockchange', IN.onpointerlockchange);
+    IN.mouse_avail = true;
+  }
+
+  static Init(): void {
+    IN.StartupMouse();
+  }
+
+  static Shutdown(): void {
+    if (!IN.mouse_avail) {
+      return;
+    }
+
+    VID.mainwindow.removeEventListener('click', IN.onclick);
+    document.removeEventListener('mousemove', IN.onmousemove);
+    document.removeEventListener('pointerlockchange', IN.onpointerlockchange);
+  }
+
+  static MouseMove(): void {
+    if (!IN.mouse_avail) {
+      return;
+    }
+
+    let mouseX: number;
+    let mouseY: number;
+    if (IN.m_filter.value !== 0) {
+      mouseX = (IN.mouse_x + IN.old_mouse_x) * 0.5;
+      mouseY = (IN.mouse_y + IN.old_mouse_y) * 0.5;
+    } else {
+      mouseX = IN.mouse_x;
+      mouseY = IN.mouse_y;
+    }
+    IN.old_mouse_x = IN.mouse_x;
+    IN.old_mouse_y = IN.mouse_y;
+    mouseX *= CL.sensitivity.value;
+    mouseY *= CL.sensitivity.value;
+
+    const strafe = kbuttons[kbutton.strafe].state & 1;
+    const mlook = kbuttons[kbutton.mlook].state & 1;
+    const angles = CL.state.viewangles;
+
+    if (strafe !== 0 || (CL.lookstrafe.value !== 0 && mlook !== 0)) {
+      CL.state.cmd.sidemove += CL.m_side.value * mouseX;
+    } else {
+      angles[1] -= CL.m_yaw.value * mouseX;
+    }
+
+    if (mlook !== 0) {
+      V.StopPitchDrift();
+    }
+
+    if (mlook !== 0 && strafe === 0) {
+      angles[0] += CL.m_pitch.value * mouseY;
+      if (angles[0] > 80.0) {
+        angles[0] = 80.0;
+      } else if (angles[0] < -70.0) {
+        angles[0] = -70.0;
+      }
+    } else if (strafe !== 0 && Host.noclip_anglehack === true) {
+      CL.state.cmd.upmove -= CL.m_forward.value * mouseY;
+    } else {
+      CL.state.cmd.forwardmove -= CL.m_forward.value * mouseY;
+    }
+
+    IN.mouse_x = 0;
+    IN.mouse_y = 0;
+  }
+
+  static Move(): void {
+    // do not interpret input during demo playback
+    if (CL.cls.demoplayback) {
+      return;
+    }
+
+    IN.MouseMove();
+  }
+
+  static onclick(): void {
+    if (document.pointerLockElement !== VID.mainwindow) {
+      void VID.mainwindow.requestPointerLock();
+    }
+  }
+
+  static onmousemove(event: MouseEvent): void {
+    if (document.pointerLockElement !== VID.mainwindow) {
+      return;
+    }
+
+    IN.mouse_x += event.movementX;
+    IN.mouse_y += event.movementY;
+  }
+
+  static onpointerlockchange(): void {
+    if (document.pointerLockElement === VID.mainwindow) {
+      return;
+    }
+
+    Key.Event(K.ESCAPE, true);
+    Key.Event(K.ESCAPE);
+  }
+}
diff --git a/source/engine/client/LegacyServerCommands.mjs b/source/engine/client/LegacyServerCommands.mjs
index 75037c22..c1248f97 100644
--- a/source/engine/client/LegacyServerCommands.mjs
+++ b/source/engine/client/LegacyServerCommands.mjs
@@ -2,7 +2,7 @@ import * as Protocol from '../network/Protocol.ts';
 import * as Def from '../common/Def.ts';
 import { HostError } from '../common/Errors.ts';
 import { eventBus, registry } from '../registry.mjs';
-import { ScoreSlot } from './ClientState.mjs';
+import { ScoreSlot } from './ClientState.ts';
 import Vector from '../../shared/Vector.ts';
 import {
   handleNop,
@@ -255,7 +255,7 @@ function handleLegacyServerData() {
     CL.state.sound_precache = sounds;
 
     CL.connection.processingServerDataState = 2;
-    CL.state.worldmodel = CL.state.model_precache[1];
+    CL.state.worldmodel = /** @type {import('../common/Mod.ts').BrushModel} */ (CL.state.model_precache[1]);
     CL.pmove.setWorldmodel(CL.state.worldmodel);
 
     const ent = CL.state.clientEntities.getEntity(0);
diff --git a/source/engine/client/Menu.mjs b/source/engine/client/Menu.mjs
index 39f00458..6806286d 100644
--- a/source/engine/client/Menu.mjs
+++ b/source/engine/client/Menu.mjs
@@ -3,10 +3,10 @@ import Cmd from '../common/Cmd.ts';
 import Cvar from '../common/Cvar.ts';
 import { clientConnectionState } from '../common/Def.ts';
 import { eventBus, registry } from '../registry.mjs';
-import ClientLifecycle from './ClientLifecycle.mjs';
+import ClientLifecycle from './ClientLifecycle.ts';
 import { GLTexture } from './GL.mjs';
-import MultiplayerMainMenu from './menu/Multiplayer.mjs';
-import VID from './VID.mjs';
+import MultiplayerMainMenu from './menu/Multiplayer.ts';
+import VID from './VID.ts';
 
 let { CL, COM, Con, Draw, Host, Key, S, SCR, SV, V } = registry;
 
@@ -231,7 +231,7 @@ M.SinglePlayer_Key = function (k) {
       switch (M.singleplayer_cursor) {
         case 0:
           if (SV.server.active) {
-            Cmd.ExecuteString('disconnect');
+            void Cmd.ExecuteString('disconnect');
           }
           Key.dest.value = Key.dest.game;
           ClientLifecycle.startGame.startSingleplayerGame();
diff --git a/source/engine/client/R.mjs b/source/engine/client/R.mjs
index 4acf96a9..feb8c671 100644
--- a/source/engine/client/R.mjs
+++ b/source/engine/client/R.mjs
@@ -4,9 +4,9 @@ import Cmd from '../common/Cmd.ts';
 import * as Def from '../common/Def.ts';
 
 import { eventBus, registry } from '../registry.mjs';
-import Chase from './Chase.mjs';
+import Chase from './Chase.ts';
 import W from '../common/W.ts';
-import VID from './VID.mjs';
+import VID from './VID.ts';
 import GL, { ATTRIB_LOCATIONS, GLTexture } from './GL.mjs';
 import { content, effect, gameCapabilities } from '../../shared/Defs.ts';
 import { modelRendererRegistry } from './renderer/ModelRendererRegistry.mjs';
diff --git a/source/engine/client/SCR.mjs b/source/engine/client/SCR.mjs
index bbbfc261..f846c2a8 100644
--- a/source/engine/client/SCR.mjs
+++ b/source/engine/client/SCR.mjs
@@ -6,7 +6,7 @@ import Cvar from '../common/Cvar.ts';
 import { clientConnectionState } from '../common/Def.ts';
 import { eventBus, registry } from '../registry.mjs';
 import GL from './GL.mjs';
-import VID from './VID.mjs';
+import VID from './VID.ts';
 import PostProcess from './renderer/PostProcess.mjs';
 
 let { CL, Con, Draw, Host, Key, M, R, S, Sbar, V } = registry;
diff --git a/source/engine/client/Sbar.mjs b/source/engine/client/Sbar.mjs
index f6edb24a..f18ed8e3 100644
--- a/source/engine/client/Sbar.mjs
+++ b/source/engine/client/Sbar.mjs
@@ -2,7 +2,7 @@
 
 import Cmd from '../common/Cmd.ts';
 import { eventBus, registry } from '../registry.mjs';
-import VID from './VID.mjs';
+import VID from './VID.ts';
 import * as Def from '../common/Def.ts';
 import Cvar from '../common/Cvar.ts';
 
diff --git a/source/engine/client/Sys.mjs b/source/engine/client/Sys.mjs
deleted file mode 100644
index b90100f6..00000000
--- a/source/engine/client/Sys.mjs
+++ /dev/null
@@ -1,295 +0,0 @@
-import { K } from '../../shared/Keys.ts';
-import Q from '../../shared/Q.ts';
-import { eventBus, registry } from '../registry.mjs';
-import Tools from './Tools.mjs';
-import WorkerManager from '../common/WorkerManager.ts';
-import workerFactories from '../common/WorkerFactories.ts';
-
-let { COM, Host, Key } = registry;
-
-eventBus.subscribe('registry.frozen', () => {
-  COM = registry.COM;
-  Host = registry.Host;
-  Key = registry.Key;
-});
-
-eventBus.subscribe('host.crash', (error) => {
-  console.error(error);
-  document.getElementById('error').textContent = (error.name ?? error.constructor.name) + ': ' + error.message;
-  COM.Shutdown(); // abort all pending IO operations
-});
-
-/**
- * @param {KeyboardEvent} event keyboard event
- * @returns {number|null} key code or null if not recognized
- */
-function getModernKey(event) {
-  // Physical key mappings - maintain WASD regardless of layout
-  const physicalKeys = {
-    'Space': K.SPACE,
-    'ShiftLeft': K.SHIFT,
-    'ShiftRight': K.SHIFT,
-    'ControlLeft': K.CTRL,
-    'ControlRight': K.CTRL,
-    'AltLeft': K.ALT,
-    'AltRight': K.ALT,
-    'ArrowUp': K.UPARROW,
-    'ArrowDown': K.DOWNARROW,
-    'ArrowLeft': K.LEFTARROW,
-    'ArrowRight': K.RIGHTARROW,
-
-    'F1': K.F1,
-    'F2': K.F2,
-    'F3': K.F3,
-    'F4': K.F4,
-    'F5': K.F5,
-    'F6': K.F6,
-    'F7': K.F7,
-    'F8': K.F8,
-    'F9': K.F9,
-    'F10': K.F10,
-    'F11': K.F11,
-    'F12': K.F12,
-  };
-
-  // Logical key mappings - use actual key value
-  const logicalKeys = {
-    'Enter': K.ENTER,
-    'Backspace': K.BACKSPACE,
-    'Tab': K.TAB,
-    'Escape': K.ESCAPE,
-    'Pause': K.PAUSE,
-    'PageUp': K.PGUP,
-    'PageDown': K.PGDN,
-    'End': K.END,
-    'Home': K.HOME,
-    'Insert': K.INS,
-    'Delete': K.DEL,
-  };
-
-  // Check physical mapping first for game controls
-  if (event.code && physicalKeys[event.code]) {
-    return physicalKeys[event.code];
-  }
-
-  // Check logical mapping for special keys
-  if (logicalKeys[event.key]) {
-    return logicalKeys[event.key];
-  }
-
-  // Handle printable characters (for console input)
-  if (event.key && event.key.length === 1) {
-    const char = event.key.toLowerCase();
-    return char.charCodeAt(0);
-  }
-
-  return null;
-};
-
-const eventHandlers = {
-  oncontextmenu(e) {
-    e.preventDefault();
-  },
-
-  onfocus() {
-    for (let i = 0; i < 256; i++) {
-      Key.Event(i);
-      Key.down[i] = false;
-    }
-  },
-
-  onkeydown(e) {
-    // Try modern key mapping first
-    const key = getModernKey(e);
-
-    if (key === null) {
-      return;
-    }
-
-    Key.Event(key, true);
-    e.preventDefault();
-  },
-
-  onkeyup(e) {
-    // Try modern key mapping first
-    const key = getModernKey(e);
-
-    if (key === null) {
-      return;
-    }
-
-    Key.Event(key);
-    e.preventDefault();
-  },
-
-  onmousedown(e) {
-    let key;
-    switch (e.which) {
-      case 1:
-        key = K.MOUSE1;
-        break;
-      case 2:
-        key = K.MOUSE3;
-        break;
-      case 3:
-        key = K.MOUSE2;
-        break;
-      default:
-        return;
-    }
-    Key.Event(key, true);
-    e.preventDefault();
-  },
-
-  onmouseup(e) {
-    let key;
-    switch (e.which) {
-      case 1:
-        key = K.MOUSE1;
-        break;
-      case 2:
-        key = K.MOUSE3;
-        break;
-      case 3:
-        key = K.MOUSE2;
-        break;
-      default:
-        return;
-    }
-    Key.Event(key);
-    e.preventDefault();
-  },
-
-  onmousewheel(e) {
-    const key = e.wheelDeltaY > 0 ? K.MWHEELUP : K.MWHEELDOWN;
-    Key.Event(key, true);
-    Key.Event(key);
-    e.preventDefault();
-  },
-
-  onwheel(e) {
-    const key = e.deltaY < 0 ? K.MWHEELUP : K.MWHEELDOWN;
-    Key.Event(key, true);
-    Key.Event(key);
-    e.preventDefault();
-  },
-};
-
-export default class Sys {
-  static #oldtime = 0;
-  static #isRunning = false;
-
-  static async Init() {
-    // @ts-ignore
-    window.registry = registry;
-
-    const location = document.location;
-    const argv = [location.hostname];
-    if (location.search && location.search.length > 1) {
-      const qs = location.search.substring(1);
-      for (const param of qs.split('&')) {
-        if (param.trim() === '') {
-          continue;
-        }
-        const [key, value] = param.split('=');
-        const decodedKey = decodeURIComponent(key);
-        const decodedValue = value ? decodeURIComponent(value) : '';
-        if (decodedValue === '' || decodedValue.toLowerCase() === 'true') {
-          argv.push('-' + decodedKey);
-        } else if (decodedKey === 'game') { // HACK: game parameter
-          argv.push('-' + decodedKey, decodedValue);
-        } else {
-          argv.push('+' + decodedKey, decodedValue);
-        }
-      }
-    }
-
-    COM.InitArgv(argv);
-
-    const $console = document.getElementById('console');
-
-    // make sure we print from the console to the HTML console
-    eventBus.subscribe('console.print-line', (line) => {
-      const $li = document.createElement('li');
-      $li.textContent = line;
-      $console.appendChild($li);
-      console.info(line);
-
-      // limit the raw console to 40 entries
-      if ($console.childNodes.length > 40) {
-        $console.removeChild($console.childNodes.item(0));
-      }
-    });
-
-    Sys.#oldtime = Date.now() * 0.001;
-
-    document.getElementById('progress').style.display = 'none';
-
-    // Start worker manager
-    WorkerManager.Init(workerFactories);
-
-    Sys.Print('Host.Init: Initializing game…\n');
-
-    await Host.Init();
-
-    for (const event of Object.keys(eventHandlers)) {
-      window.addEventListener(event.substring(2), eventHandlers[event]);
-    }
-
-    await Tools.Init();
-
-    Sys.#isRunning = true;
-
-    while (Sys.#isRunning) {
-      const startTime = Date.now();
-
-      await Host.Frame();
-
-      if (Host.refreshrate.value === 0) { // uncapped framerate
-        await Q.yield();
-        continue;
-      }
-
-      await Q.sleep(Math.max(0, 1000.0 / Math.min(300, Math.max(60, Host.refreshrate.value)) - (Date.now() - startTime)));
-    }
-  }
-
-  static Quit() {
-    Sys.#isRunning = false;
-
-    for (const event of Object.keys(eventHandlers)) {
-      window.removeEventListener(event.substring(2), eventHandlers[event]);
-    }
-
-    Tools.Shutdown();
-    Host.Shutdown();
-
-    document.body.style.cursor = 'auto';
-
-    if (COM.registered.value !== 0) {
-      // document.getElementById('end2').style.display = 'inline';
-      // parent.unloadContainer();
-    } else {
-      // document.getElementById('end1').style.display = 'inline';
-      // parent.unloadContainer();
-    }
-
-    // @ts-ignore
-    delete window.registry;
-
-    Sys.Print('Sys.Quit: finished, thank you for playing!\n');
-  }
-
-  static Print(/** @type {string} */ text) {
-    // by this time we feed the Sys.Print into the event bus
-    eventBus.publish('console.print-line', text);
-  }
-
-  static FloatTime() {
-    return Date.now() * 0.001 - Sys.#oldtime;
-  }
-
-  static FloatMilliTime() {
-    return performance.now();
-  }
-};
diff --git a/source/engine/client/Sys.ts b/source/engine/client/Sys.ts
new file mode 100644
index 00000000..626f9fa6
--- /dev/null
+++ b/source/engine/client/Sys.ts
@@ -0,0 +1,374 @@
+import { K } from '../../shared/Keys.ts';
+import Q from '../../shared/Q.ts';
+import { eventBus, getClientRegistry, registry } from '../registry.mjs';
+import Tools from './Tools.ts';
+import WorkerManager from '../common/WorkerManager.ts';
+import workerFactories from '../common/WorkerFactories.ts';
+
+interface LegacyWheelEvent extends Event {
+  readonly wheelDeltaY: number;
+}
+
+let { COM, Host, Key } = getClientRegistry();
+
+eventBus.subscribe('registry.frozen', () => {
+  ({ COM, Host, Key } = getClientRegistry());
+});
+
+eventBus.subscribe('host.crash', (error: unknown) => {
+  console.error(error);
+
+  const errorElement = document.getElementById('error');
+  if (errorElement !== null) {
+    errorElement.textContent = `${getErrorName(error)}: ${getErrorMessage(error)}`;
+  }
+
+  // abort all pending IO operations
+  COM.Shutdown();
+});
+
+/**
+ * Returns a stable display name for a thrown value.
+ * @returns Stable error name.
+ */
+function getErrorName(error: unknown): string {
+  if (error instanceof Error) {
+    return error.name;
+  }
+
+  if (typeof error === 'object' && error !== null && 'constructor' in error) {
+    const constructorValue = error.constructor;
+    if (typeof constructorValue === 'function' && constructorValue.name.length > 0) {
+      return constructorValue.name;
+    }
+  }
+
+  return typeof error;
+}
+
+/**
+ * Returns a readable message for a thrown value.
+ * @returns Readable error message.
+ */
+function getErrorMessage(error: unknown): string {
+  if (error instanceof Error) {
+    return error.message;
+  }
+
+  if (typeof error === 'object' && error !== null && 'message' in error) {
+    const message = error.message;
+    if (typeof message === 'string') {
+      return message;
+    }
+  }
+
+  return String(error);
+}
+
+/**
+ * Resolves a modern browser keycode to the engine key enum.
+ * @returns Engine key code or null when unmapped.
+ */
+function getModernKey(event: KeyboardEvent): number | null {
+  // Physical key mappings - maintain WASD regardless of layout
+  const physicalKeys: Record<string, number> = {
+    Space: K.SPACE,
+    ShiftLeft: K.SHIFT,
+    ShiftRight: K.SHIFT,
+    ControlLeft: K.CTRL,
+    ControlRight: K.CTRL,
+    AltLeft: K.ALT,
+    AltRight: K.ALT,
+    ArrowUp: K.UPARROW,
+    ArrowDown: K.DOWNARROW,
+    ArrowLeft: K.LEFTARROW,
+    ArrowRight: K.RIGHTARROW,
+    F1: K.F1,
+    F2: K.F2,
+    F3: K.F3,
+    F4: K.F4,
+    F5: K.F5,
+    F6: K.F6,
+    F7: K.F7,
+    F8: K.F8,
+    F9: K.F9,
+    F10: K.F10,
+    F11: K.F11,
+    F12: K.F12,
+  };
+  // Logical key mappings - use actual key value
+  const logicalKeys: Record<string, number> = {
+    Enter: K.ENTER,
+    Backspace: K.BACKSPACE,
+    Tab: K.TAB,
+    Escape: K.ESCAPE,
+    Pause: K.PAUSE,
+    PageUp: K.PGUP,
+    PageDown: K.PGDN,
+    End: K.END,
+    Home: K.HOME,
+    Insert: K.INS,
+    Delete: K.DEL,
+  };
+
+  // Check physical mapping first for game controls
+  if (event.code.length > 0 && physicalKeys[event.code] !== undefined) {
+    return physicalKeys[event.code];
+  }
+
+  // Check logical mapping for special keys
+  if (logicalKeys[event.key] !== undefined) {
+    return logicalKeys[event.key];
+  }
+
+  // Handle printable characters (for console input)
+  if (event.key.length === 1) {
+    return event.key.toLowerCase().charCodeAt(0);
+  }
+
+  return null;
+}
+
+/** Prevents the browser context menu from stealing mouse input. */
+function handleContextMenu(event: MouseEvent): void {
+  event.preventDefault();
+}
+
+/** Clears pressed-key state when the window regains focus. */
+function handleFocus(): void {
+  for (let index = 0; index < 256; index++) {
+    Key.Event(index);
+    Key.down[index] = false;
+  }
+}
+
+/** Dispatches key-down events into the engine input system. */
+function handleKeyDown(event: KeyboardEvent): void {
+  const key = getModernKey(event);
+  if (key === null) {
+    return;
+  }
+
+  Key.Event(key, true);
+  event.preventDefault();
+}
+
+/** Dispatches key-up events into the engine input system. */
+function handleKeyUp(event: KeyboardEvent): void {
+  const key = getModernKey(event);
+  if (key === null) {
+    return;
+  }
+
+  Key.Event(key);
+  event.preventDefault();
+}
+
+/**
+ * Maps browser mouse button indices to engine button constants.
+ * @returns Engine mouse key code or null when unmapped.
+ */
+function getMouseButtonKey(button: number): number | null {
+  switch (button) {
+    case 1:
+      return K.MOUSE1;
+    case 2:
+      return K.MOUSE3;
+    case 3:
+      return K.MOUSE2;
+    default:
+      return null;
+  }
+}
+
+/** Dispatches mouse-button presses into the engine input system. */
+function handleMouseDown(event: MouseEvent): void {
+  const key = getMouseButtonKey(event.which);
+  if (key === null) {
+    return;
+  }
+
+  Key.Event(key, true);
+  event.preventDefault();
+}
+
+/** Dispatches mouse-button releases into the engine input system. */
+function handleMouseUp(event: MouseEvent): void {
+  const key = getMouseButtonKey(event.which);
+  if (key === null) {
+    return;
+  }
+
+  Key.Event(key);
+  event.preventDefault();
+}
+
+/** Handles the legacy mousewheel event used by older browsers. */
+function handleLegacyMouseWheel(event: LegacyWheelEvent): void {
+  const key = event.wheelDeltaY > 0 ? K.MWHEELUP : K.MWHEELDOWN;
+  Key.Event(key, true);
+  Key.Event(key);
+  event.preventDefault();
+}
+
+/** Handles standard wheel events for mouse wheel bindings. */
+function handleWheel(event: WheelEvent): void {
+  const key = event.deltaY < 0 ? K.MWHEELUP : K.MWHEELDOWN;
+  Key.Event(key, true);
+  Key.Event(key);
+  event.preventDefault();
+}
+
+/** Registers all browser event listeners required by the client runtime. */
+function registerWindowListeners(): void {
+  window.addEventListener('contextmenu', handleContextMenu);
+  window.addEventListener('focus', handleFocus);
+  window.addEventListener('keydown', handleKeyDown);
+  window.addEventListener('keyup', handleKeyUp);
+  window.addEventListener('mousedown', handleMouseDown);
+  window.addEventListener('mouseup', handleMouseUp);
+  window.addEventListener('wheel', handleWheel, { passive: false });
+  window.addEventListener('mousewheel', handleLegacyMouseWheel as EventListener, { passive: false });
+}
+
+/** Unregisters all browser event listeners installed during startup. */
+function unregisterWindowListeners(): void {
+  window.removeEventListener('contextmenu', handleContextMenu);
+  window.removeEventListener('focus', handleFocus);
+  window.removeEventListener('keydown', handleKeyDown);
+  window.removeEventListener('keyup', handleKeyUp);
+  window.removeEventListener('mousedown', handleMouseDown);
+  window.removeEventListener('mouseup', handleMouseUp);
+  window.removeEventListener('wheel', handleWheel);
+  window.removeEventListener('mousewheel', handleLegacyMouseWheel as EventListener);
+}
+
+/**
+ * Looks up an element that must exist for browser startup to continue.
+ * @returns Matching DOM element.
+ */
+function getRequiredElement(id: string): HTMLElement {
+  const element = document.getElementById(id);
+  if (element === null) {
+    throw new Error(`Missing required element #${id}`);
+  }
+  return element;
+}
+
+export default class Sys {
+  static #oldtime = 0;
+  static #isRunning = false;
+
+  static async Init(): Promise<void> {
+    (window as Window & { registry?: typeof registry }).registry = registry;
+
+    const location = document.location;
+    const argv = [location.hostname];
+    if (location.search.length > 1) {
+      const queryString = location.search.substring(1);
+      for (const param of queryString.split('&')) {
+        if (param.trim() === '') {
+          continue;
+        }
+
+        const [key, value] = param.split('=');
+        const decodedKey = decodeURIComponent(key);
+        const decodedValue = value ? decodeURIComponent(value) : '';
+        if (decodedValue === '' || decodedValue.toLowerCase() === 'true') {
+          argv.push(`-${decodedKey}`);
+        } else if (decodedKey === 'game') { // HACK: game parameter
+          argv.push(`-${decodedKey}`, decodedValue);
+        } else {
+          argv.push(`+${decodedKey}`, decodedValue);
+        }
+      }
+    }
+
+    COM.InitArgv(argv);
+
+    const consoleElement = getRequiredElement('console');
+
+    // make sure we print from the console to the HTML console
+    eventBus.subscribe('console.print-line', (line: string) => {
+      const listItem = document.createElement('li');
+      listItem.textContent = line;
+      consoleElement.appendChild(listItem);
+      console.info(line);
+
+      // limit the raw console to 40 entries
+      if (consoleElement.childNodes.length > 40) {
+        consoleElement.removeChild(consoleElement.childNodes.item(0));
+      }
+    });
+
+    Sys.#oldtime = Date.now() * 0.001;
+
+    getRequiredElement('progress').style.display = 'none';
+
+  // Start worker manager
+    WorkerManager.Init(workerFactories);
+
+    Sys.Print('Host.Init: Initializing game…\n');
+
+    await Host.Init();
+
+    registerWindowListeners();
+
+    Tools.Init();
+
+    // eslint-disable-next-line require-atomic-updates
+    Sys.#isRunning = true;
+
+    while (Sys.#isRunning) {
+      const startTime = Date.now();
+
+      await Host.Frame();
+
+      const refreshRate = Host.refreshrate;
+      // uncapped framerate
+      if (refreshRate === null || refreshRate.value === 0) {
+        await Q.yield();
+        continue;
+      }
+
+      const targetFrameMs = 1000.0 / Math.min(300, Math.max(60, refreshRate.value));
+      await Q.sleep(Math.max(0, targetFrameMs - (Date.now() - startTime)));
+    }
+  }
+
+  static Quit(): void {
+    Sys.#isRunning = false;
+
+    unregisterWindowListeners();
+
+    Tools.Shutdown();
+    Host.Shutdown();
+
+    document.body.style.cursor = 'auto';
+
+    if (COM.registered?.value !== 0) {
+      // document.getElementById('end2').style.display = 'inline';
+      // parent.unloadContainer();
+    } else {
+      // document.getElementById('end1').style.display = 'inline';
+      // parent.unloadContainer();
+    }
+
+    delete (window as Window & { registry?: typeof registry }).registry;
+
+    Sys.Print('Sys.Quit: finished, thank you for playing!\n');
+  }
+
+  static Print(text: string): void {
+    // by this time we feed the Sys.Print into the event bus
+    eventBus.publish('console.print-line', text);
+  }
+
+  static FloatTime(): number {
+    return Date.now() * 0.001 - Sys.#oldtime;
+  }
+
+  static FloatMilliTime(): number {
+    return performance.now();
+  }
+}
diff --git a/source/engine/client/Tools.mjs b/source/engine/client/Tools.mjs
deleted file mode 100644
index 636dd5cc..00000000
--- a/source/engine/client/Tools.mjs
+++ /dev/null
@@ -1,117 +0,0 @@
-import Cmd, { ConsoleCommand } from '../common/Cmd.ts';
-import W, { WadFileInterface } from '../common/W.ts';
-import { eventBus, registry } from '../registry.mjs';
-
-let { Con } = registry;
-
-eventBus.subscribe('registry.frozen', () => {
-  Con = registry.Con;
-});
-
-class GfxTool {
-  constructor(filename) {
-    this.filename = filename;
-    /** @type {WadFileInterface} */
-    this.wad = null;
-  }
-
-  async load() {
-    this.wad = await W.LoadFile(this.filename);
-  }
-
-  printEntries() {
-    Con.Print(`Wad entries in ${this.filename} (${this.wad.constructor.name}):\n`);
-    for (const entry of this.wad.getLumpNames()) {
-      Con.Print(`${entry}\n`);
-    }
-  }
-
-  showEntry(entry) {
-    const win = window.open('about: blank', '_blank');
-    const $document = win.document;
-    const $img = $document.createElement('img');
-    $img.src = this.wad.getLumpMipmap(entry, 0).toDataURL();
-    $document.body.appendChild($img);
-    $document.title = `Image - ${entry} (${this.filename})`;
-  }
-
-  showEntries() {
-    const win = window.open('about: blank', '_blank');
-    const $document = win.document;
-
-    const $table = $document.createElement('table');
-    $table.style.width = '100%';
-
-    for (const entry of this.wad.getLumpNames()) {
-      const $tr = $document.createElement('tr');
-
-      const $tdName = $document.createElement('td');
-      $tdName.textContent = entry;
-      $tr.appendChild($tdName);
-
-      const $tdImage = $document.createElement('td');
-      try {
-        const $img = $document.createElement('img');
-        $img.src = this.wad.getLumpMipmap(entry, 0).toDataURL();
-        $tdImage.appendChild($img);
-      } catch (e) {
-        $tdImage.textContent = `Error loading image: ${e.message}`;
-      }
-      $tr.appendChild($tdImage);
-
-      $table.appendChild($tr);
-    }
-
-    $document.title = `Image Table - ${this.filename}`;
-    $document.body.appendChild($table);
-  }
-}
-
-class GfxToolCommand extends ConsoleCommand {
-  async run(wad, command = null) {
-    if (!wad) {
-      Con.Print('Usage: gfx <wadfile> [list|show-all|show]\n');
-      return;
-    }
-
-    const tool = new GfxTool(wad);
-
-    await tool.load();
-
-    switch (command) {
-      case 'list':
-        tool.printEntries();
-        break;
-
-      case 'show-all':
-          tool.showEntries();
-        break;
-
-      case 'show':
-        if (this.argv.length < 3) {
-          Con.Print('Usage: gfx <wadfile> show <entry>\n');
-          return;
-        }
-        try {
-          tool.showEntry(this.argv[3]);
-        } catch(e) {
-          Con.PrintError(`Error showing entries: ${e.message}\n`);
-        }
-        break;
-
-      default:
-        Con.Print(`Unknown command: ${command}\n`);
-        Con.Print('Usage: gfx <wadfile> [list|show-all|show]\n');
-        break;
-    }
-  }
-};
-
-export default class Tools {
-  static async Init() {
-    Cmd.AddCommand('gfx', GfxToolCommand);
-  }
-
-  static Shutdown() {
-  }
-};
diff --git a/source/engine/client/Tools.ts b/source/engine/client/Tools.ts
new file mode 100644
index 00000000..73fbba6b
--- /dev/null
+++ b/source/engine/client/Tools.ts
@@ -0,0 +1,167 @@
+import Cmd, { ConsoleCommand } from '../common/Cmd.ts';
+import W, { WadFileInterface } from '../common/W.ts';
+import { eventBus, getCommonRegistry } from '../registry.mjs';
+
+let { Con } = getCommonRegistry();
+
+eventBus.subscribe('registry.frozen', () => {
+  ({ Con } = getCommonRegistry());
+});
+
+/**
+ * Returns a readable message for an unknown error value.
+ * @returns Readable error message.
+ */
+function getErrorMessage(error: unknown): string {
+  if (error instanceof Error) {
+    return error.message;
+  }
+
+  return String(error);
+}
+
+/**
+ * Looks up a renderable lump texture and throws when the entry cannot be decoded.
+ * @returns Decoded lump texture.
+ */
+function getRequiredLumpTexture(wad: WadFileInterface, entry: string) {
+  const texture = wad.getLumpMipmap(entry, 0);
+  if (texture === null) {
+    throw new Error(`Could not decode wad entry ${entry}`);
+  }
+
+  return texture;
+}
+
+class GfxTool {
+  filename: string;
+  wad: WadFileInterface | null = null;
+
+  constructor(filename: string) {
+    this.filename = filename;
+  }
+
+  async load(): Promise<void> {
+    this.wad = await W.LoadFile(this.filename);
+  }
+
+  /**
+   * Returns the loaded wad file.
+   * @returns Loaded wad file.
+   */
+  getWad(): WadFileInterface {
+    if (this.wad === null) {
+      throw new Error(`Wad ${this.filename} was not loaded`);
+    }
+
+    return this.wad;
+  }
+
+  printEntries(): void {
+    const wad = this.getWad();
+    Con.Print(`Wad entries in ${this.filename} (${wad.constructor.name}):\n`);
+    for (const entry of wad.getLumpNames()) {
+      Con.Print(`${entry}\n`);
+    }
+  }
+
+  showEntry(entry: string): void {
+    const win = window.open('about:blank', '_blank');
+    if (win === null) {
+      throw new Error('Popup blocked while opening wad entry preview');
+    }
+
+    const wad = this.getWad();
+    const doc = win.document;
+    const image = doc.createElement('img');
+    image.src = getRequiredLumpTexture(wad, entry).toDataURL();
+    doc.body.appendChild(image);
+    doc.title = `Image - ${entry} (${this.filename})`;
+  }
+
+  showEntries(): void {
+    const win = window.open('about:blank', '_blank');
+    if (win === null) {
+      throw new Error('Popup blocked while opening wad browser');
+    }
+
+    const wad = this.getWad();
+    const doc = win.document;
+    const table = doc.createElement('table');
+    table.style.width = '100%';
+
+    for (const entry of wad.getLumpNames()) {
+      const row = doc.createElement('tr');
+
+      const nameCell = doc.createElement('td');
+      nameCell.textContent = entry;
+      row.appendChild(nameCell);
+
+      const imageCell = doc.createElement('td');
+      try {
+        const image = doc.createElement('img');
+        image.src = getRequiredLumpTexture(wad, entry).toDataURL();
+        imageCell.appendChild(image);
+      } catch (error: unknown) {
+        imageCell.textContent = `Error loading image: ${getErrorMessage(error)}`;
+      }
+      row.appendChild(imageCell);
+
+      table.appendChild(row);
+    }
+
+    doc.title = `Image Table - ${this.filename}`;
+    doc.body.appendChild(table);
+  }
+}
+
+class GfxToolCommand extends ConsoleCommand {
+  override async run(wad?: string, command?: string): Promise<void> {
+    if (wad === undefined) {
+      Con.Print('Usage: gfx <wadfile> [list|show-all|show]\n');
+      return;
+    }
+
+    const tool = new GfxTool(wad);
+
+    await tool.load();
+
+    switch (command) {
+      case 'list':
+        tool.printEntries();
+        break;
+
+      case 'show-all':
+        tool.showEntries();
+        break;
+
+      case 'show': {
+        const entry = this.argv[3];
+        if (entry === undefined) {
+          Con.Print('Usage: gfx <wadfile> show <entry>\n');
+          return;
+        }
+        try {
+          tool.showEntry(entry);
+        } catch (error: unknown) {
+          Con.PrintError(`Error showing entries: ${getErrorMessage(error)}\n`);
+        }
+        break;
+      }
+
+      default:
+        Con.Print(`Unknown command: ${command}\n`);
+        Con.Print('Usage: gfx <wadfile> [list|show-all|show]\n');
+        break;
+    }
+  }
+}
+
+export default class Tools {
+  static Init(): void {
+    Cmd.AddCommand('gfx', GfxToolCommand);
+  }
+
+  static Shutdown(): void {
+  }
+}
diff --git a/source/engine/client/V.mjs b/source/engine/client/V.mjs
index 3f2b84af..c09d43f3 100644
--- a/source/engine/client/V.mjs
+++ b/source/engine/client/V.mjs
@@ -5,7 +5,7 @@ import Cvar from '../common/Cvar.ts';
 import * as Def from '../common/Def.ts';
 import Q from '../../shared/Q.ts';
 import { eventBus, registry } from '../registry.mjs';
-import Chase from './Chase.mjs';
+import Chase from './Chase.ts';
 
 const V = {};
 
diff --git a/source/engine/client/VID.mjs b/source/engine/client/VID.ts
similarity index 59%
rename from source/engine/client/VID.mjs
rename to source/engine/client/VID.ts
index af99768e..20c23eda 100644
--- a/source/engine/client/VID.mjs
+++ b/source/engine/client/VID.ts
@@ -2,25 +2,21 @@ import Cmd, { ConsoleCommand } from '../common/Cmd.ts';
 import { eventBus } from '../registry.mjs';
 
 class FullscreenCommand extends ConsoleCommand {
-  async run() {
+  override async run(): Promise<void> {
     await VID.mainwindow.requestFullscreen();
   }
 }
 
 export default class VID {
-  /** @type {number} */
-  static width = null;
-  /** @type {number} */
-  static height = null;
-  /** @type {HTMLCanvasElement} */
-  static mainwindow = null;
-  /** @type {number} */
+  static width = 0;
+  static height = 0;
+  static mainwindow: HTMLCanvasElement;
   static pixelRatio = 1;
 
-  static Resize() {
-    const elem = document.documentElement;
-    const width = (elem.clientWidth <= 320) ? 320 : elem.clientWidth;
-    const height = (elem.clientHeight <= 200) ? 200 : elem.clientHeight;
+  static Resize(): void {
+    const root = document.documentElement;
+    const width = root.clientWidth <= 320 ? 320 : root.clientWidth;
+    const height = root.clientHeight <= 200 ? 200 : root.clientHeight;
 
     if (width === VID.width && height === VID.height && window.devicePixelRatio === VID.pixelRatio) {
       return; // no change
@@ -31,8 +27,8 @@ export default class VID {
     VID.pixelRatio = window.devicePixelRatio || 1;
     VID.mainwindow.width = Math.round(width * VID.pixelRatio);
     VID.mainwindow.height = Math.round(height * VID.pixelRatio);
-    VID.mainwindow.style.width = width + 'px';
-    VID.mainwindow.style.height = height + 'px';
+    VID.mainwindow.style.width = `${width}px`;
+    VID.mainwindow.style.height = `${height}px`;
 
     eventBus.publish('vid.resize', {
       width: VID.width,
@@ -41,7 +37,7 @@ export default class VID {
     });
   }
 
-  static DownloadScreenshot() {
+  static DownloadScreenshot(): void {
     const dataURL = VID.mainwindow.toDataURL('image/jpeg');
     const link = document.createElement('a');
     link.href = dataURL;
@@ -51,14 +47,20 @@ export default class VID {
     document.body.removeChild(link);
   }
 
-  static Init() {
-    // @ts-ignore
-    VID.mainwindow = document.getElementById('mainwindow');
+  static Init(): void {
+    const mainwindow = document.getElementById('mainwindow');
+    if (!(mainwindow instanceof HTMLCanvasElement)) {
+      throw new Error('Missing required canvas #mainwindow');
+    }
+    VID.mainwindow = mainwindow;
 
     VID.mainwindow.style.display = 'inline-block';
 
-    const $progress = document.getElementById('progress');
-    $progress.parentElement.removeChild($progress);
+    const progress = document.getElementById('progress');
+    if (progress === null || progress.parentElement === null) {
+      throw new Error('Missing required progress indicator');
+    }
+    progress.parentElement.removeChild(progress);
 
     VID.Resize(); // trigger once since we are ready now
 
@@ -67,13 +69,13 @@ export default class VID {
     Cmd.AddCommand('fullscreen', FullscreenCommand);
 
     eventBus.publish('vid.ready');
-  };
+  }
 
-  static Shutdown() {
+  static Shutdown(): void {
     VID.mainwindow.style.display = 'none';
 
     window.removeEventListener('resize', VID.Resize);
 
     eventBus.publish('vid.shutdown');
   }
-};
+}
diff --git a/source/engine/client/menu/MenuItem.mjs b/source/engine/client/menu/MenuItem.mjs
deleted file mode 100644
index 4e7df0a5..00000000
--- a/source/engine/client/menu/MenuItem.mjs
+++ /dev/null
@@ -1,493 +0,0 @@
-import Q from '../../../shared/Q.ts';
-import { K } from '../../../shared/Keys.ts';
-import Cvar from '../../common/Cvar.ts';
-import { eventBus, registry } from '../../registry.mjs';
-
-let { S, M, Host } = registry;
-
-eventBus.subscribe('registry.frozen', () => {
-  ({ S, M, Host } = registry);
-});
-
-/**
- * Base class for all menu items
- */
-export class MenuItem {
-  constructor(config = {}) {
-    /** @type {string} */
-    this.label = config.label || '';
-    /** @type {boolean} */
-    this.focusable = config.focusable ?? true;
-    /** @type {boolean} */
-    this.visible = config.visible ?? true;
-    /** @type {boolean} */
-    this.enabled = config.enabled ?? true;
-  }
-
-  /**
-   * Draw the menu item
-   * @param {number} x - X position (for label)
-   * @param {number} y - Y position
-   * @param {boolean} focused - Whether this item is currently focused
-   */
-  // eslint-disable-next-line no-unused-vars
-  draw(x, y, focused) {
-    // Override in subclasses
-  }
-
-  /**
-   * Handle keyboard input
-   * @param {number} key - Key code
-   * @returns {boolean} True if input was handled
-   */
-  // eslint-disable-next-line no-unused-vars
-  handleInput(key) {
-    return false;
-  }
-
-  /**
-   * Called when item becomes active (e.g., menu opens)
-   */
-  activate() {
-    // Override in subclasses
-  }
-
-  /**
-   * Called when item becomes inactive (e.g., menu closes)
-   */
-  deactivate() {
-    // Override in subclasses
-  }
-
-  /**
-   * Get the height this item needs for rendering
-   * @returns {number} Height in pixels
-   */
-  getHeight() {
-    return 8; // Default single line height
-  }
-}
-
-/**
- * Action item - executes a callback when activated
- */
-export class Action extends MenuItem {
-  constructor(config) {
-    super(config);
-    /** @type {function(): void} */
-    this.action = config.action || (() => { });
-  }
-
-  /**
-   * @param {number} x - X position
-   * @param {number} y - Y position
-   * @param {boolean} focused - Whether focused
-   */
-  // eslint-disable-next-line no-unused-vars
-  draw(x, y, focused) {
-    if (!this.visible) {
-      return;
-    }
-
-    if (this.enabled) {
-      M.PrintWhite(x, y, this.label);
-    } else {
-      M.Print(x, y, this.label);
-    }
-  }
-
-  /**
-   * @param {number} key - Key code
-   * @returns {boolean} True if handled
-   */
-  handleInput(key) {
-    if (!this.enabled) {
-      return false;
-    }
-
-    if (key === K.ENTER) {
-      this.action();
-      S.LocalSound(M.sfx_menu2);
-      return true;
-    }
-    return false;
-  }
-}
-
-/**
- * Slider for adjusting numeric values
- */
-export class Slider extends MenuItem {
-  constructor(config) {
-    super(config);
-    /** @type {string} */
-    this.cvar = config.cvar;
-    /** @type {number} */
-    this.min = config.min ?? 0;
-    /** @type {number} */
-    this.max = config.max ?? 1;
-    /** @type {number} */
-    this.step = config.step ?? 0.1;
-    /** @type {boolean} For brightness slider */
-    this.invert = config.invert ?? false;
-    /** @type {number} For displaying normalized values */
-    this.displayScale = config.displayScale ?? 1;
-  }
-
-  /**
-   * Get current cvar value
-   * @returns {number} Current value
-   */
-  getValue() {
-    const cvarObj = Cvar.FindVar(this.cvar);
-    return cvarObj ? cvarObj.value : this.min;
-  }
-
-  /**
-   * Set cvar value with clamping
-   * @param {number} val - New value
-   */
-  setValue(val) {
-    const clamped = Math.max(this.min, Math.min(this.max, val));
-    Cvar.Set(this.cvar, clamped);
-  }
-
-  /**
-   * Get normalized value for slider display
-   * @returns {number} Value between 0 and 1
-   */
-  getNormalizedValue() {
-    let val = this.getValue();
-    if (this.invert) {
-      val = this.max - val + this.min;
-    }
-    return (val - this.min) / (this.max - this.min);
-  }
-
-  /**
-   * @param {number} x - X position
-   * @param {number} y - Y position
-   * @param {boolean} focused - Whether focused
-   */
-  // eslint-disable-next-line no-unused-vars
-  draw(x, y, focused) {
-    if (!this.visible) {
-      return;
-    }
-
-    M.Print(x, y, this.label);
-    M.DrawSlider(x + 116, y, this.getNormalizedValue());
-  }
-
-  /**
-   * @param {number} key - Key code
-   * @returns {boolean} True if handled
-   */
-  handleInput(key) {
-    if (!this.enabled) {
-      return false;
-    }
-
-    if (key === K.LEFTARROW) {
-      const newVal = this.getValue() - this.step;
-      this.setValue(newVal);
-      S.LocalSound(M.sfx_menu3);
-      return true;
-    }
-
-    if (key === K.RIGHTARROW || key === K.ENTER) {
-      const newVal = this.getValue() + this.step;
-      this.setValue(newVal);
-      S.LocalSound(M.sfx_menu3);
-      return true;
-    }
-
-    return false;
-  }
-}
-
-/**
- * Toggle for on/off values
- */
-export class Toggle extends MenuItem {
-  constructor(config) {
-    super(config);
-    /** @type {string} */
-    this.cvar = config.cvar;
-    /** @type {number} */
-    this.onValue = config.onValue ?? 1;
-    /** @type {number} */
-    this.offValue = config.offValue ?? 0;
-    /** @type {string} */
-    this.onLabel = config.onLabel ?? 'on';
-    /** @type {string} */
-    this.offLabel = config.offLabel ?? 'off';
-  }
-
-  /**
-   * Get current cvar value
-   * @returns {number} Current value
-   */
-  getValue() {
-    const cvarObj = Cvar.FindVar(this.cvar);
-    return cvarObj ? cvarObj.value : this.offValue;
-  }
-
-  /**
-   * Set cvar value
-   * @param {number} val - New value
-   */
-  setValue(val) {
-    Cvar.Set(this.cvar, val);
-  }
-
-  /**
-   * Check if toggle is in "on" state
-   * @returns {boolean} True if on
-   */
-  isOn() {
-    return Q.compareFloat(this.getValue(), this.onValue);
-  }
-
-  /**
-   * Toggle between on and off
-   */
-  toggle() {
-    this.setValue(this.isOn() ? this.offValue : this.onValue);
-  }
-
-  /**
-   * @param {number} x - X position
-   * @param {number} y - Y position
-   * @param {boolean} focused - Whether focused
-   */
-  // eslint-disable-next-line no-unused-vars
-  draw(x, y, focused) {
-    if (!this.visible) {
-      return;
-    }
-
-    M.Print(x, y, this.label);
-    M.PrintWhite(x + 116, y, this.isOn() ? this.onLabel : this.offLabel);
-  }
-
-  /**
-   * @param {number} key - Key code
-   * @returns {boolean} True if handled
-   */
-  handleInput(key) {
-    if (!this.enabled) {
-      return false;
-    }
-
-    if (key === K.ENTER ||
-      key === K.LEFTARROW ||
-      key === K.RIGHTARROW) {
-      this.toggle();
-      S.LocalSound(M.sfx_menu3);
-      return true;
-    }
-
-    return false;
-  }
-}
-
-/**
- * Text input field
- */
-export class Textbox extends MenuItem {
-  constructor(config) {
-    super(config);
-    /** @type {string|null} */
-    this.cvar = config.cvar || null;
-    /** @type {string} */
-    this.value = config.value || '';
-    /** @type {number} */
-    this.maxLength = config.maxLength ?? 32;
-    /** @type {function(string): boolean} */
-    this.validator = config.validator || (() => true);
-    /** @type {number} In characters */
-    this.width = config.width ?? 24;
-  }
-
-  activate() {
-    if (this.cvar) {
-      this.value = Cvar.FindVar(this.cvar)?.string || '';
-    }
-  }
-
-  deactivate() {
-    if (this.cvar) {
-      Cvar.Set(this.cvar, this.value);
-    }
-  }
-
-  /**
-   * Get current value
-   * @returns {string} Current text value
-   */
-  getValue() {
-    return this.value;
-  }
-
-  /**
-   * Set value with validation
-   * @param {string} val - New value
-   */
-  setValue(val) {
-    if (this.validator(val)) {
-      this.value = val;
-    }
-  }
-
-  /**
-   * @param {number} x - X position
-   * @param {number} y - Y position
-   * @param {boolean} focused - Whether focused
-   */
-  draw(x, y, focused) {
-    if (!this.visible) {
-      return;
-    }
-
-    M.Print(x, y, this.label);
-
-    y += 16;
-
-    M.DrawTextBox(x, y - 8, this.width, 1);
-    M.PrintWhite(x + 8, y, this.getValue());
-
-    if (focused) {
-      const cursorX = x + 8 + (this.getValue().length * 8);
-      M.DrawCharacter(cursorX, y, 10 + ((Host.realtime * 4.0) & 1));
-    }
-  }
-
-  /**
-   * @param {number} key - Key code
-   * @returns {boolean} True if handled
-   */
-  handleInput(key) {
-    if (!this.enabled) {
-      return false;
-    }
-
-    if (key === K.BACKSPACE) {
-      const current = this.getValue();
-      if (current.length > 0) {
-        this.setValue(current.substring(0, current.length - 1));
-      }
-      return true;
-    }
-
-    // Printable characters
-    if (key >= 32 && key <= 127) {
-      const current = this.getValue();
-      if (current.length < this.maxLength) {
-        this.setValue(current + String.fromCharCode(key));
-      }
-      return true;
-    }
-
-    return false;
-  }
-}
-
-/**
- * Spacer - empty space
- */
-export class Spacer extends MenuItem {
-  constructor(config = {}) {
-    super({ ...config, focusable: false });
-    this.height = config.height ?? 8;
-  }
-
-  getHeight() {
-    return this.height;
-  }
-
-  draw() {
-    // Nothing to draw
-  }
-}
-
-/**
- * Label - non-interactive text
- */
-export class Label extends MenuItem {
-  constructor(config) {
-    super({ ...config, focusable: false });
-    this.align = config.align ?? 'left'; // left, center, right
-  }
-
-  /**
-   * @param {number} x - X position
-   * @param {number} y - Y position
-   * @param {boolean} focused - Whether focused
-   */
-  // eslint-disable-next-line no-unused-vars
-  draw(x, y, focused) {
-    if (!this.visible) {
-      return;
-    }
-    M.Print(x, y, this.label);
-  }
-}
-
-/**
- * Image - displays a picture (for image-based menu items like main menu)
- */
-export class Image extends MenuItem {
-  constructor(config) {
-    super({ ...config, focusable: config.focusable ?? false });
-    this.pic = config.pic;
-    this.centered = config.centered ?? false;
-  }
-
-  /**
-   * @param {number} x - X position
-   * @param {number} y - Y position
-   * @param {boolean} focused - Whether focused
-   */
-  // eslint-disable-next-line no-unused-vars
-  draw(x, y, focused) {
-    if (!this.visible || !this.pic) {
-      return;
-    }
-
-    const drawX = this.centered && this.pic.width ?
-      x - Math.floor(this.pic.width / 2) : x;
-
-    M.DrawPic(drawX, y, this.pic);
-  }
-
-  getHeight() {
-    return this.pic?.height || 0;
-  }
-}
-
-export class PlayerSkin extends MenuItem {
-  value = 0;
-
-  constructor() {
-    super({ focusable: false });
-  }
-
-  draw(x, y, focused) {
-    if (!this.visible) {
-      return;
-    }
-
-    const top = (this.value >> 4) & 0x0F;
-    const bottom = this.value & 0x0F;
-
-    M.DrawPic(x, y, M.bigbox);
-    M.DrawPicTranslate(x + 12, y + 8, M.menuplyr,
-      (top << 4) + (top >= 8 ? 4 : 11),
-      (bottom << 4) + (bottom >= 8 ? 4 : 11));
-  }
-
-  getHeight() {
-    return M.bigbox.height || 0;
-  }
-};
diff --git a/source/engine/client/menu/MenuItem.ts b/source/engine/client/menu/MenuItem.ts
new file mode 100644
index 00000000..dfa1d551
--- /dev/null
+++ b/source/engine/client/menu/MenuItem.ts
@@ -0,0 +1,503 @@
+import Q from '../../../shared/Q.ts';
+import { K } from '../../../shared/Keys.ts';
+import Cvar from '../../common/Cvar.ts';
+import { eventBus, getClientRegistry } from '../../registry.mjs';
+
+interface MenuPicture {
+  readonly width?: number;
+  readonly height?: number;
+}
+
+interface MenuItemConfig {
+  readonly label?: string;
+  readonly focusable?: boolean;
+  readonly visible?: boolean;
+  readonly enabled?: boolean;
+}
+
+type MenuAction = () => void | Promise<void>;
+
+interface ActionConfig extends MenuItemConfig {
+  readonly action?: MenuAction;
+}
+
+interface SliderConfig extends MenuItemConfig {
+  readonly cvar: string;
+  readonly min?: number;
+  readonly max?: number;
+  readonly step?: number;
+  readonly invert?: boolean;
+  readonly displayScale?: number;
+}
+
+interface ToggleConfig extends MenuItemConfig {
+  readonly cvar: string;
+  readonly onValue?: number;
+  readonly offValue?: number;
+  readonly onLabel?: string;
+  readonly offLabel?: string;
+}
+
+interface TextboxConfig extends MenuItemConfig {
+  readonly cvar?: string | null;
+  readonly value?: string;
+  readonly maxLength?: number;
+  readonly validator?: (value: string) => boolean;
+  readonly width?: number;
+}
+
+interface SpacerConfig extends MenuItemConfig {
+  readonly height?: number;
+}
+
+interface LabelConfig extends MenuItemConfig {
+  readonly align?: 'left' | 'center' | 'right';
+}
+
+interface ImageConfig extends MenuItemConfig {
+  readonly pic?: MenuPicture | null;
+  readonly centered?: boolean;
+}
+
+let { Host, M, S } = getClientRegistry();
+
+eventBus.subscribe('registry.frozen', () => {
+  ({ Host, M, S } = getClientRegistry());
+});
+
+/**
+ * Base class for all menu items.
+ */
+export class MenuItem {
+  label: string;
+  focusable: boolean;
+  visible: boolean;
+  enabled: boolean;
+
+  constructor(config: MenuItemConfig = {}) {
+    this.label = config.label || '';
+    this.focusable = config.focusable ?? true;
+    this.visible = config.visible ?? true;
+    this.enabled = config.enabled ?? true;
+  }
+
+  /**
+   * Draw the menu item.
+   */
+  draw(_x: number, _y: number, _focused: boolean): void {
+    // Override in subclasses
+  }
+
+  /**
+   * Handle keyboard input.
+   * @returns True if input was handled.
+   */
+  handleInput(_key: number): boolean {
+    return false;
+  }
+
+  /**
+   * Called when item becomes active (e.g., menu opens).
+   */
+  activate(): void {
+    // Override in subclasses
+  }
+
+  /**
+   * Called when item becomes inactive (e.g., menu closes).
+   */
+  deactivate(): void {
+    // Override in subclasses
+  }
+
+  /**
+   * Get the height this item needs for rendering.
+   * @returns Height in pixels.
+   */
+  getHeight(): number {
+    return 8; // Default single line height
+  }
+}
+
+/**
+ * Action item - executes a callback when activated.
+ */
+export class Action extends MenuItem {
+  action: MenuAction;
+
+  constructor(config: ActionConfig) {
+    super(config);
+    this.action = config.action || (() => {});
+  }
+
+  override draw(x: number, y: number, _focused: boolean): void {
+    if (!this.visible) {
+      return;
+    }
+
+    if (this.enabled) {
+      M.PrintWhite(x, y, this.label);
+    } else {
+      M.Print(x, y, this.label);
+    }
+  }
+
+  override handleInput(key: number): boolean {
+    if (!this.enabled) {
+      return false;
+    }
+
+    if (key === K.ENTER) {
+      void this.action();
+      S.LocalSound(M.sfx_menu2);
+      return true;
+    }
+
+    return false;
+  }
+}
+
+/**
+ * Slider for adjusting numeric values.
+ */
+export class Slider extends MenuItem {
+  cvar: string;
+  min: number;
+  max: number;
+  step: number;
+  invert: boolean;
+  displayScale: number;
+
+  constructor(config: SliderConfig) {
+    super(config);
+    this.cvar = config.cvar;
+    this.min = config.min ?? 0;
+    this.max = config.max ?? 1;
+    this.step = config.step ?? 0.1;
+    this.invert = config.invert ?? false;
+    this.displayScale = config.displayScale ?? 1;
+  }
+
+  /**
+   * Get current cvar value.
+   * @returns Current value.
+   */
+  getValue(): number {
+    const cvarObj = Cvar.FindVar(this.cvar);
+    return cvarObj ? cvarObj.value : this.min;
+  }
+
+  /**
+   * Set cvar value with clamping.
+   */
+  setValue(value: number): void {
+    const clamped = Math.max(this.min, Math.min(this.max, value));
+    Cvar.Set(this.cvar, clamped);
+  }
+
+  /**
+   * Get normalized value for slider display.
+   * @returns Value between 0 and 1.
+   */
+  getNormalizedValue(): number {
+    let value = this.getValue();
+    if (this.invert) {
+      value = this.max - value + this.min;
+    }
+    return (value - this.min) / (this.max - this.min);
+  }
+
+  override draw(x: number, y: number, _focused: boolean): void {
+    if (!this.visible) {
+      return;
+    }
+
+    M.Print(x, y, this.label);
+    M.DrawSlider(x + 116, y, this.getNormalizedValue());
+  }
+
+  override handleInput(key: number): boolean {
+    if (!this.enabled) {
+      return false;
+    }
+
+    if (key === K.LEFTARROW) {
+      const newValue = this.getValue() - this.step;
+      this.setValue(newValue);
+      S.LocalSound(M.sfx_menu3);
+      return true;
+    }
+
+    if (key === K.RIGHTARROW || key === K.ENTER) {
+      const newValue = this.getValue() + this.step;
+      this.setValue(newValue);
+      S.LocalSound(M.sfx_menu3);
+      return true;
+    }
+
+    return false;
+  }
+}
+
+/**
+ * Toggle for on/off values.
+ */
+export class Toggle extends MenuItem {
+  cvar: string;
+  onValue: number;
+  offValue: number;
+  onLabel: string;
+  offLabel: string;
+
+  constructor(config: ToggleConfig) {
+    super(config);
+    this.cvar = config.cvar;
+    this.onValue = config.onValue ?? 1;
+    this.offValue = config.offValue ?? 0;
+    this.onLabel = config.onLabel ?? 'on';
+    this.offLabel = config.offLabel ?? 'off';
+  }
+
+  /**
+   * Get current cvar value.
+   * @returns Current value.
+   */
+  getValue(): number {
+    const cvarObj = Cvar.FindVar(this.cvar);
+    return cvarObj ? cvarObj.value : this.offValue;
+  }
+
+  /**
+   * Set cvar value.
+   */
+  setValue(value: number): void {
+    Cvar.Set(this.cvar, value);
+  }
+
+  /**
+   * Check if toggle is in "on" state.
+   * @returns True if on.
+   */
+  isOn(): boolean {
+    return Q.compareFloat(this.getValue(), this.onValue);
+  }
+
+  /**
+   * Toggle between on and off.
+   */
+  toggle(): void {
+    this.setValue(this.isOn() ? this.offValue : this.onValue);
+  }
+
+  override draw(x: number, y: number, _focused: boolean): void {
+    if (!this.visible) {
+      return;
+    }
+
+    M.Print(x, y, this.label);
+    M.PrintWhite(x + 116, y, this.isOn() ? this.onLabel : this.offLabel);
+  }
+
+  override handleInput(key: number): boolean {
+    if (!this.enabled) {
+      return false;
+    }
+
+    if (key === K.ENTER || key === K.LEFTARROW || key === K.RIGHTARROW) {
+      this.toggle();
+      S.LocalSound(M.sfx_menu3);
+      return true;
+    }
+
+    return false;
+  }
+}
+
+/**
+ * Text input field.
+ */
+export class Textbox extends MenuItem {
+  cvar: string | null;
+  value: string;
+  maxLength: number;
+  validator: (value: string) => boolean;
+  width: number;
+
+  constructor(config: TextboxConfig) {
+    super(config);
+    this.cvar = config.cvar || null;
+    this.value = config.value || '';
+    this.maxLength = config.maxLength ?? 32;
+    this.validator = config.validator || (() => true);
+    this.width = config.width ?? 24;
+  }
+
+  override activate(): void {
+    if (this.cvar !== null) {
+      this.value = Cvar.FindVar(this.cvar)?.string || '';
+    }
+  }
+
+  override deactivate(): void {
+    if (this.cvar !== null) {
+      Cvar.Set(this.cvar, this.value);
+    }
+  }
+
+  /**
+   * Get current value.
+   * @returns Current text value.
+   */
+  getValue(): string {
+    return this.value;
+  }
+
+  /**
+   * Set value with validation.
+   */
+  setValue(value: string): void {
+    if (this.validator(value)) {
+      this.value = value;
+    }
+  }
+
+  override draw(x: number, y: number, focused: boolean): void {
+    if (!this.visible) {
+      return;
+    }
+
+    M.Print(x, y, this.label);
+
+    y += 16;
+
+    M.DrawTextBox(x, y - 8, this.width, 1);
+    M.PrintWhite(x + 8, y, this.getValue());
+
+    if (focused) {
+      const cursorX = x + 8 + this.getValue().length * 8;
+      M.DrawCharacter(cursorX, y, 10 + ((Host.realtime * 4.0) & 1));
+    }
+  }
+
+  override handleInput(key: number): boolean {
+    if (!this.enabled) {
+      return false;
+    }
+
+    if (key === K.BACKSPACE) {
+      const current = this.getValue();
+      if (current.length > 0) {
+        this.setValue(current.substring(0, current.length - 1));
+      }
+      return true;
+    }
+
+    // Printable characters
+    if (key >= 32 && key <= 127) {
+      const current = this.getValue();
+      if (current.length < this.maxLength) {
+        this.setValue(current + String.fromCharCode(key));
+      }
+      return true;
+    }
+
+    return false;
+  }
+}
+
+/**
+ * Spacer - empty space.
+ */
+export class Spacer extends MenuItem {
+  height: number;
+
+  constructor(config: SpacerConfig = {}) {
+    super({ ...config, focusable: false });
+    this.height = config.height ?? 8;
+  }
+
+  override getHeight(): number {
+    return this.height;
+  }
+
+  override draw(): void {
+    // Nothing to draw
+  }
+}
+
+/**
+ * Label - non-interactive text.
+ */
+export class Label extends MenuItem {
+  align: 'left' | 'center' | 'right';
+
+  constructor(config: LabelConfig) {
+    super({ ...config, focusable: false });
+    this.align = config.align ?? 'left'; // left, center, right
+  }
+
+  override draw(x: number, y: number, _focused: boolean): void {
+    if (!this.visible) {
+      return;
+    }
+    M.Print(x, y, this.label);
+  }
+}
+
+/**
+ * Image - displays a picture (for image-based menu items like main menu).
+ */
+export class Image extends MenuItem {
+  pic: MenuPicture | null;
+  centered: boolean;
+
+  constructor(config: ImageConfig) {
+    super({ ...config, focusable: config.focusable ?? false });
+    this.pic = config.pic ?? null;
+    this.centered = config.centered ?? false;
+  }
+
+  override draw(x: number, y: number, _focused: boolean): void {
+    if (!this.visible || this.pic === null) {
+      return;
+    }
+
+    const drawX = this.centered && this.pic.width ? x - Math.floor(this.pic.width / 2) : x;
+
+    M.DrawPic(drawX, y, this.pic);
+  }
+
+  override getHeight(): number {
+    return this.pic?.height || 0;
+  }
+}
+
+export class PlayerSkin extends MenuItem {
+  value = 0;
+
+  constructor() {
+    super({ focusable: false });
+  }
+
+  override draw(x: number, y: number, _focused: boolean): void {
+    if (!this.visible) {
+      return;
+    }
+
+    const top = (this.value >> 4) & 0x0F;
+    const bottom = this.value & 0x0F;
+
+    M.DrawPic(x, y, M.bigbox);
+    M.DrawPicTranslate(
+      x + 12,
+      y + 8,
+      M.menuplyr,
+      (top << 4) + (top >= 8 ? 4 : 11),
+      (bottom << 4) + (bottom >= 8 ? 4 : 11),
+    );
+  }
+
+  override getHeight(): number {
+    return M.bigbox.height || 0;
+  }
+}
diff --git a/source/engine/client/menu/MenuPage.mjs b/source/engine/client/menu/MenuPage.ts
similarity index 53%
rename from source/engine/client/menu/MenuPage.mjs
rename to source/engine/client/menu/MenuPage.ts
index 26913298..5cbb2082 100644
--- a/source/engine/client/menu/MenuPage.mjs
+++ b/source/engine/client/menu/MenuPage.ts
@@ -1,26 +1,87 @@
 import { K } from '../../../shared/Keys.ts';
-import { eventBus, registry } from '../../registry.mjs';
+import { eventBus, getClientRegistry } from '../../registry.mjs';
+import { MenuItem } from './MenuItem.ts';
+
+interface MenuPicture {
+  readonly width?: number;
+}
+
+interface MenuPageConfig {
+  readonly items?: MenuItem[];
+  readonly layout?: MenuLayout | null;
+  readonly title?: string | null;
+  readonly titlePic?: MenuPicture | null;
+  readonly onEnter?: () => void;
+  readonly onExit?: () => void;
+  readonly customDraw?: ((page: MenuPage) => void) | null;
+}
+
+interface VerticalLayoutConfig {
+  readonly startY?: number;
+  readonly spacing?: number;
+  readonly labelX?: number;
+  readonly valueX?: number;
+  readonly showCursor?: boolean;
+  readonly cursorX?: number;
+}
+
+interface ImageBasedLayoutConfig {
+  readonly backgroundPic?: unknown;
+  readonly backgroundX?: number;
+  readonly backgroundY?: number;
+  readonly cursorX?: number;
+  readonly cursorYBase?: number;
+  readonly cursorYSpacing?: number;
+}
+
+interface ListLayoutConfig {
+  readonly startX?: number;
+  readonly startY?: number;
+  readonly spacing?: number;
+  readonly cursorX?: number;
+}
+
+interface GridLayoutConfig {
+  readonly columns?: number;
+  readonly startX?: number;
+  readonly startY?: number;
+  readonly columnSpacing?: number;
+  readonly rowSpacing?: number;
+}
+
+export interface MenuLayout {
+  draw(items: MenuItem[], focusedIndex: number): void;
+}
 
 // Destructure registry modules
-let { S, M, Host } = registry;
+let { Host, M, S } = getClientRegistry();
 
 // Update when registry is frozen
 eventBus.subscribe('registry.frozen', () => {
-  ({ S, M, Host } = registry);
+  ({ Host, M, S } = getClientRegistry());
 });
 
 /**
- * A menu page containing items with automatic navigation
+ * A menu page containing items with automatic navigation.
  */
 export class MenuPage {
-  constructor(config = {}) {
+  items: MenuItem[];
+  layout: MenuLayout | null;
+  title: string | null;
+  titlePic: MenuPicture | null;
+  cursor: number;
+  onEnter: () => void;
+  onExit: () => void;
+  customDraw: ((page: MenuPage) => void) | null;
+
+  constructor(config: MenuPageConfig = {}) {
     this.items = config.items || [];
     this.layout = config.layout || null;
     this.title = config.title || null;
     this.titlePic = config.titlePic || null;
     this.cursor = 0;
-    this.onEnter = config.onEnter || (() => { });
-    this.onExit = config.onExit || (() => { });
+    this.onEnter = config.onEnter || (() => {});
+    this.onExit = config.onExit || (() => {});
     this.customDraw = config.customDraw || null;
 
     // Find first focusable item
@@ -28,18 +89,18 @@ export class MenuPage {
   }
 
   /**
-   * Initialize the menu page (called once when menu system is set up)
+   * Initialize the menu page (called once when menu system is set up).
    */
-  async init() {
+  async init(): Promise<void> {
   }
 
   /**
-   * Draw the menu page
+   * Draw the menu page.
    */
-  draw() {
+  draw(): void {
     // Draw title if provided
     if (this.titlePic) {
-      const titleX = 160 - Math.floor(this.titlePic.width / 2);
+      const titleX = 160 - Math.floor((this.titlePic.width ?? 0) / 2);
       M.DrawPic(titleX, 4, this.titlePic);
     } else if (this.title) {
       const titleX = 160 - (this.title.length * 8) / 2;
@@ -53,17 +114,14 @@ export class MenuPage {
     }
 
     // Use layout system
-    if (this.layout) {
-      this.layout.draw(this.items, this.cursor);
-    }
+    this.layout?.draw(this.items, this.cursor);
   }
 
   /**
-   * Handle keyboard input
-   * @param {number} key - Key code
-   * @returns {boolean} True if input was handled
+   * Handle keyboard input.
+   * @returns True if input was handled.
    */
-  handleInput(key) {
+  handleInput(key: number): boolean {
     // Let focused item handle input first
     const focused = this.items[this.cursor];
     if (focused && focused.handleInput(key)) {
@@ -85,34 +143,33 @@ export class MenuPage {
   }
 
   /**
-   * Called when menu becomes active
+   * Called when menu becomes active.
    */
-  activate() {
+  activate(): void {
     this._moveCursorToFirstFocusable();
 
     for (const item of this.items) {
-      item.activate?.();
+      item.activate();
     }
 
     this.onEnter();
   }
 
   /**
-   * Called when menu becomes inactive
+   * Called when menu becomes inactive.
    */
-  deactivate() {
+  deactivate(): void {
     for (const item of this.items) {
-      item.deactivate?.();
+      item.deactivate();
     }
 
     this.onExit();
   }
 
   /**
-   * Move cursor by offset, skipping non-focusable items
-   * @param {number} offset - Direction to move (-1 for up, 1 for down)
+   * Move cursor by offset, skipping non-focusable items.
    */
-  _moveCursor(offset) {
+  protected _moveCursor(offset: number): void {
     if (!this.items.length) {
       return;
     }
@@ -138,14 +195,13 @@ export class MenuPage {
         S.LocalSound(M.sfx_menu1);
         return;
       }
-
     } while (attempts < maxAttempts && this.cursor !== start);
   }
 
   /**
-   * Move cursor to first focusable item
+   * Move cursor to first focusable item.
    */
-  _moveCursorToFirstFocusable() {
+  protected _moveCursorToFirstFocusable(): void {
     this.cursor = 0;
     if (!this.items.length) {
       return;
@@ -153,9 +209,9 @@ export class MenuPage {
 
     // If current item is not focusable, find first focusable
     if (!this.items[this.cursor]?.focusable) {
-      for (let i = 0; i < this.items.length; i++) {
-        if (this.items[i]?.focusable) {
-          this.cursor = i;
+      for (let index = 0; index < this.items.length; index++) {
+        if (this.items[index]?.focusable) {
+          this.cursor = index;
           return;
         }
       }
@@ -164,10 +220,17 @@ export class MenuPage {
 }
 
 /**
- * Vertical layout - standard menu layout
+ * Vertical layout - standard menu layout.
  */
-export class VerticalLayout {
-  constructor(config = {}) {
+export class VerticalLayout implements MenuLayout {
+  startY: number;
+  spacing: number;
+  labelX: number;
+  valueX: number;
+  showCursor: boolean;
+  cursorX: number;
+
+  constructor(config: VerticalLayoutConfig = {}) {
     this.startY = config.startY ?? 32;
     this.spacing = config.spacing ?? 4;
     this.labelX = config.labelX ?? 16;
@@ -176,15 +239,15 @@ export class VerticalLayout {
     this.cursorX = config.cursorX ?? 200;
   }
 
-  draw(items, focusedIndex) {
+  draw(items: MenuItem[], focusedIndex: number): void {
     let y = this.startY;
 
-    for (const [i, item] of items.entries()) {
+    for (const [index, item] of items.entries()) {
       if (!item.visible) {
         continue;
       }
 
-      const focused = i === focusedIndex;
+      const focused = index === focusedIndex;
 
       // Draw the item
       item.draw(this.labelX, y, focused);
@@ -201,10 +264,17 @@ export class VerticalLayout {
 }
 
 /**
- * Image-based layout - for menus that use a single background image
+ * Image-based layout - for menus that use a single background image.
  */
-export class ImageBasedLayout {
-  constructor(config = {}) {
+export class ImageBasedLayout implements MenuLayout {
+  backgroundPic: unknown;
+  backgroundX: number;
+  backgroundY: number;
+  cursorX: number;
+  cursorYBase: number;
+  cursorYSpacing: number;
+
+  constructor(config: ImageBasedLayoutConfig = {}) {
     this.backgroundPic = config.backgroundPic;
     this.backgroundX = config.backgroundX ?? 72;
     this.backgroundY = config.backgroundY ?? 32;
@@ -213,7 +283,7 @@ export class ImageBasedLayout {
     this.cursorYSpacing = config.cursorYSpacing ?? 20;
   }
 
-  draw(items, focusedIndex) {
+  draw(items: MenuItem[], focusedIndex: number): void {
     // Draw background image
     if (this.backgroundPic) {
       M.DrawPic(this.backgroundX, this.backgroundY, this.backgroundPic);
@@ -225,36 +295,41 @@ export class ImageBasedLayout {
     M.DrawPic(this.cursorX, cursorY, M.menudot[dotFrame]);
 
     // Items can still draw if needed (for custom elements)
-    for (const [i, item] of items.entries()) {
+    for (const [index, item] of items.entries()) {
       if (!item.visible) {
         continue;
       }
 
-      item.draw?.(0, 0, i === focusedIndex);
+      item.draw(0, 0, index === focusedIndex);
     }
   }
 }
 
 /**
- * List layout - for save/load game lists
+ * List layout - for save/load game lists.
  */
-export class ListLayout {
-  constructor(config = {}) {
+export class ListLayout implements MenuLayout {
+  startX: number;
+  startY: number;
+  spacing: number;
+  cursorX: number;
+
+  constructor(config: ListLayoutConfig = {}) {
     this.startX = config.startX ?? 16;
     this.startY = config.startY ?? 32;
     this.spacing = config.spacing ?? 8;
     this.cursorX = config.cursorX ?? 8;
   }
 
-  draw(items, focusedIndex) {
+  draw(items: MenuItem[], focusedIndex: number): void {
     let y = this.startY;
 
-    for (const [i, item] of items.entries()) {
+    for (const [index, item] of items.entries()) {
       if (!item.visible) {
         continue;
       }
 
-      const focused = i === focusedIndex;
+      const focused = index === focusedIndex;
 
       // Draw the item
       item.draw(this.startX, y, focused);
@@ -271,10 +346,16 @@ export class ListLayout {
 }
 
 /**
- * Grid layout - for multi-column layouts
+ * Grid layout - for multi-column layouts.
  */
-export class GridLayout {
-  constructor(config = {}) {
+export class GridLayout implements MenuLayout {
+  columns: number;
+  startX: number;
+  startY: number;
+  columnSpacing: number;
+  rowSpacing: number;
+
+  constructor(config: GridLayoutConfig = {}) {
     this.columns = config.columns ?? 2;
     this.startX = config.startX ?? 16;
     this.startY = config.startY ?? 32;
@@ -282,15 +363,15 @@ export class GridLayout {
     this.rowSpacing = config.rowSpacing ?? 8;
   }
 
-  draw(items, focusedIndex) {
-    for (const [i, item] of items.entries()) {
+  draw(items: MenuItem[], focusedIndex: number): void {
+    for (const [index, item] of items.entries()) {
       if (!item.visible) {
         continue;
       }
 
-      const focused = i === focusedIndex;
-      const row = Math.floor(i / this.columns);
-      const col = i % this.columns;
+      const focused = index === focusedIndex;
+      const row = Math.floor(index / this.columns);
+      const col = index % this.columns;
 
       const x = this.startX + col * this.columnSpacing;
       const y = this.startY + row * this.rowSpacing;
diff --git a/source/engine/client/menu/MenuStack.mjs b/source/engine/client/menu/MenuStack.mjs
deleted file mode 100644
index c715db6d..00000000
--- a/source/engine/client/menu/MenuStack.mjs
+++ /dev/null
@@ -1,145 +0,0 @@
-import { eventBus, registry } from '../../registry.mjs';
-
-/**
- * @typedef {import('./MenuPage.mjs').MenuPage} MenuPage
- */
-
-// Destructure registry modules
-let { M } = registry;
-
-// Update when registry is frozen
-eventBus.subscribe('registry.frozen', () => {
-  ({ M } = registry);
-});
-
-/**
- * Stack-based menu navigation system
- */
-export class MenuStack {
-  constructor() {
-    /** @type {MenuPage[]} */
-    this.stack = [];
-    /** @type {Map<string, MenuPage>} Named page registry */
-    this.pages = new Map();
-  }
-
-  /**
-   * Register a named page
-   * @param {string} name - Page identifier
-   * @param {MenuPage} page - Page instance
-   */
-  register(name, page) {
-    this.pages.set(name, page);
-  }
-
-  /**
-   * Push a page onto the stack
-   * @param {MenuPage|string} pageOrName - Page instance or registered name
-   */
-  push(pageOrName) {
-    // Deactivate current page
-    const current = this.current();
-    if (current) {
-      current.deactivate();
-    }
-
-    // Resolve page
-    const page = typeof pageOrName === 'string' ?
-      this.pages.get(pageOrName) : pageOrName;
-
-    if (!page) {
-      console.error('MenuStack: Page not found:', pageOrName);
-      return;
-    }
-
-    // Push and activate
-    this.stack.push(page);
-    page.activate();
-    M.entersound = true;
-  }
-
-  /**
-   * Pop the current page
-   * @returns {MenuPage|null} The popped page
-   */
-  pop() {
-    if (this.stack.length === 0) {
-      return null;
-    }
-
-    const page = this.stack.pop();
-    page.deactivate();
-
-    // Activate new current page
-    const current = this.current();
-    if (current) {
-      current.activate();
-      M.entersound = true;
-    }
-
-    return page;
-  }
-
-  /**
-   * Get current page without removing it
-   * @returns {MenuPage|null} The current page or null if stack is empty
-   */
-  current() {
-    return this.stack.length > 0 ?
-      this.stack[this.stack.length - 1] : null;
-  }
-
-  /**
-   * Clear the entire stack
-   */
-  clear() {
-    while (this.stack.length > 0) {
-      const page = this.stack.pop();
-      page.deactivate();
-    }
-  }
-
-  /**
-   * Get stack depth
-   * @returns {number} Number of pages in stack
-   */
-  depth() {
-    return this.stack.length;
-  }
-
-  /**
-   * Check if stack is empty
-   * @returns {boolean} True if stack has no pages
-   */
-  isEmpty() {
-    return this.stack.length === 0;
-  }
-
-  /**
-   * Replace current page with a new one
-   * @param {MenuPage|string} pageOrName - Page instance or registered name
-   */
-  replace(pageOrName) {
-    if (this.stack.length > 0) {
-      this.pop();
-    }
-    this.push(pageOrName);
-  }
-
-  /**
-   * Pop to a specific page depth
-   * @param {number} depth - Target depth
-   */
-  popTo(depth) {
-    while (this.stack.length > depth && this.stack.length > 0) {
-      this.pop();
-    }
-  }
-
-  /**
-   * Pop to root (main menu)
-   */
-  popToRoot() {
-    this.popTo(1);
-  }
-}
diff --git a/source/engine/client/menu/MenuStack.ts b/source/engine/client/menu/MenuStack.ts
new file mode 100644
index 00000000..9f49b3e4
--- /dev/null
+++ b/source/engine/client/menu/MenuStack.ts
@@ -0,0 +1,136 @@
+import { eventBus, getClientRegistry } from '../../registry.mjs';
+import type { MenuPage } from './MenuPage.ts';
+
+// Destructure registry modules
+let { M } = getClientRegistry();
+
+// Update when registry is frozen
+eventBus.subscribe('registry.frozen', () => {
+  ({ M } = getClientRegistry());
+});
+
+/**
+ * Stack-based menu navigation system.
+ */
+export class MenuStack {
+  stack: MenuPage[];
+  pages: Map<string, MenuPage>;
+
+  constructor() {
+    this.stack = [];
+    this.pages = new Map();
+  }
+
+  /**
+   * Register a named page.
+   */
+  register(name: string, page: MenuPage): void {
+    this.pages.set(name, page);
+  }
+
+  /**
+   * Push a page onto the stack.
+   */
+  push(pageOrName: MenuPage | string): void {
+    // Deactivate current page
+    const current = this.current();
+    if (current) {
+      current.deactivate();
+    }
+
+    // Resolve page
+    const page = typeof pageOrName === 'string' ? this.pages.get(pageOrName) ?? null : pageOrName;
+
+    if (!page) {
+      console.error('MenuStack: Page not found:', pageOrName);
+      return;
+    }
+
+    // Push and activate
+    this.stack.push(page);
+    page.activate();
+    M.entersound = true;
+  }
+
+  /**
+   * Pop the current page.
+   * @returns The popped page.
+   */
+  pop(): MenuPage | null {
+    if (this.stack.length === 0) {
+      return null;
+    }
+
+    const page = this.stack.pop()!;
+    page.deactivate();
+
+    // Activate new current page
+    const current = this.current();
+    if (current) {
+      current.activate();
+      M.entersound = true;
+    }
+
+    return page;
+  }
+
+  /**
+   * Get current page without removing it.
+   * @returns The current page or null if stack is empty.
+   */
+  current(): MenuPage | null {
+    return this.stack.length > 0 ? this.stack[this.stack.length - 1] : null;
+  }
+
+  /**
+   * Clear the entire stack.
+   */
+  clear(): void {
+    while (this.stack.length > 0) {
+      const page = this.stack.pop()!;
+      page.deactivate();
+    }
+  }
+
+  /**
+   * Get stack depth.
+   * @returns Number of pages in stack.
+   */
+  depth(): number {
+    return this.stack.length;
+  }
+
+  /**
+   * Check if stack is empty.
+   * @returns True if stack has no pages.
+   */
+  isEmpty(): boolean {
+    return this.stack.length === 0;
+  }
+
+  /**
+   * Replace current page with a new one.
+   */
+  replace(pageOrName: MenuPage | string): void {
+    if (this.stack.length > 0) {
+      this.pop();
+    }
+    this.push(pageOrName);
+  }
+
+  /**
+   * Pop to a specific page depth.
+   */
+  popTo(depth: number): void {
+    while (this.stack.length > depth && this.stack.length > 0) {
+      this.pop();
+    }
+  }
+
+  /**
+   * Pop to root (main menu).
+   */
+  popToRoot(): void {
+    this.popTo(1);
+  }
+}
diff --git a/source/engine/client/menu/Multiplayer.mjs b/source/engine/client/menu/Multiplayer.ts
similarity index 75%
rename from source/engine/client/menu/Multiplayer.mjs
rename to source/engine/client/menu/Multiplayer.ts
index b54db712..b7555fa7 100644
--- a/source/engine/client/menu/Multiplayer.mjs
+++ b/source/engine/client/menu/Multiplayer.ts
@@ -1,15 +1,34 @@
 import PR from '../../server/Progs.ts';
 import { K } from '../../../shared/Keys.ts';
 import Cmd from '../../common/Cmd.ts';
-import { eventBus, registry } from '../../registry.mjs';
-import { Action, Label, Spacer } from './MenuItem.mjs';
-import { MenuPage, VerticalLayout } from './MenuPage.mjs';
+import { eventBus, getClientRegistry } from '../../registry.mjs';
+import { Action, Label, Spacer } from './MenuItem.ts';
+import { MenuPage, VerticalLayout } from './MenuPage.ts';
+import type { MenuStack } from './MenuStack.ts';
 import { ServerEngineAPI } from '../../common/GameAPIs.ts';
 
-let { M } = registry;
+interface ServerInfoSummary {
+  readonly hostname?: string;
+  readonly map?: string;
+  readonly currentPlayers?: number;
+  readonly maxPlayers?: number;
+  readonly colo?: string | null;
+  readonly country?: string | null;
+}
+
+interface ServerSessionSummary {
+  readonly sessionId: string;
+  readonly serverInfo?: ServerInfoSummary | null;
+}
+
+interface ServerListResponse {
+  readonly servers?: ServerSessionSummary[] | null;
+}
+
+let { M, urls } = getClientRegistry();
 
 eventBus.subscribe('registry.frozen', () => {
-  ({ M } = registry);
+  ({ M, urls } = getClientRegistry());
 });
 
 // CR: this whole menu is heavily WIP
@@ -30,8 +49,11 @@ eventBus.subscribe('registry.frozen', () => {
 // - start game
 
 export default class MultiplayerMainMenu extends MenuPage {
+  staticItemCount: number | undefined;
+  menuStack: MenuStack | null;
+
   // eslint-disable-next-line @typescript-eslint/require-await
-  async init() {
+  override async init(): Promise<void> {
     // M.m_multi is arriving later
     this.titlePic = M.p_multi;
 
@@ -56,7 +78,7 @@ export default class MultiplayerMainMenu extends MenuPage {
     //   this.items.push(action);
     // }
 
-    if (registry.urls?.signalingURL) {
+    if (urls?.signalingURL) {
       // FIXME: move the start serverlist to the ClientGameAPI
       const serverActions = PR.QuakeJS.ServerGameAPI.GetStartServerList();
 
@@ -84,14 +106,14 @@ export default class MultiplayerMainMenu extends MenuPage {
     this.staticItemCount = this.items.length;
   }
 
-  activate() {
+  override activate(): void {
     super.activate();
-    if (registry.urls?.signalingURL) {
+    if (urls?.signalingURL) {
       void this.refreshSessions();
     }
   }
 
-  #addRefreshSessionsButton() {
+  #addRefreshSessionsButton(): void {
     this.items.push(new Spacer());
     this.items.push(new Action({
       label: 'Refresh Sessions',
@@ -101,7 +123,7 @@ export default class MultiplayerMainMenu extends MenuPage {
     }));
   }
 
-  async refreshSessions() {
+  async refreshSessions(): Promise<void> {
     // Reset to static items
     if (this.staticItemCount !== undefined && this.items.length > this.staticItemCount) {
       // Clean up previous dynamic items
@@ -111,12 +133,16 @@ export default class MultiplayerMainMenu extends MenuPage {
     this.items.push(new Label({ label: 'Finding sessions...' }));
 
     try {
-      const signalingUrl = new URL(registry.urls.signalingURL);
+      if (!urls?.signalingURL) {
+        throw new Error('Signaling URL is unavailable');
+      }
+
+      const signalingUrl = new URL(urls.signalingURL);
       const protocol = signalingUrl.protocol === 'wss:' ? 'https:' : 'http:';
       const url = `${protocol}//${signalingUrl.host}/list-servers`;
 
       const response = await fetch(url);
-      const data = await response.json();
+      const data = await response.json() as ServerListResponse;
 
       // Remove "Finding sessions..."
       this.items.length = 3;
@@ -145,7 +171,7 @@ export default class MultiplayerMainMenu extends MenuPage {
       }
 
       this.#addRefreshSessionsButton();
-    } catch (e) {
+    } catch (error: unknown) {
       // Remove loading indicator if present
       const lastItem = this.items[this.items.length - 1];
       if (lastItem && lastItem.label === 'Finding sessions...') {
@@ -153,17 +179,11 @@ export default class MultiplayerMainMenu extends MenuPage {
       }
       this.items.push(new Label({ label: 'Unable to fetch sessions' }));
       this.#addRefreshSessionsButton();
-      console.error('Failed to fetch sessions:', e);
+      console.error('Failed to fetch sessions:', error);
     }
   }
 
-  /** @type {import('./MenuStack.mjs').MenuStack} */
-  menuStack;
-
-  /**
-   * @param {import('./MenuStack.mjs').MenuStack} menuStack - Navigation stack
-   */
-  constructor(menuStack) {
+  constructor(menuStack: MenuStack | null = null) {
     const layout = new VerticalLayout({
       startY: 40,
       spacing: 8,
@@ -179,10 +199,9 @@ export default class MultiplayerMainMenu extends MenuPage {
   }
 
   /**
-   * @param {number} key - Key code
-   * @returns {boolean} True if handled
+   * @returns True if handled.
    */
-  handleInput(key) {
+  override handleInput(key: number): boolean {
     if (key === K.ESCAPE) {
       this.deactivate();
       M.CloseMenu();
@@ -190,4 +209,4 @@ export default class MultiplayerMainMenu extends MenuPage {
     }
     return super.handleInput(key);
   }
-};
+}
diff --git a/source/engine/client/renderer/BloomEffect.mjs b/source/engine/client/renderer/BloomEffect.mjs
index 905c1f4f..24a2c94f 100644
--- a/source/engine/client/renderer/BloomEffect.mjs
+++ b/source/engine/client/renderer/BloomEffect.mjs
@@ -1,6 +1,6 @@
 import GL from '../GL.mjs';
 import PostProcess from './PostProcess.mjs';
-import VID from '../VID.mjs';
+import VID from '../VID.ts';
 import PostProcessEffect from './PostProcessEffect.mjs';
 import Vector from '../../../shared/Vector.ts';
 import { eventBus, registry } from '../../registry.mjs';
diff --git a/source/engine/client/renderer/PostProcess.mjs b/source/engine/client/renderer/PostProcess.mjs
index a933372c..4102b295 100644
--- a/source/engine/client/renderer/PostProcess.mjs
+++ b/source/engine/client/renderer/PostProcess.mjs
@@ -1,6 +1,6 @@
 import GL from '../GL.mjs';
 import Cvar from '../../common/Cvar.ts';
-import VID from '../VID.mjs';
+import VID from '../VID.ts';
 import PostProcessEffect from './PostProcessEffect.mjs';
 import { eventBus } from '../../registry.mjs';
 
diff --git a/source/engine/common/Console.ts b/source/engine/common/Console.ts
index 6f71d1c2..d4f23932 100644
--- a/source/engine/common/Console.ts
+++ b/source/engine/common/Console.ts
@@ -2,7 +2,7 @@ import Vector from '../../shared/Vector.ts';
 import { eventBus, getClientRegistry, registry } from '../registry.mjs';
 import Cvar from './Cvar.ts';
 import Cmd from './Cmd.ts';
-import VID from '../client/VID.mjs';
+import VID from '../client/VID.ts';
 import { clientConnectionState } from './Def.ts';
 import { ClientEngineAPI } from './GameAPIs.ts';
 
diff --git a/source/engine/common/GameAPIs.ts b/source/engine/common/GameAPIs.ts
index a7676c8a..8daf3713 100644
--- a/source/engine/common/GameAPIs.ts
+++ b/source/engine/common/GameAPIs.ts
@@ -12,7 +12,7 @@ import Vector from '../../shared/Vector.ts';
 import { moveTypes, solid } from '../../shared/Defs.ts';
 import Key from '../client/Key.mjs';
 import { SFX as SFXValue } from '../client/Sound.mjs';
-import VID from '../client/VID.mjs';
+import VID from '../client/VID.ts';
 import * as Protocol from '../network/Protocol.ts';
 import { EventBus, eventBus, getClientRegistry, getCommonRegistry } from '../registry.mjs';
 import { ED, ServerEdict as ServerEdictValue } from '../server/Edict.ts';
diff --git a/source/engine/common/Host.ts b/source/engine/common/Host.ts
index ed0e9a1b..249d1c40 100644
--- a/source/engine/common/Host.ts
+++ b/source/engine/common/Host.ts
@@ -19,13 +19,13 @@ import Vector from '../../shared/Vector.ts';
 import Q from '../../shared/Q.ts';
 import { ServerClient } from '../server/Client.ts';
 import { ServerEngineAPI } from './GameAPIs.ts';
-import Chase from '../client/Chase.mjs';
-import VID from '../client/VID.mjs';
+import Chase from '../client/Chase.ts';
+import VID from '../client/VID.ts';
 import { HostError } from './Errors.ts';
-import CDAudio from '../client/CDAudio.mjs';
+import CDAudio from '../client/CDAudio.ts';
 import * as Defs from '../../shared/Defs.ts';
 import { content, gameCapabilities } from '../../shared/Defs.ts';
-import ClientLifecycle from '../client/ClientLifecycle.mjs';
+import ClientLifecycle from '../client/ClientLifecycle.ts';
 import { Pmove } from './Pmove.ts';
 
 let { COM, Con, Mod, NET, PR, SV, Sys, V } = getCommonRegistry();
diff --git a/source/engine/main-browser.ts b/source/engine/main-browser.ts
index cf0df440..457e2f35 100644
--- a/source/engine/main-browser.ts
+++ b/source/engine/main-browser.ts
@@ -2,12 +2,12 @@ import type { BuildConfig, URLs } from './build-config';
 
 import CL from './client/CL.mjs';
 import Draw from './client/Draw.mjs';
-import IN from './client/IN.mjs';
+import IN from './client/IN.ts';
 import Key from './client/Key.mjs';
 import M from './client/Menu.mjs';
 import R from './client/R.mjs';
 import S from './client/Sound.mjs';
-import Sys from './client/Sys.mjs';
+import Sys from './client/Sys.ts';
 import V from './client/V.mjs';
 import Sbar from './client/Sbar.mjs';
 import SCR from './client/SCR.mjs';
diff --git a/source/engine/network/MSG.ts b/source/engine/network/MSG.ts
index 75ccd626..6215c51c 100644
--- a/source/engine/network/MSG.ts
+++ b/source/engine/network/MSG.ts
@@ -1,11 +1,12 @@
-import type { SerializableType } from '../../shared/GameInterfaces.ts';
+import type { ClientEventValue, SerializableType } from '../../shared/GameInterfaces.ts';
 import Q from '../../shared/Q.ts';
 import Vector from '../../shared/Vector.ts';
 import * as Protocol from '../network/Protocol.ts';
 import { eventBus, getCommonRegistry } from '../registry.mjs';
 
 type SerializableVectorLike = ArrayLike<number>;
-type SerializableValue = SerializableType | object;
+type ServerSerializableValue = SerializableType | object;
+type SerializableValue = ClientEventValue;
 type SerializableConstructor<T extends object = object> = abstract new (...args: never[]) => T;
 
 type SerializableHandlers<T extends object = object, ServerValue = object, ClientValue = object> = {
@@ -497,7 +498,7 @@ export class SzBuffer {
     return to;
   }
 
-  writeSerializables(serializables: readonly SerializableValue[]): void {
+  writeSerializables(serializables: readonly ServerSerializableValue[]): void {
     for (const serializable of serializables) {
       switch (true) {
         case serializable === undefined:
diff --git a/source/engine/registry.mjs b/source/engine/registry.mjs
index 42545dfe..fcb81a3b 100644
--- a/source/engine/registry.mjs
+++ b/source/engine/registry.mjs
@@ -1,7 +1,7 @@
 
 /** @typedef {typeof import('./common/Console.ts').default} ConModule */
 /** @typedef {typeof import('./common/Com.ts').default} ComModule */
-/** @typedef {typeof import('./common/Sys.ts').default} SysModule */
+/** @typedef {typeof import('./common/Sys.ts').default | typeof import('./client/Sys.ts').default | typeof import('./server/Sys.ts').default} SysModule */
 /** @typedef {typeof import('./common/Host.ts').default} HostModule */
 /** @typedef {typeof import('./client/V.mjs').default} VModule */
 /** @typedef {typeof import('./network/Network').default} NetModule */
@@ -16,7 +16,7 @@
 /** @typedef {typeof import('./client/Sbar.mjs').default} SbarModule */
 /** @typedef {typeof import('./client/Sound.mjs').default} SoundModule */
 /** @typedef {typeof import('./client/Menu.mjs').default} MenuModule */
-/** @typedef {typeof import('./client/IN.mjs').default} InputModule */
+/** @typedef {typeof import('./client/IN.ts').default} InputModule */
 /** @typedef {typeof globalThis.WebSocket} BrowserWebSocketClass */
 /** @typedef {typeof import('ws')} NodeWebSocketModule */
 /** @typedef {BrowserWebSocketClass | NodeWebSocketModule} WebSocketDependency */
diff --git a/source/shared/GameInterfaces.ts b/source/shared/GameInterfaces.ts
index 3ebda6a1..124ba31e 100644
--- a/source/shared/GameInterfaces.ts
+++ b/source/shared/GameInterfaces.ts
@@ -1,16 +1,18 @@
 import type { BaseClientEdictHandler } from './ClientEdict.ts';
 import type { ClientEngineAPI as ClientEngineApiValue, ServerEngineAPI as ServerEngineApiValue } from '../engine/common/GameAPIs.ts';
+import type { ClientEdict as ClientEdictValue } from '../engine/client/ClientEntities.mjs';
 import type { ServerEdict as ServerEdictValue } from '../engine/server/Edict.ts';
 import type { GLTexture as GLTextureValue } from '../engine/client/GL.mjs';
 import type { SFX as SFXValue } from '../engine/client/Sound.mjs';
 import type CvarValue from '../engine/common/Cvar.ts';
 import type Vector from './Vector.ts';
 import type { PmoveConfiguration as PmoveConfigurationValue, PmoveQuake2Configuration as PmoveQuake2ConfigurationValue } from '../shared/Pmove.ts';
-import type { StartGameInterface } from '../engine/client/ClientLifecycle.mjs';
+import type { StartGameInterface } from '../engine/client/ClientLifecycle.ts';
 import type { BaseModel } from '../engine/common/model/BaseModel.ts';
 
 export type ClientEngineAPI = Readonly<typeof ClientEngineApiValue>;
 export type ServerEngineAPI = Readonly<typeof ServerEngineApiValue>;
+export type ClientEdict = Readonly<ClientEdictValue>;
 export type ServerEdict = Readonly<ServerEdictValue>;
 
 export type GLTexture = GLTextureValue;
@@ -20,8 +22,10 @@ export type PmoveConfiguration = Readonly<PmoveConfigurationValue>;
 export type PmoveQuake2Configuration = Readonly<PmoveQuake2ConfigurationValue>;
 
 export type SerializableType = string | number | boolean | Vector | ServerEdict | SerializableType[] | null;
+export type ClientSerializableType = string | number | boolean | Vector | ClientEdict | ClientSerializableType[] | null;
+export type ClientEventValue = ClientSerializableType | object;
 
-export type ClientdataMap = Record<string, SerializableType>;
+export type ClientdataMap = Record<string, ClientSerializableType>;
 
 export type EdictValueType = string | number | boolean | Vector | null;
 export type EdictData = Record<string, EdictValueType>;
@@ -77,7 +81,7 @@ export declare abstract class ClientGameInterface {
   saveGame(): string;
   loadGame(data: string): void;
 
-  handleClientEvent(code: number, ...args: SerializableType[]): void;
+  handleClientEvent(code: number, ...args: ClientEventValue[]): void;
   updateRefDef(refdef: RefDef): void;
 
   static GetStartGameInterface(engineAPI: ClientEngineAPI): StartGameInterface | null;

From fc8d93cdf627c458bd46043875d427245162d02b Mon Sep 17 00:00:00 2001
From: Christian R <github@chrisnew.de>
Date: Sat, 4 Apr 2026 11:47:26 +0300
Subject: [PATCH 42/67] TS: client/ part 2

---
 source/engine/client/ClientConnection.ts      |    2 +-
 .../{ClientEntities.mjs => ClientEntities.ts} |  381 +++---
 .../{ClientLegacy.mjs => ClientLegacy.ts}     |   30 +-
 source/engine/client/ClientMessages.ts        |    2 +-
 .../client/ClientServerCommandHandlers.mjs    |   55 +-
 .../client/ClientServerCommandHandlers.ts     | 1208 +++++++++++++++++
 source/engine/client/ClientState.ts           |    2 +-
 source/engine/client/LegacyServerCommands.mjs |   64 +-
 source/engine/client/LegacyServerCommands.ts  |  830 +++++++++++
 source/engine/client/R.mjs                    |    2 +-
 .../client/renderer/AliasModelRenderer.mjs    |   10 +-
 .../client/renderer/BrushModelRenderer.mjs    |    2 +-
 source/engine/client/renderer/Materials.mjs   |    2 +-
 .../client/renderer/MeshModelRenderer.mjs     |    6 +-
 .../engine/client/renderer/ModelRenderer.mjs  |    6 +-
 source/engine/client/renderer/ShadowMap.mjs   |    8 +-
 .../client/renderer/SpriteModelRenderer.mjs   |    6 +-
 source/engine/common/GameAPIs.ts              |    2 +-
 source/engine/common/Pmove.ts                 |    2 +-
 source/engine/common/model/AliasModel.ts      |    8 -
 source/engine/common/model/BaseModel.ts       |    8 +
 source/engine/server/Edict.ts                 |    2 +-
 source/shared/ClientEdict.ts                  |    2 +-
 source/shared/GameInterfaces.ts               |    2 +-
 test/client/client-connection.test.mjs        |  251 ++++
 test/client/client-messages.test.mjs          |  146 ++
 test/common/game-apis.test.mjs                |    2 +-
 test/physics/collision-regressions.test.mjs   |    2 +-
 test/physics/fixtures.mjs                     |    2 +-
 29 files changed, 2793 insertions(+), 252 deletions(-)
 rename source/engine/client/{ClientEntities.mjs => ClientEntities.ts} (68%)
 rename source/engine/client/{ClientLegacy.mjs => ClientLegacy.ts} (80%)
 create mode 100644 source/engine/client/ClientServerCommandHandlers.ts
 create mode 100644 source/engine/client/LegacyServerCommands.ts
 create mode 100644 test/client/client-connection.test.mjs
 create mode 100644 test/client/client-messages.test.mjs

diff --git a/source/engine/client/ClientConnection.ts b/source/engine/client/ClientConnection.ts
index 16c6bd08..c67a54c6 100644
--- a/source/engine/client/ClientConnection.ts
+++ b/source/engine/client/ClientConnection.ts
@@ -8,7 +8,7 @@ import { clientRuntimeState, clientStaticState, type ClientRuntimeState, type Cl
 import { eventBus, getClientRegistry } from '../registry.mjs';
 import { HostError } from '../common/Errors.ts';
 import { QSocket } from '../network/NetworkDrivers.ts';
-import { parseServerMessage as parseServerCommandMessage } from './ClientServerCommandHandlers.mjs';
+import { parseServerMessage as parseServerCommandMessage } from './ClientServerCommandHandlers.ts';
 
 type IdentityCvars = {
   name: Cvar | null;
diff --git a/source/engine/client/ClientEntities.mjs b/source/engine/client/ClientEntities.ts
similarity index 68%
rename from source/engine/client/ClientEntities.mjs
rename to source/engine/client/ClientEntities.ts
index 0cd37b18..e53b3f1d 100644
--- a/source/engine/client/ClientEntities.mjs
+++ b/source/engine/client/ClientEntities.ts
@@ -1,53 +1,67 @@
+import type { ClientEventValue } from '../../shared/GameInterfaces.ts';
+import type { SFX } from './Sound.mjs';
+import type { BaseModel } from '../common/model/BaseModel.ts';
+import type { BrushModel } from '../common/Mod.ts';
+import type { Pmove } from '../common/Pmove.ts';
+
 import Vector from '../../shared/Vector.ts';
-import { eventBus, registry } from '../registry.mjs';
+import { eventBus, getClientRegistry } from '../registry.mjs';
 import * as Def from '../common/Def.ts';
 import { content, effect, solid } from '../../shared/Defs.ts';
 import Chase from './Chase.ts';
-import { DefaultClientEdictHandler } from './ClientLegacy.mjs';
+import { DefaultClientEdictHandler } from './ClientLegacy.ts';
 import { BaseClientEdictHandler } from '../../shared/ClientEdict.ts';
 import { ClientEngineAPI } from '../common/GameAPIs.ts';
-import { SFX } from './Sound.mjs';
-import { Node, revealedVisibility } from '../common/model/BSP.ts';
-import { BaseModel } from '../common/model/BaseModel.ts';
-
-let { CL, Con, Mod, PR, R, S } = registry;
+import { revealedVisibility, type Node } from '../common/model/BSP.ts';
+
+interface ClientEntityLerpState {
+  readonly frame: [number, number, number];
+  readonly origin: Vector;
+  readonly angles: Vector;
+}
+
+interface TempEntitySounds {
+  wizhit: SFX | null;
+  knighthit: SFX | null;
+  tink1: SFX | null;
+  ric1: SFX | null;
+  ric2: SFX | null;
+  ric3: SFX | null;
+  explosion: SFX | null;
+}
+
+let { CL, Con, Mod, PR, R, S } = getClientRegistry();
 
 eventBus.subscribe('registry.frozen', () => {
-  CL = registry.CL;
-  Con = registry.Con;
-  Mod = registry.Mod;
-  PR = registry.PR;
-  R = registry.R;
-  S = registry.S;
+  ({ CL, Con, Mod, PR, R, S } = getClientRegistry());
 });
 
 export class ClientDlight {
-  /** @type {number} light radius */
+  /** light radius */
   radius = 0.0;
 
-  /** @type {Vector} light color, RGB */
+  /** light color, RGB */
   color = new Vector(1.0, 1.0, 1.0);
 
-  /** @type {Vector} origin */
+  /** origin */
   origin = new Vector();
 
-  /** @type {number} time when this light is considered gone */
+  /** time when this light is considered gone */
   die = 0.0;
 
-  /** @type {number} radius decrease per second, e.g. 300 */
+  /** radius decrease per second, e.g. 300 */
   decay = 0.0;
 
-  /** @type {number} entity number */
+  /** entity number */
   entity = 0;
 
-  /** @type {number} */
   minlight = 0;
 
-  isFree() {
+  isFree(): boolean {
     return this.radius < 0.0 || this.die < CL.state.time;
   }
 
-  clear() {
+  clear(): void {
     this.radius = 0.0;
     this.color.setTo(1.0, 1.0, 1.0);
     this.origin.clear();
@@ -57,27 +71,25 @@ export class ClientDlight {
     this.minlight = 0;
   }
 
-  think() {
+  think(): void {
     this.radius -= this.decay * CL.state.time;
 
     if (this.radius < 0.0) {
       this.radius = 0;
     }
   }
-};
+}
 
 export class ClientBeam {
   start = new Vector();
   end = new Vector();
 
-  /** @type {import('../common/model/BaseModel.ts').BaseModel} what model to use to draw the beam */
-  model = null;
+  /** what model to use to draw the beam */
+  model: BaseModel | null = null;
 
-  /** @type {number} */
   entity = 0;
-
   endtime = 0.0;
-};
+}
 
 /**
  * Client edict maps to a server edict.
@@ -86,14 +98,60 @@ export class ClientBeam {
  * more complex logic that is not part of a client-server session.
  */
 export class ClientEdict { // TODO: extends Protocol.EntityState
-  /** @type {BaseClientEdictHandler} */
-  #handler = null;
-
-  /** @param {number} num entity number */
-  constructor(num) {
+  #handler: BaseClientEdictHandler | null = null;
+
+  classname: string | null;
+  readonly num: number;
+  model: BaseModel | null;
+  modelindex: number;
+  framePrevious: number | null;
+  frameTime: number;
+  frame: number;
+  skinnum: number;
+  colormap: number;
+  effects: number;
+  /** alpha value for rendering */
+  alpha: number;
+  solid: number;
+  originPrevious: Vector;
+  originTime: number;
+  origin: Vector;
+  anglesPrevious: Vector;
+  anglesTime: number;
+  angles: Vector;
+  velocityPrevious: Vector;
+  velocityTime: number;
+  velocity: Vector;
+  dlightbits: number;
+  dlightframe: number;
+  /** keeps track of origin changes */
+  msg_origins: [Vector, Vector];
+  /** keeps track of angle changes */
+  msg_angles: [Vector, Vector];
+  /** keeps track of velocity changes */
+  msg_velocity: [Vector, Vector];
+  leafs: number[];
+  /** count of received updates */
+  updatecount: number;
+  /** whether is ClientEntity is ready to be recycled */
+  free: boolean;
+  syncbase: number;
+  /** we are using this to lerp animations and positions as well as in future steering client entities */
+  nextthink: number;
+  maxs: Vector;
+  mins: Vector;
+  /** entity fields pushed by the server */
+  extended: Record<string, ClientEventValue>;
+  /** server time when this entity was last updated (legacy demo playback only) */
+  msgtime: number;
+  /** force-link flag: snap to current position, no interpolation (legacy demo playback only) */
+  forcelink: boolean;
+  readonly lerp: ClientEntityLerpState;
+
+  /** @param num entity number */
+  constructor(num: number) {
     this.classname = null;
     this.num = num;
-    /** @type {BaseModel} */
     this.model = null;
     this.modelindex = 0;
     this.framePrevious = null;
@@ -102,7 +160,6 @@ export class ClientEdict { // TODO: extends Protocol.EntityState
     this.skinnum = 0;
     this.colormap = 0;
     this.effects = 0;
-    /** @type {number} alpha value for rendering */
     this.alpha = 1.0;
     this.solid = 0;
     this.originPrevious = new Vector(Infinity, Infinity, Infinity);
@@ -111,49 +168,39 @@ export class ClientEdict { // TODO: extends Protocol.EntityState
     this.anglesPrevious = new Vector(Infinity, Infinity, Infinity);
     this.anglesTime = 0.0;
     this.angles = new Vector(Infinity, Infinity, Infinity);
-    this.velocityPrevious = new Vector(Infinity, Infinity, Infinity);;
+    this.velocityPrevious = new Vector(Infinity, Infinity, Infinity);
     this.velocityTime = 0.0;
     this.velocity = new Vector();
     this.dlightbits = 0;
     this.dlightframe = 0;
-    /** keeps track of origin changes */
     this.msg_origins = [new Vector(), new Vector()];
-    /** keeps track of angle changes */
     this.msg_angles = [new Vector(), new Vector()];
-    /** keeps track of velocity changes */
     this.msg_velocity = [new Vector(), new Vector()];
     this.leafs = [];
-    /** count of received updates */
     this.updatecount = 0;
-    /** whether is ClientEntity is ready to be recycled */
     this.free = false;
     this.syncbase = 0.0;
-    /** we are using this to lerp animations and positions as well as in future steering client entities */
     this.nextthink = -1;
     this.maxs = new Vector();
     this.mins = new Vector();
-    /** @type {Record<string, import('../../shared/GameInterfaces').ClientEventValue>} entity fields pushed by the server */
     this.extended = {};
-    /** server time when this entity was last updated (legacy demo playback only) */
     this.msgtime = 0.0;
-    /** force-link flag: snap to current position, no interpolation (legacy demo playback only) */
     this.forcelink = false;
 
-    /** @type {ClientEdict} */
     const that = this;
 
     /**
      * holds lerped origin and angles for rendering purposes
      */
     this.lerp = {
-      get frame() {
+      get frame(): [number, number, number] {
         const time = CL.state.clientMessages.mtime[0];
         if (that.nextthink <= time || that.framePrevious === null || CL.nolerp.value) {
           return [that.frame, that.frame, 0];
         }
         return [that.framePrevious, that.frame, (time - that.frameTime) / (that.nextthink - that.frameTime)];
       },
-      get origin() {
+      get origin(): Vector {
         const time = CL.state.clientMessages.mtime[0];
         if (that.nextthink <= time || CL.nolerp.value || that.originPrevious.isInfinite()) {
           return that.origin;
@@ -168,7 +215,7 @@ export class ClientEdict { // TODO: extends Protocol.EntityState
         );
         return l;
       },
-      get angles() {
+      get angles(): Vector {
         const time = CL.state.clientMessages.mtime[0];
         if (that.nextthink <= time || CL.nolerp.value || that.anglesPrevious.isInfinite()) {
           return that.angles;
@@ -178,8 +225,8 @@ export class ClientEdict { // TODO: extends Protocol.EntityState
         const a1 = that.anglesPrevious;
         const d = a0.copy().subtract(a1);
         for (let i = 0; i < 3; i++) { // avoid snapping around
-          if (d[i] > 180)  { d[i] -= 360; };
-          if (d[i] < -180) { d[i] += 360; };
+          if (d[i] > 180) { d[i] -= 360; }
+          if (d[i] < -180) { d[i] += 360; }
         }
         const v = new Vector(
           a1[0] + d[0] * f,
@@ -194,16 +241,16 @@ export class ClientEdict { // TODO: extends Protocol.EntityState
     Object.seal(this);
   }
 
-  isStatic() {
+  isStatic(): boolean {
     return this.num === -1;
   }
 
-  equals(other) {
+  equals(other: { num: number } | null): boolean {
     // CR: playing with fire here
-    return this === other || (this.num !== -1 && this.num === other.num);
+    return other !== null && (this === other || (this.num !== -1 && this.num === other.num));
   }
 
-  freeEdict() {
+  freeEdict(): void {
     this.model = null;
     this.framePrevious = null;
     this.frameTime = 0.0;
@@ -247,20 +294,34 @@ export class ClientEdict { // TODO: extends Protocol.EntityState
    * Links the entity to the current world model.
    * This has to be called after the origin for a client-side entity has been changed.
    */
-  linkEdict() {
-    console.assert(CL.state.worldmodel !== null, 'worldmodel must be set before linking an entity');
+  linkEdict(): void {
+    const worldmodel = CL.state.worldmodel;
+
+    console.assert(worldmodel !== null, 'worldmodel must be set before linking an entity');
     console.assert(this.isStatic(), 'linkEdict is only valid for client-side entities');
+    console.assert(this.model !== null, 'model must be set before linking an entity');
+
+    if (worldmodel === null || this.model === null) {
+      return;
+    }
+
+    const rootNode = worldmodel.nodes[0];
+    console.assert(rootNode !== undefined, 'worldmodel must have a root node before linking an entity');
+    if (rootNode === undefined) {
+      return;
+    }
+
     const emins = this.origin.copy().add(this.model.mins);
     const emaxs = this.origin.copy().add(this.model.maxs);
-    this.#splitEntityOnNode(CL.state.worldmodel.nodes[0], emins, emaxs);
+    this.#splitEntityOnNode(rootNode, emins, emaxs);
   }
 
   /**
-   * @param {Node} node BSP node to split the entity on
-   * @param {Vector} emins entity mins
-   * @param {Vector} emaxs entity maxs
+   * @param node BSP node to split the entity on
+   * @param emins entity mins
+   * @param emaxs entity maxs
    */
-  #splitEntityOnNode(node, emins, emaxs) {
+  #splitEntityOnNode(node: Node, emins: Vector, emaxs: Vector): void {
     if (node.contents === content.CONTENT_SOLID) {
       return;
     }
@@ -270,56 +331,61 @@ export class ClientEdict { // TODO: extends Protocol.EntityState
       return;
     }
 
-    const sides = Vector.boxOnPlaneSide(emins, emaxs, node.plane);
+    const plane = node.plane;
+    if (plane === null) {
+      return;
+    }
+
+    const sides = Vector.boxOnPlaneSide(emins, emaxs, plane);
+    const frontChild = node.children[0];
+    const backChild = node.children[1];
 
-    if ((sides & 1) !== 0) {
-      this.#splitEntityOnNode(node.children[0], emins, emaxs);
+    if ((sides & 1) !== 0 && frontChild !== null && typeof frontChild !== 'number') {
+      this.#splitEntityOnNode(frontChild, emins, emaxs);
     }
 
-    if ((sides & 2) !== 0) {
-      this.#splitEntityOnNode(node.children[1], emins, emaxs);
+    if ((sides & 2) !== 0 && backChild !== null && typeof backChild !== 'number') {
+      this.#splitEntityOnNode(backChild, emins, emaxs);
     }
   }
 
   /**
    * Sets the origin of the entity.
    * Only valid for client-side entities.
-   * @param {Vector} origin new position of the entity
+   * @param origin new position of the entity
    */
-  setOrigin(origin) {
+  setOrigin(origin: Vector): void {
     this.origin.set(origin);
     this.linkEdict();
   }
 
   /** loads handler based on set classname */
-  loadHandler() {
-    /** @type {typeof BaseClientEdictHandler} */
+  loadHandler(): void {
     const handler = (() => {
       const ClientAPI = PR.QuakeJS?.ClientGameAPI;
 
-      if (!ClientAPI) {
+      if (!ClientAPI || this.classname === null) {
         return null;
       }
 
-      const handler = ClientAPI.GetClientEdictHandler(this.classname);
+      const entityHandler = ClientAPI.GetClientEdictHandler(this.classname);
 
-      if (!handler) {
+      if (!entityHandler) {
         // Con.DPrint('No ClientEdictHandler for entity: ' + this.classname + '\n');
         return null;
       }
 
-      return handler;
-    })() || DefaultClientEdictHandler;
+      return entityHandler;
+    })() ?? DefaultClientEdictHandler;
 
     this.#handler = new handler(this, ClientEngineAPI);
   }
 
   /**
    * Sets origin and angles according to the current message.
-   * @param {boolean} doLerp whether to do a point lerp
+   * @param doLerp whether to do a point lerp
    */
-  updatePosition(doLerp) {
-
+  updatePosition(doLerp: boolean): void {
     const time = CL.state.clientMessages.mtime[0];
 
     // not precisely a position, but it is part of the lerp too
@@ -360,79 +426,72 @@ export class ClientEdict { // TODO: extends Protocol.EntityState
     this.velocity.set(this.msg_velocity[0]);
   }
 
-  spawn() {
+  spawn(): void {
     if (this.#handler) {
       this.#handler.spawn();
     }
   }
 
-  emit() {
+  emit(): void {
     if (this.#handler) {
       this.#handler.emit();
     }
   }
 
-  think() {
+  think(): void {
     if (this.#handler) {
       this.#handler.think();
     }
   }
 
-  toString() {
+  toString(): string {
     return `${this.num.toFixed(0).padStart(3, ' ')}: ${(this.classname || '(no classname)').padEnd(32)} ${(this.model?.name || '-').padEnd(32)}: [${this.origin}], ${this.angles}`;
   }
-};
+}
 
 export default class ClientEntities {
-  /** @type {ClientEdict[]} all entities */
-  static_entities = [];
+  /** all entities */
+  static_entities: ClientEdict[] = [];
 
-  /** @type {ClientEdict[]} all server managed entities */
-  entities = [];
+  /** all server managed entities */
+  entities: ClientEdict[] = [];
 
-  /** @type {ClientEdict[]} visible entities staged for the next frame */
-  visedicts = [];
+  /** visible entities staged for the next frame */
+  visedicts: ClientEdict[] = [];
 
-  /** @type {ClientEdict[]} all temporary entities, will last one frame */
-  temp_entities = [];
+  /** all temporary entities, will last one frame */
+  temp_entities: ClientEdict[] = [];
 
-  /** @type {ClientDlight[]} current dynamic lights */
-  dlights = [];
+  /** current dynamic lights */
+  dlights: ClientDlight[] = [];
 
-  /** @type {string[]} current configured lightstyles (set by the server) */
-  lightstyle = [];
+  /** current configured lightstyles (set by the server) */
+  lightstyle: string[] = [];
 
-  /** @type {ClientBeam[]} current beams */
-  beams = [];
+  /** current beams */
+  beams: ClientBeam[] = [];
 
   num_temp_entities = 0;
   num_visedicts = 0;
 
-  tempEntitySounds = {
-    /** @type {SFX} */
+  tempEntitySounds: TempEntitySounds = {
     wizhit: null,
-    /** @type {SFX} */
     knighthit: null,
-    /** @type {SFX} */
     tink1: null,
-    /** @type {SFX} */
     ric1: null,
-    /** @type {SFX} */
     ric2: null,
-    /** @type {SFX} */
     ric3: null,
-    /** @type {SFX} */
     explosion: null,
   };
 
-  /** @type {Record<string, import('../common/Mod.ts').BaseModel>} available tent models, initialized in initTempEntities */
-  tempEntityModels = {};
+  /** available tent models, initialized in initTempEntities */
+  tempEntityModels: Record<string, BaseModel | null> = {};
 
   constructor() {
     this.clear();
   }
 
-  async initTempEntities() {
+  async initTempEntities(): Promise<void> {
     this.tempEntitySounds = {
       wizhit: S.PrecacheSound('wizard/hit.wav'),
       knighthit: S.PrecacheSound('hknight/hit.wav'),
@@ -443,27 +502,27 @@ export default class ClientEntities {
       explosion: S.PrecacheSound('weapons/r_exp3.wav'),
     };
 
-    for (const {model, name} of await Promise.all([
+    for (const { model, name } of await Promise.all([
       'progs/bolt.mdl',
       'progs/bolt2.mdl',
       'progs/bolt3.mdl',
       'progs/beam.mdl', // CR: does not exist in Quake
-    ].map((model) => Mod.ForNameAsync(model, false, Mod.scope.client).then((m) => ({ model: m, name: model }))))) {
+    ].map((model) => Mod.ForNameAsync(model, false, Mod.scope.client).then((loadedModel) => ({ model: loadedModel, name: model }))))) {
       this.tempEntityModels[name] = model;
     }
   }
 
   /**
-   * @param {number} id lightstyle number
-   * @param {string} style lightstyle sequence
+   * @param id lightstyle number
+   * @param style lightstyle sequence
    */
-  setLightstyle(id, style) {
+  setLightstyle(id: number, style: string): void {
     console.assert(id >= 0 && id < this.lightstyle.length, 'id must be in range');
 
     this.lightstyle[id] = style;
   }
 
-  clear() {
+  clear(): void {
     this.static_entities.length = 0;
     this.visedicts.length = 0;
     this.entities.length = 0;
@@ -490,11 +549,11 @@ export default class ClientEntities {
     }
   }
 
-  setSolidEntities(pmove) {
+  setSolidEntities(pmove: Pmove): void {
     pmove.clearEntities();
 
     for (const clent of this.getEntities()) {
-      if (clent.num === 0 || !clent.model) {
+      if (clent.num === 0 || clent.model === null) {
         continue;
       }
 
@@ -505,14 +564,15 @@ export default class ClientEntities {
         continue;
       }
 
-      pmove.addEntity(clent, s === solid.SOLID_BSP ? clent.model : null);
+      const brushModel = s === solid.SOLID_BSP ? clent.model as BrushModel : null;
+      pmove.addEntity(clent, brushModel);
     }
   }
 
-  printEntities() {
+  printEntities(): void {
     Con.Print('Entities:\n');
     for (const ent of this.getEntities()) {
-      if (!ent.model) {
+      if (ent.model === null) {
         continue;
       }
 
@@ -520,8 +580,8 @@ export default class ClientEntities {
     }
   }
 
-  allocateDynamicLight(entityId) {
-    let dl = null;
+  allocateDynamicLight(entityId: number): ClientDlight {
+    let dl: ClientDlight | null = null;
 
     if (entityId === -1) {
       entityId = 0;
@@ -564,10 +624,10 @@ export default class ClientEntities {
 
   /**
    * Allocates a temporary entity. It will last one frame.
-   * @param {string?} classname optional classname to set for the temporary entity
-   * @returns {ClientEdict} a new temporary entity
+   * @param classname optional classname to set for the temporary entity
+   * @returns a new temporary entity
    */
-  allocateTempEntity(classname = null) {
+  allocateTempEntity(classname: string | null = null): ClientEdict {
     const ent = new ClientEdict(-1);
 
     this.temp_entities[this.num_temp_entities++] = ent;
@@ -584,10 +644,10 @@ export default class ClientEntities {
   /**
    * Allocates a client-only entity.
    * It will not be managed by the server and is used for client-side effects (debris, gibs, projectiles etc.).
-   * @param {string?} classname optional classname to set for the temporary entity
-   * @returns {ClientEdict} a new client-only entity
+   * @param classname optional classname to set for the temporary entity
+   * @returns a new client-only entity
    */
-  allocateClientEntity(classname = null) {
+  allocateClientEntity(classname: string | null = null): ClientEdict {
     const ent = new ClientEdict(-1);
 
     if (classname !== null) {
@@ -614,10 +674,10 @@ export default class ClientEntities {
   /**
    * Returns a client entity by its number.
    * If the entity does not exist, it will be allocated as a null entity.
-   * @param {number} num entity number
-   * @returns {ClientEdict} entity
+   * @param num entity number
+   * @returns entity
    */
-  getEntity(num) {
+  getEntity(num: number): ClientEdict {
     if (this.entities[num] !== undefined) {
       return this.entities[num];
     }
@@ -629,19 +689,24 @@ export default class ClientEntities {
       this.entities.push(new ClientEdict(this.entities.length));
     }
 
-    return this.entities[num];
+    return this.entities[num]!;
   }
 
-  #thinkTempEntities() {
+  #thinkTempEntities(): void {
     // TODO: rework
     this.num_temp_entities = 0;
     for (let i = 0; i < Def.limits.beams; i++) {
-      let yaw; let pitch;
+      let yaw: number;
+      let pitch: number;
       const b = this.beams[i];
-      if (!b.model || b.endtime < CL.state.time) {
+      if (b.model === null || b.endtime < CL.state.time) {
         continue;
       }
       if (b.entity === CL.state.viewentity) {
+        if (CL.state.playerentity === null) {
+          continue;
+        }
+
         b.start = CL.state.playerentity.origin.copy();
       }
       const dist = b.end.copy().subtract(b.start);
@@ -688,7 +753,7 @@ export default class ClientEntities {
     }
   }
 
-  #thinkDlights() {
+  #thinkDlights(): void {
     for (let i = 0; i < Def.limits.dlights; i++) {
       const dl = this.dlights[i];
 
@@ -700,19 +765,19 @@ export default class ClientEntities {
     }
   }
 
-  #thinkEntities() {
+  #thinkEntities(): void {
     for (const clent of this.getEntities()) {
       clent.think();
     }
   }
 
-  think() {
+  think(): void {
     this.#thinkEntities();
     this.#thinkTempEntities();
     this.#thinkDlights();
   }
 
-  #emitEntities() {
+  #emitEntities(): void {
     // reset all visible entities
     this.num_visedicts = 0;
 
@@ -747,7 +812,7 @@ export default class ClientEntities {
       }
 
       // if the entity is not visible, skip it
-      if (!clent.model || (clent.effects & effect.EF_NODRAW)) {
+      if (clent.model === null || (clent.effects & effect.EF_NODRAW)) {
         continue;
       }
 
@@ -760,12 +825,19 @@ export default class ClientEntities {
       this.visedicts[this.num_visedicts++] = clent;
     }
 
+    const worldmodel = CL.state.worldmodel;
+    console.assert(worldmodel !== null, 'worldmodel must be set before emitting client entities');
+    if (worldmodel === null) {
+      return;
+    }
+
     // get the PVS for the current view
-    const vis = R.novis.value !== 0 ? revealedVisibility : CL.state.worldmodel.getPvsByPoint(R.refdef.vieworg);
+    const rendererState = R as typeof R & { novis: { value: number } };
+    const vis = rendererState.novis.value !== 0 ? revealedVisibility : worldmodel.getPvsByPoint(R.refdef.vieworg);
 
     for (const clent of this.static_entities) {
       // freed entity or invisible entity
-      if (clent.free || !clent.model || (clent.effects & effect.EF_NODRAW)) {
+      if (clent.free || clent.model === null || (clent.effects & effect.EF_NODRAW)) {
         continue;
       }
 
@@ -784,14 +856,14 @@ export default class ClientEntities {
     }
   }
 
-  #emitProjectiles() {
+  #emitProjectiles(): void {
     // TODO: implement
   }
 
-  #emitTempEntities() {
+  #emitTempEntities(): void {
     for (let i = 0; i < this.num_temp_entities; i++) {
       const ent = this.temp_entities[i];
-      if (!ent.model || ent.free) {
+      if (ent.model === null || ent.free) {
         continue;
       }
 
@@ -801,7 +873,7 @@ export default class ClientEntities {
     }
   }
 
-  emit() {
+  emit(): void {
     if (CL.state.worldmodel === null) {
       // no world model, nothing to render
       return;
@@ -815,9 +887,9 @@ export default class ClientEntities {
   /**
    * Returns all entities in the game.
    * Both client-only and server entities.
-   * @yields {ClientEdict} entity
+   * @yields entity
    */
-  *getEntities() {
+  *getEntities(): Generator<ClientEdict, void, void> {
     for (const entity of this.entities) {
       if (!entity || entity.free) {
         continue;
@@ -837,11 +909,14 @@ export default class ClientEntities {
 
   /**
    * Contains all entities that are staged to be rendered.
-   * @yields {ClientEdict} entity
+   * @yields entity
    */
-  *getVisibleEntities() {
+  *getVisibleEntities(): Generator<ClientEdict, void, void> {
     for (let i = 0; i < this.num_visedicts; i++) {
-      yield this.visedicts[i];
+      const entity = this.visedicts[i];
+      if (entity !== undefined) {
+        yield entity;
+      }
     }
   }
-};
+}
diff --git a/source/engine/client/ClientLegacy.mjs b/source/engine/client/ClientLegacy.ts
similarity index 80%
rename from source/engine/client/ClientLegacy.mjs
rename to source/engine/client/ClientLegacy.ts
index 5332671a..f8b8d2a0 100644
--- a/source/engine/client/ClientLegacy.mjs
+++ b/source/engine/client/ClientLegacy.ts
@@ -7,13 +7,12 @@ import Vector from '../../shared/Vector.ts';
 import { effect, modelFlags } from '../../shared/Defs.ts';
 import { BaseClientEdictHandler } from '../../shared/ClientEdict.ts';
 
-import { registry, eventBus } from '../registry.mjs';
+import { eventBus, getClientRegistry } from '../registry.mjs';
 
-let { CL, R } = registry;
+let { CL, R } = getClientRegistry();
 
 eventBus.subscribe('registry.frozen', () => {
-  CL = registry.CL;
-  R = registry.R;
+  ({ CL, R } = getClientRegistry());
 });
 
 /**
@@ -22,11 +21,12 @@ eventBus.subscribe('registry.frozen', () => {
  * no specific game implementation is provided.
  */
 export class DefaultClientEdictHandler extends BaseClientEdictHandler {
-  emit() {
+  emit(): void {
     const clent = this.clientEdict;
     const oldorg = clent.originPrevious;
+    const modelBits = clent.model?.flags ?? 0;
 
-    if ((clent.model.flags & modelFlags.MF_ROTATE) !== 0) {
+    if ((modelBits & modelFlags.MF_ROTATE) !== 0) {
       clent.angles[1] = Vector.anglemod(CL.state.time * 100.0);
     }
     if ((clent.effects & effect.EF_BRIGHTFIELD) !== 0) {
@@ -58,29 +58,29 @@ export class DefaultClientEdictHandler extends BaseClientEdictHandler {
       dl.die = CL.state.time + 0.001;
       // dl.color = new Vector(0.5, 0.5, 1.0);
     }
-    if ((clent.model.flags & modelFlags.MF_GIB) !== 0) {
+    if ((modelBits & modelFlags.MF_GIB) !== 0) {
       R.RocketTrail(oldorg, clent.origin, 2);
-    } else if ((clent.model.flags & modelFlags.MF_ZOMGIB) !== 0) {
+    } else if ((modelBits & modelFlags.MF_ZOMGIB) !== 0) {
       R.RocketTrail(oldorg, clent.origin, 4);
-    } else if ((clent.model.flags & modelFlags.MF_TRACER) !== 0) {
+    } else if ((modelBits & modelFlags.MF_TRACER) !== 0) {
       R.RocketTrail(oldorg, clent.origin, 3);
-    } else if ((clent.model.flags & modelFlags.MF_TRACER2) !== 0) {
+    } else if ((modelBits & modelFlags.MF_TRACER2) !== 0) {
       R.RocketTrail(oldorg, clent.origin, 5);
-    } else if ((clent.model.flags & modelFlags.MF_ROCKET) !== 0) {
+    } else if ((modelBits & modelFlags.MF_ROCKET) !== 0) {
       R.RocketTrail(oldorg, clent.origin, 0);
       const dl = CL.state.clientEntities.allocateDynamicLight(clent.num);
       dl.origin = new Vector(clent.origin[0], clent.origin[1], clent.origin[2]);
       dl.radius = 200.0;
       dl.die = CL.state.time + 0.01;
-    } else if ((clent.model.flags & modelFlags.MF_GRENADE) !== 0) {
+    } else if ((modelBits & modelFlags.MF_GRENADE) !== 0) {
       R.RocketTrail(oldorg, clent.origin, 1);
-    } else if ((clent.model.flags & modelFlags.MF_TRACER3) !== 0) {
+    } else if ((modelBits & modelFlags.MF_TRACER3) !== 0) {
       R.RocketTrail(oldorg, clent.origin, 6);
     }
   }
 
-  think() {
+  think(): void {
     // Default implementation does nothing.
     // Override this method in a subclass to provide custom logic.
   }
-};
+}
diff --git a/source/engine/client/ClientMessages.ts b/source/engine/client/ClientMessages.ts
index f071dd75..0d0aa039 100644
--- a/source/engine/client/ClientMessages.ts
+++ b/source/engine/client/ClientMessages.ts
@@ -5,7 +5,7 @@ import { PmovePlayer } from '../common/Pmove.ts';
 import { gameCapabilities } from '../../shared/Defs.ts';
 import { eventBus, getClientRegistry } from '../registry.mjs';
 import { HostError } from '../common/Errors.ts';
-import { ClientEdict } from './ClientEntities.mjs';
+import { ClientEdict } from './ClientEntities.ts';
 
 type ClientdataBitsReader = 'readLong' | 'readShort' | 'readByte';
 
diff --git a/source/engine/client/ClientServerCommandHandlers.mjs b/source/engine/client/ClientServerCommandHandlers.mjs
index 67923920..89fcbbb2 100644
--- a/source/engine/client/ClientServerCommandHandlers.mjs
+++ b/source/engine/client/ClientServerCommandHandlers.mjs
@@ -5,11 +5,14 @@ import { HostError } from '../common/Errors.ts';
 import { gameCapabilities } from '../../shared/Defs.ts';
 import Vector from '../../shared/Vector.ts';
 import { ClientEngineAPI } from '../common/GameAPIs.ts';
+import type { BrushModel } from '../common/Mod.ts';
 import { sharedCollisionModelSource } from '../common/CollisionModelSource.ts';
 import { eventBus, registry } from '../registry.mjs';
+import type { BaseModel } from '../common/model/BaseModel.ts';
 import { ScoreSlot } from './ClientState.ts';
+import type { SFX } from './Sound.mjs';
 
-import { legacyServerCommandHandlers, handleLegacyEntityUpdate } from './LegacyServerCommands.mjs';
+import { legacyServerCommandHandlers, handleLegacyEntityUpdate } from './LegacyServerCommands.ts';
 
 /** @typedef {typeof import('./CL.mjs').default} ClientLayer */
 /** @typedef {import('./ClientMessages.ts').ClientMessages} ClientMessages */
@@ -28,6 +31,10 @@ sharedCollisionModelSource.configureClient({
 /** Tracks entity updates during message parsing */
 let entitiesReceived = 0;
 
+function getModelSyncbase(model) {
+  return 'random' in model && model.random ? Math.random() : 0.0;
+}
+
 /**
  * Parses the serverdata payload and prepares the client for the new map.
  */
@@ -95,7 +102,7 @@ function parseServerData() {
   CL.SetConnectingStep(15, 'Received server info');
 
   let str;
-  let nummodels; const model_precache = [];
+  let nummodels; const model_precache = /** @type {string[]} */ ([]);
   for (nummodels = 1; ; nummodels++) {
     str = NET.message.readString();
     if (str.length === 0) {
@@ -103,7 +110,7 @@ function parseServerData() {
     }
     model_precache[nummodels] = str;
   }
-  let numsounds; const sound_precache = [];
+  let numsounds; const sound_precache = /** @type {string[]} */ ([]);
   for (numsounds = 1; ; numsounds++) {
     str = NET.message.readString();
     if (str.length === 0) {
@@ -113,7 +120,7 @@ function parseServerData() {
   }
 
   if (CL.gameCapabilities.includes(gameCapabilities.CAP_CLIENTDATA_DYNAMIC)) {
-    const clientdataFields = [];
+    const clientdataFields = /** @type {string[]} */ ([]);
 
     while (true) {
       const fields = NET.message.readString();
@@ -134,7 +141,7 @@ function parseServerData() {
         break;
       }
 
-      const fields = [];
+      const fields = /** @type {string[]} */ ([]);
 
       while (true) {
         const field = NET.message.readString();
@@ -146,8 +153,8 @@ function parseServerData() {
         fields.push(field);
       }
 
-      /** @type {'readByte' | 'readShort' | 'readLong' | null} */
-      let bitsReader = null;
+      /** @type {'readByte' | 'readShort' | 'readLong'} */
+      let bitsReader;
 
       console.assert(fields.length <= 32, 'entity fields must not have more than 32 fields');
 
@@ -168,8 +175,8 @@ function parseServerData() {
   CL.connection.processingServerDataState = 1;
 
   void (async () => {
-    const models = [null];
-    const sounds = [null];
+    const models = /** @type {(BaseModel | null)[]} */ ([null]);
+    const sounds = /** @type {(SFX | null)[]} */ ([null]);
 
     models[1] = await Mod.ForNameAsync(model_precache[1], false, Mod.scope.client);
     nummodels--;
@@ -202,7 +209,7 @@ function parseServerData() {
     CL.state.sound_precache.push(...sounds);
 
     CL.connection.processingServerDataState = 2;
-    CL.state.worldmodel = /** @type {import('../common/Mod.ts').BrushModel} */ (CL.state.model_precache[1]);
+    CL.state.worldmodel = /** @type {BrushModel} */ (CL.state.model_precache[1]);
     CL.pmove.setWorldmodel(CL.state.worldmodel);
     const ent = CL.state.clientEntities.getEntity(0);
     ent.classname = 'worldspawn';
@@ -271,7 +278,10 @@ function parseStartSoundPacket() {
   const channel = entchannel & 7;
   const pos = NET.message.readCoordVector();
 
-  S.StartSound(ent, channel, CL.state.sound_precache[soundNum], pos, volume / 255.0, attenuation);
+  const sound = CL.state.sound_precache[soundNum];
+  if (sound) {
+    S.StartSound(ent, channel, sound, pos, volume / 255.0, attenuation);
+  }
 }
 
 /**
@@ -281,7 +291,7 @@ function parseStaticEntity() {
   const ent = CL.state.clientEntities.allocateClientEntity(NET.message.readString());
   const modelindex = NET.message.readByte();
   ent.modelindex = modelindex;
-  ent.model = CL.state.model_precache[modelindex];
+  ent.model = CL.state.model_precache[modelindex] || null;
   ent.frame = NET.message.readByte();
   ent.colormap = NET.message.readByte();
   ent.skinnum = NET.message.readByte();
@@ -301,7 +311,10 @@ function parseStaticSound() {
   const soundId = NET.message.readByte();
   const vol = NET.message.readByte();
   const attn = NET.message.readByte();
-  S.StaticSound(CL.state.sound_precache[soundId], org, vol / 255.0, attn);
+  const sound = CL.state.sound_precache[soundId];
+  if (sound) {
+    S.StaticSound(sound, org, vol / 255.0, attn);
+  }
 }
 
 /**
@@ -332,7 +345,7 @@ function parseServerCvars() {
 
 /**
  * Parses beam-style temporary entities.
- * @param {import('../common/model/BaseModel.ts').BaseModel} model Model to attach to the beam.
+ * @param {BaseModel | null | undefined} model Model to attach to the beam.
  */
 function parseBeam(model) {
   const ent = NET.message.readShort();
@@ -485,7 +498,7 @@ function parsePacketEntities() {
       clent.frameTime = 0.0;
 
       if (clent.model) {
-        clent.syncbase = clent.model.random ? Math.random() : 0.0;
+        clent.syncbase = getModelSyncbase(clent.model);
       }
     }
 
@@ -976,10 +989,11 @@ function handleClientEvent() {
 function handleSetPortalState() {
   const portalNum = NET.message.readShort();
   const open = NET.message.readByte() !== 0;
+  console.assert(CL.state.worldmodel !== null, 'worldmodel must be available before changing portal state');
   CL.state.worldmodel.areaPortals.setPortalState(portalNum, open);
 }
 
-/** @type {Record<number, Function>} */
+/** @type {Partial<Record<number, () => void>>} */
 const serverCommandHandlers = {
   [Protocol.svc.nop]: handleNop,
   [Protocol.svc.time]: handleTime,
@@ -1073,7 +1087,14 @@ export function parseServerMessage() {
       continue;
     }
 
-    const command = CL.svc_strings.find(([, value]) => value === cmd)[0];
+    const commandEntry = CL.svc_strings.find(([, value]) => value === cmd);
+
+    if (!commandEntry) {
+      CL.PrintLastServerMessages();
+      throw new HostError(`CL.ParseServerMessage: Unknown server message ${cmd}`);
+    }
+
+    const command = commandEntry[0];
 
     if (CL.shownet.value === 2) {
       messages.push(command);
diff --git a/source/engine/client/ClientServerCommandHandlers.ts b/source/engine/client/ClientServerCommandHandlers.ts
new file mode 100644
index 00000000..d5d8b05d
--- /dev/null
+++ b/source/engine/client/ClientServerCommandHandlers.ts
@@ -0,0 +1,1208 @@
+import * as Protocol from '../network/Protocol.ts';
+import * as Def from '../common/Def.ts';
+import Cmd from '../common/Cmd.ts';
+import { HostError } from '../common/Errors.ts';
+import { gameCapabilities } from '../../shared/Defs.ts';
+import type { ClientGameInterface } from '../../shared/GameInterfaces.ts';
+import Vector from '../../shared/Vector.ts';
+import { ClientEngineAPI } from '../common/GameAPIs.ts';
+import type { BrushModel } from '../common/Mod.ts';
+import { sharedCollisionModelSource } from '../common/CollisionModelSource.ts';
+import { eventBus, getClientRegistry } from '../registry.mjs';
+import type { BaseModel } from '../common/model/BaseModel.ts';
+import { ScoreSlot } from './ClientState.ts';
+import type { SFX } from './Sound.mjs';
+
+import { legacyServerCommandHandlers, handleLegacyEntityUpdate } from './LegacyServerCommands.ts';
+
+type ClientSignonState = 0 | 1 | 2 | 3 | 4;
+
+let { CL, Con, SCR, S, R, V, Host, SV, NET, Mod, PR, COM } = getClientRegistry();
+
+eventBus.subscribe('registry.frozen', () => {
+  ({ CL, Con, SCR, S, R, V, Host, SV, NET, Mod, PR, COM } = getClientRegistry());
+});
+
+sharedCollisionModelSource.configureClient({
+  getWorldModel: () => CL?.state?.worldmodel ?? null,
+  getModels: () => CL?.state?.model_precache ?? null,
+});
+
+/** Tracks entity updates during message parsing */
+let entitiesReceived = 0;
+
+/**
+ * Stores a loaded precache slice while preserving Quake's sparse slot indexing.
+ * @param {T[]} target Precache target array.
+ * @param {number} startIndex First slot covered by the loaded slice.
+ * @param {Array<T | null>} loaded Loaded values, where null leaves the slot empty.
+ */
+function storeLoadedSlice<T>(target: T[], startIndex: number, loaded: Array<T | null>): void {
+  target.length = startIndex + loaded.length;
+
+  for (let offset = 0; offset < loaded.length; offset++) {
+    const value = loaded[offset];
+    if (value !== null) {
+      target[startIndex + offset] = value;
+    }
+  }
+}
+
+/** Marks the screen refdef as dirty for the next frame. */
+function markRefdefDirty(): void {
+  (SCR as typeof SCR & { recalc_refdef: boolean }).recalc_refdef = true;
+}
+
+/**
+ * Parses the serverdata payload and prepares the client for the new map.
+ */
+function parseServerData() {
+  Con.DPrint('Serverdata packet received.\n');
+  CL.ClearState();
+
+  const version = NET.message.readByte();
+
+  if (version !== Protocol.version) {
+    throw new HostError(`Server returned protocol version ${version}, not ${Protocol.version}\n`);
+  }
+
+  const isHavingClientQuakeJS = NET.message.readByte() === 1;
+
+  if (isHavingClientQuakeJS) {
+    Con.DPrint('Server is running QuakeJS with ClientGameAPI provided.\n');
+
+    if (!PR.QuakeJS?.ClientGameAPI) {
+      throw new HostError('Server is running QuakeJS with client code provided,\nbut client code is not imported.\nTry clearing your cache and connect again.');
+    }
+
+    const name = NET.message.readString();
+    const author = NET.message.readString();
+    const serverVersion = [NET.message.readByte(), NET.message.readByte(), NET.message.readByte()];
+
+    const identification = PR.QuakeJS.identification;
+
+    if (identification.name !== name || identification.author !== author) {
+      throw new HostError(`Cannot connect, game mismatch.\nThe server is running ${name}\nand you are running ${identification.name}.`);
+    }
+
+    if (!PR.QuakeJS.ClientGameAPI.IsServerCompatible(serverVersion)) {
+      throw new HostError(`Server (v${serverVersion.join('.')} ) is not compatible. You are running v${identification.version.join('.')}\nTry clearing your cache and connect again.`);
+    }
+
+    CL.state.gameAPI = Reflect.construct(PR.QuakeJS.ClientGameAPI, [ClientEngineAPI]) as ClientGameInterface;
+  } else {
+    const game = NET.message.readString();
+
+    if (game !== COM.game) {
+      throw new HostError(`Server is running game ${game}, not ${COM.game}\n`);
+    }
+
+    document.title = `${game} on ${Def.productName} (${Host.version?.string ?? 'unknown'})`;
+  }
+
+  CL.state.maxclients = NET.message.readByte();
+  if ((CL.state.maxclients <= 0) || (CL.state.maxclients > 32)) {
+    throw new HostError('Bad maxclients (' + CL.state.maxclients + ') from server!');
+  }
+
+  CL.state.scores.length = 0;
+
+  for (let i = 0; i < CL.state.maxclients; i++) {
+    CL.state.scores[i] = new ScoreSlot(i);
+  }
+
+  CL.state.levelname = NET.message.readString();
+
+  // parsePmovevars(CL);
+
+  Con.Print('\x02' + CL.state.levelname + '\n\n');
+
+  CL.SetConnectingStep(15, 'Received server info');
+
+  let str: string;
+  let nummodels: number;
+  const model_precache: string[] = [];
+  for (nummodels = 1; ; nummodels++) {
+    str = NET.message.readString();
+    if (str.length === 0) {
+      break;
+    }
+    model_precache[nummodels] = str;
+  }
+  let numsounds: number;
+  const sound_precache: string[] = [];
+  for (numsounds = 1; ; numsounds++) {
+    str = NET.message.readString();
+    if (str.length === 0) {
+      break;
+    }
+    sound_precache[numsounds] = str;
+  }
+
+  if (CL.gameCapabilities.includes(gameCapabilities.CAP_CLIENTDATA_DYNAMIC)) {
+    const clientdataFields: string[] = [];
+
+    while (true) {
+      const fields = NET.message.readString();
+      if (fields === '') {
+        break;
+      }
+      clientdataFields.push(fields);
+    }
+
+    CL.state.clientMessages.clientdataFields = clientdataFields;
+  }
+
+  if (CL.gameCapabilities.includes(gameCapabilities.CAP_ENTITY_EXTENDED)) {
+    while (true) {
+      const classname = NET.message.readString();
+
+      if (classname === '') {
+        break;
+      }
+
+      const fields: string[] = [];
+
+      while (true) {
+        const field = NET.message.readString();
+
+        if (field === '') {
+          break;
+        }
+
+        fields.push(field);
+      }
+
+      let bitsReader: 'readByte' | 'readShort' | 'readLong';
+
+      console.assert(fields.length <= 32, 'entity fields must not have more than 32 fields');
+
+      if (fields.length <= 8) {
+        bitsReader = 'readByte';
+      } else if (fields.length <= 16) {
+        bitsReader = 'readShort';
+      } else {
+        bitsReader = 'readLong';
+      }
+
+      if (fields.length > 0) {
+        CL.state.clientEntityFields[classname] = { fields, bitsReader };
+      }
+    }
+  }
+
+  CL.connection.processingServerDataState = 1;
+
+  void (async () => {
+    const models: BaseModel[] = [];
+    const sounds: SFX[] = [];
+    models.length = 1;
+    sounds.length = 1;
+
+    const worldModel = await Mod.ForNameAsync(model_precache[1], false, Mod.scope.client);
+    if (worldModel === null) {
+      throw new HostError(`Failed to load world model ${model_precache[1]}`);
+    }
+    models[1] = worldModel;
+    nummodels--;
+
+    while (nummodels > 0) {
+      const chunksize = Math.min(nummodels, 10);
+      nummodels -= chunksize;
+
+      CL.SetConnectingStep(25 + (models.length / model_precache.length) * 30, 'Loading models');
+      const modelStart = models.length;
+      const loadedModels = await Promise.all(model_precache.slice(modelStart, modelStart + chunksize).map((m) => Mod.ForNameAsync(m, false, Mod.scope.client)));
+      storeLoadedSlice(models, modelStart, loadedModels);
+
+      CL.SendCmd();
+    }
+
+    while (numsounds > 0) {
+      const chunksize = Math.min(numsounds, 10);
+      numsounds -= chunksize;
+      CL.SetConnectingStep(55 + (sounds.length / sound_precache.length) * 30, 'Loading sounds');
+      const soundStart = sounds.length;
+      const loadedSounds = await Promise.all(sound_precache.slice(soundStart, soundStart + chunksize).map((s) => S.PrecacheSoundAsync(s)));
+      storeLoadedSlice(sounds, soundStart, loadedSounds);
+
+      CL.SendCmd();
+    }
+
+    return { models, sounds };
+  })().then(({ models, sounds }) => {
+    CL.state.model_precache.length = 0;
+    CL.state.sound_precache.length = 0;
+
+    CL.state.model_precache.push(...models);
+    CL.state.sound_precache.push(...sounds);
+
+    CL.connection.processingServerDataState = 2;
+    CL.state.worldmodel = CL.state.model_precache[1] as BrushModel;
+    CL.pmove.setWorldmodel(CL.state.worldmodel);
+    const ent = CL.state.clientEntities.getEntity(0);
+    ent.classname = 'worldspawn';
+    ent.loadHandler();
+    ent.model = CL.state.worldmodel;
+    ent.spawn();
+    CL.SetConnectingStep(85, 'Preparing map');
+    CL.SendCmd();
+    R.NewMap();
+    CL.SendCmd();
+    Host.noclip_anglehack = false;
+    if (CL.state.gameAPI) {
+      CL.state.gameAPI.init();
+      if (CL.state.loadClientData && CL.state.loadClientData[0]) {
+        CL.state.gameAPI.loadGame(CL.state.loadClientData[0]);
+      }
+    }
+    if (CL.state.loadClientData && CL.state.loadClientData[1]) {
+      R.DeserializeParticles(CL.state.loadClientData[1]);
+    }
+    CL.state.loadClientData = null;
+  });
+}
+
+/**
+ * Reads pmove configuration values from the network stream.
+ */
+function parsePmovevars() {
+  const movevars = CL.pmove.movevars;
+  movevars.gravity = NET.message.readFloat();
+  movevars.stopspeed = NET.message.readFloat();
+  movevars.maxspeed = NET.message.readFloat();
+  movevars.spectatormaxspeed = NET.message.readFloat();
+  movevars.accelerate = NET.message.readFloat();
+  movevars.airaccelerate = NET.message.readFloat();
+  movevars.wateraccelerate = NET.message.readFloat();
+  movevars.friction = NET.message.readFloat();
+  movevars.waterfriction = NET.message.readFloat();
+  movevars.entgravity = NET.message.readFloat();
+
+  Con.DPrint('Reconfigured Pmovevars.\n');
+}
+
+/**
+ * Parses a lightstyle definition.
+ */
+function parseLightstylePacket() {
+  const index = NET.message.readByte();
+  if (index >= Def.limits.lightstyles) {
+    throw new HostError('svc_lightstyle > MAX_LIGHTSTYLES');
+  }
+
+  CL.state.clientEntities.setLightstyle(index, NET.message.readString());
+}
+
+/**
+ * Parses a spatialized sound start request.
+ */
+function parseStartSoundPacket() {
+  const fieldMask = NET.message.readByte();
+  const volume = ((fieldMask & 1) !== 0) ? NET.message.readByte() : 255;
+  const attenuation = ((fieldMask & 2) !== 0) ? NET.message.readByte() * 0.015625 : 1.0;
+  const entchannel = NET.message.readShort();
+  const soundNum = NET.message.readByte();
+  const ent = entchannel >> 3;
+  const channel = entchannel & 7;
+  const pos = NET.message.readCoordVector();
+
+  const sound = CL.state.sound_precache[soundNum];
+  if (sound) {
+    S.StartSound(ent, channel, sound, pos, volume / 255.0, attenuation);
+  }
+}
+
+/**
+ * Parses a static entity definition.
+ */
+function parseStaticEntity() {
+  const ent = CL.state.clientEntities.allocateClientEntity(NET.message.readString());
+  const modelindex = NET.message.readByte();
+  ent.modelindex = modelindex;
+  ent.model = CL.state.model_precache[modelindex] || null;
+  ent.frame = NET.message.readByte();
+  ent.colormap = NET.message.readByte();
+  ent.skinnum = NET.message.readByte();
+  ent.effects = NET.message.readByte();
+  ent.alpha = NET.message.readByte() / 255.0;
+  ent.solid = NET.message.readByte();
+  ent.angles.set(NET.message.readAngleVector());
+  ent.setOrigin(NET.message.readCoordVector());
+  ent.spawn();
+}
+
+/**
+ * Parses a static ambient sound definition.
+ */
+function parseStaticSound() {
+  const org = NET.message.readCoordVector();
+  const soundId = NET.message.readByte();
+  const vol = NET.message.readByte();
+  const attn = NET.message.readByte();
+  const sound = CL.state.sound_precache[soundId];
+  if (sound) {
+    S.StaticSound(sound, org, vol / 255.0, attn);
+  }
+}
+
+/**
+ * Applies server cvar updates.
+ */
+function parseServerCvars() {
+  let count = NET.message.readByte();
+
+  while (count-- > 0) {
+    const name = NET.message.readString();
+    const value = NET.message.readString();
+
+    CL.cls.serverInfo[name] = value;
+
+    if (CL.cls.signon === 4) {
+      if (CL.state.maxclients > 1) { // don’t bother printing cvar changes in single player
+        Con.Print(`"${name}" changed to "${value}"\n`);
+      }
+      eventBus.publish('client.server-info.updated', name, value);
+    }
+
+    // reset cheat cvars when sv_cheats is turned off
+    if (name === 'sv_cheats' && value === '0') {
+      CL.ResetCheatCvars();
+    }
+  }
+}
+
+/**
+ * Parses beam-style temporary entities.
+ * @param {BaseModel | null | undefined} model Model to attach to the beam.
+ */
+function parseBeam(model: BaseModel | null | undefined) {
+  const ent = NET.message.readShort();
+  const start = NET.message.readCoordVector();
+  const end = NET.message.readCoordVector();
+  if (!model) {
+    return;
+  }
+  for (let i = 0; i < Def.limits.beams; i++) {
+    const beam = CL.state.clientEntities.beams[i];
+    if (beam.entity !== ent) {
+      continue;
+    }
+    beam.model = model;
+    beam.endtime = CL.state.time + 0.2;
+    beam.start = start.copy();
+    beam.end = end.copy();
+    return;
+  }
+  for (let i = 0; i < Def.limits.beams; i++) {
+    const beam = CL.state.clientEntities.beams[i];
+    if ((beam.model !== null) && (beam.endtime >= CL.state.time)) {
+      continue;
+    }
+    beam.entity = ent;
+    beam.model = model;
+    beam.endtime = CL.state.time + 0.2;
+    beam.start = start.copy();
+    beam.end = end.copy();
+    return;
+  }
+  Con.PrintWarning('beam list overflow!\n');
+}
+
+/**
+ * Decodes temporary entities (explosions, splashes, etc.).
+ */
+function parseTemporaryEntity() {
+  const type = NET.message.readByte();
+
+  switch (type) {
+    case Protocol.te.lightning1:
+      parseBeam(CL.state.clientEntities.tempEntityModels['progs/bolt.mdl']);
+      return;
+    case Protocol.te.lightning2:
+      parseBeam(CL.state.clientEntities.tempEntityModels['progs/bolt2.mdl']);
+      return;
+    case Protocol.te.lightning3:
+      parseBeam(CL.state.clientEntities.tempEntityModels['progs/bolt3.mdl']);
+      return;
+    case Protocol.te.beam: // CR: this model does not exist
+      parseBeam(CL.state.clientEntities.tempEntityModels['progs/beam.mdl']);
+      return;
+  }
+
+  const pos = NET.message.readCoordVector();
+  const sounds = CL.state.clientEntities.tempEntitySounds;
+
+  switch (type) {
+    case Protocol.te.wizspike:
+      R.RunParticleEffect(pos, Vector.origin, 20, 20);
+      if (sounds.wizhit !== null) {
+        S.StartSound(-1, 0, sounds.wizhit, pos, 1.0, 1.0);
+      }
+      return;
+    case Protocol.te.knightspike:
+      R.RunParticleEffect(pos, Vector.origin, 226, 20);
+      if (sounds.knighthit !== null) {
+        S.StartSound(-1, 0, sounds.knighthit, pos, 1.0, 1.0);
+      }
+      return;
+    case Protocol.te.spike:
+      R.RunParticleEffect(pos, Vector.origin, 0, 10);
+      return;
+    case Protocol.te.superspike:
+      R.RunParticleEffect(pos, Vector.origin, 0, 20);
+      return;
+    case Protocol.te.gunshot:
+      R.RunParticleEffect(pos, Vector.origin, 0, 20);
+      return;
+    case Protocol.te.explosion: {
+      R.ParticleExplosion(pos);
+      const dl = CL.state.clientEntities.allocateDynamicLight(0);
+      dl.origin = pos.copy();
+      dl.radius = 350.0;
+      dl.die = CL.state.time + 0.5;
+      dl.decay = 300.0;
+      if (sounds.explosion !== null) {
+        S.StartSound(-1, 0, sounds.explosion, pos, 1.0, 1.0);
+      }
+    }
+      return;
+    case Protocol.te.tarexplosion:
+      R.BlobExplosion(pos);
+      if (sounds.explosion !== null) {
+        S.StartSound(-1, 0, sounds.explosion, pos, 1.0, 1.0);
+      }
+      return;
+    case Protocol.te.lavasplash:
+      R.LavaSplash(pos);
+      return;
+    case Protocol.te.teleport:
+      R.TeleportSplash(pos);
+      return;
+    case Protocol.te.explosion2: {
+      const colorStart = NET.message.readByte();
+      const colorLength = NET.message.readByte();
+      R.ParticleExplosion2(pos, colorStart, colorLength);
+      const dl = CL.state.clientEntities.allocateDynamicLight(0);
+      dl.origin = pos.copy();
+      dl.radius = 350.0;
+      dl.die = CL.state.time + 0.5;
+      dl.decay = 300.0;
+      if (sounds.explosion !== null) {
+        S.StartSound(-1, 0, sounds.explosion, pos, 1.0, 1.0);
+      }
+    }
+      return;
+  }
+
+  throw new Error(`CL.ParseTEnt: bad type ${type}`);
+}
+
+/**
+ * Applies entity deltas for the current frame.
+ */
+function parsePacketEntities() {
+  while (true) {
+    const edictNum = NET.message.readUint16();
+
+    if (edictNum === 0) {
+      break;
+    }
+
+    const clent = CL.state.clientEntities.getEntity(edictNum);
+
+    const bits = NET.message.readUint16();
+
+    if (bits & Protocol.u.classname) {
+      clent.classname = NET.message.readString();
+      clent.loadHandler();
+      clent.spawn();
+    }
+
+    if (bits & Protocol.u.free) {
+      clent.free = NET.message.readByte() !== 0;
+    }
+
+    if (bits & Protocol.u.frame) {
+      clent.framePrevious = clent.frame;
+      clent.frame = NET.message.readByte();
+    }
+
+    if (bits & Protocol.u.model) {
+      const modelindex = NET.message.readByte();
+      clent.modelindex = modelindex;
+      clent.model = CL.state.model_precache[modelindex] || null;
+
+      clent.framePrevious = null;
+      clent.frameTime = 0.0;
+
+      if (clent.model) {
+        clent.syncbase = clent.model.random ? Math.random() : 0.0;
+      }
+    }
+
+    if (bits & Protocol.u.colormap) {
+      clent.colormap = NET.message.readByte();
+    }
+
+    if (bits & Protocol.u.skin) {
+      clent.skinnum = NET.message.readByte();
+    }
+
+    if (bits & Protocol.u.effects) {
+      clent.effects = NET.message.readByte();
+      clent.alpha = NET.message.readByte() / 255.0;
+    }
+
+    if (bits & Protocol.u.solid) {
+      clent.solid = NET.message.readByte();
+    }
+
+    const origin = clent.msg_origins[0];
+    const angles = clent.msg_angles[0];
+    const velocity = clent.msg_velocity[0];
+
+    for (let i = 0; i < 3; i++) {
+      if (bits & (Protocol.u.origin1 << i)) {
+        origin[i] = NET.message.readCoord();
+      }
+
+      if (bits & (Protocol.u.angle1 << i)) {
+        angles[i] = NET.message.readAngle();
+        velocity[i] = NET.message.readCoord();
+      }
+    }
+
+    if (bits & Protocol.u.size) {
+      clent.maxs.set(NET.message.readCoordVector());
+      clent.mins.set(NET.message.readCoordVector());
+    }
+
+    if (bits & Protocol.u.nextthink) {
+      clent.nextthink = CL.state.clientMessages.mtime[0] + NET.message.readByte() / 255.0;
+    }
+
+    if (CL.gameCapabilities.includes(gameCapabilities.CAP_ENTITY_EXTENDED)) {
+      const classname = clent.classname;
+      const clientEntityFields = classname !== null ? CL.state.clientEntityFields[classname] : undefined;
+      if (clientEntityFields) {
+        // TODO: optimize this
+        const fieldbits = clientEntityFields.bitsReader === 'readByte'
+          ? NET.message.readByte()
+          : clientEntityFields.bitsReader === 'readShort'
+            ? NET.message.readShort()
+            : NET.message.readLong();
+
+        if (fieldbits > 0) {
+          const fields = [];
+
+          for (let i = 0; i < clientEntityFields.fields.length; i++) {
+            const field = clientEntityFields.fields[i];
+            if ((fieldbits & (1 << i)) !== 0) {
+              fields.push(field);
+            }
+          }
+
+          let counter = 0;
+
+          const values = NET.message.readSerializablesOnClient();
+
+          for (const value of values) {
+            clent.extended[fields[counter++]] = value;
+          }
+        }
+      }
+    }
+
+    const time = CL.state.clientMessages.mtime[0];
+
+    if (clent.nextthink > time) {
+      if (!clent.msg_origins[0].equals(clent.origin)) {
+        clent.originTime = time;
+        clent.originPrevious.set(clent.origin);
+      }
+
+      if (!clent.msg_angles[0].equals(clent.angles)) {
+        clent.anglesTime = time;
+        clent.anglesPrevious.set(clent.angles);
+      }
+
+      if (!clent.msg_velocity[0].equals(clent.velocity)) {
+        clent.velocityTime = time;
+        clent.velocityPrevious.set(clent.velocity);
+      }
+
+      if (bits & Protocol.u.frame) {
+        clent.frameTime = time;
+      }
+    }
+
+    clent.updatecount++;
+
+    clent.msg_origins[1].set(clent.msg_origins[0]);
+    clent.msg_angles[1].set(clent.msg_angles[0]);
+    clent.msg_velocity[1].set(clent.msg_velocity[0]);
+
+    if (clent.free) {
+      clent.freeEdict();
+    }
+  }
+}
+
+/**
+ * Handles svc_nop – intentionally does nothing.
+ */
+function handleNop() { }
+
+/**
+ * Handles svc_time by forwarding to the high-level parser.
+ */
+function handleTime() {
+  CL.state.clientMessages.parseTime();
+}
+
+/**
+ * Handles svc_clientdata and populates the incremental client snapshot.
+ */
+function handleClientData() {
+  CL.state.clientMessages.parseClient();
+}
+
+/**
+ * Validates the negotiated protocol version and aborts if mismatched.
+ */
+function handleVersion() {
+  const protocol = NET.message.readLong();
+  if (protocol !== Protocol.version) {
+    throw new HostError(`CL.ParseServerMessage: Server is protocol ${protocol} instead of ${Protocol.version}\n`);
+  }
+}
+
+/**
+ * Processes svc_disconnect by surfacing the server-supplied message.
+ */
+function handleDisconnect() {
+  Host.EndGame(`Server disconnected: ${NET.message.readString()}`);
+}
+
+/**
+ * Routes svc_print text through the console.
+ */
+function handlePrint() {
+  Con.Print(NET.message.readString());
+}
+
+/**
+ * Displays server-sent center print text and mirrors it to the console.
+ */
+function handleCenterPrint() {
+  const string = NET.message.readString();
+  SCR.CenterPrint(string);
+  Con.Print(`\x03${string}\n`); // TODO: have a better system for this
+}
+
+/**
+ * Handles chat payloads and appends them to the client chat log.
+ */
+function handleChatMessage() {
+  CL.AppendChatMessage(NET.message.readString(), NET.message.readString(), NET.message.readByte() === 1);
+}
+
+/**
+ * Concatenates svc_stufftext into the pending console buffer.
+ */
+function handleStuffText() {
+  Cmd.text += NET.message.readString();
+}
+
+/**
+ * Delegates svc_damage to the view module so it can spawn impacts.
+ */
+function handleDamage() {
+  const armor = NET.message.readByte();
+  const blood = NET.message.readByte();
+  const origin = NET.message.readCoordVector();
+  V.ApplyDamage(armor, blood, origin);
+}
+
+/**
+ * Parses svc_serverdata and reinitializes renderer state.
+ */
+function handleServerData() {
+  markRefdefDirty();
+
+  // peak into the serverdata message to detect legacy demos and route to the old handlers if needed
+  if (new DataView(NET.message.data).getUint32(1, true) === 15) {
+    const handleLegacyServerData = legacyServerCommandHandlers[Protocol.svc.serverdata];
+    if (handleLegacyServerData) {
+      handleLegacyServerData();
+      return;
+    }
+  }
+
+  parseServerData();
+}
+
+/**
+ * Processes map transitions and resets client signon state.
+ */
+function handleChangeLevel() {
+  const mapname = NET.message.readString();
+  CL.SetConnectingStep(5, 'Changing level to ' + mapname);
+  CL.cls.signon = 0;
+  CL.cls.changelevel = true;
+}
+
+/**
+ * Updates the authoritative view angles of the local player.
+ */
+function handleSetAngle() {
+  CL.state.viewangles.set(NET.message.readAngleVector());
+}
+
+/**
+ * Selects the entity the client should render from.
+ */
+function handleSetView() {
+  CL.state.viewentity = NET.message.readShort();
+}
+
+/**
+ * Updates lightstyle definitions used for dynamic lighting.
+ */
+function handleLightStyle() {
+  parseLightstylePacket();
+}
+
+/**
+ * Triggers spatialized sounds for the given entity/channel tuple.
+ */
+function handleSound() {
+  parseStartSoundPacket();
+}
+
+/**
+ * Stops a currently playing sound for an entity/channel pair.
+ */
+function handleStopSound() {
+  const value = NET.message.readShort();
+  S.StopSound(value >> 3, value & 7);
+}
+
+/**
+ * Updates the server-specified sound precache entry.
+ */
+function handleLoadSound() {
+  const index = NET.message.readByte();
+  const sound = S.PrecacheSound(NET.message.readString());
+  if (sound === null) {
+    return;
+  }
+  CL.state.sound_precache[index] = sound;
+  Con.DPrint(`CL.ParseServerMessage: load sound "${CL.state.sound_precache[index].name}" (${CL.state.sound_precache[index].state}) on slot ${index}\n`);
+}
+
+/**
+ * Mirrors scoreboard name updates and broadcasts change events.
+ */
+function handleUpdateName() {
+  const slot = NET.message.readByte();
+  if (slot >= CL.state.maxclients) {
+    throw new HostError('CL.ParseServerMessage: svc_updatename > MAX_SCOREBOARD');
+  }
+  const newName = NET.message.readString();
+  if (CL.state.scores[slot].name !== '' && newName !== '' && newName !== CL.state.scores[slot].name) {
+    Con.Print(`${CL.state.scores[slot].name} renamed to ${newName}\n`);
+    eventBus.publish('client.players.name-changed', slot, CL.state.scores[slot].name, newName);
+  }
+  CL.state.scores[slot].name = newName;
+}
+
+/**
+ * Updates frag counts for a player and notifies listeners.
+ */
+function handleUpdateFrags() {
+  const slot = NET.message.readByte();
+  if (slot >= CL.state.maxclients) {
+    throw new HostError('CL.ParseServerMessage: svc_updatefrags > MAX_SCOREBOARD');
+  }
+  CL.state.scores[slot].frags = NET.message.readShort();
+  eventBus.publish('client.players.frags-updated', slot, CL.state.scores[slot].frags);
+}
+
+/**
+ * Updates color indices for a player and notifies listeners.
+ */
+function handleUpdateColors() {
+  const slot = NET.message.readByte();
+  if (slot >= CL.state.maxclients) {
+    throw new HostError('CL.ParseServerMessage: svc_updatecolors > MAX_SCOREBOARD');
+  }
+  CL.state.scores[slot].colors = NET.message.readByte();
+  eventBus.publish('client.players.colors-updated', slot, CL.state.scores[slot].colors);
+}
+
+/**
+ * Updates ping information for a player.
+ */
+function handleUpdatePings() {
+  const slot = NET.message.readByte();
+  if (slot >= CL.state.maxclients) {
+    throw new HostError('CL.ParseServerMessage: svc_updatepings > MAX_SCOREBOARD');
+  }
+  CL.state.scores[slot].ping = NET.message.readShort() / 10;
+}
+
+/**
+ * Spawns particle effects from svc_particle payloads.
+ */
+function handleParticle() {
+  const org = NET.message.readCoordVector();
+  const dir = NET.message.readCoordVector();
+  const msgcount = NET.message.readByte();
+  const color = NET.message.readByte();
+  if (msgcount === 255) {
+    R.ParticleExplosion(org);
+  } else {
+    R.RunParticleEffect(org, dir, color, msgcount);
+  }
+}
+
+/**
+ * Placeholder for svc_spawnbaseline which is not implemented yet.
+ */
+function handleSpawnBaseline() {
+  console.assert(false, 'spawnbaseline is not implemented');
+}
+
+/**
+ * Adds a static entity to the scene.
+ */
+function handleSpawnStatic() {
+  parseStaticEntity();
+}
+
+/**
+ * Parses temporary entities such as explosions and beam effects.
+ */
+function handleTempEntity() {
+  parseTemporaryEntity();
+}
+
+/**
+ * Toggles the paused state and publishes pause events.
+ */
+function handleSetPause() {
+  CL.state.paused = NET.message.readByte() !== 0;
+  if (CL.state.paused) {
+    eventBus.publish('client.paused');
+  } else {
+    eventBus.publish('client.unpaused');
+  }
+}
+
+/**
+ * Tracks the server signon phase and advances the handshake.
+ */
+function handleSignonNum() {
+  const signon = NET.message.readByte();
+  if (signon <= CL.cls.signon) {
+    throw new HostError('Received signon ' + signon + ' when at ' + CL.cls.signon);
+  }
+  console.assert(signon >= 0 && signon <= 4, 'signon must be in range 0-4');
+  CL.cls.signon = signon as ClientSignonState;
+  Con.DPrint(`Received signon ${signon}\n`);
+  CL.SignonReply();
+}
+
+/**
+ * Increments the monster kill statistic.
+ */
+function handleKilledMonster() {
+  console.assert(SV.server.gameCapabilities.includes(gameCapabilities.CAP_CLIENTDATA_UPDATESTAT), 'killedmonster requires CAP_LEGACY_UPDATESTAT');
+  CL.state.stats[Def.stat.monsters]++;
+}
+
+/**
+ * Increments the secret discovery statistic.
+ */
+function handleFoundSecret() {
+  console.assert(SV.server.gameCapabilities.includes(gameCapabilities.CAP_CLIENTDATA_UPDATESTAT), 'foundsecret requires CAP_LEGACY_UPDATESTAT');
+  CL.state.stats[Def.stat.secrets]++;
+}
+
+/**
+ * Updates an individual HUD/statistic entry.
+ */
+function handleUpdateStat() {
+  console.assert(SV.server.gameCapabilities.includes(gameCapabilities.CAP_CLIENTDATA_UPDATESTAT), 'updatestat requires CAP_LEGACY_UPDATESTAT');
+  const index = NET.message.readByte();
+  console.assert(index >= 0 && index < CL.state.stats.length, 'updatestat must be in range');
+  CL.state.stats[index] = NET.message.readLong();
+}
+
+/**
+ * Queues a static ambient sound.
+ */
+function handleSpawnStaticSound() {
+  parseStaticSound();
+}
+
+/**
+ * Starts or overrides the current CD track.
+ */
+function handleCdTrack() {
+  CL.state.cdtrack = NET.message.readByte();
+  NET.message.readByte(); // unused (usually always the same as cdtrack)
+
+  if (((CL.cls.demoplayback === true) || (CL.cls.demorecording === true)) && (CL.cls.forcetrack !== -1)) {
+    eventBus.publish('client.cdtrack', CL.cls.forcetrack);
+  } else {
+    eventBus.publish('client.cdtrack', CL.state.cdtrack);
+  }
+}
+
+/**
+ * Enters the intermission state.
+ */
+function handleIntermission() {
+  CL.state.intermission = 1;
+  CL.state.completed_time = CL.state.time;
+  markRefdefDirty();
+}
+
+/**
+ * Displays the finale text block.
+ */
+function handleFinale() {
+  CL.state.intermission = 2;
+  CL.state.completed_time = CL.state.time;
+  markRefdefDirty();
+  SCR.CenterPrint(NET.message.readString());
+}
+
+/**
+ * Plays a cutscene by showing a center print.
+ */
+function handleCutscene() {
+  CL.state.intermission = 3;
+  CL.state.completed_time = CL.state.time;
+  markRefdefDirty();
+  SCR.CenterPrint(NET.message.readString());
+}
+
+/**
+ * Calls the help command when the server requests the sell screen.
+ */
+function handleSellScreen() {
+  void Cmd.ExecuteString('help');
+}
+
+/**
+ * Updates client-only movement variables such as gravity.
+ */
+function handlePmoveVars() {
+  parsePmovevars();
+}
+
+/**
+ * Updates player-specific interpolation data.
+ */
+function handlePlayerInfo() {
+  CL.state.clientMessages.parsePlayer();
+}
+
+/**
+ * Applies delta compressed packet entities.
+ */
+function handleDeltaPacketEntities() {
+  entitiesReceived++;
+  parsePacketEntities();
+}
+
+/**
+ * Applies server-sent configuration variables.
+ */
+function handleCvar() {
+  parseServerCvars();
+}
+
+/**
+ * Passes custom client events to the game API.
+ */
+function handleClientEvent() {
+  console.assert(CL.state.gameAPI !== null, 'ClientGameAPI required');
+  CL.state.clientMessages.parseClientEvent();
+}
+
+/**
+ * Updates portal state.
+ */
+function handleSetPortalState() {
+  const portalNum = NET.message.readShort();
+  const open = NET.message.readByte() !== 0;
+  const worldmodel = CL.state.worldmodel;
+  console.assert(worldmodel !== null, 'worldmodel must be available before changing portal state');
+  if (worldmodel === null) {
+    return;
+  }
+  worldmodel.areaPortals.setPortalState(portalNum, open);
+}
+
+const serverCommandHandlers: Partial<Record<number, () => void>> = {
+  [Protocol.svc.nop]: handleNop,
+  [Protocol.svc.time]: handleTime,
+  [Protocol.svc.clientdata]: handleClientData,
+  [Protocol.svc.version]: handleVersion,
+  [Protocol.svc.disconnect]: handleDisconnect,
+  [Protocol.svc.print]: handlePrint,
+  [Protocol.svc.centerprint]: handleCenterPrint,
+  [Protocol.svc.chatmsg]: handleChatMessage,
+  [Protocol.svc.stufftext]: handleStuffText,
+  [Protocol.svc.damage]: handleDamage,
+  [Protocol.svc.serverdata]: handleServerData,
+  [Protocol.svc.changelevel]: handleChangeLevel,
+  [Protocol.svc.setangle]: handleSetAngle,
+  [Protocol.svc.setview]: handleSetView,
+  [Protocol.svc.lightstyle]: handleLightStyle,
+  [Protocol.svc.sound]: handleSound,
+  [Protocol.svc.stopsound]: handleStopSound,
+  [Protocol.svc.loadsound]: handleLoadSound,
+  [Protocol.svc.updatename]: handleUpdateName,
+  [Protocol.svc.updatefrags]: handleUpdateFrags,
+  [Protocol.svc.updatecolors]: handleUpdateColors,
+  [Protocol.svc.updatepings]: handleUpdatePings,
+  [Protocol.svc.particle]: handleParticle,
+  [Protocol.svc.spawnbaseline]: handleSpawnBaseline,
+  [Protocol.svc.spawnstatic]: handleSpawnStatic,
+  [Protocol.svc.temp_entity]: handleTempEntity,
+  [Protocol.svc.setpause]: handleSetPause,
+  [Protocol.svc.signonnum]: handleSignonNum,
+  [Protocol.svc.killedmonster]: handleKilledMonster,
+  [Protocol.svc.foundsecret]: handleFoundSecret,
+  [Protocol.svc.updatestat]: handleUpdateStat,
+  [Protocol.svc.spawnstaticsound]: handleSpawnStaticSound,
+  [Protocol.svc.cdtrack]: handleCdTrack,
+  [Protocol.svc.intermission]: handleIntermission,
+  [Protocol.svc.finale]: handleFinale,
+  [Protocol.svc.cutscene]: handleCutscene,
+  [Protocol.svc.sellscreen]: handleSellScreen,
+  [Protocol.svc.pmovevars]: handlePmoveVars,
+  [Protocol.svc.playerinfo]: handlePlayerInfo,
+  [Protocol.svc.deltapacketentities]: handleDeltaPacketEntities,
+  [Protocol.svc.cvar]: handleCvar,
+  [Protocol.svc.clientevent]: handleClientEvent,
+  [Protocol.svc.setportalstate]: handleSetPortalState,
+};
+
+/**
+ * Dispatches one in-flight server message through dedicated opcode handlers.
+ */
+export function parseServerMessage() {
+  if (CL.shownet.value === 1) {
+    Con.Print('NET: ' + NET.message.cursize + ' bytes\n');
+  }
+
+  CL.state.onground = false;
+
+  if (CL.connection.processingServerDataState === 1) {
+    return;
+  }
+
+  entitiesReceived = 0;
+
+  if (CL.connection.processingServerDataState === 3) {
+    CL.connection.processingServerDataState = 0;
+  } else {
+    CL.connection.lastServerMessages.length = 0;
+    NET.message.beginReading();
+  }
+
+  const messages: string[] = [];
+
+  while (CL.cls.state > Def.clientConnectionState.disconnected) {
+    if (CL.connection.processingServerDataState > 0) {
+      break;
+    }
+
+    if (NET.message.badread === true) {
+      CL.PrintLastServerMessages();
+      throw new HostError('CL.ParseServerMessage: Bad server message');
+    }
+
+    const cmd = NET.message.readByte();
+
+    if (cmd === -1) {
+      break;
+    }
+
+    // legacy demo playback: high bit of command byte indicates an entity delta
+    if (CL.cls.legacy_demo && (cmd & 0x80)) {
+      handleLegacyEntityUpdate(cmd & 0x7F);
+      continue;
+    }
+
+    const commandEntry = (CL.svc_strings ?? []).find(([, value]) => value === cmd);
+
+    if (!commandEntry) {
+      CL.PrintLastServerMessages();
+      throw new HostError(`CL.ParseServerMessage: Unknown server message ${cmd}`);
+    }
+
+    const command = commandEntry[0];
+
+    if (CL.shownet.value === 2) {
+      messages.push(command);
+    }
+
+    CL.connection.lastServerMessages.push(command);
+    if (CL.connection.lastServerMessages.length > 10) {
+      CL.connection.lastServerMessages.shift();
+    }
+
+    const handler = (CL.cls.legacy_demo && legacyServerCommandHandlers[cmd]) ? legacyServerCommandHandlers[cmd] : serverCommandHandlers[cmd];
+
+    if (handler) {
+      handler();
+      continue;
+    }
+
+    CL.connection.lastServerMessages.pop();
+    CL.PrintLastServerMessages();
+    throw new HostError('CL.ParseServerMessage: Illegible server message\n');
+  }
+
+  if (entitiesReceived > 0) {
+    if (CL.cls.signon === 3) {
+      CL.cls.signon = 4;
+      CL.SignonReply();
+    }
+  }
+
+  // CL.state.clientEntities.setSolidEntities(CL.pmove);
+
+  if (CL.shownet.value === 2) {
+    Con.Print(`NET: (${NET.message.cursize}) ${messages.join(', ')}\n`);
+  }
+}
+
+export {
+  handleNop,
+  handleTime,
+  handlePrint,
+  handleCenterPrint,
+  handleStuffText,
+  handleSetView,
+  handleLightStyle,
+  handleStopSound,
+  handleUpdateName,
+  handleUpdateFrags,
+  handleUpdateColors,
+  handleSetPause,
+  handleSignonNum,
+  handleCdTrack,
+  handleIntermission,
+  handleFinale,
+  handleCutscene,
+  handleSellScreen,
+};
diff --git a/source/engine/client/ClientState.ts b/source/engine/client/ClientState.ts
index ab8d5169..39ca394d 100644
--- a/source/engine/client/ClientState.ts
+++ b/source/engine/client/ClientState.ts
@@ -8,7 +8,7 @@ import type { BrushModel } from '../common/Mod.ts';
 import type { ClientGameInterface, ClientSerializableType, SFX } from '../../shared/GameInterfaces.ts';
 import type ClientDemos from './ClientDemos.ts';
 import { EventBus, eventBus, getClientRegistry } from '../registry.mjs';
-import ClientEntities, { ClientEdict } from './ClientEntities.mjs';
+import ClientEntities, { ClientEdict } from './ClientEntities.ts';
 import { ClientMessages } from './ClientMessages.ts';
 
 type ClientConnectionProgress = {
diff --git a/source/engine/client/LegacyServerCommands.mjs b/source/engine/client/LegacyServerCommands.mjs
index c1248f97..b09fffce 100644
--- a/source/engine/client/LegacyServerCommands.mjs
+++ b/source/engine/client/LegacyServerCommands.mjs
@@ -2,8 +2,11 @@ import * as Protocol from '../network/Protocol.ts';
 import * as Def from '../common/Def.ts';
 import { HostError } from '../common/Errors.ts';
 import { eventBus, registry } from '../registry.mjs';
+import type { BrushModel } from '../common/Mod.ts';
+import type { BaseModel } from '../common/model/BaseModel.ts';
 import { ScoreSlot } from './ClientState.ts';
 import Vector from '../../shared/Vector.ts';
+import type { SFX } from './Sound.mjs';
 import {
   handleNop,
   handleTime,
@@ -23,7 +26,7 @@ import {
   handleFinale,
   handleCutscene,
   handleSellScreen,
-} from './ClientServerCommandHandlers.mjs';
+} from './ClientServerCommandHandlers.ts';
 
 /** @typedef {typeof import('./CL.mjs').default} ClientLayer */
 
@@ -119,20 +122,17 @@ function readLegacyAngleVector() {
 
 // ── Entity Baselines ────────────────────────────────────────────────────────
 
-/**
- * @typedef {{
- *   modelindex: number,
- *   frame: number,
- *   colormap: number,
- *   skin: number,
- *   effects: number,
- *   origin: Float32Array,
- *   angles: Float32Array,
- * }} LegacyBaseline
- */
+type LegacyBaseline = {
+  modelindex: number;
+  frame: number;
+  colormap: number;
+  skin: number;
+  effects: number;
+  origin: Float32Array;
+  angles: Float32Array;
+};
 
-/** @type {Array<LegacyBaseline>} */
-const legacyBaselines = [];
+const legacyBaselines: LegacyBaseline[] = [];
 
 /**
  * Returns the stored baseline for the given entity number, creating a blank one if needed.
@@ -154,6 +154,10 @@ function getBaseline(num) {
   return legacyBaselines[num];
 }
 
+function getModelSyncbase(model) {
+  return 'random' in model && model.random ? Math.random() : 0.0;
+}
+
 // ── svc_serverdata (11) ─────────────────────────────────────────────────────
 // WinQuake wire format:
 //   long    protocol version (must be 15)
@@ -194,7 +198,7 @@ function handleLegacyServerData() {
   CL.SetConnectingStep(15, 'Received server info');
 
   // Read model precache list (strings terminated by empty string)
-  const model_precache = [];
+  const model_precache = /** @type {string[]} */ ([]);
   for (let nummodels = 1; ; nummodels++) {
     const str = NET.message.readString();
     if (str.length === 0) {
@@ -204,7 +208,7 @@ function handleLegacyServerData() {
   }
 
   // Read sound precache list (strings terminated by empty string)
-  const sound_precache = [];
+  const sound_precache = /** @type {string[]} */ ([]);
   for (let numsounds = 1; ; numsounds++) {
     const str = NET.message.readString();
     if (str.length === 0) {
@@ -217,8 +221,8 @@ function handleLegacyServerData() {
   CL.connection.processingServerDataState = 1;
 
   void (async () => {
-    const models = [null];
-    const sounds = [null];
+    const models = /** @type {(BaseModel | null)[]} */ ([null]);
+    const sounds = /** @type {(SFX | null)[]} */ ([null]);
 
     // Load world model first
     models[1] = await Mod.ForNameAsync(model_precache[1], false, Mod.scope.client);
@@ -255,18 +259,18 @@ function handleLegacyServerData() {
     CL.state.sound_precache = sounds;
 
     CL.connection.processingServerDataState = 2;
-    CL.state.worldmodel = /** @type {import('../common/Mod.ts').BrushModel} */ (CL.state.model_precache[1]);
+    CL.state.worldmodel = /** @type {BrushModel} */ (CL.state.model_precache[1]);
     CL.pmove.setWorldmodel(CL.state.worldmodel);
 
     const ent = CL.state.clientEntities.getEntity(0);
     ent.classname = 'worldspawn';
     ent.loadHandler();
-    ent.model = CL.state.model_precache[1];
+    ent.model = CL.state.model_precache[1] || null;
     ent.spawn();
 
     R.NewMap();
   }).catch((e) => {
-    Con.Print(e.stack);
+    Con.Print(e instanceof Error ? (e.stack ?? e.message) : String(e));
     throw new HostError('Legacy ServerData loading failed');
   });
 }
@@ -321,7 +325,7 @@ function handleLegacySpawnStatic() {
 
   const ent = CL.state.clientEntities.allocateClientEntity('static_entity');
   ent.modelindex = modelindex;
-  ent.model = CL.state.model_precache[modelindex];
+  ent.model = CL.state.model_precache[modelindex] || null;
   ent.frame = frame;
   ent.colormap = colormap;
   ent.skinnum = skin;
@@ -425,7 +429,7 @@ export function handleLegacyEntityUpdate(bits) {
   if (model !== clent.model) {
     clent.model = model;
     if (model) {
-      clent.syncbase = model.random ? Math.random() : 0.0;
+      clent.syncbase = getModelSyncbase(model);
     } else {
       clent.forcelink = true;
     }
@@ -538,7 +542,10 @@ function handleLegacySound() {
   const channel = entchannel & 7;
   const pos = readLegacyCoordVector();
 
-  S.StartSound(ent, channel, CL.state.sound_precache[soundNum], pos, volume / 255.0, attenuation);
+  const sound = CL.state.sound_precache[soundNum];
+  if (sound) {
+    S.StartSound(ent, channel, sound, pos, volume / 255.0, attenuation);
+  }
 }
 
 // ── svc_damage (19) ─────────────────────────────────────────────────────────
@@ -581,7 +588,7 @@ function handleLegacyParticle() {
 
 /**
  * Parses a beam entity from the message buffer.
- * @param {import('../common/model/BaseModel.ts').BaseModel} model beam model to use
+ * @param {BaseModel | null | undefined} model beam model to use
  */
 function parseLegacyBeam(model) {
   const ent = NET.message.readShort();
@@ -709,7 +716,10 @@ function handleLegacySpawnStaticSound() {
   const soundId = NET.message.readByte();
   const vol = NET.message.readByte();
   const attn = NET.message.readByte();
-  S.StaticSound(CL.state.sound_precache[soundId], org, vol / 255.0, attn);
+  const sound = CL.state.sound_precache[soundId];
+  if (sound) {
+    S.StaticSound(sound, org, vol / 255.0, attn);
+  }
 }
 
 // ── svc_killedmonster / svc_foundsecret / svc_updatestat ────────────────────
@@ -742,7 +752,7 @@ function handleLegacyUpdateStat() {
 // Only WinQuake svc commands (0–34).  QuakeShack-only opcodes (≥101) are
 // omitted because a WinQuake demo will never emit them.
 
-/** @type {Record<number, Function>} */
+/** @type {Partial<Record<number, () => void>>} */
 export const legacyServerCommandHandlers = {
   [Protocol.svc.nop]: handleNop,
   [Protocol.svc.time]: handleTime,
diff --git a/source/engine/client/LegacyServerCommands.ts b/source/engine/client/LegacyServerCommands.ts
new file mode 100644
index 00000000..e688aba6
--- /dev/null
+++ b/source/engine/client/LegacyServerCommands.ts
@@ -0,0 +1,830 @@
+import * as Protocol from '../network/Protocol.ts';
+import * as Def from '../common/Def.ts';
+import { HostError } from '../common/Errors.ts';
+import { eventBus, getClientRegistry } from '../registry.mjs';
+import type { BrushModel } from '../common/Mod.ts';
+import type { BaseModel } from '../common/model/BaseModel.ts';
+import { ScoreSlot } from './ClientState.ts';
+import Vector from '../../shared/Vector.ts';
+import type { SFX } from './Sound.mjs';
+import {
+  handleNop,
+  handleTime,
+  handlePrint,
+  handleCenterPrint,
+  handleStuffText,
+  handleSetView,
+  handleLightStyle,
+  handleStopSound,
+  handleUpdateName,
+  handleUpdateFrags,
+  handleUpdateColors,
+  handleSetPause,
+  handleSignonNum,
+  handleCdTrack,
+  handleIntermission,
+  handleFinale,
+  handleCutscene,
+  handleSellScreen,
+} from './ClientServerCommandHandlers.ts';
+
+let { CL, Con, NET, Mod, S, R, V, Host } = getClientRegistry();
+
+eventBus.subscribe('registry.frozen', () => {
+  ({ CL, Con, NET, Mod, S, R, V, Host } = getClientRegistry());
+});
+
+// TRIGGER WARNING: this content has been completely produced by Claude Opus 4.6
+//                  it’s only here, because I want the original demos working again --CR
+
+// ── WinQuake SU_ Client Data Update Bits ────────────────────────────────────
+// Note: bit 8 is unused in WinQuake, so ITEMS starts at bit 9.
+const enum SU {
+  VIEWHEIGHT = 1 << 0,
+  IDEALPITCH = 1 << 1,
+  PUNCH1 = 1 << 2,
+  PUNCH2 = 1 << 3,
+  PUNCH3 = 1 << 4,
+  VELOCITY1 = 1 << 5,
+  VELOCITY2 = 1 << 6,
+  VELOCITY3 = 1 << 7,
+  // bit 8 unused
+  ITEMS = 1 << 9,
+  ONGROUND = 1 << 10,
+  INWATER = 1 << 11,
+  WEAPONFRAME = 1 << 12,
+  ARMOR = 1 << 13,
+  WEAPON = 1 << 14,
+}
+
+// ── WinQuake U_ Entity Update Bits ──────────────────────────────────────────
+const enum U {
+  MOREBITS = 1 << 0,
+  ORIGIN1 = 1 << 1,
+  ORIGIN2 = 1 << 2,
+  ORIGIN3 = 1 << 3,
+  ANGLE2 = 1 << 4,
+  NOLERP = 1 << 5,
+  FRAME = 1 << 6,
+  SIGNAL = 1 << 7,
+  ANGLE1 = 1 << 8,
+  ANGLE3 = 1 << 9,
+  MODEL = 1 << 10,
+  COLORMAP = 1 << 11,
+  SKIN = 1 << 12,
+  EFFECTS = 1 << 13,
+  LONGENTITY = 1 << 14,
+}
+
+// ── WinQuake SND_ Sound Flags ───────────────────────────────────────────────
+const enum SND {
+  VOLUME = 1 << 0,
+  ATTENUATION = 1 << 1,
+}
+
+// ── Legacy Coordinate / Angle Helpers ───────────────────────────────────────
+// WinQuake coords: 16-bit short × (1/8)    = 2 bytes
+// WinQuake angles: 8-bit byte × (360/256)  = 1 byte
+
+/**
+ * Reads a WinQuake coordinate (short / 8).
+ * @returns {number} the decoded coordinate
+ */
+function readLegacyCoord(): number {
+  return NET.message.readShort() * (1.0 / 8.0);
+}
+
+/**
+ * Reads a WinQuake angle (byte × 360/256).
+ * @returns {number} the decoded angle in degrees
+ */
+function readLegacyAngle(): number {
+  return NET.message.readByte() * (360.0 / 256.0);
+}
+
+/**
+ * Reads 3 WinQuake coordinates as a Vector.
+ * @returns {Vector} xyz coordinate vector
+ */
+function readLegacyCoordVector(): Vector {
+  return new Vector(readLegacyCoord(), readLegacyCoord(), readLegacyCoord());
+}
+
+/**
+ * Reads 3 WinQuake angles as a Vector.
+ * @returns {Vector} pitch/yaw/roll angle vector
+ */
+function readLegacyAngleVector(): Vector {
+  return new Vector(readLegacyAngle(), readLegacyAngle(), readLegacyAngle());
+}
+
+// ── Entity Baselines ────────────────────────────────────────────────────────
+
+interface LegacyBaseline {
+  modelindex: number;
+  frame: number;
+  colormap: number;
+  skin: number;
+  effects: number;
+  origin: Float32Array;
+  angles: Float32Array;
+}
+
+const legacyBaselines: LegacyBaseline[] = [];
+
+/**
+ * Returns the stored baseline for the given entity number, creating a blank one if needed.
+ * @param {number} num entity number
+ * @returns {LegacyBaseline} the baseline record
+ */
+function getBaseline(num: number): LegacyBaseline {
+  if (!legacyBaselines[num]) {
+    legacyBaselines[num] = {
+      modelindex: 0,
+      frame: 0,
+      colormap: 0,
+      skin: 0,
+      effects: 0,
+      origin: new Float32Array(3),
+      angles: new Float32Array(3),
+    };
+  }
+  return legacyBaselines[num];
+}
+
+/**
+ * Returns the random-sync seed for models that support randomized animation starts.
+ * @param {BaseModel} model Model assigned to the entity.
+ * @returns {number} Sync seed to store on the client entity.
+ */
+function getModelSyncbase(model: BaseModel): number {
+  return model.random ? Math.random() : 0.0;
+}
+
+/**
+ * Stores a loaded precache slice while preserving Quake's sparse slot indexing.
+ * @param {T[]} target Precache target array.
+ * @param {number} startIndex First slot covered by the loaded slice.
+ * @param {Array<T | null>} loaded Loaded values, where null leaves the slot empty.
+ */
+function storeLoadedSlice<T>(target: T[], startIndex: number, loaded: Array<T | null>): void {
+  target.length = startIndex + loaded.length;
+
+  for (let offset = 0; offset < loaded.length; offset++) {
+    const value = loaded[offset];
+    if (value !== null) {
+      target[startIndex + offset] = value;
+    }
+  }
+}
+
+// ── svc_serverdata (11) ─────────────────────────────────────────────────────
+// WinQuake wire format:
+//   long    protocol version (must be 15)
+//   byte    maxclients
+//   byte    gametype (0=coop, 1=dm)
+//   string  level name
+//   strings model precache list (empty string terminates)
+//   strings sound precache list (empty string terminates)
+
+/**
+ * Parses WinQuake svc_serverdata and reinitializes client state for legacy demo playback.
+ */
+function handleLegacyServerData() {
+  Con.DPrint('Legacy Serverdata packet received.\n');
+  CL.ClearState();
+  CL.cls.legacy_demo = true;
+  legacyBaselines.length = 0;
+
+  const protocol = NET.message.readLong();
+  if (protocol !== 15) {
+    throw new HostError(`Legacy server returned protocol ${protocol}, not 15`);
+  }
+
+  const maxclients = NET.message.readByte();
+  CL.state.maxclients = maxclients;
+
+  CL.state.scores.length = 0;
+  for (let i = 0; i < CL.state.maxclients; i++) {
+    CL.state.scores[i] = new ScoreSlot(i);
+  }
+
+  NET.message.readByte(); // skip gametype, not used by the client
+
+  CL.state.levelname = NET.message.readString();
+
+  Con.Print('\x02' + CL.state.levelname + '\n\n');
+
+  CL.SetConnectingStep(15, 'Received server info');
+
+  // Read model precache list (strings terminated by empty string)
+  const model_precache: string[] = [];
+  for (let nummodels = 1; ; nummodels++) {
+    const str = NET.message.readString();
+    if (str.length === 0) {
+      break;
+    }
+    model_precache[nummodels] = str;
+  }
+
+  // Read sound precache list (strings terminated by empty string)
+  const sound_precache: string[] = [];
+  for (let numsounds = 1; ; numsounds++) {
+    const str = NET.message.readString();
+    if (str.length === 0) {
+      break;
+    }
+    sound_precache[numsounds] = str;
+  }
+
+  // Async asset loading
+  CL.connection.processingServerDataState = 1;
+
+  void (async () => {
+    const models: BaseModel[] = [];
+    const sounds: SFX[] = [];
+    models.length = 1;
+    sounds.length = 1;
+
+    // Load world model first
+    const worldModel = await Mod.ForNameAsync(model_precache[1], false, Mod.scope.client);
+    if (worldModel === null) {
+      throw new HostError(`Failed to load world model ${model_precache[1]}`);
+    }
+    models[1] = worldModel;
+
+    // Load remaining models in chunks
+    while (models.length < model_precache.length) {
+      const remaining = model_precache.slice(models.length);
+      const chunksize = Math.min(remaining.length, 10);
+      if (chunksize === 0) {
+        break;
+      }
+      CL.SetConnectingStep(25 + (models.length / model_precache.length) * 30, 'Loading models');
+      const modelStart = models.length;
+      const loaded = await Promise.all(remaining.slice(0, chunksize).map((m) => Mod.ForNameAsync(m, false, Mod.scope.client)));
+      storeLoadedSlice(models, modelStart, loaded);
+      CL.SendCmd();
+    }
+
+    // Load sounds in chunks
+    while (sounds.length < sound_precache.length) {
+      const remaining = sound_precache.slice(sounds.length);
+      const chunksize = Math.min(remaining.length, 10);
+      if (chunksize === 0) {
+        break;
+      }
+      CL.SetConnectingStep(55 + (sounds.length / sound_precache.length) * 30, 'Loading sounds');
+      const soundStart = sounds.length;
+      const loaded = await Promise.all(remaining.slice(0, chunksize).map((s) => S.PrecacheSoundAsync(s)));
+      storeLoadedSlice(sounds, soundStart, loaded);
+      CL.SendCmd();
+    }
+
+    return { models, sounds };
+  })().then(({ models, sounds }) => {
+    CL.state.model_precache.length = 0;
+    CL.state.sound_precache.length = 0;
+
+    CL.state.model_precache.push(...models);
+    CL.state.sound_precache.push(...sounds);
+
+    CL.connection.processingServerDataState = 2;
+    CL.state.worldmodel = CL.state.model_precache[1] as BrushModel;
+    CL.pmove.setWorldmodel(CL.state.worldmodel);
+
+    const ent = CL.state.clientEntities.getEntity(0);
+    ent.classname = 'worldspawn';
+    ent.loadHandler();
+    ent.model = CL.state.model_precache[1] || null;
+    ent.spawn();
+
+    R.NewMap();
+  }).catch((e) => {
+    Con.Print(e instanceof Error ? (e.stack ?? e.message) : String(e));
+    throw new HostError('Legacy ServerData loading failed');
+  });
+}
+
+// ── svc_spawnbaseline (22) ──────────────────────────────────────────────────
+// WinQuake wire format:
+//   short   entity number
+//   byte    modelindex
+//   byte    frame
+//   byte    colormap
+//   byte    skin
+//   3× (coord, angle)  origin[i], angles[i]   – interleaved
+
+/**
+ * Parses a WinQuake svc_spawnbaseline and stores the entity baseline.
+ */
+function handleLegacySpawnBaseline() {
+  const entnum = NET.message.readShort();
+  const baseline = getBaseline(entnum);
+
+  baseline.modelindex = NET.message.readByte();
+  baseline.frame = NET.message.readByte();
+  baseline.colormap = NET.message.readByte();
+  baseline.skin = NET.message.readByte();
+
+  for (let i = 0; i < 3; i++) {
+    baseline.origin[i] = readLegacyCoord();
+    baseline.angles[i] = readLegacyAngle();
+  }
+}
+
+// ── svc_spawnstatic (20) ────────────────────────────────────────────────────
+// Same baseline wire format as spawnbaseline (without the entity number).
+// WinQuake copies baseline → entity after parsing.
+
+/**
+ * Parses a WinQuake svc_spawnstatic and creates a static client entity.
+ */
+function handleLegacySpawnStatic() {
+  const modelindex = NET.message.readByte();
+  const frame = NET.message.readByte();
+  const colormap = NET.message.readByte();
+  const skin = NET.message.readByte();
+
+  const org = new Vector();
+  const ang = new Vector();
+
+  for (let i = 0; i < 3; i++) {
+    org[i] = readLegacyCoord();
+    ang[i] = readLegacyAngle();
+  }
+
+  const ent = CL.state.clientEntities.allocateClientEntity('static_entity');
+  ent.modelindex = modelindex;
+  ent.model = CL.state.model_precache[modelindex] || null;
+  ent.frame = frame;
+  ent.colormap = colormap;
+  ent.skinnum = skin;
+  ent.setOrigin(org);
+  ent.angles.set(ang);
+  ent.spawn();
+}
+
+// ── svc_clientdata (15) ─────────────────────────────────────────────────────
+// WinQuake wire format:
+//   short   bitmask
+//   per-axis (i=0..2): punchangle[i] if SU_PUNCHn (char), velocity[i] if SU_VELOCITYn (char×16)
+//   long    items (ALWAYS sent)
+//   if SU_WEAPONFRAME: byte
+//   if SU_ARMOR: byte
+//   if SU_WEAPON: byte
+//   short   health (ALWAYS)
+//   byte    ammo (ALWAYS)
+//   4× byte shells/nails/rockets/cells (ALWAYS)
+//   byte    activeweapon (ALWAYS)
+// Note: SU_ONGROUND and SU_INWATER are pure bit flags – no data follows.
+
+/**
+ * Parses WinQuake svc_clientdata with correct bit layout and read order.
+ */
+function handleLegacyClientData() {
+  const bits = NET.message.readShort();
+
+  CL.state.viewheight = (bits & SU.VIEWHEIGHT) ? NET.message.readChar() : 22;
+  CL.state.idealpitch = (bits & SU.IDEALPITCH) ? NET.message.readChar() : 0;
+
+  // WinQuake interleaves punchangle[i] and velocity[i] per axis
+  for (let i = 0; i < 3; i++) {
+    CL.state.punchangle[i] = (bits & (SU.PUNCH1 << i)) ? NET.message.readChar() : 0;
+    // Read velocity from the wire to keep the buffer in sync (not used for prediction)
+    if (bits & (SU.VELOCITY1 << i)) {
+      NET.message.readChar();
+    }
+  }
+
+  // Items are ALWAYS sent (unconditional long)
+  CL.state.items = NET.message.readLong();
+
+  // Onground / inwater are pure bit flags – no data bytes follow
+  CL.state.onground = (bits & SU.ONGROUND) !== 0;
+  CL.state.inwater = (bits & SU.INWATER) !== 0;
+
+  // Conditional stats
+  CL.state.stats[Def.stat.weaponframe] = (bits & SU.WEAPONFRAME) ? NET.message.readByte() : 0;
+  CL.state.stats[Def.stat.armor] = (bits & SU.ARMOR) ? NET.message.readByte() : 0;
+  CL.state.stats[Def.stat.weapon] = (bits & SU.WEAPON) ? NET.message.readByte() : 0;
+
+  // Always-sent stats
+  CL.state.stats[Def.stat.health] = NET.message.readShort();
+  CL.state.stats[Def.stat.ammo] = NET.message.readByte();
+  CL.state.stats[Def.stat.shells] = NET.message.readByte();
+  CL.state.stats[Def.stat.nails] = NET.message.readByte();
+  CL.state.stats[Def.stat.rockets] = NET.message.readByte();
+  CL.state.stats[Def.stat.cells] = NET.message.readByte();
+
+  // Active weapon (always sent)
+  CL.state.stats[Def.stat.activeweapon] = NET.message.readByte();
+}
+
+// ── Entity Update (fast update, cmd & 0x80) ────────────────────────────────
+// When the high bit of the command byte is set, the low 7 bits are the
+// initial update flags.  This is the WinQuake CL_ParseUpdate equivalent.
+
+/**
+ * Parses a WinQuake entity update.  Called when the high bit of the command
+ * byte is set.
+ * @param {number} bits initial update bits (low 7 bits of command byte)
+ */
+export function handleLegacyEntityUpdate(bits: number): void {
+  // Advance signon on first entity update  (SIGNONS - 1 → SIGNONS)
+  if (CL.cls.signon === 3) {
+    CL.cls.signon = 4;
+    CL.SignonReply();
+  }
+
+  // Extended bits
+  if (bits & U.MOREBITS) {
+    bits |= NET.message.readByte() << 8;
+  }
+
+  // Entity number
+  const num = (bits & U.LONGENTITY) ? NET.message.readShort() : NET.message.readByte();
+
+  const clent = CL.state.clientEntities.getEntity(num);
+  const baseline = getBaseline(num);
+
+  // Detect whether the entity was present in the previous server frame.
+  // If not, we cannot interpolate from a previous position.
+  const forcelink = (clent.msgtime !== CL.state.clientMessages.mtime[1]);
+  clent.msgtime = CL.state.clientMessages.mtime[0];
+
+  // Model
+  const modelindex = (bits & U.MODEL) ? NET.message.readByte() : baseline.modelindex;
+  clent.modelindex = modelindex;
+  const model = CL.state.model_precache[modelindex] || null;
+  if (model !== clent.model) {
+    clent.model = model;
+    if (model) {
+      clent.syncbase = getModelSyncbase(model);
+    } else {
+      clent.forcelink = true;
+    }
+  }
+
+  // Frame, colormap, skin, effects
+  clent.frame = (bits & U.FRAME) ? NET.message.readByte() : baseline.frame;
+  clent.colormap = (bits & U.COLORMAP) ? NET.message.readByte() : baseline.colormap;
+  clent.skinnum = (bits & U.SKIN) ? NET.message.readByte() : baseline.skin;
+  clent.effects = (bits & U.EFFECTS) ? NET.message.readByte() : baseline.effects;
+
+  // Shift interpolation history
+  clent.msg_origins[1].set(clent.msg_origins[0]);
+  clent.msg_angles[1].set(clent.msg_angles[0]);
+
+  // Origin / angle – interleaved per axis (WinQuake order)
+  clent.msg_origins[0][0] = (bits & U.ORIGIN1) ? readLegacyCoord() : baseline.origin[0];
+  clent.msg_angles[0][0]  = (bits & U.ANGLE1)  ? readLegacyAngle() : baseline.angles[0];
+
+  clent.msg_origins[0][1] = (bits & U.ORIGIN2) ? readLegacyCoord() : baseline.origin[1];
+  clent.msg_angles[0][1]  = (bits & U.ANGLE2)  ? readLegacyAngle() : baseline.angles[1];
+
+  clent.msg_origins[0][2] = (bits & U.ORIGIN3) ? readLegacyCoord() : baseline.origin[2];
+  clent.msg_angles[0][2]  = (bits & U.ANGLE3)  ? readLegacyAngle() : baseline.angles[2];
+
+  // U_NOLERP: server explicitly says don’t interpolate (e.g. teleport)
+  if (bits & U.NOLERP) {
+    clent.forcelink = true;
+  }
+
+  // Set up lerp: assume next server frame in +0.1s
+  const shouldSnap = forcelink || clent.forcelink;
+  const mtime0 = CL.state.clientMessages.mtime[0];
+
+  if (shouldSnap) {
+    // Entity just appeared or teleported – snap to current position
+    clent.msg_origins[1].set(clent.msg_origins[0]);
+    clent.msg_angles[1].set(clent.msg_angles[0]);
+    clent.origin.set(clent.msg_origins[0]);
+    clent.originPrevious.setTo(Infinity, Infinity, Infinity);
+    clent.angles.set(clent.msg_angles[0]);
+    clent.anglesPrevious.setTo(Infinity, Infinity, Infinity);
+  } else {
+    // Smooth transition from current to new target
+    clent.originPrevious.set(clent.origin);
+    clent.originTime = mtime0;
+    clent.origin.set(clent.msg_origins[0]);
+    clent.anglesPrevious.set(clent.angles);
+    clent.anglesTime = mtime0;
+    clent.angles.set(clent.msg_angles[0]);
+  }
+
+  clent.nextthink = mtime0 + 0.1; // 100ms is the default QuakeC state machine logic frame interval
+  clent.forcelink = false;
+  clent.updatecount++;
+}
+
+// ── svc_disconnect (2) ──────────────────────────────────────────────────────
+// WinQuake sends no additional data with disconnect.
+
+/**
+ * Handles WinQuake svc_disconnect (no additional data on the wire).
+ */
+function handleLegacyDisconnect() {
+  Host.EndGame('Server disconnected\n');
+}
+
+// ── svc_version (4) ─────────────────────────────────────────────────────────
+
+/**
+ * Validates the WinQuake protocol version (must be 15).
+ */
+function handleLegacyVersion() {
+  const protocol = NET.message.readLong();
+  if (protocol !== 15) {
+    throw new HostError(`CL.ParseServerMessage: Server is protocol ${protocol} instead of 15\n`);
+  }
+}
+
+// ── svc_setangle (10) ───────────────────────────────────────────────────────
+// WinQuake angles are 1 byte each (byte × 360/256).
+
+/**
+ * Updates the authoritative view angles using WinQuake 1-byte angle precision.
+ */
+function handleLegacySetAngle() {
+  CL.state.viewangles.set(readLegacyAngleVector());
+}
+
+// ── svc_sound (6) ───────────────────────────────────────────────────────────
+// WinQuake wire format:
+//   byte    field_mask (SND_ flags)
+//   if SND_VOLUME: byte
+//   if SND_ATTENUATION: byte (÷64)
+//   short   entity<<3 | channel
+//   byte    sound_num
+//   3× coord  position
+
+/**
+ * Parses a WinQuake svc_sound with legacy coordinate precision.
+ */
+function handleLegacySound() {
+  const fieldMask = NET.message.readByte();
+  const volume = (fieldMask & SND.VOLUME) ? NET.message.readByte() : 255;
+  const attenuation = (fieldMask & SND.ATTENUATION) ? NET.message.readByte() / 64.0 : 1.0;
+
+  const entchannel = NET.message.readShort();
+  const soundNum = NET.message.readByte();
+  const ent = entchannel >> 3;
+  const channel = entchannel & 7;
+  const pos = readLegacyCoordVector();
+
+  const sound = CL.state.sound_precache[soundNum];
+  if (sound) {
+    S.StartSound(ent, channel, sound, pos, volume / 255.0, attenuation);
+  }
+}
+
+// ── svc_damage (19) ─────────────────────────────────────────────────────────
+
+/**
+ * Delegates WinQuake svc_damage with legacy coordinate precision.
+ */
+function handleLegacyDamage() {
+  const armor = NET.message.readByte();
+  const blood = NET.message.readByte();
+  const origin = readLegacyCoordVector();
+  V.ApplyDamage(armor, blood, origin);
+}
+
+// ── svc_particle (18) ───────────────────────────────────────────────────────
+// WinQuake: origin is 3× ReadCoord, direction is 3× ReadChar × (1/16).
+
+/**
+ * Parses WinQuake svc_particle with legacy coords and signed-char direction.
+ */
+function handleLegacyParticle() {
+  const org = readLegacyCoordVector();
+  // WinQuake direction: 3× signed char × (1/16)
+  const dir = new Vector(
+    NET.message.readChar() * 0.0625,
+    NET.message.readChar() * 0.0625,
+    NET.message.readChar() * 0.0625,
+  );
+  const msgcount = NET.message.readByte();
+  const color = NET.message.readByte();
+
+  if (msgcount === 255) {
+    R.ParticleExplosion(org);
+  } else {
+    R.RunParticleEffect(org, dir, color, msgcount);
+  }
+}
+
+// ── svc_temp_entity (23) ────────────────────────────────────────────────────
+
+/**
+ * Parses a beam entity from the message buffer.
+ * @param {BaseModel | null | undefined} model beam model to use
+ */
+function parseLegacyBeam(model: BaseModel | null | undefined): void {
+  const ent = NET.message.readShort();
+  const start = readLegacyCoordVector();
+  const end = readLegacyCoordVector();
+
+  if (!model) {
+    return;
+  }
+
+  for (let i = 0; i < Def.limits.beams; i++) {
+    const beam = CL.state.clientEntities.beams[i];
+    if (beam.entity !== ent) {
+      continue;
+    }
+    beam.model = model;
+    beam.endtime = CL.state.time + 0.2;
+    beam.start = start.copy();
+    beam.end = end.copy();
+    return;
+  }
+
+  for (let i = 0; i < Def.limits.beams; i++) {
+    const beam = CL.state.clientEntities.beams[i];
+    if ((beam.model !== null) && (beam.endtime >= CL.state.time)) {
+      continue;
+    }
+    beam.entity = ent;
+    beam.model = model;
+    beam.endtime = CL.state.time + 0.2;
+    beam.start = start.copy();
+    beam.end = end.copy();
+    return;
+  }
+
+  Con.Print('beam list overflow!\n');
+}
+
+/**
+ * Parses a WinQuake svc_temp_entity with legacy coordinate precision.
+ */
+function handleLegacyTempEntity() {
+  const type = NET.message.readByte();
+
+  switch (type) {
+    case Protocol.te.lightning1:
+      parseLegacyBeam(CL.state.clientEntities.tempEntityModels['progs/bolt.mdl']);
+      return;
+    case Protocol.te.lightning2:
+      parseLegacyBeam(CL.state.clientEntities.tempEntityModels['progs/bolt2.mdl']);
+      return;
+    case Protocol.te.lightning3:
+      parseLegacyBeam(CL.state.clientEntities.tempEntityModels['progs/bolt3.mdl']);
+      return;
+    case Protocol.te.beam:
+      parseLegacyBeam(CL.state.clientEntities.tempEntityModels['progs/beam.mdl']);
+      return;
+  }
+
+  const pos = readLegacyCoordVector();
+  const sounds = CL.state.clientEntities.tempEntitySounds;
+
+  switch (type) {
+    case Protocol.te.wizspike:
+      R.RunParticleEffect(pos, Vector.origin, 20, 20);
+      if (sounds.wizhit !== null) {
+        S.StartSound(-1, 0, sounds.wizhit, pos, 1.0, 1.0);
+      }
+      return;
+    case Protocol.te.knightspike:
+      R.RunParticleEffect(pos, Vector.origin, 226, 20);
+      if (sounds.knighthit !== null) {
+        S.StartSound(-1, 0, sounds.knighthit, pos, 1.0, 1.0);
+      }
+      return;
+    case Protocol.te.spike:
+      R.RunParticleEffect(pos, Vector.origin, 0, 10);
+      return;
+    case Protocol.te.superspike:
+      R.RunParticleEffect(pos, Vector.origin, 0, 20);
+      return;
+    case Protocol.te.gunshot:
+      R.RunParticleEffect(pos, Vector.origin, 0, 20);
+      return;
+    case Protocol.te.explosion: {
+      R.ParticleExplosion(pos);
+      const dl = CL.state.clientEntities.allocateDynamicLight(0);
+      dl.origin = pos.copy();
+      dl.radius = 350.0;
+      dl.die = CL.state.time + 0.5;
+      dl.decay = 300.0;
+      if (sounds.explosion !== null) {
+        S.StartSound(-1, 0, sounds.explosion, pos, 1.0, 1.0);
+      }
+      }
+      return;
+    case Protocol.te.tarexplosion:
+      R.BlobExplosion(pos);
+      if (sounds.explosion !== null) {
+        S.StartSound(-1, 0, sounds.explosion, pos, 1.0, 1.0);
+      }
+      return;
+    case Protocol.te.lavasplash:
+      R.LavaSplash(pos);
+      return;
+    case Protocol.te.teleport:
+      R.TeleportSplash(pos);
+      return;
+    case Protocol.te.explosion2: {
+      const colorStart = NET.message.readByte();
+      const colorLength = NET.message.readByte();
+      R.ParticleExplosion2(pos, colorStart, colorLength);
+      const dl = CL.state.clientEntities.allocateDynamicLight(0);
+      dl.origin = pos.copy();
+      dl.radius = 350.0;
+      dl.die = CL.state.time + 0.5;
+      dl.decay = 300.0;
+      if (sounds.explosion !== null) {
+        S.StartSound(-1, 0, sounds.explosion, pos, 1.0, 1.0);
+      }
+      }
+      return;
+  }
+
+  throw new Error(`CL.ParseTEnt: bad type ${type}`);
+}
+
+// ── svc_spawnstaticsound (29) ───────────────────────────────────────────────
+
+/**
+ * Parses WinQuake svc_spawnstaticsound with legacy coordinate precision.
+ */
+function handleLegacySpawnStaticSound() {
+  const org = readLegacyCoordVector();
+  const soundId = NET.message.readByte();
+  const vol = NET.message.readByte();
+  const attn = NET.message.readByte();
+  const sound = CL.state.sound_precache[soundId];
+  if (sound) {
+    S.StaticSound(sound, org, vol / 255.0, attn);
+  }
+}
+
+// ── svc_killedmonster / svc_foundsecret / svc_updatestat ────────────────────
+// Legacy versions without gameCapabilities assertions (not available during
+// demo playback).
+
+/**
+ * Increments the monster kill statistic (no gameCapabilities check for legacy demos).
+ */
+function handleLegacyKilledMonster() {
+  CL.state.stats[Def.stat.monsters]++;
+}
+
+/**
+ * Increments the secret discovery statistic (no gameCapabilities check for legacy demos).
+ */
+function handleLegacyFoundSecret() {
+  CL.state.stats[Def.stat.secrets]++;
+}
+
+/**
+ * Updates an individual HUD statistic entry (no gameCapabilities check for legacy demos).
+ */
+function handleLegacyUpdateStat() {
+  const index = NET.message.readByte();
+  CL.state.stats[index] = NET.message.readLong();
+}
+
+// ── Handler Table ───────────────────────────────────────────────────────────
+// Only WinQuake svc commands (0–34).  QuakeShack-only opcodes (≥101) are
+// omitted because a WinQuake demo will never emit them.
+
+export const legacyServerCommandHandlers: Partial<Record<number, () => void>> = {
+  [Protocol.svc.nop]: handleNop,
+  [Protocol.svc.time]: handleTime,
+  [Protocol.svc.clientdata]: handleLegacyClientData,
+  [Protocol.svc.version]: handleLegacyVersion,
+  [Protocol.svc.disconnect]: handleLegacyDisconnect,
+  [Protocol.svc.print]: handlePrint,
+  [Protocol.svc.centerprint]: handleCenterPrint,
+  [Protocol.svc.stufftext]: handleStuffText,
+  [Protocol.svc.damage]: handleLegacyDamage,
+  [Protocol.svc.serverdata]: handleLegacyServerData,
+  [Protocol.svc.setangle]: handleLegacySetAngle,
+  [Protocol.svc.setview]: handleSetView,
+  [Protocol.svc.lightstyle]: handleLightStyle,
+  [Protocol.svc.sound]: handleLegacySound,
+  [Protocol.svc.stopsound]: handleStopSound,
+  [Protocol.svc.updatename]: handleUpdateName,
+  [Protocol.svc.updatefrags]: handleUpdateFrags,
+  [Protocol.svc.updatecolors]: handleUpdateColors,
+  [Protocol.svc.particle]: handleLegacyParticle,
+  [Protocol.svc.spawnbaseline]: handleLegacySpawnBaseline,
+  [Protocol.svc.spawnstatic]: handleLegacySpawnStatic,
+  [Protocol.svc.temp_entity]: handleLegacyTempEntity,
+  [Protocol.svc.setpause]: handleSetPause,
+  [Protocol.svc.signonnum]: handleSignonNum,
+  [Protocol.svc.killedmonster]: handleLegacyKilledMonster,
+  [Protocol.svc.foundsecret]: handleLegacyFoundSecret,
+  [Protocol.svc.updatestat]: handleLegacyUpdateStat,
+  [Protocol.svc.spawnstaticsound]: handleLegacySpawnStaticSound,
+  [Protocol.svc.cdtrack]: handleCdTrack,
+  [Protocol.svc.intermission]: handleIntermission,
+  [Protocol.svc.finale]: handleFinale,
+  [Protocol.svc.cutscene]: handleCutscene,
+  [Protocol.svc.sellscreen]: handleSellScreen,
+};
diff --git a/source/engine/client/R.mjs b/source/engine/client/R.mjs
index feb8c671..7f1f7f27 100644
--- a/source/engine/client/R.mjs
+++ b/source/engine/client/R.mjs
@@ -20,7 +20,7 @@ import PostProcess from './renderer/PostProcess.mjs';
 import BloomEffect from './renderer/BloomEffect.mjs';
 import WarpEffect from './renderer/WarpEffect.mjs';
 import ShadowMap from './renderer/ShadowMap.mjs';
-import { ClientDlight, ClientEdict } from './ClientEntities.mjs';
+import { ClientDlight, ClientEdict } from './ClientEntities.ts';
 import { avertexnormals } from '../common/model/loaders/AliasMDLLoader.ts';
 import { SkyRenderer } from './renderer/Sky.mjs';
 
diff --git a/source/engine/client/renderer/AliasModelRenderer.mjs b/source/engine/client/renderer/AliasModelRenderer.mjs
index 16311f87..8301a66c 100644
--- a/source/engine/client/renderer/AliasModelRenderer.mjs
+++ b/source/engine/client/renderer/AliasModelRenderer.mjs
@@ -46,7 +46,7 @@ export class AliasModelRenderer extends ModelRenderer {
 
   /**
    * @param {import('../../common/model/AliasModel.ts').AliasModel} _model The alias model
-   * @param {import('../ClientEntities.mjs').ClientEdict} entity The entity being rendered
+   * @param {import('../ClientEntities.ts').ClientEdict} entity The entity being rendered
    * @returns {boolean} True when this alias model should render in the opaque pass
    */
   rendersOpaquePass(_model, entity) {
@@ -55,7 +55,7 @@ export class AliasModelRenderer extends ModelRenderer {
 
   /**
    * @param {import('../../common/model/AliasModel.ts').AliasModel} _model The alias model
-   * @param {import('../ClientEntities.mjs').ClientEdict} entity The entity being rendered
+   * @param {import('../ClientEntities.ts').ClientEdict} entity The entity being rendered
    * @returns {boolean} True when this alias model should render in the sorted transparent pass
    */
   rendersTransparentPass(_model, entity) {
@@ -66,7 +66,7 @@ export class AliasModelRenderer extends ModelRenderer {
    * Render a single alias model entity.
    * Handles frustum culling, frame interpolation, skinning, and player color translation.
    * @param {import('../../common/model/AliasModel.ts').AliasModel} model The alias model to render
-   * @param {import('../ClientEntities.mjs').ClientEdict} entity The entity being rendered
+   * @param {import('../ClientEntities.ts').ClientEdict} entity The entity being rendered
    * @param {number} pass Rendering pass (0=opaque, 1=transparent)
    */
   render(model, entity, pass = 0) {
@@ -183,7 +183,7 @@ export class AliasModelRenderer extends ModelRenderer {
   /**
    * Select animation frames for rendering with interpolation
    * @param {import('../../common/model/AliasModel.ts').AliasModel} clmodel The alias model
-   * @param {import('../ClientEntities.mjs').ClientEdict} e The entity
+   * @param {import('../ClientEntities.ts').ClientEdict} e The entity
    * @returns {{frameA: object, frameB: object, targettime: number}} Selected frames and interpolation factor
    */
   static _selectFrames(clmodel, e) {
@@ -231,7 +231,7 @@ export class AliasModelRenderer extends ModelRenderer {
    * Select skin texture for rendering (handles skin groups and animation)
    * @private
    * @param {import('../../common/model/AliasModel.ts').AliasModel} clmodel The alias model
-   * @param {import('../ClientEntities.mjs').ClientEdict} e The entity
+   * @param {import('../ClientEntities.ts').ClientEdict} e The entity
    * @returns {object} Selected skin texture
    */
   _selectSkin(clmodel, e) {
diff --git a/source/engine/client/renderer/BrushModelRenderer.mjs b/source/engine/client/renderer/BrushModelRenderer.mjs
index 17782912..0fa53e87 100644
--- a/source/engine/client/renderer/BrushModelRenderer.mjs
+++ b/source/engine/client/renderer/BrushModelRenderer.mjs
@@ -5,7 +5,7 @@ import GL, { ATTRIB_LOCATIONS, BRUSH_VERTEX_STRIDE } from '../GL.mjs';
 import { getEntityBloomEmissiveScale } from './BloomEffect.mjs';
 import { materialFlags } from './Materials.mjs';
 import { BrushModel, Node } from '../../common/model/BSP.ts';
-import { ClientEdict } from '../ClientEntities.mjs';
+import { ClientEdict } from '../ClientEntities.ts';
 import Mesh from './Mesh.mjs';
 import PostProcess from './PostProcess.mjs';
 import * as Def from '../../common/Def.ts';
diff --git a/source/engine/client/renderer/Materials.mjs b/source/engine/client/renderer/Materials.mjs
index 38160c42..fed06879 100644
--- a/source/engine/client/renderer/Materials.mjs
+++ b/source/engine/client/renderer/Materials.mjs
@@ -1,5 +1,5 @@
 import { eventBus, registry } from '../../registry.mjs';
-import { ClientEdict } from '../ClientEntities.mjs';
+import { ClientEdict } from '../ClientEntities.ts';
 import GL, { GLTexture } from '../GL.mjs';
 
 let { CL, R } = registry;
diff --git a/source/engine/client/renderer/MeshModelRenderer.mjs b/source/engine/client/renderer/MeshModelRenderer.mjs
index ba3f73d4..ff403b98 100644
--- a/source/engine/client/renderer/MeshModelRenderer.mjs
+++ b/source/engine/client/renderer/MeshModelRenderer.mjs
@@ -45,7 +45,7 @@ export class MeshModelRenderer extends ModelRenderer {
 
   /**
    * @param {import('../../common/model/MeshModel.ts').MeshModel} _model The mesh model
-   * @param {import('../ClientEntities.mjs').ClientEdict} _entity The entity being rendered
+   * @param {import('../ClientEntities.ts').ClientEdict} _entity The entity being rendered
    * @returns {boolean} Mesh transparency is not implemented, so meshes stay in the opaque pass
    */
   // eslint-disable-next-line no-unused-vars
@@ -55,7 +55,7 @@ export class MeshModelRenderer extends ModelRenderer {
 
   /**
    * @param {import('../../common/model/MeshModel.ts').MeshModel} _model The mesh model
-   * @param {import('../ClientEntities.mjs').ClientEdict} _entity The entity being rendered
+   * @param {import('../ClientEntities.ts').ClientEdict} _entity The entity being rendered
    * @returns {boolean} False because sorted transparent mesh rendering is not implemented yet
    */
   // eslint-disable-next-line no-unused-vars
@@ -75,7 +75,7 @@ export class MeshModelRenderer extends ModelRenderer {
   /**
    * Render a single mesh model entity.
    * @param {import('../../common/model/MeshModel.ts').MeshModel} model The mesh model to render
-   * @param {import('../ClientEntities.mjs').ClientEdict} entity The entity being rendered
+   * @param {import('../ClientEntities.ts').ClientEdict} entity The entity being rendered
    * @param {number} pass Rendering pass (0=opaque, 1=transparent)
    */
   render(model, entity, pass = 0) {
diff --git a/source/engine/client/renderer/ModelRenderer.mjs b/source/engine/client/renderer/ModelRenderer.mjs
index 8854b8bd..7243a99c 100644
--- a/source/engine/client/renderer/ModelRenderer.mjs
+++ b/source/engine/client/renderer/ModelRenderer.mjs
@@ -32,7 +32,7 @@ export class ModelRenderer {
    * Whether this model/entity pair should contribute to the opaque pass.
    * Renderers can override this when transparency is entity- or material-driven.
    * @param {import('../../common/model/BaseModel.ts').BaseModel} _model The model to evaluate
-   * @param {import('../ClientEntities.mjs').ClientEdict} _entity The entity to evaluate
+   * @param {import('../ClientEntities.ts').ClientEdict} _entity The entity to evaluate
    * @returns {boolean} True when the pair should render during the opaque pass
    */
   // eslint-disable-next-line no-unused-vars
@@ -44,7 +44,7 @@ export class ModelRenderer {
    * Whether this model/entity pair should contribute to the sorted transparent pass.
    * Sprites are handled by their dedicated pass and should normally return false here.
    * @param {import('../../common/model/BaseModel.ts').BaseModel} _model The model to evaluate
-   * @param {import('../ClientEntities.mjs').ClientEdict} _entity The entity to evaluate
+   * @param {import('../ClientEntities.ts').ClientEdict} _entity The entity to evaluate
    * @returns {boolean} True when the pair should render during the sorted transparent pass
    */
   // eslint-disable-next-line no-unused-vars
@@ -55,7 +55,7 @@ export class ModelRenderer {
   /**
    * Render a single entity with this model type.
    * @param {import('../../common/model/BaseModel.ts').BaseModel} _model The model to render
-   * @param {import('../ClientEntities.mjs').ClientEdict} _entity The entity being rendered
+   * @param {import('../ClientEntities.ts').ClientEdict} _entity The entity being rendered
    * @param {number} [_pass] Rendering pass (0=opaque, 1=transparent, etc.)
    */
   // eslint-disable-next-line no-unused-vars
diff --git a/source/engine/client/renderer/ShadowMap.mjs b/source/engine/client/renderer/ShadowMap.mjs
index efcc50f9..faf0670d 100644
--- a/source/engine/client/renderer/ShadowMap.mjs
+++ b/source/engine/client/renderer/ShadowMap.mjs
@@ -511,7 +511,7 @@ export default class ShadowMap {
 
   /**
    * Determine whether an entity should contribute to the local shadow pass.
-   * @param {import('../ClientEntities.mjs').ClientEdict} entity Visible entity candidate
+   * @param {import('../ClientEntities.ts').ClientEdict} entity Visible entity candidate
    * @param {Vector|Float64Array|number[]|null} cutoffOrigin Local shadow reference origin
    * @param {number} cutoffDistSq Squared caster cutoff distance
    * @returns {boolean} `true` if the entity should contribute to local shadows
@@ -555,7 +555,7 @@ export default class ShadowMap {
   /**
    * Render a brush submodel entity (door, platform, etc.) into a shadow map.
    * @param {import('../../common/model/BSP.ts').BrushModel} model
-   * @param {import('../ClientEntities.mjs').ClientEdict} entity
+   * @param {import('../ClientEntities.ts').ClientEdict} entity
    * @param {Float64Array} lightSpaceMatrix
    * @param {string} programName
    */
@@ -585,7 +585,7 @@ export default class ShadowMap {
    * Render an alias model entity (monster, item, weapon) into a shadow map.
    * Handles frame interpolation identically to AliasModelRenderer.
    * @param {import('../../common/model/AliasModel.ts').AliasModel} model
-   * @param {import('../ClientEntities.mjs').ClientEdict} entity
+   * @param {import('../ClientEntities.ts').ClientEdict} entity
    * @param {Float64Array} lightSpaceMatrix
    * @param {string} programName
    */
@@ -633,7 +633,7 @@ export default class ShadowMap {
   /**
    * Render a mesh model entity (glTF) into a shadow map.
    * @param {import('../../common/model/MeshModel.ts').MeshModel} model
-   * @param {import('../ClientEntities.mjs').ClientEdict} entity
+   * @param {import('../ClientEntities.ts').ClientEdict} entity
    * @param {Float64Array} lightSpaceMatrix
    * @param {string} programName
    */
diff --git a/source/engine/client/renderer/SpriteModelRenderer.mjs b/source/engine/client/renderer/SpriteModelRenderer.mjs
index 8c1c5519..2faec355 100644
--- a/source/engine/client/renderer/SpriteModelRenderer.mjs
+++ b/source/engine/client/renderer/SpriteModelRenderer.mjs
@@ -49,7 +49,7 @@ export class SpriteModelRenderer extends ModelRenderer {
 
   /**
    * @param {import('../../common/model/SpriteModel.ts').SpriteModel} _model The sprite model
-   * @param {import('../ClientEntities.mjs').ClientEdict} _entity The entity being rendered
+   * @param {import('../ClientEntities.ts').ClientEdict} _entity The entity being rendered
    * @returns {boolean} Sprites are never drawn in the opaque pass
    */
   // eslint-disable-next-line no-unused-vars
@@ -59,7 +59,7 @@ export class SpriteModelRenderer extends ModelRenderer {
 
   /**
    * @param {import('../../common/model/SpriteModel.ts').SpriteModel} _model The sprite model
-   * @param {import('../ClientEntities.mjs').ClientEdict} _entity The entity being rendered
+   * @param {import('../ClientEntities.ts').ClientEdict} _entity The entity being rendered
    * @returns {boolean} Sprites use their dedicated sprite pass rather than the sorted transparent pass
    */
   // eslint-disable-next-line no-unused-vars
@@ -71,7 +71,7 @@ export class SpriteModelRenderer extends ModelRenderer {
    * Render a single sprite model entity.
    * Generates billboard geometry dynamically based on camera orientation.
    * @param {import('../../common/model/SpriteModel.ts').SpriteModel} model The sprite model to render
-   * @param {import('../ClientEntities.mjs').ClientEdict} entity The entity being rendered
+   * @param {import('../ClientEntities.ts').ClientEdict} entity The entity being rendered
    * @param {number} pass Rendering pass (0=opaque, 1=transparent)
    */
   render(model, entity, pass = 0) {
diff --git a/source/engine/common/GameAPIs.ts b/source/engine/common/GameAPIs.ts
index 8daf3713..a390f16d 100644
--- a/source/engine/common/GameAPIs.ts
+++ b/source/engine/common/GameAPIs.ts
@@ -1,6 +1,6 @@
 import type BaseEntity from '../../game/id1/entity/BaseEntity.mjs';
 import type { EdictValueType, SerializableType } from '../../shared/GameInterfaces.ts';
-import type { ClientDlight, ClientEdict } from '../client/ClientEntities.mjs';
+import type { ClientDlight, ClientEdict } from '../client/ClientEntities.ts';
 import type { GLTexture } from '../client/GL.mjs';
 import type { SzBuffer } from '../network/MSG.ts';
 import type ParsedQC from './model/parsers/ParsedQC.ts';
diff --git a/source/engine/common/Pmove.ts b/source/engine/common/Pmove.ts
index a44295ea..cb10d7e5 100644
--- a/source/engine/common/Pmove.ts
+++ b/source/engine/common/Pmove.ts
@@ -15,7 +15,7 @@ import { content } from '../../shared/Defs.ts';
 import { BrushModel } from './Mod.ts';
 import Cvar from './Cvar.ts';
 import { PmoveConfiguration } from '../../shared/Pmove.ts';
-import type { ClientEdict } from '../client/ClientEntities.mjs';
+import type { ClientEdict } from '../client/ClientEntities.ts';
 import type { BaseEntity } from '../server/Edict.ts';
 import type { Plane as BaseModelPlane } from './model/BaseModel.ts';
 import type { Brush, Node } from './model/BSP.ts';
diff --git a/source/engine/common/model/AliasModel.ts b/source/engine/common/model/AliasModel.ts
index 6144c7ab..befca369 100644
--- a/source/engine/common/model/AliasModel.ts
+++ b/source/engine/common/model/AliasModel.ts
@@ -103,12 +103,6 @@ export class AliasModel extends BaseModel {
   /** Texture coordinate vertices. */
   _stverts: AliasStVertex[] = [];
 
-  /** Model flags, used together with `Mod.flags` on the client. */
-  flags = 0;
-
-  /** True when animation frames should be selected randomly. */
-  random = false;
-
   /** Animation frames used by rendering and host-side metadata lookups. */
   frames: AliasFrame[] = [];
 
@@ -138,8 +132,6 @@ export class AliasModel extends BaseModel {
     this._frames = 0;
     this._triangles = [];
     this._stverts = [];
-    this.flags = 0;
-    this.random = false;
     this.frames = [];
     this.skins = [];
     this.boundingradius = 0;
diff --git a/source/engine/common/model/BaseModel.ts b/source/engine/common/model/BaseModel.ts
index d6058ef4..fe96f560 100644
--- a/source/engine/common/model/BaseModel.ts
+++ b/source/engine/common/model/BaseModel.ts
@@ -149,6 +149,12 @@ export class BaseModel {
   /** Model-space origin offset. */
   origin = new Vector();
 
+  /** Legacy client-side model flags. Alias models populate this, other model types leave it at zero. */
+  flags = 0;
+
+  /** True when animation frames should be selected randomly. Alias models populate this, other model types leave it at false. */
+  random = false;
+
   /** Shared alias-model command buffer, when applicable. */
   cmds: WebGLBuffer | null = null;
 
@@ -174,6 +180,8 @@ export class BaseModel {
     this.mins = new Vector();
     this.maxs = new Vector();
     this.origin = new Vector();
+    this.flags = 0;
+    this.random = false;
 
     // Runtime-only rendering state.
     this.cmds = null;
diff --git a/source/engine/server/Edict.ts b/source/engine/server/Edict.ts
index d0eb1f41..204ae54a 100644
--- a/source/engine/server/Edict.ts
+++ b/source/engine/server/Edict.ts
@@ -2,7 +2,7 @@ import type { EdictData } from '../../shared/GameInterfaces.ts';
 import type { WorldspawnEntity as WorldspawnEntityValue } from '../../game/id1/entity/Worldspawn.mjs';
 import type { OctreeNode } from '../../shared/Octree.ts';
 import type { Visibility } from '../common/model/BSP.ts';
-import type { ClientEdict } from '../client/ClientEntities.mjs';
+import type { ClientEdict } from '../client/ClientEntities.ts';
 import type { ServerClient } from './Client.ts';
 
 import Vector from '../../shared/Vector.ts';
diff --git a/source/shared/ClientEdict.ts b/source/shared/ClientEdict.ts
index ca1017ce..c2450793 100644
--- a/source/shared/ClientEdict.ts
+++ b/source/shared/ClientEdict.ts
@@ -1,4 +1,4 @@
-import type { ClientEdict } from '../engine/client/ClientEntities.mjs';
+import type { ClientEdict } from '../engine/client/ClientEntities.ts';
 import type { ClientEngineAPI as ClientEngineApiValue } from '../engine/common/GameAPIs.ts';
 
 type ClientEngineAPI = typeof ClientEngineApiValue;
diff --git a/source/shared/GameInterfaces.ts b/source/shared/GameInterfaces.ts
index 124ba31e..1602202f 100644
--- a/source/shared/GameInterfaces.ts
+++ b/source/shared/GameInterfaces.ts
@@ -1,6 +1,6 @@
 import type { BaseClientEdictHandler } from './ClientEdict.ts';
 import type { ClientEngineAPI as ClientEngineApiValue, ServerEngineAPI as ServerEngineApiValue } from '../engine/common/GameAPIs.ts';
-import type { ClientEdict as ClientEdictValue } from '../engine/client/ClientEntities.mjs';
+import type { ClientEdict as ClientEdictValue } from '../engine/client/ClientEntities.ts';
 import type { ServerEdict as ServerEdictValue } from '../engine/server/Edict.ts';
 import type { GLTexture as GLTextureValue } from '../engine/client/GL.mjs';
 import type { SFX as SFXValue } from '../engine/client/Sound.mjs';
diff --git a/test/client/client-connection.test.mjs b/test/client/client-connection.test.mjs
new file mode 100644
index 00000000..2f94fbf1
--- /dev/null
+++ b/test/client/client-connection.test.mjs
@@ -0,0 +1,251 @@
+import assert from 'node:assert/strict';
+import { describe, test } from 'node:test';
+
+import * as Protocol from '../../source/engine/network/Protocol.ts';
+import * as Def from '../../source/engine/common/Def.ts';
+import ClientConnection from '../../source/engine/client/ClientConnection.ts';
+import { clientRuntimeState, clientStaticState } from '../../source/engine/client/ClientState.ts';
+import { QSocket } from '../../source/engine/network/NetworkDrivers.ts';
+import { eventBus, registry } from '../../source/engine/registry.mjs';
+
+/**
+ * Build a minimal demo subsystem stub for connection tests.
+ * @returns {object} Demo playback stub.
+ */
+function createMockClientDemos() {
+  return {
+    demoplayback: false,
+    demorecording: false,
+    getMessage() {
+      return 0;
+    },
+    writeDemoMessage() {},
+    stopPlayback() {},
+  };
+}
+
+/**
+ * Build the registry surface needed by ClientConnection.
+ * @param {Record<string, object>} [overrides] Per-module overrides.
+ * @returns {object} Client registry fixture.
+ */
+function createMockClientRegistry(overrides = {}) {
+  return {
+    Con: {
+      DPrint() {},
+      Print() {},
+      forcedup: false,
+      ...overrides.Con,
+    },
+    Host: {
+      realtime: 12.5,
+      ShutdownServer() {},
+      ...overrides.Host,
+    },
+    IN: {
+      Move() {},
+      ...overrides.IN,
+    },
+    Mod: {
+      scope: { client: 'client' },
+      ClearAll() {},
+      ...overrides.Mod,
+    },
+    NET: {
+      Connect() {
+        return null;
+      },
+      SendMessage() {
+        return 1;
+      },
+      SendUnreliableMessage() {
+        return 1;
+      },
+      CanSendMessage() {
+        return true;
+      },
+      Close() {},
+      message: clientStaticState.message,
+      ...overrides.NET,
+    },
+    SCR: {
+      con_current: 1,
+      EndLoadingPlaque() {},
+      ...overrides.SCR,
+    },
+    S: {
+      StopAllSounds() {},
+      LoadPendingFiles() {},
+      ...overrides.S,
+    },
+    SV: {
+      server: { active: false },
+      ...overrides.SV,
+    },
+  };
+}
+
+/**
+ * Run a callback with a mocked client registry.
+ * @param {ReturnType<typeof createMockClientRegistry>} mockedRegistry Mock registry values.
+ * @param {() => void | Promise<void>} callback Test body.
+ * @returns {void | Promise<void>} Callback result.
+ */
+function withMockClientRegistry(mockedRegistry, callback) {
+  const previousValues = {
+    Con: registry.Con,
+    Host: registry.Host,
+    IN: registry.IN,
+    Mod: registry.Mod,
+    NET: registry.NET,
+    SCR: registry.SCR,
+    S: registry.S,
+    SV: registry.SV,
+  };
+
+  registry.Con = mockedRegistry.Con;
+  registry.Host = mockedRegistry.Host;
+  registry.IN = mockedRegistry.IN;
+  registry.Mod = mockedRegistry.Mod;
+  registry.NET = mockedRegistry.NET;
+  registry.SCR = mockedRegistry.SCR;
+  registry.S = mockedRegistry.S;
+  registry.SV = mockedRegistry.SV;
+  eventBus.publish('registry.frozen');
+
+  const restore = () => {
+    registry.Con = previousValues.Con;
+    registry.Host = previousValues.Host;
+    registry.IN = previousValues.IN;
+    registry.Mod = previousValues.Mod;
+    registry.NET = previousValues.NET;
+    registry.SCR = previousValues.SCR;
+    registry.S = previousValues.S;
+    registry.SV = previousValues.SV;
+    eventBus.publish('registry.frozen');
+  };
+
+  try {
+    const result = callback();
+
+    if (result && typeof result.then === 'function') {
+      return Promise.resolve(result).finally(restore);
+    }
+
+    restore();
+    return result;
+  } catch (error) {
+    restore();
+    throw error;
+  }
+}
+
+/**
+ *
+ */
+function resetClientConnectionState() {
+  clientRuntimeState.clear();
+  clientStaticState.clear();
+  clientStaticState.state = Def.clientConnectionState.disconnected;
+  clientStaticState.netcon = null;
+  clientStaticState.connecting = null;
+  clientStaticState.signon = 0;
+  clientStaticState.changelevel = false;
+  clientStaticState.isLocalGame = false;
+}
+
+void describe('ClientConnection', () => {
+  void test('establishes a connection and transitions into the connected state', () => {
+    resetClientConnectionState();
+
+    const publishedEvents = [];
+    const connectingSocket = {
+      state: QSocket.STATE_CONNECTING,
+      address: 'quake.example',
+    };
+    const socket = {
+      ...connectingSocket,
+      state: QSocket.STATE_CONNECTED,
+    };
+
+    const unsubscribeConnecting = eventBus.subscribe('client.connecting', (host) => {
+      publishedEvents.push(['connecting', host]);
+    });
+    const unsubscribeConnected = eventBus.subscribe('client.connected', (host) => {
+      publishedEvents.push(['connected', host]);
+    });
+
+    try {
+      void withMockClientRegistry(createMockClientRegistry({
+        NET: {
+          Connect(host) {
+            connectingSocket.address = host;
+            return connectingSocket;
+          },
+        },
+      }), () => {
+        const connection = new ClientConnection({ clientDemos: createMockClientDemos() });
+
+        connection.connect('quake.example');
+
+        assert.equal(clientStaticState.state, Def.clientConnectionState.connecting);
+        assert.equal(clientStaticState.netcon, connectingSocket);
+        assert.equal(clientStaticState.connecting?.percentage, 5);
+        assert.equal(clientStaticState.connecting?.message, 'Connecting to quake.example');
+        assert.deepEqual(publishedEvents[0], ['connecting', 'quake.example']);
+
+        clientStaticState.netcon = socket;
+        connection.checkConnectingState();
+
+        assert.equal(clientStaticState.state, Def.clientConnectionState.connected);
+        assert.equal(clientStaticState.signon, 0);
+        assert.equal(clientStaticState.lastcmdsent, 12.5);
+        assert.equal(clientStaticState.connecting?.percentage, 10);
+        assert.equal(clientStaticState.connecting?.message, 'Connecting to quake.example');
+        assert.deepEqual(publishedEvents[1], ['connected', 'quake.example']);
+      });
+    } finally {
+      unsubscribeConnecting();
+      unsubscribeConnected();
+      resetClientConnectionState();
+    }
+  });
+
+  void test('writes the expected signon commands for the prespawn and spawn stages', () => {
+    resetClientConnectionState();
+
+    void withMockClientRegistry(createMockClientRegistry(), () => {
+      const connection = new ClientConnection({ clientDemos: createMockClientDemos() });
+      connection.configureIdentityCvars({
+        name: { string: 'PlayerOne' },
+        color: { value: 0x4f },
+        rcon_password: null,
+      });
+
+      clientStaticState.spawnparms = 'skill 2';
+      clientStaticState.serverInfo = { map: 'start' };
+
+      clientStaticState.signon = 1;
+      clientStaticState.message.clear();
+      connection.signonReply();
+
+      clientStaticState.message.beginReading();
+      assert.equal(clientStaticState.message.readByte(), Protocol.clc.stringcmd);
+      assert.equal(clientStaticState.message.readString(), 'prespawn');
+
+      clientStaticState.signon = 2;
+      clientStaticState.message.clear();
+      connection.signonReply();
+
+      clientStaticState.message.beginReading();
+      assert.equal(clientStaticState.message.readByte(), Protocol.clc.stringcmd);
+      assert.equal(clientStaticState.message.readString(), 'name "PlayerOne"\n');
+      assert.equal(clientStaticState.message.readByte(), Protocol.clc.stringcmd);
+      assert.equal(clientStaticState.message.readString(), 'color 4 15\n');
+      assert.equal(clientStaticState.message.readByte(), Protocol.clc.stringcmd);
+      assert.equal(clientStaticState.message.readString(), 'spawn skill 2');
+    });
+
+    resetClientConnectionState();
+  });
+});
diff --git a/test/client/client-messages.test.mjs b/test/client/client-messages.test.mjs
new file mode 100644
index 00000000..25c9287a
--- /dev/null
+++ b/test/client/client-messages.test.mjs
@@ -0,0 +1,146 @@
+import assert from 'node:assert/strict';
+import { describe, test } from 'node:test';
+
+import * as Protocol from '../../source/engine/network/Protocol.ts';
+import { SzBuffer } from '../../source/engine/network/MSG.ts';
+import { ClientMessages } from '../../source/engine/client/ClientMessages.ts';
+import Vector from '../../source/shared/Vector.ts';
+import { eventBus, registry } from '../../source/engine/registry.mjs';
+
+/**
+ * Run a callback with just the registry modules ClientMessages depends on.
+ * @param {{CL: object, COM: object, NET: object}} dependencies Mocked registry dependencies.
+ * @param {() => void | Promise<void>} callback Test body.
+ * @returns {void | Promise<void>} Callback result.
+ */
+function withMockClientMessagesRegistry({ CL, COM, NET }, callback) {
+  const previousValues = {
+    CL: registry.CL,
+    COM: registry.COM,
+    NET: registry.NET,
+  };
+
+  registry.CL = CL;
+  registry.COM = COM;
+  registry.NET = NET;
+  eventBus.publish('registry.frozen');
+
+  const restore = () => {
+    registry.CL = previousValues.CL;
+    registry.COM = previousValues.COM;
+    registry.NET = previousValues.NET;
+    eventBus.publish('registry.frozen');
+  };
+
+  try {
+    const result = callback();
+
+    if (result && typeof result.then === 'function') {
+      return Promise.resolve(result).finally(restore);
+    }
+
+    restore();
+    return result;
+  } catch (error) {
+    restore();
+    throw error;
+  }
+}
+
+void describe('ClientMessages', () => {
+  void test('parses acknowledged move state and dynamic clientdata fields', () => {
+    const messages = new ClientMessages();
+    messages.clientdataFields = ['health', 'alive'];
+
+    const buffer = new SzBuffer(128, 'client-messages-clientdata');
+    buffer.writeShort(Protocol.su.moveack);
+    buffer.writeByte(17);
+    buffer.writeByte(3);
+    buffer.writeByte(6);
+    buffer.writeByte(9);
+    buffer.writeByte(1);
+    buffer.writeByte(Protocol.serializableTypes.long);
+    buffer.writeLong(125);
+    buffer.writeByte(Protocol.serializableTypes.none);
+    buffer.beginReading();
+
+    const mockCL = {
+      gameCapabilities: [],
+      state: {
+        time: 4.5,
+        clientMessages: messages,
+        viewheight: 0,
+        idealpitch: 0,
+        punchangle: new Vector(),
+        onground: false,
+        inwater: false,
+        acknowledgedMoveSequence: 0,
+        ackedPmFlags: 0,
+        ackedPmTime: 0,
+        ackedPmOldButtons: 0,
+        items: 0,
+        item_gettime: new Array(32).fill(0),
+        stats: new Array(32).fill(0),
+        gameAPI: {
+          clientdata: {
+            health: 10,
+            alive: true,
+          },
+        },
+      },
+    };
+
+    void withMockClientMessagesRegistry({
+      CL: mockCL,
+      COM: { standard_quake: true },
+      NET: { message: buffer },
+    }, () => {
+      messages.parseClient();
+    });
+
+    assert.equal(mockCL.state.acknowledgedMoveSequence, 17);
+    assert.equal(mockCL.state.ackedPmFlags, 3);
+    assert.equal(mockCL.state.ackedPmTime, 6);
+    assert.equal(mockCL.state.ackedPmOldButtons, 9);
+    assert.equal(mockCL.state.gameAPI.clientdata.health, 125);
+    assert.equal(mockCL.state.gameAPI.clientdata.alive, false);
+  });
+
+  void test('parses client events and forwards the decoded arguments to the game API', () => {
+    const messages = new ClientMessages();
+    const receivedEvents = [];
+
+    const buffer = new SzBuffer(128, 'client-messages-events');
+    buffer.writeByte(42);
+    buffer.writeSerializables(['hello', 99, true, new Vector(1, 2, 3), null]);
+    buffer.beginReading();
+
+    void withMockClientMessagesRegistry({
+      CL: {
+        state: {
+          clientEntities: {
+            getEntity() {
+              throw new Error('Unexpected client edict lookup');
+            },
+          },
+          gameAPI: {
+            handleClientEvent(code, ...args) {
+              receivedEvents.push([code, args]);
+            },
+          },
+        },
+      },
+      COM: { standard_quake: true },
+      NET: { message: buffer },
+    }, () => {
+      messages.parseClientEvent();
+    });
+
+    assert.equal(receivedEvents.length, 1);
+    assert.equal(receivedEvents[0][0], 42);
+    assert.deepEqual(receivedEvents[0][1].slice(0, 3), ['hello', 99, true]);
+    assert.ok(receivedEvents[0][1][3] instanceof Vector);
+    assert.deepEqual([...receivedEvents[0][1][3]], [1, 2, 3]);
+    assert.equal(receivedEvents[0][1][4], null);
+  });
+});
diff --git a/test/common/game-apis.test.mjs b/test/common/game-apis.test.mjs
index 158be8fd..5df871ea 100644
--- a/test/common/game-apis.test.mjs
+++ b/test/common/game-apis.test.mjs
@@ -3,7 +3,7 @@ import assert from 'node:assert/strict';
 
 import Vector from '../../source/shared/Vector.ts';
 import { moveTypes, solid } from '../../source/shared/Defs.ts';
-import { ClientEdict } from '../../source/engine/client/ClientEntities.mjs';
+import { ClientEdict } from '../../source/engine/client/ClientEntities.ts';
 import { ClientEngineAPI, ServerEngineAPI } from '../../source/engine/common/GameAPIs.ts';
 import { ServerArea } from '../../source/engine/server/physics/ServerArea.ts';
 import { ServerCollision } from '../../source/engine/server/physics/ServerCollision.ts';
diff --git a/test/physics/collision-regressions.test.mjs b/test/physics/collision-regressions.test.mjs
index d6d3828e..8a5ad9fa 100644
--- a/test/physics/collision-regressions.test.mjs
+++ b/test/physics/collision-regressions.test.mjs
@@ -8,7 +8,7 @@ import { BrushTrace, Hull, PMF, Pmove, PmovePlayer, Trace } from '../../source/e
 import { BSP29Loader } from '../../source/engine/common/model/loaders/BSP29Loader.ts';
 import { eventBus, registry } from '../../source/engine/registry.mjs';
 import { UserCmd } from '../../source/engine/network/Protocol.ts';
-import { ClientEdict } from '../../source/engine/client/ClientEntities.mjs';
+import { ClientEdict } from '../../source/engine/client/ClientEntities.ts';
 import { ServerCollision } from '../../source/engine/server/physics/ServerCollision.ts';
 import { ServerPhysics } from '../../source/engine/server/physics/ServerPhysics.ts';
 import { ServerMovement } from '../../source/engine/server/physics/ServerMovement.ts';
diff --git a/test/physics/fixtures.mjs b/test/physics/fixtures.mjs
index acf43844..5235bca6 100644
--- a/test/physics/fixtures.mjs
+++ b/test/physics/fixtures.mjs
@@ -4,7 +4,7 @@ import Vector from '../../source/shared/Vector.ts';
 import { content, flags, moveType, solid } from '../../source/shared/Defs.ts';
 import { Brush, BrushModel, BrushSide } from '../../source/engine/common/model/BSP.ts';
 import { eventBus, registry } from '../../source/engine/registry.mjs';
-import { ClientEdict } from '../../source/engine/client/ClientEntities.mjs';
+import { ClientEdict } from '../../source/engine/client/ClientEntities.ts';
 import { ServerPhysics } from '../../source/engine/server/physics/ServerPhysics.ts';
 
 // ── Typedefs ────────────────────────────────────────────────────────────────

From 00bfaf097e45621d3300f2c41f017992fb213359 Mon Sep 17 00:00:00 2001
From: Christian R <github@chrisnew.de>
Date: Sat, 4 Apr 2026 12:05:04 +0300
Subject: [PATCH 43/67] TS: client/ part 3

---
 source/engine/client/{CL.mjs => CL.ts}        |  172 +--
 source/engine/client/ClientEntities.ts        |    2 +-
 source/engine/client/ClientLifecycle.ts       |    2 +-
 .../client/ClientServerCommandHandlers.mjs    | 1153 ---------------
 .../client/ClientServerCommandHandlers.ts     |    2 +-
 source/engine/client/LegacyServerCommands.mjs |  790 ----------
 source/engine/client/LegacyServerCommands.ts  |    2 +-
 source/engine/client/Menu.mjs                 | 1214 ---------------
 source/engine/client/Menu.ts                  | 1298 +++++++++++++++++
 source/engine/client/{Sound.mjs => Sound.ts}  |  302 ++--
 source/engine/common/GameAPIs.ts              |    2 +-
 source/engine/main-browser.ts                 |    6 +-
 source/engine/registry.mjs                    |    6 +-
 source/shared/GameInterfaces.ts               |    2 +-
 14 files changed, 1540 insertions(+), 3413 deletions(-)
 rename source/engine/client/{CL.mjs => CL.ts} (80%)
 delete mode 100644 source/engine/client/ClientServerCommandHandlers.mjs
 delete mode 100644 source/engine/client/LegacyServerCommands.mjs
 delete mode 100644 source/engine/client/Menu.mjs
 create mode 100644 source/engine/client/Menu.ts
 rename source/engine/client/{Sound.mjs => Sound.ts} (78%)

diff --git a/source/engine/client/CL.mjs b/source/engine/client/CL.ts
similarity index 80%
rename from source/engine/client/CL.mjs
rename to source/engine/client/CL.ts
index 05d3b6a3..15a620f9 100644
--- a/source/engine/client/CL.mjs
+++ b/source/engine/client/CL.ts
@@ -1,10 +1,12 @@
+import type { SFX } from './Sound.ts';
+
 import Q from '../../shared/Q.ts';
 import * as Def from '../common/Def.ts';
 import * as Protocol from '../network/Protocol.ts';
 import Cmd, { ConsoleCommand } from '../common/Cmd.ts';
 import Cvar from '../common/Cvar.ts';
 import { Pmove, PmovePlayer } from '../common/Pmove.ts';
-import { eventBus, registry } from '../registry.mjs';
+import { eventBus, getClientRegistry } from '../registry.mjs';
 import { gameCapabilities, solid } from '../../shared/Defs.ts';
 import ClientDemos from './ClientDemos.ts';
 import { ClientPlayerState } from './ClientMessages.ts';
@@ -14,16 +16,11 @@ import ClientConnection from './ClientConnection.ts';
 import ClientLifecycle from './ClientLifecycle.ts';
 import { BrushModel } from '../common/Mod.ts';
 // import { materialFlags, PBRMaterial, QuakeMaterial } from './renderer/Materials.mjs';
-/** @typedef {import('./Sound.mjs').SFX} SFX */
 
-let { Con, Draw, Host, S, Sbar } = registry;
+let { Con, Draw, Host, S, Sbar } = getClientRegistry();
 
 eventBus.subscribe('registry.frozen', () => {
-  Con = registry.Con;
-  Draw = registry.Draw;
-  Host = registry.Host;
-  S = registry.S;
-  Sbar = registry.Sbar;
+  ({ Con, Draw, Host, S, Sbar } = getClientRegistry());
 });
 
 export default class CL {
@@ -33,20 +30,17 @@ export default class CL {
   /** @deprecated – use Def.clientConnectionState */
   static active = Def.clientConnectionState;
 
-  /** @type {Pmove} */
   static pmove = new Pmove();
 
   static #clientDemos = new ClientDemos();
-  /** @type {ClientConnection} */
-  static #connection = null;
+  static #connection: ClientConnection;
 
-  /** @type {gameCapabilities[]} */
-  static gameCapabilities = [];
+  static gameCapabilities: gameCapabilities[] = [];
 
-  /** @type {boolean} */
   static sbarDisabled = false;
   static cls = clientStaticState;
   static state = clientRuntimeState;
+  static svc_strings: Array<[string, number]> = [];
 
   static {
     this.#connection = new ClientConnection({ clientDemos: this.#clientDemos });
@@ -54,59 +48,58 @@ export default class CL {
     this.svc_strings = Object.entries(Protocol.svc);
   }
 
-  /** @type {Cvar} */ static nolerp = null;
-  /** @type {Cvar} */ static rcon_password = null;
-  /** @type {Cvar} */ static shownet = null;
-  /** @type {Cvar} */ static name = null;
-  /** @type {Cvar} */ static color = null;
-  /** @type {Cvar} */ static upspeed = null;
-  /** @type {Cvar} */ static forwardspeed = null;
-  /** @type {Cvar} */ static backspeed = null;
-  /** @type {Cvar} */ static sidespeed = null;
-  /** @type {Cvar} */ static movespeedkey = null;
-  /** @type {Cvar} */ static yawspeed = null;
-  /** @type {Cvar} */ static pitchspeed = null;
-  /** @type {Cvar} */ static anglespeedkey = null;
-  /** @type {Cvar} */ static lookspring = null;
-  /** @type {Cvar} */ static lookstrafe = null;
-  /** @type {Cvar} */ static sensitivity = null;
-  /** @type {Cvar} */ static m_pitch = null;
-  /** @type {Cvar} */ static m_yaw = null;
-  /** @type {Cvar} */ static m_forward = null;
-  /** @type {Cvar} */ static m_side = null;
-  /** @type {Cvar} */ static nopred = null;
-  /** @type {Cvar} */ static nohud = null;
-  /** @type {Cvar} */ static areaportals = null;
-
-  /** @type {SFX} */ static sfx_talk = null;
-  /** @type {Protocol.UserCmd} */ static nullcmd = new Protocol.UserCmd();
-
-
-  static StartDemos(demos) {
+  static nolerp: Cvar = null!;
+  static rcon_password: Cvar = null!;
+  static shownet: Cvar = null!;
+  static name: Cvar = null!;
+  static color: Cvar = null!;
+  static upspeed: Cvar = null!;
+  static forwardspeed: Cvar = null!;
+  static backspeed: Cvar = null!;
+  static sidespeed: Cvar = null!;
+  static movespeedkey: Cvar = null!;
+  static yawspeed: Cvar = null!;
+  static pitchspeed: Cvar = null!;
+  static anglespeedkey: Cvar = null!;
+  static lookspring: Cvar = null!;
+  static lookstrafe: Cvar = null!;
+  static sensitivity: Cvar = null!;
+  static m_pitch: Cvar = null!;
+  static m_yaw: Cvar = null!;
+  static m_forward: Cvar = null!;
+  static m_side: Cvar = null!;
+  static nopred: Cvar = null!;
+  static nohud: Cvar = null!;
+  static areaportals: Cvar = null!;
+
+  static sfx_talk: SFX | null = null;
+  static nullcmd = new Protocol.UserCmd();
+
+  static StartDemos(demos: string[]): void {
     this.#clientDemos.startDemos(demos);
   }
 
-  static async StartPlayback(demoname, timedemo = false) {
+  static async StartPlayback(demoname: string, timedemo = false): Promise<void> {
     await this.#clientDemos.startPlayback(demoname, timedemo);
   }
 
-  static StopPlayback() { // public, by Host.js
+  static StopPlayback(): void { // public, by Host.js
     this.#clientDemos.stopPlayback();
   }
 
-  static StartRecording(demoname, forcetrack = -1) {
+  static StartRecording(demoname: string, forcetrack = -1): void {
     this.#clientDemos.startRecording(demoname, forcetrack);
   }
 
-  static async StopRecording() {
+  static async StopRecording(): Promise<void> {
     await this.#clientDemos.stopRecording();
   }
 
-  static NextDemo() { // public, by Host.js, M.js
+  static NextDemo(): void { // public, by Host.js, M.js
     this.#clientDemos.playNext();
-  };
+  }
 
-  static async Init() {
+  static async Init(): Promise<void> {
     eventBus.subscribe('server.spawning', () => {
       CL.SetConnectingStep(1, 'Spawning server');
     });
@@ -118,68 +111,68 @@ export default class CL {
     return ClientLifecycle.init();
   }
 
-  static InitGame() {
+  static InitGame(): void {
     return ClientLifecycle.initGame();
   }
 
-  static SetConnectingStep(percentage, message) {
+  static SetConnectingStep(percentage: number | null, message: string | null): void {
     CL.#connection.setConnectingStep(percentage, message);
   }
 
-  static GetMessage() {
+  static GetMessage(): number {
     return CL.#connection.getMessage();
   }
 
-  static SendCmd() {
+  static SendCmd(): void {
     CL.#connection.sendCmd();
   }
 
-  static ResetCheatCvars() {
+  static ResetCheatCvars(): void {
     CL.#connection.resetCheatCvars();
   }
 
-  static ClearState() {
+  static ClearState(): void {
     CL.#connection.clearState();
   }
 
-  static ConfigureConnectionIdentity(cvars) {
+  static ConfigureConnectionIdentity(cvars: { name: Cvar | null; color: Cvar | null; rcon_password: Cvar | null }): void {
     CL.#connection.configureIdentityCvars(cvars);
   }
 
-  static get connection() {
+  static get connection(): ClientConnection {
     return CL.#connection;
   }
 
-  static ReadFromServer() {
+  static ReadFromServer(): void {
     CL.connection.readFromServer();
   }
 
-  static ParseServerMessage() {
+  static ParseServerMessage(): void {
     CL.connection.parseServerMessage();
   }
 
-  static PrintLastServerMessages() {
+  static PrintLastServerMessages(): void {
     CL.connection.printLastServerMessages();
   }
 
-  static Disconnect() {
+  static Disconnect(): void {
     CL.#connection.disconnect();
   }
 
-  static CheckConnectingState() {
+  static CheckConnectingState(): void {
     CL.#connection.checkConnectingState();
   }
 
-  static Connect(host) {
+  static Connect(host: string): void {
     CL.#connection.connect(host);
   }
 
-  static SignonReply() {
+  static SignonReply(): void {
     CL.#connection.signonReply();
   }
 
-  static Stop_f = class StopRecordingCommand extends ConsoleCommand { // private
-    async run() {
+  static Stop_f = class StopRecordingCommand extends ConsoleCommand {
+    async run(): Promise<void> {
       if (this.client) {
         return;
       }
@@ -188,8 +181,8 @@ export default class CL {
     }
   };
 
-  static Record_f = class StartRecordingCommand extends ConsoleCommand { // private
-    run(demoname, map, track) {
+  static Record_f = class StartRecordingCommand extends ConsoleCommand {
+    run(demoname?: string, map?: string, track?: string): void {
       if (this.client) {
         return;
       }
@@ -216,7 +209,7 @@ export default class CL {
   };
 
   static StartDemos_f = class StartDemosCommand extends ConsoleCommand {
-    run(...demos) {
+    run(...demos: string[]): void {
       if (this.client) {
         return;
       }
@@ -235,7 +228,7 @@ export default class CL {
   };
 
   static Demos_f = class NextDemoCommand extends ConsoleCommand {
-    run() {
+    run(): void {
       if (CL.#clientDemos.demonum === -1) {
         CL.#clientDemos.demonum = 1;
       }
@@ -246,7 +239,7 @@ export default class CL {
   };
 
   static StopDemo_f = class StopPlaybackCommand extends ConsoleCommand {
-    run() {
+    run(): void {
       if (this.client) {
         return;
       }
@@ -260,7 +253,7 @@ export default class CL {
   };
 
   static PlayDemo_f = class StartPlaybackCommand extends ConsoleCommand {
-    async run(demoname) {
+    async run(demoname?: string): Promise<void> {
       if (this.client) {
         return;
       }
@@ -276,7 +269,7 @@ export default class CL {
   };
 
   static TimeDemo_f = class TimeDemoCommand extends ConsoleCommand { // private
-    async run(demoname) {
+    async run(demoname?: string): Promise<void> {
       if (this.client) {
         return;
       }
@@ -292,7 +285,7 @@ export default class CL {
   };
 
   static Rcon_f = class extends ConsoleCommand {
-    run(...args) { // private
+    run(...args: string[]): void { // private
       if (args.length === 0) {
         Con.Print('Usage: rcon <command>\n');
         return;
@@ -311,8 +304,7 @@ export default class CL {
     }
   };
 
-  static Draw() { // public, called by SCR.js // FIXME: maybe put that into M?, called by SCR
-
+  static Draw(): void { // public, called by SCR.js // FIXME: maybe put that into M?, called by SCR
     if (this.cls.changelevel || this.cls.connecting) {
       Draw.BlackScreen();
 
@@ -337,7 +329,7 @@ export default class CL {
     }
   }
 
-  static DrawHUD() {
+  static DrawHUD(): void {
     if (this.nohud.value !== 0) {
       return;
     }
@@ -351,7 +343,7 @@ export default class CL {
     }
   }
 
-  static ClientFrame() {
+  static ClientFrame(): void {
     if (this.cls.signon !== 4) {
       return; // not ready yet
     }
@@ -375,10 +367,9 @@ export default class CL {
     //   // comptex.flags &= ~materialFlags.MF_SKIP;
     //   Draw.EndTexture();
     // }
-
   }
 
-  static ServerInfo_f() { // private
+  static ServerInfo_f(): void { // private
     if (CL.cls.state !== Def.clientConnectionState.connected) {
       Con.Print('Can\'t "serverinfo", not connected\n');
       return;
@@ -389,7 +380,7 @@ export default class CL {
     }
   }
 
-  static MoveAround_f() { // private
+  static MoveAround_f(): void { // private
     if (CL.cls.state !== Def.clientConnectionState.connected) {
       Con.Print('Can\'t "movearound", not connected\n');
       return;
@@ -410,7 +401,7 @@ export default class CL {
     CL.cls.movearound = setInterval(() => {
       if (CL.cls.state !== Def.clientConnectionState.connected) {
         Con.Print('No longer connected, stopped moving around.\n');
-        clearInterval(CL.cls.movearound);
+        clearInterval(CL.cls.movearound!);
         CL.cls.movearound = null;
         return;
       }
@@ -435,7 +426,7 @@ export default class CL {
     Con.Print('Started moving around.\n');
   }
 
-  static AppendChatMessage(name, message, direct) { // private // TODO: Client
+  static AppendChatMessage(name: string, message: string, direct: boolean): void { // private // TODO: Client
     eventBus.publish('client.chat.message', name, message, direct);
 
     if (this.gameCapabilities.includes(gameCapabilities.CAP_CHAT_MANAGED)) {
@@ -446,11 +437,11 @@ export default class CL {
       this.state.chatlog.shift();
     }
 
-    this.state.chatlog.push({name, message, direct});
+    this.state.chatlog.push({ name, message, direct });
     S.LocalSound(this.sfx_talk);
   }
 
-  static PredictMove() { // public, by Host.js
+  static PredictMove(): void { // public, by Host.js
     this.state.time = Host.realtime - this.state.latency;
     this.state.predicted = false;
 
@@ -536,7 +527,7 @@ export default class CL {
    * Populates CL.pmove with solid entities from the client entity list
    * for collision detection during prediction.
    */
-  static #setupPredictionPhysents() {
+  static #setupPredictionPhysents(): void {
     const pm = this.pmove;
     pm.clearEntities();
 
@@ -572,7 +563,7 @@ export default class CL {
    * @param {ClientPlayerState} to current state
    * @param {Protocol.UserCmd} u player commands
    */
-  static PredictUsercmd(pmove, from, to, u) { // private
+  static PredictUsercmd(pmove: PmovePlayer, from: ClientPlayerState, to: ClientPlayerState, u: Protocol.UserCmd): void { // private
     // split long commands
     if (u.msec > 50) {
       const mid = new ClientPlayerState(pmove);
@@ -616,8 +607,7 @@ export default class CL {
    * then with clipping against them.
    * This sets up the first phase.
    */
-  static SetUpPlayerPrediction() { // public, by Host.js
+  static SetUpPlayerPrediction(): void { // public, by Host.js
     // TODO: implement prediction setup once client prediction is refactored.
   }
-
-};
+}
diff --git a/source/engine/client/ClientEntities.ts b/source/engine/client/ClientEntities.ts
index e53b3f1d..5d04003e 100644
--- a/source/engine/client/ClientEntities.ts
+++ b/source/engine/client/ClientEntities.ts
@@ -1,5 +1,5 @@
 import type { ClientEventValue } from '../../shared/GameInterfaces.ts';
-import type { SFX } from './Sound.mjs';
+import type { SFX } from './Sound.ts';
 import type { BaseModel } from '../common/model/BaseModel.ts';
 import type { BrushModel } from '../common/Mod.ts';
 import type { Pmove } from '../common/Pmove.ts';
diff --git a/source/engine/client/ClientLifecycle.ts b/source/engine/client/ClientLifecycle.ts
index 51f44812..4e39823b 100644
--- a/source/engine/client/ClientLifecycle.ts
+++ b/source/engine/client/ClientLifecycle.ts
@@ -3,7 +3,7 @@ import Cmd, { ConsoleCommand } from '../common/Cmd.ts';
 import * as Def from '../common/Def.ts';
 import { gameCapabilities } from '../../shared/Defs.ts';
 import ClientInput from './ClientInput.ts';
-import CL from './CL.mjs';
+import CL from './CL.ts';
 import { clientRuntimeState } from './ClientState.ts';
 import { MoveVars, Pmove } from '../common/Pmove.ts';
 import { ClientEngineAPI } from '../common/GameAPIs.ts';
diff --git a/source/engine/client/ClientServerCommandHandlers.mjs b/source/engine/client/ClientServerCommandHandlers.mjs
deleted file mode 100644
index 89fcbbb2..00000000
--- a/source/engine/client/ClientServerCommandHandlers.mjs
+++ /dev/null
@@ -1,1153 +0,0 @@
-import * as Protocol from '../network/Protocol.ts';
-import * as Def from '../common/Def.ts';
-import Cmd from '../common/Cmd.ts';
-import { HostError } from '../common/Errors.ts';
-import { gameCapabilities } from '../../shared/Defs.ts';
-import Vector from '../../shared/Vector.ts';
-import { ClientEngineAPI } from '../common/GameAPIs.ts';
-import type { BrushModel } from '../common/Mod.ts';
-import { sharedCollisionModelSource } from '../common/CollisionModelSource.ts';
-import { eventBus, registry } from '../registry.mjs';
-import type { BaseModel } from '../common/model/BaseModel.ts';
-import { ScoreSlot } from './ClientState.ts';
-import type { SFX } from './Sound.mjs';
-
-import { legacyServerCommandHandlers, handleLegacyEntityUpdate } from './LegacyServerCommands.ts';
-
-/** @typedef {typeof import('./CL.mjs').default} ClientLayer */
-/** @typedef {import('./ClientMessages.ts').ClientMessages} ClientMessages */
-
-let { CL, Con, SCR, S, R, V, Host, SV, NET, Mod, PR, COM } = registry;
-
-eventBus.subscribe('registry.frozen', () => {
-  ({ CL, Con, SCR, S, R, V, Host, SV, NET, Mod, PR, COM } = registry);
-});
-
-sharedCollisionModelSource.configureClient({
-  getWorldModel: () => CL?.state?.worldmodel ?? null,
-  getModels: () => CL?.state?.model_precache ?? null,
-});
-
-/** Tracks entity updates during message parsing */
-let entitiesReceived = 0;
-
-function getModelSyncbase(model) {
-  return 'random' in model && model.random ? Math.random() : 0.0;
-}
-
-/**
- * Parses the serverdata payload and prepares the client for the new map.
- */
-function parseServerData() {
-  Con.DPrint('Serverdata packet received.\n');
-  CL.ClearState();
-
-  const version = NET.message.readByte();
-
-  if (version !== Protocol.version) {
-    throw new HostError('Server returned protocol version ' + version + ', not ' + Protocol.version + '\n');
-  }
-
-  const isHavingClientQuakeJS = NET.message.readByte() === 1;
-
-  if (isHavingClientQuakeJS) {
-    Con.DPrint('Server is running QuakeJS with ClientGameAPI provided.\n');
-
-    if (!PR.QuakeJS?.ClientGameAPI) {
-      throw new HostError('Server is running QuakeJS with client code provided,\nbut client code is not imported.\nTry clearing your cache and connect again.');
-    }
-
-    const name = NET.message.readString();
-    const author = NET.message.readString();
-    const serverVersion = [NET.message.readByte(), NET.message.readByte(), NET.message.readByte()];
-
-    const identification = PR.QuakeJS.identification;
-
-    if (identification.name !== name || identification.author !== author) {
-      throw new HostError(`Cannot connect, game mismatch.\nThe server is running ${name}\nand you are running ${identification.name}.`);
-    }
-
-    if (!PR.QuakeJS.ClientGameAPI.IsServerCompatible(serverVersion)) {
-      throw new HostError(`Server (v${serverVersion.join('.')} ) is not compatible. You are running v${identification.version.join('.')}\nTry clearing your cache and connect again.`);
-    }
-
-    CL.state.gameAPI = new PR.QuakeJS.ClientGameAPI(ClientEngineAPI);
-  } else {
-    const game = NET.message.readString();
-
-    if (game !== COM.game) {
-      throw new HostError('Server is running game ' + game + ', not ' + COM.game + '\n');
-    }
-
-    document.title = `${game} on ${Def.productName} (${Host.version.string})`;
-  }
-
-  CL.state.maxclients = NET.message.readByte();
-  if ((CL.state.maxclients <= 0) || (CL.state.maxclients > 32)) {
-    throw new HostError('Bad maxclients (' + CL.state.maxclients + ') from server!');
-  }
-
-  CL.state.scores.length = 0;
-
-  for (let i = 0; i < CL.state.maxclients; i++) {
-    CL.state.scores[i] = new ScoreSlot(i);
-  }
-
-  CL.state.levelname = NET.message.readString();
-
-  // parsePmovevars(CL);
-
-  Con.Print('\x02' + CL.state.levelname + '\n\n');
-
-  CL.SetConnectingStep(15, 'Received server info');
-
-  let str;
-  let nummodels; const model_precache = /** @type {string[]} */ ([]);
-  for (nummodels = 1; ; nummodels++) {
-    str = NET.message.readString();
-    if (str.length === 0) {
-      break;
-    }
-    model_precache[nummodels] = str;
-  }
-  let numsounds; const sound_precache = /** @type {string[]} */ ([]);
-  for (numsounds = 1; ; numsounds++) {
-    str = NET.message.readString();
-    if (str.length === 0) {
-      break;
-    }
-    sound_precache[numsounds] = str;
-  }
-
-  if (CL.gameCapabilities.includes(gameCapabilities.CAP_CLIENTDATA_DYNAMIC)) {
-    const clientdataFields = /** @type {string[]} */ ([]);
-
-    while (true) {
-      const fields = NET.message.readString();
-      if (fields === '') {
-        break;
-      }
-      clientdataFields.push(fields);
-    }
-
-    CL.state.clientMessages.clientdataFields = clientdataFields;
-  }
-
-  if (CL.gameCapabilities.includes(gameCapabilities.CAP_ENTITY_EXTENDED)) {
-    while (true) {
-      const classname = NET.message.readString();
-
-      if (classname === '') {
-        break;
-      }
-
-      const fields = /** @type {string[]} */ ([]);
-
-      while (true) {
-        const field = NET.message.readString();
-
-        if (field === '') {
-          break;
-        }
-
-        fields.push(field);
-      }
-
-      /** @type {'readByte' | 'readShort' | 'readLong'} */
-      let bitsReader;
-
-      console.assert(fields.length <= 32, 'entity fields must not have more than 32 fields');
-
-      if (fields.length <= 8) {
-        bitsReader = 'readByte';
-      } else if (fields.length <= 16) {
-        bitsReader = 'readShort';
-      } else {
-        bitsReader = 'readLong';
-      }
-
-      if (fields.length > 0) {
-        CL.state.clientEntityFields[classname] = { fields, bitsReader };
-      }
-    }
-  }
-
-  CL.connection.processingServerDataState = 1;
-
-  void (async () => {
-    const models = /** @type {(BaseModel | null)[]} */ ([null]);
-    const sounds = /** @type {(SFX | null)[]} */ ([null]);
-
-    models[1] = await Mod.ForNameAsync(model_precache[1], false, Mod.scope.client);
-    nummodels--;
-
-    while (nummodels > 0) {
-      const chunksize = Math.min(nummodels, 10);
-      nummodels -= chunksize;
-
-      CL.SetConnectingStep(25 + (models.length / model_precache.length) * 30, 'Loading models');
-      models.push(...await Promise.all(model_precache.slice(models.length, models.length + chunksize).map((m) => Mod.ForNameAsync(m, false, Mod.scope.client))));
-
-      CL.SendCmd();
-    }
-
-    while (numsounds > 0) {
-      const chunksize = Math.min(numsounds, 10);
-      numsounds -= chunksize;
-      CL.SetConnectingStep(55 + (sounds.length / sound_precache.length) * 30, 'Loading sounds');
-      sounds.push(...await Promise.all(sound_precache.slice(sounds.length, sounds.length + chunksize).map((s) => S.PrecacheSoundAsync(s))));
-
-      CL.SendCmd();
-    }
-
-    return { models, sounds };
-  })().then(({ models, sounds }) => {
-    CL.state.model_precache.length = 0;
-    CL.state.sound_precache.length = 0;
-
-    CL.state.model_precache.push(...models);
-    CL.state.sound_precache.push(...sounds);
-
-    CL.connection.processingServerDataState = 2;
-    CL.state.worldmodel = /** @type {BrushModel} */ (CL.state.model_precache[1]);
-    CL.pmove.setWorldmodel(CL.state.worldmodel);
-    const ent = CL.state.clientEntities.getEntity(0);
-    ent.classname = 'worldspawn';
-    ent.loadHandler();
-    ent.model = CL.state.worldmodel;
-    ent.spawn();
-    CL.SetConnectingStep(85, 'Preparing map');
-    CL.SendCmd();
-    R.NewMap();
-    CL.SendCmd();
-    Host.noclip_anglehack = false;
-    if (CL.state.gameAPI) {
-      CL.state.gameAPI.init();
-      if (CL.state.loadClientData && CL.state.loadClientData[0]) {
-        CL.state.gameAPI.loadGame(CL.state.loadClientData[0]);
-      }
-    }
-    if (CL.state.loadClientData && CL.state.loadClientData[1]) {
-      R.DeserializeParticles(CL.state.loadClientData[1]);
-    }
-    CL.state.loadClientData = null;
-  });
-}
-
-/**
- * Reads pmove configuration values from the network stream.
- */
-function parsePmovevars() {
-  const movevars = CL.pmove.movevars;
-  movevars.gravity = NET.message.readFloat();
-  movevars.stopspeed = NET.message.readFloat();
-  movevars.maxspeed = NET.message.readFloat();
-  movevars.spectatormaxspeed = NET.message.readFloat();
-  movevars.accelerate = NET.message.readFloat();
-  movevars.airaccelerate = NET.message.readFloat();
-  movevars.wateraccelerate = NET.message.readFloat();
-  movevars.friction = NET.message.readFloat();
-  movevars.waterfriction = NET.message.readFloat();
-  movevars.entgravity = NET.message.readFloat();
-
-  Con.DPrint('Reconfigured Pmovevars.\n');
-}
-
-/**
- * Parses a lightstyle definition.
- */
-function parseLightstylePacket() {
-  const index = NET.message.readByte();
-  if (index >= Def.limits.lightstyles) {
-    throw new HostError('svc_lightstyle > MAX_LIGHTSTYLES');
-  }
-
-  CL.state.clientEntities.setLightstyle(index, NET.message.readString());
-}
-
-/**
- * Parses a spatialized sound start request.
- */
-function parseStartSoundPacket() {
-  const fieldMask = NET.message.readByte();
-  const volume = ((fieldMask & 1) !== 0) ? NET.message.readByte() : 255;
-  const attenuation = ((fieldMask & 2) !== 0) ? NET.message.readByte() * 0.015625 : 1.0;
-  const entchannel = NET.message.readShort();
-  const soundNum = NET.message.readByte();
-  const ent = entchannel >> 3;
-  const channel = entchannel & 7;
-  const pos = NET.message.readCoordVector();
-
-  const sound = CL.state.sound_precache[soundNum];
-  if (sound) {
-    S.StartSound(ent, channel, sound, pos, volume / 255.0, attenuation);
-  }
-}
-
-/**
- * Parses a static entity definition.
- */
-function parseStaticEntity() {
-  const ent = CL.state.clientEntities.allocateClientEntity(NET.message.readString());
-  const modelindex = NET.message.readByte();
-  ent.modelindex = modelindex;
-  ent.model = CL.state.model_precache[modelindex] || null;
-  ent.frame = NET.message.readByte();
-  ent.colormap = NET.message.readByte();
-  ent.skinnum = NET.message.readByte();
-  ent.effects = NET.message.readByte();
-  ent.alpha = NET.message.readByte() / 255.0;
-  ent.solid = NET.message.readByte();
-  ent.angles.set(NET.message.readAngleVector());
-  ent.setOrigin(NET.message.readCoordVector());
-  ent.spawn();
-}
-
-/**
- * Parses a static ambient sound definition.
- */
-function parseStaticSound() {
-  const org = NET.message.readCoordVector();
-  const soundId = NET.message.readByte();
-  const vol = NET.message.readByte();
-  const attn = NET.message.readByte();
-  const sound = CL.state.sound_precache[soundId];
-  if (sound) {
-    S.StaticSound(sound, org, vol / 255.0, attn);
-  }
-}
-
-/**
- * Applies server cvar updates.
- */
-function parseServerCvars() {
-  let count = NET.message.readByte();
-
-  while (count-- > 0) {
-    const name = NET.message.readString();
-    const value = NET.message.readString();
-
-    CL.cls.serverInfo[name] = value;
-
-    if (CL.cls.signon === 4) {
-      if (CL.state.maxclients > 1) { // don’t bother printing cvar changes in single player
-        Con.Print(`"${name}" changed to "${value}"\n`);
-      }
-      eventBus.publish('client.server-info.updated', name, value);
-    }
-
-    // reset cheat cvars when sv_cheats is turned off
-    if (name === 'sv_cheats' && value === '0') {
-      CL.ResetCheatCvars();
-    }
-  }
-}
-
-/**
- * Parses beam-style temporary entities.
- * @param {BaseModel | null | undefined} model Model to attach to the beam.
- */
-function parseBeam(model) {
-  const ent = NET.message.readShort();
-  const start = NET.message.readCoordVector();
-  const end = NET.message.readCoordVector();
-  if (!model) {
-    return;
-  }
-  for (let i = 0; i < Def.limits.beams; i++) {
-    const beam = CL.state.clientEntities.beams[i];
-    if (beam.entity !== ent) {
-      continue;
-    }
-    beam.model = model;
-    beam.endtime = CL.state.time + 0.2;
-    beam.start = start.copy();
-    beam.end = end.copy();
-    return;
-  }
-  for (let i = 0; i < Def.limits.beams; i++) {
-    const beam = CL.state.clientEntities.beams[i];
-    if ((beam.model !== null) && (beam.endtime >= CL.state.time)) {
-      continue;
-    }
-    beam.entity = ent;
-    beam.model = model;
-    beam.endtime = CL.state.time + 0.2;
-    beam.start = start.copy();
-    beam.end = end.copy();
-    return;
-  }
-  Con.PrintWarning('beam list overflow!\n');
-}
-
-/**
- * Decodes temporary entities (explosions, splashes, etc.).
- */
-function parseTemporaryEntity() {
-  const type = NET.message.readByte();
-
-  switch (type) {
-    case Protocol.te.lightning1:
-      parseBeam(CL.state.clientEntities.tempEntityModels['progs/bolt.mdl']);
-      return;
-    case Protocol.te.lightning2:
-      parseBeam(CL.state.clientEntities.tempEntityModels['progs/bolt2.mdl']);
-      return;
-    case Protocol.te.lightning3:
-      parseBeam(CL.state.clientEntities.tempEntityModels['progs/bolt3.mdl']);
-      return;
-    case Protocol.te.beam: // CR: this model does not exist
-      parseBeam(CL.state.clientEntities.tempEntityModels['progs/beam.mdl']);
-      return;
-  }
-
-  const pos = NET.message.readCoordVector();
-  const sounds = CL.state.clientEntities.tempEntitySounds;
-
-  switch (type) {
-    case Protocol.te.wizspike:
-      R.RunParticleEffect(pos, Vector.origin, 20, 20);
-      S.StartSound(-1, 0, sounds.wizhit, pos, 1.0, 1.0);
-      return;
-    case Protocol.te.knightspike:
-      R.RunParticleEffect(pos, Vector.origin, 226, 20);
-      S.StartSound(-1, 0, sounds.knighthit, pos, 1.0, 1.0);
-      return;
-    case Protocol.te.spike:
-      R.RunParticleEffect(pos, Vector.origin, 0, 10);
-      return;
-    case Protocol.te.superspike:
-      R.RunParticleEffect(pos, Vector.origin, 0, 20);
-      return;
-    case Protocol.te.gunshot:
-      R.RunParticleEffect(pos, Vector.origin, 0, 20);
-      return;
-    case Protocol.te.explosion: {
-      R.ParticleExplosion(pos);
-      const dl = CL.state.clientEntities.allocateDynamicLight(0);
-      dl.origin = pos.copy();
-      dl.radius = 350.0;
-      dl.die = CL.state.time + 0.5;
-      dl.decay = 300.0;
-      S.StartSound(-1, 0, sounds.explosion, pos, 1.0, 1.0);
-    }
-      return;
-    case Protocol.te.tarexplosion:
-      R.BlobExplosion(pos);
-      S.StartSound(-1, 0, sounds.explosion, pos, 1.0, 1.0);
-      return;
-    case Protocol.te.lavasplash:
-      R.LavaSplash(pos);
-      return;
-    case Protocol.te.teleport:
-      R.TeleportSplash(pos);
-      return;
-    case Protocol.te.explosion2: {
-      const colorStart = NET.message.readByte();
-      const colorLength = NET.message.readByte();
-      R.ParticleExplosion2(pos, colorStart, colorLength);
-      const dl = CL.state.clientEntities.allocateDynamicLight(0);
-      dl.origin = pos.copy();
-      dl.radius = 350.0;
-      dl.die = CL.state.time + 0.5;
-      dl.decay = 300.0;
-      S.StartSound(-1, 0, sounds.explosion, pos, 1.0, 1.0);
-    }
-      return;
-  }
-
-  throw new Error(`CL.ParseTEnt: bad type ${type}`);
-}
-
-/**
- * Applies entity deltas for the current frame.
- */
-function parsePacketEntities() {
-  while (true) {
-    const edictNum = NET.message.readUint16();
-
-    if (edictNum === 0) {
-      break;
-    }
-
-    const clent = CL.state.clientEntities.getEntity(edictNum);
-
-    const bits = NET.message.readUint16();
-
-    if (bits & Protocol.u.classname) {
-      clent.classname = NET.message.readString();
-      clent.loadHandler();
-      clent.spawn();
-    }
-
-    if (bits & Protocol.u.free) {
-      clent.free = NET.message.readByte() !== 0;
-    }
-
-    if (bits & Protocol.u.frame) {
-      clent.framePrevious = clent.frame;
-      clent.frame = NET.message.readByte();
-    }
-
-    if (bits & Protocol.u.model) {
-      const modelindex = NET.message.readByte();
-      clent.modelindex = modelindex;
-      clent.model = CL.state.model_precache[modelindex] || null;
-
-      clent.framePrevious = null;
-      clent.frameTime = 0.0;
-
-      if (clent.model) {
-        clent.syncbase = getModelSyncbase(clent.model);
-      }
-    }
-
-    if (bits & Protocol.u.colormap) {
-      clent.colormap = NET.message.readByte();
-    }
-
-    if (bits & Protocol.u.skin) {
-      clent.skinnum = NET.message.readByte();
-    }
-
-    if (bits & Protocol.u.effects) {
-      clent.effects = NET.message.readByte();
-      clent.alpha = NET.message.readByte() / 255.0;
-    }
-
-    if (bits & Protocol.u.solid) {
-      clent.solid = NET.message.readByte();
-    }
-
-    const origin = clent.msg_origins[0];
-    const angles = clent.msg_angles[0];
-    const velocity = clent.msg_velocity[0];
-
-    for (let i = 0; i < 3; i++) {
-      if (bits & (Protocol.u.origin1 << i)) {
-        origin[i] = NET.message.readCoord();
-      }
-
-      if (bits & (Protocol.u.angle1 << i)) {
-        angles[i] = NET.message.readAngle();
-        velocity[i] = NET.message.readCoord();
-      }
-    }
-
-    if (bits & Protocol.u.size) {
-      clent.maxs.set(NET.message.readCoordVector());
-      clent.mins.set(NET.message.readCoordVector());
-    }
-
-    if (bits & Protocol.u.nextthink) {
-      clent.nextthink = CL.state.clientMessages.mtime[0] + NET.message.readByte() / 255.0;
-    }
-
-    if (CL.gameCapabilities.includes(gameCapabilities.CAP_ENTITY_EXTENDED)) {
-      const clientEntityFields = CL.state.clientEntityFields[clent.classname];
-      if (clientEntityFields) {
-        const fieldbits = NET.message[clientEntityFields.bitsReader]();
-
-        if (fieldbits > 0) {
-          const fields = [];
-
-          for (let i = 0; i < clientEntityFields.fields.length; i++) {
-            const field = clientEntityFields.fields[i];
-            if ((fieldbits & (1 << i)) !== 0) {
-              fields.push(field);
-            }
-          }
-
-          let counter = 0;
-
-          const values = NET.message.readSerializablesOnClient();
-
-          for (const value of values) {
-            clent.extended[fields[counter++]] = value;
-          }
-        }
-      }
-    }
-
-    const time = CL.state.clientMessages.mtime[0];
-
-    if (clent.nextthink > time) {
-      if (!clent.msg_origins[0].equals(clent.origin)) {
-        clent.originTime = time;
-        clent.originPrevious.set(clent.origin);
-      }
-
-      if (!clent.msg_angles[0].equals(clent.angles)) {
-        clent.anglesTime = time;
-        clent.anglesPrevious.set(clent.angles);
-      }
-
-      if (!clent.msg_velocity[0].equals(clent.velocity)) {
-        clent.velocityTime = time;
-        clent.velocityPrevious.set(clent.velocity);
-      }
-
-      if (bits & Protocol.u.frame) {
-        clent.frameTime = time;
-      }
-    }
-
-    clent.updatecount++;
-
-    clent.msg_origins[1].set(clent.msg_origins[0]);
-    clent.msg_angles[1].set(clent.msg_angles[0]);
-    clent.msg_velocity[1].set(clent.msg_velocity[0]);
-
-    if (clent.free) {
-      clent.freeEdict();
-    }
-  }
-}
-
-/**
- * Handles svc_nop – intentionally does nothing.
- */
-function handleNop() { }
-
-/**
- * Handles svc_time by forwarding to the high-level parser.
- */
-function handleTime() {
-  CL.state.clientMessages.parseTime();
-}
-
-/**
- * Handles svc_clientdata and populates the incremental client snapshot.
- */
-function handleClientData() {
-  CL.state.clientMessages.parseClient();
-}
-
-/**
- * Validates the negotiated protocol version and aborts if mismatched.
- */
-function handleVersion() {
-  const protocol = NET.message.readLong();
-  if (protocol !== Protocol.version) {
-    throw new HostError('CL.ParseServerMessage: Server is protocol ' + protocol + ' instead of ' + Protocol.version + '\n');
-  }
-}
-
-/**
- * Processes svc_disconnect by surfacing the server-supplied message.
- */
-function handleDisconnect() {
-  Host.EndGame(`Server disconnected: ${NET.message.readString()}`);
-}
-
-/**
- * Routes svc_print text through the console.
- */
-function handlePrint() {
-  Con.Print(NET.message.readString());
-}
-
-/**
- * Displays server-sent center print text and mirrors it to the console.
- */
-function handleCenterPrint() {
-  const string = NET.message.readString();
-  SCR.CenterPrint(string);
-  Con.Print('\x03' + string + '\n'); // TODO: have a better system for this
-}
-
-/**
- * Handles chat payloads and appends them to the client chat log.
- */
-function handleChatMessage() {
-  CL.AppendChatMessage(NET.message.readString(), NET.message.readString(), NET.message.readByte() === 1);
-}
-
-/**
- * Concatenates svc_stufftext into the pending console buffer.
- */
-function handleStuffText() {
-  Cmd.text += NET.message.readString();
-}
-
-/**
- * Delegates svc_damage to the view module so it can spawn impacts.
- */
-function handleDamage() {
-  const armor = NET.message.readByte();
-  const blood = NET.message.readByte();
-  const origin = NET.message.readCoordVector();
-  V.ApplyDamage(armor, blood, origin);
-}
-
-/**
- * Parses svc_serverdata and reinitializes renderer state.
- */
-function handleServerData() {
-  SCR.recalc_refdef = true;
-
-  // peak into the serverdata message to detect legacy demos and route to the old handlers if needed
-  if (new DataView(NET.message.data).getUint32(1, true) === 15) {
-    legacyServerCommandHandlers[Protocol.svc.serverdata]();
-    return;
-  }
-
-  parseServerData();
-}
-
-/**
- * Processes map transitions and resets client signon state.
- */
-function handleChangeLevel() {
-  const mapname = NET.message.readString();
-  CL.SetConnectingStep(5, 'Changing level to ' + mapname);
-  CL.cls.signon = 0;
-  CL.cls.changelevel = true;
-}
-
-/**
- * Updates the authoritative view angles of the local player.
- */
-function handleSetAngle() {
-  CL.state.viewangles.set(NET.message.readAngleVector());
-}
-
-/**
- * Selects the entity the client should render from.
- */
-function handleSetView() {
-  CL.state.viewentity = NET.message.readShort();
-}
-
-/**
- * Updates lightstyle definitions used for dynamic lighting.
- */
-function handleLightStyle() {
-  parseLightstylePacket();
-}
-
-/**
- * Triggers spatialized sounds for the given entity/channel tuple.
- */
-function handleSound() {
-  parseStartSoundPacket();
-}
-
-/**
- * Stops a currently playing sound for an entity/channel pair.
- */
-function handleStopSound() {
-  const value = NET.message.readShort();
-  S.StopSound(value >> 3, value & 7);
-}
-
-/**
- * Updates the server-specified sound precache entry.
- */
-function handleLoadSound() {
-  const index = NET.message.readByte();
-  CL.state.sound_precache[index] = S.PrecacheSound(NET.message.readString());
-  Con.DPrint(`CL.ParseServerMessage: load sound "${CL.state.sound_precache[index].name}" (${CL.state.sound_precache[index].state}) on slot ${index}\n`);
-}
-
-/**
- * Mirrors scoreboard name updates and broadcasts change events.
- */
-function handleUpdateName() {
-  const slot = NET.message.readByte();
-  if (slot >= CL.state.maxclients) {
-    throw new HostError('CL.ParseServerMessage: svc_updatename > MAX_SCOREBOARD');
-  }
-  const newName = NET.message.readString();
-  if (CL.state.scores[slot].name !== '' && newName !== '' && newName !== CL.state.scores[slot].name) {
-    Con.Print(`${CL.state.scores[slot].name} renamed to ${newName}\n`);
-    eventBus.publish('client.players.name-changed', slot, CL.state.scores[slot].name, newName);
-  }
-  CL.state.scores[slot].name = newName;
-}
-
-/**
- * Updates frag counts for a player and notifies listeners.
- */
-function handleUpdateFrags() {
-  const slot = NET.message.readByte();
-  if (slot >= CL.state.maxclients) {
-    throw new HostError('CL.ParseServerMessage: svc_updatefrags > MAX_SCOREBOARD');
-  }
-  CL.state.scores[slot].frags = NET.message.readShort();
-  eventBus.publish('client.players.frags-updated', slot, CL.state.scores[slot].frags);
-}
-
-/**
- * Updates color indices for a player and notifies listeners.
- */
-function handleUpdateColors() {
-  const slot = NET.message.readByte();
-  if (slot >= CL.state.maxclients) {
-    throw new HostError('CL.ParseServerMessage: svc_updatecolors > MAX_SCOREBOARD');
-  }
-  CL.state.scores[slot].colors = NET.message.readByte();
-  eventBus.publish('client.players.colors-updated', slot, CL.state.scores[slot].colors);
-}
-
-/**
- * Updates ping information for a player.
- */
-function handleUpdatePings() {
-  const slot = NET.message.readByte();
-  if (slot >= CL.state.maxclients) {
-    throw new HostError('CL.ParseServerMessage: svc_updatepings > MAX_SCOREBOARD');
-  }
-  CL.state.scores[slot].ping = NET.message.readShort() / 10;
-}
-
-/**
- * Spawns particle effects from svc_particle payloads.
- */
-function handleParticle() {
-  const org = NET.message.readCoordVector();
-  const dir = NET.message.readCoordVector();
-  const msgcount = NET.message.readByte();
-  const color = NET.message.readByte();
-  if (msgcount === 255) {
-    R.ParticleExplosion(org);
-  } else {
-    R.RunParticleEffect(org, dir, color, msgcount);
-  }
-}
-
-/**
- * Placeholder for svc_spawnbaseline which is not implemented yet.
- */
-function handleSpawnBaseline() {
-  console.assert(false, 'spawnbaseline is not implemented');
-}
-
-/**
- * Adds a static entity to the scene.
- */
-function handleSpawnStatic() {
-  parseStaticEntity();
-}
-
-/**
- * Parses temporary entities such as explosions and beam effects.
- */
-function handleTempEntity() {
-  parseTemporaryEntity();
-}
-
-/**
- * Toggles the paused state and publishes pause events.
- */
-function handleSetPause() {
-  CL.state.paused = NET.message.readByte() !== 0;
-  if (CL.state.paused) {
-    eventBus.publish('client.paused');
-  } else {
-    eventBus.publish('client.unpaused');
-  }
-}
-
-/**
- * Tracks the server signon phase and advances the handshake.
- */
-function handleSignonNum() {
-  const signon = NET.message.readByte();
-  if (signon <= CL.cls.signon) {
-    throw new HostError('Received signon ' + signon + ' when at ' + CL.cls.signon);
-  }
-  console.assert(signon >= 0 && signon <= 4, 'signon must be in range 0-4');
-  CL.cls.signon = /** @type {0|1|2|3|4} */ (signon);
-  Con.DPrint(`Received signon ${signon}\n`);
-  CL.SignonReply();
-}
-
-/**
- * Increments the monster kill statistic.
- */
-function handleKilledMonster() {
-  console.assert(SV.server.gameCapabilities.includes(gameCapabilities.CAP_CLIENTDATA_UPDATESTAT), 'killedmonster requires CAP_LEGACY_UPDATESTAT');
-  CL.state.stats[Def.stat.monsters]++;
-}
-
-/**
- * Increments the secret discovery statistic.
- */
-function handleFoundSecret() {
-  console.assert(SV.server.gameCapabilities.includes(gameCapabilities.CAP_CLIENTDATA_UPDATESTAT), 'foundsecret requires CAP_LEGACY_UPDATESTAT');
-  CL.state.stats[Def.stat.secrets]++;
-}
-
-/**
- * Updates an individual HUD/statistic entry.
- */
-function handleUpdateStat() {
-  console.assert(SV.server.gameCapabilities.includes(gameCapabilities.CAP_CLIENTDATA_UPDATESTAT), 'updatestat requires CAP_LEGACY_UPDATESTAT');
-  const index = NET.message.readByte();
-  console.assert(index >= 0 && index < CL.state.stats.length, 'updatestat must be in range');
-  CL.state.stats[index] = NET.message.readLong();
-}
-
-/**
- * Queues a static ambient sound.
- */
-function handleSpawnStaticSound() {
-  parseStaticSound();
-}
-
-/**
- * Starts or overrides the current CD track.
- */
-function handleCdTrack() {
-  CL.state.cdtrack = NET.message.readByte();
-  NET.message.readByte(); // unused (usually always the same as cdtrack)
-
-  if (((CL.cls.demoplayback === true) || (CL.cls.demorecording === true)) && (CL.cls.forcetrack !== -1)) {
-    eventBus.publish('client.cdtrack', CL.cls.forcetrack);
-  } else {
-    eventBus.publish('client.cdtrack', CL.state.cdtrack);
-  }
-}
-
-/**
- * Enters the intermission state.
- */
-function handleIntermission() {
-  CL.state.intermission = 1;
-  CL.state.completed_time = CL.state.time;
-  SCR.recalc_refdef = true;
-}
-
-/**
- * Displays the finale text block.
- */
-function handleFinale() {
-  CL.state.intermission = 2;
-  CL.state.completed_time = CL.state.time;
-  SCR.recalc_refdef = true;
-  SCR.CenterPrint(NET.message.readString());
-}
-
-/**
- * Plays a cutscene by showing a center print.
- */
-function handleCutscene() {
-  CL.state.intermission = 3;
-  CL.state.completed_time = CL.state.time;
-  SCR.recalc_refdef = true;
-  SCR.CenterPrint(NET.message.readString());
-}
-
-/**
- * Calls the help command when the server requests the sell screen.
- */
-function handleSellScreen() {
-  void Cmd.ExecuteString('help');
-}
-
-/**
- * Updates client-only movement variables such as gravity.
- */
-function handlePmoveVars() {
-  parsePmovevars();
-}
-
-/**
- * Updates player-specific interpolation data.
- */
-function handlePlayerInfo() {
-  CL.state.clientMessages.parsePlayer();
-}
-
-/**
- * Applies delta compressed packet entities.
- */
-function handleDeltaPacketEntities() {
-  entitiesReceived++;
-  parsePacketEntities();
-}
-
-/**
- * Applies server-sent configuration variables.
- */
-function handleCvar() {
-  parseServerCvars();
-}
-
-/**
- * Passes custom client events to the game API.
- */
-function handleClientEvent() {
-  console.assert(CL.state.gameAPI !== null, 'ClientGameAPI required');
-  CL.state.clientMessages.parseClientEvent();
-}
-
-/**
- * Updates portal state.
- */
-function handleSetPortalState() {
-  const portalNum = NET.message.readShort();
-  const open = NET.message.readByte() !== 0;
-  console.assert(CL.state.worldmodel !== null, 'worldmodel must be available before changing portal state');
-  CL.state.worldmodel.areaPortals.setPortalState(portalNum, open);
-}
-
-/** @type {Partial<Record<number, () => void>>} */
-const serverCommandHandlers = {
-  [Protocol.svc.nop]: handleNop,
-  [Protocol.svc.time]: handleTime,
-  [Protocol.svc.clientdata]: handleClientData,
-  [Protocol.svc.version]: handleVersion,
-  [Protocol.svc.disconnect]: handleDisconnect,
-  [Protocol.svc.print]: handlePrint,
-  [Protocol.svc.centerprint]: handleCenterPrint,
-  [Protocol.svc.chatmsg]: handleChatMessage,
-  [Protocol.svc.stufftext]: handleStuffText,
-  [Protocol.svc.damage]: handleDamage,
-  [Protocol.svc.serverdata]: handleServerData,
-  [Protocol.svc.changelevel]: handleChangeLevel,
-  [Protocol.svc.setangle]: handleSetAngle,
-  [Protocol.svc.setview]: handleSetView,
-  [Protocol.svc.lightstyle]: handleLightStyle,
-  [Protocol.svc.sound]: handleSound,
-  [Protocol.svc.stopsound]: handleStopSound,
-  [Protocol.svc.loadsound]: handleLoadSound,
-  [Protocol.svc.updatename]: handleUpdateName,
-  [Protocol.svc.updatefrags]: handleUpdateFrags,
-  [Protocol.svc.updatecolors]: handleUpdateColors,
-  [Protocol.svc.updatepings]: handleUpdatePings,
-  [Protocol.svc.particle]: handleParticle,
-  [Protocol.svc.spawnbaseline]: handleSpawnBaseline,
-  [Protocol.svc.spawnstatic]: handleSpawnStatic,
-  [Protocol.svc.temp_entity]: handleTempEntity,
-  [Protocol.svc.setpause]: handleSetPause,
-  [Protocol.svc.signonnum]: handleSignonNum,
-  [Protocol.svc.killedmonster]: handleKilledMonster,
-  [Protocol.svc.foundsecret]: handleFoundSecret,
-  [Protocol.svc.updatestat]: handleUpdateStat,
-  [Protocol.svc.spawnstaticsound]: handleSpawnStaticSound,
-  [Protocol.svc.cdtrack]: handleCdTrack,
-  [Protocol.svc.intermission]: handleIntermission,
-  [Protocol.svc.finale]: handleFinale,
-  [Protocol.svc.cutscene]: handleCutscene,
-  [Protocol.svc.sellscreen]: handleSellScreen,
-  [Protocol.svc.pmovevars]: handlePmoveVars,
-  [Protocol.svc.playerinfo]: handlePlayerInfo,
-  [Protocol.svc.deltapacketentities]: handleDeltaPacketEntities,
-  [Protocol.svc.cvar]: handleCvar,
-  [Protocol.svc.clientevent]: handleClientEvent,
-  [Protocol.svc.setportalstate]: handleSetPortalState,
-};
-
-/**
- * Dispatches one in-flight server message through dedicated opcode handlers.
- */
-export function parseServerMessage() {
-  if (CL.shownet.value === 1) {
-    Con.Print('NET: ' + NET.message.cursize + ' bytes\n');
-  }
-
-  CL.state.onground = false;
-
-  if (CL.connection.processingServerDataState === 1) {
-    return;
-  }
-
-  entitiesReceived = 0;
-
-  if (CL.connection.processingServerDataState === 3) {
-    CL.connection.processingServerDataState = 0;
-  } else {
-    CL.connection.lastServerMessages.length = 0;
-    NET.message.beginReading();
-  }
-
-  const messages = /** @type {string[]} */ ([]);
-
-  while (CL.cls.state > Def.clientConnectionState.disconnected) {
-    if (CL.connection.processingServerDataState > 0) {
-      break;
-    }
-
-    if (NET.message.badread === true) {
-      CL.PrintLastServerMessages();
-      throw new HostError('CL.ParseServerMessage: Bad server message');
-    }
-
-    const cmd = NET.message.readByte();
-
-    if (cmd === -1) {
-      break;
-    }
-
-    // legacy demo playback: high bit of command byte indicates an entity delta
-    if (CL.cls.legacy_demo && (cmd & 0x80)) {
-      handleLegacyEntityUpdate(cmd & 0x7F);
-      continue;
-    }
-
-    const commandEntry = CL.svc_strings.find(([, value]) => value === cmd);
-
-    if (!commandEntry) {
-      CL.PrintLastServerMessages();
-      throw new HostError(`CL.ParseServerMessage: Unknown server message ${cmd}`);
-    }
-
-    const command = commandEntry[0];
-
-    if (CL.shownet.value === 2) {
-      messages.push(command);
-    }
-
-    CL.connection.lastServerMessages.push(command);
-    if (CL.connection.lastServerMessages.length > 10) {
-      CL.connection.lastServerMessages.shift();
-    }
-
-    const handler = (CL.cls.legacy_demo && legacyServerCommandHandlers[cmd]) ? legacyServerCommandHandlers[cmd] : serverCommandHandlers[cmd];
-
-    if (handler) {
-      handler();
-      continue;
-    }
-
-    CL.connection.lastServerMessages.pop();
-    CL.PrintLastServerMessages();
-    throw new HostError('CL.ParseServerMessage: Illegible server message\n');
-  }
-
-  if (entitiesReceived > 0) {
-    if (CL.cls.signon === 3) {
-      CL.cls.signon = 4;
-      CL.SignonReply();
-    }
-  }
-
-  // CL.state.clientEntities.setSolidEntities(CL.pmove);
-
-  if (CL.shownet.value === 2) {
-    Con.Print('NET: (' + NET.message.cursize + ') ' + messages.join(', ') + '\n');
-  }
-}
-
-export {
-  handleNop,
-  handleTime,
-  handlePrint,
-  handleCenterPrint,
-  handleStuffText,
-  handleSetView,
-  handleLightStyle,
-  handleStopSound,
-  handleUpdateName,
-  handleUpdateFrags,
-  handleUpdateColors,
-  handleSetPause,
-  handleSignonNum,
-  handleCdTrack,
-  handleIntermission,
-  handleFinale,
-  handleCutscene,
-  handleSellScreen,
-};
diff --git a/source/engine/client/ClientServerCommandHandlers.ts b/source/engine/client/ClientServerCommandHandlers.ts
index d5d8b05d..3993bff8 100644
--- a/source/engine/client/ClientServerCommandHandlers.ts
+++ b/source/engine/client/ClientServerCommandHandlers.ts
@@ -11,7 +11,7 @@ import { sharedCollisionModelSource } from '../common/CollisionModelSource.ts';
 import { eventBus, getClientRegistry } from '../registry.mjs';
 import type { BaseModel } from '../common/model/BaseModel.ts';
 import { ScoreSlot } from './ClientState.ts';
-import type { SFX } from './Sound.mjs';
+import type { SFX } from './Sound.ts';
 
 import { legacyServerCommandHandlers, handleLegacyEntityUpdate } from './LegacyServerCommands.ts';
 
diff --git a/source/engine/client/LegacyServerCommands.mjs b/source/engine/client/LegacyServerCommands.mjs
deleted file mode 100644
index b09fffce..00000000
--- a/source/engine/client/LegacyServerCommands.mjs
+++ /dev/null
@@ -1,790 +0,0 @@
-import * as Protocol from '../network/Protocol.ts';
-import * as Def from '../common/Def.ts';
-import { HostError } from '../common/Errors.ts';
-import { eventBus, registry } from '../registry.mjs';
-import type { BrushModel } from '../common/Mod.ts';
-import type { BaseModel } from '../common/model/BaseModel.ts';
-import { ScoreSlot } from './ClientState.ts';
-import Vector from '../../shared/Vector.ts';
-import type { SFX } from './Sound.mjs';
-import {
-  handleNop,
-  handleTime,
-  handlePrint,
-  handleCenterPrint,
-  handleStuffText,
-  handleSetView,
-  handleLightStyle,
-  handleStopSound,
-  handleUpdateName,
-  handleUpdateFrags,
-  handleUpdateColors,
-  handleSetPause,
-  handleSignonNum,
-  handleCdTrack,
-  handleIntermission,
-  handleFinale,
-  handleCutscene,
-  handleSellScreen,
-} from './ClientServerCommandHandlers.ts';
-
-/** @typedef {typeof import('./CL.mjs').default} ClientLayer */
-
-let { CL, Con, NET, Mod, S, R, V, Host } = registry;
-
-eventBus.subscribe('registry.frozen', () => {
-  ({ CL, Con, NET, Mod, S, R, V, Host } = registry);
-});
-
-// TRIGGER WARNING: this content has been completely produced by Claude Opus 4.6
-//                  it’s only here, because I want the original demos working again --CR
-
-// ── WinQuake SU_ Client Data Update Bits ────────────────────────────────────
-// Note: bit 8 is unused in WinQuake, so ITEMS starts at bit 9.
-const SU = {
-  VIEWHEIGHT:  1 << 0,
-  IDEALPITCH:  1 << 1,
-  PUNCH1:      1 << 2,
-  PUNCH2:      1 << 3,
-  PUNCH3:      1 << 4,
-  VELOCITY1:   1 << 5,
-  VELOCITY2:   1 << 6,
-  VELOCITY3:   1 << 7,
-  // bit 8 unused
-  ITEMS:       1 << 9,
-  ONGROUND:    1 << 10,
-  INWATER:     1 << 11,
-  WEAPONFRAME: 1 << 12,
-  ARMOR:       1 << 13,
-  WEAPON:      1 << 14,
-};
-
-// ── WinQuake U_ Entity Update Bits ──────────────────────────────────────────
-const U = {
-  MOREBITS:    1 << 0,
-  ORIGIN1:     1 << 1,
-  ORIGIN2:     1 << 2,
-  ORIGIN3:     1 << 3,
-  ANGLE2:      1 << 4,
-  NOLERP:      1 << 5,
-  FRAME:       1 << 6,
-  SIGNAL:      1 << 7,
-  ANGLE1:      1 << 8,
-  ANGLE3:      1 << 9,
-  MODEL:       1 << 10,
-  COLORMAP:    1 << 11,
-  SKIN:        1 << 12,
-  EFFECTS:     1 << 13,
-  LONGENTITY:  1 << 14,
-};
-
-// ── WinQuake SND_ Sound Flags ───────────────────────────────────────────────
-const SND = {
-  VOLUME:      1 << 0,
-  ATTENUATION: 1 << 1,
-};
-
-// ── Legacy Coordinate / Angle Helpers ───────────────────────────────────────
-// WinQuake coords: 16-bit short × (1/8)    = 2 bytes
-// WinQuake angles: 8-bit byte × (360/256)  = 1 byte
-
-/**
- * Reads a WinQuake coordinate (short / 8).
- * @returns {number} the decoded coordinate
- */
-function readLegacyCoord() {
-  return NET.message.readShort() * (1.0 / 8.0);
-}
-
-/**
- * Reads a WinQuake angle (byte × 360/256).
- * @returns {number} the decoded angle in degrees
- */
-function readLegacyAngle() {
-  return NET.message.readByte() * (360.0 / 256.0);
-}
-
-/**
- * Reads 3 WinQuake coordinates as a Vector.
- * @returns {Vector} xyz coordinate vector
- */
-function readLegacyCoordVector() {
-  return new Vector(readLegacyCoord(), readLegacyCoord(), readLegacyCoord());
-}
-
-/**
- * Reads 3 WinQuake angles as a Vector.
- * @returns {Vector} pitch/yaw/roll angle vector
- */
-function readLegacyAngleVector() {
-  return new Vector(readLegacyAngle(), readLegacyAngle(), readLegacyAngle());
-}
-
-// ── Entity Baselines ────────────────────────────────────────────────────────
-
-type LegacyBaseline = {
-  modelindex: number;
-  frame: number;
-  colormap: number;
-  skin: number;
-  effects: number;
-  origin: Float32Array;
-  angles: Float32Array;
-};
-
-const legacyBaselines: LegacyBaseline[] = [];
-
-/**
- * Returns the stored baseline for the given entity number, creating a blank one if needed.
- * @param {number} num entity number
- * @returns {LegacyBaseline} the baseline record
- */
-function getBaseline(num) {
-  if (!legacyBaselines[num]) {
-    legacyBaselines[num] = {
-      modelindex: 0,
-      frame: 0,
-      colormap: 0,
-      skin: 0,
-      effects: 0,
-      origin: new Float32Array(3),
-      angles: new Float32Array(3),
-    };
-  }
-  return legacyBaselines[num];
-}
-
-function getModelSyncbase(model) {
-  return 'random' in model && model.random ? Math.random() : 0.0;
-}
-
-// ── svc_serverdata (11) ─────────────────────────────────────────────────────
-// WinQuake wire format:
-//   long    protocol version (must be 15)
-//   byte    maxclients
-//   byte    gametype (0=coop, 1=dm)
-//   string  level name
-//   strings model precache list (empty string terminates)
-//   strings sound precache list (empty string terminates)
-
-/**
- * Parses WinQuake svc_serverdata and reinitializes client state for legacy demo playback.
- */
-function handleLegacyServerData() {
-  Con.DPrint('Legacy Serverdata packet received.\n');
-  CL.ClearState();
-  CL.cls.legacy_demo = true;
-  legacyBaselines.length = 0;
-
-  const protocol = NET.message.readLong();
-  if (protocol !== 15) {
-    throw new HostError(`Legacy server returned protocol ${protocol}, not 15`);
-  }
-
-  const maxclients = NET.message.readByte();
-  CL.state.maxclients = maxclients;
-
-  CL.state.scores.length = 0;
-  for (let i = 0; i < CL.state.maxclients; i++) {
-    CL.state.scores[i] = new ScoreSlot(i);
-  }
-
-  NET.message.readByte(); // skip gametype, not used by the client
-
-  CL.state.levelname = NET.message.readString();
-
-  Con.Print('\x02' + CL.state.levelname + '\n\n');
-
-  CL.SetConnectingStep(15, 'Received server info');
-
-  // Read model precache list (strings terminated by empty string)
-  const model_precache = /** @type {string[]} */ ([]);
-  for (let nummodels = 1; ; nummodels++) {
-    const str = NET.message.readString();
-    if (str.length === 0) {
-      break;
-    }
-    model_precache[nummodels] = str;
-  }
-
-  // Read sound precache list (strings terminated by empty string)
-  const sound_precache = /** @type {string[]} */ ([]);
-  for (let numsounds = 1; ; numsounds++) {
-    const str = NET.message.readString();
-    if (str.length === 0) {
-      break;
-    }
-    sound_precache[numsounds] = str;
-  }
-
-  // Async asset loading
-  CL.connection.processingServerDataState = 1;
-
-  void (async () => {
-    const models = /** @type {(BaseModel | null)[]} */ ([null]);
-    const sounds = /** @type {(SFX | null)[]} */ ([null]);
-
-    // Load world model first
-    models[1] = await Mod.ForNameAsync(model_precache[1], false, Mod.scope.client);
-
-    // Load remaining models in chunks
-    while (models.length < model_precache.length) {
-      const remaining = model_precache.slice(models.length);
-      const chunksize = Math.min(remaining.length, 10);
-      if (chunksize === 0) {
-        break;
-      }
-      CL.SetConnectingStep(25 + (models.length / model_precache.length) * 30, 'Loading models');
-      const loaded = await Promise.all(remaining.slice(0, chunksize).map((m) => Mod.ForNameAsync(m, false, Mod.scope.client)));
-      models.push(...loaded);
-      CL.SendCmd();
-    }
-
-    // Load sounds in chunks
-    while (sounds.length < sound_precache.length) {
-      const remaining = sound_precache.slice(sounds.length);
-      const chunksize = Math.min(remaining.length, 10);
-      if (chunksize === 0) {
-        break;
-      }
-      CL.SetConnectingStep(55 + (sounds.length / sound_precache.length) * 30, 'Loading sounds');
-      const loaded = await Promise.all(remaining.slice(0, chunksize).map((s) => S.PrecacheSoundAsync(s)));
-      sounds.push(...loaded);
-      CL.SendCmd();
-    }
-
-    return { models, sounds };
-  })().then(({ models, sounds }) => {
-    CL.state.model_precache = models;
-    CL.state.sound_precache = sounds;
-
-    CL.connection.processingServerDataState = 2;
-    CL.state.worldmodel = /** @type {BrushModel} */ (CL.state.model_precache[1]);
-    CL.pmove.setWorldmodel(CL.state.worldmodel);
-
-    const ent = CL.state.clientEntities.getEntity(0);
-    ent.classname = 'worldspawn';
-    ent.loadHandler();
-    ent.model = CL.state.model_precache[1] || null;
-    ent.spawn();
-
-    R.NewMap();
-  }).catch((e) => {
-    Con.Print(e instanceof Error ? (e.stack ?? e.message) : String(e));
-    throw new HostError('Legacy ServerData loading failed');
-  });
-}
-
-// ── svc_spawnbaseline (22) ──────────────────────────────────────────────────
-// WinQuake wire format:
-//   short   entity number
-//   byte    modelindex
-//   byte    frame
-//   byte    colormap
-//   byte    skin
-//   3× (coord, angle)  origin[i], angles[i]   – interleaved
-
-/**
- * Parses a WinQuake svc_spawnbaseline and stores the entity baseline.
- */
-function handleLegacySpawnBaseline() {
-  const entnum = NET.message.readShort();
-  const baseline = getBaseline(entnum);
-
-  baseline.modelindex = NET.message.readByte();
-  baseline.frame = NET.message.readByte();
-  baseline.colormap = NET.message.readByte();
-  baseline.skin = NET.message.readByte();
-
-  for (let i = 0; i < 3; i++) {
-    baseline.origin[i] = readLegacyCoord();
-    baseline.angles[i] = readLegacyAngle();
-  }
-}
-
-// ── svc_spawnstatic (20) ────────────────────────────────────────────────────
-// Same baseline wire format as spawnbaseline (without the entity number).
-// WinQuake copies baseline → entity after parsing.
-
-/**
- * Parses a WinQuake svc_spawnstatic and creates a static client entity.
- */
-function handleLegacySpawnStatic() {
-  const modelindex = NET.message.readByte();
-  const frame = NET.message.readByte();
-  const colormap = NET.message.readByte();
-  const skin = NET.message.readByte();
-
-  const org = new Vector();
-  const ang = new Vector();
-
-  for (let i = 0; i < 3; i++) {
-    org[i] = readLegacyCoord();
-    ang[i] = readLegacyAngle();
-  }
-
-  const ent = CL.state.clientEntities.allocateClientEntity('static_entity');
-  ent.modelindex = modelindex;
-  ent.model = CL.state.model_precache[modelindex] || null;
-  ent.frame = frame;
-  ent.colormap = colormap;
-  ent.skinnum = skin;
-  ent.setOrigin(org);
-  ent.angles.set(ang);
-  ent.spawn();
-}
-
-// ── svc_clientdata (15) ─────────────────────────────────────────────────────
-// WinQuake wire format:
-//   short   bitmask
-//   per-axis (i=0..2): punchangle[i] if SU_PUNCHn (char), velocity[i] if SU_VELOCITYn (char×16)
-//   long    items (ALWAYS sent)
-//   if SU_WEAPONFRAME: byte
-//   if SU_ARMOR: byte
-//   if SU_WEAPON: byte
-//   short   health (ALWAYS)
-//   byte    ammo (ALWAYS)
-//   4× byte shells/nails/rockets/cells (ALWAYS)
-//   byte    activeweapon (ALWAYS)
-// Note: SU_ONGROUND and SU_INWATER are pure bit flags – no data follows.
-
-/**
- * Parses WinQuake svc_clientdata with correct bit layout and read order.
- */
-function handleLegacyClientData() {
-  const bits = NET.message.readShort();
-
-  CL.state.viewheight = (bits & SU.VIEWHEIGHT) ? NET.message.readChar() : 22;
-  CL.state.idealpitch = (bits & SU.IDEALPITCH) ? NET.message.readChar() : 0;
-
-  // WinQuake interleaves punchangle[i] and velocity[i] per axis
-  for (let i = 0; i < 3; i++) {
-    CL.state.punchangle[i] = (bits & (SU.PUNCH1 << i)) ? NET.message.readChar() : 0;
-    // Read velocity from the wire to keep the buffer in sync (not used for prediction)
-    if (bits & (SU.VELOCITY1 << i)) {
-      NET.message.readChar();
-    }
-  }
-
-  // Items are ALWAYS sent (unconditional long)
-  CL.state.items = NET.message.readLong();
-
-  // Onground / inwater are pure bit flags – no data bytes follow
-  CL.state.onground = (bits & SU.ONGROUND) !== 0;
-  CL.state.inwater = (bits & SU.INWATER) !== 0;
-
-  // Conditional stats
-  CL.state.stats[Def.stat.weaponframe] = (bits & SU.WEAPONFRAME) ? NET.message.readByte() : 0;
-  CL.state.stats[Def.stat.armor] = (bits & SU.ARMOR) ? NET.message.readByte() : 0;
-  CL.state.stats[Def.stat.weapon] = (bits & SU.WEAPON) ? NET.message.readByte() : 0;
-
-  // Always-sent stats
-  CL.state.stats[Def.stat.health] = NET.message.readShort();
-  CL.state.stats[Def.stat.ammo] = NET.message.readByte();
-  CL.state.stats[Def.stat.shells] = NET.message.readByte();
-  CL.state.stats[Def.stat.nails] = NET.message.readByte();
-  CL.state.stats[Def.stat.rockets] = NET.message.readByte();
-  CL.state.stats[Def.stat.cells] = NET.message.readByte();
-
-  // Active weapon (always sent)
-  CL.state.stats[Def.stat.activeweapon] = NET.message.readByte();
-}
-
-// ── Entity Update (fast update, cmd & 0x80) ────────────────────────────────
-// When the high bit of the command byte is set, the low 7 bits are the
-// initial update flags.  This is the WinQuake CL_ParseUpdate equivalent.
-
-/**
- * Parses a WinQuake entity update.  Called when the high bit of the command
- * byte is set.
- * @param {number} bits initial update bits (low 7 bits of command byte)
- */
-export function handleLegacyEntityUpdate(bits) {
-  // Advance signon on first entity update  (SIGNONS - 1 → SIGNONS)
-  if (CL.cls.signon === 3) {
-    CL.cls.signon = 4;
-    CL.SignonReply();
-  }
-
-  // Extended bits
-  if (bits & U.MOREBITS) {
-    bits |= NET.message.readByte() << 8;
-  }
-
-  // Entity number
-  const num = (bits & U.LONGENTITY) ? NET.message.readShort() : NET.message.readByte();
-
-  const clent = CL.state.clientEntities.getEntity(num);
-  const baseline = getBaseline(num);
-
-  // Detect whether the entity was present in the previous server frame.
-  // If not, we cannot interpolate from a previous position.
-  const forcelink = (clent.msgtime !== CL.state.clientMessages.mtime[1]);
-  clent.msgtime = CL.state.clientMessages.mtime[0];
-
-  // Model
-  const modelindex = (bits & U.MODEL) ? NET.message.readByte() : baseline.modelindex;
-  clent.modelindex = modelindex;
-  const model = CL.state.model_precache[modelindex] || null;
-  if (model !== clent.model) {
-    clent.model = model;
-    if (model) {
-      clent.syncbase = getModelSyncbase(model);
-    } else {
-      clent.forcelink = true;
-    }
-  }
-
-  // Frame, colormap, skin, effects
-  clent.frame = (bits & U.FRAME) ? NET.message.readByte() : baseline.frame;
-  clent.colormap = (bits & U.COLORMAP) ? NET.message.readByte() : baseline.colormap;
-  clent.skinnum = (bits & U.SKIN) ? NET.message.readByte() : baseline.skin;
-  clent.effects = (bits & U.EFFECTS) ? NET.message.readByte() : baseline.effects;
-
-  // Shift interpolation history
-  clent.msg_origins[1].set(clent.msg_origins[0]);
-  clent.msg_angles[1].set(clent.msg_angles[0]);
-
-  // Origin / angle – interleaved per axis (WinQuake order)
-  clent.msg_origins[0][0] = (bits & U.ORIGIN1) ? readLegacyCoord() : baseline.origin[0];
-  clent.msg_angles[0][0]  = (bits & U.ANGLE1)  ? readLegacyAngle() : baseline.angles[0];
-
-  clent.msg_origins[0][1] = (bits & U.ORIGIN2) ? readLegacyCoord() : baseline.origin[1];
-  clent.msg_angles[0][1]  = (bits & U.ANGLE2)  ? readLegacyAngle() : baseline.angles[1];
-
-  clent.msg_origins[0][2] = (bits & U.ORIGIN3) ? readLegacyCoord() : baseline.origin[2];
-  clent.msg_angles[0][2]  = (bits & U.ANGLE3)  ? readLegacyAngle() : baseline.angles[2];
-
-  // U_NOLERP: server explicitly says don’t interpolate (e.g. teleport)
-  if (bits & U.NOLERP) {
-    clent.forcelink = true;
-  }
-
-  // Set up lerp: assume next server frame in +0.1s
-  const shouldSnap = forcelink || clent.forcelink;
-  const mtime0 = CL.state.clientMessages.mtime[0];
-
-  if (shouldSnap) {
-    // Entity just appeared or teleported – snap to current position
-    clent.msg_origins[1].set(clent.msg_origins[0]);
-    clent.msg_angles[1].set(clent.msg_angles[0]);
-    clent.origin.set(clent.msg_origins[0]);
-    clent.originPrevious.setTo(Infinity, Infinity, Infinity);
-    clent.angles.set(clent.msg_angles[0]);
-    clent.anglesPrevious.setTo(Infinity, Infinity, Infinity);
-  } else {
-    // Smooth transition from current to new target
-    clent.originPrevious.set(clent.origin);
-    clent.originTime = mtime0;
-    clent.origin.set(clent.msg_origins[0]);
-    clent.anglesPrevious.set(clent.angles);
-    clent.anglesTime = mtime0;
-    clent.angles.set(clent.msg_angles[0]);
-  }
-
-  clent.nextthink = mtime0 + 0.1; // 100ms is the default QuakeC state machine logic frame interval
-  clent.forcelink = false;
-  clent.updatecount++;
-}
-
-// ── svc_disconnect (2) ──────────────────────────────────────────────────────
-// WinQuake sends no additional data with disconnect.
-
-/**
- * Handles WinQuake svc_disconnect (no additional data on the wire).
- */
-function handleLegacyDisconnect() {
-  Host.EndGame('Server disconnected\n');
-}
-
-// ── svc_version (4) ─────────────────────────────────────────────────────────
-
-/**
- * Validates the WinQuake protocol version (must be 15).
- */
-function handleLegacyVersion() {
-  const protocol = NET.message.readLong();
-  if (protocol !== 15) {
-    throw new HostError(`CL.ParseServerMessage: Server is protocol ${protocol} instead of 15\n`);
-  }
-}
-
-// ── svc_setangle (10) ───────────────────────────────────────────────────────
-// WinQuake angles are 1 byte each (byte × 360/256).
-
-/**
- * Updates the authoritative view angles using WinQuake 1-byte angle precision.
- */
-function handleLegacySetAngle() {
-  CL.state.viewangles.set(readLegacyAngleVector());
-}
-
-// ── svc_sound (6) ───────────────────────────────────────────────────────────
-// WinQuake wire format:
-//   byte    field_mask (SND_ flags)
-//   if SND_VOLUME: byte
-//   if SND_ATTENUATION: byte (÷64)
-//   short   entity<<3 | channel
-//   byte    sound_num
-//   3× coord  position
-
-/**
- * Parses a WinQuake svc_sound with legacy coordinate precision.
- */
-function handleLegacySound() {
-  const fieldMask = NET.message.readByte();
-  const volume = (fieldMask & SND.VOLUME) ? NET.message.readByte() : 255;
-  const attenuation = (fieldMask & SND.ATTENUATION) ? NET.message.readByte() / 64.0 : 1.0;
-
-  const entchannel = NET.message.readShort();
-  const soundNum = NET.message.readByte();
-  const ent = entchannel >> 3;
-  const channel = entchannel & 7;
-  const pos = readLegacyCoordVector();
-
-  const sound = CL.state.sound_precache[soundNum];
-  if (sound) {
-    S.StartSound(ent, channel, sound, pos, volume / 255.0, attenuation);
-  }
-}
-
-// ── svc_damage (19) ─────────────────────────────────────────────────────────
-
-/**
- * Delegates WinQuake svc_damage with legacy coordinate precision.
- */
-function handleLegacyDamage() {
-  const armor = NET.message.readByte();
-  const blood = NET.message.readByte();
-  const origin = readLegacyCoordVector();
-  V.ApplyDamage(armor, blood, origin);
-}
-
-// ── svc_particle (18) ───────────────────────────────────────────────────────
-// WinQuake: origin is 3× ReadCoord, direction is 3× ReadChar × (1/16).
-
-/**
- * Parses WinQuake svc_particle with legacy coords and signed-char direction.
- */
-function handleLegacyParticle() {
-  const org = readLegacyCoordVector();
-  // WinQuake direction: 3× signed char × (1/16)
-  const dir = new Vector(
-    NET.message.readChar() * 0.0625,
-    NET.message.readChar() * 0.0625,
-    NET.message.readChar() * 0.0625,
-  );
-  const msgcount = NET.message.readByte();
-  const color = NET.message.readByte();
-
-  if (msgcount === 255) {
-    R.ParticleExplosion(org);
-  } else {
-    R.RunParticleEffect(org, dir, color, msgcount);
-  }
-}
-
-// ── svc_temp_entity (23) ────────────────────────────────────────────────────
-
-/**
- * Parses a beam entity from the message buffer.
- * @param {BaseModel | null | undefined} model beam model to use
- */
-function parseLegacyBeam(model) {
-  const ent = NET.message.readShort();
-  const start = readLegacyCoordVector();
-  const end = readLegacyCoordVector();
-
-  if (!model) {
-    return;
-  }
-
-  for (let i = 0; i < Def.limits.beams; i++) {
-    const beam = CL.state.clientEntities.beams[i];
-    if (beam.entity !== ent) {
-      continue;
-    }
-    beam.model = model;
-    beam.endtime = CL.state.time + 0.2;
-    beam.start = start.copy();
-    beam.end = end.copy();
-    return;
-  }
-
-  for (let i = 0; i < Def.limits.beams; i++) {
-    const beam = CL.state.clientEntities.beams[i];
-    if ((beam.model !== null) && (beam.endtime >= CL.state.time)) {
-      continue;
-    }
-    beam.entity = ent;
-    beam.model = model;
-    beam.endtime = CL.state.time + 0.2;
-    beam.start = start.copy();
-    beam.end = end.copy();
-    return;
-  }
-
-  Con.Print('beam list overflow!\n');
-}
-
-/**
- * Parses a WinQuake svc_temp_entity with legacy coordinate precision.
- */
-function handleLegacyTempEntity() {
-  const type = NET.message.readByte();
-
-  switch (type) {
-    case Protocol.te.lightning1:
-      parseLegacyBeam(CL.state.clientEntities.tempEntityModels['progs/bolt.mdl']);
-      return;
-    case Protocol.te.lightning2:
-      parseLegacyBeam(CL.state.clientEntities.tempEntityModels['progs/bolt2.mdl']);
-      return;
-    case Protocol.te.lightning3:
-      parseLegacyBeam(CL.state.clientEntities.tempEntityModels['progs/bolt3.mdl']);
-      return;
-    case Protocol.te.beam:
-      parseLegacyBeam(CL.state.clientEntities.tempEntityModels['progs/beam.mdl']);
-      return;
-  }
-
-  const pos = readLegacyCoordVector();
-  const sounds = CL.state.clientEntities.tempEntitySounds;
-
-  switch (type) {
-    case Protocol.te.wizspike:
-      R.RunParticleEffect(pos, Vector.origin, 20, 20);
-      S.StartSound(-1, 0, sounds.wizhit, pos, 1.0, 1.0);
-      return;
-    case Protocol.te.knightspike:
-      R.RunParticleEffect(pos, Vector.origin, 226, 20);
-      S.StartSound(-1, 0, sounds.knighthit, pos, 1.0, 1.0);
-      return;
-    case Protocol.te.spike:
-      R.RunParticleEffect(pos, Vector.origin, 0, 10);
-      return;
-    case Protocol.te.superspike:
-      R.RunParticleEffect(pos, Vector.origin, 0, 20);
-      return;
-    case Protocol.te.gunshot:
-      R.RunParticleEffect(pos, Vector.origin, 0, 20);
-      return;
-    case Protocol.te.explosion: {
-      R.ParticleExplosion(pos);
-      const dl = CL.state.clientEntities.allocateDynamicLight(0);
-      dl.origin = pos.copy();
-      dl.radius = 350.0;
-      dl.die = CL.state.time + 0.5;
-      dl.decay = 300.0;
-      S.StartSound(-1, 0, sounds.explosion, pos, 1.0, 1.0);
-      }
-      return;
-    case Protocol.te.tarexplosion:
-      R.BlobExplosion(pos);
-      S.StartSound(-1, 0, sounds.explosion, pos, 1.0, 1.0);
-      return;
-    case Protocol.te.lavasplash:
-      R.LavaSplash(pos);
-      return;
-    case Protocol.te.teleport:
-      R.TeleportSplash(pos);
-      return;
-    case Protocol.te.explosion2: {
-      const colorStart = NET.message.readByte();
-      const colorLength = NET.message.readByte();
-      R.ParticleExplosion2(pos, colorStart, colorLength);
-      const dl = CL.state.clientEntities.allocateDynamicLight(0);
-      dl.origin = pos.copy();
-      dl.radius = 350.0;
-      dl.die = CL.state.time + 0.5;
-      dl.decay = 300.0;
-      S.StartSound(-1, 0, sounds.explosion, pos, 1.0, 1.0);
-      }
-      return;
-  }
-
-  throw new Error(`CL.ParseTEnt: bad type ${type}`);
-}
-
-// ── svc_spawnstaticsound (29) ───────────────────────────────────────────────
-
-/**
- * Parses WinQuake svc_spawnstaticsound with legacy coordinate precision.
- */
-function handleLegacySpawnStaticSound() {
-  const org = readLegacyCoordVector();
-  const soundId = NET.message.readByte();
-  const vol = NET.message.readByte();
-  const attn = NET.message.readByte();
-  const sound = CL.state.sound_precache[soundId];
-  if (sound) {
-    S.StaticSound(sound, org, vol / 255.0, attn);
-  }
-}
-
-// ── svc_killedmonster / svc_foundsecret / svc_updatestat ────────────────────
-// Legacy versions without gameCapabilities assertions (not available during
-// demo playback).
-
-/**
- * Increments the monster kill statistic (no gameCapabilities check for legacy demos).
- */
-function handleLegacyKilledMonster() {
-  CL.state.stats[Def.stat.monsters]++;
-}
-
-/**
- * Increments the secret discovery statistic (no gameCapabilities check for legacy demos).
- */
-function handleLegacyFoundSecret() {
-  CL.state.stats[Def.stat.secrets]++;
-}
-
-/**
- * Updates an individual HUD statistic entry (no gameCapabilities check for legacy demos).
- */
-function handleLegacyUpdateStat() {
-  const index = NET.message.readByte();
-  CL.state.stats[index] = NET.message.readLong();
-}
-
-// ── Handler Table ───────────────────────────────────────────────────────────
-// Only WinQuake svc commands (0–34).  QuakeShack-only opcodes (≥101) are
-// omitted because a WinQuake demo will never emit them.
-
-/** @type {Partial<Record<number, () => void>>} */
-export const legacyServerCommandHandlers = {
-  [Protocol.svc.nop]: handleNop,
-  [Protocol.svc.time]: handleTime,
-  [Protocol.svc.clientdata]: handleLegacyClientData,
-  [Protocol.svc.version]: handleLegacyVersion,
-  [Protocol.svc.disconnect]: handleLegacyDisconnect,
-  [Protocol.svc.print]: handlePrint,
-  [Protocol.svc.centerprint]: handleCenterPrint,
-  [Protocol.svc.stufftext]: handleStuffText,
-  [Protocol.svc.damage]: handleLegacyDamage,
-  [Protocol.svc.serverdata]: handleLegacyServerData,
-  [Protocol.svc.setangle]: handleLegacySetAngle,
-  [Protocol.svc.setview]: handleSetView,
-  [Protocol.svc.lightstyle]: handleLightStyle,
-  [Protocol.svc.sound]: handleLegacySound,
-  [Protocol.svc.stopsound]: handleStopSound,
-  [Protocol.svc.updatename]: handleUpdateName,
-  [Protocol.svc.updatefrags]: handleUpdateFrags,
-  [Protocol.svc.updatecolors]: handleUpdateColors,
-  [Protocol.svc.particle]: handleLegacyParticle,
-  [Protocol.svc.spawnbaseline]: handleLegacySpawnBaseline,
-  [Protocol.svc.spawnstatic]: handleLegacySpawnStatic,
-  [Protocol.svc.temp_entity]: handleLegacyTempEntity,
-  [Protocol.svc.setpause]: handleSetPause,
-  [Protocol.svc.signonnum]: handleSignonNum,
-  [Protocol.svc.killedmonster]: handleLegacyKilledMonster,
-  [Protocol.svc.foundsecret]: handleLegacyFoundSecret,
-  [Protocol.svc.updatestat]: handleLegacyUpdateStat,
-  [Protocol.svc.spawnstaticsound]: handleLegacySpawnStaticSound,
-  [Protocol.svc.cdtrack]: handleCdTrack,
-  [Protocol.svc.intermission]: handleIntermission,
-  [Protocol.svc.finale]: handleFinale,
-  [Protocol.svc.cutscene]: handleCutscene,
-  [Protocol.svc.sellscreen]: handleSellScreen,
-};
diff --git a/source/engine/client/LegacyServerCommands.ts b/source/engine/client/LegacyServerCommands.ts
index e688aba6..7a573e52 100644
--- a/source/engine/client/LegacyServerCommands.ts
+++ b/source/engine/client/LegacyServerCommands.ts
@@ -6,7 +6,7 @@ import type { BrushModel } from '../common/Mod.ts';
 import type { BaseModel } from '../common/model/BaseModel.ts';
 import { ScoreSlot } from './ClientState.ts';
 import Vector from '../../shared/Vector.ts';
-import type { SFX } from './Sound.mjs';
+import type { SFX } from './Sound.ts';
 import {
   handleNop,
   handleTime,
diff --git a/source/engine/client/Menu.mjs b/source/engine/client/Menu.mjs
deleted file mode 100644
index 6806286d..00000000
--- a/source/engine/client/Menu.mjs
+++ /dev/null
@@ -1,1214 +0,0 @@
-import { K } from '../../shared/Keys.ts';
-import Cmd from '../common/Cmd.ts';
-import Cvar from '../common/Cvar.ts';
-import { clientConnectionState } from '../common/Def.ts';
-import { eventBus, registry } from '../registry.mjs';
-import ClientLifecycle from './ClientLifecycle.ts';
-import { GLTexture } from './GL.mjs';
-import MultiplayerMainMenu from './menu/Multiplayer.ts';
-import VID from './VID.ts';
-
-let { CL, COM, Con, Draw, Host, Key, S, SCR, SV, V } = registry;
-
-eventBus.subscribe('registry.frozen', () => {
-  CL = registry.CL;
-  COM = registry.COM;
-  Con = registry.Con;
-  Draw = registry.Draw;
-  Host = registry.Host;
-  Key = registry.Key;
-  S = registry.S;
-  SCR = registry.SCR;
-  SV = registry.SV;
-  V = registry.V;
-});
-
-const M = {};
-
-export default M;
-
-M.state =
-{
-  none: 0,
-  main: 1,
-  singleplayer: 2,
-  load: 3,
-  save: 4,
-  multiplayer: 5,
-  options: 6,
-  keys: 7,
-  help: 8,
-  quit: 9,
-
-  alert: 10,
-  launch_server: 11,
-
-  value: 0,
-};
-
-M.DrawCharacter = function (cx, cy, num) {
-  Draw.Character(cx * 2 + Math.floor(VID.width / 2) - 320, cy * 2 + Math.floor(VID.height / 2) - 200, num, 2.0);
-};
-
-M.Print = function (cx, cy, str) {
-  Draw.StringWhite(cx * 2 + Math.floor(VID.width / 2) - 320, cy * 2 + Math.floor(VID.height / 2) - 200, str, 2.0);
-};
-
-M.PrintWhite = function (cx, cy, str) {
-  Draw.String(cx * 2 + Math.floor(VID.width / 2) - 320, cy * 2 + Math.floor(VID.height / 2) - 200, str, 2.0);
-};
-
-M.DrawPic = function (x, y, pic) {
-  Draw.Pic(x * 2 + Math.floor(VID.width / 2) - 320, y * 2 + Math.floor(VID.height / 2) - 200, pic, 2.0);
-};
-
-M.DrawPicTranslate = function (x, y, pic, top, bottom) {
-  Draw.PicTranslate(x * 2 + Math.floor(VID.width / 2) - 320, y * 2 + Math.floor(VID.height / 2) - 200, pic, top, bottom, 2.0);
-};
-
-M.DrawTextBox = function (x, y, width, lines) {
-  let cx; let cy; let n;
-
-  cy = y;
-  M.DrawPic(x, cy, M.box_tl);
-  for (n = 0; n < lines; n++) {
-    M.DrawPic(x, cy += 8, M.box_ml);
-  }
-  M.DrawPic(x, cy + 8, M.box_bl);
-
-  cx = x + 8;
-  let p;
-  for (; width > 0;) {
-    cy = y;
-    M.DrawPic(cx, y, M.box_tm);
-    p = M.box_mm;
-    for (n = 0; n < lines; n++) {
-      M.DrawPic(cx, cy += 8, p);
-      if (n === 0) {
-        p = M.box_mm2;
-      }
-    }
-    M.DrawPic(cx, cy + 8, M.box_bm);
-    width -= 2;
-    cx += 16;
-  }
-
-  cy = y;
-  M.DrawPic(cx, cy, M.box_tr);
-  for (n = 0; n < lines; n++) {
-    M.DrawPic(cx, cy += 8, M.box_mr);
-  }
-  M.DrawPic(cx, cy + 8, M.box_br);
-};
-
-M.CloseMenu = function () {
-  if (CL.cls.state === clientConnectionState.connected) {
-    Key.dest.value = Key.dest.game;
-  } else {
-    Key.dest.value = Key.dest.console;
-  }
-  M.state.value = M.state.none;
-};
-
-M.ToggleMenu_f = function () {
-  M.entersound = true;
-  if (Key.dest.value === Key.dest.menu) {
-    if (M.state.value !== M.state.main) {
-      M.Menu_Main_f();
-      return;
-    }
-    M.CloseMenu();
-    return;
-  }
-  M.Menu_Main_f();
-};
-
-
-// Main menu
-M.main_cursor = 0;
-M.main_items = 5;
-M.save_demonum = 0; // THIS IS THE REASON WHY I HATE UNINITIALIZED PROPERTIES, this line was missing and it quietly caused some NaNs deep in the demo code…
-
-M.Menu_Main_f = function () {
-  if (CL.cls.connecting !== null) {
-    return;
-  }
-
-  if (Key.dest.value !== Key.dest.menu) {
-    M.save_demonum = CL.cls.demonum;
-    CL.cls.demonum = -1;
-  }
-  Key.dest.value = Key.dest.menu;
-  M.state.value = M.state.main;
-  M.entersound = true;
-};
-
-M.Main_Draw = function () {
-  M.DrawPic(16, 4, M.qplaque);
-  M.DrawPic(160 - (M.ttl_main.width / 2), 4, M.ttl_main);
-  M.DrawPic(72, 32, M.mainmenu);
-  M.DrawPic(54, 32 + M.main_cursor * 20, M.menudot[Math.floor(Host.realtime * 10.0) % 6]);
-};
-
-M.Main_Key = function (k) {
-  switch (k) {
-    case K.ESCAPE:
-      M.CloseMenu();
-      CL.cls.demonum = M.save_demonum;
-      if ((CL.cls.demonum !== -1) && (CL.cls.demoplayback !== true) && (CL.cls.state !== clientConnectionState.connected)) {
-        CL.NextDemo();
-      }
-      return;
-    case K.DOWNARROW:
-      S.LocalSound(M.sfx_menu1);
-      if (++M.main_cursor >= M.main_items) {
-        M.main_cursor = 0;
-      }
-      return;
-    case K.UPARROW:
-      S.LocalSound(M.sfx_menu1);
-      if (M.main_cursor-- === 0) {
-        M.main_cursor = M.main_items - 1;
-      }
-      return;
-    case K.ENTER:
-      M.entersound = true;
-      switch (M.main_cursor) {
-        case 0:
-          M.Menu_SinglePlayer_f();
-          return;
-        case 1:
-          M.Menu_MultiPlayer_f();
-          return;
-        case 2:
-          M.Menu_Options_f();
-          return;
-        case 3:
-          M.Menu_Help_f();
-          return;
-        case 4:
-          M.Menu_Quit_f();
-      }
-  }
-};
-
-// Single player menu
-M.singleplayer_cursor = 0;
-M.singleplayer_items = 3;
-
-M.Menu_SinglePlayer_f = function () {
-  Key.dest.value = Key.dest.menu;
-  M.state.value = M.state.singleplayer;
-  M.entersound = true;
-};
-
-M.SinglePlayer_Draw = function () {
-  M.DrawPic(16, 4, M.qplaque);
-  M.DrawPic(160 - (M.ttl_sgl.width / 2), 4, M.ttl_sgl);
-  M.DrawPic(72, 32, M.sp_menu);
-  M.DrawPic(54, 32 + M.singleplayer_cursor * 20, M.menudot[Math.floor(Host.realtime * 10.0) % 6]);
-};
-
-M.SinglePlayer_Key = function (k) {
-  switch (k) {
-    case K.ESCAPE:
-      M.Menu_Main_f();
-      return;
-    case K.DOWNARROW:
-      S.LocalSound(M.sfx_menu1);
-      if (++M.singleplayer_cursor >= M.singleplayer_items) {
-        M.singleplayer_cursor = 0;
-      }
-      return;
-    case K.UPARROW:
-      S.LocalSound(M.sfx_menu1);
-      if (--M.singleplayer_cursor < 0) {
-        M.singleplayer_cursor = M.singleplayer_items - 1;
-      }
-      return;
-    case K.ENTER:
-      M.entersound = true;
-      switch (M.singleplayer_cursor) {
-        case 0:
-          if (SV.server.active) {
-            void Cmd.ExecuteString('disconnect');
-          }
-          Key.dest.value = Key.dest.game;
-          ClientLifecycle.startGame.startSingleplayerGame();
-          return;
-        case 1:
-          M.Menu_Load_f();
-          return;
-        case 2:
-          M.Menu_Save_f();
-          return;
-      }
-  }
-};
-
-// Load/save menu
-M.load_cursor = 0;
-M.max_savegames = 12;
-M.filenames = [];
-M.loadable = [];
-M.removable = [];
-
-M.ScanSaves = function () {
-  const searchpaths = COM.searchpaths;
-  const search = 'Quake.' + COM.gamedir[0].filename + '/s';
-  COM.searchpaths = COM.gamedir;
-  for (let i = 0; i < M.max_savegames; i++) {
-    const f = localStorage.getItem(search + i + '.json');
-    if (!f) {
-      M.filenames[i] = 'Empty slot';
-      M.loadable[i] = false;
-      M.removable[i] = false;
-      continue;
-    }
-    const gamestate = JSON.parse(f);
-    M.filenames[i] = gamestate.comment || gamestate.mapname;
-    M.loadable[i] = true;
-    M.removable[i] = true;
-  }
-  COM.searchpaths = searchpaths;
-};
-
-M.Menu_Load_f = function () {
-  M.entersound = true;
-  M.state.value = M.state.load;
-  Key.dest.value = Key.dest.menu;
-  M.ScanSaves();
-};
-
-M.Menu_Save_f = function () {
-  if ((SV.server.active !== true) || (CL.state.intermission !== 0) || (SV.svs.maxclients !== 1)) {
-    return;
-  }
-  M.entersound = true;
-  M.state.value = M.state.save;
-  Key.dest.value = Key.dest.menu;
-  M.ScanSaves();
-};
-
-M.Load_Draw = function () {
-  M.DrawPic(160 - (M.p_load.width / 2), 4, M.p_load);
-  let i;
-  for (i = 0; i < M.max_savegames; i++) {
-    M.Print(16, 32 + (i << 3), M.filenames[i]);
-  }
-  M.DrawCharacter(8, 32 + (M.load_cursor << 3), 12 + ((Host.realtime * 4.0) & 1));
-};
-
-M.Save_Draw = function () {
-  M.DrawPic(160 - (M.p_save.width / 2), 4, M.p_save);
-  let i;
-  for (i = 0; i < M.max_savegames; i++) {
-    M.Print(16, 32 + (i << 3), M.filenames[i]);
-  }
-  M.DrawCharacter(8, 32 + (M.load_cursor << 3), 12 + ((Host.realtime * 4.0) & 1));
-};
-
-M.Load_Key = function (k) {
-  switch (k) {
-    case K.ESCAPE:
-      M.Menu_SinglePlayer_f();
-      return;
-    case K.ENTER:
-      S.LocalSound(M.sfx_menu2);
-      if (M.loadable[M.load_cursor] !== true) {
-        return;
-      }
-      M.CloseMenu();
-      SCR.BeginLoadingPlaque();
-      Cmd.text += 'load s' + M.load_cursor + '\n';
-      return;
-    case K.UPARROW:
-    case K.LEFTARROW:
-      S.LocalSound(M.sfx_menu1);
-      if (--M.load_cursor < 0) {
-        M.load_cursor = M.max_savegames - 1;
-      }
-      return;
-    case K.DOWNARROW:
-    case K.RIGHTARROW:
-      S.LocalSound(M.sfx_menu1);
-      if (++M.load_cursor >= M.max_savegames) {
-        M.load_cursor = 0;
-      }
-      return;
-    case K.DEL:
-      if (M.removable[M.load_cursor] !== true) {
-        return;
-      }
-      if (confirm('Delete selected game?') !== true) {
-        return;
-      }
-      localStorage.removeItem('Quake.' + COM.gamedir[0].filename + '/s' + M.load_cursor + '.sav');
-      M.ScanSaves();
-  }
-};
-
-M.Save_Key = function (k) {
-  switch (k) {
-    case K.ESCAPE:
-      M.Menu_SinglePlayer_f();
-      return;
-    case K.ENTER:
-      M.CloseMenu();
-      Cmd.text += 'save s' + M.load_cursor + '\n';
-      return;
-    case K.UPARROW:
-    case K.LEFTARROW:
-      S.LocalSound(M.sfx_menu1);
-      if (--M.load_cursor < 0) {
-        M.load_cursor = M.max_savegames - 1;
-      }
-      return;
-    case K.DOWNARROW:
-    case K.RIGHTARROW:
-      S.LocalSound(M.sfx_menu1);
-      if (++M.load_cursor >= M.max_savegames) {
-        M.load_cursor = 0;
-      }
-      return;
-    case K.DEL:
-      if (M.removable[M.load_cursor] !== true) {
-        return;
-      }
-      if (confirm('Delete selected game?') !== true) {
-        return;
-      }
-      localStorage.removeItem('Quake.' + COM.gamedir[0].filename + '/s' + M.load_cursor + '.sav');
-      M.ScanSaves();
-  }
-};
-
-// Multiplayer menu
-M.multiplayer_cursor = 1;
-M.multiplayer_cursor_table = [56, 72, 96, 120, 156];
-M.multiplayer_joinname = (function () {
-  const url = new URL(location.href);
-  return url.host + url.pathname + (!url.pathname.endsWith('/') ? '/' : '') + 'api/';
-})();
-M.multiplayer_items = 5;
-
-M.Menu_MultiPlayer_f = function () {
-  Key.dest.value = Key.dest.menu;
-  M.state.value = M.state.multiplayer;
-  M.entersound = true;
-  M.multiplayer_myname = CL.name.string;
-  M.multiplayer_top = M.multiplayer_oldtop = CL.color.value >> 4;
-  M.multiplayer_bottom = M.multiplayer_oldbottom = CL.color.value & 15;
-  M.multiplayer_cursor = 1;
-};
-
-M.MultiPlayer_Draw = function () {
-  M.DrawPic(16, 4, M.qplaque);
-  M.DrawPic(160 - (M.p_multi.width / 2), 4, M.p_multi);
-
-  const y0 = 24;
-
-  // M.Print(64, 40 - y0, 'Join game at:');
-  // M.DrawTextBox(72, 48 - y0, 22, 1);
-  // M.Print(80, 56 - y0, M.multiplayer_joinname.substring(M.multiplayer_joinname.length - 21));
-
-  M.Print(64, 72 - y0, 'Your name');
-  M.DrawTextBox(160, 64 - y0, 16, 1);
-  M.PrintWhite(168, 72 - y0, M.multiplayer_myname);
-
-  M.Print(64, 96 - y0, 'Shirt color');
-  M.Print(64, 120 - y0, 'Pants color');
-
-  const label = CL.cls.state !== clientConnectionState.connected ? 'Join Game' : 'Accept Changes';
-
-  M.DrawTextBox(64, 148 - y0, label.length, 1);
-  M.PrintWhite(72, 156 - y0, label);
-
-  M.DrawPic(160, 80 - y0, M.bigbox);
-  M.DrawPicTranslate(172, 88 - y0, M.menuplyr,
-    (M.multiplayer_top << 4) + (M.multiplayer_top >= 8 ? 4 : 11),
-    (M.multiplayer_bottom << 4) + (M.multiplayer_bottom >= 8 ? 4 : 11));
-
-  M.DrawCharacter(56, M.multiplayer_cursor_table[M.multiplayer_cursor] - y0, 12 + ((Host.realtime * 4.0) & 1));
-
-  if (M.multiplayer_cursor === 0) {
-    M.DrawCharacter(M.multiplayer_joinname.length <= 20 ? 80 + (M.multiplayer_joinname.length << 3) : 248, 56 - y0, 10 + ((Host.realtime * 4.0) & 1));
-  } else if (M.multiplayer_cursor === 1) {
-    M.DrawCharacter(168 + (M.multiplayer_myname.length << 3), 72 - y0, 10 + ((Host.realtime * 4.0) & 1));
-  }
-};
-
-M.MultiPlayer_Key = function (k) {
-  if (k === K.ESCAPE) {
-    M.Menu_Main_f();
-  }
-
-  switch (k) {
-    case K.UPARROW:
-      S.LocalSound(M.sfx_menu1);
-      if (--M.multiplayer_cursor < 1) {
-        M.multiplayer_cursor = M.multiplayer_items - 1;
-      }
-      return;
-    case K.DOWNARROW:
-      S.LocalSound(M.sfx_menu1);
-      if (++M.multiplayer_cursor >= M.multiplayer_items) {
-        M.multiplayer_cursor = 1;
-      }
-      return;
-    case K.LEFTARROW:
-      if (M.multiplayer_cursor === 2) {
-        if (--M.multiplayer_top < 0) {
-          M.multiplayer_top = 13;
-        }
-        S.LocalSound(M.sfx_menu3);
-      } else if (M.multiplayer_cursor === 3) {
-        if (--M.multiplayer_bottom < 0) {
-          M.multiplayer_bottom = 13;
-        }
-        S.LocalSound(M.sfx_menu3);
-      }
-      return;
-    case K.RIGHTARROW:
-      if (M.multiplayer_cursor === 2) {
-        (M.multiplayer_top <= 12) ? ++M.multiplayer_top : M.multiplayer_top = 0;
-      } else if (M.multiplayer_cursor === 3) {
-        (M.multiplayer_bottom <= 12) ? ++M.multiplayer_bottom : M.multiplayer_bottom = 0;
-      } else {
-        return;
-      }
-      S.LocalSound(M.sfx_menu3);
-      return;
-    case K.ENTER:
-      switch (M.multiplayer_cursor) {
-        case 0:
-          S.LocalSound(M.sfx_menu2);
-          M.CloseMenu();
-          Cmd.text += 'connect "' + M.multiplayer_joinname + '"\n';
-          return;
-        case 2:
-          S.LocalSound(M.sfx_menu3);
-          (M.multiplayer_top <= 12) ? ++M.multiplayer_top : M.multiplayer_top = 0;
-          return;
-        case 3:
-          S.LocalSound(M.sfx_menu3);
-          (M.multiplayer_bottom <= 12) ? ++M.multiplayer_bottom : M.multiplayer_bottom = 0;
-          return;
-        case 4:
-          if (CL.name.string !== M.multiplayer_myname) {
-            Cmd.text += 'name "' + M.multiplayer_myname + '"\n';
-          }
-          if ((M.multiplayer_top !== M.multiplayer_oldtop) || (M.multiplayer_bottom !== M.multiplayer_oldbottom)) {
-            M.multiplayer_oldtop = M.multiplayer_top;
-            M.multiplayer_oldbottom = M.multiplayer_bottom;
-            Cmd.text += 'color ' + M.multiplayer_top + ' ' + M.multiplayer_bottom + '\n';
-          }
-
-          S.LocalSound(M.sfx_menu2);
-
-          if (CL.cls.state !== clientConnectionState.connected) {
-            // M.CloseMenu();
-            // Cmd.text += 'connect "' + M.multiplayer_joinname + '"\n';
-            M.Menu_Launch_Server_f();
-            return;
-          }
-
-          M.CloseMenu();
-          return;
-      }
-      return;
-    case K.BACKSPACE:
-      if (M.multiplayer_cursor === 0) {
-        if (M.multiplayer_joinname.length !== 0) {
-          M.multiplayer_joinname = M.multiplayer_joinname.substring(0, M.multiplayer_joinname.length - 1);
-        }
-        return;
-      }
-      if (M.multiplayer_cursor === 1) {
-        if (M.multiplayer_myname.length !== 0) {
-          M.multiplayer_myname = M.multiplayer_myname.substring(0, M.multiplayer_myname.length - 1);
-        }
-      }
-      return;
-  }
-
-  if ((k < 32) || (k > 127)) {
-    return;
-  }
-  if (M.multiplayer_cursor === 0) {
-    M.multiplayer_joinname += String.fromCharCode(k);
-    return;
-  }
-  if (M.multiplayer_cursor === 1) {
-    if (M.multiplayer_myname.length <= 14) {
-      M.multiplayer_myname += String.fromCharCode(k);
-    }
-  }
-};
-
-// Options menu
-M.options_cursor = 0;
-M.options_items = 12;
-
-M.Menu_Options_f = function () {
-  Key.dest.value = Key.dest.menu;
-  M.state.value = M.state.options;
-  M.entersound = true;
-};
-
-M.AdjustSliders = function (dir) {
-  S.LocalSound(M.sfx_menu3);
-
-  switch (M.options_cursor) {
-    case 3: { // screen size
-      let viewsize = SCR.viewsize.value;
-      viewsize += dir * 10;
-      if (viewsize < 30) {
-        viewsize = 30;
-      } else if (viewsize > 120) {
-        viewsize = 120;
-      }
-      Cvar.Set('viewsize', viewsize);
-      return;
-    }
-    case 4: { // gamma
-      let gamma = V.gamma.value;
-      gamma -= dir * 0.05;
-      if (gamma < 0.5) {
-        gamma = 0.5;
-      } else if (gamma > 1.0) {
-        gamma = 1.0;
-      }
-      Cvar.Set('gamma', gamma);
-      return;
-    }
-    case 5: { // mouse speed
-      let sensitivity = CL.sensitivity.value;
-      sensitivity += dir * 0.5;
-      if (sensitivity < 1.0) {
-        sensitivity = 1.0;
-      } else if (sensitivity > 11.0) {
-        sensitivity = 11.0;
-      }
-      Cvar.Set('sensitivity', sensitivity);
-      return;
-    }
-    case 6: { // music volume
-      let bgmvolume = S.bgmvolume.value;
-      bgmvolume += dir * 0.1;
-      if (bgmvolume < 0.0) {
-        bgmvolume = 0.0;
-      } else if (bgmvolume > 1.0) {
-        bgmvolume = 1.0;
-      }
-      Cvar.Set('bgmvolume', bgmvolume);
-      return;
-    }
-    case 7: { // sfx volume
-      let volume = S.volume.value;
-      volume += dir * 0.1;
-      if (volume < 0.0) {
-        volume = 0.0;
-      } else if (volume > 1.0) {
-        volume = 1.0;
-      }
-      Cvar.Set('volume', volume);
-      return;
-    }
-    case 8: // allways run
-      if (CL.forwardspeed.value > 200.0) {
-        Cvar.Set('cl_forwardspeed', 200.0);
-        Cvar.Set('cl_backspeed', 200.0);
-        return;
-      }
-      Cvar.Set('cl_forwardspeed', 400.0);
-      Cvar.Set('cl_backspeed', 400.0);
-      return;
-    case 9: // invert mouse
-      Cvar.Set('m_pitch', -CL.m_pitch.value);
-      return;
-    case 10: // lookspring
-      Cvar.Set('lookspring', (CL.lookspring.value !== 0) ? 0 : 1);
-      return;
-    case 11: // lookstrafe
-      Cvar.Set('lookstrafe', (CL.lookstrafe.value !== 0) ? 0 : 1);
-  }
-};
-
-M.DrawSlider = function (x, y, range) {
-  if (range < 0) {
-    range = 0;
-  } else if (range > 1) {
-    range = 1;
-  }
-  M.DrawCharacter(x - 8, y, 128);
-  M.DrawCharacter(x, y, 129);
-  M.DrawCharacter(x + 8, y, 129);
-  M.DrawCharacter(x + 16, y, 129);
-  M.DrawCharacter(x + 24, y, 129);
-  M.DrawCharacter(x + 32, y, 129);
-  M.DrawCharacter(x + 40, y, 129);
-  M.DrawCharacter(x + 48, y, 129);
-  M.DrawCharacter(x + 56, y, 129);
-  M.DrawCharacter(x + 64, y, 129);
-  M.DrawCharacter(x + 72, y, 129);
-  M.DrawCharacter(x + 80, y, 130);
-  M.DrawCharacter(x + Math.floor(72 * range), y, 131);
-};
-
-M.Options_Draw = function () {
-  M.DrawPic(16, 4, M.qplaque);
-  M.DrawPic(160 - (M.p_option.width / 2), 4, M.p_option);
-
-  M.Print(48, 32, 'Customize controls');
-  M.Print(88, 40, 'Go to console');
-  M.Print(56, 48, 'Reset to defaults');
-
-  M.Print(104, 56, 'Screen size');
-  M.DrawSlider(220, 56, (SCR.viewsize.value - 30) / 90);
-  M.Print(112, 64, 'Brightness');
-  M.DrawSlider(220, 64, (1.0 - V.gamma.value) * 2.0);
-  M.Print(104, 72, 'Mouse Speed');
-  M.DrawSlider(220, 72, (CL.sensitivity.value - 1) / 10);
-  M.Print(72, 80, 'CD Music Volume');
-  M.DrawSlider(220, 80, S.bgmvolume.value);
-  M.Print(96, 88, 'Sound Volume');
-  M.DrawSlider(220, 88, S.volume.value);
-  M.Print(112, 96, 'Always Run');
-  M.Print(220, 96, (CL.forwardspeed.value > 200.0) ? 'on' : 'off');
-  M.Print(96, 104, 'Invert Mouse');
-  M.Print(220, 104, (CL.m_pitch.value < 0.0) ? 'on' : 'off');
-  M.Print(112, 112, 'Lookspring');
-  M.Print(220, 112, (CL.lookspring.value !== 0) ? 'on' : 'off');
-  M.Print(112, 120, 'Lookstrafe');
-  M.Print(220, 120, (CL.lookstrafe.value !== 0) ? 'on' : 'off');
-
-  M.DrawCharacter(200, 32 + (M.options_cursor << 3), 12 + ((Host.realtime * 4.0) & 1));
-};
-
-M.Options_Key = function (k) {
-  switch (k) {
-    case K.ESCAPE:
-      M.Menu_Main_f();
-      return;
-    case K.ENTER:
-      M.entersound = true;
-      switch (M.options_cursor) {
-        case 0:
-          M.Menu_Keys_f();
-          return;
-        case 1:
-          M.CloseMenu();
-          Con.ToggleConsole_f();
-          return;
-        case 2:
-          Cmd.text += 'exec default.cfg\n';
-          return;
-        default:
-          M.AdjustSliders(1);
-      }
-      return;
-    case K.UPARROW:
-      S.LocalSound(M.sfx_menu1);
-      if (M.options_cursor-- === 0) {
-        M.options_cursor = M.options_items - 1;
-      }
-      return;
-    case K.DOWNARROW:
-      S.LocalSound(M.sfx_menu1);
-      if (++M.options_cursor >= M.options_items) {
-        M.options_cursor = 0;
-      }
-      return;
-    case K.LEFTARROW:
-      M.AdjustSliders(-1);
-      return;
-    case K.RIGHTARROW:
-      M.AdjustSliders(1);
-  }
-};
-
-// Keys menu
-M.bindnames = [
-  ['+attack', 'attack'],
-  ['impulse 10', 'change weapon'],
-  ['+jump', 'jump / swim up'],
-  ['+forward', 'walk forward'],
-  ['+back', 'backpedal'],
-  ['+left', 'turn left'],
-  ['+right', 'turn right'],
-  ['+speed', 'run'],
-  ['+moveleft', 'step left'],
-  ['+moveright', 'step right'],
-  ['+strafe', 'sidestep'],
-  ['+lookup', 'look up'],
-  ['+lookdown', 'look down'],
-  ['centerview', 'center view'],
-  ['+mlook', 'mouse look'],
-  ['+klook', 'keyboard look'],
-  ['+moveup', 'swim up'],
-  ['+movedown', 'swim down'],
-];
-
-M.keys_cursor = 0;
-
-M.Menu_Keys_f = function () {
-  Key.dest.value = Key.dest.menu;
-  M.state.value = M.state.keys;
-  M.entersound = true;
-};
-
-M.FindKeysForCommand = function (command) {
-  const twokeys = []; let i;
-  for (i = 0; i < Key.bindings.length; i++) {
-    if (Key.bindings[i] === command) {
-      twokeys[twokeys.length] = i;
-      if (twokeys.length === 2) {
-        return twokeys;
-      }
-    }
-  }
-  return twokeys;
-};
-
-M.UnbindCommand = function (command) {
-  let i;
-  for (i = 0; i < Key.bindings.length; i++) {
-    if (Key.bindings[i] === command) {
-      delete Key.bindings[i];
-    }
-  }
-};
-
-M.Keys_Draw = function () {
-  M.DrawPic(160 - (M.ttl_cstm.width / 2), 4, M.ttl_cstm);
-
-  if (M.bind_grab === true) {
-    M.Print(12, 32, 'Press a key or button for this action');
-    M.DrawCharacter(130, 48 + (M.keys_cursor << 3), 61);
-  } else {
-    M.Print(18, 32, 'Enter to change, backspace to clear');
-    M.DrawCharacter(130, 48 + (M.keys_cursor << 3), 12 + ((Host.realtime * 4.0) & 1));
-  }
-
-  let i; let y = 48; let keys; let name;
-  for (i = 0; i < M.bindnames.length; i++) {
-    M.Print(16, y, M.bindnames[i][1]);
-    keys = M.FindKeysForCommand(M.bindnames[i][0]);
-    if (keys[0] == null) {
-      M.Print(140, y, '???');
-    } else {
-      name = Key.KeynumToString(keys[0]);
-      if (keys[1] != null) {
-        name += ' or ' + Key.KeynumToString(keys[1]);
-      }
-      M.Print(140, y, name);
-    }
-    y += 8;
-  }
-};
-
-M.Keys_Key = function (k) {
-  if (M.bind_grab === true) {
-    S.LocalSound(M.sfx_menu1);
-    if ((k !== K.ESCAPE) && (k !== 96)) {
-      Cmd.text = 'bind "' + Key.KeynumToString(k) + '" "' + M.bindnames[M.keys_cursor][0] + '"\n' + Cmd.text;
-    }
-    M.bind_grab = false;
-    return;
-  }
-
-  switch (k) {
-    case K.ESCAPE:
-      M.Menu_Options_f();
-      return;
-    case K.LEFTARROW:
-    case K.UPARROW:
-      S.LocalSound(M.sfx_menu1);
-      if (--M.keys_cursor < 0) {
-        M.keys_cursor = M.bindnames.length - 1;
-      }
-      return;
-    case K.DOWNARROW:
-    case K.RIGHTARROW:
-      S.LocalSound(M.sfx_menu1);
-      if (++M.keys_cursor >= M.bindnames.length) {
-        M.keys_cursor = 0;
-      }
-      return;
-    case K.ENTER:
-      S.LocalSound(M.sfx_menu2);
-      if (M.FindKeysForCommand(M.bindnames[M.keys_cursor][0])[1] != null) {
-        M.UnbindCommand(M.bindnames[M.keys_cursor][0]);
-      }
-      M.bind_grab = true;
-      return;
-    case K.BACKSPACE:
-    case K.DEL:
-      S.LocalSound(M.sfx_menu2);
-      M.UnbindCommand(M.bindnames[M.keys_cursor][0]);
-  }
-};
-
-// Help menu
-M.num_help_pages = 6;
-
-M.Menu_Help_f = function () {
-  Key.dest.value = Key.dest.menu;
-  M.state.value = M.state.help;
-  M.entersound = true;
-  M.help_page = 0;
-};
-
-M.Help_Draw = function () {
-  M.DrawPic(0, 0, M.help_pages[M.help_page]);
-};
-
-M.Help_Key = function (k) {
-  switch (k) {
-    case K.ESCAPE:
-      M.Menu_Main_f();
-      return;
-    case K.UPARROW:
-    case K.RIGHTARROW:
-      M.entersound = true;
-      if (++M.help_page >= M.num_help_pages) {
-        M.help_page = 0;
-      }
-      return;
-    case K.DOWNARROW:
-    case K.LEFTARROW:
-      M.entersound = true;
-      if (--M.help_page < 0) {
-        M.help_page = M.num_help_pages - 1;
-      }
-  };
-};
-
-// Quit menu
-M.quitMessage =
-  [
-    ['  Are you gonna quit', '  this game just like', '   everything else?', ''],
-    [' Milord, methinks that', '   thou art a lowly', ' quitter. Is this true?', ''],
-    [' Do I need to bust your', '  face open for trying', '        to quit?', ''],
-    [' Man, I oughta smack you', '   for trying to quit!', '     Press Y to get', '      smacked out.'],
-    [' Press Y to quit like a', '   big loser in life.', '  Press N to stay proud', '    and successful!'],
-    ['   If you press Y to', '  quit, I will summon', '  Satan all over your', '      hard drive!'],
-    ['  Um, Asmodeus dislikes', ' his children trying to', ' quit. Press Y to return', '   to your Tinkertoys.'],
-    ['  If you quit now, I\'ll', '  throw a blanket-party', '   for you next time!', ''],
-  ];
-
-M.Menu_Quit_f = function () {
-  if (M.state.value === M.state.quit) {
-    return;
-  }
-  M.wasInMenus = (Key.dest.value === Key.dest.menu);
-  Key.dest.value = Key.dest.menu;
-  M.quit_prevstate = M.state.value;
-  M.state.value = M.state.quit;
-  M.entersound = true;
-  M.msgNumber = Math.floor(Math.random() * M.quitMessage.length);
-};
-
-M.Alert = function (title, message) {
-  if (M.state.value === M.state.alert) {
-    return;
-  }
-  M.wasInMenus = (Key.dest.value === Key.dest.menu);
-  Key.dest.value = Key.dest.menu;
-  M.state.value = M.state.alert;
-  M.entersound = true; // TODO: have a different sound
-  M.alertMessage = { title, message };
-};
-
-M.Alert_Draw = function () {
-  const { title, message } = M.alertMessage;
-  const titleLines = title ? title.split('\n') : [];
-  const messageLines = message ? message.split('\n') : [];
-
-  const lines = [];
-  if (titleLines.length) {
-    lines.push(...titleLines);
-    lines.push('\x1d' + '\x1e'.repeat(60) + '\x1f');
-  }
-
-  lines.push(null);
-
-  if (messageLines.length) {
-    lines.push(...messageLines);
-  }
-
-  lines.push(null);
-  lines.push('Press enter to continue.');
-
-  // Calculate dimensions for the text box
-  const boxWidth = 64;
-  const totalLines = lines.length;
-  const x = (320 - boxWidth * 8) / 2;
-
-  M.DrawTextBox(x, 52, boxWidth, totalLines + 2);
-
-  for (let i = 0, y = 68; i < totalLines; i++, y += 8) {
-    if (lines[i]) {
-      // Limit each line to 62 characters for safe drawing
-      M.PrintWhite(x + 16, y, lines[i].substring(0, 62));
-    }
-  }
-};
-
-M.Alert_Key = function (k) {
-  if (k === K.ENTER || k === K.ESCAPE) {
-    M.CloseMenu();
-  }
-};
-
-const launchServerMenu = new MultiplayerMainMenu();
-
-M.Launch_Server_Draw = function () {
-  launchServerMenu.draw();
-};
-
-M.Launch_Server_Key = function (k) {
-  if (k === K.ESCAPE) {
-    launchServerMenu.deactivate();
-    M.CloseMenu();
-    return;
-  }
-
-  launchServerMenu.handleInput(k);
-};
-
-M.Menu_Launch_Server_f = function () {
-  if (M.state.value === M.state.launch_server) {
-    return;
-  }
-  M.wasInMenus = (Key.dest.value === Key.dest.menu);
-  Key.dest.value = Key.dest.menu;
-  M.state.value = M.state.launch_server;
-  M.entersound = true;
-
-  launchServerMenu.activate();
-};
-
-M.Quit_Draw = function () {
-  if (M.wasInMenus === true) {
-    M.state.value = M.quit_prevstate;
-    M.recursiveDraw = true;
-    M.Draw();
-    M.state.value = M.state.quit;
-  }
-  M.DrawTextBox(56, 76, 24, 4);
-  M.Print(64, 84, M.quitMessage[M.msgNumber][0]);
-  M.Print(64, 92, M.quitMessage[M.msgNumber][1]);
-  M.Print(64, 100, M.quitMessage[M.msgNumber][2]);
-  M.Print(64, 108, M.quitMessage[M.msgNumber][3]);
-};
-
-M.Quit_Key = function (k) {
-  switch (k) {
-    case K.ESCAPE:
-    case 110:
-      if (M.wasInMenus === true) {
-        M.state.value = M.quit_prevstate;
-        M.entersound = true;
-      } else {
-        M.CloseMenu();
-      }
-      break;
-    case 121:
-      Key.dest.value = Key.dest.console;
-      Host.Quit_f();
-  }
-};
-
-
-// Menu Subsystem
-M.Init = async function () {
-  Cmd.AddCommand('togglemenu', M.ToggleMenu_f);
-  Cmd.AddCommand('menu_main', M.Menu_Main_f);
-  Cmd.AddCommand('menu_singleplayer', M.Menu_SinglePlayer_f);
-  Cmd.AddCommand('menu_load', M.Menu_Load_f);
-  Cmd.AddCommand('menu_save', M.Menu_Save_f);
-  Cmd.AddCommand('menu_multiplayer', M.Menu_MultiPlayer_f);
-  Cmd.AddCommand('menu_setup', M.Menu_MultiPlayer_f);
-  Cmd.AddCommand('menu_options', M.Menu_Options_f);
-  Cmd.AddCommand('menu_keys', M.Menu_Keys_f);
-  Cmd.AddCommand('help', M.Menu_Help_f);
-  Cmd.AddCommand('menu_quit', M.Menu_Quit_f);
-  Cmd.AddCommand('menu_server_launch', M.Menu_Launch_Server_f);
-
-  M.sfx_menu1 = S.PrecacheSound('misc/menu1.wav');
-  M.sfx_menu2 = S.PrecacheSound('misc/menu2.wav');
-  M.sfx_menu3 = S.PrecacheSound('misc/menu3.wav');
-
-  M.box_tl = Draw.LoadPicFromLumpDeferred('box_tl');
-  M.box_ml = Draw.LoadPicFromLumpDeferred('box_ml');
-  M.box_bl = Draw.LoadPicFromLumpDeferred('box_bl');
-  M.box_tm = Draw.LoadPicFromLumpDeferred('box_tm');
-  M.box_mm = Draw.LoadPicFromLumpDeferred('box_mm');
-  M.box_mm2 = Draw.LoadPicFromLumpDeferred('box_mm2');
-  M.box_bm = Draw.LoadPicFromLumpDeferred('box_bm');
-  M.box_tr = Draw.LoadPicFromLumpDeferred('box_tr');
-  M.box_mr = Draw.LoadPicFromLumpDeferred('box_mr');
-  M.box_br = Draw.LoadPicFromLumpDeferred('box_br');
-
-  M.qplaque = Draw.LoadPicFromLumpDeferred('qplaque');
-
-  // eslint-disable-next-line require-atomic-updates
-  M.menudot = await Promise.all([
-    Draw.LoadPicFromLump('menudot1'),
-    Draw.LoadPicFromLump('menudot2'),
-    Draw.LoadPicFromLump('menudot3'),
-    Draw.LoadPicFromLump('menudot4'),
-    Draw.LoadPicFromLump('menudot5'),
-    Draw.LoadPicFromLump('menudot6'),
-  ]);
-
-  // eslint-disable-next-line require-atomic-updates
-  M.ttl_main = await Draw.LoadPicFromLump('ttl_main');
-  // eslint-disable-next-line require-atomic-updates
-  M.mainmenu = await Draw.LoadPicFromLump('mainmenu');
-
-  M.ttl_sgl = Draw.LoadPicFromLumpDeferred('ttl_sgl');
-  M.sp_menu = Draw.LoadPicFromLumpDeferred('sp_menu');
-  M.p_load = Draw.LoadPicFromLumpDeferred('p_load');
-  M.p_save = Draw.LoadPicFromLumpDeferred('p_save');
-
-  M.p_multi = Draw.LoadPicFromLumpDeferred('p_multi');
-  M.bigbox = Draw.LoadPicFromLumpDeferred('bigbox');
-  M.menuplyr = Draw.LoadPicFromLumpDeferred('menuplyr');
-
-  // FIXME: I really don’t like this, but it’s the only way to get the player picture translation right for now
-  {
-    const lmpfile = await COM.LoadFile('gfx/menuplyr.lmp');
-
-    const view = new DataView(lmpfile, 0, 8);
-    const width = view.getUint32(0, true);
-    const height = view.getUint32(4, true);
-    const data = new Uint8Array(lmpfile, 8, width * height);
-
-    const trans = new Uint8Array(new ArrayBuffer(width * height * 4));
-
-    for (let i = 0; i < 4096; i++) {
-      const p = data[i];
-      if ((p >> 4) === 1) {
-        trans[i << 2] = (p & 15) * 17;
-        trans[(i << 2) + 1] = 255;
-      } else if ((p >> 4) === 6) {
-        trans[(i << 2) + 2] = (p & 15) * 17;
-        trans[(i << 2) + 3] = 255;
-      }
-    }
-
-    M.menuplyr.translate = GLTexture.Allocate('menuplyr_translate', width, height, trans);
-  }
-
-  M.p_option = Draw.LoadPicFromLumpDeferred('p_option');
-  M.ttl_cstm = Draw.LoadPicFromLumpDeferred('ttl_cstm');
-
-  M.help_pages = [
-    Draw.LoadPicFromLumpDeferred('help0'),
-    Draw.LoadPicFromLumpDeferred('help1'),
-    Draw.LoadPicFromLumpDeferred('help2'),
-    Draw.LoadPicFromLumpDeferred('help3'),
-    Draw.LoadPicFromLumpDeferred('help4'),
-    Draw.LoadPicFromLumpDeferred('help5'),
-  ];
-
-  await launchServerMenu.init();
-
-  // always close the menu when a connection progresses
-  eventBus.subscribe('client.signon', () => {
-    M.CloseMenu();
-  });
-};
-
-M.Draw = function () {
-  if (M.state.value === M.state.none || Key.dest.value !== Key.dest.menu) {
-    return;
-  }
-
-  if (!M.recursiveDraw) {
-    Draw.FadeScreen();
-  } else {
-    M.recursiveDraw = false;
-  }
-
-  switch (M.state.value) {
-    case M.state.main:
-      M.Main_Draw();
-      break;
-    case M.state.singleplayer:
-      M.SinglePlayer_Draw();
-      break;
-    case M.state.load:
-      M.Load_Draw();
-      break;
-    case M.state.save:
-      M.Save_Draw();
-      break;
-    case M.state.multiplayer:
-      M.MultiPlayer_Draw();
-      break;
-    case M.state.options:
-      M.Options_Draw();
-      break;
-    case M.state.keys:
-      M.Keys_Draw();
-      break;
-    case M.state.help:
-      M.Help_Draw();
-      break;
-    case M.state.quit:
-      M.Quit_Draw();
-      break;
-    case M.state.alert:
-      M.Alert_Draw();
-      break;
-    case M.state.launch_server:
-      M.Launch_Server_Draw();
-      break;
-  }
-  if (M.entersound === true) {
-    S.LocalSound(M.sfx_menu2);
-    M.entersound = false;
-  }
-};
-
-M.Keydown = function (key) {
-  switch (M.state.value) {
-    case M.state.main:
-      M.Main_Key(key);
-      return;
-    case M.state.singleplayer:
-      M.SinglePlayer_Key(key);
-      return;
-    case M.state.load:
-      M.Load_Key(key);
-      return;
-    case M.state.save:
-      M.Save_Key(key);
-      return;
-    case M.state.multiplayer:
-      M.MultiPlayer_Key(key);
-      return;
-    case M.state.options:
-      M.Options_Key(key);
-      return;
-    case M.state.keys:
-      M.Keys_Key(key);
-      return;
-    case M.state.help:
-      M.Help_Key(key);
-      return;
-    case M.state.quit:
-      M.Quit_Key(key);
-      return;
-    case M.state.alert:
-      M.Alert_Key(key);
-      return;
-    case M.state.launch_server:
-      M.Launch_Server_Key(key);
-      return;
-  }
-};
diff --git a/source/engine/client/Menu.ts b/source/engine/client/Menu.ts
new file mode 100644
index 00000000..78515a0d
--- /dev/null
+++ b/source/engine/client/Menu.ts
@@ -0,0 +1,1298 @@
+import type { SFX } from './Sound.ts';
+
+import { K } from '../../shared/Keys.ts';
+import Cmd from '../common/Cmd.ts';
+import Cvar from '../common/Cvar.ts';
+import { clientConnectionState } from '../common/Def.ts';
+import { eventBus, getClientRegistry } from '../registry.mjs';
+import ClientLifecycle from './ClientLifecycle.ts';
+import { GLTexture } from './GL.mjs';
+import MultiplayerMainMenu from './menu/Multiplayer.ts';
+import VID from './VID.ts';
+
+let { CL, COM, Con, Draw, Host, Key, S, SCR, SV, V } = getClientRegistry();
+
+eventBus.subscribe('registry.frozen', () => {
+  ({ CL, COM, Con, Draw, Host, Key, S, SCR, SV, V } = getClientRegistry());
+});
+
+enum MenuStateId {
+  none = 0,
+  main = 1,
+  singleplayer = 2,
+  load = 3,
+  save = 4,
+  multiplayer = 5,
+  options = 6,
+  keys = 7,
+  help = 8,
+  quit = 9,
+  alert = 10,
+  launch_server = 11,
+}
+
+type MenuStateStore = {
+  readonly none: MenuStateId.none;
+  readonly main: MenuStateId.main;
+  readonly singleplayer: MenuStateId.singleplayer;
+  readonly load: MenuStateId.load;
+  readonly save: MenuStateId.save;
+  readonly multiplayer: MenuStateId.multiplayer;
+  readonly options: MenuStateId.options;
+  readonly keys: MenuStateId.keys;
+  readonly help: MenuStateId.help;
+  readonly quit: MenuStateId.quit;
+  readonly alert: MenuStateId.alert;
+  readonly launch_server: MenuStateId.launch_server;
+  value: MenuStateId;
+};
+
+type MenuPic = GLTexture & { translate?: GLTexture | null };
+type SaveGameData = { comment?: string; mapname?: string };
+type BindName = [string, string];
+type QuitMessage = [string, string, string, string];
+
+const launchServerMenu = new MultiplayerMainMenu();
+
+export default class M {
+  static state: MenuStateStore = {
+    none: MenuStateId.none,
+    main: MenuStateId.main,
+    singleplayer: MenuStateId.singleplayer,
+    load: MenuStateId.load,
+    save: MenuStateId.save,
+    multiplayer: MenuStateId.multiplayer,
+    options: MenuStateId.options,
+    keys: MenuStateId.keys,
+    help: MenuStateId.help,
+    quit: MenuStateId.quit,
+    alert: MenuStateId.alert,
+    launch_server: MenuStateId.launch_server,
+    value: MenuStateId.none,
+  };
+
+  static main_cursor = 0;
+  static main_items = 5;
+  static save_demonum = 0; // THIS IS THE REASON WHY I HATE UNINITIALIZED PROPERTIES, this line was missing and it quietly caused some NaNs deep in the demo code…
+
+  static singleplayer_cursor = 0;
+  static singleplayer_items = 3;
+
+  static load_cursor = 0;
+  static max_savegames = 12;
+  static filenames: string[] = [];
+  static loadable: boolean[] = [];
+  static removable: boolean[] = [];
+
+  static multiplayer_cursor = 1;
+  static multiplayer_cursor_table = [56, 72, 96, 120, 156];
+  static multiplayer_joinname = (() => {
+    const url = new URL(location.href);
+    return url.host + url.pathname + (!url.pathname.endsWith('/') ? '/' : '') + 'api/';
+  })();
+  static multiplayer_items = 5;
+  static multiplayer_myname = '';
+  static multiplayer_top = 0;
+  static multiplayer_oldtop = 0;
+  static multiplayer_bottom = 0;
+  static multiplayer_oldbottom = 0;
+
+  static options_cursor = 0;
+  static options_items = 12;
+
+  static bindnames: BindName[] = [
+    ['+attack', 'attack'],
+    ['impulse 10', 'change weapon'],
+    ['+jump', 'jump / swim up'],
+    ['+forward', 'walk forward'],
+    ['+back', 'backpedal'],
+    ['+left', 'turn left'],
+    ['+right', 'turn right'],
+    ['+speed', 'run'],
+    ['+moveleft', 'step left'],
+    ['+moveright', 'step right'],
+    ['+strafe', 'sidestep'],
+    ['+lookup', 'look up'],
+    ['+lookdown', 'look down'],
+    ['centerview', 'center view'],
+    ['+mlook', 'mouse look'],
+    ['+klook', 'keyboard look'],
+    ['+moveup', 'swim up'],
+    ['+movedown', 'swim down'],
+  ];
+  static keys_cursor = 0;
+  static bind_grab = false;
+
+  static num_help_pages = 6;
+  static help_page = 0;
+
+  static quitMessage: QuitMessage[] = [
+    ['  Are you gonna quit', '  this game just like', '   everything else?', ''],
+    [' Milord, methinks that', '   thou art a lowly', ' quitter. Is this true?', ''],
+    [' Do I need to bust your', '  face open for trying', '        to quit?', ''],
+    [' Man, I oughta smack you', '   for trying to quit!', '     Press Y to get', '      smacked out.'],
+    [' Press Y to quit like a', '   big loser in life.', '  Press N to stay proud', '    and successful!'],
+    ['   If you press Y to', '  quit, I will summon', '  Satan all over your', '      hard drive!'],
+    ['  Um, Asmodeus dislikes', ' his children trying to', ' quit. Press Y to return', '   to your Tinkertoys.'],
+    ['  If you quit now, I\'ll', '  throw a blanket-party', '   for you next time!', ''],
+  ];
+
+  static wasInMenus = false;
+  static quit_prevstate: MenuStateId = MenuStateId.none;
+  static msgNumber = 0;
+
+  static alertMessage = { title: '', message: '' };
+
+  static recursiveDraw = false;
+  static entersound = false;
+
+  static sfx_menu1: SFX | null = null;
+  static sfx_menu2: SFX | null = null;
+  static sfx_menu3: SFX | null = null;
+
+  static box_tl: MenuPic = null!;
+  static box_ml: MenuPic = null!;
+  static box_bl: MenuPic = null!;
+  static box_tm: MenuPic = null!;
+  static box_mm: MenuPic = null!;
+  static box_mm2: MenuPic = null!;
+  static box_bm: MenuPic = null!;
+  static box_tr: MenuPic = null!;
+  static box_mr: MenuPic = null!;
+  static box_br: MenuPic = null!;
+
+  static qplaque: MenuPic = null!;
+  static menudot: MenuPic[] = [];
+  static ttl_main: MenuPic = null!;
+  static mainmenu: MenuPic = null!;
+
+  static ttl_sgl: MenuPic = null!;
+  static sp_menu: MenuPic = null!;
+  static p_load: MenuPic = null!;
+  static p_save: MenuPic = null!;
+
+  static p_multi: MenuPic = null!;
+  static bigbox: MenuPic = null!;
+  static menuplyr: MenuPic = null!;
+
+  static p_option: MenuPic = null!;
+  static ttl_cstm: MenuPic = null!;
+  static help_pages: MenuPic[] = [];
+
+  static DrawCharacter(cx: number, cy: number, num: number): void {
+    Draw.Character(cx * 2 + Math.floor(VID.width / 2) - 320, cy * 2 + Math.floor(VID.height / 2) - 200, num, 2.0);
+  }
+
+  static Print(cx: number, cy: number, str: string): void {
+    Draw.StringWhite(cx * 2 + Math.floor(VID.width / 2) - 320, cy * 2 + Math.floor(VID.height / 2) - 200, str, 2.0);
+  }
+
+  static PrintWhite(cx: number, cy: number, str: string): void {
+    Draw.String(cx * 2 + Math.floor(VID.width / 2) - 320, cy * 2 + Math.floor(VID.height / 2) - 200, str, 2.0);
+  }
+
+  static DrawPic(x: number, y: number, pic: MenuPic): void {
+    Draw.Pic(x * 2 + Math.floor(VID.width / 2) - 320, y * 2 + Math.floor(VID.height / 2) - 200, pic, 2.0);
+  }
+
+  static DrawPicTranslate(x: number, y: number, pic: MenuPic, top: number, bottom: number): void {
+    Draw.PicTranslate(x * 2 + Math.floor(VID.width / 2) - 320, y * 2 + Math.floor(VID.height / 2) - 200, pic, top, bottom, 2.0);
+  }
+
+  static DrawTextBox(x: number, y: number, width: number, lines: number): void {
+    let cx: number;
+    let cy: number;
+    let n: number;
+
+    cy = y;
+    M.DrawPic(x, cy, M.box_tl);
+    for (n = 0; n < lines; n++) {
+      M.DrawPic(x, cy += 8, M.box_ml);
+    }
+    M.DrawPic(x, cy + 8, M.box_bl);
+
+    cx = x + 8;
+    let p: MenuPic;
+    for (; width > 0;) {
+      cy = y;
+      M.DrawPic(cx, y, M.box_tm);
+      p = M.box_mm;
+      for (n = 0; n < lines; n++) {
+        M.DrawPic(cx, cy += 8, p);
+        if (n === 0) {
+          p = M.box_mm2;
+        }
+      }
+      M.DrawPic(cx, cy + 8, M.box_bm);
+      width -= 2;
+      cx += 16;
+    }
+
+    cy = y;
+    M.DrawPic(cx, cy, M.box_tr);
+    for (n = 0; n < lines; n++) {
+      M.DrawPic(cx, cy += 8, M.box_mr);
+    }
+    M.DrawPic(cx, cy + 8, M.box_br);
+  }
+
+  static CloseMenu(): void {
+    if (CL.cls.state === clientConnectionState.connected) {
+      Key.dest.value = Key.dest.game;
+    } else {
+      Key.dest.value = Key.dest.console;
+    }
+    M.state.value = M.state.none;
+  }
+
+  static ToggleMenu_f(): void {
+    M.entersound = true;
+    if (Key.dest.value === Key.dest.menu) {
+      if (M.state.value !== M.state.main) {
+        M.Menu_Main_f();
+        return;
+      }
+      M.CloseMenu();
+      return;
+    }
+    M.Menu_Main_f();
+  }
+
+  // Main menu
+  static Menu_Main_f(): void {
+    if (CL.cls.connecting !== null) {
+      return;
+    }
+
+    if (Key.dest.value !== Key.dest.menu) {
+      M.save_demonum = CL.cls.demonum;
+      CL.cls.demonum = -1;
+    }
+    Key.dest.value = Key.dest.menu;
+    M.state.value = M.state.main;
+    M.entersound = true;
+  }
+
+  static Main_Draw(): void {
+    M.DrawPic(16, 4, M.qplaque);
+    M.DrawPic(160 - (M.ttl_main.width / 2), 4, M.ttl_main);
+    M.DrawPic(72, 32, M.mainmenu);
+    M.DrawPic(54, 32 + M.main_cursor * 20, M.menudot[Math.floor(Host.realtime * 10.0) % 6]);
+  }
+
+  static Main_Key(k: number): void {
+    switch (k) {
+      case K.ESCAPE:
+        M.CloseMenu();
+        CL.cls.demonum = M.save_demonum;
+        if ((CL.cls.demonum !== -1) && (CL.cls.demoplayback !== true) && (CL.cls.state !== clientConnectionState.connected)) {
+          CL.NextDemo();
+        }
+        return;
+      case K.DOWNARROW:
+        S.LocalSound(M.sfx_menu1);
+        if (++M.main_cursor >= M.main_items) {
+          M.main_cursor = 0;
+        }
+        return;
+      case K.UPARROW:
+        S.LocalSound(M.sfx_menu1);
+        if (M.main_cursor-- === 0) {
+          M.main_cursor = M.main_items - 1;
+        }
+        return;
+      case K.ENTER:
+        M.entersound = true;
+        switch (M.main_cursor) {
+          case 0:
+            M.Menu_SinglePlayer_f();
+            return;
+          case 1:
+            M.Menu_MultiPlayer_f();
+            return;
+          case 2:
+            M.Menu_Options_f();
+            return;
+          case 3:
+            M.Menu_Help_f();
+            return;
+          case 4:
+            M.Menu_Quit_f();
+        }
+    }
+  }
+
+  // Single player menu
+  static Menu_SinglePlayer_f(): void {
+    Key.dest.value = Key.dest.menu;
+    M.state.value = M.state.singleplayer;
+    M.entersound = true;
+  }
+
+  static SinglePlayer_Draw(): void {
+    M.DrawPic(16, 4, M.qplaque);
+    M.DrawPic(160 - (M.ttl_sgl.width / 2), 4, M.ttl_sgl);
+    M.DrawPic(72, 32, M.sp_menu);
+    M.DrawPic(54, 32 + M.singleplayer_cursor * 20, M.menudot[Math.floor(Host.realtime * 10.0) % 6]);
+  }
+
+  static SinglePlayer_Key(k: number): void {
+    switch (k) {
+      case K.ESCAPE:
+        M.Menu_Main_f();
+        return;
+      case K.DOWNARROW:
+        S.LocalSound(M.sfx_menu1);
+        if (++M.singleplayer_cursor >= M.singleplayer_items) {
+          M.singleplayer_cursor = 0;
+        }
+        return;
+      case K.UPARROW:
+        S.LocalSound(M.sfx_menu1);
+        if (--M.singleplayer_cursor < 0) {
+          M.singleplayer_cursor = M.singleplayer_items - 1;
+        }
+        return;
+      case K.ENTER:
+        M.entersound = true;
+        switch (M.singleplayer_cursor) {
+          case 0:
+            if (SV.server.active) {
+              void Cmd.ExecuteString('disconnect');
+            }
+            Key.dest.value = Key.dest.game;
+            ClientLifecycle.startGame!.startSingleplayerGame();
+            return;
+          case 1:
+            M.Menu_Load_f();
+            return;
+          case 2:
+            M.Menu_Save_f();
+            return;
+        }
+    }
+  }
+
+  // Load/save menu
+  static ScanSaves(): void {
+    const searchpaths = COM.searchpaths;
+    const search = 'Quake.' + COM.gamedir[0].filename + '/s';
+    COM.searchpaths = COM.gamedir;
+    for (let i = 0; i < M.max_savegames; i++) {
+      const f = localStorage.getItem(search + i + '.json');
+      if (!f) {
+        M.filenames[i] = 'Empty slot';
+        M.loadable[i] = false;
+        M.removable[i] = false;
+        continue;
+      }
+      const gamestate = JSON.parse(f) as SaveGameData;
+      M.filenames[i] = gamestate.comment || gamestate.mapname || '';
+      M.loadable[i] = true;
+      M.removable[i] = true;
+    }
+    COM.searchpaths = searchpaths;
+  }
+
+  static Menu_Load_f(): void {
+    M.entersound = true;
+    M.state.value = M.state.load;
+    Key.dest.value = Key.dest.menu;
+    M.ScanSaves();
+  }
+
+  static Menu_Save_f(): void {
+    if ((SV.server.active !== true) || (CL.state.intermission !== 0) || (SV.svs.maxclients !== 1)) {
+      return;
+    }
+    M.entersound = true;
+    M.state.value = M.state.save;
+    Key.dest.value = Key.dest.menu;
+    M.ScanSaves();
+  }
+
+  static Load_Draw(): void {
+    M.DrawPic(160 - (M.p_load.width / 2), 4, M.p_load);
+    for (let i = 0; i < M.max_savegames; i++) {
+      M.Print(16, 32 + (i << 3), M.filenames[i]);
+    }
+    M.DrawCharacter(8, 32 + (M.load_cursor << 3), 12 + ((Host.realtime * 4.0) & 1));
+  }
+
+  static Save_Draw(): void {
+    M.DrawPic(160 - (M.p_save.width / 2), 4, M.p_save);
+    for (let i = 0; i < M.max_savegames; i++) {
+      M.Print(16, 32 + (i << 3), M.filenames[i]);
+    }
+    M.DrawCharacter(8, 32 + (M.load_cursor << 3), 12 + ((Host.realtime * 4.0) & 1));
+  }
+
+  static Load_Key(k: number): void {
+    switch (k) {
+      case K.ESCAPE:
+        M.Menu_SinglePlayer_f();
+        return;
+      case K.ENTER:
+        S.LocalSound(M.sfx_menu2);
+        if (M.loadable[M.load_cursor] !== true) {
+          return;
+        }
+        M.CloseMenu();
+        SCR.BeginLoadingPlaque();
+        Cmd.text += 'load s' + M.load_cursor + '\n';
+        return;
+      case K.UPARROW:
+      case K.LEFTARROW:
+        S.LocalSound(M.sfx_menu1);
+        if (--M.load_cursor < 0) {
+          M.load_cursor = M.max_savegames - 1;
+        }
+        return;
+      case K.DOWNARROW:
+      case K.RIGHTARROW:
+        S.LocalSound(M.sfx_menu1);
+        if (++M.load_cursor >= M.max_savegames) {
+          M.load_cursor = 0;
+        }
+        return;
+      case K.DEL:
+        if (M.removable[M.load_cursor] !== true) {
+          return;
+        }
+        if (confirm('Delete selected game?') !== true) {
+          return;
+        }
+        localStorage.removeItem('Quake.' + COM.gamedir[0].filename + '/s' + M.load_cursor + '.sav');
+        M.ScanSaves();
+    }
+  }
+
+  static Save_Key(k: number): void {
+    switch (k) {
+      case K.ESCAPE:
+        M.Menu_SinglePlayer_f();
+        return;
+      case K.ENTER:
+        M.CloseMenu();
+        Cmd.text += 'save s' + M.load_cursor + '\n';
+        return;
+      case K.UPARROW:
+      case K.LEFTARROW:
+        S.LocalSound(M.sfx_menu1);
+        if (--M.load_cursor < 0) {
+          M.load_cursor = M.max_savegames - 1;
+        }
+        return;
+      case K.DOWNARROW:
+      case K.RIGHTARROW:
+        S.LocalSound(M.sfx_menu1);
+        if (++M.load_cursor >= M.max_savegames) {
+          M.load_cursor = 0;
+        }
+        return;
+      case K.DEL:
+        if (M.removable[M.load_cursor] !== true) {
+          return;
+        }
+        if (confirm('Delete selected game?') !== true) {
+          return;
+        }
+        localStorage.removeItem('Quake.' + COM.gamedir[0].filename + '/s' + M.load_cursor + '.sav');
+        M.ScanSaves();
+    }
+  }
+
+  // Multiplayer menu
+  static Menu_MultiPlayer_f(): void {
+    Key.dest.value = Key.dest.menu;
+    M.state.value = M.state.multiplayer;
+    M.entersound = true;
+    M.multiplayer_myname = CL.name.string;
+    M.multiplayer_top = M.multiplayer_oldtop = CL.color.value >> 4;
+    M.multiplayer_bottom = M.multiplayer_oldbottom = CL.color.value & 15;
+    M.multiplayer_cursor = 1;
+  }
+
+  static MultiPlayer_Draw(): void {
+    M.DrawPic(16, 4, M.qplaque);
+    M.DrawPic(160 - (M.p_multi.width / 2), 4, M.p_multi);
+
+    const y0 = 24;
+
+    // M.Print(64, 40 - y0, 'Join game at:');
+    // M.DrawTextBox(72, 48 - y0, 22, 1);
+    // M.Print(80, 56 - y0, M.multiplayer_joinname.substring(M.multiplayer_joinname.length - 21));
+
+    M.Print(64, 72 - y0, 'Your name');
+    M.DrawTextBox(160, 64 - y0, 16, 1);
+    M.PrintWhite(168, 72 - y0, M.multiplayer_myname);
+
+    M.Print(64, 96 - y0, 'Shirt color');
+    M.Print(64, 120 - y0, 'Pants color');
+
+    const label = CL.cls.state !== clientConnectionState.connected ? 'Join Game' : 'Accept Changes';
+
+    M.DrawTextBox(64, 148 - y0, label.length, 1);
+    M.PrintWhite(72, 156 - y0, label);
+
+    M.DrawPic(160, 80 - y0, M.bigbox);
+    M.DrawPicTranslate(172, 88 - y0, M.menuplyr,
+      (M.multiplayer_top << 4) + (M.multiplayer_top >= 8 ? 4 : 11),
+      (M.multiplayer_bottom << 4) + (M.multiplayer_bottom >= 8 ? 4 : 11));
+
+    M.DrawCharacter(56, M.multiplayer_cursor_table[M.multiplayer_cursor] - y0, 12 + ((Host.realtime * 4.0) & 1));
+
+    if (M.multiplayer_cursor === 0) {
+      M.DrawCharacter(M.multiplayer_joinname.length <= 20 ? 80 + (M.multiplayer_joinname.length << 3) : 248, 56 - y0, 10 + ((Host.realtime * 4.0) & 1));
+    } else if (M.multiplayer_cursor === 1) {
+      M.DrawCharacter(168 + (M.multiplayer_myname.length << 3), 72 - y0, 10 + ((Host.realtime * 4.0) & 1));
+    }
+  }
+
+  static MultiPlayer_Key(k: number): void {
+    if (k === K.ESCAPE) {
+      M.Menu_Main_f();
+    }
+
+    switch (k) {
+      case K.UPARROW:
+        S.LocalSound(M.sfx_menu1);
+        if (--M.multiplayer_cursor < 1) {
+          M.multiplayer_cursor = M.multiplayer_items - 1;
+        }
+        return;
+      case K.DOWNARROW:
+        S.LocalSound(M.sfx_menu1);
+        if (++M.multiplayer_cursor >= M.multiplayer_items) {
+          M.multiplayer_cursor = 1;
+        }
+        return;
+      case K.LEFTARROW:
+        if (M.multiplayer_cursor === 2) {
+          if (--M.multiplayer_top < 0) {
+            M.multiplayer_top = 13;
+          }
+          S.LocalSound(M.sfx_menu3);
+        } else if (M.multiplayer_cursor === 3) {
+          if (--M.multiplayer_bottom < 0) {
+            M.multiplayer_bottom = 13;
+          }
+          S.LocalSound(M.sfx_menu3);
+        }
+        return;
+      case K.RIGHTARROW:
+        if (M.multiplayer_cursor === 2) {
+          (M.multiplayer_top <= 12) ? ++M.multiplayer_top : M.multiplayer_top = 0;
+        } else if (M.multiplayer_cursor === 3) {
+          (M.multiplayer_bottom <= 12) ? ++M.multiplayer_bottom : M.multiplayer_bottom = 0;
+        } else {
+          return;
+        }
+        S.LocalSound(M.sfx_menu3);
+        return;
+      case K.ENTER:
+        switch (M.multiplayer_cursor) {
+          case 0:
+            S.LocalSound(M.sfx_menu2);
+            M.CloseMenu();
+            Cmd.text += 'connect "' + M.multiplayer_joinname + '"\n';
+            return;
+          case 2:
+            S.LocalSound(M.sfx_menu3);
+            (M.multiplayer_top <= 12) ? ++M.multiplayer_top : M.multiplayer_top = 0;
+            return;
+          case 3:
+            S.LocalSound(M.sfx_menu3);
+            (M.multiplayer_bottom <= 12) ? ++M.multiplayer_bottom : M.multiplayer_bottom = 0;
+            return;
+          case 4:
+            if (CL.name.string !== M.multiplayer_myname) {
+              Cmd.text += 'name "' + M.multiplayer_myname + '"\n';
+            }
+            if ((M.multiplayer_top !== M.multiplayer_oldtop) || (M.multiplayer_bottom !== M.multiplayer_oldbottom)) {
+              M.multiplayer_oldtop = M.multiplayer_top;
+              M.multiplayer_oldbottom = M.multiplayer_bottom;
+              Cmd.text += 'color ' + M.multiplayer_top + ' ' + M.multiplayer_bottom + '\n';
+            }
+
+            S.LocalSound(M.sfx_menu2);
+
+            if (CL.cls.state !== clientConnectionState.connected) {
+              // M.CloseMenu();
+              // Cmd.text += 'connect "' + M.multiplayer_joinname + '"\n';
+              M.Menu_Launch_Server_f();
+              return;
+            }
+
+            M.CloseMenu();
+            return;
+        }
+        return;
+      case K.BACKSPACE:
+        if (M.multiplayer_cursor === 0) {
+          if (M.multiplayer_joinname.length !== 0) {
+            M.multiplayer_joinname = M.multiplayer_joinname.substring(0, M.multiplayer_joinname.length - 1);
+          }
+          return;
+        }
+        if (M.multiplayer_cursor === 1) {
+          if (M.multiplayer_myname.length !== 0) {
+            M.multiplayer_myname = M.multiplayer_myname.substring(0, M.multiplayer_myname.length - 1);
+          }
+        }
+        return;
+    }
+
+    if ((k < 32) || (k > 127)) {
+      return;
+    }
+    if (M.multiplayer_cursor === 0) {
+      M.multiplayer_joinname += String.fromCharCode(k);
+      return;
+    }
+    if (M.multiplayer_cursor === 1) {
+      if (M.multiplayer_myname.length <= 14) {
+        M.multiplayer_myname += String.fromCharCode(k);
+      }
+    }
+  }
+
+  // Options menu
+  static Menu_Options_f(): void {
+    Key.dest.value = Key.dest.menu;
+    M.state.value = M.state.options;
+    M.entersound = true;
+  }
+
+  static AdjustSliders(dir: number): void {
+    S.LocalSound(M.sfx_menu3);
+
+    switch (M.options_cursor) {
+      case 3: {
+        let viewsize = SCR.viewsize.value;
+        viewsize += dir * 10;
+        if (viewsize < 30) {
+          viewsize = 30;
+        } else if (viewsize > 120) {
+          viewsize = 120;
+        }
+        Cvar.Set('viewsize', viewsize);
+        return;
+      }
+      case 4: {
+        let gamma = V.gamma.value;
+        gamma -= dir * 0.05;
+        if (gamma < 0.5) {
+          gamma = 0.5;
+        } else if (gamma > 1.0) {
+          gamma = 1.0;
+        }
+        Cvar.Set('gamma', gamma);
+        return;
+      }
+      case 5: {
+        let sensitivity = CL.sensitivity.value;
+        sensitivity += dir * 0.5;
+        if (sensitivity < 1.0) {
+          sensitivity = 1.0;
+        } else if (sensitivity > 11.0) {
+          sensitivity = 11.0;
+        }
+        Cvar.Set('sensitivity', sensitivity);
+        return;
+      }
+      case 6: {
+        let bgmvolume = S.bgmvolume.value;
+        bgmvolume += dir * 0.1;
+        if (bgmvolume < 0.0) {
+          bgmvolume = 0.0;
+        } else if (bgmvolume > 1.0) {
+          bgmvolume = 1.0;
+        }
+        Cvar.Set('bgmvolume', bgmvolume);
+        return;
+      }
+      case 7: {
+        let volume = S.volume.value;
+        volume += dir * 0.1;
+        if (volume < 0.0) {
+          volume = 0.0;
+        } else if (volume > 1.0) {
+          volume = 1.0;
+        }
+        Cvar.Set('volume', volume);
+        return;
+      }
+      case 8:
+        if (CL.forwardspeed.value > 200.0) {
+          Cvar.Set('cl_forwardspeed', 200.0);
+          Cvar.Set('cl_backspeed', 200.0);
+          return;
+        }
+        Cvar.Set('cl_forwardspeed', 400.0);
+        Cvar.Set('cl_backspeed', 400.0);
+        return;
+      case 9:
+        Cvar.Set('m_pitch', -CL.m_pitch.value);
+        return;
+      case 10:
+        Cvar.Set('lookspring', (CL.lookspring.value !== 0) ? 0 : 1);
+        return;
+      case 11:
+        Cvar.Set('lookstrafe', (CL.lookstrafe.value !== 0) ? 0 : 1);
+    }
+  }
+
+  static DrawSlider(x: number, y: number, range: number): void {
+    if (range < 0) {
+      range = 0;
+    } else if (range > 1) {
+      range = 1;
+    }
+    M.DrawCharacter(x - 8, y, 128);
+    M.DrawCharacter(x, y, 129);
+    M.DrawCharacter(x + 8, y, 129);
+    M.DrawCharacter(x + 16, y, 129);
+    M.DrawCharacter(x + 24, y, 129);
+    M.DrawCharacter(x + 32, y, 129);
+    M.DrawCharacter(x + 40, y, 129);
+    M.DrawCharacter(x + 48, y, 129);
+    M.DrawCharacter(x + 56, y, 129);
+    M.DrawCharacter(x + 64, y, 129);
+    M.DrawCharacter(x + 72, y, 129);
+    M.DrawCharacter(x + 80, y, 130);
+    M.DrawCharacter(x + Math.floor(72 * range), y, 131);
+  }
+
+  static Options_Draw(): void {
+    M.DrawPic(16, 4, M.qplaque);
+    M.DrawPic(160 - (M.p_option.width / 2), 4, M.p_option);
+
+    M.Print(48, 32, 'Customize controls');
+    M.Print(88, 40, 'Go to console');
+    M.Print(56, 48, 'Reset to defaults');
+
+    M.Print(104, 56, 'Screen size');
+    M.DrawSlider(220, 56, (SCR.viewsize.value - 30) / 90);
+    M.Print(112, 64, 'Brightness');
+    M.DrawSlider(220, 64, (1.0 - V.gamma.value) * 2.0);
+    M.Print(104, 72, 'Mouse Speed');
+    M.DrawSlider(220, 72, (CL.sensitivity.value - 1) / 10);
+    M.Print(72, 80, 'CD Music Volume');
+    M.DrawSlider(220, 80, S.bgmvolume.value);
+    M.Print(96, 88, 'Sound Volume');
+    M.DrawSlider(220, 88, S.volume.value);
+    M.Print(112, 96, 'Always Run');
+    M.Print(220, 96, (CL.forwardspeed.value > 200.0) ? 'on' : 'off');
+    M.Print(96, 104, 'Invert Mouse');
+    M.Print(220, 104, (CL.m_pitch.value < 0.0) ? 'on' : 'off');
+    M.Print(112, 112, 'Lookspring');
+    M.Print(220, 112, (CL.lookspring.value !== 0) ? 'on' : 'off');
+    M.Print(112, 120, 'Lookstrafe');
+    M.Print(220, 120, (CL.lookstrafe.value !== 0) ? 'on' : 'off');
+
+    M.DrawCharacter(200, 32 + (M.options_cursor << 3), 12 + ((Host.realtime * 4.0) & 1));
+  }
+
+  static Options_Key(k: number): void {
+    switch (k) {
+      case K.ESCAPE:
+        M.Menu_Main_f();
+        return;
+      case K.ENTER:
+        M.entersound = true;
+        switch (M.options_cursor) {
+          case 0:
+            M.Menu_Keys_f();
+            return;
+          case 1:
+            M.CloseMenu();
+            Con.ToggleConsole_f();
+            return;
+          case 2:
+            Cmd.text += 'exec default.cfg\n';
+            return;
+          default:
+            M.AdjustSliders(1);
+        }
+        return;
+      case K.UPARROW:
+        S.LocalSound(M.sfx_menu1);
+        if (M.options_cursor-- === 0) {
+          M.options_cursor = M.options_items - 1;
+        }
+        return;
+      case K.DOWNARROW:
+        S.LocalSound(M.sfx_menu1);
+        if (++M.options_cursor >= M.options_items) {
+          M.options_cursor = 0;
+        }
+        return;
+      case K.LEFTARROW:
+        M.AdjustSliders(-1);
+        return;
+      case K.RIGHTARROW:
+        M.AdjustSliders(1);
+    }
+  }
+
+  // Keys menu
+  static Menu_Keys_f(): void {
+    Key.dest.value = Key.dest.menu;
+    M.state.value = M.state.keys;
+    M.entersound = true;
+  }
+
+  static FindKeysForCommand(command: string): number[] {
+    const twokeys: number[] = [];
+    for (let i = 0; i < Key.bindings.length; i++) {
+      if (Key.bindings[i] === command) {
+        twokeys[twokeys.length] = i;
+        if (twokeys.length === 2) {
+          return twokeys;
+        }
+      }
+    }
+    return twokeys;
+  }
+
+  static UnbindCommand(command: string): void {
+    for (let i = 0; i < Key.bindings.length; i++) {
+      if (Key.bindings[i] === command) {
+        delete Key.bindings[i];
+      }
+    }
+  }
+
+  static Keys_Draw(): void {
+    M.DrawPic(160 - (M.ttl_cstm.width / 2), 4, M.ttl_cstm);
+
+    if (M.bind_grab === true) {
+      M.Print(12, 32, 'Press a key or button for this action');
+      M.DrawCharacter(130, 48 + (M.keys_cursor << 3), 61);
+    } else {
+      M.Print(18, 32, 'Enter to change, backspace to clear');
+      M.DrawCharacter(130, 48 + (M.keys_cursor << 3), 12 + ((Host.realtime * 4.0) & 1));
+    }
+
+    let y = 48;
+    let keys: number[];
+    let name: string;
+    for (let i = 0; i < M.bindnames.length; i++) {
+      M.Print(16, y, M.bindnames[i][1]);
+      keys = M.FindKeysForCommand(M.bindnames[i][0]);
+      if (keys[0] === undefined) {
+        M.Print(140, y, '???');
+      } else {
+        name = Key.KeynumToString(keys[0]);
+        if (keys[1] !== undefined) {
+          name += ' or ' + Key.KeynumToString(keys[1]);
+        }
+        M.Print(140, y, name);
+      }
+      y += 8;
+    }
+  }
+
+  static Keys_Key(k: number): void {
+    if (M.bind_grab === true) {
+      S.LocalSound(M.sfx_menu1);
+      if ((k !== K.ESCAPE) && (k !== 96)) {
+        Cmd.text = 'bind "' + Key.KeynumToString(k) + '" "' + M.bindnames[M.keys_cursor][0] + '"\n' + Cmd.text;
+      }
+      M.bind_grab = false;
+      return;
+    }
+
+    switch (k) {
+      case K.ESCAPE:
+        M.Menu_Options_f();
+        return;
+      case K.LEFTARROW:
+      case K.UPARROW:
+        S.LocalSound(M.sfx_menu1);
+        if (--M.keys_cursor < 0) {
+          M.keys_cursor = M.bindnames.length - 1;
+        }
+        return;
+      case K.DOWNARROW:
+      case K.RIGHTARROW:
+        S.LocalSound(M.sfx_menu1);
+        if (++M.keys_cursor >= M.bindnames.length) {
+          M.keys_cursor = 0;
+        }
+        return;
+      case K.ENTER:
+        S.LocalSound(M.sfx_menu2);
+        if (M.FindKeysForCommand(M.bindnames[M.keys_cursor][0])[1] !== undefined) {
+          M.UnbindCommand(M.bindnames[M.keys_cursor][0]);
+        }
+        M.bind_grab = true;
+        return;
+      case K.BACKSPACE:
+      case K.DEL:
+        S.LocalSound(M.sfx_menu2);
+        M.UnbindCommand(M.bindnames[M.keys_cursor][0]);
+    }
+  }
+
+  // Help menu
+  static Menu_Help_f(): void {
+    Key.dest.value = Key.dest.menu;
+    M.state.value = M.state.help;
+    M.entersound = true;
+    M.help_page = 0;
+  }
+
+  static Help_Draw(): void {
+    M.DrawPic(0, 0, M.help_pages[M.help_page]);
+  }
+
+  static Help_Key(k: number): void {
+    switch (k) {
+      case K.ESCAPE:
+        M.Menu_Main_f();
+        return;
+      case K.UPARROW:
+      case K.RIGHTARROW:
+        M.entersound = true;
+        if (++M.help_page >= M.num_help_pages) {
+          M.help_page = 0;
+        }
+        return;
+      case K.DOWNARROW:
+      case K.LEFTARROW:
+        M.entersound = true;
+        if (--M.help_page < 0) {
+          M.help_page = M.num_help_pages - 1;
+        }
+    }
+  }
+
+  // Quit menu
+  static Menu_Quit_f(): void {
+    if (M.state.value === M.state.quit) {
+      return;
+    }
+    M.wasInMenus = (Key.dest.value === Key.dest.menu);
+    Key.dest.value = Key.dest.menu;
+    M.quit_prevstate = M.state.value;
+    M.state.value = M.state.quit;
+    M.entersound = true;
+    M.msgNumber = Math.floor(Math.random() * M.quitMessage.length);
+  }
+
+  static Alert(title: string, message: string): void {
+    if (M.state.value === M.state.alert) {
+      return;
+    }
+    M.wasInMenus = (Key.dest.value === Key.dest.menu);
+    Key.dest.value = Key.dest.menu;
+    M.state.value = M.state.alert;
+    M.entersound = true; // TODO: have a different sound
+    M.alertMessage = { title, message };
+  }
+
+  static Alert_Draw(): void {
+    const { title, message } = M.alertMessage;
+    const titleLines = title ? title.split('\n') : [];
+    const messageLines = message ? message.split('\n') : [];
+
+    const lines: Array<string | null> = [];
+    if (titleLines.length) {
+      lines.push(...titleLines);
+      lines.push('\x1d' + '\x1e'.repeat(60) + '\x1f');
+    }
+
+    lines.push(null);
+
+    if (messageLines.length) {
+      lines.push(...messageLines);
+    }
+
+    lines.push(null);
+    lines.push('Press enter to continue.');
+
+    // Calculate dimensions for the text box
+    const boxWidth = 64;
+    const totalLines = lines.length;
+    const x = (320 - boxWidth * 8) / 2;
+
+    M.DrawTextBox(x, 52, boxWidth, totalLines + 2);
+
+    for (let i = 0, y = 68; i < totalLines; i++, y += 8) {
+      if (lines[i]) {
+        // Limit each line to 62 characters for safe drawing
+        M.PrintWhite(x + 16, y, lines[i]!.substring(0, 62));
+      }
+    }
+  }
+
+  static Alert_Key(k: number): void {
+    if (k === K.ENTER || k === K.ESCAPE) {
+      M.CloseMenu();
+    }
+  }
+
+  static Launch_Server_Draw(): void {
+    launchServerMenu.draw();
+  }
+
+  static Launch_Server_Key(k: number): void {
+    if (k === K.ESCAPE) {
+      launchServerMenu.deactivate();
+      M.CloseMenu();
+      return;
+    }
+
+    launchServerMenu.handleInput(k);
+  }
+
+  static Menu_Launch_Server_f(): void {
+    if (M.state.value === M.state.launch_server) {
+      return;
+    }
+    M.wasInMenus = (Key.dest.value === Key.dest.menu);
+    Key.dest.value = Key.dest.menu;
+    M.state.value = M.state.launch_server;
+    M.entersound = true;
+
+    launchServerMenu.activate();
+  }
+
+  static Quit_Draw(): void {
+    if (M.wasInMenus === true) {
+      M.state.value = M.quit_prevstate;
+      M.recursiveDraw = true;
+      M.Draw();
+      M.state.value = M.state.quit;
+    }
+    M.DrawTextBox(56, 76, 24, 4);
+    M.Print(64, 84, M.quitMessage[M.msgNumber][0]);
+    M.Print(64, 92, M.quitMessage[M.msgNumber][1]);
+    M.Print(64, 100, M.quitMessage[M.msgNumber][2]);
+    M.Print(64, 108, M.quitMessage[M.msgNumber][3]);
+  }
+
+  static Quit_Key(k: number): void {
+    switch (k) {
+      case K.ESCAPE:
+      case 110:
+        if (M.wasInMenus === true) {
+          M.state.value = M.quit_prevstate;
+          M.entersound = true;
+        } else {
+          M.CloseMenu();
+        }
+        break;
+      case 121:
+        Key.dest.value = Key.dest.console;
+        Host.Quit_f();
+    }
+  }
+
+  // Menu Subsystem
+  static async Init(): Promise<void> {
+    Cmd.AddCommand('togglemenu', M.ToggleMenu_f);
+    Cmd.AddCommand('menu_main', M.Menu_Main_f);
+    Cmd.AddCommand('menu_singleplayer', M.Menu_SinglePlayer_f);
+    Cmd.AddCommand('menu_load', M.Menu_Load_f);
+    Cmd.AddCommand('menu_save', M.Menu_Save_f);
+    Cmd.AddCommand('menu_multiplayer', M.Menu_MultiPlayer_f);
+    Cmd.AddCommand('menu_setup', M.Menu_MultiPlayer_f);
+    Cmd.AddCommand('menu_options', M.Menu_Options_f);
+    Cmd.AddCommand('menu_keys', M.Menu_Keys_f);
+    Cmd.AddCommand('help', M.Menu_Help_f);
+    Cmd.AddCommand('menu_quit', M.Menu_Quit_f);
+    Cmd.AddCommand('menu_server_launch', M.Menu_Launch_Server_f);
+
+    M.sfx_menu1 = S.PrecacheSound('misc/menu1.wav');
+    M.sfx_menu2 = S.PrecacheSound('misc/menu2.wav');
+    M.sfx_menu3 = S.PrecacheSound('misc/menu3.wav');
+
+    M.box_tl = Draw.LoadPicFromLumpDeferred('box_tl');
+    M.box_ml = Draw.LoadPicFromLumpDeferred('box_ml');
+    M.box_bl = Draw.LoadPicFromLumpDeferred('box_bl');
+    M.box_tm = Draw.LoadPicFromLumpDeferred('box_tm');
+    M.box_mm = Draw.LoadPicFromLumpDeferred('box_mm');
+    M.box_mm2 = Draw.LoadPicFromLumpDeferred('box_mm2');
+    M.box_bm = Draw.LoadPicFromLumpDeferred('box_bm');
+    M.box_tr = Draw.LoadPicFromLumpDeferred('box_tr');
+    M.box_mr = Draw.LoadPicFromLumpDeferred('box_mr');
+    M.box_br = Draw.LoadPicFromLumpDeferred('box_br');
+
+    M.qplaque = Draw.LoadPicFromLumpDeferred('qplaque');
+
+    // eslint-disable-next-line require-atomic-updates
+    M.menudot = await Promise.all([
+      Draw.LoadPicFromLump('menudot1'),
+      Draw.LoadPicFromLump('menudot2'),
+      Draw.LoadPicFromLump('menudot3'),
+      Draw.LoadPicFromLump('menudot4'),
+      Draw.LoadPicFromLump('menudot5'),
+      Draw.LoadPicFromLump('menudot6'),
+    ]);
+
+    // eslint-disable-next-line require-atomic-updates
+    M.ttl_main = await Draw.LoadPicFromLump('ttl_main');
+    // eslint-disable-next-line require-atomic-updates
+    M.mainmenu = await Draw.LoadPicFromLump('mainmenu');
+
+    // eslint-disable-next-line require-atomic-updates
+    M.ttl_sgl = Draw.LoadPicFromLumpDeferred('ttl_sgl');
+    // eslint-disable-next-line require-atomic-updates
+    M.sp_menu = Draw.LoadPicFromLumpDeferred('sp_menu');
+    // eslint-disable-next-line require-atomic-updates
+    M.p_load = Draw.LoadPicFromLumpDeferred('p_load');
+    // eslint-disable-next-line require-atomic-updates
+    M.p_save = Draw.LoadPicFromLumpDeferred('p_save');
+
+    // eslint-disable-next-line require-atomic-updates
+    M.p_multi = Draw.LoadPicFromLumpDeferred('p_multi');
+    // eslint-disable-next-line require-atomic-updates
+    M.bigbox = Draw.LoadPicFromLumpDeferred('bigbox');
+    // eslint-disable-next-line require-atomic-updates
+    M.menuplyr = Draw.LoadPicFromLumpDeferred('menuplyr');
+
+    // FIXME: I really don’t like this, but it’s the only way to get the player picture translation right for now
+    {
+      const lmpfile = await COM.LoadFile('gfx/menuplyr.lmp');
+      if (lmpfile === null) {
+        throw new Error('Failed to load gfx/menuplyr.lmp');
+      }
+
+      const view = new DataView(lmpfile, 0, 8);
+      const width = view.getUint32(0, true);
+      const height = view.getUint32(4, true);
+      const data = new Uint8Array(lmpfile, 8, width * height);
+
+      const trans = new Uint8Array(new ArrayBuffer(width * height * 4));
+
+      for (let i = 0; i < 4096; i++) {
+        const p = data[i];
+        if ((p >> 4) === 1) {
+          trans[i << 2] = (p & 15) * 17;
+          trans[(i << 2) + 1] = 255;
+        } else if ((p >> 4) === 6) {
+          trans[(i << 2) + 2] = (p & 15) * 17;
+          trans[(i << 2) + 3] = 255;
+        }
+      }
+
+      // eslint-disable-next-line require-atomic-updates
+      M.menuplyr.translate = GLTexture.Allocate('menuplyr_translate', width, height, trans);
+    }
+
+    // eslint-disable-next-line require-atomic-updates
+    M.p_option = Draw.LoadPicFromLumpDeferred('p_option');
+    // eslint-disable-next-line require-atomic-updates
+    M.ttl_cstm = Draw.LoadPicFromLumpDeferred('ttl_cstm');
+
+    // eslint-disable-next-line require-atomic-updates
+    M.help_pages = [
+      Draw.LoadPicFromLumpDeferred('help0'),
+      Draw.LoadPicFromLumpDeferred('help1'),
+      Draw.LoadPicFromLumpDeferred('help2'),
+      Draw.LoadPicFromLumpDeferred('help3'),
+      Draw.LoadPicFromLumpDeferred('help4'),
+      Draw.LoadPicFromLumpDeferred('help5'),
+    ];
+
+    await launchServerMenu.init();
+
+    // always close the menu when a connection progresses
+    eventBus.subscribe('client.signon', () => {
+      M.CloseMenu();
+    });
+  }
+
+  static Draw(): void {
+    if (M.state.value === M.state.none || Key.dest.value !== Key.dest.menu) {
+      return;
+    }
+
+    if (!M.recursiveDraw) {
+      Draw.FadeScreen();
+    } else {
+      M.recursiveDraw = false;
+    }
+
+    switch (M.state.value) {
+      case M.state.main:
+        M.Main_Draw();
+        break;
+      case M.state.singleplayer:
+        M.SinglePlayer_Draw();
+        break;
+      case M.state.load:
+        M.Load_Draw();
+        break;
+      case M.state.save:
+        M.Save_Draw();
+        break;
+      case M.state.multiplayer:
+        M.MultiPlayer_Draw();
+        break;
+      case M.state.options:
+        M.Options_Draw();
+        break;
+      case M.state.keys:
+        M.Keys_Draw();
+        break;
+      case M.state.help:
+        M.Help_Draw();
+        break;
+      case M.state.quit:
+        M.Quit_Draw();
+        break;
+      case M.state.alert:
+        M.Alert_Draw();
+        break;
+      case M.state.launch_server:
+        M.Launch_Server_Draw();
+        break;
+    }
+    if (M.entersound === true) {
+      S.LocalSound(M.sfx_menu2);
+      M.entersound = false;
+    }
+  }
+
+  static Keydown(key: number): void {
+    switch (M.state.value) {
+      case M.state.main:
+        M.Main_Key(key);
+        return;
+      case M.state.singleplayer:
+        M.SinglePlayer_Key(key);
+        return;
+      case M.state.load:
+        M.Load_Key(key);
+        return;
+      case M.state.save:
+        M.Save_Key(key);
+        return;
+      case M.state.multiplayer:
+        M.MultiPlayer_Key(key);
+        return;
+      case M.state.options:
+        M.Options_Key(key);
+        return;
+      case M.state.keys:
+        M.Keys_Key(key);
+        return;
+      case M.state.help:
+        M.Help_Key(key);
+        return;
+      case M.state.quit:
+        M.Quit_Key(key);
+        return;
+      case M.state.alert:
+        M.Alert_Key(key);
+        return;
+      case M.state.launch_server:
+        M.Launch_Server_Key(key);
+        return;
+    }
+  }
+}
diff --git a/source/engine/client/Sound.mjs b/source/engine/client/Sound.ts
similarity index 78%
rename from source/engine/client/Sound.mjs
rename to source/engine/client/Sound.ts
index a195a0ac..154fc439 100644
--- a/source/engine/client/Sound.mjs
+++ b/source/engine/client/Sound.ts
@@ -1,50 +1,52 @@
+import type { Node as BSPNode } from '../common/model/BSP.ts';
+
 import Vector from '../../shared/Vector.ts';
 import Cmd from '../common/Cmd.ts';
 import Cvar from '../common/Cvar.ts';
 import Q from '../../shared/Q.ts';
-import { eventBus, registry } from '../registry.mjs';
-
-/** @typedef {import('../common/model/BSP.ts').Node} BSPNode */
+import { eventBus, getClientRegistry } from '../registry.mjs';
 
-let { CL, COM, Con, Host } = registry;
+let { CL, COM, Con, Host } = getClientRegistry();
 
 eventBus.subscribe('registry.frozen', () => {
-  ({ CL, COM, Con, Host } = registry);
+  ({ CL, COM, Con, Host } = getClientRegistry());
 });
 
 const MAX_DYNAMIC_CHANNELS = 64;
 
-/** @typedef {{data: AudioBuffer, length: number, size: number, loopstart: ?number}} SFXCache */
+type SFXCache = {
+  data: AudioBuffer;
+  length: number;
+  size: number;
+  loopstart: number | null;
+};
+
+export enum SfxState {
+  NEW = 'new',
+  LOADING = 'loading',
+  AVAILABLE = 'available',
+  FAILED = 'failed',
+}
 
 // ─── SFX ────────────────────────────────────────────────────────────────────────
 
 export class SFX {
-  static STATE = {
-    NEW: 'new',
-    LOADING: 'loading',
-    AVAILABLE: 'available',
-    FAILED: 'failed',
-  };
-
-  /** @param {string} name sfx filename */
-  constructor(name) {
-    /** @type {string} */
-    this.name = name;
-    /** @type {SFXCache|null} */
-    this.cache = null;
-    /** @type {string} */
-    this.state = SFX.STATE.NEW;
+  static readonly STATE = SfxState;
+
+  name: string;
+  cache: SFXCache | null = null;
+  state: SfxState = SfxState.NEW;
 
-    /** @type {Promise<SFX>|null} */
-    this._readyPromise = null;
-    /** @type {((sfx: SFX) => void)|null} */
-    this._readyResolve = null;
-    /** @type {((err: Error) => void)|null} */
-    this._readyReject = null;
+  _readyPromise: Promise<SFX> | null = null;
+  _readyResolve: ((sfx: SFX) => void) | null = null;
+  _readyReject: ((err: Error) => void) | null = null;
+
+  constructor(name: string) {
+    this.name = name;
   }
 
   /** @returns {Promise<SFX>} resolves when the SFX data is loaded */
-  get ready() {
+  get ready(): Promise<SFX> {
     if (this._readyPromise === null) {
       if (this.state === SFX.STATE.AVAILABLE) {
         this._readyPromise = Promise.resolve(this);
@@ -57,18 +59,20 @@ export class SFX {
         });
       }
     }
+
     return this._readyPromise;
   }
 
   /** @returns {Promise<boolean>} whether loading succeeded */
-  async load() {
+  async load(): Promise<boolean> {
     if (this.state !== SFX.STATE.NEW) {
       return false;
     }
-    return await Sound.LoadSound(this);
+
+    return Sound.LoadSound(this);
   }
 
-  play() {
+  play(): void {
     Sound.LocalSound(this);
   }
 }
@@ -76,44 +80,30 @@ export class SFX {
 // ─── Channel ────────────────────────────────────────────────────────────────────
 
 class Channel {
-  /**
-   * @param {AudioContext} context Web Audio context
-   * @param {AudioNode} destination master gain bus
-   */
-  constructor(context, destination) {
-    /** @type {SFX|null} */
-    this.sfx = null;
-    /** @type {Vector} */
-    this.origin = new Vector();
-    /** @type {number} */
-    this.dist_mult = 0;
-    /** @type {number|null} */
-    this.entnum = null;
-    /** @type {number|null} */
-    this.entchannel = null;
-    /** @type {number} */
-    this.end = 0;
-    /** @type {number} */
-    this.master_vol = 0;
-    /** @type {number} */
-    this.channel_vol = 0;
-    /** @type {number} */
-    this.pan = 0;
-
-    /** @type {AudioContext} */
+  sfx: SFX | null = null;
+  origin = new Vector();
+  dist_mult = 0;
+  entnum: number | null = null;
+  entchannel: number | null = null;
+  end = 0;
+  master_vol = 0;
+  channel_vol = 0;
+  pan = 0;
+
+  _context: AudioContext;
+  _panner: StereoPannerNode;
+  _gain: GainNode;
+  _source: AudioBufferSourceNode | null = null;
+
+  constructor(context: AudioContext, destination: AudioNode) {
     this._context = context;
-    /** @type {StereoPannerNode} */
     this._panner = context.createStereoPanner();
-    /** @type {GainNode} */
     this._gain = context.createGain();
     this._panner.connect(this._gain);
     this._gain.connect(destination);
-
-    /** @type {AudioBufferSourceNode|null} */
-    this._source = null;
   }
 
-  reset() {
+  reset(): void {
     this.stop();
     this.sfx = null;
     this.origin[0] = 0;
@@ -129,7 +119,7 @@ class Channel {
   }
 
   /** Starts playback of the current sfx from the beginning. */
-  play() {
+  play(): void {
     if (!this.sfx?.cache) {
       return;
     }
@@ -160,7 +150,7 @@ class Channel {
     this.updateVol();
   }
 
-  stop() {
+  stop(): void {
     if (!this._source) {
       return;
     }
@@ -171,11 +161,14 @@ class Channel {
 
     try {
       source.stop(0);
-    } catch { /* already stopped */ }
+    } catch {
+      /* already stopped */
+    }
+
     source.disconnect();
   }
 
-  updateVol() {
+  updateVol(): void {
     this._panner.pan.value = Math.max(-1, Math.min(1, this.pan));
     this._gain.gain.value = Math.max(0, this.channel_vol * Sound.volume.value);
   }
@@ -183,7 +176,7 @@ class Channel {
   /**
    * Computes pan and channel_vol based on the listener position/orientation.
    */
-  spatialize() {
+  spatialize(): void {
     // Local sound: full volume, center pan
     if (this.entnum === CL.state.viewentity) {
       this.pan = 0;
@@ -193,7 +186,7 @@ class Channel {
     }
 
     // Area portal occlusion
-    if (CL.areaportals?.value > 0 && CL.state.worldmodel && Sound._listenerLeaf) {
+    if (CL.areaportals.value > 0 && CL.state.worldmodel && Sound._listenerLeaf) {
       const leaf = CL.state.worldmodel.getLeafForPoint(this.origin);
       if (!CL.state.worldmodel.areaPortals.leafsConnected(Sound._listenerLeaf, leaf)) {
         this.channel_vol = 0;
@@ -223,7 +216,7 @@ class Channel {
   }
 
   /** Disconnects all persistent audio nodes from the graph. */
-  dispose() {
+  dispose(): void {
     this.stop();
     this._panner.disconnect();
     this._gain.disconnect();
@@ -232,50 +225,35 @@ class Channel {
 
 // ─── Sound ──────────────────────────────────────────────────────────────────────
 
-class Sound {
-  /** @type {Channel[]} */
-  static _channels = [];
-  /** @type {Channel[]} */
-  static _staticChannels = [];
-  /** @type {Channel[]} */
-  static _ambientChannels = [];
-  /** @type {SFX[]} */
-  static _knownSfx = [];
+export default class Sound {
+  static _channels: Channel[] = [];
+  static _staticChannels: Channel[] = [];
+  static _ambientChannels: Channel[] = [];
+  static _knownSfx: SFX[] = [];
 
   // Listener state
   static _listenerOrigin = new Vector();
   static _listenerRight = new Vector();
-  /** @type {BSPNode|null} */
-  static _listenerLeaf = null;
+  static _listenerLeaf: BSPNode | null = null;
 
   static _started = false;
-  /** @type {AudioContext|null} */
-  static _context = null;
-  /** @type {GainNode|null} */
-  static _masterGain = null;
-  /** @type {BiquadFilterNode|null} */
-  static _underwaterFilter = null;
+  static _context: AudioContext | null = null;
+  static _masterGain: GainNode | null = null;
+  static _underwaterFilter: BiquadFilterNode | null = null;
 
   // Cvars
-  /** @type {Cvar} */
-  static _precache = null;
-  /** @type {Cvar} */
-  static _nosound = null;
-  /** @type {Cvar} */
-  static _ambientLevel = null;
-  /** @type {Cvar} */
-  static _ambientFade = null;
-  /** @type {Cvar} */
-  static volume = null;
-  /** @type {Cvar} */
-  static bgmvolume = null;
-
-  /** @type {Array<() => void>} */
-  static _eventListeners = [];
+  static _precache: Cvar = null!;
+  static _nosound: Cvar = null!;
+  static _ambientLevel: Cvar = null!;
+  static _ambientFade: Cvar = null!;
+  static volume: Cvar = null!;
+  static bgmvolume: Cvar = null!;
+
+  static _eventListeners: Array<() => void> = [];
 
   // ─── Init / Shutdown ────────────────────────────────────────────────────────
 
-  static Init() {
+  static Init(): void {
     Cmd.AddCommand('play', Sound.Play_f.bind(Sound));
     Cmd.AddCommand('playvol', Sound.PlayVol_f.bind(Sound));
     Cmd.AddCommand('stopsound', Sound.StopAllSounds.bind(Sound));
@@ -302,7 +280,8 @@ class Sound {
 
       Sound._started = true;
     } catch (err) {
-      Con.PrintWarning(`S.Init: AudioContext failed (${err.message}). Sound disabled.\n`);
+      const message = err instanceof Error ? err.message : String(err);
+      Con.PrintWarning(`S.Init: AudioContext failed (${message}). Sound disabled.\n`);
       return;
     }
 
@@ -318,7 +297,7 @@ class Sound {
       Sound._ambientChannels.push(ch);
 
       sfx.ready.then(() => {
-        if (sfx.cache.loopstart === null) {
+        if (sfx.cache?.loopstart === null) {
           Con.Print(`S.Init: Sound ${name} not looped\n`);
         }
         ch.play();
@@ -333,7 +312,7 @@ class Sound {
     Con.DPrint('Sound subsystem initialized.\n');
   }
 
-  static Shutdown() {
+  static Shutdown(): void {
     for (const unsub of Sound._eventListeners) {
       unsub();
     }
@@ -369,19 +348,19 @@ class Sound {
    * @param {string} name sound filename
    * @returns {SFX|null} the SFX handle or null if sound is disabled
    */
-  static PrecacheSound(name) {
+  static PrecacheSound(name: string): SFX | null {
     if (!Sound._started || Sound._nosound.value !== 0) {
       return null;
     }
 
-    let sfx = Sound._knownSfx.find((s) => s.name === name);
+    let sfx = Sound._knownSfx.find((soundEffect) => soundEffect.name === name);
     if (!sfx) {
       sfx = new SFX(name);
       Sound._knownSfx.push(sfx);
     }
 
     if (Sound._precache.value !== 0 && sfx.state === SFX.STATE.NEW) {
-      Sound.LoadSound(sfx).catch(() => {});
+      void Sound.LoadSound(sfx).catch(() => {});
     }
 
     return sfx;
@@ -391,12 +370,12 @@ class Sound {
    * @param {string} name sound filename
    * @returns {Promise<SFX|null>} the SFX handle or null if sound is disabled
    */
-  static async PrecacheSoundAsync(name) {
+  static async PrecacheSoundAsync(name: string): Promise<SFX | null> {
     if (!Sound._started || Sound._nosound.value !== 0) {
       return null;
     }
 
-    let sfx = Sound._knownSfx.find((s) => s.name === name);
+    let sfx = Sound._knownSfx.find((soundEffect) => soundEffect.name === name);
     if (!sfx) {
       sfx = new SFX(name);
       Sound._knownSfx.push(sfx);
@@ -416,7 +395,7 @@ class Sound {
    * @param {SFX} sfx sound effect to load
    * @returns {Promise<boolean>} whether loading succeeded
    */
-  static async LoadSound(sfx) {
+  static async LoadSound(sfx: SFX): Promise<boolean> {
     if (!Sound._started || Sound._nosound.value !== 0) {
       sfx.state = SFX.STATE.FAILED;
       return false;
@@ -430,6 +409,12 @@ class Sound {
       return sfx.state === SFX.STATE.AVAILABLE;
     }
 
+    const context = Sound._context;
+    if (context === null) {
+      sfx.state = SFX.STATE.FAILED;
+      return false;
+    }
+
     sfx.state = SFX.STATE.LOADING;
 
     const data = await COM.LoadFile(`sound/${sfx.name}`);
@@ -444,19 +429,20 @@ class Sound {
 
     const loopInfo = Sound._parseWavLoopInfo(data);
 
-    let audioBuffer;
+    let audioBuffer: AudioBuffer;
     try {
-      audioBuffer = await Sound._context.decodeAudioData(data);
-    } catch (e) {
-      Con.PrintError(`S.LoadSound: decodeAudioData failed for ${sfx.name}: ${e.message}\n`);
+      audioBuffer = await context.decodeAudioData(data);
+    } catch (err) {
+      const message = err instanceof Error ? err.message : String(err);
+      Con.PrintError(`S.LoadSound: decodeAudioData failed for ${sfx.name}: ${message}\n`);
       sfx.state = SFX.STATE.FAILED;
-      sfx._readyReject?.(new Error(e.message));
+      sfx._readyReject?.(new Error(message));
       sfx._readyResolve = null;
       sfx._readyReject = null;
       return false;
     }
 
-    let loopstart = null;
+    let loopstart: number | null = null;
     if (loopInfo.loopstartSamples !== null) {
       const rate = loopInfo.sampleRate || audioBuffer.sampleRate;
       loopstart = loopInfo.loopstartSamples / rate;
@@ -474,7 +460,7 @@ class Sound {
   }
 
   /** Loads up to 4 pending sounds per batch, then recurses. */
-  static LoadPendingFiles() {
+  static LoadPendingFiles(): void {
     const pending = Sound._knownSfx.filter((sfx) => sfx.state === SFX.STATE.NEW);
     if (pending.length === 0) {
       return;
@@ -483,7 +469,8 @@ class Sound {
     Promise.all(pending.slice(0, 4).map((sfx) => sfx.load())).then(() => {
       Sound.LoadPendingFiles();
     }).catch((err) => {
-      Con.PrintError(`S.LoadPendingFiles: ${err.message || err}\n`);
+      const message = err instanceof Error ? err.message : String(err);
+      Con.PrintError(`S.LoadPendingFiles: ${message}\n`);
     });
   }
 
@@ -497,7 +484,7 @@ class Sound {
    * @param {number} vol master volume [0..1]
    * @param {number} attenuation distance falloff factor
    */
-  static StartSound(entnum, entchannel, sfx, origin, vol, attenuation) {
+  static StartSound(entnum: number, entchannel: number, sfx: SFX | null, origin: Vector, vol: number, attenuation: number): void {
     if (!Sound._started || Sound._nosound.value !== 0 || !sfx) {
       return;
     }
@@ -530,7 +517,7 @@ class Sound {
     }
 
     if (sfx.state === SFX.STATE.NEW) {
-      Sound.LoadSound(sfx).catch(() => {});
+      void Sound.LoadSound(sfx).catch(() => {});
     }
 
     if (sfx.state !== SFX.STATE.FAILED) {
@@ -544,7 +531,7 @@ class Sound {
    * @param {number} vol master volume [0..1]
    * @param {number} attenuation distance falloff factor
    */
-  static StaticSound(sfx, origin, vol, attenuation) {
+  static StaticSound(sfx: SFX | null, origin: Vector, vol: number, attenuation: number): void {
     if (!Sound._started || Sound._nosound.value !== 0 || !sfx) {
       return;
     }
@@ -563,6 +550,10 @@ class Sound {
     Sound._staticChannels.push(ch);
 
     const start = () => {
+      if (!sfx.cache) {
+        return;
+      }
+
       if (sfx.cache.loopstart === null) {
         Con.PrintWarning(`S.StaticSound: ${sfx.name} not looped, assuming start 0\n`);
         sfx.cache.loopstart = 0;
@@ -583,19 +574,19 @@ class Sound {
    * @param {number} entnum entity number
    * @param {number} entchannel channel on entity
    */
-  static StopSound(entnum, entchannel) {
+  static StopSound(entnum: number, entchannel: number): void {
     if (!Sound._started) {
       return;
     }
 
-    const ch = Sound._channels.find((c) => c.entnum === entnum && c.entchannel === entchannel);
+    const ch = Sound._channels.find((channel) => channel.entnum === entnum && channel.entchannel === entchannel);
     if (ch) {
       ch.stop();
       ch.reset();
     }
   }
 
-  static StopAllSounds() {
+  static StopAllSounds(): void {
     if (!Sound._started) {
       return;
     }
@@ -620,14 +611,14 @@ class Sound {
    * Plays a local (non-spatialized) sound at the view entity.
    * @param {SFX} sfx sound to play
    */
-  static LocalSound(sfx) {
+  static LocalSound(sfx: SFX | null): void {
     Sound.StartSound(CL.state.viewentity, -1, sfx, Vector.origin, 1.0, 1.0);
   }
 
   // ─── Console commands ───────────────────────────────────────────────────────
 
   /** @param {...string} samples sound names to play */
-  static Play_f(...samples) {
+  static Play_f(...samples: string[]): void {
     if (!Sound._started) {
       return;
     }
@@ -641,7 +632,7 @@ class Sound {
   }
 
   /** @param {...string} args name/volume pairs */
-  static PlayVol_f(...args) {
+  static PlayVol_f(...args: string[]): void {
     if (!Sound._started) {
       return;
     }
@@ -654,10 +645,10 @@ class Sound {
     }
   }
 
-  static SoundList_f() {
+  static SoundList_f(): void {
     let total = 0;
     for (const sfx of Sound._knownSfx) {
-      let info;
+      let info: string;
       if (sfx.state === SFX.STATE.AVAILABLE && sfx.cache) {
         const loop = sfx.cache.loopstart !== null ? 'L ' : '  ';
         info = `${loop} ${String(sfx.cache.size).padEnd(8)}`;
@@ -668,7 +659,7 @@ class Sound {
       Con.Print(`${info} : ${sfx.name}\n`);
     }
 
-    const playing = Sound._channels.filter((c) => c._source !== null).length;
+    const playing = Sound._channels.filter((channel) => channel._source !== null).length;
     Con.Print(`Total resident: ${total}\n`);
     Con.Print(`Active channels: ${playing}/${Sound._channels.length}\n`);
   }
@@ -682,7 +673,7 @@ class Sound {
    * @param {Vector} _up unused (kept for API compat)
    * @param {boolean} underwater whether the listener is submerged
    */
-  static Update(origin, _forward, right, _up, underwater) {
+  static Update(origin: Vector, _forward: Vector, right: Vector, _up: Vector, underwater: boolean): void {
     if (!Sound._started || Sound._nosound.value !== 0) {
       return;
     }
@@ -716,7 +707,7 @@ class Sound {
   }
 
   /** @protected */
-  static _updateAmbientSounds() {
+  static _updateAmbientSounds(): void {
     if (!CL.state.worldmodel || !Sound._listenerLeaf || Sound._ambientLevel.value === 0) {
       for (const ch of Sound._ambientChannels) {
         ch.channel_vol = 0;
@@ -747,7 +738,7 @@ class Sound {
   }
 
   /** @protected */
-  static _updateDynamicSounds() {
+  static _updateDynamicSounds(): void {
     for (const ch of Sound._channels) {
       if (!ch.sfx) {
         continue;
@@ -767,7 +758,7 @@ class Sound {
   }
 
   /** @protected */
-  static _updateStaticSounds() {
+  static _updateStaticSounds(): void {
     for (const ch of Sound._staticChannels) {
       ch.spatialize();
     }
@@ -776,11 +767,18 @@ class Sound {
   // ─── Helpers ────────────────────────────────────────────────────────────────
 
   /** @returns {Channel} a new audio channel wired to the master bus */
-  static _newChannel() {
-    return new Channel(Sound._context, Sound._masterGain);
+  static _newChannel(): Channel {
+    const context = Sound._context;
+    const masterGain = Sound._masterGain;
+
+    if (context === null || masterGain === null) {
+      throw new Error('Sound graph is not initialized');
+    }
+
+    return new Channel(context, masterGain);
   }
 
-  static _ensureContextRunning() {
+  static _ensureContextRunning(): void {
     if (Sound._context?.state === 'suspended') {
       Sound._context.resume().catch(() => {});
     }
@@ -791,10 +789,10 @@ class Sound {
    * @param {number} entchannel channel on entity
    * @returns {Channel} allocated or reused channel
    */
-  static _pickChannel(entnum, entchannel) {
+  static _pickChannel(entnum: number, entchannel: number): Channel {
     // Reuse existing channel for same entity+channel
     if (entchannel !== 0) {
-      const existing = Sound._channels.find((c) => c.entnum === entnum && c.entchannel === entchannel);
+      const existing = Sound._channels.find((channel) => channel.entnum === entnum && channel.entchannel === entchannel);
       if (existing) {
         existing.reset();
         return existing;
@@ -802,7 +800,7 @@ class Sound {
     }
 
     // Find a free channel
-    const free = Sound._channels.find((c) => !c.sfx);
+    const free = Sound._channels.find((channel) => !channel.sfx);
     if (free) {
       return free;
     }
@@ -815,7 +813,7 @@ class Sound {
     }
 
     // Voice steal: pick quietest non-local channel
-    let victim = null;
+    let victim: Channel | null = null;
     let lowestVol = Infinity;
     for (const ch of Sound._channels) {
       if (ch.entnum === CL.state.viewentity) {
@@ -840,33 +838,33 @@ class Sound {
    * @param {ArrayBuffer} data raw WAV file data
    * @returns {{loopstartSamples: number|null, sampleRate: number|null}} parsed loop info
    */
-  static _parseWavLoopInfo(data) {
+  static _parseWavLoopInfo(data: ArrayBuffer): { loopstartSamples: number | null; sampleRate: number | null } {
     const view = new DataView(data);
 
     if (data.byteLength < 12
-      || view.getUint32(0, true) !== 0x46464952   // 'RIFF'
-      || view.getUint32(8, true) !== 0x45564157) { // 'WAVE'
+      || view.getUint32(0, true) !== 0x46464952
+      || view.getUint32(8, true) !== 0x45564157) {
       return { loopstartSamples: null, sampleRate: null };
     }
 
     let pos = 12;
-    let sampleRate = null;
-    let cueLoopStart = null;
-    let smplLoopStart = null;
+    let sampleRate: number | null = null;
+    let cueLoopStart: number | null = null;
+    let smplLoopStart: number | null = null;
 
     while (pos + 8 <= data.byteLength) {
       const id = view.getUint32(pos, true);
       const size = Math.min(view.getUint32(pos + 4, true), data.byteLength - pos - 8);
       const at = pos + 8;
 
-      if (id === 0x20746d66 && size >= 8) {          // 'fmt '
+      if (id === 0x20746d66 && size >= 8) {
         sampleRate = view.getUint32(at + 4, true);
-      } else if (id === 0x20657563 && size >= 28) {   // 'cue '
+      } else if (id === 0x20657563 && size >= 28) {
         const n = view.getUint32(at, true);
         if (n > 0 && size >= 4 + n * 24) {
           cueLoopStart = view.getUint32(at + 4 + (n - 1) * 24 + 20, true);
         }
-      } else if (id === 0x6c706d73 && size >= 60) {   // 'smpl'
+      } else if (id === 0x6c706d73 && size >= 60) {
         if (view.getUint32(at + 28, true) >= 1) {
           smplLoopStart = view.getUint32(at + 36 + 8, true);
         }
@@ -881,5 +879,3 @@ class Sound {
     return { loopstartSamples: smplLoopStart ?? cueLoopStart, sampleRate };
   }
 }
-
-export default Sound;
diff --git a/source/engine/common/GameAPIs.ts b/source/engine/common/GameAPIs.ts
index a390f16d..1b608328 100644
--- a/source/engine/common/GameAPIs.ts
+++ b/source/engine/common/GameAPIs.ts
@@ -11,7 +11,7 @@ import { PmoveConfiguration } from '../../shared/Pmove.ts';
 import Vector from '../../shared/Vector.ts';
 import { moveTypes, solid } from '../../shared/Defs.ts';
 import Key from '../client/Key.mjs';
-import { SFX as SFXValue } from '../client/Sound.mjs';
+import { SFX as SFXValue } from '../client/Sound.ts';
 import VID from '../client/VID.ts';
 import * as Protocol from '../network/Protocol.ts';
 import { EventBus, eventBus, getClientRegistry, getCommonRegistry } from '../registry.mjs';
diff --git a/source/engine/main-browser.ts b/source/engine/main-browser.ts
index 457e2f35..cf44046c 100644
--- a/source/engine/main-browser.ts
+++ b/source/engine/main-browser.ts
@@ -1,12 +1,12 @@
 import type { BuildConfig, URLs } from './build-config';
 
-import CL from './client/CL.mjs';
+import CL from './client/CL.ts';
 import Draw from './client/Draw.mjs';
 import IN from './client/IN.ts';
 import Key from './client/Key.mjs';
-import M from './client/Menu.mjs';
+import M from './client/Menu.ts';
 import R from './client/R.mjs';
-import S from './client/Sound.mjs';
+import S from './client/Sound.ts';
 import Sys from './client/Sys.ts';
 import V from './client/V.mjs';
 import Sbar from './client/Sbar.mjs';
diff --git a/source/engine/registry.mjs b/source/engine/registry.mjs
index fcb81a3b..18e89c3e 100644
--- a/source/engine/registry.mjs
+++ b/source/engine/registry.mjs
@@ -8,14 +8,14 @@
 /** @typedef {typeof import('./server/Server.ts').default} ServerModule */
 /** @typedef {typeof import('./server/Progs.ts').default} ProgsModule */
 /** @typedef {typeof import('./common/Mod.ts').default} ModModule */
-/** @typedef {typeof import('./client/CL.mjs').default} ClientModule */
+/** @typedef {typeof import('./client/CL.ts').default} ClientModule */
 /** @typedef {typeof import('./client/SCR.mjs').default} ScrModule */
 /** @typedef {typeof import('./client/R.mjs').default} RendererModule */
 /** @typedef {typeof import('./client/Draw.mjs').default} DrawModule */
 /** @typedef {typeof import('./client/Key.mjs').default} KeyModule */
 /** @typedef {typeof import('./client/Sbar.mjs').default} SbarModule */
-/** @typedef {typeof import('./client/Sound.mjs').default} SoundModule */
-/** @typedef {typeof import('./client/Menu.mjs').default} MenuModule */
+/** @typedef {typeof import('./client/Sound.ts').default} SoundModule */
+/** @typedef {typeof import('./client/Menu.ts').default} MenuModule */
 /** @typedef {typeof import('./client/IN.ts').default} InputModule */
 /** @typedef {typeof globalThis.WebSocket} BrowserWebSocketClass */
 /** @typedef {typeof import('ws')} NodeWebSocketModule */
diff --git a/source/shared/GameInterfaces.ts b/source/shared/GameInterfaces.ts
index 1602202f..718be5d3 100644
--- a/source/shared/GameInterfaces.ts
+++ b/source/shared/GameInterfaces.ts
@@ -3,7 +3,7 @@ import type { ClientEngineAPI as ClientEngineApiValue, ServerEngineAPI as Server
 import type { ClientEdict as ClientEdictValue } from '../engine/client/ClientEntities.ts';
 import type { ServerEdict as ServerEdictValue } from '../engine/server/Edict.ts';
 import type { GLTexture as GLTextureValue } from '../engine/client/GL.mjs';
-import type { SFX as SFXValue } from '../engine/client/Sound.mjs';
+import type { SFX as SFXValue } from '../engine/client/Sound.ts';
 import type CvarValue from '../engine/common/Cvar.ts';
 import type Vector from './Vector.ts';
 import type { PmoveConfiguration as PmoveConfigurationValue, PmoveQuake2Configuration as PmoveQuake2ConfigurationValue } from '../shared/Pmove.ts';

From 191cefd86f229299a9ef6c534f25f2452a2057de Mon Sep 17 00:00:00 2001
From: Christian R <github@chrisnew.de>
Date: Sat, 4 Apr 2026 12:27:13 +0300
Subject: [PATCH 44/67] TS: client/ part 4

---
 source/engine/client/GL.mjs                   | 1158 +----------------
 source/engine/client/GL.ts                    | 1131 ++++++++++++++++
 source/engine/client/Menu.ts                  |    2 +-
 source/engine/client/V.mjs                    |  494 -------
 source/engine/client/V.ts                     |  526 ++++++++
 source/engine/common/GameAPIs.ts              |    2 +-
 source/engine/common/model/AliasModel.ts      |    2 +-
 source/engine/common/model/BaseModel.ts       |    2 +-
 source/engine/common/model/SpriteModel.ts     |    2 +-
 .../common/model/loaders/AliasMDLLoader.ts    |    2 +-
 .../common/model/loaders/BSP29Loader.ts       |    2 +-
 .../common/model/loaders/SpriteSPRLoader.ts   |    2 +-
 .../model/loaders/WavefrontOBJLoader.ts       |    2 +-
 source/engine/main-browser.ts                 |    2 +-
 source/engine/main-dedicated.ts               |    2 +-
 source/engine/registry.mjs                    |    2 +-
 source/shared/GameInterfaces.ts               |    2 +-
 test/client/gl.test.mjs                       |   19 +
 test/client/v.test.mjs                        |   28 +
 19 files changed, 1718 insertions(+), 1664 deletions(-)
 create mode 100644 source/engine/client/GL.ts
 delete mode 100644 source/engine/client/V.mjs
 create mode 100644 source/engine/client/V.ts
 create mode 100644 test/client/gl.test.mjs
 create mode 100644 test/client/v.test.mjs

diff --git a/source/engine/client/GL.mjs b/source/engine/client/GL.mjs
index 5034fcb5..478b48bc 100644
--- a/source/engine/client/GL.mjs
+++ b/source/engine/client/GL.mjs
@@ -1,1157 +1 @@
-import Cmd, { ConsoleCommand } from '../common/Cmd.ts';
-import Cvar from '../common/Cvar.ts';
-import { MissingResourceError } from '../common/Errors.ts';
-import { WadLumpTexture } from '../common/W.ts';
-import { eventBus, registry } from '../registry.mjs';
-import VID from './VID.ts';
-
-/** @type {Record<string, string>|null} */
-let shaderSources = /** @type {Record<string, string>|null} */ (null);
-
-try {
-  // Vite rewrites this at build time; raw Node.js leaves it undefined and falls back.
-  // @ts-ignore Vite-specific import.meta.glob
-  shaderSources = import.meta.glob('./shaders/*.{vert,frag}', {
-    eager: true,
-    import: 'default',
-    query: '?raw',
-  });
-} catch {
-  shaderSources = null;
-}
-
-class GL {
-  /** @type {object[]} */
-  static programs = [];
-
-  /** @type {object|null} */
-  static currentProgram = null;
-
-  /** @type {number} */
-  static maxtexturesize = 0;
-
-  /** @type {Cvar|null} */
-  static picmip = null;
-
-  /** @type {Cvar|null} */
-  static clear = null;
-
-  /** @type {ArrayBuffer|null} */
-  static streamArray = null;
-
-  /** @type {Uint8Array|null} */
-  static streamArrayBytes = null;
-
-  /** @type {number} */
-  static streamArrayPosition = 0;
-
-  /** @type {number} */
-  static streamArrayVertexCount = 0;
-
-  /** @type {DataView|null} */
-  static streamArrayView = null;
-
-  /** @type {WebGLBuffer|null} */
-  static streamBuffer = null;
-
-  /** @type {number} */
-  static streamBufferPosition = 0;
-
-  /** @type {WebGL2RenderingContext|null} */
-  static gl = null;
-
-  /** @type {number[]} */
-  static identity = [1.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 1.0];
-
-  /** @type {WebGLVertexArrayObject} Currently bound model VAO, or null for default (stream) */
-  static currentVAO = null;
-
-  /**
-   * Binds a 2D texture.
-   * @param {number} target texture target
-   * @param {WebGLTexture} texnum texture number
-   * @param {boolean} flushStream flush the stream before binding
-   * @deprecated
-   */
-  static Bind(target, texnum, flushStream = false) {
-    if (currentTextureTargets[target] === texnum) {
-      return;
-    }
-
-    if (flushStream) {
-      GL.StreamFlush();
-    }
-
-    if (currentTextureTarget !== target) {
-      currentTextureTarget = target;
-      gl.activeTexture(gl.TEXTURE0 + target);
-    }
-
-    currentTextureTargets[target] = texnum;
-    gl.bindTexture(gl.TEXTURE_2D, texnum);
-  }
-
-  /**
-   * Binds a 3D texture. Invalidates the 2D texture cache for this unit.
-   * @param {number} target texture unit (0-31)
-   * @param {WebGLTexture} texnum texture handle
-   */
-  static Bind3D(target, texnum) {
-    if (currentTextureTarget !== target) {
-      currentTextureTarget = target;
-      gl.activeTexture(gl.TEXTURE0 + target);
-    }
-
-    currentTextureTargets[target] = null;
-    gl.bindTexture(gl.TEXTURE_3D, texnum);
-  }
-
-  /**
-   * Binds a 2D array texture. Invalidates the 2D texture cache for this unit.
-   * @param {number} target texture unit (0-31)
-   * @param {WebGLTexture} texnum texture handle
-   */
-  static BindArray(target, texnum) {
-    if (currentTextureTarget !== target) {
-      currentTextureTarget = target;
-      gl.activeTexture(gl.TEXTURE0 + target);
-    }
-
-    currentTextureTargets[target] = null;
-    gl.bindTexture(gl.TEXTURE_2D_ARRAY, texnum);
-  }
-
-  /**
-   * Binds a cube map texture. Invalidates the 2D texture cache for this unit.
-   * @param {number} target texture unit (0-31)
-   * @param {WebGLTexture} texnum texture handle
-   */
-  static BindCube(target, texnum) {
-    if (currentTextureTarget !== target) {
-      currentTextureTarget = target;
-      gl.activeTexture(gl.TEXTURE0 + target);
-    }
-
-    currentTextureTargets[target] = null;
-    gl.bindTexture(gl.TEXTURE_CUBE_MAP, texnum);
-  }
-
-  static Set2D() {
-    gl.viewport(0, 0, Math.floor(VID.width * VID.pixelRatio), Math.floor(VID.height * VID.pixelRatio));
-    GL.UnbindProgram();
-
-    for (const { program, uOrtho } of GL.programs) {
-      if (!uOrtho) {
-        continue;
-      }
-
-      gl.useProgram(program);
-      gl.uniformMatrix4fv(uOrtho, false, ortho);
-    }
-
-    gl.disable(gl.DEPTH_TEST);
-    gl.enable(gl.BLEND);
-  }
-
-  /**
-   * Creates a shader program.
-   * @param {string} identifier unique program identifier
-   * @param {string[]} uniforms uniform names
-   * @param {Array} attribs attribute parameters
-   * @param {string[]} textures texture names
-   * @returns {object} the program object
-   */
-  static CreateProgram(identifier, uniforms, attribs, textures) {
-    const p = gl.createProgram();
-    const program = {
-      identifier: identifier,
-      program: p,
-      attribs: [],
-    };
-
-    if (shaderSources === null) {
-      throw new Error('Shader sources are unavailable in this runtime');
-    }
-
-    const vertexShaderPath = `./shaders/${identifier}.vert`;
-    const fragmentShaderPath = `./shaders/${identifier}.frag`;
-    const vsource = shaderSources[vertexShaderPath];
-    const fsource = shaderSources[fragmentShaderPath];
-
-    if (vsource === undefined || fsource === undefined) {
-      const missingResources = [];
-
-      if (vsource === undefined) {
-        missingResources.push(vertexShaderPath);
-      }
-      if (fsource === undefined) {
-        missingResources.push(fragmentShaderPath);
-      }
-
-      throw new MissingResourceError(
-        `${missingResources.join(', ')}. If these shader files were added while the dev session was already running, restart the active Vite build/watch process so import.meta.glob rebuilds the shader manifest.`,
-      );
-    }
-
-    const vsh = gl.createShader(gl.VERTEX_SHADER);
-    gl.shaderSource(vsh, vsource);
-    gl.compileShader(vsh);
-    if (gl.getShaderParameter(vsh, gl.COMPILE_STATUS) !== true) {
-      throw new Error('Error compiling shader: ' + gl.getShaderInfoLog(vsh));
-    }
-
-    const fsh = gl.createShader(gl.FRAGMENT_SHADER);
-    gl.shaderSource(fsh, fsource);
-    gl.compileShader(fsh);
-    if (gl.getShaderParameter(fsh, gl.COMPILE_STATUS) !== true) {
-      throw new Error('Error compiling shader: ' + gl.getShaderInfoLog(fsh));
-    }
-
-    gl.attachShader(p, vsh);
-    gl.attachShader(p, fsh);
-
-    // Bind standard attribute locations before linking so VAOs work across programs
-    for (let i = 0; i < attribs.length; i++) {
-      const name = attribs[i][0];
-      if (name in ATTRIB_LOCATIONS) {
-        gl.bindAttribLocation(p, ATTRIB_LOCATIONS[name], name);
-      }
-    }
-
-    gl.linkProgram(p);
-    if (gl.getProgramParameter(p, gl.LINK_STATUS) !== true) {
-      throw new Error('Error linking program: ' + gl.getProgramInfoLog(p));
-    }
-
-    gl.useProgram(p);
-
-    for (let i = 0; i < uniforms.length; i++) {
-      program[uniforms[i]] = gl.getUniformLocation(p, uniforms[i]);
-    }
-
-    program.vertexSize = 0;
-    program.attribBits = 0;
-    for (let i = 0; i < attribs.length; i++) {
-      const attribParameters = attribs[i];
-      const location = gl.getAttribLocation(p, attribParameters[0]);
-      console.assert(location !== -1, 'vertex shader attribute must exist and be used!', attribParameters[0]);
-      const attrib = {
-        name: attribParameters[0],
-        location,
-        type: attribParameters[1],
-        components: attribParameters[2],
-        normalized: (attribParameters[3] === true),
-        offset: program.vertexSize,
-      };
-      program.attribs[i] = attrib;
-      program[attrib.name] = attrib;
-      if (attrib.type === gl.FLOAT) {
-        program.vertexSize += attrib.components * 4;
-      } else if (attrib.type === gl.BYTE || attrib.type === gl.UNSIGNED_BYTE) {
-        program.vertexSize += 4;
-      } else {
-        throw new Error('Unknown vertex attribute type');
-      }
-      program.attribBits |= 1 << attrib.location;
-    }
-
-    for (let i = 0; i < textures.length; i++) {
-      program[textures[i]] = i;
-      gl.uniform1i(gl.getUniformLocation(p, textures[i]), i);
-    }
-
-    GL.programs[GL.programs.length] = program;
-    return program;
-  }
-
-  /**
-   * Uses a shader program.
-   * @param {string} identifier program identifier
-   * @param {boolean} flushStream flush stream before using
-   * @returns {object|null} the program object
-   */
-  static UseProgram(identifier, flushStream = false) {
-    const currentProgram = GL.currentProgram;
-    if (currentProgram !== null) {
-      if (currentProgram.identifier === identifier) {
-        return currentProgram;
-      }
-      if (flushStream) {
-        GL.StreamFlush();
-      }
-    }
-
-    const program = GL.programs.find((p) => p.identifier === identifier) || null;
-
-    if (program === null) {
-      return null;
-    }
-
-    GL.currentProgram = program;
-    gl.useProgram(program.program);
-
-    // When a model VAO is bound, it manages attribute state — skip enables
-    if (GL.currentVAO !== null) {
-      return program;
-    }
-
-    let enableAttribs = program.attribBits;
-    let disableAttribs = 0;
-    if (currentProgram !== null) {
-      enableAttribs &= ~currentProgram.attribBits;
-      disableAttribs = currentProgram.attribBits & ~program.attribBits;
-    }
-    for (let attrib = 0; enableAttribs !== 0 || disableAttribs !== 0; attrib++) {
-      const mask = 1 << attrib;
-      if ((enableAttribs & mask) !== 0) {
-        gl.enableVertexAttribArray(attrib);
-      } else if ((disableAttribs & mask) !== 0) {
-        gl.disableVertexAttribArray(attrib);
-      }
-      enableAttribs &= ~mask;
-      disableAttribs &= ~mask;
-    }
-
-    return program;
-  }
-
-  static UnbindProgram() {
-    if (GL.currentProgram === null) {
-      return;
-    }
-    GL.StreamFlush();
-    if (GL.currentVAO !== null) {
-      GL.UnbindVAO();
-    }
-    let i;
-    for (i = 0; i < GL.currentProgram.attribs.length; i++) {
-      gl.disableVertexAttribArray(GL.currentProgram.attribs[i].location);
-    }
-    GL.currentProgram = null;
-  }
-
-  /**
-   * Checks for WebGL errors.
-   * @param {string} operation operation description
-   * @throws {GLError} if an error occurred
-   */
-  static CheckError(operation = 'WebGL operation') {
-    const error = gl.getError();
-
-    if (error !== gl.NO_ERROR) {
-      const errorNames = {
-        [gl.INVALID_ENUM]: 'GL_INVALID_ENUM',
-        [gl.INVALID_VALUE]: 'GL_INVALID_VALUE',
-        [gl.INVALID_OPERATION]: 'GL_INVALID_OPERATION',
-        [gl.INVALID_FRAMEBUFFER_OPERATION]: 'GL_INVALID_FRAMEBUFFER_OPERATION',
-        [gl.OUT_OF_MEMORY]: 'GL_OUT_OF_MEMORY',
-        [gl.CONTEXT_LOST_WEBGL]: 'CONTEXT_LOST_WEBGL',
-      };
-
-      const errorName = errorNames[error] || `Unknown error (${error})`;
-      const message = `WebGL Error: ${errorName} during ${operation}`;
-
-      throw new GLError(message, error, errorName, operation);
-    }
-  }
-
-  static StreamFlush() {
-    if (GL.streamArrayVertexCount === 0) {
-      return;
-    }
-    const program = GL.currentProgram;
-    if (program !== null) {
-      gl.bindBuffer(gl.ARRAY_BUFFER, GL.streamBuffer);
-      gl.bufferSubData(gl.ARRAY_BUFFER, GL.streamBufferPosition,
-        GL.streamArrayBytes.subarray(0, GL.streamArrayPosition));
-      const attribs = program.attribs;
-      for (let i = 0; i < attribs.length; i++) {
-        const attrib = attribs[i];
-        gl.vertexAttribPointer(attrib.location,
-          attrib.components, attrib.type, attrib.normalized,
-          program.vertexSize, GL.streamBufferPosition + attrib.offset);
-      }
-      gl.drawArrays(gl.TRIANGLES, 0, GL.streamArrayVertexCount);
-      GL.streamBufferPosition += GL.streamArrayPosition;
-    }
-    GL.streamArrayPosition = 0;
-    GL.streamArrayVertexCount = 0;
-  }
-
-  static StreamGetSpace(vertexCount) {
-    const program = GL.currentProgram;
-    if (program === null) {
-      return;
-    }
-    const length = vertexCount * program.vertexSize;
-    if ((GL.streamBufferPosition + GL.streamArrayPosition + length) > GL.streamArray.byteLength) {
-      GL.StreamFlush();
-      GL.streamBufferPosition = 0;
-    }
-    GL.streamArrayVertexCount += vertexCount;
-  }
-
-  static StreamWriteFloat(x) {
-    GL.streamArrayView.setFloat32(GL.streamArrayPosition, x, true);
-    GL.streamArrayPosition += 4;
-  }
-
-  static StreamWriteFloat2(x, y) {
-    const view = GL.streamArrayView;
-    const position = GL.streamArrayPosition;
-    view.setFloat32(position, x, true);
-    view.setFloat32(position + 4, y, true);
-    GL.streamArrayPosition += 8;
-  }
-
-  static StreamWriteFloat3(x, y, z) {
-    const view = GL.streamArrayView;
-    const position = GL.streamArrayPosition;
-    view.setFloat32(position, x, true);
-    view.setFloat32(position + 4, y, true);
-    view.setFloat32(position + 8, z, true);
-    GL.streamArrayPosition += 12;
-  }
-
-  static StreamWriteFloat4(x, y, z, w) {
-    const view = GL.streamArrayView;
-    const position = GL.streamArrayPosition;
-    view.setFloat32(position, x, true);
-    view.setFloat32(position + 4, y, true);
-    view.setFloat32(position + 8, z, true);
-    view.setFloat32(position + 12, w, true);
-    GL.streamArrayPosition += 16;
-  }
-
-  static StreamWriteUByte4(x, y, z, w) {
-    const view = GL.streamArrayView;
-    const position = GL.streamArrayPosition;
-    view.setUint8(position, x);
-    view.setUint8(position + 1, y);
-    view.setUint8(position + 2, z);
-    view.setUint8(position + 3, w);
-    GL.streamArrayPosition += 4;
-  }
-
-  static StreamDrawTexturedQuad(x, y, w, h, u, v, u2, v2) {
-    const x2 = x + w;
-    const y2 = y + h;
-    GL.StreamGetSpace(6);
-    GL.StreamWriteFloat4(x, y, u, v);
-    GL.StreamWriteFloat4(x, y2, u, v2);
-    GL.StreamWriteFloat4(x2, y, u2, v);
-    GL.StreamWriteFloat4(x2, y, u2, v);
-    GL.StreamWriteFloat4(x, y2, u, v2);
-    GL.StreamWriteFloat4(x2, y2, u2, v2);
-  }
-
-  static StreamDrawColoredQuad(x, y, w, h, r, g, b, a) {
-    const x2 = x + w;
-    const y2 = y + h;
-    GL.StreamGetSpace(6);
-    GL.StreamWriteFloat2(x, y);
-    GL.StreamWriteUByte4(r, g, b, a);
-    GL.StreamWriteFloat2(x, y2);
-    GL.StreamWriteUByte4(r, g, b, a);
-    GL.StreamWriteFloat2(x2, y);
-    GL.StreamWriteUByte4(r, g, b, a);
-    GL.StreamWriteFloat2(x2, y);
-    GL.StreamWriteUByte4(r, g, b, a);
-    GL.StreamWriteFloat2(x, y2);
-    GL.StreamWriteUByte4(r, g, b, a);
-    GL.StreamWriteFloat2(x2, y2);
-    GL.StreamWriteUByte4(r, g, b, a);
-  }
-
-  /**
-   * Bind a model VAO for static geometry rendering.
-   * Flushes the stream buffer and skips attribute management in UseProgram.
-   * @param {WebGLVertexArrayObject} vao the VAO to bind
-   */
-  static BindVAO(vao) {
-    GL.StreamFlush();
-    savedDefaultAttribBits = GL.currentProgram !== null ? GL.currentProgram.attribBits : 0;
-    gl.bindVertexArray(vao);
-    GL.currentVAO = vao;
-  }
-
-  /**
-   * Unbind the model VAO, returning to the default VAO for stream rendering.
-   * Disables stale attributes on the default VAO and invalidates the current
-   * program so the next UseProgram re-enables only the attributes it needs.
-   */
-  static UnbindVAO() {
-    gl.bindVertexArray(null);
-    GL.currentVAO = null;
-    GL.currentProgram = null;
-    // Disable attributes that were enabled on the default VAO before the
-    // model VAO was bound, preventing "no buffer bound" errors on drawArrays.
-    for (let bits = savedDefaultAttribBits, i = 0; bits !== 0; i++, bits >>>= 1) {
-      if (bits & 1) {
-        gl.disableVertexAttribArray(i);
-      }
-    }
-    savedDefaultAttribBits = 0;
-  }
-
-  /**
-   * Create a VAO for a static VBO with the given vertex attribute layout.
-   * The VAO captures the VBO binding, attribute pointer state, and optionally an IBO.
-   * @param {WebGLBuffer} vbo the VBO to bind in the VAO
-   * @param {Array<{location: number, components: number, type: number, normalized: boolean, stride: number, offset: number}>} attributes attribute descriptors
-   * @param {WebGLBuffer} [ibo] optional index buffer to bind in the VAO
-   * @returns {WebGLVertexArrayObject} the created VAO
-   */
-  static CreateVAO(vbo, attributes, ibo) {
-    const vao = gl.createVertexArray();
-    gl.bindVertexArray(vao);
-    gl.bindBuffer(gl.ARRAY_BUFFER, vbo);
-    for (const attr of attributes) {
-      gl.enableVertexAttribArray(attr.location);
-      gl.vertexAttribPointer(attr.location, attr.components, attr.type, attr.normalized, attr.stride, attr.offset);
-    }
-    if (ibo) {
-      gl.bindBuffer(gl.ELEMENT_ARRAY_BUFFER, ibo);
-    }
-    gl.bindVertexArray(null);
-    return vao;
-  }
-}
-
-export default GL;
-
-let { COM, Con } = registry;
-
-eventBus.subscribe('registry.frozen', () => {
-  COM = registry.COM;
-  Con = registry.Con;
-});
-
-/** @type {WebGL2RenderingContext} */
-let gl = null;
-
-/** @type {{[key: string]: {min: number, max: number}}} */
-const textureModes = {};
-
-/** @type {string} */
-let currentTextureMode = 'GL_LINEAR_MIPMAP_LINEAR';
-
-/**
- * Standard vertex attribute locations used across all shader programs.
- * Consistent locations enable VAO reuse across different programs that
- * share the same VBO layout (e.g., brush opaque, turbulent, fog-volume).
- * @type {Record<string, number>}
- */
-export const ATTRIB_LOCATIONS = {
-  aPosition: 0,
-  aOrigin: 0, // particle (same slot as aPosition)
-  aTexCoord: 1,
-  aCoord: 1, // particle (same slot as aTexCoord)
-  aLightStyle: 2,
-  aScale: 2, // particle (same slot as aLightStyle)
-  aNormal: 3,
-  aTangent: 4,
-  aColor: 5,
-  aPositionA: 6,
-  aPositionB: 7,
-  aNormalA: 8,
-  aNormalB: 9,
-};
-
-/** @type {number} Standard brush vertex stride (20 floats = 80 bytes) */
-export const BRUSH_VERTEX_STRIDE = 80;
-
-const ortho = [
-  0.0, 0.0, 0.0, 0.0,
-  0.0, 0.0, 0.0, 0.0,
-  0.0, 0.0, -1.0, 0.0,
-  -1.0, 1.0, 0.0, 1.0,
-];
-
-// recalculate the ortho matrix when the video size changes
-eventBus.subscribe('vid.resize', ({ width, height }) => {
-  ortho[0] = 2.0 / width;
-  ortho[5] = -2.0 / height;
-});
-
-/** @type {Map<string, GLTexture>} */
-const textureCache = new Map();
-
-class TextureListCommand extends ConsoleCommand {
-  run() {
-    for (const [identifier, texture] of textureCache.entries()) {
-      if (!texture.ready) {
-        Con.Print(`${identifier} - NOT ready\n`);
-        continue;
-      }
-
-      Con.Print(`${identifier} (${texture.width} x ${texture.height})\n`);
-    }
-  }
-};
-
-/** @type {WebGLTexture[]} each index maps to a texture target and points to the texture being bound */
-const currentTextureTargets = [];
-
-/** @type {number} */
-let currentTextureTarget = null;
-
-/** @type {number} Bitmask of attributes enabled on the default VAO before a model VAO was bound */
-let savedDefaultAttribBits = 0;
-
-export class GLTexture {
-  /** @type {string} */
-  identifier = null;
-
-  /** @type {number} */
-  width = 0;
-
-  /** @type {number} */
-  height = 0;
-
-  /** @type {WebGLTexture|null} */
-  #texnum = null;
-
-  /** @type {string} */
-  #textureMode = null;
-
-  /** @type {Function} */
-  #textureModeListener = null;
-
-  /** @type {'repeat' | 'clamp'} */
-  #textureWrap = 'repeat';
-
-  /**
-   * @deprecated
-   * @returns {WebGLTexture|null} texture handle
-   */
-  get texnum() {
-    return this.#texnum;
-  }
-
-  get ready() {
-    return this.#texnum !== null;
-  }
-
-  /**
-   * @param {string} identifier unique name of the texture
-   * @param {number} width width
-   * @param {number} height height
-   * @param {Uint8Array|ImageBitmap|null} data optional texture data in RGBA format
-   */
-  constructor(identifier, width, height, data = null) {
-    this.identifier = identifier;
-    this.width = width;
-    this.height = height;
-    this.#texnum = null;
-    this.#textureMode = currentTextureMode;
-
-    console.assert(this.width > 0 && this.height > 0, 'Texture width and height must be greater than zero');
-    console.assert(textureCache.has(identifier) === false, 'Texture must not already exist in the cache');
-
-    textureCache.set(identifier, this);
-
-    if (data !== null) {
-      this.upload(data);
-    }
-
-    this.#textureModeListener = eventBus.subscribe('gl.texturemode', (name) => {
-      if (this.#textureMode !== name) {
-        this._setTextureMode(name);
-      }
-    });
-  }
-
-  /**
-   * Allocates a new texture or returns an existing one from the cache.
-   * @param {string} identifier unique name of the texture
-   * @param {number} width width
-   * @param {number} height height
-   * @param {Uint8Array|ImageBitmap|null} data optional texture data in RGBA format or as ImageBitmap
-   * @returns {GLTexture} texture instance
-   */
-  static Allocate(identifier, width, height, data = null) {
-    if (textureCache.has(identifier)) {
-      const texture = textureCache.get(identifier);
-
-      console.assert(texture.width !== null && (width === 1 || texture.width === width) && texture.height !== null && (height === 1 || texture.height === height), 'Texture dimensions must match'); // 1x1 textures are allowed to be resized, they are coming from deferred loading
-
-      return texture;
-    }
-
-    return new GLTexture(identifier, width, height, data);
-  }
-
-  /**
-   * Returns an existing texture from the cache.
-   * @param {string} identifier unique name of the texture
-   * @param {number} width width
-   * @param {number} height height
-   * @returns {GLTexture} texture instance
-   */
-  static FromCache(identifier, width, height) {
-    if (!textureCache.has(identifier)) {
-      return null;
-    }
-
-    const texture = textureCache.get(identifier);
-
-    console.assert(texture.width !== null && texture.width === width && texture.height !== null && texture.height === height, 'Texture dimensions must match');
-
-    return texture;
-  }
-
-  /**
-   * Allocates a new texture from a lump or returns an existing one from the cache.
-   * @param {WadLumpTexture} lump lump containing texture data
-   * @returns {GLTexture} texture instance
-   */
-  static FromLumpTexture(lump) {
-    return this.Allocate(lump.name, lump.width, lump.height, lump.data);
-  }
-
-  /**
-   * Allocates a new texture from an image file or returns an existing one from the cache.
-   * @param {string} filename filename an any image
-   * @param {boolean} ignoreMissing whether to ignore missing files
-   * @returns {Promise<GLTexture|null>} texture instance
-   */
-  static async FromImageFile(filename, ignoreMissing = false) {
-    // shortcut if the texture is already cached, ignore texture dimensions check
-    if (textureCache.has(filename)) {
-      return textureCache.get(filename);
-    }
-
-    const data = await COM.LoadFile(filename);
-
-    if (data === null) {
-      if (ignoreMissing) {
-        return null;
-      }
-
-      throw new MissingResourceError(filename);
-    }
-
-    const image = await createImageBitmap(new Blob([data]));
-
-    return this.Allocate(filename, image.width, image.height, image);
-  }
-
-  /**
-   * @protected
-   * @param {string} name texture mode
-   */
-  _setTextureMode(name) {
-    this.#textureMode = name;
-
-    if (!this.ready) {
-      return;
-    }
-
-    const { min, max } = textureModes[this.#textureMode];
-    this.bind(0);
-    gl.texParameterf(gl.TEXTURE_2D, gl.TEXTURE_MIN_FILTER, min);
-    gl.texParameterf(gl.TEXTURE_2D, gl.TEXTURE_MAG_FILTER, max);
-
-    switch (this.#textureWrap) {
-      case 'clamp':
-        gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_WRAP_S, gl.CLAMP_TO_EDGE);
-        gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_WRAP_T, gl.CLAMP_TO_EDGE);
-        break;
-
-      case 'repeat':
-        gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_WRAP_S, gl.REPEAT);
-        gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_WRAP_T, gl.REPEAT);
-        break;
-    }
-  }
-
-  /**
-   * Will lock the texture mode to the specified name.
-   * Changes to gl_texturemode will no longer change this texture’s mode.
-   * @param {string} name texture mode name
-   * @returns {GLTexture} this
-   */
-  lockTextureMode(name) {
-    console.assert(textureModes[name] !== undefined, 'Valid texture mode required');
-
-    if (this.#textureModeListener !== null) {
-      this.#textureModeListener();
-      this.#textureModeListener = null;
-    }
-
-    if (this.#textureMode !== name) {
-      this._setTextureMode(name);
-    }
-
-    return this;
-  }
-
-  wrapClamped() {
-    this.#textureWrap = 'clamp';
-
-    if (this.ready) {
-      this._setTextureMode(this.#textureMode);
-    }
-
-    return this;
-  }
-
-  wrapRepeat() {
-    this.#textureWrap = 'repeat';
-
-    if (this.ready) {
-      this._setTextureMode(this.#textureMode);
-    }
-
-    return this;
-  }
-
-  resize(width, height) {
-    console.assert(width > 0 && height > 0, 'Texture width and height must be greater than zero');
-
-    this.width = width;
-    this.height = height;
-
-    this.upload(null);
-
-    return this;
-  }
-
-  /**
-   * Binds the texture.
-   * @param {number} target texture target (0-31)
-   * @param {boolean} flushStream flush the stream before binding
-   * @returns {GLTexture} this
-   */
-  bind(target = 0, flushStream = false) {
-    if (!this.ready) {
-      missingPicTexture.bind(target, flushStream);
-      return this;
-    }
-
-    if (currentTextureTargets[target] === this.#texnum) {
-      // already bound
-      return this;
-    }
-
-    if (flushStream) {
-      GL.StreamFlush();
-    }
-
-    if (currentTextureTarget !== target) {
-      currentTextureTarget = target;
-      gl.activeTexture(gl.TEXTURE0 + target);
-    }
-
-    currentTextureTargets[target] = this.#texnum;
-    gl.bindTexture(gl.TEXTURE_2D, this.#texnum);
-
-    return this;
-  }
-
-  /**
-   * Uploads texture data.
-   * @param {Uint8Array|ImageBitmap|null} data texture data in RGBA format or as ImageBitmap
-   * @returns {GLTexture} this
-   */
-  upload(data) {
-    if (this.#texnum === null) {
-      this.#texnum = gl.createTexture();
-    }
-
-    this.bind(0);
-
-    if (data instanceof ImageBitmap) {
-      this.width = data.width;
-      this.height = data.height;
-      gl.texImage2D(gl.TEXTURE_2D, 0, gl.RGBA8, gl.RGBA, gl.UNSIGNED_BYTE, data);
-      gl.generateMipmap(gl.TEXTURE_2D);
-      GL.CheckError();
-    } else if (data instanceof Uint8Array) {
-      console.assert(data.length === this.width * this.height * 4, 'Texture data length must match width and height');
-
-      gl.texImage2D(gl.TEXTURE_2D, 0, gl.RGBA8, this.width, this.height, 0, gl.RGBA, gl.UNSIGNED_BYTE, data);
-      gl.generateMipmap(gl.TEXTURE_2D);
-      GL.CheckError();
-    } else if (data === null) {
-      gl.texImage2D(gl.TEXTURE_2D, 0, gl.RGBA8, this.width, this.height, 0, gl.RGBA, gl.UNSIGNED_BYTE, null);
-    }
-
-    this._setTextureMode(this.#textureMode);
-
-    eventBus.publish('gl.texture.ready', this.identifier);
-
-    return this;
-  }
-
-  free() {
-    if (this.#textureModeListener !== null) {
-      this.#textureModeListener();
-      this.#textureModeListener = null;
-    }
-
-    if (this.#texnum !== null) {
-      gl.deleteTexture(this.#texnum);
-      this.#texnum = null;
-    }
-
-    textureCache.delete(this.identifier);
-  }
-
-  [Symbol.dispose]() {
-    this.free();
-  }
-
-  toString() {
-    return `${this.identifier} (${this.width} x ${this.height}, ${this.ready ? 'ready' : 'not ready'})`;
-  }
-};
-
-/** @type {GLTexture} */
-const missingPicTexture = GLTexture.Allocate('gl_missingpic', 32, 32);
-
-class TextureModeCommand extends ConsoleCommand {
-  /** @param {string} name texture filter mode name */
-  // @ts-ignore
-  run(name) {
-    console.assert(currentTextureMode !== null, 'GL.TextureMode_f: currentTextureMode must be set');
-
-    if (name === undefined) {
-      Con.Print('Current texture mode: ' + currentTextureMode + '\n');
-      return;
-    }
-
-    name = name.toUpperCase();
-
-    if (textureModes[name] === undefined) {
-      Con.Print('Unknown texture mode: ' + name + '\n');
-      return;
-    }
-
-    currentTextureMode = name;
-
-    const { min, max } = textureModes[currentTextureMode];
-
-    eventBus.publish('gl.texturemode', name, { min, max });
-
-    Con.Print('Texture mode set to: ' + name + '\n');
-  }
-}
-
-
-
-/**
- * @param {Uint8Array} data 8-bit texture data
- * @param {number} inwidth source texture width
- * @param {number} inheight source texture height
- * @param {number} outwidth target texture width
- * @param {number} outheight target texture height
- * @returns {Uint8Array} resampled texture data
- */
-export function resampleTexture8(data, inwidth, inheight, outwidth, outheight) {
-  const outdata = new ArrayBuffer(outwidth * outheight);
-  const out = new Uint8Array(outdata);
-  const xstep = inwidth / outwidth;
-  const ystep = inheight / outheight;
-  let src;
-  let dest = 0;
-  let i;
-  let j;
-  for (i = 0; i < outheight; i++) {
-    src = Math.floor(i * ystep) * inwidth;
-    for (j = 0; j < outwidth; j++) {
-      out[dest + j] = data[src + Math.floor(j * xstep)];
-    }
-    dest += outwidth;
-  }
-  return out;
-}
-
-
-
-/** Turn this on to enable GL profiling, must be configured at compile-time */
-const profileGL = false;
-
-/** @type {Record<string, number>} */
-const glProfilingStats = {};
-
-/**
- * Wrap GL context functions to track profiling stats.
- * @param {WebGL2RenderingContext} glContext original context
- * @returns {WebGL2RenderingContext} wrapped context
- */
-function wrapGL(glContext) {
-  const keysToCatch = [
-    'createBuffer', 'deleteBuffer', 'bindBuffer', 'bufferData', 'bufferSubData',
-    'createTexture', 'deleteTexture', 'bindTexture', 'texImage2D', 'texSubImage2D', 'generateMipmap',
-    'createShader', 'deleteShader', 'shaderSource', 'compileShader',
-    'createProgram', 'deleteProgram', 'attachShader', 'linkProgram',
-    'createFramebuffer', 'deleteFramebuffer', 'bindFramebuffer', 'framebufferTexture2D',
-    'createRenderbuffer', 'deleteRenderbuffer', 'bindRenderbuffer', 'renderbufferStorage',
-    'createVertexArray', 'deleteVertexArray', 'bindVertexArray',
-    'readPixels', 'drawArrays', 'drawElements',
-  ];
-
-  const originals = {};
-
-  for (const key of keysToCatch) {
-    originals[key] = glContext[key];
-
-    glContext[key] = function () {
-      glProfilingStats[key] = (glProfilingStats[key] || 0) + 1;
-      return originals[key].apply(glContext, arguments);
-    };
-  }
-
-  return glContext;
-}
-
-class GLError extends Error {
-  /** @type {number} */
-  glError;
-
-  /** @type {string} */
-  glErrorName;
-
-  /** @type {string} */
-  operation;
-
-  constructor(message, glError, glErrorName, operation) {
-    super(message);
-    this.glError = glError;
-    this.glErrorName = glErrorName;
-    this.operation = operation;
-  }
-}
-
-/**
- * Update the default framebuffer clear color used for full-frame clears.
- */
-function initClear() {
-  if (GL.clear.value) {
-    gl.clearColor(1.0, 0.0, 1.0, 1.0); // CR: magenta clear color to easily identify unrendered areas
-  } else {
-    gl.clearColor(0.0, 0.0, 0.0, 1.0); // CR: opaque black clear color
-  }
-}
-
-/**
- * Initializes the WebGL context and sets up the default state.
- */
-function GL_Init() {
-  try {
-    const options = {
-      alpha: false,
-      preserveDrawingBuffer: true,
-    };
-
-    gl = /** @type {WebGL2RenderingContext} */ (VID.mainwindow.getContext('webgl2', options));
-  } catch (e) {
-    throw new Error(`Unable to initialize WebGL2. ${e.message}`);
-  }
-  if (!gl) {
-    throw new Error('Unable to initialize WebGL2. Your browser may not support it.');
-  }
-
-  GL.maxtexturesize = gl.getParameter(gl.MAX_TEXTURE_SIZE);
-
-  gl.cullFace(gl.FRONT);
-  gl.blendFuncSeparate(gl.SRC_ALPHA, gl.ONE_MINUS_SRC_ALPHA, gl.ONE, gl.ONE);
-
-  textureModes['GL_NEAREST'] = { min: gl.NEAREST, max: gl.NEAREST };
-  textureModes['GL_LINEAR'] = { min: gl.LINEAR, max: gl.LINEAR };
-  textureModes['GL_NEAREST_MIPMAP_NEAREST'] = { min: gl.NEAREST_MIPMAP_NEAREST, max: gl.NEAREST };
-  textureModes['GL_LINEAR_MIPMAP_NEAREST'] = { min: gl.LINEAR_MIPMAP_NEAREST, max: gl.LINEAR };
-  textureModes['GL_NEAREST_MIPMAP_LINEAR'] = { min: gl.NEAREST_MIPMAP_LINEAR, max: gl.NEAREST };
-  textureModes['GL_LINEAR_MIPMAP_LINEAR'] = { min: gl.LINEAR_MIPMAP_LINEAR, max: gl.LINEAR };
-
-  currentTextureMode = 'GL_LINEAR_MIPMAP_LINEAR';
-
-  GL.picmip = new Cvar('gl_picmip', '0');
-  GL.clear = new Cvar('gl_clear', '0', Cvar.FLAG.ARCHIVE, '1 = clear with magenta color, 0 = clear black');
-  Cmd.AddCommand('gl_texturemode', TextureModeCommand);
-  Cmd.AddCommand('gl_texturelist', TextureListCommand);
-
-  initClear();
-  eventBus.subscribe('cvar.changed.gl_clear', () => initClear());
-
-  GL.streamArray = new ArrayBuffer(8192);
-  GL.streamArrayBytes = new Uint8Array(GL.streamArray);
-  GL.streamArrayPosition = 0;
-  GL.streamArrayVertexCount = 0;
-  GL.streamArrayView = new DataView(GL.streamArray);
-  GL.streamBuffer = gl.createBuffer();
-  gl.bindBuffer(gl.ARRAY_BUFFER, GL.streamBuffer);
-  gl.bufferData(gl.ARRAY_BUFFER, GL.streamArray.byteLength, gl.DYNAMIC_DRAW);
-  GL.streamBufferPosition = 0;
-  missingPicTexture.upload((() => {
-    const l = 32;
-    const data = new Uint8Array(l * l * 4);
-    for (let i = 0; i < data.length; i += 4) {
-      const unevenRow = Math.floor(i / (l * 4)) % 2 === 1;
-      data[i] = ((unevenRow ? 1 : 0) + Math.floor(i / 4)) % 2 === 0 ? 255 : 0;
-      data[i + 1] = 0;
-      data[i + 2] = 0;
-      data[i + 3] = 255;
-    }
-    return data;
-  })());
-
-  if (profileGL) {
-    // wrap the context in a debug proxy to trap errors and do some profiling
-    gl = wrapGL(gl);
-
-    setInterval(() => {
-      const pairs = Object.entries(glProfilingStats);
-      pairs.sort((a, b) => b[1] - a[1]);
-
-      if (pairs.length > 0) {
-        console.info('GL Profiling Stats:');
-        for (const [key, value] of pairs) {
-          if (value === 0) {
-            continue;
-          }
-
-          console.info(`  ${key}: ${value}`);
-        }
-      }
-
-      for (const key in glProfilingStats) {
-        glProfilingStats[key] = 0;
-      }
-    }, 5000);
-  }
-
-  GL.gl = gl;
-  eventBus.publish('gl.ready', gl);
-};
-
-/**
- * Cleans up the WebGL context and releases resources.
- */
-function GL_Shutdown() {
-  for (const { program } of GL.programs) {
-    gl.deleteProgram(program);
-  }
-
-  currentTextureTargets.length = 0;
-  currentTextureTarget = null;
-
-  for (const texture of textureCache.values()) {
-    texture.free();
-  }
-
-  textureCache.clear();
-
-  GL.programs.length = 0;
-  GL.currentProgram = null;
-  GL.currentVAO = null;
-  savedDefaultAttribBits = 0;
-
-  gl = null;
-  eventBus.publish('gl.shutdown');
-};
-
-eventBus.subscribe('vid.ready', () => GL_Init());
-eventBus.subscribe('vid.shutdown', () => GL_Shutdown());
+export { default, ATTRIB_LOCATIONS, BRUSH_VERTEX_STRIDE, GLTexture, resampleTexture8 } from './GL.ts';
diff --git a/source/engine/client/GL.ts b/source/engine/client/GL.ts
new file mode 100644
index 00000000..395a0ad7
--- /dev/null
+++ b/source/engine/client/GL.ts
@@ -0,0 +1,1131 @@
+import Cmd, { ConsoleCommand } from '../common/Cmd.ts';
+import Cvar from '../common/Cvar.ts';
+import { MissingResourceError } from '../common/Errors.ts';
+import { WadLumpTexture } from '../common/W.ts';
+import { eventBus, getCommonRegistry } from '../registry.mjs';
+import VID from './VID.ts';
+
+interface TextureMode {
+  min: number;
+  max: number;
+}
+
+interface GLProgramAttrib {
+  name: string;
+  location: number;
+  type: number;
+  components: number;
+  normalized: boolean;
+  offset: number;
+}
+
+type GLProgramDynamicProperties = {
+  [key in `a${string}`]?: GLProgramAttrib;
+} & {
+  [key in `u${string}`]?: WebGLUniformLocation | null;
+} & {
+  [key in `t${string}`]?: number;
+};
+
+type GLProgramInfo = {
+  identifier: string;
+  program: WebGLProgram;
+  attribs: GLProgramAttrib[];
+  vertexSize: number;
+  attribBits: number;
+  uOrtho?: WebGLUniformLocation | null;
+} & GLProgramDynamicProperties;
+
+type GLProgramMutable = GLProgramInfo & Record<string, string | number | WebGLProgram | GLProgramAttrib[] | GLProgramAttrib | WebGLUniformLocation | null | undefined>;
+
+type ShaderSources = Record<string, string>;
+type TextureWrapMode = 'repeat' | 'clamp';
+
+let shaderSources: ShaderSources | null = null;
+
+try {
+  // Vite rewrites this at build time; raw Node.js leaves it undefined and falls back.
+  // @ts-ignore Vite-specific import.meta.glob
+  shaderSources = import.meta.glob('./shaders/*.{vert,frag}', {
+    eager: true,
+    import: 'default',
+    query: '?raw',
+  }) as ShaderSources;
+} catch {
+  shaderSources = null;
+}
+
+/**
+ *
+ */
+/**
+ * @param value value that must be present
+ * @param message error message when the value is null
+ * @returns value when it is non-null
+ */
+function requireValue<T>(value: T | null, message: string): T {
+  if (value === null) {
+    throw new Error(message);
+  }
+  return value;
+}
+
+class GL {
+  static programs: GLProgramInfo[] = [];
+  static currentProgram: GLProgramInfo | null = null;
+  static maxtexturesize = 0;
+  static picmip: Cvar = null!;
+  static clear: Cvar = null!;
+  static streamArray: ArrayBuffer = null!;
+  static streamArrayBytes: Uint8Array = null!;
+  static streamArrayPosition = 0;
+  static streamArrayVertexCount = 0;
+  static streamArrayView: DataView = null!;
+  static streamBuffer: WebGLBuffer = null!;
+  static streamBufferPosition = 0;
+  static gl: WebGL2RenderingContext = null!;
+  static identity = [1.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 1.0];
+  static currentVAO: WebGLVertexArrayObject | null = null;
+
+  /**
+   * Binds a 2D texture.
+   * @param {number} target texture target
+   * @param {WebGLTexture | null} texnum texture number
+   * @param {boolean} flushStream flush the stream before binding
+   * @deprecated
+   */
+  static Bind(target: number, texnum: WebGLTexture | null, flushStream = false): void {
+    if (currentTextureTargets[target] === texnum) {
+      return;
+    }
+
+    if (flushStream) {
+      GL.StreamFlush();
+    }
+
+    if (currentTextureTarget !== target) {
+      currentTextureTarget = target;
+      gl.activeTexture(gl.TEXTURE0 + target);
+    }
+
+    currentTextureTargets[target] = texnum;
+    gl.bindTexture(gl.TEXTURE_2D, texnum);
+  }
+
+  /**
+   * Binds a 3D texture. Invalidates the 2D texture cache for this unit.
+   * @param {number} target texture unit (0-31)
+   * @param {WebGLTexture} texnum texture handle
+   */
+  static Bind3D(target: number, texnum: WebGLTexture): void {
+    if (currentTextureTarget !== target) {
+      currentTextureTarget = target;
+      gl.activeTexture(gl.TEXTURE0 + target);
+    }
+
+    currentTextureTargets[target] = null;
+    gl.bindTexture(gl.TEXTURE_3D, texnum);
+  }
+
+  /**
+   * Binds a 2D array texture. Invalidates the 2D texture cache for this unit.
+   * @param {number} target texture unit (0-31)
+   * @param {WebGLTexture} texnum texture handle
+   */
+  static BindArray(target: number, texnum: WebGLTexture): void {
+    if (currentTextureTarget !== target) {
+      currentTextureTarget = target;
+      gl.activeTexture(gl.TEXTURE0 + target);
+    }
+
+    currentTextureTargets[target] = null;
+    gl.bindTexture(gl.TEXTURE_2D_ARRAY, texnum);
+  }
+
+  /**
+   * Binds a cube map texture. Invalidates the 2D texture cache for this unit.
+   * @param {number} target texture unit (0-31)
+   * @param {WebGLTexture} texnum texture handle
+   */
+  static BindCube(target: number, texnum: WebGLTexture): void {
+    if (currentTextureTarget !== target) {
+      currentTextureTarget = target;
+      gl.activeTexture(gl.TEXTURE0 + target);
+    }
+
+    currentTextureTargets[target] = null;
+    gl.bindTexture(gl.TEXTURE_CUBE_MAP, texnum);
+  }
+
+  static Set2D(): void {
+    gl.viewport(0, 0, Math.floor(VID.width * VID.pixelRatio), Math.floor(VID.height * VID.pixelRatio));
+    GL.UnbindProgram();
+
+    for (const { program, uOrtho } of GL.programs) {
+      if (!uOrtho) {
+        continue;
+      }
+
+      gl.useProgram(program);
+      gl.uniformMatrix4fv(uOrtho, false, ortho);
+    }
+
+    gl.disable(gl.DEPTH_TEST);
+    gl.enable(gl.BLEND);
+  }
+
+  /**
+   * Creates a shader program.
+   * @param {string} identifier unique program identifier
+   * @param {string[]} uniforms uniform names
+   * @param {Array<[string, number, number, boolean?]>} attribs attribute parameters
+   * @param {string[]} textures texture names
+   * @returns {GLProgramInfo} the program object
+   */
+  static CreateProgram(identifier: string, uniforms: string[], attribs: Array<[string, number, number, boolean?]>, textures: string[]): GLProgramInfo {
+    const p = requireValue(gl.createProgram(), 'Failed to create WebGL program');
+    const program = {
+      identifier,
+      program: p,
+      attribs: [],
+      vertexSize: 0,
+      attribBits: 0,
+    } as GLProgramMutable;
+
+    if (shaderSources === null) {
+      throw new Error('Shader sources are unavailable in this runtime');
+    }
+
+    const vertexShaderPath = `./shaders/${identifier}.vert`;
+    const fragmentShaderPath = `./shaders/${identifier}.frag`;
+    const vsource = shaderSources[vertexShaderPath];
+    const fsource = shaderSources[fragmentShaderPath];
+
+    if (vsource === undefined || fsource === undefined) {
+      const missingResources: string[] = [];
+
+      if (vsource === undefined) {
+        missingResources.push(vertexShaderPath);
+      }
+      if (fsource === undefined) {
+        missingResources.push(fragmentShaderPath);
+      }
+
+      throw new MissingResourceError(
+        `${missingResources.join(', ')}. If these shader files were added while the dev session was already running, restart the active Vite build/watch process so import.meta.glob rebuilds the shader manifest.`,
+      );
+    }
+
+    const vsh = requireValue(gl.createShader(gl.VERTEX_SHADER), 'Failed to create vertex shader');
+    gl.shaderSource(vsh, vsource);
+    gl.compileShader(vsh);
+    if (gl.getShaderParameter(vsh, gl.COMPILE_STATUS) !== true) {
+      throw new Error('Error compiling shader: ' + gl.getShaderInfoLog(vsh));
+    }
+
+    const fsh = requireValue(gl.createShader(gl.FRAGMENT_SHADER), 'Failed to create fragment shader');
+    gl.shaderSource(fsh, fsource);
+    gl.compileShader(fsh);
+    if (gl.getShaderParameter(fsh, gl.COMPILE_STATUS) !== true) {
+      throw new Error('Error compiling shader: ' + gl.getShaderInfoLog(fsh));
+    }
+
+    gl.attachShader(p, vsh);
+    gl.attachShader(p, fsh);
+
+    // Bind standard attribute locations before linking so VAOs work across programs
+    for (const [name] of attribs) {
+      if (name in ATTRIB_LOCATIONS) {
+        gl.bindAttribLocation(p, ATTRIB_LOCATIONS[name as keyof typeof ATTRIB_LOCATIONS], name);
+      }
+    }
+
+    gl.linkProgram(p);
+    if (gl.getProgramParameter(p, gl.LINK_STATUS) !== true) {
+      throw new Error('Error linking program: ' + gl.getProgramInfoLog(p));
+    }
+
+    gl.useProgram(p);
+
+    for (const uniformName of uniforms) {
+      program[uniformName] = gl.getUniformLocation(p, uniformName);
+    }
+
+    for (const attribParameters of attribs) {
+      const location = gl.getAttribLocation(p, attribParameters[0]);
+      console.assert(location !== -1, 'vertex shader attribute must exist and be used!', attribParameters[0]);
+      const attrib: GLProgramAttrib = {
+        name: attribParameters[0],
+        location,
+        type: attribParameters[1],
+        components: attribParameters[2],
+        normalized: attribParameters[3] === true,
+        offset: program.vertexSize,
+      };
+      program.attribs.push(attrib);
+      program[attrib.name] = attrib;
+      if (attrib.type === gl.FLOAT) {
+        program.vertexSize += attrib.components * 4;
+      } else if (attrib.type === gl.BYTE || attrib.type === gl.UNSIGNED_BYTE) {
+        program.vertexSize += 4;
+      } else {
+        throw new Error('Unknown vertex attribute type');
+      }
+      program.attribBits |= 1 << attrib.location;
+    }
+
+    for (let i = 0; i < textures.length; i++) {
+      const textureName = textures[i];
+      program[textureName] = i;
+      gl.uniform1i(gl.getUniformLocation(p, textureName), i);
+    }
+
+    GL.programs.push(program);
+    return program;
+  }
+
+  /**
+   * Uses a shader program.
+   * @param {string} identifier program identifier
+   * @param {boolean} flushStream flush stream before using
+   * @returns {GLProgramInfo | null} the program object
+   */
+  static UseProgram(identifier: string, flushStream = false): GLProgramInfo | null {
+    const currentProgram = GL.currentProgram;
+    if (currentProgram !== null) {
+      if (currentProgram.identifier === identifier) {
+        return currentProgram;
+      }
+      if (flushStream) {
+        GL.StreamFlush();
+      }
+    }
+
+    const program = GL.programs.find((candidate) => candidate.identifier === identifier) ?? null;
+
+    if (program === null) {
+      return null;
+    }
+
+    GL.currentProgram = program;
+    gl.useProgram(program.program);
+
+    // When a model VAO is bound, it manages attribute state — skip enables
+    if (GL.currentVAO !== null) {
+      return program;
+    }
+
+    let enableAttribs = program.attribBits;
+    let disableAttribs = 0;
+    if (currentProgram !== null) {
+      enableAttribs &= ~currentProgram.attribBits;
+      disableAttribs = currentProgram.attribBits & ~program.attribBits;
+    }
+    for (let attrib = 0; enableAttribs !== 0 || disableAttribs !== 0; attrib++) {
+      const mask = 1 << attrib;
+      if ((enableAttribs & mask) !== 0) {
+        gl.enableVertexAttribArray(attrib);
+      } else if ((disableAttribs & mask) !== 0) {
+        gl.disableVertexAttribArray(attrib);
+      }
+      enableAttribs &= ~mask;
+      disableAttribs &= ~mask;
+    }
+
+    return program;
+  }
+
+  static UnbindProgram(): void {
+    if (GL.currentProgram === null) {
+      return;
+    }
+    GL.StreamFlush();
+    if (GL.currentVAO !== null) {
+      GL.UnbindVAO();
+    }
+    for (const attrib of GL.currentProgram.attribs) {
+      gl.disableVertexAttribArray(attrib.location);
+    }
+    GL.currentProgram = null;
+  }
+
+  /**
+   * Checks for WebGL errors.
+   * @param {string} operation operation description
+   * @throws {GLError} if an error occurred
+   */
+  static CheckError(operation = 'WebGL operation'): void {
+    const error = gl.getError();
+
+    if (error !== gl.NO_ERROR) {
+      const errorNames: Record<number, string> = {
+        [gl.INVALID_ENUM]: 'GL_INVALID_ENUM',
+        [gl.INVALID_VALUE]: 'GL_INVALID_VALUE',
+        [gl.INVALID_OPERATION]: 'GL_INVALID_OPERATION',
+        [gl.INVALID_FRAMEBUFFER_OPERATION]: 'GL_INVALID_FRAMEBUFFER_OPERATION',
+        [gl.OUT_OF_MEMORY]: 'GL_OUT_OF_MEMORY',
+        [gl.CONTEXT_LOST_WEBGL]: 'CONTEXT_LOST_WEBGL',
+      };
+
+      const errorName = errorNames[error] ?? `Unknown error (${error})`;
+      const message = `WebGL Error: ${errorName} during ${operation}`;
+
+      throw new GLError(message, error, errorName, operation);
+    }
+  }
+
+  static StreamFlush(): void {
+    if (GL.streamArrayVertexCount === 0) {
+      return;
+    }
+    const program = GL.currentProgram;
+    if (program !== null) {
+      gl.bindBuffer(gl.ARRAY_BUFFER, GL.streamBuffer);
+      gl.bufferSubData(gl.ARRAY_BUFFER, GL.streamBufferPosition,
+        GL.streamArrayBytes.subarray(0, GL.streamArrayPosition));
+      for (const attrib of program.attribs) {
+        gl.vertexAttribPointer(attrib.location,
+          attrib.components, attrib.type, attrib.normalized,
+          program.vertexSize, GL.streamBufferPosition + attrib.offset);
+      }
+      gl.drawArrays(gl.TRIANGLES, 0, GL.streamArrayVertexCount);
+      GL.streamBufferPosition += GL.streamArrayPosition;
+    }
+    GL.streamArrayPosition = 0;
+    GL.streamArrayVertexCount = 0;
+  }
+
+  static StreamGetSpace(vertexCount: number): void {
+    const program = GL.currentProgram;
+    if (program === null) {
+      return;
+    }
+    const length = vertexCount * program.vertexSize;
+    if ((GL.streamBufferPosition + GL.streamArrayPosition + length) > GL.streamArray.byteLength) {
+      GL.StreamFlush();
+      GL.streamBufferPosition = 0;
+    }
+    GL.streamArrayVertexCount += vertexCount;
+  }
+
+  static StreamWriteFloat(x: number): void {
+    GL.streamArrayView.setFloat32(GL.streamArrayPosition, x, true);
+    GL.streamArrayPosition += 4;
+  }
+
+  static StreamWriteFloat2(x: number, y: number): void {
+    const view = GL.streamArrayView;
+    const position = GL.streamArrayPosition;
+    view.setFloat32(position, x, true);
+    view.setFloat32(position + 4, y, true);
+    GL.streamArrayPosition += 8;
+  }
+
+  static StreamWriteFloat3(x: number, y: number, z: number): void {
+    const view = GL.streamArrayView;
+    const position = GL.streamArrayPosition;
+    view.setFloat32(position, x, true);
+    view.setFloat32(position + 4, y, true);
+    view.setFloat32(position + 8, z, true);
+    GL.streamArrayPosition += 12;
+  }
+
+  static StreamWriteFloat4(x: number, y: number, z: number, w: number): void {
+    const view = GL.streamArrayView;
+    const position = GL.streamArrayPosition;
+    view.setFloat32(position, x, true);
+    view.setFloat32(position + 4, y, true);
+    view.setFloat32(position + 8, z, true);
+    view.setFloat32(position + 12, w, true);
+    GL.streamArrayPosition += 16;
+  }
+
+  static StreamWriteUByte4(x: number, y: number, z: number, w: number): void {
+    const view = GL.streamArrayView;
+    const position = GL.streamArrayPosition;
+    view.setUint8(position, x);
+    view.setUint8(position + 1, y);
+    view.setUint8(position + 2, z);
+    view.setUint8(position + 3, w);
+    GL.streamArrayPosition += 4;
+  }
+
+  static StreamDrawTexturedQuad(x: number, y: number, w: number, h: number, u: number, v: number, u2: number, v2: number): void {
+    const x2 = x + w;
+    const y2 = y + h;
+    GL.StreamGetSpace(6);
+    GL.StreamWriteFloat4(x, y, u, v);
+    GL.StreamWriteFloat4(x, y2, u, v2);
+    GL.StreamWriteFloat4(x2, y, u2, v);
+    GL.StreamWriteFloat4(x2, y, u2, v);
+    GL.StreamWriteFloat4(x, y2, u, v2);
+    GL.StreamWriteFloat4(x2, y2, u2, v2);
+  }
+
+  static StreamDrawColoredQuad(x: number, y: number, w: number, h: number, r: number, g: number, b: number, a: number): void {
+    const x2 = x + w;
+    const y2 = y + h;
+    GL.StreamGetSpace(6);
+    GL.StreamWriteFloat2(x, y);
+    GL.StreamWriteUByte4(r, g, b, a);
+    GL.StreamWriteFloat2(x, y2);
+    GL.StreamWriteUByte4(r, g, b, a);
+    GL.StreamWriteFloat2(x2, y);
+    GL.StreamWriteUByte4(r, g, b, a);
+    GL.StreamWriteFloat2(x2, y);
+    GL.StreamWriteUByte4(r, g, b, a);
+    GL.StreamWriteFloat2(x, y2);
+    GL.StreamWriteUByte4(r, g, b, a);
+    GL.StreamWriteFloat2(x2, y2);
+    GL.StreamWriteUByte4(r, g, b, a);
+  }
+
+  /**
+   * Bind a model VAO for static geometry rendering.
+   * Flushes the stream buffer and skips attribute management in UseProgram.
+   * @param {WebGLVertexArrayObject} vao the VAO to bind
+   */
+  static BindVAO(vao: WebGLVertexArrayObject): void {
+    GL.StreamFlush();
+    savedDefaultAttribBits = GL.currentProgram !== null ? GL.currentProgram.attribBits : 0;
+    gl.bindVertexArray(vao);
+    GL.currentVAO = vao;
+  }
+
+  /**
+   * Unbind the model VAO, returning to the default VAO for stream rendering.
+   * Disables stale attributes on the default VAO and invalidates the current
+   * program so the next UseProgram re-enables only the attributes it needs.
+   */
+  static UnbindVAO(): void {
+    gl.bindVertexArray(null);
+    GL.currentVAO = null;
+    GL.currentProgram = null;
+    // Disable attributes that were enabled on the default VAO before the
+    // model VAO was bound, preventing "no buffer bound" errors on drawArrays.
+    for (let bits = savedDefaultAttribBits, i = 0; bits !== 0; i++, bits >>>= 1) {
+      if ((bits & 1) !== 0) {
+        gl.disableVertexAttribArray(i);
+      }
+    }
+    savedDefaultAttribBits = 0;
+  }
+
+  /**
+   * Create a VAO for a static VBO with the given vertex attribute layout.
+   * The VAO captures the VBO binding, attribute pointer state, and optionally an IBO.
+   * @param {WebGLBuffer} vbo the VBO to bind in the VAO
+   * @param {Array<{location: number, components: number, type: number, normalized: boolean, stride: number, offset: number}>} attributes attribute descriptors
+   * @param {WebGLBuffer} [ibo] optional index buffer to bind in the VAO
+   * @returns {WebGLVertexArrayObject} the created VAO
+   */
+  static CreateVAO(vbo: WebGLBuffer, attributes: Array<{location: number; components: number; type: number; normalized: boolean; stride: number; offset: number}>, ibo?: WebGLBuffer): WebGLVertexArrayObject {
+    const vao = requireValue(gl.createVertexArray(), 'Failed to create vertex array object');
+    gl.bindVertexArray(vao);
+    gl.bindBuffer(gl.ARRAY_BUFFER, vbo);
+    for (const attr of attributes) {
+      gl.enableVertexAttribArray(attr.location);
+      gl.vertexAttribPointer(attr.location, attr.components, attr.type, attr.normalized, attr.stride, attr.offset);
+    }
+    if (ibo) {
+      gl.bindBuffer(gl.ELEMENT_ARRAY_BUFFER, ibo);
+    }
+    gl.bindVertexArray(null);
+    return vao;
+  }
+}
+
+export default GL;
+
+let { COM, Con } = getCommonRegistry();
+
+eventBus.subscribe('registry.frozen', () => {
+  ({ COM, Con } = getCommonRegistry());
+});
+
+let gl: WebGL2RenderingContext = null!;
+
+const textureModes: Record<string, TextureMode> = {};
+let currentTextureMode = 'GL_LINEAR_MIPMAP_LINEAR';
+
+/**
+ * Standard vertex attribute locations used across all shader programs.
+ * Consistent locations enable VAO reuse across different programs that
+ * share the same VBO layout (e.g., brush opaque, turbulent, fog-volume).
+ */
+export const ATTRIB_LOCATIONS = {
+  aPosition: 0,
+  aOrigin: 0, // particle (same slot as aPosition)
+  aTexCoord: 1,
+  aCoord: 1, // particle (same slot as aTexCoord)
+  aLightStyle: 2,
+  aScale: 2, // particle (same slot as aLightStyle)
+  aNormal: 3,
+  aTangent: 4,
+  aColor: 5,
+  aPositionA: 6,
+  aPositionB: 7,
+  aNormalA: 8,
+  aNormalB: 9,
+} as const;
+
+export const BRUSH_VERTEX_STRIDE = 80;
+
+const ortho = [
+  0.0, 0.0, 0.0, 0.0,
+  0.0, 0.0, 0.0, 0.0,
+  0.0, 0.0, -1.0, 0.0,
+  -1.0, 1.0, 0.0, 1.0,
+];
+
+// recalculate the ortho matrix when the video size changes
+eventBus.subscribe('vid.resize', ({ width, height }: { width: number; height: number }) => {
+  ortho[0] = 2.0 / width;
+  ortho[5] = -2.0 / height;
+});
+
+const textureCache = new Map<string, GLTexture>();
+
+class TextureListCommand extends ConsoleCommand {
+  override run(): void {
+    for (const [identifier, texture] of textureCache.entries()) {
+      if (!texture.ready) {
+        Con.Print(`${identifier} - NOT ready\n`);
+        continue;
+      }
+
+      Con.Print(`${identifier} (${texture.width} x ${texture.height})\n`);
+    }
+  }
+}
+
+const currentTextureTargets: Array<WebGLTexture | null> = [];
+let currentTextureTarget: number | null = null;
+let savedDefaultAttribBits = 0;
+
+export class GLTexture {
+  identifier = '';
+  width = 0;
+  height = 0;
+  #texnum: WebGLTexture | null = null;
+  #textureMode = '';
+  #textureModeListener: (() => void) | null = null;
+  #textureWrap: TextureWrapMode = 'repeat';
+
+  /**
+   * @deprecated
+   * @returns {WebGLTexture | null} texture handle
+   */
+  get texnum(): WebGLTexture | null {
+    return this.#texnum;
+  }
+
+  get ready(): boolean {
+    return this.#texnum !== null;
+  }
+
+  /**
+   * @param {string} identifier unique name of the texture
+   * @param {number} width width
+   * @param {number} height height
+   * @param {Uint8Array | ImageBitmap | null} data optional texture data in RGBA format
+   */
+  constructor(identifier: string, width: number, height: number, data: Uint8Array | ImageBitmap | null = null) {
+    this.identifier = identifier;
+    this.width = width;
+    this.height = height;
+    this.#textureMode = currentTextureMode;
+
+    console.assert(this.width > 0 && this.height > 0, 'Texture width and height must be greater than zero');
+    console.assert(textureCache.has(identifier) === false, 'Texture must not already exist in the cache');
+
+    textureCache.set(identifier, this);
+
+    if (data !== null) {
+      this.upload(data);
+    }
+
+    this.#textureModeListener = eventBus.subscribe('gl.texturemode', (name: string) => {
+      if (this.#textureMode !== name) {
+        this._setTextureMode(name);
+      }
+    });
+  }
+
+  /**
+   * Allocates a new texture or returns an existing one from the cache.
+   * @param {string} identifier unique name of the texture
+   * @param {number} width width
+   * @param {number} height height
+   * @param {Uint8Array | ImageBitmap | null} data optional texture data in RGBA format or as ImageBitmap
+   * @returns {GLTexture} texture instance
+   */
+  static Allocate(identifier: string, width: number, height: number, data: Uint8Array | ImageBitmap | null = null): GLTexture {
+    const cachedTexture = textureCache.get(identifier);
+    if (cachedTexture !== undefined) {
+      console.assert((width === 1 || cachedTexture.width === width) && (height === 1 || cachedTexture.height === height), 'Texture dimensions must match'); // 1x1 textures are allowed to be resized, they are coming from deferred loading
+      return cachedTexture;
+    }
+
+    return new GLTexture(identifier, width, height, data);
+  }
+
+  /**
+   * Returns an existing texture from the cache.
+   * @param {string} identifier unique name of the texture
+   * @param {number} width width
+   * @param {number} height height
+   * @returns {GLTexture | null} texture instance
+   */
+  static FromCache(identifier: string, width: number, height: number): GLTexture | null {
+    const texture = textureCache.get(identifier);
+    if (texture === undefined) {
+      return null;
+    }
+
+    console.assert(texture.width === width && texture.height === height, 'Texture dimensions must match');
+
+    return texture;
+  }
+
+  /**
+   * Allocates a new texture from a lump or returns an existing one from the cache.
+   * @param {WadLumpTexture} lump lump containing texture data
+   * @returns {GLTexture} texture instance
+   */
+  static FromLumpTexture(lump: WadLumpTexture): GLTexture {
+    return this.Allocate(lump.name, lump.width, lump.height, lump.data);
+  }
+
+  /**
+   * Allocates a new texture from an image file or returns an existing one from the cache.
+   * @param {string} filename filename an any image
+   * @param {boolean} ignoreMissing whether to ignore missing files
+   * @returns {Promise<GLTexture | null>} texture instance
+   */
+  static async FromImageFile(filename: string, ignoreMissing = false): Promise<GLTexture | null> {
+    // shortcut if the texture is already cached, ignore texture dimensions check
+    const cachedTexture = textureCache.get(filename);
+    if (cachedTexture !== undefined) {
+      return cachedTexture;
+    }
+
+    const data = await COM.LoadFile(filename);
+
+    if (data === null) {
+      if (ignoreMissing) {
+        return null;
+      }
+
+      throw new MissingResourceError(filename);
+    }
+
+    const image = await createImageBitmap(new Blob([data]));
+
+    return this.Allocate(filename, image.width, image.height, image);
+  }
+
+  /**
+   * @protected
+   * @param {string} name texture mode
+   */
+  _setTextureMode(name: string): void {
+    this.#textureMode = name;
+
+    if (!this.ready) {
+      return;
+    }
+
+    const mode = textureModes[this.#textureMode];
+    console.assert(mode !== undefined, 'Valid texture mode required');
+    const { min, max } = mode;
+    this.bind(0);
+    gl.texParameterf(gl.TEXTURE_2D, gl.TEXTURE_MIN_FILTER, min);
+    gl.texParameterf(gl.TEXTURE_2D, gl.TEXTURE_MAG_FILTER, max);
+
+    switch (this.#textureWrap) {
+      case 'clamp':
+        gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_WRAP_S, gl.CLAMP_TO_EDGE);
+        gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_WRAP_T, gl.CLAMP_TO_EDGE);
+        break;
+
+      case 'repeat':
+        gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_WRAP_S, gl.REPEAT);
+        gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_WRAP_T, gl.REPEAT);
+        break;
+    }
+  }
+
+  /**
+   * Will lock the texture mode to the specified name.
+   * Changes to gl_texturemode will no longer change this texture’s mode.
+   * @param {string} name texture mode name
+   * @returns {GLTexture} this
+   */
+  lockTextureMode(name: string): GLTexture {
+    console.assert(textureModes[name] !== undefined, 'Valid texture mode required');
+
+    if (this.#textureModeListener !== null) {
+      this.#textureModeListener();
+      this.#textureModeListener = null;
+    }
+
+    if (this.#textureMode !== name) {
+      this._setTextureMode(name);
+    }
+
+    return this;
+  }
+
+  wrapClamped(): GLTexture {
+    this.#textureWrap = 'clamp';
+
+    if (this.ready) {
+      this._setTextureMode(this.#textureMode);
+    }
+
+    return this;
+  }
+
+  wrapRepeat(): GLTexture {
+    this.#textureWrap = 'repeat';
+
+    if (this.ready) {
+      this._setTextureMode(this.#textureMode);
+    }
+
+    return this;
+  }
+
+  resize(width: number, height: number): GLTexture {
+    console.assert(width > 0 && height > 0, 'Texture width and height must be greater than zero');
+
+    this.width = width;
+    this.height = height;
+
+    this.upload(null);
+
+    return this;
+  }
+
+  /**
+   * Binds the texture.
+   * @param {number} target texture target (0-31)
+   * @param {boolean} flushStream flush the stream before binding
+   * @returns {GLTexture} this
+   */
+  bind(target = 0, flushStream = false): GLTexture {
+    if (!this.ready) {
+      missingPicTexture.bind(target, flushStream);
+      return this;
+    }
+
+    if (currentTextureTargets[target] === this.#texnum) {
+      // already bound
+      return this;
+    }
+
+    if (flushStream) {
+      GL.StreamFlush();
+    }
+
+    if (currentTextureTarget !== target) {
+      currentTextureTarget = target;
+      gl.activeTexture(gl.TEXTURE0 + target);
+    }
+
+    currentTextureTargets[target] = this.#texnum;
+    gl.bindTexture(gl.TEXTURE_2D, this.#texnum);
+
+    return this;
+  }
+
+  /**
+   * Uploads texture data.
+   * @param {Uint8Array | ImageBitmap | null} data texture data in RGBA format or as ImageBitmap
+   * @returns {GLTexture} this
+   */
+  upload(data: Uint8Array | ImageBitmap | null): GLTexture {
+    if (this.#texnum === null) {
+      this.#texnum = requireValue(gl.createTexture(), 'Failed to create WebGL texture');
+    }
+
+    this.bind(0);
+
+    if (data instanceof ImageBitmap) {
+      this.width = data.width;
+      this.height = data.height;
+      gl.texImage2D(gl.TEXTURE_2D, 0, gl.RGBA8, gl.RGBA, gl.UNSIGNED_BYTE, data);
+      gl.generateMipmap(gl.TEXTURE_2D);
+      GL.CheckError();
+    } else if (data instanceof Uint8Array) {
+      console.assert(data.length === this.width * this.height * 4, 'Texture data length must match width and height');
+
+      gl.texImage2D(gl.TEXTURE_2D, 0, gl.RGBA8, this.width, this.height, 0, gl.RGBA, gl.UNSIGNED_BYTE, data);
+      gl.generateMipmap(gl.TEXTURE_2D);
+      GL.CheckError();
+    } else if (data === null) {
+      gl.texImage2D(gl.TEXTURE_2D, 0, gl.RGBA8, this.width, this.height, 0, gl.RGBA, gl.UNSIGNED_BYTE, null);
+    }
+
+    this._setTextureMode(this.#textureMode);
+
+    eventBus.publish('gl.texture.ready', this.identifier);
+
+    return this;
+  }
+
+  free(): void {
+    if (this.#textureModeListener !== null) {
+      this.#textureModeListener();
+      this.#textureModeListener = null;
+    }
+
+    if (this.#texnum !== null) {
+      gl.deleteTexture(this.#texnum);
+      this.#texnum = null;
+    }
+
+    textureCache.delete(this.identifier);
+  }
+
+  [Symbol.dispose](): void {
+    this.free();
+  }
+
+  toString(): string {
+    return `${this.identifier} (${this.width} x ${this.height}, ${this.ready ? 'ready' : 'not ready'})`;
+  }
+}
+
+const missingPicTexture = GLTexture.Allocate('gl_missingpic', 32, 32);
+
+class TextureModeCommand extends ConsoleCommand {
+  override run(name?: string): void {
+    console.assert(currentTextureMode !== null, 'GL.TextureMode_f: currentTextureMode must be set');
+
+    if (name === undefined) {
+      Con.Print('Current texture mode: ' + currentTextureMode + '\n');
+      return;
+    }
+
+    const uppercaseName = name.toUpperCase();
+
+    if (textureModes[uppercaseName] === undefined) {
+      Con.Print('Unknown texture mode: ' + uppercaseName + '\n');
+      return;
+    }
+
+    currentTextureMode = uppercaseName;
+
+    const { min, max } = textureModes[currentTextureMode];
+
+    eventBus.publish('gl.texturemode', uppercaseName, { min, max });
+
+    Con.Print('Texture mode set to: ' + uppercaseName + '\n');
+  }
+}
+
+/**
+ * @param {Uint8Array} data 8-bit texture data
+ * @param {number} inwidth source texture width
+ * @param {number} inheight source texture height
+ * @param {number} outwidth target texture width
+ * @param {number} outheight target texture height
+ * @returns {Uint8Array} resampled texture data
+ */
+export function resampleTexture8(data: Uint8Array, inwidth: number, inheight: number, outwidth: number, outheight: number): Uint8Array {
+  const outdata = new ArrayBuffer(outwidth * outheight);
+  const out = new Uint8Array(outdata);
+  const xstep = inwidth / outwidth;
+  const ystep = inheight / outheight;
+  let src = 0;
+  let dest = 0;
+  for (let i = 0; i < outheight; i++) {
+    src = Math.floor(i * ystep) * inwidth;
+    for (let j = 0; j < outwidth; j++) {
+      out[dest + j] = data[src + Math.floor(j * xstep)];
+    }
+    dest += outwidth;
+  }
+  return out;
+}
+
+/** Turn this on to enable GL profiling, must be configured at compile-time */
+const profileGL = false;
+
+const glProfilingStats: Record<string, number> = {};
+
+/**
+ * Wrap GL context functions to track profiling stats.
+ * @param {WebGL2RenderingContext} glContext original context
+ * @returns {WebGL2RenderingContext} wrapped context
+ */
+function wrapGL(glContext: WebGL2RenderingContext): WebGL2RenderingContext {
+  const keysToCatch = [
+    'createBuffer', 'deleteBuffer', 'bindBuffer', 'bufferData', 'bufferSubData',
+    'createTexture', 'deleteTexture', 'bindTexture', 'texImage2D', 'texSubImage2D', 'generateMipmap',
+    'createShader', 'deleteShader', 'shaderSource', 'compileShader',
+    'createProgram', 'deleteProgram', 'attachShader', 'linkProgram',
+    'createFramebuffer', 'deleteFramebuffer', 'bindFramebuffer', 'framebufferTexture2D',
+    'createRenderbuffer', 'deleteRenderbuffer', 'bindRenderbuffer', 'renderbufferStorage',
+    'createVertexArray', 'deleteVertexArray', 'bindVertexArray',
+    'readPixels', 'drawArrays', 'drawElements',
+  ] as const;
+
+  for (const key of keysToCatch) {
+    const original = glContext[key].bind(glContext);
+
+    // @ts-expect-error dynamic WebGL method instrumentation
+    glContext[key] = (...args: Array<number | object | null | undefined>) => {
+      glProfilingStats[key] = (glProfilingStats[key] || 0) + 1;
+      return original(...args);
+    };
+  }
+
+  return glContext;
+}
+
+class GLError extends Error {
+  glError: number;
+  glErrorName: string;
+  operation: string;
+
+  constructor(message: string, glError: number, glErrorName: string, operation: string) {
+    super(message);
+    this.glError = glError;
+    this.glErrorName = glErrorName;
+    this.operation = operation;
+  }
+}
+
+/**
+ * Update the default framebuffer clear color used for full-frame clears.
+ */
+function initClear(): void {
+  if (GL.clear.value) {
+    gl.clearColor(1.0, 0.0, 1.0, 1.0); // CR: magenta clear color to easily identify unrendered areas
+  } else {
+    gl.clearColor(0.0, 0.0, 0.0, 1.0); // CR: opaque black clear color
+  }
+}
+
+/**
+ * Initializes the WebGL context and sets up the default state.
+ */
+function GL_Init(): void {
+  try {
+    const options: WebGLContextAttributes = {
+      alpha: false,
+      preserveDrawingBuffer: true,
+    };
+
+    gl = requireValue(VID.mainwindow.getContext('webgl2', options) as WebGL2RenderingContext | null, 'Unable to initialize WebGL2. Your browser may not support it.');
+  } catch (error) {
+    if (error instanceof Error) {
+      throw new Error(`Unable to initialize WebGL2. ${error.message}`);
+    }
+    throw new Error('Unable to initialize WebGL2.');
+  }
+
+  GL.maxtexturesize = gl.getParameter(gl.MAX_TEXTURE_SIZE);
+
+  gl.cullFace(gl.FRONT);
+  gl.blendFuncSeparate(gl.SRC_ALPHA, gl.ONE_MINUS_SRC_ALPHA, gl.ONE, gl.ONE);
+
+  textureModes['GL_NEAREST'] = { min: gl.NEAREST, max: gl.NEAREST };
+  textureModes['GL_LINEAR'] = { min: gl.LINEAR, max: gl.LINEAR };
+  textureModes['GL_NEAREST_MIPMAP_NEAREST'] = { min: gl.NEAREST_MIPMAP_NEAREST, max: gl.NEAREST };
+  textureModes['GL_LINEAR_MIPMAP_NEAREST'] = { min: gl.LINEAR_MIPMAP_NEAREST, max: gl.LINEAR };
+  textureModes['GL_NEAREST_MIPMAP_LINEAR'] = { min: gl.NEAREST_MIPMAP_LINEAR, max: gl.NEAREST };
+  textureModes['GL_LINEAR_MIPMAP_LINEAR'] = { min: gl.LINEAR_MIPMAP_LINEAR, max: gl.LINEAR };
+
+  currentTextureMode = 'GL_LINEAR_MIPMAP_LINEAR';
+
+  GL.picmip = new Cvar('gl_picmip', '0');
+  GL.clear = new Cvar('gl_clear', '0', Cvar.FLAG.ARCHIVE, '1 = clear with magenta color, 0 = clear black');
+  Cmd.AddCommand('gl_texturemode', TextureModeCommand);
+  Cmd.AddCommand('gl_texturelist', TextureListCommand);
+
+  initClear();
+  eventBus.subscribe('cvar.changed.gl_clear', () => initClear());
+
+  GL.streamArray = new ArrayBuffer(8192);
+  GL.streamArrayBytes = new Uint8Array(GL.streamArray);
+  GL.streamArrayPosition = 0;
+  GL.streamArrayVertexCount = 0;
+  GL.streamArrayView = new DataView(GL.streamArray);
+  GL.streamBuffer = requireValue(gl.createBuffer(), 'Failed to create stream vertex buffer');
+  gl.bindBuffer(gl.ARRAY_BUFFER, GL.streamBuffer);
+  gl.bufferData(gl.ARRAY_BUFFER, GL.streamArray.byteLength, gl.DYNAMIC_DRAW);
+  GL.streamBufferPosition = 0;
+  missingPicTexture.upload((() => {
+    const l = 32;
+    const data = new Uint8Array(l * l * 4);
+    for (let i = 0; i < data.length; i += 4) {
+      const unevenRow = Math.floor(i / (l * 4)) % 2 === 1;
+      data[i] = ((unevenRow ? 1 : 0) + Math.floor(i / 4)) % 2 === 0 ? 255 : 0;
+      data[i + 1] = 0;
+      data[i + 2] = 0;
+      data[i + 3] = 255;
+    }
+    return data;
+  })());
+
+  if (profileGL) {
+    // wrap the context in a debug proxy to trap errors and do some profiling
+    gl = wrapGL(gl);
+
+    setInterval(() => {
+      const pairs = Object.entries(glProfilingStats);
+      pairs.sort((a, b) => b[1] - a[1]);
+
+      if (pairs.length > 0) {
+        console.info('GL Profiling Stats:');
+        for (const [key, value] of pairs) {
+          if (value === 0) {
+            continue;
+          }
+
+          console.info(`  ${key}: ${value}`);
+        }
+      }
+
+      for (const key in glProfilingStats) {
+        glProfilingStats[key] = 0;
+      }
+    }, 5000);
+  }
+
+  GL.gl = gl;
+  eventBus.publish('gl.ready', gl);
+}
+
+/**
+ * Cleans up the WebGL context and releases resources.
+ */
+function GL_Shutdown(): void {
+  for (const { program } of GL.programs) {
+    gl.deleteProgram(program);
+  }
+
+  currentTextureTargets.length = 0;
+  currentTextureTarget = null;
+
+  for (const texture of textureCache.values()) {
+    texture.free();
+  }
+
+  textureCache.clear();
+
+  GL.programs.length = 0;
+  GL.currentProgram = null;
+  GL.currentVAO = null;
+  savedDefaultAttribBits = 0;
+  GL.gl = null!;
+  gl = null!;
+  eventBus.publish('gl.shutdown');
+}
+
+eventBus.subscribe('vid.ready', () => GL_Init());
+eventBus.subscribe('vid.shutdown', () => GL_Shutdown());
diff --git a/source/engine/client/Menu.ts b/source/engine/client/Menu.ts
index 78515a0d..93e5b473 100644
--- a/source/engine/client/Menu.ts
+++ b/source/engine/client/Menu.ts
@@ -6,7 +6,7 @@ import Cvar from '../common/Cvar.ts';
 import { clientConnectionState } from '../common/Def.ts';
 import { eventBus, getClientRegistry } from '../registry.mjs';
 import ClientLifecycle from './ClientLifecycle.ts';
-import { GLTexture } from './GL.mjs';
+import { GLTexture } from './GL.ts';
 import MultiplayerMainMenu from './menu/Multiplayer.ts';
 import VID from './VID.ts';
 
diff --git a/source/engine/client/V.mjs b/source/engine/client/V.mjs
deleted file mode 100644
index c09d43f3..00000000
--- a/source/engine/client/V.mjs
+++ /dev/null
@@ -1,494 +0,0 @@
-import Vector from '../../shared/Vector.ts';
-import { content, gameCapabilities } from '../../shared/Defs.ts';
-import Cmd from '../common/Cmd.ts';
-import Cvar from '../common/Cvar.ts';
-import * as Def from '../common/Def.ts';
-import Q from '../../shared/Q.ts';
-import { eventBus, registry } from '../registry.mjs';
-import Chase from './Chase.ts';
-
-const V = {};
-
-export default V;
-
-let { CL, Con, Host, R, SCR } = registry;
-
-eventBus.subscribe('registry.frozen', () => {
-  ({ CL, Con, Host, R, SCR } = registry);
-});
-
-V.dmg_time = 0.0;
-
-/**
- * @param {Vector} angles angles
- * @param {Vector} velocity velocity
- * @returns {number} roll angle
- */
-V.CalcRoll = function (angles, velocity) { // FIXME: this is required for dedicated as well
-  const { right } = angles.angleVectors();
-  let side = velocity[0] * right[0] + velocity[1] * right[1] + velocity[2] * right[2];
-  const sign = side < 0 ? -1 : 1;
-  side = Math.abs(side);
-  if (side < V.rollspeed.value) {
-    return side * sign * V.rollangle.value / V.rollspeed.value;
-  }
-  return V.rollangle.value * sign;
-};
-
-V.CalcBob = function () {
-  if ((V.bobcycle.value <= 0.0) ||
-    (V.bobcycle.value >= 1.0) ||
-    (V.bobup.value <= 0.0) ||
-    (V.bobup.value >= 1.0) ||
-    (V.bob.value === 0.0)) {
-    return 0.0;
-  }
-
-  let cycle = (CL.state.time - Math.floor(CL.state.time / V.bobcycle.value) * V.bobcycle.value) / V.bobcycle.value;
-  if (cycle < V.bobup.value) {
-    cycle = Math.PI * cycle / V.bobup.value;
-  } else {
-    cycle = Math.PI + Math.PI * (cycle - V.bobup.value) / (1.0 - V.bobup.value);
-  }
-  let bob = Math.hypot(CL.state.velocity[0], CL.state.velocity[1]) * V.bob.value;
-  bob = bob * 0.3 + bob * 0.7 * Math.sin(cycle);
-  if (bob > 4.0) {
-    bob = 4.0;
-  } else if (bob < -7.0) {
-    bob = -7.0;
-  }
-  return bob;
-};
-
-V.StartPitchDrift = function () {
-  if (CL.state.laststop === CL.state.time) {
-    return;
-  }
-  if ((CL.state.nodrift === true) || (CL.state.pitchvel === 0.0)) {
-    CL.state.pitchvel = V.centerspeed.value;
-    CL.state.nodrift = false;
-    CL.state.driftmove = 0.0;
-  }
-};
-
-V.StopPitchDrift = function () {
-  CL.state.laststop = CL.state.time;
-  CL.state.nodrift = true;
-  CL.state.pitchvel = 0.0;
-};
-
-V.DriftPitch = function () {
-  if ((Host.noclip_anglehack === true) || (CL.state.onground !== true) || (CL.cls.demoplayback === true)) {
-    CL.state.driftmove = 0.0;
-    CL.state.pitchvel = 0.0;
-    return;
-  }
-
-  if (CL.state.nodrift === true) {
-    if (Math.abs(CL.state.cmd.forwardmove) < CL.forwardspeed.value) {
-      CL.state.driftmove = 0.0;
-    } else {
-      CL.state.driftmove += Host.frametime;
-    }
-    if (CL.state.driftmove > V.centermove.value) {
-      V.StartPitchDrift();
-    }
-    return;
-  }
-
-  const delta = CL.state.idealpitch - CL.state.viewangles[0];
-  if (delta === 0.0) {
-    CL.state.pitchvel = 0.0;
-    return;
-  }
-
-  let move = Host.frametime * CL.state.pitchvel;
-  CL.state.pitchvel += Host.frametime * V.centerspeed.value;
-
-  if (delta > 0) {
-    if (move > delta) {
-      CL.state.pitchvel = 0.0;
-      move = delta;
-    }
-    CL.state.viewangles[0] += move;
-  } else if (delta < 0) {
-    if (move > -delta) {
-      CL.state.pitchvel = 0.0;
-      move = -delta;
-    }
-    CL.state.viewangles[0] -= move;
-  }
-};
-
-V.cshift_empty = [130.0, 80.0, 50.0, 0.0];
-V.cshift_water = [130.0, 80.0, 50.0, 128.0];
-V.cshift_slime = [0.0, 25.0, 5.0, 150.0];
-V.cshift_lava = [255.0, 80.0, 0.0, 150.0];
-
-V.blend = [0.0, 0.0, 0.0, 0.0];
-
-V.ApplyDamage = function (armor, blood, origin) { // Client (formally known as V.ParseDamage)
-  const ent = CL.state.playerentity;
-  const from = origin.subtract(ent.origin);
-
-  eventBus.publish('client.damage', { damageReceived: blood, armorLost: armor, attackOrigin: from.copy() });
-
-  from.normalize();
-  let count = (blood + armor) * 0.5;
-  if (count < 10.0) {
-    count = 10.0;
-  }
-  CL.state.faceanimtime = CL.state.time + 0.2;
-
-  const cshift = CL.state.cshifts[CL.cshift.damage];
-  cshift[3] += 3.0 * count;
-  if (cshift[3] < 0.0) {
-    cshift[3] = 0.0;
-  } else if (cshift[3] > 150.0) {
-    cshift[3] = 150.0;
-  }
-
-  if (armor > blood) {
-    cshift[0] = 200.0;
-    cshift[1] = cshift[2] = 100.0;
-  } else if (armor !== 0) {
-    cshift[0] = 220.0;
-    cshift[1] = cshift[2] = 50.0;
-  } else {
-    cshift[0] = 255.0;
-    cshift[1] = cshift[2] = 0.0;
-  }
-
-  const { forward, right } = ent.angles.angleVectors();
-  V.dmg_roll = count * (from[0] * right[0] + from[1] * right[1] + from[2] * right[2]) * V.kickroll.value;
-  V.dmg_pitch = count * (from[0] * forward[0] + from[1] * forward[1] + from[2] * forward[2]) * V.kickpitch.value;
-  V.dmg_time = V.kicktime.value;
-};
-
-V.cshift_f = function (...args) {
-  const cshift = V.cshift_empty;
-  for (let i = 0; i < Math.min(args.length, cshift.length); i++) {
-    cshift[i] = Q.atoi(args[i]);
-  }
-};
-
-V.BonusFlash_f = function () {
-  const cshift = CL.state.cshifts[CL.cshift.bonus];
-  cshift[0] = 215.0;
-  cshift[1] = 186.0;
-  cshift[2] = 69.0;
-  cshift[3] = 50.0;
-};
-
-V.ContentShift = function (slot, color, alpha) {
-  const cshift = CL.state.cshifts[slot];
-  cshift[0] = color[0] * 255.0;
-  cshift[1] = color[1] * 255.0;
-  cshift[2] = color[2] * 255.0;
-  cshift[3] = alpha * 255.0;
-};
-
-/**
- * @param {content} contents content classification
- */
-V.SetContentsColor = function (contents) {
-  switch (contents) {
-    case content.CONTENT_EMPTY:
-      CL.state.cshifts[Def.contentShift.contents] = V.cshift_empty;
-      return;
-    case content.CONTENT_LAVA:
-      CL.state.cshifts[Def.contentShift.contents] = V.cshift_lava;
-      return;
-    case content.CONTENT_SLIME:
-      CL.state.cshifts[Def.contentShift.contents] = V.cshift_slime;
-      return;
-    case content.CONTENT_WATER:
-      CL.state.cshifts[Def.contentShift.contents] = V.cshift_water;
-      return;
-  }
-};
-
-V.CalcBlend = function () {
-  let cshift = CL.state.cshifts[CL.cshift.powerup];
-  if ((CL.state.items & Def.it.quad) !== 0) {
-    cshift[0] = 0.0;
-    cshift[1] = 0.0;
-    cshift[2] = 255.0;
-    cshift[3] = 30.0;
-  } else if ((CL.state.items & Def.it.suit) !== 0) {
-    cshift[0] = 0.0;
-    cshift[1] = 255.0;
-    cshift[2] = 0.0;
-    cshift[3] = 20.0;
-  } else if ((CL.state.items & Def.it.invisibility) !== 0) {
-    cshift[0] = 100.0;
-    cshift[1] = 100.0;
-    cshift[2] = 100.0;
-    cshift[3] = 100.0;
-  } else if ((CL.state.items & Def.it.invulnerability) !== 0) {
-    cshift[0] = 255.0;
-    cshift[1] = 255.0;
-    cshift[2] = 0.0;
-    cshift[3] = 30.0;
-  } else {
-    cshift[3] = 0.0;
-  }
-
-  CL.state.cshifts[CL.cshift.damage][3] -= Host.frametime * 150.0;
-  if (CL.state.cshifts[CL.cshift.damage][3] < 0.0) {
-    CL.state.cshifts[CL.cshift.damage][3] = 0.0;
-  }
-  CL.state.cshifts[CL.cshift.bonus][3] -= Host.frametime * 100.0;
-  if (CL.state.cshifts[CL.cshift.bonus][3] < 0.0) {
-    CL.state.cshifts[CL.cshift.bonus][3] = 0.0;
-  }
-
-  for (let i = CL.cshift.user1; i < CL.state.cshifts.length; i++) {
-    const cshift = CL.state.cshifts[i];
-    cshift[3] -= Host.frametime * 100.0;
-    if (cshift[3] < 0.0) {
-      cshift[3] = 0.0;
-    }
-  }
-
-  if (V.cshiftpercent.value === 0) {
-    V.blend[0] = V.blend[1] = V.blend[2] = V.blend[3] = 0.0;
-    return;
-  }
-
-  let r = 0.0; let g = 0.0; let b = 0.0; let a = 0.0; let a2; let i;
-  for (i = 0; i < CL.state.cshifts.length; i++) {
-    cshift = CL.state.cshifts[i];
-    a2 = cshift[3] * V.cshiftpercent.value / 25500.0;
-    if (a2 === 0.0) {
-      continue;
-    }
-    a = a + a2 * (1.0 - a);
-    a2 = a2 / a;
-    r = r * (1.0 - a2) + cshift[0] * a2;
-    g = g * (1.0 - a2) + cshift[1] * a2;
-    b = b * (1.0 - a2) + cshift[2] * a2;
-  }
-  if (a > 1.0) {
-    a = 1.0;
-  } else if (a < 0.0) {
-    a = 0.0;
-  }
-  V.blend[0] = r;
-  V.blend[1] = g;
-  V.blend[2] = b;
-  V.blend[3] = a;
-  if (V.blend[3] > 1.0) {
-    V.blend[3] = 1.0;
-  } else if (V.blend[3] < 0.0) {
-    V.blend[3] = 0.0;
-  }
-};
-
-/**
- *
- * @param value
- */
-function finiteOrZero(value) {
-  return isFinite(value) ? value : 0.0;
-}
-
-V.CalcIntermissionRefdef = function () {
-  const ent = CL.state.playerentity;
-  R.refdef.vieworg[0] = finiteOrZero(ent.origin[0]);
-  R.refdef.vieworg[1] = finiteOrZero(ent.origin[1]);
-  R.refdef.vieworg[2] = finiteOrZero(ent.origin[2]);
-  R.refdef.viewangles[0] = finiteOrZero(ent.angles[0]) + Math.sin(CL.state.time * V.ipitch_cycle.value) * V.ipitch_level.value;
-  R.refdef.viewangles[1] = finiteOrZero(ent.angles[1]) + Math.sin(CL.state.time * V.iyaw_cycle.value) * V.iyaw_level.value;
-  R.refdef.viewangles[2] = finiteOrZero(ent.angles[2]) + Math.sin(CL.state.time * V.iroll_cycle.value) * V.iroll_level.value;
-  CL.state.viewent.model = null;
-};
-
-V.oldz = 0.0;
-V.CalcRefdef = function () { // TODO: Client
-  if (V.pitchdrift.value) {
-    V.DriftPitch();
-  }
-
-  const ent = CL.state.playerentity;
-  ent.angles[1] = CL.state.viewangles[1];
-  ent.angles[0] = -CL.state.viewangles[0];
-  const bob = V.CalcBob();
-
-  R.refdef.vieworg[0] = finiteOrZero(ent/*lerp*/.origin[0]) + 0.03125;
-  R.refdef.vieworg[1] = finiteOrZero(ent/*lerp*/.origin[1]) + 0.03125;
-  R.refdef.vieworg[2] = finiteOrZero(ent/*lerp*/.origin[2]) + CL.state.viewheight + bob + 0.03125;
-
-  R.refdef.viewangles[0] = CL.state.viewangles[0];
-  R.refdef.viewangles[1] = CL.state.viewangles[1];
-  R.refdef.viewangles[2] = CL.state.viewangles[2] + V.CalcRoll(CL.state.playerentity/*lerp*/.angles, CL.state.velocity);
-
-  if (V.dmg_time > 0.0) {
-    if (V.kicktime.value) {
-      R.refdef.viewangles[2] += (V.dmg_time / V.kicktime.value) * V.dmg_roll;
-      R.refdef.viewangles[0] -= (V.dmg_time / V.kicktime.value) * V.dmg_pitch;
-    }
-    V.dmg_time -= Host.frametime;
-  }
-
-  if (CL.gameCapabilities.includes(gameCapabilities.CAP_CLIENTDATA_LEGACY)) {
-    if (CL.state.stats[Def.stat.health] <= 0) {
-      R.refdef.viewangles[2] = 80.0;
-    }
-  }
-
-  const ipitch = V.idlescale.value * Math.sin(CL.state.time * V.ipitch_cycle.value) * V.ipitch_level.value;
-  const iyaw = V.idlescale.value * Math.sin(CL.state.time * V.iyaw_cycle.value) * V.iyaw_level.value;
-  const iroll = V.idlescale.value * Math.sin(CL.state.time * V.iroll_cycle.value) * V.iroll_level.value;
-  R.refdef.viewangles[0] += ipitch;
-  R.refdef.viewangles[1] += iyaw;
-  R.refdef.viewangles[2] += iroll;
-
-  const { forward, right, up } = (new Vector(finiteOrZero(-ent/*lerp*/.angles[0]), finiteOrZero(ent/*lerp*/.angles[1]), finiteOrZero(ent/*lerp*/.angles[2]))).angleVectors();
-  R.refdef.vieworg[0] += V.ofsx.value * forward[0] + V.ofsy.value * right[0] + V.ofsz.value * up[0];
-  R.refdef.vieworg[1] += V.ofsx.value * forward[1] + V.ofsy.value * right[1] + V.ofsz.value * up[1];
-  R.refdef.vieworg[2] += V.ofsx.value * forward[2] + V.ofsy.value * right[2] + V.ofsz.value * up[2];
-
-  if (R.refdef.vieworg[0] < (ent/*lerp*/.origin[0] - 14.0)) {
-    R.refdef.vieworg[0] = finiteOrZero(ent/*lerp*/.origin[0]) - 14.0;
-  } else if (R.refdef.vieworg[0] > (ent/*lerp*/.origin[0] + 14.0)) {
-    R.refdef.vieworg[0] = finiteOrZero(ent/*lerp*/.origin[0]) + 14.0;
-  }
-  if (R.refdef.vieworg[1] < (ent/*lerp*/.origin[1] - 14.0)) {
-    R.refdef.vieworg[1] = finiteOrZero(ent/*lerp*/.origin[1]) - 14.0;
-  } else if (R.refdef.vieworg[1] > (ent/*lerp*/.origin[1] + 14.0)) {
-    R.refdef.vieworg[1] = finiteOrZero(ent/*lerp*/.origin[1]) + 14.0;
-  }
-  if (R.refdef.vieworg[2] < (ent/*lerp*/.origin[2] - 22.0)) {
-    R.refdef.vieworg[2] = finiteOrZero(ent/*lerp*/.origin[2]) - 22.0;
-  } else if (R.refdef.vieworg[2] > (ent/*lerp*/.origin[2] + 30.0)) {
-    R.refdef.vieworg[2] = finiteOrZero(ent/*lerp*/.origin[2]) + 30.0;
-  }
-
-  const view = CL.state.viewent;
-  view.angles[0] = -R.refdef.viewangles[0] - ipitch;
-  view.angles[1] = R.refdef.viewangles[1] - iyaw;
-  view.angles[2] = CL.state.viewangles[2] - iroll;
-  view.origin[0] = finiteOrZero(ent/*lerp*/.origin[0]) + forward[0] * bob * 0.4;
-  view.origin[1] = finiteOrZero(ent/*lerp*/.origin[1]) + forward[1] * bob * 0.4;
-  view.origin[2] = finiteOrZero(ent/*lerp*/.origin[2]) + CL.state.viewheight + forward[2] * bob * 0.4 + bob;
-  switch (SCR.viewsize.value) {
-    case 110:
-    case 90:
-      view.origin[2] += 1.0;
-      break;
-    case 100:
-      view.origin[2] += 2.0;
-      break;
-    case 80:
-      view.origin[2] += 0.5;
-  }
-
-  if (CL.gameCapabilities.includes(gameCapabilities.CAP_VIEWMODEL_MANAGED) && CL.state.gameAPI) {
-    const viewmodel = CL.state.gameAPI.viewmodel;
-    view.model = viewmodel.model;
-    view.frame = viewmodel.frame;
-    // visibility is considered by R.DrawViewModel
-  } else {
-    view.model = CL.state.model_precache[CL.state.stats[Def.stat.weapon]];
-    view.frame = CL.state.stats[Def.stat.weaponframe];
-  }
-
-  // allow lerping viewmodel by heuristic
-  if (view.frame > 0) {
-    view.nextthink = ent.nextthink;
-    view.framePrevious = view.frame - 1;
-    view.frameTime = ent.frameTime;
-  } else {
-    view.nextthink = -1;
-    view.framePrevious = null;
-    view.frameTime = 0.0;
-  }
-
-  R.refdef.viewangles.add(CL.state.punchangle);
-
-  if ((CL.state.onground === true) && ((ent/*lerp*/.origin[2] - V.oldz) > 0.0)) {
-    let steptime = Host.frametime;
-    if (steptime < 0.0) {
-      steptime = 0.0;
-    }
-    V.oldz += steptime * 80.0;
-    if (V.oldz > ent/*lerp*/.origin[2]) {
-      V.oldz = finiteOrZero(ent/*lerp*/.origin[2]);
-    } else if ((ent/*lerp*/.origin[2] - V.oldz) > 12.0) {
-      V.oldz = finiteOrZero(ent/*lerp*/.origin[2]) - 12.0;
-    }
-    R.refdef.vieworg[2] += V.oldz - finiteOrZero(ent/*lerp*/.origin[2]);
-    view.origin[2] += V.oldz - finiteOrZero(ent/*lerp*/.origin[2]);
-  } else {
-    V.oldz = finiteOrZero(ent/*lerp*/.origin[2]);
-  }
-
-  if (CL.state.gameAPI) {
-    CL.state.gameAPI.updateRefDef(R.refdef);
-  }
-
-  if (Chase.active.value) {
-    Chase.Update();
-  }
-};
-
-V.PreRenderView = function () {
-  if (Con.forcedup) {
-    return;
-  }
-  if (CL.state.maxclients >= 2) {
-    Cvar.Set('scr_ofsx', '0');
-    Cvar.Set('scr_ofsy', '0');
-    Cvar.Set('scr_ofsz', '0');
-  }
-  if (CL.state.intermission > 0) {
-    V.CalcIntermissionRefdef();
-  } else if (!CL.state.paused) {
-    V.CalcRefdef();
-  }
-  R.PreRenderScene();
-};
-
-V.RenderView = function () {
-  if (Con.forcedup) {
-    return;
-  }
-  if (!CL.state.worldmodel) {
-    return;
-  }
-  if (CL.cls.signon < 4) {
-    return;
-  }
-  R.PushDlights();
-  R.RenderView();
-};
-
-V.Init = function () {
-  Cmd.AddCommand('v_cshift', V.cshift_f);
-  Cmd.AddCommand('bf', V.BonusFlash_f);
-  Cmd.AddCommand('centerview', V.StartPitchDrift);
-  V.centermove = new Cvar('v_centermove', '0.15');
-  V.centerspeed = new Cvar('v_centerspeed', '500');
-  V.iyaw_cycle = new Cvar('v_iyaw_cycle', '2');
-  V.iroll_cycle = new Cvar('v_iroll_cycle', '0.5');
-  V.ipitch_cycle = new Cvar('v_ipitch_cycle', '1');
-  V.iyaw_level = new Cvar('v_iyaw_level', '0.3');
-  V.iroll_level = new Cvar('v_iroll_level', '0.1');
-  V.ipitch_level = new Cvar('v_ipitch_level', '0.3');
-  V.idlescale = new Cvar('v_idlescale', '0');
-  V.cshiftpercent = new Cvar('gl_cshiftpercent', '100');
-  V.ofsx = new Cvar('scr_ofsx', '0');
-  V.ofsy = new Cvar('scr_ofsy', '0');
-  V.ofsz = new Cvar('scr_ofsz', '0');
-  V.rollspeed = new Cvar('cl_rollspeed', '200');
-  V.rollangle = new Cvar('cl_rollangle', '2.0');
-  V.bob = new Cvar('cl_bob', '0.02');
-  V.bobcycle = new Cvar('cl_bobcycle', '0.6');
-  V.bobup = new Cvar('cl_bobup', '0.5');
-  V.kicktime = new Cvar('v_kicktime', '0.5');
-  V.kickroll = new Cvar('v_kickroll', '0.6');
-  V.kickpitch = new Cvar('v_kickpitch', '0.6');
-  V.gamma = new Cvar('gamma', '0.8', Cvar.FLAG.ARCHIVE | Cvar.FLAG.CHEAT); // CR: 1 is too dark
-  V.pitchdrift = new Cvar('v_pitchdrift', '1', Cvar.FLAG.ARCHIVE, 'Vanilla Quake drift pitch when moving forward.');
-};
diff --git a/source/engine/client/V.ts b/source/engine/client/V.ts
new file mode 100644
index 00000000..228e872b
--- /dev/null
+++ b/source/engine/client/V.ts
@@ -0,0 +1,526 @@
+type ColorShift = [number, number, number, number];
+
+import Vector from '../../shared/Vector.ts';
+import { content, gameCapabilities } from '../../shared/Defs.ts';
+import Cmd from '../common/Cmd.ts';
+import Cvar from '../common/Cvar.ts';
+import * as Def from '../common/Def.ts';
+import Q from '../../shared/Q.ts';
+import { eventBus, getClientRegistry, getCommonRegistry } from '../registry.mjs';
+import Chase from './Chase.ts';
+
+let { Con, Host } = getCommonRegistry();
+let { CL, R, SCR } = getClientRegistry();
+
+eventBus.subscribe('registry.frozen', () => {
+  ({ Con, Host } = getCommonRegistry());
+  ({ CL, R, SCR } = getClientRegistry());
+});
+
+/**
+ * @param {number} value scalar component
+ * @returns {number} finite scalar or zero fallback
+ */
+function finiteOrZero(value: number): number {
+  return Number.isFinite(value) ? value : 0.0;
+}
+
+export default class V {
+  static dmg_time = 0.0;
+  static dmg_roll = 0.0;
+  static dmg_pitch = 0.0;
+  static oldz = 0.0;
+
+  static cshift_empty: ColorShift = [130.0, 80.0, 50.0, 0.0];
+  static cshift_water: ColorShift = [130.0, 80.0, 50.0, 128.0];
+  static cshift_slime: ColorShift = [0.0, 25.0, 5.0, 150.0];
+  static cshift_lava: ColorShift = [255.0, 80.0, 0.0, 150.0];
+
+  static blend: ColorShift = [0.0, 0.0, 0.0, 0.0];
+
+  static centermove: Cvar = null!;
+  static centerspeed: Cvar = null!;
+  static iyaw_cycle: Cvar = null!;
+  static iroll_cycle: Cvar = null!;
+  static ipitch_cycle: Cvar = null!;
+  static iyaw_level: Cvar = null!;
+  static iroll_level: Cvar = null!;
+  static ipitch_level: Cvar = null!;
+  static idlescale: Cvar = null!;
+  static cshiftpercent: Cvar = null!;
+  static ofsx: Cvar = null!;
+  static ofsy: Cvar = null!;
+  static ofsz: Cvar = null!;
+  static rollspeed: Cvar = null!;
+  static rollangle: Cvar = null!;
+  static bob: Cvar = null!;
+  static bobcycle: Cvar = null!;
+  static bobup: Cvar = null!;
+  static kicktime: Cvar = null!;
+  static kickroll: Cvar = null!;
+  static kickpitch: Cvar = null!;
+  static gamma: Cvar = null!;
+  static pitchdrift: Cvar = null!;
+
+  /**
+   * @param {Vector} angles angles
+   * @param {Vector} velocity velocity
+   * @returns {number} roll angle
+   */
+  static CalcRoll(angles: Vector, velocity: Vector): number { // FIXME: this is required for dedicated as well
+    const { right } = angles.angleVectors();
+    let side = velocity[0] * right[0] + velocity[1] * right[1] + velocity[2] * right[2];
+    const sign = side < 0 ? -1 : 1;
+    side = Math.abs(side);
+    if (side < V.rollspeed.value) {
+      return side * sign * V.rollangle.value / V.rollspeed.value;
+    }
+    return V.rollangle.value * sign;
+  }
+
+  static CalcBob(): number {
+    if ((V.bobcycle.value <= 0.0)
+      || (V.bobcycle.value >= 1.0)
+      || (V.bobup.value <= 0.0)
+      || (V.bobup.value >= 1.0)
+      || (V.bob.value === 0.0)) {
+      return 0.0;
+    }
+
+    let cycle = (CL.state.time - Math.floor(CL.state.time / V.bobcycle.value) * V.bobcycle.value) / V.bobcycle.value;
+    if (cycle < V.bobup.value) {
+      cycle = Math.PI * cycle / V.bobup.value;
+    } else {
+      cycle = Math.PI + Math.PI * (cycle - V.bobup.value) / (1.0 - V.bobup.value);
+    }
+    let bob = Math.hypot(CL.state.velocity[0], CL.state.velocity[1]) * V.bob.value;
+    bob = bob * 0.3 + bob * 0.7 * Math.sin(cycle);
+    if (bob > 4.0) {
+      bob = 4.0;
+    } else if (bob < -7.0) {
+      bob = -7.0;
+    }
+    return bob;
+  }
+
+  static StartPitchDrift(): void {
+    if (CL.state.laststop === CL.state.time) {
+      return;
+    }
+    if ((CL.state.nodrift === true) || (CL.state.pitchvel === 0.0)) {
+      CL.state.pitchvel = V.centerspeed.value;
+      CL.state.nodrift = false;
+      CL.state.driftmove = 0.0;
+    }
+  }
+
+  static StopPitchDrift(): void {
+    CL.state.laststop = CL.state.time;
+    CL.state.nodrift = true;
+    CL.state.pitchvel = 0.0;
+  }
+
+  static DriftPitch(): void {
+    if ((Host.noclip_anglehack === true) || (CL.state.onground !== true) || (CL.cls.demoplayback === true)) {
+      CL.state.driftmove = 0.0;
+      CL.state.pitchvel = 0.0;
+      return;
+    }
+
+    if (CL.state.nodrift === true) {
+      if (Math.abs(CL.state.cmd.forwardmove) < CL.forwardspeed.value) {
+        CL.state.driftmove = 0.0;
+      } else {
+        CL.state.driftmove += Host.frametime;
+      }
+      if (CL.state.driftmove > V.centermove.value) {
+        V.StartPitchDrift();
+      }
+      return;
+    }
+
+    const delta = CL.state.idealpitch - CL.state.viewangles[0];
+    if (delta === 0.0) {
+      CL.state.pitchvel = 0.0;
+      return;
+    }
+
+    let move = Host.frametime * CL.state.pitchvel;
+    CL.state.pitchvel += Host.frametime * V.centerspeed.value;
+
+    if (delta > 0) {
+      if (move > delta) {
+        CL.state.pitchvel = 0.0;
+        move = delta;
+      }
+      CL.state.viewangles[0] += move;
+    } else if (delta < 0) {
+      if (move > -delta) {
+        CL.state.pitchvel = 0.0;
+        move = -delta;
+      }
+      CL.state.viewangles[0] -= move;
+    }
+  }
+
+  static ApplyDamage(armor: number, blood: number, origin: Vector): void { // Client (formally known as V.ParseDamage)
+    const ent = CL.state.playerentity;
+    const from = origin.subtract(ent.origin);
+
+    eventBus.publish('client.damage', { damageReceived: blood, armorLost: armor, attackOrigin: from.copy() });
+
+    from.normalize();
+    let count = (blood + armor) * 0.5;
+    if (count < 10.0) {
+      count = 10.0;
+    }
+    CL.state.faceanimtime = CL.state.time + 0.2;
+
+    const cshift = CL.state.cshifts[CL.cshift.damage];
+    cshift[3] += 3.0 * count;
+    if (cshift[3] < 0.0) {
+      cshift[3] = 0.0;
+    } else if (cshift[3] > 150.0) {
+      cshift[3] = 150.0;
+    }
+
+    if (armor > blood) {
+      cshift[0] = 200.0;
+      cshift[1] = cshift[2] = 100.0;
+    } else if (armor !== 0) {
+      cshift[0] = 220.0;
+      cshift[1] = cshift[2] = 50.0;
+    } else {
+      cshift[0] = 255.0;
+      cshift[1] = cshift[2] = 0.0;
+    }
+
+    const { forward, right } = ent.angles.angleVectors();
+    V.dmg_roll = count * (from[0] * right[0] + from[1] * right[1] + from[2] * right[2]) * V.kickroll.value;
+    V.dmg_pitch = count * (from[0] * forward[0] + from[1] * forward[1] + from[2] * forward[2]) * V.kickpitch.value;
+    V.dmg_time = V.kicktime.value;
+  }
+
+  static cshift_f(...args: string[]): void {
+    const cshift = V.cshift_empty;
+    for (let i = 0; i < Math.min(args.length, cshift.length); i++) {
+      cshift[i] = Q.atoi(args[i]);
+    }
+  }
+
+  static BonusFlash_f(): void {
+    const cshift = CL.state.cshifts[CL.cshift.bonus];
+    cshift[0] = 215.0;
+    cshift[1] = 186.0;
+    cshift[2] = 69.0;
+    cshift[3] = 50.0;
+  }
+
+  static ContentShift(slot: number, color: Vector, alpha: number): void {
+    const cshift = CL.state.cshifts[slot];
+    cshift[0] = color[0] * 255.0;
+    cshift[1] = color[1] * 255.0;
+    cshift[2] = color[2] * 255.0;
+    cshift[3] = alpha * 255.0;
+  }
+
+  /**
+   * @param {content} contents content classification
+   */
+  static SetContentsColor(contents: content): void {
+    switch (contents) {
+      case content.CONTENT_EMPTY:
+        CL.state.cshifts[Def.contentShift.contents] = V.cshift_empty;
+        return;
+      case content.CONTENT_LAVA:
+        CL.state.cshifts[Def.contentShift.contents] = V.cshift_lava;
+        return;
+      case content.CONTENT_SLIME:
+        CL.state.cshifts[Def.contentShift.contents] = V.cshift_slime;
+        return;
+      case content.CONTENT_WATER:
+        CL.state.cshifts[Def.contentShift.contents] = V.cshift_water;
+        return;
+    }
+  }
+
+  static CalcBlend(): void {
+    let cshift = CL.state.cshifts[CL.cshift.powerup];
+    if ((CL.state.items & Def.it.quad) !== 0) {
+      cshift[0] = 0.0;
+      cshift[1] = 0.0;
+      cshift[2] = 255.0;
+      cshift[3] = 30.0;
+    } else if ((CL.state.items & Def.it.suit) !== 0) {
+      cshift[0] = 0.0;
+      cshift[1] = 255.0;
+      cshift[2] = 0.0;
+      cshift[3] = 20.0;
+    } else if ((CL.state.items & Def.it.invisibility) !== 0) {
+      cshift[0] = 100.0;
+      cshift[1] = 100.0;
+      cshift[2] = 100.0;
+      cshift[3] = 100.0;
+    } else if ((CL.state.items & Def.it.invulnerability) !== 0) {
+      cshift[0] = 255.0;
+      cshift[1] = 255.0;
+      cshift[2] = 0.0;
+      cshift[3] = 30.0;
+    } else {
+      cshift[3] = 0.0;
+    }
+
+    CL.state.cshifts[CL.cshift.damage][3] -= Host.frametime * 150.0;
+    if (CL.state.cshifts[CL.cshift.damage][3] < 0.0) {
+      CL.state.cshifts[CL.cshift.damage][3] = 0.0;
+    }
+    CL.state.cshifts[CL.cshift.bonus][3] -= Host.frametime * 100.0;
+    if (CL.state.cshifts[CL.cshift.bonus][3] < 0.0) {
+      CL.state.cshifts[CL.cshift.bonus][3] = 0.0;
+    }
+
+    for (let i = CL.cshift.user1; i < CL.state.cshifts.length; i++) {
+      const userShift = CL.state.cshifts[i];
+      userShift[3] -= Host.frametime * 100.0;
+      if (userShift[3] < 0.0) {
+        userShift[3] = 0.0;
+      }
+    }
+
+    if (V.cshiftpercent.value === 0) {
+      V.blend[0] = V.blend[1] = V.blend[2] = V.blend[3] = 0.0;
+      return;
+    }
+
+    let r = 0.0;
+    let g = 0.0;
+    let b = 0.0;
+    let a = 0.0;
+    let a2: number;
+    for (let i = 0; i < CL.state.cshifts.length; i++) {
+      cshift = CL.state.cshifts[i];
+      a2 = cshift[3] * V.cshiftpercent.value / 25500.0;
+      if (a2 === 0.0) {
+        continue;
+      }
+      a = a + a2 * (1.0 - a);
+      a2 = a2 / a;
+      r = r * (1.0 - a2) + cshift[0] * a2;
+      g = g * (1.0 - a2) + cshift[1] * a2;
+      b = b * (1.0 - a2) + cshift[2] * a2;
+    }
+    if (a > 1.0) {
+      a = 1.0;
+    } else if (a < 0.0) {
+      a = 0.0;
+    }
+    V.blend[0] = r;
+    V.blend[1] = g;
+    V.blend[2] = b;
+    V.blend[3] = a;
+    if (V.blend[3] > 1.0) {
+      V.blend[3] = 1.0;
+    } else if (V.blend[3] < 0.0) {
+      V.blend[3] = 0.0;
+    }
+  }
+
+  static CalcIntermissionRefdef(): void {
+    const ent = CL.state.playerentity;
+    R.refdef.vieworg[0] = finiteOrZero(ent.origin[0]);
+    R.refdef.vieworg[1] = finiteOrZero(ent.origin[1]);
+    R.refdef.vieworg[2] = finiteOrZero(ent.origin[2]);
+    R.refdef.viewangles[0] = finiteOrZero(ent.angles[0]) + Math.sin(CL.state.time * V.ipitch_cycle.value) * V.ipitch_level.value;
+    R.refdef.viewangles[1] = finiteOrZero(ent.angles[1]) + Math.sin(CL.state.time * V.iyaw_cycle.value) * V.iyaw_level.value;
+    R.refdef.viewangles[2] = finiteOrZero(ent.angles[2]) + Math.sin(CL.state.time * V.iroll_cycle.value) * V.iroll_level.value;
+    CL.state.viewent.model = null;
+  }
+
+  static CalcRefdef(): void { // TODO: Client
+    if (V.pitchdrift.value) {
+      V.DriftPitch();
+    }
+
+    const ent = CL.state.playerentity;
+    ent.angles[1] = CL.state.viewangles[1];
+    ent.angles[0] = -CL.state.viewangles[0];
+    const bob = V.CalcBob();
+
+    R.refdef.vieworg[0] = finiteOrZero(ent.origin[0]) + 0.03125;
+    R.refdef.vieworg[1] = finiteOrZero(ent.origin[1]) + 0.03125;
+    R.refdef.vieworg[2] = finiteOrZero(ent.origin[2]) + CL.state.viewheight + bob + 0.03125;
+
+    R.refdef.viewangles[0] = CL.state.viewangles[0];
+    R.refdef.viewangles[1] = CL.state.viewangles[1];
+    R.refdef.viewangles[2] = CL.state.viewangles[2] + V.CalcRoll(CL.state.playerentity.angles, CL.state.velocity);
+
+    if (V.dmg_time > 0.0) {
+      if (V.kicktime.value) {
+        R.refdef.viewangles[2] += (V.dmg_time / V.kicktime.value) * V.dmg_roll;
+        R.refdef.viewangles[0] -= (V.dmg_time / V.kicktime.value) * V.dmg_pitch;
+      }
+      V.dmg_time -= Host.frametime;
+    }
+
+    if (CL.gameCapabilities.includes(gameCapabilities.CAP_CLIENTDATA_LEGACY)) {
+      if (CL.state.stats[Def.stat.health] <= 0) {
+        R.refdef.viewangles[2] = 80.0;
+      }
+    }
+
+    const ipitch = V.idlescale.value * Math.sin(CL.state.time * V.ipitch_cycle.value) * V.ipitch_level.value;
+    const iyaw = V.idlescale.value * Math.sin(CL.state.time * V.iyaw_cycle.value) * V.iyaw_level.value;
+    const iroll = V.idlescale.value * Math.sin(CL.state.time * V.iroll_cycle.value) * V.iroll_level.value;
+    R.refdef.viewangles[0] += ipitch;
+    R.refdef.viewangles[1] += iyaw;
+    R.refdef.viewangles[2] += iroll;
+
+    const { forward, right, up } = new Vector(finiteOrZero(-ent.angles[0]), finiteOrZero(ent.angles[1]), finiteOrZero(ent.angles[2])).angleVectors();
+    R.refdef.vieworg[0] += V.ofsx.value * forward[0] + V.ofsy.value * right[0] + V.ofsz.value * up[0];
+    R.refdef.vieworg[1] += V.ofsx.value * forward[1] + V.ofsy.value * right[1] + V.ofsz.value * up[1];
+    R.refdef.vieworg[2] += V.ofsx.value * forward[2] + V.ofsy.value * right[2] + V.ofsz.value * up[2];
+
+    if (R.refdef.vieworg[0] < (ent.origin[0] - 14.0)) {
+      R.refdef.vieworg[0] = finiteOrZero(ent.origin[0]) - 14.0;
+    } else if (R.refdef.vieworg[0] > (ent.origin[0] + 14.0)) {
+      R.refdef.vieworg[0] = finiteOrZero(ent.origin[0]) + 14.0;
+    }
+    if (R.refdef.vieworg[1] < (ent.origin[1] - 14.0)) {
+      R.refdef.vieworg[1] = finiteOrZero(ent.origin[1]) - 14.0;
+    } else if (R.refdef.vieworg[1] > (ent.origin[1] + 14.0)) {
+      R.refdef.vieworg[1] = finiteOrZero(ent.origin[1]) + 14.0;
+    }
+    if (R.refdef.vieworg[2] < (ent.origin[2] - 22.0)) {
+      R.refdef.vieworg[2] = finiteOrZero(ent.origin[2]) - 22.0;
+    } else if (R.refdef.vieworg[2] > (ent.origin[2] + 30.0)) {
+      R.refdef.vieworg[2] = finiteOrZero(ent.origin[2]) + 30.0;
+    }
+
+    const view = CL.state.viewent;
+    view.angles[0] = -R.refdef.viewangles[0] - ipitch;
+    view.angles[1] = R.refdef.viewangles[1] - iyaw;
+    view.angles[2] = CL.state.viewangles[2] - iroll;
+    view.origin[0] = finiteOrZero(ent.origin[0]) + forward[0] * bob * 0.4;
+    view.origin[1] = finiteOrZero(ent.origin[1]) + forward[1] * bob * 0.4;
+    view.origin[2] = finiteOrZero(ent.origin[2]) + CL.state.viewheight + forward[2] * bob * 0.4 + bob;
+    switch (SCR.viewsize.value) {
+      case 110:
+      case 90:
+        view.origin[2] += 1.0;
+        break;
+      case 100:
+        view.origin[2] += 2.0;
+        break;
+      case 80:
+        view.origin[2] += 0.5;
+    }
+
+    if (CL.gameCapabilities.includes(gameCapabilities.CAP_VIEWMODEL_MANAGED) && CL.state.gameAPI) {
+      const viewmodel = CL.state.gameAPI.viewmodel;
+      view.model = viewmodel.model;
+      view.frame = viewmodel.frame;
+      // visibility is considered by R.DrawViewModel
+    } else {
+      view.model = CL.state.model_precache[CL.state.stats[Def.stat.weapon]];
+      view.frame = CL.state.stats[Def.stat.weaponframe];
+    }
+
+    // allow lerping viewmodel by heuristic
+    if (view.frame > 0) {
+      view.nextthink = ent.nextthink;
+      view.framePrevious = view.frame - 1;
+      view.frameTime = ent.frameTime;
+    } else {
+      view.nextthink = -1;
+      view.framePrevious = null;
+      view.frameTime = 0.0;
+    }
+
+    R.refdef.viewangles.add(CL.state.punchangle);
+
+    if ((CL.state.onground === true) && ((ent.origin[2] - V.oldz) > 0.0)) {
+      let steptime = Host.frametime;
+      if (steptime < 0.0) {
+        steptime = 0.0;
+      }
+      V.oldz += steptime * 80.0;
+      if (V.oldz > ent.origin[2]) {
+        V.oldz = finiteOrZero(ent.origin[2]);
+      } else if ((ent.origin[2] - V.oldz) > 12.0) {
+        V.oldz = finiteOrZero(ent.origin[2]) - 12.0;
+      }
+      R.refdef.vieworg[2] += V.oldz - finiteOrZero(ent.origin[2]);
+      view.origin[2] += V.oldz - finiteOrZero(ent.origin[2]);
+    } else {
+      V.oldz = finiteOrZero(ent.origin[2]);
+    }
+
+    if (CL.state.gameAPI) {
+      CL.state.gameAPI.updateRefDef(R.refdef);
+    }
+
+    if (Chase.active.value) {
+      Chase.Update();
+    }
+  }
+
+  static PreRenderView(): void {
+    if (Con.forcedup) {
+      return;
+    }
+    if (CL.state.maxclients >= 2) {
+      Cvar.Set('scr_ofsx', '0');
+      Cvar.Set('scr_ofsy', '0');
+      Cvar.Set('scr_ofsz', '0');
+    }
+    if (CL.state.intermission > 0) {
+      V.CalcIntermissionRefdef();
+    } else if (!CL.state.paused) {
+      V.CalcRefdef();
+    }
+    R.PreRenderScene();
+  }
+
+  static RenderView(): void {
+    if (Con.forcedup) {
+      return;
+    }
+    if (!CL.state.worldmodel) {
+      return;
+    }
+    if (CL.cls.signon < 4) {
+      return;
+    }
+    R.PushDlights();
+    R.RenderView();
+  }
+
+  static Init(): void {
+    Cmd.AddCommand('v_cshift', V.cshift_f);
+    Cmd.AddCommand('bf', V.BonusFlash_f);
+    Cmd.AddCommand('centerview', V.StartPitchDrift);
+    V.centermove = new Cvar('v_centermove', '0.15');
+    V.centerspeed = new Cvar('v_centerspeed', '500');
+    V.iyaw_cycle = new Cvar('v_iyaw_cycle', '2');
+    V.iroll_cycle = new Cvar('v_iroll_cycle', '0.5');
+    V.ipitch_cycle = new Cvar('v_ipitch_cycle', '1');
+    V.iyaw_level = new Cvar('v_iyaw_level', '0.3');
+    V.iroll_level = new Cvar('v_iroll_level', '0.1');
+    V.ipitch_level = new Cvar('v_ipitch_level', '0.3');
+    V.idlescale = new Cvar('v_idlescale', '0');
+    V.cshiftpercent = new Cvar('gl_cshiftpercent', '100');
+    V.ofsx = new Cvar('scr_ofsx', '0');
+    V.ofsy = new Cvar('scr_ofsy', '0');
+    V.ofsz = new Cvar('scr_ofsz', '0');
+    V.rollspeed = new Cvar('cl_rollspeed', '200');
+    V.rollangle = new Cvar('cl_rollangle', '2.0');
+    V.bob = new Cvar('cl_bob', '0.02');
+    V.bobcycle = new Cvar('cl_bobcycle', '0.6');
+    V.bobup = new Cvar('cl_bobup', '0.5');
+    V.kicktime = new Cvar('v_kicktime', '0.5');
+    V.kickroll = new Cvar('v_kickroll', '0.6');
+    V.kickpitch = new Cvar('v_kickpitch', '0.6');
+    V.gamma = new Cvar('gamma', '0.8', Cvar.FLAG.ARCHIVE | Cvar.FLAG.CHEAT); // CR: 1 is too dark
+    V.pitchdrift = new Cvar('v_pitchdrift', '1', Cvar.FLAG.ARCHIVE, 'Vanilla Quake drift pitch when moving forward.');
+  }
+}
diff --git a/source/engine/common/GameAPIs.ts b/source/engine/common/GameAPIs.ts
index 1b608328..64986da9 100644
--- a/source/engine/common/GameAPIs.ts
+++ b/source/engine/common/GameAPIs.ts
@@ -1,7 +1,7 @@
 import type BaseEntity from '../../game/id1/entity/BaseEntity.mjs';
 import type { EdictValueType, SerializableType } from '../../shared/GameInterfaces.ts';
 import type { ClientDlight, ClientEdict } from '../client/ClientEntities.ts';
-import type { GLTexture } from '../client/GL.mjs';
+import type { GLTexture } from '../client/GL.ts';
 import type { SzBuffer } from '../network/MSG.ts';
 import type ParsedQC from './model/parsers/ParsedQC.ts';
 import type { BaseModel } from './model/BaseModel.ts';
diff --git a/source/engine/common/model/AliasModel.ts b/source/engine/common/model/AliasModel.ts
index befca369..bb550b24 100644
--- a/source/engine/common/model/AliasModel.ts
+++ b/source/engine/common/model/AliasModel.ts
@@ -1,4 +1,4 @@
-import type { GLTexture } from '../../client/GL.mjs';
+import type { GLTexture } from '../../client/GL.ts';
 
 import Vector from '../../../shared/Vector.ts';
 import { BaseModel } from './BaseModel.ts';
diff --git a/source/engine/common/model/BaseModel.ts b/source/engine/common/model/BaseModel.ts
index fe96f560..701b76e2 100644
--- a/source/engine/common/model/BaseModel.ts
+++ b/source/engine/common/model/BaseModel.ts
@@ -1,4 +1,4 @@
-import GL from '../../client/GL.mjs';
+import GL from '../../client/GL.ts';
 import { eventBus } from '../../registry.mjs';
 import Vector from '../../../shared/Vector.ts';
 
diff --git a/source/engine/common/model/SpriteModel.ts b/source/engine/common/model/SpriteModel.ts
index 3552ad66..d62c2b56 100644
--- a/source/engine/common/model/SpriteModel.ts
+++ b/source/engine/common/model/SpriteModel.ts
@@ -1,4 +1,4 @@
-import type { GLTexture } from '../../client/GL.mjs';
+import type { GLTexture } from '../../client/GL.ts';
 
 import { BaseModel } from './BaseModel.ts';
 
diff --git a/source/engine/common/model/loaders/AliasMDLLoader.ts b/source/engine/common/model/loaders/AliasMDLLoader.ts
index 5d36fe09..338a6c2d 100644
--- a/source/engine/common/model/loaders/AliasMDLLoader.ts
+++ b/source/engine/common/model/loaders/AliasMDLLoader.ts
@@ -1,6 +1,6 @@
 import Vector from '../../../../shared/Vector.ts';
 import Q from '../../../../shared/Q.ts';
-import GL, { GLTexture, resampleTexture8 } from '../../../client/GL.mjs';
+import GL, { GLTexture, resampleTexture8 } from '../../../client/GL.ts';
 import { registry } from '../../../registry.mjs';
 import { CRC16CCITT } from '../../CRC.ts';
 import W, { translateIndexToLuminanceRGBA, translateIndexToRGBA } from '../../W.ts';
diff --git a/source/engine/common/model/loaders/BSP29Loader.ts b/source/engine/common/model/loaders/BSP29Loader.ts
index 1df427b1..bca4cd28 100644
--- a/source/engine/common/model/loaders/BSP29Loader.ts
+++ b/source/engine/common/model/loaders/BSP29Loader.ts
@@ -1,7 +1,7 @@
 import Vector from '../../../../shared/Vector.ts';
 import Q from '../../../../shared/Q.ts';
 import { content } from '../../../../shared/Defs.ts';
-import { GLTexture } from '../../../client/GL.mjs';
+import { GLTexture } from '../../../client/GL.ts';
 import W, { readWad3Texture, translateIndexToLuminanceRGBA, translateIndexToRGBA } from '../../W.ts';
 import { CRC16CCITT } from '../../CRC.ts';
 import { CorruptedResourceError } from '../../Errors.ts';
diff --git a/source/engine/common/model/loaders/SpriteSPRLoader.ts b/source/engine/common/model/loaders/SpriteSPRLoader.ts
index e479cf05..a4af5598 100644
--- a/source/engine/common/model/loaders/SpriteSPRLoader.ts
+++ b/source/engine/common/model/loaders/SpriteSPRLoader.ts
@@ -1,5 +1,5 @@
 import Vector from '../../../../shared/Vector.ts';
-import { GLTexture } from '../../../client/GL.mjs';
+import { GLTexture } from '../../../client/GL.ts';
 import { registry } from '../../../registry.mjs';
 import { CRC16CCITT } from '../../CRC.ts';
 import W, { translateIndexToRGBA } from '../../W.ts';
diff --git a/source/engine/common/model/loaders/WavefrontOBJLoader.ts b/source/engine/common/model/loaders/WavefrontOBJLoader.ts
index 22ba99f3..06e25b11 100644
--- a/source/engine/common/model/loaders/WavefrontOBJLoader.ts
+++ b/source/engine/common/model/loaders/WavefrontOBJLoader.ts
@@ -1,7 +1,7 @@
 import { registry } from '../../../registry.mjs';
 
 import Vector from '../../../../shared/Vector.ts';
-import { GLTexture } from '../../../client/GL.mjs';
+import { GLTexture } from '../../../client/GL.ts';
 import { PBRMaterial } from '../../../client/renderer/Materials.mjs';
 import { MeshModel } from '../MeshModel.ts';
 import { ModelLoader } from '../ModelLoader.ts';
diff --git a/source/engine/main-browser.ts b/source/engine/main-browser.ts
index cf44046c..79279801 100644
--- a/source/engine/main-browser.ts
+++ b/source/engine/main-browser.ts
@@ -8,7 +8,7 @@ import M from './client/Menu.ts';
 import R from './client/R.mjs';
 import S from './client/Sound.ts';
 import Sys from './client/Sys.ts';
-import V from './client/V.mjs';
+import V from './client/V.ts';
 import Sbar from './client/Sbar.mjs';
 import SCR from './client/SCR.mjs';
 import COM from './common/Com.ts';
diff --git a/source/engine/main-dedicated.ts b/source/engine/main-dedicated.ts
index 715a13ac..37dedb3e 100644
--- a/source/engine/main-dedicated.ts
+++ b/source/engine/main-dedicated.ts
@@ -6,7 +6,7 @@ import Host from './common/Host.ts';
 import Mod from './common/Mod.ts';
 import NET from './network/Network.ts';
 import { freeze as registryFreeze, registry } from './registry.mjs';
-import V from './client/V.mjs';
+import V from './client/V.ts';
 import NodeCOM from './server/Com.ts';
 import PR from './server/Progs.ts';
 import SV from './server/Server.ts';
diff --git a/source/engine/registry.mjs b/source/engine/registry.mjs
index 18e89c3e..dd41b051 100644
--- a/source/engine/registry.mjs
+++ b/source/engine/registry.mjs
@@ -3,7 +3,7 @@
 /** @typedef {typeof import('./common/Com.ts').default} ComModule */
 /** @typedef {typeof import('./common/Sys.ts').default | typeof import('./client/Sys.ts').default | typeof import('./server/Sys.ts').default} SysModule */
 /** @typedef {typeof import('./common/Host.ts').default} HostModule */
-/** @typedef {typeof import('./client/V.mjs').default} VModule */
+/** @typedef {typeof import('./client/V.ts').default} VModule */
 /** @typedef {typeof import('./network/Network').default} NetModule */
 /** @typedef {typeof import('./server/Server.ts').default} ServerModule */
 /** @typedef {typeof import('./server/Progs.ts').default} ProgsModule */
diff --git a/source/shared/GameInterfaces.ts b/source/shared/GameInterfaces.ts
index 718be5d3..8472e6c0 100644
--- a/source/shared/GameInterfaces.ts
+++ b/source/shared/GameInterfaces.ts
@@ -2,7 +2,7 @@ import type { BaseClientEdictHandler } from './ClientEdict.ts';
 import type { ClientEngineAPI as ClientEngineApiValue, ServerEngineAPI as ServerEngineApiValue } from '../engine/common/GameAPIs.ts';
 import type { ClientEdict as ClientEdictValue } from '../engine/client/ClientEntities.ts';
 import type { ServerEdict as ServerEdictValue } from '../engine/server/Edict.ts';
-import type { GLTexture as GLTextureValue } from '../engine/client/GL.mjs';
+import type { GLTexture as GLTextureValue } from '../engine/client/GL.ts';
 import type { SFX as SFXValue } from '../engine/client/Sound.ts';
 import type CvarValue from '../engine/common/Cvar.ts';
 import type Vector from './Vector.ts';
diff --git a/test/client/gl.test.mjs b/test/client/gl.test.mjs
new file mode 100644
index 00000000..24e0fcfb
--- /dev/null
+++ b/test/client/gl.test.mjs
@@ -0,0 +1,19 @@
+import assert from 'node:assert/strict';
+import { describe, test } from 'node:test';
+
+import { resampleTexture8 } from '../../source/engine/client/GL.ts';
+
+void describe('GL', () => {
+  void test('resampleTexture8 downsamples with nearest-neighbor picks', () => {
+    const source = new Uint8Array([
+      1, 2, 3, 4,
+      5, 6, 7, 8,
+      9, 10, 11, 12,
+      13, 14, 15, 16,
+    ]);
+
+    const result = resampleTexture8(source, 4, 4, 2, 2);
+
+    assert.deepEqual(Array.from(result), [1, 3, 9, 11]);
+  });
+});
diff --git a/test/client/v.test.mjs b/test/client/v.test.mjs
new file mode 100644
index 00000000..3d186086
--- /dev/null
+++ b/test/client/v.test.mjs
@@ -0,0 +1,28 @@
+import assert from 'node:assert/strict';
+import { describe, test } from 'node:test';
+
+import Vector from '../../source/shared/Vector.ts';
+import V from '../../source/engine/client/V.ts';
+
+void describe('V', () => {
+  void test('CalcRoll scales with velocity along the right vector', () => {
+    const originalRollspeed = V.rollspeed;
+    const originalRollangle = V.rollangle;
+
+    try {
+      V.rollspeed = { value: 200 };
+      V.rollangle = { value: 2 };
+
+      const angles = new Vector();
+      const { right } = angles.angleVectors();
+      const halfSpeed = right.copy().multiply(100);
+      const fullSpeed = right.copy().multiply(-400);
+
+      assert.equal(V.CalcRoll(angles, halfSpeed), 1);
+      assert.equal(V.CalcRoll(angles, fullSpeed), -2);
+    } finally {
+      V.rollspeed = originalRollspeed;
+      V.rollangle = originalRollangle;
+    }
+  });
+});

From 3245c92eb8406865556b66c42c31a1df6b57c726 Mon Sep 17 00:00:00 2001
From: Christian R <github@chrisnew.de>
Date: Sat, 4 Apr 2026 14:29:31 +0300
Subject: [PATCH 45/67] TS: client/ part 5

---
 source/engine/client/GL.ts                    |    4 +-
 source/engine/client/R.mjs                    |   20 +-
 source/engine/client/SCR.mjs                  |    2 +-
 .../client/renderer/AliasModelRenderer.mjs    |  299 ----
 .../client/renderer/AliasModelRenderer.ts     |  317 ++++
 .../{BloomEffect.mjs => BloomEffect.ts}       |  212 ++-
 ...odelRenderer.mjs => BrushModelRenderer.ts} | 1343 +++++++----------
 .../renderer/{Materials.mjs => Materials.ts}  |  240 ++-
 .../client/renderer/{Mesh.mjs => Mesh.ts}     |   11 +-
 ...ModelRenderer.mjs => MeshModelRenderer.ts} |  141 +-
 .../{ModelRenderer.mjs => ModelRenderer.ts}   |   50 +-
 .../client/renderer/ModelRendererRegistry.mjs |   68 -
 .../client/renderer/ModelRendererRegistry.ts  |   62 +
 .../{PostProcess.mjs => PostProcess.ts}       |  172 +--
 ...ProcessEffect.mjs => PostProcessEffect.ts} |   40 +-
 .../renderer/{ShadowMap.mjs => ShadowMap.ts}  |  546 +++----
 .../client/renderer/{Sky.mjs => Sky.ts}       |  193 ++-
 ...delRenderer.mjs => SpriteModelRenderer.ts} |  125 +-
 .../{WarpEffect.mjs => WarpEffect.ts}         |   39 +-
 source/engine/common/model/AliasModel.ts      |    8 +-
 source/engine/common/model/BSP.ts             |    4 +-
 source/engine/common/model/BaseModel.ts       |   11 +
 source/engine/common/model/MeshModel.ts       |    2 +-
 source/engine/common/model/SpriteModel.ts     |   26 +-
 .../common/model/loaders/BSP29Loader.ts       |   18 +-
 .../engine/common/model/loaders/BSP2Loader.ts |    6 +-
 .../model/loaders/WavefrontOBJLoader.ts       |    2 +-
 test/renderer/bloom-effect.test.mjs           |    2 +-
 test/renderer/brush-model-renderer.test.mjs   |   46 +-
 test/renderer/materials.test.mjs              |    8 +-
 test/renderer/post-process.test.mjs           |    2 +-
 test/renderer/r-sorting.test.mjs              |    8 +-
 test/renderer/sky.test.mjs                    |    2 +-
 33 files changed, 1853 insertions(+), 2176 deletions(-)
 delete mode 100644 source/engine/client/renderer/AliasModelRenderer.mjs
 create mode 100644 source/engine/client/renderer/AliasModelRenderer.ts
 rename source/engine/client/renderer/{BloomEffect.mjs => BloomEffect.ts} (59%)
 rename source/engine/client/renderer/{BrushModelRenderer.mjs => BrushModelRenderer.ts} (63%)
 rename source/engine/client/renderer/{Materials.mjs => Materials.ts} (58%)
 rename source/engine/client/renderer/{Mesh.mjs => Mesh.ts} (91%)
 rename source/engine/client/renderer/{MeshModelRenderer.mjs => MeshModelRenderer.ts} (65%)
 rename source/engine/client/renderer/{ModelRenderer.mjs => ModelRenderer.ts} (51%)
 delete mode 100644 source/engine/client/renderer/ModelRendererRegistry.mjs
 create mode 100644 source/engine/client/renderer/ModelRendererRegistry.ts
 rename source/engine/client/renderer/{PostProcess.mjs => PostProcess.ts} (80%)
 rename source/engine/client/renderer/{PostProcessEffect.mjs => PostProcessEffect.ts} (60%)
 rename source/engine/client/renderer/{ShadowMap.mjs => ShadowMap.ts} (56%)
 rename source/engine/client/renderer/{Sky.mjs => Sky.ts} (74%)
 rename source/engine/client/renderer/{SpriteModelRenderer.mjs => SpriteModelRenderer.ts} (50%)
 rename source/engine/client/renderer/{WarpEffect.mjs => WarpEffect.ts} (53%)

diff --git a/source/engine/client/GL.ts b/source/engine/client/GL.ts
index 395a0ad7..b510dfc8 100644
--- a/source/engine/client/GL.ts
+++ b/source/engine/client/GL.ts
@@ -19,7 +19,7 @@ interface GLProgramAttrib {
   offset: number;
 }
 
-type GLProgramDynamicProperties = {
+export type GLProgramDynamicProperties = {
   [key in `a${string}`]?: GLProgramAttrib;
 } & {
   [key in `u${string}`]?: WebGLUniformLocation | null;
@@ -27,7 +27,7 @@ type GLProgramDynamicProperties = {
   [key in `t${string}`]?: number;
 };
 
-type GLProgramInfo = {
+export type GLProgramInfo = {
   identifier: string;
   program: WebGLProgram;
   attribs: GLProgramAttrib[];
diff --git a/source/engine/client/R.mjs b/source/engine/client/R.mjs
index 7f1f7f27..ff35979c 100644
--- a/source/engine/client/R.mjs
+++ b/source/engine/client/R.mjs
@@ -9,20 +9,20 @@ import W from '../common/W.ts';
 import VID from './VID.ts';
 import GL, { ATTRIB_LOCATIONS, GLTexture } from './GL.mjs';
 import { content, effect, gameCapabilities } from '../../shared/Defs.ts';
-import { modelRendererRegistry } from './renderer/ModelRendererRegistry.mjs';
-import { BrushModelRenderer, LIGHTMAP_BLOCK_HEIGHT, LIGHTMAP_BLOCK_SIZE } from './renderer/BrushModelRenderer.mjs';
-import { AliasModelRenderer } from './renderer/AliasModelRenderer.mjs';
-import { SpriteModelRenderer } from './renderer/SpriteModelRenderer.mjs';
-import { MeshModelRenderer } from './renderer/MeshModelRenderer.mjs';
+import { modelRendererRegistry } from './renderer/ModelRendererRegistry.ts';
+import { BrushModelRenderer, LIGHTMAP_BLOCK_HEIGHT, LIGHTMAP_BLOCK_SIZE } from './renderer/BrushModelRenderer.ts';
+import { AliasModelRenderer } from './renderer/AliasModelRenderer.ts';
+import { SpriteModelRenderer } from './renderer/SpriteModelRenderer.ts';
+import { MeshModelRenderer } from './renderer/MeshModelRenderer.ts';
 import Draw from './Draw.mjs';
 import { BrushModel, Node, revealedVisibility } from '../common/model/BSP.ts';
-import PostProcess from './renderer/PostProcess.mjs';
-import BloomEffect from './renderer/BloomEffect.mjs';
-import WarpEffect from './renderer/WarpEffect.mjs';
-import ShadowMap from './renderer/ShadowMap.mjs';
+import PostProcess from './renderer/PostProcess.ts';
+import BloomEffect from './renderer/BloomEffect.ts';
+import WarpEffect from './renderer/WarpEffect.ts';
+import ShadowMap from './renderer/ShadowMap.ts';
 import { ClientDlight, ClientEdict } from './ClientEntities.ts';
 import { avertexnormals } from '../common/model/loaders/AliasMDLLoader.ts';
-import { SkyRenderer } from './renderer/Sky.mjs';
+import { SkyRenderer } from './renderer/Sky.ts';
 
 let { CL, Host, Mod, SCR, SV, Sys, V } = registry;
 
diff --git a/source/engine/client/SCR.mjs b/source/engine/client/SCR.mjs
index f846c2a8..47b15a64 100644
--- a/source/engine/client/SCR.mjs
+++ b/source/engine/client/SCR.mjs
@@ -7,7 +7,7 @@ import { clientConnectionState } from '../common/Def.ts';
 import { eventBus, registry } from '../registry.mjs';
 import GL from './GL.mjs';
 import VID from './VID.ts';
-import PostProcess from './renderer/PostProcess.mjs';
+import PostProcess from './renderer/PostProcess.ts';
 
 let { CL, Con, Draw, Host, Key, M, R, S, Sbar, V } = registry;
 
diff --git a/source/engine/client/renderer/AliasModelRenderer.mjs b/source/engine/client/renderer/AliasModelRenderer.mjs
deleted file mode 100644
index 8301a66c..00000000
--- a/source/engine/client/renderer/AliasModelRenderer.mjs
+++ /dev/null
@@ -1,299 +0,0 @@
-import Vector from '../../../shared/Vector.ts';
-import { ModelRenderer } from './ModelRenderer.mjs';
-import { getEntityBloomEmissiveScale } from './BloomEffect.mjs';
-import { eventBus, registry } from '../../registry.mjs';
-import GL from '../GL.mjs';
-import W from '../../common/W.ts';
-import { effect } from '../../../shared/Defs.ts';
-
-let { CL, Host, R, Con } = registry;
-let gl = /** @type {WebGL2RenderingContext} */ (null);
-
-eventBus.subscribe('registry.frozen', () => {
-  ({ CL, Host, R, Con } = registry);
-});
-
-eventBus.subscribe('gl.ready', () => {
-  gl = GL.gl;
-});
-
-eventBus.subscribe('gl.shutdown', () => {
-  gl = null;
-});
-
-/**
- * Renderer for Alias MDL models (animated mesh models like monsters, weapons, items).
- * Handles frame interpolation, skinning, and player color translation.
- */
-export class AliasModelRenderer extends ModelRenderer {
-  /**
-   * Get the model type this renderer handles
-   * @returns {number} Mod.type.alias (2)
-   */
-  getModelType() {
-    return 2; // Mod.type.alias
-  }
-
-  /**
-   * Setup rendering state for alias models.
-   * @param {number} [_pass] Rendering pass (0=opaque, 1=transparent)
-   */
-  // eslint-disable-next-line no-unused-vars
-  setupRenderState(_pass = 0) {
-    // Alias models setup their own state per-entity (different shaders for players)
-    // No shared setup needed at this level
-  }
-
-  /**
-   * @param {import('../../common/model/AliasModel.ts').AliasModel} _model The alias model
-   * @param {import('../ClientEntities.ts').ClientEdict} entity The entity being rendered
-   * @returns {boolean} True when this alias model should render in the opaque pass
-   */
-  rendersOpaquePass(_model, entity) {
-    return entity.alpha >= 1.0;
-  }
-
-  /**
-   * @param {import('../../common/model/AliasModel.ts').AliasModel} _model The alias model
-   * @param {import('../ClientEntities.ts').ClientEdict} entity The entity being rendered
-   * @returns {boolean} True when this alias model should render in the sorted transparent pass
-   */
-  rendersTransparentPass(_model, entity) {
-    return entity.alpha > 0.0 && entity.alpha < 1.0;
-  }
-
-  /**
-   * Render a single alias model entity.
-   * Handles frustum culling, frame interpolation, skinning, and player color translation.
-   * @param {import('../../common/model/AliasModel.ts').AliasModel} model The alias model to render
-   * @param {import('../ClientEntities.ts').ClientEdict} entity The entity being rendered
-   * @param {number} pass Rendering pass (0=opaque, 1=transparent)
-   */
-  render(model, entity, pass = 0) {
-    const clmodel = model;
-    const e = entity;
-
-    // Frustum culling
-    if (R.CullBox(
-      new Vector(
-        e.origin[0] - clmodel.boundingradius,
-        e.origin[1] - clmodel.boundingradius,
-        e.origin[2] - clmodel.boundingradius,
-      ),
-      new Vector(
-        e.origin[0] + clmodel.boundingradius,
-        e.origin[1] + clmodel.boundingradius,
-        e.origin[2] + clmodel.boundingradius,
-      )) === true) {
-      return;
-    }
-
-    // Select shader program (player vs normal)
-    let program;
-    if ((e.colormap !== 0) && (clmodel.player === true) && (R.nocolors.value === 0)) {
-      program = GL.UseProgram('player');
-
-      // Calculate player colors
-      let top = (CL.state.scores[e.colormap - 1].colors & 0xf0) + 4;
-      let bottom = ((CL.state.scores[e.colormap - 1].colors & 0xf) << 4) + 4;
-      if (top <= 127) {
-        top += 7;
-      }
-      if (bottom <= 127) {
-        bottom += 7;
-      }
-      top = W.d_8to24table[top];
-      bottom = W.d_8to24table[bottom];
-
-      // Set player color uniforms
-      gl.uniform3f(program.uTop, top & 0xff, (top >> 8) & 0xff, top >> 16);
-      gl.uniform3f(program.uBottom, bottom & 0xff, (bottom >> 8) & 0xff, bottom >> 16);
-    } else {
-      program = GL.UseProgram('alias');
-    }
-
-    // Setup transforms
-    gl.uniform3fv(program.uOrigin, e.lerp.origin);
-    gl.uniformMatrix3fv(program.uAngles, false, e.lerp.angles.toRotationMatrix());
-
-    // Setup lighting
-    const [ambientlight, shadelight, lightVector, dynamicShadeLight, dynamicLightVector] = R._CalculateLightValues(e);
-    gl.uniform3fv(program.uAmbientLight, ambientlight);
-    gl.uniform3fv(program.uShadeLight, shadelight);
-    gl.uniform3fv(program.uLightVec, lightVector);
-    gl.uniform3fv(program.uDynamicShadeLight, dynamicShadeLight);
-    gl.uniform3fv(program.uDynamicLightVec, dynamicLightVector);
-
-    // Update performance counter
-    R.c_alias_polys += clmodel._num_tris;
-
-    // Select animation frames
-    const { frameA, frameB, targettime } = AliasModelRenderer._selectFrames(clmodel, e);
-
-    // Setup interpolation
-    gl.uniform1f(program.uInterpolation, R.interpolation.value && (e.effects & effect.EF_MUZZLEFLASH) === 0 ? Math.min(1, Math.max(0, targettime)) : 0);
-    gl.uniform1f(program.uTime, Host.realtime);
-    gl.uniform1f(program.uAlpha, e.alpha);
-    gl.uniform1f(program.uBloomEmissiveScale, getEntityBloomEmissiveScale(e.effects));
-
-    // Bind vertex buffer and setup attributes
-    gl.bindBuffer(gl.ARRAY_BUFFER, clmodel.cmds);
-    gl.vertexAttribPointer(program.aPositionA.location, 3, gl.FLOAT, false, 24, frameA.cmdofs);
-    gl.vertexAttribPointer(program.aPositionB.location, 3, gl.FLOAT, false, 24, frameB.cmdofs);
-    gl.vertexAttribPointer(program.aNormal.location, 3, gl.FLOAT, false, 24, frameA.cmdofs + 12);
-    gl.vertexAttribPointer(program.aTexCoord.location, 2, gl.FLOAT, false, 0, 0);
-
-    // Select and bind skin texture
-    const skin = this._selectSkin(clmodel, e);
-    skin.texturenum.bind(program.tTexture);
-    (skin.luminanceTexture || R.blacktexture).bind(program.tLuminance);
-    if (clmodel.player === true) {
-      skin.playertexture.bind(program.tPlayer);
-    }
-
-    // Bind local shadow maps
-    if (program.tShadowMap0 !== undefined && R.shadow_textures?.[0]) {
-      GL.Bind(program.tShadowMap0, R.shadow_textures[0]);
-    }
-    if (program.tShadowMap1 !== undefined && R.shadow_textures?.[1]) {
-      GL.Bind(program.tShadowMap1, R.shadow_textures[1]);
-    }
-    if (program.tShadowMap2 !== undefined && R.shadow_textures?.[2]) {
-      GL.Bind(program.tShadowMap2, R.shadow_textures[2]);
-    }
-
-    // Bind point light cube shadow map
-    if (program.tPointShadowMap !== undefined && R.point_shadow_texture) {
-      GL.BindCube(program.tPointShadowMap, R.point_shadow_texture);
-    }
-
-    if (pass === 2) {
-      gl.enable(gl.BLEND);
-      gl.blendFunc(gl.SRC_ALPHA, gl.ONE_MINUS_SRC_ALPHA);
-    }
-
-    // Draw the model
-    gl.drawArrays(gl.TRIANGLES, 0, clmodel._num_tris * 3);
-
-    if (pass === 2) {
-      gl.disable(gl.BLEND);
-    }
-  }
-
-  /**
-   * Select animation frames for rendering with interpolation
-   * @param {import('../../common/model/AliasModel.ts').AliasModel} clmodel The alias model
-   * @param {import('../ClientEntities.ts').ClientEdict} e The entity
-   * @returns {{frameA: object, frameB: object, targettime: number}} Selected frames and interpolation factor
-   */
-  static _selectFrames(clmodel, e) {
-    const time = CL.state.time + e.syncbase;
-    let num = e.frame;
-
-    // Validate frame number
-    if ((num >= clmodel.frames.length) || (num < 0)) {
-      Con.DPrint('AliasModelRenderer: no such frame ' + num + '\n');
-      num = 0;
-    }
-
-    let frame = clmodel.frames[num];
-    let frameA = frame;
-    let frameB = frame;
-    let targettime = 0;
-
-    // Handle frame groups (animated sequences)
-    if (frame.group === true) {
-      num = frame.frames.length - 1;
-      const fullinterval = frame.frames[num].interval;
-      frameA = frame.frames[0];
-      frameB = frame.frames[1 % frame.frames.length];
-      targettime = time - Math.floor(time / fullinterval) * fullinterval;
-
-      for (let i = 0; i < num; i++) {
-        if (frame.frames[i].interval > targettime) {
-          frameA = frame.frames[i];
-          frameB = frame.frames[(i + 1) % frame.frames.length];
-          break;
-        }
-      }
-    } else if (R.interpolation.value && (e.effects & effect.EF_MUZZLEFLASH) === 0) {
-      // Handle lerp-based interpolation
-      const [previousFrame, nextFrame, f] = e.lerp.frame;
-      frameA = clmodel.frames[previousFrame];
-      frameB = clmodel.frames[nextFrame];
-      targettime = f;
-    }
-
-    return { frameA, frameB, targettime };
-  }
-
-  /**
-   * Select skin texture for rendering (handles skin groups and animation)
-   * @private
-   * @param {import('../../common/model/AliasModel.ts').AliasModel} clmodel The alias model
-   * @param {import('../ClientEntities.ts').ClientEdict} e The entity
-   * @returns {object} Selected skin texture
-   */
-  _selectSkin(clmodel, e) {
-    const time = CL.state.time + e.syncbase;
-    let num = e.skinnum;
-
-    // Validate skin number
-    if ((num >= clmodel.skins.length) || (num < 0)) {
-      Con.DPrint('AliasModelRenderer: no such skin # ' + num + '\n');
-      num = 0;
-    }
-
-    let skin = clmodel.skins[num];
-
-    // Handle skin groups (animated textures)
-    if (skin.group === true) {
-      num = skin.skins.length - 1;
-      const fullinterval = skin.skins[num].interval;
-      const targettime = time - Math.floor(time / fullinterval) * fullinterval;
-
-      let i = 0;
-      for (i = 0; i < num; i++) {
-        if (skin.skins[i].interval > targettime) {
-          break;
-        }
-      }
-      skin = skin.skins[i];
-    }
-
-    return skin;
-  }
-
-  /**
-   * Cleanup rendering state after alias models
-   * @param {number} [_pass] Rendering pass (0=opaque, 1=transparent)
-   */
-  // eslint-disable-next-line no-unused-vars
-  cleanupRenderState(_pass = 0) {
-    // Alias models clean up their own state per-entity
-    // No shared cleanup needed at this level
-  }
-
-  /**
-   * Prepare alias model for rendering (build vertex buffers from triangle data).
-   * @param {import('../../common/model/AliasModel.ts').AliasModel} model The alias model to prepare
-   * @param {boolean} isWorldModel Whether this model is the world model
-   */
-  // eslint-disable-next-line no-unused-vars
-  prepareModel(model, isWorldModel = false) {
-    // This will be implemented in a later task
-    // For now, vertex buffer building is still done in Mod.ts
-    Con.DPrint(`AliasModelRenderer.prepareModel: TODO - implement for ${model.name}\n`);
-  }
-
-  /**
-   * Free GPU resources for this alias model.
-   * @param {import('../../common/model/AliasModel.ts').AliasModel} model The alias model to cleanup
-   */
-  cleanupModel(model) {
-    if (model.cmds) {
-      gl.deleteBuffer(model.cmds);
-      model.cmds = null;
-    }
-  }
-}
diff --git a/source/engine/client/renderer/AliasModelRenderer.ts b/source/engine/client/renderer/AliasModelRenderer.ts
new file mode 100644
index 00000000..7fe16bf9
--- /dev/null
+++ b/source/engine/client/renderer/AliasModelRenderer.ts
@@ -0,0 +1,317 @@
+import Vector from '../../../shared/Vector.ts';
+import { ModelRenderer } from './ModelRenderer.ts';
+import { getEntityBloomEmissiveScale } from './BloomEffect.ts';
+import { eventBus, getClientRegistry } from '../../registry.mjs';
+import GL from '../GL.ts';
+import W from '../../common/W.ts';
+import { effect } from '../../../shared/Defs.ts';
+import type { AliasModel, AliasSingleFrame, AliasGroupedFrameEntry, AliasSingleSkin, AliasGroupedSkinEntry } from '../../common/model/AliasModel.ts';
+import type { ClientEdict } from '../ClientEntities.ts';
+import type { BaseModel } from '../../common/model/BaseModel.ts';
+
+let { CL, Host, R, Con } = getClientRegistry();
+
+eventBus.subscribe('registry.frozen', () => {
+  ({ CL, Host, R, Con } = getClientRegistry());
+});
+
+let gl: WebGL2RenderingContext = null!;
+
+eventBus.subscribe('gl.ready', () => {
+  gl = GL.gl;
+});
+
+eventBus.subscribe('gl.shutdown', () => {
+  gl = null!;
+});
+
+/** A frame that can be directly used for rendering (has cmdofs). */
+type AliasRenderFrame = AliasSingleFrame | AliasGroupedFrameEntry;
+
+/** A resolved (non-group) skin that can be directly used for rendering. */
+type AliasRenderSkin = AliasSingleSkin | AliasGroupedSkinEntry;
+
+/** Selected frame pair and interpolation factor returned by {@link AliasModelRenderer._selectFrames}. */
+interface AliasFrameSelection {
+  frameA: AliasRenderFrame;
+  frameB: AliasRenderFrame;
+  targettime: number;
+}
+
+/**
+ * Renderer for Alias MDL models (animated mesh models like monsters, weapons, items).
+ * Handles frame interpolation, skinning, and player color translation.
+ */
+export class AliasModelRenderer extends ModelRenderer {
+  /**
+   * Get the model type this renderer handles.
+   * @returns Mod.type.alias (2)
+   */
+  override getModelType(): number {
+    return 2; // Mod.type.alias
+  }
+
+  /**
+   * Setup rendering state for alias models.
+   * @param _pass Rendering pass (0=opaque, 1=transparent).
+   */
+
+  override setupRenderState(_pass = 0): void {
+    // Alias models setup their own state per-entity (different shaders for players)
+    // No shared setup needed at this level
+  }
+
+  /**
+   * @param _model The alias model.
+   * @param entity The entity being rendered.
+   * @returns True when this alias model should render in the opaque pass.
+   */
+  override rendersOpaquePass(_model: BaseModel, entity: ClientEdict): boolean {
+    return entity.alpha >= 1.0;
+  }
+
+  /**
+   * @param _model The alias model.
+   * @param entity The entity being rendered.
+   * @returns True when this alias model should render in the sorted transparent pass.
+   */
+  override rendersTransparentPass(_model: BaseModel, entity: ClientEdict): boolean {
+    return entity.alpha > 0.0 && entity.alpha < 1.0;
+  }
+
+  /**
+   * Render a single alias model entity.
+   * Handles frustum culling, frame interpolation, skinning, and player color translation.
+   * @param model The alias model to render.
+   * @param entity The entity being rendered.
+   * @param pass Rendering pass (0=opaque, 1=transparent).
+   */
+  override render(model: BaseModel, entity: ClientEdict, pass = 0): void {
+    const clmodel = model as AliasModel;
+    const e = entity;
+
+    // Frustum culling
+    if (R.CullBox(
+      new Vector(
+        e.origin[0] - clmodel.boundingradius,
+        e.origin[1] - clmodel.boundingradius,
+        e.origin[2] - clmodel.boundingradius,
+      ),
+      new Vector(
+        e.origin[0] + clmodel.boundingradius,
+        e.origin[1] + clmodel.boundingradius,
+        e.origin[2] + clmodel.boundingradius,
+      )) === true) {
+      return;
+    }
+
+    // Select shader program (player vs normal)
+    let program;
+    if ((e.colormap !== 0) && (clmodel.player === true) && (R.nocolors.value === 0)) {
+      program = GL.UseProgram('player');
+
+      // Calculate player colors
+      let top = (CL.state.scores[e.colormap - 1].colors & 0xf0) + 4;
+      let bottom = ((CL.state.scores[e.colormap - 1].colors & 0xf) << 4) + 4;
+      if (top <= 127) {
+        top += 7;
+      }
+      if (bottom <= 127) {
+        bottom += 7;
+      }
+      top = W.d_8to24table[top];
+      bottom = W.d_8to24table[bottom];
+
+      // Set player color uniforms
+      gl.uniform3f(program!.uTop!, top & 0xff, (top >> 8) & 0xff, top >> 16);
+      gl.uniform3f(program!.uBottom!, bottom & 0xff, (bottom >> 8) & 0xff, bottom >> 16);
+    } else {
+      program = GL.UseProgram('alias');
+    }
+
+    // Setup transforms
+    gl.uniform3fv(program!.uOrigin!, e.lerp.origin);
+    gl.uniformMatrix3fv(program!.uAngles!, false, e.lerp.angles.toRotationMatrix());
+
+    // Setup lighting
+    const [ambientlight, shadelight, lightVector, dynamicShadeLight, dynamicLightVector] = R._CalculateLightValues(e);
+    gl.uniform3fv(program!.uAmbientLight!, ambientlight);
+    gl.uniform3fv(program!.uShadeLight!, shadelight);
+    gl.uniform3fv(program!.uLightVec!, lightVector);
+    gl.uniform3fv(program!.uDynamicShadeLight!, dynamicShadeLight);
+    gl.uniform3fv(program!.uDynamicLightVec!, dynamicLightVector);
+
+    // Update performance counter
+    R.c_alias_polys += clmodel._num_tris;
+
+    // Select animation frames
+    const { frameA, frameB, targettime } = AliasModelRenderer._selectFrames(clmodel, e);
+
+    // Setup interpolation
+    gl.uniform1f(program!.uInterpolation!, R.interpolation.value && (e.effects & effect.EF_MUZZLEFLASH) === 0 ? Math.min(1, Math.max(0, targettime)) : 0);
+    gl.uniform1f(program!.uTime!, Host.realtime);
+    gl.uniform1f(program!.uAlpha!, e.alpha);
+    gl.uniform1f(program!.uBloomEmissiveScale!, getEntityBloomEmissiveScale(e.effects));
+
+    // Bind vertex buffer and setup attributes
+    gl.bindBuffer(gl.ARRAY_BUFFER, clmodel.cmds);
+    gl.vertexAttribPointer(program!.aPositionA!.location, 3, gl.FLOAT, false, 24, frameA.cmdofs!);
+    gl.vertexAttribPointer(program!.aPositionB!.location, 3, gl.FLOAT, false, 24, frameB.cmdofs!);
+    gl.vertexAttribPointer(program!.aNormal!.location, 3, gl.FLOAT, false, 24, frameA.cmdofs! + 12);
+    gl.vertexAttribPointer(program!.aTexCoord!.location, 2, gl.FLOAT, false, 0, 0);
+
+    // Select and bind skin texture
+    const skin = this._selectSkin(clmodel, e);
+    skin.texturenum!.bind(program!.tTexture!);
+    (skin.luminanceTexture || R.blacktexture).bind(program!.tLuminance!);
+    if (clmodel.player === true) {
+      skin.playertexture!.bind(program!.tPlayer!);
+    }
+
+    // Bind local shadow maps
+    if (program!.tShadowMap0 !== undefined && R.shadow_textures?.[0]) {
+      GL.Bind(program!.tShadowMap0, R.shadow_textures[0]);
+    }
+    if (program!.tShadowMap1 !== undefined && R.shadow_textures?.[1]) {
+      GL.Bind(program!.tShadowMap1, R.shadow_textures[1]);
+    }
+    if (program!.tShadowMap2 !== undefined && R.shadow_textures?.[2]) {
+      GL.Bind(program!.tShadowMap2, R.shadow_textures[2]);
+    }
+
+    // Bind point light cube shadow map
+    if (program!.tPointShadowMap !== undefined && R.point_shadow_texture) {
+      GL.BindCube(program!.tPointShadowMap, R.point_shadow_texture);
+    }
+
+    if (pass === 2) {
+      gl.enable(gl.BLEND);
+      gl.blendFunc(gl.SRC_ALPHA, gl.ONE_MINUS_SRC_ALPHA);
+    }
+
+    // Draw the model
+    gl.drawArrays(gl.TRIANGLES, 0, clmodel._num_tris * 3);
+
+    if (pass === 2) {
+      gl.disable(gl.BLEND);
+    }
+  }
+
+  /**
+   * Select animation frames for rendering with interpolation.
+   * @param clmodel The alias model.
+   * @param e The entity.
+   * @returns Selected frames and interpolation factor.
+   */
+  static _selectFrames(clmodel: AliasModel, e: ClientEdict): AliasFrameSelection {
+    const time = CL.state.time + e.syncbase;
+    let num = e.frame;
+
+    // Validate frame number
+    if ((num >= clmodel.frames.length) || (num < 0)) {
+      Con.DPrint(`AliasModelRenderer: no such frame ${num}\n`);
+      num = 0;
+    }
+
+    const frameGroup = clmodel.frames[num];
+    let frameA: AliasRenderFrame;
+    let frameB: AliasRenderFrame;
+    let targettime = 0;
+
+    // Handle frame groups (animated sequences)
+    if (frameGroup.group === true) {
+      const groupLen = frameGroup.frames.length - 1;
+      const fullinterval = frameGroup.frames[groupLen].interval;
+      frameA = frameGroup.frames[0];
+      frameB = frameGroup.frames[1 % frameGroup.frames.length];
+      targettime = time - Math.floor(time / fullinterval) * fullinterval;
+
+      for (let i = 0; i < groupLen; i++) {
+        if (frameGroup.frames[i].interval > targettime) {
+          frameA = frameGroup.frames[i];
+          frameB = frameGroup.frames[(i + 1) % frameGroup.frames.length];
+          break;
+        }
+      }
+    } else if (R.interpolation.value && (e.effects & effect.EF_MUZZLEFLASH) === 0) {
+      // Handle lerp-based interpolation
+      const [previousFrame, nextFrame, f] = e.lerp.frame;
+      frameA = clmodel.frames[previousFrame] as AliasRenderFrame;
+      frameB = clmodel.frames[nextFrame] as AliasRenderFrame;
+      targettime = f;
+    } else {
+      frameA = frameGroup;
+      frameB = frameGroup;
+    }
+
+    return { frameA, frameB, targettime };
+  }
+
+  /**
+   * Select skin texture for rendering (handles skin groups and animation).
+   * @param clmodel The alias model.
+   * @param e The entity.
+   * @returns Selected skin texture entry.
+   */
+  private _selectSkin(clmodel: AliasModel, e: ClientEdict): AliasRenderSkin {
+    const time = CL.state.time + e.syncbase;
+    let num = e.skinnum;
+
+    // Validate skin number
+    if ((num >= clmodel.skins.length) || (num < 0)) {
+      Con.DPrint(`AliasModelRenderer: no such skin # ${num}\n`);
+      num = 0;
+    }
+
+    let skin = clmodel.skins[num];
+
+    // Handle skin groups (animated textures)
+    if (skin.group === true) {
+      const groupLen = skin.skins.length - 1;
+      const fullinterval = skin.skins[groupLen].interval;
+      const targettime = time - Math.floor(time / fullinterval) * fullinterval;
+
+      let i = 0;
+      for (i = 0; i < groupLen; i++) {
+        if (skin.skins[i].interval > targettime) {
+          break;
+        }
+      }
+      return skin.skins[i];
+    }
+
+    return skin;
+  }
+
+  /**
+   * Cleanup rendering state after alias models.
+   * @param _pass Rendering pass (0=opaque, 1=transparent).
+   */
+
+  override cleanupRenderState(_pass = 0): void {
+    // Alias models clean up their own state per-entity
+    // No shared cleanup needed at this level
+  }
+
+  /**
+   * Prepare alias model for rendering (build vertex buffers from triangle data).
+   * @param model The alias model to prepare.
+   * @param isWorldModel Whether this model is the world model.
+   */
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
+  override prepareModel(model: BaseModel, isWorldModel = false): void {
+    Con.DPrint(`AliasModelRenderer.prepareModel: TODO - implement for ${model.name}\n`);
+  }
+
+  /**
+   * Free GPU resources for this alias model.
+   * @param model The alias model to cleanup.
+   */
+  override cleanupModel(model: BaseModel): void {
+    const aliasModel = model as AliasModel;
+    if (aliasModel.cmds) {
+      gl.deleteBuffer(aliasModel.cmds);
+      aliasModel.cmds = null;
+    }
+  }
+}
diff --git a/source/engine/client/renderer/BloomEffect.mjs b/source/engine/client/renderer/BloomEffect.ts
similarity index 59%
rename from source/engine/client/renderer/BloomEffect.mjs
rename to source/engine/client/renderer/BloomEffect.ts
index 24a2c94f..7dffdc94 100644
--- a/source/engine/client/renderer/BloomEffect.mjs
+++ b/source/engine/client/renderer/BloomEffect.ts
@@ -1,33 +1,45 @@
-import GL from '../GL.mjs';
-import PostProcess from './PostProcess.mjs';
+import GL from '../GL.ts';
+import PostProcess from './PostProcess.ts';
 import VID from '../VID.ts';
-import PostProcessEffect from './PostProcessEffect.mjs';
+import PostProcessEffect from './PostProcessEffect.ts';
 import Vector from '../../../shared/Vector.ts';
-import { eventBus, registry } from '../../registry.mjs';
+import { eventBus, getClientRegistry } from '../../registry.mjs';
 import { effect } from '../../../shared/Defs.ts';
 
-let { Draw, R } = registry;
+let { Draw, R } = getClientRegistry();
 
 eventBus.subscribe('registry.frozen', () => {
-  ({ Draw, R } = registry);
+  ({ Draw, R } = getClientRegistry());
 });
 
-/** @type {WebGL2RenderingContext} */
-let gl = /** @type {WebGL2RenderingContext} */ (null);
+let gl: WebGL2RenderingContext = null!;
 
 eventBus.subscribe('gl.ready', () => {
   gl = GL.gl;
 });
 
 eventBus.subscribe('gl.shutdown', () => {
-  gl = null;
+  gl = null!;
 });
 
+/** Textures available for bloom debug preview rendering. */
+interface BloomDebugTextures {
+  emissiveTexture: WebGLTexture | null;
+  extractTexture: WebGLTexture | null;
+  blurTexture: WebGLTexture | null;
+}
+
+/** A single item in the bloom debug preview list. */
+interface BloomDebugPreviewItem {
+  label: string;
+  texture: WebGLTexture;
+}
+
 /**
- * @param {number} downsample Requested downsample divisor.
- * @returns {number} Clamped divisor for the bloom buffers.
+ * @param downsample Requested downsample divisor.
+ * @returns Clamped divisor for the bloom buffers.
  */
-export function resolveBloomDownsample(downsample) {
+export function resolveBloomDownsample(downsample: number): number {
   const requested = downsample >> 0;
 
   if (requested <= 1) {
@@ -38,10 +50,10 @@ export function resolveBloomDownsample(downsample) {
 }
 
 /**
- * @param {number} mode Requested debug preview mode.
- * @returns {number} Clamped bloom debug mode.
+ * @param mode Requested debug preview mode.
+ * @returns Clamped bloom debug mode.
  */
-export function resolveBloomDebugMode(mode) {
+export function resolveBloomDebugMode(mode: number): number {
   const requested = mode >> 0;
 
   if (requested <= 0) {
@@ -52,18 +64,18 @@ export function resolveBloomDebugMode(mode) {
 }
 
 /**
- * @param {number} mode Requested debug preview mode.
- * @param {{emissiveTexture: WebGLTexture|null, extractTexture: WebGLTexture|null, blurTexture: WebGLTexture|null}} textures Preview textures.
- * @returns {{label: string, texture: WebGLTexture}[]} Preview items to render.
+ * @param mode Requested debug preview mode.
+ * @param textures Preview textures.
+ * @returns Preview items to render.
  */
-export function getBloomDebugPreviewItems(mode, textures) {
+export function getBloomDebugPreviewItems(mode: number, textures: BloomDebugTextures): BloomDebugPreviewItem[] {
   const resolvedMode = resolveBloomDebugMode(mode);
 
   if (resolvedMode === 0) {
     return [];
   }
 
-  const previewItems = /** @type {{label: string, texture: WebGLTexture|null}[]} */ ([]);
+  const previewItems: { label: string; texture: WebGLTexture | null }[] = [];
 
   if (resolvedMode === 1 || resolvedMode === 4) {
     previewItems.push({ label: 'emissive', texture: textures.emissiveTexture });
@@ -79,16 +91,16 @@ export function getBloomDebugPreviewItems(mode, textures) {
     return [];
   }
 
-  return /** @type {{label: string, texture: WebGLTexture}[]} */ (previewItems);
+  return previewItems as BloomDebugPreviewItem[];
 }
 
 /**
- * @param {number} width Full-resolution width.
- * @param {number} height Full-resolution height.
- * @param {number} downsample Requested downsample divisor.
- * @returns {{width: number, height: number}} Bloom buffer dimensions.
+ * @param width Full-resolution width.
+ * @param height Full-resolution height.
+ * @param downsample Requested downsample divisor.
+ * @returns Bloom buffer dimensions.
  */
-export function getBloomBufferSize(width, height, downsample) {
+export function getBloomBufferSize(width: number, height: number, downsample: number): { width: number; height: number } {
   const divisor = resolveBloomDownsample(downsample);
 
   return {
@@ -98,10 +110,10 @@ export function getBloomBufferSize(width, height, downsample) {
 }
 
 /**
- * @param {number} entityEffects Bitmask of entity effect flags.
- * @returns {number} Emissive bloom scale for the entity.
+ * @param entityEffects Bitmask of entity effect flags.
+ * @returns Emissive bloom scale for the entity.
  */
-export function getEntityBloomEmissiveScale(entityEffects) {
+export function getEntityBloomEmissiveScale(entityEffects: number): number {
   return (entityEffects & (effect.EF_FULLBRIGHT | effect.EF_MUZZLEFLASH)) !== 0 ? 1.0 : 0.0;
 }
 
@@ -109,32 +121,30 @@ export function getEntityBloomEmissiveScale(entityEffects) {
  * Emissive-driven bloom effect with quarter-resolution blur and additive composite.
  */
 export default class BloomEffect extends PostProcessEffect {
-  /** @type {WebGLFramebuffer} Bright-pass framebuffer. */
-  static extractFBO = null;
+  /** Bright-pass framebuffer. */
+  static extractFBO: WebGLFramebuffer | null = null;
 
-  /** @type {WebGLTexture} Bright-pass texture. */
-  static extractTexture = null;
+  /** Bright-pass texture. */
+  static extractTexture: WebGLTexture | null = null;
 
-  /** @type {WebGLFramebuffer} Blur framebuffer. */
-  static blurFBO = null;
+  /** Blur framebuffer. */
+  static blurFBO: WebGLFramebuffer | null = null;
 
-  /** @type {WebGLTexture} Blur texture. */
-  static blurTexture = null;
+  /** Blur texture. */
+  static blurTexture: WebGLTexture | null = null;
 
-  /** @type {number} Current bloom buffer width. */
+  /** Current bloom buffer width. */
   static width = 0;
 
-  /** @type {number} Current bloom buffer height. */
+  /** Current bloom buffer height. */
   static height = 0;
 
   constructor() {
     super('bloom');
   }
 
-  /**
-   * Create bloom framebuffers and textures.
-   */
-  init() {
+  /** Create bloom framebuffers and textures. */
+  override init(): void {
     BloomEffect.extractFBO = gl.createFramebuffer();
     BloomEffect.extractTexture = BloomEffect.#createColorTexture();
     gl.bindFramebuffer(gl.FRAMEBUFFER, BloomEffect.extractFBO);
@@ -148,10 +158,10 @@ export default class BloomEffect extends PostProcessEffect {
   }
 
   /**
-   * @param {number} width New width in pixels.
-   * @param {number} height New height in pixels.
+   * @param width New width in pixels.
+   * @param height New height in pixels.
    */
-  resize(width, height) {
+  override resize(width: number, height: number): void {
     const downsample = R.bloomDownsample ? R.bloomDownsample.value : 4;
     const size = getBloomBufferSize(width, height, downsample);
 
@@ -170,19 +180,19 @@ export default class BloomEffect extends PostProcessEffect {
   }
 
   /**
-   * @param {WebGLTexture} inputTexture Scene color texture.
-   * @param {number} x Output viewport x position.
-   * @param {number} y Output viewport y position.
-   * @param {number} width Output viewport width.
-   * @param {number} height Output viewport height.
+   * @param inputTexture Scene color texture.
+   * @param x Output viewport x position.
+   * @param y Output viewport y position.
+   * @param width Output viewport width.
+   * @param height Output viewport height.
    */
-  apply(inputTexture, x, y, width, height) {
+  override apply(inputTexture: WebGLTexture, x: number, y: number, width: number, height: number): void {
     if (!BloomEffect.extractFBO || !BloomEffect.blurFBO || BloomEffect.width === 0 || BloomEffect.height === 0) {
       return;
     }
 
-    const outputFramebuffer = gl.getParameter(gl.FRAMEBUFFER_BINDING);
-    const outputViewport = gl.getParameter(gl.VIEWPORT);
+    const outputFramebuffer = gl.getParameter(gl.FRAMEBUFFER_BINDING) as WebGLFramebuffer | null;
+    const outputViewport = gl.getParameter(gl.VIEWPORT) as Int32Array;
 
     gl.disable(gl.BLEND);
 
@@ -194,22 +204,20 @@ export default class BloomEffect extends PostProcessEffect {
     gl.bindFramebuffer(gl.FRAMEBUFFER, BloomEffect.blurFBO);
     gl.viewport(0, 0, BloomEffect.width, BloomEffect.height);
     gl.clear(gl.COLOR_BUFFER_BIT);
-    BloomEffect.#blur(BloomEffect.extractTexture, 1.0 / BloomEffect.width, 0.0);
+    BloomEffect.#blur(BloomEffect.extractTexture!, 1.0 / BloomEffect.width, 0.0);
 
     gl.bindFramebuffer(gl.FRAMEBUFFER, BloomEffect.extractFBO);
     gl.viewport(0, 0, BloomEffect.width, BloomEffect.height);
     gl.clear(gl.COLOR_BUFFER_BIT);
-    BloomEffect.#blur(BloomEffect.blurTexture, 0.0, 1.0 / BloomEffect.height);
+    BloomEffect.#blur(BloomEffect.blurTexture!, 0.0, 1.0 / BloomEffect.height);
 
     gl.bindFramebuffer(gl.FRAMEBUFFER, outputFramebuffer);
     gl.viewport(outputViewport[0], outputViewport[1], outputViewport[2], outputViewport[3]);
     BloomEffect.#composite(inputTexture, x, y, width, height);
   }
 
-  /**
-   * Clean up bloom GPU resources.
-   */
-  shutdown() {
+  /** Clean up bloom GPU resources. */
+  override shutdown(): void {
     if (BloomEffect.extractFBO) {
       gl.deleteFramebuffer(BloomEffect.extractFBO);
       BloomEffect.extractFBO = null;
@@ -232,10 +240,8 @@ export default class BloomEffect extends PostProcessEffect {
     this.active = false;
   }
 
-  /**
-   * Draw an on-screen bloom debug preview.
-   */
-  drawDebugPreview() {
+  /** Draw an on-screen bloom debug preview. */
+  override drawDebugPreview(): void {
     const mode = resolveBloomDebugMode(R.bloomDebug ? R.bloomDebug.value : 0);
 
     if (mode === 0) {
@@ -258,15 +264,11 @@ export default class BloomEffect extends PostProcessEffect {
     const availableWidth = Math.max(96, VID.width - margin * (previewItems.length + 1));
     const previewWidth = Math.max(96, Math.min(256, Math.floor(availableWidth / previewItems.length)));
     const previewHeight = Math.max(54, Math.floor(previewWidth * 9 / 16));
-    const previews = /** @type {{label: string, texture: WebGLTexture, x: number}[]} */ ([]);
+    const previews: Array<{ label: string; texture: WebGLTexture; x: number }> = [];
     let x = margin;
 
     for (const item of previewItems) {
-      previews.push({
-        label: item.label,
-        texture: item.texture,
-        x,
-      });
+      previews.push({ label: item.label, texture: item.texture, x });
       x += previewWidth + margin;
     }
 
@@ -285,11 +287,9 @@ export default class BloomEffect extends PostProcessEffect {
     }
   }
 
-  /**
-   * @returns {WebGLTexture} Newly configured bloom texture.
-   */
-  static #createColorTexture() {
-    const texture = gl.createTexture();
+  /** @returns Newly configured bloom texture. */
+  static #createColorTexture(): WebGLTexture {
+    const texture = gl.createTexture()!;
     GL.Bind(0, texture);
     gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_MIN_FILTER, gl.LINEAR);
     gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_MAG_FILTER, gl.LINEAR);
@@ -299,66 +299,64 @@ export default class BloomEffect extends PostProcessEffect {
     return texture;
   }
 
-  /**
-   */
-  static #extract() {
+  static #extract(): void {
     const program = GL.UseProgram('bloom-extract');
-    GL.Bind(program.tTexture, PostProcess.emissiveTexture);
+    GL.Bind(program!.tTexture!, PostProcess.emissiveTexture);
     GL.StreamDrawTexturedQuad(0, 0, VID.width, VID.height, 0.0, 1.0, 1.0, 0.0);
     GL.StreamFlush();
   }
 
   /**
-   * @param {WebGLTexture} inputTexture Texture to blur.
-   * @param {number} texelOffsetX Horizontal texel offset.
-   * @param {number} texelOffsetY Vertical texel offset.
+   * @param inputTexture Texture to blur.
+   * @param texelOffsetX Horizontal texel offset.
+   * @param texelOffsetY Vertical texel offset.
    */
-  static #blur(inputTexture, texelOffsetX, texelOffsetY) {
+  static #blur(inputTexture: WebGLTexture, texelOffsetX: number, texelOffsetY: number): void {
     const program = GL.UseProgram('bloom-blur');
-    GL.Bind(program.tTexture, inputTexture);
-    gl.uniform2f(program.uTexelOffset, texelOffsetX, texelOffsetY);
+    GL.Bind(program!.tTexture!, inputTexture);
+    gl.uniform2f(program!.uTexelOffset!, texelOffsetX, texelOffsetY);
     GL.StreamDrawTexturedQuad(0, 0, VID.width, VID.height, 0.0, 1.0, 1.0, 0.0);
     GL.StreamFlush();
   }
 
   /**
-   * @param {WebGLTexture} inputTexture Scene color texture.
-   * @param {number} x Output viewport x position.
-   * @param {number} y Output viewport y position.
-   * @param {number} width Output viewport width.
-   * @param {number} height Output viewport height.
+   * @param inputTexture Scene color texture.
+   * @param x Output viewport x position.
+   * @param y Output viewport y position.
+   * @param width Output viewport width.
+   * @param height Output viewport height.
    */
-  static #composite(inputTexture, x, y, width, height) {
+  static #composite(inputTexture: WebGLTexture, x: number, y: number, width: number, height: number): void {
     const program = GL.UseProgram('bloom-composite');
-    GL.Bind(program.tScene, inputTexture);
-    GL.Bind(program.tBloom, BloomEffect.extractTexture);
-    gl.uniform1f(program.uStrength, R.bloomStrength.value);
+    GL.Bind(program!.tScene!, inputTexture);
+    GL.Bind(program!.tBloom!, BloomEffect.extractTexture);
+    gl.uniform1f(program!.uStrength!, R.bloomStrength.value);
     GL.StreamDrawTexturedQuad(x, y, width, height, 0.0, 1.0, 1.0, 0.0);
     GL.StreamFlush();
   }
 
   /**
-   * @param {WebGLTexture} texture Texture to preview.
-   * @param {number} x Screen x position.
-   * @param {number} y Screen y position.
-   * @param {number} width Preview width.
-   * @param {number} height Preview height.
+   * @param texture Texture to preview.
+   * @param x Screen x position.
+   * @param y Screen y position.
+   * @param width Preview width.
+   * @param height Preview height.
    */
-  static #drawDebugTexture(texture, x, y, width, height) {
+  static #drawDebugTexture(texture: WebGLTexture, x: number, y: number, width: number, height: number): void {
     const program = GL.UseProgram('pic');
-    gl.uniform3f(program.uColor, 1.0, 1.0, 1.0);
-    GL.Bind(program.tTexture, texture);
+    gl.uniform3f(program!.uColor!, 1.0, 1.0, 1.0);
+    GL.Bind(program!.tTexture!, texture);
     GL.StreamDrawTexturedQuad(x, y, width, height, 0.0, 1.0, 1.0, 0.0);
     GL.StreamFlush();
   }
 
   /**
-   * @param {number} x Frame x position.
-   * @param {number} y Frame y position.
-   * @param {number} width Frame width.
-   * @param {number} height Frame height.
+   * @param x Frame x position.
+   * @param y Frame y position.
+   * @param width Frame width.
+   * @param height Frame height.
    */
-  static #drawDebugFrame(x, y, width, height) {
+  static #drawDebugFrame(x: number, y: number, width: number, height: number): void {
     const frameColor = new Vector(1.0, 1.0, 1.0);
     Draw.Fill(x - 1, y - 1, width + 2, 1, frameColor);
     Draw.Fill(x - 1, y + height, width + 2, 1, frameColor);
diff --git a/source/engine/client/renderer/BrushModelRenderer.mjs b/source/engine/client/renderer/BrushModelRenderer.ts
similarity index 63%
rename from source/engine/client/renderer/BrushModelRenderer.mjs
rename to source/engine/client/renderer/BrushModelRenderer.ts
index 0fa53e87..3ad19fb9 100644
--- a/source/engine/client/renderer/BrushModelRenderer.mjs
+++ b/source/engine/client/renderer/BrushModelRenderer.ts
@@ -1,29 +1,30 @@
 import Vector from '../../../shared/Vector.ts';
-import { ModelRenderer } from './ModelRenderer.mjs';
-import { eventBus, registry } from '../../registry.mjs';
-import GL, { ATTRIB_LOCATIONS, BRUSH_VERTEX_STRIDE } from '../GL.mjs';
-import { getEntityBloomEmissiveScale } from './BloomEffect.mjs';
-import { materialFlags } from './Materials.mjs';
-import { BrushModel, Node } from '../../common/model/BSP.ts';
-import { ClientEdict } from '../ClientEntities.ts';
-import Mesh from './Mesh.mjs';
-import PostProcess from './PostProcess.mjs';
+import { ModelRenderer } from './ModelRenderer.ts';
+import { eventBus, getClientRegistry } from '../../registry.mjs';
+import GL, { type GLProgramInfo, ATTRIB_LOCATIONS, BRUSH_VERTEX_STRIDE } from '../GL.ts';
+import { getEntityBloomEmissiveScale } from './BloomEffect.ts';
+import { MaterialFlags, type BaseMaterial } from './Materials.ts';
+import type { BrushModel, Node, FogVolumeInfo, WorldTurbulentChainInfo } from '../../common/model/BSP.ts';
+import type { Face, BaseModel } from '../../common/model/BaseModel.ts';
+import type { ClientEdict } from '../ClientEntities.ts';
+import Mesh from './Mesh.ts';
+import PostProcess from './PostProcess.ts';
 import * as Def from '../../common/Def.ts';
 
-let { CL, Host, R } = registry;
+let { CL, Host, R } = getClientRegistry();
 
 eventBus.subscribe('registry.frozen', () => {
-  ({ CL, Host, R } = registry);
+  ({ CL, Host, R } = getClientRegistry());
 });
 
-let gl = /** @type {WebGL2RenderingContext} */ (null);
+let gl: WebGL2RenderingContext = null!;
 
 eventBus.subscribe('gl.ready', () => {
   gl = GL.gl;
 });
 
 eventBus.subscribe('gl.shutdown', () => {
-  gl = null;
+  gl = null!;
 });
 
 // Lightmap atlas configuration
@@ -46,40 +47,126 @@ const TURBULENT_FALLBACK_SCALE = 0.0078125;
 const TURBULENT_FALLBACK_EPSILON = 0.0001;
 
 /**
- * @param {number} strength Requested brush bloom contribution strength.
- * @returns {number} Sanitized non-negative bloom contribution strength.
+ * @param strength Requested brush bloom contribution strength.
+ * @returns Sanitized non-negative bloom contribution strength.
  */
-export function resolveBrushBloomContributionStrength(strength) {
+export function resolveBrushBloomContributionStrength(strength: number): number {
   return Number.isFinite(strength) && strength > 0.0 ? strength : 0.0;
 }
 
+/** Internal data held per fog volume light probe. */
+interface FogLightProbeData {
+  texture: WebGLTexture;
+  resX: number;
+  resY: number;
+  resZ: number;
+  data: Uint8Array;
+}
+
+/** Dynamic light entry used for fog volume dlight uploads. */
+interface FogDlightEntry {
+  origin: Vector;
+  radius: number;
+  color: Vector;
+  distSq: number;
+}
+
+/**
+ * Resolver return type for entity lighting state.
+ */
+interface EntityLightingState {
+  ambientlight: Vector;
+  shadelight: Vector;
+  lightPosition: Vector;
+  dynamicShadeLight: Vector;
+  dynamicLightPosition: Vector;
+  hasDeluxemap: boolean;
+}
+
 /**
  * Renderer for BSP brush models (maps and inline models like doors, platforms).
  * Handles both static world geometry and dynamic brush entities.
  */
 export class BrushModelRenderer extends ModelRenderer {
+  // ─── Static properties ────────────────────────────────────────────
+
+  /** Resolution of the 3D light probe grid per axis. */
+  static FOG_LIGHT_PROBE_RES = 8;
+
+  /**
+   * Maximum number of dynamic lights passed to the fog volume shader.
+   * Must match MAX_FOG_DLIGHTS in fog-volume.frag.
+   */
+  static MAX_FOG_DLIGHTS = 8;
+
+  // ─── Private instance fields ──────────────────────────────────────
+
+  /**
+   * Light probe textures for fog volumes, keyed by the fog volume object.
+   * Each entry holds a raw WebGL texture, the grid resolution, and a reusable
+   * pixel buffer to avoid reallocating on every lightstyle update.
+   */
+  #fogLightProbes: Map<FogVolumeInfo, FogLightProbeData> = new Map();
+
+  /**
+   * The lightstyle animation frame index when probes were last rebuilt.
+   * Lightstyles tick at 10 Hz (floor(time * 10)), so probes are only
+   * regenerated when this value changes.
+   */
+  #fogProbeStyleFrame: number = -1;
+
+  /** A 1×1 white texture used as a fallback when no light probe is available. */
+  #fogLightProbeWhite: WebGLTexture | null = null;
+
+  /**
+   * Lazily created unit cube VBO for rendering world-level fog volumes.
+   * The cube spans [0,1]^3 and is transformed via uOrigin/uAngles.
+   */
+  #fogCubeVBO: WebGLBuffer | null = null;
+
+  /** Lazily created VAO for the fog cube VBO (position-only, 12-byte stride). */
+  #fogCubeVAO: WebGLVertexArrayObject | null = null;
+
+  // ─── Runtime program/model state ─────────────────────────────────
+
+  /** Active 'brush' program during world transparent pass. */
+  _worldTransparentProgram: GLProgramInfo | null = null;
+
+  /** World model associated with the current transparent pass. */
+  _worldTransparentModel: BrushModel | null = null;
+
+  /** Active 'turbulent' program during world turbulent pass. */
+  _worldTurbulentProgram: GLProgramInfo | null = null;
+
+  /** World model associated with the current turbulent pass. */
+  _worldTurbulentModel: BrushModel | null = null;
+
+  /** Active 'fog-volume' program during fog volume pass. */
+  _fogVolumeProgram: GLProgramInfo | null = null;
+
+  // ─── Static methods ───────────────────────────────────────────────
+
   /**
    * Determine whether a brush model should sample the shared deluxemap atlas.
    * Inline BSP submodels reuse the world atlas even when they do not carry
    * their own `deluxemap` pointer.
-   * @param {BrushModel} clmodel The brush model being rendered
-   * @param {BrushModel|null} worldModel The active world model
-   * @returns {boolean} True when deluxemap sampling should stay enabled
+   * @returns True when the model references the shared world deluxemap atlas.
    */
-  static usesDeluxemap(clmodel, worldModel) {
+  static usesDeluxemap(clmodel: BrushModel, worldModel: BrushModel | null): boolean {
     return Boolean(clmodel.deluxemap !== null || (clmodel.submodel && worldModel?.deluxemap !== null));
   }
 
   /**
    * Build the lighting state used by inline brush entities.
    * Brush models should use the same BSP + dynamic-light sampling as alias/mesh entities.
-   * @param {BrushModel} clmodel The brush model being rendered
-   * @param {ClientEdict} entity The entity being rendered
-   * @param {(entity: ClientEdict) => [Vector, Vector, Vector, Vector, Vector]} calculateLightValues Light sampler callback
-   * @param {BrushModel|null} [worldModel] The active world model
-   * @returns {{ambientlight: Vector, shadelight: Vector, lightPosition: Vector, dynamicShadeLight: Vector, dynamicLightPosition: Vector, hasDeluxemap: boolean}} Resolved lighting state
-   */
-  static resolveEntityLightingState(clmodel, entity, calculateLightValues, worldModel = null) {
+   * @returns The resolved entity lighting state.
+   */
+  static resolveEntityLightingState(
+    clmodel: BrushModel,
+    entity: ClientEdict,
+    calculateLightValues: (entity: ClientEdict) => [Vector, Vector, Vector, Vector, Vector],
+    worldModel: BrushModel | null = null,
+  ): EntityLightingState {
     const [ambientlight, shadelight, lightPosition, dynamicShadeLight, dynamicLightPosition] = calculateLightValues(entity);
     const usesSharedWorldLightmap = clmodel.submodel === true
       && (clmodel.lightdata !== null || clmodel.lightdata_rgb !== null);
@@ -95,12 +182,11 @@ export class BrushModelRenderer extends ModelRenderer {
   }
 
   /**
+   * Projects and normalises a tangent axis against the surface normal.
    * @private
-   * @param {Vector} axis Axis candidate.
-   * @param {Vector} normal Surface normal.
-   * @returns {Vector|null} Axis projected onto the face plane, or null when degenerate.
+   * @returns The projected axis, or null when the result is degenerate.
    */
-  static _projectTurbulentFallbackAxis(axis, normal) {
+  static _projectTurbulentFallbackAxis(axis: Vector, normal: Vector): Vector | null {
     const projectedAxis = axis.copy().subtract(normal.copy().multiply(axis.dot(normal)));
 
     if (projectedAxis.normalize() <= TURBULENT_FALLBACK_EPSILON) {
@@ -111,12 +197,11 @@ export class BrushModelRenderer extends ModelRenderer {
   }
 
   /**
+   * Computes an orthonormal tangent/bitangent basis for turbulent UV fallback.
    * @private
-   * @param {BrushModel} model Model containing the face.
-   * @param {import('../../common/model/BaseModel.ts').Face} face Turbulent face being packed.
-   * @returns {{tangent: Vector, bitangent: Vector}} Face-plane sampling basis.
+   * @returns Tangent and bitangent vectors aligned to the surface.
    */
-  static _getTurbulentFallbackBasis(model, face) {
+  static _getTurbulentFallbackBasis(model: BrushModel, face: Face): { tangent: Vector; bitangent: Vector } {
     const normal = face.normal.copy();
 
     if (normal.normalize() <= TURBULENT_FALLBACK_EPSILON) {
@@ -134,13 +219,11 @@ export class BrushModelRenderer extends ModelRenderer {
       ? BrushModelRenderer._projectTurbulentFallbackAxis(new Vector(texinfo.vecs[1][0], texinfo.vecs[1][1], texinfo.vecs[1][2]), normal)
       : null;
 
-    const faceWithVerts = /** @type {import('../../common/model/BaseModel.ts').Face & { verts?: number[][] }} */ (face);
-
-    if (tangent === null && faceWithVerts.verts && faceWithVerts.verts.length >= 2) {
+    if (tangent === null && face.verts && face.verts.length >= 2) {
       const edge = new Vector(
-        faceWithVerts.verts[1][0] - faceWithVerts.verts[0][0],
-        faceWithVerts.verts[1][1] - faceWithVerts.verts[0][1],
-        faceWithVerts.verts[1][2] - faceWithVerts.verts[0][2],
+        face.verts[1][0] - face.verts[0][0],
+        face.verts[1][1] - face.verts[0][1],
+        face.verts[1][2] - face.verts[0][2],
       );
       tangent = BrushModelRenderer._projectTurbulentFallbackAxis(edge, normal);
     }
@@ -160,13 +243,16 @@ export class BrushModelRenderer extends ModelRenderer {
   }
 
   /**
-   * @param {BrushModel} model Model containing the face.
-   * @param {import('../../common/model/BaseModel.ts').Face} face Turbulent face being packed.
-   * @param {Vector} worldPos Vertex position used for the fallback sample.
-   * @param {(position: Vector) => [Vector, Vector]} sampleLightPoint Light sampler callback.
-   * @returns {number[]} Vertex-level fallback light color.
+   * Sample fallback light at a vertex position by probing the world in a neighborhood.
+   * @param sampleLightPoint Light sampler callback from R.LightPoint.
+   * @returns RGB light values in the 0..1 renderer range.
    */
-  static sampleTurbulentFallbackLight(model, face, worldPos, sampleLightPoint) {
+  static sampleTurbulentFallbackLight(
+    model: BrushModel,
+    face: Face,
+    worldPos: Vector,
+    sampleLightPoint: (position: Vector) => [Vector, Vector],
+  ): number[] {
     const normal = face.normal.copy();
 
     if (normal.normalize() <= TURBULENT_FALLBACK_EPSILON) {
@@ -197,7 +283,7 @@ export class BrushModelRenderer extends ModelRenderer {
       worldPos.copy().subtract(antiDiagonalOffset),
       new Vector(worldPos[0], worldPos[1], worldPos[2] - TURBULENT_FALLBACK_NORMAL_OFFSET),
     ];
-    const visibleSamples = [];
+    const visibleSamples: { color: Vector; intensity: number }[] = [];
     let bestColor = new Vector(0.0, 0.0, 0.0);
     let bestIntensity = 0.0;
 
@@ -258,12 +344,11 @@ export class BrushModelRenderer extends ModelRenderer {
   }
 
   /**
-   * @param {number[]} vertexLight Per-vertex fallback color.
-   * @param {number[]} faceLight Face-level fallback color.
-   * @param {number} factor Blend factor in the 0..1 range.
-   * @returns {number[]} Smoothed fallback color.
+   * Blend per-vertex and per-face turbulent fallback light by a smoothstep factor.
+   * @param factor Blend factor in the 0..1 range.
+   * @returns The blended RGB light values.
    */
-  static blendTurbulentFallbackLight(vertexLight, faceLight, factor) {
+  static blendTurbulentFallbackLight(vertexLight: number[], faceLight: number[], factor: number): number[] {
     const clampedFactor = Math.max(0.0, Math.min(factor, 1.0));
     const inverseFactor = 1.0 - clampedFactor;
 
@@ -274,40 +359,23 @@ export class BrushModelRenderer extends ModelRenderer {
     ];
   }
 
-  /**
-   * Get the model type this renderer handles
-   * @returns {number} Mod.type.brush (0)
-   */
-  getModelType() {
-    return 0; // Mod.type.brush
+  // ─── ModelRenderer interface ──────────────────────────────────────
+
+  /** @returns Mod.type.brush (0) */
+  getModelType(): number {
+    return 0;
   }
 
-  /**
-   * Setup rendering state for brush models.
-   * Binds shared textures and prepares GL state for brush rendering.
-   * @param {number} [_pass] Rendering pass (0=opaque, 1=transparent)
-   */
-  // eslint-disable-next-line no-unused-vars
-  setupRenderState(_pass = 0) {
+
+  setupRenderState(_pass = 0): void {
     // Brush models bind their own buffers and state per-entity
-    // No shared setup needed at this level
   }
 
-  /**
-   * @param {BrushModel} _model The brush model
-   * @param {ClientEdict} entity The entity being rendered
-   * @returns {boolean} True when the brush model should contribute to the opaque pass
-   */
-  rendersOpaquePass(_model, entity) {
+  rendersOpaquePass(_model: BaseModel, entity: ClientEdict): boolean {
     return entity.alpha >= 1.0;
   }
 
-  /**
-   * @param {BrushModel} model The brush model
-   * @param {ClientEdict} entity The entity being rendered
-   * @returns {boolean} True when the brush model has transparent content for the sorted pass
-   */
-  rendersTransparentPass(model, entity) {
+  rendersTransparentPass(model: BaseModel, entity: ClientEdict): boolean {
     if (entity.alpha <= 0.0) {
       return false;
     }
@@ -316,15 +384,17 @@ export class BrushModelRenderer extends ModelRenderer {
       return true;
     }
 
-    if (!model.chains || model.chains.length === 0) {
+    const clmodel = model as BrushModel;
+
+    if (!clmodel.chains || clmodel.chains.length === 0) {
       return false;
     }
 
-    for (let i = 0; i < model.chains.length; i++) {
-      const chain = model.chains[i];
-      const material = model.textures[chain[0]];
+    for (let i = 0; i < clmodel.chains.length; i++) {
+      const chain = clmodel.chains[i];
+      const material = clmodel.textures[chain[0]];
 
-      if ((material.flags & materialFlags.MF_TRANSPARENT) !== 0) {
+      if ((material.flags & MaterialFlags.MF_TRANSPARENT) !== 0) {
         return true;
       }
     }
@@ -335,16 +405,13 @@ export class BrushModelRenderer extends ModelRenderer {
   /**
    * Render a single brush model entity.
    * Handles frustum culling, transforms, lighting, and both opaque and turbulent surfaces.
-   * @param {BrushModel} model The brush model to render
-   * @param {ClientEdict} entity The entity being rendered
-   * @param {number} pass Rendering pass (0=opaque, 1=transparent)
+   * @param pass Rendering pass (0=opaque, 1=turbulent, 2=transparent)
    */
-  render(model, entity, pass = 0) {
-    const clmodel = model;
+  render(model: BaseModel, entity: ClientEdict, pass = 0): void {
+    const clmodel = model as BrushModel;
     const e = entity;
 
     // Check if this is the world entity (entity 0)
-    // World uses leafs structure, entities use chains structure
     if (e === CL.state.clientEntities.getEntity(0)) {
       if (pass === 0) {
         this.renderWorld(clmodel);
@@ -356,8 +423,7 @@ export class BrushModelRenderer extends ModelRenderer {
       return;
     }
 
-    // Regular brush entity rendering (doors, platforms, etc)
-    // Frustum culling
+    // Regular brush entity — frustum cull
     if (clmodel.submodel === true) {
       if (R.CullBox(
         new Vector(
@@ -388,7 +454,6 @@ export class BrushModelRenderer extends ModelRenderer {
       }
     }
 
-    // Bind VAO and render appropriate pass
     const viewMatrix = e.lerp.angles.toRotationMatrix();
 
     if (pass === 0) {
@@ -409,18 +474,18 @@ export class BrushModelRenderer extends ModelRenderer {
     }
   }
 
+  // ─── World rendering ──────────────────────────────────────────────
+
   /**
-   * Render the world (entity 0) opaque surfaces.
-   * World uses leafs structure instead of chains.
-   * @param {BrushModel} clmodel The world model
+   * Render the world (entity 0) opaque surfaces using the leafs structure.
    */
-  renderWorld(clmodel) {
+  renderWorld(clmodel: BrushModel): void {
     const worldspawn = CL.state.clientEntities.getEntity(0);
 
     GL.BindVAO(clmodel.opaqueVAO);
     R.c_brush_vbos++;
 
-    const program = GL.UseProgram('brush');
+    const program = GL.UseProgram('brush')!;
     gl.uniform3f(program.uAmbientLight, 1.0, 1.0, 1.0);
     gl.uniform3f(program.uShadeLight, 0.0, 0.0, 0.0);
     gl.uniform3f(program.uDynamicShadeLight, 0.0, 0.0, 0.0);
@@ -429,22 +494,15 @@ export class BrushModelRenderer extends ModelRenderer {
     gl.uniform1f(program.uBloomEmissiveScale, 0.0);
     gl.uniform1f(program.uBloomDlightScale, R.bloomDlightStrength.value);
     gl.uniform1f(program.uBloomSpecularScale, resolveBrushBloomContributionStrength(R.bloomSpecularStrength?.value ?? 0.0));
-
     gl.uniformMatrix3fv(program.uAngles, false, GL.identity);
     gl.uniform4f(program.uLightVec, 0.0, 0.0, 0.0, 0.0);
     gl.uniform3f(program.uDynamicLightVec, 0.0, 0.0, 0.0);
 
-    // Bind common textures
     this._setupBrushShaderCommon(program, clmodel, true);
     GL.Bind(program.tLightStyleA, R.lightstyle_texture_a);
     GL.Bind(program.tLightStyleB, R.lightstyle_texture_b);
     this._bindBrushDeluxemap(program, clmodel);
 
-    // wallhack: GL_BLEND is required
-    // gl.enable(gl.BLEND);
-    // gl.blendFunc(gl.SRC_ALPHA, gl.ONE_MINUS_SRC_ALPHA);
-
-    // Iterate through visible leafs
     for (let i = 0; i < clmodel.leafs.length; i++) {
       const leaf = clmodel.leafs[i];
 
@@ -458,14 +516,13 @@ export class BrushModelRenderer extends ModelRenderer {
 
       for (let j = 0; j < leaf.skychain; j++) {
         const cmds = leaf.cmds[j];
-        const material = clmodel.textures[cmds[0]];
+        const material = clmodel.textures[cmds[0]] as BaseMaterial;
 
-        if (material.flags & materialFlags.MF_SKIP) {
+        if (material.flags & MaterialFlags.MF_SKIP) {
           continue;
         }
 
-        // Skip transparent surfaces in opaque pass
-        if (material.flags & materialFlags.MF_TRANSPARENT) {
+        if (material.flags & MaterialFlags.MF_TRANSPARENT) {
           continue;
         }
 
@@ -485,10 +542,8 @@ export class BrushModelRenderer extends ModelRenderer {
 
   /**
    * Render the world (entity 0) transparent surfaces with alpha blending.
-   * World uses leafs structure instead of chains.
-   * @param {BrushModel} clmodel The world model
    */
-  renderWorldTransparent(clmodel) {
+  renderWorldTransparent(clmodel: BrushModel): void {
     this.beginWorldTransparentPass(clmodel);
     for (let i = 0; i < clmodel.leafs.length; i++) {
       const leaf = clmodel.leafs[i];
@@ -506,12 +561,10 @@ export class BrushModelRenderer extends ModelRenderer {
   /**
    * Collect visible world leafs that contain transparent surfaces, with
    * squared distance from the given viewpoint for back-to-front sorting.
-   * @param {BrushModel} clmodel The world model
-   * @param {Float32Array|number[]} vieworg Camera position [x, y, z]
-   * @returns {{leaf: Node, dist: number}[]} Transparent leaf items sorted by distance (farthest first)
+   * @returns Leaf entries with squared view distances for back-to-front sorting.
    */
-  getWorldTransparentLeaves(clmodel, vieworg) {
-    const items = [];
+  getWorldTransparentLeaves(clmodel: BrushModel, vieworg: Float32Array | number[]): { leaf: Node; dist: number }[] {
+    const items: { leaf: Node; dist: number }[] = [];
     for (let i = 0; i < clmodel.leafs.length; i++) {
       const leaf = clmodel.leafs[i];
       if (leaf.visframe !== R.visframecount || leaf.skychain === 0) {
@@ -520,10 +573,9 @@ export class BrushModelRenderer extends ModelRenderer {
       if (R.CullBox(leaf.mins, leaf.maxs)) {
         continue;
       }
-      // Check if this leaf has any transparent surfaces
       let hasTransparent = false;
       for (let j = 0; j < leaf.skychain; j++) {
-        if (clmodel.textures[leaf.cmds[j][0]].flags & materialFlags.MF_TRANSPARENT) {
+        if ((clmodel.textures[leaf.cmds[j][0]] as BaseMaterial).flags & MaterialFlags.MF_TRANSPARENT) {
           hasTransparent = true;
           break;
         }
@@ -540,14 +592,12 @@ export class BrushModelRenderer extends ModelRenderer {
   /**
    * Setup GL state for world transparent leaf rendering.
    * Call once before one or more `renderWorldTransparentLeaf` calls.
-   * @param {BrushModel} clmodel The world model
    */
-  beginWorldTransparentPass(clmodel) {
+  beginWorldTransparentPass(clmodel: BrushModel): void {
     GL.BindVAO(clmodel.opaqueVAO);
     R.c_brush_vbos++;
 
-    /** @type {object} */
-    const program = GL.UseProgram('brush');
+    const program = GL.UseProgram('brush')!;
     this._worldTransparentProgram = program;
     this._worldTransparentModel = clmodel;
 
@@ -573,23 +623,21 @@ export class BrushModelRenderer extends ModelRenderer {
   }
 
   /**
-   * Render a single leaf’s transparent surfaces.
+   * Render a single leaf's transparent surfaces.
    * Must be called between `beginWorldTransparentPass` and `endWorldTransparentPass`.
-   * @param {BrushModel} clmodel The world model
-   * @param {Node} leaf The BSP leaf to render
    */
-  renderWorldTransparentLeaf(clmodel, leaf) {
+  renderWorldTransparentLeaf(clmodel: BrushModel, leaf: Node): void {
     const worldspawn = CL.state.clientEntities.getEntity(0);
-    const program = this._worldTransparentProgram;
+    const program = this._worldTransparentProgram!;
 
     for (let j = 0; j < leaf.skychain; j++) {
       const cmds = leaf.cmds[j];
-      const material = clmodel.textures[cmds[0]];
+      const material = clmodel.textures[cmds[0]] as BaseMaterial;
 
-      if (material.flags & materialFlags.MF_SKIP) {
+      if (material.flags & MaterialFlags.MF_SKIP) {
         continue;
       }
-      if (!(material.flags & materialFlags.MF_TRANSPARENT)) {
+      if (!(material.flags & MaterialFlags.MF_TRANSPARENT)) {
         continue;
       }
 
@@ -604,22 +652,21 @@ export class BrushModelRenderer extends ModelRenderer {
     }
   }
 
-  /**
-   * Cleanup GL state after world transparent leaf rendering.
-   */
-  endWorldTransparentPass() {
+  /** Cleanup GL state after world transparent leaf rendering. */
+  endWorldTransparentPass(): void {
     gl.disable(gl.BLEND);
     GL.UnbindVAO();
     this._worldTransparentProgram = null;
     this._worldTransparentModel = null;
   }
 
+  // ─── World turbulent rendering ────────────────────────────────────
+
   /**
    * Render the world (entity 0) turbulent surfaces.
-   * World uses leafs structure instead of chains.
-   * @param {BrushModel} clmodel The world model
+   * Note: method name preserves original typo for API compatibility.
    */
-  renderWorldTurbolents(clmodel) {
+  renderWorldTurbolents(clmodel: BrushModel): void {
     this.beginWorldTurbulentPass(clmodel);
     for (let i = 0; i < clmodel.leafs.length; i++) {
       const leaf = clmodel.leafs[i];
@@ -635,14 +682,12 @@ export class BrushModelRenderer extends ModelRenderer {
   }
 
   /**
-   * Collect visible world leafs that contain turbulent surfaces, with
-   * squared distance from the given viewpoint for back-to-front sorting.
-   * @param {BrushModel} clmodel The world model
-   * @param {Float32Array|number[]} vieworg Camera position [x, y, z]
-   * @returns {{leaf: Node, dist: number}[]} Turbulent leaf items sorted by distance (farthest first)
+   * Collect visible world leafs that contain turbulent surfaces, sorted by
+   * distance from the given viewpoint (farthest first).
+   * @returns Leaf entries with view distances for farthest-first rendering.
    */
-  getWorldTurbulentLeaves(clmodel, vieworg) {
-    const items = [];
+  getWorldTurbulentLeaves(clmodel: BrushModel, vieworg: Float32Array | number[]): { leaf: Node; dist: number }[] {
+    const items: { leaf: Node; dist: number }[] = [];
     for (let i = 0; i < clmodel.leafs.length; i++) {
       const leaf = clmodel.leafs[i];
       if ((leaf.visframe !== R.visframecount) || (leaf.waterchain === leaf.cmds.length)) {
@@ -660,12 +705,10 @@ export class BrushModelRenderer extends ModelRenderer {
   /**
    * Collect visible world turbulent draw batches with tight bounds so fog and
    * semi-transparent liquids can share the same sorted space.
-   * @param {BrushModel} clmodel The world model
-   * @param {Float32Array|number[]} vieworg Camera position [x, y, z]
-   * @returns {{chain: import('../../common/model/BSP.ts').WorldTurbulentChainInfo, dist: number}[]} Turbulent draw items with distance metadata
+   * @returns Turbulent chain entries with view distances for back-to-front sorting.
    */
-  getWorldTurbulentChains(clmodel, vieworg) {
-    const items = [];
+  getWorldTurbulentChains(clmodel: BrushModel, vieworg: Float32Array | number[]): { chain: WorldTurbulentChainInfo; dist: number }[] {
+    const items: { chain: WorldTurbulentChainInfo; dist: number }[] = [];
 
     for (let i = 0; i < clmodel.leafs.length; i++) {
       const leaf = clmodel.leafs[i];
@@ -692,44 +735,21 @@ export class BrushModelRenderer extends ModelRenderer {
     return items;
   }
 
-  /**
-   * Approximate view-relative sort distance for bounded transparent content.
-   * Uses the nearest point on the AABB instead of the center so large leaves
-   * and fog volumes sort by the depth where they begin affecting the view.
-   * @private
-   * @param {Vector|number[]|Float32Array} mins Minimum corner of the AABB
-   * @param {Vector|number[]|Float32Array} maxs Maximum corner of the AABB
-   * @param {Float32Array|number[]} vieworg Camera position [x, y, z]
-   * @returns {number} Euclidean distance from the view to the nearest point on the bounds
-   */
-  _getBoundsDistanceToView(mins, maxs, vieworg) {
-    const nearestX = Math.max(mins[0], Math.min(vieworg[0], maxs[0]));
-    const nearestY = Math.max(mins[1], Math.min(vieworg[1], maxs[1]));
-    const nearestZ = Math.max(mins[2], Math.min(vieworg[2], maxs[2]));
-    const dx = nearestX - vieworg[0];
-    const dy = nearestY - vieworg[1];
-    const dz = nearestZ - vieworg[2];
-
-    return Math.hypot(dx, dy, dz);
-  }
-
   /**
    * Setup GL state for world turbulent leaf rendering.
    * Call once before one or more `renderWorldTurbulentLeaf` calls.
-   * @param {BrushModel} clmodel The world model
    */
-  beginWorldTurbulentPass(clmodel) {
+  beginWorldTurbulentPass(clmodel: BrushModel): void {
     GL.BindVAO(clmodel.turbulentVAO);
     R.c_brush_vbos++;
 
-    const program = GL.UseProgram('turbulent');
+    const program = GL.UseProgram('turbulent')!;
     gl.uniform3f(program.uOrigin, 0.0, 0.0, 0.0);
     gl.uniformMatrix3fv(program.uAngles, false, GL.identity);
     gl.uniform1f(program.uTime, Host.realtime);
     gl.uniform1f(program.uBloomEmissiveScale, 0.0);
     gl.uniform1f(program.uBloomDlightScale, R.bloomDlightStrength.value);
 
-    // Bind common textures
     this._setupBrushShaderCommon(program, clmodel, true);
     GL.Bind(program.tLightStyle, R.lightstyle_texture_a);
 
@@ -740,10 +760,8 @@ export class BrushModelRenderer extends ModelRenderer {
   /**
    * Render a single leaf's turbulent surfaces.
    * Must be called between `beginWorldTurbulentPass` and `endWorldTurbulentPass`.
-   * @param {BrushModel} clmodel The world model
-   * @param {Node} leaf The BSP leaf to render
    */
-  renderWorldTurbulentLeaf(clmodel, leaf) {
+  renderWorldTurbulentLeaf(clmodel: BrushModel, leaf: Node): void {
     for (let j = leaf.waterchain; j < leaf.cmds.length; j++) {
       const cmds = leaf.cmds[j];
       this._renderWorldTurbulentBatch(clmodel, cmds[0], cmds[1], cmds[2]);
@@ -753,66 +771,276 @@ export class BrushModelRenderer extends ModelRenderer {
   /**
    * Render a single pre-sorted world turbulent draw batch.
    * Must be called between `beginWorldTurbulentPass` and `endWorldTurbulentPass`.
-   * @param {BrushModel} clmodel The world model
-   * @param {import('../../common/model/BSP.ts').WorldTurbulentChainInfo} chain The turbulent draw batch to render
    */
-  renderWorldTurbulentChain(clmodel, chain) {
+  renderWorldTurbulentChain(clmodel: BrushModel, chain: WorldTurbulentChainInfo): void {
     this._renderWorldTurbulentBatch(clmodel, chain.texture, chain.firstVertex, chain.vertexCount);
   }
 
+  /** Cleanup GL state after world turbulent leaf rendering. */
+  endWorldTurbulentPass(): void {
+    gl.disable(gl.BLEND);
+    gl.depthMask(true);
+    GL.UnbindVAO();
+    this._worldTurbulentProgram = null;
+    this._worldTurbulentModel = null;
+  }
+
+  // ─── Fog volume rendering ─────────────────────────────────────────
+
   /**
-   * @private
-   * @param {BrushModel} clmodel The world model
-   * @param {number} textureIndex Texture index for this draw
-   * @param {number} firstVertex First vertex in the turbulent VBO region
-   * @param {number} vertexCount Number of vertices in the draw batch
+   * Render all fog volumes defined in the world model.
+   * Handles both inline brush model fog volumes (*N) and world-level
+   * water/slime/lava fog volumes (modelIndex === 0).
    */
-  _renderWorldTurbulentBatch(clmodel, textureIndex, firstVertex, vertexCount) {
-    const worldspawn = CL.state.clientEntities.getEntity(0);
-    const program = this._worldTurbulentProgram;
-    const material = clmodel.textures[textureIndex];
+  renderFogVolumes(worldmodel: BrushModel): void {
+    if (!this.beginFogVolumePass(worldmodel)) {
+      return;
+    }
+    for (const fogVolume of worldmodel.fogVolumes) {
+      this.renderSingleFogVolume(worldmodel, fogVolume);
+    }
+    this.endFogVolumePass();
+  }
 
-    material.emit(worldspawn);
-    const alpha = this._getTurbulentMaterialAlpha(material, worldspawn);
-    this._setTurbulentSurfaceState(alpha);
-    gl.uniform1f(program.uAlpha, alpha);
+  /**
+   * Collect fog volumes with distance from the given viewpoint for back-to-front sorting.
+   * @returns Fog volume entries with view distances for back-to-front sorting.
+   */
+  getFogVolumeItems(worldmodel: BrushModel, vieworg: Float32Array | number[]): { fogVolume: FogVolumeInfo; dist: number }[] {
+    if (!worldmodel.fogVolumes || worldmodel.fogVolumes.length === 0) {
+      return [];
+    }
+    const items: { fogVolume: FogVolumeInfo; dist: number }[] = [];
+    for (const fogVolume of worldmodel.fogVolumes) {
+      const dist = this._getBoundsDistanceToView(fogVolume.mins, fogVolume.maxs, vieworg);
+      items.push({ fogVolume, dist });
+    }
+    return items;
+  }
 
-    R.c_brush_verts += vertexCount;
-    R.c_brush_tris += vertexCount / 3;
-    material.bindTo(program);
-    gl.drawArrays(gl.TRIANGLES, firstVertex, vertexCount);
-    R.c_brush_draws++;
+  /**
+   * Setup GL state for fog volume rendering.
+   * @returns True if fog volume pass was started, false if skipped.
+   */
+  beginFogVolumePass(worldmodel: BrushModel): boolean {
+    if (!worldmodel.fogVolumes || worldmodel.fogVolumes.length === 0) {
+      return false;
+    }
+
+    PostProcess.beginDepthSampling();
+
+    const program = GL.UseProgram('fog-volume')!;
+
+    gl.enable(gl.BLEND);
+    gl.blendFunc(gl.SRC_ALPHA, gl.ONE_MINUS_SRC_ALPHA);
+    gl.disable(gl.DEPTH_TEST);
+    gl.depthMask(false);
+    gl.cullFace(gl.BACK);
+    gl.enable(gl.CULL_FACE);
+
+    GL.Bind(program.tDepth, PostProcess.depthTexture);
+    gl.uniform2f(program.uScreenSize, PostProcess.width, PostProcess.height);
+
+    this._fogVolumeProgram = program;
+    return true;
   }
 
   /**
-   * Cleanup GL state after world turbulent leaf rendering.
+   * Render a single fog volume.
+   * Must be called between `beginFogVolumePass` and `endFogVolumePass`.
    */
-  endWorldTurbulentPass() {
-    gl.disable(gl.BLEND);
+  renderSingleFogVolume(worldmodel: BrushModel, fogVolume: FogVolumeInfo): void {
+    const program = this._fogVolumeProgram!;
+
+    gl.uniform3f(
+      program.uFogVolumeColor,
+      fogVolume.color[0] / 255.0,
+      fogVolume.color[1] / 255.0,
+      fogVolume.color[2] / 255.0,
+    );
+    gl.uniform1f(program.uFogVolumeDensity, fogVolume.density);
+    gl.uniform1f(program.uFogVolumeMaxOpacity, fogVolume.maxOpacity);
+
+    // Bind the light probe 3D texture for this fog volume.
+    // _getFogLightProbe / _getFogLightProbeWhite may upload via Bind3D(0, ...)
+    // which clobbers texture unit 0 (tDepth). Re-bind depth after.
+    const probe = this._getFogLightProbe(fogVolume);
+    GL.Bind3D(program.tLightProbe, probe ? probe.texture : this._getFogLightProbeWhite());
+    GL.Bind(program.tDepth, PostProcess.depthTexture);
+
+    this._uploadFogDlights(fogVolume);
+
+    gl.uniform3f(program.uFogVolumeMins, fogVolume.mins[0], fogVolume.mins[1], fogVolume.mins[2]);
+    gl.uniform3f(program.uFogVolumeMaxs, fogVolume.maxs[0], fogVolume.maxs[1], fogVolume.maxs[2]);
+
+    if (fogVolume.modelIndex === 0) {
+      const sizeX = fogVolume.maxs[0] - fogVolume.mins[0];
+      const sizeY = fogVolume.maxs[1] - fogVolume.mins[1];
+      const sizeZ = fogVolume.maxs[2] - fogVolume.mins[2];
+
+      gl.uniformMatrix3fv(program.uAngles, false, new Float32Array([
+        sizeX, 0, 0,
+        0, sizeY, 0,
+        0, 0, sizeZ,
+      ]));
+      gl.uniform3f(program.uOrigin, fogVolume.mins[0], fogVolume.mins[1], fogVolume.mins[2]);
+
+      this._getFogCubeVBO();
+
+      // Bind the fog cube VAO directly instead of through GL.BindVAO/UnbindVAO
+      // to avoid attribute/program state being cleared between volumes.
+      gl.bindVertexArray(this.#fogCubeVAO);
+      R.c_brush_vbos++;
+
+      gl.drawArrays(gl.TRIANGLES, 0, 36);
+      gl.bindVertexArray(null);
+      R.c_brush_draws++;
+    } else {
+      const submodel = worldmodel.submodels[fogVolume.modelIndex - 1];
+
+      if (!submodel || !submodel.cmds) {
+        return;
+      }
+
+      gl.uniform3f(program.uOrigin, 0.0, 0.0, 0.0);
+      gl.uniformMatrix3fv(program.uAngles, false, GL.identity);
+
+      gl.bindBuffer(gl.ARRAY_BUFFER, submodel.cmds as WebGLBuffer);
+      R.c_brush_vbos++;
+      gl.vertexAttribPointer(program.aPosition.location as number, 3, gl.FLOAT, false, 80, 0);
+
+      if (submodel.chains) {
+        for (const chain of submodel.chains) {
+          gl.drawArrays(gl.TRIANGLES, chain[1], chain[2]);
+          R.c_brush_draws++;
+        }
+      }
+    }
+  }
+
+  /** Cleanup GL state after fog volume rendering. */
+  endFogVolumePass(): void {
+    gl.enable(gl.DEPTH_TEST);
     gl.depthMask(true);
-    GL.UnbindVAO();
-    this._worldTurbulentProgram = null;
-    this._worldTurbulentModel = null;
+    gl.cullFace(gl.FRONT);
+    gl.enable(gl.CULL_FACE);
+    gl.blendFuncSeparate(gl.SRC_ALPHA, gl.ONE_MINUS_SRC_ALPHA, gl.ONE, gl.ONE);
+    gl.disable(gl.BLEND);
+
+    PostProcess.endDepthSampling();
+    this._fogVolumeProgram = null;
+  }
+
+
+  cleanupRenderState(_pass = 0): void {
+    // Brush models clean up their own state per-entity
+  }
+
+  // ─── Model preparation ────────────────────────────────────────────
+
+  /**
+   * Prepare brush model for rendering (build display lists, upload to GPU).
+   * Handles both world models (using leafs) and entity models (using chains).
+   * @param isWorldModel True if this is the actual world map (model index 1)
+   */
+  prepareModel(model: BrushModel, isWorldModel = false): void {
+    const m = model;
+
+    if (m.cmds && typeof m.cmds === 'object' && m.cmds !== null) {
+      gl.deleteBuffer(m.cmds as WebGLBuffer);
+      m.cmds = null;
+    }
+
+    if (model.name[0] !== '*') {
+      for (const face of model.faces) {
+        this._buildSurfaceDisplayList(model, face);
+      }
+    }
+
+    if (isWorldModel) {
+      this._buildWorldModelDisplayLists(m);
+    } else {
+      this._buildBrushModelDisplayLists(m);
+    }
+  }
+
+  /**
+   * Free GPU resources for this brush model.
+   */
+  cleanupModel(model: BrushModel): void {
+    if (model.opaqueVAO) {
+      gl.deleteVertexArray(model.opaqueVAO as WebGLVertexArrayObject);
+      model.opaqueVAO = null;
+    }
+    if (model.turbulentVAO) {
+      gl.deleteVertexArray(model.turbulentVAO as WebGLVertexArrayObject);
+      model.turbulentVAO = null;
+    }
+    if (model.cmds) {
+      gl.deleteBuffer(model.cmds as WebGLBuffer);
+      model.cmds = null;
+    }
+
+    if (model.fogVolumes && model.fogVolumes.length > 0) {
+      this._freeFogLightProbes();
+    }
+  }
+
+  // ─── Private helpers ──────────────────────────────────────────────
+
+  /**
+   * Distance from the viewpoint to the nearest point of an axis-aligned bounding box.
+   * @private
+   * @returns Distance to the nearest AABB corner in world units.
+   */
+  _getBoundsDistanceToView(
+    mins: Vector | number[] | Float32Array,
+    maxs: Vector | number[] | Float32Array,
+    vieworg: Float32Array | number[],
+  ): number {
+    const nearestX = Math.max(mins[0], Math.min(vieworg[0], maxs[0]));
+    const nearestY = Math.max(mins[1], Math.min(vieworg[1], maxs[1]));
+    const nearestZ = Math.max(mins[2], Math.min(vieworg[2], maxs[2]));
+    const dx = nearestX - vieworg[0];
+    const dy = nearestY - vieworg[1];
+    const dz = nearestZ - vieworg[2];
+
+    return Math.hypot(dx, dy, dz);
+  }
+
+  /** @private */
+  _renderWorldTurbulentBatch(clmodel: BrushModel, textureIndex: number, firstVertex: number, vertexCount: number): void {
+    const worldspawn = CL.state.clientEntities.getEntity(0);
+    const program = this._worldTurbulentProgram!;
+    const material = clmodel.textures[textureIndex] as BaseMaterial;
+
+    material.emit(worldspawn);
+    const alpha = this._getTurbulentMaterialAlpha(material, worldspawn);
+    this._setTurbulentSurfaceState(alpha);
+    gl.uniform1f(program.uAlpha, alpha);
+
+    R.c_brush_verts += vertexCount;
+    R.c_brush_tris += vertexCount / 3;
+    material.bindTo(program);
+    gl.drawArrays(gl.TRIANGLES, firstVertex, vertexCount);
+    R.c_brush_draws++;
   }
 
   /**
+   * Combined clamped alpha for a turbulent material surface.
    * @private
-   * @param {import('./Materials.mjs').BaseMaterial} material Material chosen for the draw.
-   * @param {ClientEdict} entity Entity that owns the surface.
-   * @returns {number} Combined material/entity alpha in the 0..1 range.
+   * @returns Clamped product of material and entity alpha in the 0..1 range.
    */
-  _getTurbulentMaterialAlpha(material, entity) {
+  _getTurbulentMaterialAlpha(material: BaseMaterial, entity: ClientEdict): number {
     const entityAlpha = entity?.alpha ?? 1.0;
     return Math.max(0.0, Math.min(material.currentAlpha * entityAlpha, 1.0));
   }
 
   /**
    * Opaque liquids must write depth so they occlude later fog/transparent passes.
-   * Transparent liquids stay blended and keep depth writes disabled.
    * @private
-   * @param {number} alpha Effective surface alpha.
    */
-  _setTurbulentSurfaceState(alpha) {
+  _setTurbulentSurfaceState(alpha: number): void {
     if (alpha >= 1.0) {
       gl.disable(gl.BLEND);
       gl.depthMask(true);
@@ -823,30 +1051,20 @@ export class BrushModelRenderer extends ModelRenderer {
     gl.depthMask(false);
   }
 
-  /**
-   * Setup common brush shader uniforms and textures.
-   * Configures lightmaps, dynamic lights, light styles, and deluxemaps.
-   * @private
-   * @param {WebGLProgram} program The shader program (brush or turbulent)
-   * @param {BrushModel} clmodel The brush model
-   * @param {boolean} isWorld Whether this is the world entity (affects deluxemap/dlight settings)
-   */
-  _setupBrushShaderCommon(program, clmodel, isWorld) {
-    // Bind lightmap textures
+  /** @private */
+  _setupBrushShaderCommon(program: GLProgramInfo, clmodel: BrushModel, isWorld: boolean): void {
     if ((R.fullbright.value !== 0) || (clmodel.lightdata === null && clmodel.lightdata_rgb === null)) {
       GL.BindArray(program.tLightmap, R.fullbright_texture);
     } else {
       GL.BindArray(program.tLightmap, R.lightmap_texture);
     }
 
-    // Bind dynamic light texture
     if (R.flashblend.value === 0 && (isWorld || clmodel.submodel)) {
       GL.Bind(program.tDlight, R.dlightmap_rgba_texture);
     } else {
       GL.Bind(program.tDlight, R.null_texture);
     }
 
-    // Bind local shadow map textures
     if (program.tShadowMap0 !== undefined && R.shadow_textures?.[0]) {
       GL.Bind(program.tShadowMap0, R.shadow_textures[0]);
     }
@@ -857,51 +1075,38 @@ export class BrushModelRenderer extends ModelRenderer {
       GL.Bind(program.tShadowMap2, R.shadow_textures[2]);
     }
 
-    // Bind point light cube shadow map
     if (program.tPointShadowMap !== undefined) {
       GL.BindCube(program.tPointShadowMap, R.point_shadow_texture);
     }
   }
 
-  /**
-   * Render opaque (non-turbulent) brush surfaces
-   * @private
-   * @param {BrushModel} clmodel The brush model
-   * @param {ClientEdict} e The entity
-   * @param {number[]} viewMatrix Rotation matrix for entity orientation
-   */
-  _renderOpaqueSurfaces(clmodel, e, viewMatrix) {
-    const program = GL.UseProgram('brush');
+  /** @private */
+  _renderOpaqueSurfaces(clmodel: BrushModel, e: ClientEdict, viewMatrix: number[]): void {
+    const program = GL.UseProgram('brush')!;
     this._applyEntityLighting(program, clmodel, e);
 
-    // Setup transforms
     gl.uniform3fv(program.uOrigin, e.lerp.origin);
     gl.uniformMatrix3fv(program.uAngles, false, viewMatrix);
-
-    // Setup uniforms
     gl.uniform1f(program.uInterpolation, R.interpolation.value ? (CL.state.time % 0.2) / 0.2 : 0);
     gl.uniform1f(program.uAlpha, 1.0);
     gl.uniform1f(program.uBloomEmissiveScale, getEntityBloomEmissiveScale(e.effects));
     gl.uniform1f(program.uBloomDlightScale, R.bloomDlightStrength.value);
     gl.uniform1f(program.uBloomSpecularScale, resolveBrushBloomContributionStrength(R.bloomSpecularStrength?.value ?? 0.0));
 
-    // Bind common textures
     this._setupBrushShaderCommon(program, clmodel, false);
     GL.Bind(program.tLightStyleA, R.lightstyle_texture_a);
     GL.Bind(program.tLightStyleB, R.lightstyle_texture_b);
     this._bindBrushDeluxemap(program, clmodel);
 
-    // Render each texture chain
     if (!clmodel.chains || clmodel.chains.length === 0) {
       return;
     }
 
     for (let i = 0; i < clmodel.chains.length; i++) {
       const chain = clmodel.chains[i];
-      const material = clmodel.textures[chain[0]];
+      const material = clmodel.textures[chain[0]] as BaseMaterial;
 
-      // Skip turbulent and transparent surfaces in opaque pass
-      if ((material.flags & materialFlags.MF_TURBULENT) || (material.flags & materialFlags.MF_TRANSPARENT)) {
+      if ((material.flags & MaterialFlags.MF_TURBULENT) || (material.flags & MaterialFlags.MF_TRANSPARENT)) {
         continue;
       }
 
@@ -916,40 +1121,27 @@ export class BrushModelRenderer extends ModelRenderer {
     }
   }
 
-  /**
-   * Render transparent brush surfaces with alpha blending
-   * @private
-   * @param {BrushModel} clmodel The brush model
-   * @param {ClientEdict} e The entity
-   * @param {number[]} viewMatrix Rotation matrix for entity orientation
-   */
-  _renderTransparentSurfaces(clmodel, e, viewMatrix) {
-    const program = GL.UseProgram('brush');
+  /** @private */
+  _renderTransparentSurfaces(clmodel: BrushModel, e: ClientEdict, viewMatrix: number[]): void {
+    const program = GL.UseProgram('brush')!;
     this._applyEntityLighting(program, clmodel, e);
 
-    // Setup transforms
     gl.uniform3fv(program.uOrigin, e.lerp.origin);
     gl.uniformMatrix3fv(program.uAngles, false, viewMatrix);
-
-    // Setup uniforms
     gl.uniform1f(program.uInterpolation, R.interpolation.value ? (CL.state.time % 0.2) / 0.2 : 0);
     gl.uniform1f(program.uAlpha, e.alpha);
     gl.uniform1f(program.uBloomEmissiveScale, getEntityBloomEmissiveScale(e.effects));
     gl.uniform1f(program.uBloomDlightScale, R.bloomDlightStrength.value);
     gl.uniform1f(program.uBloomSpecularScale, resolveBrushBloomContributionStrength(R.bloomSpecularStrength?.value ?? 0.0));
 
-    // Bind common textures
     this._setupBrushShaderCommon(program, clmodel, false);
     GL.Bind(program.tLightStyleA, R.lightstyle_texture_a);
     GL.Bind(program.tLightStyleB, R.lightstyle_texture_b);
     this._bindBrushDeluxemap(program, clmodel);
 
-    // Enable blending for transparent surfaces (depth writes stay ON so
-    // the Z-buffer correctly orders transparent geometry against each other)
     gl.enable(gl.BLEND);
     gl.blendFunc(gl.SRC_ALPHA, gl.ONE_MINUS_SRC_ALPHA);
 
-    // Render each texture chain (only transparent ones)
     if (!clmodel.chains || clmodel.chains.length === 0) {
       gl.disable(gl.BLEND);
       return;
@@ -957,16 +1149,14 @@ export class BrushModelRenderer extends ModelRenderer {
 
     for (let i = 0; i < clmodel.chains.length; i++) {
       const chain = clmodel.chains[i];
-      const material = clmodel.textures[chain[0]];
+      const material = clmodel.textures[chain[0]] as BaseMaterial;
 
-      // Skip requested
-      if (material.flags & materialFlags.MF_SKIP) {
+      if (material.flags & MaterialFlags.MF_SKIP) {
         continue;
       }
 
-      // Only render transparent surfaces in this pass
       if (e.alpha === 1.0 && (
-        (material.flags & materialFlags.MF_TURBULENT) || !(material.flags & materialFlags.MF_TRANSPARENT)
+        (material.flags & MaterialFlags.MF_TURBULENT) || !(material.flags & MaterialFlags.MF_TRANSPARENT)
       )) {
         continue;
       }
@@ -984,26 +1174,18 @@ export class BrushModelRenderer extends ModelRenderer {
     gl.disable(gl.BLEND);
   }
 
-  /**
-   * Render turbulent (water, slime, lava, teleport) brush surfaces
-   * @private
-   * @param {BrushModel} clmodel The brush model
-   * @param {ClientEdict} e The entity
-   * @param {number[]} viewMatrix Rotation matrix for entity orientation
-   */
-  _renderTurbulentSurfaces(clmodel, e, viewMatrix) {
-    const program = GL.UseProgram('turbulent');
+  /** @private */
+  _renderTurbulentSurfaces(clmodel: BrushModel, e: ClientEdict, viewMatrix: number[]): void {
+    const program = GL.UseProgram('turbulent')!;
     gl.uniform3fv(program.uOrigin, e.lerp.origin);
     gl.uniformMatrix3fv(program.uAngles, false, viewMatrix);
     gl.uniform1f(program.uTime, Host.realtime % (Math.PI * 2.0));
     gl.uniform1f(program.uBloomEmissiveScale, getEntityBloomEmissiveScale(e.effects));
     gl.uniform1f(program.uBloomDlightScale, R.bloomDlightStrength.value);
 
-    // Bind common textures
     this._setupBrushShaderCommon(program, clmodel, false);
     GL.Bind(program.tLightStyle, R.lightstyle_texture_a);
 
-    // Render each turbulent chain
     if (!clmodel.chains || clmodel.chains.length === 0) {
       gl.depthMask(true);
       gl.disable(gl.BLEND);
@@ -1012,15 +1194,14 @@ export class BrushModelRenderer extends ModelRenderer {
 
     for (let i = 0; i < clmodel.chains.length; i++) {
       const chain = clmodel.chains[i];
-      const material = clmodel.textures[chain[0]];
+      const material = clmodel.textures[chain[0]] as BaseMaterial;
 
-      // Skip requested
-      if (material.flags & materialFlags.MF_SKIP) {
+      if (material.flags & MaterialFlags.MF_SKIP) {
         continue;
       }
 
-      if (!(material.flags & materialFlags.MF_TURBULENT)) {
-        continue; // Skip non-turbulent surfaces in this pass
+      if (!(material.flags & MaterialFlags.MF_TURBULENT)) {
+        continue;
       }
 
       material.emit(e);
@@ -1039,18 +1220,13 @@ export class BrushModelRenderer extends ModelRenderer {
     gl.disable(gl.BLEND);
   }
 
-  /**
-   * @private
-   * @param {object} program Active brush shader program
-   * @param {BrushModel} clmodel The brush model
-   * @param {ClientEdict} entity The entity being rendered
-   */
-  _applyEntityLighting(program, clmodel, entity) {
+  /** @private */
+  _applyEntityLighting(program: GLProgramInfo, clmodel: BrushModel, entity: ClientEdict): void {
     const lightingState = BrushModelRenderer.resolveEntityLightingState(
       clmodel,
       entity,
       R._CalculateLightValues,
-      CL.state.worldmodel,
+      CL.state.worldmodel as BrushModel | null,
     );
 
     gl.uniform3fv(program.uAmbientLight, lightingState.ambientlight);
@@ -1066,13 +1242,9 @@ export class BrushModelRenderer extends ModelRenderer {
     gl.uniform3fv(program.uDynamicLightVec, lightingState.dynamicLightPosition);
   }
 
-  /**
-   * @private
-   * @param {object} program Active brush shader program
-   * @param {BrushModel} clmodel The brush model
-   */
-  _bindBrushDeluxemap(program, clmodel) {
-    if (BrushModelRenderer.usesDeluxemap(clmodel, CL.state.worldmodel)) {
+  /** @private */
+  _bindBrushDeluxemap(program: GLProgramInfo, clmodel: BrushModel): void {
+    if (BrushModelRenderer.usesDeluxemap(clmodel, CL.state.worldmodel as BrushModel | null)) {
       GL.BindArray(program.tDeluxemap, R.deluxemap_texture);
       gl.uniform1f(program.uHaveDeluxemap, 1.0);
       return;
@@ -1082,24 +1254,14 @@ export class BrushModelRenderer extends ModelRenderer {
     gl.uniform1f(program.uHaveDeluxemap, 0.0);
   }
 
-  /**
-   * Resolution of the 3D light probe grid per axis.
-   * A grid of RES^3 probes is sampled from R.LightPoint and packed into a 2D texture.
-   * @type {number}
-   */
-  static FOG_LIGHT_PROBE_RES = 8;
-
   /**
    * Create a VAO for brush geometry at the given byte offset in the VBO.
-   * All 6 standard brush attributes are configured with 80-byte stride.
    * @private
-   * @param {WebGLBuffer} vbo The VBO containing brush vertex data
-   * @param {number} offset Byte offset for the first vertex
-   * @returns {WebGLVertexArrayObject} The created VAO
+   * @returns The created vertex array object.
    */
-  _createBrushVAO(vbo, offset) {
+  _createBrushVAO(vbo: WebGLBuffer, offset: number): WebGLVertexArrayObject {
     return GL.CreateVAO(vbo, [
-      { location: 0, components: 3, type: gl.FLOAT, normalized: false, stride: BRUSH_VERTEX_STRIDE, offset: offset },
+      { location: 0, components: 3, type: gl.FLOAT, normalized: false, stride: BRUSH_VERTEX_STRIDE, offset },
       { location: 1, components: 4, type: gl.FLOAT, normalized: false, stride: BRUSH_VERTEX_STRIDE, offset: offset + 12 },
       { location: 2, components: 4, type: gl.FLOAT, normalized: false, stride: BRUSH_VERTEX_STRIDE, offset: offset + 28 },
       { location: 3, components: 3, type: gl.FLOAT, normalized: false, stride: BRUSH_VERTEX_STRIDE, offset: offset + 44 },
@@ -1108,58 +1270,19 @@ export class BrushModelRenderer extends ModelRenderer {
     ]);
   }
 
-  /**
-   * Maximum number of dynamic lights passed to the fog volume shader.
-   * Must match MAX_FOG_DLIGHTS in fog-volume.frag.
-   * @type {number}
-   */
-  static MAX_FOG_DLIGHTS = 8;
-
-  /**
-   * Light probe textures for fog volumes, keyed by the fog volume object.
-   * Each entry holds a raw WebGL texture, the grid resolution, and a reusable
-   * pixel buffer to avoid reallocating on every lightstyle update.
-   * @type {Map<import('../../common/model/BSP.ts').FogVolumeInfo, {texture: WebGLTexture, resX: number, resY: number, resZ: number, data: Uint8Array}>}
-   */
-  #fogLightProbes = new Map();
-
-  /**
-   * The lightstyle animation frame index when probes were last rebuilt.
-   * Lightstyles tick at 10 Hz (floor(time * 10)), so probes are only
-   * regenerated when this value changes.
-   * @type {number}
-   */
-  #fogProbeStyleFrame = -1;
-
-  /**
-   * A 1x1 white texture used as a fallback when no light probe is available.
-   * @type {WebGLTexture|null}
-   */
-  #fogLightProbeWhite = null;
-
-  /**
-   * Lazily created unit cube VBO for rendering world-level fog volumes.
-   * The cube spans [0,1]^3 and is transformed via uOrigin/uAngles to match each fog volume's AABB.
-   * @type {WebGLBuffer|null}
-   */
-  #fogCubeVBO = null;
-
-  /**
-   * Lazily created VAO for the fog cube VBO (position-only, 12-byte stride).
-   * @type {WebGLVertexArrayObject|null}
-   */
-  #fogCubeVAO = null;
+  // ─── Fog light probes ─────────────────────────────────────────────
 
   /**
-   * Get or create a 1×1×1 white fallback 3D texture for fog volumes without light probes.
-   * @returns {WebGLTexture} The white 3D texture
+   * Get or create the 1×1×1 white fallback fog light probe texture.
+   * @private
+   * @returns A white 3-D texture used when no probe data is available.
    */
-  _getFogLightProbeWhite() {
+  _getFogLightProbeWhite(): WebGLTexture {
     if (this.#fogLightProbeWhite) {
       return this.#fogLightProbeWhite;
     }
 
-    this.#fogLightProbeWhite = gl.createTexture();
+    this.#fogLightProbeWhite = gl.createTexture()!;
     GL.Bind3D(0, this.#fogLightProbeWhite);
     gl.texImage3D(gl.TEXTURE_3D, 0, gl.RGBA8, 1, 1, 1, 0, gl.RGBA, gl.UNSIGNED_BYTE, new Uint8Array([255, 255, 255, 255]));
     gl.texParameteri(gl.TEXTURE_3D, gl.TEXTURE_MIN_FILTER, gl.LINEAR);
@@ -1170,17 +1293,8 @@ export class BrushModelRenderer extends ModelRenderer {
     return this.#fogLightProbeWhite;
   }
 
-  /**
-   * Sample R.LightPoint into a pixel buffer for a fog volume's light probe grid.
-   * Data is laid out for TEXTURE_3D upload: Z slices are contiguous in memory.
-   * Texel at grid (ix, iy, iz) is at index (iz * resY * resX + iy * resX + ix).
-   * @param {import('../../common/model/BSP.ts').FogVolumeInfo} fogVolume The fog volume
-   * @param {Uint8Array} data Pixel buffer to fill (resX * resY * resZ * 4)
-   * @param {number} resX Grid resolution X
-   * @param {number} resY Grid resolution Y
-   * @param {number} resZ Grid resolution Z
-   */
-  _sampleFogLightProbe(fogVolume, data, resX, resY, resZ) {
+  /** @private */
+  _sampleFogLightProbe(fogVolume: FogVolumeInfo, data: Uint8Array, resX: number, resY: number, resZ: number): void {
     const sizeX = fogVolume.maxs[0] - fogVolume.mins[0];
     const sizeY = fogVolume.maxs[1] - fogVolume.mins[1];
     const sizeZ = fogVolume.maxs[2] - fogVolume.mins[2];
@@ -1189,7 +1303,6 @@ export class BrushModelRenderer extends ModelRenderer {
     for (let iz = 0; iz < resZ; iz++) {
       for (let iy = 0; iy < resY; iy++) {
         for (let ix = 0; ix < resX; ix++) {
-          // Map grid position to world position (probe at cell center)
           const u = (ix + 0.5) / resX;
           const v = (iy + 0.5) / resY;
           const w = (iz + 0.5) / resZ;
@@ -1202,11 +1315,6 @@ export class BrushModelRenderer extends ModelRenderer {
           const [color] = R.LightPoint(worldPos);
 
           const idx = (iz * sliceSize + iy * resX + ix) * 4;
-
-          // Normalize light color: preserve hue, map maximum component to 1.0.
-          // This prevents the light probe from dimming the fog (the base fog
-          // color already accounts for ambient brightness). We only want the
-          // chromatic variation from colored lights.
           const maxComp = Math.max(color[0], color[1], color[2]);
 
           if (maxComp > 1.0) {
@@ -1214,7 +1322,6 @@ export class BrushModelRenderer extends ModelRenderer {
             data[idx + 1] = Math.min(255, Math.round((color[1] / maxComp) * 255));
             data[idx + 2] = Math.min(255, Math.round((color[2] / maxComp) * 255));
           } else {
-            // Very dark area — keep as white (no tinting)
             data[idx] = 255;
             data[idx + 1] = 255;
             data[idx + 2] = 255;
@@ -1226,17 +1333,14 @@ export class BrushModelRenderer extends ModelRenderer {
   }
 
   /**
-   * Create or update the light probe texture for a fog volume.
-   * If the probe already exists, re-samples into the existing pixel buffer
-   * and re-uploads via texSubImage2D (avoids GPU allocation).
-   * @param {import('../../common/model/BSP.ts').FogVolumeInfo} fogVolume The fog volume
-   * @returns {{texture: WebGLTexture, resX: number, resY: number, resZ: number, data: Uint8Array}} The probe data
+   * Build or refresh the 3-D light probe texture for a fog volume.
+   * @private
+   * @returns The created or updated probe data stored in the fog light probe map.
    */
-  _createOrUpdateFogLightProbe(fogVolume) {
+  _createOrUpdateFogLightProbe(fogVolume: FogVolumeInfo): FogLightProbeData {
     const existing = this.#fogLightProbes.get(fogVolume);
 
     if (existing) {
-      // Re-sample into existing buffer and re-upload
       this._sampleFogLightProbe(fogVolume, existing.data, existing.resX, existing.resY, existing.resZ);
       GL.Bind3D(0, existing.texture);
       gl.texSubImage3D(gl.TEXTURE_3D, 0, 0, 0, 0, existing.resX, existing.resY, existing.resZ, gl.RGBA, gl.UNSIGNED_BYTE, existing.data);
@@ -1251,7 +1355,7 @@ export class BrushModelRenderer extends ModelRenderer {
 
     this._sampleFogLightProbe(fogVolume, data, resX, resY, resZ);
 
-    const texture = gl.createTexture();
+    const texture = gl.createTexture()!;
     GL.Bind3D(0, texture);
     gl.texImage3D(gl.TEXTURE_3D, 0, gl.RGBA8, resX, resY, resZ, 0, gl.RGBA, gl.UNSIGNED_BYTE, data);
     gl.texParameteri(gl.TEXTURE_3D, gl.TEXTURE_MIN_FILTER, gl.LINEAR);
@@ -1260,26 +1364,22 @@ export class BrushModelRenderer extends ModelRenderer {
     gl.texParameteri(gl.TEXTURE_3D, gl.TEXTURE_WRAP_T, gl.CLAMP_TO_EDGE);
     gl.texParameteri(gl.TEXTURE_3D, gl.TEXTURE_WRAP_R, gl.CLAMP_TO_EDGE);
 
-    const probe = { texture, resX, resY, resZ, data };
+    const probe: FogLightProbeData = { texture, resX, resY, resZ, data };
     this.#fogLightProbes.set(fogVolume, probe);
     return probe;
   }
 
   /**
-   * Get the light probe texture for a fog volume, creating or updating it
-   * when lightstyle animations tick. Lightstyles animate at 10 Hz, so the
-   * probes are re-sampled at most 10 times per second.
-   * @param {import('../../common/model/BSP.ts').FogVolumeInfo} fogVolume The fog volume
-   * @returns {{texture: WebGLTexture, resX: number, resY: number, resZ: number, data: Uint8Array}|null} Probe data, or null if light data is unavailable
+   * Get the current fog light probe for a volume, rebuilding it when stale.
+   * @private
+   * @returns The probe data, or null when world lighting is unavailable.
    */
-  _getFogLightProbe(fogVolume) {
-    // Only create probes if the world has light data to sample
-    const worldmodel = CL.state.worldmodel;
+  _getFogLightProbe(fogVolume: FogVolumeInfo): FogLightProbeData | null {
+    const worldmodel = CL.state.worldmodel as BrushModel | null;
     if (!worldmodel || (worldmodel.lightdata === null && worldmodel.lightdata_rgb === null)) {
       return null;
     }
 
-    // Check if lightstyles have ticked since last update
     const styleFrame = Math.floor(CL.state.time * 10.0);
     const needsUpdate = styleFrame !== this.#fogProbeStyleFrame;
 
@@ -1287,18 +1387,15 @@ export class BrushModelRenderer extends ModelRenderer {
       this.#fogProbeStyleFrame = styleFrame;
     }
 
-    // First access: always create. Subsequent: only re-sample on style tick.
     if (!this.#fogLightProbes.has(fogVolume) || needsUpdate) {
       return this._createOrUpdateFogLightProbe(fogVolume);
     }
 
-    return this.#fogLightProbes.get(fogVolume);
+    return this.#fogLightProbes.get(fogVolume) ?? null;
   }
 
-  /**
-   * Free all fog light probe textures. Called on map change.
-   */
-  _freeFogLightProbes() {
+  /** @private */
+  _freeFogLightProbes(): void {
     if (gl) {
       for (const { texture } of this.#fogLightProbes.values()) {
         gl.deleteTexture(texture);
@@ -1309,12 +1406,11 @@ export class BrushModelRenderer extends ModelRenderer {
 
   /**
    * Collect active dynamic lights that overlap a fog volume's AABB.
-   * Returns up to MAX_FOG_DLIGHTS lights sorted by contribution (closest first).
-   * @param {import('../../common/model/BSP.ts').FogVolumeInfo} fogVolume The fog volume
-   * @returns {{origin: Vector, radius: number, color: Vector}[]} Overlapping dlights
+   * @returns Up to MAX_FOG_DLIGHTS lights sorted by contribution (closest first).
+   * @private
    */
-  _collectFogDlights(fogVolume) {
-    const results = [];
+  _collectFogDlights(fogVolume: FogVolumeInfo): FogDlightEntry[] {
+    const results: FogDlightEntry[] = [];
     const dlights = CL.state.clientEntities.dlights;
 
     for (let i = 0; i < Def.limits.dlights; i++) {
@@ -1324,7 +1420,6 @@ export class BrushModelRenderer extends ModelRenderer {
         continue;
       }
 
-      // Sphere-AABB overlap: find closest point on AABB to light origin
       const cx = Math.max(fogVolume.mins[0], Math.min(dl.origin[0], fogVolume.maxs[0]));
       const cy = Math.max(fogVolume.mins[1], Math.min(dl.origin[1], fogVolume.maxs[1]));
       const cz = Math.max(fogVolume.mins[2], Math.min(dl.origin[2], fogVolume.maxs[2]));
@@ -1343,17 +1438,13 @@ export class BrushModelRenderer extends ModelRenderer {
       }
     }
 
-    // Sort by distance (closest first) and cap at MAX_FOG_DLIGHTS
     results.sort((a, b) => a.distSq - b.distSq);
     return results.slice(0, BrushModelRenderer.MAX_FOG_DLIGHTS);
   }
 
-  /**
-   * Upload dynamic light uniforms for the current fog volume.
-   * @param {import('../../common/model/BSP.ts').FogVolumeInfo} fogVolume The fog volume
-   */
-  _uploadFogDlights(fogVolume) {
-    const program = this._fogVolumeProgram;
+  /** @private */
+  _uploadFogDlights(fogVolume: FogVolumeInfo): void {
+    const program = this._fogVolumeProgram!;
     const dlights = this._collectFogDlights(fogVolume);
 
     gl.uniform1i(program.uDlightCount, dlights.length);
@@ -1361,11 +1452,11 @@ export class BrushModelRenderer extends ModelRenderer {
     for (let i = 0; i < dlights.length; i++) {
       const dl = dlights[i];
       gl.uniform4f(
-        program['uDlightPos[' + i + ']'],
+        program[`uDlightPos[${i}]`] as WebGLUniformLocation,
         dl.origin[0], dl.origin[1], dl.origin[2], dl.radius,
       );
       gl.uniform4f(
-        program['uDlightColor[' + i + ']'],
+        program[`uDlightColor[${i}]`] as WebGLUniformLocation,
         dl.color[0], dl.color[1], dl.color[2], 0.0,
       );
     }
@@ -1373,18 +1464,15 @@ export class BrushModelRenderer extends ModelRenderer {
 
   /**
    * Get or create the shared unit cube VBO used for world-level fog volumes.
-   * @returns {WebGLBuffer} The unit cube VBO
+   * @private
+   * @returns The shared unit cube VBO for fog volume rendering.
    */
-  _getFogCubeVBO() {
+  _getFogCubeVBO(): WebGLBuffer {
     if (this.#fogCubeVBO) {
       return this.#fogCubeVBO;
     }
 
     // Unit cube [0,1]^3 — 12 triangles, 36 vertices, CW winding from outside
-    // (matching Quake BSP convention: outward faces are CW in world space).
-    // The fog shader uses gl.cullFace(gl.BACK) which, with the Quake projection's
-    // coordinate mapping, culls near-side faces and renders far-side faces.
-    // This gives exit-point fragments for correct fog thickness calculation.
     const verts = new Float32Array([
       // Front face (z=1)
       0, 0, 1, 1, 1, 1, 1, 0, 1, 0, 0, 1, 0, 1, 1, 1, 1, 1,
@@ -1400,7 +1488,7 @@ export class BrushModelRenderer extends ModelRenderer {
       0, 0, 0, 0, 1, 1, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 1, 1,
     ]);
 
-    this.#fogCubeVBO = gl.createBuffer();
+    this.#fogCubeVBO = gl.createBuffer()!;
     gl.bindBuffer(gl.ARRAY_BUFFER, this.#fogCubeVBO);
     gl.bufferData(gl.ARRAY_BUFFER, verts, gl.STATIC_DRAW);
 
@@ -1411,232 +1499,24 @@ export class BrushModelRenderer extends ModelRenderer {
     return this.#fogCubeVBO;
   }
 
-  /**
-   * Render all fog volumes defined in the world model.
-   * Handles both inline brush model fog volumes (*N) and world-level
-   * water/slime/lava fog volumes (modelIndex === 0).
-   * @param {BrushModel} worldmodel The world model containing fog volume definitions
-   */
-  renderFogVolumes(worldmodel) {
-    if (!this.beginFogVolumePass(worldmodel)) {
-      return;
-    }
-    for (const fogVolume of worldmodel.fogVolumes) {
-      this.renderSingleFogVolume(worldmodel, fogVolume);
-    }
-    this.endFogVolumePass();
-  }
-
-  /**
-   * Collect fog volumes with distance from the given viewpoint for back-to-front sorting.
-   * @param {BrushModel} worldmodel The world model containing fog volume definitions
-   * @param {Float32Array|number[]} vieworg Camera position [x, y, z]
-   * @returns {{fogVolume: import('../../common/model/BSP.ts').FogVolumeInfo, dist: number}[]} Fog volume items with distance
-   */
-  getFogVolumeItems(worldmodel, vieworg) {
-    if (!worldmodel.fogVolumes || worldmodel.fogVolumes.length === 0) {
-      return [];
-    }
-    const items = [];
-    for (const fogVolume of worldmodel.fogVolumes) {
-      const dist = this._getBoundsDistanceToView(fogVolume.mins, fogVolume.maxs, vieworg);
-      items.push({ fogVolume, dist });
-    }
-    return items;
-  }
-
-  /**
-   * Setup GL state for fog volume rendering.
-   * Call once before one or more `renderSingleFogVolume` calls.
-   * @param {BrushModel} worldmodel The world model
-   * @returns {boolean} True if fog volume pass was started, false if skipped
-   */
-  beginFogVolumePass(worldmodel) {
-    if (!worldmodel.fogVolumes || worldmodel.fogVolumes.length === 0) {
-      return false;
-    }
-
-    // Detach depth texture from FBO so we can sample it
-    PostProcess.beginDepthSampling();
-
-    const program = GL.UseProgram('fog-volume');
-
-    // GL state for fog volumes:
-    // - Blend: src alpha compositing
-    // - No depth test: shader handles depth via texture sampling
-    // - No depth writes
-    // - Cull back faces (Quake winding): renders the far side of the brush,
-    //   giving us exit points for the fog ray. The shader computes entry via AABB.
-    gl.enable(gl.BLEND);
-    gl.blendFunc(gl.SRC_ALPHA, gl.ONE_MINUS_SRC_ALPHA);
-    gl.disable(gl.DEPTH_TEST);
-    gl.depthMask(false);
-    gl.cullFace(gl.BACK);
-    gl.enable(gl.CULL_FACE);
-
-    // Bind scene depth texture
-    GL.Bind(program.tDepth, PostProcess.depthTexture);
-
-    // Pass screen dimensions for depth texture UV calculation
-    gl.uniform2f(program.uScreenSize, PostProcess.width, PostProcess.height);
-
-    this._fogVolumeProgram = program;
-    return true;
-  }
-
-  /**
-   * Render a single fog volume.
-   * Must be called between `beginFogVolumePass` and `endFogVolumePass`.
-   * @param {BrushModel} worldmodel The world model
-   * @param {import('../../common/model/BSP.ts').FogVolumeInfo} fogVolume The fog volume to render
-   */
-  renderSingleFogVolume(worldmodel, fogVolume) {
-    const program = this._fogVolumeProgram;
-
-    // Set fog volume parameters
-    gl.uniform3f(
-      program.uFogVolumeColor,
-      fogVolume.color[0] / 255.0,
-      fogVolume.color[1] / 255.0,
-      fogVolume.color[2] / 255.0,
-    );
-    gl.uniform1f(program.uFogVolumeDensity, fogVolume.density);
-    gl.uniform1f(program.uFogVolumeMaxOpacity, fogVolume.maxOpacity);
-
-    // Bind the light probe 3D texture for this fog volume.
-    // _getFogLightProbe / _getFogLightProbeWhite may upload via Bind3D(0, ...)
-    // which clobbers texture unit 0 (tDepth). Re-bind depth after.
-    const probe = this._getFogLightProbe(fogVolume);
-    GL.Bind3D(program.tLightProbe, probe ? probe.texture : this._getFogLightProbeWhite());
-    // Restore depth texture on unit 0 (may have been clobbered by probe upload)
-    GL.Bind(program.tDepth, PostProcess.depthTexture);
-
-    // Upload dynamic lights overlapping this fog volume
-    this._uploadFogDlights(fogVolume);
-
-    // Pass the AABB of the fog volume for ray intersection
-    gl.uniform3f(program.uFogVolumeMins, fogVolume.mins[0], fogVolume.mins[1], fogVolume.mins[2]);
-    gl.uniform3f(program.uFogVolumeMaxs, fogVolume.maxs[0], fogVolume.maxs[1], fogVolume.maxs[2]);
-
-    if (fogVolume.modelIndex === 0) {
-      // World-level fog volume: use a unit cube transformed to match the AABB
-      const sizeX = fogVolume.maxs[0] - fogVolume.mins[0];
-      const sizeY = fogVolume.maxs[1] - fogVolume.mins[1];
-      const sizeZ = fogVolume.maxs[2] - fogVolume.mins[2];
-
-      // uAngles becomes a scale matrix (diagonal = AABB size)
-      gl.uniformMatrix3fv(program.uAngles, false, new Float32Array([
-        sizeX, 0, 0,
-        0, sizeY, 0,
-        0, 0, sizeZ,
-      ]));
-      gl.uniform3f(program.uOrigin, fogVolume.mins[0], fogVolume.mins[1], fogVolume.mins[2]);
-
-      this._getFogCubeVBO();
-
-      // Bind the fog cube VAO directly instead of through GL.BindVAO/UnbindVAO.
-      // GL.UnbindVAO() disables vertex attributes on the default VAO and clears
-      // GL.currentProgram, which breaks subsequent submodel fog volumes that
-      // rely on the default VAO having aPosition enabled from beginFogVolumePass.
-      gl.bindVertexArray(this.#fogCubeVAO);
-      R.c_brush_vbos++;
-
-      gl.drawArrays(gl.TRIANGLES, 0, 36);
-      gl.bindVertexArray(null);
-      R.c_brush_draws++;
-    } else {
-      // Submodel fog volume: use the submodel's own VBO
-      const submodel = worldmodel.submodels[fogVolume.modelIndex - 1];
-
-      if (!submodel || !submodel.cmds) {
-        return;
-      }
-
-      gl.uniform3f(program.uOrigin, 0.0, 0.0, 0.0);
-      gl.uniformMatrix3fv(program.uAngles, false, GL.identity);
-
-      gl.bindBuffer(gl.ARRAY_BUFFER, submodel.cmds);
-      R.c_brush_vbos++;
-      gl.vertexAttribPointer(program.aPosition.location, 3, gl.FLOAT, false, 80, 0);
-
-      if (submodel.chains) {
-        for (const chain of submodel.chains) {
-          gl.drawArrays(gl.TRIANGLES, chain[1], chain[2]);
-          R.c_brush_draws++;
-        }
-      }
-    }
-  }
-
-  /**
-   * Cleanup GL state after fog volume rendering.
-   */
-  endFogVolumePass() {
-    // Restore GL state for subsequent passes (turbulents, particles, etc.).
-    gl.enable(gl.DEPTH_TEST);
-    gl.depthMask(true);
-    gl.cullFace(gl.FRONT);
-    gl.enable(gl.CULL_FACE);
-    gl.blendFuncSeparate(gl.SRC_ALPHA, gl.ONE_MINUS_SRC_ALPHA, gl.ONE, gl.ONE);
-    gl.disable(gl.BLEND);
-
-    // Reattach depth texture to FBO
-    PostProcess.endDepthSampling();
-    this._fogVolumeProgram = null;
-  }
-
-  // eslint-disable-next-line no-unused-vars
-  cleanupRenderState(_pass = 0) {
-    // Brush models clean up their own state per-entity
-    // No shared cleanup needed at this level
-  }
-
-  /**
-   * Prepare brush model for rendering (build display lists, upload to GPU).
-   * Handles both world models (using leafs) and entity models (using chains).
-   * @param {BrushModel} model The brush model to prepare
-   * @param {boolean} [isWorldModel] True if this is the actual world map (model index 1)
-   */
-  prepareModel(model, isWorldModel = false) {
-    const m = model;
-
-    // Clean up existing buffer if present
-    if (m.cmds && typeof m.cmds === 'object' && m.cmds !== null) {
-      gl.deleteBuffer(m.cmds);
-      m.cmds = null;
-    }
-
-    if (model.name[0] !== '*') {
-      for (const face of model.faces) {
-        this._buildSurfaceDisplayList(model, face);
-      }
-    }
-
-    if (isWorldModel) {
-      this._buildWorldModelDisplayLists(m);
-    } else {
-      this._buildBrushModelDisplayLists(m);
-    }
-  }
+  // ─── Display list builders ────────────────────────────────────────
 
   /**
    * Build display lists for regular brush entities (doors, platforms, etc).
-   * Uses chains structure to group surfaces by texture.
    * @private
-   * @param {BrushModel} m The brush model
    */
-  _buildBrushModelDisplayLists(m) {
-    const cmds = [];
+  _buildBrushModelDisplayLists(m: BrushModel): void {
+    const cmds: number[] = [];
     const styles = [0.0, 0.0, 0.0, 0.0];
-    const turbulentFallbackCache = new Map();
+    const turbulentFallbackCache = new Map<string, number[]>();
     let verts = 0;
     let cutoff = 0;
     m.chains = [];
 
     // Build opaque surfaces (non-sky, non-turbulent)
     for (let i = 0; i < m.textures.length; i++) {
-      const texture = m.textures[i];
-      if (texture.flags & materialFlags.MF_SKY || texture.flags & materialFlags.MF_TURBULENT) {
+      const texture = m.textures[i] as BaseMaterial;
+      if (texture.flags & MaterialFlags.MF_SKY || texture.flags & MaterialFlags.MF_TURBULENT) {
         continue;
       }
       const chain = [i, verts, 0];
@@ -1654,13 +1534,9 @@ export class BrushModelRenderer extends ModelRenderer {
         chain[2] += surf.verts.length;
         for (let k = 0; k < surf.verts.length; k++) {
           const vert = surf.verts[k];
-          // Position (12 bytes)
           cmds.push(vert[0], vert[1], vert[2]);
-          // TexCoord (16 bytes)
           cmds.push(vert[3], vert[4], vert[5], vert[6]);
-          // LightStyle (16 bytes)
           cmds.push(styles[0], styles[1], styles[2], styles[3]);
-          // Normal (12 bytes) + Tangent/Bitangent placeholders (24 bytes)
           cmds.push(surf.normal[0], surf.normal[1], surf.normal[2]);
           cmds.push(0.0, 0.0, 0.0, 0.0, 0.0, 0.0);
         }
@@ -1676,8 +1552,8 @@ export class BrushModelRenderer extends ModelRenderer {
 
     // Build turbulent surfaces (water, lava, slime)
     for (let i = 0; i < m.textures.length; i++) {
-      const texture = m.textures[i];
-      if (!(texture.flags & materialFlags.MF_TURBULENT)) {
+      const texture = m.textures[i] as BaseMaterial;
+      if (!(texture.flags & MaterialFlags.MF_TURBULENT)) {
         continue;
       }
       const chain = [i, verts, 0];
@@ -1701,20 +1577,15 @@ export class BrushModelRenderer extends ModelRenderer {
             ? [0.0, 0.0, 0.0]
             : BrushModelRenderer.blendTurbulentFallbackLight(
               this._getTurbulentFallbackLight(m, surf, new Vector(vert[0], vert[1], vert[2]), turbulentFallbackCache),
-              faceFallbackLight,
+              faceFallbackLight!,
               TURBULENT_FALLBACK_FACE_BLEND,
             );
           const dlightTexCoordS = vert[5];
           const dlightTexCoordT = vert[6];
-          // Position (12 bytes)
           cmds.push(vert[0], vert[1], vert[2]);
-          // TexCoord (16 bytes) keeps the lightmap atlas UVs for dlights.
           cmds.push(vert[3], vert[4], dlightTexCoordS, dlightTexCoordT);
-          // LightStyle (16 bytes)
           cmds.push(styles[0], styles[1], styles[2], styles[3]);
-          // aNormal carries per-vertex fallback light for no-lightmap turbulents.
           cmds.push(fallbackLight[0], fallbackLight[1], fallbackLight[2]);
-          // aTangent carries dynamic-light atlas UVs and the baked-lightmap flag.
           cmds.push(dlightTexCoordS, dlightTexCoordT, hasLightmap ? 1.0 : 0.0, 0.0, 0.0, 0.0);
         }
       }
@@ -1724,86 +1595,61 @@ export class BrushModelRenderer extends ModelRenderer {
       }
     }
 
-    // Calculate tangents and bitangents for PBR normal mapping
     Mesh.CalculateTangentBitangents(cmds, cutoff);
 
-    // Upload to GPU
-    m.cmds = gl.createBuffer();
-    gl.bindBuffer(gl.ARRAY_BUFFER, m.cmds);
+    m.cmds = gl.createBuffer()!;
+    gl.bindBuffer(gl.ARRAY_BUFFER, m.cmds as WebGLBuffer);
     gl.bufferData(gl.ARRAY_BUFFER, new Float32Array(cmds), gl.STATIC_DRAW);
 
-    // Create VAOs for opaque (offset 0) and turbulent (offset waterchain) passes
-    m.opaqueVAO = this._createBrushVAO(m.cmds, 0);
-    m.turbulentVAO = this._createBrushVAO(m.cmds, m.waterchain);
+    m.opaqueVAO = this._createBrushVAO(m.cmds as WebGLBuffer, 0);
+    m.turbulentVAO = this._createBrushVAO(m.cmds as WebGLBuffer, m.waterchain);
   }
 
   /**
    * Expand arbitrary bounds to contain all vertices of a surface.
    * @private
-   * @param {Vector} mins Mutable bounds minimum
-   * @param {Vector} maxs Mutable bounds maximum
-   * @param {Array<number[]>} verts The surface's vertex array
    */
-  _expandBounds(mins, maxs, verts) {
+  _expandBounds(mins: Vector, maxs: Vector, verts: number[][]): void {
     for (let v = 0; v < verts.length; v++) {
       const vert = verts[v];
-      if (vert[0] < mins[0]) {
-        mins[0] = vert[0];
-      }
-      if (vert[1] < mins[1]) {
-        mins[1] = vert[1];
-      }
-      if (vert[2] < mins[2]) {
-        mins[2] = vert[2];
-      }
-      if (vert[0] > maxs[0]) {
-        maxs[0] = vert[0];
-      }
-      if (vert[1] > maxs[1]) {
-        maxs[1] = vert[1];
-      }
-      if (vert[2] > maxs[2]) {
-        maxs[2] = vert[2];
-      }
+      if (vert[0] < mins[0]) { mins[0] = vert[0]; }
+      if (vert[1] < mins[1]) { mins[1] = vert[1]; }
+      if (vert[2] < mins[2]) { mins[2] = vert[2]; }
+      if (vert[0] > maxs[0]) { maxs[0] = vert[0]; }
+      if (vert[1] > maxs[1]) { maxs[1] = vert[1]; }
+      if (vert[2] > maxs[2]) { maxs[2] = vert[2]; }
     }
   }
 
   /**
    * Expand a leaf's bounding box to contain all vertices of a surface.
-   * BSP leaf bounds represent only the leaf's convex volume, but surfaces
-   * assigned via marksurfaces can extend beyond it. Without expansion,
-   * frustum culling incorrectly rejects leafs whose geometry is visible.
    * @private
-   * @param {Node} leaf The leaf whose bounds to expand
-   * @param {Array<number[]>} verts The surface's vertex array
    */
-  _expandLeafBoundsForSurface(leaf, verts) {
+  _expandLeafBoundsForSurface(leaf: Node, verts: number[][]): void {
     this._expandBounds(leaf.mins, leaf.maxs, verts);
   }
 
   /**
-   * Build display lists for the world model.
-   * Uses leafs structure for visibility-based rendering.
+   * Build display lists for the world model using the leafs structure.
    * @private
-   * @param {BrushModel} m The world model
    */
-  _buildWorldModelDisplayLists(m) {
+  _buildWorldModelDisplayLists(m: BrushModel): void {
     if (m.cmds !== null) {
-      return; // Already built
+      return;
     }
 
     m.resetWorldRenderState();
 
-    const cmds = [];
+    const cmds: number[] = [];
     const styles = [0.0, 0.0, 0.0, 0.0];
-    const turbulentFallbackCache = new Map();
+    const turbulentFallbackCache = new Map<string, number[]>();
     let verts = 0;
     let cutoff = 0;
 
     // Build opaque surfaces (non-sky, non-turbulent) organized by leaf
     for (let i = 0; i < m.textures.length; i++) {
-      const texture = m.textures[i];
-      if ((texture.flags & materialFlags.MF_SKY) || (texture.flags & materialFlags.MF_TURBULENT)) {
+      const texture = m.textures[i] as BaseMaterial;
+      if ((texture.flags & MaterialFlags.MF_SKY) || (texture.flags & MaterialFlags.MF_TURBULENT)) {
         continue;
       }
       for (let j = 0; j < m.leafs.length; j++) {
@@ -1818,17 +1664,13 @@ export class BrushModelRenderer extends ModelRenderer {
           for (let l = 0; l < surf.styles.length; l++) {
             styles[l] = surf.styles[l] * 0.015625 + 0.0078125;
           }
-          this._expandLeafBoundsForSurface(leaf, surf.verts);
+          this._expandLeafBoundsForSurface(leaf, surf.verts!);
           chain[2] += surf.verts.length;
           for (let l = 0; l < surf.verts.length; l++) {
             const vert = surf.verts[l];
-            // Position (12 bytes)
             cmds.push(vert[0], vert[1], vert[2]);
-            // TexCoord (16 bytes)
             cmds.push(vert[3], vert[4], vert[5], vert[6]);
-            // LightStyle (16 bytes)
             cmds.push(styles[0], styles[1], styles[2], styles[3]);
-            // Normal (12 bytes) + Tangent/Bitangent placeholders (24 bytes)
             cmds.push(surf.normal[0], surf.normal[1], surf.normal[2]);
             cmds.push(0.0, 0.0, 0.0, 0.0, 0.0, 0.0);
           }
@@ -1847,8 +1689,8 @@ export class BrushModelRenderer extends ModelRenderer {
 
     // Build sky surfaces
     for (let i = 0; i < m.textures.length; i++) {
-      const texture = m.textures[i];
-      if (!(texture.flags & materialFlags.MF_SKY)) {
+      const texture = m.textures[i] as BaseMaterial;
+      if (!(texture.flags & MaterialFlags.MF_SKY)) {
         continue;
       }
       for (let j = 0; j < m.leafs.length; j++) {
@@ -1859,7 +1701,7 @@ export class BrushModelRenderer extends ModelRenderer {
           if (surf.texture !== i) {
             continue;
           }
-          this._expandLeafBoundsForSurface(leaf, surf.verts);
+          this._expandLeafBoundsForSurface(leaf, surf.verts!);
           chain[1] += surf.verts.length;
           for (let l = 0; l < surf.verts.length; l++) {
             const vert = surf.verts[l];
@@ -1878,8 +1720,8 @@ export class BrushModelRenderer extends ModelRenderer {
 
     // Build turbulent surfaces (water, lava, slime)
     for (let i = 0; i < m.textures.length; i++) {
-      const texture = m.textures[i];
-      if (!(texture.flags & materialFlags.MF_TURBULENT)) {
+      const texture = m.textures[i] as BaseMaterial;
+      if (!(texture.flags & MaterialFlags.MF_TURBULENT)) {
         continue;
       }
       for (let j = 0; j < m.leafs.length; j++) {
@@ -1898,8 +1740,8 @@ export class BrushModelRenderer extends ModelRenderer {
           }
           const hasLightmap = this._surfaceHasTurbulentLightmap(m, surf);
           const faceFallbackLight = hasLightmap ? null : this._getTurbulentFallbackFaceLight(m, surf, turbulentFallbackCache);
-          this._expandLeafBoundsForSurface(leaf, surf.verts);
-          this._expandBounds(chainMins, chainMaxs, surf.verts);
+          this._expandLeafBoundsForSurface(leaf, surf.verts!);
+          this._expandBounds(chainMins, chainMaxs, surf.verts!);
           chain[2] += surf.verts.length;
           for (let l = 0; l < surf.verts.length; l++) {
             const vert = surf.verts[l];
@@ -1907,20 +1749,15 @@ export class BrushModelRenderer extends ModelRenderer {
               ? [0.0, 0.0, 0.0]
               : BrushModelRenderer.blendTurbulentFallbackLight(
                 this._getTurbulentFallbackLight(m, surf, new Vector(vert[0], vert[1], vert[2]), turbulentFallbackCache),
-                faceFallbackLight,
+                faceFallbackLight!,
                 TURBULENT_FALLBACK_FACE_BLEND,
               );
             const dlightTexCoordS = vert[5];
             const dlightTexCoordT = vert[6];
-            // Position (12 bytes)
             cmds.push(vert[0], vert[1], vert[2]);
-            // TexCoord (16 bytes) keeps the lightmap atlas UVs for dlights.
             cmds.push(vert[3], vert[4], dlightTexCoordS, dlightTexCoordT);
-            // LightStyle (16 bytes)
             cmds.push(styles[0], styles[1], styles[2], styles[3]);
-            // aNormal carries per-vertex fallback light for no-lightmap turbulents.
             cmds.push(fallbackLight[0], fallbackLight[1], fallbackLight[2]);
-            // aTangent carries dynamic-light atlas UVs and the baked-lightmap flag.
             cmds.push(dlightTexCoordS, dlightTexCoordT, hasLightmap ? 1.0 : 0.0, 0.0, 0.0, 0.0);
           }
         }
@@ -1938,58 +1775,56 @@ export class BrushModelRenderer extends ModelRenderer {
       }
     }
 
-    // Calculate tangents and bitangents for PBR normal mapping
     Mesh.CalculateTangentBitangents(cmds, cutoff);
 
-    // Upload to GPU
-    m.cmds = gl.createBuffer();
-    gl.bindBuffer(gl.ARRAY_BUFFER, m.cmds);
+    m.cmds = gl.createBuffer()!;
+    gl.bindBuffer(gl.ARRAY_BUFFER, m.cmds as WebGLBuffer);
     gl.bufferData(gl.ARRAY_BUFFER, new Float32Array(cmds), gl.STATIC_DRAW);
 
-    // Create VAOs for opaque (offset 0) and turbulent (offset waterchain) passes
-    m.opaqueVAO = this._createBrushVAO(m.cmds, 0);
-    m.turbulentVAO = this._createBrushVAO(m.cmds, m.waterchain);
+    m.opaqueVAO = this._createBrushVAO(m.cmds as WebGLBuffer, 0);
+    m.turbulentVAO = this._createBrushVAO(m.cmds as WebGLBuffer, m.waterchain);
   }
 
-  _buildSurfaceDisplayList(model, face) {
+  /** @private */
+  _buildSurfaceDisplayList(model: BrushModel, face: Face): void {
     face.verts = [];
     if (face.numedges < 3) {
       return;
     }
     const texinfo = model.texinfo[face.texinfo];
-    const texture = model.textures[texinfo.texture];
+    const texture = model.textures[texinfo.texture as number] as BaseMaterial;
     for (let i = 0; i < face.numedges; i++) {
       const index = model.surfedges[face.firstedge + i];
-      let vec;
+      let vec: Vector;
       if (index > 0) {
         vec = model.vertexes[model.edges[index][0]];
       } else {
         vec = model.vertexes[model.edges[-index][1]];
       }
-      const vert = [vec[0], vec[1], vec[2]];
+      const vert: number[] = [vec[0], vec[1], vec[2]];
       if (face.sky !== true) {
-        const s = vec.dot(new Vector(...texinfo.vecs[0])) + texinfo.vecs[0][3];
-        const t = vec.dot(new Vector(...texinfo.vecs[1])) + texinfo.vecs[1][3];
+        const s = vec.dot(new Vector(texinfo.vecs[0][0], texinfo.vecs[0][1], texinfo.vecs[0][2])) + texinfo.vecs[0][3];
+        const t = vec.dot(new Vector(texinfo.vecs[1][0], texinfo.vecs[1][1], texinfo.vecs[1][2])) + texinfo.vecs[1][3];
         vert[3] = s / texture.width;
         vert[4] = t / texture.height;
-        vert[5] = (s - face.texturemins[0] + (face.light_s << face.lmshift) + (1 << (face.lmshift - 1))) / (LIGHTMAP_BLOCK_SIZE * (1 << face.lmshift));
-        vert[6] = (t - face.texturemins[1] + (face.light_t << face.lmshift) + (1 << (face.lmshift - 1))) / (LIGHTMAP_BLOCK_SIZE * (1 << face.lmshift));
+        const lmshift = face.lmshift ?? 0;
+        vert[5] = (s - face.texturemins[0] + (face.light_s << lmshift) + (1 << (lmshift - 1))) / (LIGHTMAP_BLOCK_SIZE * (1 << lmshift));
+        vert[6] = (t - face.texturemins[1] + (face.light_t << lmshift) + (1 << (lmshift - 1))) / (LIGHTMAP_BLOCK_SIZE * (1 << lmshift));
       }
       if (i >= 3) {
-        face.verts[face.verts.length] = face.verts[0];
-        face.verts[face.verts.length] = face.verts[face.verts.length - 2];
+        face.verts.push(face.verts[0]);
+        face.verts.push(face.verts[face.verts.length - 2]);
       }
-      face.verts[face.verts.length] = vert;
+      face.verts.push(vert);
     }
   }
 
   /**
+   * Whether a surface has baked lightmap data available for turbulent sampling.
    * @private
-   * @param {BrushModel} model Model containing the face.
-   * @param {import('../../common/model/BaseModel.ts').Face} face Turbulent face being packed.
-   * @returns {boolean} True when the face has usable baked lightmap samples.
+   * @returns True when the surface carries valid lightmap data.
    */
-  _surfaceHasTurbulentLightmap(model, face) {
+  _surfaceHasTurbulentLightmap(model: BrushModel, face: Face): boolean {
     if (face.styles.length === 0 || face.lightofs < 0) {
       return false;
     }
@@ -2002,12 +1837,11 @@ export class BrushModelRenderer extends ModelRenderer {
   }
 
   /**
+   * Build a cache key encoding the face and world-space sample position.
    * @private
-   * @param {import('../../common/model/BaseModel.ts').Face} face Turbulent face being packed.
-   * @param {Vector} worldPos Vertex position used for the fallback sample.
-   * @returns {string} Cache key shared by coplanar turbulent edges.
+   * @returns A string key for the turbulent fallback light cache.
    */
-  _getTurbulentFallbackCacheKey(face, worldPos) {
+  _getTurbulentFallbackCacheKey(face: Face, worldPos: Vector): string {
     return [
       face.texture,
       Math.round(face.normal[0] * 1024.0),
@@ -2020,12 +1854,11 @@ export class BrushModelRenderer extends ModelRenderer {
   }
 
   /**
+   * Compute the centroid of a BSP face in world space.
    * @private
-   * @param {BrushModel} model Model containing the face.
-   * @param {import('../../common/model/BaseModel.ts').Face} face Turbulent face being packed.
-   * @returns {Vector} Approximate center used for face-level fallback smoothing.
+   * @returns The face centroid as a world-space vector.
    */
-  _getTurbulentFallbackFaceCenter(model, face) {
+  _getTurbulentFallbackFaceCenter(model: BrushModel, face: Face): Vector {
     const center = new Vector(0.0, 0.0, 0.0);
 
     for (let i = 0; i < face.numedges; i++) {
@@ -2041,26 +1874,21 @@ export class BrushModelRenderer extends ModelRenderer {
   }
 
   /**
+   * Sample turbulent fallback light at the face centroid.
    * @private
-   * @param {BrushModel} model Model containing the face.
-   * @param {import('../../common/model/BaseModel.ts').Face} face Turbulent face being packed.
-   * @param {Map<string, number[]>} cache Shared per-model fallback cache.
-   * @returns {number[]} Face-level fallback color.
+   * @returns RGB fallback light values at the face center.
    */
-  _getTurbulentFallbackFaceLight(model, face, cache) {
+  _getTurbulentFallbackFaceLight(model: BrushModel, face: Face, cache: Map<string, number[]>): number[] {
     const faceCenter = this._getTurbulentFallbackFaceCenter(model, face);
     return this._getTurbulentFallbackLight(model, face, faceCenter, cache);
   }
 
   /**
+   * Sample turbulent fallback light at an arbitrary world-space position.
    * @private
-   * @param {BrushModel} model Model containing the face.
-   * @param {import('../../common/model/BaseModel.ts').Face} face Turbulent face being packed.
-   * @param {Vector} worldPos Vertex position used for the fallback sample.
-   * @param {Map<string, number[]>} [cache] Shared per-model fallback cache.
-   * @returns {number[]} Vertex-level fallback light color.
+   * @returns RGB fallback light values at the given position.
    */
-  _getTurbulentFallbackLight(model, face, worldPos, cache = null) {
+  _getTurbulentFallbackLight(model: BrushModel, face: Face, worldPos: Vector, cache: Map<string, number[]> | null = null): number[] {
     if (model.submodel || CL.state.worldmodel === null) {
       return [1.0, 1.0, 1.0];
     }
@@ -2080,29 +1908,4 @@ export class BrushModelRenderer extends ModelRenderer {
 
     return BrushModelRenderer.sampleTurbulentFallbackLight(model, face, worldPos, R.LightPoint);
   }
-
-  /**
-   * Free GPU resources for this brush model.
-   * Uses global `gl` from registry.
-   * @param {BrushModel} model The brush model to cleanup
-   */
-  cleanupModel(model) {
-    if (model.opaqueVAO) {
-      gl.deleteVertexArray(model.opaqueVAO);
-      model.opaqueVAO = null;
-    }
-    if (model.turbulentVAO) {
-      gl.deleteVertexArray(model.turbulentVAO);
-      model.turbulentVAO = null;
-    }
-    if (model.cmds) {
-      gl.deleteBuffer(model.cmds);
-      model.cmds = null;
-    }
-
-    // Free fog light probe textures when world model is cleaned up
-    if (model.fogVolumes && model.fogVolumes.length > 0) {
-      this._freeFogLightProbes();
-    }
-  }
 }
diff --git a/source/engine/client/renderer/Materials.mjs b/source/engine/client/renderer/Materials.ts
similarity index 58%
rename from source/engine/client/renderer/Materials.mjs
rename to source/engine/client/renderer/Materials.ts
index fed06879..92bff47b 100644
--- a/source/engine/client/renderer/Materials.mjs
+++ b/source/engine/client/renderer/Materials.ts
@@ -1,68 +1,64 @@
-import { eventBus, registry } from '../../registry.mjs';
-import { ClientEdict } from '../ClientEntities.ts';
-import GL, { GLTexture } from '../GL.mjs';
+import { eventBus, getClientRegistry } from '../../registry.mjs';
+import type { ClientEdict } from '../ClientEntities.ts';
+import GL, { GLTexture, type GLProgramInfo } from '../GL.ts';
 
-let { CL, R } = registry;
+let { CL, R } = getClientRegistry();
 
 eventBus.subscribe('registry.frozen', () => {
-  CL = registry.CL;
-  R = registry.R;
+  ({ CL, R } = getClientRegistry());
 
   // no renderer available in headless mode, so we need to provide a fallback for material renderer state access
   if (!R) {
-    // @ts-ignore
     R = {
       blacktexture: nullTexture,
       notexture: nullTexture,
       flatnormalmap: nullTexture,
       interpolation: { value: false },
       c_brush_texture_binds: 0,
-    };
+    } as unknown as typeof R;
   }
 });
 
-let gl = /** @type {WebGL2RenderingContext} */ (null);
+let gl: WebGL2RenderingContext = null!;
 
 eventBus.subscribe('gl.ready', () => {
   gl = GL.gl;
 });
 
 eventBus.subscribe('gl.shutdown', () => {
-  gl = null;
+  gl = null!;
 });
 
-/** @typedef {{ blacktexture: GLTexture, notexture: GLTexture, flatnormalmap: GLTexture, interpolation: { value: boolean }, c_brush_texture_binds: number }} MaterialRendererState */
-
-const nullTexture = /** @type {GLTexture} */ ({
+const nullTexture: GLTexture = {
   bind() {},
   free() {},
-});
-
-export const materialFlags = Object.freeze({
-  MF_NONE: 0,
-  MF_TRANSPARENT: 1,
-  MF_SKY: 2,
-  MF_TURBULENT: 4,
-  MF_SKIP: 8,
-  MF_FULLBRIGHT: 16,
-});
+} as unknown as GLTexture;
+
+export enum MaterialFlags {
+  MF_NONE = 0,
+  MF_TRANSPARENT = 1,
+  MF_SKY = 2,
+  MF_TURBULENT = 4,
+  MF_SKIP = 8,
+  MF_FULLBRIGHT = 16,
+}
 
 /**
  * Resolve the luminance texture for a material draw.
  * Materials flagged MF_FULLBRIGHT fall back to their diffuse texture when they
  * do not provide a separate luminance map.
- * @param {number} flags Material flags.
- * @param {GLTexture|null} luminanceTexture Explicit luminance texture.
- * @param {GLTexture|null} diffuseTexture Active diffuse texture.
- * @param {GLTexture} fallbackTexture Renderer fallback texture.
- * @returns {GLTexture} Luminance texture to bind for the draw.
+ * @param flags Material flags.
+ * @param luminanceTexture Explicit luminance texture.
+ * @param diffuseTexture Active diffuse texture.
+ * @param fallbackTexture Renderer fallback texture.
+ * @returns Luminance texture to bind for the draw.
  */
-export function resolveMaterialLuminanceTexture(flags, luminanceTexture, diffuseTexture, fallbackTexture) {
+export function resolveMaterialLuminanceTexture(flags: number, luminanceTexture: GLTexture | null, diffuseTexture: GLTexture | null, fallbackTexture: GLTexture): GLTexture {
   if (luminanceTexture && luminanceTexture !== fallbackTexture) {
     return luminanceTexture;
   }
 
-  if ((flags & materialFlags.MF_FULLBRIGHT) !== 0 && diffuseTexture !== null) {
+  if ((flags & MaterialFlags.MF_FULLBRIGHT) !== 0 && diffuseTexture !== null) {
     return diffuseTexture;
   }
 
@@ -75,43 +71,46 @@ export function resolveMaterialLuminanceTexture(flags, luminanceTexture, diffuse
  * Also responsible for managing animations etc.
  */
 export class BaseMaterial {
-  flags = /** @type {number} */ (materialFlags.MF_NONE);
-  name = /** @type {string} */ (null);
-  width = /** @type {number} */ (0);
-  height = /** @type {number} */ (0);
+  /** Material render flags, a combination of {@link MaterialFlags} bits. */
+  flags: MaterialFlags = MaterialFlags.MF_NONE;
+
+  /** Texture / material name. */
+  name: string;
+
+  /** Texture width in texels. */
+  width: number;
+
+  /** Texture height in texels. */
+  height: number;
+
+  /** Current alpha value resolved per-draw. */
   currentAlpha = 1.0;
 
-  /** @type {number[]} Average color of the texture as [r, g, b] in 0-255 range */
-  averageColor = [128, 128, 128];
+  /** Average color of the texture as [r, g, b] in 0-255 range. */
+  averageColor: [number, number, number] = [128, 128, 128];
 
-  /**
-   * @param {string} name name
-   * @param {number} width width
-   * @param {number} height height
-   */
-  constructor(name, width, height) {
+  constructor(name: string, width: number, height: number) {
     this.name = name;
     this.width = width;
     this.height = height;
   }
 
-  // eslint-disable-next-line no-unused-vars
-  bindTo(program) {
+
+  bindTo(_program: GLProgramInfo): void {
     // to be implemented by subclasses
   }
 
-  emit(/** @type {ClientEdict?} */ clientEdict = null) {
+  emit(clientEdict: ClientEdict | null = null): void {
     this.currentAlpha = this.resolveAlpha(clientEdict);
   }
 
   /**
    * Resolve the effective alpha for this material on the current draw.
-   * @protected
-   * @param {ClientEdict?} clientEdict Client entity being rendered.
-   * @returns {number} Alpha in the 0..1 range.
+   * @param clientEdict Client entity being rendered.
+   * @returns Alpha in the 0..1 range.
    */
-  resolveAlpha(clientEdict = null) {
-    if ((this.flags & materialFlags.MF_TURBULENT) === 0 || clientEdict === null) {
+  protected resolveAlpha(clientEdict: ClientEdict | null = null): number {
+    if ((this.flags & MaterialFlags.MF_TURBULENT) === 0 || clientEdict === null) {
       return 1.0;
     }
 
@@ -143,10 +142,9 @@ export class BaseMaterial {
 
   /**
    * Pick the relevant worldspawn alpha keys for this turbulent material.
-   * @protected
-   * @returns {string[]} Ordered list of worldspawn keys to query.
+   * @returns Ordered list of worldspawn keys to query.
    */
-  _getLiquidAlphaKeys() {
+  protected _getLiquidAlphaKeys(): string[] {
     const lowerName = this.name.toLowerCase();
 
     if (lowerName.includes('lava')) {
@@ -164,84 +162,78 @@ export class BaseMaterial {
     return ['_wateralpha', 'wateralpha'];
   }
 
-  free() {
+  free(): void {
     // to be implemented by subclasses
   }
 
-  [Symbol.dispose]() { // make sure we always free resources
+  [Symbol.dispose](): void {
     this.free();
   }
-};
+}
 
 class BrushMaterial extends BaseMaterial {
-  luminance = /** @type {GLTexture} */ (null);
+  /** Luminance/emissive texture for this material. */
+  luminance: GLTexture;
 
-  constructor(name, width, height) {
+  constructor(name: string, width: number, height: number) {
     super(name, width, height);
-
     this.luminance = R.blacktexture;
   }
 
   /**
-   * @protected
-   * @param {object} program Active shader program.
+   * @param program Active shader program.
    */
-  _bindInterpolation(program) {
+  protected _bindInterpolation(program: GLProgramInfo): void {
     if (program.uInterpolation !== undefined) {
-      gl.uniform1f(program.uInterpolation, R.interpolation.value ? (CL.state.time % 0.2) / 0.2 : 0);
+      gl.uniform1f(program.uInterpolation!, R.interpolation.value ? (CL.state.time % 0.2) / 0.2 : 0);
     }
   }
 
   /**
-   * @protected
-   * @returns {GLTexture} Luminance texture for the current draw.
+   * @returns Luminance texture for the current draw.
    */
-  _getLuminanceTexture() {
+  protected _getLuminanceTexture(): GLTexture {
     return resolveMaterialLuminanceTexture(this.flags, this.luminance, this._getCurrentTexture(), R.blacktexture);
   }
 
   /**
-   * @protected
-   * @param {object} program Active shader program.
+   * @param program Active shader program.
    */
-  _bindLuminance(program) {
+  protected _bindLuminance(program: GLProgramInfo): void {
     if (program.tLuminance !== undefined) {
-      this._getLuminanceTexture().bind(program.tLuminance);
+      this._getLuminanceTexture().bind(program.tLuminance!);
       R.c_brush_texture_binds++;
     }
   }
 
   /**
-   * @protected
-   * @returns {GLTexture} Current diffuse texture for the draw.
+   * @returns Current diffuse texture for the draw.
    */
-  _getCurrentTexture() {
+  protected _getCurrentTexture(): GLTexture {
     return R.notexture;
   }
 
   /**
-   * @protected
-   * @returns {GLTexture} Next diffuse texture for interpolated draws.
+   * @returns Next diffuse texture for interpolated draws.
    */
-  _getNextTexture() {
+  protected _getNextTexture(): GLTexture {
     return this._getCurrentTexture();
   }
 
   /**
-   * @protected
-   * @param {object} program Active shader program.
+   * @param program Active shader program.
    */
-  _bindPrimaryTextures(program) {
+  protected _bindPrimaryTextures(program: GLProgramInfo): void {
     const currentTexture = this._getCurrentTexture();
 
     if (program.tTextureA !== undefined && program.tTextureB !== undefined) {
-      currentTexture.bind(program.tTextureA);
-      this._getNextTexture().bind(program.tTextureB);
+      currentTexture.bind(program.tTextureA!);
+      this._getNextTexture().bind(program.tTextureB!);
       R.c_brush_texture_binds += 2;
     }
 
     if (program.tTexture !== undefined) {
-      currentTexture.bind(program.tTexture);
+      currentTexture.bind(program.tTexture!);
       R.c_brush_texture_binds++;
     }
   }
@@ -253,78 +245,72 @@ class BrushMaterial extends BaseMaterial {
  * No support for PBR or advanced features.
  */
 export class QuakeMaterial extends BrushMaterial {
-  #textures = /** @type {GLTexture[]} */ ([]);
-  #luminanceTextures = /** @type {(GLTexture|null)[]} */ ([]);
-
-  #frames = /** @type {number} */ (1);
-  #alternateFrames = /** @type {number} */ (0);
-
+  #textures: GLTexture[] = [];
+  #luminanceTextures: (GLTexture | null)[] = [];
+  #frames = 1;
+  #alternateFrames = 0;
   #frame = 0;
   #nextFrame = 0;
 
-  bindTo(program) {
-    gl.uniform1i(program.uPerformDotLighting, 0);
+  override bindTo(program: GLProgramInfo): void {
+    gl.uniform1i(program.uPerformDotLighting!, 0);
     this._bindInterpolation(program);
-
     this._bindPrimaryTextures(program);
     this._bindLuminance(program);
   }
 
-  set texture(texture) {
+  set texture(texture: GLTexture) {
     this.#textures[0] = texture;
     this.#textures.length = 1;
   }
 
-  set luminanceTexture(texture) {
+  set luminanceTexture(texture: GLTexture) {
     this.#luminanceTextures[0] = texture;
     this.#luminanceTextures.length = 1;
   }
 
-  get texture() {
+  get texture(): GLTexture | null {
     return this.#textures[0] || null;
   }
 
-  get luminanceTexture() {
+  get luminanceTexture(): GLTexture | null {
     return this.#luminanceTextures[0] || null;
   }
 
   /**
-   * @protected
-   * @returns {GLTexture} Current diffuse texture for the active animation frame.
+   * @returns Current diffuse texture for the active animation frame.
    */
-  _getCurrentTexture() {
+  protected override _getCurrentTexture(): GLTexture {
     return this.#textures[this.#frame] || R.notexture;
   }
 
   /**
-   * @protected
-   * @returns {GLTexture} Next diffuse texture for the active animation frame.
+   * @returns Next diffuse texture for the active animation frame.
    */
-  _getNextTexture() {
+  protected override _getNextTexture(): GLTexture {
     return this.#textures[this.#nextFrame] || this._getCurrentTexture();
   }
 
   /**
-   * @protected
-   * @returns {GLTexture} Luminance texture for the active animation frame.
+   * @returns Luminance texture for the active animation frame.
    */
-  _getLuminanceTexture() {
+  protected override _getLuminanceTexture(): GLTexture {
     return resolveMaterialLuminanceTexture(this.flags, this.#luminanceTextures[this.#frame] || null, this._getCurrentTexture(), R.blacktexture);
   }
 
-  addAnimationFrame(num, frameTexture, frameLuminanceTexture = null) {
+  addAnimationFrame(num: number, frameTexture: GLTexture, frameLuminanceTexture: GLTexture | null = null): void {
     this.#frames = Math.max(this.#frames, num + 1);
     this.#textures[num] = frameTexture;
     this.#luminanceTextures[num] = frameLuminanceTexture;
   }
 
-  addAlternateFrame(num, frameTexture, frameLuminanceTexture = null) {
+  addAlternateFrame(num: number, frameTexture: GLTexture, frameLuminanceTexture: GLTexture | null = null): void {
     this.#alternateFrames = Math.max(this.#alternateFrames, num + 1);
     this.#textures[num + 10] = frameTexture;
     this.#luminanceTextures[num + 10] = frameLuminanceTexture;
   }
 
-  emit(/** @type {ClientEdict} */ clientEdict = null) {
+  override emit(clientEdict: ClientEdict | null = null): void {
     this.currentAlpha = this.resolveAlpha(clientEdict);
     const frame = Math.floor((clientEdict !== null ? clientEdict.frame : 0) + CL.state.time * 5.0);
     const useAlternate = (clientEdict !== null && clientEdict.frame > 0 && this.#alternateFrames > 0);
@@ -338,7 +324,7 @@ export class QuakeMaterial extends BrushMaterial {
     }
   }
 
-  free() {
+  override free(): void {
     for (const tex of this.#textures) {
       tex.free();
     }
@@ -352,51 +338,54 @@ export class QuakeMaterial extends BrushMaterial {
     this.#textures.length = 0;
     this.#luminanceTextures.length = 0;
   }
-};
+}
 
 /**
  * A class representing a PBR material.
  */
 export class PBRMaterial extends BrushMaterial {
-  diffuse = /** @type {GLTexture} */ (null);
-  specular = /** @type {GLTexture} */ (null);
-  normal = /** @type {GLTexture} */ (null);
+  /** Diffuse (albedo) texture. */
+  diffuse: GLTexture;
 
-  constructor(name, width, height) {
-    super(name, width, height);
+  /** Specular texture. */
+  specular: GLTexture;
+
+  /** Normal map texture. */
+  normal: GLTexture;
 
+  constructor(name: string, width: number, height: number) {
+    super(name, width, height);
     this.diffuse = R.notexture;
     this.specular = R.blacktexture;
     this.normal = R.flatnormalmap;
   }
 
-  bindTo(program) {
+  override bindTo(program: GLProgramInfo): void {
     if (program.uPerformDotLighting !== undefined) {
-      gl.uniform1i(program.uPerformDotLighting, 1);
+      gl.uniform1i(program.uPerformDotLighting!, 1);
     }
 
     this._bindInterpolation(program);
-
     this._bindPrimaryTextures(program);
 
     if (program.tSpecular !== undefined) {
-      this.specular.bind(program.tSpecular);
+      this.specular.bind(program.tSpecular!);
       R.c_brush_texture_binds++;
     }
 
     if (program.tNormal !== undefined) {
-      this.normal.bind(program.tNormal);
+      this.normal.bind(program.tNormal!);
       R.c_brush_texture_binds++;
     }
 
     this._bindLuminance(program);
   }
 
-  emit(/** @type {ClientEdict?} */ clientEdict = null) {
+  override emit(clientEdict: ClientEdict | null = null): void {
     this.currentAlpha = this.resolveAlpha(clientEdict);
   }
 
-  free() {
+  override free(): void {
     if (this.diffuse !== R.notexture) {
       this.diffuse.free();
     }
@@ -415,20 +404,19 @@ export class PBRMaterial extends BrushMaterial {
   }
 
   /**
-   * @protected
-   * @returns {GLTexture} Current diffuse texture for PBR draws.
+   * @returns Current diffuse texture for PBR draws.
    */
-  _getCurrentTexture() {
+  protected override _getCurrentTexture(): GLTexture {
     return this.diffuse || R.notexture;
   }
-};
+}
 
 class NoTextureMaterial extends BaseMaterial {
   constructor() {
     super('notexture', 16, 16);
   }
 
-  bind() {
+  override bindTo(_program: GLProgramInfo): void {
     R.notexture.bind(0);
   }
 }
diff --git a/source/engine/client/renderer/Mesh.mjs b/source/engine/client/renderer/Mesh.ts
similarity index 91%
rename from source/engine/client/renderer/Mesh.mjs
rename to source/engine/client/renderer/Mesh.ts
index 0e987e0e..0731b0d5 100644
--- a/source/engine/client/renderer/Mesh.mjs
+++ b/source/engine/client/renderer/Mesh.ts
@@ -1,15 +1,16 @@
 import { EPSILON } from '../../../shared/Defs.ts';
 
 /**
- * Mesh stuff.
+ * Mesh utility helpers.
  */
 export default class Mesh {
   /**
    * Calculate tangents and bitangents for a vertex array.
-   * @param {number[]} cmds vertex data array (stride = 20 floats: pos(3), uv(2), color(4), normal(3), tangent(3), bitangent(3))
-   * @param {number} cutoff number of floats to process (should be multiple of 60 for whole triangles)
+   * Stride is 20 floats: pos(3), uv(2), color(4), normal(3), tangent(3), bitangent(3).
+   * @param cmds Vertex data array.
+   * @param cutoff Number of floats to process (should be multiple of 60 for whole triangles).
    */
-  static CalculateTangentBitangents(cmds, cutoff) {
+  static CalculateTangentBitangents(cmds: number[], cutoff: number): void {
     // compute per-triangle tangent/bitangent (stride = 20 floats)
     const stride = 20;
     for (let i = 0; i + stride * 3 <= Math.min(cutoff, cmds.length); i += stride * 3) {
@@ -86,4 +87,4 @@ export default class Mesh {
       }
     }
   }
-};
+}
diff --git a/source/engine/client/renderer/MeshModelRenderer.mjs b/source/engine/client/renderer/MeshModelRenderer.ts
similarity index 65%
rename from source/engine/client/renderer/MeshModelRenderer.mjs
rename to source/engine/client/renderer/MeshModelRenderer.ts
index ff403b98..b96d5ac7 100644
--- a/source/engine/client/renderer/MeshModelRenderer.mjs
+++ b/source/engine/client/renderer/MeshModelRenderer.ts
@@ -1,23 +1,26 @@
 import Vector from '../../../shared/Vector.ts';
-import { ModelRenderer } from './ModelRenderer.mjs';
-import { getEntityBloomEmissiveScale } from './BloomEffect.mjs';
-import { eventBus, registry } from '../../registry.mjs';
-import GL, { ATTRIB_LOCATIONS } from '../GL.mjs';
+import { ModelRenderer } from './ModelRenderer.ts';
+import { getEntityBloomEmissiveScale } from './BloomEffect.ts';
+import { eventBus, getClientRegistry } from '../../registry.mjs';
+import GL, { ATTRIB_LOCATIONS } from '../GL.ts';
+import type { MeshModel } from '../../common/model/MeshModel.ts';
+import type { ClientEdict } from '../ClientEntities.ts';
+import type { BaseModel } from '../../common/model/BaseModel.ts';
 
-let { Con, R } = registry;
+let { Con, R } = getClientRegistry();
 
 eventBus.subscribe('registry.frozen', () => {
-  ({ Con, R } = registry);
+  ({ Con, R } = getClientRegistry());
 });
 
-let gl = /** @type {WebGL2RenderingContext} */ (null);
+let gl: WebGL2RenderingContext = null!;
 
 eventBus.subscribe('gl.ready', () => {
   gl = GL.gl;
 });
 
 eventBus.subscribe('gl.shutdown', () => {
-  gl = null;
+  gl = null!;
 });
 
 /**
@@ -26,60 +29,58 @@ eventBus.subscribe('gl.shutdown', () => {
  */
 export class MeshModelRenderer extends ModelRenderer {
   /**
-   * Get the model type this renderer handles
-   * @returns {number} Mod.type.mesh (3)
+   * Get the model type this renderer handles.
+   * @returns Mod.type.mesh (3)
    */
-  getModelType() {
+  override getModelType(): number {
     return 3; // Mod.type.mesh
   }
 
   /**
    * Setup rendering state for mesh models.
-   * @param {number} [_pass] Rendering pass (0=opaque, 1=transparent)
+   * @param _pass Rendering pass (0=opaque, 1=transparent).
    */
-  // eslint-disable-next-line no-unused-vars
-  setupRenderState(_pass = 0) {
+
+  override setupRenderState(_pass = 0): void {
     // Mesh models bind their own buffers and state per-entity
     // No shared setup needed at this level
   }
 
   /**
-   * @param {import('../../common/model/MeshModel.ts').MeshModel} _model The mesh model
-   * @param {import('../ClientEntities.ts').ClientEdict} _entity The entity being rendered
-   * @returns {boolean} Mesh transparency is not implemented, so meshes stay in the opaque pass
+   * @param _model The mesh model.
+   * @param _entity The entity being rendered.
+   * @returns Mesh transparency is not implemented, so meshes stay in the opaque pass.
    */
-  // eslint-disable-next-line no-unused-vars
-  rendersOpaquePass(_model, _entity) {
+  override rendersOpaquePass(_model: BaseModel, _entity: ClientEdict): boolean {
     return true;
   }
 
   /**
-   * @param {import('../../common/model/MeshModel.ts').MeshModel} _model The mesh model
-   * @param {import('../ClientEntities.ts').ClientEdict} _entity The entity being rendered
-   * @returns {boolean} False because sorted transparent mesh rendering is not implemented yet
+   * @param _model The mesh model.
+   * @param _entity The entity being rendered.
+   * @returns False because sorted transparent mesh rendering is not implemented yet.
    */
-  // eslint-disable-next-line no-unused-vars
-  rendersTransparentPass(_model, _entity) {
+  override rendersTransparentPass(_model: BaseModel, _entity: ClientEdict): boolean {
     return false;
   }
 
   /**
    * Cleanup rendering state after rendering mesh models.
-   * @param {number} [_pass] Rendering pass (0=opaque, 1=transparent)
+   * @param _pass Rendering pass (0=opaque, 1=transparent).
    */
-  // eslint-disable-next-line no-unused-vars
-  cleanupRenderState(_pass = 0) {
+
+  override cleanupRenderState(_pass = 0): void {
     // No shared cleanup needed
   }
 
   /**
    * Render a single mesh model entity.
-   * @param {import('../../common/model/MeshModel.ts').MeshModel} model The mesh model to render
-   * @param {import('../ClientEntities.ts').ClientEdict} entity The entity being rendered
-   * @param {number} pass Rendering pass (0=opaque, 1=transparent)
+   * @param model The mesh model to render.
+   * @param entity The entity being rendered.
+   * @param pass Rendering pass (0=opaque, 1=transparent).
    */
-  render(model, entity, pass = 0) {
-    const clmodel = model;
+  override render(model: BaseModel, entity: ClientEdict, pass = 0): void {
+    const clmodel = model as MeshModel;
     const e = entity;
 
     // Only render in opaque pass for now
@@ -108,30 +109,30 @@ export class MeshModelRenderer extends ModelRenderer {
     }
 
     // Use dedicated mesh shader
-    const program = GL.UseProgram('mesh');
+    const program = GL.UseProgram('mesh')!;
 
     // Bind model VAO (captures VBO layout + IBO)
-    GL.BindVAO(clmodel.vao);
+    GL.BindVAO(clmodel.vao!);
 
     // Setup uniforms
     const viewMatrix = e.lerp.angles.toRotationMatrix();
-    gl.uniform3fv(program.uOrigin, e.lerp.origin);
-    gl.uniformMatrix3fv(program.uAngles, false, viewMatrix);
+    gl.uniform3fv(program.uOrigin!, e.lerp.origin);
+    gl.uniformMatrix3fv(program.uAngles!, false, viewMatrix);
 
     // Lighting
     const [ambientlight, shadelight, lightPosition, dynamicShadeLight, dynamicLightPosition] = R._CalculateLightValues(e);
-    gl.uniform3fv(program.uAmbientLight, ambientlight);
-    gl.uniform3fv(program.uShadeLight, shadelight);
-    gl.uniform3fv(program.uLightVec, lightPosition);
-    gl.uniform3fv(program.uDynamicShadeLight, dynamicShadeLight);
-    gl.uniform3fv(program.uDynamicLightVec, dynamicLightPosition);
-    gl.uniform1f(program.uBloomEmissiveScale, getEntityBloomEmissiveScale(e.effects));
+    gl.uniform3fv(program.uAmbientLight!, ambientlight);
+    gl.uniform3fv(program.uShadeLight!, shadelight);
+    gl.uniform3fv(program.uLightVec!, lightPosition);
+    gl.uniform3fv(program.uDynamicShadeLight!, dynamicShadeLight);
+    gl.uniform3fv(program.uDynamicLightVec!, dynamicLightPosition);
+    gl.uniform1f(program.uBloomEmissiveScale!, getEntityBloomEmissiveScale(e.effects));
 
     // Bind texture
     if (clmodel.texture) {
       clmodel.texture.bindTo(program);
     } else {
-      R.notexture.bind(program.tTexture);
+      R.notexture.bind(program.tTexture!);
     }
 
     // Bind local shadow maps
@@ -163,12 +164,12 @@ export class MeshModelRenderer extends ModelRenderer {
 
   /**
    * Prepare mesh model for rendering (build display lists, upload to GPU).
-   * @param {import('../../common/model/MeshModel.ts').MeshModel} model The mesh model to prepare
-   * @param {boolean} isWorldModel Whether this model is the world model
+   * @param model The mesh model to prepare.
+   * @param isWorldModel Whether this model is the world model.
    */
-  // eslint-disable-next-line no-unused-vars
-  prepareModel(model, isWorldModel = false) {
-    const m = model;
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
+  override prepareModel(model: BaseModel, isWorldModel = false): void {
+    const m = model as MeshModel;
 
     // Clean up existing buffers if present
     if (m.vbo) {
@@ -255,41 +256,59 @@ export class MeshModelRenderer extends ModelRenderer {
     gl.bindBuffer(gl.ELEMENT_ARRAY_BUFFER, m.ibo);
 
     // Flip winding order (CW -> CCW) to fix inside-out rendering
-    const indices = new (m.indices instanceof Uint16Array ? Uint16Array : Uint32Array)(m.indices.length);
-    for (let i = 0; i < m.indices.length; i += 3) {
-      indices[i] = m.indices[i];
-      indices[i + 1] = m.indices[i + 2];
-      indices[i + 2] = m.indices[i + 1];
+    const srcIndices = m.indices!;
+    const indices = new (srcIndices instanceof Uint16Array ? Uint16Array : Uint32Array)(srcIndices.length);
+    for (let i = 0; i < srcIndices.length; i += 3) {
+      indices[i] = srcIndices[i];
+      indices[i + 1] = srcIndices[i + 2];
+      indices[i + 2] = srcIndices[i + 1];
     }
 
     gl.bufferData(gl.ELEMENT_ARRAY_BUFFER, indices, gl.STATIC_DRAW);
 
     // Create VAO capturing VBO layout + IBO binding
     const stride = 56;
-    m.vao = GL.CreateVAO(m.vbo, [
+    m.vao = GL.CreateVAO(m.vbo!, [
       { location: ATTRIB_LOCATIONS.aPosition, components: 3, type: gl.FLOAT, normalized: false, stride, offset: 0 },
       { location: ATTRIB_LOCATIONS.aTexCoord, components: 2, type: gl.FLOAT, normalized: false, stride, offset: 12 },
       { location: ATTRIB_LOCATIONS.aNormal, components: 3, type: gl.FLOAT, normalized: false, stride, offset: 20 },
-    ], m.ibo);
+    ], m.ibo!);
 
     Con.DPrint(`MeshModelRenderer.prepareModel: ${m.name} uploaded ${m.numVertices} vertices, ${m.numTriangles} triangles\n`);
 
-    // Load texture
     this._loadTexture(m);
   }
 
   /**
-   * Load texture for mesh model
-   * @private
-   * @param {import('../../common/model/MeshModel.ts').MeshModel} model The mesh model
+   * Load texture for mesh model.
+   * @param model The mesh model.
    */
-  _loadTexture(model) {
+  private _loadTexture(model: MeshModel): void {
     // Try to load texture using the texture name
     // For now, just use the base name and let the texture system find it
     if (model.textureName) {
       // The texture will be loaded lazily when first needed
-      // For now, we'll just store the name
       // TODO: Implement proper texture loading for external formats (PNG, JPG)
     }
   }
+
+  /**
+   * Free GPU resources for this mesh model.
+   * @param model The mesh model to cleanup.
+   */
+  override cleanupModel(model: BaseModel): void {
+    const m = model as MeshModel;
+    if (m.vao) {
+      gl.deleteVertexArray(m.vao);
+      m.vao = null;
+    }
+    if (m.vbo) {
+      gl.deleteBuffer(m.vbo);
+      m.vbo = null;
+    }
+    if (m.ibo) {
+      gl.deleteBuffer(m.ibo);
+      m.ibo = null;
+    }
+  }
 }
diff --git a/source/engine/client/renderer/ModelRenderer.mjs b/source/engine/client/renderer/ModelRenderer.ts
similarity index 51%
rename from source/engine/client/renderer/ModelRenderer.mjs
rename to source/engine/client/renderer/ModelRenderer.ts
index 7243a99c..958ba3d4 100644
--- a/source/engine/client/renderer/ModelRenderer.mjs
+++ b/source/engine/client/renderer/ModelRenderer.ts
@@ -1,4 +1,6 @@
 import { NotImplementedError } from '../../common/Errors.ts';
+import type { BaseModel } from '../../common/model/BaseModel.ts';
+import type { ClientEdict } from '../ClientEntities.ts';
 
 /**
  * Abstract base class for model renderers.
@@ -9,10 +11,10 @@ import { NotImplementedError } from '../../common/Errors.ts';
  */
 export class ModelRenderer {
   /**
-   * Get the model type this renderer handles
-   * @returns {number} Model type constant (Mod.type.brush, Mod.type.alias, Mod.type.sprite)
+   * Returns the model type constant this renderer handles (e.g. Mod.type.brush).
+   * @returns The model type identifier for this renderer.
    */
-  getModelType() {
+  getModelType(): number {
     throw new NotImplementedError('ModelRenderer.getModelType must be implemented');
     // eslint-disable-next-line no-unreachable
     return -1;
@@ -21,55 +23,44 @@ export class ModelRenderer {
   /**
    * Setup rendering state for this model type.
    * Called once before rendering multiple entities of the same type.
-   * @param {number} [_pass] Rendering pass (0=opaque, 1=transparent, etc.)
    */
-  // eslint-disable-next-line no-unused-vars
-  setupRenderState(_pass = 0) {
+
+  setupRenderState(_pass = 0): void {
     throw new NotImplementedError('ModelRenderer.setupRenderState must be implemented');
   }
 
   /**
    * Whether this model/entity pair should contribute to the opaque pass.
    * Renderers can override this when transparency is entity- or material-driven.
-   * @param {import('../../common/model/BaseModel.ts').BaseModel} _model The model to evaluate
-   * @param {import('../ClientEntities.ts').ClientEdict} _entity The entity to evaluate
-   * @returns {boolean} True when the pair should render during the opaque pass
    */
-  // eslint-disable-next-line no-unused-vars
-  rendersOpaquePass(_model, _entity) {
+
+  rendersOpaquePass(_model: BaseModel, _entity: ClientEdict): boolean {
     return true;
   }
 
   /**
    * Whether this model/entity pair should contribute to the sorted transparent pass.
    * Sprites are handled by their dedicated pass and should normally return false here.
-   * @param {import('../../common/model/BaseModel.ts').BaseModel} _model The model to evaluate
-   * @param {import('../ClientEntities.ts').ClientEdict} _entity The entity to evaluate
-   * @returns {boolean} True when the pair should render during the sorted transparent pass
    */
-  // eslint-disable-next-line no-unused-vars
-  rendersTransparentPass(_model, _entity) {
+
+  rendersTransparentPass(_model: BaseModel, _entity: ClientEdict): boolean {
     return false;
   }
 
   /**
    * Render a single entity with this model type.
-   * @param {import('../../common/model/BaseModel.ts').BaseModel} _model The model to render
-   * @param {import('../ClientEntities.ts').ClientEdict} _entity The entity being rendered
-   * @param {number} [_pass] Rendering pass (0=opaque, 1=transparent, etc.)
    */
-  // eslint-disable-next-line no-unused-vars
-  render(_model, _entity, _pass = 0) {
+
+  render(_model: BaseModel, _entity: ClientEdict, _pass = 0): void {
     throw new NotImplementedError('ModelRenderer.render must be implemented');
   }
 
   /**
    * Cleanup rendering state after rendering all entities of this type.
    * Called once after rendering multiple entities of the same type.
-   * @param {number} [_pass] Rendering pass (0=opaque, 1=transparent, etc.)
    */
-  // eslint-disable-next-line no-unused-vars
-  cleanupRenderState(_pass = 0) {
+
+  cleanupRenderState(_pass = 0): void {
     throw new NotImplementedError('ModelRenderer.cleanupRenderState must be implemented');
   }
 
@@ -77,11 +68,9 @@ export class ModelRenderer {
    * Prepare model for rendering (build display lists, upload to GPU, etc.).
    * Called when model is first loaded or needs rebuilding.
    * Uses global `gl` from registry.
-   * @param {import('../../common/model/BaseModel.ts').BaseModel} _model The model to prepare
-   * @param {boolean} isWorldModel Whether this model is the world model
    */
-  // eslint-disable-next-line no-unused-vars
-  prepareModel(_model, isWorldModel = false) {
+
+  prepareModel(_model: BaseModel, _isWorldModel = false): void {
     throw new NotImplementedError('ModelRenderer.prepareModel must be implemented');
   }
 
@@ -89,10 +78,9 @@ export class ModelRenderer {
    * Free GPU resources for this model.
    * Called when model is unloaded or needs cleanup.
    * Uses global `gl` from registry.
-   * @param {import('../../common/model/BaseModel.ts').BaseModel} _model The model to cleanup
    */
-  // eslint-disable-next-line no-unused-vars
-  cleanupModel(_model) {
+
+  cleanupModel(_model: BaseModel): void {
     // Default implementation: do nothing (override if needed)
   }
 }
diff --git a/source/engine/client/renderer/ModelRendererRegistry.mjs b/source/engine/client/renderer/ModelRendererRegistry.mjs
deleted file mode 100644
index 9dccf7a2..00000000
--- a/source/engine/client/renderer/ModelRendererRegistry.mjs
+++ /dev/null
@@ -1,68 +0,0 @@
-/**
- * Registry for model renderers.
- * Maps model types to their corresponding renderer implementations.
- */
-export class ModelRendererRegistry {
-  constructor() {
-    /** @type {Map<number, import('./ModelRenderer.mjs').ModelRenderer>} Map of model type to renderer */
-    this._renderers = new Map();
-  }
-
-  /**
-   * Register a renderer for a specific model type
-   * @param {import('./ModelRenderer.mjs').ModelRenderer} renderer The renderer instance
-   */
-  register(renderer) {
-    /** @type {number} */
-    const modelType = renderer.getModelType();
-    if (this._renderers.has(modelType)) {
-      console.warn(`ModelRendererRegistry: Renderer for type ${modelType} already registered, replacing`);
-    }
-    this._renderers.set(modelType, renderer);
-  }
-
-  /**
-   * Get the renderer for a specific model type
-   * @param {number} modelType The model type constant
-   * @returns {import('./ModelRenderer.mjs').ModelRenderer|null} The renderer or null if not found
-   */
-  getRenderer(modelType) {
-    return this._renderers.get(modelType) || null;
-  }
-
-  /**
-   * Check if a renderer is registered for a model type
-   * @param {number} modelType The model type constant
-   * @returns {boolean} True if renderer is registered
-   */
-  hasRenderer(modelType) {
-    return this._renderers.has(modelType);
-  }
-
-  /**
-   * Unregister a renderer for a specific model type
-   * @param {number} modelType The model type constant
-   * @returns {boolean} True if renderer was unregistered
-   */
-  unregister(modelType) {
-    return this._renderers.delete(modelType);
-  }
-
-  /**
-   * Clear all registered renderers
-   */
-  clear() {
-    this._renderers.clear();
-  }
-
-  /**
-   * Get all registered model types
-   * @returns {number[]} Array of model type constants
-   */
-  getRegisteredTypes() {
-    return Array.from(this._renderers.keys());
-  }
-}
-
-/** @type {ModelRendererRegistry} Singleton instance */
-export const modelRendererRegistry = new ModelRendererRegistry();
diff --git a/source/engine/client/renderer/ModelRendererRegistry.ts b/source/engine/client/renderer/ModelRendererRegistry.ts
new file mode 100644
index 00000000..c9b447da
--- /dev/null
+++ b/source/engine/client/renderer/ModelRendererRegistry.ts
@@ -0,0 +1,62 @@
+import { ModelRenderer } from './ModelRenderer.ts';
+
+/**
+ * Registry for model renderers.
+ * Maps model types to their corresponding renderer implementations.
+ */
+export class ModelRendererRegistry {
+  readonly #renderers = new Map<number, ModelRenderer>();
+
+  /**
+   * Register a renderer for a specific model type.
+   */
+  register(renderer: ModelRenderer): void {
+    const modelType = renderer.getModelType();
+    if (this.#renderers.has(modelType)) {
+      console.warn(`ModelRendererRegistry: Renderer for type ${modelType} already registered, replacing`);
+    }
+    this.#renderers.set(modelType, renderer);
+  }
+
+  /**
+   * Get the renderer for a specific model type.
+   * @returns The matching renderer, or null if none is registered.
+   */
+  getRenderer(modelType: number): ModelRenderer | null {
+    return this.#renderers.get(modelType) ?? null;
+  }
+
+  /**
+   * Check if a renderer is registered for a model type.
+   * @returns True when a renderer is registered for the given type.
+   */
+  hasRenderer(modelType: number): boolean {
+    return this.#renderers.has(modelType);
+  }
+
+  /**
+   * Unregister a renderer for a specific model type.
+   * @returns True when a renderer was found and removed.
+   */
+  unregister(modelType: number): boolean {
+    return this.#renderers.delete(modelType);
+  }
+
+  /**
+   * Clear all registered renderers.
+   */
+  clear(): void {
+    this.#renderers.clear();
+  }
+
+  /**
+   * Get all registered model types.
+   * @returns Array of all registered model type constants.
+   */
+  getRegisteredTypes(): number[] {
+    return Array.from(this.#renderers.keys());
+  }
+}
+
+/** Singleton instance. */
+export const modelRendererRegistry = new ModelRendererRegistry();
diff --git a/source/engine/client/renderer/PostProcess.mjs b/source/engine/client/renderer/PostProcess.ts
similarity index 80%
rename from source/engine/client/renderer/PostProcess.mjs
rename to source/engine/client/renderer/PostProcess.ts
index 4102b295..d5fcae26 100644
--- a/source/engine/client/renderer/PostProcess.mjs
+++ b/source/engine/client/renderer/PostProcess.ts
@@ -1,17 +1,17 @@
-import GL from '../GL.mjs';
+import GL from '../GL.ts';
 import Cvar from '../../common/Cvar.ts';
 import VID from '../VID.ts';
-import PostProcessEffect from './PostProcessEffect.mjs';
+import PostProcessEffect from './PostProcessEffect.ts';
 import { eventBus } from '../../registry.mjs';
 
-let gl = /** @type {WebGL2RenderingContext} */ (null);
+let gl: WebGL2RenderingContext = null!;
 
 eventBus.subscribe('gl.ready', () => {
   gl = GL.gl;
 });
 
 eventBus.subscribe('gl.shutdown', () => {
-  gl = null;
+  gl = null!;
 });
 
 /**
@@ -32,109 +32,107 @@ eventBus.subscribe('gl.shutdown', () => {
 export default class PostProcess {
   // ─── Scene FBO (depth-aware rendering) ───────────────────────────
 
-  /** @type {WebGLFramebuffer} Scene framebuffer object */
-  static fbo = null;
+  /** Scene framebuffer object. */
+  static fbo: WebGLFramebuffer | null = null;
 
-  /** @type {WebGLTexture} Color texture attachment (RGBA) */
-  static colorTexture = null;
+  /** Color texture attachment (RGBA). */
+  static colorTexture: WebGLTexture | null = null;
 
-  /** @type {WebGLTexture} Emissive texture attachment (RGBA) */
-  static emissiveTexture = null;
+  /** Emissive texture attachment (RGBA). */
+  static emissiveTexture: WebGLTexture | null = null;
 
-  /** @type {WebGLTexture} Depth texture attachment (DEPTH_COMPONENT24) */
-  static depthTexture = null;
+  /** Depth texture attachment (DEPTH_COMPONENT24). */
+  static depthTexture: WebGLTexture | null = null;
 
-  /** @type {WebGLRenderbuffer} Depth renderbuffer used temporarily during depth sampling */
-  static depthRenderbuffer = null;
+  /** Depth renderbuffer used temporarily during depth sampling. */
+  static depthRenderbuffer: WebGLRenderbuffer | null = null;
 
-  /** @type {number} Current scene FBO width in pixels */
+  /** Current scene FBO width in pixels. */
   static width = 0;
 
-  /** @type {number} Current scene FBO height in pixels */
+  /** Current scene FBO height in pixels. */
   static height = 0;
 
-  /** @type {boolean} Whether the PostProcess system is currently active (FBO bound) */
+  /** Whether the PostProcess system is currently active (FBO bound). */
   static active = false;
 
   // ─── MSAA (multisampled scene FBO) ───────────────────────────────
 
-  /** @type {Cvar} MSAA sample count (0 = off, 2/4/8) */
-  static msaa = null;
+  /** MSAA sample count (0 = off, 2/4/8). */
+  static msaa: Cvar | null = null;
 
-  /** @type {WebGLFramebuffer} Multisampled FBO for scene rendering */
-  static msaaFBO = null;
+  /** Multisampled FBO for scene rendering. */
+  static msaaFBO: WebGLFramebuffer | null = null;
 
-  /** @type {WebGLRenderbuffer} Multisampled color renderbuffer */
-  static msaaColorRB = null;
+  /** Multisampled color renderbuffer. */
+  static msaaColorRB: WebGLRenderbuffer | null = null;
 
-  /** @type {WebGLRenderbuffer} Multisampled emissive renderbuffer */
-  static msaaEmissiveRB = null;
+  /** Multisampled emissive renderbuffer. */
+  static msaaEmissiveRB: WebGLRenderbuffer | null = null;
 
-  /** @type {WebGLRenderbuffer} Multisampled depth renderbuffer */
-  static msaaDepthRB = null;
+  /** Multisampled depth renderbuffer. */
+  static msaaDepthRB: WebGLRenderbuffer | null = null;
 
-  /** @type {number} Current MSAA sample count (0 = disabled) */
+  /** Current MSAA sample count (0 = disabled). */
   static msaaSamples = 0;
 
-  /** @type {number} Current MSAA FBO width */
+  /** Current MSAA FBO width. */
   static msaaWidth = 0;
 
-  /** @type {number} Current MSAA FBO height */
+  /** Current MSAA FBO height. */
   static msaaHeight = 0;
 
-  /** @type {boolean} Whether MSAA has been resolved to the texture FBO this frame */
+  /** Whether MSAA has been resolved to the texture FBO this frame. */
   static msaaResolved = false;
 
   // ─── Ping-pong FBOs for effect chaining ──────────────────────────
 
-  /** @type {WebGLFramebuffer} Ping FBO for effect chaining */
-  static pingFBO = null;
+  /** Ping FBO for effect chaining. */
+  static pingFBO: WebGLFramebuffer | null = null;
 
-  /** @type {WebGLTexture} Ping color texture */
-  static pingTexture = null;
+  /** Ping color texture. */
+  static pingTexture: WebGLTexture | null = null;
 
-  /** @type {WebGLFramebuffer} Pong FBO for effect chaining */
-  static pongFBO = null;
+  /** Pong FBO for effect chaining. */
+  static pongFBO: WebGLFramebuffer | null = null;
 
-  /** @type {WebGLTexture} Pong color texture */
-  static pongTexture = null;
+  /** Pong color texture. */
+  static pongTexture: WebGLTexture | null = null;
 
-  /** @type {number} Ping-pong FBO width */
+  /** Ping-pong FBO width. */
   static ppWidth = 0;
 
-  /** @type {number} Ping-pong FBO height */
+  /** Ping-pong FBO height. */
   static ppHeight = 0;
 
   // ─── Effect pipeline ─────────────────────────────────────────────
 
-  /** @type {PostProcessEffect[]} Registered effects, applied in order */
-  static effects = [];
+  /** Registered effects, applied in order. */
+  static effects: PostProcessEffect[] = [];
 
   /**
    * Register a post-process effect. Effects are applied in the order
    * they are added. Each effect's {@link PostProcessEffect.init} is
    * called during registration.
-   * @param {PostProcessEffect} effect - The effect to register
    */
-  static addEffect(effect) {
+  static addEffect(effect: PostProcessEffect): void {
     effect.init();
     PostProcess.effects.push(effect);
   }
 
   /**
    * Get a registered effect by name.
-   * @param {string} name - The effect name to look up
-   * @returns {PostProcessEffect} The effect, or undefined if not found
+   * @returns The effect with the given name, or undefined if not registered.
    */
-  static getEffect(name) {
+  static getEffect(name: string): PostProcessEffect | undefined {
     return PostProcess.effects.find((e) => e.name === name);
   }
 
   /**
    * Whether any post-process effect is currently active.
-   * @returns {boolean} True if any registered effect is active
+   * @returns True when at least one registered effect is active.
    */
-  static hasActiveEffects() {
+  static hasActiveEffects(): boolean {
     return PostProcess.effects.some((e) => e.active);
   }
 
@@ -142,12 +140,11 @@ export default class PostProcess {
    * Initialize the post-process system.
    * Creates scene FBO, MSAA FBO (if enabled), and ping-pong FBOs.
    */
-  static init() {
+  static init(): void {
     PostProcess.msaa = new Cvar('gl_msaa', '4', Cvar.FLAG.ARCHIVE, ' MSAA sample count (0 = off, 2/4/8)');
 
     PostProcess.fbo = gl.createFramebuffer();
     {
-
       // Color texture
       PostProcess.colorTexture = gl.createTexture();
       GL.Bind(0, PostProcess.colorTexture);
@@ -227,10 +224,8 @@ export default class PostProcess {
 
   /**
    * Resize the scene FBO textures to match the viewport dimensions.
-   * @param {number} width - New width in pixels
-   * @param {number} height - New height in pixels
    */
-  static resize(width, height) {
+  static resize(width: number, height: number): void {
     if (PostProcess.width === width && PostProcess.height === height) {
       return;
     }
@@ -262,11 +257,9 @@ export default class PostProcess {
   /**
    * Allocate (or deallocate) multisampled renderbuffer storage.
    * Called from `resize()` whenever the scene dimensions change.
-   * @param {number} width - New width in pixels
-   * @param {number} height - New height in pixels
    */
-  static _resizeMSAA(width, height) {
-    const requested = PostProcess.msaa.value >> 0;
+  static _resizeMSAA(width: number, height: number): void {
+    const requested = PostProcess.msaa!.value >> 0;
     if (requested <= 0) {
       PostProcess.msaaSamples = 0;
       PostProcess.msaaWidth = 0;
@@ -274,7 +267,7 @@ export default class PostProcess {
       return;
     }
 
-    const maxSamples = gl.getParameter(gl.MAX_SAMPLES);
+    const maxSamples = gl.getParameter(gl.MAX_SAMPLES) as number;
     const samples = Math.min(requested, maxSamples);
 
     if (PostProcess.msaaWidth === width && PostProcess.msaaHeight === height
@@ -302,10 +295,8 @@ export default class PostProcess {
 
   /**
    * Resize the ping-pong FBOs used for effect chaining.
-   * @param {number} width - New width in pixels
-   * @param {number} height - New height in pixels
    */
-  static resizePingPong(width, height) {
+  static resizePingPong(width: number, height: number): void {
     if (PostProcess.ppWidth === width && PostProcess.ppHeight === height) {
       return;
     }
@@ -331,7 +322,7 @@ export default class PostProcess {
    * is rendered with anti-aliasing. The MSAA FBO is resolved to the
    * texture FBO before depth sampling or at `end()`.
    */
-  static begin() {
+  static begin(): void {
     if (PostProcess.msaaSamples > 0) {
       gl.bindFramebuffer(gl.FRAMEBUFFER, PostProcess.msaaFBO);
       PostProcess.msaaResolved = false;
@@ -348,11 +339,8 @@ export default class PostProcess {
   /**
    * Begin rendering the scene to an effect's own FBO.
    * Used when only pipeline effects are active (no depth-texture scene FBO needed).
-   * @param {WebGLFramebuffer} fbo - The effect's FBO
-   * @param {number} width - FBO width
-   * @param {number} height - FBO height
    */
-  static beginToEffectFBO(fbo, width, height) {
+  static beginToEffectFBO(fbo: WebGLFramebuffer, width: number, height: number): void {
     gl.bindFramebuffer(gl.FRAMEBUFFER, fbo);
     gl.clear(gl.COLOR_BUFFER_BIT | gl.DEPTH_BUFFER_BIT);
     gl.viewport(0, 0, width, height);
@@ -365,7 +353,7 @@ export default class PostProcess {
    * If MSAA is active, resolves to the texture FBO first so the depth
    * texture contains valid data.
    */
-  static beginDepthSampling() {
+  static beginDepthSampling(): void {
     if (PostProcess.msaaSamples > 0 && !PostProcess.msaaResolved) {
       PostProcess.resolveMSAA();
     }
@@ -376,7 +364,7 @@ export default class PostProcess {
   /**
    * Reattach the depth texture to the FBO after depth sampling is done.
    */
-  static endDepthSampling() {
+  static endDepthSampling(): void {
     gl.framebufferRenderbuffer(gl.FRAMEBUFFER, gl.DEPTH_ATTACHMENT, gl.RENDERBUFFER, null);
     gl.framebufferTexture2D(gl.FRAMEBUFFER, gl.DEPTH_ATTACHMENT, gl.TEXTURE_2D, PostProcess.depthTexture, 0);
   }
@@ -385,12 +373,12 @@ export default class PostProcess {
    * Resolve one multisampled color attachment into a texture-backed attachment 0.
    * Some browsers reject `drawBuffers([COLOR_ATTACHMENT1])` during blits, so the
    * destination attachment is temporarily rebound to slot 0 for the resolve.
-   * @param {GLenum} readAttachment Source MSAA color attachment.
-   * @param {WebGLTexture} targetTexture Destination texture.
-   * @param {number} width Resolve width in pixels.
-   * @param {number} height Resolve height in pixels.
+   * @param readAttachment Source MSAA color attachment.
+   * @param targetTexture Destination texture.
+   * @param width Resolve width in pixels.
+   * @param height Resolve height in pixels.
    */
-  static _resolveMSAAColorAttachment(readAttachment, targetTexture, width, height) {
+  static _resolveMSAAColorAttachment(readAttachment: GLenum, targetTexture: WebGLTexture, width: number, height: number): void {
     gl.readBuffer(readAttachment);
     gl.framebufferTexture2D(gl.DRAW_FRAMEBUFFER, gl.COLOR_ATTACHMENT1, gl.TEXTURE_2D, null, 0);
     gl.framebufferTexture2D(gl.DRAW_FRAMEBUFFER, gl.COLOR_ATTACHMENT0, gl.TEXTURE_2D, targetTexture, 0);
@@ -404,15 +392,15 @@ export default class PostProcess {
    * depth sampling and the effect pipeline. After this call, the
    * texture FBO is bound as the active FRAMEBUFFER.
    */
-  static resolveMSAA() {
+  static resolveMSAA(): void {
     const w = PostProcess.width;
     const h = PostProcess.height;
 
     gl.bindFramebuffer(gl.READ_FRAMEBUFFER, PostProcess.msaaFBO);
     gl.bindFramebuffer(gl.DRAW_FRAMEBUFFER, PostProcess.fbo);
 
-    PostProcess._resolveMSAAColorAttachment(gl.COLOR_ATTACHMENT0, PostProcess.colorTexture, w, h);
-    PostProcess._resolveMSAAColorAttachment(gl.COLOR_ATTACHMENT1, PostProcess.emissiveTexture, w, h);
+    PostProcess._resolveMSAAColorAttachment(gl.COLOR_ATTACHMENT0, PostProcess.colorTexture!, w, h);
+    PostProcess._resolveMSAAColorAttachment(gl.COLOR_ATTACHMENT1, PostProcess.emissiveTexture!, w, h);
 
     gl.framebufferTexture2D(gl.DRAW_FRAMEBUFFER, gl.COLOR_ATTACHMENT0, gl.TEXTURE_2D, PostProcess.colorTexture, 0);
     gl.framebufferTexture2D(gl.DRAW_FRAMEBUFFER, gl.COLOR_ATTACHMENT1, gl.TEXTURE_2D, PostProcess.emissiveTexture, 0);
@@ -428,7 +416,7 @@ export default class PostProcess {
    * (no-fog path), resolves to the texture FBO first so the color texture
    * is available for the effect pipeline. Then unbinds the FBO.
    */
-  static end() {
+  static end(): void {
     if (PostProcess.msaaSamples > 0 && !PostProcess.msaaResolved) {
       PostProcess.resolveMSAA();
     }
@@ -440,13 +428,8 @@ export default class PostProcess {
    * Resolve the scene to the screen, applying all active effects in order.
    * When no effects are active, performs a simple blit. When effects are
    * active, chains them using ping-pong FBOs.
-   * @param {number} x - Viewport x position
-   * @param {number} y - Viewport y position
-   * @param {number} width - Viewport width
-   * @param {number} height - Viewport height
-   * @param {WebGLTexture} sceneTexture - The scene color texture to resolve
    */
-  static resolve(x, y, width, height, sceneTexture) {
+  static resolve(x: number, y: number, width: number, height: number, sceneTexture: WebGLTexture): void {
     const activeEffects = PostProcess.effects.filter((e) => e.active);
 
     if (activeEffects.length === 0) {
@@ -461,7 +444,7 @@ export default class PostProcess {
     PostProcess.resizePingPong(pixelWidth, pixelHeight);
 
     // Save the current viewport (GL.Set2D has already set up 2D rendering)
-    const savedViewport = gl.getParameter(gl.VIEWPORT);
+    const savedViewport = gl.getParameter(gl.VIEWPORT) as Int32Array;
 
     gl.disable(gl.BLEND);
 
@@ -484,7 +467,7 @@ export default class PostProcess {
         gl.viewport(0, 0, pixelWidth, pixelHeight);
         // Draw at ortho-space dimensions (VID.width/height) so the ortho matrix works
         activeEffects[i].apply(inputTexture, 0, 0, VID.width, VID.height);
-        inputTexture = textures[i % 2];
+        inputTexture = textures[i % 2]!;
       }
     }
 
@@ -493,18 +476,13 @@ export default class PostProcess {
 
   /**
    * Blit a texture to the screen using the 'pic' shader.
-   * @param {WebGLTexture} texture - Source texture
-   * @param {number} x - Screen x
-   * @param {number} y - Screen y
-   * @param {number} width - Screen width
-   * @param {number} height - Screen height
    */
-  static _blitToScreen(texture, x, y, width, height) {
+  static _blitToScreen(texture: WebGLTexture, x: number, y: number, width: number, height: number): void {
     gl.disable(gl.BLEND);
 
     const program = GL.UseProgram('pic');
-    gl.uniform3f(program.uColor, 1.0, 1.0, 1.0);
-    GL.Bind(program.tTexture, texture);
+    gl.uniform3f(program!.uColor, 1.0, 1.0, 1.0);
+    GL.Bind(program!.tTexture, texture);
     // FBO texture has (0,0) at bottom-left; 2D screen has (0,0) at top-left.
     GL.StreamDrawTexturedQuad(x, y, width, height, 0.0, 1.0, 1.0, 0.0);
     GL.StreamFlush();
@@ -515,7 +493,7 @@ export default class PostProcess {
   /**
    * Clean up all GPU resources.
    */
-  static shutdown() {
+  static shutdown(): void {
     // Shut down all effects
     for (const effect of PostProcess.effects) {
       effect.shutdown();
@@ -590,4 +568,4 @@ export default class PostProcess {
     PostProcess.ppHeight = 0;
     PostProcess.active = false;
   }
-};
+}
diff --git a/source/engine/client/renderer/PostProcessEffect.mjs b/source/engine/client/renderer/PostProcessEffect.ts
similarity index 60%
rename from source/engine/client/renderer/PostProcessEffect.mjs
rename to source/engine/client/renderer/PostProcessEffect.ts
index 6dc2ec33..a1a2df6f 100644
--- a/source/engine/client/renderer/PostProcessEffect.mjs
+++ b/source/engine/client/renderer/PostProcessEffect.ts
@@ -11,30 +11,22 @@
  * this pipeline.
  */
 export default class PostProcessEffect {
-  /** @type {string} Unique name identifying this effect */
-  name;
+  /** Unique name identifying this effect. */
+  readonly name: string;
 
-  /** @type {boolean} Whether this effect is currently enabled */
+  /** Whether this effect is currently enabled. */
   active = false;
 
-  /**
-   * @param {string} name - Unique identifier for this effect
-   */
-  constructor(name) {
+  constructor(name: string) {
     this.name = name;
   }
 
   /**
    * Apply the effect by drawing a fullscreen quad with the appropriate shader.
    * The caller has already bound the correct output framebuffer and viewport.
-   * @param {WebGLTexture} _inputTexture - The scene (or previous effect's) color texture
-   * @param {number} _x - Viewport x position (screen-space)
-   * @param {number} _y - Viewport y position (screen-space)
-   * @param {number} _width - Viewport width (screen-space)
-   * @param {number} _height - Viewport height (screen-space)
    */
-  // eslint-disable-next-line no-unused-vars
-  apply(_inputTexture, _x, _y, _width, _height) {
+
+  apply(_inputTexture: WebGLTexture, _x: number, _y: number, _width: number, _height: number): void {
     throw new Error(`PostProcessEffect.apply() not implemented for '${this.name}'`);
   }
 
@@ -42,25 +34,31 @@ export default class PostProcessEffect {
    * Called when the effect's FBO textures need resizing.
    * Override if the effect maintains its own GPU resources that depend on
    * viewport dimensions.
-   * @param {number} _width - New width in pixels
-   * @param {number} _height - New height in pixels
    */
-  // eslint-disable-next-line no-unused-vars
-  resize(_width, _height) {
+
+  resize(_width: number, _height: number): void {
     // Default: no-op. Override if needed.
   }
 
   /**
    * Initialize GPU resources. Called once during PostProcess.addEffect().
    */
-  init() {
+  init(): void {
     // Default: no-op.
   }
 
   /**
    * Clean up GPU resources on shutdown.
    */
-  shutdown() {
+  shutdown(): void {
+    // Default: no-op.
+  }
+
+  /**
+   * Draw a debug preview overlay for this effect.
+   * Override in subclasses that support debug visualizations (e.g. BloomEffect).
+   */
+  drawDebugPreview(): void {
     // Default: no-op.
   }
-};
+}
diff --git a/source/engine/client/renderer/ShadowMap.mjs b/source/engine/client/renderer/ShadowMap.ts
similarity index 56%
rename from source/engine/client/renderer/ShadowMap.mjs
rename to source/engine/client/renderer/ShadowMap.ts
index faf0670d..54ffa241 100644
--- a/source/engine/client/renderer/ShadowMap.mjs
+++ b/source/engine/client/renderer/ShadowMap.ts
@@ -1,27 +1,30 @@
-import GL from '../GL.mjs';
+import GL from '../GL.ts';
 import Cvar from '../../common/Cvar.ts';
 import { limits } from '../../common/Def.ts';
-import { eventBus, registry } from '../../registry.mjs';
-import { materialFlags } from './Materials.mjs';
+import { eventBus, getClientRegistry } from '../../registry.mjs';
+import { MaterialFlags } from './Materials.ts';
 import { effect } from '../../../shared/Defs.ts';
 import Vector from '../../../shared/Vector.ts';
-import { AliasModelRenderer } from './AliasModelRenderer.mjs';
+import { AliasModelRenderer } from './AliasModelRenderer.ts';
+import type { BrushModel } from '../../common/model/BSP.ts';
+import type { AliasModel } from '../../common/model/AliasModel.ts';
+import type { MeshModel } from '../../common/model/MeshModel.ts';
+import type { ClientEdict } from '../ClientEntities.ts';
 
-let { CL, COM, Mod, R, SV } = registry;
+let { CL, COM, Mod, R, SV } = getClientRegistry();
 
 eventBus.subscribe('registry.frozen', () => {
-  ({ CL, COM, Mod, R, SV } = registry);
+  ({ CL, COM, Mod, R, SV } = getClientRegistry());
 });
 
-/** @type {WebGL2RenderingContext} */
-let gl = null;
+let gl: WebGL2RenderingContext = null!;
 
 eventBus.subscribe('gl.ready', () => {
   gl = GL.gl;
 });
 
 eventBus.subscribe('gl.shutdown', () => {
-  gl = null;
+  gl = null!;
 });
 
 /** Shadow map resolution (px). Local coverage keeps this sharp at 1024. */
@@ -41,7 +44,7 @@ const POINT_NEAR = 1.0;
  * Order matches GL_TEXTURE_CUBE_MAP_POSITIVE_X .. NEGATIVE_Z.
  * Each entry: [targetX, targetY, targetZ, upX, upY, upZ]
  */
-const CUBE_FACES = [
+const CUBE_FACES: [number, number, number, number, number, number][] = [
   [ 1,  0,  0,   0, -1,  0], // +X
   [-1,  0,  0,   0, -1,  0], // -X
   [ 0,  1,  0,   0,  0,  1], // +Y
@@ -51,7 +54,7 @@ const CUBE_FACES = [
 ];
 
 /**
- * Directional shadow mapping for a single "sun" light.
+ * Directional and point-light shadow mapping for the scene.
  *
  * Renders the world BSP into a depth-only FBO from the light's perspective,
  * then the scene shaders sample this depth texture (via `sampler2DShadow`)
@@ -61,132 +64,123 @@ const CUBE_FACES = [
 export default class ShadowMap {
   // ─── FBO & textures ──────────────────────────────────────────────
 
-  /** @type {WebGLFramebuffer} Depth-only framebuffer for the shadow pass */
-  static fbo = null;
+  /** Depth-only framebuffer for the shadow pass. */
+  static fbo: WebGLFramebuffer | null = null;
 
-  /** @type {WebGLTexture[]} Depth textures with hardware comparison (sampler2DShadow) */
-  static depthTextures = [];
+  /** Depth textures with hardware comparison (sampler2DShadow). */
+  static depthTextures: WebGLTexture[] = [];
 
-  /** @type {WebGLTexture} 1×1 always-lit dummy texture used when shadows are off */
-  static dummyTexture = null;
+  /** 1×1 always-lit dummy texture used when shadows are off. */
+  static dummyTexture: WebGLTexture | null = null;
 
   // ─── Matrices ────────────────────────────────────────────────────
 
-  /** @type {Float64Array[]} Column-major 4×4 light-space view-projection matrices */
-  static lightSpaceMatrices = Array.from({ length: LOCAL_SHADOW_COUNT }, () => new Float64Array(16));
+  /** Column-major 4×4 light-space view-projection matrices. */
+  static lightSpaceMatrices: Float64Array[] = Array.from({ length: LOCAL_SHADOW_COUNT }, () => new Float64Array(16));
 
   // ─── Cvars ───────────────────────────────────────────────────────
 
-  /** @type {Cvar} Master toggle (0 = off, 1 = on) */
-  static enabled = null;
+  /** Master toggle (0 = off, 1 = on). */
+  static enabled: Cvar | null = null;
 
-  /** @type {Cvar} Orthographic half-size in world units — kept small for a local blob-style shadow */
-  static range = null;
+  /** Orthographic half-size in world units. */
+  static range: Cvar | null = null;
 
-  /** @type {Cvar} Minimum brightness in shadow (0 = pitch black, 1 = no shadow) */
-  static darkness = null;
+  /** Minimum brightness in shadow (0 = pitch black, 1 = no shadow). */
+  static darkness: Cvar | null = null;
 
-  /** @type {Cvar} Maximum distance from the viewer for local shadow casters */
-  static casterRadius = null;
+  /** Maximum distance from the viewer for local shadow casters. */
+  static casterRadius: Cvar | null = null;
 
-  /** @type {Cvar} Fallback shadow yaw when no nearby light is found (degrees, 0 = +X, 90 = +Y) */
-  static sunYaw = null;
+  /** Fallback shadow yaw when no nearby light is found (degrees). */
+  static sunYaw: Cvar | null = null;
 
-  /** @type {Cvar} Fallback shadow pitch when no nearby light is found (degrees, negative = downward) */
-  static sunPitch = null;
+  /** Fallback shadow pitch when no nearby light is found (degrees, negative = downward). */
+  static sunPitch: Cvar | null = null;
 
   // ─── Local light direction ────────────────────────────────────────
 
   /**
-   * Normalised direction vector the shadow light travels (light → scene).
-   * Derived each frame from the closest visible light entity parsed from
-   * the BSP entity lump.  Falls back to the configured fallback angles
-   * when no visible light entity is found.
-   * @type {Float64Array[]}
+   * Normalized direction vector the shadow light travels (light → scene).
+   * Derived each frame from the closest visible light entity.
    */
-  static localLightDirs = Array.from({ length: LOCAL_SHADOW_COUNT }, () => new Float64Array([0, 0, -1]));
+  static localLightDirs: Float64Array[] = Array.from({ length: LOCAL_SHADOW_COUNT }, () => new Float64Array([0, 0, -1]));
 
-  /** @type {number} Number of active local shadow directions this frame */
-  static localLightCount = 0;
+  /** Number of active local shadow directions this frame. */
+  static localLightCount: number = 0;
 
   /**
    * Shadow intensity multiplier passed to the fragment shader as `uShadowEnabled`.
-   * Always 1.0 when using static BSP light data; edge fade in the shader
-   * handles the coverage boundary.
-   * @type {number}
+   * Always 1.0 when using static BSP light data.
    */
-  static localLightFalloff = 1.0;
+  static localLightFalloff: number = 1.0;
 
   // ─── Static light entity cache ────────────────────────────────────
 
   /**
    * Parsed light entities from the BSP entity lump.
    * Each entry holds a position and radius (derived from the entity's
-   * `light` key, defaulting to 300).  Populated once per map load by
-   * `parseLightEntities()` and reused every frame.
-   * @type {Array<{origin: Float64Array, radius: number}>}
+   * `light` key, defaulting to 300). Populated once per map load.
    */
-  static lightEntities = [];
+  static lightEntities: { origin: Float64Array; radius: number }[] = [];
 
-  /**
-   * Reference to the worldmodel whose entities were last parsed.
-   * Used to detect map changes and re-parse lazily.
-   * @type {import('../../common/model/BSP.ts').BrushModel|null}
-   */
-  static _parsedWorldmodel = null;
+  /** Reference to the worldmodel whose entities were last parsed. */
+  static _parsedWorldmodel: BrushModel | null = null;
 
-  /** @type {number} Maximum number of light entities to test per frame (performance cap) */
-  static _MAX_LIGHT_TRACES = 8;
+  /** Maximum number of light entities to test per frame (performance cap). */
+  static _MAX_LIGHT_TRACES: number = 8;
 
-  /** @type {number} Distance used to nudge embedded light origins out of fixtures for LOS tests */
-  static _LIGHT_VISIBILITY_BIAS = 16.0;
+  /** Distance used to nudge embedded light origins out of fixtures for LOS tests. */
+  static _LIGHT_VISIBILITY_BIAS: number = 16.0;
 
-  /** @type {Float64Array} Scratch buffer for relaxed map-light visibility traces */
-  static _lightTraceScratch = new Float64Array(3);
+  /** Scratch buffer for relaxed map-light visibility traces. */
+  static _lightTraceScratch: Float64Array = new Float64Array(3);
 
-  /** @type {Float64Array} Stable focus point for the local entity-shadow projection */
-  static _shadowFocusPoint = new Float64Array(3);
+  /** Stable focus point for the local entity-shadow projection. */
+  static _shadowFocusPoint: Float64Array = new Float64Array(3);
 
-  /** @type {Int32Array} Indices of the map lights steering the local shadow directions */
-  static _currentLocalLightIndices = Int32Array.from([-1, -1, -1]);
+  /** Indices of the map lights steering the local shadow directions. */
+  static _currentLocalLightIndices: Int32Array = Int32Array.from([-1, -1, -1]);
 
   // ─── Point light shadow ──────────────────────────────────────────
 
-  /** @type {WebGLFramebuffer} Depth-only FBO for point light shadow (reused for all 6 faces) */
-  static pointFBO = null;
+  /** Depth-only FBO for point light shadow (reused for all 6 faces). */
+  static pointFBO: WebGLFramebuffer | null = null;
 
-  /** @type {WebGLTexture} Depth cubemap with hardware comparison (samplerCubeShadow) */
-  static pointDepthCube = null;
+  /** Depth cubemap with hardware comparison (samplerCubeShadow). */
+  static pointDepthCube: WebGLTexture | null = null;
 
-  /** @type {WebGLTexture} 1×1 always-lit dummy cubemap used when point shadows are off */
-  static pointDummyCube = null;
+  /** 1×1 always-lit dummy cubemap used when point shadows are off. */
+  static pointDummyCube: WebGLTexture | null = null;
 
-  /** @type {Float64Array} Column-major 4×4 per-face view-projection matrix */
-  static pointFaceMatrix = new Float64Array(16);
+  /** Column-major 4×4 per-face view-projection matrix. */
+  static pointFaceMatrix: Float64Array = new Float64Array(16);
 
-  /** @type {Float64Array} Active point light position [x, y, z] for this frame */
-  static pointLightOrigin = new Float64Array(3);
+  /** Active point light position [x, y, z] for this frame. */
+  static pointLightOrigin: Float64Array = new Float64Array(3);
 
-  /** @type {number} Active point light radius for this frame */
-  static pointLightRadius = 0;
+  /** Active point light radius for this frame. */
+  static pointLightRadius: number = 0;
 
-  /** @type {boolean} Whether a point light shadow was rendered this frame */
-  static pointLightActive = false;
+  /** Whether a point light shadow was rendered this frame. */
+  static pointLightActive: boolean = false;
 
-  /** @type {Cvar} Enable point light shadow mapping (0 = off, 1 = on) */
-  static pointEnabled = null;
+  /** Enable point light shadow mapping (0 = off, 1 = on). */
+  static pointEnabled: Cvar | null = null;
 
-  /** @type {Cvar} Normal offset bias for point light shadows (world units) */
-  static pointNormalBias = null;
+  /** Normal offset bias for point light shadows (world units). */
+  static pointNormalBias: Cvar | null = null;
 
-  /** @type {number} Shadow map resolution in pixels (read by shaders for PCF texel size) */
-  static size = SHADOW_SIZE;
+  /** Shadow map resolution in pixels (read by shaders for PCF texel size). */
+  static size: number = SHADOW_SIZE;
+
+  // ─── Initialization ───────────────────────────────────────────────
 
   /**
    * Initialize the shadow mapping system.
    * Creates the depth FBO, shadow texture and dummy texture.
    */
-  static init() {
+  static init(): void {
     ShadowMap.enabled = new Cvar('r_shadows', '1', Cvar.FLAG.ARCHIVE, 'Enable local entity shadow mapping');
     ShadowMap.range = new Cvar('r_shadow_range', (SHADOW_SIZE / 4).toFixed(0), Cvar.FLAG.ARCHIVE, 'Local shadow map coverage radius in world units');
     ShadowMap.darkness = new Cvar('r_shadow_darkness', '0.66', Cvar.FLAG.ARCHIVE, 'Minimum brightness in shadow (0=black, 1=no shadow)');
@@ -197,11 +191,10 @@ export default class ShadowMap {
     // ── Shadow depth textures ──────────────────────────────────────
     ShadowMap.depthTextures.length = 0;
     for (let i = 0; i < LOCAL_SHADOW_COUNT; i++) {
-      const depthTexture = gl.createTexture();
+      const depthTexture = gl.createTexture()!;
       ShadowMap.depthTextures.push(depthTexture);
       GL.Bind(0, depthTexture);
       gl.texStorage2D(gl.TEXTURE_2D, 1, gl.DEPTH_COMPONENT24, SHADOW_SIZE, SHADOW_SIZE);
-      // LINEAR + COMPARE gives free 2×2 PCF via sampler2DShadow
       gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_MIN_FILTER, gl.LINEAR);
       gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_MAG_FILTER, gl.LINEAR);
       gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_WRAP_S, gl.CLAMP_TO_EDGE);
@@ -211,15 +204,15 @@ export default class ShadowMap {
     }
 
     // ── Depth-only FBO ─────────────────────────────────────────────
-    ShadowMap.fbo = gl.createFramebuffer();
+    ShadowMap.fbo = gl.createFramebuffer()!;
     gl.bindFramebuffer(gl.FRAMEBUFFER, ShadowMap.fbo);
     gl.framebufferTexture2D(gl.FRAMEBUFFER, gl.DEPTH_ATTACHMENT, gl.TEXTURE_2D, ShadowMap.depthTextures[0], 0);
-    gl.drawBuffers([]);   // no color attachment
+    gl.drawBuffers([]);
     gl.readBuffer(gl.NONE);
     gl.bindFramebuffer(gl.FRAMEBUFFER, null);
 
     // ── 1×1 dummy (always-lit) ─────────────────────────────────────
-    ShadowMap.dummyTexture = gl.createTexture();
+    ShadowMap.dummyTexture = gl.createTexture()!;
     GL.Bind(0, ShadowMap.dummyTexture);
     gl.texStorage2D(gl.TEXTURE_2D, 1, gl.DEPTH_COMPONENT24, 1, 1);
     gl.texSubImage2D(gl.TEXTURE_2D, 0, 0, 0, 1, 1, gl.DEPTH_COMPONENT, gl.UNSIGNED_INT, new Uint32Array([0xFFFFFFFF]));
@@ -234,7 +227,7 @@ export default class ShadowMap {
     ShadowMap.pointEnabled = new Cvar('r_shadow_point', '1', Cvar.FLAG.ARCHIVE, 'Enable point light shadow mapping');
     ShadowMap.pointNormalBias = new Cvar('r_shadow_point_normal_bias', '1.5', Cvar.FLAG.ARCHIVE, 'Normal offset bias for point light shadows (world units)');
 
-    ShadowMap.pointDepthCube = gl.createTexture();
+    ShadowMap.pointDepthCube = gl.createTexture()!;
     gl.bindTexture(gl.TEXTURE_CUBE_MAP, ShadowMap.pointDepthCube);
     for (let face = 0; face < 6; face++) {
       gl.texImage2D(
@@ -252,7 +245,7 @@ export default class ShadowMap {
     gl.bindTexture(gl.TEXTURE_CUBE_MAP, null);
 
     // ── Point light depth FBO (face attachment swapped each pass) ──
-    ShadowMap.pointFBO = gl.createFramebuffer();
+    ShadowMap.pointFBO = gl.createFramebuffer()!;
     gl.bindFramebuffer(gl.FRAMEBUFFER, ShadowMap.pointFBO);
     gl.framebufferTexture2D(
       gl.FRAMEBUFFER, gl.DEPTH_ATTACHMENT,
@@ -263,7 +256,7 @@ export default class ShadowMap {
     gl.bindFramebuffer(gl.FRAMEBUFFER, null);
 
     // ── 1×1 dummy cubemap (always-lit) ─────────────────────────────
-    ShadowMap.pointDummyCube = gl.createTexture();
+    ShadowMap.pointDummyCube = gl.createTexture()!;
     gl.bindTexture(gl.TEXTURE_CUBE_MAP, ShadowMap.pointDummyCube);
     const dummyPixel = new Uint32Array([0xFFFFFFFF]);
     for (let face = 0; face < 6; face++) {
@@ -281,55 +274,47 @@ export default class ShadowMap {
     gl.bindTexture(gl.TEXTURE_CUBE_MAP, null);
   }
 
+  // ─── Matrix computation ───────────────────────────────────────────
+
   /**
    * Recompute the light-space view-projection matrix for one local shadow.
    * Uses an orthographic projection centred on the local shadow focus point.
-   * @param {number} slotIndex Local shadow slot to update
    */
-  static _updateLightSpaceMatrix(slotIndex) {
-    const range = ShadowMap.range.value;
+  static _updateLightSpaceMatrix(slotIndex: number): void {
+    const range = ShadowMap.range!.value;
     const focusPoint = ShadowMap._shadowFocusPoint;
     const focusX = focusPoint[0];
     const focusY = focusPoint[1];
     const focusZ = focusPoint[2];
 
-    // Light direction (FROM light TO scene), already normalised
     const dir = ShadowMap.localLightDirs[slotIndex];
     const dirX = dir[0];
     const dirY = dir[1];
     const dirZ = dir[2];
 
-    // Light "eye" — offset back from the shadow focus point along the light direction.
     const eyeX = focusX - dirX * range;
     const eyeY = focusY - dirY * range;
     const eyeZ = focusZ - dirZ * range;
 
-    // ── Build an OpenGL-style lookAt matrix ────────────────────────
-    // Forward = sun direction (already unit-length)
     const fX = dirX, fY = dirY, fZ = dirZ;
 
-    // Choose a world-up that isn't parallel to forward
-    let upX = 0, upY = 0, upZ = 1; // Quake up = +Z
+    let upX = 0, upY = 0, upZ = 1;
     if (Math.abs(fZ) > 0.99) {
       upX = 1; upY = 0; upZ = 0;
     }
 
-    // right = normalize(forward × up)
     let rX = fY * upZ - fZ * upY;
     let rY = fZ * upX - fX * upZ;
     let rZ = fX * upY - fY * upX;
     const rLen = Math.hypot(rX, rY, rZ);
     rX /= rLen; rY /= rLen; rZ /= rLen;
 
-    // real up = right × forward (already unit since both inputs are unit)
     upX = rY * fZ - rZ * fY;
     upY = rZ * fX - rX * fZ;
     upZ = rX * fY - rY * fX;
 
-    // OpenGL convention: camera looks along -Z in eye space
     const zX = -fX, zY = -fY, zZ = -fZ;
 
-    // Column-major view matrix (rotation rows, translation column)
     const v0 = rX, v1 = upX, v2 = zX;
     const v4 = rY, v5 = upY, v6 = zY;
     const v8 = rZ, v9 = upZ, v10 = zZ;
@@ -337,7 +322,6 @@ export default class ShadowMap {
     let v13 = -(upX * eyeX + upY * eyeY + upZ * eyeZ);
     const v14 = -(zX * eyeX + zY * eyeY + zZ * eyeZ);
 
-    // ── Orthographic projection (symmetric) ────────────────────────
     const halfSize = range;
     const near = 0.0;
     const far = range * 2.0;
@@ -345,19 +329,10 @@ export default class ShadowMap {
     const invDepth = -2.0 / (far - near);
     const nfTerm = -(far + near) / (far - near);
 
-    // ── Texel snapping ─────────────────────────────────────────────
-    // Snap the light-space XY translation to shadow-map texel boundaries.
-    // Without this the ortho projection shifts by sub-texel amounts as the
-    // camera moves, causing shadow edges to shimmer ("shadow swimming").
-    // We quantise the NDC-space translation (ortho × viewTranslation) so
-    // that it always lands on a texel centre.
-    const texelSize = (2.0 * halfSize) / SHADOW_SIZE; // world units per texel
+    const texelSize = (2.0 * halfSize) / SHADOW_SIZE;
     v12 = Math.floor(v12 / texelSize) * texelSize;
     v13 = Math.floor(v13 / texelSize) * texelSize;
 
-    // ── lightSpaceMatrix = ortho × view  (column-major multiply) ───
-    // ortho is diagonal-ish, so many terms simplify:
-    //   ortho = diag(invHS, invHS, invDepth, 1) + [0,0,0,nfTerm] in col 3
     const m = ShadowMap.lightSpaceMatrices[slotIndex];
     m[0]  = invHS * v0;
     m[1]  = invHS * v1;
@@ -377,22 +352,20 @@ export default class ShadowMap {
     m[15] = 1;
   }
 
-  /**
-   * Recompute all active local shadow matrices for the current frame.
-   */
-  static updateLightSpaceMatrices() {
+  /** Recompute all active local shadow matrices for the current frame. */
+  static updateLightSpaceMatrices(): void {
     for (let i = 0; i < ShadowMap.localLightCount; i++) {
       ShadowMap._updateLightSpaceMatrix(i);
     }
   }
 
+  // ─── Shadow pass management ───────────────────────────────────────
+
   /**
-   * Begin the shadow depth pass.
-   * Binds the shadow FBO, clears depth, and sets GL state for depth-only
-   * rendering with polygon offset bias to reduce shadow acne.
-   * @param {number} slotIndex Local shadow slot whose depth texture will be rendered
+   * Begin the shadow depth pass for a local directional shadow slot.
+   * Binds the shadow FBO, clears depth, and sets GL state.
    */
-  static begin(slotIndex) {
+  static begin(slotIndex: number): void {
     gl.bindFramebuffer(gl.FRAMEBUFFER, ShadowMap.fbo);
     gl.framebufferTexture2D(
       gl.FRAMEBUFFER,
@@ -402,54 +375,45 @@ export default class ShadowMap {
       0,
     );
     gl.viewport(0, 0, SHADOW_SIZE, SHADOW_SIZE);
-    gl.enable(gl.DEPTH_TEST); // required — Set2D disables this at end of previous frame
+    gl.enable(gl.DEPTH_TEST);
     gl.clear(gl.DEPTH_BUFFER_BIT);
     gl.colorMask(false, false, false, false);
     gl.enable(gl.POLYGON_OFFSET_FILL);
     gl.polygonOffset(1.0, 1.0);
-    gl.disable(gl.CULL_FACE); // render both sides so front-face depth is captured for thin occluders
+    gl.disable(gl.CULL_FACE);
   }
 
-  /**
-   * End the shadow depth pass and restore GL state.
-   */
-  static end() {
+  /** End the shadow depth pass and restore GL state. */
+  static end(): void {
     gl.enable(gl.CULL_FACE);
-    gl.cullFace(gl.FRONT); // restore engine default
+    gl.cullFace(gl.FRONT);
     gl.disable(gl.POLYGON_OFFSET_FILL);
     gl.colorMask(true, true, true, true);
     gl.bindFramebuffer(gl.FRAMEBUFFER, null);
   }
 
+  // ─── World shadow rendering ───────────────────────────────────────
+
   /**
    * Render the world BSP opaque geometry into the shadow map.
    * Uses a large polygon offset so the world depth is pushed well behind
-   * its true position — this prevents self-shadowing on world surfaces
-   * while still acting as an occluder that stops entity shadows from
-   * bleeding through walls and floors.
-   * Iterates every leaf (no camera-vis culling) because the light's
-   * viewpoint differs from the camera's.
+   * its true position to prevent self-shadowing on world surfaces.
    */
-  static renderWorldShadow() {
-    const worldmodel = /** @type {import('../../common/model/BSP.ts').BrushModel} */ (CL.state.worldmodel);
+  static renderWorldShadow(): void {
+    const worldmodel = CL.state.worldmodel as BrushModel | null;
     if (!worldmodel) {
       return;
     }
 
-    // Large bias: pushes stored depth far behind the surface so the world
-    // never shadows itself, but entity depth (written with normal bias)
-    // is still in front and casts shadows correctly.
     gl.polygonOffset(8.0, 4096.0);
 
-    GL.BindVAO(/** @type {WebGLVertexArrayObject} */ (worldmodel.opaqueVAO));
-    const program = GL.UseProgram('shadow-brush');
+    GL.BindVAO(worldmodel.opaqueVAO as WebGLVertexArrayObject);
+    const program = GL.UseProgram('shadow-brush')!;
 
-    // World entity: origin = 0, angles = identity
     gl.uniform3f(program.uOrigin, 0, 0, 0);
     gl.uniformMatrix3fv(program.uAngles, false, GL.identity);
     gl.uniformMatrix4fv(program.uLightSpaceMatrix, false, ShadowMap.lightSpaceMatrices[0]);
 
-    // Draw all opaque leaf commands (skip vis — we need everything the light sees)
     for (let i = 0; i < worldmodel.leafs.length; i++) {
       const leaf = worldmodel.leafs[i];
       if (leaf.skychain === 0) {
@@ -458,10 +422,9 @@ export default class ShadowMap {
 
       for (let j = 0; j < leaf.skychain; j++) {
         const cmds = leaf.cmds[j];
-        const flags = worldmodel.textures[cmds[0]].flags;
+        const flags = (worldmodel.textures[cmds[0]] as { flags: number }).flags;
 
-        // Skip non-renderable and transparent surfaces
-        if (flags & (materialFlags.MF_SKIP | materialFlags.MF_TRANSPARENT)) {
+        if (flags & (MaterialFlags.MF_SKIP | MaterialFlags.MF_TRANSPARENT)) {
           continue;
         }
 
@@ -470,21 +433,22 @@ export default class ShadowMap {
     }
 
     GL.UnbindVAO();
-
-    // Restore normal bias for entity shadow casters
     gl.polygonOffset(1.0, 1.0);
   }
 
+  // ─── Entity shadow rendering ──────────────────────────────────────
+
   /**
    * Render visible entities (brush submodels, alias models, mesh models)
    * into the active shadow map.
-   * @param {Float64Array} lightSpaceMatrix The light-space VP matrix
-   * @param {string} brushProgram Program name for brush/mesh models
-   * @param {string} aliasProgram Program name for alias models
-   * @param {Vector|Float64Array|number[]|null} cutoffOrigin View-relative origin used to reject distant local casters
-   * @param {number} cutoffDistSq Squared cutoff distance for local shadow casters
    */
-  static renderEntitiesShadow(lightSpaceMatrix, brushProgram = 'shadow-brush', aliasProgram = 'shadow-alias', cutoffOrigin = null, cutoffDistSq = Infinity) {
+  static renderEntitiesShadow(
+    lightSpaceMatrix: Float64Array,
+    brushProgram = 'shadow-brush',
+    aliasProgram = 'shadow-alias',
+    cutoffOrigin: Vector | Float64Array | number[] | null = null,
+    cutoffDistSq = Infinity,
+  ): void {
     if (R.drawentities.value === 0) {
       return;
     }
@@ -495,13 +459,13 @@ export default class ShadowMap {
       const model = entity.model;
       switch (model.type) {
         case Mod.type.brush:
-          ShadowMap._renderBrushEntityShadow(model, entity, lightSpaceMatrix, brushProgram);
+          ShadowMap._renderBrushEntityShadow(model as BrushModel, entity, lightSpaceMatrix, brushProgram);
           break;
         case Mod.type.alias:
-          ShadowMap._renderAliasEntityShadow(model, entity, lightSpaceMatrix, aliasProgram);
+          ShadowMap._renderAliasEntityShadow(model as AliasModel, entity, lightSpaceMatrix, aliasProgram);
           break;
         case Mod.type.mesh:
-          ShadowMap._renderMeshEntityShadow(model, entity, lightSpaceMatrix, brushProgram);
+          ShadowMap._renderMeshEntityShadow(model as MeshModel, entity, lightSpaceMatrix, brushProgram);
           break;
         default:
           break;
@@ -511,12 +475,13 @@ export default class ShadowMap {
 
   /**
    * Determine whether an entity should contribute to the local shadow pass.
-   * @param {import('../ClientEntities.ts').ClientEdict} entity Visible entity candidate
-   * @param {Vector|Float64Array|number[]|null} cutoffOrigin Local shadow reference origin
-   * @param {number} cutoffDistSq Squared caster cutoff distance
-   * @returns {boolean} `true` if the entity should contribute to local shadows
+   * @returns True when the entity should cast a local directional shadow this frame.
    */
-  static _isLocalShadowCasterEntity(entity, cutoffOrigin, cutoffDistSq) {
+  static _isLocalShadowCasterEntity(
+    entity: ClientEdict,
+    cutoffOrigin: Vector | Float64Array | number[] | null,
+    cutoffDistSq: number,
+  ): boolean {
     if (entity.model === null || entity.alpha === 0.0 || entity.alpha < 1.0) {
       return false;
     }
@@ -552,19 +517,18 @@ export default class ShadowMap {
     return true;
   }
 
-  /**
-   * Render a brush submodel entity (door, platform, etc.) into a shadow map.
-   * @param {import('../../common/model/BSP.ts').BrushModel} model
-   * @param {import('../ClientEntities.ts').ClientEdict} entity
-   * @param {Float64Array} lightSpaceMatrix
-   * @param {string} programName
-   */
-  static _renderBrushEntityShadow(model, entity, lightSpaceMatrix, programName) {
+  /** @private */
+  static _renderBrushEntityShadow(
+    model: BrushModel,
+    entity: ClientEdict,
+    lightSpaceMatrix: Float64Array,
+    programName: string,
+  ): void {
     if (!model.opaqueVAO || !model.chains || model.chains.length === 0) {
       return;
     }
-    GL.BindVAO(/** @type {WebGLVertexArrayObject} */ (model.opaqueVAO));
-    const program = GL.UseProgram(programName);
+    GL.BindVAO(model.opaqueVAO as WebGLVertexArrayObject);
+    const program = GL.UseProgram(programName)!;
 
     gl.uniform3fv(program.uOrigin, entity.lerp.origin);
     gl.uniformMatrix3fv(program.uAngles, false, entity.lerp.angles.toRotationMatrix());
@@ -572,8 +536,8 @@ export default class ShadowMap {
 
     for (let i = 0; i < model.chains.length; i++) {
       const chain = model.chains[i];
-      const flags = model.textures[chain[0]].flags;
-      if (flags & (materialFlags.MF_SKIP | materialFlags.MF_TRANSPARENT | materialFlags.MF_TURBULENT)) {
+      const flags = (model.textures[chain[0]] as { flags: number }).flags;
+      if (flags & (MaterialFlags.MF_SKIP | MaterialFlags.MF_TRANSPARENT | MaterialFlags.MF_TURBULENT)) {
         continue;
       }
       gl.drawArrays(gl.TRIANGLES, chain[1], chain[2]);
@@ -581,19 +545,17 @@ export default class ShadowMap {
     GL.UnbindVAO();
   }
 
-  /**
-   * Render an alias model entity (monster, item, weapon) into a shadow map.
-   * Handles frame interpolation identically to AliasModelRenderer.
-   * @param {import('../../common/model/AliasModel.ts').AliasModel} model
-   * @param {import('../ClientEntities.ts').ClientEdict} entity
-   * @param {Float64Array} lightSpaceMatrix
-   * @param {string} programName
-   */
-  static _renderAliasEntityShadow(model, entity, lightSpaceMatrix, programName) {
+  /** @private */
+  static _renderAliasEntityShadow(
+    model: AliasModel,
+    entity: ClientEdict,
+    lightSpaceMatrix: Float64Array,
+    programName: string,
+  ): void {
     if (!model.cmds) {
       return;
     }
-    const program = GL.UseProgram(programName);
+    const program = GL.UseProgram(programName)!;
 
     gl.uniform3fv(program.uOrigin, entity.lerp.origin);
     gl.uniformMatrix3fv(program.uAngles, false, entity.lerp.angles.toRotationMatrix());
@@ -603,46 +565,43 @@ export default class ShadowMap {
 
     gl.uniform1f(program.uInterpolation, R.interpolation.value && (entity.effects & effect.EF_MUZZLEFLASH) === 0 ? Math.min(1, Math.max(0, targettime)) : 0);
 
-    // Bind vertex buffer and setup attributes (stride=24: 3 floats pos + 3 floats normal)
-    gl.bindBuffer(gl.ARRAY_BUFFER, model.cmds);
-    gl.enableVertexAttribArray(program.aPositionA.location);
-    gl.enableVertexAttribArray(program.aPositionB.location);
-    gl.vertexAttribPointer(program.aPositionA.location, 3, gl.FLOAT, false, 24, frameA.cmdofs);
-    gl.vertexAttribPointer(program.aPositionB.location, 3, gl.FLOAT, false, 24, frameB.cmdofs);
+    gl.bindBuffer(gl.ARRAY_BUFFER, model.cmds as WebGLBuffer);
+    gl.enableVertexAttribArray(program.aPositionA.location as number);
+    gl.enableVertexAttribArray(program.aPositionB.location as number);
+    gl.vertexAttribPointer(program.aPositionA.location as number, 3, gl.FLOAT, false, 24, frameA.cmdofs);
+    gl.vertexAttribPointer(program.aPositionB.location as number, 3, gl.FLOAT, false, 24, frameB.cmdofs);
 
-    // Bind normal attributes for point shadow normal offset bias (offset +12 in same buffer)
     if (program.aNormalA) {
-      gl.enableVertexAttribArray(program.aNormalA.location);
-      gl.enableVertexAttribArray(program.aNormalB.location);
-      gl.vertexAttribPointer(program.aNormalA.location, 3, gl.FLOAT, false, 24, frameA.cmdofs + 12);
-      gl.vertexAttribPointer(program.aNormalB.location, 3, gl.FLOAT, false, 24, frameB.cmdofs + 12);
+      gl.enableVertexAttribArray(program.aNormalA.location as number);
+      gl.enableVertexAttribArray(program.aNormalB.location as number);
+      gl.vertexAttribPointer(program.aNormalA.location as number, 3, gl.FLOAT, false, 24, frameA.cmdofs + 12);
+      gl.vertexAttribPointer(program.aNormalB.location as number, 3, gl.FLOAT, false, 24, frameB.cmdofs + 12);
       gl.uniform3fv(program.uLightPos, ShadowMap.pointLightOrigin);
-      gl.uniform1f(program.uNormalBias, ShadowMap.pointNormalBias.value);
+      gl.uniform1f(program.uNormalBias, ShadowMap.pointNormalBias!.value);
     }
 
     gl.drawArrays(gl.TRIANGLES, 0, model._num_tris * 3);
 
-    gl.disableVertexAttribArray(program.aPositionA.location);
-    gl.disableVertexAttribArray(program.aPositionB.location);
+    gl.disableVertexAttribArray(program.aPositionA.location as number);
+    gl.disableVertexAttribArray(program.aPositionB.location as number);
     if (program.aNormalA) {
-      gl.disableVertexAttribArray(program.aNormalA.location);
-      gl.disableVertexAttribArray(program.aNormalB.location);
+      gl.disableVertexAttribArray(program.aNormalA.location as number);
+      gl.disableVertexAttribArray(program.aNormalB.location as number);
     }
   }
 
-  /**
-   * Render a mesh model entity (glTF) into a shadow map.
-   * @param {import('../../common/model/MeshModel.ts').MeshModel} model
-   * @param {import('../ClientEntities.ts').ClientEdict} entity
-   * @param {Float64Array} lightSpaceMatrix
-   * @param {string} programName
-   */
-  static _renderMeshEntityShadow(model, entity, lightSpaceMatrix, programName) {
+  /** @private */
+  static _renderMeshEntityShadow(
+    model: MeshModel,
+    entity: ClientEdict,
+    lightSpaceMatrix: Float64Array,
+    programName: string,
+  ): void {
     if (!model.vao) {
       return;
     }
     GL.BindVAO(model.vao);
-    const program = GL.UseProgram(programName);
+    const program = GL.UseProgram(programName)!;
 
     gl.uniform3fv(program.uOrigin, entity.lerp.origin);
     gl.uniformMatrix3fv(program.uAngles, false, entity.lerp.angles.toRotationMatrix());
@@ -653,32 +612,26 @@ export default class ShadowMap {
     GL.UnbindVAO();
   }
 
-  /**
-   * @returns {WebGLTexture[]} The textures to bind as local shadow maps
-   */
-  static getActiveTextures() {
-    const textures = new Array(LOCAL_SHADOW_COUNT);
+  // ─── Active texture queries ───────────────────────────────────────
+
+  /** @returns The textures to bind as local shadow maps. */
+  static getActiveTextures(): WebGLTexture[] {
+    const textures = new Array<WebGLTexture>(LOCAL_SHADOW_COUNT);
     for (let i = 0; i < LOCAL_SHADOW_COUNT; i++) {
-      textures[i] = ShadowMap.enabled.value && i < ShadowMap.localLightCount
+      textures[i] = ShadowMap.enabled!.value && i < ShadowMap.localLightCount
         ? ShadowMap.depthTextures[i]
-        : ShadowMap.dummyTexture;
+        : ShadowMap.dummyTexture!;
     }
     return textures;
   }
 
-  // ═══════════════════════════════════════════════════════════════════
-  //  Point light (cube) shadow mapping
-  // ═══════════════════════════════════════════════════════════════════
+  // ─── Point light (cube) shadow mapping ───────────────────────────
 
   /**
    * Parse all light entities from the BSP entity lump and cache them.
-   * Scans the raw entity string for entities whose classname starts with
-   * `"light"`.  For each one the origin and the light level (from the
-   * `"light"` key, default 300) are stored in `ShadowMap.lightEntities`.
-   * Called lazily from `selectLocalLight` whenever the worldmodel changes.
-   * @param {string} entityString Raw entity lump text from the BSP
+   * Scans the raw entity string for entities whose classname starts with `"light"`.
    */
-  static parseLightEntities(entityString) {
+  static parseLightEntities(entityString: string): void {
     ShadowMap.lightEntities.length = 0;
     ShadowMap._currentLocalLightIndices.fill(-1);
     ShadowMap.localLightCount = 0;
@@ -687,7 +640,7 @@ export default class ShadowMap {
       return;
     }
 
-    let data = entityString;
+    let data: string | null = entityString;
 
     while (data) {
       const parsed = COM.Parse(data);
@@ -697,7 +650,7 @@ export default class ShadowMap {
         break;
       }
 
-      const ent = {};
+      const ent: Record<string, string> = {};
       while (data) {
         const parsedKey = COM.Parse(data);
         data = parsedKey.data;
@@ -731,7 +684,6 @@ export default class ShadowMap {
         parseFloat(parts[2]),
       ]);
 
-      // The "light" key specifies intensity; default 300 per Quake convention
       const radius = ent.light ? parseFloat(ent.light) : 300;
 
       if (radius > 0 && !Number.isNaN(origin[0])) {
@@ -744,11 +696,9 @@ export default class ShadowMap {
 
   /**
    * Test line-of-sight between two points using the world BSP hull 0.
-   * @param {Vector|Float64Array|number[]} start Start point
-   * @param {Vector|Float64Array|number[]} end End point
-   * @returns {boolean} `true` if the line is unobstructed
+   * @returns True if the line is unobstructed.
    */
-  static _traceVisible(start, end) {
+  static _traceVisible(start: Vector | Float64Array | number[], end: Vector | Float64Array | number[]): boolean {
     const trace = SV.collision.traceStaticWorldLine(
       new Vector(start[0], start[1], start[2]),
       new Vector(end[0], end[1], end[2]),
@@ -759,11 +709,9 @@ export default class ShadowMap {
   /**
    * Test visibility from a map light to the target, allowing for lights that
    * are embedded slightly inside wall fixtures or ceilings.
-   * @param {Vector|Float64Array|number[]} start Light entity origin
-   * @param {Vector|Float64Array|number[]} end Shadow target point
-   * @returns {boolean} `true` if a direct or nudged trace is unobstructed
+   * @returns True if a direct or nudged trace is unobstructed.
    */
-  static _traceLightVisible(start, end) {
+  static _traceLightVisible(start: Vector | Float64Array | number[], end: Vector | Float64Array | number[]): boolean {
     if (ShadowMap._traceVisible(start, end)) {
       return true;
     }
@@ -789,13 +737,10 @@ export default class ShadowMap {
 
   /**
    * Determine the single top-down local shadow used this frame.
-   * The shadow focus follows the nearest visible caster; the local shadow
-   * direction itself is fixed straight down for now.
-   * @param {Vector|Float64Array|number[]} viewOrigin Camera position used only
-   *   as a last-resort fallback when no shadow casters are visible.
+   * The shadow focus follows the nearest visible caster.
    */
-  static selectLocalLights(viewOrigin) {
-    let anchorEntity = null;
+  static selectLocalLights(viewOrigin: Vector | Float64Array | number[]): void {
+    let anchorEntity: ClientEdict | null = null;
     let bestDistSq = Infinity;
 
     for (const entity of CL.state.clientEntities.getVisibleEntities()) {
@@ -827,12 +772,8 @@ export default class ShadowMap {
     }
   }
 
-  /**
-   * Apply the configurable fallback shadow direction.
-   * Used when no light entity from the BSP entity lump is visible.
-   * @param {number} slotIndex Local shadow slot to populate with the fallback direction
-   */
-  static _applyFallbackDirection(slotIndex) {
+  /** Apply the configurable fallback shadow direction to a slot. */
+  static _applyFallbackDirection(slotIndex: number): void {
     ShadowMap._currentLocalLightIndices[slotIndex] = -1;
     const dir = ShadowMap.localLightDirs[slotIndex];
     dir[0] = 0.0;
@@ -843,24 +784,19 @@ export default class ShadowMap {
 
   /**
    * Select the strongest light for point shadow casting.
-   * Considers both transient dynamic lights and static BSP light
-   * entities. Picks whichever scores highest (radius / distance).
-   * BSP lights are capped at twice their radius so distant map
-   * lights don't compete with nearby ones.
-   * @param {Vector|Float64Array|number[]} viewOrigin Camera position in world space.
-   * @returns {boolean} True if a suitable light was found.
+   * Considers both transient dynamic lights and static BSP light entities.
+   * @returns True if a suitable light was found.
    */
-  static selectPointLight(viewOrigin) {
+  static selectPointLight(viewOrigin: Vector | Float64Array | number[]): boolean {
     ShadowMap.pointLightActive = false;
 
-    if (!ShadowMap.pointEnabled.value) {
+    if (!ShadowMap.pointEnabled!.value) {
       return false;
     }
 
-    // Lazy-parse BSP light entities when worldmodel changes (new map)
-    const worldmodel = CL.state.worldmodel;
+    const worldmodel = CL.state.worldmodel as BrushModel | null;
     if (worldmodel && ShadowMap._parsedWorldmodel !== worldmodel) {
-      ShadowMap.parseLightEntities(worldmodel.entities);
+      ShadowMap.parseLightEntities(worldmodel.entities as string);
       ShadowMap._parsedWorldmodel = worldmodel;
     }
 
@@ -870,7 +806,6 @@ export default class ShadowMap {
     let bestOriginZ = 0;
     let bestRadius = 0;
 
-    // Score transient dynamic lights
     const dlights = CL.state.clientEntities.dlights;
     for (let i = 0; i < limits.dlights; i++) {
       const l = dlights[i];
@@ -893,33 +828,6 @@ export default class ShadowMap {
       }
     }
 
-    // // Score static BSP light entities — only consider lights within
-    // // twice their radius so distant map lights don't compete.
-    // const lights = ShadowMap.lightEntities;
-    // for (let i = 0; i < lights.length; i++) {
-    //   const light = lights[i];
-    //   const dx = light.origin[0] - viewOrigin[0];
-    //   const dy = light.origin[1] - viewOrigin[1];
-    //   const dz = light.origin[2] - viewOrigin[2];
-    //   const distSq = dx * dx + dy * dy + dz * dz;
-    //   const maxDist = light.radius * 2.0;
-
-    //   if (distSq > maxDist * maxDist) {
-    //     continue;
-    //   }
-
-    //   const dist = Math.sqrt(distSq);
-    //   const score = light.radius / Math.max(dist, 1.0);
-
-    //   if (score > bestScore) {
-    //     bestScore = score;
-    //     bestOriginX = light.origin[0];
-    //     bestOriginY = light.origin[1];
-    //     bestOriginZ = light.origin[2];
-    //     bestRadius = light.radius;
-    //   }
-    // }
-
     if (bestScore < 0) {
       return false;
     }
@@ -935,76 +843,58 @@ export default class ShadowMap {
   /**
    * Build a 90° perspective view-projection matrix for one cube face.
    * Writes into ShadowMap.pointFaceMatrix (column-major).
-   * @param {number} faceIndex 0-5 corresponding to +X, -X, +Y, -Y, +Z, -Z
    */
-  static buildPointFaceMatrix(faceIndex) {
+  static buildPointFaceMatrix(faceIndex: number): void {
     const face = CUBE_FACES[faceIndex];
     const ox = ShadowMap.pointLightOrigin[0];
     const oy = ShadowMap.pointLightOrigin[1];
     const oz = ShadowMap.pointLightOrigin[2];
     const far = ShadowMap.pointLightRadius;
 
-    // Target direction
     const tx = face[0], ty = face[1], tz = face[2];
-    // Up vector
     let ux = face[3], uy = face[4], uz = face[5];
 
-    // right = normalize(target × up)
     let rx = ty * uz - tz * uy;
     let ry = tz * ux - tx * uz;
     let rz = tx * uy - ty * ux;
     const rLen = Math.hypot(rx, ry, rz);
     rx /= rLen; ry /= rLen; rz /= rLen;
 
-    // Recalculate up = right × target
     ux = ry * tz - rz * ty;
     uy = rz * tx - rx * tz;
     uz = rx * ty - ry * tx;
 
-    // View matrix (lookAt: eye=origin, centre=origin+target, up)
-    // Camera looks along -Z in eye space, so negate the forward axis
     const fwX = -tx, fwY = -ty, fwZ = -tz;
 
     const v12 = -(rx * ox + ry * oy + rz * oz);
     const v13 = -(ux * ox + uy * oy + uz * oz);
     const v14 = -(fwX * ox + fwY * oy + fwZ * oz);
 
-    // Perspective matrix (symmetric, 90° FOV, aspect 1:1)
-    // f = 1/tan(45°) = 1.0
-    const nf = POINT_NEAR / (POINT_NEAR - far); // = n/(n-f)
-    const nf2 = (POINT_NEAR * far) / (POINT_NEAR - far); // = n*f/(n-f)
+    const nf = POINT_NEAR / (POINT_NEAR - far);
+    const nf2 = (POINT_NEAR * far) / (POINT_NEAR - far);
 
-    // Combined P × V (column-major)
-    // P = diag(1, 1, nf, 0) + col3(0, 0, nf2, -1)
     const m = ShadowMap.pointFaceMatrix;
-    // Column 0: P * V col0
     m[0]  = rx;
     m[1]  = ux;
     m[2]  = nf * fwX;
     m[3]  = -fwX;
-    // Column 1: P * V col1
     m[4]  = ry;
     m[5]  = uy;
     m[6]  = nf * fwY;
     m[7]  = -fwY;
-    // Column 2: P * V col2
     m[8]  = rz;
     m[9]  = uz;
     m[10] = nf * fwZ;
     m[11] = -fwZ;
-    // Column 3: P * V col3
     m[12] = v12;
     m[13] = v13;
     m[14] = nf * v14 + nf2;
     m[15] = -v14;
   }
 
-  /**
-   * Render the point light shadow cube map (all 6 faces).
-   * Call after selectPointLight() returns true.
-   */
-  static renderPointLightShadow() {
-    const worldmodel = /** @type {import('../../common/model/BSP.ts').BrushModel} */ (CL.state.worldmodel);
+  /** Render the point light shadow cube map (all 6 faces). */
+  static renderPointLightShadow(): void {
+    const worldmodel = CL.state.worldmodel as BrushModel | null;
     if (!worldmodel) {
       return;
     }
@@ -1013,19 +903,18 @@ export default class ShadowMap {
     gl.viewport(0, 0, POINT_SHADOW_SIZE, POINT_SHADOW_SIZE);
     gl.enable(gl.DEPTH_TEST);
     gl.colorMask(false, false, false, false);
-    gl.disable(gl.CULL_FACE); // render both sides for correct occlusion behind thin geometry
+    gl.disable(gl.CULL_FACE);
 
-    GL.BindVAO(/** @type {WebGLVertexArrayObject} */ (worldmodel.opaqueVAO));
-    const program = GL.UseProgram('shadow-point');
+    GL.BindVAO(worldmodel.opaqueVAO as WebGLVertexArrayObject);
+    const program = GL.UseProgram('shadow-point')!;
 
     gl.uniform3f(program.uOrigin, 0, 0, 0);
     gl.uniformMatrix3fv(program.uAngles, false, GL.identity);
     gl.uniform3fv(program.uLightPos, ShadowMap.pointLightOrigin);
     gl.uniform1f(program.uLightRadius, ShadowMap.pointLightRadius);
-    gl.uniform1f(program.uNormalBias, ShadowMap.pointNormalBias.value);
+    gl.uniform1f(program.uNormalBias, ShadowMap.pointNormalBias!.value);
 
     for (let face = 0; face < 6; face++) {
-      // Attach the correct cube face to the FBO depth
       gl.framebufferTexture2D(
         gl.FRAMEBUFFER, gl.DEPTH_ATTACHMENT,
         gl.TEXTURE_CUBE_MAP_POSITIVE_X + face,
@@ -1036,7 +925,6 @@ export default class ShadowMap {
       ShadowMap.buildPointFaceMatrix(face);
       gl.uniformMatrix4fv(program.uLightSpaceMatrix, false, ShadowMap.pointFaceMatrix);
 
-      // Draw all opaque leaf geometry
       for (let i = 0; i < worldmodel.leafs.length; i++) {
         const leaf = worldmodel.leafs[i];
         if (leaf.skychain === 0) {
@@ -1044,20 +932,18 @@ export default class ShadowMap {
         }
         for (let j = 0; j < leaf.skychain; j++) {
           const cmds = leaf.cmds[j];
-          const flags = worldmodel.textures[cmds[0]].flags;
-          if (flags & (materialFlags.MF_SKIP | materialFlags.MF_TRANSPARENT)) {
+          const flags = (worldmodel.textures[cmds[0]] as { flags: number }).flags;
+          if (flags & (MaterialFlags.MF_SKIP | MaterialFlags.MF_TRANSPARENT)) {
             continue;
           }
           gl.drawArrays(gl.TRIANGLES, cmds[1], cmds[2]);
         }
       }
 
-      // Draw entities into this cube face (exclude the light-emitting entity)
       GL.UnbindVAO();
       ShadowMap.renderEntitiesShadow(ShadowMap.pointFaceMatrix, 'shadow-point', 'shadow-alias-point');
 
-      // Re-bind world VAO and program for next face
-      GL.BindVAO(/** @type {WebGLVertexArrayObject} */ (worldmodel.opaqueVAO));
+      GL.BindVAO(worldmodel.opaqueVAO as WebGLVertexArrayObject);
       GL.UseProgram('shadow-point');
       gl.uniform3f(program.uOrigin, 0, 0, 0);
       gl.uniformMatrix3fv(program.uAngles, false, GL.identity);
@@ -1065,15 +951,13 @@ export default class ShadowMap {
 
     GL.UnbindVAO();
     gl.enable(gl.CULL_FACE);
-    gl.cullFace(gl.FRONT); // restore engine default
+    gl.cullFace(gl.FRONT);
     gl.colorMask(true, true, true, true);
     gl.bindFramebuffer(gl.FRAMEBUFFER, null);
   }
 
-  /**
-   * @returns {WebGLTexture} The cube texture to bind as point shadow map (real or dummy)
-   */
-  static getActivePointTexture() {
-    return ShadowMap.pointLightActive ? ShadowMap.pointDepthCube : ShadowMap.pointDummyCube;
+  /** @returns The cube texture to bind as point shadow map (real or dummy). */
+  static getActivePointTexture(): WebGLTexture {
+    return ShadowMap.pointLightActive ? ShadowMap.pointDepthCube! : ShadowMap.pointDummyCube!;
   }
 }
diff --git a/source/engine/client/renderer/Sky.mjs b/source/engine/client/renderer/Sky.ts
similarity index 74%
rename from source/engine/client/renderer/Sky.mjs
rename to source/engine/client/renderer/Sky.ts
index 6e0ef02b..3eb50337 100644
--- a/source/engine/client/renderer/Sky.mjs
+++ b/source/engine/client/renderer/Sky.ts
@@ -1,32 +1,29 @@
 import W from '../../common/W.ts';
 import { BrushModel } from '../../common/Mod.ts';
-import { eventBus, registry } from '../../registry.mjs';
+import { eventBus, getClientRegistry } from '../../registry.mjs';
+import GL, { ATTRIB_LOCATIONS, GLTexture } from '../GL.ts';
 
-import GL, { ATTRIB_LOCATIONS, GLTexture } from '../GL.mjs';
-
-let { Host, R } = registry;
+let { Host, R } = getClientRegistry();
 
 eventBus.subscribe('registry.frozen', () => {
-  Host = registry.Host;
-  R = registry.R;
+  ({ Host, R } = getClientRegistry());
 });
 
-/** @type {WebGL2RenderingContext} */
-let gl = null;
+let gl: WebGL2RenderingContext = null!;
 
 eventBus.subscribe('gl.ready', () => {
   gl = GL.gl;
 });
 
 eventBus.subscribe('gl.shutdown', () => {
-  gl = null;
+  gl = null!;
 });
 
 /**
- * @param {number} strength Requested sky bloom strength.
- * @returns {number} Sanitized sky bloom strength.
+ * @param strength Requested sky bloom strength.
+ * @returns Sanitized sky bloom strength.
  */
-export function resolveSkyBloomEmissiveScale(strength) {
+export function resolveSkyBloomEmissiveScale(strength: number): number {
   return Number.isFinite(strength) && strength > 0.0 ? strength : 0.0;
 }
 
@@ -36,24 +33,23 @@ export function resolveSkyBloomEmissiveScale(strength) {
  * Right now the BSP model loader sets up the desired sky renderer.
  */
 export class SkyRenderer {
-  /**
-   * @param {BrushModel} worldmodel current world
-   */
-  constructor(worldmodel) {
+  /** Current world model. */
+  worldmodel: BrushModel;
+
+  constructor(worldmodel: BrushModel) {
     this.worldmodel = worldmodel;
   }
 
   /**
    * Renders the stencil mask for sky surfaces.
-   * @protected
    */
-  _renderStencilMask() {
+  protected _renderStencilMask(): void {
     // Disable color writes - we only want to mark the depth buffer where sky is visible
     gl.colorMask(false, false, false, false);
 
-    const program = GL.UseProgram('sky-chain');
+    const program = GL.UseProgram('sky-chain')!;
     gl.bindBuffer(gl.ARRAY_BUFFER, this.worldmodel.cmds);
-    gl.vertexAttribPointer(program.aPosition.location, 3, gl.FLOAT, false, 12, this.worldmodel.skychain);
+    gl.vertexAttribPointer(program.aPosition!.location, 3, gl.FLOAT, false, 12, this.worldmodel.skychain);
 
     // Render all visible sky surfaces from the BSP tree
     // This writes to the depth buffer, creating a stencil of where sky should appear
@@ -81,15 +77,12 @@ export class SkyRenderer {
     gl.colorMask(true, true, true, true);
   }
 
-  init() {
-  }
+  init(): void {}
 
-  shutdown() {
-  }
+  shutdown(): void {}
 
-  render() {
-  }
-};
+  render(): void {}
+}
 
 /**
  * Quake 1 style sky rendering.
@@ -99,14 +92,10 @@ export class SkyRenderer {
 export class Quake1Sky extends SkyRenderer {
   #solidskytexture = new GLTexture('r_solidsky', 128, 128);
   #alphaskytexture = new GLTexture('r_alphasky', 128, 128);
+  #skybox: WebGLBuffer | null = null;
 
-  #skybox = null;
-
-  /**
-   * VAO for the sky dome VBO (position-only, 12-byte stride).
-   * @type {WebGLVertexArrayObject|null}
-   */
-  #skyboxVAO = null;
+  /** VAO for the sky dome VBO (position-only, 12-byte stride). */
+  #skyboxVAO: WebGLVertexArrayObject | null = null;
 
   /**
    * Procedurally generates a dome mesh for skybox rendering.
@@ -125,16 +114,16 @@ export class Quake1Sky extends SkyRenderer {
    * - Plus a triangle fan at the top (zenith)
    * - Total: 180 vertices (60 triangles)
    */
-  #makeSky() {
+  #makeSky(): void {
     // Pre-compute sine values for angles from 0° to 90° in steps of 11.25° (π/16)
     // These define the dome's curvature
     const sin = Array.from({ length: 9 }, (_, i) =>
       Number(Math.sin(i * Math.PI / 16).toFixed(6)),
     );
-    let vecs = []; let i; let j;
+    let vecs: number[] = [];
 
     // Build the dome mesh in 4 vertical segments
-    for (i = 0; i < 7; i += 2) {
+    for (let i = 0; i < 7; i += 2) {
       // Triangle fan at the top (zenith) of this segment
       // Connects the peak (0, 0, 1) to the top edge of the dome
       vecs = vecs.concat(
@@ -146,7 +135,7 @@ export class Quake1Sky extends SkyRenderer {
 
       // Build the dome grid: 8 horizontal rings, each forming a strip of quads
       // Each quad is split into 2 triangles
-      for (j = 0; j < 7; j++) {
+      for (let j = 0; j < 7; j++) {
         // The vertices form a spherical coordinate grid:
         // sin[i] controls the X/Y position (azimuth angle)
         // sin[j] controls the Z height (elevation angle)
@@ -169,19 +158,18 @@ export class Quake1Sky extends SkyRenderer {
     gl.bindBuffer(gl.ARRAY_BUFFER, this.#skybox);
     gl.bufferData(gl.ARRAY_BUFFER, new Float32Array(vecs), gl.STATIC_DRAW);
 
-    this.#skyboxVAO = GL.CreateVAO(this.#skybox, [
+    this.#skyboxVAO = GL.CreateVAO(this.#skybox!, [
       { location: ATTRIB_LOCATIONS.aPosition, components: 3, type: gl.FLOAT, normalized: false, stride: 12, offset: 0 },
     ]);
   }
 
-  init() {
+  override init(): void {
     this.#makeSky();
-
     this.#alphaskytexture.lockTextureMode('GL_NEAREST');
     this.#solidskytexture.lockTextureMode('GL_LINEAR');
   }
 
-  shutdown() {
+  override shutdown(): void {
     this.#solidskytexture.free();
     this.#alphaskytexture.free();
 
@@ -195,47 +183,47 @@ export class Quake1Sky extends SkyRenderer {
     }
   }
 
-  #renderSkyboxDome() {
+  #renderSkyboxDome(): void {
     // Configure depth testing: only draw sky where depth > existing (i.e., behind everything)
     gl.depthFunc(gl.GREATER);
     gl.depthMask(false); // Don't write to depth buffer
     gl.disable(gl.CULL_FACE); // Need to see both sides of the dome
 
     // Set up the sky shader with scrolling textures
-    const program = GL.UseProgram('sky');
+    const program = GL.UseProgram('sky')!;
     // Two scrolling layers at different speeds for parallax effect
-    gl.uniform2f(program.uTime, (Host.realtime * 0.125) % 1.0, (Host.realtime * 0.03125) % 1.0);
-    gl.uniform1f(program.uBloomEmissiveScale, resolveSkyBloomEmissiveScale(R.bloomSkyStrength?.value ?? 0.0));
-    this.#solidskytexture.bind(program.tSolid); // Base sky layer
-    this.#alphaskytexture.bind(program.tAlpha); // Overlay layer (e.g., clouds)
+    gl.uniform2f(program.uTime!, (Host.realtime * 0.125) % 1.0, (Host.realtime * 0.03125) % 1.0);
+    gl.uniform1f(program.uBloomEmissiveScale!, resolveSkyBloomEmissiveScale(R.bloomSkyStrength?.value ?? 0.0));
+    this.#solidskytexture.bind(program.tSolid!); // Base sky layer
+    this.#alphaskytexture.bind(program.tAlpha!); // Overlay layer (e.g., clouds)
 
     // Bind the procedurally-generated dome mesh
-    GL.BindVAO(this.#skyboxVAO);
+    GL.BindVAO(this.#skyboxVAO!);
 
     // Render the sky dome 8 times - once for each octant of a sphere
     // The uScale uniform transforms the base dome mesh to cover different octants
     // This creates a full spherical skybox from a single dome mesh
 
     // Octants with positive X
-    gl.uniform3f(program.uScale, 2.0, -2.0, 1.0);  // +X, -Y, +Z
+    gl.uniform3f(program.uScale!, 2.0, -2.0, 1.0);  // +X, -Y, +Z
     gl.drawArrays(gl.TRIANGLES, 0, 180);
-    gl.uniform3f(program.uScale, 2.0, -2.0, -1.0); // +X, -Y, -Z
+    gl.uniform3f(program.uScale!, 2.0, -2.0, -1.0); // +X, -Y, -Z
     gl.drawArrays(gl.TRIANGLES, 0, 180);
 
-    gl.uniform3f(program.uScale, 2.0, 2.0, 1.0);   // +X, +Y, +Z
+    gl.uniform3f(program.uScale!, 2.0, 2.0, 1.0);   // +X, +Y, +Z
     gl.drawArrays(gl.TRIANGLES, 0, 180);
-    gl.uniform3f(program.uScale, 2.0, 2.0, -1.0);  // +X, +Y, -Z
+    gl.uniform3f(program.uScale!, 2.0, 2.0, -1.0);  // +X, +Y, -Z
     gl.drawArrays(gl.TRIANGLES, 0, 180);
 
     // Octants with negative X
-    gl.uniform3f(program.uScale, -2.0, -2.0, 1.0);  // -X, -Y, +Z
+    gl.uniform3f(program.uScale!, -2.0, -2.0, 1.0);  // -X, -Y, +Z
     gl.drawArrays(gl.TRIANGLES, 0, 180);
-    gl.uniform3f(program.uScale, -2.0, -2.0, -1.0); // -X, -Y, -Z
+    gl.uniform3f(program.uScale!, -2.0, -2.0, -1.0); // -X, -Y, -Z
     gl.drawArrays(gl.TRIANGLES, 0, 180);
 
-    gl.uniform3f(program.uScale, -2.0, 2.0, 1.0);   // -X, +Y, +Z
+    gl.uniform3f(program.uScale!, -2.0, 2.0, 1.0);   // -X, +Y, +Z
     gl.drawArrays(gl.TRIANGLES, 0, 180);
-    gl.uniform3f(program.uScale, -2.0, 2.0, -1.0);  // -X, +Y, -Z
+    gl.uniform3f(program.uScale!, -2.0, 2.0, -1.0);  // -X, +Y, -Z
     gl.drawArrays(gl.TRIANGLES, 0, 180);
 
     GL.UnbindVAO();
@@ -255,9 +243,8 @@ export class Quake1Sky extends SkyRenderer {
    * not behind walls or geometry. The skybox itself is rendered 8 times (once
    * for each octant of the sphere) using a procedurally-generated dome mesh.
    */
-  render() {
+  override render(): void {
     console.assert(this.#skybox !== null, 'Skybox mesh not initialized');
-
     this._renderStencilMask();
     this.#renderSkyboxDome();
   }
@@ -272,9 +259,9 @@ export class Quake1Sky extends SkyRenderer {
    * Each layer is extracted as a 128x128 texture and converted from 8-bit
    * palette indices to 32-bit RGBA. The layers scroll at different speeds
    * in the shader to create a parallax depth effect.
-   * @param {Uint8Array} indexedTexture - 256x128 8-bit indexed sky texture data
+   * @param indexedTexture 256x128 8-bit indexed sky texture data.
    */
-  setSkyTexture(indexedTexture) {
+  setSkyTexture(indexedTexture: Uint8Array): void {
     const trans = new ArrayBuffer(65536); // 128x128x4 bytes
     const trans32 = new Uint32Array(trans);
 
@@ -305,29 +292,25 @@ export class Quake1Sky extends SkyRenderer {
 
     this.#alphaskytexture.upload(new Uint8Array(trans));
   }
-};
+}
 
 /**
  * GoldSrc style simple skybox rendering.
  * Accepts 6 separate textures for each face of the skybox cube.
  */
 export class SimpleSkyBox extends SkyRenderer {
-  #front = /** @type {GLTexture|null} */ (null);
-  #back = /** @type {GLTexture|null} */ (null);
-  #left = /** @type {GLTexture|null} */ (null);
-  #right = /** @type {GLTexture|null} */ (null);
-  #up = /** @type {GLTexture|null} */ (null);
-  #down = /** @type {GLTexture|null} */ (null);
-
-  #cubeBuffer = null;
-
-  /**
-   * VAO for the skybox cube VBO (position+texcoord+normal, 32-byte stride).
-   * @type {WebGLVertexArrayObject|null}
-   */
-  #cubeVAO = null;
-
-  setSkyTextures(front, back, left, right, up, down) {
+  #front: GLTexture | null = null;
+  #back: GLTexture | null = null;
+  #left: GLTexture | null = null;
+  #right: GLTexture | null = null;
+  #up: GLTexture | null = null;
+  #down: GLTexture | null = null;
+  #cubeBuffer: WebGLBuffer | null = null;
+
+  /** VAO for the skybox cube VBO (position+texcoord+normal, 32-byte stride). */
+  #cubeVAO: WebGLVertexArrayObject | null = null;
+
+  setSkyTextures(front: GLTexture, back: GLTexture, left: GLTexture, right: GLTexture, up: GLTexture, down: GLTexture): void {
     this.#front = front;
     this.#back = back;
     this.#left = left;
@@ -343,15 +326,15 @@ export class SimpleSkyBox extends SkyRenderer {
     this.#down.wrapClamped();
   }
 
-  init() {
+  override init(): void {
     const s = 16384.0;
-    const verts = [];
-    const push = (x, y, z, u, v, nx, ny, nz) => {
+    const verts: number[] = [];
+    const push = (x: number, y: number, z: number, u: number, v: number, nx: number, ny: number, nz: number): void => {
       verts.push(x, y, z, u, v, nx, ny, nz);
     };
 
     // Front (+X)
-    const nFront = [1, 0, 0];
+    const nFront: [number, number, number] = [1, 0, 0];
     push(s,s,-s, 0,1, ...nFront);
     push(s,-s,-s, 1,1, ...nFront);
     push(s,-s,s, 1,0, ...nFront);
@@ -360,7 +343,7 @@ export class SimpleSkyBox extends SkyRenderer {
     push(s,s,s, 0,0, ...nFront);
 
     // Back (-X)
-    const nBack = [-1, 0, 0];
+    const nBack: [number, number, number] = [-1, 0, 0];
     push(-s,-s,-s, 0,1, ...nBack);
     push(-s,s,-s, 1,1, ...nBack);
     push(-s,s,s, 1,0, ...nBack);
@@ -369,7 +352,7 @@ export class SimpleSkyBox extends SkyRenderer {
     push(-s,-s,s, 0,0, ...nBack);
 
     // Left (+Y)
-    const nLeft = [0, 1, 0];
+    const nLeft: [number, number, number] = [0, 1, 0];
     push(-s,s,-s, 0,1, ...nLeft);
     push(s,s,-s, 1,1, ...nLeft);
     push(s,s,s, 1,0, ...nLeft);
@@ -378,7 +361,7 @@ export class SimpleSkyBox extends SkyRenderer {
     push(-s,s,s, 0,0, ...nLeft);
 
     // Right (-Y)
-    const nRight = [0, -1, 0];
+    const nRight: [number, number, number] = [0, -1, 0];
     push(s,-s,-s, 0,1, ...nRight);
     push(-s,-s,-s, 1,1, ...nRight);
     push(-s,-s,s, 1,0, ...nRight);
@@ -387,7 +370,7 @@ export class SimpleSkyBox extends SkyRenderer {
     push(s,-s,s, 0,0, ...nRight);
 
     // Up (+Z)
-    const nUp = [0, 0, 1];
+    const nUp: [number, number, number] = [0, 0, 1];
     push(s,s,s, 1,1, ...nUp);
     push(s,-s,s, 1,0, ...nUp);
     push(-s,-s,s, 0,0, ...nUp);
@@ -396,7 +379,7 @@ export class SimpleSkyBox extends SkyRenderer {
     push(-s,s,s, 0,1, ...nUp);
 
     // Down (-Z)
-    const nDown = [0, 0, -1];
+    const nDown: [number, number, number] = [0, 0, -1];
     push(s,-s,-s, 0,0, ...nDown);
     push(s,s,-s, 0,1, ...nDown);
     push(-s,s,-s, 1,1, ...nDown);
@@ -408,14 +391,14 @@ export class SimpleSkyBox extends SkyRenderer {
     gl.bindBuffer(gl.ARRAY_BUFFER, this.#cubeBuffer);
     gl.bufferData(gl.ARRAY_BUFFER, new Float32Array(verts), gl.STATIC_DRAW);
 
-    this.#cubeVAO = GL.CreateVAO(this.#cubeBuffer, [
+    this.#cubeVAO = GL.CreateVAO(this.#cubeBuffer!, [
       { location: ATTRIB_LOCATIONS.aPosition, components: 3, type: gl.FLOAT, normalized: false, stride: 32, offset: 0 },
       { location: ATTRIB_LOCATIONS.aTexCoord, components: 2, type: gl.FLOAT, normalized: false, stride: 32, offset: 12 },
       { location: ATTRIB_LOCATIONS.aNormal, components: 3, type: gl.FLOAT, normalized: false, stride: 32, offset: 20 },
     ]);
   }
 
-  shutdown() {
+  override shutdown(): void {
     if (this.#cubeBuffer) {
       gl.deleteBuffer(this.#cubeBuffer);
       this.#cubeBuffer = null;
@@ -433,7 +416,7 @@ export class SimpleSkyBox extends SkyRenderer {
     this.#down = null;
   }
 
-  render() {
+  override render(): void {
     if (!this.#front) {
       return;
     }
@@ -444,15 +427,15 @@ export class SimpleSkyBox extends SkyRenderer {
     gl.depthMask(false);
     gl.disable(gl.CULL_FACE);
 
-    const program = GL.UseProgram('mesh');
-    gl.uniform3fv(program.uOrigin, R.refdef.vieworg);
-    gl.uniformMatrix3fv(program.uAngles, false, GL.identity);
-    gl.uniform3f(program.uAmbientLight, 1.0, 1.0, 1.0);
-    gl.uniform3f(program.uShadeLight, 0.0, 0.0, 0.0);
-    gl.uniform3f(program.uDynamicShadeLight, 0.0, 0.0, 0.0);
-    gl.uniform3f(program.uLightVec, 0.0, 0.0, 1.0);
-    gl.uniform1f(program.uAlpha, 1.0);
-    gl.uniform1f(program.uBloomEmissiveScale, resolveSkyBloomEmissiveScale(R.bloomSkyStrength?.value ?? 0.0));
+    const program = GL.UseProgram('mesh')!;
+    gl.uniform3fv(program.uOrigin!, R.refdef.vieworg);
+    gl.uniformMatrix3fv(program.uAngles!, false, GL.identity);
+    gl.uniform3f(program.uAmbientLight!, 1.0, 1.0, 1.0);
+    gl.uniform3f(program.uShadeLight!, 0.0, 0.0, 0.0);
+    gl.uniform3f(program.uDynamicShadeLight!, 0.0, 0.0, 0.0);
+    gl.uniform3f(program.uLightVec!, 0.0, 0.0, 1.0);
+    gl.uniform1f(program.uAlpha!, 1.0);
+    gl.uniform1f(program.uBloomEmissiveScale!, resolveSkyBloomEmissiveScale(R.bloomSkyStrength?.value ?? 0.0));
 
     if (program.tShadowMap0 !== undefined && R.shadow_textures?.[0]) {
       GL.Bind(program.tShadowMap0, R.shadow_textures[0]);
@@ -467,14 +450,14 @@ export class SimpleSkyBox extends SkyRenderer {
       GL.BindCube(program.tPointShadowMap, R.point_shadow_texture);
     }
 
-    GL.BindVAO(this.#cubeVAO);
+    GL.BindVAO(this.#cubeVAO!);
 
     const faces = [this.#front, this.#back, this.#right, this.#left, this.#up, this.#down];
     for (let i = 0; i < 6; i++) {
-        if (faces[i]) {
-            faces[i].bind(0);
-            gl.drawArrays(gl.TRIANGLES, i * 6, 6);
-        }
+      if (faces[i]) {
+        faces[i]!.bind(0);
+        gl.drawArrays(gl.TRIANGLES, i * 6, 6);
+      }
     }
 
     GL.UnbindVAO();
@@ -482,4 +465,4 @@ export class SimpleSkyBox extends SkyRenderer {
     gl.depthMask(true);
     gl.depthFunc(gl.LESS);
   }
-};
+}
diff --git a/source/engine/client/renderer/SpriteModelRenderer.mjs b/source/engine/client/renderer/SpriteModelRenderer.ts
similarity index 50%
rename from source/engine/client/renderer/SpriteModelRenderer.mjs
rename to source/engine/client/renderer/SpriteModelRenderer.ts
index 2faec355..35123502 100644
--- a/source/engine/client/renderer/SpriteModelRenderer.mjs
+++ b/source/engine/client/renderer/SpriteModelRenderer.ts
@@ -1,129 +1,128 @@
-import { ModelRenderer } from './ModelRenderer.mjs';
-import { getEntityBloomEmissiveScale } from './BloomEffect.mjs';
-import { eventBus, registry } from '../../registry.mjs';
-import GL from '../GL.mjs';
+import { ModelRenderer } from './ModelRenderer.ts';
+import { getEntityBloomEmissiveScale } from './BloomEffect.ts';
+import { eventBus, getClientRegistry } from '../../registry.mjs';
+import GL from '../GL.ts';
+import type { SpriteModel, SpriteSingleFrame, SpriteFrameImage } from '../../common/model/SpriteModel.ts';
+import type { ClientEdict } from '../ClientEntities.ts';
+import type { BaseModel } from '../../common/model/BaseModel.ts';
 
-let { CL, R } = registry;
+let { CL, R } = getClientRegistry();
 
 eventBus.subscribe('registry.frozen', () => {
-  ({ CL, R } = registry);
+  ({ CL, R } = getClientRegistry());
 });
 
-let gl = /** @type {WebGL2RenderingContext} */ (null);
+let gl: WebGL2RenderingContext = null!;
 
 eventBus.subscribe('gl.ready', () => {
   gl = GL.gl;
 });
 
 eventBus.subscribe('gl.shutdown', () => {
-  gl = null;
+  gl = null!;
 });
 
+/** A resolved (non-group) sprite frame ready for rendering. */
+type SpriteRenderFrame = SpriteSingleFrame | SpriteFrameImage;
+
 /**
  * Renderer for Sprite SPR models (2D billboards like explosions, particles).
  * Handles both camera-facing and oriented billboards using dynamic geometry.
  */
 export class SpriteModelRenderer extends ModelRenderer {
   /**
-   * Get the model type this renderer handles
-   * @returns {number} Mod.type.sprite (1)
+   * Get the model type this renderer handles.
+   * @returns Mod.type.sprite (1)
    */
-  getModelType() {
+  override getModelType(): number {
     return 1; // Mod.type.sprite
   }
 
   /**
    * Setup rendering state for sprite models.
    * Enables blending for transparent sprites.
-   * @param {number} pass Rendering pass (0=opaque, 1=transparent)
-   * @returns {object|null} The shader program or null if not in sprite pass
+   * @param pass Rendering pass (0=opaque, 1=transparent).
    */
-  setupRenderState(pass = 0) {
+  override setupRenderState(pass = 0): void {
     if (pass === 1) {
-      // Sprites are typically rendered in transparent pass
-      const program = GL.UseProgram('sprite', true);
-      return program;
+      GL.UseProgram('sprite', true);
     }
-    return null;
   }
 
   /**
-   * @param {import('../../common/model/SpriteModel.ts').SpriteModel} _model The sprite model
-   * @param {import('../ClientEntities.ts').ClientEdict} _entity The entity being rendered
-   * @returns {boolean} Sprites are never drawn in the opaque pass
+   * @param _model The sprite model.
+   * @param _entity The entity being rendered.
+   * @returns Sprites are never drawn in the opaque pass.
    */
-  // eslint-disable-next-line no-unused-vars
-  rendersOpaquePass(_model, _entity) {
+  override rendersOpaquePass(_model: BaseModel, _entity: ClientEdict): boolean {
     return false;
   }
 
   /**
-   * @param {import('../../common/model/SpriteModel.ts').SpriteModel} _model The sprite model
-   * @param {import('../ClientEntities.ts').ClientEdict} _entity The entity being rendered
-   * @returns {boolean} Sprites use their dedicated sprite pass rather than the sorted transparent pass
+   * @param _model The sprite model.
+   * @param _entity The entity being rendered.
+   * @returns Sprites use their dedicated sprite pass rather than the sorted transparent pass.
    */
-  // eslint-disable-next-line no-unused-vars
-  rendersTransparentPass(_model, _entity) {
+  override rendersTransparentPass(_model: BaseModel, _entity: ClientEdict): boolean {
     return false;
   }
 
   /**
    * Render a single sprite model entity.
    * Generates billboard geometry dynamically based on camera orientation.
-   * @param {import('../../common/model/SpriteModel.ts').SpriteModel} model The sprite model to render
-   * @param {import('../ClientEntities.ts').ClientEdict} entity The entity being rendered
-   * @param {number} pass Rendering pass (0=opaque, 1=transparent)
+   * @param model The sprite model to render.
+   * @param entity The entity being rendered.
+   * @param pass Rendering pass (0=opaque, 1=transparent).
    */
-  render(model, entity, pass = 0) {
+  override render(model: BaseModel, entity: ClientEdict, pass = 0): void {
     if (pass === 0) {
       return; // Sprites only render in transparent pass
     }
 
+    const spriteModel = model as SpriteModel;
     const e = entity;
-    const program = GL.UseProgram('sprite', true);
+    const program = GL.UseProgram('sprite', true)!;
 
     // Prepare uniforms
-    gl.uniform1f(program.uAlpha, entity.alpha);
-    gl.uniform1f(program.uBloomEmissiveScale, getEntityBloomEmissiveScale(entity.effects));
+    gl.uniform1f(program.uAlpha!, entity.alpha);
+    gl.uniform1f(program.uBloomEmissiveScale!, getEntityBloomEmissiveScale(entity.effects));
 
     // Select frame
     let num = e.frame;
-    if ((num >= model.numframes) || (num < 0)) {
-      if (registry.Con) {
-        registry.Con.DPrint('SpriteModelRenderer: no such frame ' + num + '\n');
-      }
+    if ((num >= spriteModel.numframes) || (num < 0)) {
       num = 0;
     }
 
-    let frame = model.frames[num];
+    let frame: SpriteRenderFrame = spriteModel.frames[num] as SpriteRenderFrame;
 
     // Handle frame groups (animated sprites)
-    if (frame.group === true) {
+    if ((frame as { group?: boolean }).group === true) {
+      const groupedFrame = spriteModel.frames[num] as { group: true; frames: SpriteFrameImage[] };
       const time = CL.state.time + e.syncbase;
-      num = frame.frames.length - 1;
-      const fullinterval = frame.frames[num].interval;
+      const groupLen = groupedFrame.frames.length - 1;
+      const fullinterval = groupedFrame.frames[groupLen].interval!;
       const targettime = time - Math.floor(time / fullinterval) * fullinterval;
 
       let i = 0;
-      for (i = 0; i < num; i++) {
-        if (frame.frames[i].interval > targettime) {
+      for (i = 0; i < groupLen; i++) {
+        if (groupedFrame.frames[i].interval! > targettime) {
           break;
         }
       }
-      frame = frame.frames[i];
+      frame = groupedFrame.frames[i];
     }
 
-    // TODO: set uInterpolation, frames
-
     // Bind texture
-    GL.Bind(program.tTexture, frame.texturenum, true);
+    GL.Bind(program.tTexture!, frame.texturenum, true);
 
     // Calculate billboard orientation
-    let r, u;
-    if (model.oriented === true) {
+    let r: { [n: number]: number };
+    let u: { [n: number]: number };
+    if (spriteModel.oriented === true) {
       // Sprite has fixed orientation
-      const {right, up} = e.angles.angleVectors();
-      [r, u] = [right, up];
+      const { right, up } = e.angles.angleVectors();
+      r = right;
+      u = up;
     } else {
       // Sprite faces camera
       r = R.vright;
@@ -137,8 +136,6 @@ export class SpriteModelRenderer extends ModelRenderer {
     const x2 = x1 + frame.width;
     const y2 = y1 + frame.height;
 
-    // TODO: use precomputed Vertex Array
-
     // Write 6 vertices (2 triangles) to stream buffer
     GL.StreamGetSpace(6);
 
@@ -184,10 +181,9 @@ export class SpriteModelRenderer extends ModelRenderer {
   /**
    * Cleanup rendering state after sprite models.
    * Flushes the stream buffer to draw all sprites.
-   * @param {number} [_pass] Rendering pass (0=opaque, 1=transparent)
+   * @param _pass Rendering pass (0=opaque, 1=transparent).
    */
-  // eslint-disable-next-line no-unused-vars
-  cleanupRenderState(_pass = 0) {
+  override cleanupRenderState(_pass = 0): void {
     // Flush accumulated sprite geometry
     GL.StreamFlush();
   }
@@ -195,21 +191,20 @@ export class SpriteModelRenderer extends ModelRenderer {
   /**
    * Prepare sprite model for rendering.
    * Sprites use dynamic geometry, so no GPU resources to prepare.
-   * @param {import('../../common/model/SpriteModel.ts').SpriteModel} _model The sprite model to prepare
-   * @param {boolean} isWorldModel Whether this model is the world model
+   * @param _model The sprite model to prepare.
+   * @param isWorldModel Whether this model is the world model.
    */
-  // eslint-disable-next-line no-unused-vars
-  prepareModel(_model, isWorldModel = false) {
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
+  override prepareModel(_model: BaseModel, isWorldModel = false): void {
     // Sprites don't need GPU preparation - geometry is generated per-frame
   }
 
   /**
    * Free GPU resources for this sprite model.
    * Sprites don't allocate GPU resources.
-   * @param {import('../../common/model/SpriteModel.ts').SpriteModel} _model The sprite model to cleanup
+   * @param _model The sprite model to cleanup.
    */
-  // eslint-disable-next-line no-unused-vars
-  cleanupModel(_model) {
+  override cleanupModel(_model: BaseModel): void {
     // Sprites don't have GPU resources to clean up
   }
 }
diff --git a/source/engine/client/renderer/WarpEffect.mjs b/source/engine/client/renderer/WarpEffect.ts
similarity index 53%
rename from source/engine/client/renderer/WarpEffect.mjs
rename to source/engine/client/renderer/WarpEffect.ts
index d2a6a151..4661f4e3 100644
--- a/source/engine/client/renderer/WarpEffect.mjs
+++ b/source/engine/client/renderer/WarpEffect.ts
@@ -1,22 +1,21 @@
-import GL from '../GL.mjs';
-import PostProcessEffect from './PostProcessEffect.mjs';
-import { eventBus, registry } from '../../registry.mjs';
+import GL from '../GL.ts';
+import PostProcessEffect from './PostProcessEffect.ts';
+import { eventBus, getClientRegistry } from '../../registry.mjs';
 
-let { Host } = registry;
+let { Host } = getClientRegistry();
 
 eventBus.subscribe('registry.frozen', () => {
-  ({ Host } = registry);
+  ({ Host } = getClientRegistry());
 });
 
-/** @type {WebGL2RenderingContext} */
-let gl = /** @type {WebGL2RenderingContext} */ (null);
+let gl: WebGL2RenderingContext = null!;
 
 eventBus.subscribe('gl.ready', () => {
   gl = GL.gl;
 });
 
 eventBus.subscribe('gl.shutdown', () => {
-  gl = null;
+  gl = null!;
 });
 
 /**
@@ -37,24 +36,22 @@ export default class WarpEffect extends PostProcessEffect {
   /**
    * Apply the warp distortion effect by drawing a fullscreen quad with
    * the 'warp' shader.
-   * @param {WebGLTexture} inputTexture - Scene color texture to distort
-   * @param {number} x - Viewport x position
-   * @param {number} y - Viewport y position
-   * @param {number} width - Viewport width
-   * @param {number} height - Viewport height
+   * @param inputTexture Scene color texture to distort.
+   * @param x Viewport x position.
+   * @param y Viewport y position.
+   * @param width Viewport width.
+   * @param height Viewport height.
    */
-  apply(inputTexture, x, y, width, height) {
+  override apply(inputTexture: WebGLTexture, x: number, y: number, width: number, height: number): void {
     const program = GL.UseProgram('warp');
-    GL.Bind(program.tTexture, inputTexture);
-    gl.uniform1f(program.uTime, Host.realtime % (Math.PI * 2.0));
+    GL.Bind(program!.tTexture!, inputTexture);
+    gl.uniform1f(program!.uTime!, Host.realtime % (Math.PI * 2.0));
     GL.StreamDrawTexturedQuad(x, y, width, height, 0.0, 1.0, 1.0, 0.0);
     GL.StreamFlush();
   }
 
-  /**
-   * Mark the effect inactive on shutdown.
-   */
-  shutdown() {
+  /** Mark the effect inactive on shutdown. */
+  override shutdown(): void {
     this.active = false;
   }
-};
+}
diff --git a/source/engine/common/model/AliasModel.ts b/source/engine/common/model/AliasModel.ts
index bb550b24..700df2fc 100644
--- a/source/engine/common/model/AliasModel.ts
+++ b/source/engine/common/model/AliasModel.ts
@@ -19,7 +19,7 @@ interface AliasPoseVertex {
   readonly lightnormalindex: number;
 }
 
-interface AliasSingleFrame {
+export interface AliasSingleFrame {
   readonly group: false;
   readonly bboxmin: Vector;
   readonly bboxmax: Vector;
@@ -28,7 +28,7 @@ interface AliasSingleFrame {
   readonly cmdofs?: number;
 }
 
-interface AliasGroupedFrameEntry {
+export interface AliasGroupedFrameEntry {
   readonly interval: number;
   readonly bboxmin: Vector;
   readonly bboxmax: Vector;
@@ -44,7 +44,7 @@ interface AliasGroupedFrame {
   readonly frames: AliasGroupedFrameEntry[];
 }
 
-interface AliasSingleSkin {
+export interface AliasSingleSkin {
   readonly group: false;
   readonly texturenum: GLTexture | null;
   readonly luminanceTexture: GLTexture | null;
@@ -52,7 +52,7 @@ interface AliasSingleSkin {
   readonly playertexture?: GLTexture | null;
 }
 
-interface AliasGroupedSkinEntry {
+export interface AliasGroupedSkinEntry {
   readonly interval: number;
   readonly texturenum?: GLTexture | null;
   readonly luminanceTexture?: GLTexture | null;
diff --git a/source/engine/common/model/BSP.ts b/source/engine/common/model/BSP.ts
index 43c751cc..61a10d69 100644
--- a/source/engine/common/model/BSP.ts
+++ b/source/engine/common/model/BSP.ts
@@ -1,9 +1,9 @@
-import type { BaseMaterial } from '../../client/renderer/Materials.mjs';
+import type { BaseMaterial } from '../../client/renderer/Materials.ts';
 import type Vector from '../../../shared/Vector.ts';
 
 import { content } from '../../../shared/Defs.ts';
 import { BaseModel, type Face, type Plane } from './BaseModel.ts';
-import { SkyRenderer } from '../../client/renderer/Sky.mjs';
+import { SkyRenderer } from '../../client/renderer/Sky.ts';
 import { AreaPortals, type PortalDefinition } from './AreaPortals.ts';
 
 export interface Clipnode {
diff --git a/source/engine/common/model/BaseModel.ts b/source/engine/common/model/BaseModel.ts
index 701b76e2..399b366f 100644
--- a/source/engine/common/model/BaseModel.ts
+++ b/source/engine/common/model/BaseModel.ts
@@ -96,6 +96,17 @@ export class Face {
 
   /** Last frame index that updated the dynamic light bits. */
   dlightframe = -1;
+
+  // ─── Renderer-side state (populated by BrushModelRenderer) ───────────────
+
+  /** Rendered vertex data packed by the display list builder. Each entry is a vertex attribute array. */
+  verts: number[][] | null = null;
+
+  /** Lightmap atlas block S coordinate (set by the lightmap allocator). */
+  light_s = 0;
+
+  /** Lightmap atlas block T coordinate (set by the lightmap allocator). */
+  light_t = 0;
 }
 
 /**
diff --git a/source/engine/common/model/MeshModel.ts b/source/engine/common/model/MeshModel.ts
index 6fb58cb3..ae0ab0be 100644
--- a/source/engine/common/model/MeshModel.ts
+++ b/source/engine/common/model/MeshModel.ts
@@ -1,4 +1,4 @@
-import type { BaseMaterial } from '../../client/renderer/Materials.mjs';
+import type { BaseMaterial } from '../../client/renderer/Materials.ts';
 
 import Vector from '../../../shared/Vector.ts';
 import { BaseModel } from './BaseModel.ts';
diff --git a/source/engine/common/model/SpriteModel.ts b/source/engine/common/model/SpriteModel.ts
index d62c2b56..b691aff6 100644
--- a/source/engine/common/model/SpriteModel.ts
+++ b/source/engine/common/model/SpriteModel.ts
@@ -8,7 +8,8 @@ interface SpriteFrameImage {
   readonly width: number;
   readonly height: number;
   readonly glt: GLTexture;
-  readonly texturenum: number;
+  /** Raw WebGL texture handle, stored from {@link GLTexture.texnum}. */
+  readonly texturenum: WebGLTexture | null;
 }
 
 interface SpriteSingleFrame {
@@ -17,7 +18,28 @@ interface SpriteSingleFrame {
   readonly width: number;
   readonly height: number;
   readonly glt: GLTexture;
-  readonly texturenum: number;
+  /** Raw WebGL texture handle, stored from {@link GLTexture.texnum}. */
+  readonly texturenum: WebGLTexture | null;
+}
+
+export interface SpriteFrameImage {
+  readonly interval?: number;
+  readonly origin: [number, number];
+  readonly width: number;
+  readonly height: number;
+  readonly glt: GLTexture;
+  /** Raw WebGL texture handle, stored from {@link GLTexture.texnum}. */
+  readonly texturenum: WebGLTexture | null;
+}
+
+export interface SpriteSingleFrame {
+  readonly group: false;
+  readonly origin: [number, number];
+  readonly width: number;
+  readonly height: number;
+  readonly glt: GLTexture;
+  /** Raw WebGL texture handle, stored from {@link GLTexture.texnum}. */
+  readonly texturenum: WebGLTexture | null;
 }
 
 interface SpriteFrameGroup {
diff --git a/source/engine/common/model/loaders/BSP29Loader.ts b/source/engine/common/model/loaders/BSP29Loader.ts
index bca4cd28..6888beb9 100644
--- a/source/engine/common/model/loaders/BSP29Loader.ts
+++ b/source/engine/common/model/loaders/BSP29Loader.ts
@@ -9,8 +9,8 @@ import { eventBus, getCommonRegistry, registry } from '../../../registry.mjs';
 import { ModelLoader } from '../ModelLoader.ts';
 import { Brush, BrushModel, BrushSide, Node, type BSPXLumps, type Clipnode, type Hull } from '../BSP.ts';
 import { Face, Plane } from '../BaseModel.ts';
-import { materialFlags, noTextureMaterial, PBRMaterial, QuakeMaterial } from '../../../client/renderer/Materials.mjs';
-import { Quake1Sky, SimpleSkyBox } from '../../../client/renderer/Sky.mjs';
+import { MaterialFlags, noTextureMaterial, PBRMaterial, QuakeMaterial } from '../../../client/renderer/Materials.ts';
+import { Quake1Sky, SimpleSkyBox } from '../../../client/renderer/Sky.ts';
 
 // Get registry references (will be set by eventBus)
 let { COM, Con } = getCommonRegistry();
@@ -223,7 +223,7 @@ export class BSP29Loader extends ModelLoader {
             return skyrenderer;
           };
 
-          tx.flags |= materialFlags.MF_SKY;
+          tx.flags |= MaterialFlags.MF_SKY;
         } else {
           // Try loading WAD3 texture
           const len = 40 + tx.width * tx.height * (1 + 0.25 + 0.0625 + 0.015625) + 2 + 768;
@@ -256,16 +256,16 @@ export class BSP29Loader extends ModelLoader {
         }
 
         if (tx.name[0] === '*' || tx.name[0] === '!') {
-          tx.flags |= materialFlags.MF_TURBULENT;
+          tx.flags |= MaterialFlags.MF_TURBULENT;
         }
 
         // Mark textures with '{' prefix as transparent (for alpha blending)
         if (tx.name[0] === '{') {
-          tx.flags |= materialFlags.MF_TRANSPARENT;
+          tx.flags |= MaterialFlags.MF_TRANSPARENT;
         }
 
         if (tx.name.toLowerCase().startsWith('*lava')) {
-          tx.flags |= materialFlags.MF_FULLBRIGHT;
+          tx.flags |= MaterialFlags.MF_FULLBRIGHT;
         }
       }
 
@@ -1160,7 +1160,7 @@ export class BSP29Loader extends ModelLoader {
         const face = submodel.faces[submodel.firstface + j];
         const material = loadmodel.textures[face.texture];
 
-        if (!(material.flags & materialFlags.MF_TURBULENT)) {
+        if (!(material.flags & MaterialFlags.MF_TURBULENT)) {
           allTurbulent = false;
           break;
         }
@@ -1638,9 +1638,9 @@ export class BSP29Loader extends ModelLoader {
       face.texturemins = [Math.floor(mins[0] / lmscale) * lmscale, Math.floor(mins[1] / lmscale) * lmscale];
       face.extents = [Math.ceil(maxs[0] / lmscale) * lmscale - face.texturemins[0], Math.ceil(maxs[1] / lmscale) * lmscale - face.texturemins[1]];
 
-      if (loadmodel.textures[tex.texture].flags & materialFlags.MF_TURBULENT) {
+      if (loadmodel.textures[tex.texture].flags & MaterialFlags.MF_TURBULENT) {
         face.turbulent = true;
-      } else if (loadmodel.textures[tex.texture].flags & materialFlags.MF_SKY) {
+      } else if (loadmodel.textures[tex.texture].flags & MaterialFlags.MF_SKY) {
         face.sky = true;
       }
 
diff --git a/source/engine/common/model/loaders/BSP2Loader.ts b/source/engine/common/model/loaders/BSP2Loader.ts
index ff2ad4d9..8917fef6 100644
--- a/source/engine/common/model/loaders/BSP2Loader.ts
+++ b/source/engine/common/model/loaders/BSP2Loader.ts
@@ -2,7 +2,7 @@ import Vector from '../../../../shared/Vector.ts';
 import { CorruptedResourceError } from '../../Errors.ts';
 import { Face } from '../BaseModel.ts';
 import { BrushModel, Node } from '../BSP.ts';
-import { materialFlags } from '../../../client/renderer/Materials.mjs';
+import { MaterialFlags } from '../../../client/renderer/Materials.ts';
 import { BSP29Loader } from './BSP29Loader.ts';
 
 /**
@@ -99,9 +99,9 @@ export class BSP2Loader extends BSP29Loader {
       face.texturemins = [Math.floor(mins[0] / lmscale) * lmscale, Math.floor(mins[1] / lmscale) * lmscale];
       face.extents = [Math.ceil(maxs[0] / lmscale) * lmscale - face.texturemins[0], Math.ceil(maxs[1] / lmscale) * lmscale - face.texturemins[1]];
 
-      if ((loadmodel.textures[tex.texture].flags & materialFlags.MF_TURBULENT) !== 0) {
+      if ((loadmodel.textures[tex.texture].flags & MaterialFlags.MF_TURBULENT) !== 0) {
         face.turbulent = true;
-      } else if ((loadmodel.textures[tex.texture].flags & materialFlags.MF_SKY) !== 0) {
+      } else if ((loadmodel.textures[tex.texture].flags & MaterialFlags.MF_SKY) !== 0) {
         face.sky = true;
       }
 
diff --git a/source/engine/common/model/loaders/WavefrontOBJLoader.ts b/source/engine/common/model/loaders/WavefrontOBJLoader.ts
index 06e25b11..c66b91a6 100644
--- a/source/engine/common/model/loaders/WavefrontOBJLoader.ts
+++ b/source/engine/common/model/loaders/WavefrontOBJLoader.ts
@@ -2,7 +2,7 @@ import { registry } from '../../../registry.mjs';
 
 import Vector from '../../../../shared/Vector.ts';
 import { GLTexture } from '../../../client/GL.ts';
-import { PBRMaterial } from '../../../client/renderer/Materials.mjs';
+import { PBRMaterial } from '../../../client/renderer/Materials.ts';
 import { MeshModel } from '../MeshModel.ts';
 import { ModelLoader } from '../ModelLoader.ts';
 
diff --git a/test/renderer/bloom-effect.test.mjs b/test/renderer/bloom-effect.test.mjs
index 9665f83e..4da5e856 100644
--- a/test/renderer/bloom-effect.test.mjs
+++ b/test/renderer/bloom-effect.test.mjs
@@ -3,7 +3,7 @@ import { readFileSync } from 'node:fs';
 import { describe, test } from 'node:test';
 
 import { effect } from '../../source/shared/Defs.ts';
-import { getBloomBufferSize, getBloomDebugPreviewItems, getEntityBloomEmissiveScale, resolveBloomDebugMode, resolveBloomDownsample } from '../../source/engine/client/renderer/BloomEffect.mjs';
+import { getBloomBufferSize, getBloomDebugPreviewItems, getEntityBloomEmissiveScale, resolveBloomDebugMode, resolveBloomDownsample } from '../../source/engine/client/renderer/BloomEffect.ts';
 
 const bloomBlurShaderSource = readFileSync(new URL('../../source/engine/client/shaders/bloom-blur.frag', import.meta.url), 'utf8');
 
diff --git a/test/renderer/brush-model-renderer.test.mjs b/test/renderer/brush-model-renderer.test.mjs
index e15fa4ba..4ab5cb52 100644
--- a/test/renderer/brush-model-renderer.test.mjs
+++ b/test/renderer/brush-model-renderer.test.mjs
@@ -3,8 +3,8 @@ import { describe, test } from 'node:test';
 
 import Vector from '../../source/shared/Vector.ts';
 import { eventBus, registry } from '../../source/engine/registry.mjs';
-import { BrushModelRenderer, resolveBrushBloomContributionStrength } from '../../source/engine/client/renderer/BrushModelRenderer.mjs';
-import { SimpleSkyBox } from '../../source/engine/client/renderer/Sky.mjs';
+import { BrushModelRenderer, resolveBrushBloomContributionStrength } from '../../source/engine/client/renderer/BrushModelRenderer.ts';
+import { SimpleSkyBox } from '../../source/engine/client/renderer/Sky.ts';
 
 describe('resolveBrushBloomContributionStrength', () => {
   test('clamps invalid contribution strengths to zero', () => {
@@ -21,10 +21,10 @@ describe('resolveBrushBloomContributionStrength', () => {
 
 describe('BrushModelRenderer.resolveEntityLightingState', () => {
   test('treats inline submodels as sharing the world deluxemap atlas', () => {
-    const worldModel = { deluxemap: new Uint8Array(3) };
+    const worldModel = /** @type {import('../../source/engine/common/model/BSP.ts').BrushModel} */ ({ deluxemap: new Uint8Array(3) });
     const lightingState = BrushModelRenderer.resolveEntityLightingState(
-      { deluxemap: null, submodel: true },
-      {},
+      /** @type {import('../../source/engine/common/model/BSP.ts').BrushModel} */ ({ deluxemap: null, submodel: true }),
+      /** @type {import('../../source/engine/client/ClientEntities.ts').ClientEdict} */ ({}),
       () => [new Vector(), new Vector(), new Vector(), new Vector(), new Vector()],
       worldModel,
     );
@@ -33,8 +33,8 @@ describe('BrushModelRenderer.resolveEntityLightingState', () => {
   });
 
   test('uses sampled static and dynamic lighting for inline brush entities', () => {
-    const model = { deluxemap: new Uint8Array(3), lightdata: null, lightdata_rgb: null };
-    const entity = { id: 7 };
+    const model = /** @type {import('../../source/engine/common/model/BSP.ts').BrushModel} */ ({ deluxemap: new Uint8Array(3), lightdata: null, lightdata_rgb: null });
+    const entity = /** @type {import('../../source/engine/client/ClientEntities.ts').ClientEdict} */ (/** @type {unknown} */ ({ id: 7 }));
     const ambientlight = new Vector(0.25, 0.5, 0.75);
     const shadelight = new Vector(0.75, 0.5, 0.25);
     const lightPosition = new Vector(100, 200, 300);
@@ -66,8 +66,8 @@ describe('BrushModelRenderer.resolveEntityLightingState', () => {
     const dynamicLightPosition = new Vector(-10, -20, 40);
 
     const lightingState = BrushModelRenderer.resolveEntityLightingState(
-      { deluxemap: null, lightdata: new Uint8Array(3), lightdata_rgb: null, submodel: true },
-      {},
+      /** @type {import('../../source/engine/common/model/BSP.ts').BrushModel} */ ({ deluxemap: null, lightdata: new Uint8Array(3), lightdata_rgb: null, submodel: true }),
+      /** @type {import('../../source/engine/client/ClientEntities.ts').ClientEdict} */ ({}),
       () => [ambientlight, shadelight, lightPosition, dynamicShadeLight, dynamicLightPosition],
     );
 
@@ -86,8 +86,8 @@ describe('BrushModelRenderer.resolveEntityLightingState', () => {
     const dynamicLightPosition = new Vector(-10, -20, 40);
 
     const lightingState = BrushModelRenderer.resolveEntityLightingState(
-      { deluxemap: null, lightdata: new Uint8Array(3), lightdata_rgb: null, submodel: false },
-      {},
+      /** @type {import('../../source/engine/common/model/BSP.ts').BrushModel} */ ({ deluxemap: null, lightdata: new Uint8Array(3), lightdata_rgb: null, submodel: false }),
+      /** @type {import('../../source/engine/client/ClientEntities.ts').ClientEdict} */ ({}),
       () => [ambientlight, shadelight, lightPosition, dynamicShadeLight, dynamicLightPosition],
     );
 
@@ -100,8 +100,8 @@ describe('BrushModelRenderer.resolveEntityLightingState', () => {
 
   test('falls back to non-deluxemap lighting when the model has no deluxe data', () => {
     const lightingState = BrushModelRenderer.resolveEntityLightingState(
-      { deluxemap: null, lightdata: null, lightdata_rgb: null },
-      {},
+      /** @type {import('../../source/engine/common/model/BSP.ts').BrushModel} */ ({ deluxemap: null, lightdata: null, lightdata_rgb: null }),
+      /** @type {import('../../source/engine/client/ClientEntities.ts').ClientEdict} */ ({}),
       () => [new Vector(), new Vector(), new Vector(), new Vector(), new Vector()],
     );
 
@@ -111,7 +111,7 @@ describe('BrushModelRenderer.resolveEntityLightingState', () => {
 
 describe('BrushModelRenderer.sampleTurbulentFallbackLight', () => {
   test('lifts dim no-lightmap turbulent samples toward nearby visible light', () => {
-    const face = {
+    const face = /** @type {import('../../source/engine/common/model/BaseModel.ts').Face} */ ({
       normal: new Vector(0, 0, 1),
       texinfo: 0,
       verts: [
@@ -119,10 +119,10 @@ describe('BrushModelRenderer.sampleTurbulentFallbackLight', () => {
         [16, 0, 0],
         [16, 16, 0],
       ],
-    };
-    const model = {
+    });
+    const model = /** @type {import('../../source/engine/common/model/BSP.ts').BrushModel} */ (/** @type {unknown} */ ({
       texinfo: [{ vecs: [[1, 0, 0, 0], [0, 1, 0, 0]] }],
-    };
+    }));
 
     const fallbackLight = BrushModelRenderer.sampleTurbulentFallbackLight(
       model,
@@ -161,12 +161,12 @@ describe('BrushModelRenderer.sampleTurbulentFallbackLight', () => {
 describe('BrushModelRenderer.getWorldTurbulentChains', () => {
   test('sorts world turbulents by tight batch bounds instead of oversized leaf bounds', () => {
     const previousR = registry.R;
-    registry.R = {
+    registry.R = /** @type {typeof import('../../source/engine/client/R.mjs').default} */ ({
       visframecount: 7,
       CullBox() {
         return false;
       },
-    };
+    });
     eventBus.publish('registry.frozen');
 
     try {
@@ -178,7 +178,7 @@ describe('BrushModelRenderer.getWorldTurbulentChains', () => {
         mins: new Vector(96, -8, -8),
         maxs: new Vector(128, 8, 8),
       };
-      const model = {
+      const model = /** @type {import('../../source/engine/common/model/BSP.ts').BrushModel} */ ({
         leafs: [{
           visframe: 7,
           waterchain: 0,
@@ -187,7 +187,7 @@ describe('BrushModelRenderer.getWorldTurbulentChains', () => {
           mins: new Vector(-1024, -1024, -1024),
           maxs: new Vector(1024, 1024, 1024),
         }],
-      };
+      });
 
       const items = renderer.getWorldTurbulentChains(model, new Vector(0, 0, 0));
 
@@ -203,10 +203,10 @@ describe('BrushModelRenderer.getWorldTurbulentChains', () => {
 
 describe('SimpleSkyBox.shutdown', () => {
   test('does not free shared sky face textures', () => {
-    const skybox = new SimpleSkyBox({ cmds: null, leafs: [], skychain: 0 });
+    const skybox = new SimpleSkyBox(/** @type {import('../../source/engine/common/model/BSP.ts').BrushModel} */ ({ cmds: null, leafs: [], skychain: 0 }));
     const frees = [];
     const wraps = [];
-    const makeTexture = (name) => ({
+    const makeTexture = (name) => /** @type {import('../../source/engine/client/GL.ts').GLTexture} */ ({
       wrapClamped() {
         wraps.push(name);
       },
diff --git a/test/renderer/materials.test.mjs b/test/renderer/materials.test.mjs
index b813a56b..ef28fcf6 100644
--- a/test/renderer/materials.test.mjs
+++ b/test/renderer/materials.test.mjs
@@ -1,7 +1,7 @@
 import assert from 'node:assert/strict';
 import { describe, test } from 'node:test';
 
-import { materialFlags, resolveMaterialLuminanceTexture } from '../../source/engine/client/renderer/Materials.mjs';
+import { MaterialFlags, resolveMaterialLuminanceTexture } from '../../source/engine/client/renderer/Materials.ts';
 
 describe('resolveMaterialLuminanceTexture', () => {
   test('keeps the explicit luminance texture when one is present', () => {
@@ -10,7 +10,7 @@ describe('resolveMaterialLuminanceTexture', () => {
     const luminanceTexture = /** @type {import('../../source/engine/client/GL.mjs').GLTexture} */ ({});
 
     assert.equal(
-      resolveMaterialLuminanceTexture(materialFlags.MF_FULLBRIGHT, luminanceTexture, diffuseTexture, fallbackTexture),
+      resolveMaterialLuminanceTexture(MaterialFlags.MF_FULLBRIGHT, luminanceTexture, diffuseTexture, fallbackTexture),
       luminanceTexture,
     );
   });
@@ -20,7 +20,7 @@ describe('resolveMaterialLuminanceTexture', () => {
     const diffuseTexture = /** @type {import('../../source/engine/client/GL.mjs').GLTexture} */ ({});
 
     assert.equal(
-      resolveMaterialLuminanceTexture(materialFlags.MF_FULLBRIGHT, fallbackTexture, diffuseTexture, fallbackTexture),
+      resolveMaterialLuminanceTexture(MaterialFlags.MF_FULLBRIGHT, fallbackTexture, diffuseTexture, fallbackTexture),
       diffuseTexture,
     );
   });
@@ -30,7 +30,7 @@ describe('resolveMaterialLuminanceTexture', () => {
     const diffuseTexture = /** @type {import('../../source/engine/client/GL.mjs').GLTexture} */ ({});
 
     assert.equal(
-      resolveMaterialLuminanceTexture(materialFlags.MF_NONE, null, diffuseTexture, fallbackTexture),
+      resolveMaterialLuminanceTexture(MaterialFlags.MF_NONE, null, diffuseTexture, fallbackTexture),
       fallbackTexture,
     );
   });
diff --git a/test/renderer/post-process.test.mjs b/test/renderer/post-process.test.mjs
index fc613f45..56a30eb2 100644
--- a/test/renderer/post-process.test.mjs
+++ b/test/renderer/post-process.test.mjs
@@ -2,7 +2,7 @@ import assert from 'node:assert/strict';
 import { describe, test } from 'node:test';
 
 import GL from '../../source/engine/client/GL.mjs';
-import PostProcess from '../../source/engine/client/renderer/PostProcess.mjs';
+import PostProcess from '../../source/engine/client/renderer/PostProcess.ts';
 import { eventBus } from '../../source/engine/registry.mjs';
 
 describe('PostProcess._resolveMSAAColorAttachment', () => {
diff --git a/test/renderer/r-sorting.test.mjs b/test/renderer/r-sorting.test.mjs
index a66ca8bd..9333b337 100644
--- a/test/renderer/r-sorting.test.mjs
+++ b/test/renderer/r-sorting.test.mjs
@@ -68,16 +68,16 @@ describe('R.GetEntityLightSamplePoint', () => {
     const previousCL = registry.CL;
     const previousMod = registry.Mod;
 
-    registry.CL = { state: { viewent: null } };
-    registry.Mod = { type: { alias: 2, brush: 1 } };
+    registry.CL = /** @type {typeof import('../../source/engine/client/CL.ts').default} */ ({ state: { viewent: null } });
+    registry.Mod = /** @type {typeof import('../../source/engine/common/Mod.ts').default} */ (/** @type {unknown} */ ({ type: { alias: 2, brush: 1 } }));
     eventBus.publish('registry.frozen');
 
     try {
-      const entity = {
+      const entity = /** @type {import('../../source/engine/client/ClientEntities.ts').ClientEdict} */ ({
         lerp: { origin: new Vector(-4, 8, 12) },
         model: { type: 1 },
         mins: new Vector(),
-      };
+      });
 
       const samplePoint = R.GetEntityLightSamplePoint(entity);
 
diff --git a/test/renderer/sky.test.mjs b/test/renderer/sky.test.mjs
index f3073fb8..6831761e 100644
--- a/test/renderer/sky.test.mjs
+++ b/test/renderer/sky.test.mjs
@@ -1,7 +1,7 @@
 import assert from 'node:assert/strict';
 import { describe, test } from 'node:test';
 
-import { resolveSkyBloomEmissiveScale } from '../../source/engine/client/renderer/Sky.mjs';
+import { resolveSkyBloomEmissiveScale } from '../../source/engine/client/renderer/Sky.ts';
 
 describe('resolveSkyBloomEmissiveScale', () => {
   test('clamps invalid values to zero', () => {

From 23da906c2a743164e87c76822a789c5715952153 Mon Sep 17 00:00:00 2001
From: Christian R <github@chrisnew.de>
Date: Sat, 4 Apr 2026 15:14:36 +0300
Subject: [PATCH 46/67] TS: client/ part 6

---
 docs/code-style-guide.md                   |   2 +-
 docs/console.md                            |   8 +-
 source/engine/client/{Draw.mjs => Draw.ts} | 293 ++++-----
 source/engine/client/GL.mjs                |   1 -
 source/engine/client/Key.mjs               | 419 -------------
 source/engine/client/Key.ts                | 457 ++++++++++++++
 source/engine/client/R.mjs                 |   4 +-
 source/engine/client/SCR.mjs               | 432 -------------
 source/engine/client/SCR.ts                | 464 ++++++++++++++
 source/engine/client/Sbar.mjs              | 657 -------------------
 source/engine/client/Sbar.ts               | 693 +++++++++++++++++++++
 source/engine/common/GameAPIs.ts           |   2 +-
 source/engine/main-browser.ts              |   8 +-
 source/engine/registry.mjs                 |   8 +-
 test/client/key.test.mjs                   |  30 +
 test/renderer/materials.test.mjs           |  22 +-
 test/renderer/post-process.test.mjs        |   6 +-
 17 files changed, 1799 insertions(+), 1707 deletions(-)
 rename source/engine/client/{Draw.mjs => Draw.ts} (62%)
 delete mode 100644 source/engine/client/GL.mjs
 delete mode 100644 source/engine/client/Key.mjs
 create mode 100644 source/engine/client/Key.ts
 delete mode 100644 source/engine/client/SCR.mjs
 create mode 100644 source/engine/client/SCR.ts
 delete mode 100644 source/engine/client/Sbar.mjs
 create mode 100644 source/engine/client/Sbar.ts
 create mode 100644 test/client/key.test.mjs

diff --git a/docs/code-style-guide.md b/docs/code-style-guide.md
index d43b5104..a03e0945 100644
--- a/docs/code-style-guide.md
+++ b/docs/code-style-guide.md
@@ -118,7 +118,7 @@ Mod.type.brush;            // CORRECT!
 
 ```javascript
 // ✅ GOOD - GL is not in registry, import directly
-import GL from './GL.mjs';
+import GL from './GL.ts';
 
 let gl = null;
 eventBus.subscribe('gl.ready', () => {
diff --git a/docs/console.md b/docs/console.md
index 73b88a9f..5f0d93c5 100644
--- a/docs/console.md
+++ b/docs/console.md
@@ -2,10 +2,10 @@
 
 Everything related to this is in:
 
-* `Console.mjs`
-* `Cmd.mjs`
-* `Cvar.mjs`
-* `Key.mjs`
+* `Console.ts`
+* `Cmd.ts`
+* `Cvar.ts`
+* `Key.ts`
 
 ## Console Frontend
 
diff --git a/source/engine/client/Draw.mjs b/source/engine/client/Draw.ts
similarity index 62%
rename from source/engine/client/Draw.mjs
rename to source/engine/client/Draw.ts
index 9864b2af..65805101 100644
--- a/source/engine/client/Draw.mjs
+++ b/source/engine/client/Draw.ts
@@ -4,37 +4,32 @@ import { MissingResourceError } from '../common/Errors.ts';
 import VID from './VID.ts';
 import W, { WadFileInterface, WadLumpTexture } from '../common/W.ts';
 
-import { eventBus, registry } from '../registry.mjs';
-import GL, { GLTexture } from './GL.mjs';
+import { eventBus, getClientRegistry } from '../registry.mjs';
+import GL, { GLTexture } from './GL.ts';
 import { ClientEngineAPI } from '../common/GameAPIs.ts';
 
-let { Host } = registry;
+let { Host } = getClientRegistry();
 
 eventBus.subscribe('registry.frozen', () => {
-  Host = registry.Host;
+  ({ Host } = getClientRegistry());
 });
 
-let gl = /** @type {WebGL2RenderingContext} */ (null);
+let gl: WebGL2RenderingContext = null!;
 
 eventBus.subscribe('gl.ready', () => {
   gl = GL.gl;
 });
 
 eventBus.subscribe('gl.shutdown', () => {
-  gl = null;
+  gl = null!;
 });
 
 const HIDPI_THRESHOLD = 1.0;
 
 /**
  * Based on the old Draw.CharToConback function but in 32 bit, this function places conchars into the conback texture data.
- * @param {Uint8Array} conback conback texture data
- * @param {Uint8Array} chars chars texture data
- * @param {number} num character code ASCII
- * @param {number} dest destination offset in conback
- * @param {Vector} color color vector
  */
-function charToConback(conback, chars, num, dest, color) {
+function charToConback(conback: Uint8Array, chars: Uint8Array, num: number, dest: number, color: number[]): void {
   let source = ((num >> 4) << 10) + ((num & 15) << 3);
   for (let drawline = 0; drawline < 8; drawline++) {
     for (let x = 0; x < 8; x++) {
@@ -50,35 +45,26 @@ function charToConback(conback, chars, num, dest, color) {
 }
 
 /**
- * Draw class provides static methods and properties for rendering UI elements and graphics.
+ * Provides static methods and properties for rendering UI elements and graphics.
  */
 export default class Draw {
-  /** @type {HTMLImageElement|null} */
-  static #loadingElem = null;
-  /** @type {WadFileInterface|null} */
-  static #gfxWad = null;
-  /** @type {GLTexture|null} */
-  static #chars = null;
-  /** @type {GLTexture|null} */
-  static #charsLarge = null;
-  /** @type {Record<string, number>} */
-  static #charsLargeWidthTable = {};
-  /** @type {WadLumpTexture|null} */
-  static #loading = null;
-  /** @type {GLTexture|null} */
-  static #conback = null;
-  /** @type {number} */
+  /** Loading indicator image element. */
+  static #loadingElem: HTMLImageElement | null = null;
+  static #gfxWad: WadFileInterface | null = null;
+  static #chars: GLTexture | null = null;
+  static #charsLarge: GLTexture | null = null;
+  static #charsLargeWidthTable: Record<string, number> = {};
+  static #loading: WadLumpTexture | null = null;
+  static #conback: GLTexture | null = null;
   static #loadingCounter = 0;
-  /** @type {WebGLFramebuffer|null} */
-  static #fbo = null;
-  /** @type {GLTexture|null} */
-  static #currentTexture = null;
+  static #fbo: WebGLFramebuffer | null = null;
+  static #currentTexture: GLTexture | null = null;
 
   /**
    * Redirects all subsequent Draw calls to the specified texture.
-   * @param {GLTexture} texture The texture to render to.
+   * @param texture The texture to render to.
    */
-  static BeginTexture(texture) {
+  static BeginTexture(texture: GLTexture): void {
     if (!texture.ready) {
       texture.upload(null);
     }
@@ -114,7 +100,7 @@ export default class Draw {
   /**
    * Ends rendering to texture and restores screen output.
    */
-  static EndTexture() {
+  static EndTexture(): void {
     GL.StreamFlush();
     gl.bindFramebuffer(gl.FRAMEBUFFER, null);
 
@@ -129,14 +115,10 @@ export default class Draw {
 
   /**
    * Generates a GLTexture from a given font string to be used as a replacement for ConChars.
-   * NOTE: does not generate the special symbols, only ASCII 32-127
-   * @param {string} font Font string (e.g. 'bold 30px monospace')
-   * @param {number} size Texture size (default 512)
-   * @param {Record<string, number>} widthTable Optional width table to fill
-   * @returns {Promise<GLTexture>} A promise that resolves to the generated font texture.
-   * @protected
+   * NOTE: does not generate the special symbols, only ASCII 32-127.
+   * @returns The generated font texture.
    */
-  static async CreateFontTexture(font, size = 512, widthTable = {}) {
+  static async CreateFontTexture(font: string, size = 512, widthTable: Record<string, number> = {}): Promise<GLTexture> {
     const canvas = document.createElement('canvas');
     canvas.width = size;
     canvas.height = size;
@@ -161,7 +143,7 @@ export default class Draw {
     const gold = `rgb(${r},${g},${b})`;
     const white = '#fff';
 
-    const drawChar = (i, color) => {
+    const drawChar = (i: number, color: string) => {
       const charCode = i % 128; // splitting it in half
       if (charCode < 32) {
         return; // the font most likely does not have the Quake special symbols
@@ -190,18 +172,27 @@ export default class Draw {
       drawChar(i, i < 128 ? white : gold);
     }
 
-    // console.log('widthTable:', widthTable);
-    // window.open('', '_blank')?.document.write('<img src="' + canvas.toDataURL() + '">');
-
     const bitmap = await createImageBitmap(canvas);
     return GLTexture.Allocate('font:' + font, size, size, bitmap).lockTextureMode('GL_LINEAR');
   }
 
   /**
    * Initializes the Draw system, loads resources, and sets up event listeners.
-   * @returns {Promise<void>}
    */
-  static async Init() {
+  static async Init(): Promise<void> {
+    GL.CreateProgram('fill',
+      ['uOrtho'],
+      [['aPosition', gl.FLOAT, 2], ['aColor', gl.UNSIGNED_BYTE, 4, true]],
+      []);
+    GL.CreateProgram('pic',
+      ['uOrtho', 'uColor'],
+      [['aPosition', gl.FLOAT, 2], ['aTexCoord', gl.FLOAT, 2]],
+      ['tTexture']);
+    GL.CreateProgram('pic-translate',
+      ['uOrtho', 'uTop', 'uBottom'],
+      [['aPosition', gl.FLOAT, 2], ['aTexCoord', gl.FLOAT, 2]],
+      ['tTexture', 'tTrans']);
+
     // Load gfx.wad and essential lumps in parallel
     const [gfxWad, conback, loading, conback32, concharsLarge] = await Promise.all([
       W.LoadFile('gfx.wad'),
@@ -209,20 +200,6 @@ export default class Draw {
       W.LoadLump('gfx/loading.lmp'),
       GLTexture.FromImageFile('gfx/conback.png', true), // optional 32-bit conback
       GLTexture.FromImageFile('gfx/concharslarge.png', true), // optional large conchars
-
-      // also load all shaders we need
-      GL.CreateProgram('fill',
-        ['uOrtho'],
-        [['aPosition', gl.FLOAT, 2], ['aColor', gl.UNSIGNED_BYTE, 4, true]],
-        []),
-      GL.CreateProgram('pic',
-        ['uOrtho', 'uColor'],
-        [['aPosition', gl.FLOAT, 2], ['aTexCoord', gl.FLOAT, 2]],
-        ['tTexture']),
-      GL.CreateProgram('pic-translate',
-        ['uOrtho', 'uTop', 'uBottom'],
-        [['aPosition', gl.FLOAT, 2], ['aTexCoord', gl.FLOAT, 2]],
-        ['tTexture', 'tTrans']),
     ]);
 
     Draw.#gfxWad = gfxWad;
@@ -253,38 +230,31 @@ export default class Draw {
     if (concharsLarge !== null) {
       Draw.#charsLarge = concharsLarge.lockTextureMode('GL_LINEAR');
       Draw.#charsLargeWidthTable = { '0': 17, '1': 17, '2': 17, '3': 17, '4': 17, '5': 17, '6': 17, '7': 17, '8': 17, '9': 17, ' ': 17, '!': 17, '"': 17, '#': 17, '$': 17, '%': 17, '&': 17, "'": 17, '(': 17, ')': 17, '*': 17, '+': 17, ',': 17, '-': 17, '.': 17, '/': 17, ':': 17, ';': 17, '<': 17, '=': 17, '>': 17, '?': 17, '@': 17, 'A': 17, 'B': 17, 'C': 17, 'D': 17, 'E': 17, 'F': 17, 'G': 17, 'H': 17, 'I': 17, 'J': 17, 'K': 17, 'L': 17, 'M': 17, 'N': 17, 'O': 17, 'P': 17, 'Q': 17, 'R': 17, 'S': 17, 'T': 17, 'U': 17, 'V': 17, 'W': 17, 'X': 17, 'Y': 17, 'Z': 17, '[': 17, '\\': 17, ']': 17, '^': 17, '_': 17, '`': 17, 'a': 17, 'b': 17, 'c': 17, 'd': 17, 'e': 17, 'f': 17, 'g': 17, 'h': 17, 'i': 17, 'j': 17, 'k': 17, 'l': 17, 'm': 17, 'n': 17, 'o': 17, 'p': 17, 'q': 17, 'r': 17, 's': 17, 't': 17, 'u': 17, 'v': 17, 'w': 17, 'x': 17, 'y': 17, 'z': 17, '{': 17, '|': 17, '}': 17, '~': 17, '\x7f': 0 };
-
     } else {
       Draw.#charsLarge = Draw.#chars; // fallback to normal chars
     }
 
     const elem = document.getElementById('loading');
     if (elem instanceof HTMLImageElement) {
-      Draw.#loadingElem = /** @type {HTMLImageElement} */ (elem);
+      Draw.#loadingElem = elem;
       Draw.#loadingElem.src = Draw.#loading.toDataURL();
     }
 
     eventBus.subscribe('com.fs.being', Draw.BeginDisc);
     eventBus.subscribe('com.fs.end', Draw.EndDisc);
-    VID.mainwindow.style.backgroundImage = 'url("' + Draw.#gfxWad.getLumpMipmap('BACKTILE', 0).toDataURL() + '")';
+    VID.mainwindow.style.backgroundImage = `url("${Draw.#gfxWad.getLumpMipmap('BACKTILE', 0).toDataURL()}")`;
 
     Draw.#fbo = gl.createFramebuffer(); // TODO: cleanup
-
-    // await Draw.CreateFontTexture('bold 28px "monospace"', 512, Draw.#charsLargeWidthTable);
-
-
-    // Draw.#charsLarge = await Draw.CreateFontTexture('bold 28px "Fira Code"', 512, Draw.#charsLargeWidthTable);
-    // Draw.#charsLarge = Draw.#chars;
   }
 
   /**
    * Draws a single character at the specified position.
-   * @param {number} x The x position.
-   * @param {number} y The y position.
-   * @param {number} num The character code.
-   * @param {number} scale The scale factor.
+   * @param x The x position.
+   * @param y The y position.
+   * @param num The character code.
+   * @param scale The scale factor.
    */
-  static Char(x, y, num, scale = 1.0) {
+  static Char(x: number, y: number, num: number, scale = 1.0): void {
     GL.StreamDrawTexturedQuad(Math.floor(x), Math.floor(y), scale * 8, scale * 8,
       (num & 15) * 0.0625, (num >> 4) * 0.0625,
       ((num & 15) + 1) * 0.0625, ((num >> 4) + 1) * 0.0625);
@@ -292,38 +262,38 @@ export default class Draw {
 
   /**
    * Draws a character using the loaded font texture.
-   * @param {number} x The x position.
-   * @param {number} y The y position.
-   * @param {number} num The character code.
-   * @param {number} scale The scale factor.
+   * @param x The x position.
+   * @param y The y position.
+   * @param num The character code.
+   * @param scale The scale factor.
    */
-  static Character(x, y, num, scale = 1.0) {
+  static Character(x: number, y: number, num: number, scale = 1.0): void {
     const program = GL.UseProgram('pic', true);
     gl.uniform3f(program.uColor, 1.0, 1.0, 1.0);
     if (scale > HIDPI_THRESHOLD) {
-      Draw.#charsLarge.bind(program.tTexture, true);
+      Draw.#charsLarge!.bind(program.tTexture, true);
     } else {
-      Draw.#chars.bind(program.tTexture, true);
+      Draw.#chars!.bind(program.tTexture, true);
     }
     Draw.Char(x, y, num, scale);
   }
 
   /**
    * Draws a string at the specified position.
-   * @param {number} x The x position.
-   * @param {number} y The y position.
-   * @param {string} str The string to draw.
-   * @param {number} scale The scale factor.
-   * @param {Vector} color The color vector.
-   * @returns {number} The new x position after drawing the string.
+   * @param x The x position.
+   * @param y The y position.
+   * @param str The string to draw.
+   * @param scale The scale factor.
+   * @param color The color vector.
+   * @returns The new x position after drawing the string.
    */
-  static String(x, y, str, scale = 1.0, color = new Vector(1.0, 1.0, 1.0)) {
+  static String(x: number, y: number, str: string, scale = 1.0, color = new Vector(1.0, 1.0, 1.0)): number {
     const program = GL.UseProgram('pic', true);
     gl.uniform3f(program.uColor, color[0], color[1], color[2]);
     if (scale > HIDPI_THRESHOLD) {
-      Draw.#charsLarge.bind(program.tTexture, true);
+      Draw.#charsLarge!.bind(program.tTexture, true);
     } else {
-      Draw.#chars.bind(program.tTexture, true);
+      Draw.#chars!.bind(program.tTexture, true);
     }
     for (let i = 0; i < str.length; i++) {
       Draw.Char(x, y, str.charCodeAt(i), scale);
@@ -335,19 +305,19 @@ export default class Draw {
 
   /**
    * Draws a string in white color at the specified position.
-   * @param {number} x The x position.
-   * @param {number} y The y position.
-   * @param {string} str The string to draw.
-   * @param {number} scale The scale factor.
-   * @returns {number} The new x position after drawing the string.
+   * @param x The x position.
+   * @param y The y position.
+   * @param str The string to draw.
+   * @param scale The scale factor.
+   * @returns The new x position after drawing the string.
    */
-  static StringWhite(x, y, str, scale = 1.0) {
+  static StringWhite(x: number, y: number, str: string, scale = 1.0): number {
     const program = GL.UseProgram('pic', true);
     gl.uniform3f(program.uColor, 1.0, 1.0, 1.0);
     if (scale > HIDPI_THRESHOLD) {
-      Draw.#charsLarge.bind(program.tTexture, true);
+      Draw.#charsLarge!.bind(program.tTexture, true);
     } else {
-      Draw.#chars.bind(program.tTexture, true);
+      Draw.#chars!.bind(program.tTexture, true);
     }
     for (let i = 0; i < str.length; i++) {
       Draw.Char(x, y, str.charCodeAt(i) + 128, scale);
@@ -358,48 +328,42 @@ export default class Draw {
 
   /**
    * Loads a picture from the WAD file.
-   * @param {string} name The lump name.
-   * @returns {GLTexture} The loaded GLTexture.
+   * @param name The lump name.
+   * @returns The loaded GLTexture.
    */
-  static LoadPicFromWad(name) {
-    const texdata = Draw.#gfxWad.getLumpMipmap(name, 0);
+  static LoadPicFromWad(name: string): GLTexture {
+    const texdata = Draw.#gfxWad!.getLumpMipmap(name, 0);
     return GLTexture.FromLumpTexture(texdata).lockTextureMode('GL_NEAREST');
   }
 
   /**
    * Loads a picture from a lump file.
-   * @param {string} name The lump name.
-   * @returns {Promise<GLTexture>} A promise that resolves to the loaded GLTexture.
+   * @returns The loaded picture texture.
    */
-  static async LoadPicFromLump(name) {
-    return GLTexture.FromLumpTexture(await W.LoadLump('gfx/' + name + '.lmp')).lockTextureMode('GL_NEAREST');
+  static async LoadPicFromLump(name: string): Promise<GLTexture> {
+    return GLTexture.FromLumpTexture(await W.LoadLump(`gfx/${name}.lmp`)).lockTextureMode('GL_NEAREST');
   }
 
   /**
-   * Loads a picture from a lump file in the background.
-   * @param {string} name The lump name.
-   * @returns {GLTexture} A promise that resolves to the loaded GLTexture.
+   * Loads a picture from a lump file, returning a placeholder immediately while loading asynchronously.
+   * @returns The placeholder or cached texture.
    */
-  static LoadPicFromLumpDeferred(name) {
-    // TODO: do cache lookup
-
+  static LoadPicFromLumpDeferred(name: string): GLTexture {
     const glt = GLTexture.Allocate(name, 1, 1, new Uint8Array([0, 0, 0, 0])).lockTextureMode('GL_NEAREST');
 
     if (glt.width > 1 && glt.height > 1) {
       return glt;
     }
 
-    W.LoadLump('gfx/' + name + '.lmp').then((lump) => {
+    W.LoadLump(`gfx/${name}.lmp`).then((lump) => {
       if (lump === null) {
-        // TODO: handle missing lump gracefully
         return;
       }
 
       glt.resize(lump.width, lump.height);
       glt.upload(lump.data);
-    }).catch((err) => {
-      console.error('LoadPicFromLumpDeferred(\'' + name + '\'): ' + err.message);
-      // TODO: handle error here
+    }).catch((err: Error) => {
+      console.error(`LoadPicFromLumpDeferred('${name}'): ${err.message}`);
     });
 
     return glt;
@@ -407,37 +371,30 @@ export default class Draw {
 
   /**
    * Loads a picture from an image file.
-   * @param {string} filename Filename of the image to load.
-   * @returns {Promise<GLTexture>} A promise that resolves to the loaded GLTexture.
+   * @returns The loaded picture texture.
    */
-  static async LoadPicFromFile(filename) {
+  static async LoadPicFromFile(filename: string): Promise<GLTexture> {
     return (await GLTexture.FromImageFile(filename)).lockTextureMode('GL_NEAREST');
   }
 
   /**
-   * Loads a picture from a lump file in the background.
-   * @param {string} filename The lump name.
-   * @returns {GLTexture} A promise that resolves to the loaded GLTexture.
+   * Loads a picture from an image file, returning a placeholder immediately.
    * @deprecated not implemented yet
+   * @returns The placeholder texture.
    */
-  static LoadPicFromFileDeferred(filename) {
-    // TODO: do cache lookup
-
+  static LoadPicFromFileDeferred(filename: string): GLTexture {
     const glt = GLTexture.Allocate(filename, 1, 1, new Uint8Array([0, 0, 0, 0])).lockTextureMode('GL_NEAREST');
-
-    // TODO: implement this
-
     return glt;
   }
 
   /**
    * Draws a picture at the specified position.
-   * @param {number} x The x position.
-   * @param {number} y The y position.
-   * @param {GLTexture} pic The texture to draw.
-   * @param {number} [scale] The scale factor for the picture.
+   * @param x The x position.
+   * @param y The y position.
+   * @param pic The texture to draw.
+   * @param scale The scale factor for the picture.
    */
-  static Pic(x, y, pic, scale = 1.0) {
+  static Pic(x: number, y: number, pic: GLTexture, scale = 1.0): void {
     if (!pic.ready) {
       return;
     }
@@ -450,14 +407,14 @@ export default class Draw {
 
   /**
    * Draws a translated picture at the specified position.
-   * @param {number} x The x position.
-   * @param {number} y The y position.
-   * @param {GLTexture} pic The texture to draw.
-   * @param {number} top The top color index.
-   * @param {number} bottom The bottom color index.
-   * @param {number} [scale] The scale factor for the picture.
+   * @param x The x position.
+   * @param y The y position.
+   * @param pic The texture to draw.
+   * @param top The top color index.
+   * @param bottom The bottom color index.
+   * @param scale The scale factor for the picture.
    */
-  static PicTranslate(x, y, pic, top, bottom, scale = 1.0) {
+  static PicTranslate(x: number, y: number, pic: GLTexture, top: number, bottom: number, scale = 1.0): void {
     if (!pic.ready) {
       return;
     }
@@ -480,25 +437,25 @@ export default class Draw {
 
   /**
    * Draws the console background.
-   * @param {number} lines The number of lines to show.
+   * @param lines The number of lines to show.
    */
-  static ConsoleBackground(lines) {
+  static ConsoleBackground(lines: number): void {
     const program = GL.UseProgram('pic', true);
     gl.uniform3f(program.uColor, 1.0, 1.0, 1.0);
-    Draw.#conback.bind(program.tTexture, true);
+    Draw.#conback!.bind(program.tTexture, true);
     GL.StreamDrawTexturedQuad(0, lines - VID.height, VID.width, VID.height, 0.0, 0.0, 1.0, 1.0);
     GL.StreamFlush();
   }
 
   /**
-   * Fills a rectangle with a solid color.
-   * @param {number} x The x position.
-   * @param {number} y The y position.
-   * @param {number} w The width of the rectangle.
-   * @param {number} h The height of the rectangle.
-   * @param {number} c The color index.
+   * Fills a rectangle with a solid indexed-palette color.
+   * @param x The x position.
+   * @param y The y position.
+   * @param w The width of the rectangle.
+   * @param h The height of the rectangle.
+   * @param c The color index.
    */
-  static FillIndexed(x, y, w, h, c) {
+  static FillIndexed(x: number, y: number, w: number, h: number, c: number): void {
     GL.UseProgram('fill', true);
     const color = W.d_8to24table[c];
     GL.StreamDrawColoredQuad(x, y, w, h, color & 0xff, (color >> 8) & 0xff, color >> 16, 255);
@@ -506,14 +463,14 @@ export default class Draw {
 
   /**
    * Fills a rectangle with a solid color.
-   * @param {number} x The x position.
-   * @param {number} y The y position.
-   * @param {number} w The width of the rectangle.
-   * @param {number} h The height of the rectangle.
-   * @param {Vector} c The color index.
-   * @param {number} a Optional alpha value (default is 1.0).
+   * @param x The x position.
+   * @param y The y position.
+   * @param w The width of the rectangle.
+   * @param h The height of the rectangle.
+   * @param c The color vector.
+   * @param a Optional alpha value (default is 1.0).
    */
-  static Fill(x, y, w, h, c, a = 1.0) {
+  static Fill(x: number, y: number, w: number, h: number, c: Vector, a = 1.0): void {
     GL.UseProgram('fill', true);
     GL.StreamDrawColoredQuad(x, y, w, h, Math.floor(c[0] * 255.0), Math.floor(c[1] * 255.0), Math.floor(c[2] * 255.0), Math.floor(a * 255.0));
   }
@@ -521,7 +478,7 @@ export default class Draw {
   /**
    * Draws a faded screen overlay.
    */
-  static FadeScreen() {
+  static FadeScreen(): void {
     GL.UseProgram('fill', true);
     GL.StreamDrawColoredQuad(0, 0, VID.width, VID.height, 0, 0, 0, 204);
   }
@@ -529,7 +486,7 @@ export default class Draw {
   /**
    * Draws a black screen overlay.
    */
-  static BlackScreen() {
+  static BlackScreen(): void {
     GL.UseProgram('fill', true);
     GL.StreamDrawColoredQuad(0, 0, VID.width, VID.height, 0, 0, 0, 255);
   }
@@ -537,7 +494,7 @@ export default class Draw {
   /**
    * Begins showing the loading disc.
    */
-  static BeginDisc() {
+  static BeginDisc(): void {
     Draw.#loadingCounter++;
     if (Draw.#loadingElem === null) {
       return;
@@ -549,7 +506,7 @@ export default class Draw {
   /**
    * Ends showing the loading disc.
    */
-  static EndDisc() {
+  static EndDisc(): void {
     if (--Draw.#loadingCounter > 0) {
       return;
     }
@@ -560,14 +517,14 @@ export default class Draw {
   }
 
   /**
-   * Updates the position of the loading disc.
+   * Updates the position of the loading disc based on current viewport dimensions.
    */
-  static UpdateDiscPosition() {
+  static UpdateDiscPosition(): void {
     if (Draw.#loadingElem === null) {
       return;
     }
-    Draw.#loadingElem.style.left = ((VID.width - Draw.#loading.width)) + 'px';
-    Draw.#loadingElem.style.top = ((VID.height - Draw.#loading.height)) + 'px';
+    Draw.#loadingElem.style.left = `${VID.width - Draw.#loading!.width}px`;
+    Draw.#loadingElem.style.top = `${VID.height - Draw.#loading!.height}px`;
   }
 }
 
diff --git a/source/engine/client/GL.mjs b/source/engine/client/GL.mjs
deleted file mode 100644
index 478b48bc..00000000
--- a/source/engine/client/GL.mjs
+++ /dev/null
@@ -1 +0,0 @@
-export { default, ATTRIB_LOCATIONS, BRUSH_VERTEX_STRIDE, GLTexture, resampleTexture8 } from './GL.ts';
diff --git a/source/engine/client/Key.mjs b/source/engine/client/Key.mjs
deleted file mode 100644
index 908aebf9..00000000
--- a/source/engine/client/Key.mjs
+++ /dev/null
@@ -1,419 +0,0 @@
-import { K } from '../../shared/Keys.ts';
-import Vector from '../../shared/Vector.ts';
-import Cmd from '../common/Cmd.ts';
-import Cvar from '../common/Cvar.ts';
-import { clientConnectionState } from '../common/Def.ts';
-import { registry, eventBus } from '../registry.mjs';
-
-const Key = {};
-
-export default Key;
-
-let { CL, Con, Host, M } = registry;
-
-eventBus.subscribe('registry.frozen', () => {
-  CL = registry.CL;
-  Con = registry.Con;
-  Host = registry.Host;
-  M = registry.M;
-});
-
-Key.lines = [''];
-Key.edit_line = '';
-Key.history_line = 1;
-
-Key.dest = /*Object.freeze*/({
-  game: 0,
-  console: 1,
-  message: 2,
-  menu: 3,
-
-  value: 1, // FIXME
-});
-
-Key.bindings = [];
-Key.consolekeys = [];
-Key.shift = [];
-Key.down = [];
-
-Key.names = {
-  'TAB': K.TAB,
-  'ENTER': K.ENTER,
-  'ESCAPE': K.ESCAPE,
-  'SPACE': K.SPACE,
-  'BACKSPACE': K.BACKSPACE,
-  'UPARROW': K.UPARROW,
-  'DOWNARROW': K.DOWNARROW,
-  'LEFTARROW': K.LEFTARROW,
-  'RIGHTARROW': K.RIGHTARROW,
-  'ALT': K.ALT,
-  'CTRL': K.CTRL,
-  'SHIFT': K.SHIFT,
-  'F1': K.F1,
-  'F2': K.F2,
-  'F3': K.F3,
-  'F4': K.F4,
-  'F5': K.F5,
-  'F6': K.F6,
-  'F7': K.F7,
-  'F8': K.F8,
-  'F9': K.F9,
-  'F10': K.F10,
-  'F11': K.F11,
-  'F12': K.F12,
-  'INS': K.INS,
-  'DEL': K.DEL,
-  'PGDN': K.PGDN,
-  'PGUP': K.PGUP,
-  'HOME': K.HOME,
-  'END': K.END,
-  'MOUSE1': K.MOUSE1,
-  'MOUSE2': K.MOUSE2,
-  'MOUSE3': K.MOUSE3,
-  'PAUSE': K.PAUSE,
-  'MWHEELUP': K.MWHEELUP,
-  'MWHEELDOWN': K.MWHEELDOWN,
-  'SEMICOLON': 59,
-};
-
-Key.Console = function(key) {
-  if (key === K.ENTER) {
-    Cmd.text += Key.edit_line + '\n';
-    Con.Print(']' + Key.edit_line + '\n', new Vector(0.8, 0.8, 0.8));
-    Key.lines[Key.lines.length] = Key.edit_line;
-    Key.edit_line = '';
-    Key.history_line = Key.lines.length;
-    return;
-  }
-
-  if (key === K.TAB) {
-    let cmd = Cmd.CompleteCommand(Key.edit_line);
-    if (cmd === null) {
-      cmd = Cvar.CompleteVariable(Key.edit_line);
-    }
-    if (cmd === null) {
-      return;
-    }
-    Key.edit_line = cmd + ' ';
-    return;
-  }
-
-  if ((key === K.BACKSPACE) || (key === K.LEFTARROW)) {
-    if (Key.edit_line.length > 0) {
-      Key.edit_line = Key.edit_line.substring(0, Key.edit_line.length - 1);
-    }
-    return;
-  }
-
-  if (key === K.UPARROW) {
-    if (--Key.history_line < 0) {
-      Key.history_line = 0;
-    }
-    Key.edit_line = Key.lines[Key.history_line];
-    return;
-  }
-
-  if (key === K.DOWNARROW) {
-    if (Key.history_line >= Key.lines.length) {
-      return;
-    }
-    if (++Key.history_line >= Key.lines.length) {
-      Key.history_line = Key.lines.length;
-      Key.edit_line = '';
-      return;
-    }
-    Key.edit_line = Key.lines[Key.history_line];
-    return;
-  }
-
-  if (key === K.PGUP) {
-    Con.backscroll += 2;
-    if (Con.backscroll > Con.text.length) {
-      Con.backscroll = Con.text.length;
-    }
-    return;
-  }
-
-  if (key === K.PGDN) {
-    Con.backscroll -= 2;
-    if (Con.backscroll < 0) {
-      Con.backscroll = 0;
-    }
-    return;
-  }
-
-  if (key === K.HOME) {
-    Con.backscroll = Con.text.length - 10;
-    if (Con.backscroll < 0) {
-      Con.backscroll = 0;
-    }
-    return;
-  }
-
-  if (key === K.END) {
-    Con.backscroll = 0;
-    return;
-  }
-
-  if ((key < 32) || (key > 127)) {
-    return;
-  }
-
-  Key.edit_line += String.fromCharCode(key);
-};
-
-Key.chat_buffer = '';
-
-Key.Message = function(key) {
-  if (key === K.ENTER) {
-    if (Key.chat_buffer.trim().length > 0) {
-      if (Key.team_message) {
-        Cmd.ExecuteString(`say_team "${Key.chat_buffer}"`);
-      } else {
-        Cmd.ExecuteString(`say "${Key.chat_buffer}"`);
-      }
-    }
-    Key.dest.value = Key.dest.game;
-    Key.chat_buffer = '';
-    return;
-  }
-  if (key === K.ESCAPE) {
-    Key.dest.value = Key.dest.game;
-    Key.chat_buffer = '';
-    return;
-  }
-  if ((key < 32) || (key > 127)) {
-    return;
-  }
-  if (key === K.BACKSPACE) {
-    if (Key.chat_buffer.length !== 0) {
-      Key.chat_buffer = Key.chat_buffer.substring(0, Key.chat_buffer.length - 1);
-    }
-    return;
-  }
-  if (Key.chat_buffer.length >= 31) {
-    return;
-  }
-  Key.chat_buffer = Key.chat_buffer + String.fromCharCode(key);
-};
-
-Key.BindingToString = function(binding) {
-  const keynum = Key.bindings.indexOf(binding);
-
-  if (keynum === -1) {
-    return null;
-  }
-
-  return Key.KeynumToString(keynum);
-};
-
-Key.StringToKeynum = function(str) {
-  if (str.length === 1) {
-    return str.charCodeAt(0);
-  }
-
-  return Key.names[str.toUpperCase()] || null;
-};
-
-Key.KeynumToString = function(keynum) {
-  if ((keynum > 32) && (keynum < 127)) {
-    return String.fromCharCode(keynum);
-  }
-
-  for (const [name, num] of Object.entries(Key.names)) {
-    if (num === keynum) {
-      return name;
-    }
-  }
-
-  return '<UNKNOWN KEYNUM>';
-};
-
-Key.Unbind_f = function(key) {
-  if (key === undefined) {
-    Con.Print('Usage: unbind <key>\n');
-  }
-  const b = Key.StringToKeynum(key);
-  if (b === null) {
-    Con.Print('"' + key + '" isn\'t a valid key\n');
-    return;
-  }
-  Key.bindings[b] = null;
-};
-
-Key.Unbindall_f = function() {
-  Key.bindings = [];
-};
-
-Key.Bind_f = function(key, command) {
-  if (key === undefined) {
-    Con.Print('Usage: bind <key> [command]\n');
-    return;
-  }
-
-  const b = Key.StringToKeynum(key.toLowerCase());
-
-  if (b === null) {
-    Con.Print('"' + key + '" isn\'t a valid key\n');
-    return;
-  }
-  if (command === undefined) {
-    if (Key.bindings[b] != null) {
-      Con.Print('"' + key + '" = "' + Key.bindings[b] + '"\n');
-    } else {
-      Con.Print('"' + key + '" is not bound\n');
-    }
-    return;
-  }
-
-  Key.bindings[b] = command;
-
-  Host.WriteConfiguration();
-};
-
-Key.WriteBindings = function() {
-  const f = [];
-  for (let i = 0; i < Key.bindings.length; i++) {
-    if (Key.bindings[i] != null) {
-      f.push('bind "' + Key.KeynumToString(i) + '" "' + Key.bindings[i] + '"');
-    }
-  }
-  return f.join('\n');
-};
-
-Key.Init = function() {
-  let i;
-
-  for (i = 32; i < 128; i++) {
-    Key.consolekeys[i] = true;
-  }
-  Key.consolekeys[K.ENTER] = true;
-  Key.consolekeys[K.TAB] = true;
-  Key.consolekeys[K.LEFTARROW] = true;
-  Key.consolekeys[K.RIGHTARROW] = true;
-  Key.consolekeys[K.UPARROW] = true;
-  Key.consolekeys[K.DOWNARROW] = true;
-  Key.consolekeys[K.BACKSPACE] = true;
-  Key.consolekeys[K.HOME] = true;
-  Key.consolekeys[K.END] = true;
-  Key.consolekeys[K.PGUP] = true;
-  Key.consolekeys[K.PGDN] = true;
-  Key.consolekeys[K.SHIFT] = true;
-  Key.consolekeys[96] = false;
-  Key.consolekeys[126] = false;
-
-  for (i = 0; i < 256; i++) {
-    Key.shift[i] = i;
-  }
-  for (i = 97; i <= 122; i++) {
-    Key.shift[i] = i - 32;
-  }
-  Key.shift[49] = 33;
-  Key.shift[50] = 64;
-  Key.shift[51] = 35;
-  Key.shift[52] = 36;
-  Key.shift[53] = 37;
-  Key.shift[54] = 94;
-  Key.shift[55] = 38;
-  Key.shift[56] = 42;
-  Key.shift[57] = 40;
-  Key.shift[48] = 41;
-  Key.shift[45] = 95;
-  Key.shift[61] = 43;
-  Key.shift[43] = 60;
-  Key.shift[46] = 62;
-  Key.shift[47] = 63;
-  Key.shift[59] = 58;
-  Key.shift[39] = 34;
-  Key.shift[91] = 123;
-  Key.shift[93] = 125;
-  Key.shift[96] = 126;
-  Key.shift[92] = 124;
-
-  Cmd.AddCommand('bind', Key.Bind_f);
-  Cmd.AddCommand('unbind', Key.Unbind_f);
-  Cmd.AddCommand('unbindall', Key.Unbindall_f);
-};
-
-Key.Event = function(key, down) {
-  if (CL.cls.state === clientConnectionState.connecting && key === K.ESCAPE && down === true) {
-    CL.Disconnect();
-    M.ToggleMenu_f();
-    return;
-  }
-  if (down === true) {
-    if ((key !== K.BACKSPACE) && (key !== K.PAUSE) && (Key.down[key] === true)) {
-      return;
-    }
-  }
-  Key.down[key] = down;
-
-  if (key === K.SHIFT) {
-    Key.shift_down = down;
-  }
-
-  if (key === K.ESCAPE) {
-    if (down !== true) {
-      return;
-    }
-    if (Key.dest.value === Key.dest.message) {
-      Key.Message(key);
-    } else if (Key.dest.value === Key.dest.menu) {
-      M.Keydown(key);
-    } else {
-      M.ToggleMenu_f();
-    }
-    return;
-  }
-
-  let kb;
-
-  if (down !== true) {
-    kb = Key.bindings[key];
-    if (kb != null) {
-      if (kb.charCodeAt(0) === 43) {
-        Cmd.text += '-' + kb.substring(1) + ' ' + key + '\n';
-      }
-    }
-    if (Key.shift[key] !== key) {
-      kb = Key.bindings[Key.shift[key]];
-      if (kb != null) {
-        if (kb.charCodeAt(0) === 43) {
-          Cmd.text += '-' + kb.substring(1) + ' ' + key + '\n';
-        }
-      }
-    }
-    return;
-  }
-
-  if ((CL.cls.demoplayback === true) && (Key.consolekeys[key] === true) && (Key.dest.value === Key.dest.game)) {
-    M.ToggleMenu_f();
-    return;
-  }
-
-  if (((Key.dest.value === Key.dest.menu) && ((key === K.ESCAPE) || ((key >= K.F1) && (key <= K.F12)))) ||
-    ((Key.dest.value === Key.dest.console) && (Key.consolekeys[key] !== true)) ||
-    ((Key.dest.value === Key.dest.game) && ((Con.forcedup !== true) || (Key.consolekeys[key] !== true)))) {
-    kb = Key.bindings[key];
-    if (kb != null) {
-      if (kb.charCodeAt(0) === 43) {
-        Cmd.text += kb + ' ' + key + '\n';
-      } else {
-        Cmd.text += kb + '\n';
-      }
-    }
-    return;
-  }
-
-  if (Key.shift_down === true) {
-    key = Key.shift[key];
-  }
-
-  if (Key.dest.value === Key.dest.message) {
-    Key.Message(key);
-  } else if (Key.dest.value === Key.dest.menu) {
-    M.Keydown(key);
-  } else {
-    Key.Console(key);
-  }
-};
diff --git a/source/engine/client/Key.ts b/source/engine/client/Key.ts
new file mode 100644
index 00000000..7d84697b
--- /dev/null
+++ b/source/engine/client/Key.ts
@@ -0,0 +1,457 @@
+import { K } from '../../shared/Keys.ts';
+import Vector from '../../shared/Vector.ts';
+import Cmd from '../common/Cmd.ts';
+import Cvar from '../common/Cvar.ts';
+import { clientConnectionState } from '../common/Def.ts';
+import { eventBus, getClientRegistry } from '../registry.mjs';
+
+let { CL, Con, Host, M } = getClientRegistry();
+
+eventBus.subscribe('registry.frozen', () => {
+  ({ CL, Con, Host, M } = getClientRegistry());
+});
+
+/** Current key state, mapping key code → pressed flag. */
+interface KeyDest {
+  readonly game: 0;
+  readonly console: 1;
+  readonly message: 2;
+  readonly menu: 3;
+  /** Mutable current destination. */
+  value: number;
+}
+
+export default class Key {
+  /** Console input history. */
+  static lines: string[] = [''];
+  /** Current console input line. */
+  static edit_line = '';
+  /** Index into history lines for Up/Down navigation. */
+  static history_line = 1;
+
+  /** Key destination routing constants and current active destination. */
+  static dest: KeyDest = {
+    game: 0,
+    console: 1,
+    message: 2,
+    menu: 3,
+    value: 1, // FIXME
+  };
+
+  static bindings: (string | null)[] = [];
+  static consolekeys: (boolean | undefined)[] = [];
+  static shift: number[] = [];
+  static down: (boolean | undefined)[] = [];
+
+  /** Named key string → key-code mapping for config file parsing. */
+  static readonly names: Record<string, number> = {
+    TAB: K.TAB,
+    ENTER: K.ENTER,
+    ESCAPE: K.ESCAPE,
+    SPACE: K.SPACE,
+    BACKSPACE: K.BACKSPACE,
+    UPARROW: K.UPARROW,
+    DOWNARROW: K.DOWNARROW,
+    LEFTARROW: K.LEFTARROW,
+    RIGHTARROW: K.RIGHTARROW,
+    ALT: K.ALT,
+    CTRL: K.CTRL,
+    SHIFT: K.SHIFT,
+    F1: K.F1,
+    F2: K.F2,
+    F3: K.F3,
+    F4: K.F4,
+    F5: K.F5,
+    F6: K.F6,
+    F7: K.F7,
+    F8: K.F8,
+    F9: K.F9,
+    F10: K.F10,
+    F11: K.F11,
+    F12: K.F12,
+    INS: K.INS,
+    DEL: K.DEL,
+    PGDN: K.PGDN,
+    PGUP: K.PGUP,
+    HOME: K.HOME,
+    END: K.END,
+    MOUSE1: K.MOUSE1,
+    MOUSE2: K.MOUSE2,
+    MOUSE3: K.MOUSE3,
+    PAUSE: K.PAUSE,
+    MWHEELUP: K.MWHEELUP,
+    MWHEELDOWN: K.MWHEELDOWN,
+    SEMICOLON: 59,
+  };
+
+  /** Handles a keypress for console input mode. */
+  static Console(key: number): void {
+    if (key === K.ENTER) {
+      Cmd.text += Key.edit_line + '\n';
+      Con.Print(']' + Key.edit_line + '\n', new Vector(0.8, 0.8, 0.8));
+      Key.lines[Key.lines.length] = Key.edit_line;
+      Key.edit_line = '';
+      Key.history_line = Key.lines.length;
+      return;
+    }
+
+    if (key === K.TAB) {
+      let cmd = Cmd.CompleteCommand(Key.edit_line);
+      if (cmd === null) {
+        cmd = Cvar.CompleteVariable(Key.edit_line);
+      }
+      if (cmd === null) {
+        return;
+      }
+      Key.edit_line = cmd + ' ';
+      return;
+    }
+
+    if ((key === K.BACKSPACE) || (key === K.LEFTARROW)) {
+      if (Key.edit_line.length > 0) {
+        Key.edit_line = Key.edit_line.substring(0, Key.edit_line.length - 1);
+      }
+      return;
+    }
+
+    if (key === K.UPARROW) {
+      if (--Key.history_line < 0) {
+        Key.history_line = 0;
+      }
+      Key.edit_line = Key.lines[Key.history_line];
+      return;
+    }
+
+    if (key === K.DOWNARROW) {
+      if (Key.history_line >= Key.lines.length) {
+        return;
+      }
+      if (++Key.history_line >= Key.lines.length) {
+        Key.history_line = Key.lines.length;
+        Key.edit_line = '';
+        return;
+      }
+      Key.edit_line = Key.lines[Key.history_line];
+      return;
+    }
+
+    if (key === K.PGUP) {
+      Con.backscroll += 2;
+      if (Con.backscroll > Con.text.length) {
+        Con.backscroll = Con.text.length;
+      }
+      return;
+    }
+
+    if (key === K.PGDN) {
+      Con.backscroll -= 2;
+      if (Con.backscroll < 0) {
+        Con.backscroll = 0;
+      }
+      return;
+    }
+
+    if (key === K.HOME) {
+      Con.backscroll = Con.text.length - 10;
+      if (Con.backscroll < 0) {
+        Con.backscroll = 0;
+      }
+      return;
+    }
+
+    if (key === K.END) {
+      Con.backscroll = 0;
+      return;
+    }
+
+    if ((key < 32) || (key > 127)) {
+      return;
+    }
+
+    Key.edit_line += String.fromCharCode(key);
+  }
+
+  /** Current chat message being composed. */
+  static chat_buffer = '';
+  /** True when composing a team-only message. */
+  static team_message = false;
+
+  /** Handles a keypress for chat message mode. */
+  static Message(key: number): void {
+    if (key === K.ENTER) {
+      if (Key.chat_buffer.trim().length > 0) {
+        if (Key.team_message) {
+          void Cmd.ExecuteString(`say_team "${Key.chat_buffer}"`);
+        } else {
+          void Cmd.ExecuteString(`say "${Key.chat_buffer}"`);
+        }
+      }
+      Key.dest.value = Key.dest.game;
+      Key.chat_buffer = '';
+      return;
+    }
+    if (key === K.ESCAPE) {
+      Key.dest.value = Key.dest.game;
+      Key.chat_buffer = '';
+      return;
+    }
+    if ((key < 32) || (key > 127)) {
+      return;
+    }
+    if (key === K.BACKSPACE) {
+      if (Key.chat_buffer.length !== 0) {
+        Key.chat_buffer = Key.chat_buffer.substring(0, Key.chat_buffer.length - 1);
+      }
+      return;
+    }
+    if (Key.chat_buffer.length >= 31) {
+      return;
+    }
+    Key.chat_buffer = Key.chat_buffer + String.fromCharCode(key);
+  }
+
+  /**
+   * Looks up the first key bound to the given command string.
+   * @returns The key name string, or null when not bound.
+   */
+  static BindingToString(binding: string): string | null {
+    const keynum = Key.bindings.indexOf(binding);
+
+    if (keynum === -1) {
+      return null;
+    }
+
+    return Key.KeynumToString(keynum);
+  }
+
+  /**
+   * Converts a key name string to a key code.
+   * @returns The numeric key code, or null for unknown names.
+   */
+  static StringToKeynum(str: string): number | null {
+    if (str.length === 1) {
+      return str.charCodeAt(0);
+    }
+
+    return Key.names[str.toUpperCase()] ?? null;
+  }
+
+  /**
+   * Converts a key code to its printable name string.
+   * @returns The key name, or `'<UNKNOWN KEYNUM>'` for unrecognized codes.
+   */
+  static KeynumToString(keynum: number): string {
+    if ((keynum > 32) && (keynum < 127)) {
+      return String.fromCharCode(keynum);
+    }
+
+    for (const [name, num] of Object.entries(Key.names)) {
+      if (num === keynum) {
+        return name;
+      }
+    }
+
+    return '<UNKNOWN KEYNUM>';
+  }
+
+  /** Console command handler: unbinds a single key. */
+  static Unbind_f(key: string | undefined): void {
+    if (key === undefined) {
+      Con.Print('Usage: unbind <key>\n');
+    }
+    const b = Key.StringToKeynum(key!);
+    if (b === null) {
+      Con.Print(`"${key}" isn't a valid key\n`);
+      return;
+    }
+    Key.bindings[b] = null;
+  }
+
+  /** Console command handler: unbinds all keys. */
+  static Unbindall_f(): void {
+    Key.bindings = [];
+  }
+
+  /** Console command handler: binds or prints a key binding. */
+  static Bind_f(key: string | undefined, command: string | undefined): void {
+    if (key === undefined) {
+      Con.Print('Usage: bind <key> [command]\n');
+      return;
+    }
+
+    const b = Key.StringToKeynum(key.toLowerCase());
+
+    if (b === null) {
+      Con.Print(`"${key}" isn't a valid key\n`);
+      return;
+    }
+    if (command === undefined) {
+      if (Key.bindings[b] !== null && Key.bindings[b] !== undefined) {
+        Con.Print(`"${key}" = "${Key.bindings[b]}"\n`);
+      } else {
+        Con.Print(`"${key}" is not bound\n`);
+      }
+      return;
+    }
+
+    Key.bindings[b] = command;
+
+    Host.WriteConfiguration();
+  }
+
+  /**
+   * Serializes all key bindings as a config file string.
+   * @returns Newline-separated `bind` commands for all active bindings.
+   */
+  static WriteBindings(): string {
+    const f: string[] = [];
+    for (let i = 0; i < Key.bindings.length; i++) {
+      if (Key.bindings[i] !== null && Key.bindings[i] !== undefined) {
+        f.push(`bind "${Key.KeynumToString(i)}" "${Key.bindings[i]}"`);
+      }
+    }
+    return f.join('\n');
+  }
+
+  /** Initializes key tables, console key map, and registers console commands. */
+  static Init(): void {
+    let i;
+
+    for (i = 32; i < 128; i++) {
+      Key.consolekeys[i] = true;
+    }
+    Key.consolekeys[K.ENTER] = true;
+    Key.consolekeys[K.TAB] = true;
+    Key.consolekeys[K.LEFTARROW] = true;
+    Key.consolekeys[K.RIGHTARROW] = true;
+    Key.consolekeys[K.UPARROW] = true;
+    Key.consolekeys[K.DOWNARROW] = true;
+    Key.consolekeys[K.BACKSPACE] = true;
+    Key.consolekeys[K.HOME] = true;
+    Key.consolekeys[K.END] = true;
+    Key.consolekeys[K.PGUP] = true;
+    Key.consolekeys[K.PGDN] = true;
+    Key.consolekeys[K.SHIFT] = true;
+    Key.consolekeys[96] = false;
+    Key.consolekeys[126] = false;
+
+    for (i = 0; i < 256; i++) {
+      Key.shift[i] = i;
+    }
+    for (i = 97; i <= 122; i++) {
+      Key.shift[i] = i - 32;
+    }
+    Key.shift[49] = 33;
+    Key.shift[50] = 64;
+    Key.shift[51] = 35;
+    Key.shift[52] = 36;
+    Key.shift[53] = 37;
+    Key.shift[54] = 94;
+    Key.shift[55] = 38;
+    Key.shift[56] = 42;
+    Key.shift[57] = 40;
+    Key.shift[48] = 41;
+    Key.shift[45] = 95;
+    Key.shift[61] = 43;
+    Key.shift[43] = 60;
+    Key.shift[46] = 62;
+    Key.shift[47] = 63;
+    Key.shift[59] = 58;
+    Key.shift[39] = 34;
+    Key.shift[91] = 123;
+    Key.shift[93] = 125;
+    Key.shift[96] = 126;
+    Key.shift[92] = 124;
+
+    Cmd.AddCommand('bind', Key.Bind_f);
+    Cmd.AddCommand('unbind', Key.Unbind_f);
+    Cmd.AddCommand('unbindall', Key.Unbindall_f);
+  }
+
+  /** True when Shift is held. */
+  static shift_down = false;
+
+  /** Routes a raw key event to the appropriate handler based on current destination. */
+  static Event(key: number, down: boolean): void {
+    if (CL.cls.state === clientConnectionState.connecting && key === K.ESCAPE && down === true) {
+      CL.Disconnect();
+      M.ToggleMenu_f();
+      return;
+    }
+    if (down === true) {
+      if ((key !== K.BACKSPACE) && (key !== K.PAUSE) && (Key.down[key] === true)) {
+        return;
+      }
+    }
+    Key.down[key] = down;
+
+    if (key === K.SHIFT) {
+      Key.shift_down = down;
+    }
+
+    if (key === K.ESCAPE) {
+      if (down !== true) {
+        return;
+      }
+      if (Key.dest.value === Key.dest.message) {
+        Key.Message(key);
+      } else if (Key.dest.value === Key.dest.menu) {
+        M.Keydown(key);
+      } else {
+        M.ToggleMenu_f();
+      }
+      return;
+    }
+
+    let kb: string | null | undefined;
+
+    if (down !== true) {
+      kb = Key.bindings[key];
+      if (kb !== null && kb !== undefined) {
+        if (kb.charCodeAt(0) === 43) {
+          Cmd.text += '-' + kb.substring(1) + ' ' + key + '\n';
+        }
+      }
+      if (Key.shift[key] !== key) {
+        kb = Key.bindings[Key.shift[key]];
+        if (kb !== null && kb !== undefined) {
+          if (kb.charCodeAt(0) === 43) {
+            Cmd.text += '-' + kb.substring(1) + ' ' + key + '\n';
+          }
+        }
+      }
+      return;
+    }
+
+    if ((CL.cls.demoplayback === true) && (Key.consolekeys[key] === true) && (Key.dest.value === Key.dest.game)) {
+      M.ToggleMenu_f();
+      return;
+    }
+
+    if (((Key.dest.value === Key.dest.menu) && ((key === K.ESCAPE) || ((key >= K.F1) && (key <= K.F12)))) ||
+      ((Key.dest.value === Key.dest.console) && (Key.consolekeys[key] !== true)) ||
+      ((Key.dest.value === Key.dest.game) && ((Con.forcedup !== true) || (Key.consolekeys[key] !== true)))) {
+      kb = Key.bindings[key];
+      if (kb !== null && kb !== undefined) {
+        if (kb.charCodeAt(0) === 43) {
+          Cmd.text += kb + ' ' + key + '\n';
+        } else {
+          Cmd.text += kb + '\n';
+        }
+      }
+      return;
+    }
+
+    if (Key.shift_down === true) {
+      key = Key.shift[key];
+    }
+
+    if (Key.dest.value === Key.dest.message) {
+      Key.Message(key);
+    } else if (Key.dest.value === Key.dest.menu) {
+      M.Keydown(key);
+    } else {
+      Key.Console(key);
+    }
+  }
+}
diff --git a/source/engine/client/R.mjs b/source/engine/client/R.mjs
index ff35979c..4f6b471d 100644
--- a/source/engine/client/R.mjs
+++ b/source/engine/client/R.mjs
@@ -7,14 +7,14 @@ import { eventBus, registry } from '../registry.mjs';
 import Chase from './Chase.ts';
 import W from '../common/W.ts';
 import VID from './VID.ts';
-import GL, { ATTRIB_LOCATIONS, GLTexture } from './GL.mjs';
+import GL, { ATTRIB_LOCATIONS, GLTexture } from './GL.ts';
 import { content, effect, gameCapabilities } from '../../shared/Defs.ts';
 import { modelRendererRegistry } from './renderer/ModelRendererRegistry.ts';
 import { BrushModelRenderer, LIGHTMAP_BLOCK_HEIGHT, LIGHTMAP_BLOCK_SIZE } from './renderer/BrushModelRenderer.ts';
 import { AliasModelRenderer } from './renderer/AliasModelRenderer.ts';
 import { SpriteModelRenderer } from './renderer/SpriteModelRenderer.ts';
 import { MeshModelRenderer } from './renderer/MeshModelRenderer.ts';
-import Draw from './Draw.mjs';
+import Draw from './Draw.ts';
 import { BrushModel, Node, revealedVisibility } from '../common/model/BSP.ts';
 import PostProcess from './renderer/PostProcess.ts';
 import BloomEffect from './renderer/BloomEffect.ts';
diff --git a/source/engine/client/SCR.mjs b/source/engine/client/SCR.mjs
deleted file mode 100644
index 47b15a64..00000000
--- a/source/engine/client/SCR.mjs
+++ /dev/null
@@ -1,432 +0,0 @@
-/* global  */
-
-import { gameCapabilities } from '../../shared/Defs.ts';
-import Cmd from '../common/Cmd.ts';
-import Cvar from '../common/Cvar.ts';
-import { clientConnectionState } from '../common/Def.ts';
-import { eventBus, registry } from '../registry.mjs';
-import GL from './GL.mjs';
-import VID from './VID.ts';
-import PostProcess from './renderer/PostProcess.ts';
-
-let { CL, Con, Draw, Host, Key, M, R, S, Sbar, V } = registry;
-
-eventBus.subscribe('registry.frozen', () => {
-  CL = registry.CL;
-  Con = registry.Con;
-  Draw = registry.Draw;
-  Host = registry.Host;
-  Key = registry.Key;
-  M = registry.M;
-  R = registry.R;
-  S = registry.S;
-  Sbar = registry.Sbar;
-  V = registry.V;
-});
-
-/** @type {WebGL2RenderingContext} */
-let gl = null;
-
-eventBus.subscribe('gl.ready', () => {
-  gl = GL.gl;
-});
-
-eventBus.subscribe('gl.shutdown', () => {
-  gl = null;
-});
-
-const SCR = {};
-
-export default SCR;
-
-eventBus.subscribe('vid.resize', () => {
-  SCR.recalc_refdef = true;
-});
-
-eventBus.subscribe('server.spawning', () => {
-  SCR.centertime_off = 0.0;
-});
-
-SCR.con_current = 0;
-
-SCR.centerstring = [];
-SCR.centertime_off = 0.0;
-
-SCR._requestedAnimationFrames = 0;
-
-SCR.CenterPrint = function(str) {
-  SCR.centerstring = [];
-  let i; let start = 0; let next;
-  for (i = 0; i < str.length; i++) {
-    if (str.charCodeAt(i) === 10) {
-      next = i + 1;
-    } else if ((i - start) >= 40) {
-      next = i;
-    } else {
-      continue;
-    }
-    SCR.centerstring[SCR.centerstring.length] = str.substring(start, i);
-    start = next;
-  }
-  SCR.centerstring[SCR.centerstring.length] = str.substring(start, i);
-  SCR.centertime_off = SCR.centertime.value;
-  SCR.centertime_start = CL.state.time;
-};
-
-SCR.DrawCenterString = function() {
-  SCR.centertime_off -= Host.frametime;
-  if (((SCR.centertime_off <= 0.0) && (CL.state.intermission === 0)) || (Key.dest.value !== Key.dest.game)) {
-    return;
-  }
-
-  let y;
-  if (SCR.centerstring.length <= 4) {
-    y = Math.floor(VID.height * 0.35);
-  } else {
-    y = 48;
-  }
-
-  let i;
-  if (CL.state.intermission) {
-    let remaining = Math.floor(SCR.printspeed.value * (CL.state.time - SCR.centertime_start));
-    let str; let x; let j;
-    for (i = 0; i < SCR.centerstring.length; i++) {
-      str = SCR.centerstring[i];
-      x = (VID.width - (str.length * 16)) / 2;
-      for (j = 0; j < str.length; j++) {
-        Draw.Character(x, y, str.charCodeAt(j), 2.0);
-        if ((remaining--) === 0) {
-          return;
-        }
-        x += 16;
-      }
-      y += 16;
-    }
-    return;
-  }
-
-  for (i = 0; i < SCR.centerstring.length; i++) {
-    Draw.String((VID.width - (SCR.centerstring[i].length * 16)) / 2, y, SCR.centerstring[i], 2.0);
-    y += 16;
-  }
-};
-
-SCR.CalcRefdef = function() {
-  // TODO: we need to emit an event here and the others have to observe (Sbar, R, GL)
-  SCR.recalc_refdef = false;
-
-  if (SCR.viewsize.value < 30) {
-    Cvar.Set('viewsize', '30');
-  } else if (SCR.viewsize.value > 120) {
-    Cvar.Set('viewsize', '120');
-  }
-
-  let size; let full;
-  if (CL.state.intermission !== 0) {
-    full = true;
-    size = 1.0;
-    Sbar.lines = 0;
-  } else {
-    size = SCR.viewsize.value;
-    if (size >= 120.0) {
-      Sbar.lines = 0;
-    } else if (size >= 110.0) {
-      Sbar.lines = 24;
-    } else {
-      Sbar.lines = 48;
-    }
-    if (size >= 100.0) {
-      full = true;
-      size = 100.0;
-    }
-    size *= 0.01;
-  }
-
-  const vrect = R.refdef.vrect;
-  vrect.width = Math.floor(VID.width * size);
-  if (vrect.width < 96) {
-    size = 96.0 / vrect.width;
-    vrect.width = 96;
-  }
-  vrect.height = Math.floor(VID.height * size);
-  if (vrect.height > (VID.height - Sbar.lines)) {
-    vrect.height = VID.height - Sbar.lines;
-  }
-  vrect.x = (VID.width - vrect.width) / 2;
-  if (full === true) {
-    vrect.y = 0;
-  } else {
-    vrect.y = (VID.height - Sbar.lines - vrect.height) / 2;
-  }
-
-  if (SCR.fov.value < 10) {
-    Cvar.Set('fov', '10');
-  } else if (SCR.fov.value > 170) {
-    Cvar.Set('fov', '170');
-  }
-  if ((vrect.width * 0.75) <= vrect.height) {
-    R.refdef.fov_x = SCR.fov.value;
-    R.refdef.fov_y = Math.atan(vrect.height / (vrect.width / Math.tan(SCR.fov.value * Math.PI / 360.0))) * 360.0 / Math.PI;
-  } else {
-    R.refdef.fov_x = Math.atan(vrect.width / (vrect.height / Math.tan(SCR.fov.value * 0.82 * Math.PI / 360.0))) * 360.0 / Math.PI;
-    R.refdef.fov_y = SCR.fov.value * 0.82;
-  }
-
-  const ymax = 4.0 * Math.tan(R.refdef.fov_y * Math.PI / 360.0);
-  R.perspective[0] = 4.0 / (ymax * R.refdef.vrect.width / R.refdef.vrect.height);
-  R.perspective[5] = 4.0 / ymax;
-};
-
-SCR.SizeUp_f = function() {
-  Cvar.Set('viewsize', SCR.viewsize.value + 10);
-  SCR.recalc_refdef = true;
-};
-
-SCR.SizeDown_f = function() {
-  Cvar.Set('viewsize', SCR.viewsize.value - 10);
-  SCR.recalc_refdef = true;
-};
-
-SCR.disableCrosshair = false;
-
-SCR.Init = function() {
-  SCR.fov = new Cvar('fov', '90', Cvar.FLAG.CHEAT); // TODO: move to R?
-  SCR.viewsize = new Cvar('viewsize', '120', Cvar.FLAG.ARCHIVE);
-  SCR.conspeed = new Cvar('scr_conspeed', '300');
-  SCR.showturtle = new Cvar('showturtle', '0');
-  SCR.showpause = new Cvar('showpause', '1');
-  SCR.centertime = new Cvar('scr_centertime', '2');
-  SCR.printspeed = new Cvar('scr_printspeed', '8');
-  Cmd.AddCommand('screenshot', SCR.ScreenShot_f);
-  Cmd.AddCommand('sizeup', SCR.SizeUp_f);
-  Cmd.AddCommand('sizedown', SCR.SizeDown_f);
-  SCR.net = Draw.LoadPicFromWad('NET');
-  SCR.turtle = Draw.LoadPicFromWad('TURTLE');
-  SCR.pause = Draw.LoadPicFromLumpDeferred('pause');
-  SCR.crosshair = new Cvar('crosshair', '0', Cvar.FLAG.ARCHIVE);
-  SCR.crossx = new Cvar('cl_crossx', '0', Cvar.FLAG.ARCHIVE);
-  SCR.crossy = new Cvar('cl_crossy', '0', Cvar.FLAG.ARCHIVE);
-  SCR.disableCrosshair = CL.gameCapabilities.includes(gameCapabilities.CAP_HUD_INCLUDES_CROSSHAIR);
-};
-
-SCR.count = 0;
-SCR.DrawTurtle = function() {
-  if (SCR.showturtle.value === 0) {
-    return;
-  }
-  if (Host.frametime < 0.1) {
-    SCR.count = 0;
-    return;
-  }
-  if (++SCR.count >= 3) {
-    Draw.Pic(R.refdef.vrect.x, R.refdef.vrect.y, SCR.turtle);
-  }
-};
-
-SCR.DrawNet = function() {
-  if (((Host.realtime - CL.state.last_received_message) >= 0.3) && (CL.cls.demoplayback !== true)) {
-    Draw.Pic(R.refdef.vrect.x, R.refdef.vrect.y, SCR.net);
-  }
-};
-
-SCR.DrawPause = function() {
-  if ((SCR.showpause.value !== 0) && (CL.state.paused === true)) {
-    Draw.Pic((VID.width - SCR.pause.width * 2) / 2, (VID.height - 48 - SCR.pause.height * 2) / 2, SCR.pause, 2);
-  }
-};
-
-SCR.SetUpToDrawConsole = function() {
-  Con.forcedup = (!CL.state.worldmodel) || (CL.cls.signon !== 4);
-
-  if (Con.forcedup === true) {
-    SCR.con_current = 200;
-    return;
-  }
-
-  let conlines;
-  if (Key.dest.value === Key.dest.console) {
-    conlines = 100;
-  } else {
-    conlines = 0;
-  }
-
-  if (conlines < SCR.con_current) {
-    SCR.con_current -= SCR.conspeed.value * Host.frametime;
-    if (conlines > SCR.con_current) {
-      SCR.con_current = conlines;
-    }
-  } else if (conlines > SCR.con_current) {
-    SCR.con_current += SCR.conspeed.value * Host.frametime;
-    if (conlines < SCR.con_current) {
-      SCR.con_current = conlines;
-    }
-  }
-};
-
-SCR.DrawConsole = function() {
-  if (SCR.con_current > 0) {
-    Con.DrawConsole(SCR.con_current);
-    return;
-  }
-  if ((Key.dest.value === Key.dest.game || Key.dest.value === Key.dest.message) && CL.cls.signon === 4) {
-    Con.DrawNotify();
-  }
-};
-
-SCR.ScreenShot_f = function() {
-  SCR.screenshot = true;
-};
-
-SCR.BeginLoadingPlaque = function() {
-  S.StopAllSounds();
-  if ((CL.cls.state !== clientConnectionState.connected) || (CL.cls.signon !== 4)) {
-    return;
-  }
-  SCR.centertime_off = 0.0;
-  SCR.con_current = 0;
-  SCR.disabled_for_loading = true;
-  SCR.disabled_time = Host.realtime + 60.0;
-};
-
-SCR.EndLoadingPlaque = function() {
-  Draw.EndDisc();
-  SCR.disabled_for_loading = false;
-  Con.ClearNotify();
-};
-
-SCR._lastAnimationTime = 0;
-SCR._frameTimes = new Array(30).fill(null);
-SCR._frameTimeIndex = 0;
-SCR.FPS = 0;
-
-SCR.UpdateScreen = function() {
-  // if (SCR.disabled_for_loading === true) {
-  //   if (Host.realtime <= SCR.disabled_time) {
-  //     return;
-  //   }
-  //   SCR.disabled_for_loading = false;
-  //   Con.Print('load failed.\n');
-  // }
-
-  if (SCR.oldfov !== SCR.fov.value) {
-    SCR.oldfov = SCR.fov.value;
-    SCR.recalc_refdef = true;
-  }
-  if (SCR.oldscreensize !== SCR.viewsize.value) {
-    SCR.oldscreensize = SCR.viewsize.value;
-    SCR.recalc_refdef = true;
-  }
-  if (SCR.recalc_refdef === true) {
-    SCR.CalcRefdef();
-  }
-
-  SCR.SetUpToDrawConsole();
-
-  if (SCR._requestedAnimationFrames > 0) {
-    console.assert(SCR._requestedAnimationFrames === 1, 'SCR.UpdateScreen: too many rendering requests active');
-    return;
-  }
-
-  V.PreRenderView(); // do some calculations independent of rendering
-
-  requestAnimationFrame((animationTime) => {
-    // we are already shutting down
-    if (!gl) {
-      return;
-    }
-
-    if (SCR._lastAnimationTime > 0) {
-      SCR._frameTimes[SCR._frameTimeIndex] = animationTime - SCR._lastAnimationTime;
-      SCR._frameTimeIndex = (SCR._frameTimeIndex + 1) % SCR._frameTimes.length;
-
-      const samples = SCR._frameTimes.filter((a) => a !== null);
-      SCR.FPS = 1000 / (samples.reduce((a, b) => a + b, 0) / samples.length);
-
-      if (Host.refreshrate.value === 0 && Host.framecount > SCR._frameTimes.length * 10) {
-        const refreshRate = (Math.ceil(SCR.FPS / 15)) * 15;
-        Con.DPrint(`Determined refresh rate: ${Math.round(SCR.FPS)} FPS\n`);
-        Con.DPrint(`Setting Host refreshrate to ${Math.round(refreshRate)}\n`);
-        Host.refreshrate.set(Math.round(refreshRate));
-      }
-    }
-
-    SCR._lastAnimationTime = animationTime;
-
-    V.RenderView();
-    GL.Set2D();
-    if (R.usePostProcess === true || PostProcess.hasActiveEffects()) {
-      // End scene FBO and resolve through the effect pipeline to screen.
-      // PostProcess.resolve handles both the simple blit (no active effects)
-      // and the chained effect path (warp, motion blur, etc.).
-      PostProcess.end();
-      PostProcess.resolve(
-        R.refdef.vrect.x, R.refdef.vrect.y,
-        R.refdef.vrect.width, R.refdef.vrect.height,
-        PostProcess.colorTexture,
-      );
-
-      const bloomEffect = PostProcess.getEffect('bloom');
-      if (bloomEffect && bloomEffect.active && R.bloomDebug && R.bloomDebug.value !== 0) {
-        bloomEffect.drawDebugPreview();
-      }
-    }
-    if (Con.forcedup !== true) {
-      R.PolyBlend();
-    }
-
-    if (CL.cls.state === clientConnectionState.connecting) {
-      CL.Draw();
-    } else if ((CL.state.intermission === 1) && (Key.dest.value === Key.dest.game)) {
-      if (!CL.sbarDisabled) {
-        Sbar.IntermissionOverlay();
-      } else {
-        CL.DrawHUD();
-      }
-    } else if ((CL.state.intermission === 2) && (Key.dest.value === Key.dest.game)) {
-      if (!CL.sbarDisabled) {
-        Sbar.FinaleOverlay();
-        SCR.DrawCenterString();
-      } else {
-        CL.DrawHUD();
-      }
-    } else if ((CL.state.intermission === 3) && (Key.dest.value === Key.dest.game)) {
-      if (!CL.sbarDisabled) {
-        SCR.DrawCenterString();
-      } else {
-        CL.DrawHUD();
-      }
-    } else {
-      if (!SCR.disableCrosshair && SCR.crosshair.value !== 0) {
-        Draw.Character(R.refdef.vrect.x + (R.refdef.vrect.width / 2) + SCR.crossx.value,
-            R.refdef.vrect.y + (R.refdef.vrect.height / 2) + SCR.crossy.value, 43);
-      }
-      SCR.DrawNet();
-      SCR.DrawTurtle();
-      SCR.DrawPause();
-      SCR.DrawCenterString();
-      if (CL.cls.signon === 4) {
-        CL.DrawHUD();
-      }
-      SCR.DrawConsole();
-      CL.Draw();
-      M.Draw();
-    }
-
-    GL.StreamFlush();
-
-    R.PrintSpeeds();
-
-    gl.disable(gl.BLEND);
-
-    SCR._requestedAnimationFrames--;
-  });
-
-  SCR._requestedAnimationFrames++;
-
-  if (SCR.screenshot === true) {
-    SCR.screenshot = false;
-    gl.finish();
-
-    VID.DownloadScreenshot();
-  }
-};
diff --git a/source/engine/client/SCR.ts b/source/engine/client/SCR.ts
new file mode 100644
index 00000000..592af0c3
--- /dev/null
+++ b/source/engine/client/SCR.ts
@@ -0,0 +1,464 @@
+import { gameCapabilities } from '../../shared/Defs.ts';
+import Cmd from '../common/Cmd.ts';
+import Cvar from '../common/Cvar.ts';
+import { clientConnectionState } from '../common/Def.ts';
+import { eventBus, getClientRegistry } from '../registry.mjs';
+import GL from './GL.ts';
+import VID from './VID.ts';
+import PostProcess from './renderer/PostProcess.ts';
+
+let { CL, Con, Draw, Host, Key, M, R, S, Sbar, V } = getClientRegistry();
+
+eventBus.subscribe('registry.frozen', () => {
+  ({ CL, Con, Draw, Host, Key, M, R, S, Sbar, V } = getClientRegistry());
+});
+
+let gl: WebGL2RenderingContext = null!;
+
+eventBus.subscribe('gl.ready', () => {
+  gl = GL.gl;
+});
+
+eventBus.subscribe('gl.shutdown', () => {
+  gl = null!;
+});
+
+eventBus.subscribe('vid.resize', () => {
+  SCR.recalc_refdef = true;
+});
+
+eventBus.subscribe('server.spawning', () => {
+  SCR.centertime_off = 0.0;
+});
+
+export default class SCR {
+  static con_current = 0;
+  static centerstring: string[] = [];
+  static centertime_off = 0.0;
+  static centertime_start = 0;
+
+  static _requestedAnimationFrames = 0;
+
+  static recalc_refdef = false;
+  static disabled_for_loading = false;
+  static disabled_time = 0;
+  static screenshot = false;
+
+  /** True when the crosshair should be suppressed (e.g. HUD includes its own crosshair). */
+  static disableCrosshair = false;
+
+  static count = 0;
+  static FPS = 0;
+
+  static _lastAnimationTime = 0;
+  static _frameTimes: (number | null)[] = new Array(30).fill(null);
+  static _frameTimeIndex = 0;
+
+  // Tracked to detect changes and trigger refdef recalculation
+  static oldfov = 0;
+  static oldscreensize = 0;
+
+  // Cvars — initialized in Init()
+  static fov: Cvar = null!;
+  static viewsize: Cvar = null!;
+  static conspeed: Cvar = null!;
+  static showturtle: Cvar = null!;
+  static showpause: Cvar = null!;
+  static centertime: Cvar = null!;
+  static printspeed: Cvar = null!;
+  static crosshair: Cvar = null!;
+  static crossx: Cvar = null!;
+  static crossy: Cvar = null!;
+
+  // Textures — initialized in Init()
+  static net: ReturnType<typeof Draw.LoadPicFromWad> = null!;
+  static turtle: ReturnType<typeof Draw.LoadPicFromWad> = null!;
+  static pause: ReturnType<typeof Draw.LoadPicFromLumpDeferred> = null!;
+
+  /**
+   * Formats a center-print string into wrapped lines and starts the display timer.
+   */
+  static CenterPrint(str: string): void {
+    SCR.centerstring = [];
+    let i; let start = 0; let next;
+    for (i = 0; i < str.length; i++) {
+      if (str.charCodeAt(i) === 10) {
+        next = i + 1;
+      } else if ((i - start) >= 40) {
+        next = i;
+      } else {
+        continue;
+      }
+      SCR.centerstring[SCR.centerstring.length] = str.substring(start, i);
+      start = next!;
+    }
+    SCR.centerstring[SCR.centerstring.length] = str.substring(start, i);
+    SCR.centertime_off = SCR.centertime.value;
+    SCR.centertime_start = CL.state.time;
+  }
+
+  /**
+   * Draws the center-print string to the screen, advancing the typewriter for intermissions.
+   */
+  static DrawCenterString(): void {
+    SCR.centertime_off -= Host.frametime;
+    if (((SCR.centertime_off <= 0.0) && (CL.state.intermission === 0)) || (Key.dest.value !== Key.dest.game)) {
+      return;
+    }
+
+    let y;
+    if (SCR.centerstring.length <= 4) {
+      y = Math.floor(VID.height * 0.35);
+    } else {
+      y = 48;
+    }
+
+    let i;
+    if (CL.state.intermission) {
+      let remaining = Math.floor(SCR.printspeed.value * (CL.state.time - SCR.centertime_start));
+      let str; let x; let j;
+      for (i = 0; i < SCR.centerstring.length; i++) {
+        str = SCR.centerstring[i];
+        x = (VID.width - (str.length * 16)) / 2;
+        for (j = 0; j < str.length; j++) {
+          Draw.Character(x, y, str.charCodeAt(j), 2.0);
+          if ((remaining--) === 0) {
+            return;
+          }
+          x += 16;
+        }
+        y += 16;
+      }
+      return;
+    }
+
+    for (i = 0; i < SCR.centerstring.length; i++) {
+      Draw.String((VID.width - (SCR.centerstring[i].length * 16)) / 2, y, SCR.centerstring[i], 2.0);
+      y += 16;
+    }
+  }
+
+  /**
+   * Recalculates the 3D viewport rectangle and FOV from the current cvars.
+   */
+  static CalcRefdef(): void {
+    SCR.recalc_refdef = false;
+
+    if (SCR.viewsize.value < 30) {
+      Cvar.Set('viewsize', '30');
+    } else if (SCR.viewsize.value > 120) {
+      Cvar.Set('viewsize', '120');
+    }
+
+    let size; let full;
+    if (CL.state.intermission !== 0) {
+      full = true;
+      size = 1.0;
+      Sbar.lines = 0;
+    } else {
+      size = SCR.viewsize.value;
+      if (size >= 120.0) {
+        Sbar.lines = 0;
+      } else if (size >= 110.0) {
+        Sbar.lines = 24;
+      } else {
+        Sbar.lines = 48;
+      }
+      if (size >= 100.0) {
+        full = true;
+        size = 100.0;
+      }
+      size *= 0.01;
+    }
+
+    const vrect = R.refdef.vrect;
+    vrect.width = Math.floor(VID.width * size);
+    if (vrect.width < 96) {
+      size = 96.0 / vrect.width;
+      vrect.width = 96;
+    }
+    vrect.height = Math.floor(VID.height * size);
+    if (vrect.height > (VID.height - Sbar.lines)) {
+      vrect.height = VID.height - Sbar.lines;
+    }
+    vrect.x = (VID.width - vrect.width) / 2;
+    if (full === true) {
+      vrect.y = 0;
+    } else {
+      vrect.y = (VID.height - Sbar.lines - vrect.height) / 2;
+    }
+
+    if (SCR.fov.value < 10) {
+      Cvar.Set('fov', '10');
+    } else if (SCR.fov.value > 170) {
+      Cvar.Set('fov', '170');
+    }
+    if ((vrect.width * 0.75) <= vrect.height) {
+      R.refdef.fov_x = SCR.fov.value;
+      R.refdef.fov_y = Math.atan(vrect.height / (vrect.width / Math.tan(SCR.fov.value * Math.PI / 360.0))) * 360.0 / Math.PI;
+    } else {
+      R.refdef.fov_x = Math.atan(vrect.width / (vrect.height / Math.tan(SCR.fov.value * 0.82 * Math.PI / 360.0))) * 360.0 / Math.PI;
+      R.refdef.fov_y = SCR.fov.value * 0.82;
+    }
+
+    const ymax = 4.0 * Math.tan(R.refdef.fov_y * Math.PI / 360.0);
+    R.perspective[0] = 4.0 / (ymax * R.refdef.vrect.width / R.refdef.vrect.height);
+    R.perspective[5] = 4.0 / ymax;
+  }
+
+  /** Console command: increases the view size. */
+  static SizeUp_f(): void {
+    Cvar.Set('viewsize', SCR.viewsize.value + 10);
+    SCR.recalc_refdef = true;
+  }
+
+  /** Console command: decreases the view size. */
+  static SizeDown_f(): void {
+    Cvar.Set('viewsize', SCR.viewsize.value - 10);
+    SCR.recalc_refdef = true;
+  }
+
+  /**
+   * Initializes the SCR system: registers cvars, commands, and loads textures.
+   */
+  static Init(): void {
+    SCR.fov = new Cvar('fov', '90', Cvar.FLAG.CHEAT); // TODO: move to R?
+    SCR.viewsize = new Cvar('viewsize', '120', Cvar.FLAG.ARCHIVE);
+    SCR.conspeed = new Cvar('scr_conspeed', '300');
+    SCR.showturtle = new Cvar('showturtle', '0');
+    SCR.showpause = new Cvar('showpause', '1');
+    SCR.centertime = new Cvar('scr_centertime', '2');
+    SCR.printspeed = new Cvar('scr_printspeed', '8');
+    Cmd.AddCommand('screenshot', SCR.ScreenShot_f);
+    Cmd.AddCommand('sizeup', SCR.SizeUp_f);
+    Cmd.AddCommand('sizedown', SCR.SizeDown_f);
+    SCR.net = Draw.LoadPicFromWad('NET');
+    SCR.turtle = Draw.LoadPicFromWad('TURTLE');
+    SCR.pause = Draw.LoadPicFromLumpDeferred('pause');
+    SCR.crosshair = new Cvar('crosshair', '0', Cvar.FLAG.ARCHIVE);
+    SCR.crossx = new Cvar('cl_crossx', '0', Cvar.FLAG.ARCHIVE);
+    SCR.crossy = new Cvar('cl_crossy', '0', Cvar.FLAG.ARCHIVE);
+    SCR.disableCrosshair = CL.gameCapabilities.includes(gameCapabilities.CAP_HUD_INCLUDES_CROSSHAIR);
+  }
+
+  /** Draws the low-frame-rate turtle indicator. */
+  static DrawTurtle(): void {
+    if (SCR.showturtle.value === 0) {
+      return;
+    }
+    if (Host.frametime < 0.1) {
+      SCR.count = 0;
+      return;
+    }
+    if (++SCR.count >= 3) {
+      Draw.Pic(R.refdef.vrect.x, R.refdef.vrect.y, SCR.turtle);
+    }
+  }
+
+  /** Draws the network-lag indicator when packets are delayed. */
+  static DrawNet(): void {
+    if (((Host.realtime - CL.state.last_received_message) >= 0.3) && (CL.cls.demoplayback !== true)) {
+      Draw.Pic(R.refdef.vrect.x, R.refdef.vrect.y, SCR.net);
+    }
+  }
+
+  /** Draws the pause indicator when the game is paused. */
+  static DrawPause(): void {
+    if ((SCR.showpause.value !== 0) && (CL.state.paused === true)) {
+      Draw.Pic((VID.width - SCR.pause.width * 2) / 2, (VID.height - 48 - SCR.pause.height * 2) / 2, SCR.pause, 2);
+    }
+  }
+
+  /**
+   * Determines whether the console should be drawn full-screen (forcedup) or at the configured slide height.
+   */
+  static SetUpToDrawConsole(): void {
+    Con.forcedup = (!CL.state.worldmodel) || (CL.cls.signon !== 4);
+
+    if (Con.forcedup === true) {
+      SCR.con_current = 200;
+      return;
+    }
+
+    let conlines;
+    if (Key.dest.value === Key.dest.console) {
+      conlines = 100;
+    } else {
+      conlines = 0;
+    }
+
+    if (conlines < SCR.con_current) {
+      SCR.con_current -= SCR.conspeed.value * Host.frametime;
+      if (conlines > SCR.con_current) {
+        SCR.con_current = conlines;
+      }
+    } else if (conlines > SCR.con_current) {
+      SCR.con_current += SCR.conspeed.value * Host.frametime;
+      if (conlines < SCR.con_current) {
+        SCR.con_current = conlines;
+      }
+    }
+  }
+
+  /**
+   * Draws the console or, if it is hidden, the notify messages.
+   */
+  static DrawConsole(): void {
+    if (SCR.con_current > 0) {
+      Con.DrawConsole(SCR.con_current);
+      return;
+    }
+    if ((Key.dest.value === Key.dest.game || Key.dest.value === Key.dest.message) && CL.cls.signon === 4) {
+      Con.DrawNotify();
+    }
+  }
+
+  /** Requests a screenshot on the next rendered frame. */
+  static ScreenShot_f(): void {
+    SCR.screenshot = true;
+  }
+
+  /** Stops all sounds and blanks the display while a map is loading. */
+  static BeginLoadingPlaque(): void {
+    S.StopAllSounds();
+    if ((CL.cls.state !== clientConnectionState.connected) || (CL.cls.signon !== 4)) {
+      return;
+    }
+    SCR.centertime_off = 0.0;
+    SCR.con_current = 0;
+    SCR.disabled_for_loading = true;
+    SCR.disabled_time = Host.realtime + 60.0;
+  }
+
+  /** Unhides the display and clears console notifications after loading completes. */
+  static EndLoadingPlaque(): void {
+    Draw.EndDisc();
+    SCR.disabled_for_loading = false;
+    Con.ClearNotify();
+  }
+
+  /**
+   * Drives one render frame: updates the refdef, dispatches the rAF callback,
+   * and optionally captures a screenshot.
+   */
+  static UpdateScreen(): void {
+    if (SCR.oldfov !== SCR.fov.value) {
+      SCR.oldfov = SCR.fov.value;
+      SCR.recalc_refdef = true;
+    }
+    if (SCR.oldscreensize !== SCR.viewsize.value) {
+      SCR.oldscreensize = SCR.viewsize.value;
+      SCR.recalc_refdef = true;
+    }
+    if (SCR.recalc_refdef === true) {
+      SCR.CalcRefdef();
+    }
+
+    SCR.SetUpToDrawConsole();
+
+    if (SCR._requestedAnimationFrames > 0) {
+      console.assert(SCR._requestedAnimationFrames === 1, 'SCR.UpdateScreen: too many rendering requests active');
+      return;
+    }
+
+    V.PreRenderView(); // do some calculations independent of rendering
+
+    requestAnimationFrame((animationTime) => {
+      // we are already shutting down
+      if ((gl as WebGL2RenderingContext | null) === null) {
+        return;
+      }
+
+      if (SCR._lastAnimationTime > 0) {
+        SCR._frameTimes[SCR._frameTimeIndex] = animationTime - SCR._lastAnimationTime;
+        SCR._frameTimeIndex = (SCR._frameTimeIndex + 1) % SCR._frameTimes.length;
+
+        const samples = SCR._frameTimes.filter((a): a is number => a !== null);
+        SCR.FPS = 1000 / (samples.reduce((a, b) => a + b, 0) / samples.length);
+
+        if (Host.refreshrate.value === 0 && Host.framecount > SCR._frameTimes.length * 10) {
+          const refreshRate = (Math.ceil(SCR.FPS / 15)) * 15;
+          Con.DPrint(`Determined refresh rate: ${Math.round(SCR.FPS)} FPS\n`);
+          Con.DPrint(`Setting Host refreshrate to ${Math.round(refreshRate)}\n`);
+          Host.refreshrate.set(Math.round(refreshRate));
+        }
+      }
+
+      SCR._lastAnimationTime = animationTime;
+
+      V.RenderView();
+      GL.Set2D();
+      if (R.usePostProcess === true || PostProcess.hasActiveEffects()) {
+        PostProcess.end();
+        PostProcess.resolve(
+          R.refdef.vrect.x, R.refdef.vrect.y,
+          R.refdef.vrect.width, R.refdef.vrect.height,
+          PostProcess.colorTexture,
+        );
+
+        const bloomEffect = PostProcess.getEffect('bloom');
+        if (bloomEffect && bloomEffect.active && R.bloomDebug && R.bloomDebug.value !== 0) {
+          bloomEffect.drawDebugPreview();
+        }
+      }
+      if (Con.forcedup !== true) {
+        R.PolyBlend();
+      }
+
+      if (CL.cls.state === clientConnectionState.connecting) {
+        CL.Draw();
+      } else if ((CL.state.intermission === 1) && (Key.dest.value === Key.dest.game)) {
+        if (!CL.sbarDisabled) {
+          Sbar.IntermissionOverlay();
+        } else {
+          CL.DrawHUD();
+        }
+      } else if ((CL.state.intermission === 2) && (Key.dest.value === Key.dest.game)) {
+        if (!CL.sbarDisabled) {
+          Sbar.FinaleOverlay();
+          SCR.DrawCenterString();
+        } else {
+          CL.DrawHUD();
+        }
+      } else if ((CL.state.intermission === 3) && (Key.dest.value === Key.dest.game)) {
+        if (!CL.sbarDisabled) {
+          SCR.DrawCenterString();
+        } else {
+          CL.DrawHUD();
+        }
+      } else {
+        if (!SCR.disableCrosshair && SCR.crosshair.value !== 0) {
+          Draw.Character(R.refdef.vrect.x + (R.refdef.vrect.width / 2) + SCR.crossx.value,
+            R.refdef.vrect.y + (R.refdef.vrect.height / 2) + SCR.crossy.value, 43);
+        }
+        SCR.DrawNet();
+        SCR.DrawTurtle();
+        SCR.DrawPause();
+        SCR.DrawCenterString();
+        if (CL.cls.signon === 4) {
+          CL.DrawHUD();
+        }
+        SCR.DrawConsole();
+        CL.Draw();
+        M.Draw();
+      }
+
+      GL.StreamFlush();
+
+      R.PrintSpeeds();
+
+      gl.disable(gl.BLEND);
+
+      SCR._requestedAnimationFrames--;
+    });
+
+    SCR._requestedAnimationFrames++;
+
+    if (SCR.screenshot === true) {
+      SCR.screenshot = false;
+      gl.finish();
+
+      VID.DownloadScreenshot();
+    }
+  }
+}
diff --git a/source/engine/client/Sbar.mjs b/source/engine/client/Sbar.mjs
deleted file mode 100644
index f18ed8e3..00000000
--- a/source/engine/client/Sbar.mjs
+++ /dev/null
@@ -1,657 +0,0 @@
-/* globalx Sbar Draw, COM, Host, CL, Cmd, SCR, Def, VID */
-
-import Cmd from '../common/Cmd.ts';
-import { eventBus, registry } from '../registry.mjs';
-import VID from './VID.ts';
-import * as Def from '../common/Def.ts';
-import Cvar from '../common/Cvar.ts';
-
-const Sbar = {};
-
-export default Sbar;
-
-let { CL, COM, Draw, SCR } = registry;
-
-eventBus.subscribe('registry.frozen', () => {
-  CL = registry.CL;
-  COM = registry.COM;
-  Draw = registry.Draw;
-  SCR = registry.SCR;
-});
-
-Sbar.ShowScores = function() {
-  Sbar.showscores = true;
-};
-
-Sbar.DontShowScores = function() {
-  Sbar.showscores = false;
-};
-
-Sbar.Init = async function() {
-  let i;
-
-  Sbar.nums = [[], []];
-  for (i = 0; i < 10; i++) {
-    Sbar.nums[0][i] = Draw.LoadPicFromWad('NUM_' + i);
-    Sbar.nums[1][i] = Draw.LoadPicFromWad('ANUM_' + i);
-  }
-  Sbar.nums[0][10] = Draw.LoadPicFromWad('NUM_MINUS');
-  Sbar.nums[1][10] = Draw.LoadPicFromWad('ANUM_MINUS');
-  Sbar.colon = Draw.LoadPicFromWad('NUM_COLON');
-  Sbar.slash = Draw.LoadPicFromWad('NUM_SLASH');
-
-  Sbar.weapons = [
-    [
-      Draw.LoadPicFromWad('INV_SHOTGUN'),
-      Draw.LoadPicFromWad('INV_SSHOTGUN'),
-      Draw.LoadPicFromWad('INV_NAILGUN'),
-      Draw.LoadPicFromWad('INV_SNAILGUN'),
-      Draw.LoadPicFromWad('INV_RLAUNCH'),
-      Draw.LoadPicFromWad('INV_SRLAUNCH'),
-      Draw.LoadPicFromWad('INV_LIGHTNG'),
-    ],
-    [
-      Draw.LoadPicFromWad('INV2_SHOTGUN'),
-      Draw.LoadPicFromWad('INV2_SSHOTGUN'),
-      Draw.LoadPicFromWad('INV2_NAILGUN'),
-      Draw.LoadPicFromWad('INV2_SNAILGUN'),
-      Draw.LoadPicFromWad('INV2_RLAUNCH'),
-      Draw.LoadPicFromWad('INV2_SRLAUNCH'),
-      Draw.LoadPicFromWad('INV2_LIGHTNG'),
-    ],
-  ];
-  for (i = 0; i <= 4; i++) {
-    Sbar.weapons[2 + i] = [
-      Draw.LoadPicFromWad('INVA' + (i + 1) + '_SHOTGUN'),
-      Draw.LoadPicFromWad('INVA' + (i + 1) + '_SSHOTGUN'),
-      Draw.LoadPicFromWad('INVA' + (i + 1) + '_NAILGUN'),
-      Draw.LoadPicFromWad('INVA' + (i + 1) + '_SNAILGUN'),
-      Draw.LoadPicFromWad('INVA' + (i + 1) + '_RLAUNCH'),
-      Draw.LoadPicFromWad('INVA' + (i + 1) + '_SRLAUNCH'),
-      Draw.LoadPicFromWad('INVA' + (i + 1) + '_LIGHTNG'),
-    ];
-  }
-
-  Sbar.ammo = [
-    Draw.LoadPicFromWad('SB_SHELLS'),
-    Draw.LoadPicFromWad('SB_NAILS'),
-    Draw.LoadPicFromWad('SB_ROCKET'),
-    Draw.LoadPicFromWad('SB_CELLS'),
-  ];
-
-  Sbar.armor = [
-    Draw.LoadPicFromWad('SB_ARMOR1'),
-    Draw.LoadPicFromWad('SB_ARMOR2'),
-    Draw.LoadPicFromWad('SB_ARMOR3'),
-  ];
-
-  Sbar.items = [
-    Draw.LoadPicFromWad('SB_KEY1'),
-    Draw.LoadPicFromWad('SB_KEY2'),
-    Draw.LoadPicFromWad('SB_INVIS'),
-    Draw.LoadPicFromWad('SB_INVULN'),
-    Draw.LoadPicFromWad('SB_SUIT'),
-    Draw.LoadPicFromWad('SB_QUAD'),
-  ];
-
-  Sbar.sigil = [
-    Draw.LoadPicFromWad('SB_SIGIL1'),
-    Draw.LoadPicFromWad('SB_SIGIL2'),
-    Draw.LoadPicFromWad('SB_SIGIL3'),
-    Draw.LoadPicFromWad('SB_SIGIL4'),
-  ];
-
-  Sbar.faces = [];
-  for (i = 0; i <= 4; i++) {
-    Sbar.faces[i] = [
-      Draw.LoadPicFromWad('FACE' + (5 - i)),
-      Draw.LoadPicFromWad('FACE_P' + (5 - i)),
-    ];
-  }
-  Sbar.face_invis = Draw.LoadPicFromWad('FACE_INVIS');
-  Sbar.face_invuln = Draw.LoadPicFromWad('FACE_INVUL2');
-  Sbar.face_invis_invuln = Draw.LoadPicFromWad('FACE_INV2');
-  Sbar.face_quad = Draw.LoadPicFromWad('FACE_QUAD');
-
-  Cmd.AddCommand('+showscores', Sbar.ShowScores);
-  Cmd.AddCommand('-showscores', Sbar.DontShowScores);
-
-  Sbar.sbar = Draw.LoadPicFromWad('SBAR');
-  Sbar.ibar = Draw.LoadPicFromWad('IBAR');
-  Sbar.scorebar = Draw.LoadPicFromWad('SCOREBAR');
-
-  Sbar.ranking = await Draw.LoadPicFromLump('ranking');
-  Sbar.complete = await Draw.LoadPicFromLump('complete');
-  Sbar.inter = await Draw.LoadPicFromLump('inter');
-  Sbar.finale = await Draw.LoadPicFromLump('finale');
-
-  Sbar.disc = Draw.LoadPicFromWad('DISC');
-
-  if (COM.hipnotic === true) {
-    Sbar.h_weapons = [[
-      Draw.LoadPicFromWad('INV_LASER'),
-      Draw.LoadPicFromWad('INV_MJOLNIR'),
-      Draw.LoadPicFromWad('INV_GREN_PROX'),
-      Draw.LoadPicFromWad('INV_PROX_GREN'),
-      Draw.LoadPicFromWad('INV_PROX'),
-    ],
-    [
-      Draw.LoadPicFromWad('INV2_LASER'),
-      Draw.LoadPicFromWad('INV2_MJOLNIR'),
-      Draw.LoadPicFromWad('INV2_GREN_PROX'),
-      Draw.LoadPicFromWad('INV2_PROX_GREN'),
-      Draw.LoadPicFromWad('INV2_PROX'),
-    ]];
-    for (i = 0; i <= 4; i++) {
-      Sbar.h_weapons[2 + i] = [
-        Draw.LoadPicFromWad('INVA' + (i + 1) + '_LASER'),
-        Draw.LoadPicFromWad('INVA' + (i + 1) + '_MJOLNIR'),
-        Draw.LoadPicFromWad('INVA' + (i + 1) + '_GREN_PROX'),
-        Draw.LoadPicFromWad('INVA' + (i + 1) + '_PROX_GREN'),
-        Draw.LoadPicFromWad('INVA' + (i + 1) + '_PROX'),
-      ];
-    }
-    Sbar.hipweapons = [Def.hit.laser_cannon_bit, Def.hit.mjolnir_bit, 4, Def.hit.proximity_gun_bit];
-    Sbar.h_items = [
-      Draw.LoadPicFromWad('SB_WSUIT'),
-      Draw.LoadPicFromWad('SB_ESHLD'),
-    ];
-  } else if (COM.rogue === true) {
-    Sbar.r_invbar = [
-      Draw.LoadPicFromWad('R_INVBAR1'),
-      Draw.LoadPicFromWad('R_INVBAR2'),
-    ];
-    Sbar.r_weapons = [
-      Draw.LoadPicFromWad('R_LAVA'),
-      Draw.LoadPicFromWad('R_SUPERLAVA'),
-      Draw.LoadPicFromWad('R_GREN'),
-      Draw.LoadPicFromWad('R_MULTIROCK'),
-      Draw.LoadPicFromWad('R_PLASMA'),
-    ];
-    Sbar.r_items = [
-      Draw.LoadPicFromWad('R_SHIELD1'),
-      Draw.LoadPicFromWad('R_AGRAV1'),
-    ];
-    Sbar.r_teambord = Draw.LoadPicFromWad('R_TEAMBORD');
-    Sbar.r_ammo = [
-      Draw.LoadPicFromWad('R_AMMOLAVA'),
-      Draw.LoadPicFromWad('R_AMMOMULTI'),
-      Draw.LoadPicFromWad('R_AMMOPLASMA'),
-    ];
-  }
-};
-
-Sbar.DrawPic = function(x, y, pic) {
-  if (CL.state.maxclients > 1) {
-    Draw.Pic(x, y + VID.height - 24, pic);
-  } else {
-    Draw.Pic(x + (VID.width >> 1) - 160, y + VID.height - 24, pic);
-  }
-};
-
-Sbar.DrawCharacter = function(x, y, num) {
-  if (CL.state.maxclients > 1) {
-    Draw.Character(x + 4, y + VID.height - 24, num);
-  } else {
-    Draw.Character(x + (VID.width >> 1) - 156, y + VID.height - 24, num);
-  }
-};
-
-Sbar.DrawString = function(x, y, str) {
-  if (CL.state.maxclients > 1) {
-    Draw.String(x, y + VID.height - 24, str);
-  } else {
-    Draw.String(x + (VID.width >> 1) - 160, y + VID.height - 24, str);
-  }
-};
-
-Sbar.DrawNum = function(x, y, num, digits, color) {
-  let str = num.toString();
-  if (str.length > digits) {
-    str = str.substring(str.length - digits, str.length);
-  } else if (str.length < digits) {
-    x += (digits - str.length) * 24;
-  }
-  let i; let frame;
-  for (i = 0; i < str.length; i++) {
-    frame = str.charCodeAt(i);
-    Sbar.DrawPic(x, y, Sbar.nums[color][frame === 45 ? 10 : frame - 48]);
-    x += 24;
-  }
-};
-
-Sbar.fragsort = [];
-
-Sbar.SortFrags = function() {
-  Sbar.scoreboardlines = 0;
-  let i; let j; let k;
-  for (i = 0; i < CL.state.maxclients; i++) {
-    if (CL.state.scores[i].name.length !== 0) {
-      Sbar.fragsort[Sbar.scoreboardlines++] = i;
-    }
-  }
-  // CR: this could have been one .sort() call…
-  for (i = 0; i < Sbar.scoreboardlines; i++) {
-    for (j = 0; j < (Sbar.scoreboardlines - 1 - i); j++) {
-      if (CL.state.scores[Sbar.fragsort[j]].frags < CL.state.scores[Sbar.fragsort[j + 1]].frags) {
-        k = Sbar.fragsort[j];
-        Sbar.fragsort[j] = Sbar.fragsort[j + 1];
-        Sbar.fragsort[j + 1] = k;
-      }
-    }
-  }
-};
-
-Sbar.SoloScoreboard = function() {
-  let str;
-
-  Sbar.DrawString(8, 4, 'Monsters:    /');
-  str = CL.state.stats[Def.stat.monsters].toString();
-  Sbar.DrawString(104 - (str.length << 3), 4, str);
-  str = CL.state.stats[Def.stat.totalmonsters].toString();
-  Sbar.DrawString(144 - (str.length << 3), 4, str);
-
-  Sbar.DrawString(8, 12, 'Secrets :    /');
-  str = CL.state.stats[Def.stat.secrets].toString();
-  Sbar.DrawString(104 - (str.length << 3), 12, str);
-  str = CL.state.stats[Def.stat.totalsecrets].toString();
-  Sbar.DrawString(144 - (str.length << 3), 12, str);
-
-  const minutes = Math.floor(CL.state.time / 60.0);
-  const seconds = Math.floor(CL.state.time - 60 * minutes);
-  const tens = Math.floor(seconds / 10.0);
-  str = (seconds - 10 * tens).toString();
-  Sbar.DrawString(184, 4, 'Time :   :' + tens + str);
-  str = minutes.toString();
-  Sbar.DrawString(256 - (str.length << 3), 4, str);
-
-  Sbar.DrawString(232 - (CL.state.levelname.length << 2), 12, CL.state.levelname);
-};
-
-Sbar.DrawInventory = function() {
-  let i;
-
-  if (COM.rogue === true) {
-    Sbar.DrawPic(0, -24, Sbar.r_invbar[CL.state.stats[Def.stat.activeweapon] >= Def.rit.lava_nailgun ? 0 : 1]);
-  } else {
-    Sbar.DrawPic(0, -24, Sbar.ibar);
-  }
-
-  let flashon;
-  for (i = 0; i <= 6; i++) {
-    if ((CL.state.items & (Def.it.shotgun << i)) === 0) {
-      continue;
-    }
-    flashon = Math.floor((CL.state.time - CL.state.item_gettime[i]) * 10.0);
-    if (flashon >= 10) {
-      flashon = CL.state.stats[Def.stat.activeweapon] === (Def.it.shotgun << i) ? 1 : 0;
-    } else {
-      flashon = (flashon % 5) + 2;
-    }
-    Sbar.DrawPic(i * 24, -16, Sbar.weapons[flashon][i]);
-  }
-  if (COM.hipnotic === true) {
-    let grenadeflashing = false;
-    for (i = 0; i <= 3; i++) {
-      if ((CL.state.items & (1 << Sbar.hipweapons[i])) !== 0) {
-        flashon = Math.floor((CL.state.time - CL.state.item_gettime[i]) * 10.0);
-        if (flashon >= 10) {
-          flashon = CL.state.stats[Def.stat.activeweapon] === (1 << Sbar.hipweapons[i]) ? 1 : 0;
-        } else {
-          flashon = (flashon % 5) + 2;
-        }
-
-        if (i === 2) {
-          if (((CL.state.items & Def.hit.proximity_gun) !== 0) && (flashon !== 0)) {
-            grenadeflashing = true;
-            Sbar.DrawPic(96, -16, Sbar.h_weapons[flashon][2]);
-          }
-        } else if (i === 3) {
-          if ((CL.state.items & Def.it.grenade_launcher) !== 0) {
-            if (grenadeflashing !== true) {
-              Sbar.DrawPic(96, -16, Sbar.h_weapons[flashon][3]);
-            }
-          } else {
-            Sbar.DrawPic(96, -16, Sbar.h_weapons[flashon][4]);
-          }
-        } else {
-          Sbar.DrawPic(176 + i * 24, -16, Sbar.h_weapons[flashon][i]);
-        }
-      }
-    }
-  } else if (COM.rogue === true) {
-    if (CL.state.stats[Def.stat.activeweapon] >= Def.rit.lava_nailgun) {
-      for (i = 0; i <= 4; i++) {
-        if (CL.state.stats[Def.stat.activeweapon] === (Def.rit.lava_nailgun << i)) {
-          Sbar.DrawPic((i + 2) * 24, -16, Sbar.r_weapons[i]);
-        }
-      }
-    }
-  }
-
-  for (i = 0; i <= 3; i++) {
-    const num = CL.state.stats[Def.stat.shells + i].toString();
-    switch (num.length) {
-      case 1:
-        Sbar.DrawCharacter(((6 * i + 3) << 3) - 2, -24, num.charCodeAt(0) - 30);
-        continue;
-      case 2:
-        Sbar.DrawCharacter(((6 * i + 2) << 3) - 2, -24, num.charCodeAt(0) - 30);
-        Sbar.DrawCharacter(((6 * i + 3) << 3) - 2, -24, num.charCodeAt(1) - 30);
-        continue;
-      case 3:
-        Sbar.DrawCharacter(((6 * i + 1) << 3) - 2, -24, num.charCodeAt(0) - 30);
-        Sbar.DrawCharacter(((6 * i + 2) << 3) - 2, -24, num.charCodeAt(1) - 30);
-        Sbar.DrawCharacter(((6 * i + 3) << 3) - 2, -24, num.charCodeAt(2) - 30);
-    }
-  }
-
-  if (COM.hipnotic === true) {
-    for (i = 2; i <= 5; i++) {
-      if ((CL.state.items & (1 << (17 + i))) !== 0) {
-        Sbar.DrawPic(192 + (i << 4), -16, Sbar.items[i]);
-      }
-    }
-    if ((CL.state.items & 16777216) !== 0) {
-      Sbar.DrawPic(288, -16, Sbar.h_items[0]);
-    }
-    if ((CL.state.items & 33554432) !== 0) {
-      Sbar.DrawPic(304, -16, Sbar.h_items[1]);
-    }
-  } else {
-    for (i = 0; i <= 5; i++) {
-      if ((CL.state.items & (1 << (17 + i))) !== 0) {
-        Sbar.DrawPic(192 + (i << 4), -16, Sbar.items[i]);
-      }
-    }
-    if (COM.rogue === true) {
-      if ((CL.state.items & 536870912) !== 0) {
-        Sbar.DrawPic(288, -16, Sbar.r_items[0]);
-      }
-      if ((CL.state.items & 1073741824) !== 0) {
-        Sbar.DrawPic(304, -16, Sbar.r_items[1]);
-      }
-    } else {
-      for (i = 0; i <= 3; i++) {
-        if (((CL.state.items >>> (28 + i)) & 1) !== 0) {
-          Sbar.DrawPic(288 + (i << 3), -16, Sbar.sigil[i]);
-        }
-      }
-    }
-  }
-};
-
-Sbar.DrawFrags = function() {
-  Sbar.SortFrags();
-  const l = Sbar.scoreboardlines <= 4 ? Sbar.scoreboardlines : 4;
-  let x = 23;
-  const xofs = CL.state.maxclients === 1 ? 10 : (VID.width >> 1) - 150;
-  const y = VID.height - 47;
-  let i; let k; let s; let num;
-  for (i = 0; i < l; i++) {
-    k = Sbar.fragsort[i];
-    s = CL.state.scores[k];
-    if (s.name.length === 0) {
-      continue;
-    }
-    Draw.FillIndexed(xofs + (x << 3), y, 28, 4, (s.colors & 0xf0) + 8);
-    Draw.FillIndexed(xofs + (x << 3), y + 4, 28, 3, ((s.colors & 0xf) << 4) + 8);
-    num = s.frags.toString();
-    Sbar.DrawString(((x - num.length) << 3) + 36, -24, num);
-    if (k === (CL.state.viewentity - 1)) {
-      Sbar.DrawCharacter((x << 3) + 2, -24, 16);
-      Sbar.DrawCharacter((x << 3) + 28, -24, 17);
-    }
-    x += 4;
-  }
-};
-
-Sbar.DrawFace = function() {
-  if ((COM.rogue === true) && (CL.state.maxclients !== 1) && (Cvar.FindVar('teamplay').value >= 4) && (Cvar.FindVar('teamplay').value <= 6)) { // Legacy cvars
-    const s = CL.state.scores[CL.state.viewentity - 1];
-    const top = (s.colors & 0xf0) + 8;
-    const xofs = CL.state.maxclients === 1 ? 113 : (VID.width >> 1) - 47;
-    Sbar.DrawPic(112, 0, Sbar.r_teambord);
-    Draw.FillIndexed(xofs, VID.height - 21, 22, 9, top);
-    Draw.FillIndexed(xofs, VID.height - 12, 22, 9, ((s.colors & 0xf) << 4) + 8);
-    let num = (top === 8 ? '\x3e\x3e\x3e' : '   ') + s.frags;
-    if (num.length > 3) {
-      num = num.substring(num.length - 3);
-    }
-    if (top === 8) {
-      Sbar.DrawCharacter(109, 3, num.charCodeAt(0) - 30);
-      Sbar.DrawCharacter(116, 3, num.charCodeAt(1) - 30);
-      Sbar.DrawCharacter(123, 3, num.charCodeAt(2) - 30);
-    } else {
-      Sbar.DrawCharacter(109, 3, num.charCodeAt(0));
-      Sbar.DrawCharacter(116, 3, num.charCodeAt(1));
-      Sbar.DrawCharacter(123, 3, num.charCodeAt(2));
-    }
-    return;
-  }
-
-  if ((CL.state.items & (Def.it.invisibility + Def.it.invulnerability)) === (Def.it.invisibility + Def.it.invulnerability)) {
-    Sbar.DrawPic(112, 0, Sbar.face_invis_invuln);
-    return;
-  }
-  if ((CL.state.items & Def.it.quad) !== 0) {
-    Sbar.DrawPic(112, 0, Sbar.face_quad);
-    return;
-  }
-  if ((CL.state.items & Def.it.invisibility) !== 0) {
-    Sbar.DrawPic(112, 0, Sbar.face_invis);
-    return;
-  }
-  if ((CL.state.items & Def.it.invulnerability) !== 0) {
-    Sbar.DrawPic(112, 0, Sbar.face_invuln);
-    return;
-  }
-  Sbar.DrawPic(112, 0, Sbar.faces[CL.state.stats[Def.stat.health] >= 100.0 ? 4 : Math.floor(CL.state.stats[Def.stat.health] / 20.0)][CL.state.time <= CL.state.faceanimtime ? 1 : 0]);
-};
-
-Sbar.Draw = function() {
-  if (SCR.con_current >= 200) {
-    return;
-  }
-
-  if (Sbar.lines > 24) {
-    Sbar.DrawInventory();
-    // if (CL.state.maxclients !== 1) {
-    //   Sbar.DrawFrags();
-    // }
-  }
-
-  if ((Sbar.showscores === true) || (CL.state.stats[Def.stat.health] <= 0)) {
-    Sbar.DrawPic(0, 0, Sbar.scorebar);
-    Sbar.SoloScoreboard();
-    if (CL.state.maxclients > 1) {
-      Sbar.DeathmatchOverlay();
-    }
-    return;
-  }
-
-  if (Sbar.lines === 0) {
-    return;
-  }
-
-  Sbar.DrawPic(0, 0, Sbar.sbar);
-
-  if (COM.hipnotic === true) {
-    if ((CL.state.items & Def.it.key1) !== 0) {
-      Sbar.DrawPic(209, 3, Sbar.items[0]);
-    }
-    if ((CL.state.items & Def.it.key2) !== 0) {
-      Sbar.DrawPic(209, 12, Sbar.items[1]);
-    }
-  }
-
-  const it = (COM.rogue === true) ? Def.rit : Def.it;
-
-  if ((CL.state.items & Def.it.invulnerability) !== 0) {
-    Sbar.DrawNum(24, 0, 666, 3, 1);
-    Sbar.DrawPic(0, 0, Sbar.disc);
-  } else {
-    Sbar.DrawNum(24, 0, CL.state.stats[Def.stat.armor], 3, CL.state.stats[Def.stat.armor] <= 25 ? 1 : 0);
-    if ((CL.state.items & it.armor3) !== 0) {
-      Sbar.DrawPic(0, 0, Sbar.armor[2]);
-    } else if ((CL.state.items & it.armor2) !== 0) {
-      Sbar.DrawPic(0, 0, Sbar.armor[1]);
-    } else if ((CL.state.items & it.armor1) !== 0) {
-      Sbar.DrawPic(0, 0, Sbar.armor[0]);
-    }
-  }
-
-  Sbar.DrawFace();
-
-  Sbar.DrawNum(136, 0, CL.state.stats[Def.stat.health], 3, CL.state.stats[Def.stat.health] <= 25 ? 1 : 0);
-
-  if ((CL.state.items & it.shells) !== 0) {
-    Sbar.DrawPic(224, 0, Sbar.ammo[0]);
-  } else if ((CL.state.items & it.nails) !== 0) {
-    Sbar.DrawPic(224, 0, Sbar.ammo[1]);
-  } else if ((CL.state.items & it.rockets) !== 0) {
-    Sbar.DrawPic(224, 0, Sbar.ammo[2]);
-  } else if ((CL.state.items & it.cells) !== 0) {
-    Sbar.DrawPic(224, 0, Sbar.ammo[3]);
-  } else if (COM.rogue === true) {
-    if ((CL.state.items & Def.rit.lava_nails) !== 0) {
-      Sbar.DrawPic(224, 0, Sbar.r_ammo[0]);
-    } else if ((CL.state.items & Def.rit.plasma_ammo) !== 0) {
-      Sbar.DrawPic(224, 0, Sbar.r_ammo[1]);
-    } else if ((CL.state.items & Def.rit.multi_rockets) !== 0) {
-      Sbar.DrawPic(224, 0, Sbar.r_ammo[2]);
-    }
-  }
-  Sbar.DrawNum(248, 0, CL.state.stats[Def.stat.ammo], 3, CL.state.stats[Def.stat.ammo] <= 10 ? 1 : 0);
-
-  if ((VID.width >= 512) && (CL.state.maxclients > 1)) {
-    Sbar.MiniDeathmatchOverlay();
-  }
-
-  if ((VID.width >= 768) && (CL.state.maxclients > 1)) {
-    Sbar.ChatterDrawOverlay();
-  }
-};
-
-Sbar.IntermissionNumber = function(x, y, num) {
-  let str = num.toString();
-  if (str.length > 3) {
-    str = str.substring(str.length - 3, str.length);
-  } else if (str.length < 3) {
-    x += (3 - str.length) * 24;
-  }
-  let i; let frame;
-  for (i = 0; i < str.length; i++) {
-    frame = str.charCodeAt(i);
-    Draw.Pic(x, y, Sbar.nums[0][frame === 45 ? 10 : frame - 48]);
-    x += 24;
-  }
-};
-
-// draws the score board when pressing down TAB
-Sbar.DeathmatchOverlay = function() {
-  Draw.Pic((VID.width - Sbar.ranking.width) / 2, 8, Sbar.ranking);
-  Sbar.SortFrags();
-
-  const x = (VID.width / 2) - 80; let y = 40;
-
-  for (let i = 0; i < Sbar.scoreboardlines; i++) {
-    const s = CL.state.scores[Sbar.fragsort[i]];
-    if (s.name.length === 0) {
-      continue;
-    }
-    Draw.FillIndexed(x, y, 40, 4, (s.colors & 0xf0) + 8);
-    Draw.FillIndexed(x, y + 4, 40, 4, ((s.colors & 0xf) * 16) + 8);
-    const f = s.frags.toString();
-    Draw.String(x + 32 - (f.length * 8), y, f);
-    if (Sbar.fragsort[i] === (CL.state.viewentity - 1)) {
-      Draw.Character(x - 8, y, 12);
-    }
-    Draw.String(x + 64, y, s.name);
-    Draw.String(x + 64 + 18 * 8, y, `(${s.ping.toFixed(1)} ms)`);
-    y += 10;
-  }
-};
-
-// draws the mini overlay inside the Sbar
-Sbar.MiniDeathmatchOverlay = function() {
-  Sbar.SortFrags();
-  const l = Sbar.scoreboardlines;
-  let y = VID.height - Sbar.lines;
-  const numlines = Sbar.lines * 8;
-  let i;
-
-  for (i = 0; i < l; i++) {
-    if (Sbar.fragsort[i] === (CL.state.viewentity - 1)) {
-      break;
-    }
-  }
-
-  i = (i === l) ? 0 : i - (numlines * 2);
-  if (i > (l - numlines)) {
-    i = l - numlines;
-  }
-  if (i < 0) {
-    i = 0;
-  }
-
-  for (let k, s, num; (i < l) && (y < (VID.height - 8)); i++) { // 24 chars per column
-    k = Sbar.fragsort[i];
-    s = CL.state.scores[k];
-    if (s.name.length === 0) {
-      continue;
-    }
-    Draw.FillIndexed(324, y + 1, 40, 3, (s.colors & 0xf0) + 8);
-    Draw.FillIndexed(324, y + 4, 40, 4, ((s.colors & 0xf) << 4) + 8);
-    num = s.frags.toString();
-    Draw.String(356 - (num.length << 3), y, num);
-    if (k === (CL.state.viewentity - 1)) {
-      Draw.Character(324, y, 16);
-      Draw.Character(356, y, 17);
-    }
-    Draw.String(372, y, s.name);
-    y += 8;
-  }
-};
-
-Sbar.ChatterDrawOverlay = function() {
-  const messages = CL.state.chatlog;
-  const x = 372 + 132;
-
-  for (let i = Math.max(0, messages.length - (Sbar.lines / 8)), y = VID.height - Sbar.lines; y < (VID.height) && i < messages.length; y+=8, i++) {
-    const {name, message, direct} = messages[i];
-    if (direct) {
-      Draw.String(x, y, `${name}: ${message}`);
-    } else {
-      Draw.StringWhite(x, y, `${name}: ${message}`);
-    }
-  }
-};
-
-Sbar.IntermissionOverlay = function() {
-  if (CL.state.maxclients > 1) {
-    Sbar.DeathmatchOverlay();
-    return;
-  }
-  Draw.Pic(64, 24, Sbar.complete);
-  Draw.Pic(0, 56, Sbar.inter);
-
-  const dig = Math.floor(CL.state.completed_time / 60.0);
-  Sbar.IntermissionNumber(160, 64, dig);
-  const num = Math.floor(CL.state.completed_time - dig * 60);
-  Draw.Pic(234, 64, Sbar.colon);
-  Draw.Pic(246, 64, Sbar.nums[0][Math.floor(num / 10)]);
-  Draw.Pic(266, 64, Sbar.nums[0][Math.floor(num % 10)]);
-
-  Sbar.IntermissionNumber(160, 104, CL.state.stats[Def.stat.secrets]);
-  Draw.Pic(232, 104, Sbar.slash);
-  Sbar.IntermissionNumber(240, 104, CL.state.stats[Def.stat.totalsecrets]);
-
-  Sbar.IntermissionNumber(160, 144, CL.state.stats[Def.stat.monsters]);
-  Draw.Pic(232, 144, Sbar.slash);
-  Sbar.IntermissionNumber(240, 144, CL.state.stats[Def.stat.totalmonsters]);
-};
-
-Sbar.FinaleOverlay = function() {
-  Draw.Pic((VID.width - Sbar.finale.width) >> 1, 16, Sbar.finale);
-};
diff --git a/source/engine/client/Sbar.ts b/source/engine/client/Sbar.ts
new file mode 100644
index 00000000..c180d0ac
--- /dev/null
+++ b/source/engine/client/Sbar.ts
@@ -0,0 +1,693 @@
+import Cmd from '../common/Cmd.ts';
+import { eventBus, getClientRegistry } from '../registry.mjs';
+import VID from './VID.ts';
+import * as Def from '../common/Def.ts';
+import Cvar from '../common/Cvar.ts';
+import { GLTexture } from './GL.ts';
+
+let { CL, COM, Draw, SCR } = getClientRegistry();
+
+eventBus.subscribe('registry.frozen', () => {
+  ({ CL, COM, Draw, SCR } = getClientRegistry());
+});
+
+export default class Sbar {
+  static lines = 0;
+  static showscores = false;
+  static scoreboardlines = 0;
+  static fragsort: number[] = [];
+
+  // Core WAD textures — initialized in Init()
+  static nums: GLTexture[][] = null!;
+  static colon: GLTexture = null!;
+  static slash: GLTexture = null!;
+  static weapons: GLTexture[][] = null!;
+  static ammo: GLTexture[] = null!;
+  static armor: GLTexture[] = null!;
+  static items: GLTexture[] = null!;
+  static sigil: GLTexture[] = null!;
+  static faces: GLTexture[][] = null!;
+  static face_invis: GLTexture = null!;
+  static face_invuln: GLTexture = null!;
+  static face_invis_invuln: GLTexture = null!;
+  static face_quad: GLTexture = null!;
+  static sbar: GLTexture = null!;
+  static ibar: GLTexture = null!;
+  static scorebar: GLTexture = null!;
+  static ranking: GLTexture = null!;
+  static complete: GLTexture = null!;
+  static inter: GLTexture = null!;
+  static finale: GLTexture = null!;
+  static disc: GLTexture = null!;
+
+  // Hipnotic mission pack textures (optional)
+  static h_weapons?: GLTexture[][];
+  static h_items?: GLTexture[];
+  static hipweapons?: number[];
+
+  // Rogue mission pack textures (optional)
+  static r_invbar?: GLTexture[];
+  static r_weapons?: GLTexture[];
+  static r_items?: GLTexture[];
+  static r_teambord?: GLTexture;
+  static r_ammo?: GLTexture[];
+
+  static ShowScores(): void {
+    Sbar.showscores = true;
+  }
+
+  static DontShowScores(): void {
+    Sbar.showscores = false;
+  }
+
+  static async Init(): Promise<void> {
+    let i;
+
+    Sbar.nums = [[], []];
+    for (i = 0; i < 10; i++) {
+      Sbar.nums[0][i] = Draw.LoadPicFromWad('NUM_' + i);
+      Sbar.nums[1][i] = Draw.LoadPicFromWad('ANUM_' + i);
+    }
+    Sbar.nums[0][10] = Draw.LoadPicFromWad('NUM_MINUS');
+    Sbar.nums[1][10] = Draw.LoadPicFromWad('ANUM_MINUS');
+    Sbar.colon = Draw.LoadPicFromWad('NUM_COLON');
+    Sbar.slash = Draw.LoadPicFromWad('NUM_SLASH');
+
+    Sbar.weapons = [
+      [
+        Draw.LoadPicFromWad('INV_SHOTGUN'),
+        Draw.LoadPicFromWad('INV_SSHOTGUN'),
+        Draw.LoadPicFromWad('INV_NAILGUN'),
+        Draw.LoadPicFromWad('INV_SNAILGUN'),
+        Draw.LoadPicFromWad('INV_RLAUNCH'),
+        Draw.LoadPicFromWad('INV_SRLAUNCH'),
+        Draw.LoadPicFromWad('INV_LIGHTNG'),
+      ],
+      [
+        Draw.LoadPicFromWad('INV2_SHOTGUN'),
+        Draw.LoadPicFromWad('INV2_SSHOTGUN'),
+        Draw.LoadPicFromWad('INV2_NAILGUN'),
+        Draw.LoadPicFromWad('INV2_SNAILGUN'),
+        Draw.LoadPicFromWad('INV2_RLAUNCH'),
+        Draw.LoadPicFromWad('INV2_SRLAUNCH'),
+        Draw.LoadPicFromWad('INV2_LIGHTNG'),
+      ],
+    ];
+    for (i = 0; i <= 4; i++) {
+      Sbar.weapons[2 + i] = [
+        Draw.LoadPicFromWad(`INVA${i + 1}_SHOTGUN`),
+        Draw.LoadPicFromWad(`INVA${i + 1}_SSHOTGUN`),
+        Draw.LoadPicFromWad(`INVA${i + 1}_NAILGUN`),
+        Draw.LoadPicFromWad(`INVA${i + 1}_SNAILGUN`),
+        Draw.LoadPicFromWad(`INVA${i + 1}_RLAUNCH`),
+        Draw.LoadPicFromWad(`INVA${i + 1}_SRLAUNCH`),
+        Draw.LoadPicFromWad(`INVA${i + 1}_LIGHTNG`),
+      ];
+    }
+
+    Sbar.ammo = [
+      Draw.LoadPicFromWad('SB_SHELLS'),
+      Draw.LoadPicFromWad('SB_NAILS'),
+      Draw.LoadPicFromWad('SB_ROCKET'),
+      Draw.LoadPicFromWad('SB_CELLS'),
+    ];
+
+    Sbar.armor = [
+      Draw.LoadPicFromWad('SB_ARMOR1'),
+      Draw.LoadPicFromWad('SB_ARMOR2'),
+      Draw.LoadPicFromWad('SB_ARMOR3'),
+    ];
+
+    Sbar.items = [
+      Draw.LoadPicFromWad('SB_KEY1'),
+      Draw.LoadPicFromWad('SB_KEY2'),
+      Draw.LoadPicFromWad('SB_INVIS'),
+      Draw.LoadPicFromWad('SB_INVULN'),
+      Draw.LoadPicFromWad('SB_SUIT'),
+      Draw.LoadPicFromWad('SB_QUAD'),
+    ];
+
+    Sbar.sigil = [
+      Draw.LoadPicFromWad('SB_SIGIL1'),
+      Draw.LoadPicFromWad('SB_SIGIL2'),
+      Draw.LoadPicFromWad('SB_SIGIL3'),
+      Draw.LoadPicFromWad('SB_SIGIL4'),
+    ];
+
+    Sbar.faces = [];
+    for (i = 0; i <= 4; i++) {
+      Sbar.faces[i] = [
+        Draw.LoadPicFromWad(`FACE${5 - i}`),
+        Draw.LoadPicFromWad(`FACE_P${5 - i}`),
+      ];
+    }
+    Sbar.face_invis = Draw.LoadPicFromWad('FACE_INVIS');
+    Sbar.face_invuln = Draw.LoadPicFromWad('FACE_INVUL2');
+    Sbar.face_invis_invuln = Draw.LoadPicFromWad('FACE_INV2');
+    Sbar.face_quad = Draw.LoadPicFromWad('FACE_QUAD');
+
+    Cmd.AddCommand('+showscores', Sbar.ShowScores);
+    Cmd.AddCommand('-showscores', Sbar.DontShowScores);
+
+    Sbar.sbar = Draw.LoadPicFromWad('SBAR');
+    Sbar.ibar = Draw.LoadPicFromWad('IBAR');
+    Sbar.scorebar = Draw.LoadPicFromWad('SCOREBAR');
+    Sbar.disc = Draw.LoadPicFromWad('DISC');
+
+    if (COM.hipnotic === true) {
+      Sbar.h_weapons = [[
+        Draw.LoadPicFromWad('INV_LASER'),
+        Draw.LoadPicFromWad('INV_MJOLNIR'),
+        Draw.LoadPicFromWad('INV_GREN_PROX'),
+        Draw.LoadPicFromWad('INV_PROX_GREN'),
+        Draw.LoadPicFromWad('INV_PROX'),
+      ],
+      [
+        Draw.LoadPicFromWad('INV2_LASER'),
+        Draw.LoadPicFromWad('INV2_MJOLNIR'),
+        Draw.LoadPicFromWad('INV2_GREN_PROX'),
+        Draw.LoadPicFromWad('INV2_PROX_GREN'),
+        Draw.LoadPicFromWad('INV2_PROX'),
+      ]];
+      for (i = 0; i <= 4; i++) {
+        Sbar.h_weapons[2 + i] = [
+          Draw.LoadPicFromWad(`INVA${i + 1}_LASER`),
+          Draw.LoadPicFromWad(`INVA${i + 1}_MJOLNIR`),
+          Draw.LoadPicFromWad(`INVA${i + 1}_GREN_PROX`),
+          Draw.LoadPicFromWad(`INVA${i + 1}_PROX_GREN`),
+          Draw.LoadPicFromWad(`INVA${i + 1}_PROX`),
+        ];
+      }
+      Sbar.hipweapons = [Def.hit.laser_cannon_bit, Def.hit.mjolnir_bit, 4, Def.hit.proximity_gun_bit];
+      Sbar.h_items = [
+        Draw.LoadPicFromWad('SB_WSUIT'),
+        Draw.LoadPicFromWad('SB_ESHLD'),
+      ];
+    } else if (COM.rogue === true) {
+      Sbar.r_invbar = [
+        Draw.LoadPicFromWad('R_INVBAR1'),
+        Draw.LoadPicFromWad('R_INVBAR2'),
+      ];
+      Sbar.r_weapons = [
+        Draw.LoadPicFromWad('R_LAVA'),
+        Draw.LoadPicFromWad('R_SUPERLAVA'),
+        Draw.LoadPicFromWad('R_GREN'),
+        Draw.LoadPicFromWad('R_MULTIROCK'),
+        Draw.LoadPicFromWad('R_PLASMA'),
+      ];
+      Sbar.r_items = [
+        Draw.LoadPicFromWad('R_SHIELD1'),
+        Draw.LoadPicFromWad('R_AGRAV1'),
+      ];
+      Sbar.r_teambord = Draw.LoadPicFromWad('R_TEAMBORD');
+      Sbar.r_ammo = [
+        Draw.LoadPicFromWad('R_AMMOLAVA'),
+        Draw.LoadPicFromWad('R_AMMOMULTI'),
+        Draw.LoadPicFromWad('R_AMMOPLASMA'),
+      ];
+    }
+
+    const [ranking, complete, inter, finale] = await Promise.all([
+      Draw.LoadPicFromLump('ranking'),
+      Draw.LoadPicFromLump('complete'),
+      Draw.LoadPicFromLump('inter'),
+      Draw.LoadPicFromLump('finale'),
+    ]);
+
+    Object.assign(Sbar, {
+      ranking,
+      complete,
+      inter,
+      finale,
+    });
+  }
+
+  static DrawPic(x: number, y: number, pic: GLTexture): void {
+    if (CL.state.maxclients > 1) {
+      Draw.Pic(x, y + VID.height - 24, pic);
+    } else {
+      Draw.Pic(x + (VID.width >> 1) - 160, y + VID.height - 24, pic);
+    }
+  }
+
+  static DrawCharacter(x: number, y: number, num: number): void {
+    if (CL.state.maxclients > 1) {
+      Draw.Character(x + 4, y + VID.height - 24, num);
+    } else {
+      Draw.Character(x + (VID.width >> 1) - 156, y + VID.height - 24, num);
+    }
+  }
+
+  static DrawString(x: number, y: number, str: string): void {
+    if (CL.state.maxclients > 1) {
+      Draw.String(x, y + VID.height - 24, str);
+    } else {
+      Draw.String(x + (VID.width >> 1) - 160, y + VID.height - 24, str);
+    }
+  }
+
+  static DrawNum(x: number, y: number, num: number, digits: number, color: number): void {
+    let str = num.toString();
+    if (str.length > digits) {
+      str = str.substring(str.length - digits, str.length);
+    } else if (str.length < digits) {
+      x += (digits - str.length) * 24;
+    }
+    let i; let frame;
+    for (i = 0; i < str.length; i++) {
+      frame = str.charCodeAt(i);
+      Sbar.DrawPic(x, y, Sbar.nums[color][frame === 45 ? 10 : frame - 48]);
+      x += 24;
+    }
+  }
+
+  static SortFrags(): void {
+    Sbar.scoreboardlines = 0;
+    let i; let j; let k;
+    for (i = 0; i < CL.state.maxclients; i++) {
+      if (CL.state.scores[i].name.length !== 0) {
+        Sbar.fragsort[Sbar.scoreboardlines++] = i;
+      }
+    }
+    for (i = 0; i < Sbar.scoreboardlines; i++) {
+      for (j = 0; j < (Sbar.scoreboardlines - 1 - i); j++) {
+        if (CL.state.scores[Sbar.fragsort[j]].frags < CL.state.scores[Sbar.fragsort[j + 1]].frags) {
+          k = Sbar.fragsort[j];
+          Sbar.fragsort[j] = Sbar.fragsort[j + 1];
+          Sbar.fragsort[j + 1] = k;
+        }
+      }
+    }
+  }
+
+  static SoloScoreboard(): void {
+    let str;
+
+    Sbar.DrawString(8, 4, 'Monsters:    /');
+    str = CL.state.stats[Def.stat.monsters].toString();
+    Sbar.DrawString(104 - (str.length << 3), 4, str);
+    str = CL.state.stats[Def.stat.totalmonsters].toString();
+    Sbar.DrawString(144 - (str.length << 3), 4, str);
+
+    Sbar.DrawString(8, 12, 'Secrets :    /');
+    str = CL.state.stats[Def.stat.secrets].toString();
+    Sbar.DrawString(104 - (str.length << 3), 12, str);
+    str = CL.state.stats[Def.stat.totalsecrets].toString();
+    Sbar.DrawString(144 - (str.length << 3), 12, str);
+
+    const minutes = Math.floor(CL.state.time / 60.0);
+    const seconds = Math.floor(CL.state.time - 60 * minutes);
+    const tens = Math.floor(seconds / 10.0);
+    str = (seconds - 10 * tens).toString();
+    Sbar.DrawString(184, 4, `Time :   :${tens}${str}`);
+    str = minutes.toString();
+    Sbar.DrawString(256 - (str.length << 3), 4, str);
+
+    Sbar.DrawString(232 - (CL.state.levelname.length << 2), 12, CL.state.levelname);
+  }
+
+  static DrawInventory(): void {
+    let i;
+
+    if (COM.rogue === true) {
+      Sbar.DrawPic(0, -24, Sbar.r_invbar![CL.state.stats[Def.stat.activeweapon] >= Def.rit.lava_nailgun ? 0 : 1]);
+    } else {
+      Sbar.DrawPic(0, -24, Sbar.ibar);
+    }
+
+    let flashon;
+    for (i = 0; i <= 6; i++) {
+      if ((CL.state.items & (Def.it.shotgun << i)) === 0) {
+        continue;
+      }
+      flashon = Math.floor((CL.state.time - CL.state.item_gettime[i]) * 10.0);
+      if (flashon >= 10) {
+        flashon = CL.state.stats[Def.stat.activeweapon] === (Def.it.shotgun << i) ? 1 : 0;
+      } else {
+        flashon = (flashon % 5) + 2;
+      }
+      Sbar.DrawPic(i * 24, -16, Sbar.weapons[flashon][i]);
+    }
+    if (COM.hipnotic === true) {
+      let grenadeflashing = false;
+      for (i = 0; i <= 3; i++) {
+        if ((CL.state.items & (1 << Sbar.hipweapons![i])) !== 0) {
+          flashon = Math.floor((CL.state.time - CL.state.item_gettime[i]) * 10.0);
+          if (flashon >= 10) {
+            flashon = CL.state.stats[Def.stat.activeweapon] === (1 << Sbar.hipweapons![i]) ? 1 : 0;
+          } else {
+            flashon = (flashon % 5) + 2;
+          }
+
+          if (i === 2) {
+            if (((CL.state.items & Def.hit.proximity_gun) !== 0) && (flashon !== 0)) {
+              grenadeflashing = true;
+              Sbar.DrawPic(96, -16, Sbar.h_weapons![flashon][2]);
+            }
+          } else if (i === 3) {
+            if ((CL.state.items & Def.it.grenade_launcher) !== 0) {
+              if (grenadeflashing !== true) {
+                Sbar.DrawPic(96, -16, Sbar.h_weapons![flashon][3]);
+              }
+            } else {
+              Sbar.DrawPic(96, -16, Sbar.h_weapons![flashon][4]);
+            }
+          } else {
+            Sbar.DrawPic(176 + i * 24, -16, Sbar.h_weapons![flashon][i]);
+          }
+        }
+      }
+    } else if (COM.rogue === true) {
+      if (CL.state.stats[Def.stat.activeweapon] >= Def.rit.lava_nailgun) {
+        for (i = 0; i <= 4; i++) {
+          if (CL.state.stats[Def.stat.activeweapon] === (Def.rit.lava_nailgun << i)) {
+            Sbar.DrawPic((i + 2) * 24, -16, Sbar.r_weapons![i]);
+          }
+        }
+      }
+    }
+
+    for (i = 0; i <= 3; i++) {
+      const num = CL.state.stats[Def.stat.shells + i].toString();
+      switch (num.length) {
+        case 1:
+          Sbar.DrawCharacter(((6 * i + 3) << 3) - 2, -24, num.charCodeAt(0) - 30);
+          continue;
+        case 2:
+          Sbar.DrawCharacter(((6 * i + 2) << 3) - 2, -24, num.charCodeAt(0) - 30);
+          Sbar.DrawCharacter(((6 * i + 3) << 3) - 2, -24, num.charCodeAt(1) - 30);
+          continue;
+        case 3:
+          Sbar.DrawCharacter(((6 * i + 1) << 3) - 2, -24, num.charCodeAt(0) - 30);
+          Sbar.DrawCharacter(((6 * i + 2) << 3) - 2, -24, num.charCodeAt(1) - 30);
+          Sbar.DrawCharacter(((6 * i + 3) << 3) - 2, -24, num.charCodeAt(2) - 30);
+      }
+    }
+
+    if (COM.hipnotic === true) {
+      for (i = 2; i <= 5; i++) {
+        if ((CL.state.items & (1 << (17 + i))) !== 0) {
+          Sbar.DrawPic(192 + (i << 4), -16, Sbar.items[i]);
+        }
+      }
+      if ((CL.state.items & 16777216) !== 0) {
+        Sbar.DrawPic(288, -16, Sbar.h_items![0]);
+      }
+      if ((CL.state.items & 33554432) !== 0) {
+        Sbar.DrawPic(304, -16, Sbar.h_items![1]);
+      }
+    } else {
+      for (i = 0; i <= 5; i++) {
+        if ((CL.state.items & (1 << (17 + i))) !== 0) {
+          Sbar.DrawPic(192 + (i << 4), -16, Sbar.items[i]);
+        }
+      }
+      if (COM.rogue === true) {
+        if ((CL.state.items & 536870912) !== 0) {
+          Sbar.DrawPic(288, -16, Sbar.r_items![0]);
+        }
+        if ((CL.state.items & 1073741824) !== 0) {
+          Sbar.DrawPic(304, -16, Sbar.r_items![1]);
+        }
+      } else {
+        for (i = 0; i <= 3; i++) {
+          if (((CL.state.items >>> (28 + i)) & 1) !== 0) {
+            Sbar.DrawPic(288 + (i << 3), -16, Sbar.sigil[i]);
+          }
+        }
+      }
+    }
+  }
+
+  static DrawFrags(): void {
+    Sbar.SortFrags();
+    const l = Sbar.scoreboardlines <= 4 ? Sbar.scoreboardlines : 4;
+    let x = 23;
+    const xofs = CL.state.maxclients === 1 ? 10 : (VID.width >> 1) - 150;
+    const y = VID.height - 47;
+    let i; let k; let s; let num;
+    for (i = 0; i < l; i++) {
+      k = Sbar.fragsort[i];
+      s = CL.state.scores[k];
+      if (s.name.length === 0) {
+        continue;
+      }
+      Draw.FillIndexed(xofs + (x << 3), y, 28, 4, (s.colors & 0xf0) + 8);
+      Draw.FillIndexed(xofs + (x << 3), y + 4, 28, 3, ((s.colors & 0xf) << 4) + 8);
+      num = s.frags.toString();
+      Sbar.DrawString(((x - num.length) << 3) + 36, -24, num);
+      if (k === (CL.state.viewentity - 1)) {
+        Sbar.DrawCharacter((x << 3) + 2, -24, 16);
+        Sbar.DrawCharacter((x << 3) + 28, -24, 17);
+      }
+      x += 4;
+    }
+  }
+
+  static DrawFace(): void {
+    if ((COM.rogue === true) && (CL.state.maxclients !== 1) && (Cvar.FindVar('teamplay').value >= 4) && (Cvar.FindVar('teamplay').value <= 6)) {
+      const s = CL.state.scores[CL.state.viewentity - 1];
+      const top = (s.colors & 0xf0) + 8;
+      const xofs = CL.state.maxclients === 1 ? 113 : (VID.width >> 1) - 47;
+      Sbar.DrawPic(112, 0, Sbar.r_teambord!);
+      Draw.FillIndexed(xofs, VID.height - 21, 22, 9, top);
+      Draw.FillIndexed(xofs, VID.height - 12, 22, 9, ((s.colors & 0xf) << 4) + 8);
+      let num = (top === 8 ? '\x3e\x3e\x3e' : '   ') + s.frags;
+      if (num.length > 3) {
+        num = num.substring(num.length - 3);
+      }
+      if (top === 8) {
+        Sbar.DrawCharacter(109, 3, num.charCodeAt(0) - 30);
+        Sbar.DrawCharacter(116, 3, num.charCodeAt(1) - 30);
+        Sbar.DrawCharacter(123, 3, num.charCodeAt(2) - 30);
+      } else {
+        Sbar.DrawCharacter(109, 3, num.charCodeAt(0));
+        Sbar.DrawCharacter(116, 3, num.charCodeAt(1));
+        Sbar.DrawCharacter(123, 3, num.charCodeAt(2));
+      }
+      return;
+    }
+
+    if ((CL.state.items & (Def.it.invisibility + Def.it.invulnerability)) === (Def.it.invisibility + Def.it.invulnerability)) {
+      Sbar.DrawPic(112, 0, Sbar.face_invis_invuln);
+      return;
+    }
+    if ((CL.state.items & Def.it.quad) !== 0) {
+      Sbar.DrawPic(112, 0, Sbar.face_quad);
+      return;
+    }
+    if ((CL.state.items & Def.it.invisibility) !== 0) {
+      Sbar.DrawPic(112, 0, Sbar.face_invis);
+      return;
+    }
+    if ((CL.state.items & Def.it.invulnerability) !== 0) {
+      Sbar.DrawPic(112, 0, Sbar.face_invuln);
+      return;
+    }
+    Sbar.DrawPic(112, 0, Sbar.faces[CL.state.stats[Def.stat.health] >= 100.0 ? 4 : Math.floor(CL.state.stats[Def.stat.health] / 20.0)][CL.state.time <= CL.state.faceanimtime ? 1 : 0]);
+  }
+
+  static Draw(): void {
+    if (SCR.con_current >= 200) {
+      return;
+    }
+
+    if (Sbar.lines > 24) {
+      Sbar.DrawInventory();
+    }
+
+    if ((Sbar.showscores === true) || (CL.state.stats[Def.stat.health] <= 0)) {
+      Sbar.DrawPic(0, 0, Sbar.scorebar);
+      Sbar.SoloScoreboard();
+      if (CL.state.maxclients > 1) {
+        Sbar.DeathmatchOverlay();
+      }
+      return;
+    }
+
+    if (Sbar.lines === 0) {
+      return;
+    }
+
+    Sbar.DrawPic(0, 0, Sbar.sbar);
+
+    if (COM.hipnotic === true) {
+      if ((CL.state.items & Def.it.key1) !== 0) {
+        Sbar.DrawPic(209, 3, Sbar.items[0]);
+      }
+      if ((CL.state.items & Def.it.key2) !== 0) {
+        Sbar.DrawPic(209, 12, Sbar.items[1]);
+      }
+    }
+
+    const it = (COM.rogue === true) ? Def.rit : Def.it;
+
+    if ((CL.state.items & Def.it.invulnerability) !== 0) {
+      Sbar.DrawNum(24, 0, 666, 3, 1);
+      Sbar.DrawPic(0, 0, Sbar.disc);
+    } else {
+      Sbar.DrawNum(24, 0, CL.state.stats[Def.stat.armor], 3, CL.state.stats[Def.stat.armor] <= 25 ? 1 : 0);
+      if ((CL.state.items & it.armor3) !== 0) {
+        Sbar.DrawPic(0, 0, Sbar.armor[2]);
+      } else if ((CL.state.items & it.armor2) !== 0) {
+        Sbar.DrawPic(0, 0, Sbar.armor[1]);
+      } else if ((CL.state.items & it.armor1) !== 0) {
+        Sbar.DrawPic(0, 0, Sbar.armor[0]);
+      }
+    }
+
+    Sbar.DrawFace();
+
+    Sbar.DrawNum(136, 0, CL.state.stats[Def.stat.health], 3, CL.state.stats[Def.stat.health] <= 25 ? 1 : 0);
+
+    if ((CL.state.items & it.shells) !== 0) {
+      Sbar.DrawPic(224, 0, Sbar.ammo[0]);
+    } else if ((CL.state.items & it.nails) !== 0) {
+      Sbar.DrawPic(224, 0, Sbar.ammo[1]);
+    } else if ((CL.state.items & it.rockets) !== 0) {
+      Sbar.DrawPic(224, 0, Sbar.ammo[2]);
+    } else if ((CL.state.items & it.cells) !== 0) {
+      Sbar.DrawPic(224, 0, Sbar.ammo[3]);
+    } else if (COM.rogue === true) {
+      if ((CL.state.items & Def.rit.lava_nails) !== 0) {
+        Sbar.DrawPic(224, 0, Sbar.r_ammo![0]);
+      } else if ((CL.state.items & Def.rit.plasma_ammo) !== 0) {
+        Sbar.DrawPic(224, 0, Sbar.r_ammo![1]);
+      } else if ((CL.state.items & Def.rit.multi_rockets) !== 0) {
+        Sbar.DrawPic(224, 0, Sbar.r_ammo![2]);
+      }
+    }
+    Sbar.DrawNum(248, 0, CL.state.stats[Def.stat.ammo], 3, CL.state.stats[Def.stat.ammo] <= 10 ? 1 : 0);
+
+    if ((VID.width >= 512) && (CL.state.maxclients > 1)) {
+      Sbar.MiniDeathmatchOverlay();
+    }
+
+    if ((VID.width >= 768) && (CL.state.maxclients > 1)) {
+      Sbar.ChatterDrawOverlay();
+    }
+  }
+
+  static IntermissionNumber(x: number, y: number, num: number): void {
+    let str = num.toString();
+    if (str.length > 3) {
+      str = str.substring(str.length - 3, str.length);
+    } else if (str.length < 3) {
+      x += (3 - str.length) * 24;
+    }
+    let i; let frame;
+    for (i = 0; i < str.length; i++) {
+      frame = str.charCodeAt(i);
+      Draw.Pic(x, y, Sbar.nums[0][frame === 45 ? 10 : frame - 48]);
+      x += 24;
+    }
+  }
+
+  /** Draws the score board when pressing Tab. */
+  static DeathmatchOverlay(): void {
+    Draw.Pic((VID.width - Sbar.ranking.width) / 2, 8, Sbar.ranking);
+    Sbar.SortFrags();
+
+    const x = (VID.width / 2) - 80; let y = 40;
+
+    for (let i = 0; i < Sbar.scoreboardlines; i++) {
+      const s = CL.state.scores[Sbar.fragsort[i]];
+      if (s.name.length === 0) {
+        continue;
+      }
+      Draw.FillIndexed(x, y, 40, 4, (s.colors & 0xf0) + 8);
+      Draw.FillIndexed(x, y + 4, 40, 4, ((s.colors & 0xf) * 16) + 8);
+      const f = s.frags.toString();
+      Draw.String(x + 32 - (f.length * 8), y, f);
+      if (Sbar.fragsort[i] === (CL.state.viewentity - 1)) {
+        Draw.Character(x - 8, y, 12);
+      }
+      Draw.String(x + 64, y, s.name);
+      Draw.String(x + 64 + 18 * 8, y, `(${s.ping.toFixed(1)} ms)`);
+      y += 10;
+    }
+  }
+
+  /** Draws the mini scoreboard overlay inside the status bar. */
+  static MiniDeathmatchOverlay(): void {
+    Sbar.SortFrags();
+    const l = Sbar.scoreboardlines;
+    let y = VID.height - Sbar.lines;
+    const numlines = Sbar.lines * 8;
+    let i;
+
+    for (i = 0; i < l; i++) {
+      if (Sbar.fragsort[i] === (CL.state.viewentity - 1)) {
+        break;
+      }
+    }
+
+    i = (i === l) ? 0 : i - (numlines * 2);
+    if (i > (l - numlines)) {
+      i = l - numlines;
+    }
+    if (i < 0) {
+      i = 0;
+    }
+
+    for (let k, s, num; (i < l) && (y < (VID.height - 8)); i++) {
+      k = Sbar.fragsort[i];
+      s = CL.state.scores[k];
+      if (s.name.length === 0) {
+        continue;
+      }
+      Draw.FillIndexed(324, y + 1, 40, 3, (s.colors & 0xf0) + 8);
+      Draw.FillIndexed(324, y + 4, 40, 4, ((s.colors & 0xf) << 4) + 8);
+      num = s.frags.toString();
+      Draw.String(356 - (num.length << 3), y, num);
+      if (k === (CL.state.viewentity - 1)) {
+        Draw.Character(324, y, 16);
+        Draw.Character(356, y, 17);
+      }
+      Draw.String(372, y, s.name);
+      y += 8;
+    }
+  }
+
+  static ChatterDrawOverlay(): void {
+    const messages = CL.state.chatlog;
+    const x = 372 + 132;
+
+    for (let i = Math.max(0, messages.length - (Sbar.lines / 8)), y = VID.height - Sbar.lines; y < VID.height && i < messages.length; y += 8, i++) {
+      const { name, message, direct } = messages[i];
+      if (direct) {
+        Draw.String(x, y, `${name}: ${message}`);
+      } else {
+        Draw.StringWhite(x, y, `${name}: ${message}`);
+      }
+    }
+  }
+
+  static IntermissionOverlay(): void {
+    if (CL.state.maxclients > 1) {
+      Sbar.DeathmatchOverlay();
+      return;
+    }
+    Draw.Pic(64, 24, Sbar.complete);
+    Draw.Pic(0, 56, Sbar.inter);
+
+    const dig = Math.floor(CL.state.completed_time / 60.0);
+    Sbar.IntermissionNumber(160, 64, dig);
+    const num = Math.floor(CL.state.completed_time - dig * 60);
+    Draw.Pic(234, 64, Sbar.colon);
+    Draw.Pic(246, 64, Sbar.nums[0][Math.floor(num / 10)]);
+    Draw.Pic(266, 64, Sbar.nums[0][Math.floor(num % 10)]);
+
+    Sbar.IntermissionNumber(160, 104, CL.state.stats[Def.stat.secrets]);
+    Draw.Pic(232, 104, Sbar.slash);
+    Sbar.IntermissionNumber(240, 104, CL.state.stats[Def.stat.totalsecrets]);
+
+    Sbar.IntermissionNumber(160, 144, CL.state.stats[Def.stat.monsters]);
+    Draw.Pic(232, 144, Sbar.slash);
+    Sbar.IntermissionNumber(240, 144, CL.state.stats[Def.stat.totalmonsters]);
+  }
+
+  static FinaleOverlay(): void {
+    Draw.Pic((VID.width - Sbar.finale.width) >> 1, 16, Sbar.finale);
+  }
+}
diff --git a/source/engine/common/GameAPIs.ts b/source/engine/common/GameAPIs.ts
index 64986da9..25f3ebcc 100644
--- a/source/engine/common/GameAPIs.ts
+++ b/source/engine/common/GameAPIs.ts
@@ -10,7 +10,7 @@ import type { Visibility } from './model/BSP.ts';
 import { PmoveConfiguration } from '../../shared/Pmove.ts';
 import Vector from '../../shared/Vector.ts';
 import { moveTypes, solid } from '../../shared/Defs.ts';
-import Key from '../client/Key.mjs';
+import Key from '../client/Key.ts';
 import { SFX as SFXValue } from '../client/Sound.ts';
 import VID from '../client/VID.ts';
 import * as Protocol from '../network/Protocol.ts';
diff --git a/source/engine/main-browser.ts b/source/engine/main-browser.ts
index 79279801..eca193af 100644
--- a/source/engine/main-browser.ts
+++ b/source/engine/main-browser.ts
@@ -1,16 +1,16 @@
 import type { BuildConfig, URLs } from './build-config';
 
 import CL from './client/CL.ts';
-import Draw from './client/Draw.mjs';
+import Draw from './client/Draw.ts';
 import IN from './client/IN.ts';
-import Key from './client/Key.mjs';
+import Key from './client/Key.ts';
 import M from './client/Menu.ts';
 import R from './client/R.mjs';
 import S from './client/Sound.ts';
 import Sys from './client/Sys.ts';
 import V from './client/V.ts';
-import Sbar from './client/Sbar.mjs';
-import SCR from './client/SCR.mjs';
+import Sbar from './client/Sbar.ts';
+import SCR from './client/SCR.ts';
 import COM from './common/Com.ts';
 import Con from './common/Console.ts';
 import Host from './common/Host.ts';
diff --git a/source/engine/registry.mjs b/source/engine/registry.mjs
index dd41b051..558dcdf7 100644
--- a/source/engine/registry.mjs
+++ b/source/engine/registry.mjs
@@ -9,11 +9,11 @@
 /** @typedef {typeof import('./server/Progs.ts').default} ProgsModule */
 /** @typedef {typeof import('./common/Mod.ts').default} ModModule */
 /** @typedef {typeof import('./client/CL.ts').default} ClientModule */
-/** @typedef {typeof import('./client/SCR.mjs').default} ScrModule */
+/** @typedef {typeof import('./client/SCR.ts').default} ScrModule */
 /** @typedef {typeof import('./client/R.mjs').default} RendererModule */
-/** @typedef {typeof import('./client/Draw.mjs').default} DrawModule */
-/** @typedef {typeof import('./client/Key.mjs').default} KeyModule */
-/** @typedef {typeof import('./client/Sbar.mjs').default} SbarModule */
+/** @typedef {typeof import('./client/Draw.ts').default} DrawModule */
+/** @typedef {typeof import('./client/Key.ts').default} KeyModule */
+/** @typedef {typeof import('./client/Sbar.ts').default} SbarModule */
 /** @typedef {typeof import('./client/Sound.ts').default} SoundModule */
 /** @typedef {typeof import('./client/Menu.ts').default} MenuModule */
 /** @typedef {typeof import('./client/IN.ts').default} InputModule */
diff --git a/test/client/key.test.mjs b/test/client/key.test.mjs
new file mode 100644
index 00000000..cff2d837
--- /dev/null
+++ b/test/client/key.test.mjs
@@ -0,0 +1,30 @@
+import assert from 'node:assert/strict';
+import { describe, test } from 'node:test';
+
+import { K } from '../../source/shared/Keys.ts';
+import Key from '../../source/engine/client/Key.ts';
+
+void describe('Key', () => {
+  void test('StringToKeynum resolves named and printable keys', () => {
+    assert.equal(Key.StringToKeynum('ENTER'), K.ENTER);
+    assert.equal(Key.StringToKeynum('a'), 97);
+    assert.equal(Key.StringToKeynum('not-a-key'), null);
+  });
+
+  void test('WriteBindings serializes active bindings with readable key names', () => {
+    const previousBindings = [...Key.bindings];
+
+    try {
+      Key.bindings = [];
+      Key.bindings[K.ENTER] = '+jump';
+      Key.bindings[97] = 'say hello';
+
+      assert.equal(
+        Key.WriteBindings(),
+        'bind "ENTER" "+jump"\nbind "a" "say hello"',
+      );
+    } finally {
+      Key.bindings = previousBindings;
+    }
+  });
+});
diff --git a/test/renderer/materials.test.mjs b/test/renderer/materials.test.mjs
index ef28fcf6..41060d1b 100644
--- a/test/renderer/materials.test.mjs
+++ b/test/renderer/materials.test.mjs
@@ -3,11 +3,11 @@ import { describe, test } from 'node:test';
 
 import { MaterialFlags, resolveMaterialLuminanceTexture } from '../../source/engine/client/renderer/Materials.ts';
 
-describe('resolveMaterialLuminanceTexture', () => {
-  test('keeps the explicit luminance texture when one is present', () => {
-    const fallbackTexture = /** @type {import('../../source/engine/client/GL.mjs').GLTexture} */ ({});
-    const diffuseTexture = /** @type {import('../../source/engine/client/GL.mjs').GLTexture} */ ({});
-    const luminanceTexture = /** @type {import('../../source/engine/client/GL.mjs').GLTexture} */ ({});
+void describe('resolveMaterialLuminanceTexture', () => {
+  void test('keeps the explicit luminance texture when one is present', () => {
+    const fallbackTexture = /** @type {import('../../source/engine/client/GL.ts').GLTexture} */ ({});
+    const diffuseTexture = /** @type {import('../../source/engine/client/GL.ts').GLTexture} */ ({});
+    const luminanceTexture = /** @type {import('../../source/engine/client/GL.ts').GLTexture} */ ({});
 
     assert.equal(
       resolveMaterialLuminanceTexture(MaterialFlags.MF_FULLBRIGHT, luminanceTexture, diffuseTexture, fallbackTexture),
@@ -15,9 +15,9 @@ describe('resolveMaterialLuminanceTexture', () => {
     );
   });
 
-  test('uses the diffuse texture as luminance for MF_FULLBRIGHT materials without an emissive map', () => {
-    const fallbackTexture = /** @type {import('../../source/engine/client/GL.mjs').GLTexture} */ ({});
-    const diffuseTexture = /** @type {import('../../source/engine/client/GL.mjs').GLTexture} */ ({});
+  void test('uses the diffuse texture as luminance for MF_FULLBRIGHT materials without an emissive map', () => {
+    const fallbackTexture = /** @type {import('../../source/engine/client/GL.ts').GLTexture} */ ({});
+    const diffuseTexture = /** @type {import('../../source/engine/client/GL.ts').GLTexture} */ ({});
 
     assert.equal(
       resolveMaterialLuminanceTexture(MaterialFlags.MF_FULLBRIGHT, fallbackTexture, diffuseTexture, fallbackTexture),
@@ -25,9 +25,9 @@ describe('resolveMaterialLuminanceTexture', () => {
     );
   });
 
-  test('falls back to the renderer black texture for non-fullbright materials without emissive data', () => {
-    const fallbackTexture = /** @type {import('../../source/engine/client/GL.mjs').GLTexture} */ ({});
-    const diffuseTexture = /** @type {import('../../source/engine/client/GL.mjs').GLTexture} */ ({});
+  void test('falls back to the renderer black texture for non-fullbright materials without emissive data', () => {
+    const fallbackTexture = /** @type {import('../../source/engine/client/GL.ts').GLTexture} */ ({});
+    const diffuseTexture = /** @type {import('../../source/engine/client/GL.ts').GLTexture} */ ({});
 
     assert.equal(
       resolveMaterialLuminanceTexture(MaterialFlags.MF_NONE, null, diffuseTexture, fallbackTexture),
diff --git a/test/renderer/post-process.test.mjs b/test/renderer/post-process.test.mjs
index 56a30eb2..5e7c7f88 100644
--- a/test/renderer/post-process.test.mjs
+++ b/test/renderer/post-process.test.mjs
@@ -1,12 +1,12 @@
 import assert from 'node:assert/strict';
 import { describe, test } from 'node:test';
 
-import GL from '../../source/engine/client/GL.mjs';
+import GL from '../../source/engine/client/GL.ts';
 import PostProcess from '../../source/engine/client/renderer/PostProcess.ts';
 import { eventBus } from '../../source/engine/registry.mjs';
 
-describe('PostProcess._resolveMSAAColorAttachment', () => {
-  test('resolves secondary attachments through draw attachment 0', () => {
+void describe('PostProcess._resolveMSAAColorAttachment', () => {
+  void test('resolves secondary attachments through draw attachment 0', () => {
     const operations = [];
     const mockGl = {
       COLOR_ATTACHMENT0: 0x8CE0,

From 80b8a8eb93e37a4a42a661f12b58e9d2354742d8 Mon Sep 17 00:00:00 2001
From: Christian R <github@chrisnew.de>
Date: Sat, 4 Apr 2026 15:43:06 +0300
Subject: [PATCH 47/67] TS: client/ part 7

---
 source/engine/client/R.mjs                  | 2733 ------------------
 source/engine/client/R.ts                   | 2792 +++++++++++++++++++
 source/engine/main-browser.ts               |    2 +-
 source/engine/registry.mjs                  |    2 +-
 test/renderer/brush-model-renderer.test.mjs |   34 +-
 test/renderer/r-sorting.test.mjs            |   14 +-
 6 files changed, 2818 insertions(+), 2759 deletions(-)
 delete mode 100644 source/engine/client/R.mjs
 create mode 100644 source/engine/client/R.ts

diff --git a/source/engine/client/R.mjs b/source/engine/client/R.mjs
deleted file mode 100644
index 4f6b471d..00000000
--- a/source/engine/client/R.mjs
+++ /dev/null
@@ -1,2733 +0,0 @@
-import Vector from '../../shared/Vector.ts';
-import Cvar from '../common/Cvar.ts';
-import Cmd from '../common/Cmd.ts';
-import * as Def from '../common/Def.ts';
-
-import { eventBus, registry } from '../registry.mjs';
-import Chase from './Chase.ts';
-import W from '../common/W.ts';
-import VID from './VID.ts';
-import GL, { ATTRIB_LOCATIONS, GLTexture } from './GL.ts';
-import { content, effect, gameCapabilities } from '../../shared/Defs.ts';
-import { modelRendererRegistry } from './renderer/ModelRendererRegistry.ts';
-import { BrushModelRenderer, LIGHTMAP_BLOCK_HEIGHT, LIGHTMAP_BLOCK_SIZE } from './renderer/BrushModelRenderer.ts';
-import { AliasModelRenderer } from './renderer/AliasModelRenderer.ts';
-import { SpriteModelRenderer } from './renderer/SpriteModelRenderer.ts';
-import { MeshModelRenderer } from './renderer/MeshModelRenderer.ts';
-import Draw from './Draw.ts';
-import { BrushModel, Node, revealedVisibility } from '../common/model/BSP.ts';
-import PostProcess from './renderer/PostProcess.ts';
-import BloomEffect from './renderer/BloomEffect.ts';
-import WarpEffect from './renderer/WarpEffect.ts';
-import ShadowMap from './renderer/ShadowMap.ts';
-import { ClientDlight, ClientEdict } from './ClientEntities.ts';
-import { avertexnormals } from '../common/model/loaders/AliasMDLLoader.ts';
-import { SkyRenderer } from './renderer/Sky.ts';
-
-let { CL, Host, Mod, SCR, SV, Sys, V } = registry;
-
-eventBus.subscribe('registry.frozen', () => {
-  ({ CL, Host, Mod, SCR, SV, Sys, V } = registry);
-});
-
-/** @type {WebGL2RenderingContext} */
-let gl = null;
-
-eventBus.subscribe('gl.ready', () => {
-  gl = GL.gl;
-});
-
-eventBus.subscribe('gl.shutdown', () => {
-  gl = null;
-});
-
-const R = {};
-
-const FOG_TURBULENT_SORT_EPSILON = 0.0001;
-
-/**
- * Compare mixed fog and turbulent items for the shared transparent pass.
- * Distances sort back-to-front. When a fog volume and a turbulent surface
- * begin at the same depth, fog must draw first so the nearer liquid can blend
- * over it instead of the fog overpainting the liquid.
- * @param {{dist: number, kind: number}} itemA First sorted item
- * @param {{dist: number, kind: number}} itemB Second sorted item
- * @returns {number} Sort comparator result
- */
-export function compareFogAndTurbulentItems(itemA, itemB) {
-  const distDelta = itemB.dist - itemA.dist;
-
-  if (Math.abs(distDelta) > FOG_TURBULENT_SORT_EPSILON) {
-    return distDelta;
-  }
-
-  return itemB.kind - itemA.kind;
-}
-
-export default R;
-
-eventBus.subscribe('client.disconnected', () => {
-  R.ClearAll();
-});
-
-eventBus.subscribe('areaportals.changed', () => {
-  R.oldviewleaf = null;
-});
-
-eventBus.subscribe('cvar.changed', (cvarName) => {
-  switch (cvarName) {
-    case 'r_novis':
-    case 'cl_areaportals':
-      R.oldviewleaf = null;
-      break;
-  }
-});
-
-// light
-
-R.dlightframecount = 0;
-
-R.lightstylevalue_a = new Uint8Array(new ArrayBuffer(64));
-R.lightstylevalue_b = new Uint8Array(new ArrayBuffer(64));
-
-R.AnimateLight = function() {
-  if (R.fullbright.value === 0) {
-    const i = Math.floor(CL.state.time * 10.0);
-    for (let j = 0; j < 64; j++) {
-      const ls = CL.state.clientEntities.lightstyle[j];
-      if (ls.length === 0) {
-        R.lightstylevalue_a[j] = 12;
-        R.lightstylevalue_b[j] = 12;
-        continue;
-      }
-      R.lightstylevalue_a[j] = ls.charCodeAt(i % ls.length) - 97;
-      R.lightstylevalue_b[j] = ls.charCodeAt((i + 1) % ls.length) - 97;
-    }
-  } else {
-    for (let j = 0; j < 64; j++) {
-      R.lightstylevalue_a[j] = 12;
-      R.lightstylevalue_b[j] = 12;
-    }
-  }
-  GL.Bind(0, R.lightstyle_texture_a);
-  gl.texSubImage2D(gl.TEXTURE_2D, 0, 0, 0, 64, 1, gl.RED, gl.UNSIGNED_BYTE, R.lightstylevalue_a);
-  GL.Bind(0, R.lightstyle_texture_b);
-  gl.texSubImage2D(gl.TEXTURE_2D, 0, 0, 0, 64, 1, gl.RED, gl.UNSIGNED_BYTE, R.lightstylevalue_b);
-};
-
-R.RenderDlights = function() {
-  if (R.flashblend.value === 0) {
-    return;
-  }
-  R.dlightframecount++;
-  gl.enable(gl.BLEND);
-  const program = GL.UseProgram('dlight'); let a;
-  GL.BindVAO(R.dlightVAO);
-  for (let i = 0; i < Def.limits.dlights; i++) {
-    const l = CL.state.clientEntities.dlights[i];
-    if ((l.die < CL.state.time) || (l.radius === 0.0)) {
-      continue;
-    }
-    if (l.origin.copy().subtract(R.refdef.vieworg).len() < (l.radius * 0.35)) {
-      a = l.radius * 0.0003;
-      V.blend[3] += a * (1.0 - V.blend[3]);
-      a /= V.blend[3];
-      V.blend[0] = V.blend[1] * (1.0 - a) + (255.0 * a);
-      V.blend[1] = V.blend[1] * (1.0 - a) + (127.5 * a);
-      V.blend[2] *= 1.0 - a;
-      continue;
-    }
-    gl.uniform3fv(program.uOrigin, l.origin);
-    gl.uniform1f(program.uRadius, l.radius);
-    gl.drawArrays(gl.TRIANGLE_FAN, 0, 18);
-  }
-  GL.UnbindVAO();
-  gl.disable(gl.BLEND);
-};
-
-/**
- * @param {import('../common/model/BaseModel.ts').Face} surf Surface to sample.
- * @returns {Vector} A known point on the surface plane.
- */
-R.GetDynamicLightSurfacePoint = function(surf) {
-  const surfedge = CL.state.worldmodel.surfedges[surf.firstedge];
-
-  if (surfedge >= 0) {
-    return CL.state.worldmodel.vertexes[CL.state.worldmodel.edges[surfedge][0]].copy();
-  }
-
-  return CL.state.worldmodel.vertexes[CL.state.worldmodel.edges[-surfedge][1]].copy();
-};
-
-/**
- * @param {ClientDlight} light Dynamic light being evaluated.
- * @param {import('../common/model/BaseModel.ts').Face} surf Surface being tested.
- * @returns {{distanceToPlane: number, impact: Vector}|null} Surface-plane hit information when the light is in front of the face.
- */
-R.GetDynamicLightSurfaceImpact = function(light, surf) {
-  const faceNormal = surf.normal.copy();
-  const surfacePoint = R.GetDynamicLightSurfacePoint(surf);
-  const distanceToPlane = light.origin.copy().subtract(surfacePoint).dot(faceNormal);
-
-  if (distanceToPlane <= 0.0 || distanceToPlane >= light.radius) {
-    return null;
-  }
-
-  const impact = light.origin.copy().subtract(faceNormal.copy().multiply(distanceToPlane));
-
-  return { distanceToPlane, impact };
-};
-
-/**
- * @param {ClientDlight} light Dynamic light being evaluated.
- * @param {import('../common/model/BaseModel.ts').Face} surf Surface being tested.
- * @param {Vector} impact Projected point on the face plane.
- * @returns {boolean} True when the light has line of sight to the surface.
- */
-R.IsDynamicLightSurfaceVisible = function(light, surf, impact) {
-  const end = impact.copy().add(surf.normal.copy().multiply(1.0));
-  const trace = SV.collision.traceStaticWorldLine(light.origin, end);
-
-  return !trace.startsolid && !trace.allsolid && trace.fraction === 1.0;
-};
-
-/**
- * @param {ClientDlight} light Dynamic light being propagated through the BSP.
- * @param {number} bit Bitmask for the current dynamic light.
- * @param {Node} node BSP node being traversed.
- */
-R.MarkLights = function(light, bit, node) {
-  if (node.contents < 0) {
-    return;
-  }
-  const normal = node.plane.normal;
-  const dist = light.origin.dot(normal) - node.plane.dist;
-  if (dist > light.radius) {
-    R.MarkLights(light, bit, node.children[0]);
-    return;
-  }
-  if (dist < -light.radius) {
-    R.MarkLights(light, bit, node.children[1]);
-    return;
-  }
-  for (const surf of node.facesIter()) {
-    if (surf.sky) {
-      continue;
-    }
-
-    const lightImpact = R.GetDynamicLightSurfaceImpact(light, surf);
-
-    if (lightImpact === null || !R.IsDynamicLightSurfaceVisible(light, surf, lightImpact.impact)) {
-      continue;
-    }
-
-    if (surf.dlightframe !== (R.dlightframecount + 1)) {
-      surf.dlightbits = 0;
-      surf.dlightframe = R.dlightframecount + 1;
-    }
-    surf.dlightbits |= bit;
-  }
-  R.MarkLights(light, bit, node.children[0]);
-  R.MarkLights(light, bit, node.children[1]);
-};
-
-R.PushDlights = function() {
-  if (R.flashblend.value !== 0) {
-    return;
-  }
-
-  for (let i = 0; i < LIGHTMAP_BLOCK_SIZE; i++) {
-    R.lightmap_modified[i] = 0;
-  }
-
-  let bit = 1;
-
-  for (let i = 0; i < Def.limits.dlights; i++) {
-    const l = CL.state.clientEntities.dlights[i];
-
-    if (!l.isFree()) {
-      R.MarkLights(l, bit, CL.state.worldmodel.nodes[0]);
-      for (const ent of CL.state.clientEntities.getVisibleEntities()) {
-        if (ent.model === null) {
-          continue;
-        }
-        if ((ent.model.type !== Mod.type.brush) || !ent.model.submodel) {
-          continue;
-        }
-        R.MarkLights(l, bit, CL.state.worldmodel.nodes[ent.model.hulls[0].firstclipnode]);
-      }
-    }
-    bit += bit;
-  }
-
-  let surf;
-  for (let i = 0; i < CL.state.worldmodel.faces.length; i++) {
-    surf = CL.state.worldmodel.faces[i];
-    if (surf.dlightframe === R.dlightframecount) {
-      R.RemoveDynamicLights(surf);
-    } else if (surf.dlightframe === (R.dlightframecount + 1)) {
-      R.AddDynamicLights(surf);
-    }
-  }
-
-  GL.Bind(0, R.dlightmap_rgba_texture);
-  for (let i = 0; i < LIGHTMAP_BLOCK_SIZE; i++) {
-    if (!R.lightmap_modified[i]) {
-      continue;
-    }
-    for (let j = LIGHTMAP_BLOCK_SIZE - 1; j >= i; j--) {
-      if (!R.lightmap_modified[j]) {
-        continue;
-      }
-      gl.texSubImage2D(gl.TEXTURE_2D, 0, 0, i, LIGHTMAP_BLOCK_SIZE, j - i + 1, gl.RGBA, gl.UNSIGNED_BYTE, R.dlightmaps_rgba.subarray(i * LIGHTMAP_BLOCK_SIZE * 4, (j + 1) * LIGHTMAP_BLOCK_SIZE * 4));
-      break;
-    }
-    break;
-  }
-
-  R.dlightframecount++;
-};
-
-R.RecursiveLightPoint = function(node, start, end) {
-  if (node.contents < 0) {
-    return null;
-  }
-
-  const normal = node.plane.normal;
-  const front = start[0] * normal[0] + start[1] * normal[1] + start[2] * normal[2] - node.plane.dist;
-  const back = end[0] * normal[0] + end[1] * normal[1] + end[2] * normal[2] - node.plane.dist;
-  const side = front < 0;
-
-  if ((back < 0) === side) {
-    return R.RecursiveLightPoint(node.children[side ? 1 : 0], start, end);
-  }
-
-  const frac = front / (front - back);
-  const mid = new Vector(
-    start[0] + (end[0] - start[0]) * frac,
-    start[1] + (end[1] - start[1]) * frac,
-    start[2] + (end[2] - start[2]) * frac,
-  );
-
-  const r = R.RecursiveLightPoint(node.children[side ? 1 : 0], start, mid);
-
-  if (r !== null) {
-    return r;
-  }
-
-  if ((back < 0) === side) {
-    return null;
-  }
-
-  for (const surf of node.facesIter()) {
-    if (surf.sky) {
-      continue;
-    }
-
-    const tex = CL.state.worldmodel.texinfo[surf.texinfo];
-    const s = mid.dot(new Vector(...tex.vecs[0])) + tex.vecs[0][3];
-    const t = mid.dot(new Vector(...tex.vecs[1])) + tex.vecs[1][3];
-    if ((s < surf.texturemins[0]) || (t < surf.texturemins[1])) {
-      continue;
-    }
-
-    let ds = s - surf.texturemins[0];
-    let dt = t - surf.texturemins[1];
-    if ((ds > surf.extents[0]) || (dt > surf.extents[1])) {
-      continue;
-    }
-
-    if (surf.styles.length === 0 || surf.lightofs < 0) {
-      return [new Vector(), mid];
-    }
-
-    ds >>= surf.lmshift;
-    dt >>= surf.lmshift;
-
-    const smax = (surf.extents[0] >> surf.lmshift) + 1;
-    const tmax = (surf.extents[1] >> surf.lmshift) + 1;
-
-    const r3 = new Vector();
-    const haveRGB = CL.state.worldmodel.lightdata_rgb !== null;
-    const lightdata = haveRGB ? CL.state.worldmodel.lightdata_rgb : CL.state.worldmodel.lightdata;
-    const channels = haveRGB ? 3 : 1;
-    const uInterpolation = R.interpolation.value ? (CL.state.time % .2) / .2 : 0;
-
-    for (let k = 0; k < channels; k++) {
-      let lightmap = surf.lightofs + dt * smax + ds;
-
-      for (let maps = 0; maps < surf.styles.length; maps++) {
-        const scale = (
-          R.lightstylevalue_a[surf.styles[maps]] * (1 - uInterpolation) +
-          R.lightstylevalue_b[surf.styles[maps]] * uInterpolation
-        ) * 22.0;
-
-        r3[k] += lightdata[lightmap * channels + k] * scale;
-
-        lightmap += tmax * smax;
-      }
-    }
-
-    if (!haveRGB) {
-      // replicate for green and blue
-      r3[1] = r3[0];
-      r3[2] = r3[0];
-    }
-
-    r3[0] = r3[0] >> 8;
-    r3[1] = r3[1] >> 8;
-    r3[2] = r3[2] >> 8;
-
-    return [
-      r3,
-      mid.add(surf.normal.copy().multiply(16.0)),
-    ];
-  }
-
-  return R.RecursiveLightPoint(node.children[!side ? 1 : 0], mid, end);
-};
-
-R.LightPoint = function(p) {
-  if (CL.state.worldmodel.lightdata === null && CL.state.worldmodel.lightdata_rgb === null) {
-    return [new Vector(255, 255, 255), new Vector(0, 0, 0)];
-  }
-
-  // Try lightgrid first if available
-  if (CL.state.worldmodel.lightgrid !== null) {
-    const gridResult = R.LightPointFromGrid(p);
-    if (gridResult !== null) {
-      // Get a proper light origin from surface trace for directional shading.
-      // The lightgrid provides correct color but has no surface information,
-      // so we trace downward to find the surface below the entity.
-      const surfaceTrace = R.RecursiveLightPoint(CL.state.worldmodel.nodes[0], p, new Vector(p[0], p[1], p[2] - 2048.0));
-      if (surfaceTrace !== null) {
-        gridResult[1] = surfaceTrace[1];
-      }
-      return gridResult;
-    }
-  }
-
-  const r = R.RecursiveLightPoint(CL.state.worldmodel.nodes[0], p, new Vector(p[0], p[1], p[2] - 2048.0));
-
-  if (r === null) {
-    return [new Vector(0, 0, 0), new Vector(0, 0, 0)];
-  }
-
-  return r;
-};
-
-/**
- * Sample a single point from the lightgrid octree
- * @param {number[]} gridPos - Grid position [x, y, z]
- * @returns {{stylecount: number, styles: Array<{stylenum: number, rgb: number[]}>}|null} Point data or null if missing
- */
-R.SampleLightgridPoint = function(gridPos) {
-  const grid = CL.state.worldmodel.lightgrid;
-  const LGNODE_LEAF = 1 << 31;
-  const LGNODE_MISSING = 1 << 30;
-
-  // Walk the octree to find the leaf
-  let nodeIndex = grid.rootnode;
-
-  while (true) {
-    // Check if we've hit a leaf or missing node
-    if ((nodeIndex & LGNODE_LEAF) !== 0) {
-      const leafIndex = nodeIndex & ~(LGNODE_LEAF | LGNODE_MISSING);
-
-      if ((nodeIndex & LGNODE_MISSING) !== 0) {
-        // Missing data at this point
-        return null;
-      }
-
-      // Check if leaf index is valid
-      if (leafIndex >= grid.leafs.length) {
-        return null;
-      }
-
-      const leaf = grid.leafs[leafIndex];
-
-      // Calculate index within the leaf
-      const localX = gridPos[0] - leaf.mins[0];
-      const localY = gridPos[1] - leaf.mins[1];
-      const localZ = gridPos[2] - leaf.mins[2];
-
-      // Check bounds
-      if (localX < 0 || localX >= leaf.size[0] ||
-          localY < 0 || localY >= leaf.size[1] ||
-          localZ < 0 || localZ >= leaf.size[2]) {
-        return null;
-      }
-
-      const pointIndex = localZ * leaf.size[0] * leaf.size[1] + localY * leaf.size[0] + localX;
-
-      // Check if point index is valid
-      if (pointIndex >= leaf.points.length) {
-        return null;
-      }
-
-      const point = leaf.points[pointIndex];
-
-      if (point.stylecount === 0xff) {
-        // No data at this point
-        return null;
-      }
-
-      return point;
-    }
-
-    // Internal node - traverse
-    // Check if node index is valid
-    if (nodeIndex >= grid.nodes.length) {
-      return null;
-    }
-
-    const node = grid.nodes[nodeIndex];
-
-    // Calculate child index: ((z>=mid[2])<<0) | ((y>=mid[1])<<1) | ((x>=mid[0])<<2)
-    let childIdx = 0;
-    if (gridPos[2] >= node.mid[2]) {
-      childIdx |= 1;
-    }
-    if (gridPos[1] >= node.mid[1]) {
-      childIdx |= 2;
-    }
-    if (gridPos[0] >= node.mid[0]) {
-      childIdx |= 4;
-    }
-
-    nodeIndex = node.child[childIdx];
-  }
-};
-
-/**
- * Sample lighting from the lightgrid octree with trilinear interpolation
- * @param {Vector} pos - World position to sample
- * @returns {[Vector, Vector]|null} - [RGB light color, light origin] or null if not available
- */
-R.LightPointFromGrid = function(pos) {
-  const grid = CL.state.worldmodel.lightgrid;
-
-  if (!grid) {
-    return null;
-  }
-
-  // Convert world position to grid space
-  const gridPosFloat = [
-    (pos[0] - grid.mins[0]) / grid.step[0],
-    (pos[1] - grid.mins[1]) / grid.step[1],
-    (pos[2] - grid.mins[2]) / grid.step[2],
-  ];
-
-  // Get the 8 surrounding grid points
-  const baseX = Math.floor(gridPosFloat[0]);
-  const baseY = Math.floor(gridPosFloat[1]);
-  const baseZ = Math.floor(gridPosFloat[2]);
-
-  // Calculate fractional part for interpolation
-  const fracX = gridPosFloat[0] - baseX;
-  const fracY = gridPosFloat[1] - baseY;
-  const fracZ = gridPosFloat[2] - baseZ;
-
-  // Sample the 8 corner points
-  const samples = [];
-  const weights = [];
-  let totalWeight = 0;
-
-  for (let dz = 0; dz <= 1; dz++) {
-    for (let dy = 0; dy <= 1; dy++) {
-      for (let dx = 0; dx <= 1; dx++) {
-        const gridPos = [baseX + dx, baseY + dy, baseZ + dz];
-        const sample = R.SampleLightgridPoint(gridPos);
-
-        // Calculate trilinear weight
-        const wx = dx === 0 ? (1 - fracX) : fracX;
-        const wy = dy === 0 ? (1 - fracY) : fracY;
-        const wz = dz === 0 ? (1 - fracZ) : fracZ;
-        const weight = wx * wy * wz;
-
-        if (sample !== null) {
-          samples.push(sample);
-          weights.push(weight);
-          totalWeight += weight;
-        }
-      }
-    }
-  }
-
-  // If no samples found, return null
-  if (samples.length === 0) {
-    return null;
-  }
-
-  // Compensate for missing samples by renormalizing weights
-  if (totalWeight > 0) {
-    for (let i = 0; i < weights.length; i++) {
-      weights[i] /= totalWeight;
-    }
-  }
-
-  // Accumulate weighted RGB values
-  const r3 = new Vector(0, 0, 0);
-  const uInterpolation = R.interpolation.value ? (CL.state.time % .2) / .2 : 0;
-
-  for (let i = 0; i < samples.length; i++) {
-    const sample = samples[i];
-    const weight = weights[i];
-
-    for (let s = 0; s < sample.styles.length; s++) {
-      const style = sample.styles[s];
-      const stylenum = style.stylenum;
-
-      // Apply lightstyle animation (matches RecursiveLightPoint: lightstyle * 22.0 / 256.0)
-      const scale = (
-        R.lightstylevalue_a[stylenum] * (1 - uInterpolation) +
-        R.lightstylevalue_b[stylenum] * uInterpolation
-      ) * 0.0859375; // 22.0 / 256.0
-
-      r3[0] += style.rgb[0] * scale * weight;
-      r3[1] += style.rgb[1] * scale * weight;
-      r3[2] += style.rgb[2] * scale * weight;
-    }
-  }
-
-  return [r3, pos.copy()];
-};
-
-// main
-
-R.visframecount = 0;
-
-R.frustum = [
-  {signbits: 0, normal: new Vector(), dist: 0},
-  {signbits: 0, normal: new Vector(), dist: 0},
-  {signbits: 0, normal: new Vector(), dist: 0},
-  {signbits: 0, normal: new Vector(), dist: 0},
-];
-
-R.vup = new Vector();
-R.vpn = new Vector();
-R.vright = new Vector();
-
-R.refdef = {
-  vrect: {
-    width: 0,
-    height: 0,
-  },
-  vieworg: new Vector(),
-  viewangles: new Vector(),
-};
-
-R.CullBox = function(mins, maxs) {
-  if (Vector.boxOnPlaneSide(mins, maxs, R.frustum[0]) === 2) {
-    return true;
-  }
-  if (Vector.boxOnPlaneSide(mins, maxs, R.frustum[1]) === 2) {
-    return true;
-  }
-  if (Vector.boxOnPlaneSide(mins, maxs, R.frustum[2]) === 2) {
-    return true;
-  }
-  if (Vector.boxOnPlaneSide(mins, maxs, R.frustum[3]) === 2) {
-    return true;
-  }
-  return false;
-};
-
-/**
- * Alias models in Quake sample static light slightly above their origin so
- * monsters are lit from torso height rather than foot height.
- * @param {ClientEdict} entity Entity being lit.
- * @returns {Vector} World position used for static light sampling.
- */
-R.GetEntityLightSamplePoint = function(entity) {
-  const samplePoint = entity.lerp.origin.copy();
-
-  if (entity.model !== null) {
-    // samplePoint[2] -= entity.mins[2] + 24.0; // effectively +24.0u on alias models
-    // CR: fun, that makes the boss in E1M7 pitch black
-  }
-
-  // console.log(`Sampling light for entity ${entity.num} at ${samplePoint}`, entity.model, entity.mins, entity.maxs);
-
-  return samplePoint;
-};
-
-/**
- * @param {ClientEdict} e edict to calculate light for
- * @returns {[Vector, Vector, Vector, Vector, Vector]} ambient light, shade light, nearest light origin, dynamic shade light, dynamic light origin
- */
-R._CalculateLightValues = function (e) {
-  const [ambientlight, lightOrigin] = R.LightPoint(R.GetEntityLightSamplePoint(e));
-  const shadelight = ambientlight.copy();
-
-  // never have a pitch black view model
-  if (e === CL.state.viewent && ambientlight.average() < 24.0) {
-    if (ambientlight.average() === 0) {
-      ambientlight.setTo(1.0, 1.0, 1.0); // no color, set to white
-    }
-    ambientlight.multiply(24.0);
-    shadelight.set(ambientlight);
-  }
-
-  const dynamicShadeLight = new Vector(0.0, 0.0, 0.0);
-  const dynamicLightOrigin = new Vector(0.0, 0.0, 0.0);
-  let maxAdd = 0.0;
-
-  // add dynamic lights
-  for (let i = 0; i < Def.limits.dlights; i++) {
-    const dl = CL.state.clientEntities.dlights[i];
-
-    if (dl.isFree()) {
-      continue;
-    }
-
-    const add = dl.radius - e.lerp.origin.distanceTo(dl.origin);
-
-    if (add > 0.0) {
-      const color = dl.color.copy();
-      const vadd = color.multiply(add);
-      dynamicShadeLight.add(vadd);
-
-      if (add > maxAdd) {
-        maxAdd = add;
-        dynamicLightOrigin.set(dl.origin);
-      }
-    }
-  }
-
-  // do not overbright
-  const alavg = ambientlight.greatest();
-  if (alavg > 128.0) {
-    ambientlight.multiply(128.0 / alavg);
-  }
-
-  const slavg = shadelight.greatest();
-  if (slavg > 128.0) {
-    shadelight.multiply(128.0 / slavg);
-  }
-
-  const dlavg = dynamicShadeLight.greatest();
-  if (dlavg > 128.0) {
-    dynamicShadeLight.multiply(128.0 / dlavg);
-  }
-
-  if (e.effects & (effect.EF_FULLBRIGHT | effect.EF_MUZZLEFLASH)) {
-    ambientlight.setTo(255.0, 255.0, 255.0);
-    shadelight.set(ambientlight);
-  } else if ((e.num >= 1 && e.num <= CL.state.maxclients && shadelight.greatest() < 8.0) || (e.effects & effect.EF_MINLIGHT)) {
-    // never let players go totally dark either
-    if (ambientlight.average() === 0) {
-      ambientlight.setTo(1.0, 1.0, 1.0); // no color, set to white
-    }
-    ambientlight.multiply(8.0);
-    shadelight[0] = Math.max(shadelight[0], ambientlight[0]);
-    shadelight[1] = Math.max(shadelight[1], ambientlight[1]);
-    shadelight[2] = Math.max(shadelight[2], ambientlight[2]);
-  }
-
-  ambientlight.multiply(0.0078125); // / 128.0
-  shadelight.multiply(0.0078125); // / 128.0
-  dynamicShadeLight.multiply(0.0078125);
-
-  return [ ambientlight, shadelight, lightOrigin, dynamicShadeLight, dynamicLightOrigin ];
-};
-
-R.DrawEntitiesOnList = function() {
-  if (R.drawentities.value === 0) {
-    return;
-  }
-
-  // Group entities by model type for batched rendering
-  const entitiesByType = new Map();
-
-  for (const entity of CL.state.clientEntities.getVisibleEntities()) {
-    if (entity.model === null || entity.alpha === 0.0) {
-      continue;
-    }
-
-    const modelType = entity.model.type;
-    if (!entitiesByType.has(modelType)) {
-      entitiesByType.set(modelType, []);
-    }
-    entitiesByType.get(modelType).push(entity);
-  }
-
-  // Pass 0: Opaque models (brush, alias)
-  for (const [modelType, entities] of entitiesByType) {
-    if (modelType === Mod.type.sprite) {
-      continue; // Sprites are drawn in pass 1
-    }
-
-    const renderer = modelRendererRegistry.getRenderer(modelType);
-
-    renderer.setupRenderState(0);
-    for (const entity of entities) {
-      if (!renderer.rendersOpaquePass(entity.model, entity)) {
-        continue;
-      }
-
-      renderer.render(entity.model, entity, 0);
-    }
-    renderer.cleanupRenderState(0);
-  }
-  GL.StreamFlush();
-
-  // Pass 1: Transparent sprites with blending
-  const spriteEntities = entitiesByType.get(Mod.type.sprite);
-  if (spriteEntities) {
-    const renderer = modelRendererRegistry.getRenderer(Mod.type.sprite);
-
-    gl.enable(gl.BLEND);
-    renderer.setupRenderState(1);
-    for (const entity of spriteEntities) {
-      renderer.render(entity.model, entity, 1);
-    }
-    renderer.cleanupRenderState(1);
-    GL.StreamFlush();
-    gl.disable(gl.BLEND);
-  }
-};
-
-/**
- * Render world turbulent surfaces and fog volumes in the correct order.
- *
- * Turbulent surfaces and fog volumes share the same transparency space, so
- * they must be composed from a single back-to-front list. Rendering them in
- * separate phases is incorrect when water and fog overlap or alternate in
- * depth, such as foggy water volumes or mist sitting above water.
- *
- * When no fog volumes exist (or post-process is unavailable), this falls
- * back to the simple sequential turbulent pass.
- * @param {ClientEdict} worldEntity The world entity (entity 0)
- */
-R._renderFogAndTurbulentsSorted = function(worldEntity) {
-  const worldmodel = /** @type {BrushModel} */ (worldEntity.model);
-  const brushRenderer = /** @type {BrushModelRenderer} */ (modelRendererRegistry.getRenderer(Mod.type.brush));
-  const hasFog = PostProcess.active
-    && worldmodel.fogVolumes && worldmodel.fogVolumes.length > 0;
-  const hasTurbulents = R.drawturbulents.value;
-
-  // Fast path: no fog volumes — just render turbulents the simple way
-  if (!hasFog) {
-    if (hasTurbulents) {
-      brushRenderer.render(worldmodel, worldEntity, 1);
-    }
-    return;
-  }
-
-  // Fast path: fog but no turbulents — just render fog volumes
-  if (!hasTurbulents) {
-    brushRenderer.renderFogVolumes(worldmodel);
-    return;
-  }
-
-  const vieworg = R.refdef.vieworg;
-  /** @type {Array<{dist: number, kind: number, data: import('../common/model/BSP.ts').WorldTurbulentChainInfo|import('../common/model/BSP.ts').FogVolumeInfo}>} */
-  const items = [];
-
-  const turbulentChains = brushRenderer.getWorldTurbulentChains(worldmodel, vieworg);
-  for (let i = 0; i < turbulentChains.length; i++) {
-    items.push({ dist: turbulentChains[i].dist, kind: 0, data: turbulentChains[i].chain });
-  }
-
-  const fogItems = brushRenderer.getFogVolumeItems(worldmodel, vieworg);
-  for (let i = 0; i < fogItems.length; i++) {
-    items.push({ dist: fogItems[i].dist, kind: 1, data: fogItems[i].fogVolume });
-  }
-
-  if (items.length === 0) {
-    return;
-  }
-
-  items.sort(compareFogAndTurbulentItems);
-
-  let activePass = -1;
-
-  for (let i = 0; i < items.length; i++) {
-    const item = items[i];
-
-    if (item.kind !== activePass) {
-      if (activePass === 0) {
-        brushRenderer.endWorldTurbulentPass();
-      } else if (activePass === 1) {
-        brushRenderer.endFogVolumePass();
-      }
-
-      if (item.kind === 0) {
-        brushRenderer.beginWorldTurbulentPass(worldmodel);
-      } else if (!brushRenderer.beginFogVolumePass(worldmodel)) {
-        activePass = -1;
-        continue;
-      }
-
-      activePass = item.kind;
-    }
-
-    if (item.kind === 0) {
-      brushRenderer.renderWorldTurbulentChain(worldmodel, /** @type {import('../common/model/BSP.ts').WorldTurbulentChainInfo} */ (item.data));
-      continue;
-    }
-
-    brushRenderer.renderSingleFogVolume(worldmodel, /** @type {import('../common/model/BSP.ts').FogVolumeInfo} */ (item.data));
-  }
-
-  if (activePass === 0) {
-    brushRenderer.endWorldTurbulentPass();
-  } else if (activePass === 1) {
-    brushRenderer.endFogVolumePass();
-  }
-};
-
-/**
- * Render all transparent geometry (world brush surfaces + entities) in
- * back-to-front sorted order with depth writes disabled.
- * This ensures transparent surfaces blend correctly regardless of type.
- * @param {ClientEdict} worldEntity The world entity (entity 0)
- */
-R._renderTransparentsSorted = function(worldEntity) {
-  const worldmodel = /** @type {BrushModel} */ (worldEntity.model);
-
-  const vieworg = R.refdef.vieworg;
-  /** @type {Array<{dist: number, kind: number, data: Node|ClientEdict}>} */
-  const items = [];
-
-  // Collect world transparent leaves with distances
-  const brushRenderer = /** @type {BrushModelRenderer} */ (modelRendererRegistry.getRenderer(Mod.type.brush));
-  if (worldEntity && worldEntity.model) {
-    const worldLeaves = brushRenderer.getWorldTransparentLeaves(worldmodel, vieworg);
-    for (let i = 0; i < worldLeaves.length; i++) {
-      items.push({ dist: worldLeaves[i].dist, kind: 0, data: worldLeaves[i].leaf });
-    }
-  }
-
-  // Collect transparent entities with distances
-  if (R.drawentities.value !== 0) {
-    for (const entity of CL.state.clientEntities.getVisibleEntities()) {
-      if (entity.model === null || entity.alpha === 0.0) {
-        continue;
-      }
-
-      const renderer = modelRendererRegistry.getRenderer(entity.model.type);
-      if (renderer === null || !renderer.rendersTransparentPass(entity.model, entity)) {
-        continue;
-      }
-
-      const dx = entity.origin[0] - vieworg[0];
-      const dy = entity.origin[1] - vieworg[1];
-      const dz = entity.origin[2] - vieworg[2];
-      const dist = Math.hypot(dx, dy, dz);
-      items.push({ dist, kind: 1, data: entity });
-    }
-  }
-
-  if (items.length === 0) {
-    return;
-  }
-
-  // Sort back-to-front (farthest first)
-  items.sort((a, b) => b.dist - a.dist);
-
-  // Render in sorted order with depth writes disabled
-  gl.depthMask(false);
-  let worldPassActive = false;
-
-  for (let i = 0; i < items.length; i++) {
-    const item = items[i];
-
-    if (item.kind === 0) {
-      // World transparent leaf
-      if (!worldPassActive) {
-        brushRenderer.beginWorldTransparentPass(worldmodel);
-        worldPassActive = true;
-      }
-      brushRenderer.renderWorldTransparentLeaf(worldmodel, /** @type {Node} */ (item.data));
-    } else {
-      // Transparent entity — end world pass if active (shader switch)
-      if (worldPassActive) {
-        brushRenderer.endWorldTransparentPass();
-        GL.StreamFlush();
-        worldPassActive = false;
-      }
-      const entity = /** @type {ClientEdict} */ (item.data);
-      const renderer = modelRendererRegistry.getRenderer(entity.model.type);
-      renderer.render(entity.model, entity, 2);
-      GL.StreamFlush();
-    }
-  }
-
-  if (worldPassActive) {
-    brushRenderer.endWorldTransparentPass();
-    GL.StreamFlush();
-  }
-
-  gl.depthMask(true);
-};
-
-R.DrawViewModel = function() {
-  if (R.drawviewmodel.value === 0) {
-    return;
-  }
-  if (Chase.active.value !== 0) {
-    return;
-  }
-  if (R.drawentities.value === 0) {
-    return;
-  }
-
-  if (!CL.gameCapabilities.includes(gameCapabilities.CAP_VIEWMODEL_MANAGED)) {
-    if ((CL.state.items & Def.it.invisibility) !== 0) { // Legacy
-      return;
-    }
-    if (CL.state.stats[Def.stat.health] <= 0) { // Legacy
-      return;
-    }
-    if (!CL.state.viewent.model) {
-      return;
-    }
-  } else if (CL.state.gameAPI) {
-    const viewmodel = CL.state.gameAPI.viewmodel;
-
-    if (!viewmodel.visible) {
-      return; // game says to not draw the view model
-    }
-
-    if (!viewmodel.model) {
-      return; // no model to draw
-    }
-  }
-
-  gl.depthRange(0.0, 0.3);
-
-  let ymax = 4.0 * Math.tan(SCR.fov.value * 0.82 * Math.PI / 360.0);
-  R.perspective[0] = 4.0 / (ymax * R.refdef.vrect.width / R.refdef.vrect.height);
-  R.perspective[5] = 4.0 / ymax;
-  let program = GL.UseProgram('alias');
-  gl.uniformMatrix4fv(program.uPerspective, false, R.perspective);
-
-  if (CL.state.viewent.model !== null) {
-    const aliasRenderer = modelRendererRegistry.getRenderer(Mod.type.alias);
-    aliasRenderer.setupRenderState(0);
-    aliasRenderer.render(CL.state.viewent.model, CL.state.viewent, 0);
-    aliasRenderer.cleanupRenderState(0);
-  }
-
-  ymax = 4.0 * Math.tan(R.refdef.fov_y * Math.PI / 360.0);
-  R.perspective[0] = 4.0 / (ymax * R.refdef.vrect.width / R.refdef.vrect.height);
-  R.perspective[5] = 4.0 / ymax;
-  program = GL.UseProgram('alias');
-  gl.uniformMatrix4fv(program.uPerspective, false, R.perspective);
-
-  gl.depthRange(0.0, 1.0);
-};
-
-R.PolyBlend = function() {
-  if (R.polyblend.value === 0) {
-    return;
-  }
-  if (V.blend[3] === 0.0) {
-    return;
-  }
-  GL.UseProgram('fill', true);
-  const vrect = R.refdef.vrect;
-  GL.StreamDrawColoredQuad(vrect.x, vrect.y, vrect.width, vrect.height, V.blend[0], V.blend[1], V.blend[2], V.blend[3] * 255.0);
-};
-
-R.SetFrustum = function() {
-  if (R.vup.isOrigin() || R.vright.isOrigin() || R.vpn.isOrigin()) { // can’t set frustum with these
-    return;
-  }
-  R.frustum[0].normal = R.vup.rotatePointAroundVector(R.vpn, -(90.0 - R.refdef.fov_x * 0.5));
-  R.frustum[1].normal = R.vup.rotatePointAroundVector(R.vpn, 90.0 - R.refdef.fov_x * 0.5);
-  R.frustum[2].normal = R.vright.rotatePointAroundVector(R.vpn, 90.0 - R.refdef.fov_y * 0.5);
-  R.frustum[3].normal = R.vright.rotatePointAroundVector(R.vpn, -(90.0 - R.refdef.fov_y * 0.5));
-  for (let i = 0; i < 4; i++) {
-    const out = R.frustum[i];
-    out.type = 5;
-    out.dist = R.refdef.vieworg.dot(out.normal);
-    out.signbits = 0;
-    if (out.normal[0] < 0.0) {
-      out.signbits = 1;
-    }
-    if (out.normal[1] < 0.0) {
-      out.signbits += 2;
-    }
-    if (out.normal[2] < 0.0) {
-      out.signbits += 4;
-    }
-    if (out.normal[3] < 0.0) {
-      out.signbits += 8;
-    }
-  }
-};
-
-R.viewMatrix = null;
-R.projectionMatrix = null;
-
-// eslint-disable-next-line jsdoc/require-jsdoc
-function multiplyMatrixVec4(m, v) {
-  return [
-    m[0]*v[0] + m[4]*v[1] + m[8]*v[2] + m[12]*v[3],
-    m[1]*v[0] + m[5]*v[1] + m[9]*v[2] + m[13]*v[3],
-    m[2]*v[0] + m[6]*v[1] + m[10]*v[2] + m[14]*v[3],
-    m[3]*v[0] + m[7]*v[1] + m[11]*v[2] + m[15]*v[3],
-  ];
-}
-
-/**
- *
- * @param {Vector} origin position in the world
- * @returns {Vector|null} screen coordinates or null if off-screen
- */
-R.WorldToScreen = function(origin) {
-  const projectionMatrix = R.projectionMatrix;
-  const viewMatrix = R.viewMatrix; // This is uViewAngles — rotation only
-
-  // world-space delta from camera
-  const delta = [
-    origin[0] - R.refdef.vieworg[0],
-    origin[1] - R.refdef.vieworg[1],
-    origin[2] - R.refdef.vieworg[2],
-  ];
-
-  // Apply view rotation
-  const x =
-    viewMatrix[0] * delta[0] +
-    viewMatrix[4] * delta[1] +
-    viewMatrix[8] * delta[2];
-  const y =
-    viewMatrix[1] * delta[0] +
-    viewMatrix[5] * delta[1] +
-    viewMatrix[9] * delta[2];
-  const z =
-    viewMatrix[2] * delta[0] +
-    viewMatrix[6] * delta[1] +
-    viewMatrix[10] * delta[2];
-
-  // Mimic gl_Position = projection * vec4(xz, -y, 1.0)
-  const posVec = [x, z, -y, 1.0]; // Swizzle + flip Y
-
-  const clip = multiplyMatrixVec4(projectionMatrix, posVec);
-
-  // If the clip space W coordinate is zero, we can't convert to NDC
-  if (clip[3] === 0) {
-    return null;
-  }
-
-  const ndc = [
-    clip[0] / clip[3],
-    clip[1] / clip[3],
-    clip[2] / clip[3],
-  ];
-
-  if (clip[3] > 0 && ndc[0] >= -1 && ndc[0] <= 1 && ndc[1] >= -1 && ndc[1] <= 1 && ndc[2] >= 0 && ndc[2] <= 1) {
-    return new Vector(
-      R.refdef.vrect.x + (ndc[0] + 1) * 0.5 * R.refdef.vrect.width,
-      R.refdef.vrect.y + (1 - ndc[1]) * 0.5 * R.refdef.vrect.height,
-      ndc[2],
-    );
-  }
-
-  return null;
-};
-
-R.perspective = [
-  0.0, 0.0, 0.0, 0.0,
-  0.0, 0.0, 0.0, 0.0,
-  0.0, 0.0, -65540.0 / 65532.0, -1.0,
-  0.0, 0.0, -524288.0 / 65532.0, 0.0,
-];
-
-R.Perspective = function() {
-  const viewangles = [
-    R.refdef.viewangles[0] * Math.PI / 180.0,
-    (R.refdef.viewangles[1] - 90.0) * Math.PI / -180.0,
-    R.refdef.viewangles[2] * Math.PI / -180.0,
-  ];
-  const sp = Math.sin(viewangles[0]);
-  const cp = Math.cos(viewangles[0]);
-  const sy = Math.sin(viewangles[1]);
-  const cy = Math.cos(viewangles[1]);
-  const sr = Math.sin(viewangles[2]);
-  const cr = Math.cos(viewangles[2]);
-  const viewMatrix = [
-    cr * cy + sr * sp * sy,		cp * sy,	-sr * cy + cr * sp * sy,
-    cr * -sy + sr * sp * cy,	cp * cy,	-sr * -sy + cr * sp * cy,
-    sr * cp,					-sp,		cr * cp,
-  ];
-
-  R.viewMatrix = [
-    viewMatrix[0], viewMatrix[1], viewMatrix[2], 0.0,
-    viewMatrix[3], viewMatrix[4], viewMatrix[5], 0.0,
-    viewMatrix[6], viewMatrix[7], viewMatrix[8], 0.0,
-    0.0,           0.0,           0.0,           1.0,
-  ];
-
-  R.projectionMatrix = R.perspective;
-
-  if (V.gamma.value < 0.5) {
-    V.gamma.set(0.5);
-  } else if (V.gamma.value > 1.0) {
-    V.gamma.set(1.0);
-  }
-
-  GL.UnbindProgram();
-  for (let i = 0; i < GL.programs.length; i++) {
-    const program = GL.programs[i];
-    gl.useProgram(program.program);
-    if (program.uViewOrigin !== undefined) {
-      gl.uniform3fv(program.uViewOrigin, R.refdef.vieworg);
-    }
-    if (program.uViewAngles !== undefined) {
-      gl.uniformMatrix3fv(program.uViewAngles, false, viewMatrix);
-    }
-    if (program.uPerspective !== undefined) {
-      gl.uniformMatrix4fv(program.uPerspective, false, R.perspective);
-    }
-    if (program.uGamma !== undefined) {
-      gl.uniform1f(program.uGamma, V.gamma.value);
-    }
-    // global fog uniforms (only set when shader declares them)
-    if (program.uFogColor !== undefined) {
-      const colParts = (R.fog_color.string || '128 128 128').split(/\s+/).map(Number);
-      gl.uniform3fv(program.uFogColor, [(colParts[0]||128)/255.0, (colParts[1]||128)/255.0, (colParts[2]||128)/255.0]);
-    }
-    if (program.uFogParams !== undefined) {
-      // uFogParams = vec4(start, end, density, mode)
-      gl.uniform4f(program.uFogParams, R.fog_start.value, R.fog_end.value, R.fog_density.value, R.fog_mode.value);
-    }
-    // shadow mapping uniforms (set on all programs that declare them)
-    if (program.uLightSpaceMatrix0 !== undefined) {
-      gl.uniformMatrix4fv(program.uLightSpaceMatrix0, false, ShadowMap.lightSpaceMatrices[0]);
-    }
-    if (program.uLightSpaceMatrix1 !== undefined) {
-      gl.uniformMatrix4fv(program.uLightSpaceMatrix1, false, ShadowMap.lightSpaceMatrices[1]);
-    }
-    if (program.uLightSpaceMatrix2 !== undefined) {
-      gl.uniformMatrix4fv(program.uLightSpaceMatrix2, false, ShadowMap.lightSpaceMatrices[2]);
-    }
-    if (program.uShadowEnabled !== undefined) {
-      gl.uniform1f(program.uShadowEnabled, ShadowMap.enabled.value ? 1.0 : 0.0);
-    }
-    if (program.uShadowCount !== undefined) {
-      gl.uniform1i(program.uShadowCount, ShadowMap.enabled.value ? ShadowMap.localLightCount : 0);
-    }
-    if (program.uShadowDarkness !== undefined) {
-      gl.uniform1f(program.uShadowDarkness, ShadowMap.darkness.value);
-    }
-    if (program.uShadowMapSize !== undefined) {
-      gl.uniform1f(program.uShadowMapSize, ShadowMap.size);
-    }
-    // Point light shadow uniforms
-    if (program.uPointShadowEnabled !== undefined) {
-      gl.uniform1f(program.uPointShadowEnabled, ShadowMap.pointLightActive ? 1.0 : 0.0);
-    }
-    if (program.uPointLightPos !== undefined) {
-      gl.uniform3fv(program.uPointLightPos, ShadowMap.pointLightOrigin);
-    }
-    if (program.uPointLightRadius !== undefined) {
-      gl.uniform1f(program.uPointLightRadius, ShadowMap.pointLightRadius);
-    }
-  }
-};
-
-R.SetupGL = function() {
-  const vrect = R.refdef.vrect;
-  const pixelRatio = VID.pixelRatio;
-  const w = (vrect.width * pixelRatio) >> 0;
-  const h = (vrect.height * pixelRatio) >> 0;
-
-  if (R.usePostProcess === true || PostProcess.hasActiveEffects()) {
-    // Render the scene to the shared post-process capture FBO whenever a
-    // screen-space effect needs to sample it. Depth-aware passes like fog
-    // use the same capture path and sample the depth texture mid-frame.
-    PostProcess.resize(w, h);
-    PostProcess.begin();
-    gl.viewport(0, 0, w, h);
-  } else {
-    gl.viewport((vrect.x * pixelRatio) >> 0, ((VID.height - vrect.height - vrect.y) * pixelRatio) >> 0, w, h);
-  }
-  R.Perspective();
-  gl.enable(gl.DEPTH_TEST);
-};
-
-R.viewleaf = null;
-
-R.PreRenderScene = function() {
-  R.AnimateLight();
-  const {forward, right, up} = R.refdef.viewangles.angleVectors();
-  [R.vpn, R.vright, R.vup] = [forward, right, up];
-  R.viewleaf = CL.state.worldmodel.getLeafForPoint(R.refdef.vieworg);
-  V.SetContentsColor(R.viewleaf.contents);
-  V.CalcBlend();
-  R.dowarp = (R.waterwarp.value !== 0) && (R.viewleaf.contents <= content.CONTENT_WATER);
-
-  // Update warp effect active state
-  const warpEffect = PostProcess.getEffect('warp');
-  if (warpEffect) {
-    warpEffect.active = R.dowarp;
-  }
-
-  const bloomEffect = PostProcess.getEffect('bloom');
-  if (bloomEffect) {
-    bloomEffect.active = R.bloom.value !== 0;
-  }
-
-  // Activate depth-texture post-process when fog volumes exist.
-  // Pipeline effects (warp, etc.) are resolved separately via PostProcess.resolve.
-  R.usePostProcess = CL.state.worldmodel.fogVolumes && CL.state.worldmodel.fogVolumes.length > 0;
-
-  // Choose the shadow texture for this frame (real or dummy)
-  R.shadow_textures = ShadowMap.getActiveTextures();
-  R.shadow_texture = R.shadow_textures[0];
-  R.point_shadow_texture = ShadowMap.getActivePointTexture();
-};
-
-R.RenderWorld = function() {
-  // Render world and entities using the renderer registry
-  const worldEntity = CL.state.clientEntities.getEntity(0);
-  if (worldEntity && worldEntity.model) {
-    const brushRenderer = modelRendererRegistry.getRenderer(Mod.type.brush);
-    // Pass 0: World opaque surfaces
-    brushRenderer.render(worldEntity.model, worldEntity, 0);
-  }
-
-  // Draw all other entities (pass 0 for opaque, pass 1 for turbulent)
-  R.DrawEntitiesOnList();
-
-  // Fog volumes and turbulent surfaces must be interleaved back-to-front.
-  // Without sorting, turbulents always draw over fog (or vice versa),
-  // which is wrong when a fog volume is in front of a water surface.
-  // We collect both into a single list, sort by distance from the camera,
-  // and render farthest-first so nearer surfaces blend over farther ones.
-  if (worldEntity && worldEntity.model) {
-    R._renderFogAndTurbulentsSorted(worldEntity);
-  }
-
-  gl.disable(gl.CULL_FACE);
-  R.RenderDlights();
-  R.DrawDecals();
-  R.DrawParticles();
-
-  // Pass 2: All transparent geometry, sorted back-to-front with depthMask(false).
-  // Without sorting, whichever draws last appears on top. By sorting farthest-first
-  // and disabling depth writes, nearer transparent surfaces blend over farther ones.
-  gl.enable(gl.CULL_FACE);
-  R._renderTransparentsSorted(worldEntity);
-  gl.disable(gl.CULL_FACE);
-};
-
-R.RenderScene = function() {
-  R.SetFrustum();
-
-  // Shadow depth pass — local entity shadow centered on the nearest visible
-  // shadow caster. Static world shadowing remains authored by baked lightmaps.
-  if (ShadowMap.enabled.value) {
-    ShadowMap.selectLocalLights(R.refdef.vieworg);
-    ShadowMap.updateLightSpaceMatrices();
-    R.shadow_textures = ShadowMap.getActiveTextures();
-    R.shadow_texture = R.shadow_textures[0];
-    const localCasterRadius = ShadowMap.casterRadius.value;
-    const localCasterRadiusSq = localCasterRadius * localCasterRadius;
-
-    for (let i = 0; i < ShadowMap.localLightCount; i++) {
-      ShadowMap.begin(i);
-      ShadowMap.renderEntitiesShadow(
-        ShadowMap.lightSpaceMatrices[i],
-        'shadow-brush',
-        'shadow-alias',
-        ShadowMap._shadowFocusPoint,
-        localCasterRadiusSq,
-      );
-      ShadowMap.end();
-    }
-  }
-
-  // Point light shadow pass — render world BSP into a cube depth map
-  // from the strongest dlight's position.
-  if (ShadowMap.selectPointLight(R.refdef.vieworg)) {
-    ShadowMap.renderPointLightShadow();
-  }
-  // Update point shadow texture AFTER selectPointLight so the correct
-  // texture (real or dummy) is bound for this frame. PreRenderScene
-  // runs before selectPointLight updates pointLightActive, so its
-  // assignment may be stale on the first frame a dlight appears.
-  R.point_shadow_texture = ShadowMap.getActivePointTexture();
-
-  R.SetupGL();
-  R.MarkLeafs();
-  gl.enable(gl.CULL_FACE);
-  R.DrawSkyBox();
-  R.DrawViewModel();
-  R.RenderWorld();
-};
-
-R._speeds = /** @type {string[]} */ ([]);
-
-R.RenderView = function() {
-  let time1;
-  if (R.speeds.value !== 0) {
-    gl.finish();
-    time1 = Sys.FloatMilliTime();
-  }
-  R.c_brush_verts = 0;
-  R.c_brush_tris = 0;
-  R.c_brush_draws = 0;
-  R.c_brush_draws_pbr = 0;  // Draw calls with PBR materials
-  R.c_brush_vbos = 0;
-  R.c_brush_texture_binds = 0;  // Track texture binding overhead
-  R.c_alias_polys = 0;
-  gl.clear(gl.COLOR_BUFFER_BIT + gl.DEPTH_BUFFER_BIT);
-  R.RenderScene();
-  if (R.speeds.value !== 0) {
-    const c_brush_polys = R.c_brush_verts / 3;
-    const c_alias_polys = R.c_alias_polys;
-    const avgTrisPerDraw = (R.c_brush_tris / R.c_brush_draws).toFixed(1);
-
-    R._speeds[0] = `${R.c_brush_draws.toFixed().padStart(5)} draw calls (${R.c_brush_draws_pbr} PBR)`;
-    R._speeds[1] = `${R.c_brush_tris.toFixed().padStart(5)} tris, ${R.c_brush_verts.toFixed().padStart(5)} verts`;
-    R._speeds[2] = `${R.c_brush_vbos.toFixed().padStart(5)} VBOs used, ${R.c_brush_texture_binds.toFixed().padStart(5)} texture binds`;
-    R._speeds[3] = `${c_alias_polys.toFixed().padStart(5)} alias polys, ${c_brush_polys.toFixed().padStart(5)} brush polys`;
-    R._speeds[4] = '';
-    R._speeds[5] = `Avg ${avgTrisPerDraw} tris/draw, time: ${((Sys.FloatMilliTime() - time1)).toFixed(1)} msec`;
-  }
-};
-
-R.PrintSpeeds = function() {
-  if (!R.speeds.value) {
-    return;
-  }
-
-  Draw.String(16, 16, `${SCR.FPS.toFixed(1)} FPS`, 2.0);
-
-  for (let i = 0; i < R._speeds.length; i++) {
-    Draw.String(16, 40 + i * 8, R._speeds[i]);
-  }
-};
-
-// misc
-
-R.InitTextures = function() {
-  if (registry.isDedicatedServer) {
-    return;
-  }
-
-  // make a default texture (a red and black checkerboard)
-  const data = new Uint8Array(new ArrayBuffer(256 * 4));
-  for (let i = 0; i < 8; i++) {
-    for (let j = 0; j < 8; j++) {
-      data[((i << 4) + j) * 4 + 0] = 255;
-      data[((i << 4) + j) * 4 + 1] = 0;
-      data[((i << 4) + j) * 4 + 2] = 0;
-      data[((i << 4) + j) * 4 + 3] = 255;
-
-      data[(136 + (i << 4) + j) * 4 + 0] = 255;
-      data[(136 + (i << 4) + j) * 4 + 1] = 0;
-      data[(136 + (i << 4) + j) * 4 + 2] = 0;
-      data[(136 + (i << 4) + j) * 4 + 3] = 255;
-
-      data[(8 + (i << 4) + j) * 4 + 0] = 0;
-      data[(8 + (i << 4) + j) * 4 + 1] = 0;
-      data[(8 + (i << 4) + j) * 4 + 2] = 0;
-      data[(8 + (i << 4) + j) * 4 + 3] = 255;
-
-      data[(128 + (i << 4) + j) * 4 + 0] = 0;
-      data[(128 + (i << 4) + j) * 4 + 1] = 0;
-      data[(128 + (i << 4) + j) * 4 + 2] = 0;
-      data[(128 + (i << 4) + j) * 4 + 3] = 255;
-    }
-  }
-
-  R.notexture = GLTexture.Allocate('r_notexture', 16, 16, data);
-  R.blacktexture = GLTexture.Allocate('r_blacktexture', 1, 1, new Uint8Array([0, 0, 0, 255]));
-  R.flatnormalmap = GLTexture.Allocate('r_flatnormalmap', 1, 1, new Uint8Array([128, 128, 255, 255]));
-
-  R.deluxemap_texture = gl.createTexture();
-  GL.BindArray(0, R.deluxemap_texture);
-  gl.texParameteri(gl.TEXTURE_2D_ARRAY, gl.TEXTURE_MIN_FILTER, gl.LINEAR);
-  gl.texParameteri(gl.TEXTURE_2D_ARRAY, gl.TEXTURE_MAG_FILTER, gl.LINEAR);
-  gl.texStorage3D(gl.TEXTURE_2D_ARRAY, 1, gl.RGBA8, LIGHTMAP_BLOCK_SIZE, LIGHTMAP_BLOCK_SIZE, 3);
-
-  R.lightmap_texture = gl.createTexture();
-  GL.BindArray(0, R.lightmap_texture);
-  gl.texParameteri(gl.TEXTURE_2D_ARRAY, gl.TEXTURE_MIN_FILTER, gl.LINEAR);
-  gl.texParameteri(gl.TEXTURE_2D_ARRAY, gl.TEXTURE_MAG_FILTER, gl.LINEAR);
-  gl.texStorage3D(gl.TEXTURE_2D_ARRAY, 1, gl.RGBA8, LIGHTMAP_BLOCK_SIZE, LIGHTMAP_BLOCK_SIZE, 3);
-
-  R.dlightmap_rgba_texture = gl.createTexture();
-  GL.Bind(0, R.dlightmap_rgba_texture);
-  gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_MIN_FILTER, gl.LINEAR);
-  gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_MAG_FILTER, gl.LINEAR);
-  gl.texStorage2D(gl.TEXTURE_2D, 1, gl.RGBA8, LIGHTMAP_BLOCK_SIZE, LIGHTMAP_BLOCK_SIZE);
-
-  R.lightstyle_texture_a = gl.createTexture();
-  GL.Bind(0, R.lightstyle_texture_a);
-  gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_MIN_FILTER, gl.NEAREST);
-  gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_MAG_FILTER, gl.NEAREST);
-  gl.texStorage2D(gl.TEXTURE_2D, 1, gl.R8, 64, 1);
-
-  R.lightstyle_texture_b = gl.createTexture();
-  GL.Bind(0, R.lightstyle_texture_b);
-  gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_MIN_FILTER, gl.NEAREST);
-  gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_MAG_FILTER, gl.NEAREST);
-  gl.texStorage2D(gl.TEXTURE_2D, 1, gl.R8, 64, 1);
-
-  R.fullbright_texture = gl.createTexture();
-  GL.BindArray(0, R.fullbright_texture);
-  gl.texParameteri(gl.TEXTURE_2D_ARRAY, gl.TEXTURE_MIN_FILTER, gl.NEAREST);
-  gl.texParameteri(gl.TEXTURE_2D_ARRAY, gl.TEXTURE_MAG_FILTER, gl.NEAREST);
-  gl.texStorage3D(gl.TEXTURE_2D_ARRAY, 1, gl.RGBA8, 1, 1, 3);
-  gl.texSubImage3D(gl.TEXTURE_2D_ARRAY, 0, 0, 0, 0, 1, 1, 3, gl.RGBA, gl.UNSIGNED_BYTE, new Uint8Array([
-    255, 0, 0, 0, // layer 0 (R): lightstyle 0 at full
-    255, 0, 0, 0, // layer 1 (G): lightstyle 0 at full
-    255, 0, 0, 0, // layer 2 (B): lightstyle 0 at full
-  ]));
-
-  R.null_texture = gl.createTexture();
-  GL.Bind(0, R.null_texture);
-  gl.texStorage2D(gl.TEXTURE_2D, 1, gl.RGBA8, 1, 1);
-  gl.texSubImage2D(gl.TEXTURE_2D, 0, 0, 0, 1, 1, gl.RGBA, gl.UNSIGNED_BYTE, new Uint8Array([0, 0, 0, 0]));
-  gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_MIN_FILTER, gl.NEAREST);
-  gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_MAG_FILTER, gl.NEAREST);
-
-  R.normal_up_texture = gl.createTexture();
-  GL.BindArray(0, R.normal_up_texture);
-  gl.texParameteri(gl.TEXTURE_2D_ARRAY, gl.TEXTURE_MIN_FILTER, gl.NEAREST);
-  gl.texParameteri(gl.TEXTURE_2D_ARRAY, gl.TEXTURE_MAG_FILTER, gl.NEAREST);
-  gl.texStorage3D(gl.TEXTURE_2D_ARRAY, 1, gl.RGBA8, 1, 1, 3);
-  gl.texSubImage3D(gl.TEXTURE_2D_ARRAY, 0, 0, 0, 0, 1, 1, 3, gl.RGBA, gl.UNSIGNED_BYTE, new Uint8Array([
-    128, 0, 0, 0, // layer 0 (X): neutral
-    255, 0, 0, 0, // layer 1 (Y): full (up direction)
-    128, 0, 0, 0, // layer 2 (Z): neutral
-  ]));
-
-  eventBus.publish('renderer.textures.initialized');
-};
-
-R.InitShaders = async function() {
-  // rendering alias models
-  await Promise.all([
-    GL.CreateProgram('alias',
-      ['uOrigin', 'uAngles', 'uViewOrigin', 'uViewAngles', 'uPerspective', 'uLightVec', 'uDynamicLightVec', 'uGamma', 'uAmbientLight', 'uShadeLight', 'uDynamicShadeLight', 'uInterpolation', 'uAlpha', 'uTime', 'uFogColor', 'uFogParams', 'uLightSpaceMatrix0', 'uLightSpaceMatrix1', 'uLightSpaceMatrix2', 'uShadowEnabled', 'uShadowCount', 'uShadowDarkness', 'uPointLightPos', 'uPointLightRadius', 'uPointShadowEnabled', 'uBloomEmissiveScale'],
-      [
-        ['aPositionA', gl.FLOAT, 3],
-        ['aPositionB', gl.FLOAT, 3],
-        ['aNormal', gl.FLOAT, 3],
-        ['aTexCoord', gl.FLOAT, 2],
-      ],
-      ['tTexture', 'tLuminance', 'tShadowMap0', 'tShadowMap1', 'tShadowMap2', 'tPointShadowMap']),
-
-    // rendering mesh models (OBJ, IQM, GLTF)
-    GL.CreateProgram('mesh',
-      ['uOrigin', 'uAngles', 'uViewOrigin', 'uViewAngles', 'uPerspective', 'uLightVec', 'uDynamicLightVec', 'uGamma', 'uAmbientLight', 'uShadeLight', 'uDynamicShadeLight', 'uAlpha', 'uTime', 'uFogColor', 'uFogParams', 'uLightSpaceMatrix0', 'uLightSpaceMatrix1', 'uLightSpaceMatrix2', 'uShadowEnabled', 'uShadowCount', 'uShadowDarkness', 'uPointLightPos', 'uPointLightRadius', 'uPointShadowEnabled', 'uBloomEmissiveScale'],
-      [
-        ['aPosition', gl.FLOAT, 3],
-        ['aTexCoord', gl.FLOAT, 2],
-        ['aNormal', gl.FLOAT, 3],
-      ],
-      ['tTexture', 'tShadowMap0', 'tShadowMap1', 'tShadowMap2', 'tPointShadowMap']),
-
-    // rendering brush models (water is down below)
-    GL.CreateProgram('brush',
-      ['uOrigin', 'uAngles', 'uViewOrigin', 'uViewAngles', 'uPerspective', 'uLightVec', 'uDynamicLightVec', 'uGamma', 'uAmbientLight', 'uShadeLight', 'uDynamicShadeLight', 'uInterpolation', 'uAlpha', 'uFogColor', 'uFogParams', 'uPerformDotLighting', 'uHaveDeluxemap', 'uLightSpaceMatrix0', 'uLightSpaceMatrix1', 'uLightSpaceMatrix2', 'uShadowEnabled', 'uShadowCount', 'uShadowDarkness', 'uShadowMapSize', 'uPointLightPos', 'uPointLightRadius', 'uPointShadowEnabled', 'uBloomEmissiveScale', 'uBloomDlightScale', 'uBloomSpecularScale'],
-        [
-          ['aPosition', gl.FLOAT, 3],
-          ['aTexCoord', gl.FLOAT, 4],
-          ['aLightStyle', gl.FLOAT, 4],
-          ['aNormal', gl.FLOAT, 3],
-          ['aTangent', gl.FLOAT, 3],
-          ['aBitangent', gl.FLOAT, 3],
-        ],
-        ['tTextureA', 'tTextureB', 'tLightmap', 'tDlight', 'tLightStyleA', 'tLightStyleB', 'tLuminance', 'tSpecular', 'tNormal', 'tDeluxemap', 'tShadowMap0', 'tShadowMap1', 'tShadowMap2', 'tPointShadowMap']),
-
-    // rendering dynamic lights
-    GL.CreateProgram('dlight',
-        ['uOrigin', 'uViewOrigin', 'uViewAngles', 'uPerspective', 'uRadius', 'uGamma'],
-        [['aPosition', gl.FLOAT, 3]],
-        []),
-
-    // rendering the player model (similar to alias model but with custom colors)
-    GL.CreateProgram('player',
-      ['uOrigin', 'uAngles', 'uViewOrigin', 'uViewAngles', 'uPerspective', 'uLightVec', 'uDynamicLightVec', 'uGamma', 'uAmbientLight', 'uShadeLight', 'uDynamicShadeLight', 'uInterpolation', 'uAlpha', 'uTime', 'uTop', 'uBottom', 'uFogColor', 'uFogParams', 'uLightSpaceMatrix0', 'uLightSpaceMatrix1', 'uLightSpaceMatrix2', 'uShadowEnabled', 'uShadowCount', 'uShadowDarkness', 'uPointLightPos', 'uPointLightRadius', 'uPointShadowEnabled', 'uBloomEmissiveScale'],
-        [
-          ['aPositionA', gl.FLOAT, 3],
-          ['aPositionB', gl.FLOAT, 3],
-          ['aNormal', gl.FLOAT, 3],
-          ['aTexCoord', gl.FLOAT, 2],
-        ],
-        ['tTexture', 'tLuminance', 'tPlayer', 'tShadowMap0', 'tShadowMap1', 'tShadowMap2', 'tPointShadowMap']),
-
-    // for rendering sprites (usually effects)
-    GL.CreateProgram('sprite',
-      ['uViewOrigin', 'uViewAngles', 'uPerspective', 'uGamma', 'uFogColor', 'uFogParams', 'uInterpolation', 'uAlpha', 'uBloomEmissiveScale'],
-        [['aPosition', gl.FLOAT, 3], ['aTexCoord', gl.FLOAT, 2]],
-        ['tTexture']),
-
-    // for rendering decals
-    GL.CreateProgram('decal',
-      ['uViewOrigin', 'uViewAngles', 'uPerspective', 'uGamma', 'uFogColor', 'uFogParams'],
-        [['aPosition', gl.FLOAT, 3], ['aTexCoord', gl.FLOAT, 2], ['aColor', gl.UNSIGNED_BYTE, 3, true]],
-        ['tTexture']),
-
-    // for rendering particles (colored round dots)
-    GL.CreateProgram('particle',
-      ['uViewOrigin', 'uViewAngles', 'uPerspective', 'uGamma', 'uFogColor', 'uFogParams'],
-        [['aOrigin', gl.FLOAT, 3], ['aCoord', gl.FLOAT, 2], ['aScale', gl.FLOAT, 1], ['aColor', gl.UNSIGNED_BYTE, 3, true]],
-        []),
-
-    // rendering water brushes
-    GL.CreateProgram('turbulent',
-      ['uOrigin', 'uAngles', 'uViewOrigin', 'uViewAngles', 'uPerspective', 'uGamma', 'uTime', 'uFogColor', 'uFogParams', 'uPerformDotLighting', 'uAlpha', 'uBloomEmissiveScale', 'uBloomDlightScale'],
-        [
-          ['aPosition', gl.FLOAT, 3],
-          ['aTexCoord', gl.FLOAT, 4],
-          ['aLightStyle', gl.FLOAT, 4],
-          ['aNormal', gl.FLOAT, 3],
-          // ['aTangent', gl.FLOAT, 3],
-          // ['aBitangent', gl.FLOAT, 3],
-        ],
-        ['tTexture', 'tLuminance', 'tLightmap', 'tDlight', 'tLightStyle', 'tDeluxemap']),
-
-    // warp overlay effect
-    GL.CreateProgram('warp',
-        ['uOrtho', 'uTime'],
-        [['aPosition', gl.FLOAT, 2], ['aTexCoord', gl.FLOAT, 2]],
-        ['tTexture']),
-
-    GL.CreateProgram('bloom-extract',
-      ['uOrtho'],
-      [['aPosition', gl.FLOAT, 2], ['aTexCoord', gl.FLOAT, 2]],
-      ['tTexture']),
-
-    GL.CreateProgram('bloom-blur',
-      ['uOrtho', 'uTexelOffset'],
-      [['aPosition', gl.FLOAT, 2], ['aTexCoord', gl.FLOAT, 2]],
-      ['tTexture']),
-
-    GL.CreateProgram('bloom-composite',
-      ['uOrtho', 'uStrength'],
-      [['aPosition', gl.FLOAT, 2], ['aTexCoord', gl.FLOAT, 2]],
-      ['tScene', 'tBloom']),
-
-    GL.CreateProgram('sky',
-      ['uViewAngles', 'uPerspective', 'uScale', 'uGamma', 'uTime', 'uFogColor', 'uFogParams', 'uBloomEmissiveScale'],
-      [['aPosition', gl.FLOAT, 3]],
-      ['tSolid', 'tAlpha']),
-
-    GL.CreateProgram('sky-chain',
-      ['uViewOrigin', 'uViewAngles', 'uPerspective'],
-      [['aPosition', gl.FLOAT, 3]],
-      []),
-
-    // rendering volumetric fog brush volumes
-    GL.CreateProgram('fog-volume',
-      ['uOrigin', 'uAngles', 'uViewOrigin', 'uViewAngles', 'uPerspective', 'uGamma',
-       'uFogVolumeColor', 'uFogVolumeDensity', 'uFogVolumeMaxOpacity',
-       'uFogVolumeMins', 'uFogVolumeMaxs', 'uScreenSize',
-       'uDlightCount',
-       'uDlightPos[0]', 'uDlightPos[1]', 'uDlightPos[2]', 'uDlightPos[3]',
-       'uDlightPos[4]', 'uDlightPos[5]', 'uDlightPos[6]', 'uDlightPos[7]',
-       'uDlightColor[0]', 'uDlightColor[1]', 'uDlightColor[2]', 'uDlightColor[3]',
-       'uDlightColor[4]', 'uDlightColor[5]', 'uDlightColor[6]', 'uDlightColor[7]'],
-      [['aPosition', gl.FLOAT, 3]],
-      ['tDepth', 'tLightProbe']),
-
-    // shadow depth pass for directional shadow mapping
-    GL.CreateProgram('shadow-brush',
-      ['uOrigin', 'uAngles', 'uLightSpaceMatrix'],
-      [['aPosition', gl.FLOAT, 3]],
-      []),
-
-    // shadow depth pass for point light cube shadow mapping
-    GL.CreateProgram('shadow-point',
-      ['uOrigin', 'uAngles', 'uLightSpaceMatrix', 'uLightPos', 'uLightRadius', 'uNormalBias'],
-      [['aPosition', gl.FLOAT, 3], ['aNormal', gl.FLOAT, 3]],
-      []),
-
-    // shadow depth pass for alias models (frame interpolation)
-    GL.CreateProgram('shadow-alias',
-      ['uOrigin', 'uAngles', 'uLightSpaceMatrix', 'uInterpolation'],
-      [['aPositionA', gl.FLOAT, 3], ['aPositionB', gl.FLOAT, 3]],
-      []),
-
-    // point shadow depth pass for alias models (frame interpolation)
-    GL.CreateProgram('shadow-alias-point',
-      ['uOrigin', 'uAngles', 'uLightSpaceMatrix', 'uInterpolation', 'uLightPos', 'uLightRadius', 'uNormalBias'],
-      [['aPositionA', gl.FLOAT, 3], ['aPositionB', gl.FLOAT, 3], ['aNormalA', gl.FLOAT, 3], ['aNormalB', gl.FLOAT, 3]],
-      []),
-  ]);
-
-  eventBus.publish('renderer.shaders.initialized');
-};
-
-R.Init = async function() {
-  if (registry.isDedicatedServer) {
-    console.assert(false, 'R.Init called on dedicated server');
-    return;
-  }
-
-  R.waterwarp = new Cvar('r_waterwarp', '1');
-  R.fullbright = new Cvar('r_fullbright', '0', Cvar.FLAG.CHEAT);
-  R.drawentities = new Cvar('r_drawentities', '1', Cvar.FLAG.CHEAT);
-  R.drawviewmodel = new Cvar('r_drawviewmodel', '1');
-  R.drawturbulents = new Cvar('r_drawturbulents', '1', Cvar.FLAG.CHEAT);
-  R.novis = new Cvar('r_novis', '0', Cvar.FLAG.CHEAT);
-  R.speeds = new Cvar('r_speeds', '0');
-  R.polyblend = new Cvar('gl_polyblend', '1');
-  R.flashblend = new Cvar('gl_flashblend', '0');
-  R.nocolors = new Cvar('gl_nocolors', '0');
-  R.bloom = new Cvar('r_bloom', '0', Cvar.FLAG.NONE, 'Screen-space bloom post-process, 0 = off, 1 = on.');
-  R.bloomStrength = new Cvar('r_bloom_strength', '0.8', Cvar.FLAG.NONE, 'Additive bloom intensity.');
-  R.bloomSkyStrength = new Cvar('r_bloom_sky_strength', '0.33', Cvar.FLAG.NONE, 'Sky contribution added to the bloom emissive target. Lower than 1 keeps the sky glow subtle.');
-  R.bloomDlightStrength = new Cvar('r_bloom_dlight_strength', '0.33', Cvar.FLAG.NONE, 'Dynamic-light surface contribution added to the bloom emissive target. Set to 0 to disable.');
-  R.bloomSpecularStrength = new Cvar('r_bloom_specular_strength', '0.33', Cvar.FLAG.NONE, 'Specular reflection contribution added to the bloom emissive target. Set to 0 to disable.');
-  R.bloomDownsample = new Cvar('r_bloom_downsample', '4', Cvar.FLAG.NONE, 'Bloom buffer downsample divisor, clamped to 1-8.');
-  R.bloomDebug = new Cvar('r_bloom_debug', '0', Cvar.FLAG.NONE, 'Bloom debug preview: 0 = off, 1 = emissive, 2 = extract, 3 = blur, 4 = all.');
-  R.interpolation = new Cvar('r_interpolation', '1', Cvar.FLAG.NONE, 'Interpolation of textures and animation groups, 0 - off, 1 - on');
-  // fog controls (TODO: make that a cheat, but resetting cvar to default is done after R.NewMapFog, so need to rethink the order of operations)
-  R.fog_color = new Cvar('r_fog_color', '128 128 128', Cvar.FLAG.NONE, 'Fog color: R G B (0-255)');
-  R.fog_start = new Cvar('r_fog_start', '128', Cvar.FLAG.NONE, 'Fog start distance (linear)');
-  R.fog_end = new Cvar('r_fog_end', '4096', Cvar.FLAG.NONE, 'Fog end distance (linear)');
-  R.fog_density = new Cvar('r_fog_density', '0.01', Cvar.FLAG.NONE, 'Fog density (for exp/exp2)');
-  R.fog_mode = new Cvar('r_fog_mode', '-1', Cvar.FLAG.NONE, 'Fog mode: 0=linear, 1=exp, 2=exp2, -1=disable');
-
-  R.InitTextures();
-  R.InitParticles();
-  R.InitDecals();
-  await R.InitShaders();
-
-  // Register model renderers
-  modelRendererRegistry.register(new BrushModelRenderer());
-  modelRendererRegistry.register(new AliasModelRenderer());
-  modelRendererRegistry.register(new SpriteModelRenderer());
-  modelRendererRegistry.register(new MeshModelRenderer());
-
-  // Initialize post-process infrastructure (scene FBO with depth texture)
-  // and register screen-space effects that resolve from that capture.
-  PostProcess.init();
-  PostProcess.addEffect(new BloomEffect());
-  PostProcess.addEffect(new WarpEffect());
-
-  // Initialize shadow mapping (depth-only FBO + sun light)
-  ShadowMap.init();
-
-  R.dlightvecs = gl.createBuffer();
-  gl.bindBuffer(gl.ARRAY_BUFFER, R.dlightvecs);
-  gl.bufferData(gl.ARRAY_BUFFER, (() => {
-    const positions = [];
-
-    // 1) The "down" vector
-    positions.push(0, -1, 0);
-
-    // 2) 16 equally spaced vectors around the circle in y=0 plane
-    const numSegments = 16;
-    for (let i = 0; i <= numSegments; i++) {
-      // Angle in radians
-      const angle = (2 * Math.PI * i) / numSegments;
-      // Match the pattern: x = -sin(angle), z = cos(angle)
-      positions.push(-Math.sin(angle), 0, Math.cos(angle));
-    }
-
-    return new Float32Array(positions);
-  })(), gl.STATIC_DRAW);
-
-  R.dlightVAO = GL.CreateVAO(R.dlightvecs, [
-    { location: ATTRIB_LOCATIONS.aPosition, components: 3, type: gl.FLOAT, normalized: false, stride: 0, offset: 0 },
-  ]);
-
-  R.ClearAll();
-};
-
-R.NewMapFog = function() {
-  console.assert(CL.state.worldmodel, 'worldmodel must be loaded before InitFog');
-
-  const fogInfo = CL.state.worldmodel.worldspawnInfo.fog;
-
-  if (!fogInfo) {
-    R.fog_mode.set(-1);
-    return;
-  }
-
-  const [exp, r, g, b] = fogInfo.split(' ').map(Number);
-
-  // CR: I took that calculation from Ironwail’s Fog_SetupFrame:
-  const ExpAdjustment = 1.20112241; // sqrt(log2(e))
-  const SphericalCorrection = 0.85; // compensate higher perceived density with spherical fog
-  const DensityScale = ExpAdjustment * SphericalCorrection / 64.0;
-
-  R.fog_density.set(exp / DensityScale);
-  R.fog_color.set(`${r * 255} ${g * 255} ${b * 255}`);
-  R.fog_mode.set(1);
-};
-
-R.NewMap = function() {
-  R.BuildLightmaps();
-
-  for (let i = 0; i <= R.dlightmaps_rgba.length; i++) {
-    R.dlightmaps_rgba[i] = 0;
-  }
-
-  GL.Bind(0, R.dlightmap_rgba_texture);
-  gl.texSubImage2D(gl.TEXTURE_2D, 0, 0, 0, LIGHTMAP_BLOCK_SIZE, LIGHTMAP_BLOCK_SIZE, gl.RGBA, gl.UNSIGNED_BYTE, R.dlightmaps_rgba);
-
-  R.NewMapFog();
-  R.MakeSky();
-};
-
-R.ClearAll = function() {
-  if (R.particles) {
-    R.particles.length = 0;
-  }
-
-  for (let i = 0; i < 64; i++) {
-    R.lightstylevalue_a[i] = 12;
-    R.lightstylevalue_b[i] = 12;
-  }
-
-  R.oldviewleaf = null;
-  R.viewleaf = null;
-
-  R.deluxemap = null;
-  R.lightmaps_rgb = null;
-  R.dlightmaps_rgba = null;
-
-  R.allocated = null;
-
-  R.shadow_textures = [];
-  R.shadow_texture = null;
-  R.point_shadow_texture = null;
-  R.world_depth_texture = null;
-
-  R.ClearParticles();
-  R.ClearDecals();
-  R.ClearSky();
-};
-
-// part
-
-R.ptype = {
-  tracer: 0,
-  grav: 1,
-  slowgrav: 2,
-  fire: 3,
-  explode: 4,
-  explode2: 5,
-  blob: 6,
-  blob2: 7,
-};
-
-R.ramp1 = [0x6f, 0x6d, 0x6b, 0x69, 0x67, 0x65, 0x63, 0x61];
-R.ramp2 = [0x6f, 0x6e, 0x6d, 0x6c, 0x6b, 0x6a, 0x68, 0x66];
-R.ramp3 = [0x6d, 0x6b, 6, 5, 4, 3];
-
-R.InitParticles = function() {
-  R.numparticles = 32786;
-  R.avelocities = [];
-  for (let i = 0; i <= 161; i++) {
-    R.avelocities[i] = [Math.random() * 2.56, Math.random() * 2.56, Math.random() * 2.56];
-  }
-};
-
-R.SerializeParticles = function() {
-  const data = [];
-  const round = (num) => Math.round(num * 10) / 10; // we do not need a high precision here
-
-  for (let i = 0; i < R.numparticles; i++) {
-    const p = R.particles[i];
-
-    if (p.die < CL.state.time) {
-      continue;
-    }
-
-    data.push({
-      i: i,
-      die: round(p.die - CL.state.time),
-      color: p.color,
-      ramp: round(p.ramp),
-      type: round(p.type),
-      org: [...p.org].map(round),
-      vel: [...p.vel].map(round),
-    });
-  }
-
-  return data;
-};
-
-R.DeserializeParticles = function(data) {
-  for (const p of data) {
-    console.assert(p.i >= 0 && p.i < R.particles.length, 'valid particle index', p.i);
-    R.particles[p.i] = {
-      die: p.die + CL.state.time,
-      color: p.color,
-      ramp: p.ramp,
-      type: p.type,
-      org: new Vector(...p.org),
-      vel: new Vector(...p.vel),
-    };
-  }
-};
-
-R.EntityParticles = function(ent) {
-  const allocated = R.AllocParticles(162);
-
-  for (let i = 0; i < allocated.length; i++) {
-    const angleP = CL.state.time * R.avelocities[i][0];
-    const sp = Math.sin(angleP);
-    const cp = Math.cos(angleP);
-    const angleY = CL.state.time * R.avelocities[i][1];
-    const sy = Math.sin(angleY);
-    const cy = Math.cos(angleY);
-
-    R.particles[allocated[i]] = { // TODO: Particle Class
-      die: CL.state.time + 0.01,
-      color: 0x6f,
-      ramp: 0.0,
-      type: R.ptype.explode,
-      org: [
-        ent.origin[0] + avertexnormals[i * 3 + 0] * 64.0 + cp * cy * 16.0,
-        ent.origin[1] + avertexnormals[i * 3 + 1] * 64.0 + cp * sy * 16.0,
-        ent.origin[2] + avertexnormals[i * 3 + 2] * 64.0 + sp * -16.0,
-      ],
-      vel: new Vector(),
-    };
-  }
-};
-
-R.ClearParticles = function() {
-  R.particles = [];
-  for (let i = 0; i < R.numparticles; i++) {
-    R.particles[i] = {die: -1.0};
-  }
-};
-
-R.ParticleExplosion = function(org) {
-  const allocated = R.AllocParticles(1024);
-  for (let i = 0; i < allocated.length; i++) {
-    R.particles[allocated[i]] = {
-      die: CL.state.time + 5.0,
-      color: R.ramp1[0],
-      ramp: Math.floor(Math.random() * 4.0),
-      type: ((i & 1) !== 0) ? R.ptype.explode : R.ptype.explode2,
-      org: new Vector(
-        org[0] + Math.random() * 32.0 - 16.0,
-        org[1] + Math.random() * 32.0 - 16.0,
-        org[2] + Math.random() * 32.0 - 16.0,
-      ),
-      vel: new Vector(Math.random() * 512.0 - 256.0, Math.random() * 512.0 - 256.0, Math.random() * 512.0 - 256.0),
-    };
-  }
-};
-
-R.ParticleExplosion2 = function(org, colorStart, colorLength) {
-  const allocated = R.AllocParticles(512);
-  let colorMod = 0;
-  for (let i = 0; i < allocated.length; i++) {
-    R.particles[allocated[i]] = {
-      die: CL.state.time + 0.3,
-      color: colorStart + (colorMod++ % colorLength),
-      type: R.ptype.blob,
-      org: new Vector(
-        org[0] + Math.random() * 32.0 - 16.0,
-        org[1] + Math.random() * 32.0 - 16.0,
-        org[2] + Math.random() * 32.0 - 16.0,
-      ),
-      vel: new Vector(Math.random() * 512.0 - 256.0, Math.random() * 512.0 - 256.0, Math.random() * 512.0 - 256.0),
-    };
-  }
-};
-
-R.BlobExplosion = function(org) {
-  const allocated = R.AllocParticles(1024);
-  for (let i = 0; i < allocated.length; i++) {
-    const p = R.particles[allocated[i]];
-    p.die = CL.state.time + 1.0 + Math.random() * 0.4;
-    if ((i & 1) !== 0) {
-      p.type = R.ptype.blob;
-      p.color = 66 + Math.floor(Math.random() * 7.0);
-    } else {
-      p.type = R.ptype.blob2;
-      p.color = 150 + Math.floor(Math.random() * 7.0);
-    }
-    p.org = new Vector(
-      org[0] + Math.random() * 32.0 - 16.0,
-      org[1] + Math.random() * 32.0 - 16.0,
-      org[2] + Math.random() * 32.0 - 16.0,
-    );
-    p.vel = new Vector(Math.random() * 512.0 - 256.0, Math.random() * 512.0 - 256.0, Math.random() * 512.0 - 256.0);
-  }
-};
-
-R.RunParticleEffect = function(org, dir, color, count) {
-  const allocated = R.AllocParticles(count); let i;
-  for (i = 0; i < allocated.length; i++) {
-    R.particles[allocated[i]] = {
-      die: CL.state.time + 0.6 * Math.random(),
-      color: (color & 0xf8) + Math.floor(Math.random() * 8.0),
-      type: R.ptype.slowgrav,
-      org: new Vector(
-        org[0] + Math.random() * 16.0 - 8.0,
-        org[1] + Math.random() * 16.0 - 8.0,
-        org[2] + Math.random() * 16.0 - 8.0,
-      ),
-      vel: dir.copy().multiply(15.0),
-    };
-  }
-};
-
-R.LavaSplash = function(org) {
-  const allocated = R.AllocParticles(1024);
-  let k = 0;
-  for (let i = -16; i <= 15; i++) {
-    for (let j = -16; j <= 15; j++) {
-      if (k >= allocated.length) {
-        return;
-      }
-      const p = R.particles[allocated[k++]];
-      p.die = CL.state.time + 2.0 + Math.random() * 0.64;
-      p.color = 224 + Math.floor(Math.random() * 8.0);
-      p.type = R.ptype.slowgrav;
-      const dir = new Vector((j + Math.random()) * 8.0, (i + Math.random()) * 8.0, 256.0);
-      p.org = new Vector(org[0] + dir[0], org[1] + dir[1], org[2] + Math.random() * 64.0);
-      dir.normalize();
-      p.vel = dir.multiply(50.0 + Math.random() * 64.0);
-    }
-  }
-};
-
-R.TeleportSplash = function(org) {
-  const allocated = R.AllocParticles(896);
-  let l = 0;
-  for (let i = -16; i <= 15; i += 4) {
-    for (let j = -16; j <= 15; j += 4) {
-      for (let k = -24; k <= 31; k += 4) {
-        if (l >= allocated.length) {
-          return;
-        }
-        const p = R.particles[allocated[l++]];
-        p.die = CL.state.time + 0.2 + Math.random() * 0.16;
-        p.color = 7 + Math.floor(Math.random() * 8.0);
-        p.type = R.ptype.slowgrav;
-        const dir = new Vector(j * 8.0, i * 8.0, k * 8.0);
-        p.org = new Vector(
-          org[0] + i + Math.random() * 4.0,
-          org[1] + j + Math.random() * 4.0,
-          org[2] + k + Math.random() * 4.0,
-        );
-        dir.normalize();
-        p.vel = dir.multiply(50.0 + Math.random() * 64.0);
-      }
-    }
-  }
-};
-
-R.tracercount = 0;
-R.RocketTrail = function(start, end, type) {
-  let vec = end.copy().subtract(start);
-
-  const len = vec.len();
-
-  if (len === 0.0 || !isFinite(len)) {
-    return;
-  }
-
-  vec.normalize();
-
-  let allocated;
-  if (type === 4) {
-    allocated = R.AllocParticles(Math.floor(len / 6.0));
-  } else {
-    allocated = R.AllocParticles(Math.floor(len / 3.0));
-  }
-
-  for (let i = 0; i < allocated.length; i++) {
-    const p = R.particles[allocated[i]];
-    p.vel = new Vector();
-    p.die = CL.state.time + 2.0;
-    switch (type) {
-      case 7:
-        type = 1;
-        p.die += 8.0;
-      // eslint-disable-next-line no-fallthrough
-      case 0:
-      case 1:
-        p.ramp = Math.floor(Math.random() * 4.0) + (type << 1);
-        p.color = R.ramp3[p.ramp];
-        p.type = R.ptype.fire;
-        p.org = new Vector(
-          start[0] + Math.random() * 6.0 - 3.0,
-          start[1] + Math.random() * 6.0 - 3.0,
-          start[2] + Math.random() * 6.0 - 3.0,
-        );
-        break;
-      case 2:
-        p.type = R.ptype.grav;
-        p.color = 67 + Math.floor(Math.random() * 4.0);
-        p.org = new Vector(
-          start[0] + Math.random() * 6.0 - 3.0,
-          start[1] + Math.random() * 6.0 - 3.0,
-          start[2] + Math.random() * 6.0 - 3.0,
-        );
-        break;
-      case 3:
-      case 5:
-        p.die = CL.state.time + 0.5;
-        p.type = R.ptype.tracer;
-        if (type === 3) {
-          p.color = 52 + ((R.tracercount++ & 4) << 1);
-        } else {
-          p.color = 230 + ((R.tracercount++ & 4) << 1);
-        }
-        p.org = new Vector(start[0], start[1], start[2]);
-        if ((R.tracercount & 1) !== 0) {
-          p.vel[0] = 30.0 * vec[1];
-          p.vel[2] = -30.0 * vec[0];
-        } else {
-          p.vel[0] = -30.0 * vec[1];
-          p.vel[2] = 30.0 * vec[0];
-        }
-        break;
-      case 4:
-        p.type = R.ptype.grav;
-        p.color = 67 + Math.floor(Math.random() * 4.0);
-        p.org = new Vector(
-          start[0] + Math.random() * 6.0 - 3.0,
-          start[1] + Math.random() * 6.0 - 3.0,
-          start[2] + Math.random() * 6.0 - 3.0,
-        );
-        break;
-      case 6:
-        p.color = 152 + Math.floor(Math.random() * 4.0);
-        p.type = R.ptype.tracer;
-        p.die = CL.state.time + 0.3;
-        p.org = new Vector(
-          start[0] + Math.random() * 16.0 - 8.0,
-          start[1] + Math.random() * 16.0 - 8.0,
-          start[2] + Math.random() * 16.0 - 8.0,
-        );
-        break;
-      default:
-        console.assert(false, 'Unknown particle type: ' + type);
-    }
-    start.add(vec);
-  }
-};
-
-R.InitDecals = function() {
-  R.decals = [];
-
-  Cmd.AddCommand('test_decal', async () => {
-    const start = R.refdef.vieworg;
-    const vectors = CL.state.viewangles.angleVectors();
-    const forward = vectors.forward;
-    const end = start.copy().add(forward.copy().multiply(8192));
-    const trace = SV.collision.traceStaticWorldLine(start, end);
-
-    if (trace.allsolid || trace.startsolid || trace.fraction === 1.0) {
-      return;
-    }
-
-    // Use a particle texture for testing if no bullet texture exists
-    R.PlaceDecal(trace.endpos, trace.plane.normal, await Draw.LoadPicFromLump('box_tl'));
-  });
-};
-
-R.ClearDecals = function() {
-  R.decals = [];
-};
-
-R.PlaceDecal = function(origin, normal, texture) {
-  if (!texture) {
-    return;
-  }
-
-  // Calculate basis vectors for the decal quad
-  const up = new Vector(0, 0, 1);
-
-  if (Math.abs(normal.dot(up)) > 0.99) {
-    up.setTo(1, 0, 0);
-  }
-
-  const right = normal.cross(up);
-  right.normalize();
-  up.set(right.cross(normal));
-  up.normalize();
-
-  const size = 4.0; // Decal size
-
-  const verts = [
-    origin.copy().add(right.copy().multiply(-size)).add(up.copy().multiply(size)),
-    origin.copy().add(right.copy().multiply(size)).add(up.copy().multiply(size)),
-    origin.copy().add(right.copy().multiply(size)).add(up.copy().multiply(-size)),
-    origin.copy().add(right.copy().multiply(-size)).add(up.copy().multiply(-size)),
-  ];
-
-  // Apply polygon offset
-  const offset = normal.copy().multiply(0.5);
-  for (let i = 0; i < 4; i++) {
-    verts[i].add(offset);
-  }
-
-  // Calculate lighting
-  const lightStart = origin.copy().add(normal.copy().multiply(4.0));
-  const lightEnd = origin.copy().subtract(normal.copy().multiply(4.0));
-  const lightResult = R.RecursiveLightPoint(CL.state.worldmodel.nodes[0], lightStart, lightEnd);
-
-  let color = new Vector(255, 255, 255); // Default to white
-  if (lightResult) {
-    const r = Math.min(255, Math.max(0, Math.floor(lightResult[0][0])));
-    const g = Math.min(255, Math.max(0, Math.floor(lightResult[0][1])));
-    const b = Math.min(255, Math.max(0, Math.floor(lightResult[0][2])));
-    color.setTo(r, g, b);
-  }
-
-  R.decals.push({
-    texture,
-    verts,
-    color,
-    die: CL.state.time + 10.0, // Lasts 10 seconds
-  });
-};
-
-R.DrawDecals = function() {
-  if (!R.decals || R.decals.length === 0) {
-    return;
-  }
-
-  // Remove dead decals
-  R.decals = R.decals.filter((d) => d.die > CL.state.time);
-
-  if (R.decals.length === 0) {
-    return;
-  }
-
-  GL.StreamFlush();
-
-  const program = GL.UseProgram('decal');
-  gl.depthMask(false);
-  gl.enable(gl.BLEND);
-
-  gl.uniform1f(program.uAlpha, 1.0);
-
-  let currentTexture = null;
-
-  for (let i = 0; i < R.decals.length; i++) {
-    const decal = R.decals[i];
-
-    if (decal.texture !== currentTexture) {
-      GL.StreamFlush();
-      decal.texture.bind(program.tTexture);
-      currentTexture = decal.texture;
-    }
-
-    GL.StreamGetSpace(6);
-
-    // Quad vertices: 0, 1, 2, 0, 2, 3
-    const v = decal.verts;
-    const c = decal.color;
-    const r = c[0];
-    const g = c[1];
-    const b = c[2];
-
-    GL.StreamWriteFloat3(v[0][0], v[0][1], v[0][2]); GL.StreamWriteFloat2(0, 0); GL.StreamWriteUByte4(r, g, b, 255);
-    GL.StreamWriteFloat3(v[1][0], v[1][1], v[1][2]); GL.StreamWriteFloat2(1, 0); GL.StreamWriteUByte4(r, g, b, 255);
-    GL.StreamWriteFloat3(v[2][0], v[2][1], v[2][2]); GL.StreamWriteFloat2(1, 1); GL.StreamWriteUByte4(r, g, b, 255);
-
-    GL.StreamWriteFloat3(v[0][0], v[0][1], v[0][2]); GL.StreamWriteFloat2(0, 0); GL.StreamWriteUByte4(r, g, b, 255);
-    GL.StreamWriteFloat3(v[2][0], v[2][1], v[2][2]); GL.StreamWriteFloat2(1, 1); GL.StreamWriteUByte4(r, g, b, 255);
-    GL.StreamWriteFloat3(v[3][0], v[3][1], v[3][2]); GL.StreamWriteFloat2(0, 1); GL.StreamWriteUByte4(r, g, b, 255);
-  }
-
-  GL.StreamFlush();
-  gl.depthMask(true);
-  gl.disable(gl.BLEND);
-};
-
-R.DrawParticles = function() {
-  GL.StreamFlush();
-
-  GL.UseProgram('particle');
-  gl.depthMask(false);
-  gl.enable(gl.BLEND);
-
-  const frametime = Host.frametime;
-  const grav = frametime * SV.gravity.value * 0.05;
-  const dvel = frametime * 4.0;
-  let scale;
-
-  const coords = [-1.0, -1.0, -1.0, 1.0, 1.0, -1.0, 1.0, -1.0, -1.0, 1.0, 1.0, 1.0];
-  for (let i = 0; i < R.numparticles; i++) {
-    const p = R.particles[i];
-    if (p.die < CL.state.time) {
-      continue;
-    }
-
-    const color = W.d_8to24table[p.color];
-    scale = (p.org[0] - R.refdef.vieworg[0]) * R.vpn[0] + (p.org[1] - R.refdef.vieworg[1]) * R.vpn[1] + (p.org[2] - R.refdef.vieworg[2]) * R.vpn[2];
-    if (scale < 20.0) {
-      scale = 0.375;
-    } else {
-      scale = 0.375 + scale * 0.0015;
-    }
-
-    GL.StreamGetSpace(6);
-    for (let j = 0; j < 6; j++) {
-      GL.StreamWriteFloat3(p.org[0], p.org[1], p.org[2]);
-      GL.StreamWriteFloat2(coords[j * 2], coords[j * 2 + 1]);
-      GL.StreamWriteFloat(scale);
-      GL.StreamWriteUByte4(color & 0xff, (color >> 8) & 0xff, color >> 16, 255);
-    }
-
-    p.org[0] += p.vel[0] * frametime;
-    p.org[1] += p.vel[1] * frametime;
-    p.org[2] += p.vel[2] * frametime;
-
-    switch (p.type) {
-      case R.ptype.fire:
-        p.ramp += frametime * 5.0;
-        if (p.ramp >= 6.0) {
-          p.die = -1.0;
-        } else {
-          p.color = R.ramp3[Math.floor(p.ramp)];
-        }
-        p.vel[2] += grav;
-        continue;
-      case R.ptype.explode:
-        p.ramp += frametime * 10.0;
-        if (p.ramp >= 8.0) {
-          p.die = -1.0;
-        } else {
-          p.color = R.ramp1[Math.floor(p.ramp)];
-        }
-        p.vel[0] += p.vel[0] * dvel;
-        p.vel[1] += p.vel[1] * dvel;
-        p.vel[2] += p.vel[2] * dvel - grav;
-        continue;
-      case R.ptype.explode2:
-        p.ramp += frametime * 15.0;
-        if (p.ramp >= 8.0) {
-          p.die = -1.0;
-        } else {
-          p.color = R.ramp2[Math.floor(p.ramp)];
-        }
-        p.vel[0] -= p.vel[0] * frametime;
-        p.vel[1] -= p.vel[1] * frametime;
-        p.vel[2] -= p.vel[2] * frametime + grav;
-        continue;
-      case R.ptype.blob:
-        p.vel[0] += p.vel[0] * dvel;
-        p.vel[1] += p.vel[1] * dvel;
-        p.vel[2] += p.vel[2] * dvel - grav;
-        continue;
-      case R.ptype.blob2:
-        p.vel[0] += p.vel[0] * dvel;
-        p.vel[1] += p.vel[1] * dvel;
-        p.vel[2] -= grav;
-        continue;
-      case R.ptype.grav:
-      case R.ptype.slowgrav:
-        p.vel[2] -= grav;
-    }
-  }
-
-  GL.StreamFlush();
-
-  gl.disable(gl.BLEND);
-  gl.depthMask(true);
-};
-
-R.AllocParticles = function(count) {
-  const allocated = new Array(count);
-  for (let i = 0, j = 0; i < R.numparticles; i++) {
-    if (count === 0) {
-      return allocated;
-    }
-    if (R.particles[i].die < CL.state.time) {
-      allocated[j++] = i;
-      count--;
-    }
-  }
-  allocated.length = allocated.length - count;
-  return allocated;
-};
-
-// surf
-
-R.lightmap_modified = new Uint8Array(LIGHTMAP_BLOCK_SIZE);
-R.lightmaps_rgb = /** @type {Uint8Array} */ (null); // allocated on demand
-R.dlightmaps_rgba = /** @type {Uint8Array} */ (null); // allocated on demand
-R.deluxemap = /** @type {Uint8Array} */ (null); // allocated on demand
-
-R.AddDynamicLights = function(surf) {
-  const smax = (surf.extents[0] >> surf.lmshift) + 1;
-  const tmax = (surf.extents[1] >> surf.lmshift) + 1;
-  const size = smax * tmax;
-
-  const blocklights = [];
-  for (let i = 0; i < size * 3; i++) {
-    blocklights[i] = 0;
-  }
-
-  for (let i = 0; i < Def.limits.dlights; i++) {
-    if (((surf.dlightbits >>> i) & 1) === 0) {
-      continue;
-    }
-    const light = CL.state.clientEntities.dlights[i];
-    const lightImpact = R.GetDynamicLightSurfaceImpact(light, surf);
-
-    if (lightImpact === null) {
-      continue;
-    }
-    let dist = lightImpact.distanceToPlane;
-    const rad = light.radius - dist;
-    let minlight = light.minlight;
-    if (rad < minlight) {
-      continue;
-    }
-    minlight = rad - minlight;
-    const impact = lightImpact.impact;
-    const tex = CL.state.worldmodel.texinfo[surf.texinfo];
-    const local = [
-      impact.dot(new Vector(...tex.vecs[0])) + tex.vecs[0][3] - surf.texturemins[0],
-      impact.dot(new Vector(...tex.vecs[1])) + tex.vecs[1][3] - surf.texturemins[1],
-    ];
-    for (let t = 0; t < tmax; t++) {
-      let td = local[1] - (t << surf.lmshift);
-      if (td < 0.0) {
-        td = -td;
-      }
-      td = Math.floor(td);
-      for (let s = 0; s < smax; s++) {
-        let sd = local[0] - (s << surf.lmshift);
-        if (sd < 0) {
-          sd = -sd;
-        }
-        sd = Math.floor(sd);
-        if (sd > td) {
-          dist = sd + (td >> 1);
-        } else {
-          dist = td + (sd >> 1);
-        }
-        if (dist < minlight) {
-          const bl = Math.floor((rad - dist) * 256.0);
-          const pos = (t * smax + s) * 3;
-          for (let i = 0; i < 3; i++) {
-            blocklights[pos + i] += bl * light.color[i];
-          }
-        }
-      }
-    }
-  }
-
-  for (let t = 0, i = 0; t < tmax; t++) {
-    R.lightmap_modified[surf.light_t + t] = 1;
-    const dest = ((surf.light_t + t) * LIGHTMAP_BLOCK_SIZE) + surf.light_s;
-    for (let s = 0; s < smax; s++) {
-      const dldest = (dest + s) * 4;
-      const blrgb = [
-        Math.min(Math.floor(blocklights[i * 3] / 128), 255),
-        Math.min(Math.floor(blocklights[i * 3 + 1] / 128), 255),
-        Math.min(Math.floor(blocklights[i * 3 + 2] / 128), 255),
-      ];
-      // console.log(blrgb);
-      i++;
-      for (let i = 0; i < 3; i++) {
-        R.dlightmaps_rgba[dldest + i] = blrgb[i];
-      }
-    }
-  }
-};
-
-R.RemoveDynamicLights = function(surf) {
-  const smax = (surf.extents[0] >> surf.lmshift) + 1;
-  const tmax = (surf.extents[1] >> surf.lmshift) + 1;
-  for (let t = 0; t < tmax; t++) {
-    R.lightmap_modified[surf.light_t + t] = 1;
-    const dest = ((surf.light_t + t) * LIGHTMAP_BLOCK_SIZE) + surf.light_s;
-    for (let s = 0; s < smax; s++) {
-      const dldest = (dest + s) * 4;
-      for (let i = 0; i < 3; i++) {
-        R.dlightmaps_rgba[dldest + i] = 0;
-      }
-      R.dlightmaps_rgba[dldest + 3] = 255; // fully opaque
-    }
-  }
-};
-
-R.BuildLightMap = function(currentmodel, surf) {
-  const smax = (surf.extents[0] >> surf.lmshift) + 1;
-  const tmax = (surf.extents[1] >> surf.lmshift) + 1;
-
-  for (let k = 0; k < 3; k++) {
-    const offset = LIGHTMAP_BLOCK_SIZE * LIGHTMAP_BLOCK_HEIGHT * k;
-    let lightmap = surf.lightofs;
-    let maps;
-
-    for (maps = 0; maps < surf.styles.length; maps++) {
-      let dest = (surf.light_t * LIGHTMAP_BLOCK_HEIGHT) + (surf.light_s << 2) + maps;
-      for (let i = 0; i < tmax; i++) {
-        for (let j = 0; j < smax; j++) {
-          R.lightmaps_rgb[dest + (j << 2) + offset] = currentmodel.lightdata[lightmap + j];
-        }
-        lightmap += smax;
-        dest += LIGHTMAP_BLOCK_HEIGHT;
-      }
-    }
-
-    for (; maps < 4; maps++) {
-      let dest = (surf.light_t * LIGHTMAP_BLOCK_HEIGHT) + (surf.light_s << 2) + maps;
-      for (let i = 0; i < tmax; i++) {
-        for (let j = 0; j < smax; j++) {
-          R.lightmaps_rgb[dest + (j << 2) + offset] = 0;
-        }
-        dest += LIGHTMAP_BLOCK_HEIGHT;
-      }
-    }
-  }
-};
-
-R.BuildLightMapEx = function(currentmodel, surf) {
-  const smax = (surf.extents[0] >> surf.lmshift) + 1;
-  const tmax = (surf.extents[1] >> surf.lmshift) + 1;
-
-  if (currentmodel.deluxemap && !R.deluxemap) {
-    R.deluxemap = new Uint8Array(new ArrayBuffer(LIGHTMAP_BLOCK_SIZE * LIGHTMAP_BLOCK_HEIGHT * 3));
-  }
-
-  for (let k = 0; k < 3; k++) {
-    const offset = LIGHTMAP_BLOCK_SIZE * LIGHTMAP_BLOCK_HEIGHT * k;
-    let lightmap = surf.lightofs * 3;
-    let maps;
-
-    for (maps = 0; maps < surf.styles.length; maps++) {
-      let dest = (surf.light_t * LIGHTMAP_BLOCK_HEIGHT) + (surf.light_s << 2) + maps;
-      for (let i = 0; i < tmax; i++) {
-        for (let j = 0; j < smax; j++) {
-          R.lightmaps_rgb[dest + (j << 2) + offset] = currentmodel.lightdata_rgb[(lightmap + j * 3) + k];
-
-          if (currentmodel.deluxemap) {
-            R.deluxemap[dest + (j << 2) + offset] = currentmodel.deluxemap[(lightmap + j * 3) + k];
-          }
-        }
-        lightmap += smax * 3;
-        dest += LIGHTMAP_BLOCK_HEIGHT;
-      }
-    }
-
-    for (; maps < 4; maps++) {
-      let dest = (surf.light_t * LIGHTMAP_BLOCK_HEIGHT) + (surf.light_s << 2) + maps;
-      for (let i = 0; i < tmax; i++) {
-        for (let j = 0; j < smax; j++) {
-          R.lightmaps_rgb[dest + (j << 2) + offset] = 0;
-
-          if (currentmodel.deluxemap) {
-            R.deluxemap[dest + (j << 2) + offset] = 0;
-          }
-        }
-        dest += LIGHTMAP_BLOCK_HEIGHT;
-      }
-    }
-  }
-};
-
-R.RecursiveWorldNode = function(node) {
-  if (node.contents === content.CONTENT_SOLID) {
-    return;
-  }
-  if (node.contents < 0) {
-    if (node.markvisframe !== R.visframecount) {
-      return;
-    }
-    node.visframe = R.visframecount;
-    if (node.skychain !== node.waterchain) {
-      R.drawsky = true;
-    }
-    return;
-  }
-  R.RecursiveWorldNode(node.children[0]);
-  R.RecursiveWorldNode(node.children[1]);
-};
-
-R.MarkLeafs = function() {
-  if ((R.oldviewleaf === R.viewleaf) && (R.novis.value === 0)) {
-    return;
-  }
-  R.visframecount++;
-  R.oldviewleaf = R.viewleaf;
-  const vis = (R.novis.value !== 0 || R.viewleaf === null || R.viewleaf.num === 0) ? revealedVisibility : (
-    R.novis.value === 2 ?
-      CL.state.worldmodel.getPhsByLeaf(R.viewleaf) :
-      CL.state.worldmodel.getPvsByLeaf(R.viewleaf)
-  );
-  for (let i = 1; i < CL.state.worldmodel.leafs.length; i++) {
-    if (!vis.isRevealed(i)) {
-      continue;
-    }
-    if (CL.areaportals.value > 0 && R.viewleaf && !CL.state.worldmodel.areaPortals.leafsConnected(R.viewleaf, CL.state.worldmodel.leafs[i])) {
-      continue;
-    }
-    for (let node = CL.state.worldmodel.leafs[i]; node; node = node.parent) {
-      if (node.markvisframe === R.visframecount) {
-        break;
-      }
-      node.markvisframe = R.visframecount;
-    }
-  }
-  do {
-    if (R.novis.value !== 0 || R.viewleaf === null) {
-      break;
-    }
-    const p = R.refdef.vieworg.copy();
-    let leaf;
-    if (R.viewleaf.contents <= content.CONTENT_WATER) {
-      leaf = CL.state.worldmodel.getLeafForPoint(p.add(new Vector(0, 0, 16.0)));
-      if (leaf.contents <= content.CONTENT_WATER) {
-        break;
-      }
-    } else {
-      leaf = CL.state.worldmodel.getLeafForPoint(p.add(new Vector(0, 0, -16.0)));
-      if (leaf.contents > content.CONTENT_WATER) {
-        break;
-      }
-    }
-    if (leaf === R.viewleaf) {
-      break;
-    }
-    const vis = CL.state.worldmodel.getPvsByLeaf(leaf);
-    for (let i = 1; i < CL.state.worldmodel.leafs.length; i++) {
-      if (!vis.isRevealed(i)) {
-        continue;
-      }
-      if (CL.areaportals.value > 0 && !CL.state.worldmodel.areaPortals.leafsConnected(R.viewleaf, CL.state.worldmodel.leafs[i])) {
-        continue;
-      }
-      for (let node = CL.state.worldmodel.leafs[i]; node; node = node.parent) {
-        if (node.markvisframe === R.visframecount) {
-          break;
-        }
-        node.markvisframe = R.visframecount;
-      }
-    }
-  // eslint-disable-next-line no-constant-condition
-  } while (false);
-  R.drawsky = false;
-  R.RecursiveWorldNode(CL.state.worldmodel.nodes[0]);
-};
-
-R.AllocBlock = function(surf) {
-  const w = (surf.extents[0] >> surf.lmshift) + 1;
-  const h = (surf.extents[1] >> surf.lmshift) + 1;
-  let x; let y; let i; let j; let best = LIGHTMAP_BLOCK_SIZE; let best2;
-  for (i = 0; i < (LIGHTMAP_BLOCK_SIZE - w); i++) {
-    best2 = 0;
-    for (j = 0; j < w; j++) {
-      if (R.allocated[i + j] >= best) {
-        break;
-      }
-      if (R.allocated[i + j] > best2) {
-        best2 = R.allocated[i + j];
-      }
-    }
-    if (j === w) {
-      x = i;
-      y = best = best2;
-    }
-  }
-  best += h;
-  if (best > LIGHTMAP_BLOCK_SIZE) {
-    throw new Error('R.AllocBlock: full');
-  }
-  for (i = 0; i < w; i++) {
-    R.allocated[x + i] = best;
-  }
-  surf.light_s = x;
-  surf.light_t = y;
-};
-
-R.BuildLightmaps = function() {
-  R.allocated = (new Array(LIGHTMAP_BLOCK_SIZE)).fill(0);
-
-  R.lightmaps_rgb = new Uint8Array(new ArrayBuffer(LIGHTMAP_BLOCK_SIZE * LIGHTMAP_BLOCK_HEIGHT * 3));
-  R.dlightmaps_rgba = new Uint8Array(new ArrayBuffer(LIGHTMAP_BLOCK_SIZE * LIGHTMAP_BLOCK_SIZE * 4));
-
-  const brushRenderer = modelRendererRegistry.getRenderer(Mod.type.brush);
-  const meshRenderer = modelRendererRegistry.getRenderer(Mod.type.mesh);
-
-  for (let i = 1; i < CL.state.model_precache.length; i++) {
-    const currentmodel = CL.state.model_precache[i];
-
-    // Handle brush models (BSP maps)
-    if (currentmodel.type === Mod.type.brush) {
-      if (currentmodel.name[0] !== '*') { // skip submodels
-        for (let j = 0; j < currentmodel.faces.length; j++) {
-          const surf = currentmodel.faces[j];
-          if (!surf.sky) {
-            R.AllocBlock(surf);
-            if (currentmodel.lightdata_rgb !== null) {
-              R.BuildLightMapEx(currentmodel, surf);
-            } else if (currentmodel.lightdata !== null) {
-              R.BuildLightMap(currentmodel, surf);
-            }
-          }
-        }
-      }
-      // Use the brush renderer to prepare the model
-      // Only model index 1 is the world model, all others are entity models
-      brushRenderer.prepareModel(currentmodel, i === 1);
-    }
-
-    // Handle mesh models (OBJ, IQM, etc.)
-    if (currentmodel.type === Mod.type.mesh) {
-      meshRenderer.prepareModel(currentmodel);
-    }
-  }
-
-  const layerBytes = LIGHTMAP_BLOCK_SIZE * LIGHTMAP_BLOCK_SIZE * 4;
-  GL.BindArray(0, R.lightmap_texture);
-  for (let k = 0; k < 3; k++) {
-    gl.texSubImage3D(gl.TEXTURE_2D_ARRAY, 0, 0, 0, k, LIGHTMAP_BLOCK_SIZE, LIGHTMAP_BLOCK_SIZE, 1, gl.RGBA, gl.UNSIGNED_BYTE, R.lightmaps_rgb.subarray(k * layerBytes, (k + 1) * layerBytes));
-  }
-
-  GL.BindArray(0, R.deluxemap_texture);
-  if (R.deluxemap) {
-    for (let k = 0; k < 3; k++) {
-      gl.texSubImage3D(gl.TEXTURE_2D_ARRAY, 0, 0, 0, k, LIGHTMAP_BLOCK_SIZE, LIGHTMAP_BLOCK_SIZE, 1, gl.RGBA, gl.UNSIGNED_BYTE, R.deluxemap.subarray(k * layerBytes, (k + 1) * layerBytes));
-    }
-  }
-};
-
-// warp
-
-R.skyrenderer = /** @type {SkyRenderer} */ (null);
-R.drawsky = true;
-
-R.DrawSkyBox = function() {
-  if (!R.drawsky || !R.skyrenderer) {
-    return;
-  }
-
-  R.skyrenderer.render();
-};
-
-R.MakeSky = function() {
-  // make sure we always free the old skyrenderer
-  if (R.skyrenderer) {
-    R.skyrenderer.shutdown();
-  }
-
-  R.skyrenderer = CL.state.worldmodel.newSkyRenderer();
-
-  if (!R.skyrenderer) {
-    return;
-  }
-
-  R.skyrenderer.init();
-};
-
-R.ClearSky = function() {
-  if (!R.skyrenderer) {
-    return;
-  }
-
-  R.skyrenderer.shutdown();
-  R.skyrenderer = null;
-};
-
diff --git a/source/engine/client/R.ts b/source/engine/client/R.ts
new file mode 100644
index 00000000..72fa27c4
--- /dev/null
+++ b/source/engine/client/R.ts
@@ -0,0 +1,2792 @@
+import Vector from '../../shared/Vector.ts';
+import Cvar from '../common/Cvar.ts';
+import Cmd from '../common/Cmd.ts';
+import * as Def from '../common/Def.ts';
+
+import { eventBus, registry } from '../registry.mjs';
+import Chase from './Chase.ts';
+import W from '../common/W.ts';
+import VID from './VID.ts';
+import GL, { ATTRIB_LOCATIONS, GLTexture } from './GL.ts';
+import { content, effect, gameCapabilities } from '../../shared/Defs.ts';
+import { modelRendererRegistry } from './renderer/ModelRendererRegistry.ts';
+import { BrushModelRenderer, LIGHTMAP_BLOCK_HEIGHT, LIGHTMAP_BLOCK_SIZE } from './renderer/BrushModelRenderer.ts';
+import { AliasModelRenderer } from './renderer/AliasModelRenderer.ts';
+import { SpriteModelRenderer } from './renderer/SpriteModelRenderer.ts';
+import { MeshModelRenderer } from './renderer/MeshModelRenderer.ts';
+import Draw from './Draw.ts';
+import { BrushModel, type FogVolumeInfo, type LightgridPointSample, Node, type WorldTurbulentChainInfo, revealedVisibility } from '../common/model/BSP.ts';
+import { type Face, Plane } from '../common/model/BaseModel.ts';
+import PostProcess from './renderer/PostProcess.ts';
+import BloomEffect from './renderer/BloomEffect.ts';
+import WarpEffect from './renderer/WarpEffect.ts';
+import ShadowMap from './renderer/ShadowMap.ts';
+import { ClientDlight, ClientEdict } from './ClientEntities.ts';
+import { avertexnormals } from '../common/model/loaders/AliasMDLLoader.ts';
+import { SkyRenderer } from './renderer/Sky.ts';
+
+let { CL, Host, Mod, SCR, SV, Sys, V } = registry;
+
+eventBus.subscribe('registry.frozen', () => {
+  ({ CL, Host, Mod, SCR, SV, Sys, V } = registry);
+});
+
+let gl: WebGL2RenderingContext = null!;
+
+eventBus.subscribe('gl.ready', () => {
+  gl = GL.gl;
+});
+
+eventBus.subscribe('gl.shutdown', () => {
+  gl = null!;
+});
+
+interface SortKindDistance {
+  readonly dist: number;
+  readonly kind: number;
+}
+
+interface DynamicLightSurfaceImpact {
+  readonly distanceToPlane: number;
+  readonly impact: Vector;
+}
+
+interface FogAndTurbulentSortItem extends SortKindDistance {
+  readonly data: WorldTurbulentChainInfo | FogVolumeInfo;
+}
+
+interface TransparentSortItem extends SortKindDistance {
+  readonly data: Node | ClientEdict;
+}
+
+interface RefdefRect {
+  x: number;
+  y: number;
+  width: number;
+  height: number;
+}
+
+interface RefdefState {
+  vrect: RefdefRect;
+  vieworg: Vector;
+  viewangles: Vector;
+  fov_x: number;
+  fov_y: number;
+}
+
+type LightPointResult = [Vector, Vector];
+type EntityLightValues = [Vector, Vector, Vector, Vector, Vector];
+type GridPosition = [number, number, number];
+type Vec4 = [number, number, number, number];
+
+interface SerializedParticle {
+  i: number;
+  die: number;
+  color: number;
+  ramp: number;
+  type: number;
+  org: [number, number, number];
+  vel: [number, number, number];
+}
+
+enum ParticleType {
+  tracer = 0,
+  grav = 1,
+  slowgrav = 2,
+  fire = 3,
+  explode = 4,
+  explode2 = 5,
+  blob = 6,
+  blob2 = 7,
+}
+
+
+
+const FOG_TURBULENT_SORT_EPSILON = 0.0001;
+
+/**
+ * Compare mixed fog and turbulent items for the shared transparent pass.
+ * Distances sort back-to-front. When a fog volume and a turbulent surface
+ * begin at the same depth, fog must draw first so the nearer liquid can blend
+ * over it instead of the fog overpainting the liquid.
+ * @returns Sort comparator result.
+ */
+export function compareFogAndTurbulentItems(itemA: SortKindDistance, itemB: SortKindDistance): number {
+  const distDelta = itemB.dist - itemA.dist;
+
+  if (Math.abs(distDelta) > FOG_TURBULENT_SORT_EPSILON) {
+    return distDelta;
+  }
+
+  return itemB.kind - itemA.kind;
+}
+
+
+class R {
+  // light
+
+  static dlightframecount = 0;
+
+  static lightstylevalue_a = new Uint8Array(new ArrayBuffer(64));
+  static lightstylevalue_b = new Uint8Array(new ArrayBuffer(64));
+
+  static AnimateLight(): void {
+    if (R.fullbright.value === 0) {
+      const i = Math.floor(CL.state.time * 10.0);
+      for (let j = 0; j < 64; j++) {
+        const ls = CL.state.clientEntities.lightstyle[j];
+        if (ls.length === 0) {
+          R.lightstylevalue_a[j] = 12;
+          R.lightstylevalue_b[j] = 12;
+          continue;
+        }
+        R.lightstylevalue_a[j] = ls.charCodeAt(i % ls.length) - 97;
+        R.lightstylevalue_b[j] = ls.charCodeAt((i + 1) % ls.length) - 97;
+      }
+    } else {
+      for (let j = 0; j < 64; j++) {
+        R.lightstylevalue_a[j] = 12;
+        R.lightstylevalue_b[j] = 12;
+      }
+    }
+    GL.Bind(0, R.lightstyle_texture_a);
+    gl.texSubImage2D(gl.TEXTURE_2D, 0, 0, 0, 64, 1, gl.RED, gl.UNSIGNED_BYTE, R.lightstylevalue_a!);
+    GL.Bind(0, R.lightstyle_texture_b);
+    gl.texSubImage2D(gl.TEXTURE_2D, 0, 0, 0, 64, 1, gl.RED, gl.UNSIGNED_BYTE, R.lightstylevalue_b!);
+  };
+
+  static RenderDlights() {
+    if (R.flashblend.value === 0) {
+      return;
+    }
+    R.dlightframecount++;
+    gl.enable(gl.BLEND);
+    const program = GL.UseProgram('dlight'); let a;
+    GL.BindVAO(R.dlightVAO);
+    for (let i = 0; i < Def.limits.dlights; i++) {
+      const l = CL.state.clientEntities.dlights[i];
+      if ((l.die < CL.state.time) || (l.radius === 0.0)) {
+        continue;
+      }
+      if (l.origin.copy().subtract(R.refdef.vieworg).len() < (l.radius * 0.35)) {
+        a = l.radius * 0.0003;
+        V.blend[3] += a * (1.0 - V.blend[3]);
+        a /= V.blend[3];
+        V.blend[0] = V.blend[1] * (1.0 - a) + (255.0 * a);
+        V.blend[1] = V.blend[1] * (1.0 - a) + (127.5 * a);
+        V.blend[2] *= 1.0 - a;
+        continue;
+      }
+      gl.uniform3fv(program.uOrigin, l.origin);
+      gl.uniform1f(program.uRadius, l.radius);
+      gl.drawArrays(gl.TRIANGLE_FAN, 0, 18);
+    }
+    GL.UnbindVAO();
+    gl.disable(gl.BLEND);
+  };
+
+  /**
+   * Returns a known point on the face plane for dynamic-light projection.
+   * @returns A known point on the surface plane.
+   */
+  static GetDynamicLightSurfacePoint(surf: Face): Vector {
+    const surfedge = CL.state.worldmodel.surfedges[surf.firstedge!];
+
+    if (surfedge >= 0) {
+      return CL.state.worldmodel.vertexes[CL.state.worldmodel.edges[surfedge][0]].copy();
+    }
+
+    return CL.state.worldmodel.vertexes[CL.state.worldmodel.edges[-surfedge][1]].copy();
+  };
+
+  /**
+   * Projects a dynamic light onto a face plane when the light is in front of the surface.
+   * @returns Surface-plane hit information when the light is in front of the face.
+   */
+  static GetDynamicLightSurfaceImpact(light: ClientDlight, surf: Face): DynamicLightSurfaceImpact | null {
+    const faceNormal = surf.normal!.copy();
+    const surfacePoint = R.GetDynamicLightSurfacePoint(surf);
+    const distanceToPlane = light.origin.copy().subtract(surfacePoint).dot(faceNormal);
+
+    if (distanceToPlane <= 0.0 || distanceToPlane >= light.radius) {
+      return null;
+    }
+
+    const impact = light.origin.copy().subtract(faceNormal.copy().multiply(distanceToPlane));
+
+    return { distanceToPlane, impact };
+  };
+
+  /**
+   * Returns whether the light can see the face at the projected impact point.
+   * @returns True when the light has line of sight to the surface.
+   */
+  static IsDynamicLightSurfaceVisible(light: ClientDlight, surf: Face, impact: Vector): boolean {
+    const end = impact.copy().add(surf.normal!.copy().multiply(1.0));
+    const trace = SV.collision.traceStaticWorldLine(light.origin, end);
+
+    return !trace.startsolid && !trace.allsolid && trace.fraction === 1.0;
+  };
+
+  /**
+   * Propagates a dynamic light through the BSP and marks touched faces.
+   */
+  static MarkLights(light: ClientDlight, bit: number, node: Node): void {
+    if (node.contents < 0) {
+      return;
+    }
+    const normal = node.plane!.normal;
+    const dist = light.origin.dot(normal) - node.plane.dist;
+    if (dist > light.radius) {
+      R.MarkLights(light, bit, node.children[0]);
+      return;
+    }
+    if (dist < -light.radius) {
+      R.MarkLights(light, bit, node.children[1]);
+      return;
+    }
+    for (const surf of node.facesIter()) {
+      if (surf.sky) {
+        continue;
+      }
+
+      const lightImpact = R.GetDynamicLightSurfaceImpact(light, surf);
+
+      if (lightImpact === null || !R.IsDynamicLightSurfaceVisible(light, surf, lightImpact.impact)) {
+        continue;
+      }
+
+      if (surf.dlightframe !== (R.dlightframecount + 1)) {
+        surf.dlightbits = 0;
+        surf.dlightframe = R.dlightframecount + 1;
+      }
+      surf.dlightbits |= bit;
+    }
+    R.MarkLights(light, bit, node.children[0]);
+    R.MarkLights(light, bit, node.children[1]);
+  };
+
+  static PushDlights() {
+    if (R.flashblend.value !== 0) {
+      return;
+    }
+
+    for (let i = 0; i < LIGHTMAP_BLOCK_SIZE; i++) {
+      R.lightmap_modified[i] = 0;
+    }
+
+    let bit = 1;
+
+    for (let i = 0; i < Def.limits.dlights; i++) {
+      const l = CL.state.clientEntities.dlights[i];
+
+      if (!l.isFree()) {
+        R.MarkLights(l, bit, CL.state.worldmodel.nodes[0]);
+        for (const ent of CL.state.clientEntities.getVisibleEntities()) {
+          if (ent.model === null) {
+            continue;
+          }
+          if ((ent.model.type !== Mod.type.brush) || !ent.model.submodel) {
+            continue;
+          }
+          R.MarkLights(l, bit, CL.state.worldmodel.nodes[ent.model.hulls[0].firstclipnode]);
+        }
+      }
+      bit += bit;
+    }
+
+    let surf;
+    for (let i = 0; i < CL.state.worldmodel.faces.length; i++) {
+      surf = CL.state.worldmodel.faces[i];
+      if (surf.dlightframe === R.dlightframecount) {
+        R.RemoveDynamicLights(surf);
+      } else if (surf.dlightframe === (R.dlightframecount + 1)) {
+        R.AddDynamicLights(surf);
+      }
+    }
+
+    GL.Bind(0, R.dlightmap_rgba_texture);
+    for (let i = 0; i < LIGHTMAP_BLOCK_SIZE; i++) {
+      if (!R.lightmap_modified[i]) {
+        continue;
+      }
+      for (let j = LIGHTMAP_BLOCK_SIZE - 1; j >= i; j--) {
+        if (!R.lightmap_modified[j]) {
+          continue;
+        }
+        gl.texSubImage2D(gl.TEXTURE_2D, 0, 0, i, LIGHTMAP_BLOCK_SIZE, j - i + 1, gl.RGBA, gl.UNSIGNED_BYTE, R.dlightmaps_rgba.subarray(i * LIGHTMAP_BLOCK_SIZE * 4, (j + 1) * LIGHTMAP_BLOCK_SIZE * 4));
+        break;
+      }
+      break;
+    }
+
+    R.dlightframecount++;
+  };
+
+  static RecursiveLightPoint(node: Node, start: Vector, end: Vector): LightPointResult | null {
+    if (node.contents < 0) {
+      return null;
+    }
+
+    const normal = node.plane.normal;
+    const front = start[0] * normal[0] + start[1] * normal[1] + start[2] * normal[2] - node.plane.dist;
+    const back = end[0] * normal[0] + end[1] * normal[1] + end[2] * normal[2] - node.plane.dist;
+    const side = front < 0;
+
+    if ((back < 0) === side) {
+      return R.RecursiveLightPoint(node.children[side ? 1 : 0], start, end);
+    }
+
+    const frac = front / (front - back);
+    const mid = new Vector(
+      start[0] + (end[0] - start[0]) * frac,
+      start[1] + (end[1] - start[1]) * frac,
+      start[2] + (end[2] - start[2]) * frac,
+    );
+
+    const r = R.RecursiveLightPoint(node.children[side ? 1 : 0], start, mid);
+
+    if (r !== null) {
+      return r;
+    }
+
+    if ((back < 0) === side) {
+      return null;
+    }
+
+    for (const surf of node.facesIter()) {
+      if (surf.sky) {
+        continue;
+      }
+
+      const tex = CL.state.worldmodel.texinfo[surf.texinfo];
+      const s = mid.dot(new Vector(...tex.vecs[0])) + tex.vecs[0][3];
+      const t = mid.dot(new Vector(...tex.vecs[1])) + tex.vecs[1][3];
+      if ((s < surf.texturemins[0]) || (t < surf.texturemins[1])) {
+        continue;
+      }
+
+      let ds = s - surf.texturemins[0];
+      let dt = t - surf.texturemins[1];
+      if ((ds > surf.extents[0]) || (dt > surf.extents[1])) {
+        continue;
+      }
+
+      if (surf.styles.length === 0 || surf.lightofs < 0) {
+        return [new Vector(), mid];
+      }
+
+      ds >>= surf.lmshift;
+      dt >>= surf.lmshift;
+
+      const smax = (surf.extents[0] >> surf.lmshift) + 1;
+      const tmax = (surf.extents[1] >> surf.lmshift) + 1;
+
+      const r3 = new Vector();
+      const haveRGB = CL.state.worldmodel.lightdata_rgb !== null;
+      const lightdata = haveRGB ? CL.state.worldmodel.lightdata_rgb : CL.state.worldmodel.lightdata;
+      const channels = haveRGB ? 3 : 1;
+      const uInterpolation = R.interpolation.value ? (CL.state.time % .2) / .2 : 0;
+
+      for (let k = 0; k < channels; k++) {
+        let lightmap = surf.lightofs + dt * smax + ds;
+
+        for (let maps = 0; maps < surf.styles.length; maps++) {
+          const scale = (
+            R.lightstylevalue_a[surf.styles[maps]] * (1 - uInterpolation) +
+            R.lightstylevalue_b[surf.styles[maps]] * uInterpolation
+          ) * 22.0;
+
+          r3[k] += lightdata[lightmap * channels + k] * scale;
+
+          lightmap += tmax * smax;
+        }
+      }
+
+      if (!haveRGB) {
+        // replicate for green and blue
+        r3[1] = r3[0];
+        r3[2] = r3[0];
+      }
+
+      r3[0] = r3[0] >> 8;
+      r3[1] = r3[1] >> 8;
+      r3[2] = r3[2] >> 8;
+
+      return [
+        r3,
+        mid.add(surf.normal.copy().multiply(16.0)),
+      ];
+    }
+
+    return R.RecursiveLightPoint(node.children[!side ? 1 : 0], mid, end);
+  };
+
+  static LightPoint(p: Vector): LightPointResult {
+    if (CL.state.worldmodel.lightdata === null && CL.state.worldmodel.lightdata_rgb === null) {
+      return [new Vector(255, 255, 255), new Vector(0, 0, 0)];
+    }
+
+    // Try lightgrid first if available
+    if (CL.state.worldmodel.lightgrid !== null) {
+      const gridResult = R.LightPointFromGrid(p);
+      if (gridResult !== null) {
+        // Get a proper light origin from surface trace for directional shading.
+        // The lightgrid provides correct color but has no surface information,
+        // so we trace downward to find the surface below the entity.
+        const surfaceTrace = R.RecursiveLightPoint(CL.state.worldmodel.nodes[0], p, new Vector(p[0], p[1], p[2] - 2048.0));
+        if (surfaceTrace !== null) {
+          gridResult[1] = surfaceTrace[1];
+        }
+        return gridResult;
+      }
+    }
+
+    const r = R.RecursiveLightPoint(CL.state.worldmodel.nodes[0], p, new Vector(p[0], p[1], p[2] - 2048.0));
+
+    if (r === null) {
+      return [new Vector(0, 0, 0), new Vector(0, 0, 0)];
+    }
+
+    return r;
+  };
+
+  /**
+   * Samples a single point from the lightgrid octree.
+   * @returns Point data or null when the octree has no lighting sample there.
+   */
+  static SampleLightgridPoint(gridPos: GridPosition): LightgridPointSample | null {
+    const grid = CL.state.worldmodel.lightgrid;
+    const LGNODE_LEAF = 1 << 31;
+    const LGNODE_MISSING = 1 << 30;
+
+    // Walk the octree to find the leaf
+    let nodeIndex = grid.rootnode;
+
+    while (true) {
+      // Check if we've hit a leaf or missing node
+      if ((nodeIndex & LGNODE_LEAF) !== 0) {
+        const leafIndex = nodeIndex & ~(LGNODE_LEAF | LGNODE_MISSING);
+
+        if ((nodeIndex & LGNODE_MISSING) !== 0) {
+          // Missing data at this point
+          return null;
+        }
+
+        // Check if leaf index is valid
+        if (leafIndex >= grid.leafs.length) {
+          return null;
+        }
+
+        const leaf = grid.leafs[leafIndex];
+
+        // Calculate index within the leaf
+        const localX = gridPos[0] - leaf.mins[0];
+        const localY = gridPos[1] - leaf.mins[1];
+        const localZ = gridPos[2] - leaf.mins[2];
+
+        // Check bounds
+        if (localX < 0 || localX >= leaf.size[0] ||
+            localY < 0 || localY >= leaf.size[1] ||
+            localZ < 0 || localZ >= leaf.size[2]) {
+          return null;
+        }
+
+        const pointIndex = localZ * leaf.size[0] * leaf.size[1] + localY * leaf.size[0] + localX;
+
+        // Check if point index is valid
+        if (pointIndex >= leaf.points.length) {
+          return null;
+        }
+
+        const point = leaf.points[pointIndex];
+
+        if (point.stylecount === 0xff) {
+          // No data at this point
+          return null;
+        }
+
+        return point;
+      }
+
+      // Internal node - traverse
+      // Check if node index is valid
+      if (nodeIndex >= grid.nodes.length) {
+        return null;
+      }
+
+      const node = grid.nodes[nodeIndex];
+
+      // Calculate child index: ((z>=mid[2])<<0) | ((y>=mid[1])<<1) | ((x>=mid[0])<<2)
+      let childIdx = 0;
+      if (gridPos[2] >= node.mid[2]) {
+        childIdx |= 1;
+      }
+      if (gridPos[1] >= node.mid[1]) {
+        childIdx |= 2;
+      }
+      if (gridPos[0] >= node.mid[0]) {
+        childIdx |= 4;
+      }
+
+      nodeIndex = node.child[childIdx];
+    }
+  };
+
+  /**
+   * Samples lighting from the lightgrid octree with trilinear interpolation.
+   * @returns Interpolated RGB light and origin, or null when no grid sample is available.
+   */
+  static LightPointFromGrid(pos: Vector): LightPointResult | null {
+    const grid = CL.state.worldmodel.lightgrid;
+
+    if (!grid) {
+      return null;
+    }
+
+    // Convert world position to grid space
+    const gridPosFloat = [
+      (pos[0] - grid.mins[0]) / grid.step[0],
+      (pos[1] - grid.mins[1]) / grid.step[1],
+      (pos[2] - grid.mins[2]) / grid.step[2],
+    ];
+
+    // Get the 8 surrounding grid points
+    const baseX = Math.floor(gridPosFloat[0]);
+    const baseY = Math.floor(gridPosFloat[1]);
+    const baseZ = Math.floor(gridPosFloat[2]);
+
+    // Calculate fractional part for interpolation
+    const fracX = gridPosFloat[0] - baseX;
+    const fracY = gridPosFloat[1] - baseY;
+    const fracZ = gridPosFloat[2] - baseZ;
+
+    // Sample the 8 corner points
+    const samples = [];
+    const weights = [];
+    let totalWeight = 0;
+
+    for (let dz = 0; dz <= 1; dz++) {
+      for (let dy = 0; dy <= 1; dy++) {
+        for (let dx = 0; dx <= 1; dx++) {
+          const gridPos = [baseX + dx, baseY + dy, baseZ + dz];
+          const sample = R.SampleLightgridPoint(gridPos);
+
+          // Calculate trilinear weight
+          const wx = dx === 0 ? (1 - fracX) : fracX;
+          const wy = dy === 0 ? (1 - fracY) : fracY;
+          const wz = dz === 0 ? (1 - fracZ) : fracZ;
+          const weight = wx * wy * wz;
+
+          if (sample !== null) {
+            samples.push(sample);
+            weights.push(weight);
+            totalWeight += weight;
+          }
+        }
+      }
+    }
+
+    // If no samples found, return null
+    if (samples.length === 0) {
+      return null;
+    }
+
+    // Compensate for missing samples by renormalizing weights
+    if (totalWeight > 0) {
+      for (let i = 0; i < weights.length; i++) {
+        weights[i] /= totalWeight;
+      }
+    }
+
+    // Accumulate weighted RGB values
+    const r3 = new Vector(0, 0, 0);
+    const uInterpolation = R.interpolation.value ? (CL.state.time % .2) / .2 : 0;
+
+    for (let i = 0; i < samples.length; i++) {
+      const sample = samples[i];
+      const weight = weights[i];
+
+      for (let s = 0; s < sample.styles.length; s++) {
+        const style = sample.styles[s];
+        const stylenum = style.stylenum;
+
+        // Apply lightstyle animation (matches RecursiveLightPoint: lightstyle * 22.0 / 256.0)
+        const scale = (
+          R.lightstylevalue_a[stylenum] * (1 - uInterpolation) +
+          R.lightstylevalue_b[stylenum] * uInterpolation
+        ) * 0.0859375; // 22.0 / 256.0
+
+        r3[0] += style.rgb[0] * scale * weight;
+        r3[1] += style.rgb[1] * scale * weight;
+        r3[2] += style.rgb[2] * scale * weight;
+      }
+    }
+
+    return [r3, pos.copy()];
+  };
+
+  // main
+
+  static visframecount = 0;
+
+  static frustum: Plane[] = [
+    new Plane(new Vector(), 0),
+    new Plane(new Vector(), 0),
+    new Plane(new Vector(), 0),
+    new Plane(new Vector(), 0),
+  ];
+
+  static vup = new Vector();
+  static vpn = new Vector();
+  static vright = new Vector();
+
+  static refdef: RefdefState = {
+    vrect: {
+      x: 0,
+      y: 0,
+      width: 0,
+      height: 0,
+    },
+    vieworg: new Vector(),
+    viewangles: new Vector(),
+    fov_x: 0,
+    fov_y: 0,
+  };
+
+  static oldviewleaf: Node | null = null;
+
+  static CullBox(mins: Vector, maxs: Vector): boolean {
+    if (Vector.boxOnPlaneSide(mins, maxs, R.frustum[0]) === 2) {
+      return true;
+    }
+    if (Vector.boxOnPlaneSide(mins, maxs, R.frustum[1]) === 2) {
+      return true;
+    }
+    if (Vector.boxOnPlaneSide(mins, maxs, R.frustum[2]) === 2) {
+      return true;
+    }
+    if (Vector.boxOnPlaneSide(mins, maxs, R.frustum[3]) === 2) {
+      return true;
+    }
+    return false;
+  };
+
+  /**
+   * Alias models in Quake sample static light slightly above their origin so
+   * monsters are lit from torso height rather than foot height.
+   * @returns World position used for static light sampling.
+   */
+  static GetEntityLightSamplePoint(entity: ClientEdict): Vector {
+    const samplePoint = entity.lerp.origin.copy();
+
+    if (entity.model !== null) {
+      // samplePoint[2] -= entity.mins[2] + 24.0; // effectively +24.0u on alias models
+      // CR: fun, that makes the boss in E1M7 pitch black
+    }
+
+    // console.log(`Sampling light for entity ${entity.num} at ${samplePoint}`, entity.model, entity.mins, entity.maxs);
+
+    return samplePoint;
+  };
+
+  /**
+   * Calculates static and dynamic lighting terms for a rendered entity.
+   * @returns Ambient light, shade light, nearest light origin, dynamic shade light, and dynamic light origin.
+   */
+  static _CalculateLightValues(e: ClientEdict): EntityLightValues {
+    const [ambientlight, lightOrigin] = R.LightPoint(R.GetEntityLightSamplePoint(e));
+    const shadelight = ambientlight.copy();
+
+    // never have a pitch black view model
+    if (e === CL.state.viewent && ambientlight.average() < 24.0) {
+      if (ambientlight.average() === 0) {
+        ambientlight.setTo(1.0, 1.0, 1.0); // no color, set to white
+      }
+      ambientlight.multiply(24.0);
+      shadelight.set(ambientlight);
+    }
+
+    const dynamicShadeLight = new Vector(0.0, 0.0, 0.0);
+    const dynamicLightOrigin = new Vector(0.0, 0.0, 0.0);
+    let maxAdd = 0.0;
+
+    // add dynamic lights
+    for (let i = 0; i < Def.limits.dlights; i++) {
+      const dl = CL.state.clientEntities.dlights[i];
+
+      if (dl.isFree()) {
+        continue;
+      }
+
+      const add = dl.radius - e.lerp.origin.distanceTo(dl.origin);
+
+      if (add > 0.0) {
+        const color = dl.color.copy();
+        const vadd = color.multiply(add);
+        dynamicShadeLight.add(vadd);
+
+        if (add > maxAdd) {
+          maxAdd = add;
+          dynamicLightOrigin.set(dl.origin);
+        }
+      }
+    }
+
+    // do not overbright
+    const alavg = ambientlight.greatest();
+    if (alavg > 128.0) {
+      ambientlight.multiply(128.0 / alavg);
+    }
+
+    const slavg = shadelight.greatest();
+    if (slavg > 128.0) {
+      shadelight.multiply(128.0 / slavg);
+    }
+
+    const dlavg = dynamicShadeLight.greatest();
+    if (dlavg > 128.0) {
+      dynamicShadeLight.multiply(128.0 / dlavg);
+    }
+
+    if (e.effects & (effect.EF_FULLBRIGHT | effect.EF_MUZZLEFLASH)) {
+      ambientlight.setTo(255.0, 255.0, 255.0);
+      shadelight.set(ambientlight);
+    } else if ((e.num >= 1 && e.num <= CL.state.maxclients && shadelight.greatest() < 8.0) || (e.effects & effect.EF_MINLIGHT)) {
+      // never let players go totally dark either
+      if (ambientlight.average() === 0) {
+        ambientlight.setTo(1.0, 1.0, 1.0); // no color, set to white
+      }
+      ambientlight.multiply(8.0);
+      shadelight[0] = Math.max(shadelight[0], ambientlight[0]);
+      shadelight[1] = Math.max(shadelight[1], ambientlight[1]);
+      shadelight[2] = Math.max(shadelight[2], ambientlight[2]);
+    }
+
+    ambientlight.multiply(0.0078125); // / 128.0
+    shadelight.multiply(0.0078125); // / 128.0
+    dynamicShadeLight.multiply(0.0078125);
+
+    return [ ambientlight, shadelight, lightOrigin, dynamicShadeLight, dynamicLightOrigin ];
+  };
+
+  static DrawEntitiesOnList() {
+    if (R.drawentities.value === 0) {
+      return;
+    }
+
+    // Group entities by model type for batched rendering
+    const entitiesByType = new Map();
+
+    for (const entity of CL.state.clientEntities.getVisibleEntities()) {
+      if (entity.model === null || entity.alpha === 0.0) {
+        continue;
+      }
+
+      const modelType = entity.model.type;
+      if (!entitiesByType.has(modelType)) {
+        entitiesByType.set(modelType, []);
+      }
+      entitiesByType.get(modelType).push(entity);
+    }
+
+    // Pass 0: Opaque models (brush, alias)
+    for (const [modelType, entities] of entitiesByType) {
+      if (modelType === Mod.type.sprite) {
+        continue; // Sprites are drawn in pass 1
+      }
+
+      const renderer = modelRendererRegistry.getRenderer(modelType);
+
+      renderer.setupRenderState(0);
+      for (const entity of entities) {
+        if (!renderer.rendersOpaquePass(entity.model, entity)) {
+          continue;
+        }
+
+        renderer.render(entity.model, entity, 0);
+      }
+      renderer.cleanupRenderState(0);
+    }
+    GL.StreamFlush();
+
+    // Pass 1: Transparent sprites with blending
+    const spriteEntities = entitiesByType.get(Mod.type.sprite);
+    if (spriteEntities) {
+      const renderer = modelRendererRegistry.getRenderer(Mod.type.sprite);
+
+      gl.enable(gl.BLEND);
+      renderer.setupRenderState(1);
+      for (const entity of spriteEntities) {
+        renderer.render(entity.model, entity, 1);
+      }
+      renderer.cleanupRenderState(1);
+      GL.StreamFlush();
+      gl.disable(gl.BLEND);
+    }
+  };
+
+  /**
+   * Render world turbulent surfaces and fog volumes in the correct order.
+   *
+   * Turbulent surfaces and fog volumes share the same transparency space, so
+   * they must be composed from a single back-to-front list. Rendering them in
+   * separate phases is incorrect when water and fog overlap or alternate in
+   * depth, such as foggy water volumes or mist sitting above water.
+   *
+   * When no fog volumes exist (or post-process is unavailable), this falls
+   * back to the simple sequential turbulent pass.
+   */
+  static _renderFogAndTurbulentsSorted(worldEntity: ClientEdict): void {
+    const worldmodel = worldEntity.model as BrushModel;
+    const brushRenderer = modelRendererRegistry.getRenderer(Mod.type.brush) as BrushModelRenderer;
+    const hasFog = PostProcess.active
+      && worldmodel.fogVolumes && worldmodel.fogVolumes.length > 0;
+    const hasTurbulents = R.drawturbulents.value;
+
+    // Fast path: no fog volumes — just render turbulents the simple way
+    if (!hasFog) {
+      if (hasTurbulents) {
+        brushRenderer.render(worldmodel, worldEntity, 1);
+      }
+      return;
+    }
+
+    // Fast path: fog but no turbulents — just render fog volumes
+    if (!hasTurbulents) {
+      brushRenderer.renderFogVolumes(worldmodel);
+      return;
+    }
+
+    const vieworg = R.refdef.vieworg;
+    const items: FogAndTurbulentSortItem[] = [];
+
+    const turbulentChains = brushRenderer.getWorldTurbulentChains(worldmodel, vieworg);
+    for (let i = 0; i < turbulentChains.length; i++) {
+      items.push({ dist: turbulentChains[i].dist, kind: 0, data: turbulentChains[i].chain });
+    }
+
+    const fogItems = brushRenderer.getFogVolumeItems(worldmodel, vieworg);
+    for (let i = 0; i < fogItems.length; i++) {
+      items.push({ dist: fogItems[i].dist, kind: 1, data: fogItems[i].fogVolume });
+    }
+
+    if (items.length === 0) {
+      return;
+    }
+
+    items.sort(compareFogAndTurbulentItems);
+
+    let activePass = -1;
+
+    for (let i = 0; i < items.length; i++) {
+      const item = items[i];
+
+      if (item.kind !== activePass) {
+        if (activePass === 0) {
+          brushRenderer.endWorldTurbulentPass();
+        } else if (activePass === 1) {
+          brushRenderer.endFogVolumePass();
+        }
+
+        if (item.kind === 0) {
+          brushRenderer.beginWorldTurbulentPass(worldmodel);
+        } else if (!brushRenderer.beginFogVolumePass(worldmodel)) {
+          activePass = -1;
+          continue;
+        }
+
+        activePass = item.kind;
+      }
+
+      if (item.kind === 0) {
+        brushRenderer.renderWorldTurbulentChain(worldmodel, item.data as WorldTurbulentChainInfo);
+        continue;
+      }
+
+      brushRenderer.renderSingleFogVolume(worldmodel, item.data as FogVolumeInfo);
+    }
+
+    if (activePass === 0) {
+      brushRenderer.endWorldTurbulentPass();
+    } else if (activePass === 1) {
+      brushRenderer.endFogVolumePass();
+    }
+  };
+
+  /**
+   * Render all transparent geometry (world brush surfaces + entities) in
+   * back-to-front sorted order with depth writes disabled.
+   * This ensures transparent surfaces blend correctly regardless of type.
+   */
+  static _renderTransparentsSorted(worldEntity: ClientEdict): void {
+    const worldmodel = worldEntity.model as BrushModel;
+
+    const vieworg = R.refdef.vieworg;
+    const items: TransparentSortItem[] = [];
+
+    // Collect world transparent leaves with distances
+    const brushRenderer = modelRendererRegistry.getRenderer(Mod.type.brush) as BrushModelRenderer;
+    if (worldEntity && worldEntity.model) {
+      const worldLeaves = brushRenderer.getWorldTransparentLeaves(worldmodel, vieworg);
+      for (let i = 0; i < worldLeaves.length; i++) {
+        items.push({ dist: worldLeaves[i].dist, kind: 0, data: worldLeaves[i].leaf });
+      }
+    }
+
+    // Collect transparent entities with distances
+    if (R.drawentities.value !== 0) {
+      for (const entity of CL.state.clientEntities.getVisibleEntities()) {
+        if (entity.model === null || entity.alpha === 0.0) {
+          continue;
+        }
+
+        const renderer = modelRendererRegistry.getRenderer(entity.model.type);
+        if (renderer === null || !renderer.rendersTransparentPass(entity.model, entity)) {
+          continue;
+        }
+
+        const dx = entity.origin[0] - vieworg[0];
+        const dy = entity.origin[1] - vieworg[1];
+        const dz = entity.origin[2] - vieworg[2];
+        const dist = Math.hypot(dx, dy, dz);
+        items.push({ dist, kind: 1, data: entity });
+      }
+    }
+
+    if (items.length === 0) {
+      return;
+    }
+
+    // Sort back-to-front (farthest first)
+    items.sort((a, b) => b.dist - a.dist);
+
+    // Render in sorted order with depth writes disabled
+    gl.depthMask(false);
+    let worldPassActive = false;
+
+    for (let i = 0; i < items.length; i++) {
+      const item = items[i];
+
+      if (item.kind === 0) {
+        // World transparent leaf
+        if (!worldPassActive) {
+          brushRenderer.beginWorldTransparentPass(worldmodel);
+          worldPassActive = true;
+        }
+        brushRenderer.renderWorldTransparentLeaf(worldmodel, item.data as Node);
+      } else {
+        // Transparent entity — end world pass if active (shader switch)
+        if (worldPassActive) {
+          brushRenderer.endWorldTransparentPass();
+          GL.StreamFlush();
+          worldPassActive = false;
+        }
+        const entity = item.data as ClientEdict;
+        const renderer = modelRendererRegistry.getRenderer(entity.model.type);
+        renderer.render(entity.model, entity, 2);
+        GL.StreamFlush();
+      }
+    }
+
+    if (worldPassActive) {
+      brushRenderer.endWorldTransparentPass();
+      GL.StreamFlush();
+    }
+
+    gl.depthMask(true);
+  };
+
+  static DrawViewModel() {
+    if (R.drawviewmodel.value === 0) {
+      return;
+    }
+    if (Chase.active.value !== 0) {
+      return;
+    }
+    if (R.drawentities.value === 0) {
+      return;
+    }
+
+    if (!CL.gameCapabilities.includes(gameCapabilities.CAP_VIEWMODEL_MANAGED)) {
+      if ((CL.state.items & Def.it.invisibility) !== 0) { // Legacy
+        return;
+      }
+      if (CL.state.stats[Def.stat.health] <= 0) { // Legacy
+        return;
+      }
+      if (!CL.state.viewent.model) {
+        return;
+      }
+    } else if (CL.state.gameAPI) {
+      const viewmodel = CL.state.gameAPI.viewmodel;
+
+      if (!viewmodel.visible) {
+        return; // game says to not draw the view model
+      }
+
+      if (!viewmodel.model) {
+        return; // no model to draw
+      }
+    }
+
+    gl.depthRange(0.0, 0.3);
+
+    let ymax = 4.0 * Math.tan(SCR.fov.value * 0.82 * Math.PI / 360.0);
+    R.perspective[0] = 4.0 / (ymax * R.refdef.vrect.width / R.refdef.vrect.height);
+    R.perspective[5] = 4.0 / ymax;
+    let program = GL.UseProgram('alias');
+    gl.uniformMatrix4fv(program.uPerspective, false, R.perspective);
+
+    if (CL.state.viewent.model !== null) {
+      const aliasRenderer = modelRendererRegistry.getRenderer(Mod.type.alias);
+      aliasRenderer.setupRenderState(0);
+      aliasRenderer.render(CL.state.viewent.model, CL.state.viewent, 0);
+      aliasRenderer.cleanupRenderState(0);
+    }
+
+    ymax = 4.0 * Math.tan(R.refdef.fov_y * Math.PI / 360.0);
+    R.perspective[0] = 4.0 / (ymax * R.refdef.vrect.width / R.refdef.vrect.height);
+    R.perspective[5] = 4.0 / ymax;
+    program = GL.UseProgram('alias');
+    gl.uniformMatrix4fv(program.uPerspective, false, R.perspective);
+
+    gl.depthRange(0.0, 1.0);
+  };
+
+  static PolyBlend() {
+    if (R.polyblend.value === 0) {
+      return;
+    }
+    if (V.blend[3] === 0.0) {
+      return;
+    }
+    GL.UseProgram('fill', true);
+    const vrect = R.refdef.vrect;
+    GL.StreamDrawColoredQuad(vrect.x, vrect.y, vrect.width, vrect.height, V.blend[0], V.blend[1], V.blend[2], V.blend[3] * 255.0);
+  };
+
+  static SetFrustum() {
+    if (R.vup.isOrigin() || R.vright.isOrigin() || R.vpn.isOrigin()) { // can’t set frustum with these
+      return;
+    }
+    R.frustum[0].normal = R.vup.rotatePointAroundVector(R.vpn, -(90.0 - R.refdef.fov_x * 0.5));
+    R.frustum[1].normal = R.vup.rotatePointAroundVector(R.vpn, 90.0 - R.refdef.fov_x * 0.5);
+    R.frustum[2].normal = R.vright.rotatePointAroundVector(R.vpn, 90.0 - R.refdef.fov_y * 0.5);
+    R.frustum[3].normal = R.vright.rotatePointAroundVector(R.vpn, -(90.0 - R.refdef.fov_y * 0.5));
+    for (let i = 0; i < 4; i++) {
+      const out = R.frustum[i];
+      out.type = 5;
+      out.dist = R.refdef.vieworg.dot(out.normal);
+      out.signbits = 0;
+      if (out.normal[0] < 0.0) {
+        out.signbits = 1;
+      }
+      if (out.normal[1] < 0.0) {
+        out.signbits += 2;
+      }
+      if (out.normal[2] < 0.0) {
+        out.signbits += 4;
+      }
+      if (out.normal[3] < 0.0) {
+        out.signbits += 8;
+      }
+    }
+  };
+
+  static viewMatrix: number[] | null = null;
+  static projectionMatrix: number[] | null = null;
+
+
+  private static multiplyMatrixVec4(m: number[], v: Vec4): Vec4 {
+    return [
+      m[0]*v[0] + m[4]*v[1] + m[8]*v[2] + m[12]*v[3],
+      m[1]*v[0] + m[5]*v[1] + m[9]*v[2] + m[13]*v[3],
+      m[2]*v[0] + m[6]*v[1] + m[10]*v[2] + m[14]*v[3],
+      m[3]*v[0] + m[7]*v[1] + m[11]*v[2] + m[15]*v[3],
+    ];
+  }
+
+  /**
+   * Convert a world-space position into screen coordinates.
+   * @returns Screen coordinates or null when the point is off-screen.
+   */
+  static WorldToScreen(origin: Vector): Vector | null {
+    const projectionMatrix = R.projectionMatrix;
+    const viewMatrix = R.viewMatrix; // This is uViewAngles — rotation only
+
+    if (projectionMatrix === null || viewMatrix === null) {
+      return null;
+    }
+
+    // world-space delta from camera
+    const delta = [
+      origin[0] - R.refdef.vieworg[0],
+      origin[1] - R.refdef.vieworg[1],
+      origin[2] - R.refdef.vieworg[2],
+    ];
+
+    // Apply view rotation
+    const x =
+      viewMatrix[0] * delta[0] +
+      viewMatrix[4] * delta[1] +
+      viewMatrix[8] * delta[2];
+    const y =
+      viewMatrix[1] * delta[0] +
+      viewMatrix[5] * delta[1] +
+      viewMatrix[9] * delta[2];
+    const z =
+      viewMatrix[2] * delta[0] +
+      viewMatrix[6] * delta[1] +
+      viewMatrix[10] * delta[2];
+
+    // Mimic gl_Position = projection * vec4(xz, -y, 1.0)
+    const posVec = [x, z, -y, 1.0]; // Swizzle + flip Y
+
+    const clip = R.multiplyMatrixVec4(projectionMatrix, posVec as Vec4);
+
+    // If the clip space W coordinate is zero, we can't convert to NDC
+    if (clip[3] === 0) {
+      return null;
+    }
+
+    const ndc = [
+      clip[0] / clip[3],
+      clip[1] / clip[3],
+      clip[2] / clip[3],
+    ];
+
+    if (clip[3] > 0 && ndc[0] >= -1 && ndc[0] <= 1 && ndc[1] >= -1 && ndc[1] <= 1 && ndc[2] >= 0 && ndc[2] <= 1) {
+      return new Vector(
+        R.refdef.vrect.x + (ndc[0] + 1) * 0.5 * R.refdef.vrect.width,
+        R.refdef.vrect.y + (1 - ndc[1]) * 0.5 * R.refdef.vrect.height,
+        ndc[2],
+      );
+    }
+
+    return null;
+  };
+
+  static perspective = [
+    0.0, 0.0, 0.0, 0.0,
+    0.0, 0.0, 0.0, 0.0,
+    0.0, 0.0, -65540.0 / 65532.0, -1.0,
+    0.0, 0.0, -524288.0 / 65532.0, 0.0,
+  ];
+
+  static Perspective() {
+    const viewangles = [
+      R.refdef.viewangles[0] * Math.PI / 180.0,
+      (R.refdef.viewangles[1] - 90.0) * Math.PI / -180.0,
+      R.refdef.viewangles[2] * Math.PI / -180.0,
+    ];
+    const sp = Math.sin(viewangles[0]);
+    const cp = Math.cos(viewangles[0]);
+    const sy = Math.sin(viewangles[1]);
+    const cy = Math.cos(viewangles[1]);
+    const sr = Math.sin(viewangles[2]);
+    const cr = Math.cos(viewangles[2]);
+    const viewMatrix = [
+      cr * cy + sr * sp * sy,		cp * sy,	-sr * cy + cr * sp * sy,
+      cr * -sy + sr * sp * cy,	cp * cy,	-sr * -sy + cr * sp * cy,
+      sr * cp,					-sp,		cr * cp,
+    ];
+
+    R.viewMatrix = [
+      viewMatrix[0], viewMatrix[1], viewMatrix[2], 0.0,
+      viewMatrix[3], viewMatrix[4], viewMatrix[5], 0.0,
+      viewMatrix[6], viewMatrix[7], viewMatrix[8], 0.0,
+      0.0,           0.0,           0.0,           1.0,
+    ];
+
+    R.projectionMatrix = R.perspective;
+
+    if (V.gamma.value < 0.5) {
+      V.gamma.set(0.5);
+    } else if (V.gamma.value > 1.0) {
+      V.gamma.set(1.0);
+    }
+
+    GL.UnbindProgram();
+    for (let i = 0; i < GL.programs.length; i++) {
+      const program = GL.programs[i];
+      gl.useProgram(program.program);
+      if (program.uViewOrigin !== undefined) {
+        gl.uniform3fv(program.uViewOrigin, R.refdef.vieworg);
+      }
+      if (program.uViewAngles !== undefined) {
+        gl.uniformMatrix3fv(program.uViewAngles, false, viewMatrix);
+      }
+      if (program.uPerspective !== undefined) {
+        gl.uniformMatrix4fv(program.uPerspective, false, R.perspective);
+      }
+      if (program.uGamma !== undefined) {
+        gl.uniform1f(program.uGamma, V.gamma.value);
+      }
+      // global fog uniforms (only set when shader declares them)
+      if (program.uFogColor !== undefined) {
+        const colParts = (R.fog_color.string || '128 128 128').split(/\s+/).map(Number);
+        gl.uniform3fv(program.uFogColor, [(colParts[0]||128)/255.0, (colParts[1]||128)/255.0, (colParts[2]||128)/255.0]);
+      }
+      if (program.uFogParams !== undefined) {
+        // uFogParams = vec4(start, end, density, mode)
+        gl.uniform4f(program.uFogParams, R.fog_start.value, R.fog_end.value, R.fog_density.value, R.fog_mode.value);
+      }
+      // shadow mapping uniforms (set on all programs that declare them)
+      if (program.uLightSpaceMatrix0 !== undefined) {
+        gl.uniformMatrix4fv(program.uLightSpaceMatrix0, false, ShadowMap.lightSpaceMatrices[0]);
+      }
+      if (program.uLightSpaceMatrix1 !== undefined) {
+        gl.uniformMatrix4fv(program.uLightSpaceMatrix1, false, ShadowMap.lightSpaceMatrices[1]);
+      }
+      if (program.uLightSpaceMatrix2 !== undefined) {
+        gl.uniformMatrix4fv(program.uLightSpaceMatrix2, false, ShadowMap.lightSpaceMatrices[2]);
+      }
+      if (program.uShadowEnabled !== undefined) {
+        gl.uniform1f(program.uShadowEnabled, ShadowMap.enabled.value ? 1.0 : 0.0);
+      }
+      if (program.uShadowCount !== undefined) {
+        gl.uniform1i(program.uShadowCount, ShadowMap.enabled.value ? ShadowMap.localLightCount : 0);
+      }
+      if (program.uShadowDarkness !== undefined) {
+        gl.uniform1f(program.uShadowDarkness, ShadowMap.darkness.value);
+      }
+      if (program.uShadowMapSize !== undefined) {
+        gl.uniform1f(program.uShadowMapSize, ShadowMap.size);
+      }
+      // Point light shadow uniforms
+      if (program.uPointShadowEnabled !== undefined) {
+        gl.uniform1f(program.uPointShadowEnabled, ShadowMap.pointLightActive ? 1.0 : 0.0);
+      }
+      if (program.uPointLightPos !== undefined) {
+        gl.uniform3fv(program.uPointLightPos, ShadowMap.pointLightOrigin);
+      }
+      if (program.uPointLightRadius !== undefined) {
+        gl.uniform1f(program.uPointLightRadius, ShadowMap.pointLightRadius);
+      }
+    }
+  };
+
+  static SetupGL() {
+    const vrect = R.refdef.vrect;
+    const pixelRatio = VID.pixelRatio;
+    const w = (vrect.width * pixelRatio) >> 0;
+    const h = (vrect.height * pixelRatio) >> 0;
+
+    if (R.usePostProcess === true || PostProcess.hasActiveEffects()) {
+      // Render the scene to the shared post-process capture FBO whenever a
+      // screen-space effect needs to sample it. Depth-aware passes like fog
+      // use the same capture path and sample the depth texture mid-frame.
+      PostProcess.resize(w, h);
+      PostProcess.begin();
+      gl.viewport(0, 0, w, h);
+    } else {
+      gl.viewport((vrect.x * pixelRatio) >> 0, ((VID.height - vrect.height - vrect.y) * pixelRatio) >> 0, w, h);
+    }
+    R.Perspective();
+    gl.enable(gl.DEPTH_TEST);
+  };
+
+  static viewleaf: Node | null = null;
+
+  static PreRenderScene() {
+    R.AnimateLight();
+    const {forward, right, up} = R.refdef.viewangles.angleVectors();
+    [R.vpn, R.vright, R.vup] = [forward, right, up];
+    R.viewleaf = CL.state.worldmodel.getLeafForPoint(R.refdef.vieworg);
+    V.SetContentsColor(R.viewleaf.contents);
+    V.CalcBlend();
+    R.dowarp = (R.waterwarp.value !== 0) && (R.viewleaf.contents <= content.CONTENT_WATER);
+
+    // Update warp effect active state
+    const warpEffect = PostProcess.getEffect('warp');
+    if (warpEffect) {
+      warpEffect.active = R.dowarp;
+    }
+
+    const bloomEffect = PostProcess.getEffect('bloom');
+    if (bloomEffect) {
+      bloomEffect.active = R.bloom.value !== 0;
+    }
+
+    // Activate depth-texture post-process when fog volumes exist.
+    // Pipeline effects (warp, etc.) are resolved separately via PostProcess.resolve.
+    R.usePostProcess = CL.state.worldmodel.fogVolumes && CL.state.worldmodel.fogVolumes.length > 0;
+
+    // Choose the shadow texture for this frame (real or dummy)
+    R.shadow_textures = ShadowMap.getActiveTextures();
+    R.shadow_texture = R.shadow_textures[0];
+    R.point_shadow_texture = ShadowMap.getActivePointTexture();
+  };
+
+  static RenderWorld() {
+    // Render world and entities using the renderer registry
+    const worldEntity = CL.state.clientEntities.getEntity(0);
+    if (worldEntity && worldEntity.model) {
+      const brushRenderer = modelRendererRegistry.getRenderer(Mod.type.brush);
+      // Pass 0: World opaque surfaces
+      brushRenderer.render(worldEntity.model, worldEntity, 0);
+    }
+
+    // Draw all other entities (pass 0 for opaque, pass 1 for turbulent)
+    R.DrawEntitiesOnList();
+
+    // Fog volumes and turbulent surfaces must be interleaved back-to-front.
+    // Without sorting, turbulents always draw over fog (or vice versa),
+    // which is wrong when a fog volume is in front of a water surface.
+    // We collect both into a single list, sort by distance from the camera,
+    // and render farthest-first so nearer surfaces blend over farther ones.
+    if (worldEntity && worldEntity.model) {
+      R._renderFogAndTurbulentsSorted(worldEntity);
+    }
+
+    gl.disable(gl.CULL_FACE);
+    R.RenderDlights();
+    R.DrawDecals();
+    R.DrawParticles();
+
+    // Pass 2: All transparent geometry, sorted back-to-front with depthMask(false).
+    // Without sorting, whichever draws last appears on top. By sorting farthest-first
+    // and disabling depth writes, nearer transparent surfaces blend over farther ones.
+    gl.enable(gl.CULL_FACE);
+    R._renderTransparentsSorted(worldEntity);
+    gl.disable(gl.CULL_FACE);
+  };
+
+  static RenderScene() {
+    R.SetFrustum();
+
+    // Shadow depth pass — local entity shadow centered on the nearest visible
+    // shadow caster. Static world shadowing remains authored by baked lightmaps.
+    if (ShadowMap.enabled.value) {
+      ShadowMap.selectLocalLights(R.refdef.vieworg);
+      ShadowMap.updateLightSpaceMatrices();
+      R.shadow_textures = ShadowMap.getActiveTextures();
+      R.shadow_texture = R.shadow_textures[0];
+      const localCasterRadius = ShadowMap.casterRadius.value;
+      const localCasterRadiusSq = localCasterRadius * localCasterRadius;
+
+      for (let i = 0; i < ShadowMap.localLightCount; i++) {
+        ShadowMap.begin(i);
+        ShadowMap.renderEntitiesShadow(
+          ShadowMap.lightSpaceMatrices[i],
+          'shadow-brush',
+          'shadow-alias',
+          ShadowMap._shadowFocusPoint,
+          localCasterRadiusSq,
+        );
+        ShadowMap.end();
+      }
+    }
+
+    // Point light shadow pass — render world BSP into a cube depth map
+    // from the strongest dlight's position.
+    if (ShadowMap.selectPointLight(R.refdef.vieworg)) {
+      ShadowMap.renderPointLightShadow();
+    }
+    // Update point shadow texture AFTER selectPointLight so the correct
+    // texture (real or dummy) is bound for this frame. PreRenderScene
+    // runs before selectPointLight updates pointLightActive, so its
+    // assignment may be stale on the first frame a dlight appears.
+    R.point_shadow_texture = ShadowMap.getActivePointTexture();
+
+    R.SetupGL();
+    R.MarkLeafs();
+    gl.enable(gl.CULL_FACE);
+    R.DrawSkyBox();
+    R.DrawViewModel();
+    R.RenderWorld();
+  };
+
+  static _speeds: string[] = [];
+
+  static RenderView() {
+    let time1;
+    if (R.speeds.value !== 0) {
+      gl.finish();
+      time1 = Sys.FloatMilliTime();
+    }
+    R.c_brush_verts = 0;
+    R.c_brush_tris = 0;
+    R.c_brush_draws = 0;
+    R.c_brush_draws_pbr = 0;  // Draw calls with PBR materials
+    R.c_brush_vbos = 0;
+    R.c_brush_texture_binds = 0;  // Track texture binding overhead
+    R.c_alias_polys = 0;
+    gl.clear(gl.COLOR_BUFFER_BIT + gl.DEPTH_BUFFER_BIT);
+    R.RenderScene();
+    if (R.speeds.value !== 0) {
+      const c_brush_polys = R.c_brush_verts / 3;
+      const c_alias_polys = R.c_alias_polys;
+      const avgTrisPerDraw = (R.c_brush_tris / R.c_brush_draws).toFixed(1);
+
+      R._speeds[0] = `${R.c_brush_draws.toFixed().padStart(5)} draw calls (${R.c_brush_draws_pbr} PBR)`;
+      R._speeds[1] = `${R.c_brush_tris.toFixed().padStart(5)} tris, ${R.c_brush_verts.toFixed().padStart(5)} verts`;
+      R._speeds[2] = `${R.c_brush_vbos.toFixed().padStart(5)} VBOs used, ${R.c_brush_texture_binds.toFixed().padStart(5)} texture binds`;
+      R._speeds[3] = `${c_alias_polys.toFixed().padStart(5)} alias polys, ${c_brush_polys.toFixed().padStart(5)} brush polys`;
+      R._speeds[4] = '';
+      R._speeds[5] = `Avg ${avgTrisPerDraw} tris/draw, time: ${((Sys.FloatMilliTime() - time1)).toFixed(1)} msec`;
+    }
+  };
+
+  static PrintSpeeds() {
+    if (!R.speeds.value) {
+      return;
+    }
+
+    Draw.String(16, 16, `${SCR.FPS.toFixed(1)} FPS`, 2.0);
+
+    for (let i = 0; i < R._speeds.length; i++) {
+      Draw.String(16, 40 + i * 8, R._speeds[i]);
+    }
+  };
+
+  // misc
+
+  static InitTextures() {
+    if (registry.isDedicatedServer) {
+      return;
+    }
+
+    // make a default texture (a red and black checkerboard)
+    const data = new Uint8Array(new ArrayBuffer(256 * 4));
+    for (let i = 0; i < 8; i++) {
+      for (let j = 0; j < 8; j++) {
+        data[((i << 4) + j) * 4 + 0] = 255;
+        data[((i << 4) + j) * 4 + 1] = 0;
+        data[((i << 4) + j) * 4 + 2] = 0;
+        data[((i << 4) + j) * 4 + 3] = 255;
+
+        data[(136 + (i << 4) + j) * 4 + 0] = 255;
+        data[(136 + (i << 4) + j) * 4 + 1] = 0;
+        data[(136 + (i << 4) + j) * 4 + 2] = 0;
+        data[(136 + (i << 4) + j) * 4 + 3] = 255;
+
+        data[(8 + (i << 4) + j) * 4 + 0] = 0;
+        data[(8 + (i << 4) + j) * 4 + 1] = 0;
+        data[(8 + (i << 4) + j) * 4 + 2] = 0;
+        data[(8 + (i << 4) + j) * 4 + 3] = 255;
+
+        data[(128 + (i << 4) + j) * 4 + 0] = 0;
+        data[(128 + (i << 4) + j) * 4 + 1] = 0;
+        data[(128 + (i << 4) + j) * 4 + 2] = 0;
+        data[(128 + (i << 4) + j) * 4 + 3] = 255;
+      }
+    }
+
+    R.notexture = GLTexture.Allocate('r_notexture', 16, 16, data);
+    R.blacktexture = GLTexture.Allocate('r_blacktexture', 1, 1, new Uint8Array([0, 0, 0, 255]));
+    R.flatnormalmap = GLTexture.Allocate('r_flatnormalmap', 1, 1, new Uint8Array([128, 128, 255, 255]));
+
+    R.deluxemap_texture = gl.createTexture();
+    GL.BindArray(0, R.deluxemap_texture);
+    gl.texParameteri(gl.TEXTURE_2D_ARRAY, gl.TEXTURE_MIN_FILTER, gl.LINEAR);
+    gl.texParameteri(gl.TEXTURE_2D_ARRAY, gl.TEXTURE_MAG_FILTER, gl.LINEAR);
+    gl.texStorage3D(gl.TEXTURE_2D_ARRAY, 1, gl.RGBA8, LIGHTMAP_BLOCK_SIZE, LIGHTMAP_BLOCK_SIZE, 3);
+
+    R.lightmap_texture = gl.createTexture();
+    GL.BindArray(0, R.lightmap_texture);
+    gl.texParameteri(gl.TEXTURE_2D_ARRAY, gl.TEXTURE_MIN_FILTER, gl.LINEAR);
+    gl.texParameteri(gl.TEXTURE_2D_ARRAY, gl.TEXTURE_MAG_FILTER, gl.LINEAR);
+    gl.texStorage3D(gl.TEXTURE_2D_ARRAY, 1, gl.RGBA8, LIGHTMAP_BLOCK_SIZE, LIGHTMAP_BLOCK_SIZE, 3);
+
+    R.dlightmap_rgba_texture = gl.createTexture();
+    GL.Bind(0, R.dlightmap_rgba_texture);
+    gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_MIN_FILTER, gl.LINEAR);
+    gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_MAG_FILTER, gl.LINEAR);
+    gl.texStorage2D(gl.TEXTURE_2D, 1, gl.RGBA8, LIGHTMAP_BLOCK_SIZE, LIGHTMAP_BLOCK_SIZE);
+
+    R.lightstyle_texture_a = gl.createTexture();
+    GL.Bind(0, R.lightstyle_texture_a);
+    gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_MIN_FILTER, gl.NEAREST);
+    gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_MAG_FILTER, gl.NEAREST);
+    gl.texStorage2D(gl.TEXTURE_2D, 1, gl.R8, 64, 1);
+
+    R.lightstyle_texture_b = gl.createTexture();
+    GL.Bind(0, R.lightstyle_texture_b);
+    gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_MIN_FILTER, gl.NEAREST);
+    gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_MAG_FILTER, gl.NEAREST);
+    gl.texStorage2D(gl.TEXTURE_2D, 1, gl.R8, 64, 1);
+
+    R.fullbright_texture = gl.createTexture();
+    GL.BindArray(0, R.fullbright_texture);
+    gl.texParameteri(gl.TEXTURE_2D_ARRAY, gl.TEXTURE_MIN_FILTER, gl.NEAREST);
+    gl.texParameteri(gl.TEXTURE_2D_ARRAY, gl.TEXTURE_MAG_FILTER, gl.NEAREST);
+    gl.texStorage3D(gl.TEXTURE_2D_ARRAY, 1, gl.RGBA8, 1, 1, 3);
+    gl.texSubImage3D(gl.TEXTURE_2D_ARRAY, 0, 0, 0, 0, 1, 1, 3, gl.RGBA, gl.UNSIGNED_BYTE, new Uint8Array([
+      255, 0, 0, 0, // layer 0 (R): lightstyle 0 at full
+      255, 0, 0, 0, // layer 1 (G): lightstyle 0 at full
+      255, 0, 0, 0, // layer 2 (B): lightstyle 0 at full
+    ]));
+
+    R.null_texture = gl.createTexture();
+    GL.Bind(0, R.null_texture);
+    gl.texStorage2D(gl.TEXTURE_2D, 1, gl.RGBA8, 1, 1);
+    gl.texSubImage2D(gl.TEXTURE_2D, 0, 0, 0, 1, 1, gl.RGBA, gl.UNSIGNED_BYTE, new Uint8Array([0, 0, 0, 0]));
+    gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_MIN_FILTER, gl.NEAREST);
+    gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_MAG_FILTER, gl.NEAREST);
+
+    R.normal_up_texture = gl.createTexture();
+    GL.BindArray(0, R.normal_up_texture);
+    gl.texParameteri(gl.TEXTURE_2D_ARRAY, gl.TEXTURE_MIN_FILTER, gl.NEAREST);
+    gl.texParameteri(gl.TEXTURE_2D_ARRAY, gl.TEXTURE_MAG_FILTER, gl.NEAREST);
+    gl.texStorage3D(gl.TEXTURE_2D_ARRAY, 1, gl.RGBA8, 1, 1, 3);
+    gl.texSubImage3D(gl.TEXTURE_2D_ARRAY, 0, 0, 0, 0, 1, 1, 3, gl.RGBA, gl.UNSIGNED_BYTE, new Uint8Array([
+      128, 0, 0, 0, // layer 0 (X): neutral
+      255, 0, 0, 0, // layer 1 (Y): full (up direction)
+      128, 0, 0, 0, // layer 2 (Z): neutral
+    ]));
+
+    eventBus.publish('renderer.textures.initialized');
+  };
+
+  static async InitShaders(): Promise<void> {
+    // rendering alias models
+    await Promise.all([
+      Promise.resolve(GL.CreateProgram('alias',
+        ['uOrigin', 'uAngles', 'uViewOrigin', 'uViewAngles', 'uPerspective', 'uLightVec', 'uDynamicLightVec', 'uGamma', 'uAmbientLight', 'uShadeLight', 'uDynamicShadeLight', 'uInterpolation', 'uAlpha', 'uTime', 'uFogColor', 'uFogParams', 'uLightSpaceMatrix0', 'uLightSpaceMatrix1', 'uLightSpaceMatrix2', 'uShadowEnabled', 'uShadowCount', 'uShadowDarkness', 'uPointLightPos', 'uPointLightRadius', 'uPointShadowEnabled', 'uBloomEmissiveScale'],
+        [
+          ['aPositionA', gl.FLOAT, 3],
+          ['aPositionB', gl.FLOAT, 3],
+          ['aNormal', gl.FLOAT, 3],
+          ['aTexCoord', gl.FLOAT, 2],
+        ],
+        ['tTexture', 'tLuminance', 'tShadowMap0', 'tShadowMap1', 'tShadowMap2', 'tPointShadowMap'])),
+
+      // rendering mesh models (OBJ, IQM, GLTF)
+      Promise.resolve(GL.CreateProgram('mesh',
+        ['uOrigin', 'uAngles', 'uViewOrigin', 'uViewAngles', 'uPerspective', 'uLightVec', 'uDynamicLightVec', 'uGamma', 'uAmbientLight', 'uShadeLight', 'uDynamicShadeLight', 'uAlpha', 'uTime', 'uFogColor', 'uFogParams', 'uLightSpaceMatrix0', 'uLightSpaceMatrix1', 'uLightSpaceMatrix2', 'uShadowEnabled', 'uShadowCount', 'uShadowDarkness', 'uPointLightPos', 'uPointLightRadius', 'uPointShadowEnabled', 'uBloomEmissiveScale'],
+        [
+          ['aPosition', gl.FLOAT, 3],
+          ['aTexCoord', gl.FLOAT, 2],
+          ['aNormal', gl.FLOAT, 3],
+        ],
+        ['tTexture', 'tShadowMap0', 'tShadowMap1', 'tShadowMap2', 'tPointShadowMap'])),
+
+      // rendering brush models (water is down below)
+      Promise.resolve(GL.CreateProgram('brush',
+        ['uOrigin', 'uAngles', 'uViewOrigin', 'uViewAngles', 'uPerspective', 'uLightVec', 'uDynamicLightVec', 'uGamma', 'uAmbientLight', 'uShadeLight', 'uDynamicShadeLight', 'uInterpolation', 'uAlpha', 'uFogColor', 'uFogParams', 'uPerformDotLighting', 'uHaveDeluxemap', 'uLightSpaceMatrix0', 'uLightSpaceMatrix1', 'uLightSpaceMatrix2', 'uShadowEnabled', 'uShadowCount', 'uShadowDarkness', 'uShadowMapSize', 'uPointLightPos', 'uPointLightRadius', 'uPointShadowEnabled', 'uBloomEmissiveScale', 'uBloomDlightScale', 'uBloomSpecularScale'],
+          [
+            ['aPosition', gl.FLOAT, 3],
+            ['aTexCoord', gl.FLOAT, 4],
+            ['aLightStyle', gl.FLOAT, 4],
+            ['aNormal', gl.FLOAT, 3],
+            ['aTangent', gl.FLOAT, 3],
+            ['aBitangent', gl.FLOAT, 3],
+          ],
+          ['tTextureA', 'tTextureB', 'tLightmap', 'tDlight', 'tLightStyleA', 'tLightStyleB', 'tLuminance', 'tSpecular', 'tNormal', 'tDeluxemap', 'tShadowMap0', 'tShadowMap1', 'tShadowMap2', 'tPointShadowMap'])),
+
+      // rendering dynamic lights
+      Promise.resolve(GL.CreateProgram('dlight',
+          ['uOrigin', 'uViewOrigin', 'uViewAngles', 'uPerspective', 'uRadius', 'uGamma'],
+          [['aPosition', gl.FLOAT, 3]],
+          [])),
+
+      // rendering the player model (similar to alias model but with custom colors)
+      Promise.resolve(GL.CreateProgram('player',
+        ['uOrigin', 'uAngles', 'uViewOrigin', 'uViewAngles', 'uPerspective', 'uLightVec', 'uDynamicLightVec', 'uGamma', 'uAmbientLight', 'uShadeLight', 'uDynamicShadeLight', 'uInterpolation', 'uAlpha', 'uTime', 'uTop', 'uBottom', 'uFogColor', 'uFogParams', 'uLightSpaceMatrix0', 'uLightSpaceMatrix1', 'uLightSpaceMatrix2', 'uShadowEnabled', 'uShadowCount', 'uShadowDarkness', 'uPointLightPos', 'uPointLightRadius', 'uPointShadowEnabled', 'uBloomEmissiveScale'],
+          [
+            ['aPositionA', gl.FLOAT, 3],
+            ['aPositionB', gl.FLOAT, 3],
+            ['aNormal', gl.FLOAT, 3],
+            ['aTexCoord', gl.FLOAT, 2],
+          ],
+          ['tTexture', 'tLuminance', 'tPlayer', 'tShadowMap0', 'tShadowMap1', 'tShadowMap2', 'tPointShadowMap'])),
+
+      // for rendering sprites (usually effects)
+      Promise.resolve(GL.CreateProgram('sprite',
+        ['uViewOrigin', 'uViewAngles', 'uPerspective', 'uGamma', 'uFogColor', 'uFogParams', 'uInterpolation', 'uAlpha', 'uBloomEmissiveScale'],
+          [['aPosition', gl.FLOAT, 3], ['aTexCoord', gl.FLOAT, 2]],
+          ['tTexture'])),
+
+      // for rendering decals
+      Promise.resolve(GL.CreateProgram('decal',
+        ['uViewOrigin', 'uViewAngles', 'uPerspective', 'uGamma', 'uFogColor', 'uFogParams'],
+          [['aPosition', gl.FLOAT, 3], ['aTexCoord', gl.FLOAT, 2], ['aColor', gl.UNSIGNED_BYTE, 3, true]],
+          ['tTexture'])),
+
+      // for rendering particles (colored round dots)
+      Promise.resolve(GL.CreateProgram('particle',
+        ['uViewOrigin', 'uViewAngles', 'uPerspective', 'uGamma', 'uFogColor', 'uFogParams'],
+          [['aOrigin', gl.FLOAT, 3], ['aCoord', gl.FLOAT, 2], ['aScale', gl.FLOAT, 1], ['aColor', gl.UNSIGNED_BYTE, 3, true]],
+          [])),
+
+      // rendering water brushes
+      Promise.resolve(GL.CreateProgram('turbulent',
+        ['uOrigin', 'uAngles', 'uViewOrigin', 'uViewAngles', 'uPerspective', 'uGamma', 'uTime', 'uFogColor', 'uFogParams', 'uPerformDotLighting', 'uAlpha', 'uBloomEmissiveScale', 'uBloomDlightScale'],
+          [
+            ['aPosition', gl.FLOAT, 3],
+            ['aTexCoord', gl.FLOAT, 4],
+            ['aLightStyle', gl.FLOAT, 4],
+            ['aNormal', gl.FLOAT, 3],
+            // ['aTangent', gl.FLOAT, 3],
+            // ['aBitangent', gl.FLOAT, 3],
+          ],
+          ['tTexture', 'tLuminance', 'tLightmap', 'tDlight', 'tLightStyle', 'tDeluxemap'])),
+
+      // warp overlay effect
+      Promise.resolve(GL.CreateProgram('warp',
+          ['uOrtho', 'uTime'],
+          [['aPosition', gl.FLOAT, 2], ['aTexCoord', gl.FLOAT, 2]],
+          ['tTexture'])),
+
+      Promise.resolve(GL.CreateProgram('bloom-extract',
+        ['uOrtho'],
+        [['aPosition', gl.FLOAT, 2], ['aTexCoord', gl.FLOAT, 2]],
+        ['tTexture'])),
+
+      Promise.resolve(GL.CreateProgram('bloom-blur',
+        ['uOrtho', 'uTexelOffset'],
+        [['aPosition', gl.FLOAT, 2], ['aTexCoord', gl.FLOAT, 2]],
+        ['tTexture'])),
+
+      Promise.resolve(GL.CreateProgram('bloom-composite',
+        ['uOrtho', 'uStrength'],
+        [['aPosition', gl.FLOAT, 2], ['aTexCoord', gl.FLOAT, 2]],
+        ['tScene', 'tBloom'])),
+
+      Promise.resolve(GL.CreateProgram('sky',
+        ['uViewAngles', 'uPerspective', 'uScale', 'uGamma', 'uTime', 'uFogColor', 'uFogParams', 'uBloomEmissiveScale'],
+        [['aPosition', gl.FLOAT, 3]],
+        ['tSolid', 'tAlpha'])),
+
+      Promise.resolve(GL.CreateProgram('sky-chain',
+        ['uViewOrigin', 'uViewAngles', 'uPerspective'],
+        [['aPosition', gl.FLOAT, 3]],
+        [])),
+
+      // rendering volumetric fog brush volumes
+      Promise.resolve(GL.CreateProgram('fog-volume',
+        ['uOrigin', 'uAngles', 'uViewOrigin', 'uViewAngles', 'uPerspective', 'uGamma',
+         'uFogVolumeColor', 'uFogVolumeDensity', 'uFogVolumeMaxOpacity',
+         'uFogVolumeMins', 'uFogVolumeMaxs', 'uScreenSize',
+         'uDlightCount',
+         'uDlightPos[0]', 'uDlightPos[1]', 'uDlightPos[2]', 'uDlightPos[3]',
+         'uDlightPos[4]', 'uDlightPos[5]', 'uDlightPos[6]', 'uDlightPos[7]',
+         'uDlightColor[0]', 'uDlightColor[1]', 'uDlightColor[2]', 'uDlightColor[3]',
+         'uDlightColor[4]', 'uDlightColor[5]', 'uDlightColor[6]', 'uDlightColor[7]'],
+        [['aPosition', gl.FLOAT, 3]],
+        ['tDepth', 'tLightProbe'])),
+
+      // shadow depth pass for directional shadow mapping
+      Promise.resolve(GL.CreateProgram('shadow-brush',
+        ['uOrigin', 'uAngles', 'uLightSpaceMatrix'],
+        [['aPosition', gl.FLOAT, 3]],
+        [])),
+
+      // shadow depth pass for point light cube shadow mapping
+      Promise.resolve(GL.CreateProgram('shadow-point',
+        ['uOrigin', 'uAngles', 'uLightSpaceMatrix', 'uLightPos', 'uLightRadius', 'uNormalBias'],
+        [['aPosition', gl.FLOAT, 3], ['aNormal', gl.FLOAT, 3]],
+        [])),
+
+      // shadow depth pass for alias models (frame interpolation)
+      Promise.resolve(GL.CreateProgram('shadow-alias',
+        ['uOrigin', 'uAngles', 'uLightSpaceMatrix', 'uInterpolation'],
+        [['aPositionA', gl.FLOAT, 3], ['aPositionB', gl.FLOAT, 3]],
+        [])),
+
+      // point shadow depth pass for alias models (frame interpolation)
+      Promise.resolve(GL.CreateProgram('shadow-alias-point',
+        ['uOrigin', 'uAngles', 'uLightSpaceMatrix', 'uInterpolation', 'uLightPos', 'uLightRadius', 'uNormalBias'],
+        [['aPositionA', gl.FLOAT, 3], ['aPositionB', gl.FLOAT, 3], ['aNormalA', gl.FLOAT, 3], ['aNormalB', gl.FLOAT, 3]],
+        [])),
+    ]);
+
+    eventBus.publish('renderer.shaders.initialized');
+  };
+
+  static async Init() {
+    if (registry.isDedicatedServer) {
+      console.assert(false, 'R.Init called on dedicated server');
+      return;
+    }
+
+    R.waterwarp = new Cvar('r_waterwarp', '1');
+    R.fullbright = new Cvar('r_fullbright', '0', Cvar.FLAG.CHEAT);
+    R.drawentities = new Cvar('r_drawentities', '1', Cvar.FLAG.CHEAT);
+    R.drawviewmodel = new Cvar('r_drawviewmodel', '1');
+    R.drawturbulents = new Cvar('r_drawturbulents', '1', Cvar.FLAG.CHEAT);
+    R.novis = new Cvar('r_novis', '0', Cvar.FLAG.CHEAT);
+    R.speeds = new Cvar('r_speeds', '0');
+    R.polyblend = new Cvar('gl_polyblend', '1');
+    R.flashblend = new Cvar('gl_flashblend', '0');
+    R.nocolors = new Cvar('gl_nocolors', '0');
+    R.bloom = new Cvar('r_bloom', '0', Cvar.FLAG.NONE, 'Screen-space bloom post-process, 0 = off, 1 = on.');
+    R.bloomStrength = new Cvar('r_bloom_strength', '0.8', Cvar.FLAG.NONE, 'Additive bloom intensity.');
+    R.bloomSkyStrength = new Cvar('r_bloom_sky_strength', '0.33', Cvar.FLAG.NONE, 'Sky contribution added to the bloom emissive target. Lower than 1 keeps the sky glow subtle.');
+    R.bloomDlightStrength = new Cvar('r_bloom_dlight_strength', '0.33', Cvar.FLAG.NONE, 'Dynamic-light surface contribution added to the bloom emissive target. Set to 0 to disable.');
+    R.bloomSpecularStrength = new Cvar('r_bloom_specular_strength', '0.33', Cvar.FLAG.NONE, 'Specular reflection contribution added to the bloom emissive target. Set to 0 to disable.');
+    R.bloomDownsample = new Cvar('r_bloom_downsample', '4', Cvar.FLAG.NONE, 'Bloom buffer downsample divisor, clamped to 1-8.');
+    R.bloomDebug = new Cvar('r_bloom_debug', '0', Cvar.FLAG.NONE, 'Bloom debug preview: 0 = off, 1 = emissive, 2 = extract, 3 = blur, 4 = all.');
+    R.interpolation = new Cvar('r_interpolation', '1', Cvar.FLAG.NONE, 'Interpolation of textures and animation groups, 0 - off, 1 - on');
+    // fog controls (TODO: make that a cheat, but resetting cvar to default is done after R.NewMapFog, so need to rethink the order of operations)
+    R.fog_color = new Cvar('r_fog_color', '128 128 128', Cvar.FLAG.NONE, 'Fog color: R G B (0-255)');
+    R.fog_start = new Cvar('r_fog_start', '128', Cvar.FLAG.NONE, 'Fog start distance (linear)');
+    R.fog_end = new Cvar('r_fog_end', '4096', Cvar.FLAG.NONE, 'Fog end distance (linear)');
+    R.fog_density = new Cvar('r_fog_density', '0.01', Cvar.FLAG.NONE, 'Fog density (for exp/exp2)');
+    R.fog_mode = new Cvar('r_fog_mode', '-1', Cvar.FLAG.NONE, 'Fog mode: 0=linear, 1=exp, 2=exp2, -1=disable');
+
+    R.InitTextures();
+    R.InitParticles();
+    R.InitDecals();
+    await R.InitShaders();
+
+    // Register model renderers
+    modelRendererRegistry.register(new BrushModelRenderer());
+    modelRendererRegistry.register(new AliasModelRenderer());
+    modelRendererRegistry.register(new SpriteModelRenderer());
+    modelRendererRegistry.register(new MeshModelRenderer());
+
+    // Initialize post-process infrastructure (scene FBO with depth texture)
+    // and register screen-space effects that resolve from that capture.
+    PostProcess.init();
+    PostProcess.addEffect(new BloomEffect());
+    PostProcess.addEffect(new WarpEffect());
+
+    // Initialize shadow mapping (depth-only FBO + sun light)
+    ShadowMap.init();
+
+    const dlightvecs = gl.createBuffer();
+    console.assert(dlightvecs !== null, 'Expected a dynamic light vertex buffer');
+    gl.bindBuffer(gl.ARRAY_BUFFER, dlightvecs);
+    gl.bufferData(gl.ARRAY_BUFFER, (() => {
+      const positions = [];
+
+      // 1) The "down" vector
+      positions.push(0, -1, 0);
+
+      // 2) 16 equally spaced vectors around the circle in y=0 plane
+      const numSegments = 16;
+      for (let i = 0; i <= numSegments; i++) {
+        // Angle in radians
+        const angle = (2 * Math.PI * i) / numSegments;
+        // Match the pattern: x = -sin(angle), z = cos(angle)
+        positions.push(-Math.sin(angle), 0, Math.cos(angle));
+      }
+
+      return new Float32Array(positions);
+    })(), gl.STATIC_DRAW);
+
+    const dlightVAO = GL.CreateVAO(dlightvecs, [
+      { location: ATTRIB_LOCATIONS.aPosition, components: 3, type: gl.FLOAT, normalized: false, stride: 0, offset: 0 },
+    ]);
+
+    Object.assign(R, { dlightvecs, dlightVAO });
+
+    R.ClearAll();
+  };
+
+  static NewMapFog() {
+    console.assert(CL.state.worldmodel, 'worldmodel must be loaded before InitFog');
+
+    const fogInfo = CL.state.worldmodel.worldspawnInfo.fog;
+
+    if (!fogInfo) {
+      R.fog_mode.set(-1);
+      return;
+    }
+
+    const [exp, r, g, b] = fogInfo.split(' ').map(Number);
+
+    // CR: I took that calculation from Ironwail’s Fog_SetupFrame:
+    const ExpAdjustment = 1.20112241; // sqrt(log2(e))
+    const SphericalCorrection = 0.85; // compensate higher perceived density with spherical fog
+    const DensityScale = ExpAdjustment * SphericalCorrection / 64.0;
+
+    R.fog_density.set(exp / DensityScale);
+    R.fog_color.set(`${r * 255} ${g * 255} ${b * 255}`);
+    R.fog_mode.set(1);
+  };
+
+  static NewMap() {
+    R.BuildLightmaps();
+
+    for (let i = 0; i < R.dlightmaps_rgba.length; i++) {
+      R.dlightmaps_rgba[i] = 0;
+    }
+
+    GL.Bind(0, R.dlightmap_rgba_texture);
+    gl.texSubImage2D(gl.TEXTURE_2D, 0, 0, 0, LIGHTMAP_BLOCK_SIZE, LIGHTMAP_BLOCK_SIZE, gl.RGBA, gl.UNSIGNED_BYTE, R.dlightmaps_rgba);
+
+    R.NewMapFog();
+    R.MakeSky();
+  };
+
+  static ClearAll() {
+    if (R.particles) {
+      R.particles.length = 0;
+    }
+
+    for (let i = 0; i < 64; i++) {
+      R.lightstylevalue_a[i] = 12;
+      R.lightstylevalue_b[i] = 12;
+    }
+
+    R.oldviewleaf = null;
+    R.viewleaf = null;
+
+    R.deluxemap = null;
+    R.lightmaps_rgb = null;
+    R.dlightmaps_rgba = null;
+
+    R.allocated = null;
+
+    R.shadow_textures = [];
+    R.shadow_texture = null;
+    R.point_shadow_texture = null;
+    R.world_depth_texture = null;
+
+    R.ClearParticles();
+    R.ClearDecals();
+    R.ClearSky();
+  };
+
+  // part
+
+  static readonly ptype = ParticleType;
+
+  static ramp1 = [0x6f, 0x6d, 0x6b, 0x69, 0x67, 0x65, 0x63, 0x61];
+  static ramp2 = [0x6f, 0x6e, 0x6d, 0x6c, 0x6b, 0x6a, 0x68, 0x66];
+  static ramp3 = [0x6d, 0x6b, 6, 5, 4, 3];
+
+  static InitParticles() {
+    R.numparticles = 32786;
+    R.avelocities = [];
+    for (let i = 0; i <= 161; i++) {
+      R.avelocities[i] = [Math.random() * 2.56, Math.random() * 2.56, Math.random() * 2.56];
+    }
+  };
+
+  static SerializeParticles(): SerializedParticle[] {
+    const data = [];
+    const round = (num: number): number => Math.round(num * 10) / 10; // we do not need a high precision here
+    const roundVector = (vector: Vector): [number, number, number] => [
+      round(vector[0]),
+      round(vector[1]),
+      round(vector[2]),
+    ];
+
+    for (let i = 0; i < R.numparticles; i++) {
+      const p = R.particles[i];
+
+      if (p.die < CL.state.time) {
+        continue;
+      }
+
+      data.push({
+        i: i,
+        die: round(p.die - CL.state.time),
+        color: p.color,
+        ramp: round(p.ramp),
+        type: round(p.type),
+        org: roundVector(p.org),
+        vel: roundVector(p.vel),
+      });
+    }
+
+    return data;
+  };
+
+  static DeserializeParticles(data: SerializedParticle[]): void {
+    for (const p of data) {
+      console.assert(p.i >= 0 && p.i < R.particles.length, 'valid particle index', p.i);
+      R.particles[p.i] = {
+        die: p.die + CL.state.time,
+        color: p.color,
+        ramp: p.ramp,
+        type: p.type,
+        org: new Vector(...p.org),
+        vel: new Vector(...p.vel),
+      };
+    }
+  };
+
+  static EntityParticles(ent: ClientEdict): void {
+    const allocated = R.AllocParticles(162);
+
+    for (let i = 0; i < allocated.length; i++) {
+      const angleP = CL.state.time * R.avelocities[i][0];
+      const sp = Math.sin(angleP);
+      const cp = Math.cos(angleP);
+      const angleY = CL.state.time * R.avelocities[i][1];
+      const sy = Math.sin(angleY);
+      const cy = Math.cos(angleY);
+
+      R.particles[allocated[i]] = { // TODO: Particle Class
+        die: CL.state.time + 0.01,
+        color: 0x6f,
+        ramp: 0.0,
+        type: R.ptype.explode,
+        org: [
+          ent.origin[0] + avertexnormals[i * 3 + 0] * 64.0 + cp * cy * 16.0,
+          ent.origin[1] + avertexnormals[i * 3 + 1] * 64.0 + cp * sy * 16.0,
+          ent.origin[2] + avertexnormals[i * 3 + 2] * 64.0 + sp * -16.0,
+        ],
+        vel: new Vector(),
+      };
+    }
+  };
+
+  static ClearParticles() {
+    R.particles = [];
+    for (let i = 0; i < R.numparticles; i++) {
+      R.particles[i] = {die: -1.0};
+    }
+  };
+
+  static ParticleExplosion(org: Vector): void {
+    const allocated = R.AllocParticles(1024);
+    for (let i = 0; i < allocated.length; i++) {
+      R.particles[allocated[i]] = {
+        die: CL.state.time + 5.0,
+        color: R.ramp1[0],
+        ramp: Math.floor(Math.random() * 4.0),
+        type: ((i & 1) !== 0) ? R.ptype.explode : R.ptype.explode2,
+        org: new Vector(
+          org[0] + Math.random() * 32.0 - 16.0,
+          org[1] + Math.random() * 32.0 - 16.0,
+          org[2] + Math.random() * 32.0 - 16.0,
+        ),
+        vel: new Vector(Math.random() * 512.0 - 256.0, Math.random() * 512.0 - 256.0, Math.random() * 512.0 - 256.0),
+      };
+    }
+  };
+
+  static ParticleExplosion2(org: Vector, colorStart: number, colorLength: number): void {
+    const allocated = R.AllocParticles(512);
+    let colorMod = 0;
+    for (let i = 0; i < allocated.length; i++) {
+      R.particles[allocated[i]] = {
+        die: CL.state.time + 0.3,
+        color: colorStart + (colorMod++ % colorLength),
+        type: R.ptype.blob,
+        org: new Vector(
+          org[0] + Math.random() * 32.0 - 16.0,
+          org[1] + Math.random() * 32.0 - 16.0,
+          org[2] + Math.random() * 32.0 - 16.0,
+        ),
+        vel: new Vector(Math.random() * 512.0 - 256.0, Math.random() * 512.0 - 256.0, Math.random() * 512.0 - 256.0),
+      };
+    }
+  };
+
+  static BlobExplosion(org: Vector): void {
+    const allocated = R.AllocParticles(1024);
+    for (let i = 0; i < allocated.length; i++) {
+      const p = R.particles[allocated[i]];
+      p.die = CL.state.time + 1.0 + Math.random() * 0.4;
+      if ((i & 1) !== 0) {
+        p.type = R.ptype.blob;
+        p.color = 66 + Math.floor(Math.random() * 7.0);
+      } else {
+        p.type = R.ptype.blob2;
+        p.color = 150 + Math.floor(Math.random() * 7.0);
+      }
+      p.org = new Vector(
+        org[0] + Math.random() * 32.0 - 16.0,
+        org[1] + Math.random() * 32.0 - 16.0,
+        org[2] + Math.random() * 32.0 - 16.0,
+      );
+      p.vel = new Vector(Math.random() * 512.0 - 256.0, Math.random() * 512.0 - 256.0, Math.random() * 512.0 - 256.0);
+    }
+  };
+
+  static RunParticleEffect(org: Vector, dir: Vector, color: number, count: number): void {
+    const allocated = R.AllocParticles(count); let i;
+    for (i = 0; i < allocated.length; i++) {
+      R.particles[allocated[i]] = {
+        die: CL.state.time + 0.6 * Math.random(),
+        color: (color & 0xf8) + Math.floor(Math.random() * 8.0),
+        type: R.ptype.slowgrav,
+        org: new Vector(
+          org[0] + Math.random() * 16.0 - 8.0,
+          org[1] + Math.random() * 16.0 - 8.0,
+          org[2] + Math.random() * 16.0 - 8.0,
+        ),
+        vel: dir.copy().multiply(15.0),
+      };
+    }
+  };
+
+  static LavaSplash(org: Vector): void {
+    const allocated = R.AllocParticles(1024);
+    let k = 0;
+    for (let i = -16; i <= 15; i++) {
+      for (let j = -16; j <= 15; j++) {
+        if (k >= allocated.length) {
+          return;
+        }
+        const p = R.particles[allocated[k++]];
+        p.die = CL.state.time + 2.0 + Math.random() * 0.64;
+        p.color = 224 + Math.floor(Math.random() * 8.0);
+        p.type = R.ptype.slowgrav;
+        const dir = new Vector((j + Math.random()) * 8.0, (i + Math.random()) * 8.0, 256.0);
+        p.org = new Vector(org[0] + dir[0], org[1] + dir[1], org[2] + Math.random() * 64.0);
+        dir.normalize();
+        p.vel = dir.multiply(50.0 + Math.random() * 64.0);
+      }
+    }
+  };
+
+  static TeleportSplash(org: Vector): void {
+    const allocated = R.AllocParticles(896);
+    let l = 0;
+    for (let i = -16; i <= 15; i += 4) {
+      for (let j = -16; j <= 15; j += 4) {
+        for (let k = -24; k <= 31; k += 4) {
+          if (l >= allocated.length) {
+            return;
+          }
+          const p = R.particles[allocated[l++]];
+          p.die = CL.state.time + 0.2 + Math.random() * 0.16;
+          p.color = 7 + Math.floor(Math.random() * 8.0);
+          p.type = R.ptype.slowgrav;
+          const dir = new Vector(j * 8.0, i * 8.0, k * 8.0);
+          p.org = new Vector(
+            org[0] + i + Math.random() * 4.0,
+            org[1] + j + Math.random() * 4.0,
+            org[2] + k + Math.random() * 4.0,
+          );
+          dir.normalize();
+          p.vel = dir.multiply(50.0 + Math.random() * 64.0);
+        }
+      }
+    }
+  };
+
+  static tracercount = 0;
+  static RocketTrail(start: Vector, end: Vector, type: number): void {
+    let vec = end.copy().subtract(start);
+
+    const len = vec.len();
+
+    if (len === 0.0 || !isFinite(len)) {
+      return;
+    }
+
+    vec.normalize();
+
+    let allocated;
+    if (type === 4) {
+      allocated = R.AllocParticles(Math.floor(len / 6.0));
+    } else {
+      allocated = R.AllocParticles(Math.floor(len / 3.0));
+    }
+
+    for (let i = 0; i < allocated.length; i++) {
+      const p = R.particles[allocated[i]];
+      p.vel = new Vector();
+      p.die = CL.state.time + 2.0;
+      switch (type) {
+        case 7:
+          type = 1;
+          p.die += 8.0;
+        // eslint-disable-next-line no-fallthrough
+        case 0:
+        case 1:
+          p.ramp = Math.floor(Math.random() * 4.0) + (type << 1);
+          p.color = R.ramp3[p.ramp];
+          p.type = R.ptype.fire;
+          p.org = new Vector(
+            start[0] + Math.random() * 6.0 - 3.0,
+            start[1] + Math.random() * 6.0 - 3.0,
+            start[2] + Math.random() * 6.0 - 3.0,
+          );
+          break;
+        case 2:
+          p.type = R.ptype.grav;
+          p.color = 67 + Math.floor(Math.random() * 4.0);
+          p.org = new Vector(
+            start[0] + Math.random() * 6.0 - 3.0,
+            start[1] + Math.random() * 6.0 - 3.0,
+            start[2] + Math.random() * 6.0 - 3.0,
+          );
+          break;
+        case 3:
+        case 5:
+          p.die = CL.state.time + 0.5;
+          p.type = R.ptype.tracer;
+          if (type === 3) {
+            p.color = 52 + ((R.tracercount++ & 4) << 1);
+          } else {
+            p.color = 230 + ((R.tracercount++ & 4) << 1);
+          }
+          p.org = new Vector(start[0], start[1], start[2]);
+          if ((R.tracercount & 1) !== 0) {
+            p.vel[0] = 30.0 * vec[1];
+            p.vel[2] = -30.0 * vec[0];
+          } else {
+            p.vel[0] = -30.0 * vec[1];
+            p.vel[2] = 30.0 * vec[0];
+          }
+          break;
+        case 4:
+          p.type = R.ptype.grav;
+          p.color = 67 + Math.floor(Math.random() * 4.0);
+          p.org = new Vector(
+            start[0] + Math.random() * 6.0 - 3.0,
+            start[1] + Math.random() * 6.0 - 3.0,
+            start[2] + Math.random() * 6.0 - 3.0,
+          );
+          break;
+        case 6:
+          p.color = 152 + Math.floor(Math.random() * 4.0);
+          p.type = R.ptype.tracer;
+          p.die = CL.state.time + 0.3;
+          p.org = new Vector(
+            start[0] + Math.random() * 16.0 - 8.0,
+            start[1] + Math.random() * 16.0 - 8.0,
+            start[2] + Math.random() * 16.0 - 8.0,
+          );
+          break;
+        default:
+          console.assert(false, 'Unknown particle type: ' + type);
+      }
+      start.add(vec);
+    }
+  };
+
+  static InitDecals() {
+    R.decals = [];
+
+    Cmd.AddCommand('test_decal', async () => {
+      const start = R.refdef.vieworg;
+      const vectors = CL.state.viewangles.angleVectors();
+      const forward = vectors.forward;
+      const end = start.copy().add(forward.copy().multiply(8192));
+      const trace = SV.collision.traceStaticWorldLine(start, end);
+
+      if (trace.allsolid || trace.startsolid || trace.fraction === 1.0) {
+        return;
+      }
+
+      // Use a particle texture for testing if no bullet texture exists
+      R.PlaceDecal(trace.endpos, trace.plane.normal, await Draw.LoadPicFromLump('box_tl'));
+    });
+  };
+
+  static ClearDecals() {
+    R.decals = [];
+  };
+
+  static PlaceDecal(origin: Vector, normal: Vector, texture: GLTexture | null): void {
+    if (!texture) {
+      return;
+    }
+
+    // Calculate basis vectors for the decal quad
+    const up = new Vector(0, 0, 1);
+
+    if (Math.abs(normal.dot(up)) > 0.99) {
+      up.setTo(1, 0, 0);
+    }
+
+    const right = normal.cross(up);
+    right.normalize();
+    up.set(right.cross(normal));
+    up.normalize();
+
+    const size = 4.0; // Decal size
+
+    const verts = [
+      origin.copy().add(right.copy().multiply(-size)).add(up.copy().multiply(size)),
+      origin.copy().add(right.copy().multiply(size)).add(up.copy().multiply(size)),
+      origin.copy().add(right.copy().multiply(size)).add(up.copy().multiply(-size)),
+      origin.copy().add(right.copy().multiply(-size)).add(up.copy().multiply(-size)),
+    ];
+
+    // Apply polygon offset
+    const offset = normal.copy().multiply(0.5);
+    for (let i = 0; i < 4; i++) {
+      verts[i].add(offset);
+    }
+
+    // Calculate lighting
+    const lightStart = origin.copy().add(normal.copy().multiply(4.0));
+    const lightEnd = origin.copy().subtract(normal.copy().multiply(4.0));
+    const lightResult = R.RecursiveLightPoint(CL.state.worldmodel.nodes[0], lightStart, lightEnd);
+
+    let color = new Vector(255, 255, 255); // Default to white
+    if (lightResult) {
+      const r = Math.min(255, Math.max(0, Math.floor(lightResult[0][0])));
+      const g = Math.min(255, Math.max(0, Math.floor(lightResult[0][1])));
+      const b = Math.min(255, Math.max(0, Math.floor(lightResult[0][2])));
+      color.setTo(r, g, b);
+    }
+
+    R.decals.push({
+      texture,
+      verts,
+      color,
+      die: CL.state.time + 10.0, // Lasts 10 seconds
+    });
+  };
+
+  static DrawDecals() {
+    if (!R.decals || R.decals.length === 0) {
+      return;
+    }
+
+    // Remove dead decals
+    R.decals = R.decals.filter((d) => d.die > CL.state.time);
+
+    if (R.decals.length === 0) {
+      return;
+    }
+
+    GL.StreamFlush();
+
+    const program = GL.UseProgram('decal');
+    gl.depthMask(false);
+    gl.enable(gl.BLEND);
+
+    gl.uniform1f(program.uAlpha, 1.0);
+
+    let currentTexture = null;
+
+    for (let i = 0; i < R.decals.length; i++) {
+      const decal = R.decals[i];
+
+      if (decal.texture !== currentTexture) {
+        GL.StreamFlush();
+        decal.texture.bind(program.tTexture);
+        currentTexture = decal.texture;
+      }
+
+      GL.StreamGetSpace(6);
+
+      // Quad vertices: 0, 1, 2, 0, 2, 3
+      const v = decal.verts;
+      const c = decal.color;
+      const r = c[0];
+      const g = c[1];
+      const b = c[2];
+
+      GL.StreamWriteFloat3(v[0][0], v[0][1], v[0][2]); GL.StreamWriteFloat2(0, 0); GL.StreamWriteUByte4(r, g, b, 255);
+      GL.StreamWriteFloat3(v[1][0], v[1][1], v[1][2]); GL.StreamWriteFloat2(1, 0); GL.StreamWriteUByte4(r, g, b, 255);
+      GL.StreamWriteFloat3(v[2][0], v[2][1], v[2][2]); GL.StreamWriteFloat2(1, 1); GL.StreamWriteUByte4(r, g, b, 255);
+
+      GL.StreamWriteFloat3(v[0][0], v[0][1], v[0][2]); GL.StreamWriteFloat2(0, 0); GL.StreamWriteUByte4(r, g, b, 255);
+      GL.StreamWriteFloat3(v[2][0], v[2][1], v[2][2]); GL.StreamWriteFloat2(1, 1); GL.StreamWriteUByte4(r, g, b, 255);
+      GL.StreamWriteFloat3(v[3][0], v[3][1], v[3][2]); GL.StreamWriteFloat2(0, 1); GL.StreamWriteUByte4(r, g, b, 255);
+    }
+
+    GL.StreamFlush();
+    gl.depthMask(true);
+    gl.disable(gl.BLEND);
+  };
+
+  static DrawParticles() {
+    GL.StreamFlush();
+
+    GL.UseProgram('particle');
+    gl.depthMask(false);
+    gl.enable(gl.BLEND);
+
+    const frametime = Host.frametime;
+    const grav = frametime * SV.gravity.value * 0.05;
+    const dvel = frametime * 4.0;
+    let scale;
+
+    const coords = [-1.0, -1.0, -1.0, 1.0, 1.0, -1.0, 1.0, -1.0, -1.0, 1.0, 1.0, 1.0];
+    for (let i = 0; i < R.numparticles; i++) {
+      const p = R.particles[i];
+      if (p.die < CL.state.time) {
+        continue;
+      }
+
+      const color = W.d_8to24table[p.color];
+      scale = (p.org[0] - R.refdef.vieworg[0]) * R.vpn[0] + (p.org[1] - R.refdef.vieworg[1]) * R.vpn[1] + (p.org[2] - R.refdef.vieworg[2]) * R.vpn[2];
+      if (scale < 20.0) {
+        scale = 0.375;
+      } else {
+        scale = 0.375 + scale * 0.0015;
+      }
+
+      GL.StreamGetSpace(6);
+      for (let j = 0; j < 6; j++) {
+        GL.StreamWriteFloat3(p.org[0], p.org[1], p.org[2]);
+        GL.StreamWriteFloat2(coords[j * 2], coords[j * 2 + 1]);
+        GL.StreamWriteFloat(scale);
+        GL.StreamWriteUByte4(color & 0xff, (color >> 8) & 0xff, color >> 16, 255);
+      }
+
+      p.org[0] += p.vel[0] * frametime;
+      p.org[1] += p.vel[1] * frametime;
+      p.org[2] += p.vel[2] * frametime;
+
+      switch (p.type) {
+        case R.ptype.fire:
+          p.ramp += frametime * 5.0;
+          if (p.ramp >= 6.0) {
+            p.die = -1.0;
+          } else {
+            p.color = R.ramp3[Math.floor(p.ramp)];
+          }
+          p.vel[2] += grav;
+          continue;
+        case R.ptype.explode:
+          p.ramp += frametime * 10.0;
+          if (p.ramp >= 8.0) {
+            p.die = -1.0;
+          } else {
+            p.color = R.ramp1[Math.floor(p.ramp)];
+          }
+          p.vel[0] += p.vel[0] * dvel;
+          p.vel[1] += p.vel[1] * dvel;
+          p.vel[2] += p.vel[2] * dvel - grav;
+          continue;
+        case R.ptype.explode2:
+          p.ramp += frametime * 15.0;
+          if (p.ramp >= 8.0) {
+            p.die = -1.0;
+          } else {
+            p.color = R.ramp2[Math.floor(p.ramp)];
+          }
+          p.vel[0] -= p.vel[0] * frametime;
+          p.vel[1] -= p.vel[1] * frametime;
+          p.vel[2] -= p.vel[2] * frametime + grav;
+          continue;
+        case R.ptype.blob:
+          p.vel[0] += p.vel[0] * dvel;
+          p.vel[1] += p.vel[1] * dvel;
+          p.vel[2] += p.vel[2] * dvel - grav;
+          continue;
+        case R.ptype.blob2:
+          p.vel[0] += p.vel[0] * dvel;
+          p.vel[1] += p.vel[1] * dvel;
+          p.vel[2] -= grav;
+          continue;
+        case R.ptype.grav:
+        case R.ptype.slowgrav:
+          p.vel[2] -= grav;
+      }
+    }
+
+    GL.StreamFlush();
+
+    gl.disable(gl.BLEND);
+    gl.depthMask(true);
+  };
+
+  static AllocParticles(count: number): number[] {
+    const allocated = new Array<number>(count);
+    for (let i = 0, j = 0; i < R.numparticles; i++) {
+      if (count === 0) {
+        return allocated;
+      }
+      if (R.particles[i].die < CL.state.time) {
+        allocated[j++] = i;
+        count--;
+      }
+    }
+    allocated.length = allocated.length - count;
+    return allocated;
+  };
+
+  // surf
+
+  static lightmap_modified = new Uint8Array(LIGHTMAP_BLOCK_SIZE);
+  static lightmaps_rgb: Uint8Array | null = null; // allocated on demand
+  static dlightmaps_rgba: Uint8Array | null = null; // allocated on demand
+  static deluxemap: Uint8Array | null = null; // allocated on demand
+
+  static AddDynamicLights(surf: Face): void {
+    const smax = (surf.extents[0] >> surf.lmshift) + 1;
+    const tmax = (surf.extents[1] >> surf.lmshift) + 1;
+    const size = smax * tmax;
+
+    const blocklights: number[] = [];
+    for (let i = 0; i < size * 3; i++) {
+      blocklights[i] = 0;
+    }
+
+    for (let i = 0; i < Def.limits.dlights; i++) {
+      if (((surf.dlightbits >>> i) & 1) === 0) {
+        continue;
+      }
+      const light = CL.state.clientEntities.dlights[i];
+      const lightImpact = R.GetDynamicLightSurfaceImpact(light, surf);
+
+      if (lightImpact === null) {
+        continue;
+      }
+      let dist = lightImpact.distanceToPlane;
+      const rad = light.radius - dist;
+      let minlight = light.minlight;
+      if (rad < minlight) {
+        continue;
+      }
+      minlight = rad - minlight;
+      const impact = lightImpact.impact;
+      const tex = CL.state.worldmodel.texinfo[surf.texinfo];
+      const local = [
+        impact.dot(new Vector(...tex.vecs[0])) + tex.vecs[0][3] - surf.texturemins[0],
+        impact.dot(new Vector(...tex.vecs[1])) + tex.vecs[1][3] - surf.texturemins[1],
+      ];
+      for (let t = 0; t < tmax; t++) {
+        let td = local[1] - (t << surf.lmshift);
+        if (td < 0.0) {
+          td = -td;
+        }
+        td = Math.floor(td);
+        for (let s = 0; s < smax; s++) {
+          let sd = local[0] - (s << surf.lmshift);
+          if (sd < 0) {
+            sd = -sd;
+          }
+          sd = Math.floor(sd);
+          if (sd > td) {
+            dist = sd + (td >> 1);
+          } else {
+            dist = td + (sd >> 1);
+          }
+          if (dist < minlight) {
+            const bl = Math.floor((rad - dist) * 256.0);
+            const pos = (t * smax + s) * 3;
+            for (let i = 0; i < 3; i++) {
+              blocklights[pos + i] += bl * light.color[i];
+            }
+          }
+        }
+      }
+    }
+
+    for (let t = 0, i = 0; t < tmax; t++) {
+      R.lightmap_modified[surf.light_t + t] = 1;
+      const dest = ((surf.light_t + t) * LIGHTMAP_BLOCK_SIZE) + surf.light_s;
+      for (let s = 0; s < smax; s++) {
+        const dldest = (dest + s) * 4;
+        const blrgb = [
+          Math.min(Math.floor(blocklights[i * 3] / 128), 255),
+          Math.min(Math.floor(blocklights[i * 3 + 1] / 128), 255),
+          Math.min(Math.floor(blocklights[i * 3 + 2] / 128), 255),
+        ];
+        // console.log(blrgb);
+        i++;
+        for (let i = 0; i < 3; i++) {
+          R.dlightmaps_rgba[dldest + i] = blrgb[i];
+        }
+      }
+    }
+  };
+
+  static RemoveDynamicLights(surf: Face): void {
+    const smax = (surf.extents[0] >> surf.lmshift) + 1;
+    const tmax = (surf.extents[1] >> surf.lmshift) + 1;
+    for (let t = 0; t < tmax; t++) {
+      R.lightmap_modified[surf.light_t + t] = 1;
+      const dest = ((surf.light_t + t) * LIGHTMAP_BLOCK_SIZE) + surf.light_s;
+      for (let s = 0; s < smax; s++) {
+        const dldest = (dest + s) * 4;
+        for (let i = 0; i < 3; i++) {
+          R.dlightmaps_rgba[dldest + i] = 0;
+        }
+        R.dlightmaps_rgba[dldest + 3] = 255; // fully opaque
+      }
+    }
+  };
+
+  static BuildLightMap(currentmodel: BrushModel, surf: Face): void {
+    const smax = (surf.extents[0] >> surf.lmshift) + 1;
+    const tmax = (surf.extents[1] >> surf.lmshift) + 1;
+
+    for (let k = 0; k < 3; k++) {
+      const offset = LIGHTMAP_BLOCK_SIZE * LIGHTMAP_BLOCK_HEIGHT * k;
+      let lightmap = surf.lightofs;
+      let maps;
+
+      for (maps = 0; maps < surf.styles.length; maps++) {
+        let dest = (surf.light_t * LIGHTMAP_BLOCK_HEIGHT) + (surf.light_s << 2) + maps;
+        for (let i = 0; i < tmax; i++) {
+          for (let j = 0; j < smax; j++) {
+            R.lightmaps_rgb[dest + (j << 2) + offset] = currentmodel.lightdata[lightmap + j];
+          }
+          lightmap += smax;
+          dest += LIGHTMAP_BLOCK_HEIGHT;
+        }
+      }
+
+      for (; maps < 4; maps++) {
+        let dest = (surf.light_t * LIGHTMAP_BLOCK_HEIGHT) + (surf.light_s << 2) + maps;
+        for (let i = 0; i < tmax; i++) {
+          for (let j = 0; j < smax; j++) {
+            R.lightmaps_rgb[dest + (j << 2) + offset] = 0;
+          }
+          dest += LIGHTMAP_BLOCK_HEIGHT;
+        }
+      }
+    }
+  };
+
+  static BuildLightMapEx(currentmodel: BrushModel, surf: Face): void {
+    const smax = (surf.extents[0] >> surf.lmshift) + 1;
+    const tmax = (surf.extents[1] >> surf.lmshift) + 1;
+
+    if (currentmodel.deluxemap && !R.deluxemap) {
+      R.deluxemap = new Uint8Array(new ArrayBuffer(LIGHTMAP_BLOCK_SIZE * LIGHTMAP_BLOCK_HEIGHT * 3));
+    }
+
+    for (let k = 0; k < 3; k++) {
+      const offset = LIGHTMAP_BLOCK_SIZE * LIGHTMAP_BLOCK_HEIGHT * k;
+      let lightmap = surf.lightofs * 3;
+      let maps;
+
+      for (maps = 0; maps < surf.styles.length; maps++) {
+        let dest = (surf.light_t * LIGHTMAP_BLOCK_HEIGHT) + (surf.light_s << 2) + maps;
+        for (let i = 0; i < tmax; i++) {
+          for (let j = 0; j < smax; j++) {
+            R.lightmaps_rgb[dest + (j << 2) + offset] = currentmodel.lightdata_rgb[(lightmap + j * 3) + k];
+
+            if (currentmodel.deluxemap) {
+              R.deluxemap[dest + (j << 2) + offset] = currentmodel.deluxemap[(lightmap + j * 3) + k];
+            }
+          }
+          lightmap += smax * 3;
+          dest += LIGHTMAP_BLOCK_HEIGHT;
+        }
+      }
+
+      for (; maps < 4; maps++) {
+        let dest = (surf.light_t * LIGHTMAP_BLOCK_HEIGHT) + (surf.light_s << 2) + maps;
+        for (let i = 0; i < tmax; i++) {
+          for (let j = 0; j < smax; j++) {
+            R.lightmaps_rgb[dest + (j << 2) + offset] = 0;
+
+            if (currentmodel.deluxemap) {
+              R.deluxemap[dest + (j << 2) + offset] = 0;
+            }
+          }
+          dest += LIGHTMAP_BLOCK_HEIGHT;
+        }
+      }
+    }
+  };
+
+  static RecursiveWorldNode(node: Node): void {
+    if (node.contents === content.CONTENT_SOLID) {
+      return;
+    }
+    if (node.contents < 0) {
+      if (node.markvisframe !== R.visframecount) {
+        return;
+      }
+      node.visframe = R.visframecount;
+      if (node.skychain !== node.waterchain) {
+        R.drawsky = true;
+      }
+      return;
+    }
+    R.RecursiveWorldNode(node.children[0]);
+    R.RecursiveWorldNode(node.children[1]);
+  };
+
+  static MarkLeafs() {
+    if ((R.oldviewleaf === R.viewleaf) && (R.novis.value === 0)) {
+      return;
+    }
+    R.visframecount++;
+    R.oldviewleaf = R.viewleaf;
+    const vis = (R.novis.value !== 0 || R.viewleaf === null || R.viewleaf.num === 0) ? revealedVisibility : (
+      R.novis.value === 2 ?
+        CL.state.worldmodel.getPhsByLeaf(R.viewleaf) :
+        CL.state.worldmodel.getPvsByLeaf(R.viewleaf)
+    );
+    for (let i = 1; i < CL.state.worldmodel.leafs.length; i++) {
+      if (!vis.isRevealed(i)) {
+        continue;
+      }
+      if (CL.areaportals.value > 0 && R.viewleaf && !CL.state.worldmodel.areaPortals.leafsConnected(R.viewleaf, CL.state.worldmodel.leafs[i])) {
+        continue;
+      }
+      for (let node = CL.state.worldmodel.leafs[i]; node; node = node.parent) {
+        if (node.markvisframe === R.visframecount) {
+          break;
+        }
+        node.markvisframe = R.visframecount;
+      }
+    }
+    do {
+      if (R.novis.value !== 0 || R.viewleaf === null) {
+        break;
+      }
+      const p = R.refdef.vieworg.copy();
+      let leaf;
+      if (R.viewleaf.contents <= content.CONTENT_WATER) {
+        leaf = CL.state.worldmodel.getLeafForPoint(p.add(new Vector(0, 0, 16.0)));
+        if (leaf.contents <= content.CONTENT_WATER) {
+          break;
+        }
+      } else {
+        leaf = CL.state.worldmodel.getLeafForPoint(p.add(new Vector(0, 0, -16.0)));
+        if (leaf.contents > content.CONTENT_WATER) {
+          break;
+        }
+      }
+      if (leaf === R.viewleaf) {
+        break;
+      }
+      const vis = CL.state.worldmodel.getPvsByLeaf(leaf);
+      for (let i = 1; i < CL.state.worldmodel.leafs.length; i++) {
+        if (!vis.isRevealed(i)) {
+          continue;
+        }
+        if (CL.areaportals.value > 0 && !CL.state.worldmodel.areaPortals.leafsConnected(R.viewleaf, CL.state.worldmodel.leafs[i])) {
+          continue;
+        }
+        for (let node = CL.state.worldmodel.leafs[i]; node; node = node.parent) {
+          if (node.markvisframe === R.visframecount) {
+            break;
+          }
+          node.markvisframe = R.visframecount;
+        }
+      }
+    // eslint-disable-next-line no-constant-condition
+    } while (false);
+    R.drawsky = false;
+    R.RecursiveWorldNode(CL.state.worldmodel.nodes[0]);
+  };
+
+  static AllocBlock(surf: Face): void {
+    const w = (surf.extents[0] >> surf.lmshift) + 1;
+    const h = (surf.extents[1] >> surf.lmshift) + 1;
+    let x; let y; let i; let j; let best = LIGHTMAP_BLOCK_SIZE; let best2;
+    for (i = 0; i < (LIGHTMAP_BLOCK_SIZE - w); i++) {
+      best2 = 0;
+      for (j = 0; j < w; j++) {
+        if (R.allocated[i + j] >= best) {
+          break;
+        }
+        if (R.allocated[i + j] > best2) {
+          best2 = R.allocated[i + j];
+        }
+      }
+      if (j === w) {
+        x = i;
+        y = best = best2;
+      }
+    }
+    best += h;
+    if (best > LIGHTMAP_BLOCK_SIZE) {
+      throw new Error('R.AllocBlock: full');
+    }
+    for (i = 0; i < w; i++) {
+      R.allocated[x + i] = best;
+    }
+    surf.light_s = x;
+    surf.light_t = y;
+  };
+
+  static BuildLightmaps() {
+    R.allocated = (new Array(LIGHTMAP_BLOCK_SIZE)).fill(0);
+
+    R.lightmaps_rgb = new Uint8Array(new ArrayBuffer(LIGHTMAP_BLOCK_SIZE * LIGHTMAP_BLOCK_HEIGHT * 3));
+    R.dlightmaps_rgba = new Uint8Array(new ArrayBuffer(LIGHTMAP_BLOCK_SIZE * LIGHTMAP_BLOCK_SIZE * 4));
+
+    const brushRenderer = modelRendererRegistry.getRenderer(Mod.type.brush);
+    const meshRenderer = modelRendererRegistry.getRenderer(Mod.type.mesh);
+
+    for (let i = 1; i < CL.state.model_precache.length; i++) {
+      const currentmodel = CL.state.model_precache[i];
+
+      // Handle brush models (BSP maps)
+      if (currentmodel.type === Mod.type.brush) {
+        if (currentmodel.name[0] !== '*') { // skip submodels
+          for (let j = 0; j < currentmodel.faces.length; j++) {
+            const surf = currentmodel.faces[j];
+            if (!surf.sky) {
+              R.AllocBlock(surf);
+              if (currentmodel.lightdata_rgb !== null) {
+                R.BuildLightMapEx(currentmodel, surf);
+              } else if (currentmodel.lightdata !== null) {
+                R.BuildLightMap(currentmodel, surf);
+              }
+            }
+          }
+        }
+        // Use the brush renderer to prepare the model
+        // Only model index 1 is the world model, all others are entity models
+        brushRenderer.prepareModel(currentmodel, i === 1);
+      }
+
+      // Handle mesh models (OBJ, IQM, etc.)
+      if (currentmodel.type === Mod.type.mesh) {
+        meshRenderer.prepareModel(currentmodel);
+      }
+    }
+
+    const layerBytes = LIGHTMAP_BLOCK_SIZE * LIGHTMAP_BLOCK_SIZE * 4;
+    GL.BindArray(0, R.lightmap_texture);
+    for (let k = 0; k < 3; k++) {
+      gl.texSubImage3D(gl.TEXTURE_2D_ARRAY, 0, 0, 0, k, LIGHTMAP_BLOCK_SIZE, LIGHTMAP_BLOCK_SIZE, 1, gl.RGBA, gl.UNSIGNED_BYTE, R.lightmaps_rgb.subarray(k * layerBytes, (k + 1) * layerBytes));
+    }
+
+    GL.BindArray(0, R.deluxemap_texture);
+    if (R.deluxemap) {
+      for (let k = 0; k < 3; k++) {
+        gl.texSubImage3D(gl.TEXTURE_2D_ARRAY, 0, 0, 0, k, LIGHTMAP_BLOCK_SIZE, LIGHTMAP_BLOCK_SIZE, 1, gl.RGBA, gl.UNSIGNED_BYTE, R.deluxemap.subarray(k * layerBytes, (k + 1) * layerBytes));
+      }
+    }
+  };
+
+  // warp
+
+  static skyrenderer: SkyRenderer | null = null;
+  static drawsky = true;
+
+  static DrawSkyBox() {
+    if (!R.drawsky || !R.skyrenderer) {
+      return;
+    }
+
+    R.skyrenderer.render();
+  };
+
+  static MakeSky() {
+    // make sure we always free the old skyrenderer
+    if (R.skyrenderer) {
+      R.skyrenderer.shutdown();
+    }
+
+    R.skyrenderer = CL.state.worldmodel.newSkyRenderer();
+
+    if (!R.skyrenderer) {
+      return;
+    }
+
+    R.skyrenderer.init();
+  };
+
+  static ClearSky() {
+    if (!R.skyrenderer) {
+      return;
+    }
+
+    R.skyrenderer.shutdown();
+    R.skyrenderer = null;
+  };
+
+
+}
+
+export default R;
+
+
+eventBus.subscribe('client.disconnected', () => {
+  R.ClearAll();
+});
+
+eventBus.subscribe('areaportals.changed', () => {
+  R.oldviewleaf = null;
+});
+
+eventBus.subscribe('cvar.changed', (cvarName) => {
+  switch (cvarName) {
+    case 'r_novis':
+    case 'cl_areaportals':
+      R.oldviewleaf = null;
+      break;
+  }
+});
+
diff --git a/source/engine/main-browser.ts b/source/engine/main-browser.ts
index eca193af..d484e583 100644
--- a/source/engine/main-browser.ts
+++ b/source/engine/main-browser.ts
@@ -5,7 +5,7 @@ import Draw from './client/Draw.ts';
 import IN from './client/IN.ts';
 import Key from './client/Key.ts';
 import M from './client/Menu.ts';
-import R from './client/R.mjs';
+import R from './client/R.ts';
 import S from './client/Sound.ts';
 import Sys from './client/Sys.ts';
 import V from './client/V.ts';
diff --git a/source/engine/registry.mjs b/source/engine/registry.mjs
index 558dcdf7..6d9e5542 100644
--- a/source/engine/registry.mjs
+++ b/source/engine/registry.mjs
@@ -10,7 +10,7 @@
 /** @typedef {typeof import('./common/Mod.ts').default} ModModule */
 /** @typedef {typeof import('./client/CL.ts').default} ClientModule */
 /** @typedef {typeof import('./client/SCR.ts').default} ScrModule */
-/** @typedef {typeof import('./client/R.mjs').default} RendererModule */
+/** @typedef {typeof import('./client/R.ts').default} RendererModule */
 /** @typedef {typeof import('./client/Draw.ts').default} DrawModule */
 /** @typedef {typeof import('./client/Key.ts').default} KeyModule */
 /** @typedef {typeof import('./client/Sbar.ts').default} SbarModule */
diff --git a/test/renderer/brush-model-renderer.test.mjs b/test/renderer/brush-model-renderer.test.mjs
index 4ab5cb52..8fb7ee78 100644
--- a/test/renderer/brush-model-renderer.test.mjs
+++ b/test/renderer/brush-model-renderer.test.mjs
@@ -6,21 +6,21 @@ import { eventBus, registry } from '../../source/engine/registry.mjs';
 import { BrushModelRenderer, resolveBrushBloomContributionStrength } from '../../source/engine/client/renderer/BrushModelRenderer.ts';
 import { SimpleSkyBox } from '../../source/engine/client/renderer/Sky.ts';
 
-describe('resolveBrushBloomContributionStrength', () => {
-  test('clamps invalid contribution strengths to zero', () => {
+void describe('resolveBrushBloomContributionStrength', () => {
+  void test('clamps invalid contribution strengths to zero', () => {
     assert.equal(resolveBrushBloomContributionStrength(-1), 0.0);
     assert.equal(resolveBrushBloomContributionStrength(0), 0.0);
     assert.equal(resolveBrushBloomContributionStrength(Number.NaN), 0.0);
   });
 
-  test('preserves positive contribution strengths', () => {
+  void test('preserves positive contribution strengths', () => {
     assert.equal(resolveBrushBloomContributionStrength(0.33), 0.33);
     assert.equal(resolveBrushBloomContributionStrength(1.0), 1.0);
   });
 });
 
-describe('BrushModelRenderer.resolveEntityLightingState', () => {
-  test('treats inline submodels as sharing the world deluxemap atlas', () => {
+void describe('BrushModelRenderer.resolveEntityLightingState', () => {
+  void test('treats inline submodels as sharing the world deluxemap atlas', () => {
     const worldModel = /** @type {import('../../source/engine/common/model/BSP.ts').BrushModel} */ ({ deluxemap: new Uint8Array(3) });
     const lightingState = BrushModelRenderer.resolveEntityLightingState(
       /** @type {import('../../source/engine/common/model/BSP.ts').BrushModel} */ ({ deluxemap: null, submodel: true }),
@@ -32,7 +32,7 @@ describe('BrushModelRenderer.resolveEntityLightingState', () => {
     assert.equal(lightingState.hasDeluxemap, true);
   });
 
-  test('uses sampled static and dynamic lighting for inline brush entities', () => {
+  void test('uses sampled static and dynamic lighting for inline brush entities', () => {
     const model = /** @type {import('../../source/engine/common/model/BSP.ts').BrushModel} */ ({ deluxemap: new Uint8Array(3), lightdata: null, lightdata_rgb: null });
     const entity = /** @type {import('../../source/engine/client/ClientEntities.ts').ClientEdict} */ (/** @type {unknown} */ ({ id: 7 }));
     const ambientlight = new Vector(0.25, 0.5, 0.75);
@@ -58,7 +58,7 @@ describe('BrushModelRenderer.resolveEntityLightingState', () => {
     assert.equal(lightingState.hasDeluxemap, true);
   });
 
-  test('keeps inline submodels on the world lightmap intensity contract', () => {
+  void test('keeps inline submodels on the world lightmap intensity contract', () => {
     const ambientlight = new Vector(0.25, 0.5, 0.75);
     const shadelight = new Vector(0.75, 0.5, 0.25);
     const lightPosition = new Vector(100, 200, 300);
@@ -78,7 +78,7 @@ describe('BrushModelRenderer.resolveEntityLightingState', () => {
     assert.equal(lightingState.dynamicLightPosition, dynamicLightPosition);
   });
 
-  test('keeps sampled ambient and shade lighting for standalone brush bsp entities', () => {
+  void test('keeps sampled ambient and shade lighting for standalone brush bsp entities', () => {
     const ambientlight = new Vector(0.25, 0.5, 0.75);
     const shadelight = new Vector(0.75, 0.5, 0.25);
     const lightPosition = new Vector(100, 200, 300);
@@ -98,7 +98,7 @@ describe('BrushModelRenderer.resolveEntityLightingState', () => {
     assert.equal(lightingState.dynamicLightPosition, dynamicLightPosition);
   });
 
-  test('falls back to non-deluxemap lighting when the model has no deluxe data', () => {
+  void test('falls back to non-deluxemap lighting when the model has no deluxe data', () => {
     const lightingState = BrushModelRenderer.resolveEntityLightingState(
       /** @type {import('../../source/engine/common/model/BSP.ts').BrushModel} */ ({ deluxemap: null, lightdata: null, lightdata_rgb: null }),
       /** @type {import('../../source/engine/client/ClientEntities.ts').ClientEdict} */ ({}),
@@ -109,8 +109,8 @@ describe('BrushModelRenderer.resolveEntityLightingState', () => {
   });
 });
 
-describe('BrushModelRenderer.sampleTurbulentFallbackLight', () => {
-  test('lifts dim no-lightmap turbulent samples toward nearby visible light', () => {
+void describe('BrushModelRenderer.sampleTurbulentFallbackLight', () => {
+  void test('lifts dim no-lightmap turbulent samples toward nearby visible light', () => {
     const face = /** @type {import('../../source/engine/common/model/BaseModel.ts').Face} */ ({
       normal: new Vector(0, 0, 1),
       texinfo: 0,
@@ -145,7 +145,7 @@ describe('BrushModelRenderer.sampleTurbulentFallbackLight', () => {
     assert.equal(fallbackLight[2] > 16 * 0.0078125, true);
   });
 
-  test('blends vertex fallback toward a face-level fallback to soften seams', () => {
+  void test('blends vertex fallback toward a face-level fallback to soften seams', () => {
     const blendedLight = BrushModelRenderer.blendTurbulentFallbackLight(
       [0.2, 0.1, 0.05],
       [0.4, 0.3, 0.2],
@@ -158,10 +158,10 @@ describe('BrushModelRenderer.sampleTurbulentFallbackLight', () => {
   });
 });
 
-describe('BrushModelRenderer.getWorldTurbulentChains', () => {
-  test('sorts world turbulents by tight batch bounds instead of oversized leaf bounds', () => {
+void describe('BrushModelRenderer.getWorldTurbulentChains', () => {
+  void test('sorts world turbulents by tight batch bounds instead of oversized leaf bounds', () => {
     const previousR = registry.R;
-    registry.R = /** @type {typeof import('../../source/engine/client/R.mjs').default} */ ({
+    registry.R = /** @type {typeof import('../../source/engine/client/R.ts').default} */ ({
       visframecount: 7,
       CullBox() {
         return false;
@@ -201,8 +201,8 @@ describe('BrushModelRenderer.getWorldTurbulentChains', () => {
   });
 });
 
-describe('SimpleSkyBox.shutdown', () => {
-  test('does not free shared sky face textures', () => {
+void describe('SimpleSkyBox.shutdown', () => {
+  void test('does not free shared sky face textures', () => {
     const skybox = new SimpleSkyBox(/** @type {import('../../source/engine/common/model/BSP.ts').BrushModel} */ ({ cmds: null, leafs: [], skychain: 0 }));
     const frees = [];
     const wraps = [];
diff --git a/test/renderer/r-sorting.test.mjs b/test/renderer/r-sorting.test.mjs
index 9333b337..73dc651c 100644
--- a/test/renderer/r-sorting.test.mjs
+++ b/test/renderer/r-sorting.test.mjs
@@ -1,12 +1,12 @@
 import assert from 'node:assert/strict';
 import { describe, test } from 'node:test';
 
-import R, { compareFogAndTurbulentItems } from '../../source/engine/client/R.mjs';
+import R, { compareFogAndTurbulentItems } from '../../source/engine/client/R.ts';
 import { eventBus, registry } from '../../source/engine/registry.mjs';
 import Vector from '../../source/shared/Vector.ts';
 
-describe('compareFogAndTurbulentItems', () => {
-  test('sorts farther items first', () => {
+void describe('compareFogAndTurbulentItems', () => {
+  void test('sorts farther items first', () => {
     const result = compareFogAndTurbulentItems(
       { dist: 64, kind: 0 },
       { dist: 128, kind: 1 },
@@ -15,7 +15,7 @@ describe('compareFogAndTurbulentItems', () => {
     assert(result > 0);
   });
 
-  test('sorts fog before turbulent when their front depth ties', () => {
+  void test('sorts fog before turbulent when their front depth ties', () => {
     const fog = { dist: 96, kind: 1 };
     const turbulent = { dist: 96, kind: 0 };
     const items = [turbulent, fog];
@@ -25,7 +25,7 @@ describe('compareFogAndTurbulentItems', () => {
     assert.deepEqual(items, [fog, turbulent]);
   });
 
-  test('treats near-equal distances as a tie for boundary-sharing fog and water', () => {
+  void test('treats near-equal distances as a tie for boundary-sharing fog and water', () => {
     const fog = { dist: 96.00005, kind: 1 };
     const turbulent = { dist: 96.0, kind: 0 };
     const items = [turbulent, fog];
@@ -36,7 +36,7 @@ describe('compareFogAndTurbulentItems', () => {
   });
 });
 
-describe('R.GetEntityLightSamplePoint', () => {
+void describe('R.GetEntityLightSamplePoint', () => {
   // CR: this is currently not working, see original
   // test('derives alias sample height from negative mins to match classic Quake monsters', () => {
   //   const previousCL = registry.CL;
@@ -64,7 +64,7 @@ describe('R.GetEntityLightSamplePoint', () => {
   //   }
   // });
 
-  test('keeps brush and sprite entities on their true origin', () => {
+  void test('keeps brush and sprite entities on their true origin', () => {
     const previousCL = registry.CL;
     const previousMod = registry.Mod;
 

From 6bde92317ec7040acb1c36f53022ddd7b26e01eb Mon Sep 17 00:00:00 2001
From: Christian R <github@chrisnew.de>
Date: Sat, 4 Apr 2026 15:52:17 +0300
Subject: [PATCH 48/67] TS: registry

---
 README.md                                     |   6 +-
 source/engine/client/CDAudio.ts               |   2 +-
 source/engine/client/CL.ts                    |   2 +-
 source/engine/client/Chase.ts                 |   2 +-
 source/engine/client/ClientConnection.ts      |   2 +-
 source/engine/client/ClientDemos.ts           |   2 +-
 source/engine/client/ClientEntities.ts        |   2 +-
 source/engine/client/ClientInput.ts           |   2 +-
 source/engine/client/ClientLegacy.ts          |   2 +-
 source/engine/client/ClientLifecycle.ts       |   2 +-
 source/engine/client/ClientMessages.ts        |   2 +-
 .../client/ClientServerCommandHandlers.ts     |   2 +-
 source/engine/client/ClientState.ts           |   2 +-
 source/engine/client/Draw.ts                  |   2 +-
 source/engine/client/GL.ts                    |   2 +-
 source/engine/client/IN.ts                    |   2 +-
 source/engine/client/Key.ts                   |   2 +-
 source/engine/client/LegacyServerCommands.ts  |   2 +-
 source/engine/client/Menu.ts                  |   2 +-
 source/engine/client/R.ts                     |   2 +-
 source/engine/client/SCR.ts                   |   2 +-
 source/engine/client/Sbar.ts                  |   2 +-
 source/engine/client/Sound.ts                 |   2 +-
 source/engine/client/Sys.ts                   |   2 +-
 source/engine/client/Tools.ts                 |   2 +-
 source/engine/client/V.ts                     |   2 +-
 source/engine/client/VID.ts                   |   2 +-
 source/engine/client/menu/MenuItem.ts         |   2 +-
 source/engine/client/menu/MenuPage.ts         |   2 +-
 source/engine/client/menu/MenuStack.ts        |   2 +-
 source/engine/client/menu/Multiplayer.ts      |   2 +-
 .../client/renderer/AliasModelRenderer.ts     |   2 +-
 source/engine/client/renderer/BloomEffect.ts  |   2 +-
 .../client/renderer/BrushModelRenderer.ts     |   2 +-
 source/engine/client/renderer/Materials.ts    |   2 +-
 .../client/renderer/MeshModelRenderer.ts      |   2 +-
 source/engine/client/renderer/PostProcess.ts  |   2 +-
 source/engine/client/renderer/ShadowMap.ts    |   2 +-
 source/engine/client/renderer/Sky.ts          |   2 +-
 .../client/renderer/SpriteModelRenderer.ts    |   2 +-
 source/engine/client/renderer/WarpEffect.ts   |   2 +-
 source/engine/common/Cmd.ts                   |   2 +-
 source/engine/common/CollisionModelSource.ts  |   2 +-
 source/engine/common/Com.ts                   |   2 +-
 source/engine/common/Console.ts               |   2 +-
 source/engine/common/Cvar.ts                  |   2 +-
 source/engine/common/GameAPIs.ts              |   2 +-
 source/engine/common/Host.ts                  |   2 +-
 source/engine/common/Mod.ts                   |   2 +-
 source/engine/common/PlatformWorker.ts        |   2 +-
 source/engine/common/W.ts                     |   2 +-
 source/engine/common/WorkerFramework.ts       |   2 +-
 source/engine/common/WorkerManager.ts         |   2 +-
 source/engine/common/model/AreaPortals.ts     |   2 +-
 source/engine/common/model/BaseModel.ts       |   2 +-
 .../common/model/loaders/AliasMDLLoader.ts    |   2 +-
 .../common/model/loaders/BSP29Loader.ts       |   2 +-
 .../common/model/loaders/SpriteSPRLoader.ts   |   2 +-
 .../model/loaders/WavefrontOBJLoader.ts       |   2 +-
 source/engine/main-browser.ts                 |   2 +-
 source/engine/main-dedicated.ts               |   2 +-
 source/engine/network/ConsoleCommands.ts      |   2 +-
 source/engine/network/MSG.ts                  |   2 +-
 source/engine/network/Network.ts              |   2 +-
 source/engine/network/NetworkDrivers.ts       |   2 +-
 source/engine/registry.mjs                    | 219 -----------------
 source/engine/registry.ts                     | 230 ++++++++++++++++++
 source/engine/server/Client.ts                |   2 +-
 source/engine/server/Com.ts                   |   2 +-
 source/engine/server/DummyWorker.ts           |   2 +-
 source/engine/server/Edict.ts                 |   2 +-
 source/engine/server/Navigation.ts            |   2 +-
 source/engine/server/NavigationWorker.ts      |   2 +-
 source/engine/server/Progs.ts                 |   2 +-
 source/engine/server/ProgsAPI.ts              |   2 +-
 source/engine/server/Server.ts                |   2 +-
 source/engine/server/ServerMessages.ts        |   2 +-
 source/engine/server/Sys.ts                   |   2 +-
 source/engine/server/physics/ServerArea.ts    |   2 +-
 .../server/physics/ServerClientPhysics.ts     |   2 +-
 .../engine/server/physics/ServerCollision.ts  |   2 +-
 .../physics/ServerLegacyHullCollision.ts      |   2 +-
 .../engine/server/physics/ServerMovement.ts   |   2 +-
 source/engine/server/physics/ServerPhysics.ts |   2 +-
 test/client/client-connection.test.mjs        |   2 +-
 test/client/client-messages.test.mjs          |   2 +-
 test/common/cmd.test.mjs                      |   2 +-
 test/common/console-commands.test.mjs         |   2 +-
 test/common/console.test.mjs                  |   2 +-
 test/common/model-cache.test.mjs              |   2 +-
 test/common/network-drivers.test.mjs          |   2 +-
 test/common/registry.test.mjs                 |   2 +-
 test/common/workers.test.mjs                  |   2 +-
 test/physics/collision-regressions.test.mjs   |   2 +-
 test/physics/fixtures.mjs                     |   2 +-
 test/physics/map-pmove-harness.mjs            |   2 +-
 test/physics/navigation.test.mjs              |   2 +-
 test/physics/pmove.test.mjs                   |   2 +-
 test/physics/server-messages.test.mjs         |   2 +-
 test/physics/server-physics.test.mjs          |   2 +-
 test/physics/server.test.mjs                  |   2 +-
 test/renderer/brush-model-renderer.test.mjs   |   2 +-
 test/renderer/post-process.test.mjs           |   2 +-
 test/renderer/r-sorting.test.mjs              |   2 +-
 104 files changed, 334 insertions(+), 323 deletions(-)
 delete mode 100644 source/engine/registry.mjs
 create mode 100644 source/engine/registry.ts

diff --git a/README.md b/README.md
index 3f4eab8b..6f99db71 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # The Quake Shack Engine
 
-This is a modern JavaScript port of Quake 1 with some features sprinkled on top.
+This is a modern TypeScript port of Quake 1 with some features sprinkled on top.
 
 Added features include, but are not limited to:
 
@@ -158,8 +158,8 @@ There are two main entrypoints:
 
 | File | Description |
 | - | - |
-| source/engine/main-browser.mjs | launcher for a full browser session |
-| source/engine/main-dedicated.mjs | launcher for a dedicated server |
+| source/engine/main-browser.ts | launcher for a full browser session |
+| source/engine/main-dedicated.ts | launcher for a dedicated server |
 
 ## Based on the work of
 
diff --git a/source/engine/client/CDAudio.ts b/source/engine/client/CDAudio.ts
index 96c57c66..222a8539 100644
--- a/source/engine/client/CDAudio.ts
+++ b/source/engine/client/CDAudio.ts
@@ -1,7 +1,7 @@
 import Cmd from '../common/Cmd.ts';
 import Cvar from '../common/Cvar.ts';
 import Q from '../../shared/Q.ts';
-import { eventBus, getClientRegistry } from '../registry.mjs';
+import { eventBus, getClientRegistry } from '../registry.ts';
 
 let { COM, Con, S } = getClientRegistry();
 
diff --git a/source/engine/client/CL.ts b/source/engine/client/CL.ts
index 15a620f9..cfb6e591 100644
--- a/source/engine/client/CL.ts
+++ b/source/engine/client/CL.ts
@@ -6,7 +6,7 @@ import * as Protocol from '../network/Protocol.ts';
 import Cmd, { ConsoleCommand } from '../common/Cmd.ts';
 import Cvar from '../common/Cvar.ts';
 import { Pmove, PmovePlayer } from '../common/Pmove.ts';
-import { eventBus, getClientRegistry } from '../registry.mjs';
+import { eventBus, getClientRegistry } from '../registry.ts';
 import { gameCapabilities, solid } from '../../shared/Defs.ts';
 import ClientDemos from './ClientDemos.ts';
 import { ClientPlayerState } from './ClientMessages.ts';
diff --git a/source/engine/client/Chase.ts b/source/engine/client/Chase.ts
index 88ae90a6..97e416fb 100644
--- a/source/engine/client/Chase.ts
+++ b/source/engine/client/Chase.ts
@@ -1,6 +1,6 @@
 import Vector from '../../shared/Vector.ts';
 import Cvar from '../common/Cvar.ts';
-import { eventBus, getClientRegistry } from '../registry.mjs';
+import { eventBus, getClientRegistry } from '../registry.ts';
 
 let { CL, R, SV } = getClientRegistry();
 
diff --git a/source/engine/client/ClientConnection.ts b/source/engine/client/ClientConnection.ts
index c67a54c6..c9d72378 100644
--- a/source/engine/client/ClientConnection.ts
+++ b/source/engine/client/ClientConnection.ts
@@ -5,7 +5,7 @@ import Cmd from '../common/Cmd.ts';
 import ClientInput from './ClientInput.ts';
 import type ClientDemos from './ClientDemos.ts';
 import { clientRuntimeState, clientStaticState, type ClientRuntimeState, type ClientStaticState } from './ClientState.ts';
-import { eventBus, getClientRegistry } from '../registry.mjs';
+import { eventBus, getClientRegistry } from '../registry.ts';
 import { HostError } from '../common/Errors.ts';
 import { QSocket } from '../network/NetworkDrivers.ts';
 import { parseServerMessage as parseServerCommandMessage } from './ClientServerCommandHandlers.ts';
diff --git a/source/engine/client/ClientDemos.ts b/source/engine/client/ClientDemos.ts
index 979bc804..e2c72f85 100644
--- a/source/engine/client/ClientDemos.ts
+++ b/source/engine/client/ClientDemos.ts
@@ -1,5 +1,5 @@
 import { clientConnectionState } from '../common/Def.ts';
-import { eventBus, getClientRegistry } from '../registry.mjs';
+import { eventBus, getClientRegistry } from '../registry.ts';
 import * as Protocol from '../network/Protocol.ts';
 import { HostError } from '../common/Errors.ts';
 
diff --git a/source/engine/client/ClientEntities.ts b/source/engine/client/ClientEntities.ts
index 5d04003e..6f572908 100644
--- a/source/engine/client/ClientEntities.ts
+++ b/source/engine/client/ClientEntities.ts
@@ -5,7 +5,7 @@ import type { BrushModel } from '../common/Mod.ts';
 import type { Pmove } from '../common/Pmove.ts';
 
 import Vector from '../../shared/Vector.ts';
-import { eventBus, getClientRegistry } from '../registry.mjs';
+import { eventBus, getClientRegistry } from '../registry.ts';
 import * as Def from '../common/Def.ts';
 import { content, effect, solid } from '../../shared/Defs.ts';
 import Chase from './Chase.ts';
diff --git a/source/engine/client/ClientInput.ts b/source/engine/client/ClientInput.ts
index 25e26e1b..84feace2 100644
--- a/source/engine/client/ClientInput.ts
+++ b/source/engine/client/ClientInput.ts
@@ -3,7 +3,7 @@ import * as Protocol from '../network/Protocol.ts';
 import Q from '../../shared/Q.ts';
 import { SzBuffer } from '../network/MSG.ts';
 import Cmd, { type ConsoleCommand } from '../common/Cmd.ts';
-import { eventBus, getClientRegistry } from '../registry.mjs';
+import { eventBus, getClientRegistry } from '../registry.ts';
 import { HostError } from '../common/Errors.ts';
 
 interface KButtonState {
diff --git a/source/engine/client/ClientLegacy.ts b/source/engine/client/ClientLegacy.ts
index f8b8d2a0..8bf023b8 100644
--- a/source/engine/client/ClientLegacy.ts
+++ b/source/engine/client/ClientLegacy.ts
@@ -7,7 +7,7 @@ import Vector from '../../shared/Vector.ts';
 import { effect, modelFlags } from '../../shared/Defs.ts';
 import { BaseClientEdictHandler } from '../../shared/ClientEdict.ts';
 
-import { eventBus, getClientRegistry } from '../registry.mjs';
+import { eventBus, getClientRegistry } from '../registry.ts';
 
 let { CL, R } = getClientRegistry();
 
diff --git a/source/engine/client/ClientLifecycle.ts b/source/engine/client/ClientLifecycle.ts
index 4e39823b..5de2c0de 100644
--- a/source/engine/client/ClientLifecycle.ts
+++ b/source/engine/client/ClientLifecycle.ts
@@ -7,7 +7,7 @@ import CL from './CL.ts';
 import { clientRuntimeState } from './ClientState.ts';
 import { MoveVars, Pmove } from '../common/Pmove.ts';
 import { ClientEngineAPI } from '../common/GameAPIs.ts';
-import { eventBus, getClientRegistry } from '../registry.mjs';
+import { eventBus, getClientRegistry } from '../registry.ts';
 
 let { Host, PR, S } = getClientRegistry();
 
diff --git a/source/engine/client/ClientMessages.ts b/source/engine/client/ClientMessages.ts
index 0d0aa039..ee3b357c 100644
--- a/source/engine/client/ClientMessages.ts
+++ b/source/engine/client/ClientMessages.ts
@@ -3,7 +3,7 @@ import * as Def from '../common/Def.ts';
 import Vector from '../../shared/Vector.ts';
 import { PmovePlayer } from '../common/Pmove.ts';
 import { gameCapabilities } from '../../shared/Defs.ts';
-import { eventBus, getClientRegistry } from '../registry.mjs';
+import { eventBus, getClientRegistry } from '../registry.ts';
 import { HostError } from '../common/Errors.ts';
 import { ClientEdict } from './ClientEntities.ts';
 
diff --git a/source/engine/client/ClientServerCommandHandlers.ts b/source/engine/client/ClientServerCommandHandlers.ts
index 3993bff8..76043280 100644
--- a/source/engine/client/ClientServerCommandHandlers.ts
+++ b/source/engine/client/ClientServerCommandHandlers.ts
@@ -8,7 +8,7 @@ import Vector from '../../shared/Vector.ts';
 import { ClientEngineAPI } from '../common/GameAPIs.ts';
 import type { BrushModel } from '../common/Mod.ts';
 import { sharedCollisionModelSource } from '../common/CollisionModelSource.ts';
-import { eventBus, getClientRegistry } from '../registry.mjs';
+import { eventBus, getClientRegistry } from '../registry.ts';
 import type { BaseModel } from '../common/model/BaseModel.ts';
 import { ScoreSlot } from './ClientState.ts';
 import type { SFX } from './Sound.ts';
diff --git a/source/engine/client/ClientState.ts b/source/engine/client/ClientState.ts
index 39ca394d..54f9f52a 100644
--- a/source/engine/client/ClientState.ts
+++ b/source/engine/client/ClientState.ts
@@ -7,7 +7,7 @@ import type { BaseModel } from '../common/model/BaseModel.ts';
 import type { BrushModel } from '../common/Mod.ts';
 import type { ClientGameInterface, ClientSerializableType, SFX } from '../../shared/GameInterfaces.ts';
 import type ClientDemos from './ClientDemos.ts';
-import { EventBus, eventBus, getClientRegistry } from '../registry.mjs';
+import { EventBus, eventBus, getClientRegistry } from '../registry.ts';
 import ClientEntities, { ClientEdict } from './ClientEntities.ts';
 import { ClientMessages } from './ClientMessages.ts';
 
diff --git a/source/engine/client/Draw.ts b/source/engine/client/Draw.ts
index 65805101..e68000e1 100644
--- a/source/engine/client/Draw.ts
+++ b/source/engine/client/Draw.ts
@@ -4,7 +4,7 @@ import { MissingResourceError } from '../common/Errors.ts';
 import VID from './VID.ts';
 import W, { WadFileInterface, WadLumpTexture } from '../common/W.ts';
 
-import { eventBus, getClientRegistry } from '../registry.mjs';
+import { eventBus, getClientRegistry } from '../registry.ts';
 import GL, { GLTexture } from './GL.ts';
 import { ClientEngineAPI } from '../common/GameAPIs.ts';
 
diff --git a/source/engine/client/GL.ts b/source/engine/client/GL.ts
index b510dfc8..32ec84bc 100644
--- a/source/engine/client/GL.ts
+++ b/source/engine/client/GL.ts
@@ -2,7 +2,7 @@ import Cmd, { ConsoleCommand } from '../common/Cmd.ts';
 import Cvar from '../common/Cvar.ts';
 import { MissingResourceError } from '../common/Errors.ts';
 import { WadLumpTexture } from '../common/W.ts';
-import { eventBus, getCommonRegistry } from '../registry.mjs';
+import { eventBus, getCommonRegistry } from '../registry.ts';
 import VID from './VID.ts';
 
 interface TextureMode {
diff --git a/source/engine/client/IN.ts b/source/engine/client/IN.ts
index e13c9d6e..b223aee5 100644
--- a/source/engine/client/IN.ts
+++ b/source/engine/client/IN.ts
@@ -1,6 +1,6 @@
 import { K } from '../../shared/Keys.ts';
 import Cvar from '../common/Cvar.ts';
-import { eventBus, getClientRegistry } from '../registry.mjs';
+import { eventBus, getClientRegistry } from '../registry.ts';
 import { kbutton, kbuttons } from './ClientInput.ts';
 import VID from './VID.ts';
 
diff --git a/source/engine/client/Key.ts b/source/engine/client/Key.ts
index 7d84697b..622427e0 100644
--- a/source/engine/client/Key.ts
+++ b/source/engine/client/Key.ts
@@ -3,7 +3,7 @@ import Vector from '../../shared/Vector.ts';
 import Cmd from '../common/Cmd.ts';
 import Cvar from '../common/Cvar.ts';
 import { clientConnectionState } from '../common/Def.ts';
-import { eventBus, getClientRegistry } from '../registry.mjs';
+import { eventBus, getClientRegistry } from '../registry.ts';
 
 let { CL, Con, Host, M } = getClientRegistry();
 
diff --git a/source/engine/client/LegacyServerCommands.ts b/source/engine/client/LegacyServerCommands.ts
index 7a573e52..453a0f7f 100644
--- a/source/engine/client/LegacyServerCommands.ts
+++ b/source/engine/client/LegacyServerCommands.ts
@@ -1,7 +1,7 @@
 import * as Protocol from '../network/Protocol.ts';
 import * as Def from '../common/Def.ts';
 import { HostError } from '../common/Errors.ts';
-import { eventBus, getClientRegistry } from '../registry.mjs';
+import { eventBus, getClientRegistry } from '../registry.ts';
 import type { BrushModel } from '../common/Mod.ts';
 import type { BaseModel } from '../common/model/BaseModel.ts';
 import { ScoreSlot } from './ClientState.ts';
diff --git a/source/engine/client/Menu.ts b/source/engine/client/Menu.ts
index 93e5b473..8ea35765 100644
--- a/source/engine/client/Menu.ts
+++ b/source/engine/client/Menu.ts
@@ -4,7 +4,7 @@ import { K } from '../../shared/Keys.ts';
 import Cmd from '../common/Cmd.ts';
 import Cvar from '../common/Cvar.ts';
 import { clientConnectionState } from '../common/Def.ts';
-import { eventBus, getClientRegistry } from '../registry.mjs';
+import { eventBus, getClientRegistry } from '../registry.ts';
 import ClientLifecycle from './ClientLifecycle.ts';
 import { GLTexture } from './GL.ts';
 import MultiplayerMainMenu from './menu/Multiplayer.ts';
diff --git a/source/engine/client/R.ts b/source/engine/client/R.ts
index 72fa27c4..b24ad160 100644
--- a/source/engine/client/R.ts
+++ b/source/engine/client/R.ts
@@ -3,7 +3,7 @@ import Cvar from '../common/Cvar.ts';
 import Cmd from '../common/Cmd.ts';
 import * as Def from '../common/Def.ts';
 
-import { eventBus, registry } from '../registry.mjs';
+import { eventBus, registry } from '../registry.ts';
 import Chase from './Chase.ts';
 import W from '../common/W.ts';
 import VID from './VID.ts';
diff --git a/source/engine/client/SCR.ts b/source/engine/client/SCR.ts
index 592af0c3..40589c2e 100644
--- a/source/engine/client/SCR.ts
+++ b/source/engine/client/SCR.ts
@@ -2,7 +2,7 @@ import { gameCapabilities } from '../../shared/Defs.ts';
 import Cmd from '../common/Cmd.ts';
 import Cvar from '../common/Cvar.ts';
 import { clientConnectionState } from '../common/Def.ts';
-import { eventBus, getClientRegistry } from '../registry.mjs';
+import { eventBus, getClientRegistry } from '../registry.ts';
 import GL from './GL.ts';
 import VID from './VID.ts';
 import PostProcess from './renderer/PostProcess.ts';
diff --git a/source/engine/client/Sbar.ts b/source/engine/client/Sbar.ts
index c180d0ac..8a50fcef 100644
--- a/source/engine/client/Sbar.ts
+++ b/source/engine/client/Sbar.ts
@@ -1,5 +1,5 @@
 import Cmd from '../common/Cmd.ts';
-import { eventBus, getClientRegistry } from '../registry.mjs';
+import { eventBus, getClientRegistry } from '../registry.ts';
 import VID from './VID.ts';
 import * as Def from '../common/Def.ts';
 import Cvar from '../common/Cvar.ts';
diff --git a/source/engine/client/Sound.ts b/source/engine/client/Sound.ts
index 154fc439..f51a5f7e 100644
--- a/source/engine/client/Sound.ts
+++ b/source/engine/client/Sound.ts
@@ -4,7 +4,7 @@ import Vector from '../../shared/Vector.ts';
 import Cmd from '../common/Cmd.ts';
 import Cvar from '../common/Cvar.ts';
 import Q from '../../shared/Q.ts';
-import { eventBus, getClientRegistry } from '../registry.mjs';
+import { eventBus, getClientRegistry } from '../registry.ts';
 
 let { CL, COM, Con, Host } = getClientRegistry();
 
diff --git a/source/engine/client/Sys.ts b/source/engine/client/Sys.ts
index 626f9fa6..02dbd2d8 100644
--- a/source/engine/client/Sys.ts
+++ b/source/engine/client/Sys.ts
@@ -1,6 +1,6 @@
 import { K } from '../../shared/Keys.ts';
 import Q from '../../shared/Q.ts';
-import { eventBus, getClientRegistry, registry } from '../registry.mjs';
+import { eventBus, getClientRegistry, registry } from '../registry.ts';
 import Tools from './Tools.ts';
 import WorkerManager from '../common/WorkerManager.ts';
 import workerFactories from '../common/WorkerFactories.ts';
diff --git a/source/engine/client/Tools.ts b/source/engine/client/Tools.ts
index 73fbba6b..55596583 100644
--- a/source/engine/client/Tools.ts
+++ b/source/engine/client/Tools.ts
@@ -1,6 +1,6 @@
 import Cmd, { ConsoleCommand } from '../common/Cmd.ts';
 import W, { WadFileInterface } from '../common/W.ts';
-import { eventBus, getCommonRegistry } from '../registry.mjs';
+import { eventBus, getCommonRegistry } from '../registry.ts';
 
 let { Con } = getCommonRegistry();
 
diff --git a/source/engine/client/V.ts b/source/engine/client/V.ts
index 228e872b..7b30a5a8 100644
--- a/source/engine/client/V.ts
+++ b/source/engine/client/V.ts
@@ -6,7 +6,7 @@ import Cmd from '../common/Cmd.ts';
 import Cvar from '../common/Cvar.ts';
 import * as Def from '../common/Def.ts';
 import Q from '../../shared/Q.ts';
-import { eventBus, getClientRegistry, getCommonRegistry } from '../registry.mjs';
+import { eventBus, getClientRegistry, getCommonRegistry } from '../registry.ts';
 import Chase from './Chase.ts';
 
 let { Con, Host } = getCommonRegistry();
diff --git a/source/engine/client/VID.ts b/source/engine/client/VID.ts
index 20c23eda..38ba4afd 100644
--- a/source/engine/client/VID.ts
+++ b/source/engine/client/VID.ts
@@ -1,5 +1,5 @@
 import Cmd, { ConsoleCommand } from '../common/Cmd.ts';
-import { eventBus } from '../registry.mjs';
+import { eventBus } from '../registry.ts';
 
 class FullscreenCommand extends ConsoleCommand {
   override async run(): Promise<void> {
diff --git a/source/engine/client/menu/MenuItem.ts b/source/engine/client/menu/MenuItem.ts
index dfa1d551..7c8d9202 100644
--- a/source/engine/client/menu/MenuItem.ts
+++ b/source/engine/client/menu/MenuItem.ts
@@ -1,7 +1,7 @@
 import Q from '../../../shared/Q.ts';
 import { K } from '../../../shared/Keys.ts';
 import Cvar from '../../common/Cvar.ts';
-import { eventBus, getClientRegistry } from '../../registry.mjs';
+import { eventBus, getClientRegistry } from '../../registry.ts';
 
 interface MenuPicture {
   readonly width?: number;
diff --git a/source/engine/client/menu/MenuPage.ts b/source/engine/client/menu/MenuPage.ts
index 5cbb2082..7a87ace8 100644
--- a/source/engine/client/menu/MenuPage.ts
+++ b/source/engine/client/menu/MenuPage.ts
@@ -1,5 +1,5 @@
 import { K } from '../../../shared/Keys.ts';
-import { eventBus, getClientRegistry } from '../../registry.mjs';
+import { eventBus, getClientRegistry } from '../../registry.ts';
 import { MenuItem } from './MenuItem.ts';
 
 interface MenuPicture {
diff --git a/source/engine/client/menu/MenuStack.ts b/source/engine/client/menu/MenuStack.ts
index 9f49b3e4..0ef65ecd 100644
--- a/source/engine/client/menu/MenuStack.ts
+++ b/source/engine/client/menu/MenuStack.ts
@@ -1,4 +1,4 @@
-import { eventBus, getClientRegistry } from '../../registry.mjs';
+import { eventBus, getClientRegistry } from '../../registry.ts';
 import type { MenuPage } from './MenuPage.ts';
 
 // Destructure registry modules
diff --git a/source/engine/client/menu/Multiplayer.ts b/source/engine/client/menu/Multiplayer.ts
index b7555fa7..141ecbfa 100644
--- a/source/engine/client/menu/Multiplayer.ts
+++ b/source/engine/client/menu/Multiplayer.ts
@@ -1,7 +1,7 @@
 import PR from '../../server/Progs.ts';
 import { K } from '../../../shared/Keys.ts';
 import Cmd from '../../common/Cmd.ts';
-import { eventBus, getClientRegistry } from '../../registry.mjs';
+import { eventBus, getClientRegistry } from '../../registry.ts';
 import { Action, Label, Spacer } from './MenuItem.ts';
 import { MenuPage, VerticalLayout } from './MenuPage.ts';
 import type { MenuStack } from './MenuStack.ts';
diff --git a/source/engine/client/renderer/AliasModelRenderer.ts b/source/engine/client/renderer/AliasModelRenderer.ts
index 7fe16bf9..13bcda7e 100644
--- a/source/engine/client/renderer/AliasModelRenderer.ts
+++ b/source/engine/client/renderer/AliasModelRenderer.ts
@@ -1,7 +1,7 @@
 import Vector from '../../../shared/Vector.ts';
 import { ModelRenderer } from './ModelRenderer.ts';
 import { getEntityBloomEmissiveScale } from './BloomEffect.ts';
-import { eventBus, getClientRegistry } from '../../registry.mjs';
+import { eventBus, getClientRegistry } from '../../registry.ts';
 import GL from '../GL.ts';
 import W from '../../common/W.ts';
 import { effect } from '../../../shared/Defs.ts';
diff --git a/source/engine/client/renderer/BloomEffect.ts b/source/engine/client/renderer/BloomEffect.ts
index 7dffdc94..dc4b8c55 100644
--- a/source/engine/client/renderer/BloomEffect.ts
+++ b/source/engine/client/renderer/BloomEffect.ts
@@ -3,7 +3,7 @@ import PostProcess from './PostProcess.ts';
 import VID from '../VID.ts';
 import PostProcessEffect from './PostProcessEffect.ts';
 import Vector from '../../../shared/Vector.ts';
-import { eventBus, getClientRegistry } from '../../registry.mjs';
+import { eventBus, getClientRegistry } from '../../registry.ts';
 import { effect } from '../../../shared/Defs.ts';
 
 let { Draw, R } = getClientRegistry();
diff --git a/source/engine/client/renderer/BrushModelRenderer.ts b/source/engine/client/renderer/BrushModelRenderer.ts
index 3ad19fb9..bb3db4c8 100644
--- a/source/engine/client/renderer/BrushModelRenderer.ts
+++ b/source/engine/client/renderer/BrushModelRenderer.ts
@@ -1,6 +1,6 @@
 import Vector from '../../../shared/Vector.ts';
 import { ModelRenderer } from './ModelRenderer.ts';
-import { eventBus, getClientRegistry } from '../../registry.mjs';
+import { eventBus, getClientRegistry } from '../../registry.ts';
 import GL, { type GLProgramInfo, ATTRIB_LOCATIONS, BRUSH_VERTEX_STRIDE } from '../GL.ts';
 import { getEntityBloomEmissiveScale } from './BloomEffect.ts';
 import { MaterialFlags, type BaseMaterial } from './Materials.ts';
diff --git a/source/engine/client/renderer/Materials.ts b/source/engine/client/renderer/Materials.ts
index 92bff47b..beb82be7 100644
--- a/source/engine/client/renderer/Materials.ts
+++ b/source/engine/client/renderer/Materials.ts
@@ -1,4 +1,4 @@
-import { eventBus, getClientRegistry } from '../../registry.mjs';
+import { eventBus, getClientRegistry } from '../../registry.ts';
 import type { ClientEdict } from '../ClientEntities.ts';
 import GL, { GLTexture, type GLProgramInfo } from '../GL.ts';
 
diff --git a/source/engine/client/renderer/MeshModelRenderer.ts b/source/engine/client/renderer/MeshModelRenderer.ts
index b96d5ac7..c76b2f34 100644
--- a/source/engine/client/renderer/MeshModelRenderer.ts
+++ b/source/engine/client/renderer/MeshModelRenderer.ts
@@ -1,7 +1,7 @@
 import Vector from '../../../shared/Vector.ts';
 import { ModelRenderer } from './ModelRenderer.ts';
 import { getEntityBloomEmissiveScale } from './BloomEffect.ts';
-import { eventBus, getClientRegistry } from '../../registry.mjs';
+import { eventBus, getClientRegistry } from '../../registry.ts';
 import GL, { ATTRIB_LOCATIONS } from '../GL.ts';
 import type { MeshModel } from '../../common/model/MeshModel.ts';
 import type { ClientEdict } from '../ClientEntities.ts';
diff --git a/source/engine/client/renderer/PostProcess.ts b/source/engine/client/renderer/PostProcess.ts
index d5fcae26..b468e2a2 100644
--- a/source/engine/client/renderer/PostProcess.ts
+++ b/source/engine/client/renderer/PostProcess.ts
@@ -2,7 +2,7 @@ import GL from '../GL.ts';
 import Cvar from '../../common/Cvar.ts';
 import VID from '../VID.ts';
 import PostProcessEffect from './PostProcessEffect.ts';
-import { eventBus } from '../../registry.mjs';
+import { eventBus } from '../../registry.ts';
 
 let gl: WebGL2RenderingContext = null!;
 
diff --git a/source/engine/client/renderer/ShadowMap.ts b/source/engine/client/renderer/ShadowMap.ts
index 54ffa241..71f9d245 100644
--- a/source/engine/client/renderer/ShadowMap.ts
+++ b/source/engine/client/renderer/ShadowMap.ts
@@ -1,7 +1,7 @@
 import GL from '../GL.ts';
 import Cvar from '../../common/Cvar.ts';
 import { limits } from '../../common/Def.ts';
-import { eventBus, getClientRegistry } from '../../registry.mjs';
+import { eventBus, getClientRegistry } from '../../registry.ts';
 import { MaterialFlags } from './Materials.ts';
 import { effect } from '../../../shared/Defs.ts';
 import Vector from '../../../shared/Vector.ts';
diff --git a/source/engine/client/renderer/Sky.ts b/source/engine/client/renderer/Sky.ts
index 3eb50337..f38a196a 100644
--- a/source/engine/client/renderer/Sky.ts
+++ b/source/engine/client/renderer/Sky.ts
@@ -1,6 +1,6 @@
 import W from '../../common/W.ts';
 import { BrushModel } from '../../common/Mod.ts';
-import { eventBus, getClientRegistry } from '../../registry.mjs';
+import { eventBus, getClientRegistry } from '../../registry.ts';
 import GL, { ATTRIB_LOCATIONS, GLTexture } from '../GL.ts';
 
 let { Host, R } = getClientRegistry();
diff --git a/source/engine/client/renderer/SpriteModelRenderer.ts b/source/engine/client/renderer/SpriteModelRenderer.ts
index 35123502..7112268e 100644
--- a/source/engine/client/renderer/SpriteModelRenderer.ts
+++ b/source/engine/client/renderer/SpriteModelRenderer.ts
@@ -1,6 +1,6 @@
 import { ModelRenderer } from './ModelRenderer.ts';
 import { getEntityBloomEmissiveScale } from './BloomEffect.ts';
-import { eventBus, getClientRegistry } from '../../registry.mjs';
+import { eventBus, getClientRegistry } from '../../registry.ts';
 import GL from '../GL.ts';
 import type { SpriteModel, SpriteSingleFrame, SpriteFrameImage } from '../../common/model/SpriteModel.ts';
 import type { ClientEdict } from '../ClientEntities.ts';
diff --git a/source/engine/client/renderer/WarpEffect.ts b/source/engine/client/renderer/WarpEffect.ts
index 4661f4e3..84a943c1 100644
--- a/source/engine/client/renderer/WarpEffect.ts
+++ b/source/engine/client/renderer/WarpEffect.ts
@@ -1,6 +1,6 @@
 import GL from '../GL.ts';
 import PostProcessEffect from './PostProcessEffect.ts';
-import { eventBus, getClientRegistry } from '../../registry.mjs';
+import { eventBus, getClientRegistry } from '../../registry.ts';
 
 let { Host } = getClientRegistry();
 
diff --git a/source/engine/common/Cmd.ts b/source/engine/common/Cmd.ts
index e3a8589c..04b00016 100644
--- a/source/engine/common/Cmd.ts
+++ b/source/engine/common/Cmd.ts
@@ -1,7 +1,7 @@
 import type { ServerClient } from '../server/Client.ts';
 
 import * as Protocol from '../network/Protocol.ts';
-import { eventBus, getClientRegistry, getCommonRegistry, registry } from '../registry.mjs';
+import { eventBus, getClientRegistry, getCommonRegistry, registry } from '../registry.ts';
 import Cvar from './Cvar.ts';
 import { clientConnectionState } from './Def.ts';
 
diff --git a/source/engine/common/CollisionModelSource.ts b/source/engine/common/CollisionModelSource.ts
index e721a69f..d70e35e3 100644
--- a/source/engine/common/CollisionModelSource.ts
+++ b/source/engine/common/CollisionModelSource.ts
@@ -1,4 +1,4 @@
-import { eventBus, getClientRegistry, getCommonRegistry } from '../registry.mjs';
+import { eventBus, getClientRegistry, getCommonRegistry } from '../registry.ts';
 
 import type { ServerEdict } from '../server/Edict.ts';
 import type { BrushModel } from './model/BSP.ts';
diff --git a/source/engine/common/Com.ts b/source/engine/common/Com.ts
index 97621a3d..5a969cd4 100644
--- a/source/engine/common/Com.ts
+++ b/source/engine/common/Com.ts
@@ -1,4 +1,4 @@
-import { registry, eventBus, getCommonRegistry } from '../registry.mjs';
+import { registry, eventBus, getCommonRegistry } from '../registry.ts';
 
 import Q from '../../shared/Q.ts';
 import { CorruptedResourceError } from './Errors.ts';
diff --git a/source/engine/common/Console.ts b/source/engine/common/Console.ts
index d4f23932..2f8a1fce 100644
--- a/source/engine/common/Console.ts
+++ b/source/engine/common/Console.ts
@@ -1,5 +1,5 @@
 import Vector from '../../shared/Vector.ts';
-import { eventBus, getClientRegistry, registry } from '../registry.mjs';
+import { eventBus, getClientRegistry, registry } from '../registry.ts';
 import Cvar from './Cvar.ts';
 import Cmd from './Cmd.ts';
 import VID from '../client/VID.ts';
diff --git a/source/engine/common/Cvar.ts b/source/engine/common/Cvar.ts
index 7b48075d..aefc2a30 100644
--- a/source/engine/common/Cvar.ts
+++ b/source/engine/common/Cvar.ts
@@ -1,4 +1,4 @@
-import { eventBus, getCommonRegistry, registry } from '../registry.mjs';
+import { eventBus, getCommonRegistry, registry } from '../registry.ts';
 import Cmd from './Cmd.ts';
 import Q from '../../shared/Q.ts';
 import { cvarFlags } from '../../shared/Defs.ts';
diff --git a/source/engine/common/GameAPIs.ts b/source/engine/common/GameAPIs.ts
index 25f3ebcc..6c26e982 100644
--- a/source/engine/common/GameAPIs.ts
+++ b/source/engine/common/GameAPIs.ts
@@ -14,7 +14,7 @@ import Key from '../client/Key.ts';
 import { SFX as SFXValue } from '../client/Sound.ts';
 import VID from '../client/VID.ts';
 import * as Protocol from '../network/Protocol.ts';
-import { EventBus, eventBus, getClientRegistry, getCommonRegistry } from '../registry.mjs';
+import { EventBus, eventBus, getClientRegistry, getCommonRegistry } from '../registry.ts';
 import { ED, ServerEdict as ServerEdictValue } from '../server/Edict.ts';
 import Cmd from './Cmd.ts';
 import Cvar from './Cvar.ts';
diff --git a/source/engine/common/Host.ts b/source/engine/common/Host.ts
index 249d1c40..70539a52 100644
--- a/source/engine/common/Host.ts
+++ b/source/engine/common/Host.ts
@@ -14,7 +14,7 @@ import Cvar from './Cvar.ts';
 import * as Protocol from '../network/Protocol.ts';
 import * as Def from './Def.ts';
 import Cmd, { ConsoleCommand } from './Cmd.ts';
-import { eventBus, getClientRegistry, getCommonRegistry, registry } from '../registry.mjs';
+import { eventBus, getClientRegistry, getCommonRegistry, registry } from '../registry.ts';
 import Vector from '../../shared/Vector.ts';
 import Q from '../../shared/Q.ts';
 import { ServerClient } from '../server/Client.ts';
diff --git a/source/engine/common/Mod.ts b/source/engine/common/Mod.ts
index e7785dfe..b206ec16 100644
--- a/source/engine/common/Mod.ts
+++ b/source/engine/common/Mod.ts
@@ -1,4 +1,4 @@
-import { eventBus, getClientRegistry, getCommonRegistry, registry } from '../registry.mjs';
+import { eventBus, getClientRegistry, getCommonRegistry, registry } from '../registry.ts';
 import { MissingResourceError } from './Errors.ts';
 import { ModelLoaderRegistry } from './model/ModelLoaderRegistry.ts';
 import { AliasMDLLoader } from './model/loaders/AliasMDLLoader.ts';
diff --git a/source/engine/common/PlatformWorker.ts b/source/engine/common/PlatformWorker.ts
index e95c97b0..52cd0f6d 100644
--- a/source/engine/common/PlatformWorker.ts
+++ b/source/engine/common/PlatformWorker.ts
@@ -1,4 +1,4 @@
-import { eventBus, getCommonRegistry } from '../registry.mjs';
+import { eventBus, getCommonRegistry } from '../registry.ts';
 import { BaseWorker, type WorkerMessageListener } from './Sys.ts';
 
 let { Host } = getCommonRegistry();
diff --git a/source/engine/common/W.ts b/source/engine/common/W.ts
index 96cae40a..0bbc09bb 100644
--- a/source/engine/common/W.ts
+++ b/source/engine/common/W.ts
@@ -1,4 +1,4 @@
-import { eventBus, getCommonRegistry } from '../registry.mjs';
+import { eventBus, getCommonRegistry } from '../registry.ts';
 import { CorruptedResourceError, MissingResourceError } from './Errors.ts';
 import Q from '../../shared/Q.ts';
 
diff --git a/source/engine/common/WorkerFramework.ts b/source/engine/common/WorkerFramework.ts
index 7529028d..54d69d65 100644
--- a/source/engine/common/WorkerFramework.ts
+++ b/source/engine/common/WorkerFramework.ts
@@ -1,6 +1,6 @@
 import type { URLs } from '../build-config';
 
-import { eventBus, registry } from '../registry.mjs';
+import { eventBus, registry } from '../registry.ts';
 import Mod from './Mod.ts';
 import Sys from './Sys.ts';
 import COM, { type SearchPath } from './Com.ts';
diff --git a/source/engine/common/WorkerManager.ts b/source/engine/common/WorkerManager.ts
index c5582ba8..f5c05436 100644
--- a/source/engine/common/WorkerManager.ts
+++ b/source/engine/common/WorkerManager.ts
@@ -1,4 +1,4 @@
-import { registry, eventBus, getCommonRegistry } from '../registry.mjs';
+import { registry, eventBus, getCommonRegistry } from '../registry.ts';
 import { SysError } from './Errors.ts';
 import PlatformWorker, { type WorkerFactoryRegistry, type WorkerMessageEnvelope } from './PlatformWorker.ts';
 
diff --git a/source/engine/common/model/AreaPortals.ts b/source/engine/common/model/AreaPortals.ts
index 22275ea7..462e68ec 100644
--- a/source/engine/common/model/AreaPortals.ts
+++ b/source/engine/common/model/AreaPortals.ts
@@ -1,6 +1,6 @@
 import type { Node } from './BSP.ts';
 
-import { eventBus } from '../../registry.mjs';
+import { eventBus } from '../../registry.ts';
 
 export interface PortalDefinition {
   readonly area0: number;
diff --git a/source/engine/common/model/BaseModel.ts b/source/engine/common/model/BaseModel.ts
index 399b366f..6fb06a50 100644
--- a/source/engine/common/model/BaseModel.ts
+++ b/source/engine/common/model/BaseModel.ts
@@ -1,5 +1,5 @@
 import GL from '../../client/GL.ts';
-import { eventBus } from '../../registry.mjs';
+import { eventBus } from '../../registry.ts';
 import Vector from '../../../shared/Vector.ts';
 
 let gl: WebGL2RenderingContext | null = null;
diff --git a/source/engine/common/model/loaders/AliasMDLLoader.ts b/source/engine/common/model/loaders/AliasMDLLoader.ts
index 338a6c2d..f28933bf 100644
--- a/source/engine/common/model/loaders/AliasMDLLoader.ts
+++ b/source/engine/common/model/loaders/AliasMDLLoader.ts
@@ -1,7 +1,7 @@
 import Vector from '../../../../shared/Vector.ts';
 import Q from '../../../../shared/Q.ts';
 import GL, { GLTexture, resampleTexture8 } from '../../../client/GL.ts';
-import { registry } from '../../../registry.mjs';
+import { registry } from '../../../registry.ts';
 import { CRC16CCITT } from '../../CRC.ts';
 import W, { translateIndexToLuminanceRGBA, translateIndexToRGBA } from '../../W.ts';
 import { AliasModel, type AliasFrame, type AliasSkin } from '../AliasModel.ts';
diff --git a/source/engine/common/model/loaders/BSP29Loader.ts b/source/engine/common/model/loaders/BSP29Loader.ts
index 6888beb9..716c8c9a 100644
--- a/source/engine/common/model/loaders/BSP29Loader.ts
+++ b/source/engine/common/model/loaders/BSP29Loader.ts
@@ -5,7 +5,7 @@ import { GLTexture } from '../../../client/GL.ts';
 import W, { readWad3Texture, translateIndexToLuminanceRGBA, translateIndexToRGBA } from '../../W.ts';
 import { CRC16CCITT } from '../../CRC.ts';
 import { CorruptedResourceError } from '../../Errors.ts';
-import { eventBus, getCommonRegistry, registry } from '../../../registry.mjs';
+import { eventBus, getCommonRegistry, registry } from '../../../registry.ts';
 import { ModelLoader } from '../ModelLoader.ts';
 import { Brush, BrushModel, BrushSide, Node, type BSPXLumps, type Clipnode, type Hull } from '../BSP.ts';
 import { Face, Plane } from '../BaseModel.ts';
diff --git a/source/engine/common/model/loaders/SpriteSPRLoader.ts b/source/engine/common/model/loaders/SpriteSPRLoader.ts
index a4af5598..dd529a7b 100644
--- a/source/engine/common/model/loaders/SpriteSPRLoader.ts
+++ b/source/engine/common/model/loaders/SpriteSPRLoader.ts
@@ -1,6 +1,6 @@
 import Vector from '../../../../shared/Vector.ts';
 import { GLTexture } from '../../../client/GL.ts';
-import { registry } from '../../../registry.mjs';
+import { registry } from '../../../registry.ts';
 import { CRC16CCITT } from '../../CRC.ts';
 import W, { translateIndexToRGBA } from '../../W.ts';
 import { ModelLoader } from '../ModelLoader.ts';
diff --git a/source/engine/common/model/loaders/WavefrontOBJLoader.ts b/source/engine/common/model/loaders/WavefrontOBJLoader.ts
index c66b91a6..4a67c6ba 100644
--- a/source/engine/common/model/loaders/WavefrontOBJLoader.ts
+++ b/source/engine/common/model/loaders/WavefrontOBJLoader.ts
@@ -1,4 +1,4 @@
-import { registry } from '../../../registry.mjs';
+import { registry } from '../../../registry.ts';
 
 import Vector from '../../../../shared/Vector.ts';
 import { GLTexture } from '../../../client/GL.ts';
diff --git a/source/engine/main-browser.ts b/source/engine/main-browser.ts
index d484e583..33580603 100644
--- a/source/engine/main-browser.ts
+++ b/source/engine/main-browser.ts
@@ -16,7 +16,7 @@ import Con from './common/Console.ts';
 import Host from './common/Host.ts';
 import Mod from './common/Mod.ts';
 import NET from './network/Network.ts';
-import { freeze as registryFreeze, registry } from './registry.mjs';
+import { freeze as registryFreeze, registry } from './registry.ts';
 import PR from './server/Progs.ts';
 import SV from './server/Server.ts';
 
diff --git a/source/engine/main-dedicated.ts b/source/engine/main-dedicated.ts
index 37dedb3e..3e83c5fc 100644
--- a/source/engine/main-dedicated.ts
+++ b/source/engine/main-dedicated.ts
@@ -5,7 +5,7 @@ import Con from './common/Console.ts';
 import Host from './common/Host.ts';
 import Mod from './common/Mod.ts';
 import NET from './network/Network.ts';
-import { freeze as registryFreeze, registry } from './registry.mjs';
+import { freeze as registryFreeze, registry } from './registry.ts';
 import V from './client/V.ts';
 import NodeCOM from './server/Com.ts';
 import PR from './server/Progs.ts';
diff --git a/source/engine/network/ConsoleCommands.ts b/source/engine/network/ConsoleCommands.ts
index 55f8f5e7..dda90629 100644
--- a/source/engine/network/ConsoleCommands.ts
+++ b/source/engine/network/ConsoleCommands.ts
@@ -1,5 +1,5 @@
 import { ConsoleCommand } from '../common/Cmd.ts';
-import { eventBus, getCommonRegistry } from '../registry.mjs';
+import { eventBus, getCommonRegistry } from '../registry.ts';
 
 let { Con, NET } = getCommonRegistry();
 
diff --git a/source/engine/network/MSG.ts b/source/engine/network/MSG.ts
index 6215c51c..f6d8c682 100644
--- a/source/engine/network/MSG.ts
+++ b/source/engine/network/MSG.ts
@@ -2,7 +2,7 @@ import type { ClientEventValue, SerializableType } from '../../shared/GameInterf
 import Q from '../../shared/Q.ts';
 import Vector from '../../shared/Vector.ts';
 import * as Protocol from '../network/Protocol.ts';
-import { eventBus, getCommonRegistry } from '../registry.mjs';
+import { eventBus, getCommonRegistry } from '../registry.ts';
 
 type SerializableVectorLike = ArrayLike<number>;
 type ServerSerializableValue = SerializableType | object;
diff --git a/source/engine/network/Network.ts b/source/engine/network/Network.ts
index f5b96621..ac7bf0ee 100644
--- a/source/engine/network/Network.ts
+++ b/source/engine/network/Network.ts
@@ -4,7 +4,7 @@ import Cmd from '../common/Cmd.ts';
 import Cvar from '../common/Cvar.ts';
 import { clientConnectionState } from '../common/Def.ts';
 import Q from '../../shared/Q.ts';
-import { eventBus, getClientRegistry, getCommonRegistry, registry } from '../registry.mjs';
+import { eventBus, getClientRegistry, getCommonRegistry, registry } from '../registry.ts';
 import { SzBuffer } from './MSG.ts';
 import { InviteCommand } from './ConsoleCommands.ts';
 import { DriverRegistry } from './DriverRegistry.ts';
diff --git a/source/engine/network/NetworkDrivers.ts b/source/engine/network/NetworkDrivers.ts
index da7c1712..7befbe14 100644
--- a/source/engine/network/NetworkDrivers.ts
+++ b/source/engine/network/NetworkDrivers.ts
@@ -1,7 +1,7 @@
 import Cvar from '../common/Cvar.ts';
 import { HostError } from '../common/Errors.ts';
 import type { SzBuffer } from './MSG.ts';
-import { eventBus, getCommonRegistry, registry } from '../registry.mjs';
+import { eventBus, getCommonRegistry, registry } from '../registry.ts';
 import { formatIP } from './Misc.ts';
 
 type Throwable = Error | string | number | boolean | null | undefined | { message?: string };
diff --git a/source/engine/registry.mjs b/source/engine/registry.mjs
deleted file mode 100644
index 6d9e5542..00000000
--- a/source/engine/registry.mjs
+++ /dev/null
@@ -1,219 +0,0 @@
-
-/** @typedef {typeof import('./common/Console.ts').default} ConModule */
-/** @typedef {typeof import('./common/Com.ts').default} ComModule */
-/** @typedef {typeof import('./common/Sys.ts').default | typeof import('./client/Sys.ts').default | typeof import('./server/Sys.ts').default} SysModule */
-/** @typedef {typeof import('./common/Host.ts').default} HostModule */
-/** @typedef {typeof import('./client/V.ts').default} VModule */
-/** @typedef {typeof import('./network/Network').default} NetModule */
-/** @typedef {typeof import('./server/Server.ts').default} ServerModule */
-/** @typedef {typeof import('./server/Progs.ts').default} ProgsModule */
-/** @typedef {typeof import('./common/Mod.ts').default} ModModule */
-/** @typedef {typeof import('./client/CL.ts').default} ClientModule */
-/** @typedef {typeof import('./client/SCR.ts').default} ScrModule */
-/** @typedef {typeof import('./client/R.ts').default} RendererModule */
-/** @typedef {typeof import('./client/Draw.ts').default} DrawModule */
-/** @typedef {typeof import('./client/Key.ts').default} KeyModule */
-/** @typedef {typeof import('./client/Sbar.ts').default} SbarModule */
-/** @typedef {typeof import('./client/Sound.ts').default} SoundModule */
-/** @typedef {typeof import('./client/Menu.ts').default} MenuModule */
-/** @typedef {typeof import('./client/IN.ts').default} InputModule */
-/** @typedef {typeof globalThis.WebSocket} BrowserWebSocketClass */
-/** @typedef {typeof import('ws')} NodeWebSocketModule */
-/** @typedef {BrowserWebSocketClass | NodeWebSocketModule} WebSocketDependency */
-/** @typedef {import('./build-config').BuildConfig} BuildConfig */
-/** @typedef {import('./build-config').URLs} URLs */
-/**
- * Registry for engine components.
- * Unfortunately, the engine components are too tightly coupled, that’s why we need a registry for the time being.
- * NOTE: Before adding more components here, consider refactoring the code to use ES6 modules and imports.
- * @typedef {object} Registry
- * @property {ComModule | undefined} COM command and filesystem module
- * @property {ConModule | undefined} Con console output module
- * @property {HostModule | undefined} Host engine host lifecycle module
- * @property {NetModule | undefined} NET networking module
- * @property {DrawModule | undefined} Draw 2D drawing module
- * @property {SysModule | undefined} Sys platform system module
- * @property {VModule | undefined} V view and camera module
- * @property {ClientModule | undefined} CL client runtime module
- * @property {ServerModule | undefined} SV server runtime module
- * @property {ModModule | undefined} Mod model loading and cache module
- * @property {ProgsModule | undefined} PR game program interface module
- * @property {RendererModule | undefined} R renderer module
- * @property {ScrModule | undefined} SCR screen and HUD module
- * @property {KeyModule | undefined} Key input binding module
- * @property {InputModule | undefined} IN low-level input module
- * @property {SbarModule | undefined} Sbar status bar module
- * @property {SoundModule | undefined} S audio module
- * @property {MenuModule | undefined} M menu module
- * @property {WebSocketDependency | undefined} WebSocket injected websocket dependency
- * @property {URLs | undefined} urls runtime URL providers
- * @property {BuildConfig | undefined} buildConfig build-time configuration snapshot
- * @property {boolean} isDedicatedServer true when running in server mode
- * @property {boolean} isInsideWorker true when running inside a worker
- */
-/**
- * Registry members guaranteed after both browser and dedicated launch.
- * @typedef {Registry & {
- *   COM: ComModule,
- *   Con: ConModule,
- *   Host: HostModule,
- *   NET: NetModule,
- *   Sys: SysModule,
- *   V: VModule,
- *   SV: ServerModule,
- *   Mod: ModModule,
- *   PR: ProgsModule,
- *   WebSocket: WebSocketDependency,
- * }} CommonRegistry
- */
-/**
- * Registry members guaranteed only after browser launch.
- * @typedef {CommonRegistry & {
- *   CL: ClientModule,
- *   Draw: DrawModule,
- *   Key: KeyModule,
- *   IN: InputModule,
- *   M: MenuModule,
- *   R: RendererModule,
- *   S: SoundModule,
- *   Sbar: SbarModule,
- *   SCR: ScrModule,
- *   urls: URLs,
- *   buildConfig: BuildConfig,
- *   isDedicatedServer: false,
- * }} ClientRegistry
- */
-/** @type {Registry} */
-export const registry = {
-  COM: undefined,
-  Con: undefined,
-  Host: undefined,
-  NET: undefined,
-  Draw: undefined,
-  Sys: undefined,
-  V: undefined,
-  CL: undefined,
-  SV: undefined,
-  Mod: undefined,
-  PR: undefined,
-  R: undefined,
-  SCR: undefined,
-  Key: undefined,
-  IN: undefined,
-  Sbar: undefined,
-  S: undefined,
-  M: undefined,
-
-  WebSocket: undefined,
-
-  urls: undefined,
-  buildConfig: undefined,
-
-  /** @type {boolean} true, when running in server mode */
-  isDedicatedServer: false,
-  isInsideWorker: false,
-};
-
-// make sure the registry is not extensible beyond the defined properties
-Object.seal(registry);
-
-/**
- * Returns the registry members guaranteed after both browser and dedicated launch.
- * Use this from code that runs in either runtime.
- * @returns {CommonRegistry} initialized common registry view
- */
-export function getCommonRegistry() {
-  return /** @type {CommonRegistry} */ (registry);
-}
-
-/**
- * Returns the registry members guaranteed only after browser launch.
- * Use this only from browser or client-only code paths.
- * @returns {ClientRegistry} initialized client registry view
- */
-export function getClientRegistry() {
-  return /** @type {ClientRegistry} */ (registry);
-}
-
-export class EventBus {
-  /** @type {Map<string, Set<Function>>} */
-  #listeners = new Map();
-
-  /** @type {string} */
-  #name;
-
-  /**
-   * @param {string} name name
-   */
-  constructor(name) {
-    this.#name = name;
-  }
-
-  /**
-   * Registers an event listener for a specific event type.
-   * @param {string} eventName The event type to listen for.
-   * @param {Function} listener The function to call when the event is triggered.
-   * @returns {() => void} A function to remove the listener.
-   */
-  subscribe(eventName, listener) {
-    if (!this.#listeners.has(eventName)) {
-      this.#listeners.set(eventName, new Set());
-    }
-
-    this.#listeners.get(eventName).add(listener);
-
-    return () => {
-      this.#listeners.get(eventName).delete(listener);
-    };
-  }
-
-  /**
-   * Publishes an event, calling all registered listeners for that event type.
-   * NOTE: Make sure to use arguments that are serializable. Events might be sent over the network or/and to Web Workers.
-   * @param {string} eventName The event type to trigger.
-   * @param {...*} args The arguments to pass to the event listeners.
-   */
-  publish(eventName, ...args) {
-    // console.debug(`EventBus: ${this.#name} - ${eventName}`, ...args);
-
-    if (!this.#listeners.has(eventName)) {
-      return;
-    }
-
-    for (const listener of this.#listeners.get(eventName)) {
-      listener(...args);
-    }
-  }
-
-  /**
-   * Unsubscribes from all events.
-   */
-  unsubscribeAll() {
-    this.#listeners.clear();
-  }
-
-  toString() {
-    return `EventBus(${this.#name}): ${this.#listeners.size} topics`;
-  }
-
-  /**
-   * All subscribed topics.
-   * @returns {string[]} topics
-   */
-  get topics() {
-    return Array.from(this.#listeners.keys());
-  }
-};
-
-/** Engine’s main event bus. */
-export const eventBus = new EventBus('engine');
-
-/**
- * Freezes the registry to prevent further modifications.
- * It will also call all registered change observers.
- */
-export function freeze() {
-  Object.freeze(registry);
-
-  eventBus.publish('registry.frozen', registry);
-};
diff --git a/source/engine/registry.ts b/source/engine/registry.ts
new file mode 100644
index 00000000..17d3d527
--- /dev/null
+++ b/source/engine/registry.ts
@@ -0,0 +1,230 @@
+import type { BuildConfig, URLs } from './build-config';
+
+type ConModule = typeof import('./common/Console.ts').default;
+type ComModule = typeof import('./common/Com.ts').default;
+type SysModule = typeof import('./common/Sys.ts').default | typeof import('./client/Sys.ts').default | typeof import('./server/Sys.ts').default;
+type HostModule = typeof import('./common/Host.ts').default;
+type VModule = typeof import('./client/V.ts').default;
+type NetModule = typeof import('./network/Network.ts').default;
+type ServerModule = typeof import('./server/Server.ts').default;
+type ProgsModule = typeof import('./server/Progs.ts').default;
+type ModModule = typeof import('./common/Mod.ts').default;
+type ClientModule = typeof import('./client/CL.ts').default;
+type ScrModule = typeof import('./client/SCR.ts').default;
+type RendererModule = typeof import('./client/R.ts').default;
+type DrawModule = typeof import('./client/Draw.ts').default;
+type KeyModule = typeof import('./client/Key.ts').default;
+type SbarModule = typeof import('./client/Sbar.ts').default;
+type SoundModule = typeof import('./client/Sound.ts').default;
+type MenuModule = typeof import('./client/Menu.ts').default;
+type InputModule = typeof import('./client/IN.ts').default;
+type BrowserWebSocketClass = typeof globalThis.WebSocket;
+type NodeWebSocketServerConstructor = typeof import('ws').WebSocketServer;
+
+interface NodeWebSocketDependency {
+  WebSocketServer: NodeWebSocketServerConstructor;
+}
+
+type WebSocketDependency = BrowserWebSocketClass | NodeWebSocketDependency;
+type EventBusValue = bigint | boolean | null | number | object | string | symbol | undefined;
+type EventBusArgs = readonly EventBusValue[];
+type EventBusListener<TArgs extends EventBusArgs = EventBusArgs> = (...args: TArgs) => void;
+
+/**
+ * Registry for engine components.
+ * Unfortunately, the engine components are too tightly coupled, that’s why we need a registry for the time being.
+ * NOTE: Before adding more components here, consider refactoring the code to use ES6 modules and imports.
+ */
+export interface Registry {
+  COM: ComModule | undefined;
+  Con: ConModule | undefined;
+  Host: HostModule | undefined;
+  NET: NetModule | undefined;
+  Draw: DrawModule | undefined;
+  Sys: SysModule | undefined;
+  V: VModule | undefined;
+  CL: ClientModule | undefined;
+  SV: ServerModule | undefined;
+  Mod: ModModule | undefined;
+  PR: ProgsModule | undefined;
+  R: RendererModule | undefined;
+  SCR: ScrModule | undefined;
+  Key: KeyModule | undefined;
+  IN: InputModule | undefined;
+  Sbar: SbarModule | undefined;
+  S: SoundModule | undefined;
+  M: MenuModule | undefined;
+  WebSocket: WebSocketDependency | undefined;
+  urls: URLs | undefined;
+  buildConfig: BuildConfig | undefined;
+  isDedicatedServer: boolean;
+  isInsideWorker: boolean;
+}
+
+/**
+ * Registry members guaranteed after both browser and dedicated launch.
+ */
+export interface CommonRegistry extends Registry {
+  COM: ComModule;
+  Con: ConModule;
+  Host: HostModule;
+  NET: NetModule;
+  Sys: SysModule;
+  V: VModule;
+  SV: ServerModule;
+  Mod: ModModule;
+  PR: ProgsModule;
+  WebSocket: WebSocketDependency;
+}
+
+/**
+ * Registry members guaranteed only after browser launch.
+ */
+export interface ClientRegistry extends CommonRegistry {
+  CL: ClientModule;
+  Draw: DrawModule;
+  Key: KeyModule;
+  IN: InputModule;
+  M: MenuModule;
+  R: RendererModule;
+  S: SoundModule;
+  Sbar: SbarModule;
+  SCR: ScrModule;
+  urls: URLs;
+  buildConfig: BuildConfig;
+  isDedicatedServer: false;
+}
+
+export const registry: Registry = {
+  COM: undefined,
+  Con: undefined,
+  Host: undefined,
+  NET: undefined,
+  Draw: undefined,
+  Sys: undefined,
+  V: undefined,
+  CL: undefined,
+  SV: undefined,
+  Mod: undefined,
+  PR: undefined,
+  R: undefined,
+  SCR: undefined,
+  Key: undefined,
+  IN: undefined,
+  Sbar: undefined,
+  S: undefined,
+  M: undefined,
+  WebSocket: undefined,
+  urls: undefined,
+  buildConfig: undefined,
+  isDedicatedServer: false,
+  isInsideWorker: false,
+};
+
+// Make sure the registry is not extensible beyond the defined properties.
+Object.seal(registry);
+
+/**
+ * Returns the registry members guaranteed after both browser and dedicated launch.
+ * Use this from code that runs in either runtime.
+ * @returns The initialized common registry view.
+ */
+export function getCommonRegistry(): CommonRegistry {
+  return registry as CommonRegistry;
+}
+
+/**
+ * Returns the registry members guaranteed only after browser launch.
+ * Use this only from browser or client-only code paths.
+ * @returns The initialized client registry view.
+ */
+export function getClientRegistry(): ClientRegistry {
+  return registry as ClientRegistry;
+}
+
+export class EventBus {
+  /** All listeners grouped by topic name. */
+  #listeners = new Map<string, Set<EventBusListener>>();
+
+  /** Human-readable bus name used in diagnostics. */
+  #name: string;
+
+  /**
+   * Creates a named event bus.
+   * @param name Event bus name.
+   */
+  constructor(name: string) {
+    this.#name = name;
+  }
+
+  /**
+   * Registers an event listener for a specific event type.
+   * @param eventName The event type to listen for.
+   * @param listener The function to call when the event is triggered.
+   * @returns A function that removes the listener.
+   */
+  subscribe<TArgs extends EventBusArgs>(eventName: string, listener: EventBusListener<TArgs>): () => void {
+    if (!this.#listeners.has(eventName)) {
+      this.#listeners.set(eventName, new Set());
+    }
+
+    const listeners = this.#listeners.get(eventName)!;
+    const storedListener = listener as EventBusListener;
+    listeners.add(storedListener);
+
+    return (): void => {
+      listeners.delete(storedListener);
+    };
+  }
+
+  /**
+   * Publishes an event, calling all registered listeners for that event type.
+   * NOTE: Make sure to use arguments that are serializable. Events might be sent over the network or to Web Workers.
+   * @param eventName The event type to trigger.
+   * @param args The arguments to pass to the event listeners.
+   */
+  publish<TArgs extends EventBusArgs>(eventName: string, ...args: TArgs): void {
+    // console.debug(`EventBus: ${this.#name} - ${eventName}`, ...args);
+
+    const listeners = this.#listeners.get(eventName);
+    if (listeners === undefined) {
+      return;
+    }
+
+    for (const listener of listeners) {
+      listener(...args);
+    }
+  }
+
+  /**
+   * Unsubscribes from all events.
+   */
+  unsubscribeAll(): void {
+    this.#listeners.clear();
+  }
+
+  toString(): string {
+    return `EventBus(${this.#name}): ${this.#listeners.size} topics`;
+  }
+
+  /**
+   * All subscribed topics.
+   * @returns All subscribed topic names.
+   */
+  get topics(): string[] {
+    return Array.from(this.#listeners.keys());
+  }
+}
+
+/** Engine’s main event bus. */
+export const eventBus = new EventBus('engine');
+
+/**
+ * Freezes the registry to prevent further modifications.
+ * It also calls all registered change observers.
+ */
+export function freeze(): void {
+  Object.freeze(registry);
+
+  eventBus.publish('registry.frozen', registry);
+}
diff --git a/source/engine/server/Client.ts b/source/engine/server/Client.ts
index ba93bd6a..62581993 100644
--- a/source/engine/server/Client.ts
+++ b/source/engine/server/Client.ts
@@ -6,7 +6,7 @@ import { gameCapabilities } from '../../shared/Defs.ts';
 import Vector from '../../shared/Vector.ts';
 import { SzBuffer } from '../network/MSG.ts';
 import * as Protocol from '../network/Protocol.ts';
-import { eventBus, getCommonRegistry } from '../registry.mjs';
+import { eventBus, getCommonRegistry } from '../registry.ts';
 import { ServerEntityState } from './ServerEntityState.ts';
 
 interface LegacySpawnParmsGameAPI {
diff --git a/source/engine/server/Com.ts b/source/engine/server/Com.ts
index fc723b76..4b5881e2 100644
--- a/source/engine/server/Com.ts
+++ b/source/engine/server/Com.ts
@@ -7,7 +7,7 @@ import { CRC16CCITT as CRC } from '../common/CRC.ts';
 import COM, { type PackFileEntry, type SearchPath } from '../common/Com.ts';
 
 import { CorruptedResourceError } from '../common/Errors.ts';
-import { eventBus, getCommonRegistry } from '../registry.mjs';
+import { eventBus, getCommonRegistry } from '../registry.ts';
 
 let { Con, Sys } = getCommonRegistry();
 
diff --git a/source/engine/server/DummyWorker.ts b/source/engine/server/DummyWorker.ts
index 717c1715..b74dfe29 100644
--- a/source/engine/server/DummyWorker.ts
+++ b/source/engine/server/DummyWorker.ts
@@ -1,5 +1,5 @@
 import WorkerFramework from '../common/WorkerFramework.ts';
-import { eventBus, registry } from '../registry.mjs';
+import { eventBus, registry } from '../registry.ts';
 
 await WorkerFramework.Init();
 
diff --git a/source/engine/server/Edict.ts b/source/engine/server/Edict.ts
index 204ae54a..bfd9b2ca 100644
--- a/source/engine/server/Edict.ts
+++ b/source/engine/server/Edict.ts
@@ -10,7 +10,7 @@ import { SzBuffer, registerSerializableType } from '../network/MSG.ts';
 import * as Protocol from '../network/Protocol.ts';
 import * as Def from '../common/Def.ts';
 import * as Defs from '../../shared/Defs.ts';
-import { eventBus, registry } from '../registry.mjs';
+import { eventBus, registry } from '../registry.ts';
 import Q from '../../shared/Q.ts';
 import { ConsoleCommand } from '../common/Cmd.ts';
 
diff --git a/source/engine/server/Navigation.ts b/source/engine/server/Navigation.ts
index 143535ca..34127a27 100644
--- a/source/engine/server/Navigation.ts
+++ b/source/engine/server/Navigation.ts
@@ -12,7 +12,7 @@ import { MIN_STEP_NORMAL, STEPSIZE } from '../common/Pmove.ts';
 import type { Face } from '../common/model/BaseModel.ts';
 import type PlatformWorker from '../common/PlatformWorker.ts';
 import WorkerManager from '../common/WorkerManager.ts';
-import { eventBus, registry } from '../registry.mjs';
+import { eventBus, registry } from '../registry.ts';
 import type { BaseEntity, ServerEdict } from './Edict.ts';
 import type { CollisionTrace } from './physics/ServerCollisionSupport.ts';
 
diff --git a/source/engine/server/NavigationWorker.ts b/source/engine/server/NavigationWorker.ts
index 3353bb2b..bd251e40 100644
--- a/source/engine/server/NavigationWorker.ts
+++ b/source/engine/server/NavigationWorker.ts
@@ -1,5 +1,5 @@
 import WorkerFramework from '../common/WorkerFramework.ts';
-import { eventBus, registry } from '../registry.mjs';
+import { eventBus, registry } from '../registry.ts';
 
 import { Navigation, NavMeshOutOfDateException } from './Navigation.ts';
 import Vector from '../../shared/Vector.ts';
diff --git a/source/engine/server/Progs.ts b/source/engine/server/Progs.ts
index 124e8a2e..48a5c13b 100644
--- a/source/engine/server/Progs.ts
+++ b/source/engine/server/Progs.ts
@@ -6,7 +6,7 @@ import Cvar from '../common/Cvar.ts';
 import { HostError, MissingResourceError } from '../common/Errors.ts';
 import Q from '../../shared/Q.ts';
 import Vector from '../../shared/Vector.ts';
-import { eventBus, getCommonRegistry } from '../registry.mjs';
+import { eventBus, getCommonRegistry } from '../registry.ts';
 import { ED, ServerEdict } from './Edict.ts';
 import { ServerEngineAPI } from '../common/GameAPIs.ts';
 import PF, { etype, ofs } from './ProgsAPI.ts';
diff --git a/source/engine/server/ProgsAPI.ts b/source/engine/server/ProgsAPI.ts
index fd1e064d..78e73d1c 100644
--- a/source/engine/server/ProgsAPI.ts
+++ b/source/engine/server/ProgsAPI.ts
@@ -4,7 +4,7 @@ import Vector from '../../shared/Vector.ts';
 import Cmd from '../common/Cmd.ts';
 import { HostError } from '../common/Errors.ts';
 import { ServerEngineAPI } from '../common/GameAPIs.ts';
-import { eventBus, getCommonRegistry, registry } from '../registry.mjs';
+import { eventBus, getCommonRegistry, registry } from '../registry.ts';
 import { ED, ServerEdict } from './Edict.ts';
 
 type BuiltinValue = string | number | boolean | Vector | ServerEdict | null;
diff --git a/source/engine/server/Server.ts b/source/engine/server/Server.ts
index 788c04c4..7df5fb85 100644
--- a/source/engine/server/Server.ts
+++ b/source/engine/server/Server.ts
@@ -9,7 +9,7 @@ import * as Protocol from '../network/Protocol.ts';
 import * as Def from './../common/Def.ts';
 import Cmd, { ConsoleCommand } from '../common/Cmd.ts';
 import { ED, ServerEdict } from './Edict.ts';
-import { EventBus, eventBus, getCommonRegistry } from '../registry.mjs';
+import { EventBus, eventBus, getCommonRegistry } from '../registry.ts';
 import { ServerEngineAPI } from '../common/GameAPIs.ts';
 import * as Defs from '../../shared/Defs.ts';
 import { Navigation } from './Navigation.ts';
diff --git a/source/engine/server/ServerMessages.ts b/source/engine/server/ServerMessages.ts
index d9369513..1d15a895 100644
--- a/source/engine/server/ServerMessages.ts
+++ b/source/engine/server/ServerMessages.ts
@@ -6,7 +6,7 @@ import { SzBuffer } from '../network/MSG.ts';
 import * as Protocol from '../network/Protocol.ts';
 import * as Defs from '../../shared/Defs.ts';
 import Cvar from '../common/Cvar.ts';
-import { eventBus, getCommonRegistry } from '../registry.mjs';
+import { eventBus, getCommonRegistry } from '../registry.ts';
 import { ServerClient } from './Client.ts';
 import { ServerEntityState } from './ServerEntityState.ts';
 
diff --git a/source/engine/server/Sys.ts b/source/engine/server/Sys.ts
index d4d19b05..fcda5369 100644
--- a/source/engine/server/Sys.ts
+++ b/source/engine/server/Sys.ts
@@ -9,7 +9,7 @@ import express from 'express';
 import { join } from 'path';
 import { createServer } from 'http';
 
-import { eventBus, getCommonRegistry } from '../registry.mjs';
+import { eventBus, getCommonRegistry } from '../registry.ts';
 import Cvar from '../common/Cvar.ts';
 import Cmd from '../common/Cmd.ts';
 import Q from '../../shared/Q.ts';
diff --git a/source/engine/server/physics/ServerArea.ts b/source/engine/server/physics/ServerArea.ts
index 63252f38..c9280000 100644
--- a/source/engine/server/physics/ServerArea.ts
+++ b/source/engine/server/physics/ServerArea.ts
@@ -4,7 +4,7 @@ import type { BaseEntity, ServerEdict } from '../Edict.ts';
 import Vector from '../../../shared/Vector.ts';
 import * as Defs from '../../../shared/Defs.ts';
 import { Octree } from '../../../shared/Octree.ts';
-import { eventBus, getCommonRegistry } from '../../registry.mjs';
+import { eventBus, getCommonRegistry } from '../../registry.ts';
 import CollisionModelSource, { createRegistryCollisionModelSource } from '../../common/CollisionModelSource.ts';
 import { BrushModel } from '../../common/Mod.ts';
 
diff --git a/source/engine/server/physics/ServerClientPhysics.ts b/source/engine/server/physics/ServerClientPhysics.ts
index 9da7c898..bf12d393 100644
--- a/source/engine/server/physics/ServerClientPhysics.ts
+++ b/source/engine/server/physics/ServerClientPhysics.ts
@@ -2,7 +2,7 @@ import type { ServerEdict } from '../Edict.ts';
 
 import Vector from '../../../shared/Vector.ts';
 import * as Defs from '../../../shared/Defs.ts';
-import { eventBus, getCommonRegistry } from '../../registry.mjs';
+import { eventBus, getCommonRegistry } from '../../registry.ts';
 import {
   VELOCITY_EPSILON,
 } from './Defs.ts';
diff --git a/source/engine/server/physics/ServerCollision.ts b/source/engine/server/physics/ServerCollision.ts
index 3d8c2002..fae127a6 100644
--- a/source/engine/server/physics/ServerCollision.ts
+++ b/source/engine/server/physics/ServerCollision.ts
@@ -6,7 +6,7 @@ import * as Defs from '../../../shared/Defs.ts';
 import CollisionModelSource, { createRegistryCollisionModelSource } from '../../common/CollisionModelSource.ts';
 import { BrushModel, MeshModel } from '../../common/Mod.ts';
 import { BrushTrace, DIST_EPSILON, Trace as SharedTrace } from '../../common/Pmove.ts';
-import { eventBus, getCommonRegistry } from '../../registry.mjs';
+import { eventBus, getCommonRegistry } from '../../registry.ts';
 import {
   BrushCollisionState,
   CollisionState,
diff --git a/source/engine/server/physics/ServerLegacyHullCollision.ts b/source/engine/server/physics/ServerLegacyHullCollision.ts
index 3a70aff5..8c6c2abc 100644
--- a/source/engine/server/physics/ServerLegacyHullCollision.ts
+++ b/source/engine/server/physics/ServerLegacyHullCollision.ts
@@ -4,7 +4,7 @@ import type { CollisionTrace } from './ServerCollisionSupport.ts';
 import Vector from '../../../shared/Vector.ts';
 import * as Defs from '../../../shared/Defs.ts';
 import { DIST_EPSILON } from '../../common/Pmove.ts';
-import { eventBus, getCommonRegistry } from '../../registry.mjs';
+import { eventBus, getCommonRegistry } from '../../registry.ts';
 
 interface LegacyHull extends Hull {
   readonly firstclipnode: number;
diff --git a/source/engine/server/physics/ServerMovement.ts b/source/engine/server/physics/ServerMovement.ts
index 7d889164..728102c4 100644
--- a/source/engine/server/physics/ServerMovement.ts
+++ b/source/engine/server/physics/ServerMovement.ts
@@ -4,7 +4,7 @@ import type { ServerEdict } from '../Edict.ts';
 import Vector from '../../../shared/Vector.ts';
 import * as Defs from '../../../shared/Defs.ts';
 import { STEPSIZE } from '../../common/Pmove.ts';
-import { eventBus, getCommonRegistry } from '../../registry.mjs';
+import { eventBus, getCommonRegistry } from '../../registry.ts';
 
 interface EdictReferenceLike {
   readonly edict?: ServerEdict | null;
diff --git a/source/engine/server/physics/ServerPhysics.ts b/source/engine/server/physics/ServerPhysics.ts
index 1f34bacb..1555b495 100644
--- a/source/engine/server/physics/ServerPhysics.ts
+++ b/source/engine/server/physics/ServerPhysics.ts
@@ -4,7 +4,7 @@ import type { CollisionTrace } from './ServerCollisionSupport.ts';
 import Vector from '../../../shared/Vector.ts';
 import * as Defs from '../../../shared/Defs.ts';
 import Q from '../../../shared/Q.ts';
-import { eventBus, getCommonRegistry } from '../../registry.mjs';
+import { eventBus, getCommonRegistry } from '../../registry.ts';
 import {
   GROUND_ANGLE_THRESHOLD,
   VELOCITY_EPSILON,
diff --git a/test/client/client-connection.test.mjs b/test/client/client-connection.test.mjs
index 2f94fbf1..2464224b 100644
--- a/test/client/client-connection.test.mjs
+++ b/test/client/client-connection.test.mjs
@@ -6,7 +6,7 @@ import * as Def from '../../source/engine/common/Def.ts';
 import ClientConnection from '../../source/engine/client/ClientConnection.ts';
 import { clientRuntimeState, clientStaticState } from '../../source/engine/client/ClientState.ts';
 import { QSocket } from '../../source/engine/network/NetworkDrivers.ts';
-import { eventBus, registry } from '../../source/engine/registry.mjs';
+import { eventBus, registry } from '../../source/engine/registry.ts';
 
 /**
  * Build a minimal demo subsystem stub for connection tests.
diff --git a/test/client/client-messages.test.mjs b/test/client/client-messages.test.mjs
index 25c9287a..6f2a26d2 100644
--- a/test/client/client-messages.test.mjs
+++ b/test/client/client-messages.test.mjs
@@ -5,7 +5,7 @@ import * as Protocol from '../../source/engine/network/Protocol.ts';
 import { SzBuffer } from '../../source/engine/network/MSG.ts';
 import { ClientMessages } from '../../source/engine/client/ClientMessages.ts';
 import Vector from '../../source/shared/Vector.ts';
-import { eventBus, registry } from '../../source/engine/registry.mjs';
+import { eventBus, registry } from '../../source/engine/registry.ts';
 
 /**
  * Run a callback with just the registry modules ClientMessages depends on.
diff --git a/test/common/cmd.test.mjs b/test/common/cmd.test.mjs
index f40d09f0..45c49b96 100644
--- a/test/common/cmd.test.mjs
+++ b/test/common/cmd.test.mjs
@@ -4,7 +4,7 @@ import { describe, test } from 'node:test';
 import Cmd from '../../source/engine/common/Cmd.ts';
 import COM from '../../source/engine/common/Com.ts';
 import Cvar from '../../source/engine/common/Cvar.ts';
-import { registry } from '../../source/engine/registry.mjs';
+import { registry } from '../../source/engine/registry.ts';
 import { defaultMockRegistry, withMockRegistry } from '../physics/fixtures.mjs';
 
 /** @typedef {{ prints: string[], warnings: string[], errors: string[], dprints: string[], Print: (message: string) => void, PrintWarning: (message: string) => void, PrintError: (message: string) => void, DPrint: (message: string) => void }} ConsoleCapture */
diff --git a/test/common/console-commands.test.mjs b/test/common/console-commands.test.mjs
index 6e18caf8..ceedb2f1 100644
--- a/test/common/console-commands.test.mjs
+++ b/test/common/console-commands.test.mjs
@@ -2,7 +2,7 @@ import assert from 'node:assert/strict';
 import { describe, test } from 'node:test';
 
 import { InviteCommand } from '../../source/engine/network/ConsoleCommands.ts';
-import { eventBus, registry } from '../../source/engine/registry.mjs';
+import { eventBus, registry } from '../../source/engine/registry.ts';
 
 /**
  * Temporarily install a global value for the duration of a callback.
diff --git a/test/common/console.test.mjs b/test/common/console.test.mjs
index fafd517e..1a6de0ee 100644
--- a/test/common/console.test.mjs
+++ b/test/common/console.test.mjs
@@ -2,7 +2,7 @@ import assert from 'node:assert/strict';
 import { describe, test } from 'node:test';
 
 import Con from '../../source/engine/common/Console.ts';
-import { eventBus, registry } from '../../source/engine/registry.mjs';
+import { eventBus, registry } from '../../source/engine/registry.ts';
 
 /**
  * Install minimal registry stubs for Console and fire registry.frozen so
diff --git a/test/common/model-cache.test.mjs b/test/common/model-cache.test.mjs
index 393199c7..1b1747ff 100644
--- a/test/common/model-cache.test.mjs
+++ b/test/common/model-cache.test.mjs
@@ -5,7 +5,7 @@ import Mod from '../../source/engine/common/Mod.ts';
 import { AliasModel } from '../../source/engine/common/model/AliasModel.ts';
 import { Face } from '../../source/engine/common/model/BaseModel.ts';
 import { BrushModel, Node } from '../../source/engine/common/model/BSP.ts';
-import { eventBus, registry } from '../../source/engine/registry.mjs';
+import { eventBus, registry } from '../../source/engine/registry.ts';
 import Vector from '../../source/shared/Vector.ts';
 
 /** @typedef {import('../../source/engine/common/model/BaseModel.ts').BaseModel} BaseModel */
diff --git a/test/common/network-drivers.test.mjs b/test/common/network-drivers.test.mjs
index 5a810921..b42a7fe1 100644
--- a/test/common/network-drivers.test.mjs
+++ b/test/common/network-drivers.test.mjs
@@ -4,7 +4,7 @@ import { describe, test } from 'node:test';
 import { SzBuffer } from '../../source/engine/network/MSG.ts';
 import NET from '../../source/engine/network/Network.ts';
 import { BaseDriver, LoopDriver, QSocket } from '../../source/engine/network/NetworkDrivers.ts';
-import { eventBus, registry } from '../../source/engine/registry.mjs';
+import { eventBus, registry } from '../../source/engine/registry.ts';
 
 class RecordingDriver extends BaseDriver {
   calls = [];
diff --git a/test/common/registry.test.mjs b/test/common/registry.test.mjs
index 0fab9a9a..fba44148 100644
--- a/test/common/registry.test.mjs
+++ b/test/common/registry.test.mjs
@@ -1,7 +1,7 @@
 import assert from 'node:assert/strict';
 import { describe, test } from 'node:test';
 
-import { getClientRegistry, getCommonRegistry, registry } from '../../source/engine/registry.mjs';
+import { getClientRegistry, getCommonRegistry, registry } from '../../source/engine/registry.ts';
 
 void describe('registry views', () => {
   void test('return the shared registry singleton', () => {
diff --git a/test/common/workers.test.mjs b/test/common/workers.test.mjs
index 3d8bec77..a2a00f59 100644
--- a/test/common/workers.test.mjs
+++ b/test/common/workers.test.mjs
@@ -3,7 +3,7 @@ import { describe, test } from 'node:test';
 
 import PlatformWorker from '../../source/engine/common/PlatformWorker.ts';
 import WorkerManager from '../../source/engine/common/WorkerManager.ts';
-import { eventBus, registry } from '../../source/engine/registry.mjs';
+import { eventBus, registry } from '../../source/engine/registry.ts';
 
 class FakeNodeWorker {
   constructor() {
diff --git a/test/physics/collision-regressions.test.mjs b/test/physics/collision-regressions.test.mjs
index 8a5ad9fa..6963249b 100644
--- a/test/physics/collision-regressions.test.mjs
+++ b/test/physics/collision-regressions.test.mjs
@@ -6,7 +6,7 @@ import { content, flags, moveType, moveTypes, solid } from '../../source/shared/
 import { Brush, BrushModel, BrushSide } from '../../source/engine/common/model/BSP.ts';
 import { BrushTrace, Hull, PMF, Pmove, PmovePlayer, Trace } from '../../source/engine/common/Pmove.ts';
 import { BSP29Loader } from '../../source/engine/common/model/loaders/BSP29Loader.ts';
-import { eventBus, registry } from '../../source/engine/registry.mjs';
+import { eventBus, registry } from '../../source/engine/registry.ts';
 import { UserCmd } from '../../source/engine/network/Protocol.ts';
 import { ClientEdict } from '../../source/engine/client/ClientEntities.ts';
 import { ServerCollision } from '../../source/engine/server/physics/ServerCollision.ts';
diff --git a/test/physics/fixtures.mjs b/test/physics/fixtures.mjs
index 5235bca6..546e5208 100644
--- a/test/physics/fixtures.mjs
+++ b/test/physics/fixtures.mjs
@@ -3,7 +3,7 @@ import assert from 'node:assert/strict';
 import Vector from '../../source/shared/Vector.ts';
 import { content, flags, moveType, solid } from '../../source/shared/Defs.ts';
 import { Brush, BrushModel, BrushSide } from '../../source/engine/common/model/BSP.ts';
-import { eventBus, registry } from '../../source/engine/registry.mjs';
+import { eventBus, registry } from '../../source/engine/registry.ts';
 import { ClientEdict } from '../../source/engine/client/ClientEntities.ts';
 import { ServerPhysics } from '../../source/engine/server/physics/ServerPhysics.ts';
 
diff --git a/test/physics/map-pmove-harness.mjs b/test/physics/map-pmove-harness.mjs
index af7f2c26..4a7e395f 100644
--- a/test/physics/map-pmove-harness.mjs
+++ b/test/physics/map-pmove-harness.mjs
@@ -5,7 +5,7 @@ import COMClass from '../../source/engine/common/Com.ts';
 import Mod from '../../source/engine/common/Mod.ts';
 import { PMF, Pmove } from '../../source/engine/common/Pmove.ts';
 import { UserCmd } from '../../source/engine/network/Protocol.ts';
-import { eventBus, registry } from '../../source/engine/registry.mjs';
+import { eventBus, registry } from '../../source/engine/registry.ts';
 import Vector from '../../source/shared/Vector.ts';
 
 /**
diff --git a/test/physics/navigation.test.mjs b/test/physics/navigation.test.mjs
index 194a2251..360b5e7d 100644
--- a/test/physics/navigation.test.mjs
+++ b/test/physics/navigation.test.mjs
@@ -2,7 +2,7 @@ import assert from 'node:assert/strict';
 import { describe, test } from 'node:test';
 
 import Vector from '../../source/shared/Vector.ts';
-import { eventBus, registry } from '../../source/engine/registry.mjs';
+import { eventBus, registry } from '../../source/engine/registry.ts';
 import { Navigation } from '../../source/engine/server/Navigation.ts';
 
 const NAV_MONSTER_MINS = new Vector(-16.0, -16.0, -24.0);
diff --git a/test/physics/pmove.test.mjs b/test/physics/pmove.test.mjs
index 9bc99a6e..afd6abe0 100644
--- a/test/physics/pmove.test.mjs
+++ b/test/physics/pmove.test.mjs
@@ -8,7 +8,7 @@ import Vector from '../../source/shared/Vector.ts';
 import { content } from '../../source/shared/Defs.ts';
 import { DIST_EPSILON, PM_TYPE, PMF, Pmove, PmovePlayer, Trace } from '../../source/engine/common/Pmove.ts';
 import { UserCmd } from '../../source/engine/network/Protocol.ts';
-import { eventBus, registry } from '../../source/engine/registry.mjs';
+import { eventBus, registry } from '../../source/engine/registry.ts';
 
 import {
   assertNear,
diff --git a/test/physics/server-messages.test.mjs b/test/physics/server-messages.test.mjs
index 9a1b7b63..c062106f 100644
--- a/test/physics/server-messages.test.mjs
+++ b/test/physics/server-messages.test.mjs
@@ -1,7 +1,7 @@
 import { describe, test } from 'node:test';
 import assert from 'node:assert/strict';
 
-import { eventBus, registry } from '../../source/engine/registry.mjs';
+import { eventBus, registry } from '../../source/engine/registry.ts';
 import * as Protocol from '../../source/engine/network/Protocol.ts';
 import { SzBuffer } from '../../source/engine/network/MSG.ts';
 import SV from '../../source/engine/server/Server.ts';
diff --git a/test/physics/server-physics.test.mjs b/test/physics/server-physics.test.mjs
index d0480736..db27d4a8 100644
--- a/test/physics/server-physics.test.mjs
+++ b/test/physics/server-physics.test.mjs
@@ -3,7 +3,7 @@ import assert from 'node:assert/strict';
 
 import Vector from '../../source/shared/Vector.ts';
 import { content, flags, gameCapabilities, moveType, moveTypes, solid } from '../../source/shared/Defs.ts';
-import { eventBus, registry } from '../../source/engine/registry.mjs';
+import { eventBus, registry } from '../../source/engine/registry.ts';
 import { ServerArea } from '../../source/engine/server/physics/ServerArea.ts';
 import { ServerCollision } from '../../source/engine/server/physics/ServerCollision.ts';
 import { ServerPhysics } from '../../source/engine/server/physics/ServerPhysics.ts';
diff --git a/test/physics/server.test.mjs b/test/physics/server.test.mjs
index e6f23f8e..98df4033 100644
--- a/test/physics/server.test.mjs
+++ b/test/physics/server.test.mjs
@@ -3,7 +3,7 @@ import assert from 'node:assert/strict';
 
 import Vector from '../../source/shared/Vector.ts';
 import * as Protocol from '../../source/engine/network/Protocol.ts';
-import { eventBus, registry } from '../../source/engine/registry.mjs';
+import { eventBus, registry } from '../../source/engine/registry.ts';
 import SV from '../../source/engine/server/Server.ts';
 import { ServerClient } from '../../source/engine/server/Client.ts';
 
diff --git a/test/renderer/brush-model-renderer.test.mjs b/test/renderer/brush-model-renderer.test.mjs
index 8fb7ee78..98fceeba 100644
--- a/test/renderer/brush-model-renderer.test.mjs
+++ b/test/renderer/brush-model-renderer.test.mjs
@@ -2,7 +2,7 @@ import assert from 'node:assert/strict';
 import { describe, test } from 'node:test';
 
 import Vector from '../../source/shared/Vector.ts';
-import { eventBus, registry } from '../../source/engine/registry.mjs';
+import { eventBus, registry } from '../../source/engine/registry.ts';
 import { BrushModelRenderer, resolveBrushBloomContributionStrength } from '../../source/engine/client/renderer/BrushModelRenderer.ts';
 import { SimpleSkyBox } from '../../source/engine/client/renderer/Sky.ts';
 
diff --git a/test/renderer/post-process.test.mjs b/test/renderer/post-process.test.mjs
index 5e7c7f88..177ce93a 100644
--- a/test/renderer/post-process.test.mjs
+++ b/test/renderer/post-process.test.mjs
@@ -3,7 +3,7 @@ import { describe, test } from 'node:test';
 
 import GL from '../../source/engine/client/GL.ts';
 import PostProcess from '../../source/engine/client/renderer/PostProcess.ts';
-import { eventBus } from '../../source/engine/registry.mjs';
+import { eventBus } from '../../source/engine/registry.ts';
 
 void describe('PostProcess._resolveMSAAColorAttachment', () => {
   void test('resolves secondary attachments through draw attachment 0', () => {
diff --git a/test/renderer/r-sorting.test.mjs b/test/renderer/r-sorting.test.mjs
index 73dc651c..72010f3c 100644
--- a/test/renderer/r-sorting.test.mjs
+++ b/test/renderer/r-sorting.test.mjs
@@ -2,7 +2,7 @@ import assert from 'node:assert/strict';
 import { describe, test } from 'node:test';
 
 import R, { compareFogAndTurbulentItems } from '../../source/engine/client/R.ts';
-import { eventBus, registry } from '../../source/engine/registry.mjs';
+import { eventBus, registry } from '../../source/engine/registry.ts';
 import Vector from '../../source/shared/Vector.ts';
 
 void describe('compareFogAndTurbulentItems', () => {

From 5607e6740c022ddb7507458eb442c687dbb822a5 Mon Sep 17 00:00:00 2001
From: Christian R <github@chrisnew.de>
Date: Sat, 4 Apr 2026 18:06:57 +0300
Subject: [PATCH 49/67] TS: instructions for porting game code in future

---
 .../game-logic-port.instructions.md           | 538 ++++++++++++++++++
 1 file changed, 538 insertions(+)
 create mode 100644 .github/instructions/game-logic-port.instructions.md

diff --git a/.github/instructions/game-logic-port.instructions.md b/.github/instructions/game-logic-port.instructions.md
new file mode 100644
index 00000000..ad375589
--- /dev/null
+++ b/.github/instructions/game-logic-port.instructions.md
@@ -0,0 +1,538 @@
+## Game Logic TypeScript Port Guide
+
+This document covers porting the `source/game/` entity system from `.mjs` to `.ts`. It builds on the general [typescript-port.instructions.md](typescript-port.instructions.md) and addresses game-specific patterns: field serialization, the state machine, entity components, and Defs enums.
+
+All rules from the general TS porting guide still apply. This document only adds game-logic-specific guidance.
+
+---
+
+### 1. Serializable Fields — Replace `startFields`/`endFields` with a Decorator
+
+The current JS pattern snapshots `Object.keys()` before and after field assignment to discover which properties to serialize:
+
+```javascript
+// ❌ Current JS pattern
+_declareFields() {
+  super._declareFields();
+  this._serializer.startFields();
+  this.health = 100;
+  this.enemy = null;
+  this._serializer.endFields();
+  this._damageHandler = new DamageHandler(this);
+}
+```
+
+In TypeScript, use a **`@serializable` field decorator** that registers the property at class definition time. No runtime key diffing needed.
+
+```typescript
+// ✅ TypeScript pattern
+class BaseMonster extends BaseEntity {
+  @serializable health = 100;
+  @serializable enemy: BaseEntity | null = null;
+
+  // Components are regular fields — no decorator, not serialized.
+  protected readonly _damageHandler = new DamageHandler(this);
+}
+```
+
+#### Decorator implementation
+
+Use [TC39 Stage 3 decorators](https://github.com/tc39/proposal-decorators) (native in TypeScript 5.0+, no `experimentalDecorators` flag). The decorator records metadata on the class:
+
+```typescript
+const serializableFieldsKey = Symbol('serializableFields');
+
+type SerializableFieldsMap = Map<string, true>;
+
+/**
+ * Marks a class field for save/load serialization.
+ */
+function serializable<This, Value>(
+  _target: undefined, context: ClassFieldDecoratorContext<This, Value>,
+): void {
+  const fieldName = String(context.name);
+
+  context.metadata[serializableFieldsKey] ??= new Map<string, true>();
+  (context.metadata[serializableFieldsKey] as SerializableFieldsMap).set(fieldName, true);
+}
+```
+
+At serialization time, `Serializer` reads the metadata chain (walking the prototype chain to collect inherited decorated fields) instead of relying on an instance-level field list. This:
+
+- Eliminates `startFields()` / `endFields()` entirely.
+- Eliminates `_declareFields()` — fields are declared inline on the class body.
+- Makes it impossible to forget wrapping a field or accidentally serializing a component.
+- Works with `Object.seal(this)` because all fields are already declared as TS class fields.
+
+#### Inheritance
+
+Parent-class decorated fields are automatically included — `Symbol.metadata` propagates up the prototype chain. No `super._declareFields()` call needed.
+
+#### Serializer changes
+
+The `Serializer` constructor changes from taking a `(object, engine)` pair to reading from class metadata:
+
+```typescript
+class Serializer {
+  getSerializableFields(instance: object): string[] {
+    const fields: string[] = [];
+    let proto = Object.getPrototypeOf(instance);
+    while (proto) {
+      const meta = proto.constructor[Symbol.metadata];
+      const map = meta?.[serializableFieldsKey] as SerializableFieldsMap | undefined;
+      if (map) {
+        for (const key of map.keys()) {
+          if (!fields.includes(key)) {
+            fields.push(key);
+          }
+        }
+      }
+      proto = Object.getPrototypeOf(proto);
+    }
+    return fields;
+  }
+}
+```
+
+#### `_declareFields()` removal checklist
+
+| Before (JS) | After (TS) |
+|---|---|
+| Override `_declareFields()`, call `super._declareFields()` | Delete the method entirely |
+| `this._serializer.startFields()` / `endFields()` | Delete both calls |
+| Field assignments inside the boundary | Move to class field declarations with `@serializable` |
+| Component creation after `endFields()` | Regular class fields, no decorator |
+| `this._serializer = new Serializer(this, this.engine)` in constructor | One shared `Serializer` per call, or construct it lazily; the serializer reads metadata, not per-instance lists |
+
+---
+
+### 2. `Object.seal(this)` — Replace with TypeScript Strictness
+
+`BaseEntity` currently calls `Object.seal(this)` after `_declareFields()` to prevent accidental property additions at runtime. In TypeScript this is no longer necessary:
+
+- `noUncheckedIndexedAccess` and strict property checking catch typos at compile time.
+- TS class fields define the shape exhaustively.
+
+**Remove `Object.seal(this)` from base entity constructors.** If runtime sealing is still wanted for defense-in-depth against map data injection in `assignInitialData`, do it inside `assignInitialData` after construction — not in the constructor (where it forces the `_declareFields` ceremony).
+
+---
+
+### 3. State Machine — Typed Animation Sequences
+
+The current system defines ~200 states per monster as individual `_defineState()` calls with string keys, string frame names, string next-state references, and untyped `function()` callbacks. Problems:
+
+- Typos in state names or frame names are silent.
+- `function() { this._ai.stand(); }` callbacks lose `this` typing.
+- Verbose: 8 identical calls for an 8-frame stand loop.
+
+#### 3a. Typed state key union
+
+Each entity class should declare a string literal union of its valid state names:
+
+```typescript
+type SoldierState =
+  | 'army_stand1' | 'army_stand2' | 'army_stand3' | 'army_stand4'
+  | 'army_stand5' | 'army_stand6' | 'army_stand7' | 'army_stand8'
+  | 'army_run1'   | 'army_run2'   | 'army_run3'   | 'army_run4'
+  // ...
+  | 'army_die1'   | 'army_die2'   | 'army_die3';
+```
+
+The `_defineState` and `_runState` signatures become generic on the concrete state key:
+
+```typescript
+// On BaseEntity<S extends string = string>:
+protected static _defineState<S extends string>(
+  state: S, keyframe: string | number | null, nextState: S | null, handler?: (this: BaseEntity) => void,
+): void;
+
+protected _runState(state?: S | null): boolean;
+```
+
+This catches typos at compile time. Generating the union type is straightforward — it is the set of first-argument strings across all `_defineState` calls.
+
+#### 3b. Animation sequence helper
+
+Most state definitions are repetitive animation loops. Introduce a helper that generates a sequence:
+
+```typescript
+/**
+ * Defines a looping sequence of animation frames.
+ * @param prefix - State name prefix (e.g. `'army_stand'`).
+ * @param frames - Ordered frame names from the model QC.
+ * @param handler - Callback invoked on each frame.
+ * @param loop - Whether the last frame loops back to the first. Default `true`.
+ */
+protected static _defineSequence(
+  prefix: string,
+  frames: string[],
+  handler: (this: BaseEntity, frameIndex: number) => void,
+  loop = true,
+): void {
+  for (let i = 0; i < frames.length; i++) {
+    const state = `${prefix}${i + 1}`;
+    const next = i < frames.length - 1
+      ? `${prefix}${i + 2}`
+      : (loop ? `${prefix}1` : null);
+    this._defineState(state, frames[i], next, function () { handler.call(this, i); });
+  }
+}
+```
+
+This collapses 8 stand-state calls into one:
+
+```typescript
+// ❌ Before: 8 calls
+this._defineState('army_stand1', 'stand1', 'army_stand2', function () { this._ai.stand(); });
+this._defineState('army_stand2', 'stand2', 'army_stand3', function () { this._ai.stand(); });
+// ... 6 more
+
+// ✅ After: 1 call
+this._defineSequence('army_stand', ['stand1','stand2','stand3','stand4','stand5','stand6','stand7','stand8'],
+  function () { this._ai.stand(); });
+```
+
+For sequences where individual frames need different behavior (like walk speeds or firing on frame 4), use the `frameIndex` parameter or fall back to individual `_defineState` calls:
+
+```typescript
+const walkSpeeds = [1,1,1,1,2,3,4,4,2,2,2,1,0,1,1,1,3,3,3,3,2,1,1,1];
+this._defineSequence('army_walk',
+  Array.from({length: 24}, (_, i) => `prowl_${i + 1}`),
+  function (frameIndex) {
+    if (frameIndex === 0) { this.idleSound(); }
+    this._ai.walk(walkSpeeds[frameIndex]);
+  });
+```
+
+#### 3c. Model QC — Static parsing only
+
+The `_modelQC` string and `_parseModelData` pattern can stay mostly as-is, but:
+
+- Make `_modelData` typed: `static readonly _modelData: Readonly<ParsedQC> | null`.
+- Consider moving the raw QC string into a separate `.qc` asset file loaded at build time (Vite raw import) so it doesn't bloat the TS source. Not mandatory, but cleaner for large QC definitions.
+
+#### 3d. Callbacks should be arrow functions or method references
+
+The current `function() { this._ai.stand(); }` pattern requires `call(this)` dispatch and loses TS `this` typing. Options:
+
+1. **Arrow in `_defineState`**: Already works if `_defineState` stores it and `_runState` calls `handler.call(this)`. The `this` parameter annotation gives type safety:
+   ```typescript
+   this._defineState('army_stand1', 'stand1', 'army_stand2',
+     function (this: ArmySoldierMonster) { this._ai.stand(); });
+   ```
+
+2. **Named method references**: For unique behaviors (firing, refire checks), define a private method and pass its reference. More readable for complex logic.
+
+---
+
+### 4. Defs Enums — Port to Native TypeScript Enums
+
+Current `Defs.mjs` re-exports engine-side frozen objects and defines game-specific ones:
+
+```javascript
+// ❌ Current JS
+export const dead = Object.freeze({ DEAD_NO: 0, DEAD_DYING: 1, DEAD_DEAD: 2, DEAD_RESPAWNABLE: 3 });
+export const damage = Object.freeze({ DAMAGE_NO: 0, DAMAGE_YES: 1, DAMAGE_AIM: 2 });
+```
+
+Port to TS enums per the general TS guide:
+
+```typescript
+// ✅ TS enum
+export enum Dead {
+  NO = 0,
+  DYING = 1,
+  DEAD = 2,
+  RESPAWNABLE = 3,
+}
+
+export enum Damage {
+  NO = 0,
+  YES = 1,
+  AIM = 2,
+}
+```
+
+#### Naming conventions
+
+| JS name | TS name | Members |
+|---|---|---|
+| `dead.DEAD_NO` | `Dead.NO` | Drop the redundant prefix |
+| `damage.DAMAGE_YES` | `Damage.YES` | |
+| `moveType.MOVETYPE_PUSH` | `MoveType.PUSH` | |
+| `solid.SOLID_TRIGGER` | `Solid.TRIGGER` | |
+| `items.IT_SHOTGUN` | `Item.SHOTGUN` | |
+| `effect.EF_MUZZLEFLASH` | `Effect.MUZZLEFLASH` | |
+| `state.STATE_TOP` | `PropState.TOP` | Rename `state` export to avoid conflict with `_stateCurrent` |
+
+#### Bit-flag enums
+
+For `items`, `flags`, `effects`, and other bitfields, use `const enum` only if no runtime iteration is needed. Otherwise use a regular `enum`. Continue using bitwise operators (`|`, `&`, `~`) — TS enums support this.
+
+```typescript
+export enum Item {
+  AXE = 4096,
+  SHOTGUN = 1,
+  SUPER_SHOTGUN = 2,
+  // ...
+}
+
+// Usage stays the same:
+this.items |= Item.QUAD;
+this.items &= ~(Item.ARMOR1 | Item.ARMOR2 | Item.ARMOR3);
+```
+
+#### Engine re-exports
+
+Values re-exported from `engine/Defs.ts` (`solid`, `moveType`, `flags`, etc.) should be imported directly from the engine module rather than re-exporting through `game/id1/Defs.ts`. If the game-side module needs to add game-specific values, extend via a new enum or union — don't shadow the engine enum.
+
+---
+
+### 5. Entity Components — Typed Composition
+
+#### `EntityWrapper` base
+
+Port `EntityWrapper` to a generic TypeScript class:
+
+```typescript
+abstract class EntityWrapper<T extends BaseEntity = BaseEntity> {
+  readonly #entity: WeakRef<T>;
+
+  constructor(entity: T) {
+    this.#entity = new WeakRef(entity);
+  }
+
+  protected get _entity(): T {
+    return this.#entity.deref()!;
+  }
+
+  protected get _game(): ServerGameAPI {
+    return this._entity.game;
+  }
+
+  protected get _engine(): ServerEngineAPI {
+    return this._entity.engine;
+  }
+}
+```
+
+#### `DamageHandler` and `DamageInflictor`
+
+These already extend `EntityWrapper`. In TS, parameterize on the entity type so that `this._entity` resolves without casts:
+
+```typescript
+class DamageHandler extends EntityWrapper<BaseMonster | PlayerEntity> {
+  // this._entity is typed — no casts needed for health, thinkPain, etc.
+}
+```
+
+#### `Sub` (mover helper)
+
+Port similarly. The nested `_moveData` / `_useData` plain objects should become typed interfaces:
+
+```typescript
+interface MoveData {
+  finalOrigin: Vector | null;
+  finalAngle: Vector | null;
+  callback: (() => void) | null;
+  active: boolean;
+}
+
+interface UseData {
+  callback: ((activator: BaseEntity) => void) | null;
+}
+```
+
+If `Sub` needs serialization, its fields should use `@serializable` like everything else.
+
+#### `AI` component
+
+Same pattern — `EntityWrapper<BaseMonster>`. The AI methods (`stand`, `walk`, `run`, `face`, etc.) get proper signatures.
+
+---
+
+### 6. Entity Base Class — Structural Cleanup
+
+#### Constructor simplification
+
+With `@serializable` decorators and TS class fields, the `BaseEntity` constructor shrinks significantly. Fields move to class-body declarations:
+
+```typescript
+export default class BaseEntity {
+  static readonly classname: string | null = null;
+  static readonly clientEdictHandler: typeof BaseClientEdictHandler | null = null;
+  static readonly clientEntityFields: string[] = [];
+
+  // Serialized core fields
+  @serializable ltime = 0.0;
+  @serializable origin = new Vector();
+  @serializable oldorigin = new Vector();
+  @serializable angles = new Vector();
+  @serializable mins = new Vector();
+  @serializable maxs = new Vector();
+  @serializable absmin = new Vector();
+  @serializable absmax = new Vector();
+  @serializable size = new Vector();
+  @serializable velocity = new Vector();
+  @serializable avelocity = new Vector();
+  @serializable movetype: MoveType = MoveType.NONE;
+  @serializable solid: Solid = Solid.NOT;
+  @serializable flags: number = 0;
+  // ... remaining fields
+
+  // Non-serialized
+  readonly engine: ServerEngineAPI;
+  readonly game: ServerGameAPI;
+
+  protected _sub: Sub | null = null;
+  protected _damageHandler: DamageHandler | null = null;
+
+  constructor(edict: ServerEdict, gameAPI: ServerGameAPI) {
+    this.#edict = edict ? new WeakRef(edict) : null;
+    this.engine = gameAPI.engine;
+    this.game = gameAPI;
+    this._precache();
+  }
+}
+```
+
+This eliminates the ~120-line constructor body that currently assigns every field.
+
+#### `clientEntityFields` — Type-safe with `keyof`
+
+```typescript
+static readonly clientEntityFields: readonly (keyof PlayerEntity)[] = [
+  'items', 'armortype', 'armorvalue', 'health',
+];
+```
+
+This catches typos and renames at compile time.
+
+#### `assignInitialData` — Input validation
+
+The current method uses `switch(true)` with `instanceof Vector` / `typeof === 'number'` to cast string values from map data. In TS, define:
+
+```typescript
+interface EdictInitialData {
+  readonly [key: string]: string;
+}
+```
+
+And use a type-guard or explicit parse map instead of the generic `instanceof` chain. Consider extracting a `parseFieldValue(currentValue: unknown, rawString: string): unknown` helper.
+
+---
+
+### 7. `ScheduledThink` — Lightweight Typed Class
+
+```typescript
+interface ScheduledThink {
+  nextThink: number;
+  callback: (this: BaseEntity) => void;
+  identifier: string | null;
+  isRequired: boolean;
+}
+```
+
+There is no need for `ScheduledThink` to have its own `Serializer`. It should be a plain interface or a lightweight `class` that does not have its own serialization infrastructure. The parent entity's serializer already handles the `_scheduledThinks` array through `TYPE_ARRAY` → `TYPE_SERIALIZABLE` recursion.
+
+However — **reconsider whether `ScheduledThink` needs serialization at all**. The callbacks are `function() {}` closures that get serialized via `toString()` and deserialized via `new Function()`. This is:
+
+- A security concern (`new Function` is eval-adjacent).
+- Fragile (arrow functions, closures over locals, minified code all break it).
+- Unnecessary if schedule reconstruction happens on load (entities re-schedule their thinks in `spawn()` or state restoration).
+
+If thinks can be reconstructed from entity state after deserialization, drop function serialization entirely and make `ScheduledThink` a simple runtime-only structure.
+
+---
+
+### 8. Entity Registration & Static Members
+
+#### `static classname`
+
+Use `static readonly override` in subclasses:
+
+```typescript
+class ArmySoldierMonster extends WalkMonster {
+  static readonly classname = 'monster_army' as const;
+  // ...
+}
+```
+
+The `as const` ensures the type is the literal `'monster_army'`, not `string`.
+
+#### Model statics
+
+```typescript
+class ArmySoldierMonster extends WalkMonster {
+  static readonly classname = 'monster_army' as const;
+  protected static readonly _health = 30;
+  protected static readonly _size = [new Vector(-16, -16, -24), new Vector(16, 16, 40)] as const;
+  protected static readonly _modelDefault = 'progs/soldier.mdl';
+  protected static readonly _modelHead = 'progs/h_guard.mdl';
+}
+```
+
+#### `static _states` typing
+
+```typescript
+interface StateDefinition {
+  readonly keyframe: string | number | null;
+  readonly nextState: string | null;
+  readonly handler: ((this: BaseEntity) => void) | null;
+}
+
+// On the class:
+protected static _states: Readonly<Record<string, StateDefinition>> | null = null;
+```
+
+---
+
+### 9. Port Order
+
+Port in dependency order, bottom-up:
+
+1. **`Defs.mjs` → `Defs.ts`** — Enums first; everything depends on them.
+2. **`helper/MiscHelpers.mjs` → `helper/MiscHelpers.ts`** — `Serializer`, `EntityWrapper`, decorator infrastructure.
+3. **`BaseEntity.mjs` → `BaseEntity.ts`** — Core entity, decorators, state machine.
+4. **`Subs.mjs` → `Subs.ts`** — `Sub`, `TriggerFieldEntity`, `DelayedThinkEntity`.
+5. **`entity/Weapons.mjs` → `entity/Weapons.ts`** — `DamageHandler`, `DamageInflictor`, projectiles.
+6. **`entity/Items.mjs` → `entity/Items.ts`** — Item hierarchy.
+7. **`entity/props/` → `.ts`** — `BasePropEntity`, Doors, Platforms, Buttons.
+8. **`entity/monster/BaseMonster.mjs` → `BaseMonster.ts`** — Monster base + Walk/Fly/Swim.
+9. **Concrete monsters** — Soldier, Demon, Ogre, etc. (one at a time).
+10. **`entity/Player.mjs` → `Player.ts`** — Largest entity, do last.
+11. **`entity/Triggers.mjs`, `entity/Misc.mjs`, `entity/Worldspawn.mjs`**.
+12. **`GameAPI.mjs` → `GameAPI.ts`**, `main.mjs → main.ts`.
+13. **`hellwave/` game mod** — After `id1` is fully ported.
+
+At each step: port, add/update unit tests, run `eslint --fix`, verify `tsc --noEmit`.
+
+---
+
+### 10. Unit Test Considerations
+
+- Serialization behavior must be regression-tested: create an entity, serialize, deserialize, assert field equality. The decorator-based approach changes the collection mechanism, so existing serialization round-trip tests need to keep passing.
+- State machine tests: verify that `_runState` advances through the expected sequence and invokes handlers. Test with a small synthetic entity, not a full monster.
+- `assignInitialData`: test that string-to-type coercion works for Vectors, numbers, and strings. Test that private fields and functions are rejected.
+- Mock pattern: use `withMockRegistry` as described in the unit test instructions. Entity construction needs a mock `ServerEngineAPI` and `ServerGameAPI`.
+
+---
+
+### 11. Migration Checklist Per File
+
+For each `.mjs` → `.ts` entity file:
+
+- [ ] Rename to `.ts`.
+- [ ] Replace all JSDoc `@type`/`@param` type annotations with TS syntax. Keep description text.
+- [ ] Replace `_declareFields()` + `startFields`/`endFields` with `@serializable` field decorators.
+- [ ] Remove `Object.seal(this)` from constructors.
+- [ ] Convert frozen-object enums to TS `enum`.
+- [ ] Add access modifiers (`protected`, `readonly`, `#private`).
+- [ ] Add `override` to all overridden methods.
+- [ ] Type `_states` and state names.
+- [ ] Collapse repetitive `_defineState` sequences with `_defineSequence` where appropriate.
+- [ ] Replace `/** @typedef */` imports with `import type`.
+- [ ] Verify all components (`DamageHandler`, `Sub`, `AI`) are typed via generic `EntityWrapper<T>`.
+- [ ] Run `eslint --fix` and `tsc --noEmit`.
+- [ ] Add or update unit tests for serialization round-trip and key behaviors.
+- [ ] Delete the old `.mjs` file once all importers reference the `.ts` version.

From 3b7ccb2f50a07cfea0e96bc8b5f0dd503dd261b5 Mon Sep 17 00:00:00 2001
From: Christian R <github@chrisnew.de>
Date: Sat, 4 Apr 2026 18:54:50 +0300
Subject: [PATCH 50/67] TS: polish tsc findings

---
 source/engine/client/ClientConnection.ts      | 12 ++---
 source/engine/client/ClientDemos.ts           |  4 +-
 source/engine/client/ClientEntities.ts        |  2 +-
 source/engine/client/ClientInput.ts           |  2 +-
 source/engine/client/ClientMessages.ts        |  2 +-
 .../client/ClientServerCommandHandlers.ts     |  6 +--
 source/engine/client/Draw.ts                  | 47 ++++++++++++-------
 source/engine/client/GL.ts                    | 10 ++--
 source/engine/client/IN.ts                    |  4 +-
 source/engine/client/Key.ts                   | 28 +++++------
 source/engine/client/Menu.ts                  | 24 +++++-----
 source/engine/client/R.ts                     |  2 +-
 source/engine/client/SCR.ts                   | 21 +++++----
 source/engine/client/Sbar.ts                  | 26 +++++-----
 source/engine/client/V.ts                     | 30 +++++++-----
 .../client/renderer/AliasModelRenderer.ts     | 10 ++--
 .../client/renderer/BrushModelRenderer.ts     | 23 +++++----
 .../client/renderer/MeshModelRenderer.ts      |  2 +-
 .../client/renderer/SpriteModelRenderer.ts    |  4 +-
 source/engine/common/GameAPIs.ts              |  8 ++--
 source/engine/common/Host.ts                  |  6 +--
 source/engine/common/Mod.ts                   |  2 +-
 source/engine/common/W.ts                     |  8 ++--
 source/engine/common/model/SpriteModel.ts     | 20 --------
 .../common/model/loaders/AliasMDLLoader.ts    | 10 ++--
 source/engine/network/MSG.ts                  |  2 +-
 source/engine/server/Edict.ts                 |  8 ++--
 source/engine/server/Navigation.ts            |  2 +-
 source/engine/server/Progs.ts                 | 14 +++---
 source/engine/server/ProgsAPI.ts              |  8 ++--
 source/engine/server/ServerMessages.ts        |  2 +-
 .../engine/server/physics/ServerCollision.ts  |  2 +-
 .../engine/server/physics/ServerMovement.ts   |  6 +--
 33 files changed, 178 insertions(+), 179 deletions(-)

diff --git a/source/engine/client/ClientConnection.ts b/source/engine/client/ClientConnection.ts
index c9d72378..13abb3eb 100644
--- a/source/engine/client/ClientConnection.ts
+++ b/source/engine/client/ClientConnection.ts
@@ -71,7 +71,7 @@ export default class ClientConnection {
   }
 
   getMessage(): number {
-    if (this.clientDemos.demoplayback === true) {
+    if (this.clientDemos.demoplayback) {
       return this.clientDemos.getMessage();
     }
 
@@ -135,7 +135,7 @@ export default class ClientConnection {
       throw new HostError('CL.SendCmd: no active connection');
     }
 
-    if (NET.CanSendMessage(netcon) !== true) {
+    if (!NET.CanSendMessage(netcon)) {
       Con.DPrint('CL.SendCmd: can\'t send\n');
       return;
     }
@@ -178,13 +178,13 @@ export default class ClientConnection {
       this.state.gameAPI = null;
     }
 
-    if (this.cls.demoplayback === true) {
+    if (this.cls.demoplayback) {
       this.clientDemos.stopPlayback();
     } else if (this.cls.state === Def.clientConnectionState.connecting) {
       this.cls.state = Def.clientConnectionState.disconnected;
       this.cls.message.clear();
     } else if (this.cls.state === Def.clientConnectionState.connected) {
-      if (this.cls.demorecording === true) {
+      if (this.cls.demorecording) {
         void Cmd.ExecuteString('stopdemo\n');
       }
       Con.DPrint('Sending clc_disconnect\n');
@@ -198,7 +198,7 @@ export default class ClientConnection {
         NET.Close(this.cls.netcon);
       }
       this.cls.state = Def.clientConnectionState.disconnected;
-      if (SV.server.active === true) {
+      if (SV.server.active) {
         Host.ShutdownServer();
       }
     }
@@ -237,7 +237,7 @@ export default class ClientConnection {
   }
 
   connect(host: string): void {
-    if (this.cls.demoplayback === true) {
+    if (this.cls.demoplayback) {
       return;
     }
 
diff --git a/source/engine/client/ClientDemos.ts b/source/engine/client/ClientDemos.ts
index e2c72f85..525f6766 100644
--- a/source/engine/client/ClientDemos.ts
+++ b/source/engine/client/ClientDemos.ts
@@ -72,7 +72,7 @@ export default class ClientDemos {
     console.assert(this.demoplayback, 'must be in playback mode to get message');
 
     if (CL.cls.signon === 4) {
-      if (this.timedemo === true) {
+      if (this.timedemo) {
         if (Host.framecount === this.td_lastframe) {
           return 0;
         }
@@ -174,7 +174,7 @@ export default class ClientDemos {
       }
     }
 
-    if (neg === true) {
+    if (neg) {
       this.forcetrack = -this.forcetrack;
     }
 
diff --git a/source/engine/client/ClientEntities.ts b/source/engine/client/ClientEntities.ts
index 6f572908..575676c6 100644
--- a/source/engine/client/ClientEntities.ts
+++ b/source/engine/client/ClientEntities.ts
@@ -781,7 +781,7 @@ export default class ClientEntities {
     // reset all visible entities
     this.num_visedicts = 0;
 
-    const isLegacy = CL.cls.legacy_demo === true;
+    const isLegacy = CL.cls.legacy_demo;
     const mtime0 = CL.state.clientMessages.mtime[0];
 
     for (let i = 1; i < this.entities.length; i++) {
diff --git a/source/engine/client/ClientInput.ts b/source/engine/client/ClientInput.ts
index 84feace2..0c1013f6 100644
--- a/source/engine/client/ClientInput.ts
+++ b/source/engine/client/ClientInput.ts
@@ -289,7 +289,7 @@ export default class ClientInput {
     buf.writeByte(CL.state.cmd.impulse);
     buf.writeByte(CL.state.moveSequence);
 
-    if (CL.cls.demoplayback === true) {
+    if (CL.cls.demoplayback) {
       return;
     }
     if (++CL.state.movemessages <= 2) {
diff --git a/source/engine/client/ClientMessages.ts b/source/engine/client/ClientMessages.ts
index ee3b357c..4e895cc0 100644
--- a/source/engine/client/ClientMessages.ts
+++ b/source/engine/client/ClientMessages.ts
@@ -200,7 +200,7 @@ export class ClientMessages {
     CL.state.stats[Def.stat.nails] = NET.message.readByte();
     CL.state.stats[Def.stat.rockets] = NET.message.readByte();
     CL.state.stats[Def.stat.cells] = NET.message.readByte();
-    if (COM.standard_quake === true) {
+    if (COM.standard_quake) {
       CL.state.stats[Def.stat.activeweapon] = NET.message.readByte();
     } else {
       CL.state.stats[Def.stat.activeweapon] = 1 << NET.message.readByte();
diff --git a/source/engine/client/ClientServerCommandHandlers.ts b/source/engine/client/ClientServerCommandHandlers.ts
index 76043280..2edc6785 100644
--- a/source/engine/client/ClientServerCommandHandlers.ts
+++ b/source/engine/client/ClientServerCommandHandlers.ts
@@ -256,7 +256,7 @@ function parseServerData() {
         CL.state.gameAPI.loadGame(CL.state.loadClientData[0]);
       }
     }
-    if (CL.state.loadClientData && CL.state.loadClientData[1]) {
+    if (CL.state.loadClientData && Array.isArray(CL.state.loadClientData[1])) {
       R.DeserializeParticles(CL.state.loadClientData[1]);
     }
     CL.state.loadClientData = null;
@@ -955,7 +955,7 @@ function handleCdTrack() {
   CL.state.cdtrack = NET.message.readByte();
   NET.message.readByte(); // unused (usually always the same as cdtrack)
 
-  if (((CL.cls.demoplayback === true) || (CL.cls.demorecording === true)) && (CL.cls.forcetrack !== -1)) {
+  if ((CL.cls.demoplayback || CL.cls.demorecording) && CL.cls.forcetrack !== -1) {
     eventBus.publish('client.cdtrack', CL.cls.forcetrack);
   } else {
     eventBus.publish('client.cdtrack', CL.state.cdtrack);
@@ -1125,7 +1125,7 @@ export function parseServerMessage() {
       break;
     }
 
-    if (NET.message.badread === true) {
+    if (NET.message.badread) {
       CL.PrintLastServerMessages();
       throw new HostError('CL.ParseServerMessage: Bad server message');
     }
diff --git a/source/engine/client/Draw.ts b/source/engine/client/Draw.ts
index e68000e1..3c427e0f 100644
--- a/source/engine/client/Draw.ts
+++ b/source/engine/client/Draw.ts
@@ -206,6 +206,11 @@ export default class Draw {
     Draw.#loading = loading;
 
     const conchars = Draw.#gfxWad.getLumpMipmap('CONCHARS', 0);
+
+    if (conchars === null) {
+      throw new MissingResourceError('gfx.wad/CONCHARS');
+    }
+
     Draw.#chars = GLTexture.FromLumpTexture(conchars).lockTextureMode('GL_NEAREST');
 
     Draw.#conback = (() => {
@@ -218,7 +223,7 @@ export default class Draw {
       }
 
       // we are writing the version into the conback texture
-      const version = Host.version.string;
+      const version = Host.version!.string;
       const color = ClientEngineAPI.IndexToRGB(95);
       for (let i = 0; i < version.length; i++) {
         charToConback(conback.data, conchars.data, version.charCodeAt(i), 59829 - ((version.length - i) * 8), color);
@@ -242,7 +247,12 @@ export default class Draw {
 
     eventBus.subscribe('com.fs.being', Draw.BeginDisc);
     eventBus.subscribe('com.fs.end', Draw.EndDisc);
-    VID.mainwindow.style.backgroundImage = `url("${Draw.#gfxWad.getLumpMipmap('BACKTILE', 0).toDataURL()}")`;
+
+    const backtile = Draw.#gfxWad.getLumpMipmap('BACKTILE', 0);
+
+    if (backtile !== null) {
+      VID.mainwindow.style.backgroundImage = `url("${backtile.toDataURL()}")`;
+    }
 
     Draw.#fbo = gl.createFramebuffer(); // TODO: cleanup
   }
@@ -268,8 +278,8 @@ export default class Draw {
    * @param scale The scale factor.
    */
   static Character(x: number, y: number, num: number, scale = 1.0): void {
-    const program = GL.UseProgram('pic', true);
-    gl.uniform3f(program.uColor, 1.0, 1.0, 1.0);
+    const program = GL.UseProgram('pic', true)!;
+    gl.uniform3f(program.uColor!, 1.0, 1.0, 1.0);
     if (scale > HIDPI_THRESHOLD) {
       Draw.#charsLarge!.bind(program.tTexture, true);
     } else {
@@ -288,8 +298,8 @@ export default class Draw {
    * @returns The new x position after drawing the string.
    */
   static String(x: number, y: number, str: string, scale = 1.0, color = new Vector(1.0, 1.0, 1.0)): number {
-    const program = GL.UseProgram('pic', true);
-    gl.uniform3f(program.uColor, color[0], color[1], color[2]);
+    const program = GL.UseProgram('pic', true)!;
+    gl.uniform3f(program.uColor!, color[0], color[1], color[2]);
     if (scale > HIDPI_THRESHOLD) {
       Draw.#charsLarge!.bind(program.tTexture, true);
     } else {
@@ -312,8 +322,8 @@ export default class Draw {
    * @returns The new x position after drawing the string.
    */
   static StringWhite(x: number, y: number, str: string, scale = 1.0): number {
-    const program = GL.UseProgram('pic', true);
-    gl.uniform3f(program.uColor, 1.0, 1.0, 1.0);
+    const program = GL.UseProgram('pic', true)!;
+    gl.uniform3f(program.uColor!, 1.0, 1.0, 1.0);
     if (scale > HIDPI_THRESHOLD) {
       Draw.#charsLarge!.bind(program.tTexture, true);
     } else {
@@ -333,7 +343,8 @@ export default class Draw {
    */
   static LoadPicFromWad(name: string): GLTexture {
     const texdata = Draw.#gfxWad!.getLumpMipmap(name, 0);
-    return GLTexture.FromLumpTexture(texdata).lockTextureMode('GL_NEAREST');
+    console.assert(texdata !== null, `Lump ${name} not found in gfx.wad`);
+    return GLTexture.FromLumpTexture(texdata!).lockTextureMode('GL_NEAREST');
   }
 
   /**
@@ -374,7 +385,7 @@ export default class Draw {
    * @returns The loaded picture texture.
    */
   static async LoadPicFromFile(filename: string): Promise<GLTexture> {
-    return (await GLTexture.FromImageFile(filename)).lockTextureMode('GL_NEAREST');
+    return (await GLTexture.FromImageFile(filename))!.lockTextureMode('GL_NEAREST');
   }
 
   /**
@@ -398,8 +409,8 @@ export default class Draw {
     if (!pic.ready) {
       return;
     }
-    const program = GL.UseProgram('pic', true);
-    gl.uniform3f(program.uColor, 1.0, 1.0, 1.0);
+    const program = GL.UseProgram('pic', true)!;
+    gl.uniform3f(program.uColor!, 1.0, 1.0, 1.0);
     pic.bind(program.tTexture, true);
     GL.StreamDrawTexturedQuad(x, y, pic.width * scale, pic.height * scale, 0.0, 0.0, 1.0, 1.0);
     GL.StreamFlush();
@@ -419,8 +430,8 @@ export default class Draw {
       return;
     }
     GL.StreamFlush();
-    const program = GL.UseProgram('pic-translate');
-    gl.uniform3f(program.uColor, 1.0, 1.0, 1.0);
+    const program = GL.UseProgram('pic-translate')!;
+    gl.uniform3f(program.uColor!, 1.0, 1.0, 1.0);
     pic.bind(program.tTexture);
     // @ts-ignore: translate may be dynamically added
     console.assert(pic.translate !== null, 'pic.translate must not be null');
@@ -428,9 +439,9 @@ export default class Draw {
     pic.translate && pic.translate.bind(program.tTrans);
     let p = W.d_8to24table[top];
     const uvscale = 1.0 / 191.25;
-    gl.uniform3f(program.uTop, (p & 0xff) * uvscale, ((p >> 8) & 0xff) * uvscale, (p >> 16) * uvscale);
+    gl.uniform3f(program.uTop!, (p & 0xff) * uvscale, ((p >> 8) & 0xff) * uvscale, (p >> 16) * uvscale);
     p = W.d_8to24table[bottom];
-    gl.uniform3f(program.uBottom, (p & 0xff) * uvscale, ((p >> 8) & 0xff) * uvscale, (p >> 16) * uvscale);
+    gl.uniform3f(program.uBottom!, (p & 0xff) * uvscale, ((p >> 8) & 0xff) * uvscale, (p >> 16) * uvscale);
     GL.StreamDrawTexturedQuad(x, y, pic.width * scale, pic.height * scale, 0.0, 0.0, 1.0, 1.0);
     GL.StreamFlush();
   }
@@ -440,8 +451,8 @@ export default class Draw {
    * @param lines The number of lines to show.
    */
   static ConsoleBackground(lines: number): void {
-    const program = GL.UseProgram('pic', true);
-    gl.uniform3f(program.uColor, 1.0, 1.0, 1.0);
+    const program = GL.UseProgram('pic', true)!;
+    gl.uniform3f(program.uColor!, 1.0, 1.0, 1.0);
     Draw.#conback!.bind(program.tTexture, true);
     GL.StreamDrawTexturedQuad(0, lines - VID.height, VID.width, VID.height, 0.0, 0.0, 1.0, 1.0);
     GL.StreamFlush();
diff --git a/source/engine/client/GL.ts b/source/engine/client/GL.ts
index 32ec84bc..3cbd2990 100644
--- a/source/engine/client/GL.ts
+++ b/source/engine/client/GL.ts
@@ -219,14 +219,14 @@ class GL {
     const vsh = requireValue(gl.createShader(gl.VERTEX_SHADER), 'Failed to create vertex shader');
     gl.shaderSource(vsh, vsource);
     gl.compileShader(vsh);
-    if (gl.getShaderParameter(vsh, gl.COMPILE_STATUS) !== true) {
+    if (!gl.getShaderParameter(vsh, gl.COMPILE_STATUS)) {
       throw new Error('Error compiling shader: ' + gl.getShaderInfoLog(vsh));
     }
 
     const fsh = requireValue(gl.createShader(gl.FRAGMENT_SHADER), 'Failed to create fragment shader');
     gl.shaderSource(fsh, fsource);
     gl.compileShader(fsh);
-    if (gl.getShaderParameter(fsh, gl.COMPILE_STATUS) !== true) {
+    if (!gl.getShaderParameter(fsh, gl.COMPILE_STATUS)) {
       throw new Error('Error compiling shader: ' + gl.getShaderInfoLog(fsh));
     }
 
@@ -241,7 +241,7 @@ class GL {
     }
 
     gl.linkProgram(p);
-    if (gl.getProgramParameter(p, gl.LINK_STATUS) !== true) {
+    if (!gl.getProgramParameter(p, gl.LINK_STATUS)) {
       throw new Error('Error linking program: ' + gl.getProgramInfoLog(p));
     }
 
@@ -259,7 +259,7 @@ class GL {
         location,
         type: attribParameters[1],
         components: attribParameters[2],
-        normalized: attribParameters[3] === true,
+        normalized: attribParameters[3] ?? false,
         offset: program.vertexSize,
       };
       program.attribs.push(attrib);
@@ -637,7 +637,7 @@ export class GLTexture {
     this.#textureMode = currentTextureMode;
 
     console.assert(this.width > 0 && this.height > 0, 'Texture width and height must be greater than zero');
-    console.assert(textureCache.has(identifier) === false, 'Texture must not already exist in the cache');
+    console.assert(!textureCache.has(identifier), 'Texture must not already exist in the cache');
 
     textureCache.set(identifier, this);
 
diff --git a/source/engine/client/IN.ts b/source/engine/client/IN.ts
index b223aee5..6418f6c4 100644
--- a/source/engine/client/IN.ts
+++ b/source/engine/client/IN.ts
@@ -88,7 +88,7 @@ export default class IN {
       } else if (angles[0] < -70.0) {
         angles[0] = -70.0;
       }
-    } else if (strafe !== 0 && Host.noclip_anglehack === true) {
+    } else if (strafe !== 0 && Host.noclip_anglehack) {
       CL.state.cmd.upmove -= CL.m_forward.value * mouseY;
     } else {
       CL.state.cmd.forwardmove -= CL.m_forward.value * mouseY;
@@ -128,6 +128,6 @@ export default class IN {
     }
 
     Key.Event(K.ESCAPE, true);
-    Key.Event(K.ESCAPE);
+    Key.Event(K.ESCAPE, false);
   }
 }
diff --git a/source/engine/client/Key.ts b/source/engine/client/Key.ts
index 622427e0..dd243702 100644
--- a/source/engine/client/Key.ts
+++ b/source/engine/client/Key.ts
@@ -107,7 +107,7 @@ export default class Key {
       return;
     }
 
-    if ((key === K.BACKSPACE) || (key === K.LEFTARROW)) {
+    if (key === K.BACKSPACE || key === K.LEFTARROW) {
       if (Key.edit_line.length > 0) {
         Key.edit_line = Key.edit_line.substring(0, Key.edit_line.length - 1);
       }
@@ -164,7 +164,7 @@ export default class Key {
       return;
     }
 
-    if ((key < 32) || (key > 127)) {
+    if (key < 32 || key > 127) {
       return;
     }
 
@@ -195,7 +195,7 @@ export default class Key {
       Key.chat_buffer = '';
       return;
     }
-    if ((key < 32) || (key > 127)) {
+    if (key < 32 || key > 127) {
       return;
     }
     if (key === K.BACKSPACE) {
@@ -241,7 +241,7 @@ export default class Key {
    * @returns The key name, or `'<UNKNOWN KEYNUM>'` for unrecognized codes.
    */
   static KeynumToString(keynum: number): string {
-    if ((keynum > 32) && (keynum < 127)) {
+    if (keynum > 32 && keynum < 127) {
       return String.fromCharCode(keynum);
     }
 
@@ -373,13 +373,13 @@ export default class Key {
 
   /** Routes a raw key event to the appropriate handler based on current destination. */
   static Event(key: number, down: boolean): void {
-    if (CL.cls.state === clientConnectionState.connecting && key === K.ESCAPE && down === true) {
+    if (CL.cls.state === clientConnectionState.connecting && key === K.ESCAPE && down) {
       CL.Disconnect();
       M.ToggleMenu_f();
       return;
     }
-    if (down === true) {
-      if ((key !== K.BACKSPACE) && (key !== K.PAUSE) && (Key.down[key] === true)) {
+    if (down) {
+      if (key !== K.BACKSPACE && key !== K.PAUSE && Key.down[key]) {
         return;
       }
     }
@@ -390,7 +390,7 @@ export default class Key {
     }
 
     if (key === K.ESCAPE) {
-      if (down !== true) {
+      if (!down) {
         return;
       }
       if (Key.dest.value === Key.dest.message) {
@@ -405,7 +405,7 @@ export default class Key {
 
     let kb: string | null | undefined;
 
-    if (down !== true) {
+    if (!down) {
       kb = Key.bindings[key];
       if (kb !== null && kb !== undefined) {
         if (kb.charCodeAt(0) === 43) {
@@ -423,14 +423,14 @@ export default class Key {
       return;
     }
 
-    if ((CL.cls.demoplayback === true) && (Key.consolekeys[key] === true) && (Key.dest.value === Key.dest.game)) {
+    if (CL.cls.demoplayback && Key.consolekeys[key] && Key.dest.value === Key.dest.game) {
       M.ToggleMenu_f();
       return;
     }
 
-    if (((Key.dest.value === Key.dest.menu) && ((key === K.ESCAPE) || ((key >= K.F1) && (key <= K.F12)))) ||
-      ((Key.dest.value === Key.dest.console) && (Key.consolekeys[key] !== true)) ||
-      ((Key.dest.value === Key.dest.game) && ((Con.forcedup !== true) || (Key.consolekeys[key] !== true)))) {
+    if ((Key.dest.value === Key.dest.menu && (key === K.ESCAPE || (key >= K.F1 && key <= K.F12))) ||
+      (Key.dest.value === Key.dest.console && !Key.consolekeys[key]) ||
+      (Key.dest.value === Key.dest.game && (!Con.forcedup || !Key.consolekeys[key]))) {
       kb = Key.bindings[key];
       if (kb !== null && kb !== undefined) {
         if (kb.charCodeAt(0) === 43) {
@@ -442,7 +442,7 @@ export default class Key {
       return;
     }
 
-    if (Key.shift_down === true) {
+    if (Key.shift_down) {
       key = Key.shift[key];
     }
 
diff --git a/source/engine/client/Menu.ts b/source/engine/client/Menu.ts
index 8ea35765..b05efe61 100644
--- a/source/engine/client/Menu.ts
+++ b/source/engine/client/Menu.ts
@@ -285,7 +285,7 @@ export default class M {
       case K.ESCAPE:
         M.CloseMenu();
         CL.cls.demonum = M.save_demonum;
-        if ((CL.cls.demonum !== -1) && (CL.cls.demoplayback !== true) && (CL.cls.state !== clientConnectionState.connected)) {
+        if (CL.cls.demonum !== -1 && !CL.cls.demoplayback && CL.cls.state !== clientConnectionState.connected) {
           CL.NextDemo();
         }
         return;
@@ -402,7 +402,7 @@ export default class M {
   }
 
   static Menu_Save_f(): void {
-    if ((SV.server.active !== true) || (CL.state.intermission !== 0) || (SV.svs.maxclients !== 1)) {
+    if (!SV.server.active || CL.state.intermission !== 0 || SV.svs.maxclients !== 1) {
       return;
     }
     M.entersound = true;
@@ -434,7 +434,7 @@ export default class M {
         return;
       case K.ENTER:
         S.LocalSound(M.sfx_menu2);
-        if (M.loadable[M.load_cursor] !== true) {
+        if (!M.loadable[M.load_cursor]) {
           return;
         }
         M.CloseMenu();
@@ -456,10 +456,10 @@ export default class M {
         }
         return;
       case K.DEL:
-        if (M.removable[M.load_cursor] !== true) {
+        if (!M.removable[M.load_cursor]) {
           return;
         }
-        if (confirm('Delete selected game?') !== true) {
+        if (!confirm('Delete selected game?')) {
           return;
         }
         localStorage.removeItem('Quake.' + COM.gamedir[0].filename + '/s' + M.load_cursor + '.sav');
@@ -491,10 +491,10 @@ export default class M {
         }
         return;
       case K.DEL:
-        if (M.removable[M.load_cursor] !== true) {
+        if (!M.removable[M.load_cursor]) {
           return;
         }
-        if (confirm('Delete selected game?') !== true) {
+        if (!confirm('Delete selected game?')) {
           return;
         }
         localStorage.removeItem('Quake.' + COM.gamedir[0].filename + '/s' + M.load_cursor + '.sav');
@@ -867,7 +867,7 @@ export default class M {
   static Keys_Draw(): void {
     M.DrawPic(160 - (M.ttl_cstm.width / 2), 4, M.ttl_cstm);
 
-    if (M.bind_grab === true) {
+    if (M.bind_grab) {
       M.Print(12, 32, 'Press a key or button for this action');
       M.DrawCharacter(130, 48 + (M.keys_cursor << 3), 61);
     } else {
@@ -895,7 +895,7 @@ export default class M {
   }
 
   static Keys_Key(k: number): void {
-    if (M.bind_grab === true) {
+    if (M.bind_grab) {
       S.LocalSound(M.sfx_menu1);
       if ((k !== K.ESCAPE) && (k !== 96)) {
         Cmd.text = 'bind "' + Key.KeynumToString(k) + '" "' + M.bindnames[M.keys_cursor][0] + '"\n' + Cmd.text;
@@ -1061,7 +1061,7 @@ export default class M {
   }
 
   static Quit_Draw(): void {
-    if (M.wasInMenus === true) {
+    if (M.wasInMenus) {
       M.state.value = M.quit_prevstate;
       M.recursiveDraw = true;
       M.Draw();
@@ -1078,7 +1078,7 @@ export default class M {
     switch (k) {
       case K.ESCAPE:
       case 110:
-        if (M.wasInMenus === true) {
+        if (M.wasInMenus) {
           M.state.value = M.quit_prevstate;
           M.entersound = true;
         } else {
@@ -1252,7 +1252,7 @@ export default class M {
         M.Launch_Server_Draw();
         break;
     }
-    if (M.entersound === true) {
+    if (M.entersound) {
       S.LocalSound(M.sfx_menu2);
       M.entersound = false;
     }
diff --git a/source/engine/client/R.ts b/source/engine/client/R.ts
index b24ad160..3b8b5c91 100644
--- a/source/engine/client/R.ts
+++ b/source/engine/client/R.ts
@@ -1273,7 +1273,7 @@ class R {
     const w = (vrect.width * pixelRatio) >> 0;
     const h = (vrect.height * pixelRatio) >> 0;
 
-    if (R.usePostProcess === true || PostProcess.hasActiveEffects()) {
+    if (R.usePostProcess || PostProcess.hasActiveEffects()) {
       // Render the scene to the shared post-process capture FBO whenever a
       // screen-space effect needs to sample it. Depth-aware passes like fog
       // use the same capture path and sample the depth texture mid-frame.
diff --git a/source/engine/client/SCR.ts b/source/engine/client/SCR.ts
index 40589c2e..21ea6d61 100644
--- a/source/engine/client/SCR.ts
+++ b/source/engine/client/SCR.ts
@@ -150,7 +150,7 @@ export default class SCR {
       Cvar.Set('viewsize', '120');
     }
 
-    let size; let full;
+    let size = 0.0, full = false;
     if (CL.state.intermission !== 0) {
       full = true;
       size = 1.0;
@@ -182,7 +182,7 @@ export default class SCR {
       vrect.height = VID.height - Sbar.lines;
     }
     vrect.x = (VID.width - vrect.width) / 2;
-    if (full === true) {
+    if (full) {
       vrect.y = 0;
     } else {
       vrect.y = (VID.height - Sbar.lines - vrect.height) / 2;
@@ -257,14 +257,14 @@ export default class SCR {
 
   /** Draws the network-lag indicator when packets are delayed. */
   static DrawNet(): void {
-    if (((Host.realtime - CL.state.last_received_message) >= 0.3) && (CL.cls.demoplayback !== true)) {
+    if ((Host.realtime - CL.state.last_received_message >= 0.3) && !CL.cls.demoplayback) {
       Draw.Pic(R.refdef.vrect.x, R.refdef.vrect.y, SCR.net);
     }
   }
 
   /** Draws the pause indicator when the game is paused. */
   static DrawPause(): void {
-    if ((SCR.showpause.value !== 0) && (CL.state.paused === true)) {
+    if (SCR.showpause.value !== 0 && CL.state.paused) {
       Draw.Pic((VID.width - SCR.pause.width * 2) / 2, (VID.height - 48 - SCR.pause.height * 2) / 2, SCR.pause, 2);
     }
   }
@@ -275,7 +275,7 @@ export default class SCR {
   static SetUpToDrawConsole(): void {
     Con.forcedup = (!CL.state.worldmodel) || (CL.cls.signon !== 4);
 
-    if (Con.forcedup === true) {
+    if (Con.forcedup) {
       SCR.con_current = 200;
       return;
     }
@@ -350,7 +350,7 @@ export default class SCR {
       SCR.oldscreensize = SCR.viewsize.value;
       SCR.recalc_refdef = true;
     }
-    if (SCR.recalc_refdef === true) {
+    if (SCR.recalc_refdef) {
       SCR.CalcRefdef();
     }
 
@@ -388,12 +388,13 @@ export default class SCR {
 
       V.RenderView();
       GL.Set2D();
-      if (R.usePostProcess === true || PostProcess.hasActiveEffects()) {
+      if (R.usePostProcess || PostProcess.hasActiveEffects()) {
         PostProcess.end();
+        console.assert(PostProcess.colorTexture !== null, 'PostProcess color texture is not set');
         PostProcess.resolve(
           R.refdef.vrect.x, R.refdef.vrect.y,
           R.refdef.vrect.width, R.refdef.vrect.height,
-          PostProcess.colorTexture,
+          PostProcess.colorTexture!,
         );
 
         const bloomEffect = PostProcess.getEffect('bloom');
@@ -401,7 +402,7 @@ export default class SCR {
           bloomEffect.drawDebugPreview();
         }
       }
-      if (Con.forcedup !== true) {
+      if (!Con.forcedup) {
         R.PolyBlend();
       }
 
@@ -454,7 +455,7 @@ export default class SCR {
 
     SCR._requestedAnimationFrames++;
 
-    if (SCR.screenshot === true) {
+    if (SCR.screenshot) {
       SCR.screenshot = false;
       gl.finish();
 
diff --git a/source/engine/client/Sbar.ts b/source/engine/client/Sbar.ts
index 8a50fcef..842a618e 100644
--- a/source/engine/client/Sbar.ts
+++ b/source/engine/client/Sbar.ts
@@ -154,7 +154,7 @@ export default class Sbar {
     Sbar.scorebar = Draw.LoadPicFromWad('SCOREBAR');
     Sbar.disc = Draw.LoadPicFromWad('DISC');
 
-    if (COM.hipnotic === true) {
+    if (COM.hipnotic) {
       Sbar.h_weapons = [[
         Draw.LoadPicFromWad('INV_LASER'),
         Draw.LoadPicFromWad('INV_MJOLNIR'),
@@ -183,7 +183,7 @@ export default class Sbar {
         Draw.LoadPicFromWad('SB_WSUIT'),
         Draw.LoadPicFromWad('SB_ESHLD'),
       ];
-    } else if (COM.rogue === true) {
+    } else if (COM.rogue) {
       Sbar.r_invbar = [
         Draw.LoadPicFromWad('R_INVBAR1'),
         Draw.LoadPicFromWad('R_INVBAR2'),
@@ -309,7 +309,7 @@ export default class Sbar {
   static DrawInventory(): void {
     let i;
 
-    if (COM.rogue === true) {
+    if (COM.rogue) {
       Sbar.DrawPic(0, -24, Sbar.r_invbar![CL.state.stats[Def.stat.activeweapon] >= Def.rit.lava_nailgun ? 0 : 1]);
     } else {
       Sbar.DrawPic(0, -24, Sbar.ibar);
@@ -328,7 +328,7 @@ export default class Sbar {
       }
       Sbar.DrawPic(i * 24, -16, Sbar.weapons[flashon][i]);
     }
-    if (COM.hipnotic === true) {
+    if (COM.hipnotic) {
       let grenadeflashing = false;
       for (i = 0; i <= 3; i++) {
         if ((CL.state.items & (1 << Sbar.hipweapons![i])) !== 0) {
@@ -346,7 +346,7 @@ export default class Sbar {
             }
           } else if (i === 3) {
             if ((CL.state.items & Def.it.grenade_launcher) !== 0) {
-              if (grenadeflashing !== true) {
+              if (!grenadeflashing) {
                 Sbar.DrawPic(96, -16, Sbar.h_weapons![flashon][3]);
               }
             } else {
@@ -357,7 +357,7 @@ export default class Sbar {
           }
         }
       }
-    } else if (COM.rogue === true) {
+    } else if (COM.rogue) {
       if (CL.state.stats[Def.stat.activeweapon] >= Def.rit.lava_nailgun) {
         for (i = 0; i <= 4; i++) {
           if (CL.state.stats[Def.stat.activeweapon] === (Def.rit.lava_nailgun << i)) {
@@ -384,7 +384,7 @@ export default class Sbar {
       }
     }
 
-    if (COM.hipnotic === true) {
+    if (COM.hipnotic) {
       for (i = 2; i <= 5; i++) {
         if ((CL.state.items & (1 << (17 + i))) !== 0) {
           Sbar.DrawPic(192 + (i << 4), -16, Sbar.items[i]);
@@ -402,7 +402,7 @@ export default class Sbar {
           Sbar.DrawPic(192 + (i << 4), -16, Sbar.items[i]);
         }
       }
-      if (COM.rogue === true) {
+      if (COM.rogue) {
         if ((CL.state.items & 536870912) !== 0) {
           Sbar.DrawPic(288, -16, Sbar.r_items![0]);
         }
@@ -445,7 +445,7 @@ export default class Sbar {
   }
 
   static DrawFace(): void {
-    if ((COM.rogue === true) && (CL.state.maxclients !== 1) && (Cvar.FindVar('teamplay').value >= 4) && (Cvar.FindVar('teamplay').value <= 6)) {
+    if (COM.rogue && (CL.state.maxclients !== 1) && (Cvar.FindVar('teamplay').value >= 4) && (Cvar.FindVar('teamplay').value <= 6)) {
       const s = CL.state.scores[CL.state.viewentity - 1];
       const top = (s.colors & 0xf0) + 8;
       const xofs = CL.state.maxclients === 1 ? 113 : (VID.width >> 1) - 47;
@@ -496,7 +496,7 @@ export default class Sbar {
       Sbar.DrawInventory();
     }
 
-    if ((Sbar.showscores === true) || (CL.state.stats[Def.stat.health] <= 0)) {
+    if (Sbar.showscores || CL.state.stats[Def.stat.health] <= 0) {
       Sbar.DrawPic(0, 0, Sbar.scorebar);
       Sbar.SoloScoreboard();
       if (CL.state.maxclients > 1) {
@@ -511,7 +511,7 @@ export default class Sbar {
 
     Sbar.DrawPic(0, 0, Sbar.sbar);
 
-    if (COM.hipnotic === true) {
+    if (COM.hipnotic) {
       if ((CL.state.items & Def.it.key1) !== 0) {
         Sbar.DrawPic(209, 3, Sbar.items[0]);
       }
@@ -520,7 +520,7 @@ export default class Sbar {
       }
     }
 
-    const it = (COM.rogue === true) ? Def.rit : Def.it;
+    const it = (COM.rogue) ? Def.rit : Def.it;
 
     if ((CL.state.items & Def.it.invulnerability) !== 0) {
       Sbar.DrawNum(24, 0, 666, 3, 1);
@@ -548,7 +548,7 @@ export default class Sbar {
       Sbar.DrawPic(224, 0, Sbar.ammo[2]);
     } else if ((CL.state.items & it.cells) !== 0) {
       Sbar.DrawPic(224, 0, Sbar.ammo[3]);
-    } else if (COM.rogue === true) {
+    } else if (COM.rogue) {
       if ((CL.state.items & Def.rit.lava_nails) !== 0) {
         Sbar.DrawPic(224, 0, Sbar.r_ammo![0]);
       } else if ((CL.state.items & Def.rit.plasma_ammo) !== 0) {
diff --git a/source/engine/client/V.ts b/source/engine/client/V.ts
index 7b30a5a8..5c7fe5b0 100644
--- a/source/engine/client/V.ts
+++ b/source/engine/client/V.ts
@@ -107,7 +107,7 @@ export default class V {
     if (CL.state.laststop === CL.state.time) {
       return;
     }
-    if ((CL.state.nodrift === true) || (CL.state.pitchvel === 0.0)) {
+    if (CL.state.nodrift || CL.state.pitchvel === 0.0) {
       CL.state.pitchvel = V.centerspeed.value;
       CL.state.nodrift = false;
       CL.state.driftmove = 0.0;
@@ -121,13 +121,13 @@ export default class V {
   }
 
   static DriftPitch(): void {
-    if ((Host.noclip_anglehack === true) || (CL.state.onground !== true) || (CL.cls.demoplayback === true)) {
+    if (Host.noclip_anglehack || !CL.state.onground || CL.cls.demoplayback) {
       CL.state.driftmove = 0.0;
       CL.state.pitchvel = 0.0;
       return;
     }
 
-    if (CL.state.nodrift === true) {
+    if (CL.state.nodrift) {
       if (Math.abs(CL.state.cmd.forwardmove) < CL.forwardspeed.value) {
         CL.state.driftmove = 0.0;
       } else {
@@ -164,7 +164,8 @@ export default class V {
   }
 
   static ApplyDamage(armor: number, blood: number, origin: Vector): void { // Client (formally known as V.ParseDamage)
-    const ent = CL.state.playerentity;
+    const ent = CL.state.playerentity!;
+    console.assert(ent !== null, 'Player entity is required for damage calculations');
     const from = origin.subtract(ent.origin);
 
     eventBus.publish('client.damage', { damageReceived: blood, armorLost: armor, attackOrigin: from.copy() });
@@ -326,14 +327,16 @@ export default class V {
   }
 
   static CalcIntermissionRefdef(): void {
-    const ent = CL.state.playerentity;
+    const ent = CL.state.playerentity!;
+    console.assert(ent !== null, 'Player entity is required for intermission view calculations');
     R.refdef.vieworg[0] = finiteOrZero(ent.origin[0]);
     R.refdef.vieworg[1] = finiteOrZero(ent.origin[1]);
     R.refdef.vieworg[2] = finiteOrZero(ent.origin[2]);
     R.refdef.viewangles[0] = finiteOrZero(ent.angles[0]) + Math.sin(CL.state.time * V.ipitch_cycle.value) * V.ipitch_level.value;
     R.refdef.viewangles[1] = finiteOrZero(ent.angles[1]) + Math.sin(CL.state.time * V.iyaw_cycle.value) * V.iyaw_level.value;
     R.refdef.viewangles[2] = finiteOrZero(ent.angles[2]) + Math.sin(CL.state.time * V.iroll_cycle.value) * V.iroll_level.value;
-    CL.state.viewent.model = null;
+    console.assert(CL.state.viewent !== null, 'View entity is required for intermission view calculations');
+    CL.state.viewent!.model = null;
   }
 
   static CalcRefdef(): void { // TODO: Client
@@ -341,7 +344,9 @@ export default class V {
       V.DriftPitch();
     }
 
-    const ent = CL.state.playerentity;
+    const ent = CL.state.playerentity!;
+    console.assert(ent !== null, 'Player entity is required for view calculations');
+
     ent.angles[1] = CL.state.viewangles[1];
     ent.angles[0] = -CL.state.viewangles[0];
     const bob = V.CalcBob();
@@ -352,7 +357,7 @@ export default class V {
 
     R.refdef.viewangles[0] = CL.state.viewangles[0];
     R.refdef.viewangles[1] = CL.state.viewangles[1];
-    R.refdef.viewangles[2] = CL.state.viewangles[2] + V.CalcRoll(CL.state.playerentity.angles, CL.state.velocity);
+    R.refdef.viewangles[2] = CL.state.viewangles[2] + V.CalcRoll(ent.angles, CL.state.velocity);
 
     if (V.dmg_time > 0.0) {
       if (V.kicktime.value) {
@@ -396,7 +401,9 @@ export default class V {
       R.refdef.vieworg[2] = finiteOrZero(ent.origin[2]) + 30.0;
     }
 
-    const view = CL.state.viewent;
+    const view = CL.state.viewent!;
+    console.assert(view !== null, 'View entity is required for view calculations');
+
     view.angles[0] = -R.refdef.viewangles[0] - ipitch;
     view.angles[1] = R.refdef.viewangles[1] - iyaw;
     view.angles[2] = CL.state.viewangles[2] - iroll;
@@ -416,7 +423,8 @@ export default class V {
     }
 
     if (CL.gameCapabilities.includes(gameCapabilities.CAP_VIEWMODEL_MANAGED) && CL.state.gameAPI) {
-      const viewmodel = CL.state.gameAPI.viewmodel;
+      const viewmodel = CL.state.gameAPI.viewmodel!;
+      console.assert(viewmodel !== null, 'Viewmodel is required for view calculations');
       view.model = viewmodel.model;
       view.frame = viewmodel.frame;
       // visibility is considered by R.DrawViewModel
@@ -438,7 +446,7 @@ export default class V {
 
     R.refdef.viewangles.add(CL.state.punchangle);
 
-    if ((CL.state.onground === true) && ((ent.origin[2] - V.oldz) > 0.0)) {
+    if (CL.state.onground && (ent.origin[2] - V.oldz) > 0.0) {
       let steptime = Host.frametime;
       if (steptime < 0.0) {
         steptime = 0.0;
diff --git a/source/engine/client/renderer/AliasModelRenderer.ts b/source/engine/client/renderer/AliasModelRenderer.ts
index 13bcda7e..dd1b5f1b 100644
--- a/source/engine/client/renderer/AliasModelRenderer.ts
+++ b/source/engine/client/renderer/AliasModelRenderer.ts
@@ -101,13 +101,13 @@ export class AliasModelRenderer extends ModelRenderer {
         e.origin[0] + clmodel.boundingradius,
         e.origin[1] + clmodel.boundingradius,
         e.origin[2] + clmodel.boundingradius,
-      )) === true) {
+      ))) {
       return;
     }
 
     // Select shader program (player vs normal)
     let program;
-    if ((e.colormap !== 0) && (clmodel.player === true) && (R.nocolors.value === 0)) {
+    if (e.colormap !== 0 && clmodel.player && R.nocolors.value === 0) {
       program = GL.UseProgram('player');
 
       // Calculate player colors
@@ -164,7 +164,7 @@ export class AliasModelRenderer extends ModelRenderer {
     const skin = this._selectSkin(clmodel, e);
     skin.texturenum!.bind(program!.tTexture!);
     (skin.luminanceTexture || R.blacktexture).bind(program!.tLuminance!);
-    if (clmodel.player === true) {
+    if (clmodel.player) {
       skin.playertexture!.bind(program!.tPlayer!);
     }
 
@@ -219,7 +219,7 @@ export class AliasModelRenderer extends ModelRenderer {
     let targettime = 0;
 
     // Handle frame groups (animated sequences)
-    if (frameGroup.group === true) {
+    if (frameGroup.group) {
       const groupLen = frameGroup.frames.length - 1;
       const fullinterval = frameGroup.frames[groupLen].interval;
       frameA = frameGroup.frames[0];
@@ -266,7 +266,7 @@ export class AliasModelRenderer extends ModelRenderer {
     let skin = clmodel.skins[num];
 
     // Handle skin groups (animated textures)
-    if (skin.group === true) {
+    if (skin.group) {
       const groupLen = skin.skins.length - 1;
       const fullinterval = skin.skins[groupLen].interval;
       const targettime = time - Math.floor(time / fullinterval) * fullinterval;
diff --git a/source/engine/client/renderer/BrushModelRenderer.ts b/source/engine/client/renderer/BrushModelRenderer.ts
index bb3db4c8..18353add 100644
--- a/source/engine/client/renderer/BrushModelRenderer.ts
+++ b/source/engine/client/renderer/BrushModelRenderer.ts
@@ -168,8 +168,7 @@ export class BrushModelRenderer extends ModelRenderer {
     worldModel: BrushModel | null = null,
   ): EntityLightingState {
     const [ambientlight, shadelight, lightPosition, dynamicShadeLight, dynamicLightPosition] = calculateLightValues(entity);
-    const usesSharedWorldLightmap = clmodel.submodel === true
-      && (clmodel.lightdata !== null || clmodel.lightdata_rgb !== null);
+    const usesSharedWorldLightmap = clmodel.submodel && (clmodel.lightdata !== null || clmodel.lightdata_rgb !== null);
 
     return {
       ambientlight: usesSharedWorldLightmap ? new Vector(1.0, 1.0, 1.0) : ambientlight,
@@ -424,7 +423,7 @@ export class BrushModelRenderer extends ModelRenderer {
     }
 
     // Regular brush entity — frustum cull
-    if (clmodel.submodel === true) {
+    if (clmodel.submodel) {
       if (R.CullBox(
         new Vector(
           e.origin[0] + clmodel.mins[0],
@@ -435,7 +434,7 @@ export class BrushModelRenderer extends ModelRenderer {
           e.origin[0] + clmodel.maxs[0],
           e.origin[1] + clmodel.maxs[1],
           e.origin[2] + clmodel.maxs[2],
-        )) === true) {
+        ))) {
         return;
       }
     } else {
@@ -449,7 +448,7 @@ export class BrushModelRenderer extends ModelRenderer {
           e.origin[0] + clmodel.radius,
           e.origin[1] + clmodel.radius,
           e.origin[2] + clmodel.radius,
-        )) === true) {
+        ))) {
         return;
       }
     }
@@ -673,7 +672,7 @@ export class BrushModelRenderer extends ModelRenderer {
       if ((leaf.visframe !== R.visframecount) || (leaf.waterchain === leaf.cmds.length)) {
         continue;
       }
-      if (R.CullBox(leaf.mins, leaf.maxs) === true) {
+      if (R.CullBox(leaf.mins!, leaf.maxs!)) {
         continue;
       }
       this.renderWorldTurbulentLeaf(clmodel, leaf);
@@ -693,10 +692,10 @@ export class BrushModelRenderer extends ModelRenderer {
       if ((leaf.visframe !== R.visframecount) || (leaf.waterchain === leaf.cmds.length)) {
         continue;
       }
-      if (R.CullBox(leaf.mins, leaf.maxs) === true) {
+      if (R.CullBox(leaf.mins!, leaf.maxs!)) {
         continue;
       }
-      const dist = this._getBoundsDistanceToView(leaf.mins, leaf.maxs, vieworg);
+      const dist = this._getBoundsDistanceToView(leaf.mins!, leaf.maxs!, vieworg);
       items.push({ leaf, dist });
     }
     return items;
@@ -715,19 +714,19 @@ export class BrushModelRenderer extends ModelRenderer {
       if ((leaf.visframe !== R.visframecount) || (leaf.waterchain === leaf.cmds.length)) {
         continue;
       }
-      if (R.CullBox(leaf.mins, leaf.maxs) === true) {
+      if (R.CullBox(leaf.mins!, leaf.maxs!)) {
         continue;
       }
 
       for (let j = 0; j < leaf.turbulentChains.length; j++) {
         const chain = leaf.turbulentChains[j];
-        if (R.CullBox(chain.mins, chain.maxs) === true) {
+        if (R.CullBox(chain.mins!, chain.maxs!)) {
           continue;
         }
 
         items.push({
           chain,
-          dist: this._getBoundsDistanceToView(chain.mins, chain.maxs, vieworg),
+          dist: this._getBoundsDistanceToView(chain.mins!, chain.maxs!, vieworg),
         });
       }
     }
@@ -1802,7 +1801,7 @@ export class BrushModelRenderer extends ModelRenderer {
         vec = model.vertexes[model.edges[-index][1]];
       }
       const vert: number[] = [vec[0], vec[1], vec[2]];
-      if (face.sky !== true) {
+      if (!face.sky) {
         const s = vec.dot(new Vector(texinfo.vecs[0][0], texinfo.vecs[0][1], texinfo.vecs[0][2])) + texinfo.vecs[0][3];
         const t = vec.dot(new Vector(texinfo.vecs[1][0], texinfo.vecs[1][1], texinfo.vecs[1][2])) + texinfo.vecs[1][3];
         vert[3] = s / texture.width;
diff --git a/source/engine/client/renderer/MeshModelRenderer.ts b/source/engine/client/renderer/MeshModelRenderer.ts
index c76b2f34..67a3c059 100644
--- a/source/engine/client/renderer/MeshModelRenderer.ts
+++ b/source/engine/client/renderer/MeshModelRenderer.ts
@@ -99,7 +99,7 @@ export class MeshModelRenderer extends ModelRenderer {
         e.origin[0] + clmodel.maxs[0],
         e.origin[1] + clmodel.maxs[1],
         e.origin[2] + clmodel.maxs[2],
-      )) === true) {
+      ))) {
       return;
     }
 
diff --git a/source/engine/client/renderer/SpriteModelRenderer.ts b/source/engine/client/renderer/SpriteModelRenderer.ts
index 7112268e..c64f2452 100644
--- a/source/engine/client/renderer/SpriteModelRenderer.ts
+++ b/source/engine/client/renderer/SpriteModelRenderer.ts
@@ -96,7 +96,7 @@ export class SpriteModelRenderer extends ModelRenderer {
     let frame: SpriteRenderFrame = spriteModel.frames[num] as SpriteRenderFrame;
 
     // Handle frame groups (animated sprites)
-    if ((frame as { group?: boolean }).group === true) {
+    if ((frame as { group?: boolean }).group) {
       const groupedFrame = spriteModel.frames[num] as { group: true; frames: SpriteFrameImage[] };
       const time = CL.state.time + e.syncbase;
       const groupLen = groupedFrame.frames.length - 1;
@@ -118,7 +118,7 @@ export class SpriteModelRenderer extends ModelRenderer {
     // Calculate billboard orientation
     let r: { [n: number]: number };
     let u: { [n: number]: number };
-    if (spriteModel.oriented === true) {
+    if (spriteModel.oriented) {
       // Sprite has fixed orientation
       const { right, up } = e.angles.angleVectors();
       r = right;
diff --git a/source/engine/common/GameAPIs.ts b/source/engine/common/GameAPIs.ts
index 6c26e982..d69d8797 100644
--- a/source/engine/common/GameAPIs.ts
+++ b/source/engine/common/GameAPIs.ts
@@ -934,15 +934,15 @@ export class ClientEngineAPI extends CommonEngineAPI {
    * Translate a palette index into an RGB color vector.
    * @returns The RGB color vector.
    */
-  static IndexToRGB(index: number): Vector {
+  static IndexToRGB(index: number): [number, number, number] {
     console.assert(typeof index === 'number', 'index must be a number');
     console.assert(index >= 0 && index < 256, 'index must be in range [0, 255]');
 
-    return new Vector(
+    return [
       W.d_8to24table_u8[index * 3] / 256,
       W.d_8to24table_u8[index * 3 + 1] / 256,
       W.d_8to24table_u8[index * 3 + 2] / 256,
-    );
+    ];
   }
 
   /**
@@ -992,7 +992,7 @@ export class ClientEngineAPI extends CommonEngineAPI {
   static Traceline(start: Vector, end: Vector, options: ClientTraceOptions | null = null): GameTrace {
     const worldTrace = SV.collision.traceWorldLine(start, end) as InternalTraceLike;
 
-    if (options === null || options.includeEntities !== true) {
+    if (options === null || !options.includeEntities) {
       return internalTraceToGameTrace(worldTrace);
     }
 
diff --git a/source/engine/common/Host.ts b/source/engine/common/Host.ts
index 70539a52..6a7e525a 100644
--- a/source/engine/common/Host.ts
+++ b/source/engine/common/Host.ts
@@ -402,7 +402,7 @@ export default class Host {
     SV.CheckForNewClients();
     SV.RunClients();
 
-    if (SV.server.paused !== true && (SV.svs.maxclients >= 2 || (!registry.isDedicatedServer && Key.dest.value === Key.dest.game))) {
+    if (!SV.server.paused && (SV.svs.maxclients >= 2 || (!registry.isDedicatedServer && Key.dest.value === Key.dest.game))) {
       SV.physics.physics();
     }
 
@@ -1412,9 +1412,9 @@ export default class Host {
     }
 
     SV.server.paused = !SV.server.paused;
-    Host.BroadcastPrint(`${client.name}${SV.server.paused === true ? ' paused the game\n' : ' unpaused the game\n'}`);
+    Host.BroadcastPrint(`${client.name}${SV.server.paused ? ' paused the game\n' : ' unpaused the game\n'}`);
     SV.server.reliable_datagram.writeByte(Protocol.svc.setpause);
-    SV.server.reliable_datagram.writeByte(SV.server.paused === true ? 1 : 0);
+    SV.server.reliable_datagram.writeByte(SV.server.paused ? 1 : 0);
   }
 
   static PreSpawn_f(this: ConsoleCommand): void { // signon 1, step 1
diff --git a/source/engine/common/Mod.ts b/source/engine/common/Mod.ts
index b206ec16..8e096b69 100644
--- a/source/engine/common/Mod.ts
+++ b/source/engine/common/Mod.ts
@@ -73,7 +73,7 @@ export default class Mod {
    */
   static IsBrushWorldModel(sharedModel: BaseModel): boolean {
     return sharedModel.type === Mod.type.brush
-      && sharedModel.submodel !== true
+      && !sharedModel.submodel
       && Array.isArray(sharedModel.submodels)
       && sharedModel.submodels.length > 0;
   }
diff --git a/source/engine/common/W.ts b/source/engine/common/W.ts
index 0bbc09bb..a7dcecff 100644
--- a/source/engine/common/W.ts
+++ b/source/engine/common/W.ts
@@ -1,5 +1,5 @@
 import { eventBus, getCommonRegistry } from '../registry.ts';
-import { CorruptedResourceError, MissingResourceError } from './Errors.ts';
+import { CorruptedResourceError, MissingResourceError, NotImplementedError } from './Errors.ts';
 import Q from '../../shared/Q.ts';
 
 let { COM } = getCommonRegistry();
@@ -69,7 +69,7 @@ export abstract class WadFileInterface {
    * This will return the palette translated data for the given name.
    * @returns the decoded texture data
    */
-  abstract getLumpMipmap(name: string, mipmapLevel?: number): WadLumpTexture | null;
+  abstract getLumpMipmap(name: string, mipmapLevel?: number): WadLumpTexture;
 }
 
 /** A concrete WAD handler constructor with a static MAGIC identifier. */
@@ -319,7 +319,7 @@ class Wad3File extends WadFileInterface {
    * This will return the palette translated data for the given name.
    * @returns the decoded texture data
    */
-  override getLumpMipmap(name: string, mipmapLevel = 0): WadLumpTexture | null {
+  override getLumpMipmap(name: string, mipmapLevel = 0): WadLumpTexture {
     const lumpInfo = this._lumps[name.toUpperCase()];
 
     if (!lumpInfo) {
@@ -336,7 +336,7 @@ class Wad3File extends WadFileInterface {
 
       case 0x46: // font
         console.assert(false, 'Wad3File.getLumpMipmap: font handling not implemented');
-        return null; // TODO: implement font handling
+        throw new NotImplementedError('font (lump type 0x46) handling not implemented');
     }
 
     throw new CorruptedResourceError(name, `not a valid lump type (${lumpInfo.type})`);
diff --git a/source/engine/common/model/SpriteModel.ts b/source/engine/common/model/SpriteModel.ts
index b691aff6..ac15970b 100644
--- a/source/engine/common/model/SpriteModel.ts
+++ b/source/engine/common/model/SpriteModel.ts
@@ -22,26 +22,6 @@ interface SpriteSingleFrame {
   readonly texturenum: WebGLTexture | null;
 }
 
-export interface SpriteFrameImage {
-  readonly interval?: number;
-  readonly origin: [number, number];
-  readonly width: number;
-  readonly height: number;
-  readonly glt: GLTexture;
-  /** Raw WebGL texture handle, stored from {@link GLTexture.texnum}. */
-  readonly texturenum: WebGLTexture | null;
-}
-
-export interface SpriteSingleFrame {
-  readonly group: false;
-  readonly origin: [number, number];
-  readonly width: number;
-  readonly height: number;
-  readonly glt: GLTexture;
-  /** Raw WebGL texture handle, stored from {@link GLTexture.texnum}. */
-  readonly texturenum: WebGLTexture | null;
-}
-
 interface SpriteFrameGroup {
   readonly group: true;
   readonly frames: SpriteFrameImage[];
diff --git a/source/engine/common/model/loaders/AliasMDLLoader.ts b/source/engine/common/model/loaders/AliasMDLLoader.ts
index f28933bf..0a004882 100644
--- a/source/engine/common/model/loaders/AliasMDLLoader.ts
+++ b/source/engine/common/model/loaders/AliasMDLLoader.ts
@@ -495,7 +495,7 @@ export class AliasMDLLoader extends ModelLoader {
 
         loadmodel.skins[skinIndex] = singleSkin as AliasSkin;
 
-        if (loadmodel.player === true) {
+        if (loadmodel.player) {
           this.#translatePlayerSkin(loadmodel, new Uint8Array(buffer, inmodel, skinsize), singleSkin);
         }
 
@@ -529,7 +529,7 @@ export class AliasMDLLoader extends ModelLoader {
             ? GLTexture.Allocate(`${loadmodel.name}_${skinIndex}_${groupIndex}_luma`, loadmodel._skin_width, loadmodel._skin_height, luminance)
             : null;
 
-          if (loadmodel.player === true) {
+          if (loadmodel.player) {
             this.#translatePlayerSkin(loadmodel, new Uint8Array(buffer, inmodel, skinsize), group.skins[groupIndex]);
           }
 
@@ -639,7 +639,7 @@ export class AliasMDLLoader extends ModelLoader {
     for (let triangleIndex = 0; triangleIndex < loadmodel._num_tris; triangleIndex++) {
       const triangle = loadmodel._triangles[triangleIndex];
 
-      if (triangle.facesfront === true) {
+      if (triangle.facesfront) {
         const vert0 = loadmodel._stverts[triangle.vertindex[0]];
         cmds.push((vert0.s + 0.5) / loadmodel._skin_width);
         cmds.push((vert0.t + 0.5) / loadmodel._skin_height);
@@ -656,7 +656,7 @@ export class AliasMDLLoader extends ModelLoader {
 
       for (let vertexOffset = 0; vertexOffset < 3; vertexOffset++) {
         const vert = loadmodel._stverts[triangle.vertindex[vertexOffset]];
-        if (vert.onseam === true) {
+        if (vert.onseam) {
           cmds.push((vert.s + loadmodel._skin_width / 2 + 0.5) / loadmodel._skin_width);
         } else {
           cmds.push((vert.s + 0.5) / loadmodel._skin_width);
@@ -669,7 +669,7 @@ export class AliasMDLLoader extends ModelLoader {
     for (let frameIndex = 0; frameIndex < loadmodel.frames.length; frameIndex++) {
       const group = loadmodel.frames[frameIndex] as MutableAliasFrame;
 
-      if (group.group === true) {
+      if (group.group) {
         for (let groupIndex = 0; groupIndex < group.frames.length; groupIndex++) {
           const frame = group.frames[groupIndex];
           frame.cmdofs = cmds.length * 4;
diff --git a/source/engine/network/MSG.ts b/source/engine/network/MSG.ts
index f6d8c682..acb2ce69 100644
--- a/source/engine/network/MSG.ts
+++ b/source/engine/network/MSG.ts
@@ -105,7 +105,7 @@ export class SzBuffer {
 
   allocate(size: number): number {
     if (this.cursize + size > this.maxsize) {
-      if (this.allowoverflow !== true) {
+      if (!this.allowoverflow) {
         throw new RangeError('SzBuffer.allocate: overflow without allowoverflow set');
       }
 
diff --git a/source/engine/server/Edict.ts b/source/engine/server/Edict.ts
index bfd9b2ca..78a73351 100644
--- a/source/engine/server/Edict.ts
+++ b/source/engine/server/Edict.ts
@@ -83,7 +83,7 @@ export class ED {
     for (i = SV.svs.maxclients + 1; i < SV.server.num_edicts; i++) {
       edict = SV.server.edicts[i] as ServerEdict;
 
-      if (edict.free === true && (edict.freetime < 2.0 || SV.server.time - edict.freetime > 0.5)) {
+      if (edict.free && (edict.freetime < 2.0 || SV.server.time - edict.freetime > 0.5)) {
         ED.ClearEdict(edict);
         return edict;
       }
@@ -161,7 +161,7 @@ export class ED {
 
   static PrintEdict_f = class PrintEdictCommand extends ConsoleCommand {
     run(id?: string): void {
-      if (SV.server.active !== true) {
+      if (!SV.server.active) {
         return;
       }
 
@@ -182,7 +182,7 @@ export class ED {
    * Prints an edict usage summary.
    */
   static Count(): void {
-    if (SV.server.active !== true) {
+    if (!SV.server.active) {
       return;
     }
 
@@ -194,7 +194,7 @@ export class ED {
     for (let i = 0; i < SV.server.num_edicts; i++) {
       const ent = SV.server.edicts[i] as ServerEdict;
 
-      if (ent.isFree() === true) {
+      if (ent.isFree()) {
         continue;
       }
 
diff --git a/source/engine/server/Navigation.ts b/source/engine/server/Navigation.ts
index 34127a27..bb96bd94 100644
--- a/source/engine/server/Navigation.ts
+++ b/source/engine/server/Navigation.ts
@@ -982,7 +982,7 @@ export class Navigation {
       }
 
       // Ignore special surfaces, also submodel faces
-      if (face.turbulent === true || face.sky === true || face.submodel === true) {
+      if (face.turbulent || face.sky || face.submodel) {
         continue;
       }
 
diff --git a/source/engine/server/Progs.ts b/source/engine/server/Progs.ts
index 48a5c13b..d0f4fe78 100644
--- a/source/engine/server/Progs.ts
+++ b/source/engine/server/Progs.ts
@@ -1171,11 +1171,11 @@ PR.PrintStatement = function(s) {
   } else {
     text = '';
   }
-  if ((s.op === PR.op.jnz) || (s.op === PR.op.jz)) {
+  if (s.op === PR.op.jnz || s.op === PR.op.jz) {
     text += PR.GlobalString(s.a) + 'branch ' + s.b;
   } else if (s.op === PR.op.jump) {
     text += 'branch ' + s.a;
-  } else if ((s.op >= PR.op.store_f) && (s.op <= PR.op.store_fnc)) {
+  } else if (s.op >= PR.op.store_f && s.op <= PR.op.store_fnc) {
     text += PR.GlobalString(s.a) + PR.GlobalStringNoContents(s.b);
   } else {
     if (s.a !== 0) {
@@ -1218,7 +1218,7 @@ PR.StackTrace = function() {
 };
 
 PR.Profile_f = function() {
-  if (SV.server.active !== true) {
+  if (!SV.server.active) {
     return;
   }
   let num = 0; let max; let best; let i; let f; let profile;
@@ -1292,7 +1292,7 @@ PR.LeaveFunction = function() {
 };
 
 PR.ExecuteProgram = function(fnum) {
-  if ((fnum === 0) || (fnum >= PR.functions.length)) {
+  if (fnum === 0 || fnum >= PR.functions.length) {
     if (PR.globals_int[PR.globalvars.self] !== 0) {
       ED.Print(SV.server.edicts[PR.globals_int[PR.globalvars.self]]);
     }
@@ -1371,10 +1371,10 @@ PR.ExecuteProgram = function(fnum) {
         PR.globals_float[st.c] = (PR.globals_float[st.a] < PR.globals_float[st.b]) ? 1.0 : 0.0;
         continue;
       case PR.op.and:
-        PR.globals_float[st.c] = ((PR.globals_float[st.a] !== 0.0) && (PR.globals_float[st.b] !== 0.0)) ? 1.0 : 0.0;
+        PR.globals_float[st.c] = (PR.globals_float[st.a] !== 0.0 && PR.globals_float[st.b] !== 0.0) ? 1.0 : 0.0;
         continue;
       case PR.op.or:
-        PR.globals_float[st.c] = ((PR.globals_float[st.a] !== 0.0) || (PR.globals_float[st.b] !== 0.0)) ? 1.0 : 0.0;
+        PR.globals_float[st.c] = (PR.globals_float[st.a] !== 0.0 || PR.globals_float[st.b] !== 0.0) ? 1.0 : 0.0;
         continue;
       case PR.op.not_f:
         PR.globals_float[st.c] = (PR.globals_float[st.a] === 0.0) ? 1.0 : 0.0;
@@ -1454,7 +1454,7 @@ PR.ExecuteProgram = function(fnum) {
         continue;
       case PR.op.address:
         ed = PR.globals_int[st.a];
-        if ((ed === 0) && (SV.server.loading !== true)) {
+        if (ed === 0 && !SV.server.loading) {
           PR.RunError('assignment to world entity');
         }
         PR.globals_int[st.c] = ed * PR.edict_size + 96 + (PR.globals_int[st.b] << 2);
diff --git a/source/engine/server/ProgsAPI.ts b/source/engine/server/ProgsAPI.ts
index 78e73d1c..e1149678 100644
--- a/source/engine/server/ProgsAPI.ts
+++ b/source/engine/server/ProgsAPI.ts
@@ -292,11 +292,11 @@ const breakstatement: BuiltinFunction = function breakstatement() {
 const traceline = generateBuiltinFunction('traceline', (start: Vector, end: Vector, noMonsters: number, passEdict: ServerEdict | null): void => {
   const trace = ServerEngineAPI.TracelineLegacy(start, end, noMonsters, passEdict);
 
-  SV.server.gameAPI.trace_allsolid = trace.allsolid === true ? 1.0 : 0.0;
-  SV.server.gameAPI.trace_startsolid = trace.startsolid === true ? 1.0 : 0.0;
+  SV.server.gameAPI.trace_allsolid = trace.allsolid ? 1.0 : 0.0;
+  SV.server.gameAPI.trace_startsolid = trace.startsolid ? 1.0 : 0.0;
   SV.server.gameAPI.trace_fraction = trace.fraction;
-  SV.server.gameAPI.trace_inwater = trace.inwater === true ? 1.0 : 0.0;
-  SV.server.gameAPI.trace_inopen = trace.inopen === true ? 1.0 : 0.0;
+  SV.server.gameAPI.trace_inwater = trace.inwater ? 1.0 : 0.0;
+  SV.server.gameAPI.trace_inopen = trace.inopen ? 1.0 : 0.0;
   SV.server.gameAPI.trace_endpos = trace.endpos;
   SV.server.gameAPI.trace_plane_normal = trace.plane.normal;
   SV.server.gameAPI.trace_plane_dist = trace.plane.dist;
diff --git a/source/engine/server/ServerMessages.ts b/source/engine/server/ServerMessages.ts
index 1d15a895..b41d03e6 100644
--- a/source/engine/server/ServerMessages.ts
+++ b/source/engine/server/ServerMessages.ts
@@ -746,7 +746,7 @@ export class ServerMessages {
       msg.writeByte(clientEntity.ammo_nails);
       msg.writeByte(clientEntity.ammo_rockets);
       msg.writeByte(clientEntity.ammo_cells);
-      if (COM.standard_quake === true) {
+      if (COM.standard_quake) {
         msg.writeByte(clientEntity.weapon & 0xff);
       } else {
         const weapon = clientEntity.weapon;
diff --git a/source/engine/server/physics/ServerCollision.ts b/source/engine/server/physics/ServerCollision.ts
index fae127a6..9eb7a581 100644
--- a/source/engine/server/physics/ServerCollision.ts
+++ b/source/engine/server/physics/ServerCollision.ts
@@ -853,7 +853,7 @@ export class ServerCollision {
         continue;
       }
 
-      if (clip.trace.allsolid === true) {
+      if (clip.trace.allsolid) {
         return;
       }
 
diff --git a/source/engine/server/physics/ServerMovement.ts b/source/engine/server/physics/ServerMovement.ts
index 728102c4..fc73112a 100644
--- a/source/engine/server/physics/ServerMovement.ts
+++ b/source/engine/server/physics/ServerMovement.ts
@@ -121,13 +121,13 @@ export class ServerMovement {
     const end = neworg.copy();
     end[2] -= STEPSIZE * 2.0;
     let trace = SV.collision.move(neworg, mins, maxs, end, Defs.moveTypes.MOVE_NORMAL, ent);
-    if (trace.allsolid === true) {
+    if (trace.allsolid) {
       return false;
     }
-    if (trace.startsolid === true) {
+    if (trace.startsolid) {
       neworg[2] -= STEPSIZE;
       trace = SV.collision.move(neworg, mins, maxs, end, Defs.moveTypes.MOVE_NORMAL, ent);
-      if (trace.allsolid === true || trace.startsolid === true) {
+      if (trace.allsolid || trace.startsolid) {
         return false;
       }
     }

From 0917b4b61c6e3c118da0765162f07d9d5f75cf2b Mon Sep 17 00:00:00 2001
From: Christian R <github@chrisnew.de>
Date: Sat, 4 Apr 2026 20:26:03 +0300
Subject: [PATCH 51/67] TS: polish tsc findings

---
 .../typescript-port.instructions.md           |  57 ++
 source/engine/client/ClientLifecycle.ts       |  10 +-
 source/engine/client/ClientState.ts           |   3 +-
 source/engine/client/Menu.ts                  |   2 +-
 source/engine/client/R.ts                     | 517 +++++++++++++-----
 source/engine/client/Sys.ts                   |  10 +-
 source/engine/client/menu/MenuItem.ts         |  10 +-
 source/engine/client/menu/MenuPage.ts         |  13 +-
 .../client/renderer/AliasModelRenderer.ts     |  29 +-
 .../client/renderer/MeshModelRenderer.ts      |   6 +-
 .../client/renderer/SpriteModelRenderer.ts    |  15 +-
 source/engine/common/CollisionModelSource.ts  |  36 +-
 source/engine/common/GameAPIs.ts              |  36 +-
 source/engine/common/Host.ts                  | 346 +++++++++---
 source/engine/common/Mod.ts                   |  12 +-
 source/engine/common/Pmove.ts                 |  36 +-
 source/engine/common/WorkerFramework.ts       |   6 +-
 source/engine/common/WorkerManager.ts         |   2 +-
 source/engine/common/model/BSP.ts             |  12 +-
 source/engine/common/model/MeshModel.ts       |   4 +-
 source/engine/common/model/SpriteModel.ts     |   4 +-
 .../common/model/loaders/AliasMDLLoader.ts    |  14 +-
 .../common/model/loaders/BSP29Loader.ts       |  89 +--
 source/engine/server/Edict.ts                 |   6 +-
 source/engine/server/Server.ts                |  12 +-
 source/shared/GameInterfaces.ts               |  24 +
 test/common/game-interfaces.test.mjs          |  29 +
 27 files changed, 997 insertions(+), 343 deletions(-)
 create mode 100644 test/common/game-interfaces.test.mjs

diff --git a/.github/instructions/typescript-port.instructions.md b/.github/instructions/typescript-port.instructions.md
index a48c4554..eea202ee 100644
--- a/.github/instructions/typescript-port.instructions.md
+++ b/.github/instructions/typescript-port.instructions.md
@@ -179,6 +179,60 @@ if (sometype instanceof SomeClass) {
 …
 ```
 
+### Hot-Path Narrowing and API Contracts
+
+When TypeScript complains in render loops, BSP recursion, movement code, input dispatch, or other hot paths, do **not** introduce tiny helper functions merely to placate the type checker.
+
+- **Do not create helper functions whose only purpose is syntactic narrowing** such as `isFoo(...)`, `requireBar(...)`, `resolveBaz(...)`, or `getNodeChild(...)` when the call site already knows the invariant and is in a hot path.
+- **Prefer local invariant checks** at the use site:
+  - `const worldmodel = CL.state.worldmodel!;`
+  - `console.assert(worldmodel !== null, 'worldmodel required');`
+  - then use the narrowed local directly.
+- **Use small local `as` casts only after an adjacent `console.assert(...)` or branch that already proves the invariant.** Keep the cast at the use site instead of hiding it in another function.
+- **Preserve existing runtime contracts.** Do not make required parameters optional just to quiet the compiler; fix every caller instead.
+- **Avoid `Reflect.get`, `Reflect.set`, and other dynamic property access in hot paths.** If a property is part of the runtime contract, teach the type system about it with an interface or class member and use direct property access.
+- **Avoid structural capability probes based on repeated reflective checks** like `typeof Reflect.get(entity, 'serialize') === 'function'` in gameplay code. Prefer a real runtime capability marker when possible.
+
+Example:
+
+```typescript
+// ❌ Avoid helper indirection for a known hot-path invariant.
+function getNodeChild(node: Node, childIndex: 0 | 1): Node {
+  const child = node.children[childIndex];
+  console.assert(child instanceof Node, 'linked child required');
+  return child as Node;
+}
+
+BrushTrace._recursiveHullCheck(ctx, getNodeChild(node, 0), p1f, p2f, p1, p2, depth + 1);
+
+// ✅ Narrow locally where the value is consumed.
+const frontChild = node.children[0] as Node;
+console.assert(frontChild instanceof Node, 'linked child required');
+BrushTrace._recursiveHullCheck(ctx, frontChild, p1f, p2f, p1, p2, depth + 1);
+```
+
+For runtime capabilities shared with still-JS game code, prefer a dedicated runtime marker over repeated structural probes. A good pattern is a small abstract class with `Symbol.hasInstance` so engine code can use `instanceof` while JS implementations remain compatible.
+
+```typescript
+abstract class SerializableEntity {
+  static [Symbol.hasInstance](value: unknown): boolean {
+    if (value === null || typeof value !== 'object') {
+      return false;
+    }
+
+    const candidate = value as {
+      readonly classname?: unknown;
+      readonly serialize?: unknown;
+      readonly deserialize?: unknown;
+    };
+
+    return typeof candidate.classname === 'string'
+      && typeof candidate.serialize === 'function'
+      && typeof candidate.deserialize === 'function';
+  }
+}
+```
+
 ### Template Literals
 
 Replace string concatenation with template literals for readability.
@@ -225,6 +279,9 @@ Use this checklist when polishing a ported `.ts` file:
 14. [ ] All original comments preserved, especially TODOs and complex logic explanations.
 15. [ ] File ends with an empty line.
 16. [ ] If there is some important logic that is not covered by tests yet, add tests for it.
+17. [ ] No helper functions were introduced solely for TypeScript narrowing in hot paths.
+18. [ ] No hot-path reflective property access was introduced where a typed field or runtime capability marker would do.
+19. [ ] Existing method signatures were preserved unless there was an intentional API change.
 
 ### Avoid inline import type annotations
 
diff --git a/source/engine/client/ClientLifecycle.ts b/source/engine/client/ClientLifecycle.ts
index 5de2c0de..3af3f13a 100644
--- a/source/engine/client/ClientLifecycle.ts
+++ b/source/engine/client/ClientLifecycle.ts
@@ -8,6 +8,7 @@ import { clientRuntimeState } from './ClientState.ts';
 import { MoveVars, Pmove } from '../common/Pmove.ts';
 import { ClientEngineAPI } from '../common/GameAPIs.ts';
 import { eventBus, getClientRegistry } from '../registry.ts';
+import type { SerializedParticle } from './R.ts';
 
 let { Host, PR, S } = getClientRegistry();
 
@@ -54,13 +55,16 @@ export default class ClientLifecycle {
 
   static initGame(): void {
     CL.gameCapabilities = [...PR.capabilities];
+    const hostVersion = Host.version;
+
+    console.assert(hostVersion !== null, 'Host.version must be registered before initGame');
 
     if (!PR.QuakeJS?.identification) {
-      document.title = `${Def.productName} (${Host.version.string})`;
+      document.title = `${Def.productName} (${hostVersion?.string ?? ''})`;
       return;
     }
 
-    document.title = `${PR.QuakeJS.identification.name} (${PR.QuakeJS.identification.version.join('.')}) on ${Def.productName} (${Host.version.string})`;
+    document.title = `${PR.QuakeJS.identification.name} (${PR.QuakeJS.identification.version.join('.')}) on ${Def.productName} (${hostVersion?.string ?? ''})`;
 
     if (PR.QuakeJS.ClientGameAPI) {
       PR.QuakeJS.ClientGameAPI.Init(ClientEngineAPI);
@@ -75,7 +79,7 @@ export default class ClientLifecycle {
     CL.gameCapabilities = [...PR.QuakeJS.identification.capabilities];
   }
 
-  static resumeGame(clientdata: string | null, particles: string | null): void {
+  static resumeGame(clientdata: string | null, particles: SerializedParticle[] | null): void {
     CL.Connect('local');
     clientRuntimeState.loadClientData = [clientdata, particles];
   }
diff --git a/source/engine/client/ClientState.ts b/source/engine/client/ClientState.ts
index 54f9f52a..e9811944 100644
--- a/source/engine/client/ClientState.ts
+++ b/source/engine/client/ClientState.ts
@@ -5,6 +5,7 @@ import * as Def from '../common/Def.ts';
 import Vector from '../../shared/Vector.ts';
 import type { BaseModel } from '../common/model/BaseModel.ts';
 import type { BrushModel } from '../common/Mod.ts';
+import type { SerializedParticle } from './R.ts';
 import type { ClientGameInterface, ClientSerializableType, SFX } from '../../shared/GameInterfaces.ts';
 import type ClientDemos from './ClientDemos.ts';
 import { EventBus, eventBus, getClientRegistry } from '../registry.ts';
@@ -32,7 +33,7 @@ type ClientMoveCommand = {
   msec: number;
 };
 
-type ClientLoadData = [string | null, string | null];
+type ClientLoadData = [string | null, SerializedParticle[] | null];
 
 let { CL } = getClientRegistry();
 
diff --git a/source/engine/client/Menu.ts b/source/engine/client/Menu.ts
index b05efe61..53950e7c 100644
--- a/source/engine/client/Menu.ts
+++ b/source/engine/client/Menu.ts
@@ -47,7 +47,7 @@ type MenuStateStore = {
   value: MenuStateId;
 };
 
-type MenuPic = GLTexture & { translate?: GLTexture | null };
+export type MenuPic = GLTexture & { translate?: GLTexture | null };
 type SaveGameData = { comment?: string; mapname?: string };
 type BindName = [string, string];
 type QuitMessage = [string, string, string, string];
diff --git a/source/engine/client/R.ts b/source/engine/client/R.ts
index 3b8b5c91..53030ea6 100644
--- a/source/engine/client/R.ts
+++ b/source/engine/client/R.ts
@@ -3,7 +3,7 @@ import Cvar from '../common/Cvar.ts';
 import Cmd from '../common/Cmd.ts';
 import * as Def from '../common/Def.ts';
 
-import { eventBus, registry } from '../registry.ts';
+import { eventBus, getClientRegistry, registry } from '../registry.ts';
 import Chase from './Chase.ts';
 import W from '../common/W.ts';
 import VID from './VID.ts';
@@ -15,7 +15,7 @@ import { AliasModelRenderer } from './renderer/AliasModelRenderer.ts';
 import { SpriteModelRenderer } from './renderer/SpriteModelRenderer.ts';
 import { MeshModelRenderer } from './renderer/MeshModelRenderer.ts';
 import Draw from './Draw.ts';
-import { BrushModel, type FogVolumeInfo, type LightgridPointSample, Node, type WorldTurbulentChainInfo, revealedVisibility } from '../common/model/BSP.ts';
+import { BrushModel, type BrushTexVec, type FogVolumeInfo, type LightgridPointSample, Node, type WorldTurbulentChainInfo, revealedVisibility } from '../common/model/BSP.ts';
 import { type Face, Plane } from '../common/model/BaseModel.ts';
 import PostProcess from './renderer/PostProcess.ts';
 import BloomEffect from './renderer/BloomEffect.ts';
@@ -25,10 +25,10 @@ import { ClientDlight, ClientEdict } from './ClientEntities.ts';
 import { avertexnormals } from '../common/model/loaders/AliasMDLLoader.ts';
 import { SkyRenderer } from './renderer/Sky.ts';
 
-let { CL, Host, Mod, SCR, SV, Sys, V } = registry;
+let { CL, Host, Mod, SCR, SV, Sys, V } = getClientRegistry();
 
 eventBus.subscribe('registry.frozen', () => {
-  ({ CL, Host, Mod, SCR, SV, Sys, V } = registry);
+  ({ CL, Host, Mod, SCR, SV, Sys, V } = getClientRegistry());
 });
 
 let gl: WebGL2RenderingContext = null!;
@@ -79,7 +79,7 @@ type EntityLightValues = [Vector, Vector, Vector, Vector, Vector];
 type GridPosition = [number, number, number];
 type Vec4 = [number, number, number, number];
 
-interface SerializedParticle {
+export interface SerializedParticle {
   i: number;
   die: number;
   color: number;
@@ -89,6 +89,24 @@ interface SerializedParticle {
   vel: [number, number, number];
 }
 
+interface Particle {
+  die: number;
+  color: number;
+  ramp: number;
+  type: ParticleType;
+  org: Vector;
+  vel: Vector;
+}
+
+interface Decal {
+  readonly texture: GLTexture;
+  readonly verts: [Vector, Vector, Vector, Vector];
+  readonly color: Vector;
+  readonly die: number;
+}
+
+type AngularVelocity = [number, number, number];
+
 enum ParticleType {
   tracer = 0,
   grav = 1,
@@ -130,6 +148,78 @@ class R {
   static lightstylevalue_a = new Uint8Array(new ArrayBuffer(64));
   static lightstylevalue_b = new Uint8Array(new ArrayBuffer(64));
 
+  static waterwarp: Cvar = null!;
+  static fullbright: Cvar = null!;
+  static drawentities: Cvar = null!;
+  static drawviewmodel: Cvar = null!;
+  static drawturbulents: Cvar = null!;
+  static novis: Cvar = null!;
+  static speeds: Cvar = null!;
+  static polyblend: Cvar = null!;
+  static flashblend: Cvar = null!;
+  static nocolors: Cvar = null!;
+  static bloom: Cvar = null!;
+  static bloomStrength: Cvar = null!;
+  static bloomSkyStrength: Cvar = null!;
+  static bloomDlightStrength: Cvar = null!;
+  static bloomSpecularStrength: Cvar = null!;
+  static bloomDownsample: Cvar = null!;
+  static bloomDebug: Cvar = null!;
+  static interpolation: Cvar = null!;
+  static fog_color: Cvar = null!;
+  static fog_start: Cvar = null!;
+  static fog_end: Cvar = null!;
+  static fog_density: Cvar = null!;
+  static fog_mode: Cvar = null!;
+
+  static notexture: GLTexture = null!;
+  static blacktexture: GLTexture = null!;
+  static flatnormalmap: GLTexture = null!;
+  static deluxemap_texture: WebGLTexture = null!;
+  static lightmap_texture: WebGLTexture = null!;
+  static dlightmap_rgba_texture: WebGLTexture = null!;
+  static lightstyle_texture_a: WebGLTexture = null!;
+  static lightstyle_texture_b: WebGLTexture = null!;
+  static fullbright_texture: WebGLTexture = null!;
+  static null_texture: WebGLTexture = null!;
+  static normal_up_texture: WebGLTexture = null!;
+  static shadow_textures: WebGLTexture[] = [];
+  static shadow_texture: WebGLTexture | null = null;
+  static point_shadow_texture: WebGLTexture | null = null;
+  static world_depth_texture: WebGLTexture | null = null;
+  static dlightvecs: WebGLBuffer = null!;
+  static dlightVAO: WebGLVertexArrayObject = null!;
+
+  static usePostProcess = false;
+  static dowarp = false;
+  static particles: Particle[] = [];
+  static decals: Decal[] = [];
+  static numparticles = 0;
+  static avelocities: AngularVelocity[] = [];
+  static allocated: number[] = [];
+  static c_brush_verts = 0;
+  static c_brush_tris = 0;
+  static c_brush_draws = 0;
+  static c_brush_draws_pbr = 0;
+  static c_brush_vbos = 0;
+  static c_brush_texture_binds = 0;
+  static c_alias_polys = 0;
+
+  private static _textureAxisToVector(texVec: BrushTexVec): Vector {
+    return new Vector(texVec[0], texVec[1], texVec[2]);
+  }
+
+  private static _createDeadParticle(): Particle {
+    return {
+      die: -1.0,
+      color: 0,
+      ramp: 0.0,
+      type: ParticleType.slowgrav,
+      org: new Vector(),
+      vel: new Vector(),
+    };
+  }
+
   static AnimateLight(): void {
     if (R.fullbright.value === 0) {
       const i = Math.floor(CL.state.time * 10.0);
@@ -161,7 +251,8 @@ class R {
     }
     R.dlightframecount++;
     gl.enable(gl.BLEND);
-    const program = GL.UseProgram('dlight'); let a;
+    const program = GL.UseProgram('dlight')!; let a;
+    console.assert(program !== null, 'dlight program required');
     GL.BindVAO(R.dlightVAO);
     for (let i = 0; i < Def.limits.dlights; i++) {
       const l = CL.state.clientEntities.dlights[i];
@@ -177,8 +268,8 @@ class R {
         V.blend[2] *= 1.0 - a;
         continue;
       }
-      gl.uniform3fv(program.uOrigin, l.origin);
-      gl.uniform1f(program.uRadius, l.radius);
+      gl.uniform3fv(program.uOrigin!, l.origin);
+      gl.uniform1f(program.uRadius!, l.radius);
       gl.drawArrays(gl.TRIANGLE_FAN, 0, 18);
     }
     GL.UnbindVAO();
@@ -190,13 +281,15 @@ class R {
    * @returns A known point on the surface plane.
    */
   static GetDynamicLightSurfacePoint(surf: Face): Vector {
-    const surfedge = CL.state.worldmodel.surfedges[surf.firstedge!];
+    const worldmodel = CL.state.worldmodel!;
+    console.assert(worldmodel !== null, 'worldmodel required');
+    const surfedge = worldmodel.surfedges[surf.firstedge!];
 
     if (surfedge >= 0) {
-      return CL.state.worldmodel.vertexes[CL.state.worldmodel.edges[surfedge][0]].copy();
+      return worldmodel.vertexes[worldmodel.edges[surfedge][0]].copy();
     }
 
-    return CL.state.worldmodel.vertexes[CL.state.worldmodel.edges[-surfedge][1]].copy();
+    return worldmodel.vertexes[worldmodel.edges[-surfedge][1]].copy();
   };
 
   /**
@@ -235,14 +328,20 @@ class R {
     if (node.contents < 0) {
       return;
     }
-    const normal = node.plane!.normal;
-    const dist = light.origin.dot(normal) - node.plane.dist;
+    const plane = node.plane!;
+    console.assert(plane !== null, 'node plane required');
+    const normal = plane.normal;
+    const dist = light.origin.dot(normal) - plane.dist;
     if (dist > light.radius) {
-      R.MarkLights(light, bit, node.children[0]);
+      const frontChild = node.children[0] as Node;
+      console.assert(frontChild instanceof Node, `R.MarkLights expected linked BSP child 0 on node ${node.num}`);
+      R.MarkLights(light, bit, frontChild);
       return;
     }
     if (dist < -light.radius) {
-      R.MarkLights(light, bit, node.children[1]);
+      const backChild = node.children[1] as Node;
+      console.assert(backChild instanceof Node, `R.MarkLights expected linked BSP child 1 on node ${node.num}`);
+      R.MarkLights(light, bit, backChild);
       return;
     }
     for (const surf of node.facesIter()) {
@@ -262,8 +361,12 @@ class R {
       }
       surf.dlightbits |= bit;
     }
-    R.MarkLights(light, bit, node.children[0]);
-    R.MarkLights(light, bit, node.children[1]);
+    const frontChild = node.children[0] as Node;
+    const backChild = node.children[1] as Node;
+    console.assert(frontChild instanceof Node, `R.MarkLights expected linked BSP child 0 on node ${node.num}`);
+    console.assert(backChild instanceof Node, `R.MarkLights expected linked BSP child 1 on node ${node.num}`);
+    R.MarkLights(light, bit, frontChild);
+    R.MarkLights(light, bit, backChild);
   };
 
   static PushDlights() {
@@ -271,6 +374,9 @@ class R {
       return;
     }
 
+    const worldmodel = CL.state.worldmodel!;
+    console.assert(worldmodel !== null, 'worldmodel required');
+
     for (let i = 0; i < LIGHTMAP_BLOCK_SIZE; i++) {
       R.lightmap_modified[i] = 0;
     }
@@ -281,23 +387,28 @@ class R {
       const l = CL.state.clientEntities.dlights[i];
 
       if (!l.isFree()) {
-        R.MarkLights(l, bit, CL.state.worldmodel.nodes[0]);
+        R.MarkLights(l, bit, worldmodel.nodes[0]);
         for (const ent of CL.state.clientEntities.getVisibleEntities()) {
           if (ent.model === null) {
             continue;
           }
-          if ((ent.model.type !== Mod.type.brush) || !ent.model.submodel) {
+          if (!(ent.model instanceof BrushModel) || !ent.model.submodel) {
             continue;
           }
-          R.MarkLights(l, bit, CL.state.worldmodel.nodes[ent.model.hulls[0].firstclipnode]);
+          const firstClipNode = ent.model.hulls[0]?.firstclipnode;
+          const submodelNode = firstClipNode !== undefined ? worldmodel.nodes[firstClipNode] : null;
+
+          if (submodelNode !== undefined && submodelNode !== null) {
+            R.MarkLights(l, bit, submodelNode);
+          }
         }
       }
       bit += bit;
     }
 
     let surf;
-    for (let i = 0; i < CL.state.worldmodel.faces.length; i++) {
-      surf = CL.state.worldmodel.faces[i];
+    for (let i = 0; i < worldmodel.faces.length; i++) {
+      surf = worldmodel.faces[i];
       if (surf.dlightframe === R.dlightframecount) {
         R.RemoveDynamicLights(surf);
       } else if (surf.dlightframe === (R.dlightframecount + 1)) {
@@ -314,7 +425,9 @@ class R {
         if (!R.lightmap_modified[j]) {
           continue;
         }
-        gl.texSubImage2D(gl.TEXTURE_2D, 0, 0, i, LIGHTMAP_BLOCK_SIZE, j - i + 1, gl.RGBA, gl.UNSIGNED_BYTE, R.dlightmaps_rgba.subarray(i * LIGHTMAP_BLOCK_SIZE * 4, (j + 1) * LIGHTMAP_BLOCK_SIZE * 4));
+        const dlightmapsRgba = R.dlightmaps_rgba!;
+        console.assert(dlightmapsRgba !== null, 'dynamic lightmap buffer required');
+        gl.texSubImage2D(gl.TEXTURE_2D, 0, 0, i, LIGHTMAP_BLOCK_SIZE, j - i + 1, gl.RGBA, gl.UNSIGNED_BYTE, dlightmapsRgba.subarray(i * LIGHTMAP_BLOCK_SIZE * 4, (j + 1) * LIGHTMAP_BLOCK_SIZE * 4));
         break;
       }
       break;
@@ -328,13 +441,21 @@ class R {
       return null;
     }
 
-    const normal = node.plane.normal;
-    const front = start[0] * normal[0] + start[1] * normal[1] + start[2] * normal[2] - node.plane.dist;
-    const back = end[0] * normal[0] + end[1] * normal[1] + end[2] * normal[2] - node.plane.dist;
+    const worldmodel = CL.state.worldmodel!;
+    console.assert(worldmodel !== null, 'worldmodel required');
+    const plane = node.plane!;
+    console.assert(plane !== null, 'node plane required');
+    const normal = plane.normal;
+    const front = start[0] * normal[0] + start[1] * normal[1] + start[2] * normal[2] - plane.dist;
+    const back = end[0] * normal[0] + end[1] * normal[1] + end[2] * normal[2] - plane.dist;
     const side = front < 0;
+    const frontChild = node.children[side ? 1 : 0] as Node;
+    const backChild = node.children[side ? 0 : 1] as Node;
+    console.assert(frontChild instanceof Node, `R.RecursiveLightPoint expected linked front child on node ${node.num}`);
+    console.assert(backChild instanceof Node, `R.RecursiveLightPoint expected linked back child on node ${node.num}`);
 
     if ((back < 0) === side) {
-      return R.RecursiveLightPoint(node.children[side ? 1 : 0], start, end);
+      return R.RecursiveLightPoint(frontChild, start, end);
     }
 
     const frac = front / (front - back);
@@ -344,7 +465,7 @@ class R {
       start[2] + (end[2] - start[2]) * frac,
     );
 
-    const r = R.RecursiveLightPoint(node.children[side ? 1 : 0], start, mid);
+    const r = R.RecursiveLightPoint(frontChild, start, mid);
 
     if (r !== null) {
       return r;
@@ -359,9 +480,9 @@ class R {
         continue;
       }
 
-      const tex = CL.state.worldmodel.texinfo[surf.texinfo];
-      const s = mid.dot(new Vector(...tex.vecs[0])) + tex.vecs[0][3];
-      const t = mid.dot(new Vector(...tex.vecs[1])) + tex.vecs[1][3];
+      const tex = worldmodel.texinfo[surf.texinfo];
+      const s = mid.dot(R._textureAxisToVector(tex.vecs[0])) + tex.vecs[0][3];
+      const t = mid.dot(R._textureAxisToVector(tex.vecs[1])) + tex.vecs[1][3];
       if ((s < surf.texturemins[0]) || (t < surf.texturemins[1])) {
         continue;
       }
@@ -376,15 +497,19 @@ class R {
         return [new Vector(), mid];
       }
 
-      ds >>= surf.lmshift;
-      dt >>= surf.lmshift;
+      const lmshift = surf.lmshift!;
+      console.assert(lmshift !== null, 'face lightmap shift required');
 
-      const smax = (surf.extents[0] >> surf.lmshift) + 1;
-      const tmax = (surf.extents[1] >> surf.lmshift) + 1;
+      ds >>= lmshift;
+      dt >>= lmshift;
+
+      const smax = (surf.extents[0] >> lmshift) + 1;
+      const tmax = (surf.extents[1] >> lmshift) + 1;
 
       const r3 = new Vector();
-      const haveRGB = CL.state.worldmodel.lightdata_rgb !== null;
-      const lightdata = haveRGB ? CL.state.worldmodel.lightdata_rgb : CL.state.worldmodel.lightdata;
+      const haveRGB = worldmodel.lightdata_rgb !== null;
+      const lightdata = (haveRGB ? worldmodel.lightdata_rgb : worldmodel.lightdata)!;
+      console.assert(lightdata !== null, 'world lightdata required');
       const channels = haveRGB ? 3 : 1;
       const uInterpolation = R.interpolation.value ? (CL.state.time % .2) / .2 : 0;
 
@@ -419,22 +544,25 @@ class R {
       ];
     }
 
-    return R.RecursiveLightPoint(node.children[!side ? 1 : 0], mid, end);
+    return R.RecursiveLightPoint(backChild, mid, end);
   };
 
   static LightPoint(p: Vector): LightPointResult {
-    if (CL.state.worldmodel.lightdata === null && CL.state.worldmodel.lightdata_rgb === null) {
+    const worldmodel = CL.state.worldmodel!;
+    console.assert(worldmodel !== null, 'worldmodel required');
+
+    if (worldmodel.lightdata === null && worldmodel.lightdata_rgb === null) {
       return [new Vector(255, 255, 255), new Vector(0, 0, 0)];
     }
 
     // Try lightgrid first if available
-    if (CL.state.worldmodel.lightgrid !== null) {
+    if (worldmodel.lightgrid !== null) {
       const gridResult = R.LightPointFromGrid(p);
       if (gridResult !== null) {
         // Get a proper light origin from surface trace for directional shading.
         // The lightgrid provides correct color but has no surface information,
         // so we trace downward to find the surface below the entity.
-        const surfaceTrace = R.RecursiveLightPoint(CL.state.worldmodel.nodes[0], p, new Vector(p[0], p[1], p[2] - 2048.0));
+        const surfaceTrace = R.RecursiveLightPoint(worldmodel.nodes[0], p, new Vector(p[0], p[1], p[2] - 2048.0));
         if (surfaceTrace !== null) {
           gridResult[1] = surfaceTrace[1];
         }
@@ -442,7 +570,7 @@ class R {
       }
     }
 
-    const r = R.RecursiveLightPoint(CL.state.worldmodel.nodes[0], p, new Vector(p[0], p[1], p[2] - 2048.0));
+    const r = R.RecursiveLightPoint(worldmodel.nodes[0], p, new Vector(p[0], p[1], p[2] - 2048.0));
 
     if (r === null) {
       return [new Vector(0, 0, 0), new Vector(0, 0, 0)];
@@ -456,7 +584,14 @@ class R {
    * @returns Point data or null when the octree has no lighting sample there.
    */
   static SampleLightgridPoint(gridPos: GridPosition): LightgridPointSample | null {
-    const grid = CL.state.worldmodel.lightgrid;
+    const worldmodel = CL.state.worldmodel!;
+    console.assert(worldmodel !== null, 'worldmodel required');
+    const grid = worldmodel.lightgrid;
+
+    if (grid === null) {
+      return null;
+    }
+
     const LGNODE_LEAF = 1 << 31;
     const LGNODE_MISSING = 1 << 30;
 
@@ -538,9 +673,11 @@ class R {
    * @returns Interpolated RGB light and origin, or null when no grid sample is available.
    */
   static LightPointFromGrid(pos: Vector): LightPointResult | null {
-    const grid = CL.state.worldmodel.lightgrid;
+    const worldmodel = CL.state.worldmodel!;
+    console.assert(worldmodel !== null, 'worldmodel required');
+    const grid = worldmodel.lightgrid;
 
-    if (!grid) {
+    if (grid === null) {
       return null;
     }
 
@@ -569,7 +706,7 @@ class R {
     for (let dz = 0; dz <= 1; dz++) {
       for (let dy = 0; dy <= 1; dy++) {
         for (let dx = 0; dx <= 1; dx++) {
-          const gridPos = [baseX + dx, baseY + dy, baseZ + dz];
+          const gridPos: GridPosition = [baseX + dx, baseY + dy, baseZ + dz];
           const sample = R.SampleLightgridPoint(gridPos);
 
           // Calculate trilinear weight
@@ -776,7 +913,7 @@ class R {
     }
 
     // Group entities by model type for batched rendering
-    const entitiesByType = new Map();
+    const entitiesByType = new Map<number, ClientEdict[]>();
 
     for (const entity of CL.state.clientEntities.getVisibleEntities()) {
       if (entity.model === null || entity.alpha === 0.0) {
@@ -784,10 +921,14 @@ class R {
       }
 
       const modelType = entity.model.type;
+      if (modelType === null) {
+        continue;
+      }
+
       if (!entitiesByType.has(modelType)) {
         entitiesByType.set(modelType, []);
       }
-      entitiesByType.get(modelType).push(entity);
+      entitiesByType.get(modelType)!.push(entity);
     }
 
     // Pass 0: Opaque models (brush, alias)
@@ -796,15 +937,19 @@ class R {
         continue; // Sprites are drawn in pass 1
       }
 
-      const renderer = modelRendererRegistry.getRenderer(modelType);
+      const renderer = modelRendererRegistry.getRenderer(modelType)!;
+      console.assert(renderer !== null, `renderer required for model type ${modelType}`);
 
       renderer.setupRenderState(0);
       for (const entity of entities) {
-        if (!renderer.rendersOpaquePass(entity.model, entity)) {
+        const model = entity.model!;
+        console.assert(model !== null, 'entity model required for opaque pass');
+
+        if (!renderer.rendersOpaquePass(model, entity)) {
           continue;
         }
 
-        renderer.render(entity.model, entity, 0);
+        renderer.render(model, entity, 0);
       }
       renderer.cleanupRenderState(0);
     }
@@ -813,12 +958,15 @@ class R {
     // Pass 1: Transparent sprites with blending
     const spriteEntities = entitiesByType.get(Mod.type.sprite);
     if (spriteEntities) {
-      const renderer = modelRendererRegistry.getRenderer(Mod.type.sprite);
+      const renderer = modelRendererRegistry.getRenderer(Mod.type.sprite)!;
+      console.assert(renderer !== null, 'sprite renderer required');
 
       gl.enable(gl.BLEND);
       renderer.setupRenderState(1);
       for (const entity of spriteEntities) {
-        renderer.render(entity.model, entity, 1);
+        const model = entity.model!;
+        console.assert(model !== null, 'entity model required for sprite pass');
+        renderer.render(model, entity, 1);
       }
       renderer.cleanupRenderState(1);
       GL.StreamFlush();
@@ -838,8 +986,13 @@ class R {
    * back to the simple sequential turbulent pass.
    */
   static _renderFogAndTurbulentsSorted(worldEntity: ClientEdict): void {
-    const worldmodel = worldEntity.model as BrushModel;
-    const brushRenderer = modelRendererRegistry.getRenderer(Mod.type.brush) as BrushModelRenderer;
+    if (!(worldEntity.model instanceof BrushModel)) {
+      return;
+    }
+
+    const worldmodel = worldEntity.model;
+    const brushRenderer = modelRendererRegistry.getRenderer(Mod.type.brush)! as BrushModelRenderer;
+    console.assert(brushRenderer !== null, 'brush renderer required');
     const hasFog = PostProcess.active
       && worldmodel.fogVolumes && worldmodel.fogVolumes.length > 0;
     const hasTurbulents = R.drawturbulents.value;
@@ -920,18 +1073,21 @@ class R {
    * This ensures transparent surfaces blend correctly regardless of type.
    */
   static _renderTransparentsSorted(worldEntity: ClientEdict): void {
-    const worldmodel = worldEntity.model as BrushModel;
+    if (!(worldEntity.model instanceof BrushModel)) {
+      return;
+    }
+
+    const worldmodel = worldEntity.model;
 
     const vieworg = R.refdef.vieworg;
     const items: TransparentSortItem[] = [];
 
     // Collect world transparent leaves with distances
-    const brushRenderer = modelRendererRegistry.getRenderer(Mod.type.brush) as BrushModelRenderer;
-    if (worldEntity && worldEntity.model) {
-      const worldLeaves = brushRenderer.getWorldTransparentLeaves(worldmodel, vieworg);
-      for (let i = 0; i < worldLeaves.length; i++) {
-        items.push({ dist: worldLeaves[i].dist, kind: 0, data: worldLeaves[i].leaf });
-      }
+    const brushRenderer = modelRendererRegistry.getRenderer(Mod.type.brush)! as BrushModelRenderer;
+    console.assert(brushRenderer !== null, 'brush renderer required');
+    const worldLeaves = brushRenderer.getWorldTransparentLeaves(worldmodel, vieworg);
+    for (let i = 0; i < worldLeaves.length; i++) {
+      items.push({ dist: worldLeaves[i].dist, kind: 0, data: worldLeaves[i].leaf });
     }
 
     // Collect transparent entities with distances
@@ -941,8 +1097,13 @@ class R {
           continue;
         }
 
-        const renderer = modelRendererRegistry.getRenderer(entity.model.type);
-        if (renderer === null || !renderer.rendersTransparentPass(entity.model, entity)) {
+        if (entity.model.type === null) {
+          continue;
+        }
+
+        const renderer = modelRendererRegistry.getRenderer(entity.model.type)!;
+        console.assert(renderer !== null, `renderer required for model type ${entity.model.type}`);
+        if (!renderer.rendersTransparentPass(entity.model, entity)) {
           continue;
         }
 
@@ -983,7 +1144,12 @@ class R {
           worldPassActive = false;
         }
         const entity = item.data as ClientEdict;
-        const renderer = modelRendererRegistry.getRenderer(entity.model.type);
+        if (entity.model === null || entity.model.type === null) {
+          continue;
+        }
+
+        const renderer = modelRendererRegistry.getRenderer(entity.model.type)!;
+        console.assert(renderer !== null, `renderer required for model type ${entity.model.type}`);
         renderer.render(entity.model, entity, 2);
         GL.StreamFlush();
       }
@@ -1009,18 +1175,25 @@ class R {
     }
 
     if (!CL.gameCapabilities.includes(gameCapabilities.CAP_VIEWMODEL_MANAGED)) {
+      const viewent = CL.state.viewent!;
+      console.assert(viewent !== null, 'view entity required');
+
       if ((CL.state.items & Def.it.invisibility) !== 0) { // Legacy
         return;
       }
       if (CL.state.stats[Def.stat.health] <= 0) { // Legacy
         return;
       }
-      if (!CL.state.viewent.model) {
+      if (!viewent.model) {
         return;
       }
     } else if (CL.state.gameAPI) {
       const viewmodel = CL.state.gameAPI.viewmodel;
 
+      if (viewmodel === null) {
+        return;
+      }
+
       if (!viewmodel.visible) {
         return; // game says to not draw the view model
       }
@@ -1035,21 +1208,25 @@ class R {
     let ymax = 4.0 * Math.tan(SCR.fov.value * 0.82 * Math.PI / 360.0);
     R.perspective[0] = 4.0 / (ymax * R.refdef.vrect.width / R.refdef.vrect.height);
     R.perspective[5] = 4.0 / ymax;
-    let program = GL.UseProgram('alias');
-    gl.uniformMatrix4fv(program.uPerspective, false, R.perspective);
-
-    if (CL.state.viewent.model !== null) {
-      const aliasRenderer = modelRendererRegistry.getRenderer(Mod.type.alias);
+    let program = GL.UseProgram('alias')!;
+    console.assert(program !== null, 'alias program required');
+    gl.uniformMatrix4fv(program.uPerspective!, false, R.perspective);
+
+    const viewent = CL.state.viewent;
+    if (viewent !== null && viewent.model !== null) {
+      const aliasRenderer = modelRendererRegistry.getRenderer(Mod.type.alias)!;
+      console.assert(aliasRenderer !== null, 'alias renderer required');
       aliasRenderer.setupRenderState(0);
-      aliasRenderer.render(CL.state.viewent.model, CL.state.viewent, 0);
+      aliasRenderer.render(viewent.model, viewent, 0);
       aliasRenderer.cleanupRenderState(0);
     }
 
     ymax = 4.0 * Math.tan(R.refdef.fov_y * Math.PI / 360.0);
     R.perspective[0] = 4.0 / (ymax * R.refdef.vrect.width / R.refdef.vrect.height);
     R.perspective[5] = 4.0 / ymax;
-    program = GL.UseProgram('alias');
-    gl.uniformMatrix4fv(program.uPerspective, false, R.perspective);
+    program = GL.UseProgram('alias')!;
+    console.assert(program !== null, 'alias program required');
+    gl.uniformMatrix4fv(program.uPerspective!, false, R.perspective);
 
     gl.depthRange(0.0, 1.0);
   };
@@ -1243,13 +1420,13 @@ class R {
         gl.uniformMatrix4fv(program.uLightSpaceMatrix2, false, ShadowMap.lightSpaceMatrices[2]);
       }
       if (program.uShadowEnabled !== undefined) {
-        gl.uniform1f(program.uShadowEnabled, ShadowMap.enabled.value ? 1.0 : 0.0);
+        gl.uniform1f(program.uShadowEnabled, ShadowMap.enabled!.value ? 1.0 : 0.0);
       }
       if (program.uShadowCount !== undefined) {
-        gl.uniform1i(program.uShadowCount, ShadowMap.enabled.value ? ShadowMap.localLightCount : 0);
+        gl.uniform1i(program.uShadowCount, ShadowMap.enabled!.value ? ShadowMap.localLightCount : 0);
       }
       if (program.uShadowDarkness !== undefined) {
-        gl.uniform1f(program.uShadowDarkness, ShadowMap.darkness.value);
+        gl.uniform1f(program.uShadowDarkness, ShadowMap.darkness!.value);
       }
       if (program.uShadowMapSize !== undefined) {
         gl.uniform1f(program.uShadowMapSize, ShadowMap.size);
@@ -1291,9 +1468,11 @@ class R {
 
   static PreRenderScene() {
     R.AnimateLight();
+    const worldmodel = CL.state.worldmodel!;
+    console.assert(worldmodel !== null, 'worldmodel required');
     const {forward, right, up} = R.refdef.viewangles.angleVectors();
     [R.vpn, R.vright, R.vup] = [forward, right, up];
-    R.viewleaf = CL.state.worldmodel.getLeafForPoint(R.refdef.vieworg);
+    R.viewleaf = worldmodel.getLeafForPoint(R.refdef.vieworg);
     V.SetContentsColor(R.viewleaf.contents);
     V.CalcBlend();
     R.dowarp = (R.waterwarp.value !== 0) && (R.viewleaf.contents <= content.CONTENT_WATER);
@@ -1311,11 +1490,11 @@ class R {
 
     // Activate depth-texture post-process when fog volumes exist.
     // Pipeline effects (warp, etc.) are resolved separately via PostProcess.resolve.
-    R.usePostProcess = CL.state.worldmodel.fogVolumes && CL.state.worldmodel.fogVolumes.length > 0;
+    R.usePostProcess = worldmodel.fogVolumes.length > 0;
 
     // Choose the shadow texture for this frame (real or dummy)
     R.shadow_textures = ShadowMap.getActiveTextures();
-    R.shadow_texture = R.shadow_textures[0];
+    R.shadow_texture = R.shadow_textures[0] ?? null;
     R.point_shadow_texture = ShadowMap.getActivePointTexture();
   };
 
@@ -1323,7 +1502,8 @@ class R {
     // Render world and entities using the renderer registry
     const worldEntity = CL.state.clientEntities.getEntity(0);
     if (worldEntity && worldEntity.model) {
-      const brushRenderer = modelRendererRegistry.getRenderer(Mod.type.brush);
+      const brushRenderer = modelRendererRegistry.getRenderer(Mod.type.brush)!;
+      console.assert(brushRenderer !== null, 'brush renderer required');
       // Pass 0: World opaque surfaces
       brushRenderer.render(worldEntity.model, worldEntity, 0);
     }
@@ -1355,15 +1535,17 @@ class R {
 
   static RenderScene() {
     R.SetFrustum();
+    console.assert(ShadowMap.enabled !== null, 'shadow toggle required');
+    console.assert(ShadowMap.casterRadius !== null, 'shadow caster radius required');
 
     // Shadow depth pass — local entity shadow centered on the nearest visible
     // shadow caster. Static world shadowing remains authored by baked lightmaps.
-    if (ShadowMap.enabled.value) {
+    if (ShadowMap.enabled!.value) {
       ShadowMap.selectLocalLights(R.refdef.vieworg);
       ShadowMap.updateLightSpaceMatrices();
       R.shadow_textures = ShadowMap.getActiveTextures();
-      R.shadow_texture = R.shadow_textures[0];
-      const localCasterRadius = ShadowMap.casterRadius.value;
+      R.shadow_texture = R.shadow_textures[0] ?? null;
+      const localCasterRadius = ShadowMap.casterRadius!.value;
       const localCasterRadiusSq = localCasterRadius * localCasterRadius;
 
       for (let i = 0; i < ShadowMap.localLightCount; i++) {
@@ -1401,7 +1583,7 @@ class R {
   static _speeds: string[] = [];
 
   static RenderView() {
-    let time1;
+    let time1 = 0;
     if (R.speeds.value !== 0) {
       gl.finish();
       time1 = Sys.FloatMilliTime();
@@ -1778,9 +1960,10 @@ class R {
   };
 
   static NewMapFog() {
-    console.assert(CL.state.worldmodel, 'worldmodel must be loaded before InitFog');
+    const worldmodel = CL.state.worldmodel!;
+    console.assert(worldmodel !== null, 'worldmodel must be loaded before InitFog');
 
-    const fogInfo = CL.state.worldmodel.worldspawnInfo.fog;
+    const fogInfo = worldmodel.worldspawnInfo.fog;
 
     if (!fogInfo) {
       R.fog_mode.set(-1);
@@ -1802,12 +1985,15 @@ class R {
   static NewMap() {
     R.BuildLightmaps();
 
-    for (let i = 0; i < R.dlightmaps_rgba.length; i++) {
-      R.dlightmaps_rgba[i] = 0;
+    const dlightmapsRgba = R.dlightmaps_rgba!;
+    console.assert(dlightmapsRgba !== null, 'dynamic lightmap buffer required');
+
+    for (let i = 0; i < dlightmapsRgba.length; i++) {
+      dlightmapsRgba[i] = 0;
     }
 
     GL.Bind(0, R.dlightmap_rgba_texture);
-    gl.texSubImage2D(gl.TEXTURE_2D, 0, 0, 0, LIGHTMAP_BLOCK_SIZE, LIGHTMAP_BLOCK_SIZE, gl.RGBA, gl.UNSIGNED_BYTE, R.dlightmaps_rgba);
+    gl.texSubImage2D(gl.TEXTURE_2D, 0, 0, 0, LIGHTMAP_BLOCK_SIZE, LIGHTMAP_BLOCK_SIZE, gl.RGBA, gl.UNSIGNED_BYTE, dlightmapsRgba);
 
     R.NewMapFog();
     R.MakeSky();
@@ -1830,7 +2016,7 @@ class R {
     R.lightmaps_rgb = null;
     R.dlightmaps_rgba = null;
 
-    R.allocated = null;
+    R.allocated = [];
 
     R.shadow_textures = [];
     R.shadow_texture = null;
@@ -1918,11 +2104,11 @@ class R {
         color: 0x6f,
         ramp: 0.0,
         type: R.ptype.explode,
-        org: [
+        org: new Vector(
           ent.origin[0] + avertexnormals[i * 3 + 0] * 64.0 + cp * cy * 16.0,
           ent.origin[1] + avertexnormals[i * 3 + 1] * 64.0 + cp * sy * 16.0,
           ent.origin[2] + avertexnormals[i * 3 + 2] * 64.0 + sp * -16.0,
-        ],
+        ),
         vel: new Vector(),
       };
     }
@@ -1931,7 +2117,7 @@ class R {
   static ClearParticles() {
     R.particles = [];
     for (let i = 0; i < R.numparticles; i++) {
-      R.particles[i] = {die: -1.0};
+      R.particles[i] = R._createDeadParticle();
     }
   };
 
@@ -1960,6 +2146,7 @@ class R {
       R.particles[allocated[i]] = {
         die: CL.state.time + 0.3,
         color: colorStart + (colorMod++ % colorLength),
+        ramp: 0.0,
         type: R.ptype.blob,
         org: new Vector(
           org[0] + Math.random() * 32.0 - 16.0,
@@ -1998,6 +2185,7 @@ class R {
       R.particles[allocated[i]] = {
         die: CL.state.time + 0.6 * Math.random(),
         color: (color & 0xf8) + Math.floor(Math.random() * 8.0),
+        ramp: 0.0,
         type: R.ptype.slowgrav,
         org: new Vector(
           org[0] + Math.random() * 16.0 - 8.0,
@@ -2189,7 +2377,7 @@ class R {
 
     const size = 4.0; // Decal size
 
-    const verts = [
+    const verts: [Vector, Vector, Vector, Vector] = [
       origin.copy().add(right.copy().multiply(-size)).add(up.copy().multiply(size)),
       origin.copy().add(right.copy().multiply(size)).add(up.copy().multiply(size)),
       origin.copy().add(right.copy().multiply(size)).add(up.copy().multiply(-size)),
@@ -2203,9 +2391,11 @@ class R {
     }
 
     // Calculate lighting
+    const worldmodel = CL.state.worldmodel!;
+    console.assert(worldmodel !== null, 'worldmodel required');
     const lightStart = origin.copy().add(normal.copy().multiply(4.0));
     const lightEnd = origin.copy().subtract(normal.copy().multiply(4.0));
-    const lightResult = R.RecursiveLightPoint(CL.state.worldmodel.nodes[0], lightStart, lightEnd);
+    const lightResult = R.RecursiveLightPoint(worldmodel.nodes[0], lightStart, lightEnd);
 
     let color = new Vector(255, 255, 255); // Default to white
     if (lightResult) {
@@ -2237,11 +2427,12 @@ class R {
 
     GL.StreamFlush();
 
-    const program = GL.UseProgram('decal');
+    const program = GL.UseProgram('decal')!;
+    console.assert(program !== null, 'decal program required');
     gl.depthMask(false);
     gl.enable(gl.BLEND);
 
-    gl.uniform1f(program.uAlpha, 1.0);
+    gl.uniform1f(program.uAlpha!, 1.0);
 
     let currentTexture = null;
 
@@ -2250,7 +2441,7 @@ class R {
 
       if (decal.texture !== currentTexture) {
         GL.StreamFlush();
-        decal.texture.bind(program.tTexture);
+        decal.texture.bind(program.tTexture!);
         currentTexture = decal.texture;
       }
 
@@ -2285,7 +2476,8 @@ class R {
     gl.enable(gl.BLEND);
 
     const frametime = Host.frametime;
-    const grav = frametime * SV.gravity.value * 0.05;
+    console.assert(SV.gravity !== null, 'server gravity cvar required');
+    const grav = frametime * SV.gravity!.value * 0.05;
     const dvel = frametime * 4.0;
     let scale;
 
@@ -2393,8 +2585,14 @@ class R {
   static deluxemap: Uint8Array | null = null; // allocated on demand
 
   static AddDynamicLights(surf: Face): void {
-    const smax = (surf.extents[0] >> surf.lmshift) + 1;
-    const tmax = (surf.extents[1] >> surf.lmshift) + 1;
+    const lmshift = surf.lmshift!;
+    console.assert(lmshift !== null, 'face lightmap shift required');
+    const worldmodel = CL.state.worldmodel!;
+    console.assert(worldmodel !== null, 'worldmodel required');
+    const dlightmapsRgba = R.dlightmaps_rgba!;
+    console.assert(dlightmapsRgba !== null, 'dynamic lightmap buffer required');
+    const smax = (surf.extents[0] >> lmshift) + 1;
+    const tmax = (surf.extents[1] >> lmshift) + 1;
     const size = smax * tmax;
 
     const blocklights: number[] = [];
@@ -2420,19 +2618,19 @@ class R {
       }
       minlight = rad - minlight;
       const impact = lightImpact.impact;
-      const tex = CL.state.worldmodel.texinfo[surf.texinfo];
+      const tex = worldmodel.texinfo[surf.texinfo];
       const local = [
-        impact.dot(new Vector(...tex.vecs[0])) + tex.vecs[0][3] - surf.texturemins[0],
-        impact.dot(new Vector(...tex.vecs[1])) + tex.vecs[1][3] - surf.texturemins[1],
+        impact.dot(R._textureAxisToVector(tex.vecs[0])) + tex.vecs[0][3] - surf.texturemins[0],
+        impact.dot(R._textureAxisToVector(tex.vecs[1])) + tex.vecs[1][3] - surf.texturemins[1],
       ];
       for (let t = 0; t < tmax; t++) {
-        let td = local[1] - (t << surf.lmshift);
+        let td = local[1] - (t << lmshift);
         if (td < 0.0) {
           td = -td;
         }
         td = Math.floor(td);
         for (let s = 0; s < smax; s++) {
-          let sd = local[0] - (s << surf.lmshift);
+          let sd = local[0] - (s << lmshift);
           if (sd < 0) {
             sd = -sd;
           }
@@ -2466,31 +2664,41 @@ class R {
         // console.log(blrgb);
         i++;
         for (let i = 0; i < 3; i++) {
-          R.dlightmaps_rgba[dldest + i] = blrgb[i];
+          dlightmapsRgba[dldest + i] = blrgb[i];
         }
       }
     }
   };
 
   static RemoveDynamicLights(surf: Face): void {
-    const smax = (surf.extents[0] >> surf.lmshift) + 1;
-    const tmax = (surf.extents[1] >> surf.lmshift) + 1;
+    const lmshift = surf.lmshift!;
+    console.assert(lmshift !== null, 'face lightmap shift required');
+    const dlightmapsRgba = R.dlightmaps_rgba!;
+    console.assert(dlightmapsRgba !== null, 'dynamic lightmap buffer required');
+    const smax = (surf.extents[0] >> lmshift) + 1;
+    const tmax = (surf.extents[1] >> lmshift) + 1;
     for (let t = 0; t < tmax; t++) {
       R.lightmap_modified[surf.light_t + t] = 1;
       const dest = ((surf.light_t + t) * LIGHTMAP_BLOCK_SIZE) + surf.light_s;
       for (let s = 0; s < smax; s++) {
         const dldest = (dest + s) * 4;
         for (let i = 0; i < 3; i++) {
-          R.dlightmaps_rgba[dldest + i] = 0;
+          dlightmapsRgba[dldest + i] = 0;
         }
-        R.dlightmaps_rgba[dldest + 3] = 255; // fully opaque
+        dlightmapsRgba[dldest + 3] = 255; // fully opaque
       }
     }
   };
 
   static BuildLightMap(currentmodel: BrushModel, surf: Face): void {
-    const smax = (surf.extents[0] >> surf.lmshift) + 1;
-    const tmax = (surf.extents[1] >> surf.lmshift) + 1;
+    const lmshift = surf.lmshift!;
+    console.assert(lmshift !== null, 'face lightmap shift required');
+    const lightmapsRgb = R.lightmaps_rgb!;
+    console.assert(lightmapsRgb !== null, 'lightmap buffer required');
+    const lightdata = currentmodel.lightdata!;
+    console.assert(lightdata !== null, 'brush lightdata required');
+    const smax = (surf.extents[0] >> lmshift) + 1;
+    const tmax = (surf.extents[1] >> lmshift) + 1;
 
     for (let k = 0; k < 3; k++) {
       const offset = LIGHTMAP_BLOCK_SIZE * LIGHTMAP_BLOCK_HEIGHT * k;
@@ -2501,7 +2709,7 @@ class R {
         let dest = (surf.light_t * LIGHTMAP_BLOCK_HEIGHT) + (surf.light_s << 2) + maps;
         for (let i = 0; i < tmax; i++) {
           for (let j = 0; j < smax; j++) {
-            R.lightmaps_rgb[dest + (j << 2) + offset] = currentmodel.lightdata[lightmap + j];
+            lightmapsRgb[dest + (j << 2) + offset] = lightdata[lightmap + j];
           }
           lightmap += smax;
           dest += LIGHTMAP_BLOCK_HEIGHT;
@@ -2512,7 +2720,7 @@ class R {
         let dest = (surf.light_t * LIGHTMAP_BLOCK_HEIGHT) + (surf.light_s << 2) + maps;
         for (let i = 0; i < tmax; i++) {
           for (let j = 0; j < smax; j++) {
-            R.lightmaps_rgb[dest + (j << 2) + offset] = 0;
+            lightmapsRgb[dest + (j << 2) + offset] = 0;
           }
           dest += LIGHTMAP_BLOCK_HEIGHT;
         }
@@ -2521,8 +2729,14 @@ class R {
   };
 
   static BuildLightMapEx(currentmodel: BrushModel, surf: Face): void {
-    const smax = (surf.extents[0] >> surf.lmshift) + 1;
-    const tmax = (surf.extents[1] >> surf.lmshift) + 1;
+    const lmshift = surf.lmshift!;
+    console.assert(lmshift !== null, 'face lightmap shift required');
+    const lightmapsRgb = R.lightmaps_rgb!;
+    console.assert(lightmapsRgb !== null, 'lightmap buffer required');
+    const lightdataRgb = currentmodel.lightdata_rgb!;
+    console.assert(lightdataRgb !== null, 'brush rgb lightdata required');
+    const smax = (surf.extents[0] >> lmshift) + 1;
+    const tmax = (surf.extents[1] >> lmshift) + 1;
 
     if (currentmodel.deluxemap && !R.deluxemap) {
       R.deluxemap = new Uint8Array(new ArrayBuffer(LIGHTMAP_BLOCK_SIZE * LIGHTMAP_BLOCK_HEIGHT * 3));
@@ -2537,10 +2751,10 @@ class R {
         let dest = (surf.light_t * LIGHTMAP_BLOCK_HEIGHT) + (surf.light_s << 2) + maps;
         for (let i = 0; i < tmax; i++) {
           for (let j = 0; j < smax; j++) {
-            R.lightmaps_rgb[dest + (j << 2) + offset] = currentmodel.lightdata_rgb[(lightmap + j * 3) + k];
+            lightmapsRgb[dest + (j << 2) + offset] = lightdataRgb[(lightmap + j * 3) + k];
 
             if (currentmodel.deluxemap) {
-              R.deluxemap[dest + (j << 2) + offset] = currentmodel.deluxemap[(lightmap + j * 3) + k];
+              R.deluxemap![dest + (j << 2) + offset] = currentmodel.deluxemap[(lightmap + j * 3) + k];
             }
           }
           lightmap += smax * 3;
@@ -2552,10 +2766,10 @@ class R {
         let dest = (surf.light_t * LIGHTMAP_BLOCK_HEIGHT) + (surf.light_s << 2) + maps;
         for (let i = 0; i < tmax; i++) {
           for (let j = 0; j < smax; j++) {
-            R.lightmaps_rgb[dest + (j << 2) + offset] = 0;
+            lightmapsRgb[dest + (j << 2) + offset] = 0;
 
             if (currentmodel.deluxemap) {
-              R.deluxemap[dest + (j << 2) + offset] = 0;
+              R.deluxemap![dest + (j << 2) + offset] = 0;
             }
           }
           dest += LIGHTMAP_BLOCK_HEIGHT;
@@ -2578,29 +2792,36 @@ class R {
       }
       return;
     }
-    R.RecursiveWorldNode(node.children[0]);
-    R.RecursiveWorldNode(node.children[1]);
+    const frontChild = node.children[0] as Node;
+    const backChild = node.children[1] as Node;
+    console.assert(frontChild instanceof Node, `R.RecursiveWorldNode expected linked BSP child 0 on node ${node.num}`);
+    console.assert(backChild instanceof Node, `R.RecursiveWorldNode expected linked BSP child 1 on node ${node.num}`);
+    R.RecursiveWorldNode(frontChild);
+    R.RecursiveWorldNode(backChild);
   };
 
   static MarkLeafs() {
+    const worldmodel = CL.state.worldmodel!;
+    console.assert(worldmodel !== null, 'worldmodel required');
+
     if ((R.oldviewleaf === R.viewleaf) && (R.novis.value === 0)) {
       return;
     }
     R.visframecount++;
     R.oldviewleaf = R.viewleaf;
-    const vis = (R.novis.value !== 0 || R.viewleaf === null || R.viewleaf.num === 0) ? revealedVisibility : (
+    const vis = (R.novis.value === 1 || R.viewleaf === null || R.viewleaf.num === 0) ? revealedVisibility : (
       R.novis.value === 2 ?
-        CL.state.worldmodel.getPhsByLeaf(R.viewleaf) :
-        CL.state.worldmodel.getPvsByLeaf(R.viewleaf)
+        worldmodel.getPhsByLeaf(R.viewleaf) :
+        worldmodel.getPvsByLeaf(R.viewleaf)
     );
-    for (let i = 1; i < CL.state.worldmodel.leafs.length; i++) {
+    for (let i = 1; i < worldmodel.leafs.length; i++) {
       if (!vis.isRevealed(i)) {
         continue;
       }
-      if (CL.areaportals.value > 0 && R.viewleaf && !CL.state.worldmodel.areaPortals.leafsConnected(R.viewleaf, CL.state.worldmodel.leafs[i])) {
+      if (CL.areaportals.value > 0 && R.viewleaf && !worldmodel.areaPortals.leafsConnected(R.viewleaf, worldmodel.leafs[i])) {
         continue;
       }
-      for (let node = CL.state.worldmodel.leafs[i]; node; node = node.parent) {
+      for (let node: Node | null = worldmodel.leafs[i]; node !== null; node = node.parent) {
         if (node.markvisframe === R.visframecount) {
           break;
         }
@@ -2612,14 +2833,14 @@ class R {
         break;
       }
       const p = R.refdef.vieworg.copy();
-      let leaf;
+      let leaf: Node;
       if (R.viewleaf.contents <= content.CONTENT_WATER) {
-        leaf = CL.state.worldmodel.getLeafForPoint(p.add(new Vector(0, 0, 16.0)));
+        leaf = worldmodel.getLeafForPoint(p.add(new Vector(0, 0, 16.0)));
         if (leaf.contents <= content.CONTENT_WATER) {
           break;
         }
       } else {
-        leaf = CL.state.worldmodel.getLeafForPoint(p.add(new Vector(0, 0, -16.0)));
+        leaf = worldmodel.getLeafForPoint(p.add(new Vector(0, 0, -16.0)));
         if (leaf.contents > content.CONTENT_WATER) {
           break;
         }
@@ -2627,15 +2848,15 @@ class R {
       if (leaf === R.viewleaf) {
         break;
       }
-      const vis = CL.state.worldmodel.getPvsByLeaf(leaf);
-      for (let i = 1; i < CL.state.worldmodel.leafs.length; i++) {
+      const vis = worldmodel.getPvsByLeaf(leaf);
+      for (let i = 1; i < worldmodel.leafs.length; i++) {
         if (!vis.isRevealed(i)) {
           continue;
         }
-        if (CL.areaportals.value > 0 && !CL.state.worldmodel.areaPortals.leafsConnected(R.viewleaf, CL.state.worldmodel.leafs[i])) {
+        if (CL.areaportals.value > 0 && !worldmodel.areaPortals.leafsConnected(R.viewleaf, worldmodel.leafs[i])) {
           continue;
         }
-        for (let node = CL.state.worldmodel.leafs[i]; node; node = node.parent) {
+        for (let node: Node | null = worldmodel.leafs[i]; node !== null; node = node.parent) {
           if (node.markvisframe === R.visframecount) {
             break;
           }
@@ -2645,13 +2866,15 @@ class R {
     // eslint-disable-next-line no-constant-condition
     } while (false);
     R.drawsky = false;
-    R.RecursiveWorldNode(CL.state.worldmodel.nodes[0]);
+    R.RecursiveWorldNode(worldmodel.nodes[0]);
   };
 
   static AllocBlock(surf: Face): void {
-    const w = (surf.extents[0] >> surf.lmshift) + 1;
-    const h = (surf.extents[1] >> surf.lmshift) + 1;
-    let x; let y; let i; let j; let best = LIGHTMAP_BLOCK_SIZE; let best2;
+    const lmshift = surf.lmshift!;
+    console.assert(lmshift !== null, 'face lightmap shift required');
+    const w = (surf.extents[0] >> lmshift) + 1;
+    const h = (surf.extents[1] >> lmshift) + 1;
+    let x = 0; let y = 0; let i; let j; let best = LIGHTMAP_BLOCK_SIZE; let best2;
     for (i = 0; i < (LIGHTMAP_BLOCK_SIZE - w); i++) {
       best2 = 0;
       for (j = 0; j < w; j++) {
@@ -2684,14 +2907,16 @@ class R {
     R.lightmaps_rgb = new Uint8Array(new ArrayBuffer(LIGHTMAP_BLOCK_SIZE * LIGHTMAP_BLOCK_HEIGHT * 3));
     R.dlightmaps_rgba = new Uint8Array(new ArrayBuffer(LIGHTMAP_BLOCK_SIZE * LIGHTMAP_BLOCK_SIZE * 4));
 
-    const brushRenderer = modelRendererRegistry.getRenderer(Mod.type.brush);
-    const meshRenderer = modelRendererRegistry.getRenderer(Mod.type.mesh);
+    const brushRenderer = modelRendererRegistry.getRenderer(Mod.type.brush)!;
+    const meshRenderer = modelRendererRegistry.getRenderer(Mod.type.mesh)!;
+    console.assert(brushRenderer !== null, 'brush renderer required');
+    console.assert(meshRenderer !== null, 'mesh renderer required');
 
     for (let i = 1; i < CL.state.model_precache.length; i++) {
       const currentmodel = CL.state.model_precache[i];
 
       // Handle brush models (BSP maps)
-      if (currentmodel.type === Mod.type.brush) {
+      if (currentmodel instanceof BrushModel) {
         if (currentmodel.name[0] !== '*') { // skip submodels
           for (let j = 0; j < currentmodel.faces.length; j++) {
             const surf = currentmodel.faces[j];
@@ -2749,7 +2974,9 @@ class R {
       R.skyrenderer.shutdown();
     }
 
-    R.skyrenderer = CL.state.worldmodel.newSkyRenderer();
+    const worldmodel = CL.state.worldmodel!;
+    console.assert(worldmodel !== null, 'worldmodel required');
+    R.skyrenderer = worldmodel.newSkyRenderer();
 
     if (!R.skyrenderer) {
       return;
diff --git a/source/engine/client/Sys.ts b/source/engine/client/Sys.ts
index 02dbd2d8..5b33724b 100644
--- a/source/engine/client/Sys.ts
+++ b/source/engine/client/Sys.ts
@@ -137,7 +137,7 @@ function handleContextMenu(event: MouseEvent): void {
 /** Clears pressed-key state when the window regains focus. */
 function handleFocus(): void {
   for (let index = 0; index < 256; index++) {
-    Key.Event(index);
+    Key.Event(index, false);
     Key.down[index] = false;
   }
 }
@@ -160,7 +160,7 @@ function handleKeyUp(event: KeyboardEvent): void {
     return;
   }
 
-  Key.Event(key);
+  Key.Event(key, false);
   event.preventDefault();
 }
 
@@ -199,7 +199,7 @@ function handleMouseUp(event: MouseEvent): void {
     return;
   }
 
-  Key.Event(key);
+  Key.Event(key, false);
   event.preventDefault();
 }
 
@@ -207,7 +207,7 @@ function handleMouseUp(event: MouseEvent): void {
 function handleLegacyMouseWheel(event: LegacyWheelEvent): void {
   const key = event.wheelDeltaY > 0 ? K.MWHEELUP : K.MWHEELDOWN;
   Key.Event(key, true);
-  Key.Event(key);
+  Key.Event(key, false);
   event.preventDefault();
 }
 
@@ -215,7 +215,7 @@ function handleLegacyMouseWheel(event: LegacyWheelEvent): void {
 function handleWheel(event: WheelEvent): void {
   const key = event.deltaY < 0 ? K.MWHEELUP : K.MWHEELDOWN;
   Key.Event(key, true);
-  Key.Event(key);
+  Key.Event(key, false);
   event.preventDefault();
 }
 
diff --git a/source/engine/client/menu/MenuItem.ts b/source/engine/client/menu/MenuItem.ts
index 7c8d9202..bd097300 100644
--- a/source/engine/client/menu/MenuItem.ts
+++ b/source/engine/client/menu/MenuItem.ts
@@ -2,11 +2,7 @@ import Q from '../../../shared/Q.ts';
 import { K } from '../../../shared/Keys.ts';
 import Cvar from '../../common/Cvar.ts';
 import { eventBus, getClientRegistry } from '../../registry.ts';
-
-interface MenuPicture {
-  readonly width?: number;
-  readonly height?: number;
-}
+import type { MenuPic } from '../Menu.ts';
 
 interface MenuItemConfig {
   readonly label?: string;
@@ -55,7 +51,7 @@ interface LabelConfig extends MenuItemConfig {
 }
 
 interface ImageConfig extends MenuItemConfig {
-  readonly pic?: MenuPicture | null;
+  readonly pic?: MenuPic | null;
   readonly centered?: boolean;
 }
 
@@ -448,7 +444,7 @@ export class Label extends MenuItem {
  * Image - displays a picture (for image-based menu items like main menu).
  */
 export class Image extends MenuItem {
-  pic: MenuPicture | null;
+  pic: MenuPic | null;
   centered: boolean;
 
   constructor(config: ImageConfig) {
diff --git a/source/engine/client/menu/MenuPage.ts b/source/engine/client/menu/MenuPage.ts
index 7a87ace8..af74ef00 100644
--- a/source/engine/client/menu/MenuPage.ts
+++ b/source/engine/client/menu/MenuPage.ts
@@ -1,16 +1,13 @@
 import { K } from '../../../shared/Keys.ts';
 import { eventBus, getClientRegistry } from '../../registry.ts';
+import type { MenuPic } from '../Menu.ts';
 import { MenuItem } from './MenuItem.ts';
 
-interface MenuPicture {
-  readonly width?: number;
-}
-
 interface MenuPageConfig {
   readonly items?: MenuItem[];
   readonly layout?: MenuLayout | null;
   readonly title?: string | null;
-  readonly titlePic?: MenuPicture | null;
+  readonly titlePic?: MenuPic | null;
   readonly onEnter?: () => void;
   readonly onExit?: () => void;
   readonly customDraw?: ((page: MenuPage) => void) | null;
@@ -26,7 +23,7 @@ interface VerticalLayoutConfig {
 }
 
 interface ImageBasedLayoutConfig {
-  readonly backgroundPic?: unknown;
+  readonly backgroundPic?: MenuPic | null;
   readonly backgroundX?: number;
   readonly backgroundY?: number;
   readonly cursorX?: number;
@@ -68,7 +65,7 @@ export class MenuPage {
   items: MenuItem[];
   layout: MenuLayout | null;
   title: string | null;
-  titlePic: MenuPicture | null;
+  titlePic: MenuPic | null;
   cursor: number;
   onEnter: () => void;
   onExit: () => void;
@@ -267,7 +264,7 @@ export class VerticalLayout implements MenuLayout {
  * Image-based layout - for menus that use a single background image.
  */
 export class ImageBasedLayout implements MenuLayout {
-  backgroundPic: unknown;
+  backgroundPic: MenuPic | null;
   backgroundX: number;
   backgroundY: number;
   cursorX: number;
diff --git a/source/engine/client/renderer/AliasModelRenderer.ts b/source/engine/client/renderer/AliasModelRenderer.ts
index dd1b5f1b..ee68878b 100644
--- a/source/engine/client/renderer/AliasModelRenderer.ts
+++ b/source/engine/client/renderer/AliasModelRenderer.ts
@@ -236,12 +236,29 @@ export class AliasModelRenderer extends ModelRenderer {
     } else if (R.interpolation.value && (e.effects & effect.EF_MUZZLEFLASH) === 0) {
       // Handle lerp-based interpolation
       const [previousFrame, nextFrame, f] = e.lerp.frame;
-      frameA = clmodel.frames[previousFrame] as AliasRenderFrame;
-      frameB = clmodel.frames[nextFrame] as AliasRenderFrame;
+      const previous = clmodel.frames[previousFrame];
+      const next = clmodel.frames[nextFrame];
+      console.assert(previous.group === false, 'alias lerp previous frame must be a single frame');
+      console.assert(next.group === false, 'alias lerp next frame must be a single frame');
+
+      if (previous.group) {
+        frameA = previous.frames[0];
+      } else {
+        frameA = previous as AliasSingleFrame;
+      }
+
+      if (next.group) {
+        frameB = next.frames[0];
+      } else {
+        frameB = next as AliasSingleFrame;
+      }
+
       targettime = f;
     } else {
-      frameA = frameGroup;
-      frameB = frameGroup;
+      console.assert(frameGroup.group === false, 'alias static frame must be a single frame');
+      const staticFrame = frameGroup as AliasSingleFrame;
+      frameA = staticFrame;
+      frameB = staticFrame;
     }
 
     return { frameA, frameB, targettime };
@@ -263,7 +280,7 @@ export class AliasModelRenderer extends ModelRenderer {
       num = 0;
     }
 
-    let skin = clmodel.skins[num];
+    const skin = clmodel.skins[num];
 
     // Handle skin groups (animated textures)
     if (skin.group) {
@@ -280,7 +297,7 @@ export class AliasModelRenderer extends ModelRenderer {
       return skin.skins[i];
     }
 
-    return skin;
+    return skin as AliasSingleSkin;
   }
 
   /**
diff --git a/source/engine/client/renderer/MeshModelRenderer.ts b/source/engine/client/renderer/MeshModelRenderer.ts
index 67a3c059..a068fd70 100644
--- a/source/engine/client/renderer/MeshModelRenderer.ts
+++ b/source/engine/client/renderer/MeshModelRenderer.ts
@@ -156,10 +156,8 @@ export class MeshModelRenderer extends ModelRenderer {
     gl.drawElements(gl.TRIANGLES, clmodel.numTriangles * 3, indexType, 0);
     GL.UnbindVAO();
 
-    // Stats
-    R.c_alias_draws++;
-    R.c_alias_verts += clmodel.numVertices;
-    R.c_alias_tris += clmodel.numTriangles;
+    // Track non-brush geometry together with alias-model poly counts in r_speeds.
+    R.c_alias_polys += clmodel.numTriangles;
   }
 
   /**
diff --git a/source/engine/client/renderer/SpriteModelRenderer.ts b/source/engine/client/renderer/SpriteModelRenderer.ts
index c64f2452..610eb087 100644
--- a/source/engine/client/renderer/SpriteModelRenderer.ts
+++ b/source/engine/client/renderer/SpriteModelRenderer.ts
@@ -2,7 +2,7 @@ import { ModelRenderer } from './ModelRenderer.ts';
 import { getEntityBloomEmissiveScale } from './BloomEffect.ts';
 import { eventBus, getClientRegistry } from '../../registry.ts';
 import GL from '../GL.ts';
-import type { SpriteModel, SpriteSingleFrame, SpriteFrameImage } from '../../common/model/SpriteModel.ts';
+import type { SpriteModel } from '../../common/model/SpriteModel.ts';
 import type { ClientEdict } from '../ClientEntities.ts';
 import type { BaseModel } from '../../common/model/BaseModel.ts';
 
@@ -23,7 +23,9 @@ eventBus.subscribe('gl.shutdown', () => {
 });
 
 /** A resolved (non-group) sprite frame ready for rendering. */
-type SpriteRenderFrame = SpriteSingleFrame | SpriteFrameImage;
+type SpriteFrame = SpriteModel['frames'][number];
+type SpriteGroupedFrame = Extract<SpriteFrame, { group: true }>;
+type SpriteRenderFrame = Exclude<SpriteFrame, { group: true }> | SpriteGroupedFrame['frames'][number];
 
 /**
  * Renderer for Sprite SPR models (2D billboards like explosions, particles).
@@ -93,11 +95,12 @@ export class SpriteModelRenderer extends ModelRenderer {
       num = 0;
     }
 
-    let frame: SpriteRenderFrame = spriteModel.frames[num] as SpriteRenderFrame;
+    const selectedFrame = spriteModel.frames[num];
+    let frame: SpriteRenderFrame;
 
     // Handle frame groups (animated sprites)
-    if ((frame as { group?: boolean }).group) {
-      const groupedFrame = spriteModel.frames[num] as { group: true; frames: SpriteFrameImage[] };
+    if (selectedFrame.group) {
+      const groupedFrame = selectedFrame;
       const time = CL.state.time + e.syncbase;
       const groupLen = groupedFrame.frames.length - 1;
       const fullinterval = groupedFrame.frames[groupLen].interval!;
@@ -110,6 +113,8 @@ export class SpriteModelRenderer extends ModelRenderer {
         }
       }
       frame = groupedFrame.frames[i];
+    } else {
+      frame = selectedFrame as Exclude<SpriteFrame, { group: true }>;
     }
 
     // Bind texture
diff --git a/source/engine/common/CollisionModelSource.ts b/source/engine/common/CollisionModelSource.ts
index d70e35e3..4c80e8b9 100644
--- a/source/engine/common/CollisionModelSource.ts
+++ b/source/engine/common/CollisionModelSource.ts
@@ -1,17 +1,18 @@
 import { eventBus, getClientRegistry, getCommonRegistry } from '../registry.ts';
 
 import type { ServerEdict } from '../server/Edict.ts';
+import type { BaseModel } from './model/BaseModel.ts';
 import type { BrushModel } from './model/BSP.ts';
 
 interface ServerCollisionModelAccessors {
   readonly getWorldEntity?: () => ServerEdict | null;
   readonly getWorldModel?: () => BrushModel | null;
-  readonly getModels?: () => Array<BrushModel | object | null> | null;
+  readonly getModels?: () => Array<BaseModel | null> | null;
 }
 
 interface ClientCollisionModelAccessors {
   readonly getWorldModel?: () => BrushModel | null;
-  readonly getModels?: () => Array<BrushModel | object | null> | null;
+  readonly getModels?: () => Array<BaseModel | null> | null;
 }
 
 let { SV } = getCommonRegistry();
@@ -30,9 +31,9 @@ eventBus.subscribe('registry.frozen', () => {
 export class CollisionModelSource {
   #getServerWorldEntity: () => ServerEdict | null = () => null;
   #getServerWorldModel: () => BrushModel | null = () => null;
-  #getServerModels: () => Array<BrushModel | object | null> | null = () => null;
+  #getServerModels: () => Array<BaseModel | null> | null = () => null;
   #getClientWorldModel: () => BrushModel | null = () => null;
-  #getClientModels: () => Array<BrushModel | object | null> | null = () => null;
+  #getClientModels: () => Array<BaseModel | null> | null = () => null;
 
   /**
    * Install live server accessors.
@@ -64,17 +65,32 @@ export class CollisionModelSource {
    * @returns The current server or client world model.
    */
   getWorldModel(): BrushModel | null {
-    return this.#getServerWorldModel()
-      ?? this.#getClientWorldModel()
-      ?? this.#getClientModels()?.[1]
-      ?? null;
+    const serverWorldModel = this.#getServerWorldModel();
+
+    if (serverWorldModel !== null) {
+      return serverWorldModel;
+    }
+
+    const clientWorldModel = this.#getClientWorldModel();
+
+    if (clientWorldModel !== null) {
+      return clientWorldModel;
+    }
+
+    const fallbackClientModel = this.#getClientModels()?.[1] ?? null;
+
+    if (fallbackClientModel !== null && fallbackClientModel.type === 0) {
+      return fallbackClientModel as BrushModel;
+    }
+
+    return null;
   }
 
   /**
    * Resolve a model from the active runtime's model cache.
    * @returns The resolved model, if any.
    */
-  getModelByIndex(modelIndex: number): BrushModel | object | null {
+  getModelByIndex(modelIndex: number): BaseModel | null {
     return this.#getServerModels()?.[modelIndex]
       ?? this.#getClientModels()?.[modelIndex]
       ?? null;
@@ -92,7 +108,7 @@ export function createRegistryCollisionModelSource(): CollisionModelSource {
   modelSource.configureServer({
     getWorldEntity: () => SV?.server?.edicts?.[0] ?? null,
     getWorldModel: () => SV?.server?.worldmodel ?? null,
-    getModels: () => SV?.server?.models ?? null,
+    getModels: () => (SV?.server?.models.map((model) => model instanceof Promise ? null : model) as Array<BaseModel | null> | undefined) ?? null,
   });
   modelSource.configureClient({
     getWorldModel: () => CL?.state?.worldmodel ?? null,
diff --git a/source/engine/common/GameAPIs.ts b/source/engine/common/GameAPIs.ts
index d69d8797..d790ee90 100644
--- a/source/engine/common/GameAPIs.ts
+++ b/source/engine/common/GameAPIs.ts
@@ -1,4 +1,3 @@
-import type BaseEntity from '../../game/id1/entity/BaseEntity.mjs';
 import type { EdictValueType, SerializableType } from '../../shared/GameInterfaces.ts';
 import type { ClientDlight, ClientEdict } from '../client/ClientEntities.ts';
 import type { GLTexture } from '../client/GL.ts';
@@ -15,7 +14,7 @@ import { SFX as SFXValue } from '../client/Sound.ts';
 import VID from '../client/VID.ts';
 import * as Protocol from '../network/Protocol.ts';
 import { EventBus, eventBus, getClientRegistry, getCommonRegistry } from '../registry.ts';
-import { ED, ServerEdict as ServerEdictValue } from '../server/Edict.ts';
+import { ED, type BaseEntity, ServerEdict as ServerEdictValue } from '../server/Edict.ts';
 import Cmd from './Cmd.ts';
 import Cvar from './Cvar.ts';
 import { HostError } from './Errors.ts';
@@ -604,9 +603,10 @@ export class ServerEngineAPI extends CommonEngineAPI {
         continue;
       }
 
-      const entity = ent.entity! as BaseEntity & Record<string, EdictValueType>;
+      const entity = ent.entity!;
+      const entityFields = entity as BaseEntity & Record<string, EdictValueType | undefined>;
 
-      if (entity[field] === value) {
+      if (entityFields[field] === value) {
         return ent; // FIXME: turn it into yield
       }
     }
@@ -627,9 +627,10 @@ export class ServerEngineAPI extends CommonEngineAPI {
         continue;
       }
 
-      const entity = ent.entity! as BaseEntity & Record<string, EdictValueType>;
+      const entity = ent.entity!;
+      const entityFields = entity as BaseEntity & Record<string, EdictValueType | undefined>;
 
-      if (entity[field] === value) {
+      if (entityFields[field] === value) {
         yield ent;
       }
     }
@@ -700,12 +701,15 @@ export class ServerEngineAPI extends CommonEngineAPI {
     const edict = ED.Alloc();
 
     try {
-      if (!SV.server.gameAPI.prepareEntity(edict, classname, initialData)) {
+      const gameAPI = SV.server.gameAPI;
+      console.assert(gameAPI !== null, 'server gameAPI must exist before spawning entities');
+
+      if (gameAPI === null || !gameAPI.prepareEntity(edict, classname, initialData)) {
         edict.freeEdict();
         return null;
       }
 
-      if (!SV.server.gameAPI.spawnPreparedEntity(edict)) {
+      if (!gameAPI.spawnPreparedEntity(edict)) {
         edict.freeEdict();
         return null;
       }
@@ -796,7 +800,7 @@ export class ServerEngineAPI extends CommonEngineAPI {
    * @returns The waypoints from start to end, or `null` when no path could be found.
    */
   static Navigate(start: Vector, end: Vector): Vector[] | null {
-    return SV.server.navigation.findPath(start, end);
+    return SV.server.navigation?.findPath(start, end) ?? null;
   }
 
   /**
@@ -804,15 +808,19 @@ export class ServerEngineAPI extends CommonEngineAPI {
    * @returns The waypoints from start to end, or `null` when no path could be found.
    */
   static NavigateAsync(start: Vector, end: Vector): Promise<Vector[] | null> {
-    return SV.server.navigation.findPathAsync(start, end);
+    return SV.server.navigation?.findPathAsync(start, end) ?? Promise.resolve(null);
   }
 
   static GetPHS(origin: Vector): Visibility {
-    return SV.server.worldmodel.getPhsByPoint(origin);
+    const worldmodel = SV.server.worldmodel;
+    console.assert(worldmodel !== null, 'server worldmodel required for PHS queries');
+    return worldmodel!.getPhsByPoint(origin);
   }
 
   static GetPVS(origin: Vector): Visibility {
-    return SV.server.worldmodel.getPvsByPoint(origin);
+    const worldmodel = SV.server.worldmodel;
+    console.assert(worldmodel !== null, 'server worldmodel required for PVS queries');
+    return worldmodel!.getPvsByPoint(origin);
   }
 
   /**
@@ -820,7 +828,9 @@ export class ServerEngineAPI extends CommonEngineAPI {
    * @returns The area index, where `0` means outside or invalid.
    */
   static GetAreaForPoint(origin: Vector): number {
-    return SV.server.worldmodel.getLeafForPoint(origin).area;
+    const worldmodel = SV.server.worldmodel;
+    console.assert(worldmodel !== null, 'server worldmodel required for area queries');
+    return worldmodel!.getLeafForPoint(origin).area;
   }
 
   /**
diff --git a/source/engine/common/Host.ts b/source/engine/common/Host.ts
index 6a7e525a..f998aeca 100644
--- a/source/engine/common/Host.ts
+++ b/source/engine/common/Host.ts
@@ -8,6 +8,9 @@
 
 /* eslint-disable jsdoc/require-returns */
 
+import { SerializableEntity, type SerializedData } from '../../shared/GameInterfaces.ts';
+import type { SerializedParticle } from '../client/R.ts';
+import type { AliasModel } from './model/AliasModel.ts';
 import type { ServerEdict } from '../server/Edict.ts';
 
 import Cvar from './Cvar.ts';
@@ -42,8 +45,7 @@ interface ScheduledFutureEntry {
   readonly callback: DeferredCallback;
 }
 type PrintFunction = (text: string) => void;
-type JsonValue = string | number | boolean | null | JsonValue[] | { [key: string]: JsonValue };
-type SavegameEdictEntry = [classname: string, data: JsonValue] | null;
+type SavegameEdictEntry = [classname: string, data: SerializedData] | null;
 type SpawnParameters = ServerClient['spawn_parms'];
 type CrashLike =
   | Error
@@ -64,12 +66,19 @@ interface SavegameState {
   readonly mapname: string;
   readonly time: number;
   readonly lightstyles: string[];
-  readonly globals: JsonValue;
+  readonly globals: SerializedData;
   readonly cvars: Array<[name: string, value: string]>;
-  readonly clientdata: JsonValue | null;
+  readonly clientdata: string | null;
   readonly edicts: SavegameEdictEntry[];
   readonly num_edicts: number;
-  readonly particles: JsonValue;
+  readonly particles: SerializedParticle[];
+}
+
+interface LegacyLevelStats {
+  total_secrets: number;
+  total_monsters: number;
+  found_secrets: number;
+  killed_monsters: number;
 }
 
 /** Extracts a display name from a CrashLike value. */
@@ -103,7 +112,7 @@ class HostConsoleCommand extends ConsoleCommand {
    * Returns true when the command must abort because cheats are disabled.
    */
   cheat(): boolean {
-    if (SV.cheats.value) {
+    if (SV.cheats !== null && SV.cheats.value) {
       return false;
     }
 
@@ -396,7 +405,13 @@ export default class Host {
   }
 
   static ServerFrame(): void { // TODO: move to SV.ServerFrame
-    SV.server.gameAPI.frametime = Host.frametime;
+    const gameAPI = SV.server.gameAPI;
+    console.assert(gameAPI !== null, 'server gameAPI must exist during ServerFrame');
+    if (gameAPI === null) {
+      return;
+    }
+
+    gameAPI.frametime = Host.frametime;
     SV.server.datagram.clear();
     SV.server.expedited_datagram.clear();
     SV.CheckForNewClients();
@@ -521,7 +536,7 @@ export default class Host {
     }
 
     // Set up prediction for other players.
-    CL.SetUpPlayerPrediction(false);
+    CL.SetUpPlayerPrediction();
 
     if (Host.speeds !== null && Host.speeds.value !== 0) {
       console.profile('CL.PredictMove');
@@ -535,7 +550,7 @@ export default class Host {
     }
 
     // Set up prediction for other players.
-    CL.SetUpPlayerPrediction(true);
+    CL.SetUpPlayerPrediction();
 
     // Build a refresh entity list.
     CL.state.clientEntities.emit();
@@ -764,9 +779,16 @@ export default class Host {
         return;
       }
 
-      client.edict.entity.flags ^= Defs.flags.FL_GODMODE;
+      const entity = client.edict.entity;
+      console.assert(entity !== null, 'god command requires a live client entity');
 
-      if ((client.edict.entity.flags & Defs.flags.FL_GODMODE) === 0) {
+      if (entity === null) {
+        return;
+      }
+
+      entity.flags ^= Defs.flags.FL_GODMODE;
+
+      if ((entity.flags & Defs.flags.FL_GODMODE) === 0) {
         Host.ClientPrint(client, 'godmode OFF\n');
         return;
       }
@@ -787,9 +809,16 @@ export default class Host {
         return;
       }
 
-      client.edict.entity.flags ^= Defs.flags.FL_NOTARGET;
+      const entity = client.edict.entity;
+      console.assert(entity !== null, 'notarget command requires a live client entity');
+
+      if (entity === null) {
+        return;
+      }
+
+      entity.flags ^= Defs.flags.FL_NOTARGET;
 
-      if ((client.edict.entity.flags & Defs.flags.FL_NOTARGET) === 0) {
+      if ((entity.flags & Defs.flags.FL_NOTARGET) === 0) {
         Host.ClientPrint(client, 'notarget OFF\n');
         return;
       }
@@ -810,15 +839,22 @@ export default class Host {
         return;
       }
 
-      if (client.edict.entity.movetype !== Defs.moveType.MOVETYPE_NOCLIP) {
+      const entity = client.edict.entity;
+      console.assert(entity !== null, 'noclip command requires a live client entity');
+
+      if (entity === null) {
+        return;
+      }
+
+      if (entity.movetype !== Defs.moveType.MOVETYPE_NOCLIP) {
         Host.noclip_anglehack = true;
-        client.edict.entity.movetype = Defs.moveType.MOVETYPE_NOCLIP;
+        entity.movetype = Defs.moveType.MOVETYPE_NOCLIP;
         Host.ClientPrint(client, 'noclip ON\n');
         return;
       }
 
       Host.noclip_anglehack = false;
-      client.edict.entity.movetype = Defs.moveType.MOVETYPE_WALK;
+      entity.movetype = Defs.moveType.MOVETYPE_WALK;
       Host.ClientPrint(client, 'noclip OFF\n');
     }
   };
@@ -835,13 +871,20 @@ export default class Host {
         return;
       }
 
-      if (client.edict.entity.movetype !== Defs.moveType.MOVETYPE_FLY) {
-        client.edict.entity.movetype = Defs.moveType.MOVETYPE_FLY;
+      const entity = client.edict.entity;
+      console.assert(entity !== null, 'fly command requires a live client entity');
+
+      if (entity === null) {
+        return;
+      }
+
+      if (entity.movetype !== Defs.moveType.MOVETYPE_FLY) {
+        entity.movetype = Defs.moveType.MOVETYPE_FLY;
         Host.ClientPrint(client, 'flymode ON\n');
         return;
       }
 
-      client.edict.entity.movetype = Defs.moveType.MOVETYPE_WALK;
+      entity.movetype = Defs.moveType.MOVETYPE_WALK;
       Host.ClientPrint(client, 'flymode OFF\n');
     }
   };
@@ -1057,29 +1100,50 @@ export default class Host {
     }
 
     const client = SV.svs.clients[0];
+    const clientEntity = client.edict.entity;
+    console.assert(clientEntity !== null, 'savegame requires a connected player entity');
+
+    if (clientEntity === null) {
+      return;
+    }
 
-    if (client.state >= ServerClient.STATE.CONNECTED && client.edict.entity.health <= 0.0) {
+    if (client.state >= ServerClient.STATE.CONNECTED && clientEntity.health <= 0.0) {
       Con.PrintWarning('Can\'t savegame with a dead player\n');
       return;
     }
 
-    const clientdata = CL.state.gameAPI ? CL.state.gameAPI.saveGame() as JsonValue : null;
+    const clientdata = CL.state.gameAPI ? CL.state.gameAPI.saveGame() : null;
+    const gameAPI = SV.server.gameAPI;
+    const gameversion = SV.server.gameVersion;
+    const mapname = SV.server.mapname;
+
+    console.assert(gameAPI !== null, 'savegame requires a loaded game API');
+    console.assert(gameversion !== null, 'savegame requires a loaded game version');
+    console.assert(mapname !== null, 'savegame requires an active map name');
+
+    if (gameAPI === null || gameversion === null || mapname === null) {
+      return;
+    }
 
     // IDEA: we could actually compress this by using a list of common fields.
     const edicts: SavegameEdictEntry[] = [];
 
     for (const edict of SV.server.edicts) {
-      edicts.push(edict.isFree() ? null : [edict.entity.classname, edict.entity.serialize() as JsonValue]);
+      const entity = edict.entity;
+
+      edicts.push(edict.isFree() || entity === null || !(entity instanceof SerializableEntity)
+        ? null
+        : [entity.classname, entity.serialize()]);
     }
 
-    const globals = SV.server.gameAPI.serialize() as JsonValue;
+    const globals = gameAPI.serialize();
 
     const gamestate: SavegameState = {
       version: Def.gamestateVersion,
-      gameversion: SV.server.gameVersion,
+      gameversion,
       comment: CL.state.levelname,
       spawn_parms: client.spawn_parms,
-      mapname: SV.server.mapname,
+      mapname,
       time: SV.server.time,
       lightstyles: SV.server.lightstyles,
       globals,
@@ -1087,7 +1151,7 @@ export default class Host {
       clientdata,
       edicts,
       num_edicts: SV.server.num_edicts,
-      particles: R.SerializeParticles() as JsonValue,
+      particles: R.SerializeParticles(),
     };
 
     const filename = COM.DefaultExtension(savename, '.json');
@@ -1168,7 +1232,14 @@ export default class Host {
     SV.server.loadgame = true;
 
     SV.server.lightstyles = gamestate.lightstyles;
-    SV.server.gameAPI.deserialize(gamestate.globals);
+    const gameAPI = SV.server.gameAPI;
+    console.assert(gameAPI !== null, 'loadgame requires a live server game API');
+
+    if (gameAPI === null) {
+      return;
+    }
+
+    gameAPI.deserialize(gamestate.globals);
 
     SV.server.num_edicts = gamestate.num_edicts;
     console.assert(SV.server.num_edicts <= SV.server.edicts.length, 'resizing edicts not supported yet'); // TODO: alloc more edicts
@@ -1185,7 +1256,7 @@ export default class Host {
       }
 
       const [classname] = serializedEdict;
-      console.assert(SV.server.gameAPI.prepareEntity(edict, classname), 'no entity for classname');
+      console.assert(gameAPI.prepareEntity(edict, classname), 'no entity for classname');
     }
 
     // Second run: we can start deserializing now that entity classes exist.
@@ -1198,7 +1269,14 @@ export default class Host {
       }
 
       const [, entityData] = serializedEdict;
-      edict.entity.deserialize(entityData);
+      const entity = edict.entity;
+      console.assert(entity instanceof SerializableEntity, 'loaded edict entity must support serialization');
+
+      if (!(entity instanceof SerializableEntity)) {
+        continue;
+      }
+
+      entity.deserialize(entityData);
       edict.linkEdict();
     }
 
@@ -1375,7 +1453,15 @@ export default class Host {
     }
 
     this.client.colors = playercolor;
-    this.client.edict.entity.team = bottom + 1;
+
+    const entity = this.client.edict.entity;
+    console.assert(entity !== null, 'color command requires a live client entity');
+
+    if (entity === null) {
+      return;
+    }
+
+    entity.team = bottom + 1;
 
     const message = SV.server.reliable_datagram;
     message.writeByte(Protocol.svc.updatecolors);
@@ -1390,13 +1476,27 @@ export default class Host {
 
     const client = this.client;
 
-    if (client.edict.entity.health <= 0.0) {
+    const entity = client.edict.entity;
+    console.assert(entity !== null, 'kill command requires a live client entity');
+
+    if (entity === null) {
+      return;
+    }
+
+    if (entity.health <= 0.0) {
       Host.ClientPrint(client, 'Can\'t suicide -- already dead!\n');
       return;
     }
 
-    SV.server.gameAPI.time = SV.server.time;
-    SV.server.gameAPI.ClientKill(client.edict);
+    const gameAPI = SV.server.gameAPI;
+    console.assert(gameAPI !== null, 'kill command requires a live server game API');
+
+    if (gameAPI === null) {
+      return;
+    }
+
+    gameAPI.time = SV.server.time;
+    gameAPI.ClientKill(client.edict);
   }
 
   static Pause_f(this: ConsoleCommand): void {
@@ -1464,7 +1564,14 @@ export default class Host {
     if (SV.server.loadgame) {
       SV.server.paused = false;
     } else {
-      SV.server.gameAPI.prepareEntity(entity, 'player', {
+      const gameAPI = SV.server.gameAPI;
+      console.assert(gameAPI !== null, 'spawn requires a live server game API');
+
+      if (gameAPI === null) {
+        return;
+      }
+
+      gameAPI.prepareEntity(entity, 'player', {
         netname: client.name,
         colormap: entity.num, // the num, not the entity
         team: (client.colors & 15) + 1,
@@ -1473,19 +1580,24 @@ export default class Host {
       // Load legacy spawn parameters.
       if (SV.server.gameCapabilities.includes(gameCapabilities.CAP_SPAWNPARMS_LEGACY) && Array.isArray(client.spawn_parms)) {
         for (let index = 0; index <= 15; index++) {
-          SV.server.gameAPI[`parm${index + 1}`] = client.spawn_parms[index];
+          Reflect.set(gameAPI, `parm${index + 1}`, client.spawn_parms[index]);
         }
       }
 
       // Load dynamic spawn parameters.
       if (SV.server.gameCapabilities.includes(gameCapabilities.CAP_SPAWNPARMS_DYNAMIC)) {
-        entity.entity.restoreSpawnParameters(client.spawn_parms);
+        const playerEntity = entity.entity;
+        console.assert(playerEntity !== null, 'spawn requires a prepared player entity');
+
+        if (playerEntity !== null && typeof playerEntity.restoreSpawnParameters === 'function') {
+          playerEntity.restoreSpawnParameters(typeof client.spawn_parms === 'string' ? client.spawn_parms : null);
+        }
       }
 
-      SV.server.gameAPI.time = SV.server.time;
-      SV.server.gameAPI.ClientConnect(entity);
-      SV.server.gameAPI.time = SV.server.time;
-      SV.server.gameAPI.PutClientInServer(entity);
+      gameAPI.time = SV.server.time;
+      gameAPI.ClientConnect(entity);
+      gameAPI.time = SV.server.time;
+      gameAPI.PutClientInServer(entity);
     }
 
     for (let index = 0; index < SV.svs.maxclients; index++) {
@@ -1508,22 +1620,45 @@ export default class Host {
     }
 
     if (SV.server.gameCapabilities.includes(gameCapabilities.CAP_CLIENTDATA_UPDATESTAT)) {
+      const gameAPI = SV.server.gameAPI;
+      const legacyStats = gameAPI as (typeof gameAPI & Partial<LegacyLevelStats>) | null;
+      const hasLegacyLevelStats = legacyStats !== null
+        && typeof legacyStats.total_secrets === 'number'
+        && typeof legacyStats.total_monsters === 'number'
+        && typeof legacyStats.found_secrets === 'number'
+        && typeof legacyStats.killed_monsters === 'number';
+
+      console.assert(hasLegacyLevelStats, 'gameAPI must expose legacy level stats when CAP_CLIENTDATA_UPDATESTAT is enabled');
+
+      if (!hasLegacyLevelStats || legacyStats === null) {
+        return;
+      }
+
+      const strictLegacyStats = legacyStats as LegacyLevelStats;
+
       message.writeByte(Protocol.svc.updatestat);
       message.writeByte(Def.stat.totalsecrets);
-      message.writeLong(SV.server.gameAPI.total_secrets);
+      message.writeLong(strictLegacyStats.total_secrets);
       message.writeByte(Protocol.svc.updatestat);
       message.writeByte(Def.stat.totalmonsters);
-      message.writeLong(SV.server.gameAPI.total_monsters);
+      message.writeLong(strictLegacyStats.total_monsters);
       message.writeByte(Protocol.svc.updatestat);
       message.writeByte(Def.stat.secrets);
-      message.writeLong(SV.server.gameAPI.found_secrets);
+      message.writeLong(strictLegacyStats.found_secrets);
       message.writeByte(Protocol.svc.updatestat);
       message.writeByte(Def.stat.monsters);
-      message.writeLong(SV.server.gameAPI.killed_monsters);
+      message.writeLong(strictLegacyStats.killed_monsters);
+    }
+
+    const playerEntity = entity.entity;
+    console.assert(playerEntity !== null, 'spawned client must have a player entity');
+
+    if (playerEntity === null) {
+      return;
     }
 
     message.writeByte(Protocol.svc.setangle);
-    message.writeAngleVector(entity.entity.angles);
+    message.writeAngleVector(playerEntity.angles);
     SV.messages.writeClientdataToMessage(client, message);
     message.writeByte(Protocol.svc.signonnum);
     message.writeByte(3);
@@ -1538,7 +1673,14 @@ export default class Host {
     }
 
     // Send all portal states before the client is officially spawned and gets updates incrementally.
-    const areaPortals = SV.server.worldmodel.areaPortals;
+    const worldmodel = SV.server.worldmodel;
+    console.assert(worldmodel !== null, 'server worldmodel required');
+
+    if (worldmodel === null) {
+      return;
+    }
+
+    const areaPortals = worldmodel.areaPortals;
 
     for (let portalIndex = 0; portalIndex < areaPortals.numPortals; portalIndex++) {
       this.client.message.writeByte(Protocol.svc.setportalstate);
@@ -1548,9 +1690,16 @@ export default class Host {
 
     this.client.state = ServerClient.STATE.SPAWNED;
 
-    if (SV.server.gameAPI.ClientBegin) {
-      SV.server.gameAPI.time = SV.server.time;
-      SV.server.gameAPI.ClientBegin(this.client.edict);
+    const gameAPI = SV.server.gameAPI;
+    console.assert(gameAPI !== null, 'begin requires a live server game API');
+
+    if (gameAPI === null) {
+      return;
+    }
+
+    if (gameAPI.ClientBegin) {
+      gameAPI.time = SV.server.time;
+      gameAPI.ClientBegin(this.client.edict);
     }
   }
 
@@ -1666,8 +1815,15 @@ export default class Host {
 
       // Wait for the next server frame.
       SV.ScheduleGameCommand(() => {
-        const { forward } = player.entity.v_angle.angleVectors();
-        const start = player.entity.origin;
+        const playerEntity = player.entity;
+        console.assert(playerEntity !== null, 'give command requires a live player entity');
+
+        if (playerEntity === null) {
+          return;
+        }
+
+        const { forward } = playerEntity.v_angle.angleVectors();
+        const start = playerEntity.origin;
         const end = forward.copy().multiply(64.0).add(start);
         const mins = new Vector(-16.0, -16.0, -24.0);
         const maxs = new Vector(16.0, 16.0, 32.0);
@@ -1691,7 +1847,7 @@ export default class Host {
       for (let index = 0; index < SV.server.num_edicts; index++) {
         const edict = SV.server.edicts[index];
 
-        if (!edict.isFree() && edict.entity.classname === 'viewthing') {
+        if (!edict.isFree() && edict.entity !== null && edict.entity.classname === 'viewthing') {
           return edict;
         }
       }
@@ -1720,8 +1876,15 @@ export default class Host {
       return;
     }
 
-    entity.entity.frame = 0;
-    CL.state.model_precache[entity.entity.modelindex] = loadedModel;
+    const viewEntity = entity.entity;
+    console.assert(viewEntity !== null, 'viewmodel command requires a live viewthing entity');
+
+    if (viewEntity === null) {
+      return;
+    }
+
+    viewEntity.frame = 0;
+    CL.state.model_precache[viewEntity.modelindex] = loadedModel;
   }
 
   static Viewframe_f(frame?: string): void {
@@ -1736,19 +1899,28 @@ export default class Host {
       return;
     }
 
-    const model = CL.state.model_precache[entity.entity.modelindex >> 0];
+    const viewEntity = entity.entity;
+    console.assert(viewEntity !== null, 'viewframe requires a live viewthing entity');
 
-    if (!model) {
+    if (viewEntity === null) {
       return;
     }
 
+    const model = CL.state.model_precache[viewEntity.modelindex >> 0];
+
+    if (!model || model.type !== Mod.type.alias) {
+      return;
+    }
+
+    const aliasModel = model as AliasModel;
+
     let nextFrame = Q.atoi(frame);
 
-    if (nextFrame >= model.frames.length) {
-      nextFrame = model.frames.length - 1;
+    if (nextFrame >= aliasModel.frames.length) {
+      nextFrame = aliasModel.frames.length - 1;
     }
 
-    entity.entity.frame = nextFrame;
+    viewEntity.frame = nextFrame;
   }
 
   static Viewnext_f(): void {
@@ -1758,20 +1930,36 @@ export default class Host {
       return;
     }
 
-    const model = CL.state.model_precache[entity.entity.modelindex >> 0];
+    const viewEntity = entity.entity;
+    console.assert(viewEntity !== null, 'viewnext requires a live viewthing entity');
 
-    if (!model) {
+    if (viewEntity === null) {
       return;
     }
 
-    let nextFrame = (entity.entity.frame >> 0) + 1;
+    const model = CL.state.model_precache[viewEntity.modelindex >> 0];
 
-    if (nextFrame >= model.frames.length) {
-      nextFrame = model.frames.length - 1;
+    if (!model || model.type !== Mod.type.alias) {
+      return;
     }
 
-    entity.entity.frame = nextFrame;
-    Con.Print(`frame ${nextFrame}: ${model.frames[nextFrame].name}\n`);
+    const aliasModel = model as AliasModel;
+
+    let nextFrame = (viewEntity.frame >> 0) + 1;
+
+    if (nextFrame >= aliasModel.frames.length) {
+      nextFrame = aliasModel.frames.length - 1;
+    }
+
+    viewEntity.frame = nextFrame;
+    const frameData = aliasModel.frames[nextFrame];
+    let frameName: string;
+    if (frameData.group) {
+      frameName = frameData.frames[0].name;
+    } else {
+      frameName = (frameData as Exclude<AliasModel['frames'][number], { group: true }>).name;
+    }
+    Con.Print(`frame ${nextFrame}: ${frameName}\n`);
   }
 
   static Viewprev_f(): void {
@@ -1781,20 +1969,36 @@ export default class Host {
       return;
     }
 
-    const model = CL.state.model_precache[entity.entity.modelindex >> 0];
+    const viewEntity = entity.entity;
+    console.assert(viewEntity !== null, 'viewprev requires a live viewthing entity');
+
+    if (viewEntity === null) {
+      return;
+    }
+
+    const model = CL.state.model_precache[viewEntity.modelindex >> 0];
 
-    if (!model) {
+    if (!model || model.type !== Mod.type.alias) {
       return;
     }
 
-    let nextFrame = (entity.entity.frame >> 0) - 1;
+    const aliasModel = model as AliasModel;
+
+    let nextFrame = (viewEntity.frame >> 0) - 1;
 
     if (nextFrame < 0) {
       nextFrame = 0;
     }
 
-    entity.entity.frame = nextFrame;
-    Con.Print(`frame ${nextFrame}: ${model.frames[nextFrame].name}\n`);
+    viewEntity.frame = nextFrame;
+    const frameData = aliasModel.frames[nextFrame];
+    let frameName: string;
+    if (frameData.group) {
+      frameName = frameData.frames[0].name;
+    } else {
+      frameName = (frameData as Exclude<AliasModel['frames'][number], { group: true }>).name;
+    }
+    Con.Print(`frame ${nextFrame}: ${frameName}\n`);
   }
 
   static InitCommands(): void {
diff --git a/source/engine/common/Mod.ts b/source/engine/common/Mod.ts
index 8e096b69..d1115305 100644
--- a/source/engine/common/Mod.ts
+++ b/source/engine/common/Mod.ts
@@ -9,6 +9,7 @@ import { WavefrontOBJLoader } from './model/loaders/WavefrontOBJLoader.ts';
 import ParsedQC from './model/parsers/ParsedQC.ts';
 import { BSP38Loader } from './model/loaders/BSP38Loader.ts';
 import type { BaseModel } from './model/BaseModel.ts';
+import type { BrushModel } from './model/BSP.ts';
 
 let { COM } = getCommonRegistry();
 let { CL } = getClientRegistry();
@@ -40,6 +41,10 @@ export enum ModelHull {
 
 type ModelCache = Record<string, BaseModel>;
 
+function isBrushModel(model: BaseModel): model is BrushModel {
+  return model.type === ModelType.brush;
+}
+
 // Re-export model classes for backward compatibility.
 // TODO: remove these!
 export { AliasModel } from './model/AliasModel.ts';
@@ -71,10 +76,9 @@ export default class Mod {
    * Returns true when the shared model is a world brush model with inline submodels.
    * @returns True when the model is a world brush model with inline submodels.
    */
-  static IsBrushWorldModel(sharedModel: BaseModel): boolean {
-    return sharedModel.type === Mod.type.brush
+  static IsBrushWorldModel(sharedModel: BaseModel): sharedModel is BrushModel {
+    return isBrushModel(sharedModel)
       && !sharedModel.submodel
-      && Array.isArray(sharedModel.submodels)
       && sharedModel.submodels.length > 0;
   }
 
@@ -82,7 +86,7 @@ export default class Mod {
    * Rebuilds scoped inline submodels against a scoped world view.
    */
   static RegisterScopedSubmodels(sharedWorld: BaseModel, scopedWorld: BaseModel, scope: ModelScope): void {
-    if (!Mod.IsBrushWorldModel(sharedWorld)) {
+    if (!Mod.IsBrushWorldModel(sharedWorld) || !isBrushModel(scopedWorld)) {
       return;
     }
 
diff --git a/source/engine/common/Pmove.ts b/source/engine/common/Pmove.ts
index cb10d7e5..76be0856 100644
--- a/source/engine/common/Pmove.ts
+++ b/source/engine/common/Pmove.ts
@@ -18,7 +18,7 @@ import { PmoveConfiguration } from '../../shared/Pmove.ts';
 import type { ClientEdict } from '../client/ClientEntities.ts';
 import type { BaseEntity } from '../server/Edict.ts';
 import type { Plane as BaseModelPlane } from './model/BaseModel.ts';
-import type { Brush, Node } from './model/BSP.ts';
+import { Node, type Brush } from './model/BSP.ts';
 interface BrushTracePlaneLike {
   readonly normal: Vector;
   readonly type: number;
@@ -980,27 +980,35 @@ export class BrushTrace {
 
     // Entirely on front side
     if (d >= offset) {
+      const frontChild = node.children[0] as Node;
+      console.assert(frontChild instanceof Node, 'brush trace expected linked BSP child node');
       return BrushTrace._testPositionRecursive(
-        worldModel, node.children[0], position, mins, maxs, boundsMins, boundsMaxs, extents, isPoint, checkCount,
+        worldModel, frontChild, position, mins, maxs, boundsMins, boundsMaxs, extents, isPoint, checkCount,
       );
     }
 
     // Entirely on back side
     if (d < -offset) {
+      const backChild = node.children[1] as Node;
+      console.assert(backChild instanceof Node, 'brush trace expected linked BSP child node');
       return BrushTrace._testPositionRecursive(
-        worldModel, node.children[1], position, mins, maxs, boundsMins, boundsMaxs, extents, isPoint, checkCount,
+        worldModel, backChild, position, mins, maxs, boundsMins, boundsMaxs, extents, isPoint, checkCount,
       );
     }
 
     // Box straddles the plane: test both sides
+    const frontChild = node.children[0] as Node;
+    const backChild = node.children[1] as Node;
+    console.assert(frontChild instanceof Node, 'brush trace expected linked BSP child node');
+    console.assert(backChild instanceof Node, 'brush trace expected linked BSP child node');
     if (BrushTrace._testPositionRecursive(
-      worldModel, node.children[0], position, mins, maxs, boundsMins, boundsMaxs, extents, isPoint, checkCount,
+      worldModel, frontChild, position, mins, maxs, boundsMins, boundsMaxs, extents, isPoint, checkCount,
     )) {
       return true;
     }
 
     return BrushTrace._testPositionRecursive(
-      worldModel, node.children[1], position, mins, maxs, boundsMins, boundsMaxs, extents, isPoint, checkCount,
+      worldModel, backChild, position, mins, maxs, boundsMins, boundsMaxs, extents, isPoint, checkCount,
     );
   }
 
@@ -1263,13 +1271,17 @@ export class BrushTrace {
 
     // Both on front side
     if (t1 >= offset && t2 >= offset) {
-      BrushTrace._recursiveHullCheck(ctx, node.children[0], p1f, p2f, p1, p2, depth + 1);
+      const frontChild = node.children[0] as Node;
+      console.assert(frontChild instanceof Node, 'brush trace expected linked BSP child node');
+      BrushTrace._recursiveHullCheck(ctx, frontChild, p1f, p2f, p1, p2, depth + 1);
       return;
     }
 
     // Both on back side
     if (t1 < -offset && t2 < -offset) {
-      BrushTrace._recursiveHullCheck(ctx, node.children[1], p1f, p2f, p1, p2, depth + 1);
+      const backChild = node.children[1] as Node;
+      console.assert(backChild instanceof Node, 'brush trace expected linked BSP child node');
+      BrushTrace._recursiveHullCheck(ctx, backChild, p1f, p2f, p1, p2, depth + 1);
       return;
     }
 
@@ -1307,7 +1319,9 @@ export class BrushTrace {
     mid[1] = p1[1] + frac * (p2[1] - p1[1]);
     mid[2] = p1[2] + frac * (p2[2] - p1[2]);
 
-    BrushTrace._recursiveHullCheck(ctx, node.children[side], p1f, midf, p1, mid, depth + 1);
+    const nearChild = node.children[side as 0 | 1] as Node;
+    console.assert(nearChild instanceof Node, 'brush trace expected linked BSP child node');
+    BrushTrace._recursiveHullCheck(ctx, nearChild, p1f, midf, p1, mid, depth + 1);
 
     // Go past the node
     const midf2 = p1f + (p2f - p1f) * frac2;
@@ -1316,7 +1330,9 @@ export class BrushTrace {
     mid2[1] = p1[1] + frac2 * (p2[1] - p1[1]);
     mid2[2] = p1[2] + frac2 * (p2[2] - p1[2]);
 
-    BrushTrace._recursiveHullCheck(ctx, node.children[side ^ 1], midf2, p2f, mid2, p2, depth + 1);
+    const farChild = node.children[(side ^ 1) as 0 | 1] as Node;
+    console.assert(farChild instanceof Node, 'brush trace expected linked BSP child node');
+    BrushTrace._recursiveHullCheck(ctx, farChild, midf2, p2f, mid2, p2, depth + 1);
   }
 
   /**
@@ -3789,7 +3805,7 @@ export class Pmove { // pmove_t
       // For non-BSP entities, hull-based collision is always used (BoxHull)
     }
 
-    if ('edictId' in entity) {
+    if ('edictId' in entity && typeof entity.edictId === 'number') {
       pe.edictId = entity.edictId;
     }
 
diff --git a/source/engine/common/WorkerFramework.ts b/source/engine/common/WorkerFramework.ts
index 54d69d65..0a622f35 100644
--- a/source/engine/common/WorkerFramework.ts
+++ b/source/engine/common/WorkerFramework.ts
@@ -108,7 +108,8 @@ export default class WorkerFramework {
       workerCom = comModule.default as typeof COM;
 
       this.port.on?.('message', ({ event, args }) => {
-        eventBus.publish(event, ...args);
+        const eventArgs = Array.isArray(args) ? args as Array<Parameters<typeof eventBus.publish>[1]> : [];
+        eventBus.publish(event, ...eventArgs);
       });
     } else {
       this.port = self as unknown as WorkerFrameworkPort;
@@ -116,7 +117,8 @@ export default class WorkerFramework {
 
       this.port.addEventListener?.('message', (event) => {
         const { event: eventName, args } = event.data;
-        eventBus.publish(eventName, ...args);
+        const eventArgs = Array.isArray(args) ? args as Array<Parameters<typeof eventBus.publish>[1]> : [];
+        eventBus.publish(eventName, ...eventArgs);
       });
     }
 
diff --git a/source/engine/common/WorkerManager.ts b/source/engine/common/WorkerManager.ts
index f5c05436..efa64bde 100644
--- a/source/engine/common/WorkerManager.ts
+++ b/source/engine/common/WorkerManager.ts
@@ -99,7 +99,7 @@ export default class WorkerManager {
           break;
 
         default:
-          eventBus.publish(event, ...data);
+          eventBus.publish(event, ...(data as Array<Parameters<typeof eventBus.publish>[1]>));
           break;
       }
     });
diff --git a/source/engine/common/model/BSP.ts b/source/engine/common/model/BSP.ts
index 61a10d69..0d6768a1 100644
--- a/source/engine/common/model/BSP.ts
+++ b/source/engine/common/model/BSP.ts
@@ -56,6 +56,11 @@ export interface FogVolumeInfo {
   readonly maxs: [number, number, number];
 }
 
+export interface BrushRange {
+  readonly firstBrush: number;
+  readonly numBrushes: number;
+}
+
 export interface WorldTurbulentChainInfo {
   /** Texture index used by the draw batch. */
   readonly texture: number;
@@ -632,6 +637,9 @@ export class BrushModel extends BaseModel {
   /** Number of brushes belonging to this model. */
   numBrushes = 0;
 
+  /** Per-submodel brush ranges parsed from BRUSHLIST BSPX data. */
+  _brushRanges: Map<number, BrushRange> | null = null;
+
   /** Opaque world VAO created by the brush renderer. */
   opaqueVAO: WebGLVertexArrayObject | null = null;
 
@@ -776,8 +784,8 @@ export class BrushModel extends BaseModel {
   /**
    * @returns Scoped runtime view.
    */
-  override createScopedView(): BrushModel {
-    const scopedView = super.createScopedView() as BrushModel;
+  override createScopedView(): this {
+    const scopedView = super.createScopedView() as this;
 
     scopedView.cmds = null;
     scopedView.chains = [];
diff --git a/source/engine/common/model/MeshModel.ts b/source/engine/common/model/MeshModel.ts
index ae0ab0be..75c49ab6 100644
--- a/source/engine/common/model/MeshModel.ts
+++ b/source/engine/common/model/MeshModel.ts
@@ -94,8 +94,8 @@ export class MeshModel extends BaseModel {
     this.type = 3;
   }
 
-  override createScopedView(): MeshModel {
-    const scopedView = super.createScopedView() as MeshModel;
+  override createScopedView(): this {
+    const scopedView = super.createScopedView() as this;
 
     // Scoped views must not own shared GPU objects from the source model.
     scopedView.vbo = null;
diff --git a/source/engine/common/model/SpriteModel.ts b/source/engine/common/model/SpriteModel.ts
index ac15970b..85ed19d9 100644
--- a/source/engine/common/model/SpriteModel.ts
+++ b/source/engine/common/model/SpriteModel.ts
@@ -2,7 +2,7 @@ import type { GLTexture } from '../../client/GL.ts';
 
 import { BaseModel } from './BaseModel.ts';
 
-interface SpriteFrameImage {
+export interface SpriteFrameImage {
   readonly interval?: number;
   readonly origin: [number, number];
   readonly width: number;
@@ -12,7 +12,7 @@ interface SpriteFrameImage {
   readonly texturenum: WebGLTexture | null;
 }
 
-interface SpriteSingleFrame {
+export interface SpriteSingleFrame {
   readonly group: false;
   readonly origin: [number, number];
   readonly width: number;
diff --git a/source/engine/common/model/loaders/AliasMDLLoader.ts b/source/engine/common/model/loaders/AliasMDLLoader.ts
index 0a004882..d6b672f0 100644
--- a/source/engine/common/model/loaders/AliasMDLLoader.ts
+++ b/source/engine/common/model/loaders/AliasMDLLoader.ts
@@ -66,6 +66,8 @@ interface MutableAliasGroupedFrame {
 
 type MutableAliasFrame = MutableAliasSingleFrame | MutableAliasGroupedFrame;
 type MutableAliasSkin = MutableAliasSingleSkin | MutableAliasGroupedSkin;
+type MutableAliasRenderFrame = MutableAliasSingleFrame | MutableAliasGroupedFrameEntry;
+type MutableAliasRenderSkin = MutableAliasSingleSkin | MutableAliasGroupedSkinEntry;
 
 /**
  * Builds the diffuse and luminance skin layers for a legacy alias model skin.
@@ -411,6 +413,10 @@ export class AliasMDLLoader extends ModelLoader {
     const fillcolor = skin[0];
     const filledcolor = W.filledColor;
 
+    if (filledcolor === null) {
+      return;
+    }
+
     if (fillcolor === filledcolor) {
       return;
     }
@@ -441,7 +447,7 @@ export class AliasMDLLoader extends ModelLoader {
   /**
    * Translate player skin for color customization.
    */
-  #translatePlayerSkin(loadmodel: AliasModel, data: Uint8Array, skin: MutableAliasSkin): void {
+  #translatePlayerSkin(loadmodel: AliasModel, data: Uint8Array, skin: MutableAliasRenderSkin): void {
     if (registry.isDedicatedServer) {
       return;
     }
@@ -692,7 +698,11 @@ export class AliasMDLLoader extends ModelLoader {
         continue;
       }
 
-      const frame = group;
+      if (group.group) {
+        continue;
+      }
+
+      const frame: MutableAliasRenderFrame = group;
       frame.cmdofs = cmds.length * 4;
 
       for (let triangleIndex = 0; triangleIndex < loadmodel._num_tris; triangleIndex++) {
diff --git a/source/engine/common/model/loaders/BSP29Loader.ts b/source/engine/common/model/loaders/BSP29Loader.ts
index 716c8c9a..6b05b5ba 100644
--- a/source/engine/common/model/loaders/BSP29Loader.ts
+++ b/source/engine/common/model/loaders/BSP29Loader.ts
@@ -7,7 +7,7 @@ import { CRC16CCITT } from '../../CRC.ts';
 import { CorruptedResourceError } from '../../Errors.ts';
 import { eventBus, getCommonRegistry, registry } from '../../../registry.ts';
 import { ModelLoader } from '../ModelLoader.ts';
-import { Brush, BrushModel, BrushSide, Node, type BSPXLumps, type Clipnode, type Hull } from '../BSP.ts';
+import { Brush, BrushModel, BrushSide, Node, type BSPXLumps, type BrushRange, type BrushTexInfo, type Clipnode, type Hull } from '../BSP.ts';
 import { Face, Plane } from '../BaseModel.ts';
 import { MaterialFlags, noTextureMaterial, PBRMaterial, QuakeMaterial } from '../../../client/renderer/Materials.ts';
 import { Quake1Sky, SimpleSkyBox } from '../../../client/renderer/Sky.ts';
@@ -20,10 +20,28 @@ eventBus.subscribe('registry.frozen', () => {
 });
 
 interface AllowedClipnodeHull extends Hull {
-  readonly firstclipnode: number;
   allowedClipNodes?: Uint8Array | null;
 }
 
+interface MaterialDefinition {
+  readonly diffuse?: string;
+  readonly luminance?: string;
+  readonly specular?: string;
+  readonly normal?: string;
+  readonly flags?: string[];
+}
+
+interface MaterialFile {
+  readonly version: number;
+  readonly materials: Record<string, MaterialDefinition>;
+}
+
+function getNodeChild(node: Node, childIndex: 0 | 1): Node {
+  const child = node.children[childIndex];
+  console.assert(child instanceof Node, 'BSP29Loader expected linked BSP child node');
+  return child as Node;
+}
+
 /**
  * Loader for Quake BSP29 format (.bsp)
  * It supports vanilla BSP29 and a few BSPX extensions (such as lightgrid, RGB lighting).
@@ -342,7 +360,7 @@ export class BSP29Loader extends ModelLoader {
     }
 
     Con.DPrint(`BSP29Loader: found materials file for ${loadmodel.name}\n`);
-    const materialData = JSON.parse(matfile);
+    const materialData = JSON.parse(matfile) as MaterialFile;
     console.assert(materialData.version === 1);
 
     for (const [txName, textures] of Object.entries(materialData.materials)) {
@@ -369,9 +387,11 @@ export class BSP29Loader extends ModelLoader {
 
       if (textures.flags) {
         for (const flagName of textures.flags) {
-          const flagValue = materialFlags[flagName];
+          const flagValue = MaterialFlags[flagName as keyof typeof MaterialFlags];
           console.assert(typeof flagValue === 'number', `BSP29Loader: unknown material flag ${flagName} in ${loadmodel.name}`);
-          pbr.flags |= flagValue;
+          if (typeof flagValue === 'number') {
+            pbr.flags |= flagValue;
+          }
         }
       }
 
@@ -703,10 +723,10 @@ export class BSP29Loader extends ModelLoader {
 
       // Inner Node
       if (node.children[0]) {
-        classifyRecursive(node.children[0], nextStates);
+        classifyRecursive(getNodeChild(node, 0), nextStates);
       }
       if (node.children[1]) {
-        classifyRecursive(node.children[1], nextStates);
+        classifyRecursive(getNodeChild(node, 1), nextStates);
       }
     };
 
@@ -1176,11 +1196,11 @@ export class BSP29Loader extends ModelLoader {
 
       // Derive fog color from the texture's average color, modulated by ambient light
       const material = loadmodel.textures[turbulentTextureIndex];
-      const baseColor = material.averageColor || [128, 128, 128];
-      const volMins = [submodel.mins[0], submodel.mins[1], submodel.mins[2]];
-      const volMaxs = [submodel.maxs[0], submodel.maxs[1], submodel.maxs[2]];
+      const baseColor: [number, number, number] = material.averageColor || [128, 128, 128];
+      const volMins: [number, number, number] = [submodel.mins[0], submodel.mins[1], submodel.mins[2]];
+      const volMaxs: [number, number, number] = [submodel.maxs[0], submodel.maxs[1], submodel.maxs[2]];
       const lightFactor = this.#sampleAmbientLightForVolume(loadmodel, volMins, volMaxs);
-      const color = [
+      const color: [number, number, number] = [
         Math.round(baseColor[0] * lightFactor),
         Math.round(baseColor[1] * lightFactor),
         Math.round(baseColor[2] * lightFactor),
@@ -1228,7 +1248,7 @@ export class BSP29Loader extends ModelLoader {
       if (!liquidLeafsByType.has(c)) {
         liquidLeafsByType.set(c, []);
       }
-      liquidLeafsByType.get(c).push(i);
+      liquidLeafsByType.get(c)?.push(i);
     }
 
     if (liquidLeafsByType.size === 0) {
@@ -1237,7 +1257,10 @@ export class BSP29Loader extends ModelLoader {
 
     for (const [contentType, leafIndices] of liquidLeafsByType) {
       // Find dominant turbulent texture color across all leafs of this type
-      const color = this.#findClusterTurbulentColor(loadmodel, leafIndices) || [128, 128, 128];
+      const clusterColor = this.#findClusterTurbulentColor(loadmodel, leafIndices);
+      const color: [number, number, number] = clusterColor !== null
+        ? [clusterColor[0], clusterColor[1], clusterColor[2]]
+        : [128, 128, 128];
 
       const contentName = contentType === content.CONTENT_WATER ? 'water'
         : contentType === content.CONTENT_SLIME ? 'slime' : 'lava';
@@ -1248,10 +1271,13 @@ export class BSP29Loader extends ModelLoader {
       // Create one fog volume per leaf with exact BSP bounds, modulated by ambient light
       for (const leafIdx of leafIndices) {
         const leaf = loadmodel.leafs[leafIdx];
-        const volMins = [leaf.mins[0], leaf.mins[1], leaf.mins[2]];
-        const volMaxs = [leaf.maxs[0], leaf.maxs[1], leaf.maxs[2]];
+        if (leaf.mins === null || leaf.maxs === null) {
+          continue;
+        }
+        const volMins: [number, number, number] = [leaf.mins[0], leaf.mins[1], leaf.mins[2]];
+        const volMaxs: [number, number, number] = [leaf.maxs[0], leaf.maxs[1], leaf.maxs[2]];
         const lightFactor = this.#sampleAmbientLightForVolume(loadmodel, volMins, volMaxs);
-        const dimmedColor = [
+        const dimmedColor: [number, number, number] = [
           Math.round(color[0] * lightFactor),
           Math.round(color[1] * lightFactor),
           Math.round(color[2] * lightFactor),
@@ -1416,7 +1442,7 @@ export class BSP29Loader extends ModelLoader {
    * Skips fully transparent pixels so alpha-masked areas don't dilute the color.
    * @returns The average RGB color.
    */
-  static #computeAverageColor(rgba: Uint8Array): number[] {
+  static #computeAverageColor(rgba: Uint8Array): [number, number, number] {
     let r = 0;
     let g = 0;
     let b = 0;
@@ -1548,18 +1574,17 @@ export class BSP29Loader extends ModelLoader {
     const count = filelen / 40;
     loadmodel.texinfo.length = 0;
     for (let i = 0; i < count; i++) {
-      const out = {
-        vecs: [
-          [view.getFloat32(fileofs, true), view.getFloat32(fileofs + 4, true), view.getFloat32(fileofs + 8, true), view.getFloat32(fileofs + 12, true)],
-          [view.getFloat32(fileofs + 16, true), view.getFloat32(fileofs + 20, true), view.getFloat32(fileofs + 24, true), view.getFloat32(fileofs + 28, true)],
-        ],
-        texture: view.getUint32(fileofs + 32, true),
-        flags: view.getUint32(fileofs + 36, true),
-      };
-      if (out.texture >= loadmodel.textures.length) {
-        out.texture = loadmodel.textures.length - 1;
-        out.flags = 0;
+      const vecs: BrushTexInfo['vecs'] = [
+        [view.getFloat32(fileofs, true), view.getFloat32(fileofs + 4, true), view.getFloat32(fileofs + 8, true), view.getFloat32(fileofs + 12, true)],
+        [view.getFloat32(fileofs + 16, true), view.getFloat32(fileofs + 20, true), view.getFloat32(fileofs + 24, true), view.getFloat32(fileofs + 28, true)],
+      ];
+      let texture = view.getUint32(fileofs + 32, true);
+      let flags = view.getUint32(fileofs + 36, true);
+      if (texture >= loadmodel.textures.length) {
+        texture = loadmodel.textures.length - 1;
+        flags = 0;
       }
+      const out: BrushTexInfo = { vecs, texture, flags };
       loadmodel.texinfo[i] = out;
       fileofs += 40;
     }
@@ -1606,7 +1631,7 @@ export class BSP29Loader extends ModelLoader {
       const mins = [Infinity, Infinity];
       const maxs = [-Infinity, -Infinity];
       const tex = loadmodel.texinfo[face.texinfo];
-      face.texture = tex.texture;
+      face.texture = typeof tex.texture === 'number' ? tex.texture : 0;
 
       for (let j = 0; j < face.numedges; j++) {
         const e = loadmodel.surfedges[face.firstedge + j];
@@ -1614,8 +1639,8 @@ export class BSP29Loader extends ModelLoader {
           ? loadmodel.vertexes[loadmodel.edges[e][0]]
           : loadmodel.vertexes[loadmodel.edges[-e][1]];
 
-        const val0 = v.dot(new Vector(...tex.vecs[0])) + tex.vecs[0][3];
-        const val1 = v.dot(new Vector(...tex.vecs[1])) + tex.vecs[1][3];
+        const val0 = v.dot(new Vector(tex.vecs[0][0], tex.vecs[0][1], tex.vecs[0][2])) + tex.vecs[0][3];
+        const val1 = v.dot(new Vector(tex.vecs[1][0], tex.vecs[1][1], tex.vecs[1][2])) + tex.vecs[1][3];
 
         if (val0 < mins[0]) {
           mins[0] = val0;
@@ -1862,7 +1887,7 @@ export class BSP29Loader extends ModelLoader {
    * Attach the owning subtree mask to a legacy hull.
    */
   #assignAllowedClipnodeMask(hull?: AllowedClipnodeHull): void {
-    if (!hull) {
+    if (!hull || hull.firstclipnode === undefined) {
       return;
     }
 
diff --git a/source/engine/server/Edict.ts b/source/engine/server/Edict.ts
index 78a73351..56ee6d10 100644
--- a/source/engine/server/Edict.ts
+++ b/source/engine/server/Edict.ts
@@ -1,4 +1,4 @@
-import type { EdictData } from '../../shared/GameInterfaces.ts';
+import { SerializableEntity, type EdictData } from '../../shared/GameInterfaces.ts';
 import type { WorldspawnEntity as WorldspawnEntityValue } from '../../game/id1/entity/Worldspawn.mjs';
 import type { OctreeNode } from '../../shared/Octree.ts';
 import type { Visibility } from '../common/model/BSP.ts';
@@ -14,7 +14,7 @@ import { eventBus, registry } from '../registry.ts';
 import Q from '../../shared/Q.ts';
 import { ConsoleCommand } from '../common/Cmd.ts';
 
-export interface BaseEntity {
+export interface BaseEntity extends SerializableEntity {
   classname: string;
   alpha: number;
   angles: Vector;
@@ -45,6 +45,8 @@ export interface BaseEntity {
   velocity: Vector;
   view_ofs: Vector;
   v_angle: Vector;
+  readonly edictId: number | undefined;
+  restoreSpawnParameters?(data: string | null): void;
 }
 
 export type WorldspawnEntity = WorldspawnEntityValue;
diff --git a/source/engine/server/Server.ts b/source/engine/server/Server.ts
index 7df5fb85..40fe6767 100644
--- a/source/engine/server/Server.ts
+++ b/source/engine/server/Server.ts
@@ -34,7 +34,7 @@ eventBus.subscribe('registry.frozen', () => {
 type BitsWriter = 'writeByte' | 'writeShort' | 'writeLong';
 type ScheduledGameCommand = () => void;
 type ServerClientSpawnParameters = ServerClient['spawn_parms'];
-type ServerModel = BaseModel | null | Promise<BaseModel>;
+type ServerModel = BaseModel | null | Promise<BaseModel | null>;
 type DynamicSpawnClientEntity = ServerClient['entity'] & {
   restoreSpawnParameters(data: string | null): void;
 };
@@ -526,7 +526,7 @@ export default class SV {
 
     for (const model of SV.server.models) {
       if (model instanceof Promise) {
-        void model.then((loadedModel) => loadedModel.reset());
+        void model.then((loadedModel) => loadedModel?.reset());
         continue;
       }
 
@@ -734,12 +734,14 @@ export default class SV {
   }
 
   static async #loadGameProgs(): Promise<void> {
-    const gameAPI = PR.QuakeJS ? new PR.QuakeJS.ServerGameAPI(ServerEngineAPI) : await PR.LoadProgs();
+    const gameAPI = PR.QuakeJS
+      ? Reflect.construct(PR.QuakeJS.ServerGameAPI, [ServerEngineAPI]) as ServerRuntimeGameAPI
+      : await PR.LoadProgs();
 
     SV.server.gameAPI = gameAPI as ServerRuntimeGameAPI;
     SV.server.gameVersion = PR.QuakeJS ? `${PR.QuakeJS.identification.version.join('.')} QuakeJS` : `${PR.crc} CRC`;
     SV.server.gameName = PR.QuakeJS ? PR.QuakeJS.identification.name : COM.game;
-    SV.server.gameCapabilities = PR.QuakeJS ? PR.QuakeJS.identification.capabilities : PR.capabilities;
+    SV.server.gameCapabilities = PR.QuakeJS ? [...PR.QuakeJS.identification.capabilities] : [...PR.capabilities];
 
     Con.DPrint('Game progs loaded\n');
   }
@@ -1051,5 +1053,5 @@ class PlayerMoveCvars extends MoveVars {
 sharedCollisionModelSource.configureServer({
   getWorldEntity: () => SV.server.edicts[0] ?? null,
   getWorldModel: () => SV.server.worldmodel,
-  getModels: () => SV.server.models,
+  getModels: () => SV.server.models.map((model) => model instanceof Promise ? null : model),
 });
diff --git a/source/shared/GameInterfaces.ts b/source/shared/GameInterfaces.ts
index 8472e6c0..a4e86568 100644
--- a/source/shared/GameInterfaces.ts
+++ b/source/shared/GameInterfaces.ts
@@ -129,6 +129,30 @@ export type SerializedObject = [number, SerializedData];
 export type SerializedValue = SerializedSkipped | SerializedInfinity | SerializedPrimitiveValue | SerializedFunction | SerializedVector | SerializedArray | SerializedEdictReference | SerializedObject;
 export type SerializedData = Record<string, SerializedValue>;
 
+interface SerializableEntityCandidate {
+  readonly classname?: unknown;
+  readonly serialize?: unknown;
+  readonly deserialize?: unknown;
+}
+
+export abstract class SerializableEntity {
+  static [Symbol.hasInstance](value: unknown): boolean {
+    if (value === null || typeof value !== 'object') {
+      return false;
+    }
+
+    const candidate = value as SerializableEntityCandidate;
+
+    return typeof candidate.classname === 'string'
+      && typeof candidate.serialize === 'function'
+      && typeof candidate.deserialize === 'function';
+  }
+
+  abstract classname: string;
+  abstract serialize(): SerializedData;
+  abstract deserialize(data: SerializedData): void;
+}
+
 export declare abstract class ServerGameInterface {
   SetNewParms?(): void;
   SetSpawnParms?(clientEdict: ServerEdict): void;
diff --git a/test/common/game-interfaces.test.mjs b/test/common/game-interfaces.test.mjs
new file mode 100644
index 00000000..16dcf976
--- /dev/null
+++ b/test/common/game-interfaces.test.mjs
@@ -0,0 +1,29 @@
+import assert from 'node:assert/strict';
+import { describe, test } from 'node:test';
+
+import { SerializableEntity } from '../../source/shared/GameInterfaces.ts';
+
+void describe('SerializableEntity', () => {
+  void test('matches structural serializable entities via instanceof', () => {
+    const entity = {
+      classname: 'player',
+      serialize() {
+        return {};
+      },
+      deserialize(_data) {},
+    };
+
+    assert.equal(entity instanceof SerializableEntity, true);
+  });
+
+  void test('rejects objects that do not expose save-load methods', () => {
+    const entity = {
+      classname: 'player',
+      serialize() {
+        return {};
+      },
+    };
+
+    assert.equal(entity instanceof SerializableEntity, false);
+  });
+});

From f74e28085475f51b72ba883815658641b3a08128 Mon Sep 17 00:00:00 2001
From: Christian R <github@chrisnew.de>
Date: Sat, 4 Apr 2026 20:52:55 +0300
Subject: [PATCH 52/67] TS: polish tsc findings

---
 source/engine/common/CollisionModelSource.ts  |   2 +-
 source/engine/common/Pmove.ts                 |  69 ++++---
 source/engine/common/model/BSP.ts             |   2 +-
 .../common/model/loaders/AliasMDLLoader.ts    |   6 +-
 .../common/model/loaders/BSP29Loader.ts       | 181 +++++++++++++-----
 .../engine/common/model/loaders/BSP2Loader.ts |  10 +-
 .../common/model/loaders/SpriteSPRLoader.ts   |   2 +-
 source/engine/main-dedicated.ts               |   2 +-
 source/engine/network/NetworkDrivers.ts       |   9 +-
 source/engine/server/Com.ts                   |   2 +-
 source/engine/server/Edict.ts                 |  16 +-
 source/engine/server/GameLoader.ts            |   3 +-
 source/engine/server/Navigation.ts            |   4 +-
 source/engine/server/NavigationWorker.ts      |   7 +-
 source/engine/server/ServerMessages.ts        |  31 ++-
 source/engine/server/Sys.ts                   |   2 +-
 source/engine/server/physics/ServerArea.ts    |  10 +-
 17 files changed, 247 insertions(+), 111 deletions(-)

diff --git a/source/engine/common/CollisionModelSource.ts b/source/engine/common/CollisionModelSource.ts
index 4c80e8b9..b0b53b7d 100644
--- a/source/engine/common/CollisionModelSource.ts
+++ b/source/engine/common/CollisionModelSource.ts
@@ -108,7 +108,7 @@ export function createRegistryCollisionModelSource(): CollisionModelSource {
   modelSource.configureServer({
     getWorldEntity: () => SV?.server?.edicts?.[0] ?? null,
     getWorldModel: () => SV?.server?.worldmodel ?? null,
-    getModels: () => (SV?.server?.models.map((model) => model instanceof Promise ? null : model) as Array<BaseModel | null> | undefined) ?? null,
+    getModels: () => (SV?.server?.models?.map((model) => model instanceof Promise ? null : model) as Array<BaseModel | null> | undefined) ?? null,
   });
   modelSource.configureClient({
     getWorldModel: () => CL?.state?.worldmodel ?? null,
diff --git a/source/engine/common/Pmove.ts b/source/engine/common/Pmove.ts
index 76be0856..78a5eda3 100644
--- a/source/engine/common/Pmove.ts
+++ b/source/engine/common/Pmove.ts
@@ -980,35 +980,44 @@ export class BrushTrace {
 
     // Entirely on front side
     if (d >= offset) {
-      const frontChild = node.children[0] as Node;
-      console.assert(frontChild instanceof Node, 'brush trace expected linked BSP child node');
+      const frontChild = node.children[0];
+      console.assert(typeof frontChild === 'object' && frontChild !== null, 'brush trace expected linked BSP child node');
+      if (typeof frontChild !== 'object' || frontChild === null) {
+        return false;
+      }
       return BrushTrace._testPositionRecursive(
-        worldModel, frontChild, position, mins, maxs, boundsMins, boundsMaxs, extents, isPoint, checkCount,
+        worldModel, frontChild as Node, position, mins, maxs, boundsMins, boundsMaxs, extents, isPoint, checkCount,
       );
     }
 
     // Entirely on back side
     if (d < -offset) {
-      const backChild = node.children[1] as Node;
-      console.assert(backChild instanceof Node, 'brush trace expected linked BSP child node');
+      const backChild = node.children[1];
+      console.assert(typeof backChild === 'object' && backChild !== null, 'brush trace expected linked BSP child node');
+      if (typeof backChild !== 'object' || backChild === null) {
+        return false;
+      }
       return BrushTrace._testPositionRecursive(
-        worldModel, backChild, position, mins, maxs, boundsMins, boundsMaxs, extents, isPoint, checkCount,
+        worldModel, backChild as Node, position, mins, maxs, boundsMins, boundsMaxs, extents, isPoint, checkCount,
       );
     }
 
     // Box straddles the plane: test both sides
-    const frontChild = node.children[0] as Node;
-    const backChild = node.children[1] as Node;
-    console.assert(frontChild instanceof Node, 'brush trace expected linked BSP child node');
-    console.assert(backChild instanceof Node, 'brush trace expected linked BSP child node');
+    const frontChild = node.children[0];
+    const backChild = node.children[1];
+    console.assert(typeof frontChild === 'object' && frontChild !== null, 'brush trace expected linked BSP child node');
+    console.assert(typeof backChild === 'object' && backChild !== null, 'brush trace expected linked BSP child node');
+    if (typeof frontChild !== 'object' || frontChild === null || typeof backChild !== 'object' || backChild === null) {
+      return false;
+    }
     if (BrushTrace._testPositionRecursive(
-      worldModel, frontChild, position, mins, maxs, boundsMins, boundsMaxs, extents, isPoint, checkCount,
+      worldModel, frontChild as Node, position, mins, maxs, boundsMins, boundsMaxs, extents, isPoint, checkCount,
     )) {
       return true;
     }
 
     return BrushTrace._testPositionRecursive(
-      worldModel, backChild, position, mins, maxs, boundsMins, boundsMaxs, extents, isPoint, checkCount,
+      worldModel, backChild as Node, position, mins, maxs, boundsMins, boundsMaxs, extents, isPoint, checkCount,
     );
   }
 
@@ -1271,17 +1280,23 @@ export class BrushTrace {
 
     // Both on front side
     if (t1 >= offset && t2 >= offset) {
-      const frontChild = node.children[0] as Node;
-      console.assert(frontChild instanceof Node, 'brush trace expected linked BSP child node');
-      BrushTrace._recursiveHullCheck(ctx, frontChild, p1f, p2f, p1, p2, depth + 1);
+      const frontChild = node.children[0];
+      console.assert(typeof frontChild === 'object' && frontChild !== null, 'brush trace expected linked BSP child node');
+      if (typeof frontChild !== 'object' || frontChild === null) {
+        return;
+      }
+      BrushTrace._recursiveHullCheck(ctx, frontChild as Node, p1f, p2f, p1, p2, depth + 1);
       return;
     }
 
     // Both on back side
     if (t1 < -offset && t2 < -offset) {
-      const backChild = node.children[1] as Node;
-      console.assert(backChild instanceof Node, 'brush trace expected linked BSP child node');
-      BrushTrace._recursiveHullCheck(ctx, backChild, p1f, p2f, p1, p2, depth + 1);
+      const backChild = node.children[1];
+      console.assert(typeof backChild === 'object' && backChild !== null, 'brush trace expected linked BSP child node');
+      if (typeof backChild !== 'object' || backChild === null) {
+        return;
+      }
+      BrushTrace._recursiveHullCheck(ctx, backChild as Node, p1f, p2f, p1, p2, depth + 1);
       return;
     }
 
@@ -1319,9 +1334,12 @@ export class BrushTrace {
     mid[1] = p1[1] + frac * (p2[1] - p1[1]);
     mid[2] = p1[2] + frac * (p2[2] - p1[2]);
 
-    const nearChild = node.children[side as 0 | 1] as Node;
-    console.assert(nearChild instanceof Node, 'brush trace expected linked BSP child node');
-    BrushTrace._recursiveHullCheck(ctx, nearChild, p1f, midf, p1, mid, depth + 1);
+    const nearChild = node.children[side as 0 | 1];
+    console.assert(typeof nearChild === 'object' && nearChild !== null, 'brush trace expected linked BSP child node');
+    if (typeof nearChild !== 'object' || nearChild === null) {
+      return;
+    }
+    BrushTrace._recursiveHullCheck(ctx, nearChild as Node, p1f, midf, p1, mid, depth + 1);
 
     // Go past the node
     const midf2 = p1f + (p2f - p1f) * frac2;
@@ -1330,9 +1348,12 @@ export class BrushTrace {
     mid2[1] = p1[1] + frac2 * (p2[1] - p1[1]);
     mid2[2] = p1[2] + frac2 * (p2[2] - p1[2]);
 
-    const farChild = node.children[(side ^ 1) as 0 | 1] as Node;
-    console.assert(farChild instanceof Node, 'brush trace expected linked BSP child node');
-    BrushTrace._recursiveHullCheck(ctx, farChild, midf2, p2f, mid2, p2, depth + 1);
+    const farChild = node.children[(side ^ 1) as 0 | 1];
+    console.assert(typeof farChild === 'object' && farChild !== null, 'brush trace expected linked BSP child node');
+    if (typeof farChild !== 'object' || farChild === null) {
+      return;
+    }
+    BrushTrace._recursiveHullCheck(ctx, farChild as Node, midf2, p2f, mid2, p2, depth + 1);
   }
 
   /**
diff --git a/source/engine/common/model/BSP.ts b/source/engine/common/model/BSP.ts
index 0d6768a1..1af31bf3 100644
--- a/source/engine/common/model/BSP.ts
+++ b/source/engine/common/model/BSP.ts
@@ -22,7 +22,7 @@ export interface Hull {
   readonly planes: Plane[];
 
   /** Index of the first clipnode, when the hull is a subrange. */
-  readonly firstclipnode?: number;
+  firstclipnode?: number;
 
   /** Index of the last clipnode. */
   readonly lastclipnode: number;
diff --git a/source/engine/common/model/loaders/AliasMDLLoader.ts b/source/engine/common/model/loaders/AliasMDLLoader.ts
index d6b672f0..a1d704b9 100644
--- a/source/engine/common/model/loaders/AliasMDLLoader.ts
+++ b/source/engine/common/model/loaders/AliasMDLLoader.ts
@@ -698,11 +698,7 @@ export class AliasMDLLoader extends ModelLoader {
         continue;
       }
 
-      if (group.group) {
-        continue;
-      }
-
-      const frame: MutableAliasRenderFrame = group;
+      const frame = group as MutableAliasSingleFrame;
       frame.cmdofs = cmds.length * 4;
 
       for (let triangleIndex = 0; triangleIndex < loadmodel._num_tris; triangleIndex++) {
diff --git a/source/engine/common/model/loaders/BSP29Loader.ts b/source/engine/common/model/loaders/BSP29Loader.ts
index 6b05b5ba..94f22038 100644
--- a/source/engine/common/model/loaders/BSP29Loader.ts
+++ b/source/engine/common/model/loaders/BSP29Loader.ts
@@ -36,6 +36,8 @@ interface MaterialFile {
   readonly materials: Record<string, MaterialDefinition>;
 }
 
+type MaterialTextureCategory = 'luminance' | 'diffuse' | 'specular' | 'normal';
+
 function getNodeChild(node: Node, childIndex: 0 | 1): Node {
   const child = node.children[childIndex];
   console.assert(child instanceof Node, 'BSP29Loader expected linked BSP child node');
@@ -150,6 +152,10 @@ export class BSP29Loader extends ModelLoader {
       GLTexture.FromImageFile(`gfx/env/${skyname}dn.png`),
     ]);
 
+    if (front === null || back === null || left === null || right === null || up === null || down === null) {
+      return;
+    }
+
     // CR: unholy yet convenient hack to pass sky texture data to SkyRenderer
     loadmodel.newSkyRenderer = function () {
       const skyrenderer = new SimpleSkyBox(this);
@@ -290,16 +296,23 @@ export class BSP29Loader extends ModelLoader {
       if (name[0] === '+') { // animation prefix
         const frame = name.toUpperCase().charCodeAt(1);
 
-        if (frame >= 48 && frame <= 57) { // '0'-'9'
-          const frameIndex = frame - 48;
-          tx.addAnimationFrame(frameIndex, glt, luminanceTexture);
-        } else if (frame >= 65 && frame <= 74) { // 'A'-'J'
-          const frameIndex = frame - 65;
-          tx.addAlternateFrame(frameIndex, glt, luminanceTexture);
+        if (glt !== null) {
+          if (frame >= 48 && frame <= 57) { // '0'-'9'
+            const frameIndex = frame - 48;
+            tx.addAnimationFrame(frameIndex, glt, luminanceTexture);
+          } else if (frame >= 65 && frame <= 74) { // 'A'-'J'
+            const frameIndex = frame - 65;
+            tx.addAlternateFrame(frameIndex, glt, luminanceTexture);
+          }
         }
       } else {
-        tx.texture = glt;
-        tx.luminanceTexture = luminanceTexture;
+        if (glt !== null) {
+          tx.texture = glt;
+        }
+
+        if (luminanceTexture !== null) {
+          tx.luminanceTexture = luminanceTexture;
+        }
       }
 
       loadmodel.textures[i] = tx;
@@ -374,13 +387,23 @@ export class BSP29Loader extends ModelLoader {
       const [txIndex, texture] = textureEntry;
       const pbr = new PBRMaterial(texture.name, texture.width, texture.height);
 
-      for (const category of ['luminance', 'diffuse', 'specular', 'normal']) {
-        if (textures[category]) {
+      const materialTextureCategories: MaterialTextureCategory[] = ['luminance', 'diffuse', 'specular', 'normal'];
+
+      for (const category of materialTextureCategories) {
+        const texturePath = textures[category];
+
+        if (texturePath) {
           try {
-            pbr[category] = await GLTexture.FromImageFile(textures[category]);
-            Con.DPrint(`BSP29Loader: loaded ${category} texture for ${texture.name} from ${textures[category]}\n`);
-          } catch (e) {
-            Con.PrintError(`BSP29Loader: failed to load ${textures[category]}: ${e.message}\n`);
+            const loadedTexture = await GLTexture.FromImageFile(texturePath);
+
+            if (loadedTexture !== null) {
+              pbr[category] = loadedTexture;
+            }
+
+            Con.DPrint(`BSP29Loader: loaded ${category} texture for ${texture.name} from ${texturePath}\n`);
+          } catch (error) {
+            const errorMessage = error instanceof Error ? error.message : String(error);
+            Con.PrintError(`BSP29Loader: failed to load ${texturePath}: ${errorMessage}\n`);
           }
         }
       }
@@ -395,7 +418,7 @@ export class BSP29Loader extends ModelLoader {
         }
       }
 
-      if (!textures.diffuse && (texture instanceof QuakeMaterial)) {
+      if (!textures.diffuse && texture instanceof QuakeMaterial && texture.texture !== null) {
         pbr.diffuse = texture.texture; // keep original diffuse as base
       }
 
@@ -622,12 +645,18 @@ export class BSP29Loader extends ModelLoader {
       }
     }
 
-    const portals = [];
+    const portals: Array<{
+      readonly portalNum: number;
+      readonly axis: 0 | 1 | 2;
+      readonly dist: number;
+      readonly backVis: ReturnType<BrushModel['getPhsByPoint']>;
+      readonly frontVis: ReturnType<BrushModel['getPhsByPoint']>;
+    }> = [];
 
     for (const [portalNum, bbox] of mergedBboxes) {
       // Determine split plane (thinnest axis)
-      const size = [bbox.maxs[0] - bbox.mins[0], bbox.maxs[1] - bbox.mins[1], bbox.maxs[2] - bbox.mins[2]];
-      let axis = 0;
+      const size: [number, number, number] = [bbox.maxs[0] - bbox.mins[0], bbox.maxs[1] - bbox.mins[1], bbox.maxs[2] - bbox.mins[2]];
+      let axis: 0 | 1 | 2 = 0;
 
       if (size[1] < size[0]) {
         axis = 1;
@@ -672,10 +701,16 @@ export class BSP29Loader extends ModelLoader {
         }
 
         const p = portals[i];
+        const nodeMins = node.mins;
+        const nodeMaxs = node.maxs;
 
-        if (node.maxs[p.axis] < p.dist) {
+        if (nodeMins === null || nodeMaxs === null) {
+          continue;
+        }
+
+        if (nodeMaxs[p.axis] < p.dist) {
           nextStates[i] = 0;
-        } else if (node.mins[p.axis] > p.dist) {
+        } else if (nodeMins[p.axis] > p.dist) {
           nextStates[i] = 1;
         }
       }
@@ -687,9 +722,17 @@ export class BSP29Loader extends ModelLoader {
           return;
         }
 
-        const cx = (node.mins[0] + node.maxs[0]) * 0.5;
-        const cy = (node.mins[1] + node.maxs[1]) * 0.5;
-        const cz = (node.mins[2] + node.maxs[2]) * 0.5;
+        const nodeMins = node.mins;
+        const nodeMaxs = node.maxs;
+        console.assert(nodeMins !== null && nodeMaxs !== null, 'leaf nodes require bounds for area computation');
+
+        if (nodeMins === null || nodeMaxs === null) {
+          return;
+        }
+
+        const cx = (nodeMins[0] + nodeMaxs[0]) * 0.5;
+        const cy = (nodeMins[1] + nodeMaxs[1]) * 0.5;
+        const cz = (nodeMins[2] + nodeMaxs[2]) * 0.5;
         const center = [cx, cy, cz];
 
         let sig = '';
@@ -759,12 +802,18 @@ export class BSP29Loader extends ModelLoader {
         const area = nextArea++;
         areasList.push({ sig, area });
         areaLeafsMap.set(area, []);
+        const areaLeafs = areaLeafsMap.get(area);
+        console.assert(areaLeafs !== undefined, 'area leaf list must exist after initialization');
+
+        if (areaLeafs === undefined) {
+          continue;
+        }
 
         // BFS within this signature group using PVS
         const queue = [startLeaf];
         visited.add(startLeaf);
         loadmodel.leafs[startLeaf].area = area;
-        areaLeafsMap.get(area).push(startLeaf);
+        areaLeafs.push(startLeaf);
 
         while (queue.length > 0) {
           const current = queue.shift();
@@ -775,7 +824,7 @@ export class BSP29Loader extends ModelLoader {
             if (!visited.has(candidate) && pvs.isRevealed(candidate)) {
               visited.add(candidate);
               loadmodel.leafs[candidate].area = area;
-              areaLeafsMap.get(area).push(candidate);
+              areaLeafs.push(candidate);
               queue.push(candidate);
             }
           }
@@ -821,6 +870,11 @@ export class BSP29Loader extends ModelLoader {
         // PVS Adjacency Check
         const leafsA = areaLeafsMap.get(areaA);
         const leafsB = areaLeafsMap.get(areaB);
+
+        if (leafsA === undefined || leafsB === undefined) {
+          continue;
+        }
+
         let pvsAdjacent = false;
 
         // Check A seeing B (optimization: only check first few or scan until hit)
@@ -875,7 +929,7 @@ export class BSP29Loader extends ModelLoader {
     const autoAssignDoors: { modelIndex: number; model: string }[] = [];
     let maxExplicitPortal = -1;
 
-    let data = loadmodel.entities;
+    let data: string | null = loadmodel.entities;
 
     Con.DPrint('BSP29Loader.#parsePortalEntities: looking for portals in entity lump...\n');
 
@@ -1362,6 +1416,12 @@ export class BSP29Loader extends ModelLoader {
 
     for (let i = 0; i < loadmodel.leafs.length; i++) {
       const leaf = loadmodel.leafs[i];
+      const leafMins = leaf.mins;
+      const leafMaxs = leaf.maxs;
+
+      if (leafMins === null || leafMaxs === null) {
+        continue;
+      }
 
       // Skip liquid leafs — we want light from surrounding solid geometry
       if (leaf.contents === content.CONTENT_WATER
@@ -1371,9 +1431,9 @@ export class BSP29Loader extends ModelLoader {
       }
 
       // AABB overlap test
-      if (leaf.mins[0] > eMaxs[0] || leaf.maxs[0] < eMins[0]
-        || leaf.mins[1] > eMaxs[1] || leaf.maxs[1] < eMins[1]
-        || leaf.mins[2] > eMaxs[2] || leaf.maxs[2] < eMins[2]) {
+      if (leafMins[0] > eMaxs[0] || leafMaxs[0] < eMins[0]
+        || leafMins[1] > eMaxs[1] || leafMaxs[1] < eMins[1]
+        || leafMins[2] > eMaxs[2] || leafMaxs[2] < eMins[2]) {
         continue;
       }
 
@@ -1386,9 +1446,15 @@ export class BSP29Loader extends ModelLoader {
           continue;
         }
 
+        const lmshift = face.lmshift;
+
+        if (lmshift === null) {
+          continue;
+        }
+
         // Compute lightmap dimensions for this face
-        const smax = (face.extents[0] >> face.lmshift) + 1;
-        const tmax = (face.extents[1] >> face.lmshift) + 1;
+        const smax = (face.extents[0] >> lmshift) + 1;
+        const tmax = (face.extents[1] >> lmshift) + 1;
         const size = smax * tmax;
 
         if (size <= 0 || size > 4096) {
@@ -1397,28 +1463,40 @@ export class BSP29Loader extends ModelLoader {
 
         // Sample only the first light style (style 0 = static light)
         if (hasRGB) {
+          const lightdataRgb = loadmodel.lightdata_rgb;
+
+          if (lightdataRgb === null) {
+            continue;
+          }
+
           const offset = face.lightofs * 3;
 
-          if (offset + size * 3 > loadmodel.lightdata_rgb.length) {
+          if (offset + size * 3 > lightdataRgb.length) {
             continue;
           }
 
           for (let s = 0; s < size * 3; s += 3) {
             // Perceptual luminance
-            totalIntensity += loadmodel.lightdata_rgb[offset + s] * 0.299
-              + loadmodel.lightdata_rgb[offset + s + 1] * 0.587
-              + loadmodel.lightdata_rgb[offset + s + 2] * 0.114;
+            totalIntensity += lightdataRgb[offset + s] * 0.299
+              + lightdataRgb[offset + s + 1] * 0.587
+              + lightdataRgb[offset + s + 2] * 0.114;
             sampleCount++;
           }
         } else {
+          const lightdata = loadmodel.lightdata;
+
+          if (lightdata === null) {
+            continue;
+          }
+
           const offset = face.lightofs;
 
-          if (offset + size > loadmodel.lightdata.length) {
+          if (offset + size > lightdata.length) {
             continue;
           }
 
           for (let s = 0; s < size; s++) {
-            totalIntensity += loadmodel.lightdata[offset + s];
+            totalIntensity += lightdata[offset + s];
             sampleCount++;
           }
         }
@@ -1617,7 +1695,6 @@ export class BSP29Loader extends ModelLoader {
         firstedge: view.getInt32(fileofs + 4, true),
         numedges: view.getUint16(fileofs + 8, true),
         texinfo: view.getUint16(fileofs + 10, true),
-        styles: [],
         lightofs: view.getInt32(fileofs + 16, true),
         lmshift,
       });
@@ -1663,9 +1740,9 @@ export class BSP29Loader extends ModelLoader {
       face.texturemins = [Math.floor(mins[0] / lmscale) * lmscale, Math.floor(mins[1] / lmscale) * lmscale];
       face.extents = [Math.ceil(maxs[0] / lmscale) * lmscale - face.texturemins[0], Math.ceil(maxs[1] / lmscale) * lmscale - face.texturemins[1]];
 
-      if (loadmodel.textures[tex.texture].flags & MaterialFlags.MF_TURBULENT) {
+      if (loadmodel.textures[face.texture].flags & MaterialFlags.MF_TURBULENT) {
         face.turbulent = true;
-      } else if (loadmodel.textures[tex.texture].flags & MaterialFlags.MF_SKY) {
+      } else if (loadmodel.textures[face.texture].flags & MaterialFlags.MF_SKY) {
         face.sky = true;
       }
 
@@ -2289,14 +2366,24 @@ export class BSP29Loader extends ModelLoader {
       }
 
       if (d1 >= 0) {
-        insertBrushRecursive(node.children[0], brushIdx, brush);
+        const frontChild = node.children[0];
+        console.assert(frontChild !== null, 'brush insertion requires linked BSP child');
+
+        if (frontChild !== null) {
+          insertBrushRecursive(frontChild as Node, brushIdx, brush);
+        }
       }
       // Brushes that touch the split plane on their back-most extent must be
       // inserted into both leaves. Otherwise exact-boundary player positions
       // can miss a clip brush in one leaf and hit it only after a tiny move
       // into the adjacent leaf, producing false stuck/allsolid behavior.
       if (d2 <= 0) {
-        insertBrushRecursive(node.children[1], brushIdx, brush);
+        const backChild = node.children[1];
+        console.assert(backChild !== null, 'brush insertion requires linked BSP child');
+
+        if (backChild !== null) {
+          insertBrushRecursive(backChild as Node, brushIdx, brush);
+        }
       }
     };
 
@@ -2430,15 +2517,15 @@ export class BSP29Loader extends ModelLoader {
       }
 
       // vec3_t step
-      const step = new Vector(
+      const step: [number, number, number] = [
         view.getFloat32(offset, true),
         view.getFloat32(offset + 4, true),
         view.getFloat32(offset + 8, true),
-      );
+      ];
       offset += 12;
 
       // ivec3_t size
-      const size = [
+      const size: [number, number, number] = [
         view.getInt32(offset, true),
         view.getInt32(offset + 4, true),
         view.getInt32(offset + 8, true),
@@ -2507,14 +2594,14 @@ export class BSP29Loader extends ModelLoader {
           return;
         }
 
-        const leafMins = [
+        const leafMins: [number, number, number] = [
           view.getInt32(offset, true),
           view.getInt32(offset + 4, true),
           view.getInt32(offset + 8, true),
         ];
         offset += 12;
 
-        const leafSize = [
+        const leafSize: [number, number, number] = [
           view.getInt32(offset, true),
           view.getInt32(offset + 4, true),
           view.getInt32(offset + 8, true),
diff --git a/source/engine/common/model/loaders/BSP2Loader.ts b/source/engine/common/model/loaders/BSP2Loader.ts
index 8917fef6..37341b93 100644
--- a/source/engine/common/model/loaders/BSP2Loader.ts
+++ b/source/engine/common/model/loaders/BSP2Loader.ts
@@ -70,7 +70,13 @@ export class BSP2Loader extends BSP29Loader {
       const mins = [Infinity, Infinity];
       const maxs = [-Infinity, -Infinity];
       const tex = loadmodel.texinfo[face.texinfo];
+      console.assert(typeof tex.texture === 'number', 'BSP2 texture indices must stay numeric');
+      if (typeof tex.texture !== 'number') {
+        throw new CorruptedResourceError(loadmodel.name, 'BSP2Loader: face texture index is not numeric');
+      }
       face.texture = tex.texture;
+      const texVec0 = new Vector(tex.vecs[0][0], tex.vecs[0][1], tex.vecs[0][2]);
+      const texVec1 = new Vector(tex.vecs[1][0], tex.vecs[1][1], tex.vecs[1][2]);
 
       for (let j = 0; j < face.numedges; j++) {
         const edgeIndex = loadmodel.surfedges[face.firstedge + j];
@@ -78,8 +84,8 @@ export class BSP2Loader extends BSP29Loader {
           ? loadmodel.vertexes[loadmodel.edges[edgeIndex][0]]
           : loadmodel.vertexes[loadmodel.edges[-edgeIndex][1]];
 
-        const val0 = vertex.dot(new Vector(...tex.vecs[0])) + tex.vecs[0][3];
-        const val1 = vertex.dot(new Vector(...tex.vecs[1])) + tex.vecs[1][3];
+        const val0 = vertex.dot(texVec0) + tex.vecs[0][3];
+        const val1 = vertex.dot(texVec1) + tex.vecs[1][3];
 
         if (val0 < mins[0]) {
           mins[0] = val0;
diff --git a/source/engine/common/model/loaders/SpriteSPRLoader.ts b/source/engine/common/model/loaders/SpriteSPRLoader.ts
index dd529a7b..cd557b3d 100644
--- a/source/engine/common/model/loaders/SpriteSPRLoader.ts
+++ b/source/engine/common/model/loaders/SpriteSPRLoader.ts
@@ -12,7 +12,7 @@ interface MutableSpriteFrameImage {
   width: number;
   height: number;
   glt: GLTexture;
-  texturenum: number;
+  texturenum: WebGLTexture | null;
 }
 
 interface MutableSpriteSingleFrame extends MutableSpriteFrameImage {
diff --git a/source/engine/main-dedicated.ts b/source/engine/main-dedicated.ts
index 3e83c5fc..a813e61d 100644
--- a/source/engine/main-dedicated.ts
+++ b/source/engine/main-dedicated.ts
@@ -15,7 +15,7 @@ import Sys from './server/Sys.ts';
 // Polyfill Worker global for Node.js so that WorkerFactories.ts
 // (which uses the browser-compatible `new Worker(url)` pattern for
 // Vite static analysis) works identically in unbundled Node.js.
-globalThis.Worker = Worker as typeof globalThis.Worker;
+globalThis.Worker = Worker as unknown as typeof globalThis.Worker;
 
 export default class EngineLauncher {
   static async Launch(): Promise<typeof registry> {
diff --git a/source/engine/network/NetworkDrivers.ts b/source/engine/network/NetworkDrivers.ts
index 7befbe14..2e7881fb 100644
--- a/source/engine/network/NetworkDrivers.ts
+++ b/source/engine/network/NetworkDrivers.ts
@@ -900,12 +900,15 @@ export class WebSocketDriver extends BaseDriver {
 
     const address = this.wss.address();
 
-    if (address === null || typeof address === 'string') {
+    if (address === null) {
+      return null;
+    }
+
+    if (typeof address === 'string') {
       return address;
     }
 
-    const socketAddress = address as ListenAddress;
-    return formatIP(socketAddress.address, socketAddress.port);
+    return formatIP(address.address, address.port);
   }
 }
 
diff --git a/source/engine/server/Com.ts b/source/engine/server/Com.ts
index 4b5881e2..d38b013f 100644
--- a/source/engine/server/Com.ts
+++ b/source/engine/server/Com.ts
@@ -156,7 +156,7 @@ export default class NodeCOM extends COM {
     const filepath = `data/${this.searchpaths[this.searchpaths.length - 1].filename}/${filename.toLowerCase()}`;
 
     try {
-      await fsPromises.writeFile(filepath, data);
+      await fsPromises.writeFile(filepath, Uint8Array.from(data));
     } catch (e) {
       const message = e instanceof Error ? e.message : String(e);
       Sys.Print(`COM.WriteFile: failed on ${filename}, ${message}\n`);
diff --git a/source/engine/server/Edict.ts b/source/engine/server/Edict.ts
index 56ee6d10..2491b0f0 100644
--- a/source/engine/server/Edict.ts
+++ b/source/engine/server/Edict.ts
@@ -23,6 +23,7 @@ export interface BaseEntity extends SerializableEntity {
   absmin: Vector;
   clear(): void;
   colormap: number;
+  deadflag?: number;
   effects: number;
   flags: number;
   frame: number;
@@ -42,9 +43,12 @@ export interface BaseEntity extends SerializableEntity {
   solid: number;
   takedamage: number;
   team: number;
+  teleport_time?: number;
   velocity: Vector;
   view_ofs: Vector;
   v_angle: Vector;
+  waterlevel?: number;
+  watertype?: number;
   readonly edictId: number | undefined;
   restoreSpawnParameters?(data: string | null): void;
 }
@@ -142,8 +146,8 @@ export class ED {
         continue;
       }
 
-      const printableEntity = entity as Record<string, string | number | boolean | Vector | BaseEntity | null | undefined>;
-      Con.Print(`${name.padStart(24, '.')}: ${printableEntity[name]}\n`);
+      const printableValue = (entity as BaseEntity & Record<string, string | number | boolean | Vector | BaseEntity | null | undefined>)[name];
+      Con.Print(`${name.padStart(24, '.')}: ${printableValue}\n`);
     }
   }
 
@@ -284,11 +288,9 @@ export class ED {
         continue;
       }
 
-      if (anglehack) {
-        parsedValue.token = `0 ${parsedValue.token} 0`;
-      }
+      const tokenValue = anglehack ? `0 ${parsedValue.token} 0` : parsedValue.token;
 
-      initialData[keyname] = parsedValue.token.replace(/\\n/g, '\n');
+      initialData[keyname] = tokenValue.replace(/\\n/g, '\n');
       init = true;
     }
 
@@ -362,7 +364,7 @@ export class ServerEdict {
   readonly num: number;
   free: boolean;
   octreeNode: OctreeNode<ServerEdict> | null;
-  readonly leafnums: number[];
+  leafnums: number[];
   freetime: number;
   entity: BaseEntity | null;
 
diff --git a/source/engine/server/GameLoader.ts b/source/engine/server/GameLoader.ts
index f0bf8774..7004bd36 100644
--- a/source/engine/server/GameLoader.ts
+++ b/source/engine/server/GameLoader.ts
@@ -21,7 +21,8 @@ let gameModules: Record<string, GameModuleLoader> = {};
 
 // CR: dear future self, do not try to optimize this import.meta.glob usage further.
 try {
-  gameModules = import.meta.glob('../../game/**/main.mjs') as Record<string, GameModuleLoader>;
+  // @ts-ignore, NEVER EVER TOUCH THIS LINE BELOW:
+  gameModules = import.meta.glob('../../game/**/main.mjs');
 } catch (_error) {
   // Not in Vite environment
 }
diff --git a/source/engine/server/Navigation.ts b/source/engine/server/Navigation.ts
index bb96bd94..48feda5b 100644
--- a/source/engine/server/Navigation.ts
+++ b/source/engine/server/Navigation.ts
@@ -1090,7 +1090,7 @@ export class Navigation {
       // grid-sample the bounding box and test inclusion
       for (let sx = startX; sx <= Math.ceil(maxX); sx += step) {
         for (let sy = startY; sy <= Math.ceil(maxY); sy += step) {
-          const pt2 = [sx, sy];
+          const pt2: PlanePoint = [sx, sy];
           if (!pointInPoly(pt2, verts2)) {
             continue;
           }
@@ -1252,7 +1252,7 @@ export class Navigation {
       let nearLedge = false;
       let isClipping = false;
       let isFloating = false;
-      const surfaces = new Set();
+      const surfaces = new Set<WalkableSurface>();
 
       for (const { wp, surface } of group.items) {
         centroid.add(wp.origin);
diff --git a/source/engine/server/NavigationWorker.ts b/source/engine/server/NavigationWorker.ts
index bd251e40..86693d16 100644
--- a/source/engine/server/NavigationWorker.ts
+++ b/source/engine/server/NavigationWorker.ts
@@ -9,7 +9,7 @@ type WorkerVectorLike = ArrayLike<number>;
 await WorkerFramework.Init();
 
 const { Con } = registry;
-const navigation = new Navigation();
+const navigation = new Navigation(null);
 
 eventBus.subscribe('nav.load', async (mapname: string, checksum: number | null) => {
   Con.DPrint('Navigation: loading navigation graph...\n');
@@ -27,7 +27,10 @@ eventBus.subscribe('nav.load', async (mapname: string, checksum: number | null)
 });
 
 eventBus.subscribe('nav.path.request', (id: string, start: WorkerVectorLike, end: WorkerVectorLike) => {
-  const path = navigation.findPath(new Vector(...start), new Vector(...end));
+  const path = navigation.findPath(
+    new Vector(start[0], start[1], start[2]),
+    new Vector(end[0], end[1], end[2]),
+  );
 
   WorkerFramework.Publish('nav.path.response', id, path);
 });
diff --git a/source/engine/server/ServerMessages.ts b/source/engine/server/ServerMessages.ts
index b41d03e6..a8b1e1ef 100644
--- a/source/engine/server/ServerMessages.ts
+++ b/source/engine/server/ServerMessages.ts
@@ -1,6 +1,7 @@
 import type { Visibility } from '../common/model/BSP.ts';
+import type { SerializableType } from '../../shared/GameInterfaces.ts';
 import type Vector from '../../shared/Vector.ts';
-import type { BaseEntity, ServerEdict, WorldspawnEntity } from './Edict.ts';
+import type { BaseEntity, ServerEdict } from './Edict.ts';
 
 import { SzBuffer } from '../network/MSG.ts';
 import * as Protocol from '../network/Protocol.ts';
@@ -11,7 +12,7 @@ import { ServerClient } from './Client.ts';
 import { ServerEntityState } from './ServerEntityState.ts';
 
 type BitsWriter = 'writeByte' | 'writeShort' | 'writeLong';
-type EntityFieldValue = string | number | boolean | Vector | null | ServerEdict | BaseEntity | undefined;
+type DynamicEntityFieldValue = SerializableType | undefined;
 
 interface DamageInflictorEntityLike {
   edict?: ServerEdict;
@@ -19,7 +20,12 @@ interface DamageInflictorEntityLike {
   entity: ServerMessageEntity;
 }
 
-interface ServerMessageEntity extends BaseEntity, Record<string, EntityFieldValue> {
+interface WorldspawnMessageEntity {
+  message?: string | null;
+  sounds?: number;
+}
+
+interface ServerMessageEntity extends BaseEntity {
   alpha: number;
   ammo_cells: number;
   ammo_nails: number;
@@ -27,7 +33,7 @@ interface ServerMessageEntity extends BaseEntity, Record<string, EntityFieldValu
   ammo_shells: number;
   armorvalue: number;
   classname: string;
-  colormap?: number;
+  colormap: number;
   currentammo: number;
   dmg_inflictor: DamageInflictorEntityLike | ServerEdict | null;
   dmg_save: number;
@@ -36,6 +42,7 @@ interface ServerMessageEntity extends BaseEntity, Record<string, EntityFieldValu
   fixangle: boolean;
   flags: number;
   frame: number;
+  frags: number;
   health: number;
   idealpitch: number;
   items: number;
@@ -81,12 +88,12 @@ function requireEntity(edict: ServerEdict): ServerMessageEntity {
  * Returns the initialized worldspawn entity.
  * @returns The current worldspawn entity.
  */
-function requireWorldspawnEntity(): WorldspawnEntity {
+function requireWorldspawnEntity(): WorldspawnMessageEntity {
   const entity = SV.server.edicts[0]?.entity;
 
   console.assert(entity !== null, 'ServerMessages requires a worldspawn entity');
 
-  return entity as WorldspawnEntity;
+  return entity as WorldspawnMessageEntity;
 }
 
 /**
@@ -596,9 +603,14 @@ export class ServerMessages {
         if (SV.server.clientEntityFields[entity.classname]) {
           const entityFields = SV.server.clientEntityFields[entity.classname];
           const fields = entityFields.fields;
+          const serializableEntity = entity as ServerMessageEntity & Record<string, DynamicEntityFieldValue>;
 
           for (const field of fields) {
-            toState.extended[field] = entity[field];
+            const value = serializableEntity[field];
+
+            if (value !== undefined) {
+              toState.extended[field] = value;
+            }
           }
         }
       }
@@ -765,10 +777,11 @@ export class ServerMessages {
 
       let fieldbits = 0;
       const values = [];
+      const serializableEntity = clientEntity as ServerMessageEntity & Record<string, DynamicEntityFieldValue>;
 
       for (let i = 0; i < clientdataFields.length; i++) {
         const field = clientdataFields[i];
-        const value = clientEntity[field];
+        const value = serializableEntity[field];
 
         if (!value) {
           continue;
@@ -857,7 +870,7 @@ export class ServerMessages {
   updateToReliableMessages(): void {
     for (let i = 0; i < SV.svs.maxclients; i++) {
       const currentClient = SV.svs.clients[i];
-      const frags = currentClient.edict.entity ? currentClient.edict.entity.frags | 0 : 0;
+      const frags = currentClient.edict.entity ? requireEntity(currentClient.edict).frags | 0 : 0;
       if (currentClient.old_frags === frags) {
         continue;
       }
diff --git a/source/engine/server/Sys.ts b/source/engine/server/Sys.ts
index fcda5369..d0ca4d84 100644
--- a/source/engine/server/Sys.ts
+++ b/source/engine/server/Sys.ts
@@ -61,7 +61,7 @@ const evaluateReplCommand: REPLEval = function(command, _context, _filename, cal
   MainLoop.notify();
   this.clearBufferedCommand();
   Cmd.text += command;
-  setTimeout(() => callback(null), 20); // we have to wait at least one frame before expecting a result
+  setTimeout(() => callback(null, undefined), 20); // we have to wait at least one frame before expecting a result
 };
 
 eventBus.subscribe('net.connection.accepted', () => {
diff --git a/source/engine/server/physics/ServerArea.ts b/source/engine/server/physics/ServerArea.ts
index c9280000..afe7f059 100644
--- a/source/engine/server/physics/ServerArea.ts
+++ b/source/engine/server/physics/ServerArea.ts
@@ -257,12 +257,16 @@ export class ServerArea {
         continue;
       }
 
-      const touchEntity = touch.entity!;
-      if (!touchEntity.touch || touchEntity.solid !== Defs.solid.SOLID_TRIGGER) {
+      const touchEntity = touch.entity as (BaseEntity & {
+        solid: number;
+        touch?: (this: BaseEntity, other: BaseEntity | null) => void;
+      }) | null;
+
+      if (touchEntity === null || !touchEntity.touch || touchEntity.solid !== Defs.solid.SOLID_TRIGGER) {
         continue;
       }
 
-      const touchFn = touchEntity.touch as (this: BaseEntity, other: BaseEntity | null) => void;
+      const touchFn = touchEntity.touch;
 
       gameAPI.time = SV.server.time;
       touchFn.call(touchEntity, !ent.isFree() ? ent.entity : null);

From 9613c6c7a5243c1ae7f6eff45c639095d74edbd2 Mon Sep 17 00:00:00 2001
From: Christian R <github@chrisnew.de>
Date: Sat, 4 Apr 2026 21:47:20 +0300
Subject: [PATCH 53/67] TS: polish tsc findings

---
 source/engine/common/GameAPIs.ts              |  20 +-
 source/engine/server/Edict.ts                 |  19 ++
 source/engine/server/Progs.ts                 | 182 ++++++++++++------
 source/engine/server/ProgsAPI.ts              |  85 +++++---
 source/engine/server/Server.ts                |  31 ++-
 source/engine/server/physics/ServerArea.ts    |  10 +-
 .../engine/server/physics/ServerCollision.ts  |  20 +-
 .../engine/server/physics/ServerMovement.ts   |  14 +-
 source/shared/GameInterfaces.ts               |   7 +-
 test/common/game-apis.test.mjs                |  42 ++++
 10 files changed, 334 insertions(+), 96 deletions(-)

diff --git a/source/engine/common/GameAPIs.ts b/source/engine/common/GameAPIs.ts
index d790ee90..56735e34 100644
--- a/source/engine/common/GameAPIs.ts
+++ b/source/engine/common/GameAPIs.ts
@@ -1,4 +1,4 @@
-import type { EdictValueType, SerializableType } from '../../shared/GameInterfaces.ts';
+import type { EdictData, EdictValueType, SerializableType } from '../../shared/GameInterfaces.ts';
 import type { ClientDlight, ClientEdict } from '../client/ClientEntities.ts';
 import type { GLTexture } from '../client/GL.ts';
 import type { SzBuffer } from '../network/MSG.ts';
@@ -69,6 +69,21 @@ interface ClientTraceEntityAdapter {
   equals(other: unknown): boolean;
 }
 
+/**
+ * Normalize runtime entity references passed through dynamic spawn initial data.
+ * @param initialData Initial field values supplied to SpawnEntity.
+ * @returns Initial data with ServerEdict wrappers replaced by live entities.
+ */
+function normalizeEntityInitialData(initialData: Record<string, EdictValueType>): EdictData {
+  const normalizedInitialData: EdictData = {};
+
+  for (const [key, value] of Object.entries(initialData)) {
+    normalizedInitialData[key] = value instanceof ServerEdictValue ? value.entity : value;
+  }
+
+  return normalizedInitialData;
+}
+
 type ServerEntityFilter = ((entity: ServerEdict) => boolean) | null;
 type ClientEntityFilter = ((entity: ClientEdict) => boolean) | null;
 type CommandCallback = (...args: string[]) => void | Promise<void>;
@@ -699,12 +714,13 @@ export class ServerEngineAPI extends CommonEngineAPI {
    */
   static SpawnEntity(classname: string, initialData: Record<string, EdictValueType> = {}): ServerEdict | null {
     const edict = ED.Alloc();
+    const normalizedInitialData = normalizeEntityInitialData(initialData);
 
     try {
       const gameAPI = SV.server.gameAPI;
       console.assert(gameAPI !== null, 'server gameAPI must exist before spawning entities');
 
-      if (gameAPI === null || !gameAPI.prepareEntity(edict, classname, initialData)) {
+      if (gameAPI === null || !gameAPI.prepareEntity(edict, classname, normalizedInitialData)) {
         edict.freeEdict();
         return null;
       }
diff --git a/source/engine/server/Edict.ts b/source/engine/server/Edict.ts
index 2491b0f0..7b091162 100644
--- a/source/engine/server/Edict.ts
+++ b/source/engine/server/Edict.ts
@@ -21,34 +21,53 @@ export interface BaseEntity extends SerializableEntity {
   avelocity: Vector;
   absmax: Vector;
   absmin: Vector;
+  assignInitialData(initialData: EdictData): void;
+  blocked?(blockedByEntity: BaseEntity): void;
+  chain?: BaseEntity | ServerEdict | null;
   clear(): void;
   colormap: number;
   deadflag?: number;
+  readonly edict?: ServerEdict | null;
+  enemy?: BaseEntity | ServerEdict | null;
+  equals(otherEntity: BaseEntity | ServerEdict | null): boolean;
   effects: number;
   flags: number;
   frame: number;
   free(): void;
+  goalentity?: BaseEntity | ServerEdict | null;
+  gravity?: number | null;
   groundentity: BaseEntity | null;
   health: number;
+  ideal_yaw?: number;
+  idealpitch?: number;
+  fixangle?: boolean;
+  ltime?: number;
   mins: Vector;
   maxs: Vector;
   model: string | null;
   modelindex: number;
   movetype: number;
   netname?: string | null;
+  nextthink?: number;
+  oldorigin?: Vector;
   origin: Vector;
+  owner?: BaseEntity | ServerEdict | null;
   punchangle: Vector;
   size: Vector;
   skin: number;
   solid: number;
+  spawn(): void;
   takedamage: number;
   team: number;
   teleport_time?: number;
+  think?(): void;
+  touch?(touchedByEntity: BaseEntity, pushVector: Vector): void;
   velocity: Vector;
   view_ofs: Vector;
   v_angle: Vector;
   waterlevel?: number;
   watertype?: number;
+  yaw_speed?: number;
   readonly edictId: number | undefined;
   restoreSpawnParameters?(data: string | null): void;
 }
diff --git a/source/engine/server/Progs.ts b/source/engine/server/Progs.ts
index d0f4fe78..308fce69 100644
--- a/source/engine/server/Progs.ts
+++ b/source/engine/server/Progs.ts
@@ -1,4 +1,4 @@
-import type { ServerGameInterface } from '../../shared/GameInterfaces.ts';
+import type { EdictData, ServerGameInterface } from '../../shared/GameInterfaces.ts';
 
 import Cmd from '../common/Cmd.ts';
 import { CRC16CCITT } from '../common/CRC.ts';
@@ -7,7 +7,7 @@ import { HostError, MissingResourceError } from '../common/Errors.ts';
 import Q from '../../shared/Q.ts';
 import Vector from '../../shared/Vector.ts';
 import { eventBus, getCommonRegistry } from '../registry.ts';
-import { ED, ServerEdict } from './Edict.ts';
+import { ED, ServerEdict, type BaseEntity } from './Edict.ts';
 import { ServerEngineAPI } from '../common/GameAPIs.ts';
 import PF, { etype, ofs } from './ProgsAPI.ts';
 import { gameCapabilities } from '../../shared/Defs.ts';
@@ -40,6 +40,23 @@ interface ProgsFunctionDefinition {
 type ProgsValue = string | number | boolean | number[] | null;
 type ProgsStackEntry = [number, ProgsFunctionDefinition | null];
 
+interface FunctionProxySettings {
+  readonly backupSelfAndOther?: boolean;
+  readonly resetOther?: boolean;
+}
+
+type ProgsSerializedValue = [string, ...unknown[]];
+type ProgsSerializedData = Record<string, ProgsSerializedValue>;
+type ProgsEntityRecord = ProgsEntity & Record<string, unknown>;
+
+interface ProgsGameAPI extends ServerGameInterface {
+  readonly [key: string]: unknown;
+  coop: number;
+  deathmatch: number;
+  mapname: string | null;
+  serverflags: number;
+}
+
 const PROGS_OP = Object.freeze({
   done: 0,
   mul_f: 1, mul_v: 2, mul_fv: 3, mul_vf: 4,
@@ -268,9 +285,14 @@ PR.progheader_crc = 5927;
  * FIXME: function proxies need to become cached
  */
 class ProgsFunctionProxy extends Function {
-  static proxyCache = [];
+  static proxyCache: Record<string, ProgsFunctionProxy> = {};
+
+  declare fnc: number;
+  declare ent: ProgsEntity | ServerEdict | null;
+  declare _signature: string | null;
+  declare _settings: FunctionProxySettings;
 
-  constructor(fnc, ent = null, settings = {}) {
+  constructor(fnc: number, ent: ProgsEntity | ServerEdict | null = null, settings: FunctionProxySettings = {}) {
     super();
 
     this.fnc = fnc;
@@ -289,12 +311,12 @@ class ProgsFunctionProxy extends Function {
     Object.freeze(this);
   }
 
-  toString() {
+  toString(): string {
     return `${PR.GetString(PR.functions[this.fnc].name)} (ProgsFunctionProxy(${this.fnc}))`;
   }
 
-  static create(fnc, ent, settings = {}) {
-    const cacheId = `${fnc}-${ent ? ent.num : 'null'}`;
+  static create(fnc: number, ent: ProgsEntity | ServerEdict | null, settings: FunctionProxySettings = {}): ProgsFunctionProxy {
+    const cacheId = `${fnc}-${ent ? ProgsFunctionProxy._getEdictId(ent) : 'null'}`;
 
     if (ProgsFunctionProxy.proxyCache[cacheId]) {
       return ProgsFunctionProxy.proxyCache[cacheId];
@@ -312,7 +334,7 @@ class ProgsFunctionProxy extends Function {
     return ProgsFunctionProxy.proxyCache[cacheId];
   }
 
-  static _getEdictId(ent) {
+  static _getEdictId(ent: ProgsEntity | ServerEdict | null): number {
     if (!ent) {
       return 0;
     }
@@ -328,11 +350,11 @@ class ProgsFunctionProxy extends Function {
    * Calls the proxied QuakeC function.
    * @returns The QuakeC function return value interpreted as a float.
    */
-  call(self) {
+  call(self: ProgsEntity | ServerEdict | null): ProgsValue {
     const old_self = PR.globals_int[PR.globalvars.self];
     const old_other = PR.globals_int[PR.globalvars.other];
 
-    if (this.ent && !this.ent.isFree()) {
+    if (this.ent && (!(this.ent instanceof ServerEdict) || !this.ent.isFree())) {
       // in case this is a function bound to an entity, we need to set it to self
       PR.globals_int[PR.globalvars.self] = ProgsFunctionProxy._getEdictId(this.ent);
 
@@ -369,15 +391,25 @@ class ProgsEntity {
   static SERIALIZATION_TYPE_VECTOR = 'V';
   static SERIALIZATION_TYPE_PRIMITIVE = 'P';
 
+  declare _edictNum: number;
+  declare _v: ArrayBuffer | null;
+  declare _v_float: Float32Array | null;
+  declare _v_int: Int32Array | null;
+  declare _serializableFields: string[];
+
   /**
    * Creates a QuakeC entity view backed by an edict or the globals table.
    */
-    constructor(ed: ServerEdict | null) {
+  constructor(ed: ServerEdict | null) {
     // const stats = ed ? PR._stats.edict : PR._stats.global;
     const defs = ed ? PR.fielddefs : PR.globaldefs;
 
+    this._edictNum = ed ? ed.num : 0;
+    this._v = null;
+    this._v_float = null;
+    this._v_int = null;
+
     if (ed) {
-      this._edictNum = ed.num;
       this._v = new ArrayBuffer(PR.entityfields * 4);
       this._v_float = new Float32Array(this._v);
       this._v_int = new Int32Array(this._v);
@@ -556,11 +588,12 @@ class ProgsEntity {
     }
   }
 
-  serialize() {
-    const data = {};
+  serialize(): ProgsSerializedData {
+    const data: ProgsSerializedData = {};
+    const entityView = this as ProgsEntityRecord;
 
     for (const field of this._serializableFields) {
-      const value = this[field];
+      const value = entityView[field];
 
       switch (true) {
         case value === null:
@@ -590,7 +623,9 @@ class ProgsEntity {
     return data;
   }
 
-  deserialize(obj) {
+  deserialize(obj: ProgsSerializedData): this {
+    const entityView = this as ProgsEntityRecord;
+
     for (const [key, value] of Object.entries(obj)) {
       console.assert(this._serializableFields.includes(key));
 
@@ -598,19 +633,19 @@ class ProgsEntity {
 
       switch (type) {
         case ProgsEntity.SERIALIZATION_TYPE_EDICT:
-          this[key] = SV.server.edicts[data[0]];
+          entityView[key] = SV.server.edicts[data[0] as number];
           break;
 
         case ProgsEntity.SERIALIZATION_TYPE_FUNCTION:
-          this[key] = {fnc: data[0]};
+          entityView[key] = { fnc: data[0] };
           break;
 
         case ProgsEntity.SERIALIZATION_TYPE_VECTOR:
-          this[key] = new Vector(...data);
+          entityView[key] = new Vector(...data as [number, number, number]);
           break;
 
         case ProgsEntity.SERIALIZATION_TYPE_PRIMITIVE:
-          this[key] = data[0];
+          entityView[key] = data[0];
           break;
       }
     }
@@ -618,7 +653,7 @@ class ProgsEntity {
     return this;
   }
 
-  clear() {
+  clear(): void {
     if (this._v) {
       const int32 = new Int32Array(this._v);
       for (let i = 0; i < PR.entityfields; i++) {
@@ -627,24 +662,43 @@ class ProgsEntity {
     }
   }
 
-  free() {
+  free(): void {
     this.clear();
   }
 
-  equals(other) {
-    return other && other._edictNum === this._edictNum;
+  equals(other: ProgsEntity | ServerEdict | null): boolean {
+    return other !== null && ProgsFunctionProxy._getEdictId(other) === this._edictNum;
   }
 
-  spawn() {
+  spawn(): void {
     // QuakeC is different, the actual spawn function is called by its classname
-    SV.server.gameAPI[this.classname]({num: this._edictNum});
+    const gameAPI = SV.server.gameAPI as unknown as ProgsGameAPI;
+    const entityView = this as ProgsEntityRecord;
+    const classname = typeof entityView.classname === 'string' ? entityView.classname : null;
+    const spawnFunction = classname !== null ? gameAPI[classname] : null;
+
+    console.assert(typeof spawnFunction === 'function', 'classname spawn function required');
+
+    (spawnFunction as (edict: { num: number }) => void)({ num: this._edictNum });
   }
 
-  get edictId() {
+  get edictId(): number {
     return this._edictNum;
   }
 };
 
+/**
+ * Retrieves the QuakeC entity view for a live server edict.
+ * @returns The QuakeC entity record backing the edict.
+ */
+function getProgsEntity(edict: ServerEdict): ProgsEntityRecord {
+  const entity = edict.entity as unknown as ProgsEntityRecord | null;
+
+  console.assert(entity !== null, 'QuakeC edict must have an entity view');
+
+  return entity!;
+}
+
 // edict
 
 /**
@@ -934,7 +988,7 @@ PR.LoadProgs = async function() {
     const def = PR.FindField(field);
     PR.entvars[field] = (def !== null) ? def.ofs : null;
   }
-  ProgsFunctionProxy.proxyCache = []; // free all cached functions
+  ProgsFunctionProxy.proxyCache = {}; // free all cached functions
   // hook up progs.dat with our proxies
 
   const progsAPI = new ProgsEntity(null);
@@ -944,12 +998,14 @@ PR.LoadProgs = async function() {
   const coop = Cvar.FindVar('coop');
 
   const gameAPI = Object.assign(progsAPI, {
-    prepareEntity(edict, classname, initialData = {}) {
+    prepareEntity(edict: ServerEdict, classname: string | null, initialData: EdictData = {}): boolean {
       if (!edict.entity) { // do not use isFree(), check for unset entity property
-        edict.entity = new ProgsEntity(edict);
+        edict.entity = new ProgsEntity(edict) as unknown as BaseEntity;
         Object.freeze(edict.entity);
       }
 
+      const preparedEntity = getProgsEntity(edict);
+
       // yet another hack, always be successful during a loadgame
       if (SV.server.loadgame) {
         return true;
@@ -965,13 +1021,13 @@ PR.LoadProgs = async function() {
         return true;
       }
 
-      if (!SV.server.gameAPI[classname]) {
+      if (typeof (SV.server.gameAPI as unknown as ProgsGameAPI)[classname] !== 'function') {
         Con.PrintWarning(`No spawn function for edict ${edict.num}: ${classname}\n`);
         // debugger;
         return false;
       }
 
-      initialData.classname = classname;
+      preparedEntity.classname = classname;
 
       for (const [key, value] of Object.entries(initialData)) {
         const field = PR.FindField(key);
@@ -983,36 +1039,54 @@ PR.LoadProgs = async function() {
 
         switch (field.type & 0x7fff) {
           case etype.ev_entity:
-            edict.entity[key] = value instanceof ServerEdict ? value : {num: Q.atoi(value)};
+            if (value === null || typeof value === 'object') {
+              preparedEntity[key] = value;
+            } else {
+              preparedEntity[key] = { num: Q.atoi(String(value)) };
+            }
             break;
 
           case etype.ev_vector:
-            edict.entity[key] = value instanceof Vector ? value : new Vector(...value.split(' ').map((x) => Q.atof(x)));
+            if (value instanceof Vector) {
+              preparedEntity[key] = value;
+            } else {
+              preparedEntity[key] = new Vector(...String(value).split(' ').map((x) => Q.atof(x)));
+            }
             break;
 
           case etype.ev_field: {
+            if (typeof value !== 'string') {
+              throw new TypeError(`Expected field name string for ${key}`);
+            }
+
             const d = PR.FindField(value);
             if (!d) {
               Con.PrintWarning(`Can't find field: ${value}\n`);
               break;
             }
-            edict.entity[key] = d;
+            preparedEntity[key] = d;
             break;
           }
 
           case etype.ev_function: {
-            edict.entity[key] = {fnc: value};
+            if (typeof value === 'string') {
+              preparedEntity[key] = value;
+            } else if (typeof value === 'number') {
+              preparedEntity[key] = { fnc: value };
+            } else {
+              throw new TypeError(`Expected function name or function id for ${key}`);
+            }
             break;
           }
 
           default:
-            edict.entity[key] = value;
+            preparedEntity[key] = value;
         }
       }
 
       // these are quake specific things happening during loading
 
-      const spawnflags = edict.entity.spawnflags || 0;
+      const spawnflags = typeof preparedEntity.spawnflags === 'number' ? preparedEntity.spawnflags : 0;
 
       if (deathmatch.value !== 0 && (spawnflags & 2048)) {
         return false;
@@ -1027,7 +1101,7 @@ PR.LoadProgs = async function() {
       return true;
     },
 
-    spawnPreparedEntity(edict) {
+    spawnPreparedEntity(edict: ServerEdict): boolean {
       if (!edict.entity) {
         Con.PrintError('PR.LoadProgs.spawnPreparedEntity: no entity class instance set!\n');
         return false;
@@ -1043,7 +1117,7 @@ PR.LoadProgs = async function() {
       return true;
     },
 
-    init(mapname, serverflags) {
+    init(mapname: string, serverflags: number): void {
       gameAPI.mapname = mapname;
       gameAPI.serverflags = serverflags;
 
@@ -1061,15 +1135,15 @@ PR.LoadProgs = async function() {
     },
 
 
-    shutdown(_isCrashShutdown) {
+    shutdown(_isCrashShutdown: boolean): void {
     },
 
-    startFrame() {
+    startFrame(): void {
       // pass to the VM
       // @ts-ignore
       progsAPI.StartFrame(null);
     },
-  });
+  }) as ProgsEntityRecord & ProgsGameAPI;
 
   Object.freeze(gameAPI);
 
@@ -1443,14 +1517,14 @@ PR.ExecuteProgram = function(fnum) {
       case PR.op.storep_s:
       case PR.op.storep_fnc:
         ptr = PR.globals_int[st.b];
-        SV.server.edicts[Math.floor(ptr / PR.edict_size)].entity._v_int[((ptr % PR.edict_size) - 96) >> 2] = PR.globals_int[st.a];
+        getProgsEntity(SV.server.edicts[Math.floor(ptr / PR.edict_size)])._v_int![((ptr % PR.edict_size) - 96) >> 2] = PR.globals_int[st.a];
         continue;
       case PR.op.storep_v:
         ed = SV.server.edicts[Math.floor(PR.globals_int[st.b] / PR.edict_size)];
         ptr = ((PR.globals_int[st.b] % PR.edict_size) - 96) >> 2;
-        ed.entity._v_int[ptr] = PR.globals_int[st.a];
-        ed.entity._v_int[ptr + 1] = PR.globals_int[st.a + 1];
-        ed.entity._v_int[ptr + 2] = PR.globals_int[st.a + 2];
+        getProgsEntity(ed)._v_int![ptr] = PR.globals_int[st.a];
+        getProgsEntity(ed)._v_int![ptr + 1] = PR.globals_int[st.a + 1];
+        getProgsEntity(ed)._v_int![ptr + 2] = PR.globals_int[st.a + 2];
         continue;
       case PR.op.address:
         ed = PR.globals_int[st.a];
@@ -1464,14 +1538,14 @@ PR.ExecuteProgram = function(fnum) {
       case PR.op.load_ent:
       case PR.op.load_s:
       case PR.op.load_fnc:
-        PR.globals_int[st.c] = SV.server.edicts[PR.globals_int[st.a]].entity._v_int[PR.globals_int[st.b]];
+        PR.globals_int[st.c] = getProgsEntity(SV.server.edicts[PR.globals_int[st.a]])._v_int![PR.globals_int[st.b]];
         continue;
       case PR.op.load_v:
         ed = SV.server.edicts[PR.globals_int[st.a]];
         ptr = PR.globals_int[st.b];
-        PR.globals_int[st.c] = ed.entity._v_int[ptr];
-        PR.globals_int[st.c + 1] = ed.entity._v_int[ptr + 1];
-        PR.globals_int[st.c + 2] = ed.entity._v_int[ptr + 2];
+        PR.globals_int[st.c] = getProgsEntity(ed)._v_int![ptr];
+        PR.globals_int[st.c + 1] = getProgsEntity(ed)._v_int![ptr + 1];
+        PR.globals_int[st.c + 2] = getProgsEntity(ed)._v_int![ptr + 2];
         continue;
       case PR.op.jz:
         if (PR.globals_int[st.a] === 0) {
@@ -1532,9 +1606,9 @@ PR.ExecuteProgram = function(fnum) {
         continue;
       case PR.op.state:
         ed = SV.server.edicts[PR.globals_int[PR.globalvars.self]];
-        ed.entity._v_float[PR.entvars.nextthink] = PR.globals_float[PR.globalvars.time] + 0.1;
-        ed.entity._v_float[PR.entvars.frame] = PR.globals_float[st.a];
-        ed.entity._v_int[PR.entvars.think] = PR.globals_int[st.b];
+        getProgsEntity(ed)._v_float![PR.entvars.nextthink] = PR.globals_float[PR.globalvars.time] + 0.1;
+        getProgsEntity(ed)._v_float![PR.entvars.frame] = PR.globals_float[st.a];
+        getProgsEntity(ed)._v_int![PR.entvars.think] = PR.globals_int[st.b];
         continue;
     }
     PR.RunError('Bad opcode ' + st.op);
diff --git a/source/engine/server/ProgsAPI.ts b/source/engine/server/ProgsAPI.ts
index e1149678..27f95a61 100644
--- a/source/engine/server/ProgsAPI.ts
+++ b/source/engine/server/ProgsAPI.ts
@@ -1,4 +1,5 @@
 import type { SzBuffer } from '../network/MSG.ts';
+import type { ClientEdict } from '../../shared/GameInterfaces.ts';
 
 import Vector from '../../shared/Vector.ts';
 import Cmd from '../common/Cmd.ts';
@@ -22,6 +23,35 @@ interface ProgsAPI {
   builtin: BuiltinFunction[];
 }
 
+interface QuakeCRuntimeGameAPI {
+  msg_entity: ServerEdict | null;
+  self: ServerEdict;
+  trace_allsolid: number;
+  trace_endpos: Vector;
+  trace_ent: { readonly entity: ClientEdict | NonNullable<ServerEdict['entity']> } | null;
+  trace_fraction: number;
+  trace_inopen: number;
+  trace_inwater: number;
+  trace_plane_dist: number;
+  trace_plane_normal: Vector;
+  trace_startsolid: number;
+  v_forward: Vector;
+  v_right: Vector;
+  v_up: Vector;
+}
+
+/**
+ * Retrieves the active QuakeC runtime game API.
+ * @returns The QuakeC runtime view for builtin access.
+ */
+function getQuakeCGameAPI(): QuakeCRuntimeGameAPI {
+  const gameAPI = SV.server.gameAPI as QuakeCRuntimeGameAPI | null;
+
+  console.assert(gameAPI !== null, 'QuakeC builtins require an active game API');
+
+  return gameAPI!;
+}
+
 const PF: ProgsAPI = {
   _assertTrue(check: boolean, message: string): void {
     if (!check) {
@@ -220,21 +250,23 @@ function generateBuiltinFunction(name: string, func: BuiltinImplementation, argT
 
 const error = generateBuiltinFunction('error', (str: string): never => {
   Con.PrintError(`======SERVER ERROR in ${PR.GetString(PR.xfunction.name)}\n${str}\n`);
-  ED.Print(SV.server.gameAPI.self);
+  ED.Print(getQuakeCGameAPI().self);
   throw new HostError(`Program error: ${str}`);
 }, [etype.ev_strings]);
 
 const objerror = generateBuiltinFunction('objerror', (str: string): never => {
   Con.PrintError(`======OBJECT ERROR in ${PR.GetString(PR.xfunction.name)}\n${str}\n`);
-  ED.Print(SV.server.gameAPI.self);
+  ED.Print(getQuakeCGameAPI().self);
   throw new HostError(`Program error: ${str}`);
 }, [etype.ev_strings]);
 
 const makevectors = generateBuiltinFunction('makevectors', (vec: Vector): void => {
   const { forward, right, up } = vec.angleVectors();
-  SV.server.gameAPI.v_forward = forward;
-  SV.server.gameAPI.v_right = right;
-  SV.server.gameAPI.v_up = up;
+  const gameAPI = getQuakeCGameAPI();
+
+  gameAPI.v_forward = forward;
+  gameAPI.v_right = right;
+  gameAPI.v_up = up;
 }, [etype.ev_vector]);
 
 const setorigin = generateBuiltinFunction('setorigin', (edict: ServerEdict, vec: Vector): void => edict.setOrigin(vec), [etype.ev_entity, etype.ev_vector], etype.ev_void);
@@ -290,20 +322,21 @@ const breakstatement: BuiltinFunction = function breakstatement() {
 };
 
 const traceline = generateBuiltinFunction('traceline', (start: Vector, end: Vector, noMonsters: number, passEdict: ServerEdict | null): void => {
-  const trace = ServerEngineAPI.TracelineLegacy(start, end, noMonsters, passEdict);
-
-  SV.server.gameAPI.trace_allsolid = trace.allsolid ? 1.0 : 0.0;
-  SV.server.gameAPI.trace_startsolid = trace.startsolid ? 1.0 : 0.0;
-  SV.server.gameAPI.trace_fraction = trace.fraction;
-  SV.server.gameAPI.trace_inwater = trace.inwater ? 1.0 : 0.0;
-  SV.server.gameAPI.trace_inopen = trace.inopen ? 1.0 : 0.0;
-  SV.server.gameAPI.trace_endpos = trace.endpos;
-  SV.server.gameAPI.trace_plane_normal = trace.plane.normal;
-  SV.server.gameAPI.trace_plane_dist = trace.plane.dist;
-  SV.server.gameAPI.trace_ent = trace.ent || null;
+  const trace = ServerEngineAPI.TracelineLegacy(start, end, noMonsters !== 0, passEdict);
+  const gameAPI = getQuakeCGameAPI();
+
+  gameAPI.trace_allsolid = trace.allsolid ? 1.0 : 0.0;
+  gameAPI.trace_startsolid = trace.startsolid ? 1.0 : 0.0;
+  gameAPI.trace_fraction = trace.fraction;
+  gameAPI.trace_inwater = trace.inwater ? 1.0 : 0.0;
+  gameAPI.trace_inopen = trace.inopen ? 1.0 : 0.0;
+  gameAPI.trace_endpos = trace.endpos;
+  gameAPI.trace_plane_normal = trace.plane.normal;
+  gameAPI.trace_plane_dist = trace.plane.dist;
+  gameAPI.trace_ent = trace.ent || null;
 }, [etype.ev_vector, etype.ev_vector, etype.ev_integer, etype.ev_entity]);
 
-const checkclient = generateBuiltinFunction('checkclient', (): ServerEdict | null => SV.server.gameAPI.self.getNextBestClient(), [], etype.ev_entity_client);
+const checkclient = generateBuiltinFunction('checkclient', (): ServerEdict | null => getQuakeCGameAPI().self.getNextBestClient(), [], etype.ev_entity_client);
 
 const stuffcmd = generateBuiltinFunction('stuffcmd', (clientEdict: ServerEdict, command: string): void => {
   clientEdict.getClient().sendConsoleCommands(command);
@@ -323,12 +356,12 @@ const cvar_set = generateBuiltinFunction('cvar_set', (name: string, value: strin
 }, [etype.ev_string, etype.ev_string]);
 
 const findradius = generateBuiltinFunction('findradius', (origin: Vector, radius: number): ServerEdict => {
-  const edicts = ServerEngineAPI.FindInRadius(origin, radius);
-  let chain = SV.server.edicts[0];
+  const edicts = ServerEngineAPI.FindInRadius(origin, radius) as unknown as ServerEdict[];
+  let chain: ServerEdict = SV.server.edicts[0] as ServerEdict;
 
   for (const edict of edicts) {
     edict.entity.chain = chain;
-    chain = edict;
+    chain = edict as ServerEdict;
   }
 
   return chain;
@@ -353,7 +386,7 @@ const Remove = generateBuiltinFunction('Remove', (edict: ServerEdict): void => {
 }, [etype.ev_entity]);
 
 const Find = generateBuiltinFunction('Find', (edict: ServerEdict, field: string, value: string): ServerEdict | null => ServerEngineAPI.FindByFieldAndValue(field, value, edict.num + 1), [etype.ev_entity, etype.ev_field, etype.ev_string], etype.ev_entity);
-const MoveToGoal = generateBuiltinFunction('MoveToGoal', (dist: number): boolean => SV.server.gameAPI.self.moveToGoal(dist), [etype.ev_float], etype.ev_bool);
+const MoveToGoal = generateBuiltinFunction('MoveToGoal', (dist: number): boolean => getQuakeCGameAPI().self.moveToGoal(dist), [etype.ev_float], etype.ev_bool);
 const precache_file = generateBuiltinFunction('precache_file', (value: number): number => value, [etype.ev_integer], etype.ev_integer);
 
 const precache_sound = generateBuiltinFunction('precache_sound', (sfxName: string): void => {
@@ -382,12 +415,12 @@ const eprint: BuiltinFunction = function eprint() {
 
 const walkmove = generateBuiltinFunction('walkmove', (yaw: number, dist: number): boolean => {
   const oldFunction = PR.xfunction;
-  const result = SV.server.gameAPI.self.walkMove(yaw, dist);
+  const result = getQuakeCGameAPI().self.walkMove(yaw, dist);
   PR.xfunction = oldFunction;
   return result;
 }, [etype.ev_float, etype.ev_float], etype.ev_bool);
 
-const droptofloor = generateBuiltinFunction('droptofloor', (): boolean => SV.server.gameAPI.self.dropToFloor(-256.0), [], etype.ev_bool);
+const droptofloor = generateBuiltinFunction('droptofloor', (): boolean => getQuakeCGameAPI().self.dropToFloor(-256.0), [], etype.ev_bool);
 
 const lightstyle = generateBuiltinFunction('lightstyle', (style: number, value: string): void => {
   ServerEngineAPI.Lightstyle(style, value);
@@ -401,12 +434,12 @@ const pointcontents = generateBuiltinFunction('pointcontents', (point: Vector):
 const nextent = generateBuiltinFunction('nextent', (edict: ServerEdict): ServerEdict | null => edict.nextEdict(), [etype.ev_entity], etype.ev_entity);
 
 const aim = generateBuiltinFunction('aim', (edict: ServerEdict): Vector => {
-  const direction = SV.server.gameAPI.v_forward;
+  const direction = getQuakeCGameAPI().v_forward;
   return edict.aim(direction);
 }, [etype.ev_entity], etype.ev_vector);
 
 const changeyaw = generateBuiltinFunction('changeyaw', (): void => {
-  SV.server.gameAPI.self.changeYaw();
+  getQuakeCGameAPI().self.changeYaw();
 }, []);
 
 /**
@@ -419,7 +452,7 @@ function WriteGeneric(dest: number): SzBuffer {
       return SV.server.datagram;
 
     case 1: {
-      const messageEntity = SV.server.gameAPI.msg_entity;
+      const messageEntity = getQuakeCGameAPI().msg_entity;
       const entityNumber = messageEntity.num;
 
       if (!messageEntity.isClient()) {
diff --git a/source/engine/server/Server.ts b/source/engine/server/Server.ts
index 40fe6767..b8bc8b32 100644
--- a/source/engine/server/Server.ts
+++ b/source/engine/server/Server.ts
@@ -1,7 +1,8 @@
-import type { ServerGameInterface } from '../../shared/GameInterfaces.ts';
+import type { ClientEdict, ServerGameInterface } from '../../shared/GameInterfaces.ts';
 import type { BaseModel } from '../common/model/BaseModel.ts';
 import type { QSocket } from '../network/NetworkDrivers.ts';
 
+import Vector from '../../shared/Vector.ts';
 import Cvar from '../common/Cvar.ts';
 import { MoveVars, Pmove } from '../common/Pmove.ts';
 import { SzBuffer } from '../network/MSG.ts';
@@ -42,10 +43,38 @@ type PlayerClientdataEntity = ServerClient['entity'] & {
   clientdataFields: string[];
 } & Record<string, unknown>;
 
+/**
+ * Runtime view of the active game API owned by the server.
+ *
+ * This extends the public game-module contract with mutable state that the
+ * server frame loop and QuakeC builtin layer exchange at runtime, such as
+ * trace results, orientation vectors, and legacy global values like `self`.
+ * Keeping that widened shape local to the server preserves the stable
+ * `ServerGameInterface` boundary while still giving engine code a typed place
+ * for the extra per-frame data that does not belong in the public API.
+ */
 interface ServerRuntimeGameAPI extends ServerGameInterface {
+  coop?: number;
+  deathmatch?: number;
+  force_retouch?: number;
   frametime: number;
+  mapname?: string | null;
+  msg_entity?: ServerEdict | null;
+  self?: ServerEdict | null;
   time: number;
   serverflags?: number;
+  trace_allsolid?: number;
+  trace_endpos?: Vector;
+  trace_ent?: { readonly entity: ClientEdict | NonNullable<ServerEdict['entity']> } | null;
+  trace_fraction?: number;
+  trace_inopen?: number;
+  trace_inwater?: number;
+  trace_plane_dist?: number;
+  trace_plane_normal?: Vector;
+  trace_startsolid?: number;
+  v_forward?: Vector;
+  v_right?: Vector;
+  v_up?: Vector;
 }
 
 interface LegacySpawnParmsGameAPI extends ServerRuntimeGameAPI {
diff --git a/source/engine/server/physics/ServerArea.ts b/source/engine/server/physics/ServerArea.ts
index afe7f059..1f40b5a9 100644
--- a/source/engine/server/physics/ServerArea.ts
+++ b/source/engine/server/physics/ServerArea.ts
@@ -10,18 +10,21 @@ import { BrushModel } from '../../common/Mod.ts';
 
 interface BoxClipNode {
   planenum: number;
-  children: number[];
+  children: [number, number];
 }
 
 interface BoxPlane {
   type: number;
   normal: Vector;
   dist: number;
+  signbits: Hull['planes'][number]['signbits'];
 }
 
 interface BoxHull {
   clipnodes: BoxClipNode[];
   planes: BoxPlane[];
+  clip_mins: Vector;
+  clip_maxs: Vector;
   firstclipnode: number;
   lastclipnode: number;
 }
@@ -123,6 +126,8 @@ export class ServerArea {
     this.box_hull = {
       clipnodes: this.box_clipnodes,
       planes: this.box_planes,
+      clip_mins: Vector.origin,
+      clip_maxs: Vector.origin,
       firstclipnode: 0,
       lastclipnode: 5,
     };
@@ -130,7 +135,7 @@ export class ServerArea {
     for (let index = 0; index <= 5; index++) {
       const node: BoxClipNode = {
         planenum: index,
-        children: [],
+        children: [0, 0],
       };
       this.box_clipnodes[index] = node;
       node.children[index & 1] = Defs.content.CONTENT_EMPTY;
@@ -144,6 +149,7 @@ export class ServerArea {
         type: index >> 1,
         normal: new Vector(),
         dist: 0.0,
+        signbits: 0,
       };
       this.box_planes[index] = plane;
       plane.normal[index >> 1] = 1.0;
diff --git a/source/engine/server/physics/ServerCollision.ts b/source/engine/server/physics/ServerCollision.ts
index 9eb7a581..3af95b98 100644
--- a/source/engine/server/physics/ServerCollision.ts
+++ b/source/engine/server/physics/ServerCollision.ts
@@ -35,6 +35,10 @@ interface TraceExtents {
   readonly maxs: Vector;
 }
 
+type LegacyHull = Hull & {
+  readonly firstclipnode: number;
+};
+
 let { Con, SV } = getCommonRegistry();
 
 eventBus.subscribe('registry.frozen', () => {
@@ -371,7 +375,8 @@ export class ServerCollision {
    */
   _traceLegacyHullLine(hull: Hull, start: Vector, end: Vector): CollisionTrace {
     const trace = CollisionTrace.hullInitial(end);
-    this.recursiveHullCheck(hull, hull.firstclipnode ?? 0, 0.0, 1.0, start, end, trace);
+    const legacyHull = this._asLegacyHull(hull);
+    this.recursiveHullCheck(legacyHull, legacyHull.firstclipnode, 0.0, 1.0, start, end, trace);
     return trace;
   }
 
@@ -380,7 +385,7 @@ export class ServerCollision {
    * @returns The contents value at the point within the hull.
    */
   hullPointContents(hull: Hull, num: number, p: Vector): number {
-    return legacyHullPointContents(hull, num, p);
+    return legacyHullPointContents(this._asLegacyHull(hull), num, p);
   }
 
   /**
@@ -522,7 +527,16 @@ export class ServerCollision {
     trace: CollisionTrace,
     depth = 0,
   ): boolean {
-    return legacyRecursiveHullCheck(hull, num, p1f, p2f, p1, p2, trace, depth);
+    return legacyRecursiveHullCheck(this._asLegacyHull(hull), num, p1f, p2f, p1, p2, trace, depth);
+  }
+
+  /**
+   * Narrow a BSP hull to the legacy shape required by clipnode traversal.
+   * @returns The hull with a concrete first clipnode.
+   */
+  _asLegacyHull(hull: Hull): LegacyHull {
+    console.assert(typeof hull.firstclipnode === 'number', 'legacy hull requires firstclipnode');
+    return hull as LegacyHull;
   }
 
   /**
diff --git a/source/engine/server/physics/ServerMovement.ts b/source/engine/server/physics/ServerMovement.ts
index fc73112a..63c23477 100644
--- a/source/engine/server/physics/ServerMovement.ts
+++ b/source/engine/server/physics/ServerMovement.ts
@@ -1,5 +1,5 @@
-import type BaseEntity from '../../../game/id1/entity/BaseEntity.mjs';
-import type { ServerEdict } from '../Edict.ts';
+import type { ServerEdict as ReadonlyServerEdict } from '../../../shared/GameInterfaces.ts';
+import type { BaseEntity, ServerEdict } from '../Edict.ts';
 
 import Vector from '../../../shared/Vector.ts';
 import * as Defs from '../../../shared/Defs.ts';
@@ -7,7 +7,7 @@ import { STEPSIZE } from '../../common/Pmove.ts';
 import { eventBus, getCommonRegistry } from '../../registry.ts';
 
 interface EdictReferenceLike {
-  readonly edict?: ServerEdict | null;
+  readonly edict?: ReadonlyServerEdict | null;
 }
 
 let { SV } = getCommonRegistry();
@@ -324,7 +324,7 @@ export class ServerMovement {
     }
   }
 
-  closeEnough(ent: ServerEdict, goal: ServerEdict, dist: number): boolean {
+  closeEnough(ent: ServerEdict, goal: { readonly entity: BaseEntity | null }, dist: number): boolean {
     const absmin = ent.entity!.absmin;
     const absmax = ent.entity!.absmax;
     const absminGoal = goal.entity!.absmin;
@@ -340,7 +340,7 @@ export class ServerMovement {
     return true;
   }
 
-  #resolveEdict(value: BaseEntity | EdictReferenceLike | ServerEdict | null): ServerEdict | null {
+  #resolveEdict(value: BaseEntity | EdictReferenceLike | ReadonlyServerEdict | ServerEdict | null): ReadonlyServerEdict | ServerEdict | null {
     if (!value) {
       return null;
     }
@@ -350,7 +350,7 @@ export class ServerMovement {
     return value.edict ?? null;
   }
 
-  #resolveEntity(value: BaseEntity | EdictReferenceLike | ServerEdict | null): BaseEntity | null {
+  #resolveEntity(value: BaseEntity | EdictReferenceLike | ReadonlyServerEdict | ServerEdict | null): BaseEntity | null {
     if (!value) {
       return null;
     }
@@ -363,7 +363,7 @@ export class ServerMovement {
     return value.edict?.entity ?? null;
   }
 
-  #isServerEdictLike(value: BaseEntity | EdictReferenceLike | ServerEdict): value is ServerEdict {
+  #isServerEdictLike(value: BaseEntity | EdictReferenceLike | ReadonlyServerEdict | ServerEdict): value is ReadonlyServerEdict | ServerEdict {
     return 'entity' in value && typeof value.isWorld === 'function';
   }
 }
diff --git a/source/shared/GameInterfaces.ts b/source/shared/GameInterfaces.ts
index a4e86568..51a5a1fe 100644
--- a/source/shared/GameInterfaces.ts
+++ b/source/shared/GameInterfaces.ts
@@ -27,7 +27,12 @@ export type ClientEventValue = ClientSerializableType | object;
 
 export type ClientdataMap = Record<string, ClientSerializableType>;
 
-export type EdictValueType = string | number | boolean | Vector | null;
+export interface ServerEntityReference {
+  readonly edict?: ServerEdict | null;
+  readonly edictId?: number | null;
+}
+
+export type EdictValueType = string | number | boolean | Vector | ServerEdict | ServerEntityReference | null;
 export type EdictData = Record<string, EdictValueType>;
 
 export type SFX = Readonly<SFXValue>;
diff --git a/test/common/game-apis.test.mjs b/test/common/game-apis.test.mjs
index 5df871ea..3c907b0b 100644
--- a/test/common/game-apis.test.mjs
+++ b/test/common/game-apis.test.mjs
@@ -5,6 +5,7 @@ import Vector from '../../source/shared/Vector.ts';
 import { moveTypes, solid } from '../../source/shared/Defs.ts';
 import { ClientEdict } from '../../source/engine/client/ClientEntities.ts';
 import { ClientEngineAPI, ServerEngineAPI } from '../../source/engine/common/GameAPIs.ts';
+import { ServerEdict } from '../../source/engine/server/Edict.ts';
 import { ServerArea } from '../../source/engine/server/physics/ServerArea.ts';
 import { ServerCollision } from '../../source/engine/server/physics/ServerCollision.ts';
 import { CollisionTrace } from '../../source/engine/server/physics/ServerCollisionSupport.ts';
@@ -183,6 +184,47 @@ void describe('ServerEngineAPI.Traceline', () => {
   });
 });
 
+void describe('ServerEngineAPI.SpawnEntity', () => {
+  void test('unwraps edict-backed initial entity references before prepareEntity', () => {
+    const worldEdict = new ServerEdict(0);
+    const ownerEdict = new ServerEdict(1);
+    const spawnedEdict = new ServerEdict(2);
+    const ownerEntity = { classname: 'player' };
+    let capturedInitialData = null;
+
+    ownerEdict.entity = ownerEntity;
+
+    void withMockRegistry(defaultMockRegistry({
+      area: {
+        unlinkEdict() {},
+      },
+      svs: {
+        maxclients: 1,
+      },
+      server: {
+        time: 0,
+        num_edicts: 2,
+        edicts: [worldEdict, ownerEdict, spawnedEdict],
+        gameAPI: {
+          prepareEntity(_edict, _classname, initialData) {
+            capturedInitialData = initialData;
+            return true;
+          },
+          spawnPreparedEntity() {
+            return true;
+          },
+        },
+      },
+    }), () => {
+      const result = ServerEngineAPI.SpawnEntity('test_entity', { owner: ownerEdict });
+
+      assert.equal(result, spawnedEdict);
+    });
+
+    assert.equal(capturedInitialData.owner, ownerEntity);
+  });
+});
+
 void describe('ServerEngineAPI.Navigate', () => {
   void test('passes through a missing synchronous path as null', () => {
     void withMockRegistry(defaultMockRegistry({

From 5b2b18d0e09bf813e85c10355487b71b7b83a107 Mon Sep 17 00:00:00 2001
From: Christian R <github@chrisnew.de>
Date: Sat, 4 Apr 2026 23:30:20 +0300
Subject: [PATCH 54/67] game update

---
 source/game/id1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/source/game/id1 b/source/game/id1
index 6315a490..a5c90d2f 160000
--- a/source/game/id1
+++ b/source/game/id1
@@ -1 +1 @@
-Subproject commit 6315a49042ae9619a1950ca13d47f665efbf8d7c
+Subproject commit a5c90d2f0263c09c8945604c5e009227a54a95e8

From 64c57f26bc324261e9c588bd0c2c5e4b20a609a9 Mon Sep 17 00:00:00 2001
From: Christian R <github@chrisnew.de>
Date: Sun, 5 Apr 2026 00:20:52 +0300
Subject: [PATCH 55/67] ditched the node TS execution path for dedicated in
 favor of annotations

---
 .../build-and-deploy.instructions.md          |  12 +-
 .../game-logic-port.instructions.md           | 129 +++++++-----------
 Dockerfile                                    |   6 +-
 dedicated.ts                                  |   1 -
 package-lock.json                             |  44 ++++++
 package.json                                  |  16 +--
 source/engine/server/GameLoader.ts            |   4 +-
 test/common/id1-base-entity.test.mjs          | 126 +++++++++++++++++
 test/common/workers.test.mjs                  |  62 +++++++++
 vite.config.dedicated.mjs                     |  12 +-
 10 files changed, 307 insertions(+), 105 deletions(-)
 create mode 100644 test/common/id1-base-entity.test.mjs

diff --git a/.github/instructions/build-and-deploy.instructions.md b/.github/instructions/build-and-deploy.instructions.md
index 7b1e59ee..f10f5259 100644
--- a/.github/instructions/build-and-deploy.instructions.md
+++ b/.github/instructions/build-and-deploy.instructions.md
@@ -14,8 +14,12 @@
 
 ### Three different kinds of builds
 
-We need to make sure the correct build is used at all times.
+All code is always compiled through esbuild (via Vite) before execution. This ensures full TypeScript feature support (decorators, const enum, etc.) across every environment.
 
-1. Dedicated development server: The code is executed in node.js directly, no build step required.
-2. Dedicated production server: The code is built using `npm run build:production` and the output files in `dist/` are executed in node.js. This is required to strip out all console.assert statements and other development-only code for optimal performance.
-3. Client code: The code is built using `npm run build:production` and the output files in `dist/` are executed in the browser.
+1. Dedicated development server: Build with `npm run dedicated:dev` (Vite watch mode), run with `npm run dedicated:start`. The build step compiles TypeScript to JavaScript in `dist/dedicated/` with source maps enabled.
+2. Dedicated production server: Build with `npm run dedicated:build:production` and run with `npm run dedicated:start`. Strips console.assert and other development-only code for optimal performance.
+3. Client code: Build with `npm run build:production` and serve the output in `dist/browser/` to the browser.
+
+### Testing
+
+Tests use `tsx` (esbuild-based) as the Node.js loader, ensuring the same TypeScript compilation behavior as the Vite builds. Run with `npm test`.
diff --git a/.github/instructions/game-logic-port.instructions.md b/.github/instructions/game-logic-port.instructions.md
index ad375589..1d3d70c2 100644
--- a/.github/instructions/game-logic-port.instructions.md
+++ b/.github/instructions/game-logic-port.instructions.md
@@ -6,7 +6,7 @@ All rules from the general TS porting guide still apply. This document only adds
 
 ---
 
-### 1. Serializable Fields — Replace `startFields`/`endFields` with a Decorator
+### 1. Serializable Fields — Use `@entity` / `@serializable` Decorators
 
 The current JS pattern snapshots `Object.keys()` before and after field assignment to discover which properties to serialize:
 
@@ -22,76 +22,54 @@ _declareFields() {
 }
 ```
 
-In TypeScript, use a **`@serializable` field decorator** that registers the property at class definition time. No runtime key diffing needed.
+In TypeScript, use the `@entity` class decorator and `@serializable` field decorator from `MiscHelpers.ts`. The `@serializable` decorator marks individual fields, and `@entity` on the class flushes them into a frozen `static serializableFields` array at class definition time — fully compatible with the existing `collectSerializableFields()` prototype-chain walk.
 
 ```typescript
-// ✅ TypeScript pattern
+// ✅ TypeScript pattern — decorators
+import { entity, serializable, Serializer } from '../helper/MiscHelpers.ts';
+
+@entity
 class BaseMonster extends BaseEntity {
   @serializable health = 100;
   @serializable enemy: BaseEntity | null = null;
+  @serializable pausetime = 0;
 
-  // Components are regular fields — no decorator, not serialized.
+  // Components are regular class fields — not decorated, not serialized.
   protected readonly _damageHandler = new DamageHandler(this);
 }
 ```
 
-#### Decorator implementation
-
-Use [TC39 Stage 3 decorators](https://github.com/tc39/proposal-decorators) (native in TypeScript 5.0+, no `experimentalDecorators` flag). The decorator records metadata on the class:
-
-```typescript
-const serializableFieldsKey = Symbol('serializableFields');
+The legacy `static readonly serializableFields` array pattern still works but is no longer recommended for new TypeScript classes. Legacy `.mjs` callers using `startFields()`/`endFields()` continue to work during the migration.
 
-type SerializableFieldsMap = Map<string, true>;
+#### How it works
 
-/**
- * Marks a class field for save/load serialization.
- */
-function serializable<This, Value>(
-  _target: undefined, context: ClassFieldDecoratorContext<This, Value>,
-): void {
-  const fieldName = String(context.name);
+1. `@serializable` field decorators accumulate field names in a module-level array during class definition.
+2. `@entity` class decorator freezes those names into a `static serializableFields` property.
+3. `collectSerializableFields()` in `MiscHelpers.ts` walks the constructor chain bottom-up and merges every class's `serializableFields` array. Parent fields are included automatically.
 
-  context.metadata[serializableFieldsKey] ??= new Map<string, true>();
-  (context.metadata[serializableFieldsKey] as SerializableFieldsMap).set(fieldName, true);
+```typescript
+// BaseEntity uses @entity + @serializable for its fields:
+@entity
+class BaseEntity {
+  @serializable ltime = 0.0;
+  @serializable origin = new Vector();
+  // ...
 }
-```
-
-At serialization time, `Serializer` reads the metadata chain (walking the prototype chain to collect inherited decorated fields) instead of relying on an instance-level field list. This:
-
-- Eliminates `startFields()` / `endFields()` entirely.
-- Eliminates `_declareFields()` — fields are declared inline on the class body.
-- Makes it impossible to forget wrapping a field or accidentally serializing a component.
-- Works with `Object.seal(this)` because all fields are already declared as TS class fields.
-
-#### Inheritance
-
-Parent-class decorated fields are automatically included — `Symbol.metadata` propagates up the prototype chain. No `super._declareFields()` call needed.
 
-#### Serializer changes
-
-The `Serializer` constructor changes from taking a `(object, engine)` pair to reading from class metadata:
+// BaseMonster adds its own:
+@entity
+class BaseMonster extends BaseEntity {
+  @serializable health = 100;
+  @serializable enemy: BaseEntity | null = null;
+}
 
-```typescript
-class Serializer {
-  getSerializableFields(instance: object): string[] {
-    const fields: string[] = [];
-    let proto = Object.getPrototypeOf(instance);
-    while (proto) {
-      const meta = proto.constructor[Symbol.metadata];
-      const map = meta?.[serializableFieldsKey] as SerializableFieldsMap | undefined;
-      if (map) {
-        for (const key of map.keys()) {
-          if (!fields.includes(key)) {
-            fields.push(key);
-          }
-        }
-      }
-      proto = Object.getPrototypeOf(proto);
-    }
-    return fields;
-  }
+// ArmySoldierMonster adds its own:
+@entity
+class ArmySoldierMonster extends BaseMonster {
+  @serializable _aiState = 'idle';
 }
+
+// At runtime the Serializer sees all three merged: ['ltime', 'origin', ..., 'health', ..., '_aiState']
 ```
 
 #### `_declareFields()` removal checklist
@@ -100,9 +78,12 @@ class Serializer {
 |---|---|
 | Override `_declareFields()`, call `super._declareFields()` | Delete the method entirely |
 | `this._serializer.startFields()` / `endFields()` | Delete both calls |
-| Field assignments inside the boundary | Move to class field declarations with `@serializable` |
-| Component creation after `endFields()` | Regular class fields, no decorator |
-| `this._serializer = new Serializer(this, this.engine)` in constructor | One shared `Serializer` per call, or construct it lazily; the serializer reads metadata, not per-instance lists |
+| Field assignments inside the boundary | Move to typed class field declarations with `@serializable` |
+| Component creation after `endFields()` | Regular class fields (no `@serializable`) |
+| Manual `static readonly serializableFields = [...]` | Delete — `@entity` + `@serializable` handles this |
+| `this._serializer = new Serializer(this, this.engine)` in constructor | Keep as-is; Serializer reads `serializableFields` from the chain |
+
+The legacy `startFields()`/`endFields()` API remains in `Serializer` for `.mjs` callers during the migration.
 
 ---
 
@@ -151,35 +132,20 @@ protected _runState(state?: S | null): boolean;
 
 This catches typos at compile time. Generating the union type is straightforward — it is the set of first-argument strings across all `_defineState` calls.
 
-#### 3b. Animation sequence helper
+#### 3b. Animation sequence helper — `_defineSequence`
 
-Most state definitions are repetitive animation loops. Introduce a helper that generates a sequence:
+`BaseEntity._defineSequence()` is already implemented and generates a numbered sequence of states from a prefix and frame array:
 
 ```typescript
-/**
- * Defines a looping sequence of animation frames.
- * @param prefix - State name prefix (e.g. `'army_stand'`).
- * @param frames - Ordered frame names from the model QC.
- * @param handler - Callback invoked on each frame.
- * @param loop - Whether the last frame loops back to the first. Default `true`.
- */
-protected static _defineSequence(
+static _defineSequence(
   prefix: string,
-  frames: string[],
-  handler: (this: BaseEntity, frameIndex: number) => void,
+  frames: readonly (string | number)[],
+  handler: ((this: BaseEntity, frameIndex: number) => void) | null = null,
   loop = true,
-): void {
-  for (let i = 0; i < frames.length; i++) {
-    const state = `${prefix}${i + 1}`;
-    const next = i < frames.length - 1
-      ? `${prefix}${i + 2}`
-      : (loop ? `${prefix}1` : null);
-    this._defineState(state, frames[i], next, function () { handler.call(this, i); });
-  }
-}
+): void;
 ```
 
-This collapses 8 stand-state calls into one:
+States are named `${prefix}1`, `${prefix}2`, ... with the last frame looping back to `${prefix}1` by default. This collapses 8 stand-state calls into one:
 
 ```typescript
 // ❌ Before: 8 calls
@@ -188,11 +154,12 @@ this._defineState('army_stand2', 'stand2', 'army_stand3', function () { this._ai
 // ... 6 more
 
 // ✅ After: 1 call
-this._defineSequence('army_stand', ['stand1','stand2','stand3','stand4','stand5','stand6','stand7','stand8'],
+this._defineSequence('army_stand',
+  ['stand1','stand2','stand3','stand4','stand5','stand6','stand7','stand8'],
   function () { this._ai.stand(); });
 ```
 
-For sequences where individual frames need different behavior (like walk speeds or firing on frame 4), use the `frameIndex` parameter or fall back to individual `_defineState` calls:
+For sequences where individual frames need different behavior (walk speeds, firing on a specific frame), use the `frameIndex` parameter or fall back to individual `_defineState` calls:
 
 ```typescript
 const walkSpeeds = [1,1,1,1,2,3,4,4,2,2,2,1,0,1,1,1,3,3,3,3,2,1,1,1];
diff --git a/Dockerfile b/Dockerfile
index 0f9abf46..45115295 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -12,10 +12,10 @@ COPY package.json package-lock.json ./
 RUN npm ci
 
 COPY index.html ./index.html
-COPY dedicated.mjs ./dedicated.mjs
+COPY dedicated.ts ./dedicated.ts
 COPY vite.config.mjs ./vite.config.mjs
 COPY vite.config.dedicated.mjs ./vite.config.dedicated.mjs
-COPY jsconfig.json ./jsconfig.json
+COPY tsconfig.json ./tsconfig.json
 COPY source ./source
 COPY public ./public
 COPY test ./test
@@ -60,4 +60,4 @@ EXPOSE 3000
 HEALTHCHECK --interval=30s --timeout=5s --start-period=10s --retries=3 \
   CMD wget -qO /dev/null http://localhost:3000/ || exit 1
 
-CMD ["npm", "run", "dedicated:start:production"]
+CMD ["npm", "run", "dedicated:start"]
diff --git a/dedicated.ts b/dedicated.ts
index 68cc7370..7a85c2fe 100644
--- a/dedicated.ts
+++ b/dedicated.ts
@@ -1,4 +1,3 @@
-#!/usr/bin/env node --experimental-transform-types
 import process from 'node:process';
 
 import EngineLauncher from './source/engine/main-dedicated.ts';
diff --git a/package-lock.json b/package-lock.json
index 484728ed..79c00d5c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -26,6 +26,7 @@
         "eslint-plugin-sort-class-members": "^1.21.0",
         "eslint-plugin-types": "^1.0.2",
         "globals": "^15.14.0",
+        "tsx": "^4.21.0",
         "typescript": "^5.9.3",
         "vite": "^7.1.12"
       },
@@ -2416,6 +2417,19 @@
         "node": ">= 0.4"
       }
     },
+    "node_modules/get-tsconfig": {
+      "version": "4.13.7",
+      "resolved": "https://registry.npmjs.org/get-tsconfig/-/get-tsconfig-4.13.7.tgz",
+      "integrity": "sha512-7tN6rFgBlMgpBML5j8typ92BKFi2sFQvIdpAqLA2beia5avZDrMs0FLZiM5etShWq5irVyGcGMEA1jcDaK7A/Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "resolve-pkg-maps": "^1.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/privatenumber/get-tsconfig?sponsor=1"
+      }
+    },
     "node_modules/glob-parent": {
       "version": "6.0.2",
       "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
@@ -3099,6 +3113,16 @@
         "node": ">=4"
       }
     },
+    "node_modules/resolve-pkg-maps": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-pkg-maps/-/resolve-pkg-maps-1.0.0.tgz",
+      "integrity": "sha512-seS2Tj26TBVOC2NIc2rOe2y2ZO7efxITtLZcGSOnHHNOQ7CkiUBfw0Iw2ck6xkIhPwLhKNLS8BO+hEpngQlqzw==",
+      "dev": true,
+      "license": "MIT",
+      "funding": {
+        "url": "https://github.com/privatenumber/resolve-pkg-maps?sponsor=1"
+      }
+    },
     "node_modules/rollup": {
       "version": "4.59.0",
       "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.59.0.tgz",
@@ -3447,6 +3471,26 @@
         "typescript": ">=4.8.4"
       }
     },
+    "node_modules/tsx": {
+      "version": "4.21.0",
+      "resolved": "https://registry.npmjs.org/tsx/-/tsx-4.21.0.tgz",
+      "integrity": "sha512-5C1sg4USs1lfG0GFb2RLXsdpXqBSEhAaA/0kPL01wxzpMqLILNxIxIOKiILz+cdg/pLnOUxFYOR5yhHU666wbw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "esbuild": "~0.27.0",
+        "get-tsconfig": "^4.7.5"
+      },
+      "bin": {
+        "tsx": "dist/cli.mjs"
+      },
+      "engines": {
+        "node": ">=18.0.0"
+      },
+      "optionalDependencies": {
+        "fsevents": "~2.3.3"
+      }
+    },
     "node_modules/type-check": {
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
diff --git a/package.json b/package.json
index e5702b71..841ceac6 100644
--- a/package.json
+++ b/package.json
@@ -10,9 +10,9 @@
     "node": ">=24 <25"
   },
   "devDependencies": {
-    "@types/node": "^24.6.1",
     "@eslint/js": "^9.17.0",
     "@stylistic/eslint-plugin": "^5.2.2",
+    "@types/node": "^24.6.1",
     "@typescript-eslint/eslint-plugin": "^8.46.4",
     "@typescript-eslint/parser": "^8.46.4",
     "eslint": "^9.19.0",
@@ -21,6 +21,7 @@
     "eslint-plugin-sort-class-members": "^1.21.0",
     "eslint-plugin-types": "^1.0.2",
     "globals": "^15.14.0",
+    "tsx": "^4.21.0",
     "typescript": "^5.9.3",
     "vite": "^7.1.12"
   },
@@ -31,10 +32,10 @@
     "ws": "^8.18.0"
   },
   "scripts": {
-    "test": "node --experimental-transform-types --test test/**/*.test.mjs",
-    "test:common": "node --experimental-transform-types --test test/common/**/*.test.mjs",
-    "test:physics": "node --experimental-transform-types --test test/physics/**/*.test.mjs",
-    "test:renderer": "node --experimental-transform-types --test test/renderer/**/*.test.mjs",
+    "test": "tsx --test test/**/*.test.mjs",
+    "test:common": "tsx --test test/common/**/*.test.mjs",
+    "test:physics": "tsx --test test/physics/**/*.test.mjs",
+    "test:renderer": "tsx --test test/renderer/**/*.test.mjs",
     "typecheck": "tsc -p tsconfig.json",
     "typecheck:watch": "tsc -p tsconfig.json --watch --preserveWatchOutput",
     "build:wrangler": "npm run test && npm run build:production",
@@ -42,14 +43,11 @@
     "build": "vite build",
     "build:production": "vite build --mode production",
     "watch": "vite build --watch",
-
     "lint": "eslint source",
     "lint-fix": "eslint --fix source",
-
     "dedicated:dev": "vite build --watch --mode development --config vite.config.dedicated.mjs",
     "dedicated:build": "vite build --config vite.config.dedicated.mjs",
     "dedicated:build:production": "vite build --config vite.config.dedicated.mjs --mode production",
-    "dedicated:start": "node --experimental-transform-types ./dedicated.ts +exec server.cfg",
-    "dedicated:start:production": "node ./dist/dedicated/dedicated.mjs +exec server.cfg"
+    "dedicated:start": "node ./dist/dedicated/dedicated.mjs +exec server.cfg"
   }
 }
diff --git a/source/engine/server/GameLoader.ts b/source/engine/server/GameLoader.ts
index 7004bd36..a1be0c0d 100644
--- a/source/engine/server/GameLoader.ts
+++ b/source/engine/server/GameLoader.ts
@@ -22,7 +22,7 @@ let gameModules: Record<string, GameModuleLoader> = {};
 // CR: dear future self, do not try to optimize this import.meta.glob usage further.
 try {
   // @ts-ignore, NEVER EVER TOUCH THIS LINE BELOW:
-  gameModules = import.meta.glob('../../game/**/main.mjs');
+  gameModules = import.meta.glob('../../game/**/main.ts');
 } catch (_error) {
   // Not in Vite environment
 }
@@ -32,7 +32,7 @@ try {
  * @returns The loaded game module.
  */
 export async function loadGameModule(gameDir: string): Promise<GameModuleInterface> {
-  const modulePath = `../../game/${gameDir}/main.mjs`;
+  const modulePath = `../../game/${gameDir}/main.ts`;
 
   // Try the pre-bundled modules first (Vite production build)
   if (gameModules[modulePath]) {
diff --git a/test/common/id1-base-entity.test.mjs b/test/common/id1-base-entity.test.mjs
new file mode 100644
index 00000000..e2fe5c4c
--- /dev/null
+++ b/test/common/id1-base-entity.test.mjs
@@ -0,0 +1,126 @@
+import { describe, test } from 'node:test';
+import assert from 'node:assert/strict';
+
+import BaseEntity from '../../source/game/id1/entity/BaseEntity.ts';
+import { entity, serializable, Serializer } from '../../source/game/id1/helper/MiscHelpers.ts';
+
+function createMockGameAPI() {
+  return {
+    engine: {
+      IsLoading() {
+        return false;
+      },
+    },
+  };
+}
+
+void describe('Serializer', () => {
+  void test('uses static serializableFields for typed classes', () => {
+    class StaticSerializable {
+      static serializableFields = ['count'];
+
+      count = 3;
+      skipped = 'ignore-me';
+
+      constructor() {
+        this._serializer = new Serializer(this, null);
+      }
+    }
+
+    const instance = new StaticSerializable();
+
+    assert.deepEqual(instance._serializer.serialize(), {
+      count: ['P', 3],
+    });
+  });
+
+  void test('still supports legacy startFields/endFields callers', () => {
+    class LegacySerializable {
+      constructor() {
+        this._serializer = new Serializer(this, null);
+        this._serializer.startFields();
+        this.name = 'legacy';
+        this.enabled = true;
+        this._serializer.endFields();
+      }
+    }
+
+    const instance = new LegacySerializable();
+
+    assert.deepEqual(instance._serializer.serialize(), {
+      enabled: ['P', true],
+      name: ['P', 'legacy'],
+    });
+  });
+});
+
+void describe('BaseEntity', () => {
+  void test('stays extensible for mod-friendly subclasses during the transition', () => {
+    class ModFriendlyEntity extends BaseEntity {
+      static classname = 'mod_friendly';
+
+      _declareFields() {
+        super._declareFields();
+        this._serializer.startFields();
+        this.customField = 42;
+        this._serializer.endFields();
+      }
+
+      constructor(gameAPI) {
+        super(null, gameAPI);
+        this.postConstructorField = 'works';
+      }
+    }
+
+    const entity = new ModFriendlyEntity(createMockGameAPI());
+
+    assert.equal(Object.isSealed(entity), false);
+    assert.equal(entity.customField, 42);
+    assert.equal(entity.postConstructorField, 'works');
+
+    entity.extraField = 'mods stay easy';
+    assert.equal(entity.extraField, 'mods stay easy');
+  });
+});
+
+void describe('@entity / @serializable decorators', () => {
+  void test('BaseEntity.serializableFields is a frozen array from @entity', () => {
+    assert.ok(Array.isArray(BaseEntity.serializableFields));
+    assert.ok(Object.isFrozen(BaseEntity.serializableFields));
+    assert.ok(BaseEntity.serializableFields.includes('ltime'));
+    assert.ok(BaseEntity.serializableFields.includes('origin'));
+    assert.ok(BaseEntity.serializableFields.includes('_scheduledThinks'));
+  });
+
+  void test('Serializer collects all decorated BaseEntity fields', () => {
+    const entity = new BaseEntity(null, createMockGameAPI());
+    const serialized = entity._serializer.serialize();
+    assert.ok('ltime' in serialized);
+    assert.ok('origin' in serialized);
+    assert.ok('message' in serialized);
+    assert.ok(!('_sub' in serialized), '_sub should not be serialized');
+    assert.ok(!('_damageHandler' in serialized), '_damageHandler should not be serialized');
+  });
+
+  void test('legacy static serializableFields merges with decorated parent', () => {
+    class LegacyChild extends BaseEntity {
+      static classname = 'legacy_child';
+      static serializableFields = ['customProp'];
+
+      constructor(gameAPI) {
+        super(null, gameAPI);
+        this.customProp = 42;
+      }
+    }
+
+    const child = new LegacyChild(createMockGameAPI());
+    const serialized = child._serializer.serialize();
+    assert.ok('ltime' in serialized, 'inherits decorated parent fields');
+    assert.ok('customProp' in serialized, 'includes own static array fields');
+  });
+
+  void test('entity and serializable are exported functions', () => {
+    assert.equal(typeof entity, 'function');
+    assert.equal(typeof serializable, 'function');
+  });
+});
diff --git a/test/common/workers.test.mjs b/test/common/workers.test.mjs
index a2a00f59..f1dfff83 100644
--- a/test/common/workers.test.mjs
+++ b/test/common/workers.test.mjs
@@ -1,5 +1,7 @@
 import assert from 'node:assert/strict';
+import fs from 'node:fs/promises';
 import { describe, test } from 'node:test';
+import { glob } from 'node:fs/promises';
 
 import PlatformWorker from '../../source/engine/common/PlatformWorker.ts';
 import WorkerManager from '../../source/engine/common/WorkerManager.ts';
@@ -192,3 +194,63 @@ void describe('WorkerManager', () => {
     });
   });
 });
+
+const dedicatedDir = new URL('../../dist/dedicated/', import.meta.url);
+
+void describe('Dedicated build worker output', () => {
+  void test('WorkerFactories URLs point to ./workers/*.mjs in the engine bundle', async () => {
+    const engineChunks = [];
+    const dir = new URL('./', dedicatedDir);
+
+    for await (const entry of fs.glob('engine-*.mjs', { cwd: dir })) {
+      engineChunks.push(new URL(entry, dir));
+    }
+
+    assert.ok(engineChunks.length > 0, 'expected at least one engine-*.mjs chunk in dist/dedicated/');
+
+    const code = await fs.readFile(engineChunks[0], 'utf8');
+    const workerUrlPattern = /new Worker\(new URL\(["']([^"']+)["'],\s*import\.meta\.url\)/g;
+    const urls = [...code.matchAll(workerUrlPattern)].map((m) => m[1]);
+
+    assert.ok(urls.length >= 2, `expected at least 2 worker URLs, found ${urls.length}: ${urls.join(', ')}`);
+
+    for (const url of urls) {
+      assert.ok(url.startsWith('./workers/'), `worker URL should start with ./workers/, got: ${url}`);
+      assert.ok(url.endsWith('.mjs'), `worker URL should end with .mjs, got: ${url}`);
+    }
+  });
+
+  void test('worker bundles exist in dist/dedicated/workers/', async () => {
+    const workersDir = new URL('workers/', dedicatedDir);
+
+    for (const name of ['NavigationWorker.mjs', 'DummyWorker.mjs']) {
+      const filePath = new URL(name, workersDir);
+      const stat = await fs.stat(filePath).catch(() => null);
+      assert.ok(stat !== null && stat.isFile(), `expected ${name} to exist in dist/dedicated/workers/`);
+    }
+  });
+
+  void test('worker bundles do not contain unresolved source imports', async () => {
+    const workersDir = new URL('workers/', dedicatedDir);
+    const workerFiles = [];
+
+    for await (const entry of fs.glob('*.mjs', { cwd: workersDir })) {
+      workerFiles.push(new URL(entry, workersDir));
+    }
+
+    assert.ok(workerFiles.length > 0, 'expected at least one .mjs file in dist/dedicated/workers/');
+
+    for (const file of workerFiles) {
+      const code = await fs.readFile(file, 'utf8');
+      const sourceImports = [...code.matchAll(/from\s+["']([^"']+)["']/g)]
+        .map((m) => m[1])
+        .filter((specifier) => specifier.includes('/source/') || specifier.endsWith('.ts'));
+
+      assert.deepEqual(
+        sourceImports,
+        [],
+        `${file.pathname} still imports unresolved source paths: ${sourceImports.join(', ')}`,
+      );
+    }
+  });
+});
diff --git a/vite.config.dedicated.mjs b/vite.config.dedicated.mjs
index 1c4bbe29..ff82ce4e 100644
--- a/vite.config.dedicated.mjs
+++ b/vite.config.dedicated.mjs
@@ -29,7 +29,7 @@ function dedicatedServerPathsPlugin() {
           code: code
             .replace(/^#!.*\n/, '')
             .replace(
-              "new URL('./', import.meta.url)",
+              /new URL\((['"])\.\/\1,\s*import\.meta\.url\)/,
               "new URL('../..', import.meta.url)",
             ),
           map: null,
@@ -44,7 +44,7 @@ function dedicatedServerPathsPlugin() {
       if (id.includes('/source/engine/server/Sys.ts')) {
         return {
           code: code.replace(
-            "import.meta.dirname + '/../..'",
+            /import\.meta\.dirname\s*\+\s*(['"])\/\.\.\/(\.\.)\1/,
             "import.meta.dirname + '/..'",
           ),
           map: null,
@@ -56,7 +56,7 @@ function dedicatedServerPathsPlugin() {
       // dedicatedWorkerBundlePlugin (see below).
       if (id.includes('WorkerFactories.ts')) {
         return {
-          code: code.replace(/\.\.\/server\/([^']+)\.ts/g, './workers/$1.mjs'),
+          code: code.replace(/\.\.\/server\/([^'"]+)\.ts/g, './workers/$1.mjs'),
           map: null,
         };
       }
@@ -137,14 +137,16 @@ function dedicatedWorkerBundlePlugin(mode) {
               if (!id.includes('WorkerFramework')) { return null; }
               // Replace the two-step variable + import() patterns with direct
               // literal import() calls so Rollup can statically resolve them.
+              // esbuild may convert single quotes to double quotes and reformat
+              // the import() across multiple lines, so the regexes must be flexible.
               return {
                 code: code
                   .replace(
-                    /const workerThreadsId\s*=\s*\[.*?\]\.join\([^)]+\);\s*const \{ parentPort \} = await import\(\/\* @vite-ignore \*\/ workerThreadsId\)/s,
+                    /const workerThreadsId\s*=\s*\[['"]node['"],\s*['"]worker_threads['"]\]\.join\([^)]+\);\s*const \{ parentPort \} = await import\(\s*(?:\/\*.*?\*\/\s*)?workerThreadsId\s*\)/s,
                     "const { parentPort } = await import('node:worker_threads')",
                   )
                   .replace(
-                    /const serverComId\s*=\s*\[.*?\]\.join\([^)]+\);\s*const comModule = await import\(\/\* @vite-ignore \*\/ serverComId\)/s,
+                    /const serverComId\s*=\s*\[['"]\.\.['"],\s*['"]server['"],\s*['"]Com\.ts['"]\]\.join\([^)]+\);\s*const comModule = await import\(\s*(?:\/\*.*?\*\/\s*)?serverComId\s*\)/s,
                     "const comModule = await import('../server/Com.ts')",
                   ),
                 map: null,

From 63337d43bcdc658a6e313a80748665749192666a Mon Sep 17 00:00:00 2001
From: Christian R <github@chrisnew.de>
Date: Sun, 5 Apr 2026 01:38:08 +0300
Subject: [PATCH 56/67] TS: updated instructions on how to port the game, more
 game updates

---
 .../game-logic-port.instructions.md           | 126 ++++++++++++++++--
 source/game/id1                               |   2 +-
 test/common/id1-base-entity.test.mjs          |  64 +++++++++
 test/common/id1-fish.test.mjs                 | 115 ++++++++++++++++
 4 files changed, 295 insertions(+), 12 deletions(-)
 create mode 100644 test/common/id1-fish.test.mjs

diff --git a/.github/instructions/game-logic-port.instructions.md b/.github/instructions/game-logic-port.instructions.md
index 1d3d70c2..325924c9 100644
--- a/.github/instructions/game-logic-port.instructions.md
+++ b/.github/instructions/game-logic-port.instructions.md
@@ -137,14 +137,16 @@ This catches typos at compile time. Generating the union type is straightforward
 `BaseEntity._defineSequence()` is already implemented and generates a numbered sequence of states from a prefix and frame array:
 
 ```typescript
-static _defineSequence(
+static _defineSequence<T extends BaseEntity>(
   prefix: string,
   frames: readonly (string | number)[],
-  handler: ((this: BaseEntity, frameIndex: number) => void) | null = null,
+  handler: ((this: T, frameIndex: number) => void) | null = null,
   loop = true,
 ): void;
 ```
 
+The generic `T` is inferred from the callback's `this` annotation, so subclass callbacks get full type safety without casts.
+
 States are named `${prefix}1`, `${prefix}2`, ... with the last frame looping back to `${prefix}1` by default. This collapses 8 stand-state calls into one:
 
 ```typescript
@@ -178,17 +180,19 @@ The `_modelQC` string and `_parseModelData` pattern can stay mostly as-is, but:
 - Make `_modelData` typed: `static readonly _modelData: Readonly<ParsedQC> | null`.
 - Consider moving the raw QC string into a separate `.qc` asset file loaded at build time (Vite raw import) so it doesn't bloat the TS source. Not mandatory, but cleaner for large QC definitions.
 
-#### 3d. Callbacks should be arrow functions or method references
+#### 3d. Callbacks use the concrete entity `this` type
+
+`_defineState` and `_defineSequence` are generic on `T extends BaseEntity` — the `T` is inferred from the callback's `this` annotation. Annotate callbacks with the concrete entity type to get full type safety without casts:
 
-The current `function() { this._ai.stand(); }` pattern requires `call(this)` dispatch and loses TS `this` typing. Options:
+```typescript
+this._defineSequence('f_stand', swimFrames,
+  function (this: FishMonsterEntity) { this._ai.stand(); });
 
-1. **Arrow in `_defineState`**: Already works if `_defineState` stores it and `_runState` calls `handler.call(this)`. The `this` parameter annotation gives type safety:
-   ```typescript
-   this._defineState('army_stand1', 'stand1', 'army_stand2',
-     function (this: ArmySoldierMonster) { this._ai.stand(); });
-   ```
+this._defineState('f_death21', 'death21', null,
+  function (this: FishMonsterEntity) { this.solid = solid.SOLID_NOT; });
+```
 
-2. **Named method references**: For unique behaviors (firing, refire checks), define a private method and pass its reference. More readable for complex logic.
+The generic is erased at storage time (`handler as ScheduledThinkCallback`) so the untyped `_states` record remains compatible, while `_runState` dispatches via `.call(this)` on the real entity instance.
 
 ---
 
@@ -502,4 +506,104 @@ For each `.mjs` → `.ts` entity file:
 - [ ] Verify all components (`DamageHandler`, `Sub`, `AI`) are typed via generic `EntityWrapper<T>`.
 - [ ] Run `eslint --fix` and `tsc --noEmit`.
 - [ ] Add or update unit tests for serialization round-trip and key behaviors.
-- [ ] Delete the old `.mjs` file once all importers reference the `.ts` version.
+- [ ] Convert the old `.mjs` file to a one-line re-export shim: `export { default } from './File.ts';`
+- [ ] Update internal TS imports to point to `.ts` directly (e.g. `GameAPI.ts`).
+
+---
+
+### 12. Common Pitfalls When Porting Monster Entities
+
+These issues were encountered and resolved during the Fish.mjs → Fish.ts port. They apply to all monster/entity ports.
+
+#### 12a. Callback `this` parameter in `_defineSequence` / `_defineState`
+
+`_defineSequence<T>` and `_defineState<T>` are generic — `T` is inferred from the callback's `this` annotation. Always annotate callbacks with the concrete entity type for full type safety:
+
+```typescript
+// ✅ Correct — T is inferred as FishMonsterEntity, full autocomplete on this
+this._defineSequence('f_stand', swimFrames,
+  function (this: FishMonsterEntity) { this._ai.stand(); });
+```
+
+The generic is erased when stored in `_states` (`handler as ScheduledThinkCallback`), which is safe because `_runState` always dispatches via `.call(this)` on the concrete entity instance.
+
+#### 12b. Engine edict interface properties cannot use `override`
+
+Properties like `netname`, `classname`, and other edict fields exist on the engine's `BaseEntity` **interface** (defined in `Edict.ts`), not on the game-side `BaseEntity` class. TypeScript `override` only applies to members declared in a parent class. Implementing an interface property is not an override.
+
+```typescript
+// ❌ Compile error — netname is not in the class hierarchy
+override get netname(): string { return 'a fish'; }
+
+// ✅ Correct — plain getter (implements the interface property)
+get netname(): string { return 'a fish'; }
+```
+
+#### 12c. Vector uses indexed access, not named properties
+
+The `Vector` class uses `[0]`, `[1]`, `[2]` for component access — **not** `.x`, `.y`, `.z`. There is no `Vector.of()` static factory either.
+
+```typescript
+// ❌ Wrong
+Vector.of(-16, -16, -24)
+vector.x
+
+// ✅ Correct
+new Vector(-16, -16, -24)
+vector[0]
+```
+
+#### 12d. Static `_size` must not use `as const`
+
+The parent class declares `_size` as `[Vector | null, Vector | null]` (a mutable tuple). Using `as const` on the child declaration creates a `readonly` tuple that is not assignable to the mutable parent type.
+
+```typescript
+// ❌ Compile error — readonly tuple not assignable to mutable
+static _size = [new Vector(-16, -16, -24), new Vector(16, 16, 24)] as const;
+
+// ✅ Correct — explicit mutable tuple type
+static _size: [Vector, Vector] = [new Vector(-16, -16, -24), new Vector(16, 16, 24)];
+```
+
+#### 12e. ESM circular dependency in tests
+
+Entity `.ts` files import from each other and from `GameAPI.ts`, creating circular module dependencies. In production the entry point (`GameAPI.ts`) evaluates first, establishing all bindings. In tests, importing a specific entity file directly may invert the evaluation order, causing TDZ errors.
+
+**Always `await import('GameAPI.ts')` before importing any entity class in tests:**
+
+```javascript
+// In test file — must be top-level await
+await import('../../source/game/id1/GameAPI.ts');
+const { default: FishMonsterEntity } = await import('../../source/game/id1/entity/monster/Fish.ts');
+```
+
+#### 12f. `_initStates` must be called explicitly in tests
+
+The game registry calls `_initStates()` on each entity class during bootstrap. In unit tests without the full registry, call it manually before testing state machine properties:
+
+```javascript
+FishMonsterEntity._initStates();
+```
+
+#### 12g. The `.mjs` shim pattern
+
+After porting, convert the old `.mjs` file to a one-line re-export shim so that any remaining `.mjs` importers continue to work without modification:
+
+```javascript
+// Fish.mjs — re-export shim
+export { default } from './Fish.ts';
+```
+
+Then update all **internal TypeScript imports** to point directly to `.ts`. The shim is only for external/legacy `.mjs` consumers.
+
+#### 12h. Reference port: Fish.ts
+
+`source/game/id1/entity/monster/Fish.ts` serves as the canonical example of a fully ported monster entity. It demonstrates:
+
+- `@entity` class decorator (no `@serializable` fields needed — Fish has none beyond inherited)
+- `_defineSequence` to collapse repetitive state definitions
+- Callback `this: FishMonsterEntity` with generic inference (no casts needed)
+- Non-looping sequences (`loop = false` for death)
+- Override of `_defineState` for terminal frames (attack→run, pain→run, death→null)
+- `override` on methods, `protected` on `_newEntityAI` and `hasMeleeAttack`
+- `private` on helper methods (`_fishMelee`)
diff --git a/source/game/id1 b/source/game/id1
index a5c90d2f..1efaf674 160000
--- a/source/game/id1
+++ b/source/game/id1
@@ -1 +1 @@
-Subproject commit a5c90d2f0263c09c8945604c5e009227a54a95e8
+Subproject commit 1efaf6743f3d4158c69eb33f02b574cf08019dbc
diff --git a/test/common/id1-base-entity.test.mjs b/test/common/id1-base-entity.test.mjs
index e2fe5c4c..084674ea 100644
--- a/test/common/id1-base-entity.test.mjs
+++ b/test/common/id1-base-entity.test.mjs
@@ -124,3 +124,67 @@ void describe('@entity / @serializable decorators', () => {
     assert.equal(typeof serializable, 'function');
   });
 });
+
+void describe('BaseMonster decorator port', async () => {
+  // Import GameAPI first to establish the correct ESM evaluation order.
+  // In production, GameAPI.ts is the entry point, so monster subclasses
+  // evaluate after BaseMonster.ts. In tests, importing BaseMonster.ts
+  // directly inverts that order, causing TDZ errors in subclass files.
+  await import('../../source/game/id1/GameAPI.ts');
+
+  const { default: BaseMonster, WalkMonster, FlyMonster, SwimMonster, MeatSprayEntity } =
+    await import('../../source/game/id1/entity/monster/BaseMonster.ts');
+
+  void test('BaseMonster.serializableFields is a frozen array from @entity', () => {
+    assert.ok(Array.isArray(BaseMonster.serializableFields));
+    assert.ok(Object.isFrozen(BaseMonster.serializableFields));
+  });
+
+  void test('BaseMonster decorated fields include expected keys', () => {
+    const fields = BaseMonster.serializableFields;
+    for (const key of ['pausetime', 'movetarget', 'health', 'ideal_yaw', 'yaw_speed', 'bloodcolor', 'enemy', 'goalentity', 'cnt', '_ai']) {
+      assert.ok(fields.includes(key), `missing field "${key}"`);
+    }
+  });
+
+  void test('collectSerializableFields merges BaseEntity + BaseMonster fields', () => {
+    // collectSerializableFields walks the prototype chain to merge fields from
+    // all @entity-decorated ancestors.  We verify this by constructing a mock
+    // instance whose prototype chain looks like: instance → BaseMonster → BaseEntity.
+    const merged = [...new Set([
+      ...BaseEntity.serializableFields,
+      ...BaseMonster.serializableFields,
+    ])];
+    for (const key of BaseEntity.serializableFields) {
+      assert.ok(merged.includes(key), `missing inherited field "${key}"`);
+    }
+    for (const key of BaseMonster.serializableFields) {
+      assert.ok(merged.includes(key), `missing own field "${key}"`);
+    }
+  });
+
+  void test('subclasses carry their own serializableFields from @entity', () => {
+    // WalkMonster, FlyMonster, SwimMonster add no extra @serializable fields,
+    // so their own serializableFields arrays should be empty (only BaseMonster's
+    // and BaseEntity's are inherited via collectSerializableFields at runtime).
+    for (const Ctor of [WalkMonster, FlyMonster, SwimMonster]) {
+      const fields = Ctor.serializableFields;
+      assert.ok(Array.isArray(fields), `${Ctor.name} missing serializableFields`);
+      assert.ok(Object.isFrozen(fields), `${Ctor.name} serializableFields not frozen`);
+    }
+  });
+
+  void test('MeatSprayEntity has its own decorator-generated serializableFields', () => {
+    assert.ok(Array.isArray(MeatSprayEntity.serializableFields));
+    assert.ok(Object.isFrozen(MeatSprayEntity.serializableFields));
+    // MeatSprayEntity extends BaseEntity with no extra @serializable fields,
+    // so its own array should be empty.
+    assert.equal(MeatSprayEntity.serializableFields.length, 0);
+  });
+
+  void test('non-serializable fields are excluded from BaseMonster', () => {
+    const fields = BaseMonster.serializableFields;
+    assert.ok(!fields.includes('_damageHandler'), '_damageHandler should not be serialized');
+    assert.ok(!fields.includes('_sub'), '_sub should not be serialized');
+  });
+});
diff --git a/test/common/id1-fish.test.mjs b/test/common/id1-fish.test.mjs
new file mode 100644
index 00000000..3fbb237b
--- /dev/null
+++ b/test/common/id1-fish.test.mjs
@@ -0,0 +1,115 @@
+import { describe, test } from 'node:test';
+import assert from 'node:assert/strict';
+
+// Establish correct ESM evaluation order — GameAPI is the production entry point.
+await import('../../source/game/id1/GameAPI.ts');
+
+const { default: FishMonsterEntity } = await import('../../source/game/id1/entity/monster/Fish.ts');
+
+// _initStates is normally called by the game registry during bootstrap.
+// In unit tests we trigger it manually so the state machine is available.
+FishMonsterEntity._initStates();
+
+void describe('FishMonsterEntity class metadata', () => {
+  void test('classname is monster_fish', () => {
+    assert.equal(FishMonsterEntity.classname, 'monster_fish');
+  });
+
+  void test('health is 25', () => {
+    assert.equal(FishMonsterEntity._health, 25);
+  });
+
+  void test('model default is progs/fish.mdl', () => {
+    assert.equal(FishMonsterEntity._modelDefault, 'progs/fish.mdl');
+  });
+
+  void test('size vectors are correct', () => {
+    const [mins, maxs] = FishMonsterEntity._size;
+    assert.deepEqual([mins[0], mins[1], mins[2]], [-16, -16, -24]);
+    assert.deepEqual([maxs[0], maxs[1], maxs[2]], [16, 16, 24]);
+  });
+
+  void test('serializableFields is a frozen array from @entity', () => {
+    assert.ok(Array.isArray(FishMonsterEntity.serializableFields));
+    assert.ok(Object.isFrozen(FishMonsterEntity.serializableFields));
+  });
+});
+
+void describe('FishMonsterEntity state machine', () => {
+  void test('_states is populated after _initStates', () => {
+    assert.ok(FishMonsterEntity._states !== null);
+    assert.equal(typeof FishMonsterEntity._states, 'object');
+  });
+
+  void test('stand sequence has 18 frames that loop', () => {
+    const states = FishMonsterEntity._states;
+    // f_stand1 through f_stand18, last loops to f_stand1
+    for (let i = 1; i <= 18; i++) {
+      const key = `f_stand${i}`;
+      assert.ok(key in states, `missing state ${key}`);
+      assert.equal(states[key].keyframe, `swim${i}`);
+    }
+    assert.equal(states.f_stand18.nextState, 'f_stand1');
+  });
+
+  void test('walk sequence has 18 frames that loop', () => {
+    const states = FishMonsterEntity._states;
+    for (let i = 1; i <= 18; i++) {
+      const key = `f_walk${i}`;
+      assert.ok(key in states, `missing state ${key}`);
+      assert.equal(states[key].keyframe, `swim${i}`);
+    }
+    assert.equal(states.f_walk18.nextState, 'f_walk1');
+  });
+
+  void test('run sequence uses odd swim frames and loops', () => {
+    const states = FishMonsterEntity._states;
+    // 9 run frames: swim1, swim3, swim5, ..., swim17
+    const expectedKeyframes = [1, 3, 5, 7, 9, 11, 13, 15, 17];
+    for (let i = 0; i < 9; i++) {
+      const key = `f_run${i + 1}`;
+      assert.ok(key in states, `missing state ${key}`);
+      assert.equal(states[key].keyframe, `swim${expectedKeyframes[i]}`);
+    }
+    assert.equal(states.f_run9.nextState, 'f_run1');
+  });
+
+  void test('attack sequence has 18 frames ending at f_run1', () => {
+    const states = FishMonsterEntity._states;
+    for (let i = 1; i <= 18; i++) {
+      const key = `f_atta${i}`;
+      assert.ok(key in states, `missing state ${key}`);
+      assert.equal(states[key].keyframe, `attack${i}`);
+    }
+    // Last attack frame transitions to run, not loop
+    assert.equal(states.f_atta18.nextState, 'f_run1');
+  });
+
+  void test('death sequence has 21 frames and does not loop', () => {
+    const states = FishMonsterEntity._states;
+    for (let i = 1; i <= 21; i++) {
+      const key = `f_death${i}`;
+      assert.ok(key in states, `missing state ${key}`);
+      assert.equal(states[key].keyframe, `death${i}`);
+    }
+    // Last death frame has no next state
+    assert.equal(states.f_death21.nextState, null);
+  });
+
+  void test('pain sequence has 9 frames ending at f_run1', () => {
+    const states = FishMonsterEntity._states;
+    for (let i = 1; i <= 9; i++) {
+      const key = `f_pain${i}`;
+      assert.ok(key in states, `missing state ${key}`);
+      assert.equal(states[key].keyframe, `pain${i}`);
+    }
+    assert.equal(states.f_pain9.nextState, 'f_run1');
+  });
+
+  void test('all state handlers are functions', () => {
+    const states = FishMonsterEntity._states;
+    for (const [name, state] of Object.entries(states)) {
+      assert.equal(typeof state.handler, 'function', `${name} handler should be a function`);
+    }
+  });
+});

From 4805c9669c6075d4395cf57d5bdfa9090ee55d38 Mon Sep 17 00:00:00 2001
From: Christian R <github@chrisnew.de>
Date: Sun, 5 Apr 2026 02:01:51 +0300
Subject: [PATCH 57/67] TS: making GameAPIs more solid

---
 .../game-logic-port.instructions.md           | 31 +++++++++++++++++++
 package.json                                  |  2 +-
 .../client/ClientServerCommandHandlers.ts     |  2 +-
 source/engine/common/GameAPIs.ts              |  4 +--
 source/engine/server/ServerMessages.ts        | 16 +++++-----
 source/game/id1                               |  2 +-
 6 files changed, 44 insertions(+), 13 deletions(-)

diff --git a/.github/instructions/game-logic-port.instructions.md b/.github/instructions/game-logic-port.instructions.md
index 325924c9..dd8512c3 100644
--- a/.github/instructions/game-logic-port.instructions.md
+++ b/.github/instructions/game-logic-port.instructions.md
@@ -607,3 +607,34 @@ Then update all **internal TypeScript imports** to point directly to `.ts`. The
 - Override of `_defineState` for terminal frames (attack→run, pain→run, death→null)
 - `override` on methods, `protected` on `_newEntityAI` and `hasMeleeAttack`
 - `private` on helper methods (`_fishMelee`)
+
+#### 12i. `SpawnEntity<T>` — Generic Entity Spawning
+
+`ServerEngineAPI.SpawnEntity` accepts an optional generic type parameter `T` that narrows the returned edict's `.entity` to the expected entity class. Since TypeScript generics are erased at runtime, the generic is a caller-side assertion — always pair it with a `console.assert(… instanceof …)` to validate at runtime.
+
+```typescript
+// ❌ Old pattern — manual `as` cast, no runtime check
+const backpack = this.engine.SpawnEntity(BackpackEntity.classname, {
+  origin: this.origin.copy(),
+  regeneration_time: 0,
+})?.entity as BackpackEntity | undefined;
+
+backpack?.toss();
+
+// ✅ New pattern — generic + instanceof assert
+const backpack = this.engine.SpawnEntity<BackpackEntity>(BackpackEntity.classname, {
+  origin: this.origin.copy(),
+  regeneration_time: 0,
+})?.entity!;
+
+console.assert(backpack instanceof BackpackEntity);
+
+backpack.toss();
+```
+
+Key rules:
+
+- **Always pass the concrete entity class** as the generic argument: `SpawnEntity<BackpackEntity>(…)`.
+- **Always follow with `console.assert(result instanceof EntityClass)`** — the generic cannot be checked at runtime by the engine, so the call site must verify.
+- **Use `!` (non-null assertion) on `.entity`** when the spawn is expected to succeed. If failure is a possibility, use `?.` and guard accordingly.
+- **Never use `as EntityClass | undefined`** to narrow the result — prefer the generic parameter instead.
diff --git a/package.json b/package.json
index 841ceac6..06ea677b 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "quakeshack",
-  "version": "1.0.0",
+  "version": "1.2.0",
   "main": "dedicated.ts",
   "type": "module",
   "repository": "https://github.com/chrisnew/quakeshack",
diff --git a/source/engine/client/ClientServerCommandHandlers.ts b/source/engine/client/ClientServerCommandHandlers.ts
index 2edc6785..902d413b 100644
--- a/source/engine/client/ClientServerCommandHandlers.ts
+++ b/source/engine/client/ClientServerCommandHandlers.ts
@@ -97,7 +97,7 @@ function parseServerData() {
       throw new HostError(`Server is running game ${game}, not ${COM.game}\n`);
     }
 
-    document.title = `${game} on ${Def.productName} (${Host.version?.string ?? 'unknown'})`;
+    document.title = `${game} on ${Def.productName} (${Host.version!.string})`;
   }
 
   CL.state.maxclients = NET.message.readByte();
diff --git a/source/engine/common/GameAPIs.ts b/source/engine/common/GameAPIs.ts
index 56735e34..9bfa8d16 100644
--- a/source/engine/common/GameAPIs.ts
+++ b/source/engine/common/GameAPIs.ts
@@ -712,7 +712,7 @@ export class ServerEngineAPI extends CommonEngineAPI {
    * Spawn an Edict, not an entity.
    * @returns The spawned edict, or `null` on failure.
    */
-  static SpawnEntity(classname: string, initialData: Record<string, EdictValueType> = {}): ServerEdict | null {
+  static SpawnEntity<T = BaseEntity>(classname: string, initialData: Record<string, EdictValueType> = {}): (Omit<ServerEdict, 'entity'> & { entity: T }) | null {
     const edict = ED.Alloc();
     const normalizedInitialData = normalizeEntityInitialData(initialData);
 
@@ -734,7 +734,7 @@ export class ServerEngineAPI extends CommonEngineAPI {
       throw e;
     }
 
-    return edict;
+    return edict as unknown as Omit<ServerEdict, 'entity'> & { entity: T };
   }
 
   static IsLoading(): boolean {
diff --git a/source/engine/server/ServerMessages.ts b/source/engine/server/ServerMessages.ts
index a8b1e1ef..75e5e206 100644
--- a/source/engine/server/ServerMessages.ts
+++ b/source/engine/server/ServerMessages.ts
@@ -175,7 +175,7 @@ export class ServerMessages {
     const worldspawnEntity = requireWorldspawnEntity();
 
     message.writeByte(Protocol.svc.print);
-    message.writeString(`\x02\nVERSION ${Host.version.string} SERVER (${SV.server.gameVersion})\n`);
+    message.writeString(`\x02\nVERSION ${Host.version!.string} SERVER (${SV.server.gameVersion})\n`);
 
     message.writeByte(Protocol.svc.serverdata);
     message.writeByte(Protocol.version);
@@ -194,7 +194,7 @@ export class ServerMessages {
     }
 
     message.writeByte(SV.svs.maxclients);
-    message.writeString(worldspawnEntity.message || SV.server.mapname);
+    message.writeString(worldspawnEntity.message || SV.server.mapname!);
     // SV.pmove.movevars.sendToClient(message);
     for (let i = 1; i < SV.server.modelPrecache.length; i++) {
       message.writeString(SV.server.modelPrecache[i]);
@@ -472,13 +472,13 @@ export class ServerMessages {
       return false;
     }
 
-    console.assert(to.num > 0, 'valid entity num', to.num);
+    console.assert(to.num !== null && to.num > 0, 'valid entity num', to.num);
 
-    msg.writeUint16(to.num);
+    msg.writeUint16(to.num!);
     msg.writeUint16(bits);
 
     if (bits & Protocol.u.classname) {
-      msg.writeString(to.classname);
+      msg.writeString(to.classname!);
     }
 
     if (bits & Protocol.u.free) {
@@ -534,8 +534,8 @@ export class ServerMessages {
     }
 
     if (SV.server.gameCapabilities.includes(Defs.gameCapabilities.CAP_ENTITY_EXTENDED)) {
-      if (SV.server.clientEntityFields[to.classname]) {
-        const entityFields = SV.server.clientEntityFields[to.classname];
+      if (SV.server.clientEntityFields[to.classname!]) {
+        const entityFields = SV.server.clientEntityFields[to.classname!];
         const fields = entityFields.fields;
         const bitsWriter = entityFields.bitsWriter as BitsWriter | null;
 
@@ -565,7 +565,7 @@ export class ServerMessages {
   writeEntitiesToClient(clientEdict: ServerEdict, msg: SzBuffer): boolean {
     const clientEntity = requireEntity(clientEdict);
     const origin = clientEntity.origin.copy().add(clientEntity.view_ofs);
-    const pvs = SV.server.worldmodel.getFatPvsByPoint(origin);
+    const pvs = SV.server.worldmodel!.getFatPvsByPoint(origin);
 
     let changes = this.writePlayersToClient(clientEdict, pvs, msg) ? 1 : 0;
 
diff --git a/source/game/id1 b/source/game/id1
index 1efaf674..6e3651b5 160000
--- a/source/game/id1
+++ b/source/game/id1
@@ -1 +1 @@
-Subproject commit 1efaf6743f3d4158c69eb33f02b574cf08019dbc
+Subproject commit 6e3651b521ce839094f22a05e27181d9204be660

From 8abdc2c4a1ae3c51c50bc9ae9f3c3eb503527c7f Mon Sep 17 00:00:00 2001
From: Christian R <github@chrisnew.de>
Date: Mon, 6 Apr 2026 00:37:34 +0300
Subject: [PATCH 58/67] installed fallow to detect dead code and unused files

---
 .fallowrc.json    |  11 ++++
 .gitignore        |   1 +
 package-lock.json | 155 +++++++++++++++++++++++++++++++++++++++++-----
 package.json      |   3 +-
 4 files changed, 151 insertions(+), 19 deletions(-)
 create mode 100644 .fallowrc.json

diff --git a/.fallowrc.json b/.fallowrc.json
new file mode 100644
index 00000000..0d478b56
--- /dev/null
+++ b/.fallowrc.json
@@ -0,0 +1,11 @@
+{
+  "entry": [
+    "source/cloudflare/worker.mjs",
+    "source/engine/main-browser.ts",
+    "source/game/**/main.ts"
+  ],
+  "ignorePatterns": [
+    ".fallow/**",
+    "dist/**"
+  ]
+}
diff --git a/.gitignore b/.gitignore
index 37757113..86861dae 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ data/id1/*.pak
 data/
 dist/
 .wrangler/
+.fallow/
diff --git a/package-lock.json b/package-lock.json
index 79c00d5c..451c5181 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,16 +1,14 @@
 {
   "name": "quakeshack",
-  "version": "1.0.0",
+  "version": "1.2.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "quakeshack",
-      "version": "1.0.0",
+      "version": "1.2.0",
       "license": "GPL-2.0-only",
       "dependencies": {
-        "ammojs3": "^0.0.11",
-        "cannon": "^0.6.2",
         "express": "^4.21.2",
         "ws": "^8.18.0"
       },
@@ -25,6 +23,7 @@
         "eslint-plugin-jsdoc": "^50.6.3",
         "eslint-plugin-sort-class-members": "^1.21.0",
         "eslint-plugin-types": "^1.0.2",
+        "fallow": "^2.13.3",
         "globals": "^15.14.0",
         "tsx": "^4.21.0",
         "typescript": "^5.9.3",
@@ -722,6 +721,104 @@
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       }
     },
+    "node_modules/@fallow-cli/darwin-arm64": {
+      "version": "2.13.3",
+      "resolved": "https://registry.npmjs.org/@fallow-cli/darwin-arm64/-/darwin-arm64-2.13.3.tgz",
+      "integrity": "sha512-qYB2WyBG/7I4hvBSiCeb/H7v3E+dpUmynfBTwUNvCKEq8xs9e4xPWUR+xUfYYDQ537x0/iyy1CC1Bsuj+ZBkdQ==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ]
+    },
+    "node_modules/@fallow-cli/darwin-x64": {
+      "version": "2.13.3",
+      "resolved": "https://registry.npmjs.org/@fallow-cli/darwin-x64/-/darwin-x64-2.13.3.tgz",
+      "integrity": "sha512-yl1uGsZ7YJWiLrhRO7N02kgeOL+wCshTh9d13i6HWVz31w4dARAwF3xUblWSsjQzMaIbWvL6f/Oy79tv17K8LA==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ]
+    },
+    "node_modules/@fallow-cli/linux-arm64-gnu": {
+      "version": "2.13.3",
+      "resolved": "https://registry.npmjs.org/@fallow-cli/linux-arm64-gnu/-/linux-arm64-gnu-2.13.3.tgz",
+      "integrity": "sha512-wz1Pxid3ZMhqGn5gm9/BybH30y1I1wlyh6aV0S2l6aGqI3R1uTdBZLqkSHpEPwRK+hNSjnBojAgNA9VTda3yHA==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@fallow-cli/linux-arm64-musl": {
+      "version": "2.13.3",
+      "resolved": "https://registry.npmjs.org/@fallow-cli/linux-arm64-musl/-/linux-arm64-musl-2.13.3.tgz",
+      "integrity": "sha512-JTIK2nf09hNq2S997YpaIR2VORnJhkkvYC6CIrbvP6Gmi78goIsmCQsZKHxRyKtR7axhxHt6b2pIEd5eqv5C1Q==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@fallow-cli/linux-x64-gnu": {
+      "version": "2.13.3",
+      "resolved": "https://registry.npmjs.org/@fallow-cli/linux-x64-gnu/-/linux-x64-gnu-2.13.3.tgz",
+      "integrity": "sha512-ynvds9eX6nAkD70Mq74hfsL5UHbkDh/aNwZ/vzbsTOglCYOvM3PejBBAD/KBT1CHLK5MdLAjXSJM7JDsFwi8Rg==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@fallow-cli/linux-x64-musl": {
+      "version": "2.13.3",
+      "resolved": "https://registry.npmjs.org/@fallow-cli/linux-x64-musl/-/linux-x64-musl-2.13.3.tgz",
+      "integrity": "sha512-GWu2WJEz5397fzu/74q8PNUzIBy5YwPAbLHQhJH5ttUg5BpB2kYXlgh5ZsglqwjdNDlxHwY1Z+NXjsyCYKSylg==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@fallow-cli/win32-x64-msvc": {
+      "version": "2.13.3",
+      "resolved": "https://registry.npmjs.org/@fallow-cli/win32-x64-msvc/-/win32-x64-msvc-2.13.3.tgz",
+      "integrity": "sha512-de3f1R5bzv1LPnFs5NQpW2+IM8v0/VzmXY3DkiORWyoSANrnAa5fv8QpZnr5hl2iAM4c1ytEYNzmvfC7983SCg==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ]
+    },
     "node_modules/@humanfs/core": {
       "version": "0.19.1",
       "resolved": "https://registry.npmjs.org/@humanfs/core/-/core-0.19.1.tgz",
@@ -1455,11 +1552,6 @@
         "url": "https://github.com/sponsors/epoberezkin"
       }
     },
-    "node_modules/ammojs3": {
-      "version": "0.0.11",
-      "resolved": "https://registry.npmjs.org/ammojs3/-/ammojs3-0.0.11.tgz",
-      "integrity": "sha512-pfnMm0XvTLjzCt+ytdpV3aIgooxQzexjkC2DbTyiGsAk8ECEBPxJ8gOQ/m0CE+d9pf9ToPMK8PZJR7jP1h6lOA=="
-    },
     "node_modules/ansi-styles": {
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
@@ -1609,14 +1701,6 @@
         "node": ">=6"
       }
     },
-    "node_modules/cannon": {
-      "version": "0.6.2",
-      "resolved": "https://registry.npmjs.org/cannon/-/cannon-0.6.2.tgz",
-      "integrity": "sha512-n/7wWSXr8KOSvjad2x0fJHgpMepKjOKi+NdSnjfYyijoDBZnp4JQKgPcpv28jlXoWM+N9zVYU09J0A6Qxx+Y7w==",
-      "engines": {
-        "node": "*"
-      }
-    },
     "node_modules/chalk": {
       "version": "4.1.2",
       "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
@@ -1766,6 +1850,16 @@
         "npm": "1.2.8000 || >= 1.4.16"
       }
     },
+    "node_modules/detect-libc": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.1.2.tgz",
+      "integrity": "sha512-Btj2BOOO83o3WyH59e8MgXsxEQVcarkUOpEYrubB0urwnN10yQ364rsiByU11nZlqWYZm05i/of7io4mzihBtQ==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/dunder-proto": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/dunder-proto/-/dunder-proto-1.0.1.tgz",
@@ -2215,6 +2309,33 @@
       "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
       "license": "MIT"
     },
+    "node_modules/fallow": {
+      "version": "2.13.3",
+      "resolved": "https://registry.npmjs.org/fallow/-/fallow-2.13.3.tgz",
+      "integrity": "sha512-01R2cTup/ECQlZUCB3f+3nP0fvS0lCJIAqq4qNIsR+7O1izo40Lb5UW8AJICkzrNkpI2A570EUrHyrQMy8w8tg==",
+      "dev": true,
+      "hasInstallScript": true,
+      "license": "MIT",
+      "dependencies": {
+        "detect-libc": "^2.0.0"
+      },
+      "bin": {
+        "fallow": "bin/fallow",
+        "fallow-mcp": "bin/fallow-mcp"
+      },
+      "engines": {
+        "node": ">=16"
+      },
+      "optionalDependencies": {
+        "@fallow-cli/darwin-arm64": "2.13.3",
+        "@fallow-cli/darwin-x64": "2.13.3",
+        "@fallow-cli/linux-arm64-gnu": "2.13.3",
+        "@fallow-cli/linux-arm64-musl": "2.13.3",
+        "@fallow-cli/linux-x64-gnu": "2.13.3",
+        "@fallow-cli/linux-x64-musl": "2.13.3",
+        "@fallow-cli/win32-x64-msvc": "2.13.3"
+      }
+    },
     "node_modules/fast-deep-equal": {
       "version": "3.1.3",
       "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
diff --git a/package.json b/package.json
index 06ea677b..f28a779b 100644
--- a/package.json
+++ b/package.json
@@ -20,14 +20,13 @@
     "eslint-plugin-jsdoc": "^50.6.3",
     "eslint-plugin-sort-class-members": "^1.21.0",
     "eslint-plugin-types": "^1.0.2",
+    "fallow": "^2.13.3",
     "globals": "^15.14.0",
     "tsx": "^4.21.0",
     "typescript": "^5.9.3",
     "vite": "^7.1.12"
   },
   "dependencies": {
-    "ammojs3": "^0.0.11",
-    "cannon": "^0.6.2",
     "express": "^4.21.2",
     "ws": "^8.18.0"
   },

From 219ac05b881c0b9123e5b5bba0999cc84c97ac7b Mon Sep 17 00:00:00 2001
From: Christian R <github@chrisnew.de>
Date: Mon, 6 Apr 2026 12:19:43 +0300
Subject: [PATCH 59/67] TS: huge polish of files, more TS stuff, also
 overhauled Key

---
 .plan                                         |   9 +-
 docs/code-style-guide.md                      |   6 +-
 docs/console.md                               |   6 +-
 eslint.config.mjs                             |  38 ++
 package-lock.json                             | 100 +++
 package.json                                  |   6 +-
 source/engine/client/CDAudio.ts               |   8 +-
 source/engine/client/CL.ts                    |   6 +-
 source/engine/client/ClientConnection.ts      |   3 +-
 source/engine/client/ClientEntities.ts        |  10 +-
 source/engine/client/ClientMessages.ts        |   4 +-
 .../client/ClientServerCommandHandlers.ts     |   9 +-
 source/engine/client/ClientState.ts           |   2 +-
 source/engine/client/Draw.ts                  |   2 +-
 source/engine/client/GL.ts                    |  23 +-
 source/engine/client/Key.ts                   | 575 ++++++++++--------
 source/engine/client/LegacyServerCommands.ts  |   9 +-
 source/engine/client/Menu.ts                  |  81 +--
 source/engine/client/R.ts                     |  33 +-
 source/engine/client/SCR.ts                   |  17 +-
 source/engine/client/Sbar.ts                  |  11 +-
 source/engine/client/Sound.ts                 |   8 +-
 source/engine/client/Sys.ts                   |   1 -
 source/engine/client/V.ts                     |   1 +
 source/engine/client/menu/MenuItem.ts         |  10 +-
 source/engine/client/menu/MenuPage.ts         |   5 +-
 source/engine/client/menu/Multiplayer.ts      |   6 +-
 .../client/renderer/AliasModelRenderer.ts     |  13 +-
 .../client/renderer/BrushModelRenderer.ts     | 232 +++----
 .../client/renderer/MeshModelRenderer.ts      |   7 +-
 .../engine/client/renderer/ModelRenderer.ts   |   7 +-
 source/engine/client/renderer/PostProcess.ts  |   6 +-
 source/engine/client/renderer/ShadowMap.ts    |  86 +--
 source/engine/client/renderer/Sky.ts          |   2 +-
 .../client/renderer/SpriteModelRenderer.ts    |   7 +-
 source/engine/common/CollisionModelSource.ts  |   3 +-
 source/engine/common/Console.ts               |  15 +-
 source/engine/common/Cvar.ts                  |   4 +-
 source/engine/common/Def.ts                   |  16 +-
 source/engine/common/GameAPIs.ts              |   8 +-
 source/engine/common/Host.ts                  |  22 +-
 source/engine/common/Mod.ts                   |  50 +-
 source/engine/common/Pmove.ts                 | 139 +++--
 source/engine/common/WorkerManager.ts         |   5 +
 source/engine/common/model/BSP.ts             |  22 +-
 source/engine/common/model/BaseModel.ts       |   3 +-
 .../common/model/loaders/AliasMDLLoader.ts    |   5 +-
 .../common/model/loaders/BSP29Loader.ts       |  80 ++-
 .../engine/common/model/loaders/BSP2Loader.ts |  11 +-
 .../model/loaders/WavefrontOBJLoader.ts       |   2 +-
 source/engine/network/MSG.ts                  |   2 +-
 source/engine/network/Network.ts              |   2 +
 source/engine/network/NetworkDrivers.ts       |  18 +-
 source/engine/network/Protocol.ts             |   4 +-
 source/engine/server/DummyWorker.ts           |   4 +-
 source/engine/server/Edict.ts                 |  59 +-
 source/engine/server/Navigation.ts            |  54 +-
 source/engine/server/NavigationWorker.ts      |   5 +-
 source/engine/server/Progs.ts                 |  47 +-
 source/engine/server/ProgsAPI.ts              |  25 +-
 source/engine/server/Server.ts                |  10 +-
 source/engine/server/ServerMessages.ts        |   2 +-
 source/engine/server/Sys.ts                   |  12 +-
 source/engine/server/physics/ServerArea.ts    |   6 +-
 .../server/physics/ServerClientPhysics.ts     |  17 +-
 .../engine/server/physics/ServerCollision.ts  |  14 +-
 .../server/physics/ServerCollisionSupport.ts  |   3 +-
 .../physics/ServerLegacyHullCollision.ts      |   4 +-
 .../engine/server/physics/ServerMovement.ts   |  10 +-
 source/engine/server/physics/ServerPhysics.ts |  62 +-
 source/shared/Defs.ts                         |   3 +-
 source/shared/Keys.ts                         |   4 +
 source/shared/Vector.ts                       |   6 +-
 test/client/key.test.mjs                      | 118 +++-
 test/common/model-cache.test.mjs              |  74 +--
 test/physics/server-physics.test.mjs          |   4 +-
 test/renderer/brush-model-renderer.test.mjs   |   2 +-
 tsconfig.json                                 |  12 +-
 78 files changed, 1357 insertions(+), 960 deletions(-)

diff --git a/.plan b/.plan
index 7c95cf36..4b5d54d8 100644
--- a/.plan
+++ b/.plan
@@ -34,7 +34,7 @@ Grouped by sections and then sorted by priority (more or less).
 - [_] CL: go over the client API again, too much confusing lingo here and there after me hacking in lots of features
 - [_] SV: cleanup the `SV.WriteEntitiesToClient` mess a bit, make it more flexible
 - [_] cleanup `charCodeAt` everywhere
-- [_] completely get rid of `Host.client`
+- [X] completely get rid of `Host.client`
 - [X] refactor `MSG`/`SZ` especially in regards to `NET.message` and `client[…].message`
 - [_] `CL.state.intermission`/`ExitIntermission`: unsure what happens next on DS
 - [_] remove C style code that is almost verbatim from Quake
@@ -157,6 +157,13 @@ Grouped by sections and then sorted by priority (more or less).
 
 ## Log
 
+### 2026-04-05
+
+- The Grand TypeScript Port™
+  - due to the use of annotations, dedicated must be transpiled before run
+  - decided to ditch QuakeC VM and legacy code paths completely
+  - decided to ditch old SBar code as well
+
 ### 2026-04-01
 
 - removed nipplejs
diff --git a/docs/code-style-guide.md b/docs/code-style-guide.md
index a03e0945..1d464b95 100644
--- a/docs/code-style-guide.md
+++ b/docs/code-style-guide.md
@@ -96,11 +96,11 @@ eventBus.subscribe('registry.frozen', () => {
 ```javascript
 // ❌ NEVER ACCESS DIRECTLY - This breaks in nested scopes and loses type inference
 registry.Con.DPrint(...);  // WRONG!
-registry.Mod.type.brush;    // WRONG!
+registry.Mod.ClearAll();    // WRONG!
 
 // ✅ ALWAYS USE - Destructured variables work everywhere
 Con.DPrint(...);           // CORRECT!
-Mod.type.brush;            // CORRECT!
+Mod.ClearAll();            // CORRECT!
 ```
 
 **Important:** Even in files that already have registry access, always set up the destructuring prolog at the top of the file. Never use `registry.ModuleName` syntax anywhere in the code.
@@ -286,7 +286,7 @@ _renderOpaqueSurfaces(clmodel) {
 
 ### Constants
 - Use UPPER_CASE for true constants
-- Use `Mod.type.brush` pattern for enum-like values
+- Use native enums like `ModelType.brush` for enum-like values
 
 ### Files
 - Use PascalCase for class files: `BrushModelRenderer.mjs`
diff --git a/docs/console.md b/docs/console.md
index 5f0d93c5..31e8ea87 100644
--- a/docs/console.md
+++ b/docs/console.md
@@ -12,9 +12,9 @@ Everything related to this is in:
 * `Con.DrawNotify` is responsible for drawing the chat input box.
 * `Con.DrawInput` draws the input box for the actual console.
 * `Con.DrawConsole` is responsible for drawing everything.
-* `Key.dest.value` decides what is receiving key strokes:
-  * `Key.dest.console` is for the console
-  * `Key.dest.message` is for chatting
+* `Key.destination` decides what is receiving key strokes:
+  * `KeyDestination.console` is for the console
+  * `KeyDestination.message` is for chatting
   * However, actual handling of the key strokes is happening in `Key.Console`.
 
 ### Console Background Customization
diff --git a/eslint.config.mjs b/eslint.config.mjs
index b01d7901..83d2dfd1 100644
--- a/eslint.config.mjs
+++ b/eslint.config.mjs
@@ -78,6 +78,43 @@ const commonRules = /** @type {import('eslint').Linter.RulesRecord} */ ({
   '@typescript-eslint/no-redundant-type-constituents': 'warn',
 });
 
+/** Extra strict rules applied only to TypeScript files. */
+const tsStrictRules = /** @type {import('eslint').Linter.RulesRecord} */ ({
+  // Replace base rules with TS-aware extension equivalents
+  'consistent-return': 'off',
+  '@typescript-eslint/consistent-return': 'error',
+  'no-duplicate-imports': 'off',
+
+  // Strict type-checked rules
+  '@typescript-eslint/no-base-to-string': 'error',
+  '@typescript-eslint/no-confusing-void-expression': 'error',
+  '@typescript-eslint/no-duplicate-enum-values': 'error',
+  '@typescript-eslint/no-duplicate-type-constituents': 'error',
+  '@typescript-eslint/no-for-in-array': 'error',
+  '@typescript-eslint/no-implied-eval': 'error',
+  '@typescript-eslint/no-mixed-enums': 'error',
+  '@typescript-eslint/no-non-null-asserted-nullish-coalescing': 'error',
+  '@typescript-eslint/no-non-null-asserted-optional-chain': 'error',
+  '@typescript-eslint/no-redundant-type-constituents': 'error',
+  '@typescript-eslint/no-unnecessary-boolean-literal-compare': 'error',
+  '@typescript-eslint/no-unnecessary-template-expression': 'error',
+  '@typescript-eslint/no-unnecessary-type-constraint': 'error',
+  '@typescript-eslint/no-unnecessary-type-conversion': 'error',
+  '@typescript-eslint/no-unsafe-enum-comparison': 'error',
+  '@typescript-eslint/no-useless-constructor': 'error',
+  '@typescript-eslint/only-throw-error': 'error',
+  '@typescript-eslint/prefer-promise-reject-errors': 'error',
+  '@typescript-eslint/prefer-reduce-type-parameter': 'error',
+  '@typescript-eslint/prefer-return-this-type': 'error',
+  '@typescript-eslint/restrict-plus-operands': ['error', {
+    allowNumberAndString: true,
+  }],
+  '@typescript-eslint/restrict-template-expressions': 'off',
+  '@typescript-eslint/return-await': ['error', 'error-handling-correctness-only'],
+  '@typescript-eslint/unbound-method': 'warn',
+  '@typescript-eslint/unified-signatures': 'error',
+});
+
 export default defineConfig([
   {
     ignores: [
@@ -117,6 +154,7 @@ export default defineConfig([
     },
     rules: {
       ...commonRules,
+      ...tsStrictRules,
       'jsdoc/check-param-names': 'off',
       'jsdoc/require-param': 'off',
       'jsdoc/require-param-type': 'off',
diff --git a/package-lock.json b/package-lock.json
index 451c5181..8c42532a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -15,7 +15,9 @@
       "devDependencies": {
         "@eslint/js": "^9.17.0",
         "@stylistic/eslint-plugin": "^5.2.2",
+        "@types/express": "^5.0.6",
         "@types/node": "^24.6.1",
+        "@types/ws": "^8.18.1",
         "@typescript-eslint/eslint-plugin": "^8.46.4",
         "@typescript-eslint/parser": "^8.46.4",
         "eslint": "^9.19.0",
@@ -1242,6 +1244,27 @@
         "eslint": "^9.0.0 || ^10.0.0"
       }
     },
+    "node_modules/@types/body-parser": {
+      "version": "1.19.6",
+      "resolved": "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.6.tgz",
+      "integrity": "sha512-HLFeCYgz89uk22N5Qg3dvGvsv46B8GLvKKo1zKG4NybA8U2DiEO3w9lqGg29t/tfLRJpJ6iQxnVw4OnB7MoM9g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/connect": "*",
+        "@types/node": "*"
+      }
+    },
+    "node_modules/@types/connect": {
+      "version": "3.4.38",
+      "resolved": "https://registry.npmjs.org/@types/connect/-/connect-3.4.38.tgz",
+      "integrity": "sha512-K6uROf1LD88uDQqJCktA4yzL1YYAK6NgfsI0v/mTgyPKWsX1CnJ0XPSDhViejru1GcRkLWb8RlzFYJRqGUbaug==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/node": "*"
+      }
+    },
     "node_modules/@types/estree": {
       "version": "1.0.8",
       "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.8.tgz",
@@ -1249,6 +1272,38 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/@types/express": {
+      "version": "5.0.6",
+      "resolved": "https://registry.npmjs.org/@types/express/-/express-5.0.6.tgz",
+      "integrity": "sha512-sKYVuV7Sv9fbPIt/442koC7+IIwK5olP1KWeD88e/idgoJqDm3JV/YUiPwkoKK92ylff2MGxSz1CSjsXelx0YA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/body-parser": "*",
+        "@types/express-serve-static-core": "^5.0.0",
+        "@types/serve-static": "^2"
+      }
+    },
+    "node_modules/@types/express-serve-static-core": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-5.1.1.tgz",
+      "integrity": "sha512-v4zIMr/cX7/d2BpAEX3KNKL/JrT1s43s96lLvvdTmza1oEvDudCqK9aF/djc/SWgy8Yh0h30TZx5VpzqFCxk5A==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/node": "*",
+        "@types/qs": "*",
+        "@types/range-parser": "*",
+        "@types/send": "*"
+      }
+    },
+    "node_modules/@types/http-errors": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/@types/http-errors/-/http-errors-2.0.5.tgz",
+      "integrity": "sha512-r8Tayk8HJnX0FztbZN7oVqGccWgw98T/0neJphO91KkmOzug1KkofZURD4UaD5uH8AqcFLfdPErnBod0u71/qg==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/@types/json-schema": {
       "version": "7.0.15",
       "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.15.tgz",
@@ -1266,6 +1321,51 @@
         "undici-types": "~7.16.0"
       }
     },
+    "node_modules/@types/qs": {
+      "version": "6.15.0",
+      "resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.15.0.tgz",
+      "integrity": "sha512-JawvT8iBVWpzTrz3EGw9BTQFg3BQNmwERdKE22vlTxawwtbyUSlMppvZYKLZzB5zgACXdXxbD3m1bXaMqP/9ow==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@types/range-parser": {
+      "version": "1.2.7",
+      "resolved": "https://registry.npmjs.org/@types/range-parser/-/range-parser-1.2.7.tgz",
+      "integrity": "sha512-hKormJbkJqzQGhziax5PItDUTMAM9uE2XXQmM37dyd4hVM+5aVl7oVxMVUiVQn2oCQFN/LKCZdvSM0pFRqbSmQ==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@types/send": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/@types/send/-/send-1.2.1.tgz",
+      "integrity": "sha512-arsCikDvlU99zl1g69TcAB3mzZPpxgw0UQnaHeC1Nwb015xp8bknZv5rIfri9xTOcMuaVgvabfIRA7PSZVuZIQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/node": "*"
+      }
+    },
+    "node_modules/@types/serve-static": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/@types/serve-static/-/serve-static-2.2.0.tgz",
+      "integrity": "sha512-8mam4H1NHLtu7nmtalF7eyBH14QyOASmcxHhSfEoRyr0nP/YdoesEtU+uSRvMe96TW/HPTtkoKqQLl53N7UXMQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/http-errors": "*",
+        "@types/node": "*"
+      }
+    },
+    "node_modules/@types/ws": {
+      "version": "8.18.1",
+      "resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.18.1.tgz",
+      "integrity": "sha512-ThVF6DCVhA8kUGy+aazFQ4kXQ7E1Ty7A3ypFOe0IcJV8O/M511G99AW24irKrW56Wt44yG9+ij8FaqoBGkuBXg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/node": "*"
+      }
+    },
     "node_modules/@typescript-eslint/eslint-plugin": {
       "version": "8.56.1",
       "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.56.1.tgz",
diff --git a/package.json b/package.json
index f28a779b..bab2acab 100644
--- a/package.json
+++ b/package.json
@@ -12,7 +12,9 @@
   "devDependencies": {
     "@eslint/js": "^9.17.0",
     "@stylistic/eslint-plugin": "^5.2.2",
+    "@types/express": "^5.0.6",
     "@types/node": "^24.6.1",
+    "@types/ws": "^8.18.1",
     "@typescript-eslint/eslint-plugin": "^8.46.4",
     "@typescript-eslint/parser": "^8.46.4",
     "eslint": "^9.19.0",
@@ -42,8 +44,8 @@
     "build": "vite build",
     "build:production": "vite build --mode production",
     "watch": "vite build --watch",
-    "lint": "eslint source",
-    "lint-fix": "eslint --fix source",
+    "lint": "eslint --fix source dedicated.ts eslint.config.mjs vite.config.mjs vite.config.dedicated.mjs",
+    "check": "npm run typecheck && npm run lint",
     "dedicated:dev": "vite build --watch --mode development --config vite.config.dedicated.mjs",
     "dedicated:build": "vite build --config vite.config.dedicated.mjs",
     "dedicated:build:production": "vite build --config vite.config.dedicated.mjs --mode production",
diff --git a/source/engine/client/CDAudio.ts b/source/engine/client/CDAudio.ts
index 222a8539..d90cd0f7 100644
--- a/source/engine/client/CDAudio.ts
+++ b/source/engine/client/CDAudio.ts
@@ -155,10 +155,10 @@ export default class CDAudio {
     CDAudio.initialized = true;
     CDAudio.enabled = true;
     CDAudio.Update();
-    CDAudio.#eventListeners.push(eventBus.subscribe('client.cdtrack', (track: number) => CDAudio.Play(track, true)));
-    CDAudio.#eventListeners.push(eventBus.subscribe('client.paused', () => CDAudio.Pause()));
-    CDAudio.#eventListeners.push(eventBus.subscribe('client.unpaused', () => CDAudio.Resume()));
-    CDAudio.#eventListeners.push(eventBus.subscribe('client.disconnected', () => CDAudio.Stop()));
+    CDAudio.#eventListeners.push(eventBus.subscribe('client.cdtrack', (track: number) => { CDAudio.Play(track, true); }));
+    CDAudio.#eventListeners.push(eventBus.subscribe('client.paused', () => { CDAudio.Pause(); }));
+    CDAudio.#eventListeners.push(eventBus.subscribe('client.unpaused', () => { CDAudio.Resume(); }));
+    CDAudio.#eventListeners.push(eventBus.subscribe('client.disconnected', () => { CDAudio.Stop(); }));
     Con.DPrint('CD Audio Initialized\n');
   }
 
diff --git a/source/engine/client/CL.ts b/source/engine/client/CL.ts
index cfb6e591..2f23e7eb 100644
--- a/source/engine/client/CL.ts
+++ b/source/engine/client/CL.ts
@@ -112,7 +112,7 @@ export default class CL {
   }
 
   static InitGame(): void {
-    return ClientLifecycle.initGame();
+    ClientLifecycle.initGame();
   }
 
   static SetConnectingStep(percentage: number | null, message: string | null): void {
@@ -204,7 +204,7 @@ export default class CL {
 
       void Cmd.ExecuteString('map ' + map);
 
-      CL.StartRecording(demoname, Q.atoi(track));
+      CL.StartRecording(demoname, Q.atoi(track || '0'));
     }
   };
 
@@ -300,7 +300,7 @@ export default class CL {
 
       CL.cls.message.writeByte(Protocol.clc.rconcmd);
       CL.cls.message.writeString(password);
-      CL.cls.message.writeString(this.args.substring(5));
+      CL.cls.message.writeString(this.args!.substring(5));
     }
   };
 
diff --git a/source/engine/client/ClientConnection.ts b/source/engine/client/ClientConnection.ts
index 13abb3eb..7b307711 100644
--- a/source/engine/client/ClientConnection.ts
+++ b/source/engine/client/ClientConnection.ts
@@ -9,6 +9,7 @@ import { eventBus, getClientRegistry } from '../registry.ts';
 import { HostError } from '../common/Errors.ts';
 import { QSocket } from '../network/NetworkDrivers.ts';
 import { parseServerMessage as parseServerCommandMessage } from './ClientServerCommandHandlers.ts';
+import { ModelScope } from '../common/Mod.ts';
 
 type IdentityCvars = {
   name: Cvar | null;
@@ -158,7 +159,7 @@ export default class ClientConnection {
     S.StopAllSounds();
 
     Con.DPrint('Clearing client model views\n');
-    Mod.ClearAll(Mod.scope.client);
+    Mod.ClearAll(ModelScope.client);
     this.cls.signon = 0;
 
     this.setConnectingStep(null, null);
diff --git a/source/engine/client/ClientEntities.ts b/source/engine/client/ClientEntities.ts
index 575676c6..39b6e5b7 100644
--- a/source/engine/client/ClientEntities.ts
+++ b/source/engine/client/ClientEntities.ts
@@ -1,7 +1,7 @@
 import type { ClientEventValue } from '../../shared/GameInterfaces.ts';
 import type { SFX } from './Sound.ts';
 import type { BaseModel } from '../common/model/BaseModel.ts';
-import type { BrushModel } from '../common/Mod.ts';
+import { ModelScope, type BrushModel } from '../common/Mod.ts';
 import type { Pmove } from '../common/Pmove.ts';
 
 import Vector from '../../shared/Vector.ts';
@@ -109,10 +109,10 @@ export class ClientEdict { // TODO: extends Protocol.EntityState
   frame: number;
   skinnum: number;
   colormap: number;
-  effects: number;
+  effects: effect;
   /** alpha value for rendering */
   alpha: number;
-  solid: number;
+  solid: solid;
   originPrevious: Vector;
   originTime: number;
   origin: Vector;
@@ -326,7 +326,7 @@ export class ClientEdict { // TODO: extends Protocol.EntityState
       return;
     }
 
-    if (node.contents < 0) {
+    if (node.contents < content.CONTENT_NONE) {
       this.leafs[this.leafs.length] = node.num;
       return;
     }
@@ -507,7 +507,7 @@ export default class ClientEntities {
       'progs/bolt2.mdl',
       'progs/bolt3.mdl',
       'progs/beam.mdl', // CR: does not exist in Quake
-    ].map((model) => Mod.ForNameAsync(model, false, Mod.scope.client).then((loadedModel) => ({ model: loadedModel, name: model }))))) {
+    ].map((model) => Mod.ForNameAsync(model, false, ModelScope.client).then((loadedModel) => ({ model: loadedModel, name: model }))))) {
       this.tempEntityModels[name] = model;
     }
   }
diff --git a/source/engine/client/ClientMessages.ts b/source/engine/client/ClientMessages.ts
index 4e895cc0..7317de09 100644
--- a/source/engine/client/ClientMessages.ts
+++ b/source/engine/client/ClientMessages.ts
@@ -237,7 +237,7 @@ export class ClientMessages {
     let counter = 0;
 
     // we are writing directly into clientdata object
-    const clientdata = CL.state.gameAPI.clientdata;
+    const clientdata = CL.state.gameAPI!.clientdata;
 
     if (clientdata === null) {
       throw new HostError('Client game API clientdata is not initialized');
@@ -324,7 +324,7 @@ export class ClientMessages {
     const eventCode = NET.message.readByte();
     const args = NET.message.readSerializablesOnClient();
 
-    CL.state.gameAPI.handleClientEvent(eventCode, ...args);
+    CL.state.gameAPI!.handleClientEvent(eventCode, ...args);
   }
 
   /**
diff --git a/source/engine/client/ClientServerCommandHandlers.ts b/source/engine/client/ClientServerCommandHandlers.ts
index 902d413b..eb60737c 100644
--- a/source/engine/client/ClientServerCommandHandlers.ts
+++ b/source/engine/client/ClientServerCommandHandlers.ts
@@ -6,7 +6,7 @@ import { gameCapabilities } from '../../shared/Defs.ts';
 import type { ClientGameInterface } from '../../shared/GameInterfaces.ts';
 import Vector from '../../shared/Vector.ts';
 import { ClientEngineAPI } from '../common/GameAPIs.ts';
-import type { BrushModel } from '../common/Mod.ts';
+import { ModelScope, type BrushModel } from '../common/Mod.ts';
 import { sharedCollisionModelSource } from '../common/CollisionModelSource.ts';
 import { eventBus, getClientRegistry } from '../registry.ts';
 import type { BaseModel } from '../common/model/BaseModel.ts';
@@ -199,7 +199,7 @@ function parseServerData() {
     models.length = 1;
     sounds.length = 1;
 
-    const worldModel = await Mod.ForNameAsync(model_precache[1], false, Mod.scope.client);
+    const worldModel = await Mod.ForNameAsync(model_precache[1], false, ModelScope.client);
     if (worldModel === null) {
       throw new HostError(`Failed to load world model ${model_precache[1]}`);
     }
@@ -212,7 +212,7 @@ function parseServerData() {
 
       CL.SetConnectingStep(25 + (models.length / model_precache.length) * 30, 'Loading models');
       const modelStart = models.length;
-      const loadedModels = await Promise.all(model_precache.slice(modelStart, modelStart + chunksize).map((m) => Mod.ForNameAsync(m, false, Mod.scope.client)));
+      const loadedModels = await Promise.all(model_precache.slice(modelStart, modelStart + chunksize).map((m) => Mod.ForNameAsync(m, false, ModelScope.client)));
       storeLoadedSlice(models, modelStart, loadedModels);
 
       CL.SendCmd();
@@ -413,7 +413,8 @@ function parseBeam(model: BaseModel | null | undefined) {
  * Decodes temporary entities (explosions, splashes, etc.).
  */
 function parseTemporaryEntity() {
-  const type = NET.message.readByte();
+  const type = NET.message.readByte() as Protocol.te;
+  console.assert(Object.values(Protocol.te).includes(type), `CL.ParseTEnt: invalid temp entity type ${type}`);
 
   switch (type) {
     case Protocol.te.lightning1:
diff --git a/source/engine/client/ClientState.ts b/source/engine/client/ClientState.ts
index e9811944..147cdc60 100644
--- a/source/engine/client/ClientState.ts
+++ b/source/engine/client/ClientState.ts
@@ -323,7 +323,7 @@ class ClientRuntimeState {
 
   #configureProxyEvents(): void {
     for (const event of this.#clientGameEvents) {
-      this.#proxyEventListeners.push(eventBus.subscribe(event, (...args) => this.eventBus.publish(event, ...args)));
+      this.#proxyEventListeners.push(eventBus.subscribe(event, (...args) => { this.eventBus.publish(event, ...args); }));
     }
   }
 }
diff --git a/source/engine/client/Draw.ts b/source/engine/client/Draw.ts
index 3c427e0f..0f84ec85 100644
--- a/source/engine/client/Draw.ts
+++ b/source/engine/client/Draw.ts
@@ -539,4 +539,4 @@ export default class Draw {
   }
 }
 
-eventBus.subscribe('vid.resize', () => Draw.UpdateDiscPosition());
+eventBus.subscribe('vid.resize', () => { Draw.UpdateDiscPosition(); });
diff --git a/source/engine/client/GL.ts b/source/engine/client/GL.ts
index 3cbd2990..6239ae70 100644
--- a/source/engine/client/GL.ts
+++ b/source/engine/client/GL.ts
@@ -187,7 +187,7 @@ class GL {
     const program = {
       identifier,
       program: p,
-      attribs: [],
+      attribs: [] as GLProgramAttrib[],
       vertexSize: 0,
       attribBits: 0,
     } as GLProgramMutable;
@@ -762,7 +762,7 @@ export class GLTexture {
    * @param {string} name texture mode name
    * @returns {GLTexture} this
    */
-  lockTextureMode(name: string): GLTexture {
+  lockTextureMode(name: string): this {
     console.assert(textureModes[name] !== undefined, 'Valid texture mode required');
 
     if (this.#textureModeListener !== null) {
@@ -777,7 +777,7 @@ export class GLTexture {
     return this;
   }
 
-  wrapClamped(): GLTexture {
+  wrapClamped(): this {
     this.#textureWrap = 'clamp';
 
     if (this.ready) {
@@ -787,7 +787,7 @@ export class GLTexture {
     return this;
   }
 
-  wrapRepeat(): GLTexture {
+  wrapRepeat(): this {
     this.#textureWrap = 'repeat';
 
     if (this.ready) {
@@ -797,7 +797,7 @@ export class GLTexture {
     return this;
   }
 
-  resize(width: number, height: number): GLTexture {
+  resize(width: number, height: number): this {
     console.assert(width > 0 && height > 0, 'Texture width and height must be greater than zero');
 
     this.width = width;
@@ -814,7 +814,7 @@ export class GLTexture {
    * @param {boolean} flushStream flush the stream before binding
    * @returns {GLTexture} this
    */
-  bind(target = 0, flushStream = false): GLTexture {
+  bind(target = 0, flushStream = false): this {
     if (!this.ready) {
       missingPicTexture.bind(target, flushStream);
       return this;
@@ -845,7 +845,7 @@ export class GLTexture {
    * @param {Uint8Array | ImageBitmap | null} data texture data in RGBA format or as ImageBitmap
    * @returns {GLTexture} this
    */
-  upload(data: Uint8Array | ImageBitmap | null): GLTexture {
+  upload(data: Uint8Array | ImageBitmap | null): this {
     if (this.#texnum === null) {
       this.#texnum = requireValue(gl.createTexture(), 'Failed to create WebGL texture');
     }
@@ -974,7 +974,8 @@ function wrapGL(glContext: WebGL2RenderingContext): WebGL2RenderingContext {
   ] as const;
 
   for (const key of keysToCatch) {
-    const original = glContext[key].bind(glContext);
+    const original = glContext[key].bind(glContext) as Function;
+    console.assert(typeof original === 'function', `Expected gl.${key} to be a function`);
 
     // @ts-expect-error dynamic WebGL method instrumentation
     glContext[key] = (...args: Array<number | object | null | undefined>) => {
@@ -1048,7 +1049,7 @@ function GL_Init(): void {
   Cmd.AddCommand('gl_texturelist', TextureListCommand);
 
   initClear();
-  eventBus.subscribe('cvar.changed.gl_clear', () => initClear());
+  eventBus.subscribe('cvar.changed.gl_clear', () => { initClear(); });
 
   GL.streamArray = new ArrayBuffer(8192);
   GL.streamArrayBytes = new Uint8Array(GL.streamArray);
@@ -1127,5 +1128,5 @@ function GL_Shutdown(): void {
   eventBus.publish('gl.shutdown');
 }
 
-eventBus.subscribe('vid.ready', () => GL_Init());
-eventBus.subscribe('vid.shutdown', () => GL_Shutdown());
+eventBus.subscribe('vid.ready', () => { GL_Init(); });
+eventBus.subscribe('vid.shutdown', () => { GL_Shutdown(); });
diff --git a/source/engine/client/Key.ts b/source/engine/client/Key.ts
index dd243702..06f02226 100644
--- a/source/engine/client/Key.ts
+++ b/source/engine/client/Key.ts
@@ -11,16 +11,147 @@ eventBus.subscribe('registry.frozen', () => {
   ({ CL, Con, Host, M } = getClientRegistry());
 });
 
-/** Current key state, mapping key code → pressed flag. */
-interface KeyDest {
-  readonly game: 0;
-  readonly console: 1;
-  readonly message: 2;
-  readonly menu: 3;
-  /** Mutable current destination. */
-  value: number;
+/** Where key events are routed to. */
+export enum KeyDestination {
+  game = 0,
+  console = 1,
+  message = 2,
+  menu = 3,
 }
 
+// ── Key name ↔ key-code mappings ─────────────────────────────────────────────
+
+/** Named key string → key-code mapping for config file parsing. */
+const keyNameToCode = new Map<string, number>([
+  ['TAB', K.TAB],
+  ['ENTER', K.ENTER],
+  ['ESCAPE', K.ESCAPE],
+  ['SPACE', K.SPACE],
+  ['BACKSPACE', K.BACKSPACE],
+  ['UPARROW', K.UPARROW],
+  ['DOWNARROW', K.DOWNARROW],
+  ['LEFTARROW', K.LEFTARROW],
+  ['RIGHTARROW', K.RIGHTARROW],
+  ['ALT', K.ALT],
+  ['CTRL', K.CTRL],
+  ['SHIFT', K.SHIFT],
+  ['F1', K.F1],
+  ['F2', K.F2],
+  ['F3', K.F3],
+  ['F4', K.F4],
+  ['F5', K.F5],
+  ['F6', K.F6],
+  ['F7', K.F7],
+  ['F8', K.F8],
+  ['F9', K.F9],
+  ['F10', K.F10],
+  ['F11', K.F11],
+  ['F12', K.F12],
+  ['INS', K.INS],
+  ['DEL', K.DEL],
+  ['PGDN', K.PGDN],
+  ['PGUP', K.PGUP],
+  ['HOME', K.HOME],
+  ['END', K.END],
+  ['MOUSE1', K.MOUSE1],
+  ['MOUSE2', K.MOUSE2],
+  ['MOUSE3', K.MOUSE3],
+  ['PAUSE', K.PAUSE],
+  ['MWHEELUP', K.MWHEELUP],
+  ['MWHEELDOWN', K.MWHEELDOWN],
+  ['SEMICOLON', ';'.charCodeAt(0)],
+]);
+
+/** Reverse lookup: key-code → canonical name. Built once from keyNameToCode. */
+const codeToKeyName = new Map<number, string>();
+for (const [name, code] of keyNameToCode) {
+  if (!codeToKeyName.has(code)) {
+    codeToKeyName.set(code, name);
+  }
+}
+
+// ── Shift map (US-QWERTY layout) ────────────────────────────────────────────
+
+/**
+ * Builds the shift-key lookup table (unshifted char-code → shifted char-code).
+ * @returns The shift map array indexed by unshifted char code.
+ */
+function buildShiftMap(): number[] {
+  const map: number[] = [];
+
+  // Identity for all codes 0–255.
+  for (let i = 0; i < 256; i++) {
+    map[i] = i;
+  }
+
+  // a-z → A-Z
+  for (let i = 'a'.charCodeAt(0); i <= 'z'.charCodeAt(0); i++) {
+    map[i] = i - 32;
+  }
+
+  // Number row: 1!  2@  3#  4$  5%  6^  7&  8*  9(  0)
+  const numberRowShifts: ReadonlyArray<[string, string]> = [
+    ['1', '!'], ['2', '@'], ['3', '#'], ['4', '$'], ['5', '%'],
+    ['6', '^'], ['7', '&'], ['8', '*'], ['9', '('], ['0', ')'],
+  ];
+
+  for (const [from, to] of numberRowShifts) {
+    map[from.charCodeAt(0)] = to.charCodeAt(0);
+  }
+
+  // Punctuation shifts
+  const punctuationShifts: ReadonlyArray<[string, string]> = [
+    ['-', '_'], ['=', '+'], ['+', '<'], ['.', '>'], ['/', '?'],
+    [';', ':'], ["'", '"'], ['[', '{'], [']', '}'], ['`', '~'],
+    ['\\', '|'],
+  ];
+
+  for (const [from, to] of punctuationShifts) {
+    map[from.charCodeAt(0)] = to.charCodeAt(0);
+  }
+
+  return map;
+}
+
+// ── Console-key set ──────────────────────────────────────────────────────────
+
+/**
+ * Builds the set of key codes that are consumed by the console input.
+ * @returns A set of key codes for console-mode input.
+ */
+function buildConsoleKeySet(): Set<number> {
+  const keys = new Set<number>();
+
+  // All printable ASCII characters
+  for (let i = K.SPACE; i < K.BACKSPACE; i++) {
+    keys.add(i);
+  }
+
+  // Navigation and editing keys
+  keys.add(K.ENTER);
+  keys.add(K.TAB);
+  keys.add(K.LEFTARROW);
+  keys.add(K.RIGHTARROW);
+  keys.add(K.UPARROW);
+  keys.add(K.DOWNARROW);
+  keys.add(K.BACKSPACE);
+  keys.add(K.HOME);
+  keys.add(K.END);
+  keys.add(K.PGUP);
+  keys.add(K.PGDN);
+  keys.add(K.SHIFT);
+
+  // Backtick (`) and tilde (~) toggle the console, so they must not be consumed as input.
+  keys.delete('`'.charCodeAt(0));
+  keys.delete('~'.charCodeAt(0));
+
+  return keys;
+}
+
+// ── Prompt color ─────────────────────────────────────────────────────────────
+
+const CONSOLE_PROMPT_COLOR = new Vector(0.8, 0.8, 0.8);
+
 export default class Key {
   /** Console input history. */
   static lines: string[] = [''];
@@ -29,198 +160,161 @@ export default class Key {
   /** Index into history lines for Up/Down navigation. */
   static history_line = 1;
 
-  /** Key destination routing constants and current active destination. */
-  static dest: KeyDest = {
-    game: 0,
-    console: 1,
-    message: 2,
-    menu: 3,
-    value: 1, // FIXME
-  };
+  /** Current active key destination. */
+  static destination = KeyDestination.console;
 
+  /** Active key bindings, indexed by key code. */
   static bindings: (string | null)[] = [];
-  static consolekeys: (boolean | undefined)[] = [];
-  static shift: number[] = [];
-  static down: (boolean | undefined)[] = [];
-
-  /** Named key string → key-code mapping for config file parsing. */
-  static readonly names: Record<string, number> = {
-    TAB: K.TAB,
-    ENTER: K.ENTER,
-    ESCAPE: K.ESCAPE,
-    SPACE: K.SPACE,
-    BACKSPACE: K.BACKSPACE,
-    UPARROW: K.UPARROW,
-    DOWNARROW: K.DOWNARROW,
-    LEFTARROW: K.LEFTARROW,
-    RIGHTARROW: K.RIGHTARROW,
-    ALT: K.ALT,
-    CTRL: K.CTRL,
-    SHIFT: K.SHIFT,
-    F1: K.F1,
-    F2: K.F2,
-    F3: K.F3,
-    F4: K.F4,
-    F5: K.F5,
-    F6: K.F6,
-    F7: K.F7,
-    F8: K.F8,
-    F9: K.F9,
-    F10: K.F10,
-    F11: K.F11,
-    F12: K.F12,
-    INS: K.INS,
-    DEL: K.DEL,
-    PGDN: K.PGDN,
-    PGUP: K.PGUP,
-    HOME: K.HOME,
-    END: K.END,
-    MOUSE1: K.MOUSE1,
-    MOUSE2: K.MOUSE2,
-    MOUSE3: K.MOUSE3,
-    PAUSE: K.PAUSE,
-    MWHEELUP: K.MWHEELUP,
-    MWHEELDOWN: K.MWHEELDOWN,
-    SEMICOLON: 59,
-  };
 
-  /** Handles a keypress for console input mode. */
-  static Console(key: number): void {
-    if (key === K.ENTER) {
-      Cmd.text += Key.edit_line + '\n';
-      Con.Print(']' + Key.edit_line + '\n', new Vector(0.8, 0.8, 0.8));
-      Key.lines[Key.lines.length] = Key.edit_line;
-      Key.edit_line = '';
-      Key.history_line = Key.lines.length;
-      return;
-    }
+  /** Set of key codes that are consumed by the console rather than bound commands. */
+  private static consolekeys = buildConsoleKeySet();
+
+  /** Shift-key lookup table (indexed by unshifted key code, returns shifted code). */
+  private static shiftMap = buildShiftMap();
 
-    if (key === K.TAB) {
-      let cmd = Cmd.CompleteCommand(Key.edit_line);
-      if (cmd === null) {
-        cmd = Cvar.CompleteVariable(Key.edit_line);
+  /** Currently pressed key codes. */
+  private static pressed = new Set<number>();
+
+  /** True when Shift is held. */
+  private static shiftDown = false;
+
+  // ── Console input ────────────────────────────────────────────────────────
+
+  /** Handles a keypress for console input mode. */
+  static Console(key: K): void {
+    switch (key) {
+      case K.ENTER: {
+        Cmd.text += `${Key.edit_line}\n`;
+        Con.Print(`]${Key.edit_line}\n`, CONSOLE_PROMPT_COLOR);
+        Key.lines.push(Key.edit_line);
+        Key.edit_line = '';
+        Key.history_line = Key.lines.length;
+        return;
       }
-      if (cmd === null) {
+
+      case K.TAB: {
+        const cmd = Cmd.CompleteCommand(Key.edit_line) ?? Cvar.CompleteVariable(Key.edit_line);
+        if (cmd !== null) {
+          Key.edit_line = `${cmd} `;
+        }
         return;
       }
-      Key.edit_line = cmd + ' ';
-      return;
-    }
 
-    if (key === K.BACKSPACE || key === K.LEFTARROW) {
-      if (Key.edit_line.length > 0) {
-        Key.edit_line = Key.edit_line.substring(0, Key.edit_line.length - 1);
+      // WinQuake treated LEFTARROW as delete; no cursor position support yet.
+      case K.BACKSPACE:
+      case K.LEFTARROW: {
+        if (Key.edit_line.length > 0) {
+          Key.edit_line = Key.edit_line.slice(0, -1);
+        }
+        return;
       }
-      return;
-    }
 
-    if (key === K.UPARROW) {
-      if (--Key.history_line < 0) {
-        Key.history_line = 0;
+      case K.UPARROW: {
+        Key.history_line = Math.max(0, Key.history_line - 1);
+        Key.edit_line = Key.lines[Key.history_line];
+        return;
       }
-      Key.edit_line = Key.lines[Key.history_line];
-      return;
-    }
 
-    if (key === K.DOWNARROW) {
-      if (Key.history_line >= Key.lines.length) {
+      case K.DOWNARROW: {
+        if (Key.history_line >= Key.lines.length) {
+          return;
+        }
+        Key.history_line++;
+        if (Key.history_line >= Key.lines.length) {
+          Key.history_line = Key.lines.length;
+          Key.edit_line = '';
+          return;
+        }
+        Key.edit_line = Key.lines[Key.history_line];
         return;
       }
-      if (++Key.history_line >= Key.lines.length) {
-        Key.history_line = Key.lines.length;
-        Key.edit_line = '';
+
+      case K.PGUP: {
+        Con.backscroll = Math.min(Con.backscroll + 2, Con.text.length);
         return;
       }
-      Key.edit_line = Key.lines[Key.history_line];
-      return;
-    }
 
-    if (key === K.PGUP) {
-      Con.backscroll += 2;
-      if (Con.backscroll > Con.text.length) {
-        Con.backscroll = Con.text.length;
+      case K.PGDN: {
+        Con.backscroll = Math.max(Con.backscroll - 2, 0);
+        return;
       }
-      return;
-    }
 
-    if (key === K.PGDN) {
-      Con.backscroll -= 2;
-      if (Con.backscroll < 0) {
-        Con.backscroll = 0;
+      case K.HOME: {
+        Con.backscroll = Math.max(Con.text.length - 10, 0);
+        return;
       }
-      return;
-    }
 
-    if (key === K.HOME) {
-      Con.backscroll = Con.text.length - 10;
-      if (Con.backscroll < 0) {
+      case K.END: {
         Con.backscroll = 0;
+        return;
       }
-      return;
     }
 
-    if (key === K.END) {
-      Con.backscroll = 0;
-      return;
-    }
-
-    if (key < 32 || key > 127) {
+    // Only accept printable ASCII (SPACE through BACKSPACE-1).
+    if (key < K.SPACE || key > K.BACKSPACE) {
       return;
     }
 
     Key.edit_line += String.fromCharCode(key);
   }
 
+  // ── Chat message input ───────────────────────────────────────────────────
+
   /** Current chat message being composed. */
   static chat_buffer = '';
   /** True when composing a team-only message. */
   static team_message = false;
 
+  /** Maximum chat message length. */
+  private static readonly MAX_CHAT_LENGTH = 31;
+
   /** Handles a keypress for chat message mode. */
-  static Message(key: number): void {
+  static Message(key: K): void {
     if (key === K.ENTER) {
       if (Key.chat_buffer.trim().length > 0) {
-        if (Key.team_message) {
-          void Cmd.ExecuteString(`say_team "${Key.chat_buffer}"`);
-        } else {
-          void Cmd.ExecuteString(`say "${Key.chat_buffer}"`);
-        }
+        const command = Key.team_message ? 'say_team' : 'say';
+        void Cmd.ExecuteString(`${command} "${Key.chat_buffer}"`);
       }
-      Key.dest.value = Key.dest.game;
+      Key.destination = KeyDestination.game;
       Key.chat_buffer = '';
       return;
     }
+
     if (key === K.ESCAPE) {
-      Key.dest.value = Key.dest.game;
+      Key.destination = KeyDestination.game;
       Key.chat_buffer = '';
       return;
     }
-    if (key < 32 || key > 127) {
+
+    if (key < K.SPACE || key > K.BACKSPACE) {
       return;
     }
+
     if (key === K.BACKSPACE) {
-      if (Key.chat_buffer.length !== 0) {
-        Key.chat_buffer = Key.chat_buffer.substring(0, Key.chat_buffer.length - 1);
+      if (Key.chat_buffer.length > 0) {
+        Key.chat_buffer = Key.chat_buffer.slice(0, -1);
       }
       return;
     }
-    if (Key.chat_buffer.length >= 31) {
+
+    if (Key.chat_buffer.length >= Key.MAX_CHAT_LENGTH) {
       return;
     }
-    Key.chat_buffer = Key.chat_buffer + String.fromCharCode(key);
+
+    Key.chat_buffer += String.fromCharCode(key);
   }
 
+  // ── Key name / code conversion ───────────────────────────────────────────
+
   /**
    * Looks up the first key bound to the given command string.
    * @returns The key name string, or null when not bound.
    */
   static BindingToString(binding: string): string | null {
     const keynum = Key.bindings.indexOf(binding);
-
     if (keynum === -1) {
       return null;
     }
-
     return Key.KeynumToString(keynum);
   }
 
@@ -232,8 +326,7 @@ export default class Key {
     if (str.length === 1) {
       return str.charCodeAt(0);
     }
-
-    return Key.names[str.toUpperCase()] ?? null;
+    return keyNameToCode.get(str.toUpperCase()) ?? null;
   }
 
   /**
@@ -241,27 +334,23 @@ export default class Key {
    * @returns The key name, or `'<UNKNOWN KEYNUM>'` for unrecognized codes.
    */
   static KeynumToString(keynum: number): string {
-    if (keynum > 32 && keynum < 127) {
+    if (keynum > (K.SPACE as number) && keynum < (K.BACKSPACE as number)) {
       return String.fromCharCode(keynum);
     }
-
-    for (const [name, num] of Object.entries(Key.names)) {
-      if (num === keynum) {
-        return name;
-      }
-    }
-
-    return '<UNKNOWN KEYNUM>';
+    return codeToKeyName.get(keynum) ?? '<UNKNOWN KEYNUM>';
   }
 
+  // ── Bind / unbind console commands ───────────────────────────────────────
+
   /** Console command handler: unbinds a single key. */
-  static Unbind_f(key: string | undefined): void {
-    if (key === undefined) {
+  static Unbind_f(...args: string[]): void {
+    if (args.length === 0) {
       Con.Print('Usage: unbind <key>\n');
+      return;
     }
-    const b = Key.StringToKeynum(key!);
+    const b = Key.StringToKeynum(args[0]);
     if (b === null) {
-      Con.Print(`"${key}" isn't a valid key\n`);
+      Con.Print(`"${args[0]}" isn't a valid key\n`);
       return;
     }
     Key.bindings[b] = null;
@@ -273,29 +362,31 @@ export default class Key {
   }
 
   /** Console command handler: binds or prints a key binding. */
-  static Bind_f(key: string | undefined, command: string | undefined): void {
-    if (key === undefined) {
+  static Bind_f(...args: string[]): void {
+    if (args.length === 0) {
       Con.Print('Usage: bind <key> [command]\n');
       return;
     }
 
-    const b = Key.StringToKeynum(key.toLowerCase());
+    const keyName = args[0];
+    const b = Key.StringToKeynum(keyName.toLowerCase());
 
     if (b === null) {
-      Con.Print(`"${key}" isn't a valid key\n`);
+      Con.Print(`"${keyName}" isn't a valid key\n`);
       return;
     }
-    if (command === undefined) {
-      if (Key.bindings[b] !== null && Key.bindings[b] !== undefined) {
-        Con.Print(`"${key}" = "${Key.bindings[b]}"\n`);
+
+    if (args.length < 2) {
+      const binding = Key.bindings[b];
+      if (binding !== null && binding !== undefined) {
+        Con.Print(`"${keyName}" = "${binding}"\n`);
       } else {
-        Con.Print(`"${key}" is not bound\n`);
+        Con.Print(`"${keyName}" is not bound\n`);
       }
       return;
     }
 
-    Key.bindings[b] = command;
-
+    Key.bindings[b] = args[1];
     Host.WriteConfiguration();
   }
 
@@ -304,98 +395,68 @@ export default class Key {
    * @returns Newline-separated `bind` commands for all active bindings.
    */
   static WriteBindings(): string {
-    const f: string[] = [];
+    const lines: string[] = [];
     for (let i = 0; i < Key.bindings.length; i++) {
       if (Key.bindings[i] !== null && Key.bindings[i] !== undefined) {
-        f.push(`bind "${Key.KeynumToString(i)}" "${Key.bindings[i]}"`);
+        lines.push(`bind "${Key.KeynumToString(i)}" "${Key.bindings[i]}"`);
       }
     }
-    return f.join('\n');
+    return lines.join('\n');
   }
 
-  /** Initializes key tables, console key map, and registers console commands. */
+  // ── Initialization ───────────────────────────────────────────────────────
+
+  /** Registers key-related console commands. */
   static Init(): void {
-    let i;
+    Cmd.AddCommand('bind', (...args: string[]) => { Key.Bind_f(...args); });
+    Cmd.AddCommand('unbind', (...args: string[]) => { Key.Unbind_f(...args); });
+    Cmd.AddCommand('unbindall', () => { Key.Unbindall_f(); });
+  }
 
-    for (i = 32; i < 128; i++) {
-      Key.consolekeys[i] = true;
-    }
-    Key.consolekeys[K.ENTER] = true;
-    Key.consolekeys[K.TAB] = true;
-    Key.consolekeys[K.LEFTARROW] = true;
-    Key.consolekeys[K.RIGHTARROW] = true;
-    Key.consolekeys[K.UPARROW] = true;
-    Key.consolekeys[K.DOWNARROW] = true;
-    Key.consolekeys[K.BACKSPACE] = true;
-    Key.consolekeys[K.HOME] = true;
-    Key.consolekeys[K.END] = true;
-    Key.consolekeys[K.PGUP] = true;
-    Key.consolekeys[K.PGDN] = true;
-    Key.consolekeys[K.SHIFT] = true;
-    Key.consolekeys[96] = false;
-    Key.consolekeys[126] = false;
-
-    for (i = 0; i < 256; i++) {
-      Key.shift[i] = i;
-    }
-    for (i = 97; i <= 122; i++) {
-      Key.shift[i] = i - 32;
+  // ── Event dispatch ───────────────────────────────────────────────────────
+
+  /** Appends a `+command` (key-down) or `-command` (key-up) binding action to the command buffer. */
+  private static appendBindAction(binding: string, key: K, down: boolean): void {
+    if (binding.startsWith('+')) {
+      const prefix = down ? '+' : '-';
+      Cmd.text += `${prefix}${binding.substring(1)} ${key}\n`;
+    } else if (down) {
+      Cmd.text += `${binding}\n`;
     }
-    Key.shift[49] = 33;
-    Key.shift[50] = 64;
-    Key.shift[51] = 35;
-    Key.shift[52] = 36;
-    Key.shift[53] = 37;
-    Key.shift[54] = 94;
-    Key.shift[55] = 38;
-    Key.shift[56] = 42;
-    Key.shift[57] = 40;
-    Key.shift[48] = 41;
-    Key.shift[45] = 95;
-    Key.shift[61] = 43;
-    Key.shift[43] = 60;
-    Key.shift[46] = 62;
-    Key.shift[47] = 63;
-    Key.shift[59] = 58;
-    Key.shift[39] = 34;
-    Key.shift[91] = 123;
-    Key.shift[93] = 125;
-    Key.shift[96] = 126;
-    Key.shift[92] = 124;
-
-    Cmd.AddCommand('bind', Key.Bind_f);
-    Cmd.AddCommand('unbind', Key.Unbind_f);
-    Cmd.AddCommand('unbindall', Key.Unbindall_f);
   }
 
-  /** True when Shift is held. */
-  static shift_down = false;
-
   /** Routes a raw key event to the appropriate handler based on current destination. */
-  static Event(key: number, down: boolean): void {
+  static Event(key: K, down: boolean): void {
+    // Allow cancelling a pending connection with Escape.
     if (CL.cls.state === clientConnectionState.connecting && key === K.ESCAPE && down) {
       CL.Disconnect();
       M.ToggleMenu_f();
       return;
     }
+
+    // Suppress auto-repeat for most keys.
+    if (down && key !== K.BACKSPACE && key !== K.PAUSE && Key.pressed.has(key)) {
+      return;
+    }
+
     if (down) {
-      if (key !== K.BACKSPACE && key !== K.PAUSE && Key.down[key]) {
-        return;
-      }
+      Key.pressed.add(key);
+    } else {
+      Key.pressed.delete(key);
     }
-    Key.down[key] = down;
 
     if (key === K.SHIFT) {
-      Key.shift_down = down;
+      Key.shiftDown = down;
     }
 
+    // Escape handling: always consumed, routes to the active destination.
     if (key === K.ESCAPE) {
       if (!down) {
         return;
       }
-      if (Key.dest.value === Key.dest.message) {
+      if (Key.destination === KeyDestination.message) {
         Key.Message(key);
-      } else if (Key.dest.value === Key.dest.menu) {
+      } else if (Key.destination === KeyDestination.menu) {
         M.Keydown(key);
       } else {
         M.ToggleMenu_f();
@@ -403,55 +464,59 @@ export default class Key {
       return;
     }
 
-    let kb: string | null | undefined;
-
+    // Key-up: release any +command bindings.
     if (!down) {
-      kb = Key.bindings[key];
-      if (kb !== null && kb !== undefined) {
-        if (kb.charCodeAt(0) === 43) {
-          Cmd.text += '-' + kb.substring(1) + ' ' + key + '\n';
-        }
+      const binding = Key.bindings[key];
+      if (binding !== null && binding !== undefined) {
+        Key.appendBindAction(binding, key, false);
       }
-      if (Key.shift[key] !== key) {
-        kb = Key.bindings[Key.shift[key]];
-        if (kb !== null && kb !== undefined) {
-          if (kb.charCodeAt(0) === 43) {
-            Cmd.text += '-' + kb.substring(1) + ' ' + key + '\n';
-          }
+      // Also release the shifted variant if it differs.
+      const shiftedCode = Key.shiftMap[key];
+      if (shiftedCode !== (key as number)) {
+        const shiftedBinding = Key.bindings[shiftedCode];
+        if (shiftedBinding !== null && shiftedBinding !== undefined) {
+          Key.appendBindAction(shiftedBinding, key, false);
         }
       }
       return;
     }
 
-    if (CL.cls.demoplayback && Key.consolekeys[key] && Key.dest.value === Key.dest.game) {
+    // During demo playback, any console key in game mode opens the menu.
+    if (CL.cls.demoplayback && Key.consolekeys.has(key) && Key.destination === KeyDestination.game) {
       M.ToggleMenu_f();
       return;
     }
 
-    if ((Key.dest.value === Key.dest.menu && (key === K.ESCAPE || (key >= K.F1 && key <= K.F12))) ||
-      (Key.dest.value === Key.dest.console && !Key.consolekeys[key]) ||
-      (Key.dest.value === Key.dest.game && (!Con.forcedup || !Key.consolekeys[key]))) {
-      kb = Key.bindings[key];
-      if (kb !== null && kb !== undefined) {
-        if (kb.charCodeAt(0) === 43) {
-          Cmd.text += kb + ' ' + key + '\n';
-        } else {
-          Cmd.text += kb + '\n';
-        }
+    // Execute bindings when the key shouldn't be consumed by the active text input:
+    // - In the menu, F-keys always execute bindings.
+    // - In the console, non-console keys execute bindings.
+    // - In game, bindings execute unless the console is forced up and it's a console key.
+    if ((Key.destination === KeyDestination.menu && key >= K.F1 && key <= K.F12) ||
+      (Key.destination === KeyDestination.console && !Key.consolekeys.has(key)) ||
+      (Key.destination === KeyDestination.game && (!Con.forcedup || !Key.consolekeys.has(key)))) {
+      const binding = Key.bindings[key];
+      if (binding !== null && binding !== undefined) {
+        Key.appendBindAction(binding, key, true);
       }
       return;
     }
 
-    if (Key.shift_down) {
-      key = Key.shift[key];
+    // Apply shift mapping for text input destinations.
+    if (Key.shiftDown) {
+      key = Key.shiftMap[key] as K;
     }
 
-    if (Key.dest.value === Key.dest.message) {
-      Key.Message(key);
-    } else if (Key.dest.value === Key.dest.menu) {
-      M.Keydown(key);
-    } else {
-      Key.Console(key);
+    switch (Key.destination) {
+      case KeyDestination.message:
+        Key.Message(key);
+        break;
+      case KeyDestination.menu:
+        M.Keydown(key);
+        break;
+      default:
+        Key.Console(key);
+        break;
     }
   }
 }
+
diff --git a/source/engine/client/LegacyServerCommands.ts b/source/engine/client/LegacyServerCommands.ts
index 453a0f7f..552861d4 100644
--- a/source/engine/client/LegacyServerCommands.ts
+++ b/source/engine/client/LegacyServerCommands.ts
@@ -2,7 +2,7 @@ import * as Protocol from '../network/Protocol.ts';
 import * as Def from '../common/Def.ts';
 import { HostError } from '../common/Errors.ts';
 import { eventBus, getClientRegistry } from '../registry.ts';
-import type { BrushModel } from '../common/Mod.ts';
+import { ModelScope, type BrushModel } from '../common/Mod.ts';
 import type { BaseModel } from '../common/model/BaseModel.ts';
 import { ScoreSlot } from './ClientState.ts';
 import Vector from '../../shared/Vector.ts';
@@ -247,7 +247,7 @@ function handleLegacyServerData() {
     sounds.length = 1;
 
     // Load world model first
-    const worldModel = await Mod.ForNameAsync(model_precache[1], false, Mod.scope.client);
+    const worldModel = await Mod.ForNameAsync(model_precache[1], false, ModelScope.client);
     if (worldModel === null) {
       throw new HostError(`Failed to load world model ${model_precache[1]}`);
     }
@@ -262,7 +262,7 @@ function handleLegacyServerData() {
       }
       CL.SetConnectingStep(25 + (models.length / model_precache.length) * 30, 'Loading models');
       const modelStart = models.length;
-      const loaded = await Promise.all(remaining.slice(0, chunksize).map((m) => Mod.ForNameAsync(m, false, Mod.scope.client)));
+      const loaded = await Promise.all(remaining.slice(0, chunksize).map((m) => Mod.ForNameAsync(m, false, ModelScope.client)));
       storeLoadedSlice(models, modelStart, loaded);
       CL.SendCmd();
     }
@@ -662,7 +662,8 @@ function parseLegacyBeam(model: BaseModel | null | undefined): void {
  * Parses a WinQuake svc_temp_entity with legacy coordinate precision.
  */
 function handleLegacyTempEntity() {
-  const type = NET.message.readByte();
+  const type = NET.message.readByte() as Protocol.te;
+  console.assert(Object.values(Protocol.te).includes(type), `invalid temp entity type ${type}`);
 
   switch (type) {
     case Protocol.te.lightning1:
diff --git a/source/engine/client/Menu.ts b/source/engine/client/Menu.ts
index 53950e7c..b8a9edf7 100644
--- a/source/engine/client/Menu.ts
+++ b/source/engine/client/Menu.ts
@@ -7,6 +7,7 @@ import { clientConnectionState } from '../common/Def.ts';
 import { eventBus, getClientRegistry } from '../registry.ts';
 import ClientLifecycle from './ClientLifecycle.ts';
 import { GLTexture } from './GL.ts';
+import { KeyDestination } from './Key.ts';
 import MultiplayerMainMenu from './menu/Multiplayer.ts';
 import VID from './VID.ts';
 
@@ -238,16 +239,16 @@ export default class M {
 
   static CloseMenu(): void {
     if (CL.cls.state === clientConnectionState.connected) {
-      Key.dest.value = Key.dest.game;
+      Key.destination = KeyDestination.game;
     } else {
-      Key.dest.value = Key.dest.console;
+      Key.destination = KeyDestination.console;
     }
     M.state.value = M.state.none;
   }
 
   static ToggleMenu_f(): void {
     M.entersound = true;
-    if (Key.dest.value === Key.dest.menu) {
+    if (Key.destination === KeyDestination.menu) {
       if (M.state.value !== M.state.main) {
         M.Menu_Main_f();
         return;
@@ -264,11 +265,11 @@ export default class M {
       return;
     }
 
-    if (Key.dest.value !== Key.dest.menu) {
+    if (Key.destination !== KeyDestination.menu) {
       M.save_demonum = CL.cls.demonum;
       CL.cls.demonum = -1;
     }
-    Key.dest.value = Key.dest.menu;
+    Key.destination = KeyDestination.menu;
     M.state.value = M.state.main;
     M.entersound = true;
   }
@@ -280,7 +281,7 @@ export default class M {
     M.DrawPic(54, 32 + M.main_cursor * 20, M.menudot[Math.floor(Host.realtime * 10.0) % 6]);
   }
 
-  static Main_Key(k: number): void {
+  static Main_Key(k: K): void {
     switch (k) {
       case K.ESCAPE:
         M.CloseMenu();
@@ -324,7 +325,7 @@ export default class M {
 
   // Single player menu
   static Menu_SinglePlayer_f(): void {
-    Key.dest.value = Key.dest.menu;
+    Key.destination = KeyDestination.menu;
     M.state.value = M.state.singleplayer;
     M.entersound = true;
   }
@@ -336,7 +337,7 @@ export default class M {
     M.DrawPic(54, 32 + M.singleplayer_cursor * 20, M.menudot[Math.floor(Host.realtime * 10.0) % 6]);
   }
 
-  static SinglePlayer_Key(k: number): void {
+  static SinglePlayer_Key(k: K): void {
     switch (k) {
       case K.ESCAPE:
         M.Menu_Main_f();
@@ -360,7 +361,7 @@ export default class M {
             if (SV.server.active) {
               void Cmd.ExecuteString('disconnect');
             }
-            Key.dest.value = Key.dest.game;
+            Key.destination = KeyDestination.game;
             ClientLifecycle.startGame!.startSingleplayerGame();
             return;
           case 1:
@@ -376,8 +377,8 @@ export default class M {
   // Load/save menu
   static ScanSaves(): void {
     const searchpaths = COM.searchpaths;
-    const search = 'Quake.' + COM.gamedir[0].filename + '/s';
-    COM.searchpaths = COM.gamedir;
+    const search = 'Quake.' + COM.gamedir![0].filename + '/s';
+    COM.searchpaths = COM.gamedir!;
     for (let i = 0; i < M.max_savegames; i++) {
       const f = localStorage.getItem(search + i + '.json');
       if (!f) {
@@ -397,7 +398,7 @@ export default class M {
   static Menu_Load_f(): void {
     M.entersound = true;
     M.state.value = M.state.load;
-    Key.dest.value = Key.dest.menu;
+    Key.destination = KeyDestination.menu;
     M.ScanSaves();
   }
 
@@ -407,7 +408,7 @@ export default class M {
     }
     M.entersound = true;
     M.state.value = M.state.save;
-    Key.dest.value = Key.dest.menu;
+    Key.destination = KeyDestination.menu;
     M.ScanSaves();
   }
 
@@ -427,7 +428,7 @@ export default class M {
     M.DrawCharacter(8, 32 + (M.load_cursor << 3), 12 + ((Host.realtime * 4.0) & 1));
   }
 
-  static Load_Key(k: number): void {
+  static Load_Key(k: K): void {
     switch (k) {
       case K.ESCAPE:
         M.Menu_SinglePlayer_f();
@@ -462,12 +463,12 @@ export default class M {
         if (!confirm('Delete selected game?')) {
           return;
         }
-        localStorage.removeItem('Quake.' + COM.gamedir[0].filename + '/s' + M.load_cursor + '.sav');
+        localStorage.removeItem('Quake.' + COM.gamedir![0].filename + '/s' + M.load_cursor + '.sav');
         M.ScanSaves();
     }
   }
 
-  static Save_Key(k: number): void {
+  static Save_Key(k: K): void {
     switch (k) {
       case K.ESCAPE:
         M.Menu_SinglePlayer_f();
@@ -497,14 +498,14 @@ export default class M {
         if (!confirm('Delete selected game?')) {
           return;
         }
-        localStorage.removeItem('Quake.' + COM.gamedir[0].filename + '/s' + M.load_cursor + '.sav');
+        localStorage.removeItem('Quake.' + COM.gamedir![0].filename + '/s' + M.load_cursor + '.sav');
         M.ScanSaves();
     }
   }
 
   // Multiplayer menu
   static Menu_MultiPlayer_f(): void {
-    Key.dest.value = Key.dest.menu;
+    Key.destination = KeyDestination.menu;
     M.state.value = M.state.multiplayer;
     M.entersound = true;
     M.multiplayer_myname = CL.name.string;
@@ -549,7 +550,7 @@ export default class M {
     }
   }
 
-  static MultiPlayer_Key(k: number): void {
+  static MultiPlayer_Key(k: K): void {
     if (k === K.ESCAPE) {
       M.Menu_Main_f();
     }
@@ -643,7 +644,7 @@ export default class M {
         return;
     }
 
-    if ((k < 32) || (k > 127)) {
+    if (k < K.SPACE || k > K.BACKSPACE) {
       return;
     }
     if (M.multiplayer_cursor === 0) {
@@ -659,7 +660,7 @@ export default class M {
 
   // Options menu
   static Menu_Options_f(): void {
-    Key.dest.value = Key.dest.menu;
+    Key.destination = KeyDestination.menu;
     M.state.value = M.state.options;
     M.entersound = true;
   }
@@ -794,7 +795,7 @@ export default class M {
     M.DrawCharacter(200, 32 + (M.options_cursor << 3), 12 + ((Host.realtime * 4.0) & 1));
   }
 
-  static Options_Key(k: number): void {
+  static Options_Key(k: K): void {
     switch (k) {
       case K.ESCAPE:
         M.Menu_Main_f();
@@ -838,7 +839,7 @@ export default class M {
 
   // Keys menu
   static Menu_Keys_f(): void {
-    Key.dest.value = Key.dest.menu;
+    Key.destination = KeyDestination.menu;
     M.state.value = M.state.keys;
     M.entersound = true;
   }
@@ -894,10 +895,10 @@ export default class M {
     }
   }
 
-  static Keys_Key(k: number): void {
+  static Keys_Key(k: K): void {
     if (M.bind_grab) {
       S.LocalSound(M.sfx_menu1);
-      if ((k !== K.ESCAPE) && (k !== 96)) {
+      if (k !== K.ESCAPE && k !== 96 as K) { // FIXME: what’s 96?
         Cmd.text = 'bind "' + Key.KeynumToString(k) + '" "' + M.bindnames[M.keys_cursor][0] + '"\n' + Cmd.text;
       }
       M.bind_grab = false;
@@ -938,7 +939,7 @@ export default class M {
 
   // Help menu
   static Menu_Help_f(): void {
-    Key.dest.value = Key.dest.menu;
+    Key.destination = KeyDestination.menu;
     M.state.value = M.state.help;
     M.entersound = true;
     M.help_page = 0;
@@ -948,7 +949,7 @@ export default class M {
     M.DrawPic(0, 0, M.help_pages[M.help_page]);
   }
 
-  static Help_Key(k: number): void {
+  static Help_Key(k: K): void {
     switch (k) {
       case K.ESCAPE:
         M.Menu_Main_f();
@@ -974,8 +975,8 @@ export default class M {
     if (M.state.value === M.state.quit) {
       return;
     }
-    M.wasInMenus = (Key.dest.value === Key.dest.menu);
-    Key.dest.value = Key.dest.menu;
+    M.wasInMenus = (Key.destination === KeyDestination.menu);
+    Key.destination = KeyDestination.menu;
     M.quit_prevstate = M.state.value;
     M.state.value = M.state.quit;
     M.entersound = true;
@@ -986,8 +987,8 @@ export default class M {
     if (M.state.value === M.state.alert) {
       return;
     }
-    M.wasInMenus = (Key.dest.value === Key.dest.menu);
-    Key.dest.value = Key.dest.menu;
+    M.wasInMenus = (Key.destination === KeyDestination.menu);
+    Key.destination = KeyDestination.menu;
     M.state.value = M.state.alert;
     M.entersound = true; // TODO: have a different sound
     M.alertMessage = { title, message };
@@ -1028,7 +1029,7 @@ export default class M {
     }
   }
 
-  static Alert_Key(k: number): void {
+  static Alert_Key(k: K): void {
     if (k === K.ENTER || k === K.ESCAPE) {
       M.CloseMenu();
     }
@@ -1038,7 +1039,7 @@ export default class M {
     launchServerMenu.draw();
   }
 
-  static Launch_Server_Key(k: number): void {
+  static Launch_Server_Key(k: K): void {
     if (k === K.ESCAPE) {
       launchServerMenu.deactivate();
       M.CloseMenu();
@@ -1052,8 +1053,8 @@ export default class M {
     if (M.state.value === M.state.launch_server) {
       return;
     }
-    M.wasInMenus = (Key.dest.value === Key.dest.menu);
-    Key.dest.value = Key.dest.menu;
+    M.wasInMenus = (Key.destination === KeyDestination.menu);
+    Key.destination = KeyDestination.menu;
     M.state.value = M.state.launch_server;
     M.entersound = true;
 
@@ -1074,10 +1075,10 @@ export default class M {
     M.Print(64, 108, M.quitMessage[M.msgNumber][3]);
   }
 
-  static Quit_Key(k: number): void {
+  static Quit_Key(k: K): void {
     switch (k) {
       case K.ESCAPE:
-      case 110:
+      case 110 as K:
         if (M.wasInMenus) {
           M.state.value = M.quit_prevstate;
           M.entersound = true;
@@ -1085,8 +1086,8 @@ export default class M {
           M.CloseMenu();
         }
         break;
-      case 121:
-        Key.dest.value = Key.dest.console;
+      case 121 as K:
+        Key.destination = KeyDestination.console;
         Host.Quit_f();
     }
   }
@@ -1207,7 +1208,7 @@ export default class M {
   }
 
   static Draw(): void {
-    if (M.state.value === M.state.none || Key.dest.value !== Key.dest.menu) {
+    if (M.state.value === M.state.none || Key.destination !== KeyDestination.menu) {
       return;
     }
 
diff --git a/source/engine/client/R.ts b/source/engine/client/R.ts
index 53030ea6..ba5e93ac 100644
--- a/source/engine/client/R.ts
+++ b/source/engine/client/R.ts
@@ -24,11 +24,12 @@ import ShadowMap from './renderer/ShadowMap.ts';
 import { ClientDlight, ClientEdict } from './ClientEntities.ts';
 import { avertexnormals } from '../common/model/loaders/AliasMDLLoader.ts';
 import { SkyRenderer } from './renderer/Sky.ts';
+import { ModelType } from '../common/Mod.ts';
 
-let { CL, Host, Mod, SCR, SV, Sys, V } = getClientRegistry();
+let { CL, Host, SCR, SV, Sys, V } = getClientRegistry();
 
 eventBus.subscribe('registry.frozen', () => {
-  ({ CL, Host, Mod, SCR, SV, Sys, V } = getClientRegistry());
+  ({ CL, Host, SCR, SV, Sys, V } = getClientRegistry());
 });
 
 let gl: WebGL2RenderingContext = null!;
@@ -325,7 +326,7 @@ class R {
    * Propagates a dynamic light through the BSP and marks touched faces.
    */
   static MarkLights(light: ClientDlight, bit: number, node: Node): void {
-    if (node.contents < 0) {
+    if (node.contents < content.CONTENT_NONE) {
       return;
     }
     const plane = node.plane!;
@@ -437,7 +438,7 @@ class R {
   };
 
   static RecursiveLightPoint(node: Node, start: Vector, end: Vector): LightPointResult | null {
-    if (node.contents < 0) {
+    if (node.contents < content.CONTENT_NONE) {
       return null;
     }
 
@@ -913,7 +914,7 @@ class R {
     }
 
     // Group entities by model type for batched rendering
-    const entitiesByType = new Map<number, ClientEdict[]>();
+    const entitiesByType = new Map<ModelType, ClientEdict[]>();
 
     for (const entity of CL.state.clientEntities.getVisibleEntities()) {
       if (entity.model === null || entity.alpha === 0.0) {
@@ -933,7 +934,7 @@ class R {
 
     // Pass 0: Opaque models (brush, alias)
     for (const [modelType, entities] of entitiesByType) {
-      if (modelType === Mod.type.sprite) {
+      if (modelType === ModelType.sprite) {
         continue; // Sprites are drawn in pass 1
       }
 
@@ -956,9 +957,9 @@ class R {
     GL.StreamFlush();
 
     // Pass 1: Transparent sprites with blending
-    const spriteEntities = entitiesByType.get(Mod.type.sprite);
+    const spriteEntities = entitiesByType.get(ModelType.sprite);
     if (spriteEntities) {
-      const renderer = modelRendererRegistry.getRenderer(Mod.type.sprite)!;
+      const renderer = modelRendererRegistry.getRenderer(ModelType.sprite)!;
       console.assert(renderer !== null, 'sprite renderer required');
 
       gl.enable(gl.BLEND);
@@ -991,7 +992,7 @@ class R {
     }
 
     const worldmodel = worldEntity.model;
-    const brushRenderer = modelRendererRegistry.getRenderer(Mod.type.brush)! as BrushModelRenderer;
+  const brushRenderer = modelRendererRegistry.getRenderer(ModelType.brush)! as BrushModelRenderer;
     console.assert(brushRenderer !== null, 'brush renderer required');
     const hasFog = PostProcess.active
       && worldmodel.fogVolumes && worldmodel.fogVolumes.length > 0;
@@ -1083,7 +1084,7 @@ class R {
     const items: TransparentSortItem[] = [];
 
     // Collect world transparent leaves with distances
-    const brushRenderer = modelRendererRegistry.getRenderer(Mod.type.brush)! as BrushModelRenderer;
+    const brushRenderer = modelRendererRegistry.getRenderer(ModelType.brush)! as BrushModelRenderer;
     console.assert(brushRenderer !== null, 'brush renderer required');
     const worldLeaves = brushRenderer.getWorldTransparentLeaves(worldmodel, vieworg);
     for (let i = 0; i < worldLeaves.length; i++) {
@@ -1214,7 +1215,7 @@ class R {
 
     const viewent = CL.state.viewent;
     if (viewent !== null && viewent.model !== null) {
-      const aliasRenderer = modelRendererRegistry.getRenderer(Mod.type.alias)!;
+      const aliasRenderer = modelRendererRegistry.getRenderer(ModelType.alias)!;
       console.assert(aliasRenderer !== null, 'alias renderer required');
       aliasRenderer.setupRenderState(0);
       aliasRenderer.render(viewent.model, viewent, 0);
@@ -1502,7 +1503,7 @@ class R {
     // Render world and entities using the renderer registry
     const worldEntity = CL.state.clientEntities.getEntity(0);
     if (worldEntity && worldEntity.model) {
-      const brushRenderer = modelRendererRegistry.getRenderer(Mod.type.brush)!;
+      const brushRenderer = modelRendererRegistry.getRenderer(ModelType.brush)!;
       console.assert(brushRenderer !== null, 'brush renderer required');
       // Pass 0: World opaque surfaces
       brushRenderer.render(worldEntity.model, worldEntity, 0);
@@ -2782,7 +2783,7 @@ class R {
     if (node.contents === content.CONTENT_SOLID) {
       return;
     }
-    if (node.contents < 0) {
+    if (node.contents < content.CONTENT_NONE) {
       if (node.markvisframe !== R.visframecount) {
         return;
       }
@@ -2907,8 +2908,8 @@ class R {
     R.lightmaps_rgb = new Uint8Array(new ArrayBuffer(LIGHTMAP_BLOCK_SIZE * LIGHTMAP_BLOCK_HEIGHT * 3));
     R.dlightmaps_rgba = new Uint8Array(new ArrayBuffer(LIGHTMAP_BLOCK_SIZE * LIGHTMAP_BLOCK_SIZE * 4));
 
-    const brushRenderer = modelRendererRegistry.getRenderer(Mod.type.brush)!;
-    const meshRenderer = modelRendererRegistry.getRenderer(Mod.type.mesh)!;
+    const brushRenderer = modelRendererRegistry.getRenderer(ModelType.brush)!;
+    const meshRenderer = modelRendererRegistry.getRenderer(ModelType.mesh)!;
     console.assert(brushRenderer !== null, 'brush renderer required');
     console.assert(meshRenderer !== null, 'mesh renderer required');
 
@@ -2936,7 +2937,7 @@ class R {
       }
 
       // Handle mesh models (OBJ, IQM, etc.)
-      if (currentmodel.type === Mod.type.mesh) {
+      if (currentmodel.type === ModelType.mesh) {
         meshRenderer.prepareModel(currentmodel);
       }
     }
diff --git a/source/engine/client/SCR.ts b/source/engine/client/SCR.ts
index 21ea6d61..107191d4 100644
--- a/source/engine/client/SCR.ts
+++ b/source/engine/client/SCR.ts
@@ -3,6 +3,7 @@ import Cmd from '../common/Cmd.ts';
 import Cvar from '../common/Cvar.ts';
 import { clientConnectionState } from '../common/Def.ts';
 import { eventBus, getClientRegistry } from '../registry.ts';
+import { KeyDestination } from './Key.ts';
 import GL from './GL.ts';
 import VID from './VID.ts';
 import PostProcess from './renderer/PostProcess.ts';
@@ -102,7 +103,7 @@ export default class SCR {
    */
   static DrawCenterString(): void {
     SCR.centertime_off -= Host.frametime;
-    if (((SCR.centertime_off <= 0.0) && (CL.state.intermission === 0)) || (Key.dest.value !== Key.dest.game)) {
+    if (((SCR.centertime_off <= 0.0) && (CL.state.intermission === 0)) || (Key.destination !== KeyDestination.game)) {
       return;
     }
 
@@ -281,7 +282,7 @@ export default class SCR {
     }
 
     let conlines;
-    if (Key.dest.value === Key.dest.console) {
+    if (Key.destination === KeyDestination.console) {
       conlines = 100;
     } else {
       conlines = 0;
@@ -308,7 +309,7 @@ export default class SCR {
       Con.DrawConsole(SCR.con_current);
       return;
     }
-    if ((Key.dest.value === Key.dest.game || Key.dest.value === Key.dest.message) && CL.cls.signon === 4) {
+    if ((Key.destination === KeyDestination.game || Key.destination === KeyDestination.message) && CL.cls.signon === 4) {
       Con.DrawNotify();
     }
   }
@@ -376,11 +377,11 @@ export default class SCR {
         const samples = SCR._frameTimes.filter((a): a is number => a !== null);
         SCR.FPS = 1000 / (samples.reduce((a, b) => a + b, 0) / samples.length);
 
-        if (Host.refreshrate.value === 0 && Host.framecount > SCR._frameTimes.length * 10) {
+        if (Host.refreshrate!.value === 0 && Host.framecount > SCR._frameTimes.length * 10) {
           const refreshRate = (Math.ceil(SCR.FPS / 15)) * 15;
           Con.DPrint(`Determined refresh rate: ${Math.round(SCR.FPS)} FPS\n`);
           Con.DPrint(`Setting Host refreshrate to ${Math.round(refreshRate)}\n`);
-          Host.refreshrate.set(Math.round(refreshRate));
+          Host.refreshrate!.set(Math.round(refreshRate));
         }
       }
 
@@ -408,20 +409,20 @@ export default class SCR {
 
       if (CL.cls.state === clientConnectionState.connecting) {
         CL.Draw();
-      } else if ((CL.state.intermission === 1) && (Key.dest.value === Key.dest.game)) {
+      } else if ((CL.state.intermission === 1) && (Key.destination === KeyDestination.game)) {
         if (!CL.sbarDisabled) {
           Sbar.IntermissionOverlay();
         } else {
           CL.DrawHUD();
         }
-      } else if ((CL.state.intermission === 2) && (Key.dest.value === Key.dest.game)) {
+      } else if ((CL.state.intermission === 2) && (Key.destination === KeyDestination.game)) {
         if (!CL.sbarDisabled) {
           Sbar.FinaleOverlay();
           SCR.DrawCenterString();
         } else {
           CL.DrawHUD();
         }
-      } else if ((CL.state.intermission === 3) && (Key.dest.value === Key.dest.game)) {
+      } else if ((CL.state.intermission === 3) && (Key.destination === KeyDestination.game)) {
         if (!CL.sbarDisabled) {
           SCR.DrawCenterString();
         } else {
diff --git a/source/engine/client/Sbar.ts b/source/engine/client/Sbar.ts
index 842a618e..b816d975 100644
--- a/source/engine/client/Sbar.ts
+++ b/source/engine/client/Sbar.ts
@@ -303,14 +303,16 @@ export default class Sbar {
     str = minutes.toString();
     Sbar.DrawString(256 - (str.length << 3), 4, str);
 
-    Sbar.DrawString(232 - (CL.state.levelname.length << 2), 12, CL.state.levelname);
+    if (CL.state.levelname) {
+      Sbar.DrawString(232 - (CL.state.levelname!.length << 2), 12, CL.state.levelname!);
+    }
   }
 
   static DrawInventory(): void {
     let i;
 
     if (COM.rogue) {
-      Sbar.DrawPic(0, -24, Sbar.r_invbar![CL.state.stats[Def.stat.activeweapon] >= Def.rit.lava_nailgun ? 0 : 1]);
+      Sbar.DrawPic(0, -24, Sbar.r_invbar![CL.state.stats[Def.stat.activeweapon] as Def.rit >= Def.rit.lava_nailgun ? 0 : 1]);
     } else {
       Sbar.DrawPic(0, -24, Sbar.ibar);
     }
@@ -358,7 +360,7 @@ export default class Sbar {
         }
       }
     } else if (COM.rogue) {
-      if (CL.state.stats[Def.stat.activeweapon] >= Def.rit.lava_nailgun) {
+      if (CL.state.stats[Def.stat.activeweapon] as Def.rit >= Def.rit.lava_nailgun) {
         for (i = 0; i <= 4; i++) {
           if (CL.state.stats[Def.stat.activeweapon] === (Def.rit.lava_nailgun << i)) {
             Sbar.DrawPic((i + 2) * 24, -16, Sbar.r_weapons![i]);
@@ -445,7 +447,8 @@ export default class Sbar {
   }
 
   static DrawFace(): void {
-    if (COM.rogue && (CL.state.maxclients !== 1) && (Cvar.FindVar('teamplay').value >= 4) && (Cvar.FindVar('teamplay').value <= 6)) {
+    // FIXME: cache Cvars
+    if (COM.rogue && (CL.state.maxclients !== 1) && (Cvar.FindVar('teamplay')!.value >= 4) && (Cvar.FindVar('teamplay')!.value <= 6)) {
       const s = CL.state.scores[CL.state.viewentity - 1];
       const top = (s.colors & 0xf0) + 8;
       const xofs = CL.state.maxclients === 1 ? 113 : (VID.width >> 1) - 47;
diff --git a/source/engine/client/Sound.ts b/source/engine/client/Sound.ts
index f51a5f7e..b82fb254 100644
--- a/source/engine/client/Sound.ts
+++ b/source/engine/client/Sound.ts
@@ -305,8 +305,8 @@ export default class Sound {
     }
 
     Sound._eventListeners.push(
-      eventBus.subscribe('client.paused', () => Sound._context?.suspend()),
-      eventBus.subscribe('client.unpaused', () => Sound._context?.resume()),
+      eventBus.subscribe('client.paused', () => void Sound._context?.suspend()),
+      eventBus.subscribe('client.unpaused', () => void Sound._context?.resume()),
     );
 
     Con.DPrint('Sound subsystem initialized.\n');
@@ -521,7 +521,7 @@ export default class Sound {
     }
 
     if (sfx.state !== SFX.STATE.FAILED) {
-      sfx.ready.then(() => play()).catch(() => {});
+      sfx.ready.then(() => { play(); }).catch(() => {});
     }
   }
 
@@ -566,7 +566,7 @@ export default class Sound {
     if (sfx.state === SFX.STATE.AVAILABLE) {
       start();
     } else if (sfx.state !== SFX.STATE.FAILED) {
-      sfx.ready.then(() => start()).catch(() => {});
+      sfx.ready.then(() => { start(); }).catch(() => {});
     }
   }
 
diff --git a/source/engine/client/Sys.ts b/source/engine/client/Sys.ts
index 5b33724b..3c5a7971 100644
--- a/source/engine/client/Sys.ts
+++ b/source/engine/client/Sys.ts
@@ -138,7 +138,6 @@ function handleContextMenu(event: MouseEvent): void {
 function handleFocus(): void {
   for (let index = 0; index < 256; index++) {
     Key.Event(index, false);
-    Key.down[index] = false;
   }
 }
 
diff --git a/source/engine/client/V.ts b/source/engine/client/V.ts
index 5c7fe5b0..23eeccb4 100644
--- a/source/engine/client/V.ts
+++ b/source/engine/client/V.ts
@@ -280,6 +280,7 @@ export default class V {
       CL.state.cshifts[CL.cshift.bonus][3] = 0.0;
     }
 
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-enum-comparison
     for (let i = CL.cshift.user1; i < CL.state.cshifts.length; i++) {
       const userShift = CL.state.cshifts[i];
       userShift[3] -= Host.frametime * 100.0;
diff --git a/source/engine/client/menu/MenuItem.ts b/source/engine/client/menu/MenuItem.ts
index bd097300..25c9d2cc 100644
--- a/source/engine/client/menu/MenuItem.ts
+++ b/source/engine/client/menu/MenuItem.ts
@@ -138,7 +138,7 @@ export class Action extends MenuItem {
     }
   }
 
-  override handleInput(key: number): boolean {
+  override handleInput(key: K): boolean {
     if (!this.enabled) {
       return false;
     }
@@ -212,7 +212,7 @@ export class Slider extends MenuItem {
     M.DrawSlider(x + 116, y, this.getNormalizedValue());
   }
 
-  override handleInput(key: number): boolean {
+  override handleInput(key: K): boolean {
     if (!this.enabled) {
       return false;
     }
@@ -294,7 +294,7 @@ export class Toggle extends MenuItem {
     M.PrintWhite(x + 116, y, this.isOn() ? this.onLabel : this.offLabel);
   }
 
-  override handleInput(key: number): boolean {
+  override handleInput(key: K): boolean {
     if (!this.enabled) {
       return false;
     }
@@ -375,7 +375,7 @@ export class Textbox extends MenuItem {
     }
   }
 
-  override handleInput(key: number): boolean {
+  override handleInput(key: K): boolean {
     if (!this.enabled) {
       return false;
     }
@@ -389,7 +389,7 @@ export class Textbox extends MenuItem {
     }
 
     // Printable characters
-    if (key >= 32 && key <= 127) {
+    if (key >= K.SPACE && key <= K.BACKSPACE) {
       const current = this.getValue();
       if (current.length < this.maxLength) {
         this.setValue(current + String.fromCharCode(key));
diff --git a/source/engine/client/menu/MenuPage.ts b/source/engine/client/menu/MenuPage.ts
index af74ef00..2b1279f3 100644
--- a/source/engine/client/menu/MenuPage.ts
+++ b/source/engine/client/menu/MenuPage.ts
@@ -118,7 +118,7 @@ export class MenuPage {
    * Handle keyboard input.
    * @returns True if input was handled.
    */
-  handleInput(key: number): boolean {
+  handleInput(key: K): boolean {
     // Let focused item handle input first
     const focused = this.items[this.cursor];
     if (focused && focused.handleInput(key)) {
@@ -272,7 +272,8 @@ export class ImageBasedLayout implements MenuLayout {
   cursorYSpacing: number;
 
   constructor(config: ImageBasedLayoutConfig = {}) {
-    this.backgroundPic = config.backgroundPic;
+    console.assert(config.backgroundPic !== undefined, 'ImageBasedLayout requires a backgroundPic');
+    this.backgroundPic = config.backgroundPic!;
     this.backgroundX = config.backgroundX ?? 72;
     this.backgroundY = config.backgroundY ?? 32;
     this.cursorX = config.cursorX ?? 54;
diff --git a/source/engine/client/menu/Multiplayer.ts b/source/engine/client/menu/Multiplayer.ts
index 141ecbfa..5d83ea9d 100644
--- a/source/engine/client/menu/Multiplayer.ts
+++ b/source/engine/client/menu/Multiplayer.ts
@@ -80,7 +80,9 @@ export default class MultiplayerMainMenu extends MenuPage {
 
     if (urls?.signalingURL) {
       // FIXME: move the start serverlist to the ClientGameAPI
-      const serverActions = PR.QuakeJS.ServerGameAPI.GetStartServerList();
+      const serverActions = PR.QuakeJS!.ServerGameAPI.GetStartServerList()!;
+
+      console.assert(Array.isArray(serverActions), 'Expected GetStartServerList to return an array');
 
       for (const serverAction of serverActions) {
         this.items.push(new Action({
@@ -201,7 +203,7 @@ export default class MultiplayerMainMenu extends MenuPage {
   /**
    * @returns True if handled.
    */
-  override handleInput(key: number): boolean {
+  override handleInput(key: K): boolean {
     if (key === K.ESCAPE) {
       this.deactivate();
       M.CloseMenu();
diff --git a/source/engine/client/renderer/AliasModelRenderer.ts b/source/engine/client/renderer/AliasModelRenderer.ts
index ee68878b..5d64253c 100644
--- a/source/engine/client/renderer/AliasModelRenderer.ts
+++ b/source/engine/client/renderer/AliasModelRenderer.ts
@@ -4,6 +4,7 @@ import { getEntityBloomEmissiveScale } from './BloomEffect.ts';
 import { eventBus, getClientRegistry } from '../../registry.ts';
 import GL from '../GL.ts';
 import W from '../../common/W.ts';
+import { ModelType } from '../../common/Mod.ts';
 import { effect } from '../../../shared/Defs.ts';
 import type { AliasModel, AliasSingleFrame, AliasGroupedFrameEntry, AliasSingleSkin, AliasGroupedSkinEntry } from '../../common/model/AliasModel.ts';
 import type { ClientEdict } from '../ClientEntities.ts';
@@ -45,10 +46,10 @@ interface AliasFrameSelection {
 export class AliasModelRenderer extends ModelRenderer {
   /**
    * Get the model type this renderer handles.
-   * @returns Mod.type.alias (2)
+   * @returns ModelType.alias.
    */
-  override getModelType(): number {
-    return 2; // Mod.type.alias
+  override getModelType(): ModelType {
+    return ModelType.alias;
   }
 
   /**
@@ -238,8 +239,8 @@ export class AliasModelRenderer extends ModelRenderer {
       const [previousFrame, nextFrame, f] = e.lerp.frame;
       const previous = clmodel.frames[previousFrame];
       const next = clmodel.frames[nextFrame];
-      console.assert(previous.group === false, 'alias lerp previous frame must be a single frame');
-      console.assert(next.group === false, 'alias lerp next frame must be a single frame');
+      console.assert(!previous.group, 'alias lerp previous frame must be a single frame');
+      console.assert(!next.group, 'alias lerp next frame must be a single frame');
 
       if (previous.group) {
         frameA = previous.frames[0];
@@ -255,7 +256,7 @@ export class AliasModelRenderer extends ModelRenderer {
 
       targettime = f;
     } else {
-      console.assert(frameGroup.group === false, 'alias static frame must be a single frame');
+      console.assert(!frameGroup.group, 'alias static frame must be a single frame');
       const staticFrame = frameGroup as AliasSingleFrame;
       frameA = staticFrame;
       frameB = staticFrame;
diff --git a/source/engine/client/renderer/BrushModelRenderer.ts b/source/engine/client/renderer/BrushModelRenderer.ts
index 18353add..660039f6 100644
--- a/source/engine/client/renderer/BrushModelRenderer.ts
+++ b/source/engine/client/renderer/BrushModelRenderer.ts
@@ -4,6 +4,7 @@ import { eventBus, getClientRegistry } from '../../registry.ts';
 import GL, { type GLProgramInfo, ATTRIB_LOCATIONS, BRUSH_VERTEX_STRIDE } from '../GL.ts';
 import { getEntityBloomEmissiveScale } from './BloomEffect.ts';
 import { MaterialFlags, type BaseMaterial } from './Materials.ts';
+import { ModelType } from '../../common/Mod.ts';
 import type { BrushModel, Node, FogVolumeInfo, WorldTurbulentChainInfo } from '../../common/model/BSP.ts';
 import type { Face, BaseModel } from '../../common/model/BaseModel.ts';
 import type { ClientEdict } from '../ClientEntities.ts';
@@ -153,7 +154,7 @@ export class BrushModelRenderer extends ModelRenderer {
    * @returns True when the model references the shared world deluxemap atlas.
    */
   static usesDeluxemap(clmodel: BrushModel, worldModel: BrushModel | null): boolean {
-    return Boolean(clmodel.deluxemap !== null || (clmodel.submodel && worldModel?.deluxemap !== null));
+    return (clmodel.deluxemap !== null || (clmodel.submodel && worldModel !== null && worldModel.deluxemap !== null));
   }
 
   /**
@@ -360,9 +361,9 @@ export class BrushModelRenderer extends ModelRenderer {
 
   // ─── ModelRenderer interface ──────────────────────────────────────
 
-  /** @returns Mod.type.brush (0) */
-  getModelType(): number {
-    return 0;
+  /** @returns ModelType.brush. */
+  override getModelType(): ModelType {
+    return ModelType.brush;
   }
 
 
@@ -456,17 +457,17 @@ export class BrushModelRenderer extends ModelRenderer {
     const viewMatrix = e.lerp.angles.toRotationMatrix();
 
     if (pass === 0) {
-      GL.BindVAO(clmodel.opaqueVAO);
+      GL.BindVAO(clmodel.opaqueVAO!);
       R.c_brush_vbos++;
       this._renderOpaqueSurfaces(clmodel, e, viewMatrix);
       GL.UnbindVAO();
     } else if (pass === 1 && R.drawturbulents.value) {
-      GL.BindVAO(clmodel.turbulentVAO);
+      GL.BindVAO(clmodel.turbulentVAO!);
       R.c_brush_vbos++;
       this._renderTurbulentSurfaces(clmodel, e, viewMatrix);
       GL.UnbindVAO();
     } else if (pass === 2) {
-      GL.BindVAO(clmodel.opaqueVAO);
+      GL.BindVAO(clmodel.opaqueVAO!);
       R.c_brush_vbos++;
       this._renderTransparentSurfaces(clmodel, e, viewMatrix);
       GL.UnbindVAO();
@@ -481,25 +482,25 @@ export class BrushModelRenderer extends ModelRenderer {
   renderWorld(clmodel: BrushModel): void {
     const worldspawn = CL.state.clientEntities.getEntity(0);
 
-    GL.BindVAO(clmodel.opaqueVAO);
+    GL.BindVAO(clmodel.opaqueVAO!);
     R.c_brush_vbos++;
 
     const program = GL.UseProgram('brush')!;
-    gl.uniform3f(program.uAmbientLight, 1.0, 1.0, 1.0);
-    gl.uniform3f(program.uShadeLight, 0.0, 0.0, 0.0);
-    gl.uniform3f(program.uDynamicShadeLight, 0.0, 0.0, 0.0);
-    gl.uniform3f(program.uOrigin, 0.0, 0.0, 0.0);
-    gl.uniform1f(program.uAlpha, 1.0);
-    gl.uniform1f(program.uBloomEmissiveScale, 0.0);
-    gl.uniform1f(program.uBloomDlightScale, R.bloomDlightStrength.value);
-    gl.uniform1f(program.uBloomSpecularScale, resolveBrushBloomContributionStrength(R.bloomSpecularStrength?.value ?? 0.0));
-    gl.uniformMatrix3fv(program.uAngles, false, GL.identity);
-    gl.uniform4f(program.uLightVec, 0.0, 0.0, 0.0, 0.0);
-    gl.uniform3f(program.uDynamicLightVec, 0.0, 0.0, 0.0);
+    gl.uniform3f(program.uAmbientLight!, 1.0, 1.0, 1.0);
+    gl.uniform3f(program.uShadeLight!, 0.0, 0.0, 0.0);
+    gl.uniform3f(program.uDynamicShadeLight!, 0.0, 0.0, 0.0);
+    gl.uniform3f(program.uOrigin!, 0.0, 0.0, 0.0);
+    gl.uniform1f(program.uAlpha!, 1.0);
+    gl.uniform1f(program.uBloomEmissiveScale!, 0.0);
+    gl.uniform1f(program.uBloomDlightScale!, R.bloomDlightStrength.value);
+    gl.uniform1f(program.uBloomSpecularScale!, resolveBrushBloomContributionStrength(R.bloomSpecularStrength?.value ?? 0.0));
+    gl.uniformMatrix3fv(program.uAngles!, false, GL.identity);
+    gl.uniform4f(program.uLightVec!, 0.0, 0.0, 0.0, 0.0);
+    gl.uniform3f(program.uDynamicLightVec!, 0.0, 0.0, 0.0);
 
     this._setupBrushShaderCommon(program, clmodel, true);
-    GL.Bind(program.tLightStyleA, R.lightstyle_texture_a);
-    GL.Bind(program.tLightStyleB, R.lightstyle_texture_b);
+    GL.Bind(program.tLightStyleA!, R.lightstyle_texture_a);
+    GL.Bind(program.tLightStyleB!, R.lightstyle_texture_b);
     this._bindBrushDeluxemap(program, clmodel);
 
     for (let i = 0; i < clmodel.leafs.length; i++) {
@@ -509,7 +510,7 @@ export class BrushModelRenderer extends ModelRenderer {
         continue;
       }
 
-      if (R.CullBox(leaf.mins, leaf.maxs)) {
+      if (R.CullBox(leaf.mins!, leaf.maxs!)) {
         continue;
       }
 
@@ -549,7 +550,7 @@ export class BrushModelRenderer extends ModelRenderer {
       if (leaf.visframe !== R.visframecount || leaf.skychain === 0) {
         continue;
       }
-      if (R.CullBox(leaf.mins, leaf.maxs)) {
+      if (R.CullBox(leaf.mins!, leaf.maxs!)) {
         continue;
       }
       this.renderWorldTransparentLeaf(clmodel, leaf);
@@ -569,7 +570,7 @@ export class BrushModelRenderer extends ModelRenderer {
       if (leaf.visframe !== R.visframecount || leaf.skychain === 0) {
         continue;
       }
-      if (R.CullBox(leaf.mins, leaf.maxs)) {
+      if (R.CullBox(leaf.mins!, leaf.maxs!)) {
         continue;
       }
       let hasTransparent = false;
@@ -582,7 +583,7 @@ export class BrushModelRenderer extends ModelRenderer {
       if (!hasTransparent) {
         continue;
       }
-      const dist = this._getBoundsDistanceToView(leaf.mins, leaf.maxs, vieworg);
+      const dist = this._getBoundsDistanceToView(leaf.mins!, leaf.maxs!, vieworg);
       items.push({ leaf, dist });
     }
     return items;
@@ -593,28 +594,28 @@ export class BrushModelRenderer extends ModelRenderer {
    * Call once before one or more `renderWorldTransparentLeaf` calls.
    */
   beginWorldTransparentPass(clmodel: BrushModel): void {
-    GL.BindVAO(clmodel.opaqueVAO);
+    GL.BindVAO(clmodel.opaqueVAO!);
     R.c_brush_vbos++;
 
     const program = GL.UseProgram('brush')!;
     this._worldTransparentProgram = program;
     this._worldTransparentModel = clmodel;
 
-    gl.uniform3f(program.uAmbientLight, 1.0, 1.0, 1.0);
-    gl.uniform3f(program.uShadeLight, 0.0, 0.0, 0.0);
-    gl.uniform3f(program.uDynamicShadeLight, 0.0, 0.0, 0.0);
-    gl.uniform3f(program.uOrigin, 0.0, 0.0, 0.0);
-    gl.uniform1f(program.uAlpha, 1.0);
-    gl.uniform1f(program.uBloomEmissiveScale, 0.0);
-    gl.uniform1f(program.uBloomDlightScale, R.bloomDlightStrength.value);
-    gl.uniform1f(program.uBloomSpecularScale, resolveBrushBloomContributionStrength(R.bloomSpecularStrength?.value ?? 0.0));
-    gl.uniformMatrix3fv(program.uAngles, false, GL.identity);
-    gl.uniform4f(program.uLightVec, 0.0, 0.0, 0.0, 0.0);
-    gl.uniform3f(program.uDynamicLightVec, 0.0, 0.0, 0.0);
+    gl.uniform3f(program.uAmbientLight!, 1.0, 1.0, 1.0);
+    gl.uniform3f(program.uShadeLight!, 0.0, 0.0, 0.0);
+    gl.uniform3f(program.uDynamicShadeLight!, 0.0, 0.0, 0.0);
+    gl.uniform3f(program.uOrigin!, 0.0, 0.0, 0.0);
+    gl.uniform1f(program.uAlpha!, 1.0);
+    gl.uniform1f(program.uBloomEmissiveScale!, 0.0);
+    gl.uniform1f(program.uBloomDlightScale!, R.bloomDlightStrength.value);
+    gl.uniform1f(program.uBloomSpecularScale!, resolveBrushBloomContributionStrength(R.bloomSpecularStrength?.value ?? 0.0));
+    gl.uniformMatrix3fv(program.uAngles!, false, GL.identity);
+    gl.uniform4f(program.uLightVec!, 0.0, 0.0, 0.0, 0.0);
+    gl.uniform3f(program.uDynamicLightVec!, 0.0, 0.0, 0.0);
 
     this._setupBrushShaderCommon(program, clmodel, true);
-    GL.Bind(program.tLightStyleA, R.lightstyle_texture_a);
-    GL.Bind(program.tLightStyleB, R.lightstyle_texture_b);
+    GL.Bind(program.tLightStyleA!, R.lightstyle_texture_a);
+    GL.Bind(program.tLightStyleB!, R.lightstyle_texture_b);
     this._bindBrushDeluxemap(program, clmodel);
 
     gl.enable(gl.BLEND);
@@ -739,18 +740,18 @@ export class BrushModelRenderer extends ModelRenderer {
    * Call once before one or more `renderWorldTurbulentLeaf` calls.
    */
   beginWorldTurbulentPass(clmodel: BrushModel): void {
-    GL.BindVAO(clmodel.turbulentVAO);
+    GL.BindVAO(clmodel.turbulentVAO!);
     R.c_brush_vbos++;
 
     const program = GL.UseProgram('turbulent')!;
-    gl.uniform3f(program.uOrigin, 0.0, 0.0, 0.0);
-    gl.uniformMatrix3fv(program.uAngles, false, GL.identity);
-    gl.uniform1f(program.uTime, Host.realtime);
-    gl.uniform1f(program.uBloomEmissiveScale, 0.0);
-    gl.uniform1f(program.uBloomDlightScale, R.bloomDlightStrength.value);
+    gl.uniform3f(program.uOrigin!, 0.0, 0.0, 0.0);
+    gl.uniformMatrix3fv(program.uAngles!, false, GL.identity);
+    gl.uniform1f(program.uTime!, Host.realtime);
+    gl.uniform1f(program.uBloomEmissiveScale!, 0.0);
+    gl.uniform1f(program.uBloomDlightScale!, R.bloomDlightStrength.value);
 
     this._setupBrushShaderCommon(program, clmodel, true);
-    GL.Bind(program.tLightStyle, R.lightstyle_texture_a);
+    GL.Bind(program.tLightStyle!, R.lightstyle_texture_a);
 
     this._worldTurbulentProgram = program;
     this._worldTurbulentModel = clmodel;
@@ -837,8 +838,8 @@ export class BrushModelRenderer extends ModelRenderer {
     gl.cullFace(gl.BACK);
     gl.enable(gl.CULL_FACE);
 
-    GL.Bind(program.tDepth, PostProcess.depthTexture);
-    gl.uniform2f(program.uScreenSize, PostProcess.width, PostProcess.height);
+    GL.Bind(program.tDepth!, PostProcess.depthTexture);
+    gl.uniform2f(program.uScreenSize!, PostProcess.width, PostProcess.height);
 
     this._fogVolumeProgram = program;
     return true;
@@ -852,37 +853,37 @@ export class BrushModelRenderer extends ModelRenderer {
     const program = this._fogVolumeProgram!;
 
     gl.uniform3f(
-      program.uFogVolumeColor,
+      program.uFogVolumeColor!,
       fogVolume.color[0] / 255.0,
       fogVolume.color[1] / 255.0,
       fogVolume.color[2] / 255.0,
     );
-    gl.uniform1f(program.uFogVolumeDensity, fogVolume.density);
-    gl.uniform1f(program.uFogVolumeMaxOpacity, fogVolume.maxOpacity);
+    gl.uniform1f(program.uFogVolumeDensity!, fogVolume.density);
+    gl.uniform1f(program.uFogVolumeMaxOpacity!, fogVolume.maxOpacity);
 
     // Bind the light probe 3D texture for this fog volume.
     // _getFogLightProbe / _getFogLightProbeWhite may upload via Bind3D(0, ...)
     // which clobbers texture unit 0 (tDepth). Re-bind depth after.
     const probe = this._getFogLightProbe(fogVolume);
-    GL.Bind3D(program.tLightProbe, probe ? probe.texture : this._getFogLightProbeWhite());
-    GL.Bind(program.tDepth, PostProcess.depthTexture);
+    GL.Bind3D(program.tLightProbe!, probe ? probe.texture : this._getFogLightProbeWhite());
+    GL.Bind(program.tDepth!, PostProcess.depthTexture);
 
     this._uploadFogDlights(fogVolume);
 
-    gl.uniform3f(program.uFogVolumeMins, fogVolume.mins[0], fogVolume.mins[1], fogVolume.mins[2]);
-    gl.uniform3f(program.uFogVolumeMaxs, fogVolume.maxs[0], fogVolume.maxs[1], fogVolume.maxs[2]);
+    gl.uniform3f(program.uFogVolumeMins!, fogVolume.mins[0], fogVolume.mins[1], fogVolume.mins[2]);
+    gl.uniform3f(program.uFogVolumeMaxs!, fogVolume.maxs[0], fogVolume.maxs[1], fogVolume.maxs[2]);
 
     if (fogVolume.modelIndex === 0) {
       const sizeX = fogVolume.maxs[0] - fogVolume.mins[0];
       const sizeY = fogVolume.maxs[1] - fogVolume.mins[1];
       const sizeZ = fogVolume.maxs[2] - fogVolume.mins[2];
 
-      gl.uniformMatrix3fv(program.uAngles, false, new Float32Array([
+      gl.uniformMatrix3fv(program.uAngles!, false, new Float32Array([
         sizeX, 0, 0,
         0, sizeY, 0,
         0, 0, sizeZ,
       ]));
-      gl.uniform3f(program.uOrigin, fogVolume.mins[0], fogVolume.mins[1], fogVolume.mins[2]);
+      gl.uniform3f(program.uOrigin!, fogVolume.mins[0], fogVolume.mins[1], fogVolume.mins[2]);
 
       this._getFogCubeVBO();
 
@@ -901,12 +902,12 @@ export class BrushModelRenderer extends ModelRenderer {
         return;
       }
 
-      gl.uniform3f(program.uOrigin, 0.0, 0.0, 0.0);
-      gl.uniformMatrix3fv(program.uAngles, false, GL.identity);
+      gl.uniform3f(program.uOrigin!, 0.0, 0.0, 0.0);
+      gl.uniformMatrix3fv(program.uAngles!, false, GL.identity);
 
       gl.bindBuffer(gl.ARRAY_BUFFER, submodel.cmds as WebGLBuffer);
       R.c_brush_vbos++;
-      gl.vertexAttribPointer(program.aPosition.location as number, 3, gl.FLOAT, false, 80, 0);
+      gl.vertexAttribPointer(program.aPosition!.location as number, 3, gl.FLOAT, false, 80, 0);
 
       if (submodel.chains) {
         for (const chain of submodel.chains) {
@@ -1016,7 +1017,7 @@ export class BrushModelRenderer extends ModelRenderer {
     material.emit(worldspawn);
     const alpha = this._getTurbulentMaterialAlpha(material, worldspawn);
     this._setTurbulentSurfaceState(alpha);
-    gl.uniform1f(program.uAlpha, alpha);
+    gl.uniform1f(program.uAlpha!, alpha);
 
     R.c_brush_verts += vertexCount;
     R.c_brush_tris += vertexCount / 3;
@@ -1053,29 +1054,29 @@ export class BrushModelRenderer extends ModelRenderer {
   /** @private */
   _setupBrushShaderCommon(program: GLProgramInfo, clmodel: BrushModel, isWorld: boolean): void {
     if ((R.fullbright.value !== 0) || (clmodel.lightdata === null && clmodel.lightdata_rgb === null)) {
-      GL.BindArray(program.tLightmap, R.fullbright_texture);
+      GL.BindArray(program.tLightmap!, R.fullbright_texture);
     } else {
-      GL.BindArray(program.tLightmap, R.lightmap_texture);
+      GL.BindArray(program.tLightmap!, R.lightmap_texture);
     }
 
     if (R.flashblend.value === 0 && (isWorld || clmodel.submodel)) {
-      GL.Bind(program.tDlight, R.dlightmap_rgba_texture);
+      GL.Bind(program.tDlight!, R.dlightmap_rgba_texture);
     } else {
-      GL.Bind(program.tDlight, R.null_texture);
+      GL.Bind(program.tDlight!, R.null_texture);
     }
 
     if (program.tShadowMap0 !== undefined && R.shadow_textures?.[0]) {
-      GL.Bind(program.tShadowMap0, R.shadow_textures[0]);
+      GL.Bind(program.tShadowMap0!, R.shadow_textures[0]);
     }
     if (program.tShadowMap1 !== undefined && R.shadow_textures?.[1]) {
-      GL.Bind(program.tShadowMap1, R.shadow_textures[1]);
+      GL.Bind(program.tShadowMap1!, R.shadow_textures[1]);
     }
     if (program.tShadowMap2 !== undefined && R.shadow_textures?.[2]) {
-      GL.Bind(program.tShadowMap2, R.shadow_textures[2]);
+      GL.Bind(program.tShadowMap2!, R.shadow_textures[2]);
     }
 
     if (program.tPointShadowMap !== undefined) {
-      GL.BindCube(program.tPointShadowMap, R.point_shadow_texture);
+      GL.BindCube(program.tPointShadowMap!, R.point_shadow_texture!);
     }
   }
 
@@ -1084,17 +1085,17 @@ export class BrushModelRenderer extends ModelRenderer {
     const program = GL.UseProgram('brush')!;
     this._applyEntityLighting(program, clmodel, e);
 
-    gl.uniform3fv(program.uOrigin, e.lerp.origin);
-    gl.uniformMatrix3fv(program.uAngles, false, viewMatrix);
-    gl.uniform1f(program.uInterpolation, R.interpolation.value ? (CL.state.time % 0.2) / 0.2 : 0);
-    gl.uniform1f(program.uAlpha, 1.0);
-    gl.uniform1f(program.uBloomEmissiveScale, getEntityBloomEmissiveScale(e.effects));
-    gl.uniform1f(program.uBloomDlightScale, R.bloomDlightStrength.value);
-    gl.uniform1f(program.uBloomSpecularScale, resolveBrushBloomContributionStrength(R.bloomSpecularStrength?.value ?? 0.0));
+    gl.uniform3fv(program.uOrigin!, e.lerp.origin);
+    gl.uniformMatrix3fv(program.uAngles!, false, viewMatrix);
+    gl.uniform1f(program.uInterpolation!, R.interpolation.value ? (CL.state.time % 0.2) / 0.2 : 0);
+    gl.uniform1f(program.uAlpha!, 1.0);
+    gl.uniform1f(program.uBloomEmissiveScale!, getEntityBloomEmissiveScale(e.effects));
+    gl.uniform1f(program.uBloomDlightScale!, R.bloomDlightStrength.value);
+    gl.uniform1f(program.uBloomSpecularScale!, resolveBrushBloomContributionStrength(R.bloomSpecularStrength?.value ?? 0.0));
 
     this._setupBrushShaderCommon(program, clmodel, false);
-    GL.Bind(program.tLightStyleA, R.lightstyle_texture_a);
-    GL.Bind(program.tLightStyleB, R.lightstyle_texture_b);
+    GL.Bind(program.tLightStyleA!, R.lightstyle_texture_a);
+    GL.Bind(program.tLightStyleB!, R.lightstyle_texture_b);
     this._bindBrushDeluxemap(program, clmodel);
 
     if (!clmodel.chains || clmodel.chains.length === 0) {
@@ -1125,17 +1126,17 @@ export class BrushModelRenderer extends ModelRenderer {
     const program = GL.UseProgram('brush')!;
     this._applyEntityLighting(program, clmodel, e);
 
-    gl.uniform3fv(program.uOrigin, e.lerp.origin);
-    gl.uniformMatrix3fv(program.uAngles, false, viewMatrix);
-    gl.uniform1f(program.uInterpolation, R.interpolation.value ? (CL.state.time % 0.2) / 0.2 : 0);
-    gl.uniform1f(program.uAlpha, e.alpha);
-    gl.uniform1f(program.uBloomEmissiveScale, getEntityBloomEmissiveScale(e.effects));
-    gl.uniform1f(program.uBloomDlightScale, R.bloomDlightStrength.value);
-    gl.uniform1f(program.uBloomSpecularScale, resolveBrushBloomContributionStrength(R.bloomSpecularStrength?.value ?? 0.0));
+    gl.uniform3fv(program.uOrigin!, e.lerp.origin);
+    gl.uniformMatrix3fv(program.uAngles!, false, viewMatrix);
+    gl.uniform1f(program.uInterpolation!, R.interpolation.value ? (CL.state.time % 0.2) / 0.2 : 0);
+    gl.uniform1f(program.uAlpha!, e.alpha);
+    gl.uniform1f(program.uBloomEmissiveScale!, getEntityBloomEmissiveScale(e.effects));
+    gl.uniform1f(program.uBloomDlightScale!, R.bloomDlightStrength.value);
+    gl.uniform1f(program.uBloomSpecularScale!, resolveBrushBloomContributionStrength(R.bloomSpecularStrength?.value ?? 0.0));
 
     this._setupBrushShaderCommon(program, clmodel, false);
-    GL.Bind(program.tLightStyleA, R.lightstyle_texture_a);
-    GL.Bind(program.tLightStyleB, R.lightstyle_texture_b);
+    GL.Bind(program.tLightStyleA!, R.lightstyle_texture_a);
+    GL.Bind(program.tLightStyleB!, R.lightstyle_texture_b);
     this._bindBrushDeluxemap(program, clmodel);
 
     gl.enable(gl.BLEND);
@@ -1176,14 +1177,14 @@ export class BrushModelRenderer extends ModelRenderer {
   /** @private */
   _renderTurbulentSurfaces(clmodel: BrushModel, e: ClientEdict, viewMatrix: number[]): void {
     const program = GL.UseProgram('turbulent')!;
-    gl.uniform3fv(program.uOrigin, e.lerp.origin);
-    gl.uniformMatrix3fv(program.uAngles, false, viewMatrix);
-    gl.uniform1f(program.uTime, Host.realtime % (Math.PI * 2.0));
-    gl.uniform1f(program.uBloomEmissiveScale, getEntityBloomEmissiveScale(e.effects));
-    gl.uniform1f(program.uBloomDlightScale, R.bloomDlightStrength.value);
+    gl.uniform3fv(program.uOrigin!, e.lerp.origin);
+    gl.uniformMatrix3fv(program.uAngles!, false, viewMatrix);
+    gl.uniform1f(program.uTime!, Host.realtime % (Math.PI * 2.0));
+    gl.uniform1f(program.uBloomEmissiveScale!, getEntityBloomEmissiveScale(e.effects));
+    gl.uniform1f(program.uBloomDlightScale!, R.bloomDlightStrength.value);
 
     this._setupBrushShaderCommon(program, clmodel, false);
-    GL.Bind(program.tLightStyle, R.lightstyle_texture_a);
+    GL.Bind(program.tLightStyle!, R.lightstyle_texture_a);
 
     if (!clmodel.chains || clmodel.chains.length === 0) {
       gl.depthMask(true);
@@ -1206,7 +1207,7 @@ export class BrushModelRenderer extends ModelRenderer {
       material.emit(e);
       const alpha = this._getTurbulentMaterialAlpha(material, e);
       this._setTurbulentSurfaceState(alpha);
-      gl.uniform1f(program.uAlpha, alpha);
+      gl.uniform1f(program.uAlpha!, alpha);
       material.bindTo(program);
 
       R.c_brush_verts += chain[2];
@@ -1228,29 +1229,29 @@ export class BrushModelRenderer extends ModelRenderer {
       CL.state.worldmodel as BrushModel | null,
     );
 
-    gl.uniform3fv(program.uAmbientLight, lightingState.ambientlight);
-    gl.uniform3fv(program.uShadeLight, lightingState.shadelight);
+    gl.uniform3fv(program.uAmbientLight!, lightingState.ambientlight);
+    gl.uniform3fv(program.uShadeLight!, lightingState.shadelight);
     gl.uniform4f(
-      program.uLightVec,
+      program.uLightVec!,
       lightingState.lightPosition[0],
       lightingState.lightPosition[1],
       lightingState.lightPosition[2],
       0.0,
     );
-    gl.uniform3fv(program.uDynamicShadeLight, lightingState.dynamicShadeLight);
-    gl.uniform3fv(program.uDynamicLightVec, lightingState.dynamicLightPosition);
+    gl.uniform3fv(program.uDynamicShadeLight!, lightingState.dynamicShadeLight);
+    gl.uniform3fv(program.uDynamicLightVec!, lightingState.dynamicLightPosition);
   }
 
   /** @private */
   _bindBrushDeluxemap(program: GLProgramInfo, clmodel: BrushModel): void {
     if (BrushModelRenderer.usesDeluxemap(clmodel, CL.state.worldmodel as BrushModel | null)) {
-      GL.BindArray(program.tDeluxemap, R.deluxemap_texture);
-      gl.uniform1f(program.uHaveDeluxemap, 1.0);
+      GL.BindArray(program.tDeluxemap!, R.deluxemap_texture);
+      gl.uniform1f(program.uHaveDeluxemap!, 1.0);
       return;
     }
 
-    GL.BindArray(program.tDeluxemap, R.normal_up_texture);
-    gl.uniform1f(program.uHaveDeluxemap, 0.0);
+    GL.BindArray(program.tDeluxemap!, R.normal_up_texture);
+    gl.uniform1f(program.uHaveDeluxemap!, 0.0);
   }
 
   /**
@@ -1446,7 +1447,7 @@ export class BrushModelRenderer extends ModelRenderer {
     const program = this._fogVolumeProgram!;
     const dlights = this._collectFogDlights(fogVolume);
 
-    gl.uniform1i(program.uDlightCount, dlights.length);
+    gl.uniform1i(program.uDlightCount!, dlights.length);
 
     for (let i = 0; i < dlights.length; i++) {
       const dl = dlights[i];
@@ -1625,7 +1626,7 @@ export class BrushModelRenderer extends ModelRenderer {
    * @private
    */
   _expandLeafBoundsForSurface(leaf: Node, verts: number[][]): void {
-    this._expandBounds(leaf.mins, leaf.maxs, verts);
+    this._expandBounds(leaf.mins!, leaf.maxs!, verts);
   }
 
   /**
@@ -1663,10 +1664,11 @@ export class BrushModelRenderer extends ModelRenderer {
           for (let l = 0; l < surf.styles.length; l++) {
             styles[l] = surf.styles[l] * 0.015625 + 0.0078125;
           }
+          console.assert(surf.verts !== null && Array.isArray(surf.verts));
           this._expandLeafBoundsForSurface(leaf, surf.verts!);
-          chain[2] += surf.verts.length;
-          for (let l = 0; l < surf.verts.length; l++) {
-            const vert = surf.verts[l];
+          chain[2] += surf.verts!.length;
+          for (let l = 0; l < surf.verts!.length; l++) {
+            const vert = surf.verts![l];
             cmds.push(vert[0], vert[1], vert[2]);
             cmds.push(vert[3], vert[4], vert[5], vert[6]);
             cmds.push(styles[0], styles[1], styles[2], styles[3]);
@@ -1700,10 +1702,11 @@ export class BrushModelRenderer extends ModelRenderer {
           if (surf.texture !== i) {
             continue;
           }
+          console.assert(surf.verts !== null && Array.isArray(surf.verts));
           this._expandLeafBoundsForSurface(leaf, surf.verts!);
-          chain[1] += surf.verts.length;
-          for (let l = 0; l < surf.verts.length; l++) {
-            const vert = surf.verts[l];
+          chain[1] += surf.verts!.length;
+          for (let l = 0; l < surf.verts!.length; l++) {
+            const vert = surf.verts![l];
             cmds.push(vert[0], vert[1], vert[2]);
           }
         }
@@ -1739,11 +1742,12 @@ export class BrushModelRenderer extends ModelRenderer {
           }
           const hasLightmap = this._surfaceHasTurbulentLightmap(m, surf);
           const faceFallbackLight = hasLightmap ? null : this._getTurbulentFallbackFaceLight(m, surf, turbulentFallbackCache);
+          console.assert(surf.verts !== null && Array.isArray(surf.verts));
           this._expandLeafBoundsForSurface(leaf, surf.verts!);
           this._expandBounds(chainMins, chainMaxs, surf.verts!);
-          chain[2] += surf.verts.length;
-          for (let l = 0; l < surf.verts.length; l++) {
-            const vert = surf.verts[l];
+          chain[2] += surf.verts!.length;
+          for (let l = 0; l < surf.verts!.length; l++) {
+            const vert = surf.verts![l];
             const fallbackLight = hasLightmap
               ? [0.0, 0.0, 0.0]
               : BrushModelRenderer.blendTurbulentFallbackLight(
diff --git a/source/engine/client/renderer/MeshModelRenderer.ts b/source/engine/client/renderer/MeshModelRenderer.ts
index a068fd70..031482db 100644
--- a/source/engine/client/renderer/MeshModelRenderer.ts
+++ b/source/engine/client/renderer/MeshModelRenderer.ts
@@ -3,6 +3,7 @@ import { ModelRenderer } from './ModelRenderer.ts';
 import { getEntityBloomEmissiveScale } from './BloomEffect.ts';
 import { eventBus, getClientRegistry } from '../../registry.ts';
 import GL, { ATTRIB_LOCATIONS } from '../GL.ts';
+import { ModelType } from '../../common/Mod.ts';
 import type { MeshModel } from '../../common/model/MeshModel.ts';
 import type { ClientEdict } from '../ClientEntities.ts';
 import type { BaseModel } from '../../common/model/BaseModel.ts';
@@ -30,10 +31,10 @@ eventBus.subscribe('gl.shutdown', () => {
 export class MeshModelRenderer extends ModelRenderer {
   /**
    * Get the model type this renderer handles.
-   * @returns Mod.type.mesh (3)
+   * @returns ModelType.mesh.
    */
-  override getModelType(): number {
-    return 3; // Mod.type.mesh
+  override getModelType(): ModelType {
+    return ModelType.mesh;
   }
 
   /**
diff --git a/source/engine/client/renderer/ModelRenderer.ts b/source/engine/client/renderer/ModelRenderer.ts
index 958ba3d4..193b5c25 100644
--- a/source/engine/client/renderer/ModelRenderer.ts
+++ b/source/engine/client/renderer/ModelRenderer.ts
@@ -1,4 +1,5 @@
 import { NotImplementedError } from '../../common/Errors.ts';
+import { ModelType } from '../../common/Mod.ts';
 import type { BaseModel } from '../../common/model/BaseModel.ts';
 import type { ClientEdict } from '../ClientEntities.ts';
 
@@ -11,13 +12,13 @@ import type { ClientEdict } from '../ClientEntities.ts';
  */
 export class ModelRenderer {
   /**
-   * Returns the model type constant this renderer handles (e.g. Mod.type.brush).
+   * Returns the model type constant this renderer handles (e.g. ModelType.brush).
    * @returns The model type identifier for this renderer.
    */
-  getModelType(): number {
+  getModelType(): ModelType {
     throw new NotImplementedError('ModelRenderer.getModelType must be implemented');
     // eslint-disable-next-line no-unreachable
-    return -1;
+    return ModelType.brush;
   }
 
   /**
diff --git a/source/engine/client/renderer/PostProcess.ts b/source/engine/client/renderer/PostProcess.ts
index b468e2a2..5ac11e2c 100644
--- a/source/engine/client/renderer/PostProcess.ts
+++ b/source/engine/client/renderer/PostProcess.ts
@@ -480,9 +480,9 @@ export default class PostProcess {
   static _blitToScreen(texture: WebGLTexture, x: number, y: number, width: number, height: number): void {
     gl.disable(gl.BLEND);
 
-    const program = GL.UseProgram('pic');
-    gl.uniform3f(program!.uColor, 1.0, 1.0, 1.0);
-    GL.Bind(program!.tTexture, texture);
+    const program = GL.UseProgram('pic')!;
+    gl.uniform3f(program!.uColor!, 1.0, 1.0, 1.0);
+    GL.Bind(program!.tTexture!, texture);
     // FBO texture has (0,0) at bottom-left; 2D screen has (0,0) at top-left.
     GL.StreamDrawTexturedQuad(x, y, width, height, 0.0, 1.0, 1.0, 0.0);
     GL.StreamFlush();
diff --git a/source/engine/client/renderer/ShadowMap.ts b/source/engine/client/renderer/ShadowMap.ts
index 71f9d245..2f44270e 100644
--- a/source/engine/client/renderer/ShadowMap.ts
+++ b/source/engine/client/renderer/ShadowMap.ts
@@ -10,11 +10,12 @@ import type { BrushModel } from '../../common/model/BSP.ts';
 import type { AliasModel } from '../../common/model/AliasModel.ts';
 import type { MeshModel } from '../../common/model/MeshModel.ts';
 import type { ClientEdict } from '../ClientEntities.ts';
+import { ModelType } from '../../common/Mod.ts';
 
-let { CL, COM, Mod, R, SV } = getClientRegistry();
+let { CL, COM, R, SV } = getClientRegistry();
 
 eventBus.subscribe('registry.frozen', () => {
-  ({ CL, COM, Mod, R, SV } = getClientRegistry());
+  ({ CL, COM, R, SV } = getClientRegistry());
 });
 
 let gl: WebGL2RenderingContext = null!;
@@ -410,9 +411,9 @@ export default class ShadowMap {
     GL.BindVAO(worldmodel.opaqueVAO as WebGLVertexArrayObject);
     const program = GL.UseProgram('shadow-brush')!;
 
-    gl.uniform3f(program.uOrigin, 0, 0, 0);
-    gl.uniformMatrix3fv(program.uAngles, false, GL.identity);
-    gl.uniformMatrix4fv(program.uLightSpaceMatrix, false, ShadowMap.lightSpaceMatrices[0]);
+    gl.uniform3f(program.uOrigin!, 0, 0, 0);
+    gl.uniformMatrix3fv(program.uAngles!, false, GL.identity);
+    gl.uniformMatrix4fv(program.uLightSpaceMatrix!, false, ShadowMap.lightSpaceMatrices[0]);
 
     for (let i = 0; i < worldmodel.leafs.length; i++) {
       const leaf = worldmodel.leafs[i];
@@ -456,15 +457,16 @@ export default class ShadowMap {
       if (!ShadowMap._isLocalShadowCasterEntity(entity, cutoffOrigin, cutoffDistSq)) {
         continue;
       }
-      const model = entity.model;
+      const model = entity.model!;
+      console.assert(model !== null, `Entity ${entity.num} has no model`);
       switch (model.type) {
-        case Mod.type.brush:
+        case ModelType.brush:
           ShadowMap._renderBrushEntityShadow(model as BrushModel, entity, lightSpaceMatrix, brushProgram);
           break;
-        case Mod.type.alias:
+        case ModelType.alias:
           ShadowMap._renderAliasEntityShadow(model as AliasModel, entity, lightSpaceMatrix, aliasProgram);
           break;
-        case Mod.type.mesh:
+        case ModelType.mesh:
           ShadowMap._renderMeshEntityShadow(model as MeshModel, entity, lightSpaceMatrix, brushProgram);
           break;
         default:
@@ -501,7 +503,7 @@ export default class ShadowMap {
     }
 
     const type = entity.model.type;
-    if (type !== Mod.type.brush && type !== Mod.type.alias && type !== Mod.type.mesh) {
+    if (type !== ModelType.brush && type !== ModelType.alias && type !== ModelType.mesh) {
       return false;
     }
 
@@ -530,9 +532,9 @@ export default class ShadowMap {
     GL.BindVAO(model.opaqueVAO as WebGLVertexArrayObject);
     const program = GL.UseProgram(programName)!;
 
-    gl.uniform3fv(program.uOrigin, entity.lerp.origin);
-    gl.uniformMatrix3fv(program.uAngles, false, entity.lerp.angles.toRotationMatrix());
-    gl.uniformMatrix4fv(program.uLightSpaceMatrix, false, lightSpaceMatrix);
+    gl.uniform3fv(program.uOrigin!, entity.lerp.origin);
+    gl.uniformMatrix3fv(program.uAngles!, false, entity.lerp.angles.toRotationMatrix());
+    gl.uniformMatrix4fv(program.uLightSpaceMatrix!, false, lightSpaceMatrix);
 
     for (let i = 0; i < model.chains.length; i++) {
       const chain = model.chains[i];
@@ -557,36 +559,36 @@ export default class ShadowMap {
     }
     const program = GL.UseProgram(programName)!;
 
-    gl.uniform3fv(program.uOrigin, entity.lerp.origin);
-    gl.uniformMatrix3fv(program.uAngles, false, entity.lerp.angles.toRotationMatrix());
-    gl.uniformMatrix4fv(program.uLightSpaceMatrix, false, lightSpaceMatrix);
+    gl.uniform3fv(program.uOrigin!, entity.lerp.origin);
+    gl.uniformMatrix3fv(program.uAngles!, false, entity.lerp.angles.toRotationMatrix());
+    gl.uniformMatrix4fv(program.uLightSpaceMatrix!, false, lightSpaceMatrix);
 
     const { frameA, frameB, targettime } = AliasModelRenderer._selectFrames(model, entity);
 
-    gl.uniform1f(program.uInterpolation, R.interpolation.value && (entity.effects & effect.EF_MUZZLEFLASH) === 0 ? Math.min(1, Math.max(0, targettime)) : 0);
+    gl.uniform1f(program.uInterpolation!, R.interpolation.value && (entity.effects & effect.EF_MUZZLEFLASH) === 0 ? Math.min(1, Math.max(0, targettime)) : 0);
 
     gl.bindBuffer(gl.ARRAY_BUFFER, model.cmds as WebGLBuffer);
-    gl.enableVertexAttribArray(program.aPositionA.location as number);
-    gl.enableVertexAttribArray(program.aPositionB.location as number);
-    gl.vertexAttribPointer(program.aPositionA.location as number, 3, gl.FLOAT, false, 24, frameA.cmdofs);
-    gl.vertexAttribPointer(program.aPositionB.location as number, 3, gl.FLOAT, false, 24, frameB.cmdofs);
+    gl.enableVertexAttribArray(program.aPositionA!.location as number);
+    gl.enableVertexAttribArray(program.aPositionB!.location as number);
+    gl.vertexAttribPointer(program.aPositionA!.location as number, 3, gl.FLOAT, false, 24, frameA.cmdofs!);
+    gl.vertexAttribPointer(program.aPositionB!.location as number, 3, gl.FLOAT, false, 24, frameB.cmdofs!);
 
     if (program.aNormalA) {
-      gl.enableVertexAttribArray(program.aNormalA.location as number);
-      gl.enableVertexAttribArray(program.aNormalB.location as number);
-      gl.vertexAttribPointer(program.aNormalA.location as number, 3, gl.FLOAT, false, 24, frameA.cmdofs + 12);
-      gl.vertexAttribPointer(program.aNormalB.location as number, 3, gl.FLOAT, false, 24, frameB.cmdofs + 12);
-      gl.uniform3fv(program.uLightPos, ShadowMap.pointLightOrigin);
-      gl.uniform1f(program.uNormalBias, ShadowMap.pointNormalBias!.value);
+      gl.enableVertexAttribArray(program.aNormalA!.location as number);
+      gl.enableVertexAttribArray(program.aNormalB!.location as number);
+      gl.vertexAttribPointer(program.aNormalA!.location as number, 3, gl.FLOAT, false, 24, frameA.cmdofs! + 12);
+      gl.vertexAttribPointer(program.aNormalB!.location as number, 3, gl.FLOAT, false, 24, frameB.cmdofs! + 12);
+      gl.uniform3fv(program.uLightPos!, ShadowMap.pointLightOrigin);
+      gl.uniform1f(program.uNormalBias!, ShadowMap.pointNormalBias!.value);
     }
 
     gl.drawArrays(gl.TRIANGLES, 0, model._num_tris * 3);
 
-    gl.disableVertexAttribArray(program.aPositionA.location as number);
-    gl.disableVertexAttribArray(program.aPositionB.location as number);
+    gl.disableVertexAttribArray(program.aPositionA!.location as number);
+    gl.disableVertexAttribArray(program.aPositionB!.location as number);
     if (program.aNormalA) {
-      gl.disableVertexAttribArray(program.aNormalA.location as number);
-      gl.disableVertexAttribArray(program.aNormalB.location as number);
+      gl.disableVertexAttribArray(program.aNormalA!.location as number);
+      gl.disableVertexAttribArray(program.aNormalB!.location as number);
     }
   }
 
@@ -603,9 +605,9 @@ export default class ShadowMap {
     GL.BindVAO(model.vao);
     const program = GL.UseProgram(programName)!;
 
-    gl.uniform3fv(program.uOrigin, entity.lerp.origin);
-    gl.uniformMatrix3fv(program.uAngles, false, entity.lerp.angles.toRotationMatrix());
-    gl.uniformMatrix4fv(program.uLightSpaceMatrix, false, lightSpaceMatrix);
+    gl.uniform3fv(program.uOrigin!, entity.lerp.origin);
+    gl.uniformMatrix3fv(program.uAngles!, false, entity.lerp.angles.toRotationMatrix());
+    gl.uniformMatrix4fv(program.uLightSpaceMatrix!, false, lightSpaceMatrix);
 
     const indexType = model.indices instanceof Uint16Array ? gl.UNSIGNED_SHORT : gl.UNSIGNED_INT;
     gl.drawElements(gl.TRIANGLES, model.numTriangles * 3, indexType, 0);
@@ -908,11 +910,11 @@ export default class ShadowMap {
     GL.BindVAO(worldmodel.opaqueVAO as WebGLVertexArrayObject);
     const program = GL.UseProgram('shadow-point')!;
 
-    gl.uniform3f(program.uOrigin, 0, 0, 0);
-    gl.uniformMatrix3fv(program.uAngles, false, GL.identity);
-    gl.uniform3fv(program.uLightPos, ShadowMap.pointLightOrigin);
-    gl.uniform1f(program.uLightRadius, ShadowMap.pointLightRadius);
-    gl.uniform1f(program.uNormalBias, ShadowMap.pointNormalBias!.value);
+    gl.uniform3f(program.uOrigin!, 0, 0, 0);
+    gl.uniformMatrix3fv(program.uAngles!, false, GL.identity);
+    gl.uniform3fv(program.uLightPos!, ShadowMap.pointLightOrigin);
+    gl.uniform1f(program.uLightRadius!, ShadowMap.pointLightRadius);
+    gl.uniform1f(program.uNormalBias!, ShadowMap.pointNormalBias!.value);
 
     for (let face = 0; face < 6; face++) {
       gl.framebufferTexture2D(
@@ -923,7 +925,7 @@ export default class ShadowMap {
       gl.clear(gl.DEPTH_BUFFER_BIT);
 
       ShadowMap.buildPointFaceMatrix(face);
-      gl.uniformMatrix4fv(program.uLightSpaceMatrix, false, ShadowMap.pointFaceMatrix);
+      gl.uniformMatrix4fv(program.uLightSpaceMatrix!, false, ShadowMap.pointFaceMatrix);
 
       for (let i = 0; i < worldmodel.leafs.length; i++) {
         const leaf = worldmodel.leafs[i];
@@ -945,8 +947,8 @@ export default class ShadowMap {
 
       GL.BindVAO(worldmodel.opaqueVAO as WebGLVertexArrayObject);
       GL.UseProgram('shadow-point');
-      gl.uniform3f(program.uOrigin, 0, 0, 0);
-      gl.uniformMatrix3fv(program.uAngles, false, GL.identity);
+      gl.uniform3f(program.uOrigin!, 0, 0, 0);
+      gl.uniformMatrix3fv(program.uAngles!, false, GL.identity);
     }
 
     GL.UnbindVAO();
diff --git a/source/engine/client/renderer/Sky.ts b/source/engine/client/renderer/Sky.ts
index f38a196a..62da1673 100644
--- a/source/engine/client/renderer/Sky.ts
+++ b/source/engine/client/renderer/Sky.ts
@@ -62,7 +62,7 @@ export class SkyRenderer {
       }
 
       // Frustum culling
-      if (R.CullBox(leaf.mins, leaf.maxs)) {
+      if (R.CullBox(leaf.mins!, leaf.maxs!)) {
         continue;
       }
 
diff --git a/source/engine/client/renderer/SpriteModelRenderer.ts b/source/engine/client/renderer/SpriteModelRenderer.ts
index 610eb087..5aa05ede 100644
--- a/source/engine/client/renderer/SpriteModelRenderer.ts
+++ b/source/engine/client/renderer/SpriteModelRenderer.ts
@@ -2,6 +2,7 @@ import { ModelRenderer } from './ModelRenderer.ts';
 import { getEntityBloomEmissiveScale } from './BloomEffect.ts';
 import { eventBus, getClientRegistry } from '../../registry.ts';
 import GL from '../GL.ts';
+import { ModelType } from '../../common/Mod.ts';
 import type { SpriteModel } from '../../common/model/SpriteModel.ts';
 import type { ClientEdict } from '../ClientEntities.ts';
 import type { BaseModel } from '../../common/model/BaseModel.ts';
@@ -34,10 +35,10 @@ type SpriteRenderFrame = Exclude<SpriteFrame, { group: true }> | SpriteGroupedFr
 export class SpriteModelRenderer extends ModelRenderer {
   /**
    * Get the model type this renderer handles.
-   * @returns Mod.type.sprite (1)
+   * @returns ModelType.sprite.
    */
-  override getModelType(): number {
-    return 1; // Mod.type.sprite
+  override getModelType(): ModelType {
+    return ModelType.sprite;
   }
 
   /**
diff --git a/source/engine/common/CollisionModelSource.ts b/source/engine/common/CollisionModelSource.ts
index b0b53b7d..cb20d5a8 100644
--- a/source/engine/common/CollisionModelSource.ts
+++ b/source/engine/common/CollisionModelSource.ts
@@ -1,6 +1,7 @@
 import { eventBus, getClientRegistry, getCommonRegistry } from '../registry.ts';
 
 import type { ServerEdict } from '../server/Edict.ts';
+import { ModelType } from './Mod.ts';
 import type { BaseModel } from './model/BaseModel.ts';
 import type { BrushModel } from './model/BSP.ts';
 
@@ -79,7 +80,7 @@ export class CollisionModelSource {
 
     const fallbackClientModel = this.#getClientModels()?.[1] ?? null;
 
-    if (fallbackClientModel !== null && fallbackClientModel.type === 0) {
+    if (fallbackClientModel !== null && fallbackClientModel.type === ModelType.brush) {
       return fallbackClientModel as BrushModel;
     }
 
diff --git a/source/engine/common/Console.ts b/source/engine/common/Console.ts
index 2f8a1fce..bf7947db 100644
--- a/source/engine/common/Console.ts
+++ b/source/engine/common/Console.ts
@@ -1,4 +1,5 @@
 import Vector from '../../shared/Vector.ts';
+import { KeyDestination } from '../client/Key.ts';
 import { eventBus, getClientRegistry, registry } from '../registry.ts';
 import Cvar from './Cvar.ts';
 import Cmd from './Cmd.ts';
@@ -43,17 +44,17 @@ export default class Con {
 
   static ToggleConsole_f() {
     SCR.EndLoadingPlaque();
-    if (Key.dest.value === Key.dest.console) {
+    if (Key.destination === KeyDestination.console) {
       if (CL.cls.state !== clientConnectionState.connected) {
         M.Menu_Main_f();
         return;
       }
-      Key.dest.value = Key.dest.game;
+      Key.destination = KeyDestination.game;
       // Key.edit_line = ''; // CR: this annoys me otherwise
       Key.history_line = Key.lines.length;
       return;
     }
-    Key.dest.value = Key.dest.console;
+    Key.destination = KeyDestination.console;
   }
 
   static Clear_f() {
@@ -69,12 +70,12 @@ export default class Con {
   }
 
   static MessageMode_f() {
-    Key.dest.value = Key.dest.message;
+    Key.destination = KeyDestination.message;
     Key.team_message = false;
   }
 
   static MessageMode2_f() {
-    Key.dest.value = Key.dest.message;
+    Key.destination = KeyDestination.message;
     Key.team_message = true;
   }
 
@@ -164,7 +165,7 @@ export default class Con {
   }
 
   static DrawInput() {
-    if (Key.dest.value !== Key.dest.console) {
+    if (Key.destination !== KeyDestination.console) {
       return;
     }
     let text = ']' + Key.edit_line + String.fromCharCode(10 + ((Host.realtime * 4.0) & 1));
@@ -195,7 +196,7 @@ export default class Con {
 
     v += 16;
 
-    if (Key.dest.value === Key.dest.message) {
+    if (Key.destination === KeyDestination.message) {
       Draw.String(8, v, 'say: ' + Key.chat_buffer + String.fromCharCode(10 + ((Host.realtime * 4.0) & 1)), 2.0);
     }
   }
diff --git a/source/engine/common/Cvar.ts b/source/engine/common/Cvar.ts
index aefc2a30..f3c97be4 100644
--- a/source/engine/common/Cvar.ts
+++ b/source/engine/common/Cvar.ts
@@ -85,7 +85,7 @@ export default class Cvar {
     return Cvar.GetVariableNames().find((name) => name.startsWith(partial)) ?? null;
   }
 
-  set(value: CvarValue): Cvar {
+  set(value: CvarValue): this {
     let nextValue: string;
 
     // turning everything into a string
@@ -120,7 +120,7 @@ export default class Cvar {
     return this;
   }
 
-  reset(): Cvar {
+  reset(): this {
     this.set(this.#originalValue);
     return this;
   }
diff --git a/source/engine/common/Def.ts b/source/engine/common/Def.ts
index 840feece..9ed0a474 100644
--- a/source/engine/common/Def.ts
+++ b/source/engine/common/Def.ts
@@ -21,14 +21,14 @@ export const defaultBasedir = 'id1';
 /**
  * Engine limitations.
  */
-export enum limits {
-  edicts = 64,
-  clients = 32,
-  dlights = 32,
-  lightstyles = 64,
-  beams = 24,
-  entities = 1024,
-}
+export const limits = Object.freeze({
+  edicts: 64,
+  clients: 32,
+  dlights: 32,
+  lightstyles: 64,
+  beams: 24,
+  entities: 1024,
+});
 
 /**
  * Legacy client stat indices.
diff --git a/source/engine/common/GameAPIs.ts b/source/engine/common/GameAPIs.ts
index 9bfa8d16..6d73336d 100644
--- a/source/engine/common/GameAPIs.ts
+++ b/source/engine/common/GameAPIs.ts
@@ -18,7 +18,7 @@ import { ED, type BaseEntity, ServerEdict as ServerEdictValue } from '../server/
 import Cmd from './Cmd.ts';
 import Cvar from './Cvar.ts';
 import { HostError } from './Errors.ts';
-import Mod from './Mod.ts';
+import Mod, { ModelScope } from './Mod.ts';
 import W from './W.ts';
 
 type ServerEdict = ServerEdictValue;
@@ -136,8 +136,8 @@ function internalTraceToGameTrace(trace: InternalTraceLike): GameTrace {
       distance: trace.plane.dist,
     },
     contents: {
-      inOpen: !!trace.inopen,
-      inWater: !!trace.inwater,
+      inOpen: trace.inopen,
+      inWater: trace.inwater,
     },
     point: trace.endpos,
     entity: trace.ent ? trace.ent.entity : null,
@@ -705,7 +705,7 @@ export class ServerEngineAPI extends CommonEngineAPI {
     }
 
     SV.server.modelPrecache.push(modelName);
-    SV.server.models.push(Mod.ForNameAsync(modelName, true, Mod.scope.server)); // will cause promises in the array
+    SV.server.models.push(Mod.ForNameAsync(modelName, true, ModelScope.server)); // will cause promises in the array
   }
 
   /**
diff --git a/source/engine/common/Host.ts b/source/engine/common/Host.ts
index f998aeca..9515ea33 100644
--- a/source/engine/common/Host.ts
+++ b/source/engine/common/Host.ts
@@ -22,6 +22,7 @@ import Vector from '../../shared/Vector.ts';
 import Q from '../../shared/Q.ts';
 import { ServerClient } from '../server/Client.ts';
 import { ServerEngineAPI } from './GameAPIs.ts';
+import { KeyDestination } from '../client/Key.ts';
 import Chase from '../client/Chase.ts';
 import VID from '../client/VID.ts';
 import { HostError } from './Errors.ts';
@@ -30,6 +31,7 @@ import * as Defs from '../../shared/Defs.ts';
 import { content, gameCapabilities } from '../../shared/Defs.ts';
 import ClientLifecycle from '../client/ClientLifecycle.ts';
 import { Pmove } from './Pmove.ts';
+import { ModelScope, ModelType } from './Mod.ts';
 
 let { COM, Con, Mod, NET, PR, SV, Sys, V } = getCommonRegistry();
 let { CL, Draw, IN, Key, M, R, S, SCR, Sbar } = getClientRegistry();
@@ -417,7 +419,7 @@ export default class Host {
     SV.CheckForNewClients();
     SV.RunClients();
 
-    if (!SV.server.paused && (SV.svs.maxclients >= 2 || (!registry.isDedicatedServer && Key.dest.value === Key.dest.game))) {
+    if (!SV.server.paused && (SV.svs.maxclients >= 2 || (!registry.isDedicatedServer && Key.destination === KeyDestination.game))) {
       SV.physics.physics();
     }
 
@@ -689,7 +691,7 @@ export default class Host {
   // Commands
 
   static Quit_f(): void {
-    if (!registry.isDedicatedServer && Key.dest.value !== Key.dest.console) {
+    if (!registry.isDedicatedServer && Key.destination !== KeyDestination.console) {
       M.Menu_Quit_f();
       return;
     }
@@ -747,7 +749,7 @@ export default class Host {
         client.uniqueId.substring(0, 19).padEnd(19),
         Q.secsToTime(NET.time - client.netconnection.connecttime).padEnd(9),
         client.ping.toFixed(0).padStart(4),
-        Number(0).toFixed(0).padStart(4), // TODO: add loss
+        (0).toFixed(0).padStart(4), // TODO: add loss
         (ServerClient.STATE[client.state] ?? `unknown (${client.state})`).padEnd(10),
         client.netconnection.address,
       ];
@@ -942,7 +944,7 @@ export default class Host {
     Host.ShutdownServer(); // CR: this is the reason why you would need to use changelevel on Counter-Strike 1.6 etc.
 
     if (!registry.isDedicatedServer) {
-      Key.dest.value = Key.dest.game;
+      Key.destination = KeyDestination.game;
       SCR.BeginLoadingPlaque();
       CL.SetConnectingStep(5, 'Spawning server');
       CL.cls.spawnparms = spawnparms.join(' ');
@@ -1665,7 +1667,7 @@ export default class Host {
   }
 
   static Begin_f(this: ConsoleCommand): void { // signon 3, step 1
-    Con.DPrint(`Host.Begin_f: ${this.client}\n`);
+    Con.DPrint(`Host.Begin_f: ${this.client!}\n`);
 
     if (this.client === null) {
       Con.Print('begin is not valid from the console\n');
@@ -1697,7 +1699,7 @@ export default class Host {
       return;
     }
 
-    if (gameAPI.ClientBegin) {
+    if (gameAPI.ClientBegin instanceof Function) {
       gameAPI.time = SV.server.time;
       gameAPI.ClientBegin(this.client.edict);
     }
@@ -1869,7 +1871,7 @@ export default class Host {
       return;
     }
 
-    const loadedModel = await Mod.ForNameAsync(model, false, Mod.scope.client);
+    const loadedModel = await Mod.ForNameAsync(model, false, ModelScope.client);
 
     if (!loadedModel) {
       Con.Print(`Can't load ${model}\n`);
@@ -1908,7 +1910,7 @@ export default class Host {
 
     const model = CL.state.model_precache[viewEntity.modelindex >> 0];
 
-    if (!model || model.type !== Mod.type.alias) {
+    if (!model || model.type !== ModelType.alias) {
       return;
     }
 
@@ -1939,7 +1941,7 @@ export default class Host {
 
     const model = CL.state.model_precache[viewEntity.modelindex >> 0];
 
-    if (!model || model.type !== Mod.type.alias) {
+    if (!model || model.type !== ModelType.alias) {
       return;
     }
 
@@ -1978,7 +1980,7 @@ export default class Host {
 
     const model = CL.state.model_precache[viewEntity.modelindex >> 0];
 
-    if (!model || model.type !== Mod.type.alias) {
+    if (!model || model.type !== ModelType.alias) {
       return;
     }
 
diff --git a/source/engine/common/Mod.ts b/source/engine/common/Mod.ts
index d1115305..128f1bab 100644
--- a/source/engine/common/Mod.ts
+++ b/source/engine/common/Mod.ts
@@ -9,7 +9,7 @@ import { WavefrontOBJLoader } from './model/loaders/WavefrontOBJLoader.ts';
 import ParsedQC from './model/parsers/ParsedQC.ts';
 import { BSP38Loader } from './model/loaders/BSP38Loader.ts';
 import type { BaseModel } from './model/BaseModel.ts';
-import type { BrushModel } from './model/BSP.ts';
+import { BrushModel } from './model/BSP.ts';
 
 let { COM } = getCommonRegistry();
 let { CL } = getClientRegistry();
@@ -41,10 +41,6 @@ export enum ModelHull {
 
 type ModelCache = Record<string, BaseModel>;
 
-function isBrushModel(model: BaseModel): model is BrushModel {
-  return model.type === ModelType.brush;
-}
-
 // Re-export model classes for backward compatibility.
 // TODO: remove these!
 export { AliasModel } from './model/AliasModel.ts';
@@ -56,37 +52,17 @@ export { MeshModel } from './model/MeshModel.ts';
  * Shared model cache and loading entry point.
  */
 export default class Mod {
-  /** @deprecated use ModelType instead */
-  static type = ModelType;
-  /** @deprecated use ModelScope instead */
-  static scope = ModelScope;
-  /** @deprecated use ModelHull instead */
-  static hull = ModelHull;
   static known: ModelCache = {};
   static clientKnown: ModelCache = {};
   static serverKnown: ModelCache = {};
   static readonly pendingLoads: Record<string, Promise<BaseModel | null>> = {};
   static readonly modelLoaderRegistry = new ModelLoaderRegistry();
 
-  static IsSubmodelName(name: string): boolean {
-    return name[0] === '*';
-  }
-
-  /**
-   * Returns true when the shared model is a world brush model with inline submodels.
-   * @returns True when the model is a world brush model with inline submodels.
-   */
-  static IsBrushWorldModel(sharedModel: BaseModel): sharedModel is BrushModel {
-    return isBrushModel(sharedModel)
-      && !sharedModel.submodel
-      && sharedModel.submodels.length > 0;
-  }
-
   /**
    * Rebuilds scoped inline submodels against a scoped world view.
    */
   static RegisterScopedSubmodels(sharedWorld: BaseModel, scopedWorld: BaseModel, scope: ModelScope): void {
-    if (!Mod.IsBrushWorldModel(sharedWorld) || !isBrushModel(scopedWorld)) {
+    if (!(sharedWorld instanceof BrushModel && sharedWorld.isWorldModel) || !(scopedWorld instanceof BrushModel)) {
       return;
     }
 
@@ -144,9 +120,9 @@ export default class Mod {
    */
   static GetScopeCache(scope: ModelScope): ModelCache {
     switch (scope) {
-      case Mod.scope.client:
+      case ModelScope.client:
         return Mod.clientKnown;
-      case Mod.scope.server:
+      case ModelScope.server:
         return Mod.serverKnown;
       default:
         return Mod.known;
@@ -159,7 +135,7 @@ export default class Mod {
    * @returns The scoped model instance, or `null` when unavailable.
    */
   static ResolveScopedModel(name: string, scope: ModelScope): BaseModel | null {
-    if (scope === Mod.scope.shared) {
+    if (scope === ModelScope.shared) {
       return Mod.known[name] ?? null;
     }
 
@@ -178,7 +154,7 @@ export default class Mod {
     const scopedModel = sharedModel.createScopedView();
     scopedCache[name] = scopedModel;
 
-    if (Mod.IsBrushWorldModel(sharedModel)) {
+    if (sharedModel instanceof BrushModel && sharedModel.isWorldModel) {
       Mod.RegisterScopedSubmodels(sharedModel, scopedModel, scope);
     }
 
@@ -198,9 +174,9 @@ export default class Mod {
   /**
    * Clears cached models for a scope.
    */
-  static ClearAll(scope: ModelScope = Mod.scope.shared): void {
-    if (scope === Mod.scope.shared) {
-      for (const scopedScope of [Mod.scope.client, Mod.scope.server]) {
+  static ClearAll(scope: ModelScope = ModelScope.shared): void {
+    if (scope === ModelScope.shared) {
+      for (const scopedScope of [ModelScope.client, ModelScope.server]) {
         Mod.ClearAll(scopedScope);
       }
 
@@ -212,7 +188,7 @@ export default class Mod {
     }
 
     const tempEnts = (() => {
-      if (scope !== Mod.scope.client || registry.isDedicatedServer) {
+      if (scope !== ModelScope.client || registry.isDedicatedServer) {
         return [] as string[];
       }
 
@@ -249,7 +225,7 @@ export default class Mod {
    * Loads a named model into the shared cache and returns the scoped instance.
    * @returns The scoped model instance, or `null` when the load fails without crashing.
    */
-  static async LoadModelAsync(name: string, crash: boolean, scope: ModelScope = Mod.scope.shared): Promise<BaseModel | null> {
+  static async LoadModelAsync(name: string, crash: boolean, scope: ModelScope = ModelScope.shared): Promise<BaseModel | null> {
     const scopedModel = Mod.ResolveScopedModel(name, scope);
 
     if (scopedModel !== null) {
@@ -287,7 +263,7 @@ export default class Mod {
    * Resolves an inline submodel from the already loaded world model cache.
    * @returns The scoped inline submodel, or `null` when it is unavailable.
    */
-  static ForName(name: string, scope: ModelScope = Mod.scope.shared): BaseModel | null {
+  static ForName(name: string, scope: ModelScope = ModelScope.shared): BaseModel | null {
     console.assert(name[0] === '*', 'only submodels supported in Mod.ForName');
     return Mod.ResolveScopedModel(name, scope);
   }
@@ -296,7 +272,7 @@ export default class Mod {
    * Returns the requested model, loading it first when necessary.
    * @returns The requested model, or `null` when it cannot be loaded.
    */
-  static async ForNameAsync(name: string, crash = false, scope: ModelScope = Mod.scope.shared): Promise<BaseModel | null> {
+  static async ForNameAsync(name: string, crash = false, scope: ModelScope = ModelScope.shared): Promise<BaseModel | null> {
     if (name[0] === '*') {
       return Mod.ForName(name, scope);
     }
diff --git a/source/engine/common/Pmove.ts b/source/engine/common/Pmove.ts
index 78a5eda3..a9ff3ffe 100644
--- a/source/engine/common/Pmove.ts
+++ b/source/engine/common/Pmove.ts
@@ -9,7 +9,7 @@
 
 /* eslint-disable jsdoc/require-returns */
 
-import Vector, { type DirectionalVectors } from '../../shared/Vector.ts';
+import Vector, { DirectionalVectors } from '../../shared/Vector.ts';
 import * as Protocol from '../network/Protocol.ts';
 import { content } from '../../shared/Defs.ts';
 import { BrushModel } from './Mod.ts';
@@ -18,7 +18,7 @@ import { PmoveConfiguration } from '../../shared/Pmove.ts';
 import type { ClientEdict } from '../client/ClientEntities.ts';
 import type { BaseEntity } from '../server/Edict.ts';
 import type { Plane as BaseModelPlane } from './model/BaseModel.ts';
-import { Node, type Brush } from './model/BSP.ts';
+import { Node, type Brush, type Hull as BSPHull } from './model/BSP.ts';
 interface BrushTracePlaneLike {
   readonly normal: Vector;
   readonly type: number;
@@ -195,7 +195,7 @@ export class Trace { // pmtrace_t
    * @param other - source trace to copy from
    * @returns this trace after copying the values
    */
-  set(other: Trace): Trace {
+  set(other: Trace): this {
     console.assert(other instanceof Trace, 'other must be a Trace');
 
     this.allsolid = other.allsolid;
@@ -265,13 +265,13 @@ export class Hull { // hull_t
    * @param hull - source hull from model loading
    * @returns copied runtime hull
    */
-  static fromModelHull(hull) {
+  static fromModelHull(hull: BSPHull): Hull {
     const newHull = new Hull();
     newHull.clipMins = hull.clip_mins.copy();
     newHull.clipMaxs = hull.clip_maxs.copy();
-    newHull.firstClipNode = hull.firstclipnode;
-    newHull.lastClipNode = hull.lastclipnode;
-    newHull.allowedClipNodes = hull.allowedClipNodes ?? null;
+    newHull.firstClipNode = hull.firstclipnode!;
+    newHull.lastClipNode = hull.lastclipnode!;
+    newHull.allowedClipNodes = null; // FIXME: missing allowed clip node masks in Q1 BSP format
     newHull.clipNodes = hull.clipnodes.map((clipnode) => {
       const node = new ClipNode(clipnode.planenum);
       node.children[0] = clipnode.children[0];
@@ -296,7 +296,7 @@ export class Hull { // hull_t
    * @param num - starting clip node index
    * @returns negative Quake contents value for the containing leaf
    */
-  pointContents(point: Vector, num: number = this.firstClipNode): number {
+  pointContents(point: Vector, num: number = this.firstClipNode): content {
     // as long as num is a valid node, keep going down the tree
     while (num >= 0) {
       if (this.allowedClipNodes !== null && this.allowedClipNodes[num] !== 1) {
@@ -344,9 +344,10 @@ export class Hull { // hull_t
   check(p1f: number, p2f: number, p1: Vector, p2: Vector, trace: Trace, num: number = this.firstClipNode, depth: number = 0): boolean {
     // check for empty
     if (num < 0) {
-      if (num !== content.CONTENT_SOLID && num !== content.CONTENT_SKY) {
+      const contentNum = num as content;
+      if (contentNum !== content.CONTENT_SOLID && contentNum !== content.CONTENT_SKY) {
         trace.allsolid = false;
-        if (num === content.CONTENT_EMPTY) {
+        if (contentNum === content.CONTENT_EMPTY) {
           trace.inopen = true;
         } else {
           trace.inwater = true;
@@ -496,7 +497,7 @@ export class BoxHull extends Hull {
    * @param maxs - local maximum corner
    * @returns this box hull for chaining
    */
-  setSize(mins: Vector, maxs: Vector): BoxHull {
+  setSize(mins: Vector, maxs: Vector): this {
     console.assert(mins instanceof Vector, 'mins must be a Vector');
     console.assert(maxs instanceof Vector, 'maxs must be a Vector');
 
@@ -956,12 +957,12 @@ export class BrushTrace {
     }
 
     // Leaf node: test all brushes in this leaf
-    if (node.contents < 0) {
+    if (node.contents < content.CONTENT_NONE) {
       return BrushTrace._testLeafSolid(worldModel, node, position, mins, maxs, boundsMins, boundsMaxs, checkCount);
     }
 
     // Internal node: test which side(s) of the splitting plane the box is on
-    const plane = node.plane;
+    const plane = node.plane!;
     let d, offset;
 
     if (plane.type < 3) {
@@ -1202,9 +1203,11 @@ export class BrushTrace {
    * Test if a box at origin is inside a brush. Equivalent to Q2’s CM_TestBoxInBrush.
    */
   static _testBoxInBrush(worldModel: BrushModel, brush: Brush, position: Vector, mins: Vector, maxs: Vector): boolean {
-    const brushsides = worldModel.brushsides;
+    const brushsides = worldModel.brushsides!;
     const planes = worldModel.planes;
 
+    console.assert(brushsides !== null, 'brush trace expected brushsides');
+
     for (let i = 0; i < brush.numsides; i++) {
       const side = brushsides[brush.firstside + i];
       const plane = planes[side.planenum];
@@ -1253,13 +1256,13 @@ export class BrushTrace {
     }
 
     // Leaf node: test brushes
-    if (node.contents < 0) {
+    if (node.contents < content.CONTENT_NONE) {
       BrushTrace._traceToLeaf(ctx, node);
       return;
     }
 
     // Internal node: find the point distances to the splitting plane
-    const plane = node.plane;
+    const plane = node.plane!;
     let t1, t2, offset;
 
     if (plane.type < 3) {
@@ -1413,7 +1416,7 @@ export class BrushTrace {
    * Equivalent to Q2’s CM_ClipBoxToBrush.
    */
   static _clipBoxToBrush(ctx: BrushTraceContext, brush: Brush) {
-    const brushsides = ctx.worldModel.brushsides;
+    const brushsides = ctx.worldModel.brushsides!;
     const planes = ctx.worldModel.planes;
     const moveDeltaX = ctx.end[0] - ctx.start[0];
     const moveDeltaY = ctx.end[1] - ctx.start[1];
@@ -1421,6 +1424,8 @@ export class BrushTrace {
     const moveDistance = Math.sqrt(moveDeltaX * moveDeltaX + moveDeltaY * moveDeltaY + moveDeltaZ * moveDeltaZ);
     const fractionEpsilon = moveDistance > DIST_EPSILON ? DIST_EPSILON / moveDistance : 1.0;
 
+    console.assert(brushsides !== null, 'brush trace expected brushsides');
+
     let enterfrac = -1;
     let leavefrac = 1;
     let clipplane: BaseModelPlane | null = null;
@@ -1531,13 +1536,13 @@ export class BrushTrace {
 
     if (enterfrac < leavefrac) {
       const currentPlane = ctx.trace.fraction < 1.0 ? ctx.trace.plane : null;
-      if (enterfrac > -1 && BrushTrace._shouldPreferTraceHit(currentPlane, ctx.trace.fraction, clipplane, enterfrac, fractionEpsilon)) {
+      if (enterfrac > -1 && BrushTrace._shouldPreferTraceHit(currentPlane, ctx.trace.fraction, clipplane!, enterfrac, fractionEpsilon)) {
         if (enterfrac < 0) {
           enterfrac = 0;
         }
         ctx.trace.fraction = enterfrac;
-        ctx.trace.plane.normal.set(clipplane.normal);
-        ctx.trace.plane.dist = clipplane.dist;
+        ctx.trace.plane.normal.set(clipplane!.normal);
+        ctx.trace.plane.dist = clipplane!.dist;
       }
     }
   }
@@ -1742,12 +1747,12 @@ export class PhysEnt { // physent_t
         continue;
       }
 
-      const expandedMinX = brush.mins[0] - Pmove.PLAYER_MAXS[0] - DIST_EPSILON;
-      const expandedMinY = brush.mins[1] - Pmove.PLAYER_MAXS[1] - DIST_EPSILON;
-      const expandedMinZ = brush.mins[2] - Pmove.PLAYER_MAXS[2] - DIST_EPSILON;
-      const expandedMaxX = brush.maxs[0] - Pmove.PLAYER_MINS[0] + DIST_EPSILON;
-      const expandedMaxY = brush.maxs[1] - Pmove.PLAYER_MINS[1] + DIST_EPSILON;
-      const expandedMaxZ = brush.maxs[2] - Pmove.PLAYER_MINS[2] + DIST_EPSILON;
+      const expandedMinX = brush.mins![0] - Pmove.PLAYER_MAXS[0] - DIST_EPSILON;
+      const expandedMinY = brush.mins![1] - Pmove.PLAYER_MAXS[1] - DIST_EPSILON;
+      const expandedMinZ = brush.mins![2] - Pmove.PLAYER_MAXS[2] - DIST_EPSILON;
+      const expandedMaxX = brush.maxs![0] - Pmove.PLAYER_MINS[0] + DIST_EPSILON;
+      const expandedMaxY = brush.maxs![1] - Pmove.PLAYER_MINS[1] + DIST_EPSILON;
+      const expandedMaxZ = brush.maxs![2] - Pmove.PLAYER_MINS[2] + DIST_EPSILON;
 
       if (position[0] < expandedMinX || position[0] > expandedMaxX
         || position[1] < expandedMinY || position[1] > expandedMaxY
@@ -1788,8 +1793,8 @@ export class PhysEnt { // physent_t
         numsides: brush.numsides,
         nearestPlaneDistance,
         touchingPlanes,
-        mins: brush.mins,
-        maxs: brush.maxs,
+        mins: brush.mins!,
+        maxs: brush.maxs!,
         sideSummaries: sideSummaries.slice(0, 4).map((entry) => entry.summary),
       });
     }
@@ -1848,12 +1853,12 @@ export class PhysEnt { // physent_t
         continue;
       }
 
-      const expandedMinX = brush.mins[0] - Pmove.PLAYER_MAXS[0] - DIST_EPSILON;
-      const expandedMinY = brush.mins[1] - Pmove.PLAYER_MAXS[1] - DIST_EPSILON;
-      const expandedMinZ = brush.mins[2] - Pmove.PLAYER_MAXS[2] - DIST_EPSILON;
-      const expandedMaxX = brush.maxs[0] - Pmove.PLAYER_MINS[0] + DIST_EPSILON;
-      const expandedMaxY = brush.maxs[1] - Pmove.PLAYER_MINS[1] + DIST_EPSILON;
-      const expandedMaxZ = brush.maxs[2] - Pmove.PLAYER_MINS[2] + DIST_EPSILON;
+      const expandedMinX = brush.mins![0] - Pmove.PLAYER_MAXS[0] - DIST_EPSILON;
+      const expandedMinY = brush.mins![1] - Pmove.PLAYER_MAXS[1] - DIST_EPSILON;
+      const expandedMinZ = brush.mins![2] - Pmove.PLAYER_MAXS[2] - DIST_EPSILON;
+      const expandedMaxX = brush.maxs![0] - Pmove.PLAYER_MINS[0] + DIST_EPSILON;
+      const expandedMaxY = brush.maxs![1] - Pmove.PLAYER_MINS[1] + DIST_EPSILON;
+      const expandedMaxZ = brush.maxs![2] - Pmove.PLAYER_MINS[2] + DIST_EPSILON;
 
       if (position[0] < expandedMinX || position[0] > expandedMaxX
         || position[1] < expandedMinY || position[1] > expandedMaxY
@@ -1999,8 +2004,10 @@ export class PhysEnt { // physent_t
     const traceEnd = this.toCollisionSpace(end);
 
     if (this.usesBrushTracing) {
+      console.assert(this.brushCollisionModel !== null, 'brush tracing expected a valid collision model');
+
       const brushTrace = BrushTrace.transformedBoxTrace(
-        this.brushCollisionModel,
+        this.brushCollisionModel!,
         traceStart,
         traceEnd,
         Pmove.PLAYER_MINS,
@@ -2042,8 +2049,11 @@ export class PhysEnt { // physent_t
             // Brush blocks but hull doesn't — log which specific brush is the culprit
             const brushes = model.brushes;
             const last = model.firstBrush + model.numBrushes;
+
+            console.assert(brushes !== null, 'brush trace expected brushes in model');
+
             for (let bi = model.firstBrush; bi < last; bi++) {
-              const brush = brushes[bi];
+              const brush = brushes![bi];
 
               if (!brush || brush.numsides === 0) {
                 continue;
@@ -2077,8 +2087,10 @@ export class PhysEnt { // physent_t
    */
   testPlayerPosition(position: Vector): boolean {
     if (this.usesBrushTracing) {
+      console.assert(this.brushCollisionModel !== null, 'brush tracing expected a valid collision model');
+
       const brushResult = BrushTrace.transformedTestPosition(
-        this.brushCollisionModel,
+        this.brushCollisionModel!,
         position,
         Pmove.PLAYER_MINS,
         Pmove.PLAYER_MAXS,
@@ -2135,8 +2147,12 @@ export class PhysEnt { // physent_t
             const planes = model.planes;
             const brushsides = model.brushsides;
             const last = model.firstBrush + model.numBrushes;
+
+            console.assert(brushes !== null, 'brush trace expected brushes in model');
+            console.assert(brushsides !== null, 'brush trace expected brushsides in model');
+
             for (let bi = model.firstBrush; bi < last; bi++) {
-              const brush = brushes[bi];
+              const brush = brushes![bi];
               if (!brush || brush.numsides === 0) {
                 continue;
               }
@@ -2148,7 +2164,7 @@ export class PhysEnt { // physent_t
               // Minkowski test inline
               let inside = true;
               for (let si = 0; si < brush.numsides; si++) {
-                const side = brushsides[brush.firstside + si];
+                const side = brushsides![brush.firstside + si];
                 const plane = planes[side.planenum];
                 let dist = plane.dist;
                 for (let j = 0; j < 3; j++) {
@@ -2216,7 +2232,7 @@ export class PmovePlayer { // pmove_t (player state only)
   /** Water depth from 0 to 3. */
   waterlevel: number;
   /** Current water contents value. */
-  watertype: number;
+  watertype: content;
   /** Ground physent index, or null while airborne. */
   onground: number | null;
   /** Player origin in world space. */
@@ -2433,8 +2449,8 @@ export class PmovePlayer { // pmove_t (player state only)
     this._snapPosition();
 
     if (_dbg) {
-      const moved = !this.origin.equals(_dbgOriginBefore);
-      const snapMoved = !this.origin.equals(_dbgBeforeSnap);
+      const moved = !this.origin.equals(_dbgOriginBefore!);
+      const snapMoved = !this.origin.equals(_dbgBeforeSnap!);
       if (moved) {
         console.log(`[Pmove] frame: origin ${_dbgOriginBefore} -> ${_dbgBeforeSnap} -> snap ${this.origin} vel=${this.velocity} onground=${this.onground} flags=${this.pmFlags}${snapMoved ? ' (SNAP MOVED)' : ''}`);
       }
@@ -2593,8 +2609,10 @@ export class PmovePlayer { // pmove_t (player state only)
 
     this._ladder = false;
 
+    console.assert(this._angleVectors instanceof DirectionalVectors, 'angle vectors should be set by _clampAngles before checking special movement');
+
     // check for ladder
-    const flatforward = new Vector(this._angleVectors.forward[0], this._angleVectors.forward[1], 0);
+    const flatforward = new Vector(this._angleVectors!.forward[0], this._angleVectors!.forward[1], 0);
     flatforward.normalize();
 
     const spot = this.origin.copy().add(flatforward);
@@ -3191,10 +3209,12 @@ export class PmovePlayer { // pmove_t (player state only)
     const fmove = this.cmd.forwardmove;
     const smove = this.cmd.sidemove;
 
+    console.assert(this._angleVectors instanceof DirectionalVectors, 'angle vectors should be set by _clampAngles before air move');
+
     // Project forward/right onto the horizontal plane and renormalize.
     // This prevents looking up/down from reducing horizontal move speed.
-    const forward = this._angleVectors.forward.copy();
-    const right = this._angleVectors.right.copy();
+    const forward = this._angleVectors!.forward.copy();
+    const right = this._angleVectors!.right.copy();
     forward[2] = 0;
     right[2] = 0;
     forward.normalize();
@@ -3272,8 +3292,10 @@ export class PmovePlayer { // pmove_t (player state only)
 
   /** Water movement. */
   _waterMove() { // Q2: PM_WaterMove / QW: PM_WaterMove
-    const forward = this._angleVectors.forward;
-    const right = this._angleVectors.right;
+    console.assert(this._angleVectors instanceof DirectionalVectors, 'angle vectors should be set by _clampAngles before water move');
+
+    const forward = this._angleVectors!.forward;
+    const right = this._angleVectors!.right;
 
     const wishvel = new Vector(
       forward[0] * this.cmd.forwardmove + right[0] * this.cmd.sidemove,
@@ -3359,8 +3381,9 @@ export class PmovePlayer { // pmove_t (player state only)
     const fmove = this.cmd.forwardmove;
     const smove = this.cmd.sidemove;
 
-    const fwd = this._angleVectors.forward.copy();
-    const rgt = this._angleVectors.right.copy();
+    console.assert(this._angleVectors instanceof DirectionalVectors, 'angle vectors should be set by _clampAngles before fly move');
+    const fwd = this._angleVectors!.forward.copy();
+    const rgt = this._angleVectors!.right.copy();
     fwd.normalize();
     rgt.normalize();
 
@@ -3519,7 +3542,7 @@ export class Pmove { // pmove_t
   }
 
   static Shutdown() {
-    Pmove.debug.free();
+    Pmove.debug!.free();
     Pmove.debug = null;
   }
 
@@ -3531,7 +3554,7 @@ export class Pmove { // pmove_t
    * @param contents - raw contents value from the collision backend
    * @returns normalized static-world contents value
    */
-  _normalizeStaticWorldContents(contents: number): number {
+  _normalizeStaticWorldContents(contents: content): content {
     if ((contents <= content.CONTENT_CURRENT_0) && (contents >= content.CONTENT_CURRENT_DOWN)) {
       return content.CONTENT_WATER;
     }
@@ -3549,7 +3572,7 @@ export class Pmove { // pmove_t
     console.assert(worldPhysEnt.brushWorldModel instanceof BrushModel, 'world brush model');
 
     if (!BrushTrace.transformedTestPosition(
-      worldPhysEnt.brushWorldModel,
+      worldPhysEnt.brushWorldModel!,
       point,
       Vector.origin,
       Vector.origin,
@@ -3559,7 +3582,7 @@ export class Pmove { // pmove_t
       return content.CONTENT_SOLID;
     }
 
-    return this._normalizeStaticWorldContents(worldPhysEnt.brushWorldModel.getLeafForPoint(point).contents);
+    return this._normalizeStaticWorldContents(worldPhysEnt.brushWorldModel!.getLeafForPoint(point).contents);
   }
 
   /**
@@ -3569,7 +3592,7 @@ export class Pmove { // pmove_t
    * @param point - world-space position to sample
    * @returns static-world contents value
    */
-  staticWorldContents(point: Vector): number {
+  staticWorldContents(point: Vector): content {
     console.assert(this.physents[0] instanceof PhysEnt, 'world physent');
 
     const worldPhysEnt = this.physents[0];
@@ -3742,7 +3765,7 @@ export class Pmove { // pmove_t
    * @param model - world brush model to use as physent zero
    * @returns this pmove instance
    */
-  setWorldmodel(model: BrushModel): Pmove {
+  setWorldmodel(model: BrushModel): this {
     console.assert(model instanceof BrushModel, 'model');
 
     this.physents.length = 0;
@@ -3770,7 +3793,7 @@ export class Pmove { // pmove_t
    * Clears all entities.
    * @returns this pmove instance
    */
-  clearEntities(): Pmove {
+  clearEntities(): this {
     this.physents.length = 1;
     return this;
   }
@@ -3781,7 +3804,7 @@ export class Pmove { // pmove_t
    * @param model - brush model to use for SOLID_BSP-style entities
    * @returns this pmove instance
    */
-  addEntity(entity: BaseEntity | ClientEdict, model: BrushModel | null = null): Pmove {
+  addEntity(entity: BaseEntity | ClientEdict, model: BrushModel | null = null): this {
     const pe = new PhysEnt(this);
 
     console.assert(model === null || model instanceof BrushModel, 'no model or brush model required');
@@ -3808,7 +3831,7 @@ export class Pmove { // pmove_t
 
       // Always set up hull data as fallback (and for hull0 pointContents)
       if (this.#modelHullsCache.has(model.name)) {
-        pe.hulls = this.#modelHullsCache.get(model.name);
+        pe.hulls = this.#modelHullsCache.get(model.name)!;
       } else {
         for (const modelHull of model.hulls) {
           pe.hulls.push(Hull.fromModelHull(modelHull));
diff --git a/source/engine/common/WorkerManager.ts b/source/engine/common/WorkerManager.ts
index efa64bde..bcbb40b5 100644
--- a/source/engine/common/WorkerManager.ts
+++ b/source/engine/common/WorkerManager.ts
@@ -79,22 +79,27 @@ export default class WorkerManager {
       // Handle special events directly, otherwise publish to event bus
       switch (event) {
         case 'worker.con.print':
+          // eslint-disable-next-line @typescript-eslint/no-base-to-string
           Con.Print(String(data[0] ?? ''));
           break;
 
         case 'worker.con.print.success':
+          // eslint-disable-next-line @typescript-eslint/no-base-to-string
           Con.PrintSuccess(String(data[0] ?? ''));
           break;
 
         case 'worker.con.print.warning':
+          // eslint-disable-next-line @typescript-eslint/no-base-to-string
           Con.PrintWarning(String(data[0] ?? ''));
           break;
 
         case 'worker.con.print.error':
+          // eslint-disable-next-line @typescript-eslint/no-base-to-string
           Con.PrintError(String(data[0] ?? ''));
           break;
 
         case 'worker.con.dprint':
+          // eslint-disable-next-line @typescript-eslint/no-base-to-string
           Con.DPrint(String(data[0] ?? ''));
           break;
 
diff --git a/source/engine/common/model/BSP.ts b/source/engine/common/model/BSP.ts
index 1af31bf3..d0a645e9 100644
--- a/source/engine/common/model/BSP.ts
+++ b/source/engine/common/model/BSP.ts
@@ -32,6 +32,8 @@ export interface Hull {
 
   /** Maximum bounding box for this hull. */
   readonly clip_maxs: Vector;
+
+  // TODO: allowedClipNodes?
 }
 
 export type WorldspawnInfo = Record<string, string>;
@@ -202,7 +204,7 @@ export class Visibility {
    * Reveal all clusters.
    * @returns This visibility object.
    */
-  revealAll(): Visibility {
+  revealAll(): this {
     this.#data.fill(0xff);
     this.#unconditionalReveal = true;
 
@@ -213,7 +215,7 @@ export class Visibility {
    * Hide all clusters.
    * @returns This visibility object.
    */
-  hideAll(): Visibility {
+  hideAll(): this {
     this.#data.fill(0x00);
 
     return this;
@@ -232,7 +234,7 @@ export class Visibility {
     }
 
     while (true) {
-      if (node.contents < 0) {
+      if (node.contents < content.CONTENT_NONE) {
         if (node.contents !== content.CONTENT_SOLID && node.cluster >= 0 && model.clusterPvsOffsets !== null) {
           const visofs = model.clusterPvsOffsets[node.cluster];
           const vis = Visibility.fromBrushModel(model, visofs);
@@ -268,7 +270,7 @@ export class Visibility {
    * @param p Point in world space.
    * @returns This visibility object.
    */
-  addFatPoint(p: Vector): Visibility {
+  addFatPoint(p: Vector): this {
     const model = this.#model;
 
     if (model !== null) {
@@ -360,7 +362,7 @@ export class Node extends BrushModelComponent {
   /** Node index in the nodes array. */
   num = 0;
 
-  contents = 0;
+  contents: content = content.CONTENT_NONE;
 
   /** Index into planes array. */
   planenum = 0;
@@ -478,8 +480,8 @@ export class Brush extends BrushModelComponent {
   /** Number of brush sides. */
   numsides = 0;
 
-  /** Contents flags, see `Defs.content`. */
-  contents = 0;
+  /** Contents of the brush. */
+  contents: content = content.CONTENT_NONE;
 
   /** Axis-aligned bounding box minimum. */
   mins: Vector | null = null;
@@ -648,6 +650,10 @@ export class BrushModel extends BaseModel {
 
   override type = 0;
 
+  get isWorldModel(): boolean {
+    return !this.submodel;
+  }
+
   /**
    * Whether this model has complete brush-based collision data.
    * When true, Q2-style brush tracing can be used instead of Q1-style hull tracing.
@@ -676,7 +682,7 @@ export class BrushModel extends BaseModel {
     let node = this.nodes[0] as Node;
 
     while (true) {
-      if (node.contents < 0) {
+      if (node.contents < content.CONTENT_NONE) {
         return node;
       }
 
diff --git a/source/engine/common/model/BaseModel.ts b/source/engine/common/model/BaseModel.ts
index 6fb06a50..62e229a6 100644
--- a/source/engine/common/model/BaseModel.ts
+++ b/source/engine/common/model/BaseModel.ts
@@ -1,6 +1,7 @@
 import GL from '../../client/GL.ts';
 import { eventBus } from '../../registry.ts';
 import Vector from '../../../shared/Vector.ts';
+import type { ModelType } from '../Mod.ts';
 
 let gl: WebGL2RenderingContext | null = null;
 
@@ -122,7 +123,7 @@ export class BaseModel {
   name: string;
 
   /** Concrete model type, assigned by subclasses. */
-  type: number | null;
+  type: ModelType | null;
 
   /** Number of frames in file. */
   _num_frames = 0;
diff --git a/source/engine/common/model/loaders/AliasMDLLoader.ts b/source/engine/common/model/loaders/AliasMDLLoader.ts
index a1d704b9..6aad55cd 100644
--- a/source/engine/common/model/loaders/AliasMDLLoader.ts
+++ b/source/engine/common/model/loaders/AliasMDLLoader.ts
@@ -3,6 +3,7 @@ import Q from '../../../../shared/Q.ts';
 import GL, { GLTexture, resampleTexture8 } from '../../../client/GL.ts';
 import { registry } from '../../../registry.ts';
 import { CRC16CCITT } from '../../CRC.ts';
+import { ModelType } from '../../Mod.ts';
 import W, { translateIndexToLuminanceRGBA, translateIndexToRGBA } from '../../W.ts';
 import { AliasModel, type AliasFrame, type AliasSkin } from '../AliasModel.ts';
 import { ModelLoader } from '../ModelLoader.ts';
@@ -65,8 +66,6 @@ interface MutableAliasGroupedFrame {
 }
 
 type MutableAliasFrame = MutableAliasSingleFrame | MutableAliasGroupedFrame;
-type MutableAliasSkin = MutableAliasSingleSkin | MutableAliasGroupedSkin;
-type MutableAliasRenderFrame = MutableAliasSingleFrame | MutableAliasGroupedFrameEntry;
 type MutableAliasRenderSkin = MutableAliasSingleSkin | MutableAliasGroupedSkinEntry;
 
 /**
@@ -293,7 +292,7 @@ export class AliasMDLLoader extends ModelLoader {
   override load(buffer: ArrayBuffer, name: string): Promise<AliasModel> {
     const loadmodel = new AliasModel(name);
 
-    loadmodel.type = 2; // Mod.type.alias
+    loadmodel.type = ModelType.alias;
     loadmodel.player = name === 'progs/player.mdl';
 
     const view = new DataView(buffer);
diff --git a/source/engine/common/model/loaders/BSP29Loader.ts b/source/engine/common/model/loaders/BSP29Loader.ts
index 94f22038..1fbd56ea 100644
--- a/source/engine/common/model/loaders/BSP29Loader.ts
+++ b/source/engine/common/model/loaders/BSP29Loader.ts
@@ -7,7 +7,7 @@ import { CRC16CCITT } from '../../CRC.ts';
 import { CorruptedResourceError } from '../../Errors.ts';
 import { eventBus, getCommonRegistry, registry } from '../../../registry.ts';
 import { ModelLoader } from '../ModelLoader.ts';
-import { Brush, BrushModel, BrushSide, Node, type BSPXLumps, type BrushRange, type BrushTexInfo, type Clipnode, type Hull } from '../BSP.ts';
+import { Brush, BrushModel, BrushSide, Node, type BSPXLumps, type BrushTexInfo, type Clipnode, type Hull, type LightgridLeaf, type LightgridNode, type LightgridPointSample, type LightgridStyleSample } from '../BSP.ts';
 import { Face, Plane } from '../BaseModel.ts';
 import { MaterialFlags, noTextureMaterial, PBRMaterial, QuakeMaterial } from '../../../client/renderer/Materials.ts';
 import { Quake1Sky, SimpleSkyBox } from '../../../client/renderer/Sky.ts';
@@ -38,6 +38,10 @@ interface MaterialFile {
 
 type MaterialTextureCategory = 'luminance' | 'diffuse' | 'specular' | 'normal';
 
+/**
+ * Helper function to get a child node from a BSP node, with type assertion.
+ * @returns The child node at the specified index.
+ */
 function getNodeChild(node: Node, childIndex: 0 | 1): Node {
   const child = node.children[childIndex];
   console.assert(child instanceof Node, 'BSP29Loader expected linked BSP child node');
@@ -715,7 +719,7 @@ export class BSP29Loader extends ModelLoader {
         }
       }
 
-      if (node.contents < 0) {
+      if (node.contents < content.CONTENT_NONE) {
         // Leaf Node
         if (node.contents === content.CONTENT_SOLID) {
           node.area = 0;
@@ -1086,12 +1090,12 @@ export class BSP29Loader extends ModelLoader {
     loadmodel.entities = Q.memstr(new Uint8Array(buf, fileofs, filelen));
     loadmodel.worldspawnInfo = {};
 
-    let data = loadmodel.entities;
+    let data = loadmodel.entities as string | null;
 
     // going for worldspawn and light
     let stillLooking = 2;
     while (stillLooking > 0) {
-      const parsed = COM.Parse(data);
+      const parsed = COM.Parse(data!);
       data = parsed.data;
 
       if (!data) {
@@ -1289,7 +1293,7 @@ export class BSP29Loader extends ModelLoader {
       return;
     }
 
-    const liquidLeafsByType = new Map<number, number[]>();
+    const liquidLeafsByType = new Map<content, number[]>();
 
     for (let i = 0; i < loadmodel.leafs.length; i++) {
       const leaf = loadmodel.leafs[i];
@@ -1763,7 +1767,7 @@ export class BSP29Loader extends ModelLoader {
   #setParent(node: Node, parent: Node | null): void {
     node.parent = parent;
 
-    if (node.contents < 0) {
+    if (node.contents < content.CONTENT_NONE) {
       return;
     }
 
@@ -1797,8 +1801,8 @@ export class BSP29Loader extends ModelLoader {
         firstface: view.getUint16(fileofs + 20, true),
         numfaces: view.getUint16(fileofs + 22, true),
       });
-      loadmodel.nodes[i].baseMins = loadmodel.nodes[i].mins.copy();
-      loadmodel.nodes[i].baseMaxs = loadmodel.nodes[i].maxs.copy();
+      loadmodel.nodes[i].baseMins = loadmodel.nodes[i].mins!.copy();
+      loadmodel.nodes[i].baseMaxs = loadmodel.nodes[i].maxs!.copy();
       fileofs += 24;
     }
 
@@ -1851,8 +1855,8 @@ export class BSP29Loader extends ModelLoader {
           view.getUint8(fileofs + 27),
         ],
       });
-      loadmodel.leafs[i].baseMins = loadmodel.leafs[i].mins.copy();
-      loadmodel.leafs[i].baseMaxs = loadmodel.leafs[i].maxs.copy();
+      loadmodel.leafs[i].baseMins = loadmodel.leafs[i].mins!.copy();
+      loadmodel.leafs[i].baseMaxs = loadmodel.leafs[i].maxs!.copy();
       fileofs += 28;
     }
     loadmodel.bspxoffset = Math.max(loadmodel.bspxoffset, fileofs);
@@ -1901,22 +1905,24 @@ export class BSP29Loader extends ModelLoader {
    * Create hull0 (point hull) from BSP nodes for collision detection.
    */
   #makeHull0(loadmodel: BrushModel): void {
-    const clipnodes = [];
+    type Clipnode = { planenum: number; children: (number | Node)[] };
+
+    const clipnodes = [] as Clipnode[];
     const hull = {
       clipnodes: clipnodes,
       lastclipnode: loadmodel.nodes.length - 1,
       planes: loadmodel.planes,
       clip_mins: new Vector(),
       clip_maxs: new Vector(),
-    };
+    } as Hull;
 
     for (let i = 0; i < loadmodel.nodes.length; i++) {
       const node = loadmodel.nodes[i];
-      const out = { planenum: node.planenum, children: [] };
+      const out = { planenum: node.planenum, children: [] } as Clipnode;
       const child0 = node.children[0] as Node;
       const child1 = node.children[1] as Node;
-      out.children[0] = child0.contents < 0 ? child0.contents : child0.num;
-      out.children[1] = child1.contents < 0 ? child1.contents : child1.num;
+      out.children[0] = child0.contents < content.CONTENT_NONE ? child0.contents : child0.num;
+      out.children[1] = child1.contents < content.CONTENT_NONE ? child1.contents : child1.num;
       clipnodes[i] = out;
     }
     loadmodel.hulls[0] = hull;
@@ -2333,7 +2339,7 @@ export class BSP29Loader extends ModelLoader {
     /** Recursively insert a brush into BSP leaf nodes whose bounds overlap. */
     const insertBrushRecursive = (node: Node, brushIdx: number, brush: Brush): void => {
       // Leaf node: add the brush here
-      if (node.contents < 0) {
+      if (node.contents < content.CONTENT_NONE) {
         const leafIndex = leafIndexMap.get(node);
         if (leafIndex !== undefined) {
           leafBrushLists[leafIndex].push(brushIdx);
@@ -2342,26 +2348,28 @@ export class BSP29Loader extends ModelLoader {
       }
 
       // Internal node: test brush AABB against splitting plane
-      const plane = node.plane;
+      const plane = node.plane!;
+      console.assert(plane !== undefined, 'BSP node without plane');
+
       let d1, d2;
 
       if (plane.type < 3) {
         // Axial plane: fast path
-        d1 = brush.maxs[plane.type] - plane.dist;
-        d2 = brush.mins[plane.type] - plane.dist;
+        d1 = brush.maxs![plane.type] - plane.dist;
+        d2 = brush.mins![plane.type] - plane.dist;
       } else {
         // General plane: compute support points using worst-case AABB corners
         const nx = plane.normal[0];
         const ny = plane.normal[1];
         const nz = plane.normal[2];
 
-        d1 = nx * (nx >= 0 ? brush.maxs[0] : brush.mins[0])
-           + ny * (ny >= 0 ? brush.maxs[1] : brush.mins[1])
-           + nz * (nz >= 0 ? brush.maxs[2] : brush.mins[2])
+        d1 = nx * (nx >= 0 ? brush.maxs![0] : brush.mins![0])
+           + ny * (ny >= 0 ? brush.maxs![1] : brush.mins![1])
+           + nz * (nz >= 0 ? brush.maxs![2] : brush.mins![2])
            - plane.dist;
-        d2 = nx * (nx >= 0 ? brush.mins[0] : brush.maxs[0])
-           + ny * (ny >= 0 ? brush.mins[1] : brush.maxs[1])
-           + nz * (nz >= 0 ? brush.mins[2] : brush.maxs[2])
+        d2 = nx * (nx >= 0 ? brush.mins![0] : brush.maxs![0])
+           + ny * (ny >= 0 ? brush.mins![1] : brush.maxs![1])
+           + nz * (nz >= 0 ? brush.mins![2] : brush.maxs![2])
            - plane.dist;
       }
 
@@ -2559,16 +2567,16 @@ export class BSP29Loader extends ModelLoader {
       }
 
       // Parse nodes
-      const nodes = [];
+      const nodes = [] as LightgridNode[];
       for (let i = 0; i < numnodes; i++) {
         const mid = [
           view.getUint32(offset, true),
           view.getUint32(offset + 4, true),
           view.getUint32(offset + 8, true),
-        ];
+        ] as [number, number, number];
         offset += 12;
 
-        const child = [];
+        const child = [] as number[];
         for (let j = 0; j < 8; j++) {
           child[j] = view.getUint32(offset, true);
           offset += 4;
@@ -2586,7 +2594,7 @@ export class BSP29Loader extends ModelLoader {
       offset += 4;
 
       // Parse leafs
-      const leafs = [];
+      const leafs = [] as LightgridLeaf[];
       for (let i = 0; i < numleafs; i++) {
         // Check bounds for leaf header (mins + size = 24 bytes)
         if (offset + 24 > endOffset) {
@@ -2610,7 +2618,7 @@ export class BSP29Loader extends ModelLoader {
 
         // Parse per-point data
         const totalPoints = leafSize[0] * leafSize[1] * leafSize[2];
-        const points = [];
+        const points = [] as LightgridPointSample[];
 
         for (let p = 0; p < totalPoints; p++) {
           // Check bounds for stylecount byte
@@ -2628,7 +2636,7 @@ export class BSP29Loader extends ModelLoader {
             continue;
           }
 
-          const styles = [];
+          const styles = [] as LightgridStyleSample[];
           for (let s = 0; s < stylecount; s++) {
             // Check bounds for style data (1 byte stylenum + 3 bytes rgb = 4 bytes)
             if (offset + 3 >= endOffset) {
@@ -2644,7 +2652,7 @@ export class BSP29Loader extends ModelLoader {
               view.getUint8(offset),
               view.getUint8(offset + 1),
               view.getUint8(offset + 2),
-            ];
+            ] as [number, number, number];
             offset += 3;
 
             styles.push({ stylenum, rgb });
@@ -2668,7 +2676,13 @@ export class BSP29Loader extends ModelLoader {
 
       Con.DPrint(`BSP29Loader: loaded LIGHTGRID_OCTREE with ${numnodes} nodes and ${numleafs} leafs\n`);
     } catch (error) {
-      Con.DPrint(`BSP29Loader: error loading LIGHTGRID_OCTREE: ${error.message}\n`);
+      if (error instanceof Error) {
+        Con.PrintError(`BSP29Loader: error loading LIGHTGRID_OCTREE: ${error.message}\n`);
+      } else {
+        Con.PrintError('BSP29Loader: error loading LIGHTGRID_OCTREE\n');
+        // eslint-disable-next-line no-debugger
+        debugger;
+      }
       loadmodel.lightgrid = null;
     }
   }
diff --git a/source/engine/common/model/loaders/BSP2Loader.ts b/source/engine/common/model/loaders/BSP2Loader.ts
index 37341b93..8b30779c 100644
--- a/source/engine/common/model/loaders/BSP2Loader.ts
+++ b/source/engine/common/model/loaders/BSP2Loader.ts
@@ -4,6 +4,7 @@ import { Face } from '../BaseModel.ts';
 import { BrushModel, Node } from '../BSP.ts';
 import { MaterialFlags } from '../../../client/renderer/Materials.ts';
 import { BSP29Loader } from './BSP29Loader.ts';
+import { content } from '../../../../shared/Defs.ts';
 
 /**
  * Loader for BSP2 format (.bsp).
@@ -149,8 +150,8 @@ export class BSP2Loader extends BSP29Loader {
         firstface: view.getUint32(fileofs + 36, true),
         numfaces: view.getUint32(fileofs + 40, true),
       });
-      loadmodel.nodes[i].baseMins = loadmodel.nodes[i].mins.copy();
-      loadmodel.nodes[i].baseMaxs = loadmodel.nodes[i].maxs.copy();
+      loadmodel.nodes[i].baseMins = loadmodel.nodes[i].mins!.copy();
+      loadmodel.nodes[i].baseMaxs = loadmodel.nodes[i].maxs!.copy();
       fileofs += 44;
     }
 
@@ -169,7 +170,7 @@ export class BSP2Loader extends BSP29Loader {
     function setParent(node: Node, parent: Node | null): void {
       node.parent = parent;
 
-      if (node.contents < 0 || !node.children[0] || !node.children[1]) {
+      if (node.contents < content.CONTENT_NONE || !node.children[0] || !node.children[1]) {
         return;
       }
 
@@ -214,8 +215,8 @@ export class BSP2Loader extends BSP29Loader {
           view.getUint8(fileofs + 43),
         ],
       });
-      loadmodel.leafs[i].baseMins = loadmodel.leafs[i].mins.copy();
-      loadmodel.leafs[i].baseMaxs = loadmodel.leafs[i].maxs.copy();
+      loadmodel.leafs[i].baseMins = loadmodel.leafs[i].mins!.copy();
+      loadmodel.leafs[i].baseMaxs = loadmodel.leafs[i].maxs!.copy();
       fileofs += 44;
     }
 
diff --git a/source/engine/common/model/loaders/WavefrontOBJLoader.ts b/source/engine/common/model/loaders/WavefrontOBJLoader.ts
index 4a67c6ba..dec82145 100644
--- a/source/engine/common/model/loaders/WavefrontOBJLoader.ts
+++ b/source/engine/common/model/loaders/WavefrontOBJLoader.ts
@@ -80,7 +80,7 @@ export class WavefrontOBJLoader extends ModelLoader {
 
     if (!registry.isDedicatedServer) {
       const material = new PBRMaterial(baseName, 256, 256);
-      material.diffuse = await GLTexture.FromImageFile(baseName);
+      material.diffuse = (await GLTexture.FromImageFile(baseName))!;
       material.width = material.diffuse.width;
       material.height = material.diffuse.height;
       loadmodel.texture = material;
diff --git a/source/engine/network/MSG.ts b/source/engine/network/MSG.ts
index acb2ce69..d6749e7f 100644
--- a/source/engine/network/MSG.ts
+++ b/source/engine/network/MSG.ts
@@ -92,7 +92,7 @@ export class SzBuffer {
     return copy;
   }
 
-  set(other: SzBuffer): SzBuffer {
+  set(other: SzBuffer): this {
     this.name = other.name;
     this.data = new ArrayBuffer(other.maxsize);
     new Uint8Array(this.data).set(new Uint8Array(other.data));
diff --git a/source/engine/network/Network.ts b/source/engine/network/Network.ts
index ac7bf0ee..a04fb3d3 100644
--- a/source/engine/network/Network.ts
+++ b/source/engine/network/Network.ts
@@ -184,6 +184,7 @@ export default class NET {
     if (!registry.isDedicatedServer) {
       const { Key } = getClientRegistry();
 
+      // eslint-disable-next-line @typescript-eslint/no-misused-promises
       eventBus.subscribe('server.spawned', async () => {
         await Q.sleep(5000);
 
@@ -194,6 +195,7 @@ export default class NET {
         Con.PrintSuccess('Online multiplayer game has been created!\n');
       });
 
+      // eslint-disable-next-line @typescript-eslint/no-misused-promises
       eventBus.subscribe('client.signon', async (signon: number) => {
         if (signon !== 4) {
           return;
diff --git a/source/engine/network/NetworkDrivers.ts b/source/engine/network/NetworkDrivers.ts
index 2e7881fb..af545f13 100644
--- a/source/engine/network/NetworkDrivers.ts
+++ b/source/engine/network/NetworkDrivers.ts
@@ -28,8 +28,7 @@ type NodeWebSocketLike = {
   readyState: number;
   send: (data: ArrayBuffer) => void;
   on: {
-    (eventName: 'close', listener: () => void): void;
-    (eventName: 'error', listener: () => void): void;
+    (eventName: 'close' | 'error', listener: () => void): void;
     (eventName: 'message', listener: (data: NodeRawData) => void): void;
   };
 };
@@ -145,6 +144,7 @@ function getErrorMessage(error: Throwable): string {
     return error.message;
   }
 
+  // eslint-disable-next-line @typescript-eslint/no-base-to-string
   return String(error);
 }
 
@@ -1041,7 +1041,8 @@ export class WebRTCDriver extends BaseDriver {
 
       this.signalingWs.onerror = (errorEvent: Event) => {
         console.debug('WebRTCDriver: Signaling WebSocket error', errorEvent);
-        Con.DPrint(`WebRTCDriver: Signaling error: ${errorEvent}\n`);
+        // eslint-disable-next-line @typescript-eslint/no-base-to-string
+        Con.DPrint(`WebRTCDriver: Signaling error: ${errorEvent}\n`); // FIXME: this does not print anything useful, need to find a better way to log the error details
         this.#OnSignalingError({ error: 'Signaling connection error', type: 'error' });
       };
 
@@ -1143,9 +1144,9 @@ export class WebRTCDriver extends BaseDriver {
     }
 
     this.#StopServerInfoSubscriptions();
-    this.serverEventSubscriptions.push(eventBus.subscribe('server.spawned', () => this.#UpdateServerInfo()));
-    this.serverEventSubscriptions.push(eventBus.subscribe('server.client.connected', () => this.#UpdateServerInfo()));
-    this.serverEventSubscriptions.push(eventBus.subscribe('server.client.disconnected', () => this.#UpdateServerInfo()));
+    this.serverEventSubscriptions.push(eventBus.subscribe('server.spawned', () => { this.#UpdateServerInfo(); }));
+    this.serverEventSubscriptions.push(eventBus.subscribe('server.client.connected', () => { this.#UpdateServerInfo(); }));
+    this.serverEventSubscriptions.push(eventBus.subscribe('server.client.disconnected', () => { this.#UpdateServerInfo(); }));
     this.serverEventSubscriptions.push(eventBus.subscribe('cvar.changed', (cvarName: string) => {
       const cvar = Cvar.FindVar(cvarName);
 
@@ -1183,7 +1184,7 @@ export class WebRTCDriver extends BaseDriver {
       hostname: Cvar.FindVar('hostname')?.string ?? 'UNNAMED',
       maxPlayers: SV.svs.maxclients,
       currentPlayers: NET.activeconnections,
-      map: SV.server.mapname,
+      map: SV.server.mapname!,
       mod: COM.game,
       settings: {},
     };
@@ -1645,7 +1646,8 @@ export class WebRTCDriver extends BaseDriver {
     };
 
     channel.onerror = (error) => {
-      Con.PrintError(`WebRTCDriver: Data channel error with ${peerId}: ${error}\n`);
+      // eslint-disable-next-line @typescript-eslint/no-base-to-string
+      Con.PrintError(`WebRTCDriver: Data channel error with ${peerId}: ${error}\n`); // FIXME: this does not print anything useful, need to find a better way to log the error details
       sock.state = QSocket.STATE_DISCONNECTED;
     };
 
diff --git a/source/engine/network/Protocol.ts b/source/engine/network/Protocol.ts
index eb39dfb7..65c7a131 100644
--- a/source/engine/network/Protocol.ts
+++ b/source/engine/network/Protocol.ts
@@ -250,7 +250,7 @@ export class UserCmd {
     return cmd;
   }
 
-  set(other: UserCmd): UserCmd {
+  set(other: UserCmd): this {
     this.msec = other.msec;
     this.forwardmove = other.forwardmove;
     this.sidemove = other.sidemove;
@@ -262,7 +262,7 @@ export class UserCmd {
     return this;
   }
 
-  reset(): UserCmd {
+  reset(): this {
     this.msec = 0;
     this.forwardmove = 0;
     this.sidemove = 0;
diff --git a/source/engine/server/DummyWorker.ts b/source/engine/server/DummyWorker.ts
index b74dfe29..66e37b3c 100644
--- a/source/engine/server/DummyWorker.ts
+++ b/source/engine/server/DummyWorker.ts
@@ -1,9 +1,9 @@
 import WorkerFramework from '../common/WorkerFramework.ts';
-import { eventBus, registry } from '../registry.ts';
+import { eventBus, getCommonRegistry } from '../registry.ts';
 
 await WorkerFramework.Init();
 
-const { Con } = registry;
+const { Con } = getCommonRegistry();
 
 eventBus.subscribe('worker.test', (message: string | null) => {
   if (message) {
diff --git a/source/engine/server/Edict.ts b/source/engine/server/Edict.ts
index 7b091162..484f3a39 100644
--- a/source/engine/server/Edict.ts
+++ b/source/engine/server/Edict.ts
@@ -10,9 +10,10 @@ import { SzBuffer, registerSerializableType } from '../network/MSG.ts';
 import * as Protocol from '../network/Protocol.ts';
 import * as Def from '../common/Def.ts';
 import * as Defs from '../../shared/Defs.ts';
-import { eventBus, registry } from '../registry.ts';
+import { eventBus, getClientRegistry, getCommonRegistry } from '../registry.ts';
 import Q from '../../shared/Q.ts';
 import { ConsoleCommand } from '../common/Cmd.ts';
+import { ModelType } from '../common/Mod.ts';
 
 export interface BaseEntity extends SerializableEntity {
   classname: string;
@@ -46,7 +47,7 @@ export interface BaseEntity extends SerializableEntity {
   maxs: Vector;
   model: string | null;
   modelindex: number;
-  movetype: number;
+  movetype: Defs.moveType;
   netname?: string | null;
   nextthink?: number;
   oldorigin?: Vector;
@@ -55,9 +56,9 @@ export interface BaseEntity extends SerializableEntity {
   punchangle: Vector;
   size: Vector;
   skin: number;
-  solid: number;
+  solid: Defs.solid;
   spawn(): void;
-  takedamage: number;
+  takedamage: Defs.damage;
   team: number;
   teleport_time?: number;
   think?(): void;
@@ -65,8 +66,8 @@ export interface BaseEntity extends SerializableEntity {
   velocity: Vector;
   view_ofs: Vector;
   v_angle: Vector;
-  waterlevel?: number;
-  watertype?: number;
+  waterlevel?: Defs.waterlevel;
+  watertype?: Defs.content;
   yaw_speed?: number;
   readonly edictId: number | undefined;
   restoreSpawnParameters?(data: string | null): void;
@@ -74,10 +75,12 @@ export interface BaseEntity extends SerializableEntity {
 
 export type WorldspawnEntity = WorldspawnEntityValue;
 
-let { CL, COM, Con, Host, NET, PR, SV } = registry;
+let { COM, Con, Host, NET, PR, SV } = getCommonRegistry();
+let { CL } = getClientRegistry();
 
 eventBus.subscribe('registry.frozen', () => {
-  ({ CL, COM, Con, Host, NET, PR, SV } = registry);
+  ({ CL } = getClientRegistry());
+  ({ COM, Con, Host, NET, PR, SV } = getCommonRegistry());
 });
 
 /**
@@ -88,11 +91,6 @@ export class ED {
    * Clears an edict for reuse.
    */
   static ClearEdict(ed: ServerEdict): void {
-    if (ed.entity) {
-      ed.entity.free();
-      ed.entity = null;
-    }
-
     ed.clear();
     ed.free = false;
   }
@@ -166,6 +164,7 @@ export class ED {
       }
 
       const printableValue = (entity as BaseEntity & Record<string, string | number | boolean | Vector | BaseEntity | null | undefined>)[name];
+      // eslint-disable-next-line @typescript-eslint/no-base-to-string
       Con.Print(`${name.padStart(24, '.')}: ${printableValue}\n`);
     }
   }
@@ -223,7 +222,7 @@ export class ED {
         continue;
       }
 
-      const entity = ent.entity;
+      const entity = ent.entity!;
 
       console.assert(entity !== null, 'ED.Count requires a live entity');
 
@@ -267,7 +266,7 @@ export class ED {
     while (true) {
       const parsedKey = COM.Parse(data);
 
-      data = parsedKey.data;
+      data = parsedKey.data!;
 
       if (parsedKey.token.charCodeAt(0) === 125) {
         break;
@@ -293,7 +292,7 @@ export class ED {
 
       const parsedValue = COM.Parse(data);
 
-      data = parsedValue.data;
+      data = parsedValue.data!;
 
       if (data === null) {
         throw new Error('ED.ParseEdict: EOF without closing brace');
@@ -326,7 +325,10 @@ export class ED {
   static async LoadFromFile(data: string): Promise<void> {
     let inhibit = 0;
     let ent: ServerEdict | null = null;
-    SV.server.gameAPI.time = SV.server.time;
+
+    console.assert(SV.server.gameAPI !== null, 'SV.server.gameAPI is required to load entities');
+
+    SV.server.gameAPI!.time = SV.server.time;
 
     while (true) {
       const parsed = COM.Parse(data);
@@ -351,7 +353,7 @@ export class ED {
         continue;
       }
 
-      const maySpawn = SV.server.gameAPI.prepareEntity(ent, initialData.classname as string, initialData);
+      const maySpawn = SV.server.gameAPI!.prepareEntity(ent, initialData.classname as string, initialData);
 
       if (!maySpawn) {
         ED.Free(ent);
@@ -361,7 +363,7 @@ export class ED {
 
       await SV.WaitForPrecachedResources();
 
-      const spawned = SV.server.gameAPI.spawnPreparedEntity(ent);
+      const spawned = SV.server.gameAPI!.spawnPreparedEntity(ent);
 
       if (!spawned) {
         Con.Print(`Could not spawn entity for edict ${ent.num}:\n`);
@@ -524,7 +526,8 @@ export class ServerEdict {
 
     if (mod instanceof Promise) {
       void mod.then((loadedModel) => {
-        this.setMinMaxSize(loadedModel.mins, loadedModel.maxs);
+        console.assert(loadedModel !== null, `Edict.setModel: failed to load model ${model}`);
+        this.setMinMaxSize(loadedModel!.mins, loadedModel!.maxs);
       });
       return;
     }
@@ -536,7 +539,7 @@ export class ServerEdict {
     }
 
     if (entity.solid === Defs.solid.SOLID_BSP) {
-      console.assert(mod && mod.type === 0, 'Edict.setModel: not a brush model for SOLID_BSP');
+      console.assert(mod && mod.type === ModelType.brush, 'Edict.setModel: not a brush model for SOLID_BSP');
     }
   }
 
@@ -581,9 +584,11 @@ export class ServerEdict {
   makeStatic(): void {
     const entity = this._requireEntity();
     const message = SV.server.signon;
+    const modelIndex = SV.ModelIndex(entity.model)!;
+    console.assert(modelIndex !== null, `Edict.makeStatic: model ${entity.model} not precached`);
     message.writeByte(Protocol.svc.spawnstatic);
     message.writeString(entity.classname);
-    message.writeByte(SV.ModelIndex(entity.model));
+    message.writeByte(modelIndex);
     message.writeByte(entity.frame || 0);
     message.writeByte(entity.colormap || 0);
     message.writeByte(entity.skin || 0);
@@ -642,7 +647,7 @@ export class ServerEdict {
       }
 
       SV.server.lastcheck = i;
-      ServerEdict.#lastcheckpvs = SV.server.worldmodel.getPvsByPoint(ent._requireEntity().origin.copy().add(ent._requireEntity().view_ofs));
+      ServerEdict.#lastcheckpvs = SV.server.worldmodel!.getPvsByPoint(ent._requireEntity().origin.copy().add(ent._requireEntity().view_ofs));
       SV.server.lastchecktime = SV.server.time;
     }
 
@@ -659,7 +664,7 @@ export class ServerEdict {
       return null;
     }
 
-    const leaf = SV.server.worldmodel.getLeafForPoint(this._requireEntity().origin.copy().add(this._requireEntity().view_ofs)).num;
+    const leaf = SV.server.worldmodel!.getLeafForPoint(this._requireEntity().origin.copy().add(this._requireEntity().view_ofs)).num;
 
     if (leaf === 0 || !lastcheckpvs.isRevealed(leaf)) {
       return null;
@@ -699,13 +704,13 @@ export class ServerEdict {
     if (trace.ent !== null) {
       const hitEntity = trace.ent.entity;
 
-      if (hitEntity !== null && hitEntity.takedamage === Defs.damage.DAMAGE_AIM && (!Host.teamplay.value || entity.team <= 0 || entity.team !== hitEntity.team)) {
+      if (hitEntity !== null && hitEntity.takedamage === Defs.damage.DAMAGE_AIM && (!Host.teamplay!.value || entity.team <= 0 || entity.team !== hitEntity.team)) {
         return dir;
       }
     }
 
     const bestdir = dir.copy();
-    let bestdist = SV.aim.value;
+    let bestdist = SV.aim!.value;
     let bestent: ServerEdict | null = null;
 
     for (let i = 1; i < SV.server.num_edicts; i++) {
@@ -725,7 +730,7 @@ export class ServerEdict {
         continue;
       }
 
-      if (Host.teamplay.value !== 0 && entity.team > 0 && entity.team === checkEntity.team) {
+      if (Host.teamplay!.value !== 0 && entity.team > 0 && entity.team === checkEntity.team) {
         continue;
       }
 
diff --git a/source/engine/server/Navigation.ts b/source/engine/server/Navigation.ts
index 48feda5b..08690906 100644
--- a/source/engine/server/Navigation.ts
+++ b/source/engine/server/Navigation.ts
@@ -12,7 +12,7 @@ import { MIN_STEP_NORMAL, STEPSIZE } from '../common/Pmove.ts';
 import type { Face } from '../common/model/BaseModel.ts';
 import type PlatformWorker from '../common/PlatformWorker.ts';
 import WorkerManager from '../common/WorkerManager.ts';
-import { eventBus, registry } from '../registry.ts';
+import { eventBus, getClientRegistry, getCommonRegistry, registry } from '../registry.ts';
 import type { BaseEntity, ServerEdict } from './Edict.ts';
 import type { CollisionTrace } from './physics/ServerCollisionSupport.ts';
 
@@ -82,10 +82,12 @@ function vectorToTuple(vector: Vector): VectorTuple {
   return [vector[0], vector[1], vector[2]];
 }
 
-let { CL, COM, Con, R, SV } = registry;
+let { COM, Con, SV } = getCommonRegistry();
+let { CL, R } = getClientRegistry();
 
 eventBus.subscribe('registry.frozen', () => {
-  ({ CL, COM, Con, R, SV } = registry);
+  ({ COM, Con, SV } = getCommonRegistry());
+  ({ CL, R } = getClientRegistry());
 });
 
 class Waypoint {
@@ -158,7 +160,7 @@ class WalkableSurface {
 
     console.assert(face, 'Navigation requires a worldmodel when deserializing surfaces');
 
-    const surface = new WalkableSurface(face, faceIndex);
+    const surface = new WalkableSurface(face!, faceIndex);
     surface.stability = data[0];
     surface.normal = new Vector(...data[1]);
     surface.waypoints = data[3].map((wpData) => Waypoint.deserialize(wpData));
@@ -506,10 +508,13 @@ export class Navigation {
       this.build();
     }
 
+    console.assert(SV.server.mapname, 'SV.server.mapname is required for navigation initialization');
+    console.assert(SV.server.worldmodel, 'SV.server.worldmodel is required for navigation initialization');
+
     this.#initWorker();
     this.#subscribePathResponse();
     this.#subscribeDebugCvars();
-    eventBus.publish('nav.load', SV.server.mapname, SV.server.worldmodel.checksum);
+    eventBus.publish('nav.load', SV.server.mapname, SV.server.worldmodel!.checksum);
   }
 
   shutdown(): void {
@@ -612,7 +617,7 @@ export class Navigation {
       if (checksum !== expectedChecksum) {
         throw new NavMeshOutOfDateException(filename, 'outdated map');
       }
-    } else if (checksum !== this.worldmodel.checksum) {
+    } else if (checksum !== this.worldmodel!.checksum) {
       throw new NavMeshOutOfDateException(filename, 'outdated map');
     }
 
@@ -674,7 +679,8 @@ export class Navigation {
   }
 
   async save(): Promise<void> {
-    console.assert(Boolean(this.worldmodel), 'Navigation: worldmodel is required');
+    console.assert(this.worldmodel !== null, 'Navigation: worldmodel is required');
+    console.assert(SV.server.mapname, 'SV.server.mapname is required');
 
     const filename = `maps/${SV.server.mapname}.nav`;
 
@@ -690,7 +696,7 @@ export class Navigation {
       bytes.push((value >>> 16) & 0xff);
       bytes.push((value >>> 24) & 0xff);
     };
-    const pushInt32 = (value: number): void => pushUint32(value >>> 0);
+    const pushInt32 = (value: number): void => { pushUint32(value >>> 0); };
     const pushFloat32 = (value: number): void => {
       tdv.setFloat32(0, value, true);
       const byteView = new Uint8Array(tmp, 0, 4);
@@ -707,11 +713,11 @@ export class Navigation {
     pushUint32(NAV_FILE_VERSION);
 
     // world name
-    const nameBytes = new TextEncoder().encode(SV.server.mapname);
+    const nameBytes = new TextEncoder().encode(SV.server.mapname!);
     pushUint16(nameBytes.length);
     pushBytes(nameBytes);
 
-    pushUint32(this.worldmodel.checksum);
+    pushUint32(this.worldmodel!.checksum);
     pushFloat32(this.requiredHeight);
     pushFloat32(this.requiredRadius);
 
@@ -747,7 +753,7 @@ export class Navigation {
     await COM.WriteFile(filename, out, out.length);
 
     // Keep the worker in sync after every successful rebuild, including listen-server sessions.
-    eventBus.publish('nav.load', SV.server.mapname, this.worldmodel.checksum);
+    eventBus.publish('nav.load', SV.server.mapname, this.worldmodel!.checksum);
   }
 
   #newWalkerStandOffset(): Vector {
@@ -846,13 +852,15 @@ export class Navigation {
    * @returns A point lying on the given surface plane.
    */
   #getSurfacePoint(surface: WalkableSurface): Vector {
-    const surfedge = this.worldmodel.surfedges[surface.face.firstedge];
+    console.assert(this.worldmodel, 'Navigation: worldmodel is required for surface point retrieval');
+
+    const surfedge = this.worldmodel!.surfedges[surface.face.firstedge];
 
     if (surfedge > 0) {
-      return new Vector().set(this.worldmodel.vertexes[this.worldmodel.edges[surfedge][0]]);
+      return new Vector().set(this.worldmodel!.vertexes[this.worldmodel!.edges[surfedge][0]]);
     }
 
-    return new Vector().set(this.worldmodel.vertexes[this.worldmodel.edges[-surfedge][1]]);
+    return new Vector().set(this.worldmodel!.vertexes[this.worldmodel!.edges[-surfedge][1]]);
   }
 
   /**
@@ -962,9 +970,11 @@ export class Navigation {
     const upwards = new Vector(0, 0, 1);
     const sidewards = new Vector(0, 1, 0);
 
+    console.assert(this.worldmodel, 'Navigation: worldmodel is required for walkable surface extraction');
+
     // Pass 1: collect all potentially walkable surfaces
-    for (let i = 0; i < this.worldmodel.faces.length; i++) {
-      const face = this.worldmodel.faces[i];
+    for (let i = 0; i < this.worldmodel!.faces.length; i++) {
+      const face = this.worldmodel!.faces[i];
 
       if (face.numedges < 3) {
         continue;
@@ -1000,12 +1010,12 @@ export class Navigation {
       const verts3: Vector[] = [];
       for (let i = 0; i < face.numedges; i++) {
         const vec = new Vector();
-        const surfedge = this.worldmodel.surfedges[face.firstedge + i];
+        const surfedge = this.worldmodel!.surfedges[face.firstedge + i];
 
         if (surfedge > 0) {
-          vec.set(this.worldmodel.vertexes[this.worldmodel.edges[surfedge][0]]);
+          vec.set(this.worldmodel!.vertexes[this.worldmodel!.edges[surfedge][0]]);
         } else {
-          vec.set(this.worldmodel.vertexes[this.worldmodel.edges[-surfedge][1]]);
+          vec.set(this.worldmodel!.vertexes[this.worldmodel!.edges[-surfedge][1]]);
         }
 
         verts3.push(vec);
@@ -1731,7 +1741,7 @@ export class Navigation {
   }
 
   #debugNavigation(): void {
-    if (!Navigation.nav_debug_graph.value) {
+    if (!Navigation.nav_debug_graph!.value) {
       return;
     }
 
@@ -1773,7 +1783,7 @@ export class Navigation {
   }
 
   #debugWaypoints(): void {
-    if (!Navigation.nav_debug_waypoints.value) {
+    if (!Navigation.nav_debug_waypoints!.value) {
       return;
     }
 
@@ -1856,7 +1866,7 @@ export class Navigation {
           void Cmd.ExecuteString('quit');
         }
       })
-      .catch((err) => Con.PrintError(`Navigation: failed to save navigation graph: ${err}\n`));
+      .catch((err) => { Con.PrintError(`Navigation: failed to save navigation graph: ${err}\n`); });
 
     this.#scheduleDebugRefresh();
   }
diff --git a/source/engine/server/NavigationWorker.ts b/source/engine/server/NavigationWorker.ts
index 86693d16..889ea4bf 100644
--- a/source/engine/server/NavigationWorker.ts
+++ b/source/engine/server/NavigationWorker.ts
@@ -1,5 +1,5 @@
 import WorkerFramework from '../common/WorkerFramework.ts';
-import { eventBus, registry } from '../registry.ts';
+import { eventBus, getCommonRegistry } from '../registry.ts';
 
 import { Navigation, NavMeshOutOfDateException } from './Navigation.ts';
 import Vector from '../../shared/Vector.ts';
@@ -8,9 +8,10 @@ type WorkerVectorLike = ArrayLike<number>;
 
 await WorkerFramework.Init();
 
-const { Con } = registry;
+const { Con } = getCommonRegistry();
 const navigation = new Navigation(null);
 
+// eslint-disable-next-line @typescript-eslint/no-misused-promises
 eventBus.subscribe('nav.load', async (mapname: string, checksum: number | null) => {
   Con.DPrint('Navigation: loading navigation graph...\n');
 
diff --git a/source/engine/server/Progs.ts b/source/engine/server/Progs.ts
index 308fce69..898f1508 100644
--- a/source/engine/server/Progs.ts
+++ b/source/engine/server/Progs.ts
@@ -327,7 +327,7 @@ class ProgsFunctionProxy extends Function {
     // such an ugly hack to make objects actually callable
     ProgsFunctionProxy.proxyCache[cacheId] = new Proxy(obj, {
       apply(target, thisArg, args) {
-        return obj.call.apply(obj, args);
+        return obj.call.apply(obj, args as [ProgsEntity | ServerEdict | null]);
       },
     });
 
@@ -438,12 +438,12 @@ class ProgsEntity {
         this._serializableFields.push(name);
       }
 
-      const val_float = new Float32Array(val);
-      const val_int = new Int32Array(val);
+      const val_float = new Float32Array(val!);
+      const val_int = new Int32Array(val!);
 
-      const assignedFunctions = [];
+      const assignedFunctions = [] as Function[];
 
-      switch (type) {
+      switch (type as etype) {
         case etype.ev_string:
           Object.defineProperty(this, name, {
             get: function() {
@@ -745,7 +745,7 @@ PR.ValueString = function(type, val, ofs) {
   const val_float = new Float32Array(val);
   const val_int = new Int32Array(val);
   type &= ~PR.saveglobal;
-  switch (type) {
+  switch (type as etype) {
     case etype.ev_string:
       return PR.GetString(val_int[ofs]);
     case etype.ev_entity:
@@ -777,7 +777,7 @@ PR.Value = function(type, val, ofs) {
   const val_float = new Float32Array(val);
   const val_int = new Int32Array(val);
   type &= ~PR.saveglobal;
-  switch (type) {
+  switch (type as etype) {
     case etype.ev_string:
       return PR.GetString(val_int[ofs]);
     case etype.ev_pointer:
@@ -809,7 +809,7 @@ PR.UglyValueString = function(type, val, ofs) {
   const val_float = new Float32Array(val);
   const val_int = new Int32Array(val);
   type &= ~PR.saveglobal;
-  switch (type) {
+  switch (type as etype) {
     case etype.ev_string:
       return PR.GetString(val_int[ofs]);
     case etype.ev_entity:
@@ -993,9 +993,13 @@ PR.LoadProgs = async function() {
 
   const progsAPI = new ProgsEntity(null);
 
-  const deathmatch = Cvar.FindVar('deathmatch');
-  const skill = Cvar.FindVar('skill');
-  const coop = Cvar.FindVar('coop');
+  const deathmatch = Cvar.FindVar('deathmatch')!;
+  const skill = Cvar.FindVar('skill')!;
+  const coop = Cvar.FindVar('coop')!;
+
+  console.assert(deathmatch instanceof Cvar, 'deathmatch cvar not found');
+  console.assert(skill instanceof Cvar, 'skill cvar not found');
+  console.assert(coop instanceof Cvar, 'coop cvar not found');
 
   const gameAPI = Object.assign(progsAPI, {
     prepareEntity(edict: ServerEdict, classname: string | null, initialData: EdictData = {}): boolean {
@@ -1037,7 +1041,7 @@ PR.LoadProgs = async function() {
           continue;
         }
 
-        switch (field.type & 0x7fff) {
+        switch ((field.type & 0x7fff) as etype) {
           case etype.ev_entity:
             if (value === null || typeof value === 'object') {
               preparedEntity[key] = value;
@@ -1050,6 +1054,7 @@ PR.LoadProgs = async function() {
             if (value instanceof Vector) {
               preparedEntity[key] = value;
             } else {
+              // eslint-disable-next-line @typescript-eslint/no-base-to-string
               preparedEntity[key] = new Vector(...String(value).split(' ').map((x) => Q.atof(x)));
             }
             break;
@@ -1088,13 +1093,13 @@ PR.LoadProgs = async function() {
 
       const spawnflags = typeof preparedEntity.spawnflags === 'number' ? preparedEntity.spawnflags : 0;
 
-      if (deathmatch.value !== 0 && (spawnflags & 2048)) {
+      if (deathmatch!.value !== 0 && (spawnflags & 2048)) {
         return false;
       }
 
       const skillFlags = [256, 512, 1024, 1024];
 
-      if (spawnflags & skillFlags[Math.max(0, Math.min(skillFlags.length, skill.value))]) {
+      if (spawnflags & skillFlags[Math.max(0, Math.min(skillFlags.length, skill!.value))]) {
         return false;
       }
 
@@ -1122,7 +1127,7 @@ PR.LoadProgs = async function() {
       gameAPI.serverflags = serverflags;
 
       // coop automatically disables deathmatch
-      if (coop.value) {
+      if (coop!.value) {
         coop.set(true);
         deathmatch.set(false);
       }
@@ -1161,7 +1166,7 @@ PR.Init = async function() {
       PR.QuakeJS = null;
     } else {
       // try to get the game API
-      PR.QuakeJS = await loadGameModule(COM.gamedir[0].filename);
+      PR.QuakeJS = await loadGameModule(COM.gamedir![0].filename);
       PR.QuakeJS.ServerGameAPI.Init(ServerEngineAPI);
 
       const identification = PR.QuakeJS.identification;
@@ -1169,13 +1174,17 @@ PR.Init = async function() {
     return;
     }
   } catch (e) {
-    if (typeof(e.code) === 'string' && e.code !== 'ERR_MODULE_NOT_FOUND') { // only catch module not found errors
+    const errorCode = typeof e === 'object' && e !== null && 'code' in e && typeof e.code === 'string'
+      ? e.code
+      : null;
+
+    if (errorCode !== null && errorCode !== 'ERR_MODULE_NOT_FOUND') { // only catch module not found errors
       throw e;
     }
 
     // CR: stupidest error convention ever, check https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Operators/import#return_value
-
-    Con.PrintWarning('PR.Init: Falling back to QuakeC, failed to initialize QuakeJS server code: ' + e.message +'.\n');
+    const errorMessage = e instanceof Error ? e.message : String(e);
+    Con.PrintWarning('PR.Init: Falling back to QuakeC, failed to initialize QuakeJS server code: ' + errorMessage + '.\n');
 
     PR.QuakeJS = null;
   }
diff --git a/source/engine/server/ProgsAPI.ts b/source/engine/server/ProgsAPI.ts
index 27f95a61..1692e9a0 100644
--- a/source/engine/server/ProgsAPI.ts
+++ b/source/engine/server/ProgsAPI.ts
@@ -1,3 +1,4 @@
+/* eslint-disable @typescript-eslint/no-implied-eval */
 import type { SzBuffer } from '../network/MSG.ts';
 import type { ClientEdict } from '../../shared/GameInterfaces.ts';
 
@@ -9,7 +10,7 @@ import { eventBus, getCommonRegistry, registry } from '../registry.ts';
 import { ED, ServerEdict } from './Edict.ts';
 
 type BuiltinValue = string | number | boolean | Vector | ServerEdict | null;
-type BuiltinImplementation = (...args: BuiltinValue[]) => BuiltinValue | void;
+type BuiltinImplementation<TArgs extends BuiltinValue[] = BuiltinValue[], TReturn extends BuiltinValue | void = BuiltinValue | void> = (...args: TArgs) => TReturn;
 type BuiltinFunction = () => void;
 
 interface GeneratedAssert {
@@ -120,7 +121,12 @@ export enum ofs {
  * Generates a function that can be exposed to the QuakeC VM as a builtin.
  * @returns The VM-facing builtin wrapper.
  */
-function generateBuiltinFunction(name: string, func: BuiltinImplementation, argTypes: readonly etype[] = [], returnType: etype = etype.ev_void): BuiltinFunction {
+function generateBuiltinFunction<TArgs extends BuiltinValue[], TReturn extends BuiltinValue | void>(
+  name: string,
+  func: BuiltinImplementation<TArgs, TReturn>,
+  argTypes: readonly etype[] = [],
+  returnType: etype = etype.ev_void,
+): BuiltinFunction {
   if (!(func instanceof Function)) {
     throw new TypeError('func must be a Function!');
   }
@@ -269,8 +275,8 @@ const makevectors = generateBuiltinFunction('makevectors', (vec: Vector): void =
   gameAPI.v_up = up;
 }, [etype.ev_vector]);
 
-const setorigin = generateBuiltinFunction('setorigin', (edict: ServerEdict, vec: Vector): void => edict.setOrigin(vec), [etype.ev_entity, etype.ev_vector], etype.ev_void);
-const setsize = generateBuiltinFunction('setsize', (edict: ServerEdict, min: Vector, max: Vector): void => edict.setMinMaxSize(min, max), [etype.ev_entity, etype.ev_vector, etype.ev_vector], etype.ev_void);
+const setorigin = generateBuiltinFunction('setorigin', (edict: ServerEdict, vec: Vector): void => { edict.setOrigin(vec); }, [etype.ev_entity, etype.ev_vector], etype.ev_void);
+const setsize = generateBuiltinFunction('setsize', (edict: ServerEdict, min: Vector, max: Vector): void => { edict.setMinMaxSize(min, max); }, [etype.ev_entity, etype.ev_vector, etype.ev_vector], etype.ev_void);
 
 const setmodel = generateBuiltinFunction('setmodel', (edict: ServerEdict, model: string): void => {
   edict.setModel(model);
@@ -371,7 +377,7 @@ const dprint = generateBuiltinFunction('dprint', (message: string): void => {
   ServerEngineAPI.ConsoleDebug(message);
 }, [etype.ev_strings]);
 
-const ftos = generateBuiltinFunction('ftos', (value: number): string => ((+value | 0) === +value ? value.toString() : value.toFixed(1)), [etype.ev_float], etype.ev_string);
+const ftos = generateBuiltinFunction('ftos', (value: number): string => (Number.isInteger(value) ? value.toString() : value.toFixed(1)), [etype.ev_float], etype.ev_string);
 const fabs = generateBuiltinFunction('fabs', (value: number): number => Math.abs(value), [etype.ev_float], etype.ev_float);
 const vtos = generateBuiltinFunction('vtos', (vec: Vector): string => vec.toString(), [etype.ev_vector], etype.ev_string);
 
@@ -452,14 +458,14 @@ function WriteGeneric(dest: number): SzBuffer {
       return SV.server.datagram;
 
     case 1: {
-      const messageEntity = getQuakeCGameAPI().msg_entity;
+      const messageEntity = getQuakeCGameAPI().msg_entity!;
       const entityNumber = messageEntity.num;
 
       if (!messageEntity.isClient()) {
         throw new Error(`WriteGeneric: not a client ${entityNumber}`);
       }
 
-      return messageEntity.getClient().message;
+      return messageEntity.getClient()!.message;
     }
 
     case 2:
@@ -510,10 +516,11 @@ const makestatic = generateBuiltinFunction('makestatic', (edict: ServerEdict): v
 }, [etype.ev_entity]);
 
 const setspawnparms = generateBuiltinFunction('setspawnparms', (clientEdict: ServerEdict): void => {
-  const spawnParameters = clientEdict.getClient().spawn_parms;
+  console.assert(clientEdict.isClient(), 'setspawnparms requires a client edict');
+  const spawnParameters = clientEdict.getClient()!.spawn_parms;
 
   for (let i = 0; i <= 15; i++) {
-    SV.server.gameAPI[`parm${i + 1}`] = spawnParameters[i];
+    SV.server.gameAPI[`parm${i + 1}`] = spawnParameters![i];
   }
 }, [etype.ev_entity_client]);
 
diff --git a/source/engine/server/Server.ts b/source/engine/server/Server.ts
index b8bc8b32..a6169b13 100644
--- a/source/engine/server/Server.ts
+++ b/source/engine/server/Server.ts
@@ -21,7 +21,7 @@ import { ServerMovement } from './physics/ServerMovement.ts';
 import { ServerArea } from './physics/ServerArea.ts';
 import { ServerCollision } from './physics/ServerCollision.ts';
 import { sharedCollisionModelSource } from '../common/CollisionModelSource.ts';
-import { BrushModel } from '../common/Mod.ts';
+import { BrushModel, ModelScope } from '../common/Mod.ts';
 import { ServerClient } from './Client.ts';
 
 export { ServerEntityState } from './ServerEntityState.ts';
@@ -491,7 +491,7 @@ export default class SV {
     }
 
     Con.DPrint('Clearing memory\n');
-    Mod.ClearAll(Mod.scope.server);
+    Mod.ClearAll(ModelScope.server);
     await SV.#loadGameProgs();
 
     SV.#initializeEdicts();
@@ -798,7 +798,7 @@ export default class SV {
 
   static async #loadWorldModel(mapname: string): Promise<boolean> {
     SV.server.mapname = mapname;
-    SV.server.worldmodel = await Mod.ForNameAsync(`maps/${mapname}.bsp`, false, Mod.scope.server) as BrushModel | null;
+    SV.server.worldmodel = await Mod.ForNameAsync(`maps/${mapname}.bsp`, false, ModelScope.server) as BrushModel | null;
 
     if (SV.server.worldmodel === null) {
       Con.PrintWarning(`SV.SpawnServer: Cannot start server, unable to load map ${mapname}\n`);
@@ -826,7 +826,7 @@ export default class SV {
 
     for (let i = 1; i <= worldmodel.submodels.length; i++) {
       SV.server.modelPrecache[i + 1] = `*${i}`;
-      SV.server.models[i + 1] = Mod.ForName(`*${i}`, Mod.scope.server) as BaseModel;
+      SV.server.models[i + 1] = Mod.ForName(`*${i}`, ModelScope.server) as BaseModel;
     }
 
     Con.DPrint('Model precache setup complete\n');
@@ -992,7 +992,7 @@ export default class SV {
     Con.Print(`${client.name} tried to ${input}!\n`);
   }
 
-  static #processClientCommand(client: ServerClient, cmd: number): boolean {
+  static #processClientCommand(client: ServerClient, cmd: Protocol.clc): boolean {
     switch (cmd) {
       case Protocol.clc.nop:
         Con.DPrint(`${client.netconnection?.address ?? 'unknown'} sent a nop\n`);
diff --git a/source/engine/server/ServerMessages.ts b/source/engine/server/ServerMessages.ts
index 75e5e206..4b113125 100644
--- a/source/engine/server/ServerMessages.ts
+++ b/source/engine/server/ServerMessages.ts
@@ -60,7 +60,7 @@ interface ServerMessageEntity extends BaseEntity {
   sounds?: number;
   velocity: Vector;
   view_ofs: Vector;
-  waterlevel: number;
+  waterlevel: Defs.waterlevel;
   weapon: number;
   weaponframe: number;
   weaponmodel: string | null;
diff --git a/source/engine/server/Sys.ts b/source/engine/server/Sys.ts
index d0ca4d84..373fdb3c 100644
--- a/source/engine/server/Sys.ts
+++ b/source/engine/server/Sys.ts
@@ -61,7 +61,7 @@ const evaluateReplCommand: REPLEval = function(command, _context, _filename, cal
   MainLoop.notify();
   this.clearBufferedCommand();
   Cmd.text += command;
-  setTimeout(() => callback(null, undefined), 20); // we have to wait at least one frame before expecting a result
+  setTimeout(() => { callback(null, undefined); }, 20); // we have to wait at least one frame before expecting a result
 };
 
 eventBus.subscribe('net.connection.accepted', () => {
@@ -120,8 +120,8 @@ export default class Sys extends BaseSys {
     // eslint-disable-next-line require-atomic-updates
     Sys.#isRunning = true;
 
-    if (Host.refreshrate.value === 0) {
-      Host.refreshrate.set(60);
+    if (Host.refreshrate!.value === 0) {
+      Host.refreshrate!.set(60);
     }
 
     // Main loop
@@ -136,7 +136,7 @@ export default class Sys extends BaseSys {
         Sys.Print(`Host.Frame took too long: ${dtime} ms\n`);
       }
 
-      await Q.sleep(Math.max(0, 1000.0 / Math.min(300, Math.max(60, Host.refreshrate.value)) - dtime));
+      await Q.sleep(Math.max(0, 1000.0 / Math.min(300, Math.max(60, Host.refreshrate!.value)) - dtime));
 
       // when there are no more commands to process and no active connections, we can sleep indefinitely
       if (NET.activeconnections === 0 && Host._scheduledForNextFrame.length === 0 && !Cmd.HasPendingCommands()) {
@@ -160,7 +160,7 @@ export default class Sys extends BaseSys {
    * Prints a message to the console.
    */
   static override Print(text: string): void {
-    stdout.write(String(text).trim() + '\n');
+    stdout.write(text.trim() + '\n');
   }
 
   /**
@@ -230,7 +230,7 @@ export default class Sys extends BaseSys {
 
         // Set headers and send the file data
         res.setHeader('Content-Type', 'application/octet-stream');
-        res.setHeader('Cache-Control', Host.developer.value ? 'private, max-age=0' : 'public, max-age=86400');
+        res.setHeader('Cache-Control', Host.developer!.value ? 'private, max-age=0' : 'public, max-age=86400');
 
         // Convert ArrayBuffer -> Buffer before sending
         return res.send(Buffer.from(fileData));
diff --git a/source/engine/server/physics/ServerArea.ts b/source/engine/server/physics/ServerArea.ts
index 1f40b5a9..bf2a23ad 100644
--- a/source/engine/server/physics/ServerArea.ts
+++ b/source/engine/server/physics/ServerArea.ts
@@ -289,7 +289,7 @@ export class ServerArea {
       return;
     }
 
-    if (node.contents < 0) {
+    if (node.contents < Defs.content.CONTENT_NONE) {
       if (ent.leafnums.length === 16) {
         return;
       }
@@ -326,7 +326,7 @@ export class ServerArea {
     console.assert(ent.entity !== null);
     const entity = ent.entity! as BaseEntity;
 
-    SV.server.navigation.relinkEdict(ent);
+    SV.server.navigation!.relinkEdict(ent);
     this.unlinkEdict(ent);
 
     const absmin = new Vector();
@@ -349,7 +349,7 @@ export class ServerArea {
 
     ent.leafnums = [];
     if (entity.modelindex !== 0) {
-      this.findTouchedLeafs(ent, SV.server.worldmodel.nodes[0]);
+      this.findTouchedLeafs(ent, SV.server.worldmodel!.nodes[0]);
     }
 
     if (entity.solid === Defs.solid.SOLID_NOT) {
diff --git a/source/engine/server/physics/ServerClientPhysics.ts b/source/engine/server/physics/ServerClientPhysics.ts
index bf12d393..daa4ef8a 100644
--- a/source/engine/server/physics/ServerClientPhysics.ts
+++ b/source/engine/server/physics/ServerClientPhysics.ts
@@ -92,15 +92,16 @@ export class ServerClientPhysics {
     pmove.angles.set(entity.v_angle ?? entity.angles);
 
     // Persistent PM state from the client connection
+    const teleportTime = entity.teleport_time || 0;
     pmove.oldbuttons = client.pmOldButtons;
     pmove.pmFlags = client.pmFlags;
     pmove.pmTime = client.pmTime;
-    pmove.waterjumptime = entity.teleport_time > SV.server.time ? (entity.teleport_time - SV.server.time) : 0;
-    pmove.dead = entity.deadflag > 0;
+    pmove.waterjumptime = teleportTime > SV.server.time ? (teleportTime - SV.server.time) : 0;
+    pmove.dead = entity.deadflag! > 0;
     pmove.spectator = false;
 
     // Determine PM type
-    if (entity.deadflag > 0) {
+    if (entity.deadflag! > 0) {
       pmove.pmType = PM_TYPE.DEAD;
     } else if (entity.movetype === Defs.moveType.MOVETYPE_NOCLIP) {
       pmove.pmType = PM_TYPE.SPECTATOR;
@@ -261,7 +262,7 @@ export class ServerClientPhysics {
     }
 
     if (steps >= 2) {
-      entity.idealpitch = -dir * SV.idealpitchscale.value;
+      entity.idealpitch = -dir * SV.idealpitchscale!.value;
     }
   }
 
@@ -295,7 +296,7 @@ export class ServerClientPhysics {
 
     entity.punchangle = punchangle.multiply(len);
 
-    if (entity.deadflag > 0) {
+    if (entity.deadflag! > 0) {
       return;
     }
 
@@ -340,9 +341,9 @@ export class ServerClientPhysics {
     }
 
     gameAPI.time = SV.server.time;
-    SV.server.gameAPI.PlayerPreThink(ent);
+    SV.server.gameAPI!.PlayerPreThink(ent);
     SV.physics.checkVelocity(ent);
-    const movetype = ent.entity!.movetype >> 0;
+    const movetype = (ent.entity!.movetype >> 0) as Defs.moveType;
     if (movetype === Defs.moveType.MOVETYPE_TOSS || movetype === Defs.moveType.MOVETYPE_BOUNCE) {
       SV.physics.physicsToss(ent);
     } else {
@@ -377,6 +378,6 @@ export class ServerClientPhysics {
     }
     SV.area.linkEdict(ent, true);
     gameAPI.time = SV.server.time;
-    SV.server.gameAPI.PlayerPostThink(ent);
+    SV.server.gameAPI!.PlayerPostThink(ent);
   }
 }
diff --git a/source/engine/server/physics/ServerCollision.ts b/source/engine/server/physics/ServerCollision.ts
index 3af95b98..d0c67e64 100644
--- a/source/engine/server/physics/ServerCollision.ts
+++ b/source/engine/server/physics/ServerCollision.ts
@@ -392,7 +392,7 @@ export class ServerCollision {
    * Normalize static-world contents values so current volumes behave like water.
    * @returns The normalized contents value.
    */
-  _normalizeStaticWorldContents(contents: number): number {
+  _normalizeStaticWorldContents(contents: Defs.content): Defs.content {
     if ((contents <= Defs.content.CONTENT_CURRENT_0) && (contents >= Defs.content.CONTENT_CURRENT_DOWN)) {
       return Defs.content.CONTENT_WATER;
     }
@@ -425,7 +425,7 @@ export class ServerCollision {
    * active map.
    * @returns The static-world contents at the sampled point.
    */
-  staticWorldContents(point: Vector, hullNum = 0): number {
+  staticWorldContents(point: Vector, hullNum = 0): Defs.content {
     const { worldModel } = this._getStaticWorldSource();
 
     if (worldModel === null) {
@@ -443,7 +443,7 @@ export class ServerCollision {
    * Compatibility alias for staticWorldContents.
    * @returns The static-world contents at the sampled point.
    */
-  worldContents(point: Vector, hullNum = 0): number {
+  worldContents(point: Vector, hullNum = 0): Defs.content {
     return this.staticWorldContents(point, hullNum);
   }
 
@@ -451,7 +451,7 @@ export class ServerCollision {
    * Compatibility alias for staticWorldContents.
    * @returns The static-world contents at the sampled point.
    */
-  pointContents(p: Vector, hullNum = 0): number {
+  pointContents(p: Vector, hullNum = 0): Defs.content {
     return this.staticWorldContents(p, hullNum);
   }
 
@@ -820,7 +820,7 @@ export class ServerCollision {
     mins: Vector,
     maxs: Vector,
     end: Vector,
-    type: number,
+    type: Defs.moveTypes,
     passedict: ServerEdict | null,
   ): MoveClip {
     const worldEdict = SV.server.edicts[0];
@@ -858,7 +858,9 @@ export class ServerCollision {
    * Recursively checks the links in the area node BSP for collision.
    */
   clipToLinks(clip: MoveClip): void {
-    for (const touch of SV.area.tree.queryAABB(clip.boxmins, clip.boxmaxs)) {
+    console.assert(SV.area.tree !== null, 'collision area tree must be initialized before clipping to links');
+
+    for (const touch of SV.area.tree!.queryAABB(clip.boxmins, clip.boxmaxs)) {
       if (this._shouldSkipTouch(clip, touch)) {
         continue;
       }
diff --git a/source/engine/server/physics/ServerCollisionSupport.ts b/source/engine/server/physics/ServerCollisionSupport.ts
index 18c2f8b5..34c9703b 100644
--- a/source/engine/server/physics/ServerCollisionSupport.ts
+++ b/source/engine/server/physics/ServerCollisionSupport.ts
@@ -4,6 +4,7 @@ import type { MeshModel } from '../../common/model/MeshModel.ts';
 import type { ServerEdict } from '../Edict.ts';
 
 import Vector from '../../../shared/Vector.ts';
+import type { moveTypes } from '../../../shared/Defs.ts';
 
 interface CollisionPlaneSource {
   readonly normal: Vector;
@@ -74,7 +75,7 @@ export class MoveClip {
   mins2: Vector;
   maxs: Vector;
   maxs2: Vector;
-  type: number;
+  type: moveTypes;
   passedict: ServerEdict | null;
   boxmins: Vector;
   boxmaxs: Vector;
diff --git a/source/engine/server/physics/ServerLegacyHullCollision.ts b/source/engine/server/physics/ServerLegacyHullCollision.ts
index 8c6c2abc..8094ff1f 100644
--- a/source/engine/server/physics/ServerLegacyHullCollision.ts
+++ b/source/engine/server/physics/ServerLegacyHullCollision.ts
@@ -50,7 +50,7 @@ export function getHullPlaneDistance(plane: Hull['planes'][number], point: Vecto
  * @param trace Trace accumulator.
  * @returns True when traversal should continue upward.
  */
-export function classifyHullLeaf(contents: number, trace: CollisionTrace): boolean {
+export function classifyHullLeaf(contents: Defs.content, trace: CollisionTrace): boolean {
   if (contents !== Defs.content.CONTENT_SOLID) {
     trace.allsolid = false;
     if (contents === Defs.content.CONTENT_EMPTY) {
@@ -72,7 +72,7 @@ export function classifyHullLeaf(contents: number, trace: CollisionTrace): boole
  * @param p Point to classify.
  * @returns Content type for the point.
  */
-export function hullPointContents(hull: LegacyHull, num: number, p: Vector): number {
+export function hullPointContents(hull: LegacyHull, num: number, p: Vector): Defs.content {
   while (num >= 0) {
     if (!isHullNodeAllowed(hull, num)) {
       return Defs.content.CONTENT_EMPTY;
diff --git a/source/engine/server/physics/ServerMovement.ts b/source/engine/server/physics/ServerMovement.ts
index 63c23477..64a57334 100644
--- a/source/engine/server/physics/ServerMovement.ts
+++ b/source/engine/server/physics/ServerMovement.ts
@@ -183,8 +183,8 @@ export class ServerMovement {
       return false;
     }
 
-    const goalEdict = this.#resolveEdict(entity.goalentity);
-    const enemyEdict = this.#resolveEdict(entity.enemy);
+    const goalEdict = this.#resolveEdict(entity.goalentity || null);
+    const enemyEdict = this.#resolveEdict(entity.enemy || null);
 
     console.assert(goalEdict !== null, 'must have goal for moveToGoal');
 
@@ -195,7 +195,7 @@ export class ServerMovement {
     }
 
     // TODO: consider reintroducing direct movestep steering toward goal to reduce chase ping-pong.
-    if (Math.random() >= 0.75 || !this.stepDirection(ent, entity.ideal_yaw, dist)) {
+    if (Math.random() >= 0.75 || !this.stepDirection(ent, entity.ideal_yaw || 0, dist)) {
       this.newChaseDir(ent, goalTarget, dist);
       return true;
     }
@@ -207,7 +207,7 @@ export class ServerMovement {
     const entity = edict.entity!;
     const angle1 = entity.angles[1];
     const current = Vector.anglemod(angle1);
-    const ideal = entity.ideal_yaw;
+    const ideal = entity.ideal_yaw || 0;
 
     if (current === ideal) {
       return angle1;
@@ -257,7 +257,7 @@ export class ServerMovement {
 
   newChaseDir(actor: ServerEdict, endpos: Vector, dist: number): void {
     const entity = actor.entity!;
-    const olddir = Vector.anglemod(((entity.ideal_yaw / 45.0) >> 0) * 45.0);
+    const olddir = Vector.anglemod((((entity.ideal_yaw || 0) / 45.0) >> 0) * 45.0);
     const turnaround = Vector.anglemod(olddir - 180.0);
     const deltax = endpos[0] - entity.origin[0];
     const deltay = endpos[1] - entity.origin[1];
diff --git a/source/engine/server/physics/ServerPhysics.ts b/source/engine/server/physics/ServerPhysics.ts
index 1555b495..5410657a 100644
--- a/source/engine/server/physics/ServerPhysics.ts
+++ b/source/engine/server/physics/ServerPhysics.ts
@@ -110,10 +110,10 @@ export class ServerPhysics {
         origin[index] = 0.0;
       }
 
-      if (component > SV.maxvelocity.value) {
-        component = SV.maxvelocity.value;
-      } else if (component < -SV.maxvelocity.value) {
-        component = -SV.maxvelocity.value;
+      if (component > SV.maxvelocity!.value) {
+        component = SV.maxvelocity!.value;
+      } else if (component < -SV.maxvelocity!.value) {
+        component = -SV.maxvelocity!.value;
       }
 
       velo[index] = component;
@@ -131,7 +131,7 @@ export class ServerPhysics {
     const entity = ent.entity!;
 
     while (true) {
-      let thinktime = entity.nextthink;
+      let thinktime = entity.nextthink!;
 
       if (thinktime <= 0.0 || thinktime > (SV.server.time + Host.frametime)) {
         return true;
@@ -142,8 +142,9 @@ export class ServerPhysics {
       }
 
       entity.nextthink = 0.0;
-      SV.server.gameAPI.time = thinktime;
-      entity.think();
+      SV.server.gameAPI!.time = thinktime;
+      console.assert(entity.think instanceof Function, 'runThink: entity.think must be a function');
+      entity.think!();
 
       if (ent.isFree()) {
         return false;
@@ -155,7 +156,7 @@ export class ServerPhysics {
    * Invokes touch callbacks between two entities.
    */
   impact(e1: ServerEdict, e2: ServerEdict, pushVector: Vector): void {
-    SV.server.gameAPI.time = SV.server.time;
+    SV.server.gameAPI!.time = SV.server.time;
 
     const ent1 = e1.entity!;
     const ent2 = e2.entity!;
@@ -302,7 +303,7 @@ export class ServerPhysics {
     const entity = ent.entity!;
     const entGravity = typeof entity.gravity === 'number' ? entity.gravity : 1.0;
     const velocity = entity.velocity;
-    velocity[2] += entGravity * SV.gravity.value * Host.frametime * -1.0;
+    velocity[2] += entGravity * SV.gravity!.value * Host.frametime * -1.0;
     entity.velocity = velocity;
   }
 
@@ -311,7 +312,7 @@ export class ServerPhysics {
    */
   addBuoyancy(ent: ServerEdict): void {
     const velocity = ent.entity!.velocity;
-    velocity[2] += SV.gravity.value * Host.frametime * 0.01;
+    velocity[2] += SV.gravity!.value * Host.frametime * 0.01;
     ent.entity!.velocity = velocity;
   }
 
@@ -356,8 +357,12 @@ export class ServerPhysics {
   pushMove(pusher: ServerEdict, movetime: number): void {
     const pusherEntity = pusher.entity!;
 
+    console.assert(pusherEntity !== null, 'pushMove: pusherEntity must not be null');
+    console.assert(pusherEntity.ltime !== undefined, 'pushMove: pusherEntity.ltime must be defined');
+    console.assert(typeof (pusherEntity.ltime) === 'number' && !Number.isNaN(pusherEntity.ltime), 'pushMove: pusherEntity.ltime must be a number');
+
     if (pusherEntity.velocity.isOrigin() && pusherEntity.avelocity.isOrigin()) {
-      pusherEntity.ltime += movetime;
+      pusherEntity.ltime! += movetime;
       return;
     }
 
@@ -372,7 +377,7 @@ export class ServerPhysics {
     pusherEntity.origin = pusherEntity.origin.copy().add(move);
     pusherEntity.angles = pusherEntity.angles.copy().add(rotation);
     const finalbasis = pusherEntity.angles.isOrigin() ? null : pusherEntity.angles.toRotationMatrix();
-    pusherEntity.ltime += movetime;
+    pusherEntity.ltime! += movetime;
     SV.area.linkEdict(pusher);
 
     const moved: MovedEntityState[] = [];
@@ -460,7 +465,7 @@ export class ServerPhysics {
         pusherEntity.origin = pusherEntity.origin.set(pushorig);
         pusherEntity.angles = pusherEntity.angles.set(pushangles);
         SV.area.linkEdict(pusher);
-        pusherEntity.ltime -= movetime;
+        pusherEntity.ltime! -= movetime;
         if (pusherEntity.blocked) {
           pusherEntity.blocked(checkEntity);
         }
@@ -479,8 +484,8 @@ export class ServerPhysics {
    */
   physicsPusher(ent: ServerEdict): void {
     const entity = ent.entity!;
-    const oldltime = entity.ltime;
-    const thinktime = entity.nextthink;
+    const oldltime = entity.ltime!;
+    const thinktime = entity.nextthink!;
     let movetime: number;
 
     if (thinktime > 0.0 && thinktime < (oldltime + Host.frametime)) {
@@ -493,13 +498,15 @@ export class ServerPhysics {
       this.pushMove(ent, movetime);
     }
 
-    if (thinktime <= oldltime || thinktime > entity.ltime) {
+    if (thinktime <= oldltime || thinktime > entity.ltime!) {
       return;
     }
 
     entity.nextthink = 0.0;
-    SV.server.gameAPI.time = SV.server.time;
-    entity.think();
+    SV.server.gameAPI!.time = SV.server.time;
+
+    console.assert(entity.think instanceof Function, 'physicsPusher: entity.think must be a function');
+    entity.think!();
   }
 
   /**
@@ -509,11 +516,11 @@ export class ServerPhysics {
     const entity = ent.entity!;
 
     if (!SV.collision.testEntityPosition(ent)) {
-      entity.oldorigin = entity.oldorigin.set(entity.origin);
+      entity.oldorigin = entity.oldorigin!.set(entity.origin);
       return;
     }
 
-    entity.origin = entity.origin.set(entity.oldorigin);
+    entity.origin = entity.origin.set(entity.oldorigin!);
     if (!SV.collision.testEntityPosition(ent)) {
       Con.DPrint('Unstuck.\n');
       SV.area.linkEdict(ent, true);
@@ -595,7 +602,7 @@ export class ServerPhysics {
     }
 
     entity.watertype = Defs.content.CONTENT_EMPTY;
-    entity.waterlevel = cont; // CR: I’m not sure whether this is correct or should be e.g. WATERLEVEL_NONE
+    entity.waterlevel = Defs.waterlevel.WATERLEVEL_NONE; // FIXME: double check if this is correct, used to be `cont` before
   }
 
   /**
@@ -707,7 +714,7 @@ export class ServerPhysics {
   physicsStep(ent: ServerEdict): void {
     const entity = ent.entity!;
     if ((entity.flags & (Defs.flags.FL_ONGROUND | Defs.flags.FL_FLY | Defs.flags.FL_SWIM)) === 0) {
-      const hitsound = entity.velocity[2] < (SV.gravity.value * -VELOCITY_EPSILON);
+      const hitsound = entity.velocity[2] < (SV.gravity!.value * -VELOCITY_EPSILON);
       this.addGravity(ent);
       this.checkVelocity(ent);
       this.flyMove(ent, Host.frametime);
@@ -724,8 +731,9 @@ export class ServerPhysics {
    * Runs the main entity physics step for the server.
    */
   physics(): void {
-    SV.server.gameAPI.time = SV.server.time;
-    SV.server.gameAPI.startFrame();
+    console.assert(SV.server.gameAPI !== null, 'physics: gameAPI must not be null');
+    SV.server.gameAPI!.time = SV.server.time;
+    SV.server.gameAPI!.startFrame();
 
     for (let index = 0; index < SV.server.num_edicts; index++) {
       const ent = SV.server.edicts[index];
@@ -734,7 +742,7 @@ export class ServerPhysics {
       }
       // force_retouch: relink ALL entities so stationary objects re-check
       // trigger contacts (e.g. telefrag triggers).
-      if (SV.server.gameAPI.force_retouch) {
+      if (SV.server.gameAPI!.force_retouch) {
         SV.area.linkEdict(ent, true);
       }
       if (ent.isClient()) {
@@ -765,8 +773,8 @@ export class ServerPhysics {
       }
     }
 
-    if (SV.server.gameAPI.force_retouch) {
-      SV.server.gameAPI.force_retouch--;
+    if (SV.server.gameAPI!.force_retouch) {
+      SV.server.gameAPI!.force_retouch--;
     }
 
     SV.server.time += Host.frametime;
diff --git a/source/shared/Defs.ts b/source/shared/Defs.ts
index 83df1ac2..83a4084a 100644
--- a/source/shared/Defs.ts
+++ b/source/shared/Defs.ts
@@ -92,7 +92,7 @@ export enum damage {
 /**
  * Collision trace move types.
  */
-export enum moveTypes {
+export enum moveTypes { // TODO: unfortunate name, need to rename this to avoid confusion with edict.movetype
   /** normal trace */
   MOVE_NORMAL = 0,
   /** don't clip against monsters */
@@ -176,6 +176,7 @@ export const hull = Object.freeze([
  */
 export enum content {
   // for convenience:
+  /** uninitialized content, should never show up */
   CONTENT_NONE = 0,
 
   // for game play:
diff --git a/source/shared/Keys.ts b/source/shared/Keys.ts
index 27438193..b213fbe0 100644
--- a/source/shared/Keys.ts
+++ b/source/shared/Keys.ts
@@ -5,6 +5,10 @@ export enum K {
   ESCAPE = 27,
   SPACE = 32,
 
+  // TODO: 96
+  // TODO: 110
+  // TODO: 121
+
   BACKSPACE = 127,
   UPARROW = 128,
   DOWNARROW = 129,
diff --git a/source/shared/Vector.ts b/source/shared/Vector.ts
index c8c085f3..a94aebc1 100644
--- a/source/shared/Vector.ts
+++ b/source/shared/Vector.ts
@@ -75,7 +75,7 @@ export class Quaternion extends Array<number> {
   /**
    * Freezes this Quaternion.
    */
-  freeze(): Quaternion {
+  freeze(): this {
     Object.freeze(this);
     return this;
   }
@@ -84,7 +84,7 @@ export class Quaternion extends Array<number> {
    * Quake-style string representation of a Quaternion.
    */
   override toString(): string {
-    return `${this.map((element) => element.toFixed(1)).join(' ')}`;
+    return this.map((element) => element.toFixed(1)).join(' ');
   }
 }
 
@@ -647,6 +647,6 @@ export default class Vector extends Float32Array {
    * Quake-style string representation of a Vector.
    */
   override toString(): string {
-    return `${this.map((element) => +element.toFixed(1)).join(' ')}`;
+    return this.map((element) => +element.toFixed(1)).join(' ');
   }
 }
diff --git a/test/client/key.test.mjs b/test/client/key.test.mjs
index cff2d837..ba974676 100644
--- a/test/client/key.test.mjs
+++ b/test/client/key.test.mjs
@@ -2,29 +2,107 @@ import assert from 'node:assert/strict';
 import { describe, test } from 'node:test';
 
 import { K } from '../../source/shared/Keys.ts';
-import Key from '../../source/engine/client/Key.ts';
+import Key, { KeyDestination } from '../../source/engine/client/Key.ts';
 
 void describe('Key', () => {
-  void test('StringToKeynum resolves named and printable keys', () => {
-    assert.equal(Key.StringToKeynum('ENTER'), K.ENTER);
-    assert.equal(Key.StringToKeynum('a'), 97);
-    assert.equal(Key.StringToKeynum('not-a-key'), null);
+  void describe('StringToKeynum', () => {
+    void test('resolves named special keys', () => {
+      assert.equal(Key.StringToKeynum('ENTER'), K.ENTER);
+      assert.equal(Key.StringToKeynum('ESCAPE'), K.ESCAPE);
+      assert.equal(Key.StringToKeynum('SPACE'), K.SPACE);
+      assert.equal(Key.StringToKeynum('SEMICOLON'), ';'.charCodeAt(0));
+    });
+
+    void test('resolves single printable characters by char code', () => {
+      assert.equal(Key.StringToKeynum('a'), 97);
+      assert.equal(Key.StringToKeynum('Z'), 90);
+    });
+
+    void test('is case-insensitive for named keys', () => {
+      assert.equal(Key.StringToKeynum('enter'), K.ENTER);
+      assert.equal(Key.StringToKeynum('Escape'), K.ESCAPE);
+    });
+
+    void test('returns null for unknown names', () => {
+      assert.equal(Key.StringToKeynum('not-a-key'), null);
+      assert.equal(Key.StringToKeynum('BOGUS'), null);
+    });
+  });
+
+  void describe('KeynumToString', () => {
+    void test('returns printable character for ASCII range', () => {
+      assert.equal(Key.KeynumToString(97), 'a');
+      assert.equal(Key.KeynumToString(65), 'A');
+    });
+
+    void test('returns canonical name for special keys', () => {
+      assert.equal(Key.KeynumToString(K.ENTER), 'ENTER');
+      assert.equal(Key.KeynumToString(K.ESCAPE), 'ESCAPE');
+    });
+
+    void test('returns marker for unrecognized key codes', () => {
+      assert.equal(Key.KeynumToString(999), '<UNKNOWN KEYNUM>');
+    });
+  });
+
+  void describe('WriteBindings', () => {
+    void test('serializes active bindings with readable key names', () => {
+      const previousBindings = [...Key.bindings];
+
+      try {
+        Key.bindings = [];
+        Key.bindings[K.ENTER] = '+jump';
+        Key.bindings[97] = 'say hello';
+
+        assert.equal(
+          Key.WriteBindings(),
+          'bind "ENTER" "+jump"\nbind "a" "say hello"',
+        );
+      } finally {
+        Key.bindings = previousBindings;
+      }
+    });
+
+    void test('skips null and undefined slots', () => {
+      const previousBindings = [...Key.bindings];
+      try {
+        Key.bindings = [];
+        Key.bindings[10] = null;
+        Key.bindings[97] = 'test';
+        assert.equal(Key.WriteBindings(), 'bind "a" "test"');
+      } finally {
+        Key.bindings = previousBindings;
+      }
+    });
   });
 
-  void test('WriteBindings serializes active bindings with readable key names', () => {
-    const previousBindings = [...Key.bindings];
-
-    try {
-      Key.bindings = [];
-      Key.bindings[K.ENTER] = '+jump';
-      Key.bindings[97] = 'say hello';
-
-      assert.equal(
-        Key.WriteBindings(),
-        'bind "ENTER" "+jump"\nbind "a" "say hello"',
-      );
-    } finally {
-      Key.bindings = previousBindings;
-    }
+  void describe('BindingToString', () => {
+    void test('finds the first key bound to a command', () => {
+      const previousBindings = [...Key.bindings];
+      try {
+        Key.bindings = [];
+        Key.bindings[K.ENTER] = '+jump';
+        assert.equal(Key.BindingToString('+jump'), 'ENTER');
+      } finally {
+        Key.bindings = previousBindings;
+      }
+    });
+
+    void test('returns null when no key is bound to the command', () => {
+      assert.equal(Key.BindingToString('nonexistent_command'), null);
+    });
+  });
+
+  void describe('KeyDestination', () => {
+    void test('enum values match expected constants', () => {
+      assert.equal(KeyDestination.game, 0);
+      assert.equal(KeyDestination.console, 1);
+      assert.equal(KeyDestination.message, 2);
+      assert.equal(KeyDestination.menu, 3);
+    });
+
+    void test('destination defaults to console', () => {
+      assert.equal(Key.destination, KeyDestination.console);
+    });
   });
 });
diff --git a/test/common/model-cache.test.mjs b/test/common/model-cache.test.mjs
index 1b1747ff..e7822e41 100644
--- a/test/common/model-cache.test.mjs
+++ b/test/common/model-cache.test.mjs
@@ -1,7 +1,7 @@
 import assert from 'node:assert/strict';
 import { describe, test } from 'node:test';
 
-import Mod from '../../source/engine/common/Mod.ts';
+import Mod, { ModelScope } from '../../source/engine/common/Mod.ts';
 import { AliasModel } from '../../source/engine/common/model/AliasModel.ts';
 import { Face } from '../../source/engine/common/model/BaseModel.ts';
 import { BrushModel, Node } from '../../source/engine/common/model/BSP.ts';
@@ -60,7 +60,7 @@ async function withModelRegistry(callback) {
     const previousMod = previousRegistry.Mod;
     const previousIsDedicatedServer = previousRegistry.isDedicatedServer;
 
-    Mod.ClearAll(Mod.scope.shared);
+    Mod.ClearAll(ModelScope.shared);
 
     for (const name of Object.keys(Mod.known)) {
       delete Mod.known[name];
@@ -185,13 +185,13 @@ void describe('Mod scoped model cache', () => {
     await withModelRegistry(async () => {
       const { worldModel, submodel } = createSharedBrushModels();
 
-      const serverWorld = asBrushModel(await Mod.ForNameAsync(worldModel.name, true, Mod.scope.server));
-      const clientWorld = asBrushModel(await Mod.ForNameAsync(worldModel.name, true, Mod.scope.client));
-      const sharedWorld = asBrushModel(await Mod.ForNameAsync(worldModel.name, true, Mod.scope.shared));
+      const serverWorld = asBrushModel(await Mod.ForNameAsync(worldModel.name, true, ModelScope.server));
+      const clientWorld = asBrushModel(await Mod.ForNameAsync(worldModel.name, true, ModelScope.client));
+      const sharedWorld = asBrushModel(await Mod.ForNameAsync(worldModel.name, true, ModelScope.shared));
 
-      const serverSubmodel = asBrushModel(Mod.ForName('*1', Mod.scope.server));
-      const clientSubmodel = asBrushModel(Mod.ForName('*1', Mod.scope.client));
-      const sharedSubmodel = asBrushModel(Mod.ForName('*1', Mod.scope.shared));
+      const serverSubmodel = asBrushModel(Mod.ForName('*1', ModelScope.server));
+      const clientSubmodel = asBrushModel(Mod.ForName('*1', ModelScope.client));
+      const sharedSubmodel = asBrushModel(Mod.ForName('*1', ModelScope.shared));
 
       assert.equal(sharedWorld, worldModel);
       assert.equal(sharedSubmodel, null);
@@ -211,16 +211,16 @@ void describe('Mod scoped model cache', () => {
       assert.equal(clientSubmodel.edges.length > 0, true);
       assert.equal(clientSubmodel.surfedges.length > 0, true);
 
-      Mod.ClearAll(Mod.scope.server);
+      Mod.ClearAll(ModelScope.server);
 
-      const refreshedServerSubmodel = asBrushModel(Mod.ForName('*1', Mod.scope.server));
+      const refreshedServerSubmodel = asBrushModel(Mod.ForName('*1', ModelScope.server));
       assert.equal(refreshedServerSubmodel, null);
-      assert.equal(Mod.ForName('*1', Mod.scope.client), clientSubmodel);
-      assert.equal(Mod.ForName('*1', Mod.scope.shared), null);
+      assert.equal(Mod.ForName('*1', ModelScope.client), clientSubmodel);
+      assert.equal(Mod.ForName('*1', ModelScope.shared), null);
 
-      Mod.ClearAll(Mod.scope.client);
+      Mod.ClearAll(ModelScope.client);
 
-      const refreshedClientSubmodel = asBrushModel(Mod.ForName('*1', Mod.scope.client));
+      const refreshedClientSubmodel = asBrushModel(Mod.ForName('*1', ModelScope.client));
       assert.equal(refreshedClientSubmodel, null);
     });
   });
@@ -230,11 +230,11 @@ void describe('Mod scoped model cache', () => {
       const { worldModel: serverWorldShared } = createSharedBrushModelsForWorld('maps/server-test.bsp', 64);
       const { worldModel: clientWorldShared } = createSharedBrushModelsForWorld('maps/client-test.bsp', 256);
 
-      const serverWorld = asBrushModel(await Mod.ForNameAsync(serverWorldShared.name, true, Mod.scope.server));
-      const clientWorld = asBrushModel(await Mod.ForNameAsync(clientWorldShared.name, true, Mod.scope.client));
+      const serverWorld = asBrushModel(await Mod.ForNameAsync(serverWorldShared.name, true, ModelScope.server));
+      const clientWorld = asBrushModel(await Mod.ForNameAsync(clientWorldShared.name, true, ModelScope.client));
 
-      const serverSubmodel = asBrushModel(Mod.ForName('*1', Mod.scope.server));
-      const clientSubmodel = asBrushModel(Mod.ForName('*1', Mod.scope.client));
+      const serverSubmodel = asBrushModel(Mod.ForName('*1', ModelScope.server));
+      const clientSubmodel = asBrushModel(Mod.ForName('*1', ModelScope.client));
 
       assert.equal(serverSubmodel.vertexes, serverWorld.vertexes);
       assert.equal(clientSubmodel.vertexes, clientWorld.vertexes);
@@ -248,19 +248,19 @@ void describe('Mod scoped model cache', () => {
     await withModelRegistry(async () => {
       const sharedAliasModel = createSharedAliasModel();
 
-      const clientAliasModel = asAliasModel(await Mod.ForNameAsync(sharedAliasModel.name, true, Mod.scope.client));
-      const serverAliasModel = asAliasModel(await Mod.ForNameAsync(sharedAliasModel.name, true, Mod.scope.server));
+      const clientAliasModel = asAliasModel(await Mod.ForNameAsync(sharedAliasModel.name, true, ModelScope.client));
+      const serverAliasModel = asAliasModel(await Mod.ForNameAsync(sharedAliasModel.name, true, ModelScope.server));
 
       assert.notEqual(clientAliasModel, sharedAliasModel);
       assert.notEqual(serverAliasModel, sharedAliasModel);
       assert.equal(clientAliasModel.cmds, sharedAliasModel.cmds);
       assert.equal(serverAliasModel.cmds, sharedAliasModel.cmds);
 
-      Mod.ClearAll(Mod.scope.client);
+      Mod.ClearAll(ModelScope.client);
 
       assert.equal(sharedAliasModel.cmds !== null, true);
 
-      const refreshedClientAliasModel = asAliasModel(await Mod.ForNameAsync(sharedAliasModel.name, true, Mod.scope.client));
+      const refreshedClientAliasModel = asAliasModel(await Mod.ForNameAsync(sharedAliasModel.name, true, ModelScope.client));
       assert.equal(refreshedClientAliasModel.cmds, sharedAliasModel.cmds);
     });
   });
@@ -269,9 +269,9 @@ void describe('Mod scoped model cache', () => {
     await withModelRegistry(async () => {
       const { worldModel } = createSharedBrushModels();
 
-      const clientWorld = asBrushModel(await Mod.ForNameAsync(worldModel.name, true, Mod.scope.client));
-      const serverWorld = asBrushModel(await Mod.ForNameAsync(worldModel.name, true, Mod.scope.server));
-      const sharedWorld = asBrushModel(await Mod.ForNameAsync(worldModel.name, true, Mod.scope.shared));
+      const clientWorld = asBrushModel(await Mod.ForNameAsync(worldModel.name, true, ModelScope.client));
+      const serverWorld = asBrushModel(await Mod.ForNameAsync(worldModel.name, true, ModelScope.server));
+      const sharedWorld = asBrushModel(await Mod.ForNameAsync(worldModel.name, true, ModelScope.shared));
 
       assert.equal(clientWorld.nodes[0], sharedWorld.nodes[0]);
       assert.equal(clientWorld.leafs[0], sharedWorld.leafs[0]);
@@ -292,9 +292,9 @@ void describe('Mod scoped model cache', () => {
       assert.equal(sharedWorld.leafs[0].waterchain, 3);
       assert.equal(sharedWorld.leafs[0].mins[0], -128);
 
-      Mod.ClearAll(Mod.scope.client);
+      Mod.ClearAll(ModelScope.client);
 
-      const refreshedClientWorld = asBrushModel(await Mod.ForNameAsync(worldModel.name, true, Mod.scope.client));
+      const refreshedClientWorld = asBrushModel(await Mod.ForNameAsync(worldModel.name, true, ModelScope.client));
 
       assert.notEqual(refreshedClientWorld, clientWorld);
       assert.equal(refreshedClientWorld.nodes[0], clientWorld.nodes[0]);
@@ -322,10 +322,10 @@ void describe('Mod scoped model cache', () => {
       const { worldModel } = createSharedBrushModels();
       const sharedAliasModel = createSharedAliasModel();
 
-      const clientWorld = asBrushModel(await Mod.ForNameAsync(worldModel.name, true, Mod.scope.client));
-      const serverWorld = asBrushModel(await Mod.ForNameAsync(worldModel.name, true, Mod.scope.server));
-      const clientAliasModel = asAliasModel(await Mod.ForNameAsync(sharedAliasModel.name, true, Mod.scope.client));
-      const serverAliasModel = asAliasModel(await Mod.ForNameAsync(sharedAliasModel.name, true, Mod.scope.server));
+      const clientWorld = asBrushModel(await Mod.ForNameAsync(worldModel.name, true, ModelScope.client));
+      const serverWorld = asBrushModel(await Mod.ForNameAsync(worldModel.name, true, ModelScope.server));
+      const clientAliasModel = asAliasModel(await Mod.ForNameAsync(sharedAliasModel.name, true, ModelScope.client));
+      const serverAliasModel = asAliasModel(await Mod.ForNameAsync(sharedAliasModel.name, true, ModelScope.server));
 
       assert.equal(clientWorld !== null, true);
       assert.equal(serverWorld !== null, true);
@@ -335,16 +335,16 @@ void describe('Mod scoped model cache', () => {
       assert.equal(Object.keys(Mod.clientKnown).length > 0, true);
       assert.equal(Object.keys(Mod.serverKnown).length > 0, true);
 
-      Mod.ClearAll(Mod.scope.shared);
+      Mod.ClearAll(ModelScope.shared);
 
       assert.deepEqual(Object.keys(Mod.known), []);
       assert.deepEqual(Object.keys(Mod.clientKnown), []);
       assert.deepEqual(Object.keys(Mod.serverKnown), []);
-      assert.equal(Mod.ResolveScopedModel(worldModel.name, Mod.scope.shared), null);
-      assert.equal(Mod.ForName('*1', Mod.scope.client), null);
-      assert.equal(Mod.ForName('*1', Mod.scope.server), null);
-      assert.equal(Mod.ResolveScopedModel(sharedAliasModel.name, Mod.scope.client), null);
-      assert.equal(Mod.ResolveScopedModel(sharedAliasModel.name, Mod.scope.server), null);
+      assert.equal(Mod.ResolveScopedModel(worldModel.name, ModelScope.shared), null);
+      assert.equal(Mod.ForName('*1', ModelScope.client), null);
+      assert.equal(Mod.ForName('*1', ModelScope.server), null);
+      assert.equal(Mod.ResolveScopedModel(sharedAliasModel.name, ModelScope.client), null);
+      assert.equal(Mod.ResolveScopedModel(sharedAliasModel.name, ModelScope.server), null);
     });
   });
 });
diff --git a/test/physics/server-physics.test.mjs b/test/physics/server-physics.test.mjs
index db27d4a8..37ce719e 100644
--- a/test/physics/server-physics.test.mjs
+++ b/test/physics/server-physics.test.mjs
@@ -2,7 +2,7 @@ import { describe, test } from 'node:test';
 import assert from 'node:assert/strict';
 
 import Vector from '../../source/shared/Vector.ts';
-import { content, flags, gameCapabilities, moveType, moveTypes, solid } from '../../source/shared/Defs.ts';
+import { content, flags, gameCapabilities, moveType, moveTypes, solid, waterlevel } from '../../source/shared/Defs.ts';
 import { eventBus, registry } from '../../source/engine/registry.ts';
 import { ServerArea } from '../../source/engine/server/physics/ServerArea.ts';
 import { ServerCollision } from '../../source/engine/server/physics/ServerCollision.ts';
@@ -1406,7 +1406,7 @@ void describe('ServerPhysics', () => {
       assert.equal(startSoundCalls[0][0], edict);
       assert.equal(startSoundCalls[0][2], 'misc/h2ohit1.wav');
       assert.equal(entity.watertype, content.CONTENT_EMPTY);
-      assert.equal(entity.waterlevel, content.CONTENT_EMPTY);
+      assert.equal(entity.waterlevel, waterlevel.WATERLEVEL_NONE);
     });
   });
 
diff --git a/test/renderer/brush-model-renderer.test.mjs b/test/renderer/brush-model-renderer.test.mjs
index 98fceeba..3193e5b4 100644
--- a/test/renderer/brush-model-renderer.test.mjs
+++ b/test/renderer/brush-model-renderer.test.mjs
@@ -100,7 +100,7 @@ void describe('BrushModelRenderer.resolveEntityLightingState', () => {
 
   void test('falls back to non-deluxemap lighting when the model has no deluxe data', () => {
     const lightingState = BrushModelRenderer.resolveEntityLightingState(
-      /** @type {import('../../source/engine/common/model/BSP.ts').BrushModel} */ ({ deluxemap: null, lightdata: null, lightdata_rgb: null }),
+      /** @type {import('../../source/engine/common/model/BSP.ts').BrushModel} */ ({ deluxemap: null, lightdata: null, lightdata_rgb: null, submodel: false }),
       /** @type {import('../../source/engine/client/ClientEntities.ts').ClientEdict} */ ({}),
       () => [new Vector(), new Vector(), new Vector(), new Vector(), new Vector()],
     );
diff --git a/tsconfig.json b/tsconfig.json
index f16999f2..76a2c435 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -5,6 +5,8 @@
     "moduleResolution": "bundler",
     "lib": ["ESNext", "DOM", "DOM.Iterable"],
     "types": ["node"],
+    "strict": true,
+    "strictNullChecks": true,
     "allowJs": true,
     "checkJs": true,
     "noEmit": true,
@@ -46,11 +48,11 @@
     "./source/cloudflare/**/*.mts",
     "./source/cloudflare/**/*.cts",
     "./source/cloudflare/**/*.d.ts",
-    "./test/**/*.mjs",
-    "./test/**/*.cjs",
-    "./test/**/*.ts",
-    "./test/**/*.mts",
-    "./test/**/*.cts",
+    // "./test/**/*.mjs",
+    // "./test/**/*.cjs",
+    // "./test/**/*.ts",
+    // "./test/**/*.mts",
+    // "./test/**/*.cts",
     "./*.mjs",
     "./*.cjs",
     "./*.ts",

From 1ff1a7d306795c219811695d3062499a0b9bddcc Mon Sep 17 00:00:00 2001
From: Christian R <github@chrisnew.de>
Date: Mon, 6 Apr 2026 15:58:09 +0300
Subject: [PATCH 60/67] simplifying code and more cleaning up TS porting
 residue

---
 .../client/ClientServerCommandHandlers.ts     |   4 +-
 source/engine/client/LegacyServerCommands.ts  |  13 +-
 source/engine/client/Menu.ts                  |   3 +-
 source/engine/client/Tools.ts                 |   4 +-
 source/engine/common/Console.ts               |   2 +
 source/engine/common/GameAPIs.ts              |   1 +
 source/engine/common/Pmove.ts                 |  18 +--
 source/engine/common/model/BSP.ts             |   3 +-
 .../common/model/loaders/AliasMDLLoader.ts    |  15 +-
 .../common/model/loaders/BSP29Loader.ts       |  14 +-
 .../engine/common/model/loaders/BSP2Loader.ts |   6 +-
 .../common/model/loaders/SpriteSPRLoader.ts   |   7 +-
 source/engine/server/Edict.ts                 |  47 +++---
 source/engine/server/Navigation.ts            |  28 ++--
 source/engine/server/NavigationWorker.ts      |   3 +-
 source/engine/server/Server.ts                |  69 +++-----
 .../server/physics/ServerClientPhysics.ts     |   3 +-
 source/engine/server/physics/ServerPhysics.ts |   3 +-
 source/game/id1                               |   2 +-
 test/common/id1-dog.test.mjs                  | 138 ++++++++++++++++
 test/common/id1-game-api.test.mjs             | 106 +++++++++++++
 test/common/id1-knights.test.mjs              | 111 +++++++++++++
 test/common/id1-soldier.test.mjs              | 148 ++++++++++++++++++
 23 files changed, 610 insertions(+), 138 deletions(-)
 create mode 100644 test/common/id1-dog.test.mjs
 create mode 100644 test/common/id1-game-api.test.mjs
 create mode 100644 test/common/id1-knights.test.mjs
 create mode 100644 test/common/id1-soldier.test.mjs

diff --git a/source/engine/client/ClientServerCommandHandlers.ts b/source/engine/client/ClientServerCommandHandlers.ts
index eb60737c..b00a85a5 100644
--- a/source/engine/client/ClientServerCommandHandlers.ts
+++ b/source/engine/client/ClientServerCommandHandlers.ts
@@ -494,9 +494,9 @@ function parseTemporaryEntity() {
       }
     }
       return;
+    default:
+      throw new Error(`CL.ParseTEnt: bad type ${type}`);
   }
-
-  throw new Error(`CL.ParseTEnt: bad type ${type}`);
 }
 
 /**
diff --git a/source/engine/client/LegacyServerCommands.ts b/source/engine/client/LegacyServerCommands.ts
index 552861d4..399d26df 100644
--- a/source/engine/client/LegacyServerCommands.ts
+++ b/source/engine/client/LegacyServerCommands.ts
@@ -478,13 +478,13 @@ export function handleLegacyEntityUpdate(bits: number): void {
 
   // Origin / angle – interleaved per axis (WinQuake order)
   clent.msg_origins[0][0] = (bits & U.ORIGIN1) ? readLegacyCoord() : baseline.origin[0];
-  clent.msg_angles[0][0]  = (bits & U.ANGLE1)  ? readLegacyAngle() : baseline.angles[0];
+  clent.msg_angles[0][0] = (bits & U.ANGLE1) ? readLegacyAngle() : baseline.angles[0];
 
   clent.msg_origins[0][1] = (bits & U.ORIGIN2) ? readLegacyCoord() : baseline.origin[1];
-  clent.msg_angles[0][1]  = (bits & U.ANGLE2)  ? readLegacyAngle() : baseline.angles[1];
+  clent.msg_angles[0][1] = (bits & U.ANGLE2) ? readLegacyAngle() : baseline.angles[1];
 
   clent.msg_origins[0][2] = (bits & U.ORIGIN3) ? readLegacyCoord() : baseline.origin[2];
-  clent.msg_angles[0][2]  = (bits & U.ANGLE3)  ? readLegacyAngle() : baseline.angles[2];
+  clent.msg_angles[0][2] = (bits & U.ANGLE3) ? readLegacyAngle() : baseline.angles[2];
 
   // U_NOLERP: server explicitly says don’t interpolate (e.g. teleport)
   if (bits & U.NOLERP) {
@@ -715,7 +715,7 @@ function handleLegacyTempEntity() {
       if (sounds.explosion !== null) {
         S.StartSound(-1, 0, sounds.explosion, pos, 1.0, 1.0);
       }
-      }
+    }
       return;
     case Protocol.te.tarexplosion:
       R.BlobExplosion(pos);
@@ -741,11 +741,12 @@ function handleLegacyTempEntity() {
       if (sounds.explosion !== null) {
         S.StartSound(-1, 0, sounds.explosion, pos, 1.0, 1.0);
       }
-      }
       return;
+    }
+    default:
+      throw new Error(`CL.ParseTEnt: bad type ${type}`);
   }
 
-  throw new Error(`CL.ParseTEnt: bad type ${type}`);
 }
 
 // ── svc_spawnstaticsound (29) ───────────────────────────────────────────────
diff --git a/source/engine/client/Menu.ts b/source/engine/client/Menu.ts
index b8a9edf7..e50a7ab3 100644
--- a/source/engine/client/Menu.ts
+++ b/source/engine/client/Menu.ts
@@ -10,6 +10,7 @@ import { GLTexture } from './GL.ts';
 import { KeyDestination } from './Key.ts';
 import MultiplayerMainMenu from './menu/Multiplayer.ts';
 import VID from './VID.ts';
+import { MissingResourceError } from '../common/Errors.ts';
 
 let { CL, COM, Con, Draw, Host, Key, S, SCR, SV, V } = getClientRegistry();
 
@@ -1159,7 +1160,7 @@ export default class M {
     {
       const lmpfile = await COM.LoadFile('gfx/menuplyr.lmp');
       if (lmpfile === null) {
-        throw new Error('Failed to load gfx/menuplyr.lmp');
+        throw new MissingResourceError('gfx/menuplyr.lmp');
       }
 
       const view = new DataView(lmpfile, 0, 8);
diff --git a/source/engine/client/Tools.ts b/source/engine/client/Tools.ts
index 55596583..632b4479 100644
--- a/source/engine/client/Tools.ts
+++ b/source/engine/client/Tools.ts
@@ -1,4 +1,5 @@
 import Cmd, { ConsoleCommand } from '../common/Cmd.ts';
+import { MissingResourceError } from '../common/Errors.ts';
 import W, { WadFileInterface } from '../common/W.ts';
 import { eventBus, getCommonRegistry } from '../registry.ts';
 
@@ -26,6 +27,7 @@ function getErrorMessage(error: unknown): string {
  */
 function getRequiredLumpTexture(wad: WadFileInterface, entry: string) {
   const texture = wad.getLumpMipmap(entry, 0);
+
   if (texture === null) {
     throw new Error(`Could not decode wad entry ${entry}`);
   }
@@ -51,7 +53,7 @@ class GfxTool {
    */
   getWad(): WadFileInterface {
     if (this.wad === null) {
-      throw new Error(`Wad ${this.filename} was not loaded`);
+      throw new MissingResourceError(this.filename);
     }
 
     return this.wad;
diff --git a/source/engine/common/Console.ts b/source/engine/common/Console.ts
index bf7947db..d8dc0092 100644
--- a/source/engine/common/Console.ts
+++ b/source/engine/common/Console.ts
@@ -153,10 +153,12 @@ export default class Con {
   }
 
   static PrintWarning(msg: string) {
+    // TODO: make Con.Print make emit this as a console.warn
     Con.Print(msg, new Vector(1.0, 1.0, 0.3));
   }
 
   static PrintError(msg: string) {
+    // TODO: make Con.Print make emit this as a console.error
     Con.Print(msg, new Vector(1.0, 0.3, 0.3));
   }
 
diff --git a/source/engine/common/GameAPIs.ts b/source/engine/common/GameAPIs.ts
index 6d73336d..95f00a05 100644
--- a/source/engine/common/GameAPIs.ts
+++ b/source/engine/common/GameAPIs.ts
@@ -813,6 +813,7 @@ export class ServerEngineAPI extends CommonEngineAPI {
 
   /**
    * Return a series of waypoints from start to end.
+   * @deprecated use NavigateAsync instead
    * @returns The waypoints from start to end, or `null` when no path could be found.
    */
   static Navigate(start: Vector, end: Vector): Vector[] | null {
diff --git a/source/engine/common/Pmove.ts b/source/engine/common/Pmove.ts
index a9ff3ffe..e0282c6c 100644
--- a/source/engine/common/Pmove.ts
+++ b/source/engine/common/Pmove.ts
@@ -271,7 +271,7 @@ export class Hull { // hull_t
     newHull.clipMaxs = hull.clip_maxs.copy();
     newHull.firstClipNode = hull.firstclipnode!;
     newHull.lastClipNode = hull.lastclipnode!;
-    newHull.allowedClipNodes = null; // FIXME: missing allowed clip node masks in Q1 BSP format
+    newHull.allowedClipNodes = hull.allowedClipNodes?.slice() ?? null;
     newHull.clipNodes = hull.clipnodes.map((clipnode) => {
       const node = new ClipNode(clipnode.planenum);
       node.children[0] = clipnode.children[0];
@@ -1691,12 +1691,8 @@ export class PhysEnt { // physent_t
 
   /** Parent Pmove instance. */
   get _pmove(): Pmove {
-    const pmove = this.#pmoveRef.deref();
-
-    if (pmove === undefined) {
-      throw new Error('PhysEnt parent Pmove was released');
-    }
-
+    const pmove = this.#pmoveRef.deref()!;
+    console.assert(pmove !== undefined, 'physent parent Pmove was released');
     return pmove;
   }
 
@@ -2314,12 +2310,8 @@ export class PmovePlayer { // pmove_t (player state only)
 
   /** Parent Pmove instance. */
   get _pmove(): Pmove {
-    const pmove = this.#pmoveRef.deref();
-
-    if (pmove === undefined) {
-      throw new Error('PmovePlayer parent Pmove was released');
-    }
-
+    const pmove = this.#pmoveRef.deref()!;
+    console.assert(pmove !== undefined, 'PmovePlayer parent Pmove was released');
     return pmove;
   }
 
diff --git a/source/engine/common/model/BSP.ts b/source/engine/common/model/BSP.ts
index d0a645e9..847e0369 100644
--- a/source/engine/common/model/BSP.ts
+++ b/source/engine/common/model/BSP.ts
@@ -33,7 +33,8 @@ export interface Hull {
   /** Maximum bounding box for this hull. */
   readonly clip_maxs: Vector;
 
-  // TODO: allowedClipNodes?
+  /** Optional mask restricting traversal to the owning clipnode subtree. */
+  allowedClipNodes?: Uint8Array | null;
 }
 
 export type WorldspawnInfo = Record<string, string>;
diff --git a/source/engine/common/model/loaders/AliasMDLLoader.ts b/source/engine/common/model/loaders/AliasMDLLoader.ts
index 6aad55cd..88c9db97 100644
--- a/source/engine/common/model/loaders/AliasMDLLoader.ts
+++ b/source/engine/common/model/loaders/AliasMDLLoader.ts
@@ -7,6 +7,7 @@ import { ModelType } from '../../Mod.ts';
 import W, { translateIndexToLuminanceRGBA, translateIndexToRGBA } from '../../W.ts';
 import { AliasModel, type AliasFrame, type AliasSkin } from '../AliasModel.ts';
 import { ModelLoader } from '../ModelLoader.ts';
+import { CorruptedResourceError } from '../../Errors.ts';
 
 interface AliasSkinLayers {
   readonly diffuse: Uint8Array;
@@ -299,7 +300,7 @@ export class AliasMDLLoader extends ModelLoader {
     const version = view.getUint32(4, true);
 
     if (version !== 6) {
-      throw new Error(`${name} has wrong version number (${version} should be 6)`);
+      throw new CorruptedResourceError(name, `${name} has wrong version number (${version} should be 6)`);
     }
 
     // Read header
@@ -317,7 +318,7 @@ export class AliasMDLLoader extends ModelLoader {
     loadmodel._num_skins = view.getUint32(48, true);
 
     if (loadmodel._num_skins === 0) {
-      throw new Error(`model ${name} has no skins`);
+      throw new CorruptedResourceError(name, `model ${name} has no skins`);
     }
 
     loadmodel._skin_width = view.getUint32(52, true);
@@ -325,19 +326,19 @@ export class AliasMDLLoader extends ModelLoader {
     loadmodel._num_verts = view.getUint32(60, true);
 
     if (loadmodel._num_verts === 0) {
-      throw new Error(`model ${name} has no vertices`);
+      throw new CorruptedResourceError(name, `model ${name} has no vertices`);
     }
 
     loadmodel._num_tris = view.getUint32(64, true);
 
     if (loadmodel._num_tris === 0) {
-      throw new Error(`model ${name} has no triangles`);
+      throw new CorruptedResourceError(name, `model ${name} has no triangles`);
     }
 
     loadmodel._frames = view.getUint32(68, true);
 
     if (loadmodel._frames === 0) {
-      throw new Error(`model ${name} has no frames`);
+      throw new CorruptedResourceError(name, `model ${name} has no frames`);
     }
 
     loadmodel.random = view.getUint32(72, true) === 1;
@@ -517,7 +518,7 @@ export class AliasMDLLoader extends ModelLoader {
         for (let groupIndex = 0; groupIndex < numskins; groupIndex++) {
           group.skins[groupIndex] = { interval: view.getFloat32(inmodel, true) };
           if (group.skins[groupIndex].interval <= 0.0) {
-            throw new Error('AliasMDLLoader: skin interval <= 0');
+            throw new CorruptedResourceError(loadmodel.name, 'AliasMDLLoader: skin interval <= 0');
           }
           inmodel += 4;
         }
@@ -598,7 +599,7 @@ export class AliasMDLLoader extends ModelLoader {
             v: [],
           };
           if (group.frames[groupIndex].interval <= 0.0) {
-            throw new Error('AliasMDLLoader: frame interval <= 0');
+            throw new CorruptedResourceError(loadmodel.name, 'AliasMDLLoader: frame interval <= 0');
           }
           inmodel += 4;
         }
diff --git a/source/engine/common/model/loaders/BSP29Loader.ts b/source/engine/common/model/loaders/BSP29Loader.ts
index 1fbd56ea..994482bd 100644
--- a/source/engine/common/model/loaders/BSP29Loader.ts
+++ b/source/engine/common/model/loaders/BSP29Loader.ts
@@ -1560,7 +1560,7 @@ export class BSP29Loader extends ModelLoader {
     let fileofs = view.getUint32((lump.vertexes << 3) + 4, true);
     const filelen = view.getUint32((lump.vertexes << 3) + 8, true);
     if ((filelen % 12) !== 0) {
-      throw new Error(`BSP29Loader: vertexes lump size is not a multiple of 12 in ${loadmodel.name}`);
+      throw new CorruptedResourceError(loadmodel.name, 'BSP29Loader: vertexes lump size is not a multiple of 12');
     }
     const count = filelen / 12;
     loadmodel.vertexes.length = 0;
@@ -1620,7 +1620,7 @@ export class BSP29Loader extends ModelLoader {
     let fileofs = view.getUint32((lump.planes << 3) + 4, true);
     const filelen = view.getUint32((lump.planes << 3) + 8, true);
     if ((filelen % 20) !== 0) {
-      throw new Error(`BSP29Loader: planes lump size is not a multiple of 20 in ${loadmodel.name}`);
+      throw new CorruptedResourceError(loadmodel.name, 'BSP29Loader: planes lump size is not a multiple of 20');
     }
     const count = filelen / 20;
     loadmodel.planes.length = 0;
@@ -1651,7 +1651,7 @@ export class BSP29Loader extends ModelLoader {
     let fileofs = view.getUint32((lump.texinfo << 3) + 4, true);
     const filelen = view.getUint32((lump.texinfo << 3) + 8, true);
     if ((filelen % 40) !== 0) {
-      throw new Error(`BSP29Loader: texinfo lump size is not a multiple of 40 in ${loadmodel.name}`);
+      throw new CorruptedResourceError(loadmodel.name, 'BSP29Loader: texinfo lump size is not a multiple of 40');
     }
     const count = filelen / 40;
     loadmodel.texinfo.length = 0;
@@ -1785,7 +1785,7 @@ export class BSP29Loader extends ModelLoader {
     const filelen = view.getUint32((lump.nodes << 3) + 8, true);
 
     if ((filelen === 0) || ((filelen % 24) !== 0)) {
-      throw new Error(`BSP29Loader: nodes lump size is invalid in ${loadmodel.name}`);
+      throw new CorruptedResourceError(loadmodel.name, 'BSP29Loader: nodes lump size is invalid');
     }
 
     const count = filelen / 24;
@@ -1833,7 +1833,7 @@ export class BSP29Loader extends ModelLoader {
     let fileofs = view.getUint32((lump.leafs << 3) + 4, true);
     const filelen = view.getUint32((lump.leafs << 3) + 8, true);
     if ((filelen % 28) !== 0) {
-      throw new Error(`BSP29Loader: leafs lump size is not a multiple of 28 in ${loadmodel.name}`);
+      throw new CorruptedResourceError(loadmodel.name, 'BSP29Loader: leafs lump size is not a multiple of 28');
     }
     const count = filelen / 28;
     loadmodel.leafs.length = count;
@@ -1991,7 +1991,7 @@ export class BSP29Loader extends ModelLoader {
     for (let i = 0; i < count; i++) {
       const j = view.getUint16(fileofs + (i << 1), true);
       if (j > loadmodel.faces.length) {
-        throw new Error('BSP29Loader: bad surface number in marksurfaces');
+        throw new CorruptedResourceError(loadmodel.name, 'BSP29Loader: bad surface number in marksurfaces');
       }
       loadmodel.marksurfaces[i] = j;
     }
@@ -2008,7 +2008,7 @@ export class BSP29Loader extends ModelLoader {
     const filelen = view.getUint32((lump.models << 3) + 8, true);
     const count = filelen >> 6;
     if (count === 0) {
-      throw new Error(`BSP29Loader: no submodels in ${loadmodel.name}`);
+      throw new CorruptedResourceError(loadmodel.name, 'BSP29Loader: no submodels');
     }
     loadmodel.submodels.length = 0;
 
diff --git a/source/engine/common/model/loaders/BSP2Loader.ts b/source/engine/common/model/loaders/BSP2Loader.ts
index 8b30779c..b51ab323 100644
--- a/source/engine/common/model/loaders/BSP2Loader.ts
+++ b/source/engine/common/model/loaders/BSP2Loader.ts
@@ -134,7 +134,7 @@ export class BSP2Loader extends BSP29Loader {
     const filelen = view.getUint32((lump.nodes << 3) + 8, true);
 
     if ((filelen === 0) || ((filelen % 44) !== 0)) {
-      throw new Error(`BSP2Loader: nodes lump size is invalid in ${loadmodel.name}`);
+      throw new CorruptedResourceError(loadmodel.name, 'BSP2Loader: nodes lump size is invalid');
     }
 
     const count = filelen / 44;
@@ -192,7 +192,7 @@ export class BSP2Loader extends BSP29Loader {
     const filelen = view.getUint32((lump.leafs << 3) + 8, true);
 
     if ((filelen % 44) !== 0) {
-      throw new Error(`BSP2Loader: leafs lump size is not a multiple of 44 in ${loadmodel.name}`);
+      throw new CorruptedResourceError(loadmodel.name, 'BSP2Loader: leafs lump size is not a multiple of 44');
     }
 
     const count = filelen / 44;
@@ -257,7 +257,7 @@ export class BSP2Loader extends BSP29Loader {
     const filelen = view.getUint32((lump.clipnodes << 3) + 8, true);
 
     if ((filelen % 12) !== 0) {
-      throw new Error(`BSP2Loader: clipnodes lump size is not a multiple of 12 in ${loadmodel.name}`);
+      throw new CorruptedResourceError(loadmodel.name, 'BSP2Loader: clipnodes lump size is not a multiple of 12');
     }
 
     const count = filelen / 12;
diff --git a/source/engine/common/model/loaders/SpriteSPRLoader.ts b/source/engine/common/model/loaders/SpriteSPRLoader.ts
index cd557b3d..d87ef0a1 100644
--- a/source/engine/common/model/loaders/SpriteSPRLoader.ts
+++ b/source/engine/common/model/loaders/SpriteSPRLoader.ts
@@ -2,6 +2,7 @@ import Vector from '../../../../shared/Vector.ts';
 import { GLTexture } from '../../../client/GL.ts';
 import { registry } from '../../../registry.ts';
 import { CRC16CCITT } from '../../CRC.ts';
+import { CorruptedResourceError } from '../../Errors.ts';
 import W, { translateIndexToRGBA } from '../../W.ts';
 import { ModelLoader } from '../ModelLoader.ts';
 import { SpriteModel, type SpriteFrame } from '../SpriteModel.ts';
@@ -46,7 +47,7 @@ export class SpriteSPRLoader extends ModelLoader {
     const version = view.getUint32(4, true);
 
     if (version !== 1) {
-      throw new Error(`${name} has wrong version number (${version} should be 1)`);
+      throw new CorruptedResourceError(name, `${name} has wrong version number (${version} should be 1)`);
     }
 
     loadmodel.oriented = view.getUint32(8, true) === 3;
@@ -56,7 +57,7 @@ export class SpriteSPRLoader extends ModelLoader {
     loadmodel._frames = view.getUint32(24, true);
 
     if (loadmodel._frames === 0) {
-      throw new Error(`model ${name} has no frames`);
+      throw new CorruptedResourceError(name, `model ${name} has no frames`);
     }
 
     loadmodel.random = view.getUint32(32, true) === 1;
@@ -96,7 +97,7 @@ export class SpriteSPRLoader extends ModelLoader {
       for (let j = 0; j < numframes; j++) {
         group.frames[j] = { interval: view.getFloat32(inframe, true) } as MutableSpriteFrameImage;
         if ((group.frames[j].interval ?? 0) <= 0.0) {
-          throw new Error('SpriteSPRLoader: interval <= 0');
+          throw new CorruptedResourceError(name, 'SpriteSPRLoader: interval <= 0');
         }
         inframe += 4;
       }
diff --git a/source/engine/server/Edict.ts b/source/engine/server/Edict.ts
index 484f3a39..04b59280 100644
--- a/source/engine/server/Edict.ts
+++ b/source/engine/server/Edict.ts
@@ -14,6 +14,7 @@ import { eventBus, getClientRegistry, getCommonRegistry } from '../registry.ts';
 import Q from '../../shared/Q.ts';
 import { ConsoleCommand } from '../common/Cmd.ts';
 import { ModelType } from '../common/Mod.ts';
+import { CorruptedResourceError, HostError } from '../common/Errors.ts';
 
 export interface BaseEntity extends SerializableEntity {
   classname: string;
@@ -273,7 +274,7 @@ export class ED {
       }
 
       if (data === null) {
-        throw new Error('ED.ParseEdict: EOF without closing brace');
+        throw new CorruptedResourceError('<entities.txt>', 'ED.ParseEdict: EOF without closing brace');
       }
 
       if (parsedKey.token === 'angle') {
@@ -295,11 +296,11 @@ export class ED {
       data = parsedValue.data!;
 
       if (data === null) {
-        throw new Error('ED.ParseEdict: EOF without closing brace');
+        throw new CorruptedResourceError('<entities.txt>', 'ED.ParseEdict: EOF without closing brace');
       }
 
       if (parsedValue.token.charCodeAt(0) === 125) {
-        throw new Error('ED.ParseEdict: Closing brace without data');
+        throw new CorruptedResourceError('<entities.txt>', 'ED.ParseEdict: Closing brace without data');
       }
 
       if (keyname.startsWith('_')) {
@@ -340,7 +341,7 @@ export class ED {
       data = parsed.data;
 
       if (parsed.token !== '{') {
-        throw new Error(`ED.LoadFromFile: found ${parsed.token} when expecting {`);
+        throw new CorruptedResourceError('<entities.txt>', `ED.LoadFromFile: found ${parsed.token} when expecting {`);
       }
 
       const initialData: EdictData = {};
@@ -398,14 +399,6 @@ export class ServerEdict {
     this.entity = null;
   }
 
-  private _requireEntity(): BaseEntity {
-    if (this.entity === null) {
-      throw new Error(`Edict ${this.num} has no entity`);
-    }
-
-    return this.entity;
-  }
-
   /**
    * Clears the currently linked entity instance.
    */
@@ -453,7 +446,7 @@ export class ServerEdict {
       return `unused (${this.num})`;
     }
 
-    const entity = this._requireEntity();
+    const entity = this.entity!;
     return `Edict (${entity.classname}, num: ${this.num}, origin: ${entity.origin})`;
   }
 
@@ -476,11 +469,9 @@ export class ServerEdict {
    * Updates mins, maxs, and size for this entity.
    */
   setMinMaxSize(min: Vector, max: Vector): void {
-    if (min[0] > max[0] || min[1] > max[1] || min[2] > max[2]) {
-      throw new Error('Edict.setMinMaxSize: backwards mins/maxs');
-    }
+    console.assert(min[0] <= max[0] && min[1] <= max[1] && min[2] <= max[2], 'Edict.setMinMaxSize: backwards mins/maxs');
 
-    const entity = this._requireEntity();
+    const entity = this.entity!;
     entity.mins = min.copy();
     entity.maxs = max.copy();
     entity.size = max.copy().subtract(min);
@@ -491,7 +482,7 @@ export class ServerEdict {
    * Moves the entity to a new origin and relinks it.
    */
   setOrigin(vec: Vector): void {
-    this._requireEntity().origin = vec.copy();
+    this.entity!.origin = vec.copy();
     this.linkEdict(false);
   }
 
@@ -515,10 +506,10 @@ export class ServerEdict {
     }
 
     if (i === SV.server.modelPrecache.length) {
-      throw new Error(`Edict.setModel: ${model} not precached`);
+      throw new HostError(`Edict.setModel: ${model} not precached`);
     }
 
-    const entity = this._requireEntity();
+    const entity = this.entity!;
     entity.model = model;
     entity.modelindex = i;
 
@@ -556,7 +547,7 @@ export class ServerEdict {
    * @returns True when the drop succeeded.
    */
   dropToFloor(z = -2048.0): boolean {
-    const entity = this._requireEntity();
+    const entity = this.entity!;
     const end = entity.origin.copy().add(new Vector(0.0, 0.0, z));
     const trace = SV.collision.move(entity.origin, entity.mins, entity.maxs, end, 0, this);
 
@@ -582,7 +573,7 @@ export class ServerEdict {
    * Converts this edict into a static entity for client signon.
    */
   makeStatic(): void {
-    const entity = this._requireEntity();
+    const entity = this.entity!;
     const message = SV.server.signon;
     const modelIndex = SV.ModelIndex(entity.model)!;
     console.assert(modelIndex !== null, `Edict.makeStatic: model ${entity.model} not precached`);
@@ -637,7 +628,7 @@ export class ServerEdict {
           continue;
         }
 
-        const entity = ent._requireEntity();
+        const entity = ent.entity!;
 
         if (entity.health <= 0.0 || (entity.flags & Defs.flags.FL_NOTARGET) !== 0) {
           continue;
@@ -647,7 +638,7 @@ export class ServerEdict {
       }
 
       SV.server.lastcheck = i;
-      ServerEdict.#lastcheckpvs = SV.server.worldmodel!.getPvsByPoint(ent._requireEntity().origin.copy().add(ent._requireEntity().view_ofs));
+      ServerEdict.#lastcheckpvs = SV.server.worldmodel!.getPvsByPoint(ent.entity!.origin.copy().add(ent.entity!.view_ofs));
       SV.server.lastchecktime = SV.server.time;
     }
 
@@ -664,7 +655,7 @@ export class ServerEdict {
       return null;
     }
 
-    const leaf = SV.server.worldmodel!.getLeafForPoint(this._requireEntity().origin.copy().add(this._requireEntity().view_ofs)).num;
+    const leaf = SV.server.worldmodel!.getLeafForPoint(this.entity!.origin.copy().add(this.entity!.view_ofs)).num;
 
     if (leaf === 0 || !lastcheckpvs.isRevealed(leaf)) {
       return null;
@@ -694,7 +685,7 @@ export class ServerEdict {
    * @returns The resolved aim direction.
    */
   aim(direction: Vector): Vector {
-    const entity = this._requireEntity();
+    const entity = this.entity!;
     const dir = direction.copy();
     const origin = entity.origin.copy();
     const start = origin.add(new Vector(0.0, 0.0, 20.0));
@@ -753,7 +744,7 @@ export class ServerEdict {
     }
 
     if (bestent !== null) {
-      const bestEntity = bestent._requireEntity();
+      const bestEntity = bestent.entity!;
       dir.set(bestEntity.origin).subtract(entity.origin);
       const dist = dir.dot(bestdir);
       end[0] = bestdir[0] * dist;
@@ -787,7 +778,7 @@ export class ServerEdict {
    * @returns The new yaw angle.
    */
   changeYaw(): number {
-    const entity = this._requireEntity();
+    const entity = this.entity!;
     const angles = entity.angles;
     angles[1] = SV.movement.changeYaw(this);
     entity.angles = angles;
diff --git a/source/engine/server/Navigation.ts b/source/engine/server/Navigation.ts
index 08690906..e17310c1 100644
--- a/source/engine/server/Navigation.ts
+++ b/source/engine/server/Navigation.ts
@@ -289,7 +289,7 @@ class MinHeap {
   /**
    * Bubbles a node up until the heap invariant is restored.
    */
-    #bubbleUp(i: number): void {
+  #bubbleUp(i: number): void {
     const data = this.#data;
     const keys = this.#keys;
     const idx = this.#index;
@@ -313,7 +313,7 @@ class MinHeap {
   /**
    * Sinks a node down until the heap invariant is restored.
    */
-    #sinkDown(i: number): void {
+  #sinkDown(i: number): void {
     const data = this.#data;
     const keys = this.#keys;
     const idx = this.#index;
@@ -346,7 +346,7 @@ class MinHeap {
   }
 }
 
-export class NavMeshOutOfDateException extends CorruptedResourceError {}
+export class NavMeshOutOfDateException extends CorruptedResourceError { }
 
 // TODO: in future we could build graphs per entity type (e.g. monster navmesh with tighter clearances, flying monster navmesh that ignores ground support, etc.)
 
@@ -360,6 +360,7 @@ export class Navigation {
   static nav_debug_waypoints: Cvar | null = null;
   static nav_debug_graph: Cvar | null = null;
   static nav_debug_path: Cvar | null = null;
+  static nav_enabled: Cvar | null = null;
   /** unavailable outside of the dedicated server. */
   static nav_build_process: Cvar | null = null;
 
@@ -382,9 +383,6 @@ export class Navigation {
   /** worker thread handling navigation lookups. */
   #worker: PlatformWorker | null = null;
 
-  /** unsubscribe from nav.path.request. */
-  #pathRequestEventListener: EventUnsubscribe = null;
-
   /** unsubscribe from nav.path.response. */
   #pathResponseEventListener: EventUnsubscribe = null;
 
@@ -426,6 +424,7 @@ export class Navigation {
     this.nav_debug_graph = new Cvar('nav_debug_graph', '0', Cvar.FLAG.NONE, 'if set to 1, will render the navigation graph for debugging');
     this.nav_debug_waypoints = new Cvar('nav_debug_waypoints', '0', Cvar.FLAG.NONE, 'if set to 1, will render all waypoints for debugging');
     this.nav_debug_path = new Cvar('nav_debug_path', '0', Cvar.FLAG.NONE | Cvar.FLAG.CHEAT, 'if set to 1, will render the last computed path for debugging');
+    this.nav_enabled = new Cvar('nav_enabled', '1', Cvar.FLAG.NONE, 'if set to 1, navigation is enabled');
 
     // worker thread -> main thread: mesh probably out of date
     eventBus.subscribe('nav.build', (): void => {
@@ -524,11 +523,6 @@ export class Navigation {
 
     this.#shutdownWorker();
 
-    if (this.#pathRequestEventListener) {
-      this.#pathRequestEventListener();
-      this.#pathRequestEventListener = null;
-    }
-
     if (this.#pathResponseEventListener) {
       this.#pathResponseEventListener();
       this.#pathResponseEventListener = null;
@@ -1481,7 +1475,7 @@ export class Navigation {
       }
 
       const destinationEdict = Array.from(ServerEngineAPI.FindAllByFieldAndValue('targetname', source.target))[0];
-  const destination = destinationEdict?.entity as ServerEntity | null;
+      const destination = destinationEdict?.entity as ServerEntity | null;
 
       if (!destination) {
         Con.PrintWarning(`Navigation: teleporter without a valid target: ${source.classname}\n`);
@@ -1567,7 +1561,7 @@ export class Navigation {
     const halfSize = Math.max(extentX, extentY, extentZ) / 2 + 1;
 
     const center = new Vector(cx, cy, cz);
-  this.graph.octree = new Octree<Node>(center, halfSize, 12, 8);
+    this.graph.octree = new Octree<Node>(center, halfSize, 12, 8);
 
     for (const n of this.graph.nodes) {
       this.graph.octree.insert(n);
@@ -1578,7 +1572,7 @@ export class Navigation {
    * Find nearest graph node to a world position.
    * @returns The nearest node within the search radius, or null.
    */
-    #findNearestNode(position: Vector, maxDist = 512): Node | null {
+  #findNearestNode(position: Vector, maxDist = 512): Node | null {
     if (this.graph.nodes.length === 0) {
       return null;
     }
@@ -1637,6 +1631,10 @@ export class Navigation {
    * @returns A promised path containing the start and goal positions, or null.
    */
   findPathAsync(startPos: Vector, goalPos: Vector): Promise<Vector[] | null> {
+    if (!Navigation.nav_enabled!.value) {
+      return Promise.resolve(null);
+    }
+
     return new Promise<Vector[] | null>((resolve) => {
       const id = Math.random().toString(36).substring(2, 10);
 
@@ -1651,7 +1649,7 @@ export class Navigation {
    * Returns an array of Vector positions (node origins) or null if no path.
    * @returns A path containing the start and goal positions, or null.
    */
-    findPath(startPos: Vector, goalPos: Vector): Vector[] | null {
+  findPath(startPos: Vector, goalPos: Vector): Vector[] | null {
     if (!this.graph || !this.graph.nodes || this.graph.nodes.length === 0) {
       return null;
     }
diff --git a/source/engine/server/NavigationWorker.ts b/source/engine/server/NavigationWorker.ts
index 889ea4bf..5d9b4e59 100644
--- a/source/engine/server/NavigationWorker.ts
+++ b/source/engine/server/NavigationWorker.ts
@@ -22,7 +22,8 @@ eventBus.subscribe('nav.load', async (mapname: string, checksum: number | null)
   } catch (error) {
     // unusable navmesh, trigger a rebuild
     if (error instanceof NavMeshOutOfDateException) {
-      WorkerFramework.Publish('nav.build');
+      // WorkerFramework.Publish('nav.build');
+      Con.PrintWarning('Navigation: navmesh is out of date, needs to be rebuilt\n');
     }
   }
 });
diff --git a/source/engine/server/Server.ts b/source/engine/server/Server.ts
index a6169b13..28d6e813 100644
--- a/source/engine/server/Server.ts
+++ b/source/engine/server/Server.ts
@@ -240,42 +240,6 @@ export default class SV {
   /** Scheduled game commands. */
   static _scheduledGameCommands: ScheduledGameCommand[] = [];
 
-  static #requireGameAPI(): ServerRuntimeGameAPI {
-    if (SV.server.gameAPI === null) {
-      throw new Error('SV.server.gameAPI is not initialized');
-    }
-
-    return SV.server.gameAPI;
-  }
-
-  static #requireWorldModel(): BrushModel {
-    if (SV.server.worldmodel === null) {
-      throw new Error('SV.server.worldmodel is not initialized');
-    }
-
-    return SV.server.worldmodel;
-  }
-
-  static #requirePmove(): Pmove {
-    if (SV.pmove === null) {
-      throw new Error('SV.pmove is not initialized');
-    }
-
-    return SV.pmove;
-  }
-
-  static #requireNavigation(): Navigation {
-    if (SV.server.navigation === null) {
-      throw new Error('SV.server.navigation is not initialized');
-    }
-
-    return SV.server.navigation;
-  }
-
-  static #getLegacySpawnParmsGameAPI(): LegacySpawnParmsGameAPI {
-    return SV.#requireGameAPI() as unknown as LegacySpawnParmsGameAPI;
-  }
-
   static InitPmove(): void {
     SV.pmove = new Pmove();
     SV.pmove.movevars = new PlayerMoveCvars();
@@ -395,7 +359,8 @@ export default class SV {
           spawnParms[i] = oldSpawnParms![i] as number;
         }
       } else {
-        const gameAPI = SV.#getLegacySpawnParmsGameAPI();
+        console.assert(SV.server.gameAPI !== null, 'SV.server.gameAPI is initialized');
+        const gameAPI = SV.server.gameAPI! as LegacySpawnParmsGameAPI;
         gameAPI.SetNewParms();
 
         for (let i = 0; i < spawnParms.length; i++) {
@@ -456,7 +421,8 @@ export default class SV {
   }
 
   static SaveSpawnparms(): void {
-    const gameAPI = SV.#requireGameAPI();
+    console.assert(SV.server.gameAPI !== null, 'SV.server.gameAPI is initialized');
+    const gameAPI = SV.server.gameAPI!;
 
     if ('serverflags' in gameAPI) {
       SV.svs.serverflags = gameAPI.serverflags ?? 0;
@@ -500,8 +466,10 @@ export default class SV {
       return false;
     }
 
-    const worldmodel = SV.#requireWorldModel();
-    const pmove = SV.#requirePmove();
+    console.assert(SV.server.worldmodel !== null, 'SV.server.worldmodel is initialized');
+    const worldmodel = SV.server.worldmodel!;
+    console.assert(SV.pmove !== null, 'SV.pmove is initialized');
+    const pmove = SV.pmove!;
     pmove.setWorldmodel(worldmodel);
 
     SV.area.initOctree(worldmodel.mins, worldmodel.maxs);
@@ -518,7 +486,8 @@ export default class SV {
     SV.server.eventBus.unsubscribeAll();
     SV.server.navigation = new Navigation(worldmodel);
 
-    const gameAPI = SV.#requireGameAPI();
+    console.assert(SV.server.gameAPI !== null, 'SV.server.gameAPI is initialized');
+    const gameAPI = SV.server.gameAPI!;
     gameAPI.init(mapname, SV.svs.serverflags);
 
     if (!SV.#spawnWorldspawnEntity()) {
@@ -811,7 +780,8 @@ export default class SV {
   }
 
   static #setupModelPrecache(): void {
-    const worldmodel = SV.#requireWorldModel();
+    console.assert(SV.server.worldmodel !== null, 'SV.server.worldmodel is initialized');
+    const worldmodel = SV.server.worldmodel!;
 
     SV.server.models.length = 2;
     SV.server.models[0] = null;
@@ -833,7 +803,8 @@ export default class SV {
   }
 
   static #setupPlayerEntities(): boolean {
-    const gameAPI = SV.#requireGameAPI();
+    console.assert(SV.server.gameAPI !== null, 'SV.server.gameAPI is initialized');
+    const gameAPI = SV.server.gameAPI!;
 
     for (let i = 0; i < SV.svs.maxclients; i++) {
       const ent = SV.server.edicts[i + 1] as ServerEdict;
@@ -893,7 +864,8 @@ export default class SV {
 
   static #setupExtendedEntityFields(): void {
     if (SV.server.gameCapabilities.includes(Defs.gameCapabilities.CAP_ENTITY_EXTENDED)) {
-      const fields = SV.#requireGameAPI().getClientEntityFields();
+      console.assert(SV.server.gameAPI !== null, 'SV.server.gameAPI is initialized');
+      const fields = SV.server.gameAPI!.getClientEntityFields();
 
       for (const [classname, extendedFields] of Object.entries(fields)) {
         const clientEntityField: ClientEntityFieldConfig = {
@@ -920,8 +892,10 @@ export default class SV {
 
   static #spawnWorldspawnEntity(): boolean {
     const ent = SV.server.edicts[0] as ServerEdict;
-    const worldmodel = SV.#requireWorldModel();
-    const gameAPI = SV.#requireGameAPI();
+    console.assert(SV.server.worldmodel !== null, 'SV.server.worldmodel is initialized');
+    const worldmodel = SV.server.worldmodel!;
+    console.assert(SV.server.gameAPI !== null, 'SV.server.gameAPI is initialized');
+    const gameAPI = SV.server.gameAPI!;
 
     if (!gameAPI.prepareEntity(ent, 'worldspawn', {
       model: worldmodel.name,
@@ -976,7 +950,8 @@ export default class SV {
       }
     }
 
-    SV.#requireNavigation().init();
+    console.assert(SV.server.navigation !== null, 'SV.server.navigation is initialized');
+    SV.server.navigation!.init();
     eventBus.publish('server.spawned', { mapname });
     Con.PrintSuccess('Server spawned.\n');
   }
diff --git a/source/engine/server/physics/ServerClientPhysics.ts b/source/engine/server/physics/ServerClientPhysics.ts
index daa4ef8a..d9c3eb19 100644
--- a/source/engine/server/physics/ServerClientPhysics.ts
+++ b/source/engine/server/physics/ServerClientPhysics.ts
@@ -9,6 +9,7 @@ import {
 import { ServerClient } from '../Client.ts';
 import { PM_TYPE } from '../../common/Pmove.ts';
 import { BrushModel } from '../../common/Mod.ts';
+import { HostError } from '../../common/Errors.ts';
 
 let { Host, SV, V } = getCommonRegistry();
 
@@ -373,7 +374,7 @@ export class ServerClientPhysics {
           SV.physics.flyMove(ent, Host.frametime);
           break;
         default:
-          throw new Error(`SV.Physics_Client: bad movetype ${movetype}`);
+          throw new HostError(`SV.Physics_Client: bad movetype ${movetype}`);
       }
     }
     SV.area.linkEdict(ent, true);
diff --git a/source/engine/server/physics/ServerPhysics.ts b/source/engine/server/physics/ServerPhysics.ts
index 5410657a..83d241de 100644
--- a/source/engine/server/physics/ServerPhysics.ts
+++ b/source/engine/server/physics/ServerPhysics.ts
@@ -1,3 +1,4 @@
+import { HostError } from '../../common/Errors.ts';
 import type { ServerEdict } from '../Edict.ts';
 import type { CollisionTrace } from './ServerCollisionSupport.ts';
 
@@ -769,7 +770,7 @@ export class ServerPhysics {
           this.physicsToss(ent);
           continue;
         default:
-          throw new Error(`SV.Physics: bad movetype ${ent.entity!.movetype >> 0}`);
+          throw new HostError(`SV.Physics: bad movetype ${ent.entity!.movetype >> 0}`);
       }
     }
 
diff --git a/source/game/id1 b/source/game/id1
index 6e3651b5..a14f97ad 160000
--- a/source/game/id1
+++ b/source/game/id1
@@ -1 +1 @@
-Subproject commit 6e3651b521ce839094f22a05e27181d9204be660
+Subproject commit a14f97ad70d9920484579f0b242e74c7d1ea90de
diff --git a/test/common/id1-dog.test.mjs b/test/common/id1-dog.test.mjs
new file mode 100644
index 00000000..bb2c1c9e
--- /dev/null
+++ b/test/common/id1-dog.test.mjs
@@ -0,0 +1,138 @@
+import { describe, test } from 'node:test';
+import assert from 'node:assert/strict';
+
+await import('../../source/game/id1/GameAPI.ts');
+
+const { default: DogMonsterEntity } = await import('../../source/game/id1/entity/monster/Dog.ts');
+
+DogMonsterEntity._initStates();
+
+void describe('DogMonsterEntity class metadata', () => {
+  void test('classname is monster_dog', () => {
+    assert.equal(DogMonsterEntity.classname, 'monster_dog');
+  });
+
+  void test('health is 25', () => {
+    assert.equal(DogMonsterEntity._health, 25);
+  });
+
+  void test('models are precached from dog assets', () => {
+    assert.equal(DogMonsterEntity._modelDefault, 'progs/dog.mdl');
+    assert.equal(DogMonsterEntity._modelHead, 'progs/h_dog.mdl');
+  });
+
+  void test('size vectors are correct', () => {
+    const [mins, maxs] = DogMonsterEntity._size;
+    assert.deepEqual([mins[0], mins[1], mins[2]], [-32, -32, -24]);
+    assert.deepEqual([maxs[0], maxs[1], maxs[2]], [32, 32, 40]);
+  });
+
+  void test('serializableFields is a frozen array from @entity', () => {
+    assert.ok(Array.isArray(DogMonsterEntity.serializableFields));
+    assert.ok(Object.isFrozen(DogMonsterEntity.serializableFields));
+    assert.deepEqual(DogMonsterEntity.serializableFields, ['_isLeaping']);
+  });
+});
+
+void describe('DogMonsterEntity state machine', () => {
+  void test('_states is populated after _initStates', () => {
+    assert.ok(DogMonsterEntity._states !== null);
+    assert.equal(typeof DogMonsterEntity._states, 'object');
+  });
+
+  void test('stand sequence has 9 frames that loop', () => {
+    const states = DogMonsterEntity._states;
+    for (let i = 1; i <= 9; i++) {
+      const key = `dog_stand${i}`;
+      assert.ok(key in states, `missing state ${key}`);
+      assert.equal(states[key].keyframe, `stand${i}`);
+    }
+    assert.equal(states.dog_stand9.nextState, 'dog_stand1');
+  });
+
+  void test('walk sequence has 8 frames that loop', () => {
+    const states = DogMonsterEntity._states;
+    for (let i = 1; i <= 8; i++) {
+      const key = `dog_walk${i}`;
+      assert.ok(key in states, `missing state ${key}`);
+      assert.equal(states[key].keyframe, `walk${i}`);
+    }
+    assert.equal(states.dog_walk8.nextState, 'dog_walk1');
+  });
+
+  void test('run sequence has 12 frames that loop', () => {
+    const states = DogMonsterEntity._states;
+    for (let i = 1; i <= 12; i++) {
+      const key = `dog_run${i}`;
+      assert.ok(key in states, `missing state ${key}`);
+      assert.equal(states[key].keyframe, `run${i}`);
+    }
+    assert.equal(states.dog_run12.nextState, 'dog_run1');
+  });
+
+  void test('attack sequence has 8 frames ending at dog_run1', () => {
+    const states = DogMonsterEntity._states;
+    for (let i = 1; i <= 8; i++) {
+      const key = `dog_atta${i}`;
+      assert.ok(key in states, `missing state ${key}`);
+      assert.equal(states[key].keyframe, `attack${i}`);
+    }
+    assert.equal(states.dog_atta8.nextState, 'dog_run1');
+  });
+
+  void test('leap sequence has 9 frames ending at dog_run1', () => {
+    const states = DogMonsterEntity._states;
+    for (let i = 1; i <= 9; i++) {
+      const key = `dog_leap${i}`;
+      assert.ok(key in states, `missing state ${key}`);
+      assert.equal(states[key].keyframe, `leap${i}`);
+    }
+    assert.equal(states.dog_leap9.nextState, 'dog_run1');
+  });
+
+  void test('pain sequences end at dog_run1', () => {
+    const states = DogMonsterEntity._states;
+    for (let i = 1; i <= 6; i++) {
+      const key = `dog_pain${i}`;
+      assert.ok(key in states, `missing state ${key}`);
+      assert.equal(states[key].keyframe, `pain${i}`);
+    }
+    assert.equal(states.dog_pain6.nextState, 'dog_run1');
+
+    for (let i = 1; i <= 16; i++) {
+      const key = `dog_painb${i}`;
+      assert.ok(key in states, `missing state ${key}`);
+      assert.equal(states[key].keyframe, `painb${i}`);
+    }
+    assert.equal(states.dog_painb16.nextState, 'dog_run1');
+  });
+
+  void test('death sequences do not loop', () => {
+    const states = DogMonsterEntity._states;
+    for (let i = 1; i <= 9; i++) {
+      const key = `dog_die${i}`;
+      assert.ok(key in states, `missing state ${key}`);
+      assert.equal(states[key].keyframe, `death${i}`);
+    }
+    assert.equal(states.dog_die9.nextState, null);
+
+    for (let i = 1; i <= 9; i++) {
+      const key = `dog_dieb${i}`;
+      assert.ok(key in states, `missing state ${key}`);
+      assert.equal(states[key].keyframe, `deathb${i}`);
+    }
+    assert.equal(states.dog_dieb9.nextState, null);
+  });
+
+  void test('active states keep handlers and passive states omit them', () => {
+    const states = DogMonsterEntity._states;
+
+    for (const name of ['dog_stand1', 'dog_walk1', 'dog_run1', 'dog_atta1', 'dog_leap1', 'dog_leap2', 'dog_painb1', 'dog_painb2']) {
+      assert.equal(typeof states[name].handler, 'function', `${name} handler should be a function`);
+    }
+
+    for (const name of ['dog_leap9', 'dog_pain1', 'dog_pain6', 'dog_painb16', 'dog_die1', 'dog_die9', 'dog_dieb1', 'dog_dieb9']) {
+      assert.equal(states[name].handler, null, `${name} handler should be omitted`);
+    }
+  });
+});
diff --git a/test/common/id1-game-api.test.mjs b/test/common/id1-game-api.test.mjs
new file mode 100644
index 00000000..bc12ba86
--- /dev/null
+++ b/test/common/id1-game-api.test.mjs
@@ -0,0 +1,106 @@
+import assert from 'node:assert/strict';
+import { describe, test } from 'node:test';
+
+const { ServerGameAPI } = await import('../../source/game/id1/GameAPI.ts');
+
+function createMockCvar(initialValue) {
+  const normalizedValue = Number(initialValue);
+
+  return {
+    value: normalizedValue,
+    string: String(normalizedValue),
+    set(nextValue) {
+      this.value = Number(nextValue);
+      this.string = String(this.value);
+    },
+    free() {
+    },
+  };
+}
+
+function createStaticCvars(overrides = {}) {
+  return {
+    nomonster: createMockCvar(0),
+    fraglimit: createMockCvar(20),
+    timelimit: createMockCvar(15),
+    samelevel: createMockCvar(0),
+    noexit: createMockCvar(0),
+    skill: createMockCvar(1),
+    deathmatch: createMockCvar(0),
+    coop: createMockCvar(0),
+    ...overrides,
+  };
+}
+
+void describe('ServerGameAPI cvar access', () => {
+  void test('getters read initialized cvars directly', () => {
+    const originalCvars = ServerGameAPI._cvars;
+
+    try {
+      ServerGameAPI._cvars = createStaticCvars({
+        skill: createMockCvar(3),
+        deathmatch: createMockCvar(1),
+      });
+
+      const gameAPI = Object.create(ServerGameAPI.prototype);
+      gameAPI.constructor = ServerGameAPI;
+      gameAPI._cvars = {
+        teamplay: createMockCvar(2),
+        gravity: createMockCvar(900),
+        nextmap: createMockCvar(0),
+      };
+
+      assert.equal(gameAPI.skill, 3);
+      assert.equal(gameAPI.deathmatch, 1);
+      assert.equal(gameAPI.teamplay, 2);
+      assert.equal(gameAPI.gravity, 900);
+    } finally {
+      ServerGameAPI._cvars = originalCvars;
+    }
+  });
+
+  void test('init normalizes guaranteed cvars in place', () => {
+    const originalCvars = ServerGameAPI._cvars;
+    let subscribedToEvents = false;
+    let precachedResources = false;
+    let initializedNextMap = false;
+
+    try {
+      const cvars = createStaticCvars({
+        coop: createMockCvar(1),
+        deathmatch: createMockCvar(1),
+        skill: createMockCvar(9),
+      });
+      ServerGameAPI._cvars = cvars;
+
+      const gameAPI = Object.create(ServerGameAPI.prototype);
+      gameAPI.constructor = ServerGameAPI;
+      gameAPI.mapname = null;
+      gameAPI.serverflags = 0;
+      gameAPI.stats = {
+        subscribeToEvents() {
+          subscribedToEvents = true;
+        },
+      };
+      gameAPI._precacheResources = () => {
+        precachedResources = true;
+      };
+      gameAPI._initNextMap = () => {
+        initializedNextMap = true;
+      };
+
+      gameAPI.init('e1m1', 7);
+
+      assert.equal(gameAPI.mapname, 'e1m1');
+      assert.equal(gameAPI.serverflags, 7);
+      assert.equal(cvars.coop.value, 1);
+      assert.equal(cvars.deathmatch.value, 0);
+      assert.equal(cvars.skill.value, 3);
+      assert.equal(subscribedToEvents, true);
+      assert.equal(precachedResources, true);
+      assert.equal(initializedNextMap, true);
+    } finally {
+      ServerGameAPI._cvars = originalCvars;
+    }
+  });
+});
diff --git a/test/common/id1-knights.test.mjs b/test/common/id1-knights.test.mjs
new file mode 100644
index 00000000..8a7b8e26
--- /dev/null
+++ b/test/common/id1-knights.test.mjs
@@ -0,0 +1,111 @@
+import { describe, test } from 'node:test';
+import assert from 'node:assert/strict';
+
+await import('../../source/game/id1/GameAPI.ts');
+
+const { tentType } = await import('../../source/game/id1/Defs.ts');
+const { HellKnightMonster, KnightMonster, KnightSpike } = await import('../../source/game/id1/entity/monster/Knights.ts');
+
+KnightMonster._initStates();
+HellKnightMonster._initStates();
+
+void describe('KnightMonster metadata', () => {
+  void test('class metadata matches the original monster', () => {
+    assert.equal(KnightMonster.classname, 'monster_knight');
+    assert.equal(KnightMonster._health, 75);
+    assert.equal(KnightMonster._modelDefault, 'progs/knight.mdl');
+    assert.equal(KnightMonster._modelHead, 'progs/h_knight.mdl');
+  });
+
+  void test('size vectors are correct', () => {
+    const [mins, maxs] = KnightMonster._size;
+    assert.deepEqual([mins[0], mins[1], mins[2]], [-16, -16, -24]);
+    assert.deepEqual([maxs[0], maxs[1], maxs[2]], [16, 16, 40]);
+  });
+});
+
+void describe('KnightMonster state machine', () => {
+  void test('core movement sequences loop', () => {
+    const states = KnightMonster._states;
+    assert.equal(states.knight_stand9.nextState, 'knight_stand1');
+    assert.equal(states.knight_walk14.nextState, 'knight_walk1');
+    assert.equal(states.knight_run8.nextState, 'knight_run1');
+  });
+
+  void test('combat and death chains return or terminate correctly', () => {
+    const states = KnightMonster._states;
+    assert.equal(states.knight_runatk11.nextState, 'knight_run1');
+    assert.equal(states.knight_atk10.nextState, 'knight_run1');
+    assert.equal(states.knight_pain3.nextState, 'knight_run1');
+    assert.equal(states.knight_painb11.nextState, 'knight_run1');
+    assert.equal(states.knight_die10.nextState, null);
+    assert.equal(states.knight_dieb11.nextState, null);
+  });
+
+  void test('bow states keep the kneel loop and return to walking', () => {
+    const states = KnightMonster._states;
+    assert.equal(states.knight_bow5.nextState, 'knight_bow5');
+    assert.equal(states.knight_bow10.nextState, 'knight_walk1');
+  });
+
+  void test('sequence-generated handlers remain present on knight states', () => {
+    const states = KnightMonster._states;
+    assert.equal(typeof states.knight_runatk2.handler, 'function');
+    assert.equal(typeof states.knight_bow1.handler, 'function');
+    assert.equal(typeof states.knight_die1.handler, 'function');
+    assert.equal(typeof states.knight_pain2.handler, 'function');
+  });
+});
+
+void describe('KnightSpike metadata', () => {
+  void test('projectile metadata matches the original spike', () => {
+    assert.equal(KnightSpike.classname, 'knightspike');
+    assert.equal(KnightSpike._damage, 9);
+    assert.equal(KnightSpike._tentType, tentType.TE_SPIKE);
+    assert.equal(KnightSpike._model, 'progs/k_spike.mdl');
+  });
+});
+
+void describe('HellKnightMonster metadata', () => {
+  void test('class metadata matches the original monster', () => {
+    assert.equal(HellKnightMonster.classname, 'monster_hell_knight');
+    assert.equal(HellKnightMonster._health, 250);
+    assert.equal(HellKnightMonster._modelDefault, 'progs/hknight.mdl');
+    assert.equal(HellKnightMonster._modelHead, 'progs/h_hellkn.mdl');
+  });
+});
+
+void describe('HellKnightMonster state machine', () => {
+  void test('core movement sequences loop', () => {
+    const states = HellKnightMonster._states;
+    assert.equal(states.hknight_stand9.nextState, 'hknight_stand1');
+    assert.equal(states.hknight_walk20.nextState, 'hknight_walk1');
+    assert.equal(states.hknight_run8.nextState, 'hknight_run1');
+  });
+
+  void test('missile and charge chains return as expected', () => {
+    const states = HellKnightMonster._states;
+    assert.equal(states.hknight_magica14.nextState, 'hknight_run1');
+    assert.equal(states.hknight_magicb13.nextState, 'hknight_run1');
+    assert.equal(states.hknight_magicc11.nextState, 'hknight_run1');
+    assert.equal(states.hknight_char_a16.nextState, 'hknight_run1');
+    assert.equal(states.hknight_char_b6.nextState, 'hknight_char_b1');
+    assert.equal(states.hknight_slice10.nextState, 'hknight_run1');
+    assert.equal(states.hknight_smash11.nextState, 'hknight_run1');
+    assert.equal(states.hknight_watk22.nextState, 'hknight_run1');
+  });
+
+  void test('death chains terminate correctly', () => {
+    const states = HellKnightMonster._states;
+    assert.equal(states.hknight_die12.nextState, null);
+    assert.equal(states.hknight_dieb9.nextState, null);
+  });
+
+  void test('sequence-generated handlers remain present on hell knight states', () => {
+    const states = HellKnightMonster._states;
+    assert.equal(typeof states.hknight_run1.handler, 'function');
+    assert.equal(typeof states.hknight_char_b1.handler, 'function');
+    assert.equal(typeof states.hknight_pain2.handler, 'function');
+    assert.equal(typeof states.hknight_dieb1.handler, 'function');
+  });
+});
diff --git a/test/common/id1-soldier.test.mjs b/test/common/id1-soldier.test.mjs
new file mode 100644
index 00000000..f8637a2a
--- /dev/null
+++ b/test/common/id1-soldier.test.mjs
@@ -0,0 +1,148 @@
+import { describe, test } from 'node:test';
+import assert from 'node:assert/strict';
+
+await import('../../source/game/id1/GameAPI.ts');
+
+const { ArmySoldierMonster, ArmyEnforcerMonster } = await import('../../source/game/id1/entity/monster/Soldier.ts');
+
+ArmySoldierMonster._initStates();
+ArmyEnforcerMonster._initStates();
+
+void describe('ArmySoldierMonster class metadata', () => {
+  void test('classname is monster_army', () => {
+    assert.equal(ArmySoldierMonster.classname, 'monster_army');
+  });
+
+  void test('health and model metadata match QC setup', () => {
+    assert.equal(ArmySoldierMonster._health, 30);
+    assert.equal(ArmySoldierMonster._modelDefault, 'progs/soldier.mdl');
+    assert.equal(ArmySoldierMonster._modelHead, 'progs/h_guard.mdl');
+  });
+
+  void test('size vectors are correct', () => {
+    const [mins, maxs] = ArmySoldierMonster._size;
+    assert.deepEqual([mins[0], mins[1], mins[2]], [-16, -16, -24]);
+    assert.deepEqual([maxs[0], maxs[1], maxs[2]], [16, 16, 40]);
+  });
+
+  void test('serializableFields is a frozen empty array', () => {
+    assert.ok(Array.isArray(ArmySoldierMonster.serializableFields));
+    assert.ok(Object.isFrozen(ArmySoldierMonster.serializableFields));
+    assert.deepEqual(ArmySoldierMonster.serializableFields, []);
+  });
+});
+
+void describe('ArmySoldierMonster state machine', () => {
+  void test('stand, walk, and run sequences loop correctly', () => {
+    const states = ArmySoldierMonster._states;
+
+    for (let i = 1; i <= 8; i++) {
+      assert.equal(states[`army_stand${i}`].keyframe, `stand${i}`);
+      assert.equal(states[`army_run${i}`].keyframe, `run${i}`);
+    }
+    assert.equal(states.army_stand8.nextState, 'army_stand1');
+    assert.equal(states.army_run8.nextState, 'army_run1');
+
+    for (let i = 1; i <= 24; i++) {
+      assert.equal(states[`army_walk${i}`].keyframe, `prowl_${i}`);
+    }
+    assert.equal(states.army_walk24.nextState, 'army_walk1');
+  });
+
+  void test('attack, pain, and death transitions match the QuakeC flow', () => {
+    const states = ArmySoldierMonster._states;
+
+    for (let i = 1; i <= 9; i++) {
+      assert.equal(states[`army_atk${i}`].keyframe, `shoot${i}`);
+    }
+    assert.equal(states.army_atk9.nextState, 'army_run1');
+    assert.equal(states.army_pain6.nextState, 'army_run1');
+    assert.equal(states.army_painb14.nextState, 'army_run1');
+    assert.equal(states.army_painc13.nextState, 'army_run1');
+    assert.equal(states.army_die10.nextState, null);
+    assert.equal(states.army_cdie11.nextState, null);
+  });
+
+  void test('inactive sequences omit handlers where expected', () => {
+    const states = ArmySoldierMonster._states;
+    assert.equal(states.army_pain1.handler, null);
+    assert.equal(states.army_pain6.handler !== null, true);
+    assert.equal(typeof states.army_painb2.handler, 'function');
+    assert.equal(typeof states.army_atk4.handler, 'function');
+  });
+});
+
+void describe('ArmyEnforcerMonster class metadata', () => {
+  void test('classname is monster_enforcer', () => {
+    assert.equal(ArmyEnforcerMonster.classname, 'monster_enforcer');
+  });
+
+  void test('health and model metadata match QC setup', () => {
+    assert.equal(ArmyEnforcerMonster._health, 80);
+    assert.equal(ArmyEnforcerMonster._modelDefault, 'progs/enforcer.mdl');
+    assert.equal(ArmyEnforcerMonster._modelHead, 'progs/h_mega.mdl');
+  });
+
+  void test('size vectors are correct', () => {
+    const [mins, maxs] = ArmyEnforcerMonster._size;
+    assert.deepEqual([mins[0], mins[1], mins[2]], [-16, -16, -24]);
+    assert.deepEqual([maxs[0], maxs[1], maxs[2]], [16, 16, 40]);
+  });
+
+  void test('serializableFields is a frozen empty array', () => {
+    assert.ok(Array.isArray(ArmyEnforcerMonster.serializableFields));
+    assert.ok(Object.isFrozen(ArmyEnforcerMonster.serializableFields));
+    assert.deepEqual(ArmyEnforcerMonster.serializableFields, []);
+  });
+});
+
+void describe('ArmyEnforcerMonster state machine', () => {
+  void test('stand, walk, and run sequences loop correctly', () => {
+    const states = ArmyEnforcerMonster._states;
+
+    for (let i = 1; i <= 7; i++) {
+      assert.equal(states[`enf_stand${i}`].keyframe, `stand${i}`);
+    }
+    assert.equal(states.enf_stand7.nextState, 'enf_stand1');
+
+    for (let i = 1; i <= 16; i++) {
+      assert.equal(states[`enf_walk${i}`].keyframe, `walk${i}`);
+    }
+    assert.equal(states.enf_walk16.nextState, 'enf_walk1');
+
+    for (let i = 1; i <= 8; i++) {
+      assert.equal(states[`enf_run${i}`].keyframe, `run${i}`);
+    }
+    assert.equal(states.enf_run8.nextState, 'enf_run1');
+  });
+
+  void test('attack and pain sequences transition back to run', () => {
+    const states = ArmyEnforcerMonster._states;
+    const attackFrames = ['attack1', 'attack2', 'attack3', 'attack4', 'attack5', 'attack6', 'attack7', 'attack8', 'attack5', 'attack6', 'attack7', 'attack8', 'attack9', 'attack10'];
+
+    for (let i = 0; i < attackFrames.length; i++) {
+      assert.equal(states[`enf_atk${i + 1}`].keyframe, attackFrames[i]);
+    }
+
+    assert.equal(states.enf_atk14.nextState, 'enf_run1');
+    assert.equal(states.enf_paina4.nextState, 'enf_run1');
+    assert.equal(states.enf_painb5.nextState, 'enf_run1');
+    assert.equal(states.enf_painc8.nextState, 'enf_run1');
+    assert.equal(states.enf_paind19.nextState, 'enf_run1');
+  });
+
+  void test('death sequences remain terminal', () => {
+    const states = ArmyEnforcerMonster._states;
+    assert.equal(states.enf_die14.nextState, 'enf_die14');
+    assert.equal(states.enf_fdie11.nextState, 'enf_fdie11');
+  });
+
+  void test('inactive sequences omit handlers where expected', () => {
+    const states = ArmyEnforcerMonster._states;
+    assert.equal(states.enf_paina1.handler, null);
+    assert.equal(states.enf_painb1.handler, null);
+    assert.equal(states.enf_painc1.handler, null);
+    assert.equal(typeof states.enf_paind4.handler, 'function');
+    assert.equal(typeof states.enf_atk6.handler, 'function');
+  });
+});

From 129bc74d1ff0fa0c0777a15028ef278f2ffb26b6 Mon Sep 17 00:00:00 2001
From: Christian R <github@chrisnew.de>
Date: Mon, 6 Apr 2026 21:00:37 +0300
Subject: [PATCH 61/67] lots of tests to make sure the base game logic is in
 good standing

---
 source/game/id1                               |   2 +-
 .../{common => game}/id1-base-entity.test.mjs |   4 +
 test/game/id1-boss.test.mjs                   | 350 ++++++++++++++++++
 test/game/id1-demon.test.mjs                  | 122 ++++++
 test/{common => game}/id1-dog.test.mjs        |   0
 test/{common => game}/id1-fish.test.mjs       |   0
 test/{common => game}/id1-game-api.test.mjs   |  10 +
 test/game/id1-game-stats.test.mjs             | 150 ++++++++
 test/{common => game}/id1-knights.test.mjs    |   0
 test/game/id1-ogre.test.mjs                   |  72 ++++
 test/game/id1-oldone.test.mjs                 | 224 +++++++++++
 test/game/id1-player-weapons.test.mjs         | 110 ++++++
 test/game/id1-registry.test.mjs               | 107 ++++++
 test/game/id1-shalrath.test.mjs               | 211 +++++++++++
 test/game/id1-shambler.test.mjs               | 218 +++++++++++
 test/{common => game}/id1-soldier.test.mjs    |   0
 test/game/id1-tarbaby.test.mjs                | 178 +++++++++
 test/game/id1-wizard.test.mjs                 | 240 ++++++++++++
 test/game/id1-zombie.test.mjs                 | 233 ++++++++++++
 test/game/quake-entity-ai.test.mjs            | 307 +++++++++++++++
 test/physics/quake-entity-ai.test.mjs         | 128 -------
 21 files changed, 2537 insertions(+), 129 deletions(-)
 rename test/{common => game}/id1-base-entity.test.mjs (98%)
 create mode 100644 test/game/id1-boss.test.mjs
 create mode 100644 test/game/id1-demon.test.mjs
 rename test/{common => game}/id1-dog.test.mjs (100%)
 rename test/{common => game}/id1-fish.test.mjs (100%)
 rename test/{common => game}/id1-game-api.test.mjs (90%)
 create mode 100644 test/game/id1-game-stats.test.mjs
 rename test/{common => game}/id1-knights.test.mjs (100%)
 create mode 100644 test/game/id1-ogre.test.mjs
 create mode 100644 test/game/id1-oldone.test.mjs
 create mode 100644 test/game/id1-player-weapons.test.mjs
 create mode 100644 test/game/id1-registry.test.mjs
 create mode 100644 test/game/id1-shalrath.test.mjs
 create mode 100644 test/game/id1-shambler.test.mjs
 rename test/{common => game}/id1-soldier.test.mjs (100%)
 create mode 100644 test/game/id1-tarbaby.test.mjs
 create mode 100644 test/game/id1-wizard.test.mjs
 create mode 100644 test/game/id1-zombie.test.mjs
 create mode 100644 test/game/quake-entity-ai.test.mjs
 delete mode 100644 test/physics/quake-entity-ai.test.mjs

diff --git a/source/game/id1 b/source/game/id1
index a14f97ad..8407bdb1 160000
--- a/source/game/id1
+++ b/source/game/id1
@@ -1 +1 @@
-Subproject commit a14f97ad70d9920484579f0b242e74c7d1ea90de
+Subproject commit 8407bdb1143dc754aba7a43aeaef385c0177f672
diff --git a/test/common/id1-base-entity.test.mjs b/test/game/id1-base-entity.test.mjs
similarity index 98%
rename from test/common/id1-base-entity.test.mjs
rename to test/game/id1-base-entity.test.mjs
index 084674ea..3eb104d7 100644
--- a/test/common/id1-base-entity.test.mjs
+++ b/test/game/id1-base-entity.test.mjs
@@ -4,6 +4,10 @@ import assert from 'node:assert/strict';
 import BaseEntity from '../../source/game/id1/entity/BaseEntity.ts';
 import { entity, serializable, Serializer } from '../../source/game/id1/helper/MiscHelpers.ts';
 
+/**
+ * Create the minimal game API surface required by serializer tests.
+ * @returns {object} Mock game API.
+ */
 function createMockGameAPI() {
   return {
     engine: {
diff --git a/test/game/id1-boss.test.mjs b/test/game/id1-boss.test.mjs
new file mode 100644
index 00000000..5e40a384
--- /dev/null
+++ b/test/game/id1-boss.test.mjs
@@ -0,0 +1,350 @@
+import { describe, test } from 'node:test';
+import assert from 'node:assert/strict';
+
+import Vector from '../../source/shared/Vector.ts';
+import { effect, moveType, solid, tentType } from '../../source/game/id1/Defs.ts';
+
+await import('../../source/game/id1/GameAPI.ts');
+
+const { BossLavaball, BossMonster, EventLightningEntity } = await import('../../source/game/id1/entity/monster/Boss.mjs');
+
+const ELECTRODE_STATE_TOP = 0;
+
+BossMonster._initStates();
+
+/**
+ * Create a minimal boss fixture for focused behavior tests.
+ * @param {typeof BossMonster} MonsterClass Monster constructor under test.
+ * @param {object} [gameOverrides] Optional game API overrides.
+ * @returns {BossMonster} Monster fixture instance.
+ */
+function createBossFixture(MonsterClass, gameOverrides = {}) {
+  const edict = {
+    num: 1,
+    entity: null,
+    freeEdict() {},
+    setOrigin() {},
+    setModel() {},
+    setMinMaxSize() {},
+    walkMove() {
+      return false;
+    },
+    changeYaw() {
+      return 0;
+    },
+    dropToFloor() {
+      return true;
+    },
+    isOnTheFloor() {
+      return false;
+    },
+    makeStatic() {},
+    aim() {
+      return null;
+    },
+    moveToGoal() {
+      return false;
+    },
+    isInPXS() {
+      return true;
+    },
+    getNextBestClient() {
+      return null;
+    },
+  };
+
+  const engine = {
+    IsLoading() {
+      return false;
+    },
+    PrecacheModel() {},
+    PrecacheSound() {},
+    ParseQC() {
+      return null;
+    },
+    StartSound() {},
+    SpawnEntity() {
+      return { entity: null };
+    },
+    DispatchTempEntityEvent() {},
+    DispatchBeamEvent() {},
+    eventBus: {
+      publish() {},
+    },
+  };
+
+  const gameAPI = {
+    engine,
+    time: 3,
+    skill: 1,
+    deathmatch: 0,
+    nomonsters: 0,
+    ...gameOverrides,
+  };
+
+  const entity = new MonsterClass(edict, gameAPI);
+  edict.entity = entity;
+  entity.origin = new Vector(10, 20, 30);
+  entity.angles = new Vector();
+  entity.enemy = {
+    origin: new Vector(90, 20, 30),
+    velocity: new Vector(20, 0, 0),
+    health: 100,
+  };
+
+  return entity;
+}
+
+/**
+ * Create a minimal event_lightning fixture.
+ * @returns {EventLightningEntity} Lightning fixture instance.
+ */
+function createLightningFixture() {
+  const edict = {
+    num: 2,
+    entity: null,
+    freeEdict() {},
+    setOrigin() {},
+    setModel() {},
+    setMinMaxSize() {},
+    walkMove() {
+      return false;
+    },
+    changeYaw() {
+      return 0;
+    },
+    dropToFloor() {
+      return true;
+    },
+    isOnTheFloor() {
+      return false;
+    },
+    makeStatic() {},
+    aim() {
+      return null;
+    },
+    moveToGoal() {
+      return false;
+    },
+    isInPXS() {
+      return true;
+    },
+    getNextBestClient() {
+      return null;
+    },
+  };
+
+  const engine = {
+    IsLoading() {
+      return false;
+    },
+    PrecacheModel() {},
+    PrecacheSound() {},
+    ParseQC() {
+      return null;
+    },
+    StartSound() {},
+    DispatchBeamEvent() {},
+    eventBus: {
+      publish() {},
+    },
+  };
+
+  const gameAPI = {
+    engine,
+    time: 5,
+    skill: 1,
+    deathmatch: 0,
+    nomonsters: 0,
+  };
+
+  const entity = new EventLightningEntity(edict, gameAPI);
+  edict.entity = entity;
+  return entity;
+}
+
+void describe('Boss module metadata', () => {
+  void test('exports the boss, lavaball, and lightning classes', () => {
+    assert.equal(BossMonster.classname, 'monster_boss');
+    assert.equal(BossLavaball.classname, 'monster_boss_lavaball');
+    assert.equal(EventLightningEntity.classname, 'event_lightning');
+  });
+});
+
+void describe('BossMonster state machine', () => {
+  void test('rise, idle, missile, and shock loops keep the QuakeC transitions', () => {
+    const states = BossMonster._states;
+
+    assert.equal(states.boss_rise17.nextState, 'boss_missile1');
+    assert.equal(states.boss_idle31.nextState, 'boss_idle1');
+    assert.equal(states.boss_missile23.nextState, 'boss_missile1');
+    assert.equal(states.boss_shocka10.nextState, 'boss_missile1');
+    assert.equal(states.boss_shockb7.keyframe, 'shockb1');
+    assert.equal(states.boss_shockb10.nextState, 'boss_missile1');
+    assert.equal(states.boss_shockc10.nextState, 'boss_death1');
+    assert.equal(states.boss_death10.nextState, 'boss_death10');
+  });
+});
+
+void describe('BossMonster QC fixes', () => {
+  void test('use wakes the boss with the skill-scaled health and lava splash', () => {
+    const boss = createBossFixture(BossMonster, { skill: 0 });
+    let stateName = null;
+    const tempEvents = [];
+
+    boss._runState = (nextState) => {
+      stateName = nextState;
+      return true;
+    };
+    boss.engine.DispatchTempEntityEvent = (eventType, origin) => {
+      tempEvents.push({ eventType, origin });
+    };
+
+    boss.use({ classname: 'player', origin: new Vector() });
+
+    assert.equal(boss.health, 1);
+    assert.equal(boss.movetype, moveType.MOVETYPE_STEP);
+    assert.equal(boss.solid, solid.SOLID_SLIDEBOX);
+    assert.equal(stateName, 'boss_rise1');
+    assert.deepEqual(tempEvents, [{ eventType: tentType.TE_LAVASPLASH, origin: boss.origin }]);
+  });
+
+  void test('takeLightningDamage steps through the classic shock states', () => {
+    const boss = createBossFixture(BossMonster);
+    let stateName = null;
+
+    boss._runState = (nextState) => {
+      stateName = nextState;
+      return true;
+    };
+    boss.health = 3;
+
+    boss.takeLightningDamage({ classname: 'player', origin: new Vector() });
+    assert.equal(boss.health, 2);
+    assert.equal(stateName, 'boss_shocka1');
+
+    boss.takeLightningDamage({ classname: 'player', origin: new Vector() });
+    assert.equal(boss.health, 1);
+    assert.equal(stateName, 'boss_shockb1');
+
+    boss.takeLightningDamage({ classname: 'player', origin: new Vector() });
+    assert.equal(boss.health, 0);
+    assert.equal(stateName, 'boss_shockc1');
+  });
+});
+
+void describe('BossLavaball', () => {
+  void test('spawn keeps the classic lavaball movement and fullbright effect', () => {
+    const boss = createBossFixture(BossMonster);
+    const edict = {
+      num: 3,
+      entity: null,
+      freeEdict() {},
+      setOrigin() {},
+      setModel() {},
+      setMinMaxSize() {},
+      walkMove() {
+        return false;
+      },
+      changeYaw() {
+        return 0;
+      },
+      dropToFloor() {
+        return true;
+      },
+      isOnTheFloor() {
+        return false;
+      },
+      makeStatic() {},
+      aim() {
+        return null;
+      },
+      moveToGoal() {
+        return false;
+      },
+      isInPXS() {
+        return true;
+      },
+      getNextBestClient() {
+        return null;
+      },
+    };
+
+    const lavaball = new BossLavaball(edict, boss.game);
+    edict.entity = lavaball;
+    lavaball.movedir = new Vector(1, 0, 0);
+
+    lavaball.spawn();
+
+    assert.equal(lavaball.movetype, moveType.MOVETYPE_FLYMISSILE);
+    assert.equal(lavaball.solid, solid.SOLID_BBOX);
+    assert.equal((lavaball.effects & effect.EF_FULLBRIGHT) !== 0, true);
+    assert.deepEqual([lavaball.avelocity[0], lavaball.avelocity[1], lavaball.avelocity[2]], [200, 100, 300]);
+    assert.equal(Math.round(lavaball.velocity.len()), 300);
+  });
+});
+
+void describe('EventLightningEntity', () => {
+  void test('fires aligned top electrodes and damages the boss once', () => {
+    const lightning = createLightningFixture();
+    const beams = [];
+    const sounds = [];
+    const activator = { classname: 'player', origin: new Vector() };
+    let damageCalls = 0;
+    const boss = createBossFixture(BossMonster);
+    boss.health = 3;
+
+    const electrode1 = {
+      state: ELECTRODE_STATE_TOP,
+      nextthink: 0,
+      mins: new Vector(-16, -16, -16),
+      maxs: new Vector(16, 16, 16),
+      absmin: new Vector(0, 0, 40),
+      _doorGoDown() {},
+    };
+    const electrode2 = {
+      state: ELECTRODE_STATE_TOP,
+      nextthink: 0,
+      mins: new Vector(-16, -16, -16),
+      maxs: new Vector(16, 16, 16),
+      absmin: new Vector(200, 0, 40),
+      _doorGoDown() {},
+    };
+    boss.takeLightningDamage = (entity) => {
+      damageCalls += 1;
+      assert.equal(entity, activator);
+    };
+
+    lightning.findFirstEntityByFieldAndValue = (fieldName, value) => {
+      if (fieldName === 'target' && value === 'lightning') {
+        return electrode1;
+      }
+      if (fieldName === 'classname' && value === BossMonster.classname) {
+        return boss;
+      }
+      return null;
+    };
+    lightning.findNextEntityByFieldAndValue = (fieldName, value, current) => {
+      if (fieldName === 'target' && value === 'lightning' && current === electrode1) {
+        return electrode2;
+      }
+      return null;
+    };
+    lightning.engine.DispatchBeamEvent = (eventType, edictId, start, end) => {
+      beams.push({ eventType, edictId, start, end });
+    };
+    lightning.startSound = (_channel, soundName) => {
+      sounds.push(soundName);
+    };
+
+    lightning.use(activator);
+
+    assert.equal(lightning.lightning_end, 6);
+    assert.equal(electrode1.nextthink, -1);
+    assert.equal(electrode2.nextthink, -1);
+    assert.deepEqual(sounds, ['misc/power.wav']);
+    assert.equal(beams.length, 1);
+    assert.equal(beams[0].eventType, tentType.TE_LIGHTNING3);
+    assert.equal(damageCalls, 1);
+  });
+});
diff --git a/test/game/id1-demon.test.mjs b/test/game/id1-demon.test.mjs
new file mode 100644
index 00000000..85b24c57
--- /dev/null
+++ b/test/game/id1-demon.test.mjs
@@ -0,0 +1,122 @@
+import { describe, test } from 'node:test';
+import assert from 'node:assert/strict';
+
+await import('../../source/game/id1/GameAPI.ts');
+
+const { default: DemonMonster } = await import('../../source/game/id1/entity/monster/Demon.ts');
+
+DemonMonster._initStates();
+
+void describe('DemonMonster class metadata', () => {
+  void test('classname is monster_demon1', () => {
+    assert.equal(DemonMonster.classname, 'monster_demon1');
+  });
+
+  void test('health is 300', () => {
+    assert.equal(DemonMonster._health, 300);
+  });
+
+  void test('models are precached from demon assets', () => {
+    assert.equal(DemonMonster._modelDefault, 'progs/demon.mdl');
+    assert.equal(DemonMonster._modelHead, 'progs/h_demon.mdl');
+  });
+
+  void test('size vectors are correct', () => {
+    const [mins, maxs] = DemonMonster._size;
+    assert.deepEqual([mins[0], mins[1], mins[2]], [-32, -32, -24]);
+    assert.deepEqual([maxs[0], maxs[1], maxs[2]], [32, 32, 64]);
+  });
+
+  void test('serializableFields is a frozen array from @entity', () => {
+    const { serializableFields } = /** @type {{ serializableFields: unknown }} */ (/** @type {unknown} */ (DemonMonster));
+    assert.ok(Array.isArray(serializableFields));
+    assert.ok(Object.isFrozen(serializableFields));
+    assert.deepEqual(serializableFields, ['_isLeaping']);
+  });
+});
+
+void describe('DemonMonster state machine', () => {
+  void test('_states is populated after _initStates', () => {
+    assert.ok(DemonMonster['_states'] !== null);
+    assert.equal(typeof DemonMonster['_states'], 'object');
+  });
+
+  void test('stand sequence has 13 frames that loop', () => {
+    const states = DemonMonster['_states'];
+    for (let i = 1; i <= 13; i++) {
+      const key = `demon1_stand${i}`;
+      assert.ok(key in states, `missing state ${key}`);
+      assert.equal(states[key].keyframe, `stand${i}`);
+    }
+    assert.equal(states.demon1_stand13.nextState, 'demon1_stand1');
+  });
+
+  void test('walk and run sequences loop', () => {
+    const states = DemonMonster['_states'];
+    for (let i = 1; i <= 8; i++) {
+      const key = `demon1_walk${i}`;
+      assert.ok(key in states, `missing state ${key}`);
+      assert.equal(states[key].keyframe, `walk${i}`);
+    }
+    assert.equal(states.demon1_walk8.nextState, 'demon1_walk1');
+
+    for (let i = 1; i <= 6; i++) {
+      const key = `demon1_run${i}`;
+      assert.ok(key in states, `missing state ${key}`);
+      assert.equal(states[key].keyframe, `run${i}`);
+    }
+    assert.equal(states.demon1_run6.nextState, 'demon1_run1');
+  });
+
+  void test('jump sequence keeps the retry loop and returns to run', () => {
+    const states = DemonMonster['_states'];
+    for (let i = 1; i <= 10; i++) {
+      const key = `demon1_jump${i}`;
+      assert.ok(key in states, `missing state ${key}`);
+      assert.equal(states[key].keyframe, `leap${i}`);
+    }
+    assert.equal(states.demon1_jump10.nextState, 'demon1_jump1');
+    assert.equal(states.demon1_jump11.keyframe, 'leap11');
+    assert.equal(states.demon1_jump12.keyframe, 'leap12');
+    assert.equal(states.demon1_jump12.nextState, 'demon1_run1');
+  });
+
+  void test('attack sequence ends at demon1_run1', () => {
+    const states = DemonMonster['_states'];
+    for (let i = 1; i <= 15; i++) {
+      const key = `demon1_atta${i}`;
+      assert.ok(key in states, `missing state ${key}`);
+      assert.equal(states[key].keyframe, `attacka${i}`);
+    }
+    assert.equal(states.demon1_atta15.nextState, 'demon1_run1');
+  });
+
+  void test('pain and death sequences terminate as expected', () => {
+    const states = DemonMonster['_states'];
+    for (let i = 1; i <= 6; i++) {
+      const key = `demon1_pain${i}`;
+      assert.ok(key in states, `missing state ${key}`);
+      assert.equal(states[key].keyframe, `pain${i}`);
+    }
+    assert.equal(states.demon1_pain6.nextState, 'demon1_run1');
+
+    for (let i = 1; i <= 9; i++) {
+      const key = `demon1_die${i}`;
+      assert.ok(key in states, `missing state ${key}`);
+      assert.equal(states[key].keyframe, `death${i}`);
+    }
+    assert.equal(states.demon1_die9.nextState, null);
+  });
+
+  void test('active states keep handlers and passive states omit them', () => {
+    const states = DemonMonster['_states'];
+
+    for (const name of ['demon1_stand1', 'demon1_walk1', 'demon1_run1', 'demon1_jump1', 'demon1_jump3', 'demon1_jump5', 'demon1_jump10', 'demon1_atta5', 'demon1_die6', 'demon1_die9']) {
+      assert.equal(typeof states[name].handler, 'function', `${name} handler should be a function`);
+    }
+
+    for (const name of ['demon1_jump11', 'demon1_jump12', 'demon1_pain1', 'demon1_pain6']) {
+      assert.equal(states[name].handler, null, `${name} handler should be omitted`);
+    }
+  });
+});
diff --git a/test/common/id1-dog.test.mjs b/test/game/id1-dog.test.mjs
similarity index 100%
rename from test/common/id1-dog.test.mjs
rename to test/game/id1-dog.test.mjs
diff --git a/test/common/id1-fish.test.mjs b/test/game/id1-fish.test.mjs
similarity index 100%
rename from test/common/id1-fish.test.mjs
rename to test/game/id1-fish.test.mjs
diff --git a/test/common/id1-game-api.test.mjs b/test/game/id1-game-api.test.mjs
similarity index 90%
rename from test/common/id1-game-api.test.mjs
rename to test/game/id1-game-api.test.mjs
index bc12ba86..b910637d 100644
--- a/test/common/id1-game-api.test.mjs
+++ b/test/game/id1-game-api.test.mjs
@@ -3,6 +3,11 @@ import { describe, test } from 'node:test';
 
 const { ServerGameAPI } = await import('../../source/game/id1/GameAPI.ts');
 
+/**
+ * Create a mutable mock cvar.
+ * @param {number|string} initialValue Initial cvar value.
+ * @returns {object} Mock cvar.
+ */
 function createMockCvar(initialValue) {
   const normalizedValue = Number(initialValue);
 
@@ -18,6 +23,11 @@ function createMockCvar(initialValue) {
   };
 }
 
+/**
+ * Create the static cvar table used by ServerGameAPI tests.
+ * @param {object} overrides Override values for selected cvars.
+ * @returns {object} Mock static cvar registry.
+ */
 function createStaticCvars(overrides = {}) {
   return {
     nomonster: createMockCvar(0),
diff --git a/test/game/id1-game-stats.test.mjs b/test/game/id1-game-stats.test.mjs
new file mode 100644
index 00000000..0db13096
--- /dev/null
+++ b/test/game/id1-game-stats.test.mjs
@@ -0,0 +1,150 @@
+import assert from 'node:assert/strict';
+import { describe, test } from 'node:test';
+
+const { clientEvent } = await import('../../source/game/id1/Defs.ts');
+const gameStatsModule = await import('../../source/game/id1/helper/GameStats.ts');
+const gameStatsShimModule = await import('../../source/game/id1/helper/GameStats.mjs');
+
+const GameStats = gameStatsModule.default;
+const { gameStatSlots } = gameStatsModule;
+
+/**
+ * Create an event bus with subscribe/publish support for stats tests.
+ * @returns {object} Mock event bus.
+ */
+function createEventBus() {
+  const listeners = new Map();
+
+  return {
+    subscribe(eventName, handler) {
+      const handlers = listeners.get(eventName) ?? [];
+      handlers.push(handler);
+      listeners.set(eventName, handlers);
+
+      return () => {
+        const currentHandlers = listeners.get(eventName) ?? [];
+        listeners.set(eventName, currentHandlers.filter((currentHandler) => currentHandler !== handler));
+      };
+    },
+
+    publish(eventName, ...args) {
+      for (const handler of listeners.get(eventName) ?? []) {
+        handler(...args);
+      }
+    },
+  };
+}
+
+/**
+ * Create the minimal engine API surface used by GameStats.
+ * @returns {object} Mock engine API.
+ */
+function createEngineAPI() {
+  const eventBus = createEventBus();
+  const broadcasts = [];
+  const dispatches = [];
+
+  return {
+    eventBus,
+    broadcasts,
+    dispatches,
+    BroadcastClientEvent(...args) {
+      broadcasts.push(args);
+    },
+    DispatchClientEvent(...args) {
+      dispatches.push(args);
+    },
+  };
+}
+
+/**
+ * Create a mock entity wrapper with an edict number.
+ * @param {number} edictNum Edict slot number.
+ * @returns {object} Mock entity.
+ */
+function createEntity(edictNum) {
+  return {
+    edict: { num: edictNum },
+  };
+}
+
+void describe('GameStats', () => {
+  void test('keeps the .mjs shim aligned with the TypeScript module', () => {
+    assert.equal(gameStatsShimModule.default, GameStats);
+    assert.deepEqual(gameStatsShimModule.gameStatSlots, gameStatSlots);
+  });
+
+  void test('tracks decorated stat fields for serialization', () => {
+    const engineAPI = createEngineAPI();
+    const stats = new GameStats({}, engineAPI);
+
+    assert.ok(Array.isArray(GameStats.serializableFields));
+    assert.ok(Object.isFrozen(GameStats.serializableFields));
+    assert.deepEqual(GameStats.serializableFields, [...gameStatSlots]);
+    assert.deepEqual(stats._serializer.serialize(), {
+      monsters_killed: ['P', 0],
+      monsters_total: ['P', 0],
+      secrets_found: ['P', 0],
+      secrets_total: ['P', 0],
+    });
+  });
+
+  void test('subscribes to gameplay events and broadcasts stat updates', () => {
+    const engineAPI = createEngineAPI();
+    const stats = new GameStats({}, engineAPI);
+    const secretFinder = createEntity(17);
+    const attacker = createEntity(42);
+
+    stats.subscribeToEvents();
+
+    engineAPI.eventBus.publish('game.secret.spawned');
+    engineAPI.eventBus.publish('game.monster.spawned');
+    engineAPI.eventBus.publish('game.secret.found', createEntity(8), secretFinder);
+    engineAPI.eventBus.publish('game.monster.killed', createEntity(9), attacker);
+
+    assert.equal(stats.secrets_total, 1);
+    assert.equal(stats.monsters_total, 1);
+    assert.equal(stats.secrets_found, 1);
+    assert.equal(stats.monsters_killed, 1);
+    assert.deepEqual(engineAPI.broadcasts, [
+      [true, clientEvent.STATS_UPDATED, 'secrets_found', 1, secretFinder.edict],
+      [true, clientEvent.STATS_UPDATED, 'monsters_killed', 1, attacker.edict],
+    ]);
+  });
+
+  void test('sends every stat slot to a player in slot order', () => {
+    const engineAPI = createEngineAPI();
+    const stats = new GameStats({}, engineAPI);
+    const playerEntity = createEntity(7);
+
+    stats.monsters_total = 10;
+    stats.monsters_killed = 4;
+    stats.secrets_total = 3;
+    stats.secrets_found = 2;
+
+    stats.sendToPlayer(playerEntity);
+
+    assert.deepEqual(engineAPI.dispatches, [
+      [playerEntity.edict, true, clientEvent.STATS_INIT, 'monsters_total', 10],
+      [playerEntity.edict, true, clientEvent.STATS_INIT, 'monsters_killed', 4],
+      [playerEntity.edict, true, clientEvent.STATS_INIT, 'secrets_total', 3],
+      [playerEntity.edict, true, clientEvent.STATS_INIT, 'secrets_found', 2],
+    ]);
+  });
+
+  void test('reset clears all stat counters', () => {
+    const engineAPI = createEngineAPI();
+    const stats = new GameStats({}, engineAPI);
+
+    stats.monsters_total = 8;
+    stats.monsters_killed = 5;
+    stats.secrets_total = 4;
+    stats.secrets_found = 1;
+
+    stats.reset();
+
+    for (const statSlot of gameStatSlots) {
+      assert.equal(stats[statSlot], 0);
+    }
+  });
+});
diff --git a/test/common/id1-knights.test.mjs b/test/game/id1-knights.test.mjs
similarity index 100%
rename from test/common/id1-knights.test.mjs
rename to test/game/id1-knights.test.mjs
diff --git a/test/game/id1-ogre.test.mjs b/test/game/id1-ogre.test.mjs
new file mode 100644
index 00000000..6f8b5d3c
--- /dev/null
+++ b/test/game/id1-ogre.test.mjs
@@ -0,0 +1,72 @@
+import { describe, test } from 'node:test';
+import assert from 'node:assert/strict';
+
+await import('../../source/game/id1/GameAPI.ts');
+
+const { default: OgreMonsterEntity } = await import('../../source/game/id1/entity/monster/Ogre.ts');
+
+OgreMonsterEntity._initStates();
+
+void describe('OgreMonsterEntity metadata', () => {
+  void test('class metadata matches the original monster', () => {
+    assert.equal(OgreMonsterEntity.classname, 'monster_ogre');
+    assert.equal(OgreMonsterEntity._health, 200);
+    assert.equal(OgreMonsterEntity._modelDefault, 'progs/ogre.mdl');
+    assert.equal(OgreMonsterEntity._modelHead, 'progs/h_ogre.mdl');
+  });
+
+  void test('size vectors are correct', () => {
+    const [mins, maxs] = OgreMonsterEntity._size;
+    assert.deepEqual([mins[0], mins[1], mins[2]], [-32, -32, -24]);
+    assert.deepEqual([maxs[0], maxs[1], maxs[2]], [32, 32, 64]);
+  });
+
+  void test('serializableFields is a frozen empty array', () => {
+    const { serializableFields } = /** @type {{ serializableFields: unknown }} */ (/** @type {unknown} */ (OgreMonsterEntity));
+    assert.ok(Array.isArray(serializableFields));
+    assert.ok(Object.isFrozen(serializableFields));
+    assert.deepEqual(serializableFields, []);
+  });
+});
+
+void describe('OgreMonsterEntity state machine', () => {
+  void test('core movement sequences loop', () => {
+    const states = OgreMonsterEntity['_states'];
+    assert.equal(states.ogre_stand9.nextState, 'ogre_stand1');
+    assert.equal(states.ogre_walk16.nextState, 'ogre_walk1');
+    assert.equal(states.ogre_run8.nextState, 'ogre_run1');
+  });
+
+  void test('melee and missile attacks return to the run loop', () => {
+    const states = OgreMonsterEntity['_states'];
+    assert.equal(states.ogre_swing14.nextState, 'ogre_run1');
+    assert.equal(states.ogre_smash14.nextState, 'ogre_run1');
+    assert.equal(states.ogre_nail7.nextState, 'ogre_run1');
+  });
+
+  void test('pain variants return to the run loop', () => {
+    const states = OgreMonsterEntity['_states'];
+    assert.equal(states.ogre_pain5.nextState, 'ogre_run1');
+    assert.equal(states.ogre_pain1b3.nextState, 'ogre_run1');
+    assert.equal(states.ogre_pain1c6.nextState, 'ogre_run1');
+    assert.equal(states.ogre_pain1d16.nextState, 'ogre_run1');
+    assert.equal(states.ogre_pain1e15.nextState, 'ogre_run1');
+  });
+
+  void test('death chains terminate correctly', () => {
+    const states = OgreMonsterEntity['_states'];
+    assert.equal(states.ogre_die14.nextState, null);
+    assert.equal(states.ogre_bdie10.nextState, null);
+  });
+
+  void test('sequence handlers remain present on active states', () => {
+    const states = OgreMonsterEntity['_states'];
+    assert.equal(typeof states.ogre_stand5.handler, 'function');
+    assert.equal(typeof states.ogre_walk6.handler, 'function');
+    assert.equal(typeof states.ogre_run1.handler, 'function');
+    assert.equal(typeof states.ogre_swing5.handler, 'function');
+    assert.equal(typeof states.ogre_smash12.handler, 'function');
+    assert.equal(typeof states.ogre_nail4.handler, 'function');
+    assert.equal(typeof states.ogre_bdie2.handler, 'function');
+  });
+});
diff --git a/test/game/id1-oldone.test.mjs b/test/game/id1-oldone.test.mjs
new file mode 100644
index 00000000..f4536040
--- /dev/null
+++ b/test/game/id1-oldone.test.mjs
@@ -0,0 +1,224 @@
+import { describe, test } from 'node:test';
+import assert from 'node:assert/strict';
+
+import Vector from '../../source/shared/Vector.ts';
+import { damage, moveType, solid } from '../../source/game/id1/Defs.ts';
+
+await import('../../source/game/id1/GameAPI.ts');
+
+const { default: OldOneMonster } = await import('../../source/game/id1/entity/monster/OldOne.mjs');
+
+OldOneMonster._initStates();
+
+/**
+ * Create a minimal OldOne fixture for focused behavior tests.
+ * @param {typeof OldOneMonster} MonsterClass Monster constructor under test.
+ * @param {object} [gameOverrides] Optional game API overrides.
+ * @returns {OldOneMonster} Monster fixture instance.
+ */
+function createMonsterFixture(MonsterClass, gameOverrides = {}) {
+  const edict = {
+    num: 1,
+    entity: null,
+    freeEdict() {},
+    setOrigin() {},
+    setModel() {},
+    setMinMaxSize() {},
+    walkMove() {
+      return false;
+    },
+    changeYaw() {
+      return 0;
+    },
+    dropToFloor() {
+      return true;
+    },
+    isOnTheFloor() {
+      return false;
+    },
+    makeStatic() {},
+    aim() {
+      return null;
+    },
+    moveToGoal() {
+      return false;
+    },
+    isInPXS() {
+      return true;
+    },
+    getNextBestClient() {
+      return null;
+    },
+  };
+
+  const engine = {
+    IsLoading() {
+      return false;
+    },
+    PrecacheModel() {},
+    PrecacheSound() {},
+    ParseQC() {
+      return null;
+    },
+    StartSound() {},
+    SpawnEntity() {
+      return { entity: null };
+    },
+    FindByFieldAndValue() {
+      return null;
+    },
+    FindAllByFieldAndValue() {
+      return [];
+    },
+    DispatchTempEntityEvent() {},
+    Lightstyle() {},
+    PlayTrack() {},
+    eventBus: {
+      publish() {},
+    },
+  };
+
+  const gameAPI = {
+    engine,
+    time: 10,
+    deathmatch: 0,
+    nomonsters: 0,
+    intermission_running: 0,
+    intermission_exittime: 0,
+    ...gameOverrides,
+  };
+
+  const entity = new MonsterClass(edict, gameAPI);
+  edict.entity = entity;
+  entity.origin = new Vector(10, 20, 30);
+  entity.angles = new Vector();
+
+  return entity;
+}
+
+void describe('OldOneMonster metadata', () => {
+  void test('class metadata matches the original monster', () => {
+    assert.equal(OldOneMonster.classname, 'monster_oldone');
+    assert.equal(OldOneMonster._modelDefault, 'progs/oldone.mdl');
+    assert.ok(Array.isArray(OldOneMonster.serializableFields));
+    assert.ok(Object.isFrozen(OldOneMonster.serializableFields));
+  });
+
+  void test('thrash light levels preserve the QuakeC sequence', () => {
+    assert.deepEqual(OldOneMonster._thrashLightLevels, ['m', 'k', 'k', 'i', 'g', 'e', 'c', 'a', 'c', 'e', 'g', 'i', 'k', 'm', 'm', 'g', 'c', 'b', 'a', 'a']);
+  });
+});
+
+void describe('OldOneMonster state machine', () => {
+  void test('idle sequence keeps all 46 frames and loops', () => {
+    const states = OldOneMonster._states;
+
+    for (let i = 1; i <= 46; i++) {
+      assert.equal(states[`old_idle${i}`].keyframe, `old${i}`);
+    }
+    assert.equal(states.old_idle46.nextState, 'old_idle1');
+  });
+
+  void test('thrash sequence keeps the duplicate shake12 frame and terminal loop', () => {
+    const states = OldOneMonster._states;
+
+    for (let i = 1; i <= 11; i++) {
+      assert.equal(states[`old_thrash${i}`].keyframe, `shake${i}`);
+    }
+    assert.equal(states.old_thrash12.keyframe, 'shake12');
+    assert.equal(states.old_thrash13.keyframe, 'shake13');
+    assert.equal(states.old_thrash20.keyframe, 'shake20');
+    assert.equal(states.old_thrash20.nextState, 'old_thrash20');
+  });
+});
+
+void describe('OldOneMonster QC fixes', () => {
+  void test('pain resets health so only the telefrag finale can kill the boss', () => {
+    const oldOne = createMonsterFixture(OldOneMonster);
+
+    oldOne.health = 1;
+    oldOne.thinkPain();
+
+    assert.equal(oldOne.health, 40000);
+  });
+
+  void test('thrash15 restarts the cycle until the third pass', () => {
+    const oldOne = createMonsterFixture(OldOneMonster);
+    const lightStyles = [];
+    let stateName = null;
+
+    oldOne.engine.Lightstyle = (_style, level) => {
+      lightStyles.push(level);
+    };
+    oldOne._runState = (nextState) => {
+      stateName = nextState;
+      return true;
+    };
+
+    oldOne._thrash15Callback();
+    assert.equal(oldOne.cnt, 1);
+    assert.deepEqual(lightStyles, ['m']);
+    assert.equal(stateName, 'old_thrash1');
+
+    stateName = null;
+    oldOne.cnt = 2;
+    oldOne._thrash15Callback();
+    assert.equal(oldOne.cnt, 3);
+    assert.equal(stateName, null);
+  });
+
+  void test('spawn sets the classic boss bounds and telefrag-only health', () => {
+    const oldOne = createMonsterFixture(OldOneMonster);
+    let stateName = null;
+    let published = null;
+
+    oldOne._runState = (nextState) => {
+      stateName = nextState;
+      return true;
+    };
+    oldOne.engine.eventBus.publish = (eventName, entity) => {
+      published = { eventName, entity };
+    };
+
+    oldOne.spawn();
+
+    assert.equal(oldOne.movetype, moveType.MOVETYPE_STEP);
+    assert.equal(oldOne.solid, solid.SOLID_SLIDEBOX);
+    assert.equal(oldOne.health, 40000);
+    assert.equal(oldOne.takedamage, damage.DAMAGE_YES);
+    assert.equal(stateName, 'old_idle1');
+    assert.deepEqual(published, { eventName: 'game.monster.spawned', entity: oldOne });
+  });
+
+  void test('finale4 tolerates a stand-in edict without an entity', () => {
+    const oldOne = createMonsterFixture(OldOneMonster);
+    let playTrack = null;
+    const lightStyles = [];
+    let removed = false;
+
+    oldOne.engine.SpawnEntity = (classname) => {
+      if (classname === 'misc_null') {
+        return { entity: null };
+      }
+
+      return { entity: null };
+    };
+    oldOne.engine.PlayTrack = (track) => {
+      playTrack = track;
+    };
+    oldOne.engine.Lightstyle = (_style, level) => {
+      lightStyles.push(level);
+    };
+    oldOne.remove = () => {
+      removed = true;
+    };
+
+    assert.doesNotThrow(() => {
+      oldOne._finale4();
+    });
+
+    assert.equal(playTrack, 3);
+    assert.deepEqual(lightStyles, ['m']);
+    assert.equal(removed, true);
+  });
+});
diff --git a/test/game/id1-player-weapons.test.mjs b/test/game/id1-player-weapons.test.mjs
new file mode 100644
index 00000000..1491af7a
--- /dev/null
+++ b/test/game/id1-player-weapons.test.mjs
@@ -0,0 +1,110 @@
+import assert from 'node:assert/strict';
+import { describe, test } from 'node:test';
+
+await import('../../source/game/id1/GameAPI.ts');
+
+const defsModule = await import('../../source/game/id1/Defs.ts');
+const playerModule = await import('../../source/game/id1/entity/Player.mjs');
+const weaponsModule = await import('../../source/game/id1/entity/Weapons.mjs');
+
+const { items, waterlevel } = defsModule;
+const { PlayerEntity } = playerModule;
+const { DamageHandler, PlayerWeapons, weaponConfig } = weaponsModule;
+
+PlayerEntity._initStates();
+
+/**
+ * Create a player-like object for weapon selection tests.
+ * @param {object} overrides Field overrides for the mock player.
+ * @returns {object} Mock player state.
+ */
+function createWeaponSelectionPlayer(overrides = {}) {
+  return {
+    items: items.IT_AXE,
+    ammo_shells: 0,
+    ammo_nails: 0,
+    ammo_rockets: 0,
+    ammo_cells: 0,
+    waterlevel: waterlevel.WATERLEVEL_NONE,
+    ...overrides,
+  };
+}
+
+void describe('Player and weapon module surface', () => {
+  void test('exports the current gameplay classes and weapon config map', () => {
+    assert.equal(typeof PlayerEntity, 'function');
+    assert.equal(typeof playerModule.GibEntity, 'function');
+    assert.equal(typeof PlayerWeapons, 'function');
+    assert.equal(typeof DamageHandler, 'function');
+    assert.equal(weaponConfig instanceof Map, true);
+  });
+});
+
+void describe('PlayerEntity state machine', () => {
+  void test('standing and running loops wrap correctly', () => {
+    const states = PlayerEntity._states;
+
+    assert.equal(states.player_stand5.nextState, 'player_stand1');
+    assert.equal(states.player_stand_axe12.nextState, 'player_stand_axe1');
+    assert.equal(states.player_run6.nextState, 'player_run1');
+    assert.equal(states.player_run_axe6.nextState, 'player_run_axe1');
+  });
+
+  void test('continuous-fire states alternate correctly', () => {
+    const states = PlayerEntity._states;
+
+    assert.equal(states.player_nail1.keyframe, 'nailatt1');
+    assert.equal(states.player_nail1.nextState, 'player_nail2');
+    assert.equal(states.player_nail2.nextState, 'player_nail1');
+
+    assert.equal(states.player_light1.keyframe, 'nailatt1');
+    assert.equal(states.player_light1.nextState, 'player_light2');
+    assert.equal(states.player_light2.nextState, 'player_light1');
+  });
+
+  void test('pain and death chains terminate and keep handlers where needed', () => {
+    const states = PlayerEntity._states;
+
+    assert.equal(states.player_pain6.nextState, null);
+    assert.equal(states.player_pain_axe6.nextState, null);
+    assert.equal(states.player_diea11.nextState, null);
+    assert.equal(states.player_die_ax9.nextState, null);
+
+    assert.equal(typeof states.player_stand1.handler, 'function');
+    assert.equal(typeof states.player_shot1.handler, 'function');
+    assert.equal(typeof states.player_nail1.handler, 'function');
+    assert.equal(typeof states.player_light1.handler, 'function');
+  });
+});
+
+void describe('PlayerEntity weapon selection', () => {
+  void test('falls back to the axe when stronger owned weapons are out of ammo', () => {
+    const player = createWeaponSelectionPlayer({
+      items: items.IT_AXE | items.IT_SHOTGUN | items.IT_SUPER_SHOTGUN,
+    });
+
+    assert.equal(PlayerEntity.prototype.chooseBestWeapon.call(player), items.IT_AXE);
+  });
+
+  void test('skips lightning underwater and keeps the best safe weapon', () => {
+    const player = createWeaponSelectionPlayer({
+      items: items.IT_AXE | items.IT_ROCKET_LAUNCHER | items.IT_LIGHTNING,
+      ammo_rockets: 5,
+      ammo_cells: 30,
+      waterlevel: waterlevel.WATERLEVEL_WAIST,
+    });
+
+    assert.equal(PlayerEntity.prototype.chooseBestWeapon.call(player), items.IT_ROCKET_LAUNCHER);
+  });
+
+  void test('prefers the highest-priority usable weapon', () => {
+    const player = createWeaponSelectionPlayer({
+      items: items.IT_AXE | items.IT_SHOTGUN | items.IT_SUPER_NAILGUN | items.IT_GRENADE_LAUNCHER,
+      ammo_shells: 25,
+      ammo_nails: 20,
+      ammo_rockets: 1,
+    });
+
+    assert.equal(PlayerEntity.prototype.chooseBestWeapon.call(player), items.IT_GRENADE_LAUNCHER);
+  });
+});
diff --git a/test/game/id1-registry.test.mjs b/test/game/id1-registry.test.mjs
new file mode 100644
index 00000000..97e6cff2
--- /dev/null
+++ b/test/game/id1-registry.test.mjs
@@ -0,0 +1,107 @@
+import assert from 'node:assert/strict';
+import { describe, test } from 'node:test';
+
+import BaseEntity from '../../source/game/id1/entity/BaseEntity.ts';
+
+const registryModule = await import('../../source/game/id1/helper/Registry.ts');
+const registryShimModule = await import('../../source/game/id1/helper/Registry.mjs');
+
+const EntityRegistry = registryModule.default;
+
+class RegisteredEntity extends BaseEntity {
+  static classname = 'registered_entity';
+  static clientEntityFields = ['origin', 'angles'];
+  static precacheCalls = 0;
+  static parseModelDataCalls = 0;
+  static initStatesCalls = 0;
+
+  static _precache(_engineAPI) {
+    void _engineAPI;
+    this.precacheCalls += 1;
+  }
+
+  static _parseModelData(_engineAPI) {
+    void _engineAPI;
+    this.parseModelDataCalls += 1;
+  }
+
+  static _initStates() {
+    this.initStatesCalls += 1;
+  }
+}
+
+class ServerOnlyEntity extends BaseEntity {
+  static classname = 'server_only_entity';
+  static clientEntityFields = [];
+  static precacheCalls = 0;
+  static parseModelDataCalls = 0;
+  static initStatesCalls = 0;
+
+  static _precache(_engineAPI) {
+    void _engineAPI;
+    this.precacheCalls += 1;
+  }
+
+  static _parseModelData(_engineAPI) {
+    void _engineAPI;
+    this.parseModelDataCalls += 1;
+  }
+
+  static _initStates() {
+    this.initStatesCalls += 1;
+  }
+}
+
+/**
+ * Reset static hook counters for both test entity classes.
+ * @returns {void}
+ */
+function resetCounters() {
+  RegisteredEntity.precacheCalls = 0;
+  RegisteredEntity.parseModelDataCalls = 0;
+  RegisteredEntity.initStatesCalls = 0;
+  ServerOnlyEntity.precacheCalls = 0;
+  ServerOnlyEntity.parseModelDataCalls = 0;
+  ServerOnlyEntity.initStatesCalls = 0;
+}
+
+void describe('EntityRegistry', () => {
+  void test('keeps the .mjs shim aligned with the TypeScript module', () => {
+    assert.equal(registryShimModule.default, EntityRegistry);
+  });
+
+  void test('registers entity classes by classname', () => {
+    const registry = new EntityRegistry([RegisteredEntity, ServerOnlyEntity]);
+
+    assert.equal(registry.has('registered_entity'), true);
+    assert.equal(registry.has('missing_entity'), false);
+    assert.equal(registry.get('registered_entity'), RegisteredEntity);
+    assert.equal(registry.get('missing_entity'), null);
+    assert.deepEqual([...registry.getAll()], [RegisteredEntity, ServerOnlyEntity]);
+  });
+
+  void test('runs bootstrap hooks across every registered entity class', () => {
+    resetCounters();
+
+    const registry = new EntityRegistry([RegisteredEntity, ServerOnlyEntity]);
+    const engineAPI = {};
+
+    registry.precacheAll(engineAPI);
+    registry.initializeAll(engineAPI);
+
+    assert.equal(RegisteredEntity.precacheCalls, 1);
+    assert.equal(RegisteredEntity.parseModelDataCalls, 1);
+    assert.equal(RegisteredEntity.initStatesCalls, 1);
+    assert.equal(ServerOnlyEntity.precacheCalls, 1);
+    assert.equal(ServerOnlyEntity.parseModelDataCalls, 1);
+    assert.equal(ServerOnlyEntity.initStatesCalls, 1);
+  });
+
+  void test('returns only entities with client-exposed fields', () => {
+    const registry = new EntityRegistry([RegisteredEntity, ServerOnlyEntity]);
+
+    assert.deepEqual(registry.getClientEntityFields(), {
+      registered_entity: ['origin', 'angles'],
+    });
+  });
+});
diff --git a/test/game/id1-shalrath.test.mjs b/test/game/id1-shalrath.test.mjs
new file mode 100644
index 00000000..56f45c23
--- /dev/null
+++ b/test/game/id1-shalrath.test.mjs
@@ -0,0 +1,211 @@
+import { describe, test } from 'node:test';
+import assert from 'node:assert/strict';
+
+import Vector from '../../source/shared/Vector.ts';
+import { effect } from '../../source/game/id1/Defs.ts';
+
+await import('../../source/game/id1/GameAPI.ts');
+
+const { default: ShalrathMonsterEntity, ShalrathMissileEntity } = await import('../../source/game/id1/entity/monster/Shalrath.mjs');
+
+ShalrathMonsterEntity._initStates();
+
+/**
+ * Create a minimal Shalrath fixture for focused behavior tests.
+ * @param {typeof ShalrathMonsterEntity} MonsterClass Monster constructor under test.
+ * @returns {ShalrathMonsterEntity} Monster fixture instance.
+ */
+function createMonsterFixture(MonsterClass) {
+  const edict = {
+    num: 1,
+    entity: null,
+    freeEdict() {},
+    setOrigin() {},
+    setModel() {},
+    setMinMaxSize() {},
+    walkMove() {
+      return false;
+    },
+    changeYaw() {
+      return 0;
+    },
+    dropToFloor() {
+      return true;
+    },
+    isOnTheFloor() {
+      return false;
+    },
+    makeStatic() {},
+    aim() {
+      return null;
+    },
+    moveToGoal() {
+      return false;
+    },
+    isInPXS() {
+      return true;
+    },
+    getNextBestClient() {
+      return null;
+    },
+  };
+
+  const engine = {
+    IsLoading() {
+      return false;
+    },
+    PrecacheModel() {},
+    PrecacheSound() {},
+    ParseQC() {
+      return null;
+    },
+    StartSound() {},
+    SpawnEntity() {
+      return { entity: null };
+    },
+    eventBus: {
+      publish() {},
+    },
+  };
+
+  const gameAPI = {
+    engine,
+    time: 0,
+    skill: 1,
+    deathmatch: 0,
+    nomonsters: 0,
+  };
+
+  const entity = new MonsterClass(edict, gameAPI);
+  edict.entity = entity;
+  entity.origin = new Vector(10, 20, 30);
+  entity.angles = new Vector();
+  entity.enemy = {
+    origin: new Vector(90, 20, 30),
+    health: 100,
+  };
+
+  return entity;
+}
+
+void describe('ShalrathMonsterEntity metadata', () => {
+  void test('class metadata matches the original monster', () => {
+    assert.equal(ShalrathMonsterEntity.classname, 'monster_shalrath');
+    assert.equal(ShalrathMonsterEntity._health, 400);
+    assert.equal(ShalrathMonsterEntity._modelDefault, 'progs/shalrath.mdl');
+    assert.equal(ShalrathMonsterEntity._modelHead, 'progs/h_shal.mdl');
+  });
+
+  void test('size vectors are correct', () => {
+    const [mins, maxs] = ShalrathMonsterEntity._size;
+    assert.deepEqual([mins[0], mins[1], mins[2]], [-32, -32, -24]);
+    assert.deepEqual([maxs[0], maxs[1], maxs[2]], [32, 32, 64]);
+  });
+});
+
+void describe('ShalrathMonsterEntity state machine', () => {
+  void test('walk and run loops match the QuakeC frame counts', () => {
+    const states = ShalrathMonsterEntity._states;
+
+    assert.equal(states.shal_stand.keyframe, 'walk1');
+    assert.equal(states.shal_stand.nextState, 'shal_stand');
+
+    for (let i = 1; i <= 12; i++) {
+      assert.ok(states[`shal_walk${i}`], `missing shal_walk${i}`);
+      assert.ok(states[`shal_run${i}`], `missing shal_run${i}`);
+    }
+    assert.equal(states.shal_walk12.nextState, 'shal_walk1');
+    assert.equal(states.shal_run12.nextState, 'shal_run1');
+  });
+
+  void test('attack, pain, and death chains keep the original frame counts', () => {
+    const states = ShalrathMonsterEntity._states;
+
+    for (let i = 1; i <= 11; i++) {
+      assert.equal(states[`shal_attack${i}`].keyframe, `attack${i}`);
+    }
+    assert.equal(states.shal_attack11.nextState, 'shal_run1');
+
+    for (let i = 1; i <= 5; i++) {
+      assert.equal(states[`shal_pain${i}`].keyframe, `pain${i}`);
+    }
+    assert.equal(states.shal_pain5.nextState, 'shal_run1');
+
+    for (let i = 1; i <= 7; i++) {
+      assert.equal(states[`shal_death${i}`].keyframe, `death${i}`);
+    }
+    assert.equal(states.shal_death7.nextState, null);
+  });
+});
+
+void describe('ShalrathMonsterEntity QC fixes', () => {
+  void test('launchMissile adds muzzleflash, plays attack2, and spawns a missile', () => {
+    const shalrath = createMonsterFixture(ShalrathMonsterEntity);
+    const spawned = [];
+    const sounds = [];
+
+    shalrath.engine.SpawnEntity = (classname, initialData) => {
+      spawned.push({ classname, initialData });
+      return { entity: null };
+    };
+    shalrath.startSound = (_channel, soundName) => {
+      sounds.push(soundName);
+    };
+
+    shalrath.launchMissile();
+
+    assert.equal((shalrath.effects & effect.EF_MUZZLEFLASH) !== 0, true);
+    assert.deepEqual(sounds, ['shalrath/attack2.wav']);
+    assert.equal(spawned.length, 1);
+    assert.equal(spawned[0].classname, ShalrathMissileEntity.classname);
+    assert.equal(spawned[0].initialData.owner, shalrath);
+  });
+
+  void test('missile spawn starts above the owner and adds the classic spin', () => {
+    const owner = createMonsterFixture(ShalrathMonsterEntity);
+    const edict = {
+      num: 2,
+      entity: null,
+      freeEdict() {},
+      setOrigin() {},
+      setModel() {},
+      setMinMaxSize() {},
+      walkMove() {
+        return false;
+      },
+      changeYaw() {
+        return 0;
+      },
+      dropToFloor() {
+        return true;
+      },
+      isOnTheFloor() {
+        return false;
+      },
+      makeStatic() {},
+      aim() {
+        return null;
+      },
+      moveToGoal() {
+        return false;
+      },
+      isInPXS() {
+        return true;
+      },
+      getNextBestClient() {
+        return null;
+      },
+    };
+
+    const missile = new ShalrathMissileEntity(edict, owner.game);
+    edict.entity = missile;
+    missile.owner = owner;
+    owner.movedir = new Vector(1, 0, 0);
+
+    missile.spawn();
+
+    assert.deepEqual([missile.origin[0], missile.origin[1], missile.origin[2]], [10, 20, 40]);
+    assert.deepEqual([missile.avelocity[0], missile.avelocity[1], missile.avelocity[2]], [300, 300, 300]);
+    assert.equal(Math.round(missile.velocity.len()), 400);
+  });
+});
diff --git a/test/game/id1-shambler.test.mjs b/test/game/id1-shambler.test.mjs
new file mode 100644
index 00000000..e5c9fb6c
--- /dev/null
+++ b/test/game/id1-shambler.test.mjs
@@ -0,0 +1,218 @@
+import { describe, test } from 'node:test';
+import assert from 'node:assert/strict';
+
+import Vector from '../../source/shared/Vector.ts';
+
+await import('../../source/game/id1/GameAPI.ts');
+
+const { default: ShamblerMonsterEntity } = await import('../../source/game/id1/entity/monster/Shambler.mjs');
+
+ShamblerMonsterEntity._initStates();
+
+/**
+ * Create a minimal Shambler fixture for focused behavior tests.
+ * @param {typeof ShamblerMonsterEntity} MonsterClass Monster constructor under test.
+ * @returns {ShamblerMonsterEntity} Monster fixture instance.
+ */
+function createMonsterFixture(MonsterClass) {
+  const edict = {
+    num: 1,
+    entity: null,
+    freeEdict() {},
+    setOrigin() {},
+    setModel() {},
+    setMinMaxSize() {},
+    walkMove() {
+      return false;
+    },
+    changeYaw() {
+      return 0;
+    },
+    dropToFloor() {
+      return true;
+    },
+    isOnTheFloor() {
+      return false;
+    },
+    makeStatic() {},
+    aim() {
+      return null;
+    },
+    moveToGoal() {
+      return false;
+    },
+    isInPXS() {
+      return true;
+    },
+    getNextBestClient() {
+      return null;
+    },
+  };
+
+  const engine = {
+    IsLoading() {
+      return false;
+    },
+    PrecacheModel() {},
+    PrecacheSound() {},
+    ParseQC() {
+      return null;
+    },
+    StartSound() {},
+    SpawnEntity() {
+      return { entity: null };
+    },
+    DispatchTempEntityEvent() {},
+    eventBus: {
+      publish() {},
+    },
+  };
+
+  const gameAPI = {
+    engine,
+    time: 0,
+    skill: 1,
+    deathmatch: 0,
+    nomonsters: 0,
+  };
+
+  const entity = new MonsterClass(edict, gameAPI);
+  edict.entity = entity;
+  entity.origin = new Vector();
+  entity.angles = new Vector();
+  entity.enemy = null;
+
+  return entity;
+}
+
+void describe('ShamblerMonsterEntity metadata', () => {
+  void test('class metadata matches the original monster', () => {
+    assert.equal(ShamblerMonsterEntity.classname, 'monster_shambler');
+    assert.equal(ShamblerMonsterEntity._health, 600);
+    assert.equal(ShamblerMonsterEntity._modelDefault, 'progs/shambler.mdl');
+    assert.equal(ShamblerMonsterEntity._modelHead, 'progs/h_shams.mdl');
+  });
+
+  void test('size vectors are correct', () => {
+    const [mins, maxs] = ShamblerMonsterEntity._size;
+    assert.deepEqual([mins[0], mins[1], mins[2]], [-32, -32, -24]);
+    assert.deepEqual([maxs[0], maxs[1], maxs[2]], [32, 32, 64]);
+  });
+});
+
+void describe('ShamblerMonsterEntity state machine', () => {
+  void test('stand, walk, and run loops match the QuakeC frame counts', () => {
+    const states = ShamblerMonsterEntity._states;
+
+    for (let i = 1; i <= 17; i++) {
+      assert.equal(states[`sham_stand${i}`].keyframe, `stand${i}`);
+    }
+    assert.equal(states.sham_stand17.nextState, 'sham_stand1');
+
+    for (let i = 1; i <= 12; i++) {
+      assert.equal(states[`sham_walk${i}`].keyframe, `walk${i}`);
+    }
+    assert.equal(states.sham_walk12.nextState, 'sham_walk1');
+
+    for (let i = 1; i <= 6; i++) {
+      assert.equal(states[`sham_run${i}`].keyframe, `run${i}`);
+    }
+    assert.equal(states.sham_run6.nextState, 'sham_run1');
+  });
+
+  void test('melee chains return to the run loop', () => {
+    const states = ShamblerMonsterEntity._states;
+
+    for (let i = 1; i <= 12; i++) {
+      assert.equal(states[`sham_smash${i}`].keyframe, `smash${i}`);
+    }
+    assert.equal(states.sham_smash12.nextState, 'sham_run1');
+
+    for (let i = 1; i <= 9; i++) {
+      assert.equal(states[`sham_swingl${i}`].keyframe, `swingl${i}`);
+      assert.equal(states[`sham_swingr${i}`].keyframe, `swingr${i}`);
+    }
+    assert.equal(states.sham_swingl9.nextState, 'sham_run1');
+    assert.equal(states.sham_swingr9.nextState, 'sham_run1');
+  });
+
+  void test('magic sequence keeps the legacy extra magic3 state and skips directly to magic9', () => {
+    const states = ShamblerMonsterEntity._states;
+
+    assert.equal(states.sham_magic1.keyframe, 'magic1');
+    assert.equal(states.sham_magic2.keyframe, 'magic2');
+    assert.equal(states.sham_magic3.keyframe, 'magic3');
+    assert.equal(states.sham_magic3.nextState, 'sham_magic3b');
+    assert.equal(states.sham_magic3b.keyframe, 'magic3');
+    assert.equal(states.sham_magic3b.nextState, 'sham_magic4');
+    assert.equal(states.sham_magic4.keyframe, 'magic4');
+    assert.equal(states.sham_magic5.keyframe, 'magic5');
+    assert.equal(states.sham_magic6.keyframe, 'magic6');
+    assert.equal(states.sham_magic6.nextState, 'sham_magic9');
+    assert.equal(states.sham_magic9.keyframe, 'magic9');
+    assert.equal(states.sham_magic10.keyframe, 'magic10');
+    assert.equal(states.sham_magic11.keyframe, 'magic11');
+    assert.equal(states.sham_magic12.keyframe, 'magic12');
+    assert.equal(states.sham_magic12.nextState, 'sham_run1');
+  });
+
+  void test('pain and death sequences transition correctly', () => {
+    const states = ShamblerMonsterEntity._states;
+
+    for (let i = 1; i <= 6; i++) {
+      assert.equal(states[`sham_pain${i}`].keyframe, `pain${i}`);
+    }
+    assert.equal(states.sham_pain6.nextState, 'sham_run1');
+
+    for (let i = 1; i <= 11; i++) {
+      assert.equal(states[`sham_death${i}`].keyframe, `death${i}`);
+    }
+    assert.equal(states.sham_death11.nextState, null);
+  });
+
+  void test('active states keep handlers while passive pain and death frames omit them', () => {
+    const states = ShamblerMonsterEntity._states;
+
+    for (const name of ['sham_stand1', 'sham_walk12', 'sham_run6', 'sham_smash10', 'sham_swingl7', 'sham_swingr7', 'sham_magic1', 'sham_magic3', 'sham_magic3b', 'sham_magic11']) {
+      assert.equal(typeof states[name].handler, 'function', `${name} handler should be a function`);
+    }
+
+    for (const name of ['sham_pain1', 'sham_pain6', 'sham_magic12']) {
+      assert.equal(states[name].handler, null, `${name} handler should be omitted`);
+    }
+
+    for (const name of ['sham_death1', 'sham_death11']) {
+      assert.equal(typeof states[name].handler, 'function', `${name} handler should be a function`);
+    }
+  });
+});
+
+void describe('ShamblerMonsterEntity QC fixes', () => {
+  void test('castLightning does not replay the boom sound on every pulse', () => {
+    const shambler = createMonsterFixture(ShamblerMonsterEntity);
+    let soundCalls = 0;
+    let beamCalls = 0;
+
+    shambler.enemy = {
+      origin: new Vector(64, 0, 0),
+    };
+    shambler._ai.face = () => {};
+    shambler.startSound = () => {
+      soundCalls += 1;
+    };
+    shambler.traceline = () => ({
+      point: new Vector(64, 0, 0),
+    });
+    shambler._damageInflictor = {
+      lightningDamage() {},
+      dispatchBeamEvent() {
+        beamCalls += 1;
+      },
+    };
+
+    shambler.castLightning();
+
+    assert.equal(soundCalls, 0);
+    assert.equal(beamCalls, 1);
+  });
+});
diff --git a/test/common/id1-soldier.test.mjs b/test/game/id1-soldier.test.mjs
similarity index 100%
rename from test/common/id1-soldier.test.mjs
rename to test/game/id1-soldier.test.mjs
diff --git a/test/game/id1-tarbaby.test.mjs b/test/game/id1-tarbaby.test.mjs
new file mode 100644
index 00000000..64894939
--- /dev/null
+++ b/test/game/id1-tarbaby.test.mjs
@@ -0,0 +1,178 @@
+import { describe, test } from 'node:test';
+import assert from 'node:assert/strict';
+
+import Vector from '../../source/shared/Vector.ts';
+import { tentType } from '../../source/game/id1/Defs.ts';
+
+await import('../../source/game/id1/GameAPI.ts');
+
+const { default: TarbabyMonsterEntity } = await import('../../source/game/id1/entity/monster/Tarbaby.mjs');
+
+TarbabyMonsterEntity._initStates();
+
+/**
+ * Create a minimal Tarbaby fixture for focused behavior tests.
+ * @param {typeof TarbabyMonsterEntity} MonsterClass Monster constructor under test.
+ * @returns {{ entity: TarbabyMonsterEntity, events: Array<{ eventType: number, origin: Vector }> }} Monster fixture and captured temp events.
+ */
+function createMonsterFixture(MonsterClass) {
+  const edict = {
+    num: 1,
+    entity: null,
+    freeEdict() {},
+    setOrigin() {},
+    setModel() {},
+    setMinMaxSize() {},
+    walkMove() {
+      return false;
+    },
+    changeYaw() {
+      return 0;
+    },
+    dropToFloor() {
+      return true;
+    },
+    isOnTheFloor() {
+      return false;
+    },
+    makeStatic() {},
+    aim() {
+      return null;
+    },
+    moveToGoal() {
+      return false;
+    },
+    isInPXS() {
+      return true;
+    },
+    getNextBestClient() {
+      return null;
+    },
+  };
+
+  const events = [];
+
+  const engine = {
+    IsLoading() {
+      return false;
+    },
+    PrecacheModel() {},
+    PrecacheSound() {},
+    ParseQC() {
+      return null;
+    },
+    StartSound() {},
+    SpawnEntity() {
+      return { entity: null };
+    },
+    DispatchTempEntityEvent(eventType, origin) {
+      events.push({ eventType, origin: origin.copy() });
+    },
+    eventBus: {
+      publish() {},
+    },
+  };
+
+  const gameAPI = {
+    engine,
+    time: 0,
+    skill: 1,
+    deathmatch: 0,
+    nomonsters: 0,
+  };
+
+  const entity = new MonsterClass(edict, gameAPI);
+  edict.entity = entity;
+  entity.origin = new Vector(10, 20, 30);
+  entity.velocity = new Vector(100, 0, 0);
+
+  return { entity, events };
+}
+
+void describe('TarbabyMonsterEntity metadata', () => {
+  void test('class metadata matches the original monster', () => {
+    assert.equal(TarbabyMonsterEntity.classname, 'monster_tarbaby');
+    assert.equal(TarbabyMonsterEntity._health, 80);
+    assert.equal(TarbabyMonsterEntity._modelDefault, 'progs/tarbaby.mdl');
+  });
+
+  void test('size vectors are correct', () => {
+    const [mins, maxs] = TarbabyMonsterEntity._size;
+    assert.deepEqual([mins[0], mins[1], mins[2]], [-16, -16, -24]);
+    assert.deepEqual([maxs[0], maxs[1], maxs[2]], [16, 16, 40]);
+  });
+});
+
+void describe('TarbabyMonsterEntity state machine', () => {
+  void test('stand and hang states loop on a single frame', () => {
+    const states = TarbabyMonsterEntity._states;
+
+    assert.equal(states.tbaby_stand1.keyframe, 'walk1');
+    assert.equal(states.tbaby_stand1.nextState, 'tbaby_stand1');
+    assert.equal(states.tbaby_hang1.keyframe, 'walk1');
+    assert.equal(states.tbaby_hang1.nextState, 'tbaby_hang1');
+  });
+
+  void test('walk and run loops match the QuakeC frame counts', () => {
+    const states = TarbabyMonsterEntity._states;
+
+    for (let i = 1; i <= 25; i++) {
+      assert.equal(states[`tbaby_walk${i}`].keyframe, `walk${i}`);
+      assert.equal(states[`tbaby_run${i}`].keyframe, `run${i}`);
+    }
+    assert.equal(states.tbaby_walk25.nextState, 'tbaby_walk1');
+    assert.equal(states.tbaby_run25.nextState, 'tbaby_run1');
+  });
+
+  void test('jump and fly chains follow the legacy bounce cycle', () => {
+    const states = TarbabyMonsterEntity._states;
+
+    for (let i = 1; i <= 6; i++) {
+      assert.equal(states[`tbaby_jump${i}`].keyframe, `jump${i}`);
+    }
+    assert.equal(states.tbaby_jump6.nextState, 'tbaby_fly1');
+
+    for (let i = 1; i <= 4; i++) {
+      assert.equal(states[`tbaby_fly${i}`].keyframe, `fly${i}`);
+    }
+    assert.equal(states.tbaby_fly4.nextState, 'tbaby_fly1');
+  });
+
+  void test('death sequence terminates after the explosion frame', () => {
+    const states = TarbabyMonsterEntity._states;
+
+    assert.equal(states.tbaby_die1.keyframe, 'exp');
+    assert.equal(states.tbaby_die1.nextState, 'tbaby_die2');
+    assert.equal(states.tbaby_die2.keyframe, 'exp');
+    assert.equal(states.tbaby_die2.nextState, null);
+  });
+
+  void test('all tarbaby states currently carry handlers', () => {
+    const states = TarbabyMonsterEntity._states;
+
+    for (const name of ['tbaby_stand1', 'tbaby_hang1', 'tbaby_walk1', 'tbaby_walk25', 'tbaby_run1', 'tbaby_run25', 'tbaby_jump5', 'tbaby_jump6', 'tbaby_fly1', 'tbaby_fly4', 'tbaby_die1', 'tbaby_die2']) {
+      assert.equal(typeof states[name].handler, 'function', `${name} handler should be a function`);
+    }
+  });
+});
+
+void describe('TarbabyMonsterEntity QC fixes', () => {
+  void test('death explosion emits TE_TAREXPLOSION and removes the entity', () => {
+    const { entity, events } = createMonsterFixture(TarbabyMonsterEntity);
+    let removed = false;
+
+    entity._damageInflictor = {
+      blastDamage() {},
+    };
+    entity.startSound = () => {};
+    entity.remove = () => {
+      removed = true;
+    };
+
+    entity._dieInAnExplosion();
+
+    assert.equal(events.length, 1);
+    assert.equal(events[0].eventType, tentType.TE_TAREXPLOSION);
+    assert.equal(removed, true);
+  });
+});
diff --git a/test/game/id1-wizard.test.mjs b/test/game/id1-wizard.test.mjs
new file mode 100644
index 00000000..7d40c93a
--- /dev/null
+++ b/test/game/id1-wizard.test.mjs
@@ -0,0 +1,240 @@
+import { describe, test } from 'node:test';
+import assert from 'node:assert/strict';
+
+import Vector from '../../source/shared/Vector.ts';
+import { range } from '../../source/game/id1/Defs.ts';
+import { ATTACK_STATE } from '../../source/game/id1/helper/AI.ts';
+
+await import('../../source/game/id1/GameAPI.ts');
+
+const { default: WizardMonsterEntity } = await import('../../source/game/id1/entity/monster/Wizard.mjs');
+
+WizardMonsterEntity._initStates();
+
+/**
+ * Create a minimal Wizard fixture for focused behavior tests.
+ * @param {typeof WizardMonsterEntity} MonsterClass Monster constructor under test.
+ * @returns {WizardMonsterEntity} Monster fixture instance.
+ */
+function createMonsterFixture(MonsterClass) {
+  const edict = {
+    num: 1,
+    entity: null,
+    freeEdict() {},
+    setOrigin() {},
+    setModel() {},
+    setMinMaxSize() {},
+    walkMove() {
+      return false;
+    },
+    changeYaw() {
+      return 0;
+    },
+    dropToFloor() {
+      return true;
+    },
+    isOnTheFloor() {
+      return false;
+    },
+    makeStatic() {},
+    aim() {
+      return null;
+    },
+    moveToGoal() {
+      return false;
+    },
+    isInPXS() {
+      return true;
+    },
+    getNextBestClient() {
+      return null;
+    },
+  };
+
+  const engine = {
+    IsLoading() {
+      return false;
+    },
+    PrecacheModel() {},
+    PrecacheSound() {},
+    ParseQC() {
+      return null;
+    },
+    StartSound() {},
+    SpawnEntity() {
+      return { entity: null };
+    },
+    eventBus: {
+      publish() {},
+    },
+  };
+
+  const gameAPI = {
+    engine,
+    time: 5,
+    skill: 1,
+    deathmatch: 0,
+    nomonsters: 0,
+  };
+
+  const entity = new MonsterClass(edict, gameAPI);
+  edict.entity = entity;
+  entity.origin = new Vector();
+  entity.angles = new Vector();
+  entity.enemy = {
+    origin: new Vector(128, 0, 0),
+    velocity: new Vector(),
+    view_ofs: new Vector(0, 0, 22),
+    mins: new Vector(-16, -16, -24),
+    size: new Vector(32, 32, 56),
+    health: 100,
+  };
+
+  return entity;
+}
+
+void describe('WizardMonsterEntity metadata', () => {
+  void test('class metadata matches the original monster', () => {
+    assert.equal(WizardMonsterEntity.classname, 'monster_wizard');
+    assert.equal(WizardMonsterEntity._health, 80);
+    assert.equal(WizardMonsterEntity._modelDefault, 'progs/wizard.mdl');
+    assert.equal(WizardMonsterEntity._modelHead, 'progs/h_wizard.mdl');
+  });
+
+  void test('size vectors are correct', () => {
+    const [mins, maxs] = WizardMonsterEntity._size;
+    assert.deepEqual([mins[0], mins[1], mins[2]], [-16, -16, -24]);
+    assert.deepEqual([maxs[0], maxs[1], maxs[2]], [16, 16, 40]);
+  });
+});
+
+void describe('WizardMonsterEntity state machine', () => {
+  void test('stand, walk, side, and run loops match the QuakeC frame counts', () => {
+    const states = WizardMonsterEntity._states;
+
+    for (let i = 1; i <= 8; i++) {
+      assert.equal(states[`wiz_stand${i}`].keyframe, `hover${i}`);
+      assert.equal(states[`wiz_walk${i}`].keyframe, `hover${i}`);
+      assert.equal(states[`wiz_side${i}`].keyframe, `hover${i}`);
+    }
+    assert.equal(states.wiz_stand8.nextState, 'wiz_stand1');
+    assert.equal(states.wiz_walk8.nextState, 'wiz_walk1');
+    assert.equal(states.wiz_side8.nextState, 'wiz_side1');
+
+    for (let i = 1; i <= 14; i++) {
+      assert.equal(states[`wiz_run${i}`].keyframe, `fly${i}`);
+    }
+    assert.equal(states.wiz_run14.nextState, 'wiz_run1');
+  });
+
+  void test('fast attack, pain, and death chains keep the original frame ordering', () => {
+    const states = WizardMonsterEntity._states;
+
+    assert.equal(states.wiz_fast1.keyframe, 'magatt1');
+    assert.equal(states.wiz_fast7.keyframe, 'magatt5');
+    assert.equal(states.wiz_fast8.keyframe, 'magatt4');
+    assert.equal(states.wiz_fast10.keyframe, 'magatt2');
+    assert.equal(states.wiz_fast10.nextState, 'wiz_run1');
+
+    for (let i = 1; i <= 4; i++) {
+      assert.equal(states[`wiz_pain${i}`].keyframe, `pain${i}`);
+    }
+    assert.equal(states.wiz_pain4.nextState, 'wiz_run1');
+
+    for (let i = 1; i <= 8; i++) {
+      assert.equal(states[`wiz_death${i}`].keyframe, `death${i}`);
+    }
+    assert.equal(states.wiz_death8.nextState, null);
+  });
+});
+
+void describe('WizardMonsterEntity QC fixes', () => {
+  void test('pain can fail to flinch on low damage', () => {
+    const wizard = createMonsterFixture(WizardMonsterEntity);
+    const originalRandom = Math.random;
+    let stateName = null;
+
+    wizard.startSound = () => {};
+    wizard._ai = {
+      foundTarget() {},
+    };
+    wizard._runState = (nextState) => {
+      stateName = nextState;
+      return true;
+    };
+
+    try {
+      Math.random = () => 0.99;
+      wizard.thinkPain({ origin: new Vector() }, 10);
+    } finally {
+      Math.random = originalRandom;
+    }
+
+    assert.equal(stateName, null);
+  });
+
+  void test('pain still flinches when the damage check succeeds', () => {
+    const wizard = createMonsterFixture(WizardMonsterEntity);
+    const originalRandom = Math.random;
+    let stateName = null;
+
+    wizard.startSound = () => {};
+    wizard._ai = {
+      foundTarget() {},
+    };
+    wizard._runState = (nextState) => {
+      stateName = nextState;
+      return true;
+    };
+
+    try {
+      Math.random = () => 0;
+      wizard.thinkPain({ origin: new Vector() }, 10);
+    } finally {
+      Math.random = originalRandom;
+    }
+
+    assert.equal(stateName, 'wiz_pain1');
+  });
+
+  void test('attack finish applies the original cooldown and resumes straight movement at mid range', () => {
+    const wizard = createMonsterFixture(WizardMonsterEntity);
+    let stateName = null;
+
+    wizard._ai = {
+      enemyRange: range.RANGE_MID,
+      enemyIsVisible: true,
+      _attackState: ATTACK_STATE.AS_MISSILE,
+    };
+    wizard._runState = (nextState) => {
+      stateName = nextState;
+      return true;
+    };
+
+    wizard._attackFinished();
+
+    assert.equal(wizard.attack_finished, 7);
+    assert.equal(wizard._ai._attackState, ATTACK_STATE.AS_STRAIGHT);
+    assert.equal(stateName, 'wiz_run1');
+  });
+
+  void test('attack finish switches to sliding movement at close visible range', () => {
+    const wizard = createMonsterFixture(WizardMonsterEntity);
+    let stateName = null;
+
+    wizard._ai = {
+      enemyRange: range.RANGE_NEAR,
+      enemyIsVisible: true,
+      _attackState: ATTACK_STATE.AS_MISSILE,
+    };
+    wizard._runState = (nextState) => {
+      stateName = nextState;
+      return true;
+    };
+
+    wizard._attackFinished();
+
+    assert.equal(wizard._ai._attackState, ATTACK_STATE.AS_SLIDING);
+    assert.equal(stateName, 'wiz_side1');
+  });
+});
diff --git a/test/game/id1-zombie.test.mjs b/test/game/id1-zombie.test.mjs
new file mode 100644
index 00000000..19d4a4de
--- /dev/null
+++ b/test/game/id1-zombie.test.mjs
@@ -0,0 +1,233 @@
+import { describe, test } from 'node:test';
+import assert from 'node:assert/strict';
+
+import Vector from '../../source/shared/Vector.ts';
+import { damage, moveType, solid } from '../../source/game/id1/Defs.ts';
+
+await import('../../source/game/id1/GameAPI.ts');
+
+const { default: ZombieMonster } = await import('../../source/game/id1/entity/monster/Zombie.mjs');
+
+ZombieMonster._initStates();
+
+/**
+ * Create a minimal Zombie fixture for focused behavior tests.
+ * @param {typeof ZombieMonster} MonsterClass Monster constructor under test.
+ * @returns {ZombieMonster} Monster fixture instance.
+ */
+function createMonsterFixture(MonsterClass) {
+  const edict = {
+    num: 1,
+    entity: null,
+    freeEdict() {},
+    setOrigin() {},
+    setModel() {},
+    setMinMaxSize() {},
+    walkMove() {
+      return false;
+    },
+    changeYaw() {
+      return 0;
+    },
+    dropToFloor() {
+      return true;
+    },
+    isOnTheFloor() {
+      return false;
+    },
+    makeStatic() {},
+    aim() {
+      return null;
+    },
+    moveToGoal() {
+      return false;
+    },
+    isInPXS() {
+      return true;
+    },
+    getNextBestClient() {
+      return null;
+    },
+  };
+
+  const engine = {
+    IsLoading() {
+      return false;
+    },
+    PrecacheModel() {},
+    PrecacheSound() {},
+    ParseQC() {
+      return null;
+    },
+    StartSound() {},
+    SpawnEntity() {
+      return { entity: null };
+    },
+    eventBus: {
+      publish() {},
+    },
+  };
+
+  const gameAPI = {
+    engine,
+    time: 10,
+    skill: 1,
+    deathmatch: 0,
+    nomonsters: 0,
+  };
+
+  const entity = new MonsterClass(edict, gameAPI);
+  edict.entity = entity;
+  entity.origin = new Vector();
+  entity.angles = new Vector();
+  entity.enemy = {
+    origin: new Vector(128, 0, 0),
+  };
+
+  return entity;
+}
+
+void describe('ZombieMonster metadata', () => {
+  void test('class metadata matches the original monster', () => {
+    assert.equal(ZombieMonster.classname, 'monster_zombie');
+    assert.equal(ZombieMonster._health, 60);
+    assert.equal(ZombieMonster._modelDefault, 'progs/zombie.mdl');
+    assert.equal(ZombieMonster._modelHead, 'progs/h_zombie.mdl');
+  });
+
+  void test('size vectors are correct', () => {
+    const [mins, maxs] = ZombieMonster._size;
+    assert.deepEqual([mins[0], mins[1], mins[2]], [-16, -16, -24]);
+    assert.deepEqual([maxs[0], maxs[1], maxs[2]], [16, 16, 40]);
+  });
+});
+
+void describe('ZombieMonster state machine', () => {
+  void test('stand, walk, and run loops match the QuakeC frame counts', () => {
+    const states = ZombieMonster._states;
+
+    for (let i = 1; i <= 15; i++) {
+      assert.equal(states[`zombie_stand${i}`].keyframe, `stand${i}`);
+    }
+    assert.equal(states.zombie_stand15.nextState, 'zombie_stand1');
+
+    for (let i = 1; i <= 19; i++) {
+      assert.equal(states[`zombie_walk${i}`].keyframe, `walk${i}`);
+    }
+    assert.equal(states.zombie_walk19.nextState, 'zombie_walk1');
+
+    for (let i = 1; i <= 18; i++) {
+      assert.equal(states[`zombie_run${i}`].keyframe, `run${i}`);
+    }
+    assert.equal(states.zombie_run18.nextState, 'zombie_run1');
+  });
+
+  void test('grenade and pain sequences return to the run loop', () => {
+    const states = ZombieMonster._states;
+
+    assert.equal(states.zombie_atta13.nextState, 'zombie_run1');
+    assert.equal(states.zombie_attb14.nextState, 'zombie_run1');
+    assert.equal(states.zombie_attc12.nextState, 'zombie_run1');
+
+    assert.equal(states.zombie_paina12.nextState, 'zombie_run1');
+    assert.equal(states.zombie_painb28.nextState, 'zombie_run1');
+    assert.equal(states.zombie_painc18.nextState, 'zombie_run1');
+    assert.equal(states.zombie_paind13.nextState, 'zombie_run1');
+    assert.equal(states.zombie_paine30.nextState, 'zombie_run1');
+  });
+
+  void test('crucified idle loop keeps all six frames', () => {
+    const states = ZombieMonster._states;
+
+    for (let i = 1; i <= 6; i++) {
+      assert.equal(states[`zombie_cruc${i}`].keyframe, `cruc_${i}`);
+    }
+    assert.equal(states.zombie_cruc6.nextState, 'zombie_cruc1');
+  });
+});
+
+void describe('ZombieMonster QC fixes', () => {
+  void test('crucified spawn disables damage and collision', () => {
+    const zombie = createMonsterFixture(ZombieMonster);
+    let stateName = null;
+
+    zombie.spawnflags = ZombieMonster.SPAWN_CRUCIFIED;
+    zombie._runState = (nextState) => {
+      stateName = nextState;
+      return true;
+    };
+
+    zombie._postSpawn();
+
+    assert.equal(zombie.movetype, moveType.MOVETYPE_NONE);
+    assert.equal(zombie.takedamage, damage.DAMAGE_NO);
+    assert.equal(zombie.solid, solid.SOLID_NOT);
+    assert.equal(zombie._damageHandler, null);
+    assert.equal(stateName, 'zombie_cruc1');
+  });
+
+  void test('major pain hits reset health to 60 and knock the zombie down', () => {
+    const zombie = createMonsterFixture(ZombieMonster);
+    let stateName = null;
+
+    zombie.health = 5;
+    zombie._runState = (nextState) => {
+      stateName = nextState;
+      return true;
+    };
+    zombie._ai = {
+      foundTarget() {},
+    };
+
+    zombie.thinkPain({ origin: new Vector() }, 25);
+
+    assert.equal(zombie.health, 60);
+    assert.equal(zombie.inpain, 2);
+    assert.equal(stateName, 'zombie_paine1');
+  });
+
+  void test('blocked stand-up retries the paine11 recovery frame', () => {
+    const zombie = createMonsterFixture(ZombieMonster);
+    let stateName = null;
+
+    zombie.walkMove = () => false;
+    zombie._runState = (nextState) => {
+      stateName = nextState;
+      return true;
+    };
+    zombie.startSound = () => {};
+
+    zombie._standUp();
+
+    assert.equal(zombie.health, 60);
+    assert.equal(zombie.solid, solid.SOLID_SLIDEBOX);
+    assert.equal(stateName, 'zombie_paine11');
+  });
+
+  void test('missile choice keeps the original attack thresholds', () => {
+    const zombie = createMonsterFixture(ZombieMonster);
+    const originalRandom = Math.random;
+    let stateName = null;
+
+    zombie._runState = (nextState) => {
+      stateName = nextState;
+      return true;
+    };
+
+    try {
+      Math.random = () => 0.2;
+      zombie.thinkMissile();
+      assert.equal(stateName, 'zombie_atta1');
+
+      Math.random = () => 0.5;
+      zombie.thinkMissile();
+      assert.equal(stateName, 'zombie_attb1');
+
+      Math.random = () => 0.9;
+      zombie.thinkMissile();
+      assert.equal(stateName, 'zombie_attc1');
+    } finally {
+      Math.random = originalRandom;
+    }
+  });
+});
diff --git a/test/game/quake-entity-ai.test.mjs b/test/game/quake-entity-ai.test.mjs
new file mode 100644
index 00000000..158563c0
--- /dev/null
+++ b/test/game/quake-entity-ai.test.mjs
@@ -0,0 +1,307 @@
+import { describe, test } from 'node:test';
+import assert from 'node:assert/strict';
+
+import Vector from '../../source/shared/Vector.ts';
+
+import { flags, items, worldType } from '../../source/game/id1/Defs.mjs';
+import { entityClasses } from '../../source/game/id1/GameAPI.mjs';
+
+const OgreEntity = entityClasses.find((entityClass) => entityClass.classname === 'monster_ogre');
+const PlayerCtor = entityClasses.find((entityClass) => entityClass.classname === 'player');
+
+assert.ok(OgreEntity, 'monster_ogre must be registered in GameAPI');
+assert.ok(PlayerCtor, 'player must be registered in GameAPI');
+
+/**
+ * Create a minimal edict stub for AI tests.
+ * @param {number} num Edict slot number.
+ * @returns {object} Mock edict.
+ */
+function createMockEdict(num) {
+  return {
+    num,
+    entity: null,
+    equals(other) {
+      return this === other;
+    },
+    freeEdict() {},
+    setOrigin() {},
+    setModel() {},
+    setMinMaxSize() {},
+    walkMove() {
+      return false;
+    },
+    changeYaw() {
+      return 0;
+    },
+    dropToFloor() {
+      return true;
+    },
+    isOnTheFloor() {
+      return false;
+    },
+    makeStatic() {},
+    aim() {
+      return null;
+    },
+    getNextBestClient() {
+      return null;
+    },
+    moveToGoal() {
+      return false;
+    },
+    isInPXS() {
+      return true;
+    },
+  };
+}
+
+/**
+ * Create the minimal engine surface required by the AI harness.
+ * @returns {object} Mock engine API.
+ */
+function createMockEngine() {
+  return {
+    IsLoading() {
+      return false;
+    },
+    PrecacheModel() {},
+    PrecacheSound() {},
+    StartSound() {},
+    SpawnAmbientSound() {},
+    SpawnEntity() {
+      return { entity: null };
+    },
+    FindByFieldAndValue() {
+      return null;
+    },
+    FindAllByFieldAndValue() {
+      return [];
+    },
+    ParseQC() {
+      return null;
+    },
+    Traceline() {
+      return null;
+    },
+    SetAreaPortalState() {},
+    GetCvar() {
+      return { value: 0 };
+    },
+    GetPHS() {
+      return null;
+    },
+    GetAreaForPoint() {
+      return 0;
+    },
+    AreasConnected() {
+      return true;
+    },
+    NavigateAsync() {
+      return Promise.resolve(null);
+    },
+    ConsoleDebug() {},
+    eventBus: {
+      publish() {},
+    },
+  };
+}
+
+/**
+ * Create shared game-wide AI state for the harness.
+ * @returns {object} Mock game AI state.
+ */
+function createMockGameAI() {
+  return {
+    _sightEntity: null,
+    _sightEntityTime: 0,
+    _sightEntityLastOrigin: new Vector(),
+  };
+}
+
+/**
+ * @returns {InstanceType<typeof OgreEntity>} monster fixture with a minimal engine API
+ */
+function createMonsterVisibilityFixture() {
+  const edict = createMockEdict(1);
+  const engine = createMockEngine();
+
+  const gameAPI = {
+    engine,
+    time: 1,
+    coop: 0,
+    worldspawn: {
+      worldtype: worldType.MEDIEVAL,
+    },
+    gameAI: createMockGameAI(),
+  };
+
+  const entity = new OgreEntity(edict, gameAPI);
+  edict.entity = entity;
+
+  entity.health = 200;
+  entity.origin = new Vector();
+  entity.view_ofs = new Vector();
+  entity.angles = new Vector();
+  entity.enemy = null;
+  entity.goalentity = null;
+  entity.movetarget = null;
+  entity.show_hostile = 0;
+  entity.spawnflags = 0;
+  entity.effects = 0;
+  entity.flags = 0;
+  entity.items = 0;
+  entity.ideal_yaw = 0;
+  entity.attack_finished = 0;
+  entity.nextthink = 0;
+  entity.yaw_speed = 20;
+  entity.pausetime = Infinity;
+  entity.sightSound = () => {};
+  entity.thinkRun = () => {};
+  entity.thinkStand = () => {};
+  entity.thinkWalk = () => {};
+  entity._scheduleThink = (...args) => {
+    entity._scheduledThinkArgs = args;
+  };
+  entity.attackFinished = (delay) => {
+    entity.attack_finished = gameAPI.time + delay;
+  };
+  entity.getNextBestClient = () => null;
+
+  return entity;
+}
+
+/**
+ * Create a player fixture compatible with the monster AI routines.
+ * @returns {InstanceType<typeof PlayerCtor>} Mock player entity.
+ */
+function createPlayerFixture() {
+  const edict = createMockEdict(2);
+  const engine = createMockEngine();
+
+  const gameAPI = {
+    engine,
+    time: 0,
+    coop: 0,
+    worldspawn: {
+      worldtype: worldType.MEDIEVAL,
+    },
+    gameAI: createMockGameAI(),
+    stats: {
+      sendToPlayer() {},
+    },
+  };
+
+  const player = new PlayerCtor(edict, gameAPI);
+  edict.entity = player;
+
+  player.health = 100;
+  player.origin = new Vector(64, 0, 0);
+  player.view_ofs = new Vector(0, 0, 22);
+  player.flags = flags.FL_CLIENT;
+  player.effects = 0;
+  player.items = 0;
+  player.show_hostile = 0;
+
+  return player;
+}
+
+void describe('QuakeEntityAI._isVisible', () => {
+  void test('treats a clear ignoreMonsters traceline as visible even when no entity is returned', () => {
+    const entity = createMonsterVisibilityFixture();
+    const target = createMonsterVisibilityFixture();
+
+    entity.engine.Traceline = () => ({
+      fraction: 1.0,
+      entity: null,
+      contents: {
+        inOpen: false,
+        inWater: false,
+      },
+    });
+
+    assert.equal(entity._ai._isVisible(target), true);
+  });
+
+  void test('rejects blocked sight lines when the trace stops short', () => {
+    const entity = createMonsterVisibilityFixture();
+    const target = createMonsterVisibilityFixture();
+
+    entity.engine.Traceline = () => ({
+      fraction: 0.5,
+      entity: null,
+      contents: {
+        inOpen: false,
+        inWater: false,
+      },
+    });
+
+    assert.equal(entity._ai._isVisible(target), false);
+  });
+});
+
+void describe('QuakeEntityAI.findTarget', () => {
+  void test('acquires a visible player and schedules a run state', () => {
+    const monster = createMonsterVisibilityFixture();
+    const player = createPlayerFixture();
+
+    monster.getNextBestClient = () => player;
+    monster.engine.Traceline = () => ({
+      fraction: 1.0,
+      entity: null,
+      contents: {
+        inOpen: false,
+        inWater: false,
+      },
+    });
+
+    const found = monster._ai.findTarget();
+
+    assert.equal(found, true);
+    assert.equal(monster.enemy, player);
+    assert.equal(monster.goalentity, player);
+    assert.equal(monster.show_hostile, monster.game.time + 1.0);
+    assert.deepEqual(monster.game.gameAI._sightEntityLastOrigin, player.origin);
+    assert.equal(monster._scheduledThinkArgs[0], monster.game.time + 0.05);
+    assert.equal(typeof monster._scheduledThinkArgs[1], 'function');
+    assert.equal(monster._scheduledThinkArgs[2], 'animation-state-machine');
+  });
+
+  void test('rejects invisible players before visibility and range checks', () => {
+    const monster = createMonsterVisibilityFixture();
+    const player = createPlayerFixture();
+
+    player.items = items.IT_INVISIBILITY;
+
+    let visibilityChecks = 0;
+    monster.getNextBestClient = () => player;
+    monster.engine.Traceline = () => {
+      visibilityChecks += 1;
+      return {
+        fraction: 1.0,
+        entity: null,
+        contents: {
+          inOpen: false,
+          inWater: false,
+        },
+      };
+    };
+
+    const found = monster._ai.findTarget();
+
+    assert.equal(found, false);
+    assert.equal(monster.enemy, null);
+    assert.equal(visibilityChecks, 0);
+  });
+
+  void test('ignores undefined client lookups without throwing', () => {
+    const monster = createMonsterVisibilityFixture();
+
+    monster.getNextBestClient = () => undefined;
+
+    assert.doesNotThrow(() => {
+      assert.equal(monster._ai.findTarget(), false);
+    });
+    assert.equal(monster.enemy, null);
+  });
+});
diff --git a/test/physics/quake-entity-ai.test.mjs b/test/physics/quake-entity-ai.test.mjs
deleted file mode 100644
index f7f2a5bd..00000000
--- a/test/physics/quake-entity-ai.test.mjs
+++ /dev/null
@@ -1,128 +0,0 @@
-import { describe, test } from 'node:test';
-import assert from 'node:assert/strict';
-
-import { worldType } from '../../source/game/id1/Defs.mjs';
-import { entityClasses } from '../../source/game/id1/GameAPI.mjs';
-
-const OgreEntity = entityClasses.find((entityClass) => entityClass.classname === 'monster_ogre');
-
-assert.ok(OgreEntity, 'monster_ogre must be registered in GameAPI');
-
-/**
- * @returns {InstanceType<typeof OgreEntity>} monster fixture with a minimal engine API
- */
-function createMonsterVisibilityFixture() {
-  const edict = {
-    num: 1,
-    entity: null,
-    equals(other) {
-      return this === other;
-    },
-    freeEdict() {},
-    setOrigin() {},
-    setModel() {},
-    setMinMaxSize() {},
-    walkMove() {
-      return false;
-    },
-    changeYaw() {
-      return 0;
-    },
-    dropToFloor() {
-      return true;
-    },
-    isOnTheFloor() {
-      return false;
-    },
-    makeStatic() {},
-    aim() {
-      return null;
-    },
-    getNextBestClient() {
-      return null;
-    },
-  };
-
-  const engine = {
-    IsLoading() {
-      return false;
-    },
-    PrecacheModel() {},
-    PrecacheSound() {},
-    StartSound() {},
-    SpawnAmbientSound() {},
-    SpawnEntity() {
-      return { entity: null };
-    },
-    FindByFieldAndValue() {
-      return null;
-    },
-    FindAllByFieldAndValue() {
-      return [];
-    },
-    ParseQC() {
-      return null;
-    },
-    Traceline() {
-      return null;
-    },
-    SetAreaPortalState() {},
-    GetCvar() {
-      return { value: 0 };
-    },
-    eventBus: {
-      publish() {},
-    },
-  };
-
-  const gameAPI = {
-    engine,
-    time: 0,
-    worldspawn: {
-      worldtype: worldType.MEDIEVAL,
-    },
-    gameAI: {
-      _sightEntity: null,
-      _sightEntityTime: 0,
-    },
-  };
-
-  const entity = new OgreEntity(edict, gameAPI);
-  edict.entity = entity;
-
-  return entity;
-}
-
-void describe('QuakeEntityAI._isVisible', () => {
-  void test('treats a clear ignoreMonsters traceline as visible even when no entity is returned', () => {
-    const entity = createMonsterVisibilityFixture();
-    const target = createMonsterVisibilityFixture();
-
-    entity.engine.Traceline = () => ({
-      fraction: 1.0,
-      entity: null,
-      contents: {
-        inOpen: false,
-        inWater: false,
-      },
-    });
-
-    assert.equal(entity._ai._isVisible(target), true);
-  });
-
-  void test('rejects blocked sight lines when the trace stops short', () => {
-    const entity = createMonsterVisibilityFixture();
-    const target = createMonsterVisibilityFixture();
-
-    entity.engine.Traceline = () => ({
-      fraction: 0.5,
-      entity: null,
-      contents: {
-        inOpen: false,
-        inWater: false,
-      },
-    });
-
-    assert.equal(entity._ai._isVisible(target), false);
-  });
-});

From 9a7ee4072bddd12eb6259dcff96dd971378c3ad4 Mon Sep 17 00:00:00 2001
From: Christian R <github@chrisnew.de>
Date: Tue, 7 Apr 2026 13:04:21 +0300
Subject: [PATCH 62/67] lots of tests to test the game code

---
 source/engine/server/Edict.ts           |   2 +-
 source/game/id1                         |   2 +-
 test/game/id1-base-entity.test.mjs      |  36 ++-
 test/game/id1-boss.test.mjs             |   8 +-
 test/game/id1-buttons.test.mjs          | 255 +++++++++++++++++
 test/game/id1-client.test.mjs           | 322 ++++++++++++++++++++++
 test/game/id1-doors.test.mjs            | 347 ++++++++++++++++++++++++
 test/game/id1-fog.test.mjs              |  54 ++++
 test/game/id1-game-api.test.mjs         |  66 +++++
 test/game/id1-game-stats.test.mjs       |   6 -
 test/game/id1-items.test.mjs            | 188 +++++++++++++
 test/game/id1-knights.test.mjs          | 126 ++++++++-
 test/game/id1-misc.test.mjs             | 154 +++++++++++
 test/game/id1-oldone.test.mjs           |   4 +-
 test/game/id1-platforms.test.mjs        | 287 ++++++++++++++++++++
 test/game/id1-player-lifecycle.test.mjs | 264 ++++++++++++++++++
 test/game/id1-player-weapons.test.mjs   |  47 +++-
 test/game/id1-registry.test.mjs         |   5 -
 test/game/id1-shalrath.test.mjs         |   6 +-
 test/game/id1-shambler.test.mjs         |   4 +-
 test/game/id1-soldier.test.mjs          | 138 +++++++++-
 test/game/id1-subs.test.mjs             | 219 +++++++++++++++
 test/game/id1-tarbaby.test.mjs          |   4 +-
 test/game/id1-triggers.test.mjs         | 211 ++++++++++++++
 test/game/id1-weapons.test.mjs          |  60 ++++
 test/game/id1-wizard.test.mjs           |   4 +-
 test/game/id1-worldspawn.test.mjs       | 187 +++++++++++++
 test/game/id1-zombie.test.mjs           |   4 +-
 test/game/quake-entity-ai.test.mjs      |   8 +-
 test/physics/func-door.test.mjs         |   4 +-
 test/physics/func-plat.test.mjs         |   6 +-
 test/physics/func-rotating.test.mjs     |  13 +-
 test/physics/func-train.test.mjs        |   6 +-
 33 files changed, 2991 insertions(+), 56 deletions(-)
 create mode 100644 test/game/id1-buttons.test.mjs
 create mode 100644 test/game/id1-client.test.mjs
 create mode 100644 test/game/id1-doors.test.mjs
 create mode 100644 test/game/id1-fog.test.mjs
 create mode 100644 test/game/id1-items.test.mjs
 create mode 100644 test/game/id1-misc.test.mjs
 create mode 100644 test/game/id1-platforms.test.mjs
 create mode 100644 test/game/id1-player-lifecycle.test.mjs
 create mode 100644 test/game/id1-subs.test.mjs
 create mode 100644 test/game/id1-triggers.test.mjs
 create mode 100644 test/game/id1-weapons.test.mjs
 create mode 100644 test/game/id1-worldspawn.test.mjs

diff --git a/source/engine/server/Edict.ts b/source/engine/server/Edict.ts
index 04b59280..64e125e1 100644
--- a/source/engine/server/Edict.ts
+++ b/source/engine/server/Edict.ts
@@ -1,5 +1,5 @@
 import { SerializableEntity, type EdictData } from '../../shared/GameInterfaces.ts';
-import type { WorldspawnEntity as WorldspawnEntityValue } from '../../game/id1/entity/Worldspawn.mjs';
+import type { WorldspawnEntity as WorldspawnEntityValue } from '../../game/id1/entity/Worldspawn.ts';
 import type { OctreeNode } from '../../shared/Octree.ts';
 import type { Visibility } from '../common/model/BSP.ts';
 import type { ClientEdict } from '../client/ClientEntities.ts';
diff --git a/source/game/id1 b/source/game/id1
index 8407bdb1..2615937a 160000
--- a/source/game/id1
+++ b/source/game/id1
@@ -1 +1 @@
-Subproject commit 8407bdb1143dc754aba7a43aeaef385c0177f672
+Subproject commit 2615937a8d5bbb36a0e7e4050a65e84ce53053d1
diff --git a/test/game/id1-base-entity.test.mjs b/test/game/id1-base-entity.test.mjs
index 3eb104d7..26de8566 100644
--- a/test/game/id1-base-entity.test.mjs
+++ b/test/game/id1-base-entity.test.mjs
@@ -76,7 +76,7 @@ void describe('BaseEntity', () => {
       }
     }
 
-    const entity = new ModFriendlyEntity(createMockGameAPI());
+    const entity = new ModFriendlyEntity(createMockGameAPI()).initializeEntity();
 
     assert.equal(Object.isSealed(entity), false);
     assert.equal(entity.customField, 42);
@@ -97,7 +97,7 @@ void describe('@entity / @serializable decorators', () => {
   });
 
   void test('Serializer collects all decorated BaseEntity fields', () => {
-    const entity = new BaseEntity(null, createMockGameAPI());
+    const entity = new BaseEntity(null, createMockGameAPI()).initializeEntity();
     const serialized = entity._serializer.serialize();
     assert.ok('ltime' in serialized);
     assert.ok('origin' in serialized);
@@ -117,7 +117,7 @@ void describe('@entity / @serializable decorators', () => {
       }
     }
 
-    const child = new LegacyChild(createMockGameAPI());
+    const child = new LegacyChild(createMockGameAPI()).initializeEntity();
     const serialized = child._serializer.serialize();
     assert.ok('ltime' in serialized, 'inherits decorated parent fields');
     assert.ok('customProp' in serialized, 'includes own static array fields');
@@ -127,6 +127,36 @@ void describe('@entity / @serializable decorators', () => {
     assert.equal(typeof entity, 'function');
     assert.equal(typeof serializable, 'function');
   });
+
+});
+
+void describe('BasePropEntity decorator port', async () => {
+  await import('../../source/game/id1/GameAPI.ts');
+
+  const { default: BasePropEntity, PropState } = await import('../../source/game/id1/entity/props/BasePropEntity.ts');
+
+  void test('uses decorator-registered fields with initialized defaults', () => {
+    class TestPropEntity extends BasePropEntity {
+      static classname = 'test_prop_entity';
+
+      spawn() {}
+    }
+
+    const entity = new TestPropEntity(null, createMockGameAPI()).initializeEntity();
+    const serialized = entity._serializer.serialize();
+
+    assert.ok(Array.isArray(BasePropEntity.serializableFields));
+    assert.ok(Object.isFrozen(BasePropEntity.serializableFields));
+    assert.ok(BasePropEntity.serializableFields.includes('sounds'));
+    assert.ok(BasePropEntity.serializableFields.includes('pos1'));
+    assert.ok(BasePropEntity.serializableFields.includes('state'));
+    assert.equal(entity.sounds, 0);
+    assert.equal(entity.state, PropState.STATE_TOP);
+    assert.equal(entity._sub !== null, true);
+    assert.ok('sounds' in serialized);
+    assert.ok('pos1' in serialized);
+    assert.ok('state' in serialized);
+  });
 });
 
 void describe('BaseMonster decorator port', async () => {
diff --git a/test/game/id1-boss.test.mjs b/test/game/id1-boss.test.mjs
index 5e40a384..df04301f 100644
--- a/test/game/id1-boss.test.mjs
+++ b/test/game/id1-boss.test.mjs
@@ -6,7 +6,7 @@ import { effect, moveType, solid, tentType } from '../../source/game/id1/Defs.ts
 
 await import('../../source/game/id1/GameAPI.ts');
 
-const { BossLavaball, BossMonster, EventLightningEntity } = await import('../../source/game/id1/entity/monster/Boss.mjs');
+const { BossLavaball, BossMonster, EventLightningEntity } = await import('../../source/game/id1/entity/monster/Boss.ts');
 
 const ELECTRODE_STATE_TOP = 0;
 
@@ -82,7 +82,7 @@ function createBossFixture(MonsterClass, gameOverrides = {}) {
     ...gameOverrides,
   };
 
-  const entity = new MonsterClass(edict, gameAPI);
+  const entity = new MonsterClass(edict, gameAPI).initializeEntity();
   edict.entity = entity;
   entity.origin = new Vector(10, 20, 30);
   entity.angles = new Vector();
@@ -158,7 +158,7 @@ function createLightningFixture() {
     nomonsters: 0,
   };
 
-  const entity = new EventLightningEntity(edict, gameAPI);
+  const entity = new EventLightningEntity(edict, gameAPI).initializeEntity();
   edict.entity = entity;
   return entity;
 }
@@ -270,7 +270,7 @@ void describe('BossLavaball', () => {
       },
     };
 
-    const lavaball = new BossLavaball(edict, boss.game);
+    const lavaball = new BossLavaball(edict, boss.game).initializeEntity();
     edict.entity = lavaball;
     lavaball.movedir = new Vector(1, 0, 0);
 
diff --git a/test/game/id1-buttons.test.mjs b/test/game/id1-buttons.test.mjs
new file mode 100644
index 00000000..6d342d81
--- /dev/null
+++ b/test/game/id1-buttons.test.mjs
@@ -0,0 +1,255 @@
+import { describe, test } from 'node:test';
+import assert from 'node:assert/strict';
+
+import Vector from '../../source/shared/Vector.ts';
+import { damage, moveType, solid } from '../../source/game/id1/Defs.ts';
+
+await import('../../source/game/id1/GameAPI.ts');
+
+const { PlayerEntity } = await import('../../source/game/id1/entity/Player.ts');
+const { ButtonEntity } = await import('../../source/game/id1/entity/props/Buttons.ts');
+const { state } = await import('../../source/game/id1/entity/props/BasePropEntity.ts');
+
+/**
+ * Create a minimal button fixture for focused behavior tests.
+ * @returns {{ button: ButtonEntity, engine: object, setModelCalls: string[], precachedSounds: string[] }} Button fixture data.
+ */
+function createButtonFixture() {
+  const setModelCalls = [];
+  const precachedSounds = [];
+  const edict = {
+    num: 1,
+    entity: null,
+    freeEdict() {},
+    setOrigin() {},
+    setModel(model) {
+      setModelCalls.push(model);
+    },
+    setMinMaxSize() {},
+    walkMove() {
+      return false;
+    },
+    changeYaw() {
+      return 0;
+    },
+    dropToFloor() {
+      return true;
+    },
+    isOnTheFloor() {
+      return false;
+    },
+    makeStatic() {},
+    aim() {
+      return null;
+    },
+    moveToGoal() {
+      return false;
+    },
+    isInPXS() {
+      return true;
+    },
+    getNextBestClient() {
+      return null;
+    },
+  };
+
+  const engine = {
+    IsLoading() {
+      return false;
+    },
+    PrecacheModel() {},
+    PrecacheSound(sound) {
+      precachedSounds.push(sound);
+    },
+    ParseQC() {
+      return null;
+    },
+    StartSound() {},
+    SpawnEntity() {
+      return { entity: null };
+    },
+    DispatchTempEntityEvent() {},
+    FindByFieldAndValue() {
+      return null;
+    },
+    FindAllByFieldAndValue() {
+      return [];
+    },
+    eventBus: {
+      publish() {},
+    },
+  };
+
+  const gameAPI = {
+    engine,
+    time: 3,
+    deathmatch: 0,
+    nomonsters: 0,
+  };
+
+  const button = new ButtonEntity(edict, gameAPI).initializeEntity().precacheEntity();
+  edict.entity = button;
+  button.origin = new Vector(10, 20, 30);
+  button.angles = new Vector();
+  button.size = new Vector(64, 16, 8);
+  button.model = 'progs/button.bsp';
+
+  return { button, engine, setModelCalls, precachedSounds };
+}
+
+void describe('ButtonEntity spawn', () => {
+  void test('applies QC defaults and computes the travel destination', () => {
+    const { button, precachedSounds, setModelCalls } = createButtonFixture();
+    let setMovedirCalls = 0;
+
+    button._sub = {
+      setMovedir() {
+        setMovedirCalls++;
+        button.movedir.setTo(1, 0, 0);
+      },
+      calcMove() {},
+      useTargets() {},
+    };
+
+    button.spawn();
+
+    assert.deepEqual(precachedSounds, ['buttons/airbut1.wav']);
+    assert.equal(setMovedirCalls, 1);
+    assert.deepEqual(setModelCalls, ['progs/button.bsp']);
+    assert.equal(button.movetype, moveType.MOVETYPE_PUSH);
+    assert.equal(button.solid, solid.SOLID_BSP);
+    assert.equal(button.speed, 40);
+    assert.equal(button.wait, 1);
+    assert.equal(button.lip, 4);
+    assert.equal(button.state, state.STATE_BOTTOM);
+    assert.ok(button.pos1.equalsTo(10, 20, 30));
+    assert.ok(button.pos2.equalsTo(70, 20, 30));
+  });
+
+  void test('enables takedamage and stores max health for shootable buttons', () => {
+    const { button } = createButtonFixture();
+
+    button._sub = {
+      setMovedir() {
+        button.movedir.setTo(0, 1, 0);
+      },
+      calcMove() {},
+      useTargets() {},
+    };
+    button.health = 25;
+
+    button.spawn();
+
+    assert.equal(button.max_health, 25);
+    assert.equal(button.takedamage, damage.DAMAGE_YES);
+  });
+});
+
+void describe('ButtonEntity interaction', () => {
+  void test('touch ignores non-player entities and shootable buttons', () => {
+    const { button } = createButtonFixture();
+    const player = Object.create(PlayerEntity.prototype);
+    const pushVector = new Vector();
+    const firedWith = [];
+
+    button._buttonFire = (userEntity) => {
+      firedWith.push(userEntity);
+    };
+
+    button.touch(button, pushVector);
+    button.max_health = 5;
+    button.touch(player, pushVector);
+
+    assert.deepEqual(firedWith, []);
+  });
+
+  void test('use starts the opening move and ignores repeat triggers while already active', () => {
+    const { button } = createButtonFixture();
+    const calcMoveCalls = [];
+    const soundCalls = [];
+    const userEntity = button;
+
+    button._sub = {
+      setMovedir() {},
+      calcMove(target, speed, callback) {
+        calcMoveCalls.push({ target, speed, callback });
+      },
+      useTargets() {},
+    };
+    button.pos2 = new Vector(100, 20, 30);
+    button.speed = 55;
+    button.noise = 'buttons/switch02.wav';
+    button.state = state.STATE_BOTTOM;
+    button.startSound = (_channel, soundName) => {
+      soundCalls.push(soundName);
+    };
+
+    button.use(userEntity);
+    button.use(userEntity);
+
+    assert.equal(button.state, state.STATE_UP);
+    assert.deepEqual(soundCalls, ['buttons/switch02.wav']);
+    assert.equal(calcMoveCalls.length, 1);
+    assert.ok(calcMoveCalls[0].target.equalsTo(100, 20, 30));
+    assert.equal(calcMoveCalls[0].speed, 55);
+    assert.equal(typeof calcMoveCalls[0].callback, 'function');
+  });
+
+  void test('wait, return, and death preserve the QC button cycle', () => {
+    const { button } = createButtonFixture();
+    const calcMoveCalls = [];
+    const scheduledThinks = [];
+    const usedTargets = [];
+    const attacker = button;
+
+    button._sub = {
+      setMovedir() {},
+      calcMove(target, speed, callback) {
+        calcMoveCalls.push({ target, speed, callback });
+      },
+      useTargets(userEntity) {
+        usedTargets.push(userEntity);
+      },
+    };
+    button._scheduleThink = (nextThink, callback) => {
+      scheduledThinks.push({ nextThink, callback });
+    };
+    button.pos1 = new Vector(10, 20, 30);
+    button.speed = 30;
+    button.wait = 2;
+    button.ltime = 5;
+    button.health = 9;
+    button.max_health = 9;
+    button.takedamage = damage.DAMAGE_YES;
+    button.noise = 'buttons/airbut1.wav';
+    button.state = state.STATE_BOTTOM;
+
+    button.thinkDie(attacker);
+
+    assert.equal(button.health, 9);
+    assert.equal(button.takedamage, damage.DAMAGE_NO);
+    assert.equal(button.state, state.STATE_UP);
+    assert.equal(calcMoveCalls.length, 1);
+
+    calcMoveCalls[0].callback();
+
+    assert.equal(button.state, state.STATE_TOP);
+    assert.equal(button.frame, 1);
+    assert.deepEqual(usedTargets, [attacker]);
+    assert.equal(scheduledThinks.length, 1);
+    assert.equal(scheduledThinks[0].nextThink, 7);
+
+    scheduledThinks[0].callback();
+
+    assert.equal(button.state, state.STATE_DOWN);
+    assert.equal(button.frame, 0);
+    assert.equal(button.takedamage, damage.DAMAGE_YES);
+    assert.equal(calcMoveCalls.length, 2);
+    assert.ok(calcMoveCalls[1].target.equalsTo(10, 20, 30));
+    assert.equal(calcMoveCalls[1].speed, 30);
+
+    calcMoveCalls[1].callback();
+
+    assert.equal(button.state, state.STATE_BOTTOM);
+  });
+});
diff --git a/test/game/id1-client.test.mjs b/test/game/id1-client.test.mjs
new file mode 100644
index 00000000..b4f89ff8
--- /dev/null
+++ b/test/game/id1-client.test.mjs
@@ -0,0 +1,322 @@
+import assert from 'node:assert/strict';
+import { describe, test } from 'node:test';
+
+import Vector from '../../source/shared/Vector.ts';
+
+const { clientEvent, clientEventName, effect, items } = await import('../../source/game/id1/Defs.ts');
+await import('../../source/game/id1/GameAPI.ts');
+
+const syncModule = await import('../../source/game/id1/client/Sync.ts');
+const hudModule = await import('../../source/game/id1/client/HUD.ts');
+const clientApiModule = await import('../../source/game/id1/client/ClientAPI.ts');
+
+const { ClientStats, ServerInfo } = syncModule;
+const { Q1HUD } = hudModule;
+const { ClientGameAPI } = clientApiModule;
+
+/**
+ * Create an event bus with subscribe and publish support.
+ * @returns {object} Mock event bus.
+ */
+function createEventBus() {
+  const listeners = new Map();
+
+  return {
+    subscribe(eventName, handler) {
+      const handlers = listeners.get(eventName) ?? [];
+      handlers.push(handler);
+      listeners.set(eventName, handlers);
+
+      return () => {
+        const currentHandlers = listeners.get(eventName) ?? [];
+        listeners.set(eventName, currentHandlers.filter((currentHandler) => currentHandler !== handler));
+      };
+    },
+
+    publish(eventName, ...args) {
+      for (const handler of listeners.get(eventName) ?? []) {
+        handler(...args);
+      }
+    },
+  };
+}
+
+/**
+ * Create a mock texture with the surface expected by HUD and ClientGameAPI.
+ * @param {string} name Debug name.
+ * @param {number} width Texture width.
+ * @param {number} height Texture height.
+ * @returns {object} Mock texture.
+ */
+function createMockTexture(name, width = 24, height = 24) {
+  return {
+    name,
+    width,
+    height,
+    freed: false,
+    free() {
+      this.freed = true;
+    },
+    wrapClamped() {
+    },
+  };
+}
+
+/**
+ * Create a minimal client engine API mock for HUD and client API tests.
+ * @param {object} overrides Override values.
+ * @returns {object} Mock engine API.
+ */
+function createMockClientEngine(overrides = {}) {
+  const eventBus = createEventBus();
+  const sounds = [];
+  const commands = new Map();
+
+  return {
+    eventBus,
+    sounds,
+    commands,
+    DrawPic() {
+    },
+    DrawRect() {
+    },
+    DrawString() {
+    },
+    LoadPicFromWad(name) {
+      return createMockTexture(name);
+    },
+    LoadPicFromLump(name) {
+      return createMockTexture(name, 64, 16);
+    },
+    LoadPicFromFile(name) {
+      return Promise.resolve(createMockTexture(name));
+    },
+    LoadSound(name) {
+      const sound = {
+        name,
+        playCount: 0,
+        play() {
+          this.playCount += 1;
+        },
+      };
+      sounds.push(sound);
+      return sound;
+    },
+    ConsoleDebug() {
+    },
+    ConsoleError() {
+    },
+    ConsolePrint() {
+    },
+    RegisterCommand(name, handler) {
+      commands.set(name, handler);
+    },
+    UnregisterCommand(name) {
+      commands.delete(name);
+    },
+    ContentShift() {
+    },
+    IndexToRGB() {
+      return [1.0, 1.0, 1.0];
+    },
+    PlaceDecal() {
+    },
+    ModForName(name) {
+      return { name };
+    },
+    AllocDlight() {
+      return {};
+    },
+    VID: {
+      width: 320,
+      height: 200,
+    },
+    SCR: {
+      viewsize: 100,
+    },
+    CL: {
+      gametime: 0,
+      frametime: 0.1,
+      entityNum: 1,
+      intermission: false,
+      levelname: 'e1m1',
+      maxclients: 1,
+      time: 0,
+      viewangles: new Vector(),
+      vieworigin: new Vector(),
+      score() {
+        return {
+          isActive: false,
+          frags: 0,
+          name: '',
+          ping: 0,
+          colors: 0,
+        };
+      },
+    },
+    ...overrides,
+  };
+}
+
+/**
+ * Create a minimal clientdata map for HUD and client API tests.
+ * @param {object} overrides Override values.
+ * @returns {object} Mock clientdata.
+ */
+function createClientdata(overrides = {}) {
+  return {
+    health: 100,
+    armorvalue: 0,
+    armortype: 0,
+    items: 0,
+    ammo_shells: 0,
+    ammo_nails: 0,
+    ammo_rockets: 0,
+    ammo_cells: 0,
+    weapon: 0,
+    weaponframe: 0,
+    effects: 0,
+    ...overrides,
+  };
+}
+
+void describe('id1 client sync', () => {
+  void test('updates stats and server info from client events', () => {
+    const engine = createMockClientEngine();
+    const stats = new ClientStats(engine);
+    const serverInfo = new ServerInfo(engine);
+
+    engine.eventBus.publish(clientEventName(clientEvent.STATS_INIT), 'monsters_total', 13);
+    engine.eventBus.publish(clientEventName(clientEvent.STATS_UPDATED), 'secrets_found', 2);
+    engine.eventBus.publish('client.server-info.ready', {
+      hostname: 'Shub Hub',
+      coop: '1',
+      deathmatch: '0',
+      skill: '3',
+      map: 'e1m8',
+    });
+    engine.eventBus.publish('client.server-info.updated', 'hostname', 'Slipgate Complex');
+
+    assert.equal(stats.monsters_total, 13);
+    assert.equal(stats.secrets_found, 2);
+    assert.equal(serverInfo.hostname, 'Slipgate Complex');
+    assert.equal(serverInfo.coop, '1');
+    assert.equal(serverInfo.map, 'e1m8');
+  });
+});
+
+void describe('id1 client HUD state', () => {
+  void test('restores saved vectors and stat counters when loading HUD state', () => {
+    const engine = createMockClientEngine();
+    const game = {
+      clientdata: createClientdata(),
+      serverInfo: new ServerInfo(engine),
+    };
+    const hud = new Q1HUD(game, engine);
+
+    hud.init();
+    hud.loadState({
+      damage: {
+        time: 4,
+        attackOrigin: [1, 2, 3],
+        damageReceived: 9,
+      },
+      intermission: {
+        running: true,
+        message: 'Episode complete',
+        mapCompletedTime: 17,
+      },
+      stats: {
+        monsters_total: 10,
+        monsters_killed: 7,
+        secrets_total: 5,
+        secrets_found: 4,
+      },
+    });
+
+    assert.ok(hud.damage.attackOrigin instanceof Vector);
+    assert.deepEqual(Array.from(hud.damage.attackOrigin), [1, 2, 3]);
+    assert.equal(hud.damage.damageReceived, 9);
+    assert.equal(hud.intermission.message, 'Episode complete');
+    assert.equal(hud.stats.monsters_killed, 7);
+  });
+});
+
+void describe('id1 client API', () => {
+  void test('publishes client events and restores saved game state', () => {
+    const engine = createMockClientEngine();
+    const receivedEvents = [];
+    const clientGame = new ClientGameAPI(engine);
+
+    clientGame.init();
+
+    engine.eventBus.subscribe(clientEventName(clientEvent.TEST_EVENT), (...args) => {
+      receivedEvents.push(args);
+    });
+
+    clientGame.clientdata.health = 33;
+    clientGame.serverInfo.hostname = 'Old Name';
+    clientGame.hud.damage.time = 2;
+    clientGame.hud.damage.damageReceived = 11;
+    clientGame.hud.damage.attackOrigin = new Vector(4, 5, 6);
+
+    const savedGame = clientGame.saveGame();
+
+    clientGame.clientdata.health = 100;
+    clientGame.serverInfo.hostname = 'New Name';
+    clientGame.handleClientEvent(clientEvent.TEST_EVENT, 'alpha', 7);
+    clientGame.loadGame(savedGame);
+
+    assert.deepEqual(receivedEvents, [['alpha', 7]]);
+    assert.equal(clientGame.clientdata.health, 33);
+    assert.equal(clientGame.serverInfo.hostname, 'Old Name');
+    assert.ok(clientGame.hud.damage.attackOrigin instanceof Vector);
+    assert.deepEqual(Array.from(clientGame.hud.damage.attackOrigin), [4, 5, 6]);
+  });
+
+  void test('updates the viewmodel and muzzleflash effects during the frame', () => {
+    const dlight = {};
+    const engine = createMockClientEngine({
+      AllocDlight() {
+        return dlight;
+      },
+      CL: {
+        gametime: 0,
+        frametime: 0.1,
+        entityNum: 3,
+        intermission: false,
+        levelname: 'e1m1',
+        maxclients: 1,
+        time: 10,
+        viewangles: new Vector(),
+        vieworigin: new Vector(10, 20, 30),
+        score() {
+          return {
+            isActive: false,
+            frags: 0,
+            name: '',
+            ping: 0,
+            colors: 0,
+          };
+        },
+      },
+    });
+    const clientGame = new ClientGameAPI(engine);
+
+    clientGame.init();
+    clientGame.clientdata = createClientdata({
+      weapon: items.IT_SHOTGUN,
+      weaponframe: 3,
+      effects: effect.EF_MUZZLEFLASH,
+    });
+
+    clientGame.startFrame();
+
+    assert.equal(clientGame.viewmodel.visible, true);
+    assert.equal(clientGame.viewmodel.model.name, 'progs/v_shot.mdl');
+    assert.equal(clientGame.viewmodel.frame, 3);
+    assert.deepEqual(Array.from(dlight.origin), [30, 20, 62]);
+    assert.equal(dlight.minlight, 32);
+    assert.equal(dlight.die, 10.2);
+  });
+});
diff --git a/test/game/id1-doors.test.mjs b/test/game/id1-doors.test.mjs
new file mode 100644
index 00000000..893acbe9
--- /dev/null
+++ b/test/game/id1-doors.test.mjs
@@ -0,0 +1,347 @@
+import { describe, test } from 'node:test';
+import assert from 'node:assert/strict';
+
+import Vector from '../../source/shared/Vector.ts';
+import { attn, channel, damage, items, moveType, solid, worldType } from '../../source/game/id1/Defs.ts';
+
+await import('../../source/game/id1/GameAPI.ts');
+
+const { PlayerEntity } = await import('../../source/game/id1/entity/Player.ts');
+const { DoorEntity, SecretDoorEntity, flag } = await import('../../source/game/id1/entity/props/Doors.ts');
+const { state } = await import('../../source/game/id1/entity/props/BasePropEntity.ts');
+
+/**
+ * Create a minimal engine/game harness for door tests.
+ * @returns {{ edict: object, engine: object, gameAPI: object, precachedSounds: string[], portalCalls: Array<{ portal: number | null, isOpen: boolean }>, setModelCalls: Array<string | null>, spawnRequests: Array<{ classname: string, initialData: object }> }} Harness data.
+ */
+function createDoorHarness() {
+  const precachedSounds = [];
+  const portalCalls = [];
+  const setModelCalls = [];
+  const spawnRequests = [];
+  let boundEntity = null;
+
+  const edict = {
+    num: 1,
+    entity: null,
+    freeEdict() {},
+    setOrigin(origin) {
+      boundEntity?.origin.set(origin);
+    },
+    setModel(model) {
+      setModelCalls.push(model);
+    },
+    setMinMaxSize() {},
+    walkMove() {
+      return false;
+    },
+    changeYaw() {
+      return 0;
+    },
+    dropToFloor() {
+      return true;
+    },
+    isOnTheFloor() {
+      return false;
+    },
+    makeStatic() {},
+    aim() {
+      return null;
+    },
+    moveToGoal() {
+      return false;
+    },
+    isInPXS() {
+      return true;
+    },
+    getNextBestClient() {
+      return null;
+    },
+  };
+
+  const engine = {
+    IsLoading() {
+      return false;
+    },
+    PrecacheModel() {},
+    PrecacheSound(sound) {
+      precachedSounds.push(sound);
+    },
+    ParseQC() {
+      return null;
+    },
+    StartSound() {},
+    SpawnEntity(classname, initialData = {}) {
+      spawnRequests.push({ classname, initialData });
+      return { entity: null };
+    },
+    FindByFieldAndValue() {
+      return null;
+    },
+    FindAllByFieldAndValue() {
+      return [];
+    },
+    SetAreaPortalState(portal, isOpen) {
+      portalCalls.push({ portal, isOpen });
+    },
+    GetModelPortal() {
+      return 7;
+    },
+    eventBus: {
+      publish() {},
+    },
+  };
+
+  const gameAPI = {
+    engine,
+    worldspawn: {
+      worldtype: worldType.MEDIEVAL,
+    },
+    time: 3,
+    deathmatch: 0,
+    nomonsters: 0,
+  };
+
+  return {
+    edict,
+    engine,
+    gameAPI,
+    precachedSounds,
+    portalCalls,
+    setModelCalls,
+    spawnRequests,
+    bindEntity(entity) {
+      boundEntity = entity;
+      edict.entity = entity;
+    },
+  };
+}
+
+/**
+ * Create a minimal DoorEntity fixture that exercises explicit instance precache.
+ * @returns {{ door: import('../../source/game/id1/entity/props/Doors.ts').DoorEntity, gameAPI: object, precachedSounds: string[], portalCalls: Array<{ portal: number | null, isOpen: boolean }>, setModelCalls: Array<string | null>, spawnRequests: Array<{ classname: string, initialData: object }> }} Fixture data.
+ */
+function createDoorFixture() {
+  const harness = createDoorHarness();
+  const door = new DoorEntity(harness.edict, harness.gameAPI).initializeEntity().precacheEntity();
+  harness.bindEntity(door);
+  return { door, ...harness };
+}
+
+/**
+ * Create a minimal SecretDoorEntity fixture for focused behavior tests.
+ * @returns {{ door: import('../../source/game/id1/entity/props/Doors.ts').SecretDoorEntity, gameAPI: object, precachedSounds: string[], portalCalls: Array<{ portal: number | null, isOpen: boolean }>, setModelCalls: Array<string | null>, spawnRequests: Array<{ classname: string, initialData: object }> }} Fixture data.
+ */
+function createSecretDoorFixture() {
+  const harness = createDoorHarness();
+  const door = new SecretDoorEntity(harness.edict, harness.gameAPI).initializeEntity().precacheEntity();
+  harness.bindEntity(door);
+  return { door, ...harness };
+}
+
+void describe('DoorEntity instance precache', () => {
+  void test('defaults sounds before precache so map load does not crash', () => {
+    const { door, precachedSounds } = createDoorFixture();
+
+    assert.equal(door.sounds, 1);
+    assert.deepEqual(precachedSounds, [
+      'doors/medtry.wav',
+      'doors/meduse.wav',
+      'doors/drclos4.wav',
+      'doors/doormv1.wav',
+    ]);
+  });
+});
+
+void describe('DoorEntity spawn and touch', () => {
+  void test('applies QC defaults, key-door setup, and portal state during spawn', () => {
+    const { door, portalCalls, setModelCalls } = createDoorFixture();
+    const scheduledThinks = [];
+    let setMovedirCalls = 0;
+
+    door._sub = {
+      setMovedir() {
+        setMovedirCalls++;
+        door.movedir.setTo(1, 0, 0);
+      },
+      calcMove() {},
+      useTargets() {},
+      reset() {},
+    };
+    door._scheduleThink = (nextThink, callback) => {
+      scheduledThinks.push({ nextThink, callback });
+    };
+    door.origin = new Vector(10, 20, 30);
+    door.size = new Vector(64, 16, 8);
+    door.model = 'progs/door.bsp';
+    door.health = 20;
+    door.spawnflags = flag.DOOR_SILVER_KEY;
+
+    door.spawn();
+
+    assert.equal(setMovedirCalls, 1);
+    assert.deepEqual(setModelCalls, ['progs/door.bsp']);
+    assert.equal(door.movetype, moveType.MOVETYPE_PUSH);
+    assert.equal(door.solid, solid.SOLID_BSP);
+    assert.equal(door.speed, 100);
+    assert.equal(door.wait, -1);
+    assert.equal(door.lip, 8);
+    assert.equal(door.dmg, 2);
+    assert.equal(door.items, items.IT_KEY1);
+    assert.equal(door.max_health, 20);
+    assert.equal(door.takedamage, damage.DAMAGE_YES);
+    assert.equal(door.state, state.STATE_BOTTOM);
+    assert.equal(door.noise1, 'doors/drclos4.wav');
+    assert.equal(door.noise2, 'doors/doormv1.wav');
+    assert.equal(door.noise3, 'doors/medtry.wav');
+    assert.equal(door.noise4, 'doors/meduse.wav');
+    assert.ok(door.pos1.equalsTo(10, 20, 30));
+    assert.ok(door.pos2.equalsTo(66, 20, 30));
+    assert.deepEqual(portalCalls, [{ portal: 7, isOpen: false }]);
+    assert.equal(scheduledThinks.length, 1);
+    assert.equal(scheduledThinks[0].nextThink, 0.1);
+  });
+
+  void test('touch prints messages, enforces keys, and consumes the used key', () => {
+    const { door, gameAPI } = createDoorFixture();
+    const centerPrints = [];
+    const soundCalls = [];
+    const usedBy = [];
+    const player = Object.create(PlayerEntity.prototype);
+
+    player.items = 0;
+    player.centerPrint = (message) => {
+      centerPrints.push(message);
+    };
+    player.startSound = (...args) => {
+      soundCalls.push(args);
+    };
+
+    door.owner = door;
+    door._linkedDoor = door;
+    door.use = (usedByEntity) => {
+      usedBy.push(usedByEntity);
+    };
+
+    door.message = 'Door message';
+    door.items = 0;
+    door.touch(player);
+
+    assert.deepEqual(centerPrints, ['Door message']);
+    assert.deepEqual(soundCalls, [[channel.CHAN_VOICE, 'misc/talk.wav', 1.0, attn.ATTN_NONE]]);
+
+    centerPrints.length = 0;
+    soundCalls.length = 0;
+    gameAPI.time = 6;
+
+    door.message = null;
+    door._doorKeyUsed = false;
+    door.items = items.IT_KEY1;
+    door.owner.attack_finished = 0;
+    door.touch(player);
+
+    assert.deepEqual(centerPrints, ['You need the Silver Key']);
+    assert.deepEqual(soundCalls, [[channel.CHAN_VOICE, 'misc/talk.wav', 1.0, attn.ATTN_NONE]]);
+    assert.deepEqual(usedBy, []);
+
+    centerPrints.length = 0;
+    soundCalls.length = 0;
+    player.items = items.IT_KEY1;
+    door.owner.attack_finished = 0;
+    gameAPI.time = 9;
+
+    door.touch(player);
+
+    assert.equal(player.items, 0);
+    assert.equal(door._doorKeyUsed, true);
+    assert.deepEqual(usedBy, [player]);
+    assert.deepEqual(centerPrints, []);
+  });
+});
+
+void describe('SecretDoorEntity', () => {
+  void test('spawn applies defaults and closes the linked area portal', () => {
+    const { door, portalCalls, setModelCalls } = createSecretDoorFixture();
+
+    door.model = 'progs/secret.bsp';
+    door.origin = new Vector(4, 5, 6);
+    door.angles = new Vector();
+    door.size = new Vector(16, 32, 64);
+
+    door.spawn();
+
+    assert.equal(door.sounds, 3);
+    assert.equal(door.movetype, moveType.MOVETYPE_PUSH);
+    assert.equal(door.solid, solid.SOLID_BSP);
+    assert.equal(door.speed, 50);
+    assert.equal(door.wait, 5);
+    assert.equal(door.health, 10000);
+    assert.equal(door.takedamage, damage.DAMAGE_YES);
+    assert.deepEqual(setModelCalls, ['progs/secret.bsp']);
+    assert.deepEqual(portalCalls, [{ portal: 7, isOpen: false }]);
+    assert.ok(door.oldorigin.equalsTo(4, 5, 6));
+  });
+
+  void test('use runs the open-close sequence and restores the closed state', () => {
+    const { door, portalCalls } = createSecretDoorFixture();
+    const calcMoveCalls = [];
+    const scheduledThinks = [];
+    const usedTargets = [];
+    const soundCalls = [];
+
+    door.model = 'progs/secret.bsp';
+    door.origin = new Vector();
+    door.angles = new Vector();
+    door.size = new Vector(16, 32, 64);
+    door.spawn();
+
+    door._sub = {
+      calcMove(target, speed, callback) {
+        calcMoveCalls.push({ target: target.copy(), speed, callback });
+      },
+      useTargets(usedByEntity) {
+        usedTargets.push(usedByEntity);
+      },
+      reset() {},
+      setMovedir() {},
+    };
+    door._scheduleThink = (nextThink, callback) => {
+      scheduledThinks.push({ nextThink, callback });
+    };
+    door.startSound = (_channel, soundName) => {
+      soundCalls.push(soundName);
+    };
+
+    door.use(door);
+
+    assert.deepEqual(usedTargets, [door]);
+    assert.equal(door.takedamage, damage.DAMAGE_NO);
+    assert.equal(calcMoveCalls.length, 1);
+    assert.equal(calcMoveCalls[0].speed, 50);
+    assert.deepEqual(portalCalls.at(-1), { portal: 7, isOpen: true });
+
+    calcMoveCalls[0].callback();
+    assert.equal(scheduledThinks.length, 1);
+
+    scheduledThinks[0].callback();
+    assert.equal(calcMoveCalls.length, 2);
+
+    calcMoveCalls[1].callback();
+    assert.equal(scheduledThinks.length, 2);
+
+    scheduledThinks[1].callback();
+    assert.equal(calcMoveCalls.length, 3);
+
+    calcMoveCalls[2].callback();
+    assert.equal(scheduledThinks.length, 3);
+
+    scheduledThinks[2].callback();
+    assert.equal(calcMoveCalls.length, 4);
+
+    calcMoveCalls[3].callback();
+
+    assert.equal(door.takedamage, damage.DAMAGE_YES);
+    assert.deepEqual(portalCalls.at(-1), { portal: 7, isOpen: false });
+    assert.equal(soundCalls.at(-1), 'doors/basesec2.wav');
+  });
+});
diff --git a/test/game/id1-fog.test.mjs b/test/game/id1-fog.test.mjs
new file mode 100644
index 00000000..b2ed10b8
--- /dev/null
+++ b/test/game/id1-fog.test.mjs
@@ -0,0 +1,54 @@
+import { describe, test } from 'node:test';
+import assert from 'node:assert/strict';
+
+await import('../../source/game/id1/GameAPI.ts');
+
+const { FogEntity } = await import('../../source/game/id1/entity/props/Misc.ts');
+
+/**
+ * Create a minimal game API surface for fog entity tests.
+ * @returns {{ entity: import('../../source/game/id1/entity/props/Misc.ts').FogEntity }} Fixture data.
+ */
+function createFogFixture() {
+  const gameAPI = {
+    engine: {
+      IsLoading() {
+        return false;
+      },
+    },
+  };
+
+  const entity = new FogEntity(null, gameAPI).initializeEntity();
+  return { entity };
+}
+
+void describe('FogEntity', () => {
+  void test('uses decorated defaults for fog fields', () => {
+    const { entity } = createFogFixture();
+    const serialized = entity._serializer.serialize();
+
+    assert.equal(entity.fog_color, '128 128 128');
+    assert.equal(entity.fog_density, 0.01);
+    assert.equal(entity.fog_max_opacity, 0.8);
+    assert.ok(FogEntity.serializableFields.includes('fog_color'));
+    assert.ok(FogEntity.serializableFields.includes('fog_density'));
+    assert.ok(FogEntity.serializableFields.includes('fog_max_opacity'));
+    assert.ok('fog_color' in serialized);
+    assert.ok('fog_density' in serialized);
+    assert.ok('fog_max_opacity' in serialized);
+  });
+
+  void test('assignInitialData overrides fog parameters with map values', () => {
+    const { entity } = createFogFixture();
+
+    entity.assignInitialData({
+      fog_color: '10 20 30',
+      fog_density: '0.05',
+      fog_max_opacity: '0.4',
+    });
+
+    assert.equal(entity.fog_color, '10 20 30');
+    assert.equal(entity.fog_density, 0.05);
+    assert.equal(entity.fog_max_opacity, 0.4);
+  });
+});
diff --git a/test/game/id1-game-api.test.mjs b/test/game/id1-game-api.test.mjs
index b910637d..cb67b89d 100644
--- a/test/game/id1-game-api.test.mjs
+++ b/test/game/id1-game-api.test.mjs
@@ -2,6 +2,7 @@ import assert from 'node:assert/strict';
 import { describe, test } from 'node:test';
 
 const { ServerGameAPI } = await import('../../source/game/id1/GameAPI.ts');
+const { default: BaseEntity } = await import('../../source/game/id1/entity/BaseEntity.ts');
 
 /**
  * Create a mutable mock cvar.
@@ -114,3 +115,68 @@ void describe('ServerGameAPI cvar access', () => {
     }
   });
 });
+
+void describe('ServerGameAPI entity lifecycle', () => {
+  void test('prepareEntity precaches after assigned initial data is applied', () => {
+    class DeferredInitEntity extends BaseEntity {
+      static classname = 'deferred_init_entity';
+
+      constructor(edict, gameAPI) {
+        super(edict, gameAPI);
+        this.constructorValue = 3;
+      }
+
+      _declareFields() {
+        super._declareFields();
+        this._serializer.startFields();
+        this.initializerReady = 0;
+        this.constructorValue = 0;
+        this.precacheObservedValue = -1;
+        this._serializer.endFields();
+      }
+
+      _precache() {
+        this.precacheObservedValue = this.initializerReady;
+      }
+    }
+
+    const originalRegistry = ServerGameAPI._entityRegistry;
+    const originalCvars = ServerGameAPI._cvars;
+
+    try {
+      ServerGameAPI._cvars = createStaticCvars();
+      ServerGameAPI._entityRegistry = {
+        has(classname) {
+          return classname === DeferredInitEntity.classname;
+        },
+        get(classname) {
+          return classname === DeferredInitEntity.classname ? DeferredInitEntity : null;
+        },
+      };
+
+      const gameAPI = Object.create(ServerGameAPI.prototype);
+      gameAPI.constructor = ServerGameAPI;
+      gameAPI.engine = {
+        ConsoleWarning() {},
+        IsLoading() {
+          return false;
+        },
+      };
+      gameAPI._missingEntityClassStats = {};
+      gameAPI._isPreparingEntityAllowed = () => true;
+
+      const edict = { entity: null };
+
+      const prepared = gameAPI.prepareEntity(edict, DeferredInitEntity.classname, {
+        initializerReady: 7,
+      });
+
+      assert.equal(prepared, true);
+      assert.equal(edict.entity.precacheObservedValue, 7);
+      assert.equal(edict.entity.constructorValue, 0);
+    } finally {
+      ServerGameAPI._entityRegistry = originalRegistry;
+      ServerGameAPI._cvars = originalCvars;
+    }
+  });
+});
diff --git a/test/game/id1-game-stats.test.mjs b/test/game/id1-game-stats.test.mjs
index 0db13096..0ac3adf1 100644
--- a/test/game/id1-game-stats.test.mjs
+++ b/test/game/id1-game-stats.test.mjs
@@ -3,7 +3,6 @@ import { describe, test } from 'node:test';
 
 const { clientEvent } = await import('../../source/game/id1/Defs.ts');
 const gameStatsModule = await import('../../source/game/id1/helper/GameStats.ts');
-const gameStatsShimModule = await import('../../source/game/id1/helper/GameStats.mjs');
 
 const GameStats = gameStatsModule.default;
 const { gameStatSlots } = gameStatsModule;
@@ -69,11 +68,6 @@ function createEntity(edictNum) {
 }
 
 void describe('GameStats', () => {
-  void test('keeps the .mjs shim aligned with the TypeScript module', () => {
-    assert.equal(gameStatsShimModule.default, GameStats);
-    assert.deepEqual(gameStatsShimModule.gameStatSlots, gameStatSlots);
-  });
-
   void test('tracks decorated stat fields for serialization', () => {
     const engineAPI = createEngineAPI();
     const stats = new GameStats({}, engineAPI);
diff --git a/test/game/id1-items.test.mjs b/test/game/id1-items.test.mjs
new file mode 100644
index 00000000..8da76f85
--- /dev/null
+++ b/test/game/id1-items.test.mjs
@@ -0,0 +1,188 @@
+import assert from 'node:assert/strict';
+import { describe, test } from 'node:test';
+
+import { channel, items, solid, tentType, worldType } from '../../source/game/id1/Defs.ts';
+
+await import('../../source/game/id1/GameAPI.ts');
+
+const { default: BaseEntity } = await import('../../source/game/id1/entity/BaseEntity.ts');
+const {
+  BackpackEntity,
+  HealthItemEntity,
+  ItemShellsEntity,
+  SilverKeyEntity,
+} = await import('../../source/game/id1/entity/Items.ts');
+
+/**
+ * Create the minimal game API surface required by the item tests.
+ * @param {object} overrides Optional engine/game overrides.
+ * @returns {object} Mock game API.
+ */
+function createMockGameAPI(overrides = {}) {
+  const engine = {
+    DispatchTempEntityEvent() {},
+    FindAllByFieldAndValue() {
+      return [];
+    },
+    IsLoading() {
+      return false;
+    },
+    PrecacheModel() {},
+    PrecacheSound() {},
+    SpawnEntity() {
+      return null;
+    },
+    StartSound() {},
+    ...overrides.engine,
+  };
+
+  return {
+    time: 0,
+    deathmatch: 0,
+    coop: 0,
+    serverflags: 0,
+    engine,
+    worldspawn: overrides.worldspawn ?? {
+      worldtype: worldType.MEDIEVAL,
+      findNextEntityByFieldAndValue() {
+        return null;
+      },
+    },
+    ...overrides,
+  };
+}
+
+void describe('Items', () => {
+  void test('serializes shared pickup fields and backpack timeout fields', () => {
+    const backpack = new BackpackEntity(null, createMockGameAPI()).initializeEntity();
+    const serialized = backpack._serializer.serialize();
+
+    for (const field of [
+      'ammo_shells',
+      'ammo_nails',
+      'ammo_rockets',
+      'ammo_cells',
+      'items',
+      'weapon',
+      'regeneration_time',
+      '_model_original',
+      'noise',
+      'netname',
+      'remove_after',
+    ]) {
+      assert.ok(field in serialized, `missing serialized field "${field}"`);
+    }
+  });
+
+  void test('hides picked items in deathmatch and restores them on regeneration', () => {
+    const gameAPI = createMockGameAPI({ deathmatch: 1, time: 12 });
+    const activator = new BaseEntity(null, gameAPI).initializeEntity();
+    const backpack = new BackpackEntity(null, gameAPI).initializeEntity();
+    const scheduled = [];
+    const sounds = [];
+    const tempEvents = [];
+
+    backpack.model = 'progs/backpack.mdl';
+    backpack.regeneration_time = 30;
+    backpack._scheduleThink = (time, callback, identifier) => {
+      scheduled.push({ time, callback, identifier });
+    };
+    backpack.setOrigin = () => {};
+    backpack.startSound = (soundChannel, sfxName) => {
+      sounds.push({ soundChannel, sfxName });
+    };
+    backpack.engine.DispatchTempEntityEvent = (eventType, origin) => {
+      tempEvents.push({ eventType, origin: origin.copy() });
+    };
+
+    backpack._afterTouch(activator);
+
+    assert.equal(backpack.solid, solid.SOLID_NOT);
+    assert.equal(backpack.model, null);
+    assert.equal(backpack._model_original, 'progs/backpack.mdl');
+    assert.equal(scheduled.length, 1);
+    assert.equal(scheduled[0].time, 42);
+
+    scheduled[0].callback.call(backpack, backpack);
+
+    assert.equal(backpack.model, 'progs/backpack.mdl');
+    assert.equal(backpack.solid, solid.SOLID_TRIGGER);
+    assert.deepEqual(sounds, [{ soundChannel: channel.CHAN_VOICE, sfxName: 'items/itembk2.wav' }]);
+    assert.equal(tempEvents.length, 1);
+    assert.equal(tempEvents[0].eventType, tentType.TE_TELEPORT);
+  });
+
+  void test('prefers the super shotgun when a shell pickup makes it usable', () => {
+    const shellBox = new ItemShellsEntity(null, createMockGameAPI()).initializeEntity();
+    let appliedBackpack = false;
+
+    shellBox.ammo_shells = 20;
+    shellBox.weapon = items.IT_SHOTGUN;
+
+    const player = {
+      items: items.IT_SUPER_SHOTGUN,
+      ammo_shells: 0,
+      applyBackpack(entity) {
+        appliedBackpack = entity === shellBox;
+        return true;
+      },
+    };
+
+    assert.equal(shellBox._pickup(player), true);
+    assert.equal(shellBox.weapon, items.IT_SUPER_SHOTGUN);
+    assert.equal(appliedBackpack, true);
+  });
+
+  void test('falls back to medieval key assets for unknown world types', () => {
+    const key = new SilverKeyEntity(null, createMockGameAPI({
+      worldspawn: { worldtype: 99 },
+    })).initializeEntity();
+
+    key._setInfo();
+
+    assert.equal(key.noise, 'misc/medkey.wav');
+    assert.equal(key.netname, 'silver key');
+    assert.equal(key.model, 'progs/w_s_key.mdl');
+  });
+
+  void test('chips megahealth back to max and clears the superhealth flag', () => {
+    const gameAPI = createMockGameAPI({ time: 5 });
+    const megaHealth = new HealthItemEntity(null, gameAPI).initializeEntity();
+    const scheduled = [];
+    let removed = false;
+
+    megaHealth.spawnflags = HealthItemEntity.H_MEGA;
+    megaHealth.model = 'maps/b_bh100.bsp';
+    megaHealth._scheduleThink = (time, callback, identifier) => {
+      scheduled.push({ time, callback, identifier });
+    };
+    megaHealth.remove = () => {
+      removed = true;
+    };
+
+    const player = {
+      health: 101,
+      max_health: 100,
+      items: items.IT_SUPERHEALTH,
+    };
+
+    megaHealth._afterTouch(player);
+
+    assert.equal(megaHealth.owner, player);
+    assert.equal(megaHealth.model, null);
+    assert.equal(scheduled.length, 1);
+    assert.equal(scheduled[0].time, 10);
+
+    scheduled.length = 0;
+    megaHealth._takeHealth();
+    assert.equal(player.health, 100);
+    assert.equal(scheduled.length, 1);
+    assert.equal(scheduled[0].time, 6);
+
+    scheduled.length = 0;
+    megaHealth._takeHealth();
+    assert.equal(player.items & items.IT_SUPERHEALTH, 0);
+    assert.equal(megaHealth.owner, null);
+    assert.equal(removed, true);
+  });
+});
diff --git a/test/game/id1-knights.test.mjs b/test/game/id1-knights.test.mjs
index 8a7b8e26..3966b5cb 100644
--- a/test/game/id1-knights.test.mjs
+++ b/test/game/id1-knights.test.mjs
@@ -1,14 +1,79 @@
 import { describe, test } from 'node:test';
 import assert from 'node:assert/strict';
 
+import Vector from '../../source/shared/Vector.ts';
+
 await import('../../source/game/id1/GameAPI.ts');
 
-const { tentType } = await import('../../source/game/id1/Defs.ts');
+const { channel, tentType } = await import('../../source/game/id1/Defs.ts');
 const { HellKnightMonster, KnightMonster, KnightSpike } = await import('../../source/game/id1/entity/monster/Knights.ts');
 
 KnightMonster._initStates();
 HellKnightMonster._initStates();
 
+function createMonsterFixture(MonsterClass, gameOverrides = {}) {
+  const soundCalls = [];
+  const spawnRequests = [];
+  const edict = { entity: null };
+  const engine = {
+    IsLoading() {
+      return false;
+    },
+    ParseQC() {
+      return null;
+    },
+    PrecacheSound() {
+    },
+    PrecacheModel() {
+    },
+    SpawnEntity(classname, initialData = {}) {
+      spawnRequests.push({ classname, initialData });
+      return { entity: null };
+    },
+    DispatchTempEntityEvent() {
+    },
+    FindByFieldAndValue() {
+      return null;
+    },
+    FindAllByFieldAndValue() {
+      return [];
+    },
+    eventBus: {
+      publish() {
+      },
+    },
+  };
+  const gameAPI = {
+    engine,
+    time: 10,
+    skill: 1,
+    deathmatch: 0,
+    nomonsters: 0,
+    gravity: 800,
+    hasFeature() {
+      return false;
+    },
+    ...gameOverrides,
+  };
+
+  const entity = new MonsterClass(edict, gameAPI).initializeEntity();
+  edict.entity = entity;
+  entity.origin = new Vector();
+  entity.view_ofs = new Vector();
+  entity.movedir = new Vector();
+  entity.startSound = (...args) => {
+    soundCalls.push(args);
+  };
+
+  return { entity, gameAPI, soundCalls, spawnRequests };
+}
+
+function assertVectorNear(actual, expected, epsilon = 1e-6) {
+  for (let i = 0; i < 3; i++) {
+    assert.ok(Math.abs(actual[i] - expected[i]) <= epsilon, `component ${i} mismatch: ${actual[i]} !== ${expected[i]}`);
+  }
+}
+
 void describe('KnightMonster metadata', () => {
   void test('class metadata matches the original monster', () => {
     assert.equal(KnightMonster.classname, 'monster_knight');
@@ -55,6 +120,33 @@ void describe('KnightMonster state machine', () => {
     assert.equal(typeof states.knight_die1.handler, 'function');
     assert.equal(typeof states.knight_pain2.handler, 'function');
   });
+
+  void test('thinkMelee keeps the legacy distance split between melee and run attack', () => {
+    const { entity } = createMonsterFixture(KnightMonster);
+    const runStates = [];
+
+    entity._runState = (state) => {
+      runStates.push(state);
+      return true;
+    };
+
+    entity.enemy = {
+      origin: new Vector(60, 0, 0),
+      view_ofs: new Vector(),
+    };
+    entity.thinkMelee();
+
+    entity.enemy = {
+      origin: new Vector(120, 0, 0),
+      view_ofs: new Vector(),
+    };
+    entity.thinkMelee();
+
+    entity.enemy = null;
+    entity.thinkMelee();
+
+    assert.deepEqual(runStates, ['knight_atk1', 'knight_runatk1', 'knight_atk1']);
+  });
 });
 
 void describe('KnightSpike metadata', () => {
@@ -108,4 +200,36 @@ void describe('HellKnightMonster state machine', () => {
     assert.equal(typeof states.hknight_pain2.handler, 'function');
     assert.equal(typeof states.hknight_dieb1.handler, 'function');
   });
+
+  void test('attackShot preserves the projectile spawn contract and aimed movedir', () => {
+    const { entity, soundCalls, spawnRequests } = createMonsterFixture(HellKnightMonster);
+    const originalRandom = Math.random;
+
+    entity.origin = new Vector(5, -10, 20);
+    entity.enemy = {
+      origin: new Vector(45, 10, 20),
+    };
+
+    Math.random = () => 0.5;
+
+    try {
+      entity.attackShot(2);
+    } finally {
+      Math.random = originalRandom;
+    }
+
+    const offsetAngles = entity.enemy.origin.copy().subtract(entity.origin).toAngles();
+    offsetAngles[1] += 12;
+    const { forward } = offsetAngles.angleVectors();
+    forward.normalize();
+    forward[2] = -forward[2];
+
+    assert.equal(spawnRequests.length, 1);
+    assert.equal(spawnRequests[0].classname, KnightSpike.classname);
+    assert.equal(spawnRequests[0].initialData.speed, 300);
+    assert.equal(spawnRequests[0].initialData.owner, entity);
+    assert.equal(soundCalls.length, 1);
+    assert.deepEqual(soundCalls[0].slice(0, 2), [channel.CHAN_WEAPON, 'hknight/attack1.wav']);
+    assertVectorNear(entity.movedir, forward);
+  });
 });
diff --git a/test/game/id1-misc.test.mjs b/test/game/id1-misc.test.mjs
new file mode 100644
index 00000000..8e24d3b6
--- /dev/null
+++ b/test/game/id1-misc.test.mjs
@@ -0,0 +1,154 @@
+import assert from 'node:assert/strict';
+import { describe, test } from 'node:test';
+
+await import('../../source/game/id1/GameAPI.ts');
+
+const { default: BaseEntity } = await import('../../source/game/id1/entity/BaseEntity.ts');
+const { default: BaseMonster } = await import('../../source/game/id1/entity/monster/BaseMonster.ts');
+const {
+  BubbleSpawnerEntity,
+  IntermissionCameraEntity,
+  LightEntity,
+  PathCornerEntity,
+} = await import('../../source/game/id1/entity/Misc.ts');
+
+/**
+ * Create a minimal mock game API for Misc entity tests.
+ * @param {object} overrides Optional engine and game overrides.
+ * @returns {object} Mock game API object.
+ */
+function createMockGameAPI(overrides = {}) {
+  const engine = {
+    Lightstyle() {},
+    SpawnEntity() {
+      return null;
+    },
+    PrecacheModel() {},
+    PrecacheSound() {},
+    SpawnAmbientSound() {},
+    StartSound() {},
+    DispatchTempEntityEvent() {},
+    DeterminePointContents() {
+      return 0;
+    },
+    eventBus: {
+      publish() {},
+    },
+    ...overrides.engine,
+  };
+
+  return {
+    time: 0,
+    engine,
+    deathmatch: 0,
+    nomonsters: 0,
+    serverflags: 0,
+    worldspawn: overrides.worldspawn ?? null,
+    ...overrides,
+  };
+}
+
+class TestEntity extends BaseEntity {
+  static classname = 'test_misc_entity';
+
+  removed = false;
+
+  remove() {
+    this.removed = true;
+  }
+}
+
+class TestMonster extends BaseMonster {
+  static classname = 'test_misc_monster';
+
+  reachedCorner = null;
+
+  moveTargetReached(pathCornerEntity) {
+    this.reachedCorner = pathCornerEntity;
+  }
+
+  spawn() {}
+}
+
+void describe('Misc entity port', () => {
+  void test('IntermissionCameraEntity uses decorated defaults', () => {
+    const entity = new IntermissionCameraEntity(null, createMockGameAPI()).initializeEntity();
+
+    assert.ok(IntermissionCameraEntity.serializableFields.includes('mangle'));
+    assert.ok(entity.mangle.equalsTo(0, 0, 0));
+  });
+
+  void test('LightEntity removes inert lights and toggles targeted styles', () => {
+    const styles = [];
+    const inert = new LightEntity(null, createMockGameAPI()).initializeEntity();
+    let removed = false;
+    inert.remove = () => {
+      removed = true;
+    };
+    inert.spawn();
+    assert.equal(removed, true);
+
+    const active = new LightEntity(null, createMockGameAPI({
+      engine: {
+        Lightstyle(style, value) {
+          styles.push({ style, value });
+        },
+      },
+    })).initializeEntity();
+    active.targetname = 'target_light';
+    active.style = 35;
+    active.spawnflags = LightEntity.START_OFF;
+
+    active.spawn();
+    active.use(active);
+
+    assert.deepEqual(styles, [
+      { style: 35, value: 'a' },
+      { style: 35, value: 'm' },
+    ]);
+  });
+
+  void test('PathCornerEntity only advances idle monsters at their current movetarget', () => {
+    const corner = new PathCornerEntity(null, createMockGameAPI()).initializeEntity();
+    const otherCorner = new PathCornerEntity(null, createMockGameAPI()).initializeEntity();
+    const monster = new TestMonster(null, createMockGameAPI()).initializeEntity();
+    corner.equals = (otherEntity) => otherEntity === corner;
+
+    monster.movetarget = otherCorner;
+    corner.touch(monster);
+    assert.equal(monster.reachedCorner, null);
+
+    monster.movetarget = corner;
+    monster.enemy = new TestEntity(null, createMockGameAPI()).initializeEntity();
+    corner.touch(monster);
+    assert.equal(monster.reachedCorner, null);
+
+    monster.enemy = null;
+    corner.touch(monster);
+    assert.equal(monster.reachedCorner, corner);
+  });
+
+  void test('BubbleSpawnerEntity.bubble spawns a positioned helper spawner', () => {
+    const spawnCalls = [];
+    const spawner = new BubbleSpawnerEntity(null, createMockGameAPI()).initializeEntity();
+    const originator = new TestEntity(null, createMockGameAPI({
+      engine: {
+        SpawnEntity(classname, initialData) {
+          spawnCalls.push({ classname, initialData });
+          return { entity: spawner };
+        },
+      },
+    })).initializeEntity();
+    originator.origin.setTo(100, 200, 300);
+    originator.view_ofs.setTo(1, 2, 3);
+
+    const result = BubbleSpawnerEntity.bubble(originator, 6);
+
+    assert.equal(result, spawner);
+    assert.equal(spawnCalls.length, 1);
+    assert.equal(spawnCalls[0].classname, BubbleSpawnerEntity.classname);
+    assert.ok(spawnCalls[0].initialData.origin.equalsTo(101, 202, 303));
+    assert.equal(spawnCalls[0].initialData.bubble_count, 6);
+    assert.equal(spawnCalls[0].initialData.spread, 5);
+  });
+});
diff --git a/test/game/id1-oldone.test.mjs b/test/game/id1-oldone.test.mjs
index f4536040..af1ab10d 100644
--- a/test/game/id1-oldone.test.mjs
+++ b/test/game/id1-oldone.test.mjs
@@ -6,7 +6,7 @@ import { damage, moveType, solid } from '../../source/game/id1/Defs.ts';
 
 await import('../../source/game/id1/GameAPI.ts');
 
-const { default: OldOneMonster } = await import('../../source/game/id1/entity/monster/OldOne.mjs');
+const { default: OldOneMonster } = await import('../../source/game/id1/entity/monster/OldOne.ts');
 
 OldOneMonster._initStates();
 
@@ -88,7 +88,7 @@ function createMonsterFixture(MonsterClass, gameOverrides = {}) {
     ...gameOverrides,
   };
 
-  const entity = new MonsterClass(edict, gameAPI);
+  const entity = new MonsterClass(edict, gameAPI).initializeEntity();
   edict.entity = entity;
   entity.origin = new Vector(10, 20, 30);
   entity.angles = new Vector();
diff --git a/test/game/id1-platforms.test.mjs b/test/game/id1-platforms.test.mjs
new file mode 100644
index 00000000..d2238f8a
--- /dev/null
+++ b/test/game/id1-platforms.test.mjs
@@ -0,0 +1,287 @@
+import { describe, test } from 'node:test';
+import assert from 'node:assert/strict';
+
+import Vector from '../../source/shared/Vector.ts';
+import { moveType, solid } from '../../source/game/id1/Defs.ts';
+
+await import('../../source/game/id1/GameAPI.ts');
+
+const { PathCornerEntity } = await import('../../source/game/id1/entity/Misc.ts');
+const { PlatformEntity, PlatformTriggerEntity, TrainEntity, TeleportTrainEntity } = await import('../../source/game/id1/entity/props/Platforms.ts');
+const { state } = await import('../../source/game/id1/entity/props/BasePropEntity.ts');
+
+/**
+ * Create a minimal mover harness for platform-family entity tests.
+ * @returns {{ edict: object, engine: object, gameAPI: object, precachedSounds: string[], precachedModels: string[], setModelCalls: string[], spawnRequests: Array<{ classname: string, initialData: object }>, scheduledThinks: Array<{ nextThink: number, callback: Function, identifier?: string | null }> }} Harness data.
+ */
+function createMoverHarness() {
+  const precachedSounds = [];
+  const precachedModels = [];
+  const setModelCalls = [];
+  const spawnRequests = [];
+  const scheduledThinks = [];
+  let boundEntity = null;
+
+  const edict = {
+    num: 1,
+    entity: null,
+    freeEdict() {},
+    setOrigin(origin) {
+      boundEntity?.origin.set(origin);
+    },
+    setModel(model) {
+      setModelCalls.push(model);
+      if (boundEntity !== null) {
+        boundEntity.model = model;
+        boundEntity.modelindex = model ? 1 : 0;
+      }
+    },
+    setMinMaxSize(mins, maxs) {
+      if (boundEntity !== null) {
+        boundEntity.mins.set(mins);
+        boundEntity.maxs.set(maxs);
+        boundEntity.size = maxs.copy().subtract(mins);
+      }
+    },
+    walkMove() {
+      return false;
+    },
+    changeYaw() {
+      return 0;
+    },
+    dropToFloor() {
+      return true;
+    },
+    isOnTheFloor() {
+      return false;
+    },
+    makeStatic() {},
+    aim() {
+      return null;
+    },
+    moveToGoal() {
+      return false;
+    },
+    isInPXS() {
+      return true;
+    },
+    getNextBestClient() {
+      return null;
+    },
+  };
+
+  const engine = {
+    IsLoading() {
+      return false;
+    },
+    PrecacheModel(model) {
+      precachedModels.push(model);
+    },
+    PrecacheSound(sound) {
+      precachedSounds.push(sound);
+    },
+    StartSound() {},
+    SpawnAmbientSound() {},
+    SpawnEntity(classname, initialData = {}) {
+      spawnRequests.push({ classname, initialData });
+      return { entity: null };
+    },
+    FindByFieldAndValue() {
+      return null;
+    },
+    FindAllByFieldAndValue() {
+      return [];
+    },
+    ParseQC() {
+      return null;
+    },
+    Traceline() {
+      return null;
+    },
+    SetAreaPortalState() {},
+    GetCvar() {
+      return { value: 0 };
+    },
+  };
+
+  const gameAPI = {
+    engine,
+    time: 0,
+  };
+
+  return {
+    edict,
+    engine,
+    gameAPI,
+    precachedSounds,
+    precachedModels,
+    setModelCalls,
+    spawnRequests,
+    scheduledThinks,
+    bindEntity(entity) {
+      boundEntity = entity;
+      edict.entity = entity;
+      entity._scheduleThink = (nextThink, callback, identifier = null) => {
+        scheduledThinks.push({ nextThink, callback, identifier });
+      };
+    },
+  };
+}
+
+/**
+ * Build a platform fixture for focused gameplay tests.
+ * @returns {{ entity: InstanceType<typeof PlatformEntity>, edict: object, engine: object, gameAPI: object, precachedSounds: string[], precachedModels: string[], setModelCalls: string[], spawnRequests: Array<{ classname: string, initialData: object }>, scheduledThinks: Array<{ nextThink: number, callback: Function, identifier?: string | null }> }} Fixture data.
+ */
+function createPlatformFixture() {
+  const harness = createMoverHarness();
+  const entity = new PlatformEntity(harness.edict, harness.gameAPI).initializeEntity().precacheEntity();
+  harness.bindEntity(entity);
+  return { entity, ...harness };
+}
+
+/**
+ * Build a train-family fixture for focused gameplay tests.
+ * @param {typeof TrainEntity | typeof TeleportTrainEntity} [EntityClass] Constructor under test.
+ * @returns {{ entity: InstanceType<typeof TrainEntity>, edict: object, engine: object, gameAPI: object, precachedSounds: string[], precachedModels: string[], setModelCalls: string[], spawnRequests: Array<{ classname: string, initialData: object }>, scheduledThinks: Array<{ nextThink: number, callback: Function, identifier?: string | null }> }} Fixture data.
+ */
+function createTrainFixture(EntityClass = TrainEntity) {
+  const harness = createMoverHarness();
+  const entity = new EntityClass(harness.edict, harness.gameAPI).initializeEntity().precacheEntity();
+  harness.bindEntity(entity);
+  return { entity, ...harness };
+}
+
+void describe('PlatformEntity', () => {
+  void test('spawn applies QC defaults, positions the plat, and spawns its trigger', () => {
+    const { entity, spawnRequests, setModelCalls, precachedSounds } = createPlatformFixture();
+
+    entity.origin = new Vector(10, 20, 30);
+    entity.model = 'progs/plat.bsp';
+    entity.mins = new Vector(-32, -32, 0);
+    entity.maxs = new Vector(32, 32, 64);
+    entity.size = new Vector(64, 64, 64);
+
+    entity.spawn();
+
+    assert.deepEqual(precachedSounds, ['plats/medplat1.wav', 'plats/medplat2.wav']);
+    assert.equal(entity.speed, 150);
+    assert.equal(entity.t_length, 80);
+    assert.equal(entity.t_width, 10);
+    assert.equal(entity.movetype, moveType.MOVETYPE_PUSH);
+    assert.equal(entity.solid, solid.SOLID_BSP);
+    assert.equal(entity.state, state.STATE_BOTTOM);
+    assert.equal(entity.noise, 'plats/medplat1.wav');
+    assert.equal(entity.noise1, 'plats/medplat2.wav');
+    assert.ok(entity.pos1.equalsTo(10, 20, 30));
+    assert.ok(entity.pos2.equalsTo(10, 20, -26));
+    assert.ok(entity.origin.equalsTo(10, 20, -26));
+    assert.deepEqual(setModelCalls, ['progs/plat.bsp']);
+    assert.deepEqual(spawnRequests, [{ classname: PlatformTriggerEntity.classname, initialData: { owner: entity } }]);
+  });
+
+  void test('targeted plats only honor the remote use once, matching QC plat_use', () => {
+    const { entity } = createPlatformFixture();
+    const calcMoveCalls = [];
+
+    entity.origin = new Vector();
+    entity.model = 'progs/plat_targeted.bsp';
+    entity.mins = new Vector(-16, -16, 0);
+    entity.maxs = new Vector(16, 16, 32);
+    entity.size = new Vector(32, 32, 32);
+    entity.targetname = 'remote_plat';
+    entity._sub = {
+      calcMove(target, speed, callback) {
+        calcMoveCalls.push({ target: target.copy(), speed, callback });
+      },
+      setMovedir() {},
+      useTargets() {},
+      reset() {},
+    };
+
+    entity.spawn();
+    entity.use(entity);
+    entity.state = state.STATE_UP;
+    entity.use(entity);
+
+    assert.equal(calcMoveCalls.length, 1);
+    assert.equal(entity.state, state.STATE_UP);
+  });
+});
+
+void describe('TrainEntity', () => {
+  void test('finds the first corner, updates target to the next corner, and only activates once when targeted', () => {
+    const { entity } = createTrainFixture();
+    const calcMoveCalls = [];
+    const firstCorner = Object.assign(Object.create(PathCornerEntity.prototype), {
+      origin: new Vector(100, 200, 300),
+      target: 'corner_2',
+      wait: 0,
+    });
+    const secondCorner = Object.assign(Object.create(PathCornerEntity.prototype), {
+      origin: new Vector(400, 500, 600),
+      target: 'corner_3',
+      wait: 1.5,
+    });
+
+    entity.model = 'progs/train.bsp';
+    entity.target = 'corner_1';
+    entity.targetname = 'remote_train';
+    entity.mins = new Vector(-16, -16, -16);
+    entity.maxs = new Vector(16, 16, 16);
+    entity.size = new Vector(32, 32, 32);
+    entity._sub = {
+      calcMove(target, speed, callback) {
+        calcMoveCalls.push({ target: target.copy(), speed, callback });
+      },
+      setMovedir() {},
+      useTargets() {},
+      reset() {},
+    };
+    entity.findFirstEntityByFieldAndValue = (_field, value) => {
+      if (value === 'corner_1') {
+        return firstCorner;
+      }
+      if (value === 'corner_2') {
+        return secondCorner;
+      }
+      return null;
+    };
+
+    entity.spawn();
+    entity._trainFind();
+
+    assert.ok(entity.origin.equalsTo(116, 216, 316));
+    assert.equal(entity.target, 'corner_2');
+
+    entity.use(entity);
+    entity.use(entity);
+
+    assert.equal(calcMoveCalls.length, 1);
+    assert.ok(calcMoveCalls[0].target.equalsTo(416, 516, 616));
+    assert.equal(calcMoveCalls[0].speed, 100);
+    assert.equal(entity.target, 'corner_3');
+    assert.equal(entity.wait, 1.5);
+  });
+});
+
+void describe('TeleportTrainEntity', () => {
+  void test('spawns with the teleport model, no collision, and the initial find think', () => {
+    const { entity, setModelCalls, precachedModels, precachedSounds, scheduledThinks } = createTrainFixture(TeleportTrainEntity);
+
+    entity.target = 'tele_corner';
+    entity.mins = new Vector(-8, -8, -8);
+    entity.maxs = new Vector(8, 8, 8);
+    entity.size = new Vector(16, 16, 16);
+
+    entity.spawn();
+
+    assert.deepEqual(precachedSounds, ['misc/null.wav']);
+    assert.deepEqual(precachedModels, ['progs/teleport.mdl']);
+    assert.deepEqual(setModelCalls, ['progs/teleport.mdl']);
+    assert.equal(entity.movetype, moveType.MOVETYPE_PUSH);
+    assert.equal(entity.solid, solid.SOLID_NOT);
+    assert.ok(entity.avelocity.equalsTo(100, 200, 300));
+    assert.equal(scheduledThinks.length, 1);
+    assert.equal(scheduledThinks[0].nextThink, 0.1);
+  });
+});
diff --git a/test/game/id1-player-lifecycle.test.mjs b/test/game/id1-player-lifecycle.test.mjs
new file mode 100644
index 00000000..e2e48c21
--- /dev/null
+++ b/test/game/id1-player-lifecycle.test.mjs
@@ -0,0 +1,264 @@
+import assert from 'node:assert/strict';
+import { describe, test } from 'node:test';
+
+await import('../../source/game/id1/GameAPI.ts');
+
+const defsModule = await import('../../source/game/id1/Defs.ts');
+const playerModule = await import('../../source/game/id1/entity/Player.ts');
+const worldspawnModule = await import('../../source/game/id1/entity/Worldspawn.ts');
+const vectorModule = await import('../../source/shared/Vector.ts');
+
+const { clientEvent, items } = defsModule;
+const { PlayerEntity } = playerModule;
+const { BodyqueEntity } = worldspawnModule;
+const { default: Vector } = vectorModule;
+
+/**
+ * Create a minimal game API surface for BodyqueEntity construction.
+ * @returns {{engine: object}} Minimal game API object.
+ */
+function createBodyqueGameAPI() {
+  return {
+    engine: {},
+  };
+}
+
+/**
+ * Create a body queue node with edict-bound methods stubbed for unit tests.
+ * @returns {BodyqueEntity} Stubbed body queue entity.
+ */
+function createBodyqueNode() {
+  const body = new BodyqueEntity(null, createBodyqueGameAPI()).initializeEntity();
+
+  body.setModel = function setModel(model) {
+    this.model = model;
+  };
+
+  body.setOrigin = function setOrigin(origin) {
+    this.origin = origin.copy();
+  };
+
+  body.setSize = function setSize(mins, maxs) {
+    this.mins = mins.copy();
+    this.maxs = maxs.copy();
+  };
+
+  return body;
+}
+
+void describe('PlayerEntity respawn flow', () => {
+  void test('singleplayer respawn restarts the map', () => {
+    const appendedConsoleText = [];
+    const player = {
+      game: {
+        coop: false,
+        deathmatch: false,
+      },
+      engine: {
+        AppendConsoleText(command) {
+          appendedConsoleText.push(command);
+        },
+      },
+    };
+
+    PlayerEntity.prototype._respawn.call(player);
+
+    assert.deepEqual(appendedConsoleText, ['restart\n']);
+  });
+
+  void test('deathmatch respawn refreshes spawn state and advances the body queue ring', () => {
+    const bodyA = createBodyqueNode();
+    const bodyB = createBodyqueNode();
+    bodyA.owner = bodyB;
+    bodyB.owner = bodyA;
+
+    const calls = [];
+    const player = {
+      game: {
+        coop: false,
+        deathmatch: true,
+        bodyque_head: bodyA,
+      },
+      angles: new Vector(1, 2, 3),
+      model: 'progs/player.mdl',
+      frame: 4,
+      colormap: 16,
+      movetype: 7,
+      velocity: new Vector(10, 20, 30),
+      origin: new Vector(100, 200, 300),
+      mins: new Vector(-16, -16, -24),
+      maxs: new Vector(16, 16, 32),
+      clear() {
+        calls.push('clear');
+      },
+      putPlayerInServer() {
+        calls.push('putPlayerInServer');
+      },
+      _freshSpawnParameters() {
+        calls.push('freshSpawnParameters');
+      },
+    };
+
+    PlayerEntity.prototype._respawn.call(player);
+
+    assert.deepEqual(calls, ['freshSpawnParameters', 'clear', 'putPlayerInServer']);
+    assert.equal(player.game.bodyque_head, bodyB);
+    assert.equal(bodyA.model, 'progs/player.mdl');
+    assert.deepEqual(bodyA.origin, new Vector(100, 200, 300));
+    assert.deepEqual(bodyA.velocity, new Vector(10, 20, 30));
+  });
+});
+
+void describe('PlayerEntity intermission flow', () => {
+  void test('deathmatch intermission exits directly to the next map', () => {
+    let loadNextMapCalls = 0;
+    const player = {
+      game: {
+        deathmatch: true,
+        intermission_exittime: 0,
+        intermission_running: 1,
+        time: 10,
+        loadNextMap() {
+          loadNextMapCalls++;
+        },
+      },
+    };
+
+    PlayerEntity.prototype._intermissionExit.call(player);
+
+    assert.equal(loadNextMapCalls, 1);
+  });
+
+  void test('episode-ending intermission prints finale text before loading the next map', () => {
+    const centerPrints = [];
+    let trackPlayed = null;
+    let loadNextMapCalls = 0;
+    const player = {
+      game: {
+        deathmatch: false,
+        intermission_exittime: 0,
+        intermission_running: 1,
+        time: 42,
+        mapname: 'e1m7',
+        serverflags: 0,
+        loadNextMap() {
+          loadNextMapCalls++;
+        },
+      },
+      engine: {
+        registered: true,
+        PlayTrack(track) {
+          trackPlayed = track;
+        },
+      },
+      centerPrint(message) {
+        centerPrints.push(message);
+      },
+      _getEpisodeFinaleText: PlayerEntity.prototype._getEpisodeFinaleText,
+    };
+
+    PlayerEntity.prototype._intermissionExit.call(player);
+
+    assert.equal(player.game.intermission_running, 2);
+    assert.equal(player.game.intermission_exittime, 43);
+    assert.equal(trackPlayed, 2);
+    assert.equal(centerPrints.length, 1);
+    assert.equal(centerPrints[0].includes('Rune of Earth'), true);
+    assert.equal(loadNextMapCalls, 0);
+  });
+});
+
+void describe('PlayerEntity powerup timers', () => {
+  void test('expired invisibility restores the player model and clears the item flag', () => {
+    const dispatchedEvents = [];
+    const sounds = [];
+    const player = {
+      health: 100,
+      game: { time: 20 },
+      items: items.IT_INVISIBILITY,
+      invisible_finished: 19,
+      invisible_time: 5,
+      invisible_sound: 0,
+      invincible_finished: 0,
+      super_damage_finished: 0,
+      radsuit_finished: 0,
+      air_finished: 0,
+      modelindex: 5,
+      _modelIndex: {
+        player: 11,
+        eyes: 22,
+      },
+      frame: 3,
+      dispatchEvent(eventType) {
+        dispatchedEvents.push(eventType);
+      },
+      consolePrint() {
+      },
+      startSound(_channel, soundName) {
+        sounds.push(soundName);
+      },
+    };
+
+    PlayerEntity.prototype._powerupFrame.call(player);
+
+    assert.equal(player.items & items.IT_INVISIBILITY, 0);
+    assert.equal(player.invisible_finished, 0);
+    assert.equal(player.invisible_time, 0);
+    assert.equal(player.modelindex, 11);
+    assert.deepEqual(dispatchedEvents, [clientEvent.BONUS_FLASH]);
+    assert.deepEqual(sounds, ['items/inv3.wav']);
+  });
+
+  void test('expired invulnerability clears cached attacker sound gates', () => {
+    const player = {
+      health: 100,
+      game: { time: 20 },
+      items: items.IT_INVULNERABILITY,
+      invisible_finished: 0,
+      invincible_finished: 19,
+      invincible_time: 5,
+      invincible_sound_time: { 1: 9, 7: 15 },
+      super_damage_finished: 0,
+      radsuit_finished: 0,
+      air_finished: 0,
+      dispatchEvent() {
+      },
+      consolePrint() {
+      },
+      startSound() {
+      },
+    };
+
+    PlayerEntity.prototype._powerupFrame.call(player);
+
+    assert.equal(player.items & items.IT_INVULNERABILITY, 0);
+    assert.equal(player.invincible_finished, 0);
+    assert.equal(player.invincible_time, 0);
+    assert.deepEqual(player.invincible_sound_time, {});
+  });
+
+  void test('expiring biosuit keeps resetting air supply until the suit ends', () => {
+    const player = {
+      health: 100,
+      game: { time: 10 },
+      items: items.IT_SUIT,
+      invisible_finished: 0,
+      invincible_finished: 0,
+      super_damage_finished: 0,
+      radsuit_finished: 11,
+      rad_time: 0,
+      air_finished: 0,
+      dispatchEvent() {
+      },
+      consolePrint() {
+      },
+      startSound() {
+      },
+    };
+
+    PlayerEntity.prototype._powerupFrame.call(player);
+
+    assert.equal(player.air_finished, 22);
+    assert.equal(player.items & items.IT_SUIT, items.IT_SUIT);
+  });
+});
diff --git a/test/game/id1-player-weapons.test.mjs b/test/game/id1-player-weapons.test.mjs
index 1491af7a..a617b34e 100644
--- a/test/game/id1-player-weapons.test.mjs
+++ b/test/game/id1-player-weapons.test.mjs
@@ -4,8 +4,8 @@ import { describe, test } from 'node:test';
 await import('../../source/game/id1/GameAPI.ts');
 
 const defsModule = await import('../../source/game/id1/Defs.ts');
-const playerModule = await import('../../source/game/id1/entity/Player.mjs');
-const weaponsModule = await import('../../source/game/id1/entity/Weapons.mjs');
+const playerModule = await import('../../source/game/id1/entity/Player.ts');
+const weaponsModule = await import('../../source/game/id1/entity/Weapons.ts');
 
 const { items, waterlevel } = defsModule;
 const { PlayerEntity } = playerModule;
@@ -38,6 +38,16 @@ void describe('Player and weapon module surface', () => {
     assert.equal(typeof DamageHandler, 'function');
     assert.equal(weaponConfig instanceof Map, true);
   });
+
+  void test('registers player-specific state through serializer decorators', () => {
+    const serializableFields = Reflect.get(PlayerEntity, 'serializableFields');
+
+    assert.equal(Array.isArray(serializableFields), true);
+    assert.equal(serializableFields.includes('_spawnParameters'), true);
+    assert.equal(serializableFields.includes('weapon'), true);
+    assert.equal(serializableFields.includes('invincible_sound_time'), true);
+    assert.equal(serializableFields.includes('_modelIndex'), true);
+  });
 });
 
 void describe('PlayerEntity state machine', () => {
@@ -107,4 +117,37 @@ void describe('PlayerEntity weapon selection', () => {
 
     assert.equal(PlayerEntity.prototype.chooseBestWeapon.call(player), items.IT_GRENADE_LAUNCHER);
   });
+
+  void test('applyBackpack caps ammo and switches to the picked weapon outside deathmatch', () => {
+    const selectedWeapons = [];
+    const player = {
+      ...createWeaponSelectionPlayer({
+        ammo_shells: 95,
+        ammo_rockets: 99,
+        items: items.IT_AXE | items.IT_SHOTGUN,
+        weapon: items.IT_SHOTGUN,
+      }),
+      constructor: PlayerEntity,
+      game: { deathmatch: false },
+      setWeapon(weapon) {
+        selectedWeapons.push(weapon);
+        this.weapon = weapon;
+      },
+    };
+
+    const changed = PlayerEntity.prototype.applyBackpack.call(player, {
+      ammo_shells: 10,
+      ammo_nails: 0,
+      ammo_rockets: 5,
+      ammo_cells: 0,
+      items: items.IT_ROCKET_LAUNCHER,
+      weapon: items.IT_ROCKET_LAUNCHER,
+    });
+
+    assert.equal(changed, true);
+    assert.equal(player.ammo_shells, 100);
+    assert.equal(player.ammo_rockets, 100);
+    assert.equal(player.items & items.IT_ROCKET_LAUNCHER, items.IT_ROCKET_LAUNCHER);
+    assert.deepEqual(selectedWeapons, [items.IT_ROCKET_LAUNCHER]);
+  });
 });
diff --git a/test/game/id1-registry.test.mjs b/test/game/id1-registry.test.mjs
index 97e6cff2..062a0bed 100644
--- a/test/game/id1-registry.test.mjs
+++ b/test/game/id1-registry.test.mjs
@@ -4,7 +4,6 @@ import { describe, test } from 'node:test';
 import BaseEntity from '../../source/game/id1/entity/BaseEntity.ts';
 
 const registryModule = await import('../../source/game/id1/helper/Registry.ts');
-const registryShimModule = await import('../../source/game/id1/helper/Registry.mjs');
 
 const EntityRegistry = registryModule.default;
 
@@ -66,10 +65,6 @@ function resetCounters() {
 }
 
 void describe('EntityRegistry', () => {
-  void test('keeps the .mjs shim aligned with the TypeScript module', () => {
-    assert.equal(registryShimModule.default, EntityRegistry);
-  });
-
   void test('registers entity classes by classname', () => {
     const registry = new EntityRegistry([RegisteredEntity, ServerOnlyEntity]);
 
diff --git a/test/game/id1-shalrath.test.mjs b/test/game/id1-shalrath.test.mjs
index 56f45c23..e2c446b3 100644
--- a/test/game/id1-shalrath.test.mjs
+++ b/test/game/id1-shalrath.test.mjs
@@ -6,7 +6,7 @@ import { effect } from '../../source/game/id1/Defs.ts';
 
 await import('../../source/game/id1/GameAPI.ts');
 
-const { default: ShalrathMonsterEntity, ShalrathMissileEntity } = await import('../../source/game/id1/entity/monster/Shalrath.mjs');
+const { default: ShalrathMonsterEntity, ShalrathMissileEntity } = await import('../../source/game/id1/entity/monster/Shalrath.ts');
 
 ShalrathMonsterEntity._initStates();
 
@@ -76,7 +76,7 @@ function createMonsterFixture(MonsterClass) {
     nomonsters: 0,
   };
 
-  const entity = new MonsterClass(edict, gameAPI);
+  const entity = new MonsterClass(edict, gameAPI).initializeEntity();
   edict.entity = entity;
   entity.origin = new Vector(10, 20, 30);
   entity.angles = new Vector();
@@ -197,7 +197,7 @@ void describe('ShalrathMonsterEntity QC fixes', () => {
       },
     };
 
-    const missile = new ShalrathMissileEntity(edict, owner.game);
+    const missile = new ShalrathMissileEntity(edict, owner.game).initializeEntity();
     edict.entity = missile;
     missile.owner = owner;
     owner.movedir = new Vector(1, 0, 0);
diff --git a/test/game/id1-shambler.test.mjs b/test/game/id1-shambler.test.mjs
index e5c9fb6c..8cbde700 100644
--- a/test/game/id1-shambler.test.mjs
+++ b/test/game/id1-shambler.test.mjs
@@ -5,7 +5,7 @@ import Vector from '../../source/shared/Vector.ts';
 
 await import('../../source/game/id1/GameAPI.ts');
 
-const { default: ShamblerMonsterEntity } = await import('../../source/game/id1/entity/monster/Shambler.mjs');
+const { default: ShamblerMonsterEntity } = await import('../../source/game/id1/entity/monster/Shambler.ts');
 
 ShamblerMonsterEntity._initStates();
 
@@ -76,7 +76,7 @@ function createMonsterFixture(MonsterClass) {
     nomonsters: 0,
   };
 
-  const entity = new MonsterClass(edict, gameAPI);
+  const entity = new MonsterClass(edict, gameAPI).initializeEntity();
   edict.entity = entity;
   entity.origin = new Vector();
   entity.angles = new Vector();
diff --git a/test/game/id1-soldier.test.mjs b/test/game/id1-soldier.test.mjs
index f8637a2a..07024091 100644
--- a/test/game/id1-soldier.test.mjs
+++ b/test/game/id1-soldier.test.mjs
@@ -1,13 +1,73 @@
 import { describe, test } from 'node:test';
 import assert from 'node:assert/strict';
 
+import Vector from '../../source/shared/Vector.ts';
+
 await import('../../source/game/id1/GameAPI.ts');
 
 const { ArmySoldierMonster, ArmyEnforcerMonster } = await import('../../source/game/id1/entity/monster/Soldier.ts');
+const { Laser } = await import('../../source/game/id1/entity/Weapons.ts');
 
 ArmySoldierMonster._initStates();
 ArmyEnforcerMonster._initStates();
 
+function createMonsterFixture(MonsterClass, gameOverrides = {}) {
+  const spawnRequests = [];
+  const edict = { entity: null };
+  const engine = {
+    IsLoading() {
+      return false;
+    },
+    ParseQC() {
+      return null;
+    },
+    PrecacheModel() {
+    },
+    PrecacheSound() {
+    },
+    SpawnEntity(classname, initialData = {}) {
+      spawnRequests.push({ classname, initialData });
+      return { entity: null };
+    },
+    DispatchTempEntityEvent() {
+    },
+    FindByFieldAndValue() {
+      return null;
+    },
+    FindAllByFieldAndValue() {
+      return [];
+    },
+    eventBus: {
+      publish() {
+      },
+    },
+  };
+  const gameAPI = {
+    engine,
+    time: 10,
+    skill: 1,
+    deathmatch: 0,
+    nomonsters: 0,
+    gravity: 800,
+    hasFeature() {
+      return false;
+    },
+    ...gameOverrides,
+  };
+
+  const entity = new MonsterClass(edict, gameAPI).initializeEntity();
+  edict.entity = entity;
+  entity.origin = new Vector();
+
+  return { entity, gameAPI, spawnRequests };
+}
+
+function assertVectorNear(actual, expected, epsilon = 1e-6) {
+  for (let i = 0; i < 3; i++) {
+    assert.ok(Math.abs(actual[i] - expected[i]) <= epsilon, `component ${i} mismatch: ${actual[i]} !== ${expected[i]}`);
+  }
+}
+
 void describe('ArmySoldierMonster class metadata', () => {
   void test('classname is monster_army', () => {
     assert.equal(ArmySoldierMonster.classname, 'monster_army');
@@ -25,10 +85,50 @@ void describe('ArmySoldierMonster class metadata', () => {
     assert.deepEqual([maxs[0], maxs[1], maxs[2]], [16, 16, 40]);
   });
 
-  void test('serializableFields is a frozen empty array', () => {
+  void test('preserves the legacy serialized AI state field and keeps helpers runtime-only', () => {
+    const { entity } = createMonsterFixture(ArmySoldierMonster);
+    const serialized = entity._serializer.serialize();
+
     assert.ok(Array.isArray(ArmySoldierMonster.serializableFields));
     assert.ok(Object.isFrozen(ArmySoldierMonster.serializableFields));
-    assert.deepEqual(ArmySoldierMonster.serializableFields, []);
+    assert.deepEqual(ArmySoldierMonster.serializableFields, ['_aiState']);
+    assert.equal(entity._aiState, null);
+    assert.ok('_aiState' in serialized);
+    assert.ok(!('_damageInflictor' in serialized));
+  });
+
+  void test('fire keeps the QuakeC lead target calculation and spread values', () => {
+    const { entity } = createMonsterFixture(ArmySoldierMonster);
+    const shots = [];
+    let faceCalls = 0;
+
+    entity.enemy = {
+      origin: new Vector(100, 20, 40),
+      velocity: new Vector(15, -10, 0),
+    };
+    entity._ai = {
+      face() {
+        faceCalls++;
+      },
+    };
+    entity.attackSound = () => {
+    };
+    entity._damageInflictor.fireBullets = (count, direction, spread) => {
+      shots.push({ count, direction: direction.copy(), spread: spread.copy() });
+    };
+
+    entity._fire();
+
+    const expectedDirection = entity.enemy.origin.copy()
+      .subtract(entity.enemy.velocity.copy().multiply(0.2))
+      .subtract(entity.origin);
+    expectedDirection.normalize();
+
+    assert.equal(faceCalls, 1);
+    assert.equal(shots.length, 1);
+    assert.equal(shots[0].count, 4);
+    assertVectorNear(shots[0].direction, expectedDirection);
+    assertVectorNear(shots[0].spread, new Vector(0.1, 0.1, 0));
   });
 });
 
@@ -94,6 +194,40 @@ void describe('ArmyEnforcerMonster class metadata', () => {
     assert.ok(Object.isFrozen(ArmyEnforcerMonster.serializableFields));
     assert.deepEqual(ArmyEnforcerMonster.serializableFields, []);
   });
+
+  void test('fire spawns a laser from the muzzle origin and updates movedir', () => {
+    const { entity, spawnRequests } = createMonsterFixture(ArmyEnforcerMonster);
+    let laserOrigin = null;
+    const laser = Object.create(Laser.prototype);
+
+    laser.setOrigin = (origin) => {
+      laserOrigin = origin.copy();
+    };
+
+    entity.origin = new Vector(10, 20, 30);
+    entity.angles = new Vector();
+    entity.enemy = {
+      origin: new Vector(70, 60, 30),
+    };
+    entity.engine.SpawnEntity = (classname, initialData = {}) => {
+      spawnRequests.push({ classname, initialData });
+      return {
+        entity: laser,
+      };
+    };
+
+    entity.fire();
+
+    const movedir = entity.enemy.origin.copy().subtract(entity.origin);
+    movedir.normalize();
+    const { forward, right } = entity.angles.angleVectors();
+    const expectedOrigin = entity.origin.copy().add(forward.multiply(30)).add(right.multiply(8.5)).add(new Vector(0, 0, 16));
+
+    assert.equal(spawnRequests.length, 1);
+    assert.equal(spawnRequests[0].initialData.owner, entity);
+    assertVectorNear(entity.movedir, movedir);
+    assertVectorNear(laserOrigin, expectedOrigin);
+  });
 });
 
 void describe('ArmyEnforcerMonster state machine', () => {
diff --git a/test/game/id1-subs.test.mjs b/test/game/id1-subs.test.mjs
new file mode 100644
index 00000000..89e35107
--- /dev/null
+++ b/test/game/id1-subs.test.mjs
@@ -0,0 +1,219 @@
+import assert from 'node:assert/strict';
+import { describe, test } from 'node:test';
+
+import Vector from '../../source/shared/Vector.ts';
+
+await import('../../source/game/id1/GameAPI.ts');
+
+const { default: BaseEntity } = await import('../../source/game/id1/entity/BaseEntity.ts');
+const { DelayedThinkEntity, Sub, TriggerFieldEntity, TriggerFieldFlag } = await import('../../source/game/id1/entity/Subs.ts');
+
+/**
+ * Create a minimal mock game API for helper tests.
+ * @param {object} overrides Optional engine/game overrides.
+ * @returns {object} Mock game API object.
+ */
+function createMockGameAPI(overrides = {}) {
+  const engine = {
+    SpawnEntity() {
+      return null;
+    },
+    FindAllByFieldAndValue() {
+      return [];
+    },
+    PrecacheSound() {},
+    StartSound() {},
+    ...overrides.engine,
+  };
+
+  return {
+    time: 0,
+    engine,
+    worldspawn: overrides.worldspawn ?? null,
+    ...overrides,
+  };
+}
+
+class TestTargetEntity extends BaseEntity {
+  static classname = 'test_subs_target';
+
+  usedBy = null;
+  removed = false;
+
+  use(activatorEntity) {
+    this.usedBy = activatorEntity;
+  }
+
+  remove() {
+    this.removed = true;
+  }
+}
+
+void describe('Sub helpers', () => {
+  void test('useTargets keeps stock killtarget early-return behavior', () => {
+    const activator = new TestTargetEntity(null, createMockGameAPI()).initializeEntity();
+    const firstKilltarget = new TestTargetEntity(null, createMockGameAPI()).initializeEntity();
+    const target = new TestTargetEntity(null, createMockGameAPI()).initializeEntity();
+
+    let findCallCount = 0;
+    const worldspawn = new TestTargetEntity(null, createMockGameAPI()).initializeEntity();
+    worldspawn.findNextEntityByFieldAndValue = (field, value) => {
+      assert.equal(field, 'targetname');
+      assert.equal(value, 'remove_me');
+      findCallCount++;
+      return findCallCount === 1 ? firstKilltarget : null;
+    };
+    firstKilltarget.findNextEntityByFieldAndValue = () => {
+      findCallCount++;
+      return null;
+    };
+
+    const owner = new TestTargetEntity(null, createMockGameAPI({
+      worldspawn,
+      engine: {
+        FindAllByFieldAndValue() {
+          return [{ entity: target }];
+        },
+      },
+    })).initializeEntity();
+    owner.killtarget = 'remove_me';
+    owner.target = 'fire_me';
+
+    const sub = new Sub(owner);
+    sub.useTargets(activator);
+
+    assert.equal(firstKilltarget.removed, true);
+    assert.equal(target.usedBy, null);
+  });
+
+  void test('useTargets spawns delayed helper entities when delay is set', () => {
+    const activator = new TestTargetEntity(null, createMockGameAPI()).initializeEntity();
+    const spawnCalls = [];
+    const owner = new TestTargetEntity(null, createMockGameAPI({
+      engine: {
+        SpawnEntity(classname, initialData) {
+          spawnCalls.push({ classname, initialData });
+          return null;
+        },
+      },
+    })).initializeEntity();
+    owner.delay = 0.75;
+
+    const sub = new Sub(owner);
+    sub.useTargets(activator);
+
+    assert.equal(spawnCalls.length, 1);
+    assert.equal(spawnCalls[0].classname, DelayedThinkEntity.classname);
+    assert.equal(spawnCalls[0].initialData.owner, owner);
+    assert.equal(spawnCalls[0].initialData.activator, activator);
+    assert.equal(spawnCalls[0].initialData.delay, 0.75);
+  });
+});
+
+void describe('TriggerFieldEntity', () => {
+  void test('expands the touch bounds on spawn', () => {
+    const sizeCalls = [];
+    const entity = new TriggerFieldEntity(null, createMockGameAPI()).initializeEntity();
+    entity.mins.setTo(10, 20, 30);
+    entity.maxs.setTo(40, 50, 60);
+    entity.setSize = (mins, maxs) => {
+      sizeCalls.push({ mins: mins.copy(), maxs: maxs.copy() });
+    };
+
+    entity.spawn();
+
+    assert.equal(sizeCalls.length, 1);
+    assert.ok(sizeCalls[0].mins.equalsTo(-50, -40, 22));
+    assert.ok(sizeCalls[0].maxs.equalsTo(100, 110, 68));
+  });
+
+  void test('respects actor and debounce gating before forwarding use', () => {
+    const usedBy = [];
+    const owner = new TestTargetEntity(null, createMockGameAPI()).initializeEntity();
+    owner.use = (entity) => {
+      usedBy.push(entity);
+    };
+
+    const field = new TriggerFieldEntity(null, createMockGameAPI()).initializeEntity();
+    field.owner = owner;
+
+    const nonActor = new TestTargetEntity(null, createMockGameAPI()).initializeEntity();
+    field.touch(nonActor);
+    assert.equal(usedBy.length, 0);
+
+    class ActorEntity extends TestTargetEntity {
+      isActor() {
+        return true;
+      }
+    }
+
+    const actor = new ActorEntity(null, createMockGameAPI()).initializeEntity();
+    actor.health = 25;
+    field.touch(actor);
+    assert.equal(usedBy.length, 1);
+    assert.equal(usedBy[0], actor);
+    assert.equal(field.attack_finished, 1);
+
+    field.touch(actor);
+    assert.equal(usedBy.length, 1);
+
+    field.game.time = 1.5;
+    field.flags = TriggerFieldFlag.TFF_ANY_ENTITY_TRIGGERS;
+    field.touch(nonActor);
+    assert.equal(usedBy.length, 2);
+    assert.equal(usedBy[1], nonActor);
+  });
+});
+
+void describe('Sub movement helpers', () => {
+  void test('setMovedir preserves Quake up/down angle sentinels', () => {
+    const entity = new TestTargetEntity(null, createMockGameAPI()).initializeEntity();
+    entity.angles.setTo(0, -1, 0);
+
+    const sub = new Sub(entity);
+    sub.setMovedir();
+    assert.ok(entity.movedir.equalsTo(0, 0, 1));
+    assert.ok(entity.angles.equalsTo(0, 0, 0));
+
+    entity.angles.setTo(0, -2, 0);
+    sub.setMovedir();
+    assert.ok(entity.movedir.equalsTo(0, 0, -1));
+
+    entity.angles.setTo(0, 0, 0);
+    sub.setMovedir();
+    assert.ok(entity.movedir.equalsTo(1, 0, 0));
+  });
+
+  void test('calcMove schedules a completion think and velocity toward the destination', () => {
+    const scheduleCalls = [];
+    const entity = new TestTargetEntity(null, createMockGameAPI()).initializeEntity();
+    entity.origin.setTo(0, 0, 0);
+    entity.ltime = 10;
+    entity._scheduleThink = (time, callback, identifier) => {
+      scheduleCalls.push({ time, callback, identifier });
+    };
+    entity.setOrigin = (origin) => {
+      entity.origin.set(origin);
+    };
+
+    const sub = new Sub(entity);
+  entity._sub = sub;
+    const destination = new Vector(100, 0, 0);
+    let callbackCount = 0;
+
+    sub.calcMove(destination, 50, function () {
+      callbackCount++;
+    });
+
+    assert.equal(scheduleCalls.length, 1);
+    assert.equal(scheduleCalls[0].time, 12);
+    assert.equal(scheduleCalls[0].identifier, 'sub-calcmove');
+    assert.ok(entity.velocity.equalsTo(50, 0, 0));
+
+    scheduleCalls[0].callback.call(entity, entity);
+
+    assert.ok(entity.origin.equalsTo(100, 0, 0));
+    assert.ok(entity.velocity.equalsTo(0, 0, 0));
+    assert.equal(callbackCount, 1);
+  });
+});
diff --git a/test/game/id1-tarbaby.test.mjs b/test/game/id1-tarbaby.test.mjs
index 64894939..10617bd4 100644
--- a/test/game/id1-tarbaby.test.mjs
+++ b/test/game/id1-tarbaby.test.mjs
@@ -6,7 +6,7 @@ import { tentType } from '../../source/game/id1/Defs.ts';
 
 await import('../../source/game/id1/GameAPI.ts');
 
-const { default: TarbabyMonsterEntity } = await import('../../source/game/id1/entity/monster/Tarbaby.mjs');
+const { default: TarbabyMonsterEntity } = await import('../../source/game/id1/entity/monster/Tarbaby.ts');
 
 TarbabyMonsterEntity._initStates();
 
@@ -81,7 +81,7 @@ function createMonsterFixture(MonsterClass) {
     nomonsters: 0,
   };
 
-  const entity = new MonsterClass(edict, gameAPI);
+  const entity = new MonsterClass(edict, gameAPI).initializeEntity();
   edict.entity = entity;
   entity.origin = new Vector(10, 20, 30);
   entity.velocity = new Vector(100, 0, 0);
diff --git a/test/game/id1-triggers.test.mjs b/test/game/id1-triggers.test.mjs
new file mode 100644
index 00000000..ec5e2224
--- /dev/null
+++ b/test/game/id1-triggers.test.mjs
@@ -0,0 +1,211 @@
+import assert from 'node:assert/strict';
+import { describe, test } from 'node:test';
+
+import Vector from '../../source/shared/Vector.ts';
+
+await import('../../source/game/id1/GameAPI.ts');
+
+const { damage, flags, solid } = await import('../../source/game/id1/Defs.ts');
+const { default: BaseEntity } = await import('../../source/game/id1/entity/BaseEntity.ts');
+const { TeleportEffectEntity } = await import('../../source/game/id1/entity/Misc.ts');
+const { PlayerEntity, TelefragTriggerEntity } = await import('../../source/game/id1/entity/Player.ts');
+const {
+  CountTriggerEntity,
+  InfoTeleportDestination,
+  MultipleTriggerEntity,
+  TeleportTriggerEntity,
+  TriggerMonsterjumpEntity,
+} = await import('../../source/game/id1/entity/Triggers.ts');
+
+/**
+ * Create a minimal mock game API for trigger tests.
+ * @param {object} overrides Optional engine/game overrides.
+ * @returns {object} Mock game API object.
+ */
+function createMockGameAPI(overrides = {}) {
+  const engine = {
+    SpawnEntity() {
+      return null;
+    },
+    SpawnAmbientSound() {},
+    PrecacheSound() {},
+    BroadcastPrint() {},
+    SetCvar() {},
+    eventBus: {
+      publish() {},
+    },
+    ...overrides.engine,
+  };
+
+  return {
+    time: 0,
+    engine,
+    noexit: 0,
+    mapname: 'e1m1',
+    coop: 0,
+    deathmatch: 0,
+    force_retouch: 0,
+    loadNextMap() {},
+    startIntermission() {},
+    ...overrides,
+  };
+}
+
+class TestEntity extends BaseEntity {
+  static classname = 'test_trigger_entity';
+
+  removed = false;
+
+  remove() {
+    this.removed = true;
+  }
+}
+
+/**
+ * Build a player-shaped test double that satisfies instanceof checks.
+ * @param {object} overrides Optional field or method overrides.
+ * @returns {PlayerEntity} Player-like test entity.
+ */
+function createPlayerStub(overrides = {}) {
+  return Object.assign(Object.create(PlayerEntity.prototype), {
+    health: 100,
+    solid: solid.SOLID_SLIDEBOX,
+    flags: flags.FL_ONGROUND,
+    origin: new Vector(),
+    angles: new Vector(),
+    velocity: new Vector(),
+    fixangle: false,
+    teleport_time: 0,
+    fly_time: 0,
+    netname: 'Player',
+    centerPrint() {},
+    startSound() {},
+    setOrigin(origin) {
+      this.origin.set(origin);
+    },
+    ...overrides,
+  });
+}
+
+void describe('Triggers port', () => {
+  void test('MultipleTriggerEntity applies QC defaults and rearms health-gated triggers', () => {
+    const scheduledThinks = [];
+    const entity = new MultipleTriggerEntity(null, createMockGameAPI()).initializeEntity();
+    entity.model = '*1';
+    entity.health = 12;
+    entity.setModel = () => {};
+    entity.setOrigin = () => {};
+    entity._scheduleThink = (nextThink, callback) => {
+      scheduledThinks.push({ nextThink, callback });
+    };
+
+    entity.spawn();
+
+    assert.equal(entity.wait, 0.2);
+    assert.equal(entity.max_health, 12);
+    assert.equal(entity.takedamage, damage.DAMAGE_YES);
+    assert.equal(entity.solid, solid.SOLID_BBOX);
+
+    entity._sub = {
+      useTargets() {},
+      setMovedir() {},
+    };
+    entity._trigger(new TestEntity(null, createMockGameAPI()).initializeEntity());
+
+    assert.equal(scheduledThinks.length, 1);
+    scheduledThinks[0].callback();
+    assert.equal(entity._isActive, false);
+    assert.equal(entity.health, 12);
+  });
+
+  void test('CountTriggerEntity shows countdown text and fires when it reaches zero', () => {
+    const prints = [];
+    const usedTargets = [];
+    const player = createPlayerStub({
+      centerPrint(message) {
+        prints.push(message);
+      },
+    });
+    const entity = new CountTriggerEntity(null, createMockGameAPI()).initializeEntity();
+    entity._sub = {
+      useTargets(userEntity) {
+        usedTargets.push(userEntity);
+      },
+      setMovedir() {},
+    };
+    entity.lazyRemove = () => {
+      entity.removed = true;
+    };
+    entity.count = 2;
+
+    entity.use(player);
+    entity.use(player);
+
+    assert.deepEqual(prints, ['Only 1 more to go...', 'Sequence completed!']);
+    assert.deepEqual(usedTargets, [player]);
+  });
+
+  void test('TeleportTriggerEntity moves players, spawns effects, and sets exit velocity', () => {
+    const spawnRequests = [];
+    const usedTargets = [];
+    const player = createPlayerStub();
+    player.origin.setTo(10, 20, 30);
+    player.velocity.setTo(1, 2, 3);
+
+    const destination = new InfoTeleportDestination(null, createMockGameAPI()).initializeEntity();
+    destination.origin.setTo(100, 200, 300);
+    destination.mangle.setTo(0, 0, 0);
+
+    const entity = new TeleportTriggerEntity(null, createMockGameAPI({
+      time: 5,
+      engine: {
+        SpawnEntity(classname, initialData) {
+          spawnRequests.push({ classname, initialData });
+          return { entity: null };
+        },
+      },
+    })).initializeEntity();
+    entity._sub = {
+      useTargets(userEntity) {
+        usedTargets.push(userEntity);
+      },
+      setMovedir() {},
+    };
+    entity.target = 'tele_dest';
+    entity.findFirstEntityByFieldAndValue = () => destination;
+
+    entity.touch(player);
+
+    assert.deepEqual(usedTargets, [player]);
+    assert.equal(spawnRequests.length, 3);
+    assert.equal(spawnRequests[0].classname, TeleportEffectEntity.classname);
+    assert.equal(spawnRequests[1].classname, TeleportEffectEntity.classname);
+    assert.equal(spawnRequests[2].classname, TelefragTriggerEntity.classname);
+    assert.ok(player.origin.equalsTo(100, 200, 300));
+    assert.ok(player.angles.equalsTo(0, 0, 0));
+    assert.equal(player.fixangle, true);
+    assert.equal(player.teleport_time, 5.7);
+    assert.ok(player.velocity.equalsTo(300, 0, 0));
+    assert.equal((player.flags & flags.FL_ONGROUND) === 0, true);
+  });
+
+  void test('TriggerMonsterjumpEntity applies defaults and launches grounded monsters', () => {
+    const entity = new TriggerMonsterjumpEntity(null, createMockGameAPI()).initializeEntity();
+    entity.model = '*2';
+    entity.setModel = () => {};
+    entity.spawn();
+
+    assert.equal(entity.speed, 200);
+    assert.equal(entity.height, 200);
+    entity.movedir.setTo(1, 0, 0);
+
+    const monster = new TestEntity(null, createMockGameAPI()).initializeEntity();
+    monster.flags = flags.FL_MONSTER | flags.FL_ONGROUND;
+    monster.velocity.setTo(0, 0, 5);
+
+    entity.touch(monster);
+
+    assert.ok(monster.velocity.equalsTo(200, 0, 200));
+    assert.equal((monster.flags & flags.FL_ONGROUND) === 0, true);
+  });
+});
diff --git a/test/game/id1-weapons.test.mjs b/test/game/id1-weapons.test.mjs
new file mode 100644
index 00000000..f8ae7799
--- /dev/null
+++ b/test/game/id1-weapons.test.mjs
@@ -0,0 +1,60 @@
+import assert from 'node:assert/strict';
+import { describe, test } from 'node:test';
+
+await import('../../source/game/id1/GameAPI.ts');
+
+const weaponsModule = await import('../../source/game/id1/entity/Weapons.ts');
+
+const { Backpack, Spike } = weaponsModule;
+
+/**
+ * Create the minimal game API surface required by the weapon helper tests.
+ * @returns {object} Mock game API.
+ */
+function createMockGameAPI() {
+  return {
+    time: 0,
+    engine: {
+      IsLoading() {
+        return false;
+      },
+    },
+  };
+}
+
+void describe('Weapons projectile helpers', () => {
+  void test('registers Backpack ammo and weapon fields through serializer decorators', () => {
+    const serializableFields = Reflect.get(Backpack, 'serializableFields');
+
+    assert.equal(Array.isArray(serializableFields), true);
+    assert.equal(serializableFields.includes('ammo_shells'), true);
+    assert.equal(serializableFields.includes('ammo_nails'), true);
+    assert.equal(serializableFields.includes('ammo_rockets'), true);
+    assert.equal(serializableFields.includes('ammo_cells'), true);
+    assert.equal(serializableFields.includes('items'), true);
+    assert.equal(serializableFields.includes('weapon'), true);
+  });
+
+  void test('inherits the shared explosion state chain on projectile classes', () => {
+    Spike._initStates();
+
+    const states = Spike._states;
+
+    assert.equal(states.s_explode1.keyframe, 0);
+    assert.equal(states.s_explode1.nextState, 's_explode2');
+    assert.equal(states.s_explode5.nextState, 's_explode6');
+    assert.equal(states.s_explode6.nextState, null);
+    assert.equal(typeof states.s_explode6.handler, 'function');
+  });
+
+  void test('keeps spike speed serializable while helper wrappers stay runtime-only', () => {
+    const spike = new Spike(null, createMockGameAPI()).initializeEntity();
+    const serialized = spike._serializer.serialize();
+
+    assert.equal(spike.speed, 0);
+    assert.ok('_damageInflictor' in spike);
+    assert.ok('speed' in serialized);
+    assert.ok(!('_damageInflictor' in serialized), '_damageInflictor should not be serialized');
+    assert.ok(!('_explosions' in serialized), '_explosions should not be serialized');
+  });
+});
diff --git a/test/game/id1-wizard.test.mjs b/test/game/id1-wizard.test.mjs
index 7d40c93a..7762559d 100644
--- a/test/game/id1-wizard.test.mjs
+++ b/test/game/id1-wizard.test.mjs
@@ -7,7 +7,7 @@ import { ATTACK_STATE } from '../../source/game/id1/helper/AI.ts';
 
 await import('../../source/game/id1/GameAPI.ts');
 
-const { default: WizardMonsterEntity } = await import('../../source/game/id1/entity/monster/Wizard.mjs');
+const { default: WizardMonsterEntity } = await import('../../source/game/id1/entity/monster/Wizard.ts');
 
 WizardMonsterEntity._initStates();
 
@@ -77,7 +77,7 @@ function createMonsterFixture(MonsterClass) {
     nomonsters: 0,
   };
 
-  const entity = new MonsterClass(edict, gameAPI);
+  const entity = new MonsterClass(edict, gameAPI).initializeEntity();
   edict.entity = entity;
   entity.origin = new Vector();
   entity.angles = new Vector();
diff --git a/test/game/id1-worldspawn.test.mjs b/test/game/id1-worldspawn.test.mjs
new file mode 100644
index 00000000..07fe08bd
--- /dev/null
+++ b/test/game/id1-worldspawn.test.mjs
@@ -0,0 +1,187 @@
+import { describe, test } from 'node:test';
+import assert from 'node:assert/strict';
+
+import Vector from '../../source/shared/Vector.ts';
+import { moveType } from '../../source/game/id1/Defs.ts';
+
+await import('../../source/game/id1/GameAPI.ts');
+
+const { BodyqueEntity, CopyToBodyQue, WorldspawnEntity } = await import('../../source/game/id1/entity/Worldspawn.ts');
+
+/**
+ * Create a mock server edict that keeps entity fields in sync.
+ * @param {number} num Edict slot number.
+ * @returns {import('../../source/shared/GameInterfaces.ts').ServerEdict} Mock edict.
+ */
+function createMockEdict(num) {
+  const entityRef = { current: null };
+
+  return /** @type {import('../../source/shared/GameInterfaces.ts').ServerEdict} */ ({
+    num,
+    entity: null,
+    freeEdict() {},
+    setOrigin(origin) {
+      entityRef.current.origin = origin.copy();
+    },
+    setModel(model) {
+      entityRef.current.model = model;
+    },
+    setMinMaxSize(mins, maxs) {
+      entityRef.current.mins = mins.copy();
+      entityRef.current.maxs = maxs.copy();
+    },
+    walkMove() {
+      return false;
+    },
+    changeYaw() {
+      return 0;
+    },
+    dropToFloor() {
+      return true;
+    },
+    isOnTheFloor() {
+      return false;
+    },
+    makeStatic() {},
+    aim() {
+      return null;
+    },
+    moveToGoal() {
+      return false;
+    },
+    isInPXS() {
+      return true;
+    },
+    getNextBestClient() {
+      return null;
+    },
+    __setEntity(entity) {
+      entityRef.current = entity;
+      this.entity = entity;
+    },
+  });
+}
+
+/**
+ * Create a minimal worldspawn fixture with spawnable body queue entities.
+ * @returns {{ worldspawn: WorldspawnEntity, gameAPI: object, precachedSounds: string[], precachedModels: string[], lightstyles: Array<{ style: number, value: string }>, cvars: Array<{ name: string, value: string }>, spawnClassnames: string[] }} Fixture data.
+ */
+function createWorldspawnFixture() {
+  const precachedSounds = [];
+  const precachedModels = [];
+  const lightstyles = [];
+  const cvars = [];
+  const spawnClassnames = [];
+  let nextEdictNum = 10;
+  const gameAPI = {
+    engine: null,
+    worldspawn: /** @type {WorldspawnEntity|null} */ (null),
+    lastspawn: /** @type {WorldspawnEntity|null} */ (null),
+    bodyque_head: /** @type {BodyqueEntity|null} */ (null),
+  };
+
+  const engine = {
+    IsLoading() {
+      return false;
+    },
+    PrecacheSound(sound) {
+      precachedSounds.push(sound);
+    },
+    PrecacheModel(model) {
+      precachedModels.push(model);
+    },
+    ParseQC() {
+      return null;
+    },
+    SetCvar(name, value) {
+      cvars.push({ name, value });
+    },
+    Lightstyle(style, value) {
+      lightstyles.push({ style, value });
+    },
+    SpawnEntity(classname) {
+      spawnClassnames.push(classname);
+      if (classname !== BodyqueEntity.classname) {
+        return { entity: null };
+      }
+
+      const edict = createMockEdict(nextEdictNum++);
+      const entity = new BodyqueEntity(edict, gameAPI).initializeEntity().precacheEntity();
+      edict.__setEntity(entity);
+      return { entity };
+    },
+  };
+
+  gameAPI.engine = engine;
+
+  const worldspawnEdict = createMockEdict(1);
+  const worldspawn = new WorldspawnEntity(worldspawnEdict, gameAPI).initializeEntity().precacheEntity();
+  worldspawnEdict.__setEntity(worldspawn);
+  worldspawn.origin = new Vector();
+  worldspawn.model = 'maps/start.bsp';
+
+  return { worldspawn, gameAPI, precachedSounds, precachedModels, lightstyles, cvars, spawnClassnames };
+}
+
+void describe('WorldspawnEntity spawn', () => {
+  void test('creates a four-entry QC body queue ring and initializes world lighting', () => {
+    const previousWorldspawn = /** @type {WorldspawnEntity} */ ({ marker: 'previous' });
+    const { worldspawn, gameAPI, cvars, lightstyles, spawnClassnames, precachedSounds, precachedModels } = createWorldspawnFixture();
+
+    gameAPI.worldspawn = previousWorldspawn;
+    worldspawn.model = 'maps/e1m8.bsp';
+
+    worldspawn.spawn();
+
+    assert.equal(gameAPI.lastspawn, previousWorldspawn);
+    assert.equal(gameAPI.worldspawn, worldspawn);
+    assert.equal(spawnClassnames.length, 4);
+    assert.ok(gameAPI.bodyque_head instanceof BodyqueEntity);
+    assert.equal(gameAPI.bodyque_head.owner.owner.owner.owner, gameAPI.bodyque_head);
+    assert.deepEqual(cvars, [{ name: 'sv_gravity', value: '100' }]);
+    assert.equal(lightstyles.length, 13);
+    assert.deepEqual(lightstyles[0], { style: 0, value: 'm' });
+    assert.deepEqual(lightstyles.at(-1), { style: 63, value: 'a' });
+    assert.ok(precachedSounds.includes('demon/dland2.wav'));
+    assert.ok(precachedSounds.includes('misc/talk.wav'));
+    assert.ok(precachedModels.includes('progs/bolt3.mdl'));
+  });
+
+  void test('uses normal gravity outside END and copies corpse data into the body queue', () => {
+    const { worldspawn, gameAPI, cvars } = createWorldspawnFixture();
+    worldspawn.spawn();
+
+    const firstBody = gameAPI.bodyque_head;
+    const nextBody = firstBody.owner;
+    const player = {
+      angles: new Vector(10, 20, 30),
+      model: 'progs/player.mdl',
+      frame: 7,
+      colormap: 5,
+      movetype: moveType.MOVETYPE_WALK,
+      velocity: new Vector(1, 2, 3),
+      origin: new Vector(100, 200, 300),
+      mins: new Vector(-16, -16, -24),
+      maxs: new Vector(16, 16, 32),
+    };
+
+    CopyToBodyQue(gameAPI, /** @type {import('../../source/game/id1/entity/Player.ts').PlayerEntity} */ (player));
+
+    assert.deepEqual(cvars, [{ name: 'sv_gravity', value: '800' }]);
+    assert.ok(firstBody.angles.equalsTo(10, 20, 30));
+    assert.equal(firstBody.model, 'progs/player.mdl');
+    assert.equal(firstBody.frame, 7);
+    assert.equal(firstBody.colormap, 5);
+    assert.equal(firstBody.movetype, moveType.MOVETYPE_WALK);
+    assert.ok(firstBody.velocity.equalsTo(1, 2, 3));
+    assert.ok(firstBody.origin.equalsTo(100, 200, 300));
+    assert.ok(firstBody.mins.equalsTo(-16, -16, -24));
+    assert.ok(firstBody.maxs.equalsTo(16, 16, 32));
+    assert.equal(gameAPI.bodyque_head, nextBody);
+
+    player.angles.setTo(1, 1, 1);
+    player.velocity.setTo(9, 9, 9);
+    assert.ok(firstBody.angles.equalsTo(10, 20, 30));
+    assert.ok(firstBody.velocity.equalsTo(1, 2, 3));
+  });
+});
diff --git a/test/game/id1-zombie.test.mjs b/test/game/id1-zombie.test.mjs
index 19d4a4de..080b40bb 100644
--- a/test/game/id1-zombie.test.mjs
+++ b/test/game/id1-zombie.test.mjs
@@ -6,7 +6,7 @@ import { damage, moveType, solid } from '../../source/game/id1/Defs.ts';
 
 await import('../../source/game/id1/GameAPI.ts');
 
-const { default: ZombieMonster } = await import('../../source/game/id1/entity/monster/Zombie.mjs');
+const { default: ZombieMonster } = await import('../../source/game/id1/entity/monster/Zombie.ts');
 
 ZombieMonster._initStates();
 
@@ -76,7 +76,7 @@ function createMonsterFixture(MonsterClass) {
     nomonsters: 0,
   };
 
-  const entity = new MonsterClass(edict, gameAPI);
+  const entity = new MonsterClass(edict, gameAPI).initializeEntity();
   edict.entity = entity;
   entity.origin = new Vector();
   entity.angles = new Vector();
diff --git a/test/game/quake-entity-ai.test.mjs b/test/game/quake-entity-ai.test.mjs
index 158563c0..91730c2c 100644
--- a/test/game/quake-entity-ai.test.mjs
+++ b/test/game/quake-entity-ai.test.mjs
@@ -3,8 +3,8 @@ import assert from 'node:assert/strict';
 
 import Vector from '../../source/shared/Vector.ts';
 
-import { flags, items, worldType } from '../../source/game/id1/Defs.mjs';
-import { entityClasses } from '../../source/game/id1/GameAPI.mjs';
+import { flags, items, worldType } from '../../source/game/id1/Defs.ts';
+import { entityClasses } from '../../source/game/id1/GameAPI.ts';
 
 const OgreEntity = entityClasses.find((entityClass) => entityClass.classname === 'monster_ogre');
 const PlayerCtor = entityClasses.find((entityClass) => entityClass.classname === 'player');
@@ -136,7 +136,7 @@ function createMonsterVisibilityFixture() {
     gameAI: createMockGameAI(),
   };
 
-  const entity = new OgreEntity(edict, gameAPI);
+  const entity = new OgreEntity(edict, gameAPI).initializeEntity();
   edict.entity = entity;
 
   entity.health = 200;
@@ -192,7 +192,7 @@ function createPlayerFixture() {
     },
   };
 
-  const player = new PlayerCtor(edict, gameAPI);
+  const player = new PlayerCtor(edict, gameAPI).initializeEntity();
   edict.entity = player;
 
   player.health = 100;
diff --git a/test/physics/func-door.test.mjs b/test/physics/func-door.test.mjs
index d58540d1..fb85b60a 100644
--- a/test/physics/func-door.test.mjs
+++ b/test/physics/func-door.test.mjs
@@ -1,8 +1,8 @@
 import { describe, test } from 'node:test';
 import assert from 'node:assert/strict';
 
-import { worldType } from '../../source/game/id1/Defs.mjs';
-import { entityClasses } from '../../source/game/id1/GameAPI.mjs';
+import { worldType } from '../../source/game/id1/Defs.ts';
+import { entityClasses } from '../../source/game/id1/GameAPI.ts';
 
 const DoorEntity = entityClasses.find((entityClass) => entityClass.classname === 'func_door');
 
diff --git a/test/physics/func-plat.test.mjs b/test/physics/func-plat.test.mjs
index c07d5e46..2dab7816 100644
--- a/test/physics/func-plat.test.mjs
+++ b/test/physics/func-plat.test.mjs
@@ -1,7 +1,7 @@
 import { describe, test } from 'node:test';
 import assert from 'node:assert/strict';
 
-import { entityClasses } from '../../source/game/id1/GameAPI.mjs';
+import { entityClasses } from '../../source/game/id1/GameAPI.ts';
 
 const PlatformEntity = entityClasses.find((entityClass) => entityClass.classname === 'func_plat');
 
@@ -84,8 +84,8 @@ function createPlatformEntityFixture() {
   return { entity, gameAPI };
 }
 
-describe('PlatformEntity', () => {
-  test('extends the scheduled go-down think instead of leaving a stale queue entry', () => {
+void describe('PlatformEntity', () => {
+  void test('extends the scheduled go-down think instead of leaving a stale queue entry', () => {
     const { entity } = createPlatformEntityFixture();
 
     entity.ltime = 5.0;
diff --git a/test/physics/func-rotating.test.mjs b/test/physics/func-rotating.test.mjs
index 0b4b4d4e..08f6c877 100644
--- a/test/physics/func-rotating.test.mjs
+++ b/test/physics/func-rotating.test.mjs
@@ -3,14 +3,15 @@ import assert from 'node:assert/strict';
 
 import Vector from '../../source/shared/Vector.ts';
 import { moveType, solid } from '../../source/shared/Defs.ts';
-import { entityClasses } from '../../source/game/id1/GameAPI.mjs';
+import { entityClasses } from '../../source/game/id1/GameAPI.ts';
 
 const RotatingEntity = entityClasses.find((entityClass) => entityClass.classname === 'func_rotating');
 
 assert.ok(RotatingEntity, 'func_rotating must be registered in GameAPI');
 
 /**
- *
+ * Create a minimal rotating-entity fixture.
+ * @returns {{ entity: InstanceType<typeof RotatingEntity>, precachedModels: string[] }} Fixture data.
  */
 function createRotatingEntityFixture() {
   const modelMins = new Vector(-16, -16, -16);
@@ -109,8 +110,8 @@ function createRotatingEntityFixture() {
   return { entity, precachedModels };
 }
 
-describe('RotatingEntity', () => {
-  test('starts spinning on spawn when START_ON is set', () => {
+void describe('RotatingEntity', () => {
+  void test('starts spinning on spawn when START_ON is set', () => {
     const { entity, precachedModels } = createRotatingEntityFixture();
     entity.spawnflags = RotatingEntity.START_ON;
     entity.speed = 180;
@@ -124,7 +125,7 @@ describe('RotatingEntity', () => {
     assert.deepEqual(precachedModels, []);
   });
 
-  test('maps axis flags to the engine Euler components and toggles with use', () => {
+  void test('maps axis flags to the engine Euler components and toggles with use', () => {
     const cases = [
       { spawnflags: RotatingEntity.X_AXIS, expected: [0, 0, 90] },
       { spawnflags: RotatingEntity.Y_AXIS, expected: [90, 0, 0] },
@@ -151,7 +152,7 @@ describe('RotatingEntity', () => {
     }
   });
 
-  test('inflicts configured damage on touch and stops on block when requested', () => {
+  void test('inflicts configured damage on touch and stops on block when requested', () => {
     const { entity } = createRotatingEntityFixture();
     const damageCalls = [];
     const victim = {
diff --git a/test/physics/func-train.test.mjs b/test/physics/func-train.test.mjs
index d287680a..302f45ba 100644
--- a/test/physics/func-train.test.mjs
+++ b/test/physics/func-train.test.mjs
@@ -2,7 +2,7 @@ import { describe, test } from 'node:test';
 import assert from 'node:assert/strict';
 
 import Vector from '../../source/shared/Vector.ts';
-import { entityClasses } from '../../source/game/id1/GameAPI.mjs';
+import { entityClasses } from '../../source/game/id1/GameAPI.ts';
 
 const TrainEntity = entityClasses.find((entityClass) => entityClass.classname === 'func_train');
 
@@ -103,8 +103,8 @@ function createTrainEntityFixture() {
   return { entity, gameAPI };
 }
 
-describe('TrainEntity', () => {
-  test('uses attack_finished for blocked damage cooldown without mutating nextthink', () => {
+void describe('TrainEntity', () => {
+  void test('uses attack_finished for blocked damage cooldown without mutating nextthink', () => {
     const { entity, gameAPI } = createTrainEntityFixture();
     const damageCalls = [];
     const victim = {

From 9a49dbd2e0a6657f69a88fb0b7b8bdfaec2a5e3a Mon Sep 17 00:00:00 2001
From: Christian R <github@chrisnew.de>
Date: Tue, 7 Apr 2026 17:02:51 +0300
Subject: [PATCH 63/67] StartGameInterface

---
 source/engine/client/ClientLifecycle.ts | 15 ++---
 source/game/id1                         |  2 +-
 source/shared/GameInterfaces.ts         |  4 +-
 test/game/id1-client.test.mjs           | 13 +++++
 test/game/id1-game-api.test.mjs         | 76 +++++++++++++++++++++++++
 5 files changed, 99 insertions(+), 11 deletions(-)

diff --git a/source/engine/client/ClientLifecycle.ts b/source/engine/client/ClientLifecycle.ts
index 3af3f13a..ae6027fa 100644
--- a/source/engine/client/ClientLifecycle.ts
+++ b/source/engine/client/ClientLifecycle.ts
@@ -17,21 +17,18 @@ eventBus.subscribe('registry.frozen', () => {
 });
 
 /** The client game can tell the menu what to do when a new game is requested. */
-export class StartGameInterface {
-  startSingleplayerGame(): void {
-  }
-
-  startMultiplayerGame(_mapname: string): void {
-  }
+export interface StartGameInterface {
+  startSingleplayerGame(): void;
+  startMultiplayerGame(mapname: string): void;
 }
 
 /** Quake 1 default start game entries. */
-export class DefaultStartGameFunctions extends StartGameInterface {
-  override startSingleplayerGame(): void {
+export class DefaultStartGameFunctions implements StartGameInterface {
+  startSingleplayerGame(): void {
     void Cmd.ExecuteString('map start');
   }
 
-  override startMultiplayerGame(mapname: string): void {
+  startMultiplayerGame(mapname: string): void {
     void Cmd.ExecuteString(`map ${mapname}`);
   }
 }
diff --git a/source/game/id1 b/source/game/id1
index 2615937a..7345474b 160000
--- a/source/game/id1
+++ b/source/game/id1
@@ -1 +1 @@
-Subproject commit 2615937a8d5bbb36a0e7e4050a65e84ce53053d1
+Subproject commit 7345474b1c66777eef356006c40eaf37ea20ff0d
diff --git a/source/shared/GameInterfaces.ts b/source/shared/GameInterfaces.ts
index 51a5a1fe..67a2afd0 100644
--- a/source/shared/GameInterfaces.ts
+++ b/source/shared/GameInterfaces.ts
@@ -7,8 +7,10 @@ import type { SFX as SFXValue } from '../engine/client/Sound.ts';
 import type CvarValue from '../engine/common/Cvar.ts';
 import type Vector from './Vector.ts';
 import type { PmoveConfiguration as PmoveConfigurationValue, PmoveQuake2Configuration as PmoveQuake2ConfigurationValue } from '../shared/Pmove.ts';
-import type { StartGameInterface } from '../engine/client/ClientLifecycle.ts';
 import type { BaseModel } from '../engine/common/model/BaseModel.ts';
+import type { StartGameInterface } from '../engine/client/ClientLifecycle.ts';
+
+export type { StartGameInterface } from '../engine/client/ClientLifecycle.ts';
 
 export type ClientEngineAPI = Readonly<typeof ClientEngineApiValue>;
 export type ServerEngineAPI = Readonly<typeof ServerEngineApiValue>;
diff --git a/test/game/id1-client.test.mjs b/test/game/id1-client.test.mjs
index b4f89ff8..9e28075c 100644
--- a/test/game/id1-client.test.mjs
+++ b/test/game/id1-client.test.mjs
@@ -203,6 +203,19 @@ void describe('id1 client sync', () => {
     assert.equal(serverInfo.coop, '1');
     assert.equal(serverInfo.map, 'e1m8');
   });
+
+  void test('parses numeric stat strings and ignores non-numeric stat strings', () => {
+    const engine = createMockClientEngine();
+    const stats = new ClientStats(engine);
+
+    engine.eventBus.publish(clientEventName(clientEvent.STATS_INIT), 'monsters_total', '13');
+    engine.eventBus.publish(clientEventName(clientEvent.STATS_UPDATED), 'secrets_found', ' 2 ');
+    engine.eventBus.publish(clientEventName(clientEvent.STATS_UPDATED), 'monsters_killed', 'not-a-number');
+
+    assert.equal(stats.monsters_total, 13);
+    assert.equal(stats.secrets_found, 2);
+    assert.equal(stats.monsters_killed, 0);
+  });
 });
 
 void describe('id1 client HUD state', () => {
diff --git a/test/game/id1-game-api.test.mjs b/test/game/id1-game-api.test.mjs
index cb67b89d..0df24b93 100644
--- a/test/game/id1-game-api.test.mjs
+++ b/test/game/id1-game-api.test.mjs
@@ -43,6 +43,82 @@ function createStaticCvars(overrides = {}) {
   };
 }
 
+/**
+ * Create the minimal server engine surface required by ServerGameAPI construction tests.
+ * @param {object} overrides Optional engine overrides.
+ * @returns {object} Mock server engine.
+ */
+function createMockServerEngine(overrides = {}) {
+  const cvars = {
+    teamplay: createMockCvar(0),
+    sv_gravity: createMockCvar(800),
+    sv_nextmap: createMockCvar(0),
+  };
+
+  return {
+    GetCvar(name) {
+      return cvars[name] ?? createMockCvar(0);
+    },
+    eventBus: {
+      subscribe() {
+        return () => {};
+      },
+    },
+    maxplayers: 1,
+    ...overrides,
+  };
+}
+
+void describe('ServerGameAPI serialization', () => {
+  void test('preserves the legacy serialized field set with decorator registration', () => {
+    const gameAPI = new ServerGameAPI(createMockServerEngine());
+
+    assert.deepEqual(ServerGameAPI.serializableFields, [
+      'mapname',
+      'force_retouch',
+      'stats',
+      'parm1',
+      'parm2',
+      'parm3',
+      'parm4',
+      'parm5',
+      'parm6',
+      'parm7',
+      'parm8',
+      'parm9',
+      'parm10',
+      'parm11',
+      'parm12',
+      'parm13',
+      'parm14',
+      'parm15',
+      'parm16',
+      'serverflags',
+      'time',
+      'framecount',
+      'frametime',
+      'worldspawn',
+      'lastspawn',
+      'gameover',
+      'intermission_running',
+      'intermission_exittime',
+      'nextmap',
+    ]);
+
+    const serialized = gameAPI.serialize();
+
+    assert.deepEqual(Object.keys(serialized), ServerGameAPI.serializableFields);
+    assert.deepEqual(serialized.stats, ['S', {
+      monsters_total: ['P', 0],
+      monsters_killed: ['P', 0],
+      secrets_total: ['P', 0],
+      secrets_found: ['P', 0],
+    }]);
+    assert.equal(Object.hasOwn(serialized, 'gameAI'), false);
+    assert.equal(Object.hasOwn(serialized, 'bodyque_head'), false);
+  });
+});
+
 void describe('ServerGameAPI cvar access', () => {
   void test('getters read initialized cvars directly', () => {
     const originalCvars = ServerGameAPI._cvars;

From 54eaf5aad287ff72cc0e65a771cb524426adaa82 Mon Sep 17 00:00:00 2001
From: Christian R <github@chrisnew.de>
Date: Wed, 8 Apr 2026 11:21:00 +0300
Subject: [PATCH 64/67] TS: final polish

---
 source/cloudflare/worker.mjs               |  8 +++++
 source/engine/server/Edict.ts              |  3 ++
 source/engine/server/Progs.ts              |  8 ++---
 source/engine/server/ProgsAPI.ts           | 35 ++++++++++++++++++----
 source/engine/server/physics/ServerArea.ts |  2 +-
 source/game/id1                            |  2 +-
 source/shared/GameInterfaces.ts            | 23 +++++++-------
 7 files changed, 59 insertions(+), 22 deletions(-)

diff --git a/source/cloudflare/worker.mjs b/source/cloudflare/worker.mjs
index f8d46b00..2d5ea69a 100644
--- a/source/cloudflare/worker.mjs
+++ b/source/cloudflare/worker.mjs
@@ -4,7 +4,15 @@
  * https://developers.cloudflare.com/workers/static-assets/
  */
 
+/**
+ * @typedef {{ ASSETS: { fetch(request: Request): Promise<Response> } }} WorkerEnv
+ */
+
 export default {
+  /**
+   * @param {Request} request Incoming worker request.
+   * @param {WorkerEnv} env Worker bindings.
+   */
   async fetch(request, env) {
     // Serve static assets via the ASSETS binding
     const response = await env.ASSETS.fetch(request);
diff --git a/source/engine/server/Edict.ts b/source/engine/server/Edict.ts
index 64e125e1..ee98149e 100644
--- a/source/engine/server/Edict.ts
+++ b/source/engine/server/Edict.ts
@@ -16,6 +16,7 @@ import { ConsoleCommand } from '../common/Cmd.ts';
 import { ModelType } from '../common/Mod.ts';
 import { CorruptedResourceError, HostError } from '../common/Errors.ts';
 
+// FIXME: we should improve this interface and make the actual BaseEntity implement it
 export interface BaseEntity extends SerializableEntity {
   classname: string;
   alpha: number;
@@ -43,6 +44,7 @@ export interface BaseEntity extends SerializableEntity {
   ideal_yaw?: number;
   idealpitch?: number;
   fixangle?: boolean;
+  interact?(interactingEntity: BaseEntity): void;
   ltime?: number;
   mins: Vector;
   maxs: Vector;
@@ -64,6 +66,7 @@ export interface BaseEntity extends SerializableEntity {
   teleport_time?: number;
   think?(): void;
   touch?(touchedByEntity: BaseEntity, pushVector: Vector): void;
+  use?(usedByEntity: BaseEntity): void;
   velocity: Vector;
   view_ofs: Vector;
   v_angle: Vector;
diff --git a/source/engine/server/Progs.ts b/source/engine/server/Progs.ts
index 898f1508..4ba1cfdd 100644
--- a/source/engine/server/Progs.ts
+++ b/source/engine/server/Progs.ts
@@ -1370,7 +1370,7 @@ PR.LeaveFunction = function() {
   for (--c; c >= 0; --c) {
     PR.globals_int[PR.xfunction.parm_start + c] = PR.localstack[PR.localstack_used + c];
   }
-  PR.xfunction = PR.stack[--PR.depth][1];
+  PR.xfunction = PR.stack[--PR.depth][1]!;
   return PR.stack[PR.depth][0];
 };
 
@@ -1615,9 +1615,9 @@ PR.ExecuteProgram = function(fnum) {
         continue;
       case PR.op.state:
         ed = SV.server.edicts[PR.globals_int[PR.globalvars.self]];
-        getProgsEntity(ed)._v_float![PR.entvars.nextthink] = PR.globals_float[PR.globalvars.time] + 0.1;
-        getProgsEntity(ed)._v_float![PR.entvars.frame] = PR.globals_float[st.a];
-        getProgsEntity(ed)._v_int![PR.entvars.think] = PR.globals_int[st.b];
+        getProgsEntity(ed)._v_float![PR.entvars.nextthink!] = PR.globals_float[PR.globalvars.time] + 0.1;
+        getProgsEntity(ed)._v_float![PR.entvars.frame!] = PR.globals_float[st.a];
+        getProgsEntity(ed)._v_int![PR.entvars.think!] = PR.globals_int[st.b];
         continue;
     }
     PR.RunError('Bad opcode ' + st.op);
diff --git a/source/engine/server/ProgsAPI.ts b/source/engine/server/ProgsAPI.ts
index 1692e9a0..e991d7eb 100644
--- a/source/engine/server/ProgsAPI.ts
+++ b/source/engine/server/ProgsAPI.ts
@@ -25,6 +25,23 @@ interface ProgsAPI {
 }
 
 interface QuakeCRuntimeGameAPI {
+  prepareEntity(edict: ServerEdict, classname: string | null, initialData?: Record<string, unknown>): boolean;
+  parm1: number;
+  parm2: number;
+  parm3: number;
+  parm4: number;
+  parm5: number;
+  parm6: number;
+  parm7: number;
+  parm8: number;
+  parm9: number;
+  parm10: number;
+  parm11: number;
+  parm12: number;
+  parm13: number;
+  parm14: number;
+  parm15: number;
+  parm16: number;
   msg_entity: ServerEdict | null;
   self: ServerEdict;
   trace_allsolid: number;
@@ -287,11 +304,11 @@ const bprint = generateBuiltinFunction('bprint', (message: string): void => {
 }, [etype.ev_strings]);
 
 const sprint = generateBuiltinFunction('sprint', (clientEdict: ServerEdict, message: string): void => {
-  clientEdict.getClient().consolePrint(message);
+  clientEdict.getClient()!.consolePrint(message);
 }, [etype.ev_entity_client, etype.ev_strings]);
 
 const centerprint = generateBuiltinFunction('centerprint', (clientEdict: ServerEdict, message: string): void => {
-  clientEdict.getClient().centerPrint(message);
+  clientEdict.getClient()!.centerPrint(message);
 }, [etype.ev_entity_client, etype.ev_strings]);
 
 const normalize = generateBuiltinFunction('normalize', (vec: Vector): Vector => {
@@ -345,7 +362,7 @@ const traceline = generateBuiltinFunction('traceline', (start: Vector, end: Vect
 const checkclient = generateBuiltinFunction('checkclient', (): ServerEdict | null => getQuakeCGameAPI().self.getNextBestClient(), [], etype.ev_entity_client);
 
 const stuffcmd = generateBuiltinFunction('stuffcmd', (clientEdict: ServerEdict, command: string): void => {
-  clientEdict.getClient().sendConsoleCommands(command);
+  clientEdict.getClient()!.sendConsoleCommands(command);
 }, [etype.ev_entity_client, etype.ev_string]);
 
 const localcmd = generateBuiltinFunction('localcmd', (command: string): void => {
@@ -366,7 +383,11 @@ const findradius = generateBuiltinFunction('findradius', (origin: Vector, radius
   let chain: ServerEdict = SV.server.edicts[0] as ServerEdict;
 
   for (const edict of edicts) {
-    edict.entity.chain = chain;
+    const entity = edict.entity!;
+
+    console.assert(entity !== null, 'findradius requires edicts with live entities');
+
+    entity.chain = chain;
     chain = edict as ServerEdict;
   }
 
@@ -383,7 +404,7 @@ const vtos = generateBuiltinFunction('vtos', (vec: Vector): string => vec.toStri
 
 const Spawn = generateBuiltinFunction('Spawn', (): ServerEdict => {
   const edict = ED.Alloc();
-  SV.server.gameAPI.prepareEntity(edict, null, {});
+  getQuakeCGameAPI().prepareEntity(edict, null, {});
   return edict;
 }, [], etype.ev_entity);
 
@@ -518,9 +539,11 @@ const makestatic = generateBuiltinFunction('makestatic', (edict: ServerEdict): v
 const setspawnparms = generateBuiltinFunction('setspawnparms', (clientEdict: ServerEdict): void => {
   console.assert(clientEdict.isClient(), 'setspawnparms requires a client edict');
   const spawnParameters = clientEdict.getClient()!.spawn_parms;
+  const gameAPI = getQuakeCGameAPI();
+  const parmKeys = ['parm1', 'parm2', 'parm3', 'parm4', 'parm5', 'parm6', 'parm7', 'parm8', 'parm9', 'parm10', 'parm11', 'parm12', 'parm13', 'parm14', 'parm15', 'parm16'] as const;
 
   for (let i = 0; i <= 15; i++) {
-    SV.server.gameAPI[`parm${i + 1}`] = spawnParameters![i];
+    gameAPI[parmKeys[i]] = Number(spawnParameters![i]);
   }
 }, [etype.ev_entity_client]);
 
diff --git a/source/engine/server/physics/ServerArea.ts b/source/engine/server/physics/ServerArea.ts
index bf2a23ad..ce67fc76 100644
--- a/source/engine/server/physics/ServerArea.ts
+++ b/source/engine/server/physics/ServerArea.ts
@@ -264,7 +264,7 @@ export class ServerArea {
       }
 
       const touchEntity = touch.entity as (BaseEntity & {
-        solid: number;
+        solid: Defs.solid;
         touch?: (this: BaseEntity, other: BaseEntity | null) => void;
       }) | null;
 
diff --git a/source/game/id1 b/source/game/id1
index 7345474b..7d4ebeed 160000
--- a/source/game/id1
+++ b/source/game/id1
@@ -1 +1 @@
-Subproject commit 7345474b1c66777eef356006c40eaf37ea20ff0d
+Subproject commit 7d4ebeede2d0d6b1f3d0561d6219e6637e108cf0
diff --git a/source/shared/GameInterfaces.ts b/source/shared/GameInterfaces.ts
index 67a2afd0..7a0f09b2 100644
--- a/source/shared/GameInterfaces.ts
+++ b/source/shared/GameInterfaces.ts
@@ -23,7 +23,10 @@ export type Cvar = Readonly<CvarValue>;
 export type PmoveConfiguration = Readonly<PmoveConfigurationValue>;
 export type PmoveQuake2Configuration = Readonly<PmoveQuake2ConfigurationValue>;
 
-export type SerializableType = string | number | boolean | Vector | ServerEdict | SerializableType[] | null;
+export interface SerializableObject {
+  [key: string]: SerializableType;
+}
+export type SerializableType = string | number | boolean | Vector | ServerEdict | SerializableObject | SerializableType[] | null;
 export type ClientSerializableType = string | number | boolean | Vector | ClientEdict | ClientSerializableType[] | null;
 export type ClientEventValue = ClientSerializableType | object;
 
@@ -125,15 +128,15 @@ export interface StartServerListEntry {
 }
 
 export type SerializedPrimitive = string | number | boolean | null;
-export type SerializedVector = [number, number, number, number];
-export type SerializedSkipped = [number];
-export type SerializedInfinity = [number, number];
-export type SerializedPrimitiveValue = [number, SerializedPrimitive];
-export type SerializedFunction = [number, string];
-export type SerializedArray = [number, SerializedValue[]];
-export type SerializedEdictReference = [number, number];
-export type SerializedObject = [number, SerializedData];
-export type SerializedValue = SerializedSkipped | SerializedInfinity | SerializedPrimitiveValue | SerializedFunction | SerializedVector | SerializedArray | SerializedEdictReference | SerializedObject;
+export type SerializedSkipped = ['X'];
+export type SerializedInfinity = ['I', number];
+export type SerializedPrimitiveValue = ['P', SerializedPrimitive];
+export type SerializedFunction = ['F', string];
+export type SerializedArray = ['A', SerializedValue[]];
+export type SerializedEdictReference = ['E', number | null];
+export type SerializedObject = ['S', SerializedData];
+export type SerializedVector = ['V', ...number[]];
+export type SerializedValue = SerializedSkipped | SerializedInfinity | SerializedPrimitiveValue | SerializedFunction | SerializedArray | SerializedEdictReference | SerializedObject | SerializedVector;
 export type SerializedData = Record<string, SerializedValue>;
 
 interface SerializableEntityCandidate {

From 213ea064b7fbb57dc802d6fee58fcb86d22663af Mon Sep 17 00:00:00 2001
From: Christian R <github@chrisnew.de>
Date: Wed, 8 Apr 2026 17:01:11 +0300
Subject: [PATCH 65/67] unit tests

---
 .../instructions/unit-tests.instructions.md   |  37 +-
 eslint.config.mjs                             |  13 +
 package.json                                  |   4 +-
 source/game/id1                               |   2 +-
 source/game/tsconfig.vendored.json            |  10 +
 test/game/id1-base-entity.test.mjs            | 224 -----------
 test/game/id1-boss.test.mjs                   | 350 ------------------
 test/game/id1-buttons.test.mjs                | 255 -------------
 test/game/id1-client.test.mjs                 | 335 -----------------
 test/game/id1-demon.test.mjs                  | 122 ------
 test/game/id1-dog.test.mjs                    | 138 -------
 test/game/id1-doors.test.mjs                  | 347 -----------------
 test/game/id1-fish.test.mjs                   | 115 ------
 test/game/id1-fog.test.mjs                    |  54 ---
 test/game/id1-game-api.test.mjs               | 258 -------------
 test/game/id1-game-stats.test.mjs             | 144 -------
 test/game/id1-items.test.mjs                  | 188 ----------
 test/game/id1-knights.test.mjs                | 235 ------------
 test/game/id1-misc.test.mjs                   | 154 --------
 test/game/id1-ogre.test.mjs                   |  72 ----
 test/game/id1-oldone.test.mjs                 | 224 -----------
 test/game/id1-platforms.test.mjs              | 287 --------------
 test/game/id1-player-lifecycle.test.mjs       | 264 -------------
 test/game/id1-player-weapons.test.mjs         | 153 --------
 test/game/id1-registry.test.mjs               | 102 -----
 test/game/id1-shalrath.test.mjs               | 211 -----------
 test/game/id1-shambler.test.mjs               | 218 -----------
 test/game/id1-soldier.test.mjs                | 282 --------------
 test/game/id1-subs.test.mjs                   | 219 -----------
 test/game/id1-tarbaby.test.mjs                | 178 ---------
 test/game/id1-triggers.test.mjs               | 211 -----------
 test/game/id1-weapons.test.mjs                |  60 ---
 test/game/id1-wizard.test.mjs                 | 240 ------------
 test/game/id1-worldspawn.test.mjs             | 187 ----------
 test/game/id1-zombie.test.mjs                 | 233 ------------
 test/game/quake-entity-ai.test.mjs            | 307 ---------------
 tsconfig.json                                 |   2 +-
 37 files changed, 49 insertions(+), 6386 deletions(-)
 create mode 100644 source/game/tsconfig.vendored.json
 delete mode 100644 test/game/id1-base-entity.test.mjs
 delete mode 100644 test/game/id1-boss.test.mjs
 delete mode 100644 test/game/id1-buttons.test.mjs
 delete mode 100644 test/game/id1-client.test.mjs
 delete mode 100644 test/game/id1-demon.test.mjs
 delete mode 100644 test/game/id1-dog.test.mjs
 delete mode 100644 test/game/id1-doors.test.mjs
 delete mode 100644 test/game/id1-fish.test.mjs
 delete mode 100644 test/game/id1-fog.test.mjs
 delete mode 100644 test/game/id1-game-api.test.mjs
 delete mode 100644 test/game/id1-game-stats.test.mjs
 delete mode 100644 test/game/id1-items.test.mjs
 delete mode 100644 test/game/id1-knights.test.mjs
 delete mode 100644 test/game/id1-misc.test.mjs
 delete mode 100644 test/game/id1-ogre.test.mjs
 delete mode 100644 test/game/id1-oldone.test.mjs
 delete mode 100644 test/game/id1-platforms.test.mjs
 delete mode 100644 test/game/id1-player-lifecycle.test.mjs
 delete mode 100644 test/game/id1-player-weapons.test.mjs
 delete mode 100644 test/game/id1-registry.test.mjs
 delete mode 100644 test/game/id1-shalrath.test.mjs
 delete mode 100644 test/game/id1-shambler.test.mjs
 delete mode 100644 test/game/id1-soldier.test.mjs
 delete mode 100644 test/game/id1-subs.test.mjs
 delete mode 100644 test/game/id1-tarbaby.test.mjs
 delete mode 100644 test/game/id1-triggers.test.mjs
 delete mode 100644 test/game/id1-weapons.test.mjs
 delete mode 100644 test/game/id1-wizard.test.mjs
 delete mode 100644 test/game/id1-worldspawn.test.mjs
 delete mode 100644 test/game/id1-zombie.test.mjs
 delete mode 100644 test/game/quake-entity-ai.test.mjs

diff --git a/.github/instructions/unit-tests.instructions.md b/.github/instructions/unit-tests.instructions.md
index 72148fd0..22cc72f4 100644
--- a/.github/instructions/unit-tests.instructions.md
+++ b/.github/instructions/unit-tests.instructions.md
@@ -3,8 +3,11 @@
 ### Runner and File Layout
 
 - **Test runner**: Node.js built-in (`node:test`). No third-party frameworks.
-- **Primary glob**: `node --test test/**/*.test.mjs` (see `package.json` scripts).
-- **Category globs**: Keep tests grouped by top-level area such as `test/common/`, `test/physics/`, and `test/renderer/`.
+- **Primary engine glob**: `node --test test/**/*.test.mjs` (see `package.json` scripts).
+- **Repo-local game globs**: `node --test source/game/**/test/*.test.mjs source/game/**/test/**/*.test.mjs`.
+- **Folder ownership**: Keep engine-owned tests under `test/`. Keep game/mod-owned tests in repo-local folders under `source/game/<repo>/test/`.
+- **Repo-local organization**: Within game repos, prefer mirroring the source layout with folders such as `client/`, `entity/`, `helper/`, `monster/`, `props/`, and `core/` when that keeps related tests easier to find.
+- **Category globs**: Keep engine tests grouped by top-level area such as `test/common/`, `test/physics/`, and `test/renderer/`.
 - **File naming**: `<subsystem>.test.mjs`. One file per production class/module.
 - **Shared helpers**: `test/physics/fixtures.mjs` (no `.test.` — never auto-run).
 - **All files are ESM** (`.mjs`). Use `import`/`export` exclusively.
@@ -61,25 +64,27 @@ withMockRegistry({
 ### Writing New Tests
 
 1. **One file per production module**: `ServerPhysics` → `test/physics/server-physics.test.mjs`, `Mod` → `test/common/model-cache.test.mjs`.
-2. **Regression tests go in the relevant subsystem file**, not a catch-all file.
-3. **Document magic numbers** with a comment explaining the derivation. Example:
-   ```javascript
-   // checkStuck tries: 1 (current pos) + 1 (oldorigin) + 18 z × 3 x × 3 y = 164
-   assert.equal(testCallCount, 164);
-   ```
-4. **Prefer precise assertions** (`assert.deepEqual`, `assert.equal`) over loose checks.
-5. **Use `assertNear`** for any floating-point comparison.
-6. **Avoid `Math.random` in production paths** — if production uses it, save and restore in tests:
-   ```javascript
-   const originalRandom = Math.random;
-   Math.random = () => 0.0;
-   try { ... } finally { Math.random = originalRandom; }
-   ```
+2. **Game/mod tests live with their repo**: `source/game/id1/test/entity/items.test.mjs`, `source/game/id1/test/monster/ogre.test.mjs`, `source/game/hellwave/test/hellwave-game-api.test.mjs`.
+3. **Regression tests go in the relevant subsystem file**, not a catch-all file.
+4. **Document magic numbers** with a comment explaining the derivation. Example:
+  ```javascript
+  // checkStuck tries: 1 (current pos) + 1 (oldorigin) + 18 z × 3 x × 3 y = 164
+  assert.equal(testCallCount, 164);
+  ```
+5. **Prefer precise assertions** (`assert.deepEqual`, `assert.equal`) over loose checks.
+6. **Use `assertNear`** for any floating-point comparison.
+7. **Avoid `Math.random` in production paths** — if production uses it, save and restore in tests:
+  ```javascript
+  const originalRandom = Math.random;
+  Math.random = () => 0.0;
+  try { ... } finally { Math.random = originalRandom; }
+  ```
 
 ### Running Tests
 
 ```bash
 npm test               # all tests
+npm run test:game      # repo-local game/mod tests
 npm run test:common    # common engine tests
 npm run test:physics       # all physics tests
 npm run test:renderer      # renderer tests
diff --git a/eslint.config.mjs b/eslint.config.mjs
index 83d2dfd1..9152a44f 100644
--- a/eslint.config.mjs
+++ b/eslint.config.mjs
@@ -12,6 +12,8 @@ const __dirname = dirname(fileURLToPath(import.meta.url));
 const typeAwareParserOptions = {
   ecmaVersion: 'latest',
   sourceType: 'module',
+  // Game modules vendored under source/game are responsible for shipping a
+  // local tsconfig.json when they want typed linting for their own tests.
   projectService: true,
   tsconfigRootDir: __dirname,
 };
@@ -181,12 +183,23 @@ export default defineConfig([
       'source/engine/main-dedicated.ts',
       'source/engine/server/**/*.{mjs,ts,mts,cts}',
       'source/engine/common/**/*.{mjs,ts,mts,cts}',
+      'source/game/**/test/**/*.{mjs,ts,mts,cts}',
       'test/**/*.{mjs,ts,mts,cts}',
     ],
     languageOptions: {
       globals: nodeGlobals,
     },
   },
+  {
+    files: [
+      'source/game/**/test/**/*.{mjs,ts,mts,cts}',
+      'test/**/*.{mjs,ts,mts,cts}',
+    ],
+    rules: {
+      'jsdoc/require-param-type': 'off',
+      'jsdoc/require-returns-type': 'off',
+    },
+  },
   {
     files: ['source/cloudflare/**/*.{mjs,ts,mts,cts}'],
     languageOptions: {
diff --git a/package.json b/package.json
index bab2acab..c36127ad 100644
--- a/package.json
+++ b/package.json
@@ -33,7 +33,9 @@
     "ws": "^8.18.0"
   },
   "scripts": {
-    "test": "tsx --test test/**/*.test.mjs",
+    "test": "tsx --test test/**/*.test.mjs source/game/**/test/*.test.mjs source/game/**/test/**/*.test.mjs",
+    "test:engine": "tsx --test test/**/*.test.mjs",
+    "test:game": "tsx --test source/game/**/test/*.test.mjs source/game/**/test/**/*.test.mjs",
     "test:common": "tsx --test test/common/**/*.test.mjs",
     "test:physics": "tsx --test test/physics/**/*.test.mjs",
     "test:renderer": "tsx --test test/renderer/**/*.test.mjs",
diff --git a/source/game/id1 b/source/game/id1
index 7d4ebeed..dd8c6c01 160000
--- a/source/game/id1
+++ b/source/game/id1
@@ -1 +1 @@
-Subproject commit 7d4ebeede2d0d6b1f3d0561d6219e6637e108cf0
+Subproject commit dd8c6c011cc2883e43d8100e2703bc63403aef6f
diff --git a/source/game/tsconfig.vendored.json b/source/game/tsconfig.vendored.json
new file mode 100644
index 00000000..ff58801e
--- /dev/null
+++ b/source/game/tsconfig.vendored.json
@@ -0,0 +1,10 @@
+{
+  "extends": "../../tsconfig.json",
+  "compilerOptions": {
+    "checkJs": false
+  },
+  "exclude": [
+    "../../node_modules",
+    "../../dist"
+  ]
+}
diff --git a/test/game/id1-base-entity.test.mjs b/test/game/id1-base-entity.test.mjs
deleted file mode 100644
index 26de8566..00000000
--- a/test/game/id1-base-entity.test.mjs
+++ /dev/null
@@ -1,224 +0,0 @@
-import { describe, test } from 'node:test';
-import assert from 'node:assert/strict';
-
-import BaseEntity from '../../source/game/id1/entity/BaseEntity.ts';
-import { entity, serializable, Serializer } from '../../source/game/id1/helper/MiscHelpers.ts';
-
-/**
- * Create the minimal game API surface required by serializer tests.
- * @returns {object} Mock game API.
- */
-function createMockGameAPI() {
-  return {
-    engine: {
-      IsLoading() {
-        return false;
-      },
-    },
-  };
-}
-
-void describe('Serializer', () => {
-  void test('uses static serializableFields for typed classes', () => {
-    class StaticSerializable {
-      static serializableFields = ['count'];
-
-      count = 3;
-      skipped = 'ignore-me';
-
-      constructor() {
-        this._serializer = new Serializer(this, null);
-      }
-    }
-
-    const instance = new StaticSerializable();
-
-    assert.deepEqual(instance._serializer.serialize(), {
-      count: ['P', 3],
-    });
-  });
-
-  void test('still supports legacy startFields/endFields callers', () => {
-    class LegacySerializable {
-      constructor() {
-        this._serializer = new Serializer(this, null);
-        this._serializer.startFields();
-        this.name = 'legacy';
-        this.enabled = true;
-        this._serializer.endFields();
-      }
-    }
-
-    const instance = new LegacySerializable();
-
-    assert.deepEqual(instance._serializer.serialize(), {
-      enabled: ['P', true],
-      name: ['P', 'legacy'],
-    });
-  });
-});
-
-void describe('BaseEntity', () => {
-  void test('stays extensible for mod-friendly subclasses during the transition', () => {
-    class ModFriendlyEntity extends BaseEntity {
-      static classname = 'mod_friendly';
-
-      _declareFields() {
-        super._declareFields();
-        this._serializer.startFields();
-        this.customField = 42;
-        this._serializer.endFields();
-      }
-
-      constructor(gameAPI) {
-        super(null, gameAPI);
-        this.postConstructorField = 'works';
-      }
-    }
-
-    const entity = new ModFriendlyEntity(createMockGameAPI()).initializeEntity();
-
-    assert.equal(Object.isSealed(entity), false);
-    assert.equal(entity.customField, 42);
-    assert.equal(entity.postConstructorField, 'works');
-
-    entity.extraField = 'mods stay easy';
-    assert.equal(entity.extraField, 'mods stay easy');
-  });
-});
-
-void describe('@entity / @serializable decorators', () => {
-  void test('BaseEntity.serializableFields is a frozen array from @entity', () => {
-    assert.ok(Array.isArray(BaseEntity.serializableFields));
-    assert.ok(Object.isFrozen(BaseEntity.serializableFields));
-    assert.ok(BaseEntity.serializableFields.includes('ltime'));
-    assert.ok(BaseEntity.serializableFields.includes('origin'));
-    assert.ok(BaseEntity.serializableFields.includes('_scheduledThinks'));
-  });
-
-  void test('Serializer collects all decorated BaseEntity fields', () => {
-    const entity = new BaseEntity(null, createMockGameAPI()).initializeEntity();
-    const serialized = entity._serializer.serialize();
-    assert.ok('ltime' in serialized);
-    assert.ok('origin' in serialized);
-    assert.ok('message' in serialized);
-    assert.ok(!('_sub' in serialized), '_sub should not be serialized');
-    assert.ok(!('_damageHandler' in serialized), '_damageHandler should not be serialized');
-  });
-
-  void test('legacy static serializableFields merges with decorated parent', () => {
-    class LegacyChild extends BaseEntity {
-      static classname = 'legacy_child';
-      static serializableFields = ['customProp'];
-
-      constructor(gameAPI) {
-        super(null, gameAPI);
-        this.customProp = 42;
-      }
-    }
-
-    const child = new LegacyChild(createMockGameAPI()).initializeEntity();
-    const serialized = child._serializer.serialize();
-    assert.ok('ltime' in serialized, 'inherits decorated parent fields');
-    assert.ok('customProp' in serialized, 'includes own static array fields');
-  });
-
-  void test('entity and serializable are exported functions', () => {
-    assert.equal(typeof entity, 'function');
-    assert.equal(typeof serializable, 'function');
-  });
-
-});
-
-void describe('BasePropEntity decorator port', async () => {
-  await import('../../source/game/id1/GameAPI.ts');
-
-  const { default: BasePropEntity, PropState } = await import('../../source/game/id1/entity/props/BasePropEntity.ts');
-
-  void test('uses decorator-registered fields with initialized defaults', () => {
-    class TestPropEntity extends BasePropEntity {
-      static classname = 'test_prop_entity';
-
-      spawn() {}
-    }
-
-    const entity = new TestPropEntity(null, createMockGameAPI()).initializeEntity();
-    const serialized = entity._serializer.serialize();
-
-    assert.ok(Array.isArray(BasePropEntity.serializableFields));
-    assert.ok(Object.isFrozen(BasePropEntity.serializableFields));
-    assert.ok(BasePropEntity.serializableFields.includes('sounds'));
-    assert.ok(BasePropEntity.serializableFields.includes('pos1'));
-    assert.ok(BasePropEntity.serializableFields.includes('state'));
-    assert.equal(entity.sounds, 0);
-    assert.equal(entity.state, PropState.STATE_TOP);
-    assert.equal(entity._sub !== null, true);
-    assert.ok('sounds' in serialized);
-    assert.ok('pos1' in serialized);
-    assert.ok('state' in serialized);
-  });
-});
-
-void describe('BaseMonster decorator port', async () => {
-  // Import GameAPI first to establish the correct ESM evaluation order.
-  // In production, GameAPI.ts is the entry point, so monster subclasses
-  // evaluate after BaseMonster.ts. In tests, importing BaseMonster.ts
-  // directly inverts that order, causing TDZ errors in subclass files.
-  await import('../../source/game/id1/GameAPI.ts');
-
-  const { default: BaseMonster, WalkMonster, FlyMonster, SwimMonster, MeatSprayEntity } =
-    await import('../../source/game/id1/entity/monster/BaseMonster.ts');
-
-  void test('BaseMonster.serializableFields is a frozen array from @entity', () => {
-    assert.ok(Array.isArray(BaseMonster.serializableFields));
-    assert.ok(Object.isFrozen(BaseMonster.serializableFields));
-  });
-
-  void test('BaseMonster decorated fields include expected keys', () => {
-    const fields = BaseMonster.serializableFields;
-    for (const key of ['pausetime', 'movetarget', 'health', 'ideal_yaw', 'yaw_speed', 'bloodcolor', 'enemy', 'goalentity', 'cnt', '_ai']) {
-      assert.ok(fields.includes(key), `missing field "${key}"`);
-    }
-  });
-
-  void test('collectSerializableFields merges BaseEntity + BaseMonster fields', () => {
-    // collectSerializableFields walks the prototype chain to merge fields from
-    // all @entity-decorated ancestors.  We verify this by constructing a mock
-    // instance whose prototype chain looks like: instance → BaseMonster → BaseEntity.
-    const merged = [...new Set([
-      ...BaseEntity.serializableFields,
-      ...BaseMonster.serializableFields,
-    ])];
-    for (const key of BaseEntity.serializableFields) {
-      assert.ok(merged.includes(key), `missing inherited field "${key}"`);
-    }
-    for (const key of BaseMonster.serializableFields) {
-      assert.ok(merged.includes(key), `missing own field "${key}"`);
-    }
-  });
-
-  void test('subclasses carry their own serializableFields from @entity', () => {
-    // WalkMonster, FlyMonster, SwimMonster add no extra @serializable fields,
-    // so their own serializableFields arrays should be empty (only BaseMonster's
-    // and BaseEntity's are inherited via collectSerializableFields at runtime).
-    for (const Ctor of [WalkMonster, FlyMonster, SwimMonster]) {
-      const fields = Ctor.serializableFields;
-      assert.ok(Array.isArray(fields), `${Ctor.name} missing serializableFields`);
-      assert.ok(Object.isFrozen(fields), `${Ctor.name} serializableFields not frozen`);
-    }
-  });
-
-  void test('MeatSprayEntity has its own decorator-generated serializableFields', () => {
-    assert.ok(Array.isArray(MeatSprayEntity.serializableFields));
-    assert.ok(Object.isFrozen(MeatSprayEntity.serializableFields));
-    // MeatSprayEntity extends BaseEntity with no extra @serializable fields,
-    // so its own array should be empty.
-    assert.equal(MeatSprayEntity.serializableFields.length, 0);
-  });
-
-  void test('non-serializable fields are excluded from BaseMonster', () => {
-    const fields = BaseMonster.serializableFields;
-    assert.ok(!fields.includes('_damageHandler'), '_damageHandler should not be serialized');
-    assert.ok(!fields.includes('_sub'), '_sub should not be serialized');
-  });
-});
diff --git a/test/game/id1-boss.test.mjs b/test/game/id1-boss.test.mjs
deleted file mode 100644
index df04301f..00000000
--- a/test/game/id1-boss.test.mjs
+++ /dev/null
@@ -1,350 +0,0 @@
-import { describe, test } from 'node:test';
-import assert from 'node:assert/strict';
-
-import Vector from '../../source/shared/Vector.ts';
-import { effect, moveType, solid, tentType } from '../../source/game/id1/Defs.ts';
-
-await import('../../source/game/id1/GameAPI.ts');
-
-const { BossLavaball, BossMonster, EventLightningEntity } = await import('../../source/game/id1/entity/monster/Boss.ts');
-
-const ELECTRODE_STATE_TOP = 0;
-
-BossMonster._initStates();
-
-/**
- * Create a minimal boss fixture for focused behavior tests.
- * @param {typeof BossMonster} MonsterClass Monster constructor under test.
- * @param {object} [gameOverrides] Optional game API overrides.
- * @returns {BossMonster} Monster fixture instance.
- */
-function createBossFixture(MonsterClass, gameOverrides = {}) {
-  const edict = {
-    num: 1,
-    entity: null,
-    freeEdict() {},
-    setOrigin() {},
-    setModel() {},
-    setMinMaxSize() {},
-    walkMove() {
-      return false;
-    },
-    changeYaw() {
-      return 0;
-    },
-    dropToFloor() {
-      return true;
-    },
-    isOnTheFloor() {
-      return false;
-    },
-    makeStatic() {},
-    aim() {
-      return null;
-    },
-    moveToGoal() {
-      return false;
-    },
-    isInPXS() {
-      return true;
-    },
-    getNextBestClient() {
-      return null;
-    },
-  };
-
-  const engine = {
-    IsLoading() {
-      return false;
-    },
-    PrecacheModel() {},
-    PrecacheSound() {},
-    ParseQC() {
-      return null;
-    },
-    StartSound() {},
-    SpawnEntity() {
-      return { entity: null };
-    },
-    DispatchTempEntityEvent() {},
-    DispatchBeamEvent() {},
-    eventBus: {
-      publish() {},
-    },
-  };
-
-  const gameAPI = {
-    engine,
-    time: 3,
-    skill: 1,
-    deathmatch: 0,
-    nomonsters: 0,
-    ...gameOverrides,
-  };
-
-  const entity = new MonsterClass(edict, gameAPI).initializeEntity();
-  edict.entity = entity;
-  entity.origin = new Vector(10, 20, 30);
-  entity.angles = new Vector();
-  entity.enemy = {
-    origin: new Vector(90, 20, 30),
-    velocity: new Vector(20, 0, 0),
-    health: 100,
-  };
-
-  return entity;
-}
-
-/**
- * Create a minimal event_lightning fixture.
- * @returns {EventLightningEntity} Lightning fixture instance.
- */
-function createLightningFixture() {
-  const edict = {
-    num: 2,
-    entity: null,
-    freeEdict() {},
-    setOrigin() {},
-    setModel() {},
-    setMinMaxSize() {},
-    walkMove() {
-      return false;
-    },
-    changeYaw() {
-      return 0;
-    },
-    dropToFloor() {
-      return true;
-    },
-    isOnTheFloor() {
-      return false;
-    },
-    makeStatic() {},
-    aim() {
-      return null;
-    },
-    moveToGoal() {
-      return false;
-    },
-    isInPXS() {
-      return true;
-    },
-    getNextBestClient() {
-      return null;
-    },
-  };
-
-  const engine = {
-    IsLoading() {
-      return false;
-    },
-    PrecacheModel() {},
-    PrecacheSound() {},
-    ParseQC() {
-      return null;
-    },
-    StartSound() {},
-    DispatchBeamEvent() {},
-    eventBus: {
-      publish() {},
-    },
-  };
-
-  const gameAPI = {
-    engine,
-    time: 5,
-    skill: 1,
-    deathmatch: 0,
-    nomonsters: 0,
-  };
-
-  const entity = new EventLightningEntity(edict, gameAPI).initializeEntity();
-  edict.entity = entity;
-  return entity;
-}
-
-void describe('Boss module metadata', () => {
-  void test('exports the boss, lavaball, and lightning classes', () => {
-    assert.equal(BossMonster.classname, 'monster_boss');
-    assert.equal(BossLavaball.classname, 'monster_boss_lavaball');
-    assert.equal(EventLightningEntity.classname, 'event_lightning');
-  });
-});
-
-void describe('BossMonster state machine', () => {
-  void test('rise, idle, missile, and shock loops keep the QuakeC transitions', () => {
-    const states = BossMonster._states;
-
-    assert.equal(states.boss_rise17.nextState, 'boss_missile1');
-    assert.equal(states.boss_idle31.nextState, 'boss_idle1');
-    assert.equal(states.boss_missile23.nextState, 'boss_missile1');
-    assert.equal(states.boss_shocka10.nextState, 'boss_missile1');
-    assert.equal(states.boss_shockb7.keyframe, 'shockb1');
-    assert.equal(states.boss_shockb10.nextState, 'boss_missile1');
-    assert.equal(states.boss_shockc10.nextState, 'boss_death1');
-    assert.equal(states.boss_death10.nextState, 'boss_death10');
-  });
-});
-
-void describe('BossMonster QC fixes', () => {
-  void test('use wakes the boss with the skill-scaled health and lava splash', () => {
-    const boss = createBossFixture(BossMonster, { skill: 0 });
-    let stateName = null;
-    const tempEvents = [];
-
-    boss._runState = (nextState) => {
-      stateName = nextState;
-      return true;
-    };
-    boss.engine.DispatchTempEntityEvent = (eventType, origin) => {
-      tempEvents.push({ eventType, origin });
-    };
-
-    boss.use({ classname: 'player', origin: new Vector() });
-
-    assert.equal(boss.health, 1);
-    assert.equal(boss.movetype, moveType.MOVETYPE_STEP);
-    assert.equal(boss.solid, solid.SOLID_SLIDEBOX);
-    assert.equal(stateName, 'boss_rise1');
-    assert.deepEqual(tempEvents, [{ eventType: tentType.TE_LAVASPLASH, origin: boss.origin }]);
-  });
-
-  void test('takeLightningDamage steps through the classic shock states', () => {
-    const boss = createBossFixture(BossMonster);
-    let stateName = null;
-
-    boss._runState = (nextState) => {
-      stateName = nextState;
-      return true;
-    };
-    boss.health = 3;
-
-    boss.takeLightningDamage({ classname: 'player', origin: new Vector() });
-    assert.equal(boss.health, 2);
-    assert.equal(stateName, 'boss_shocka1');
-
-    boss.takeLightningDamage({ classname: 'player', origin: new Vector() });
-    assert.equal(boss.health, 1);
-    assert.equal(stateName, 'boss_shockb1');
-
-    boss.takeLightningDamage({ classname: 'player', origin: new Vector() });
-    assert.equal(boss.health, 0);
-    assert.equal(stateName, 'boss_shockc1');
-  });
-});
-
-void describe('BossLavaball', () => {
-  void test('spawn keeps the classic lavaball movement and fullbright effect', () => {
-    const boss = createBossFixture(BossMonster);
-    const edict = {
-      num: 3,
-      entity: null,
-      freeEdict() {},
-      setOrigin() {},
-      setModel() {},
-      setMinMaxSize() {},
-      walkMove() {
-        return false;
-      },
-      changeYaw() {
-        return 0;
-      },
-      dropToFloor() {
-        return true;
-      },
-      isOnTheFloor() {
-        return false;
-      },
-      makeStatic() {},
-      aim() {
-        return null;
-      },
-      moveToGoal() {
-        return false;
-      },
-      isInPXS() {
-        return true;
-      },
-      getNextBestClient() {
-        return null;
-      },
-    };
-
-    const lavaball = new BossLavaball(edict, boss.game).initializeEntity();
-    edict.entity = lavaball;
-    lavaball.movedir = new Vector(1, 0, 0);
-
-    lavaball.spawn();
-
-    assert.equal(lavaball.movetype, moveType.MOVETYPE_FLYMISSILE);
-    assert.equal(lavaball.solid, solid.SOLID_BBOX);
-    assert.equal((lavaball.effects & effect.EF_FULLBRIGHT) !== 0, true);
-    assert.deepEqual([lavaball.avelocity[0], lavaball.avelocity[1], lavaball.avelocity[2]], [200, 100, 300]);
-    assert.equal(Math.round(lavaball.velocity.len()), 300);
-  });
-});
-
-void describe('EventLightningEntity', () => {
-  void test('fires aligned top electrodes and damages the boss once', () => {
-    const lightning = createLightningFixture();
-    const beams = [];
-    const sounds = [];
-    const activator = { classname: 'player', origin: new Vector() };
-    let damageCalls = 0;
-    const boss = createBossFixture(BossMonster);
-    boss.health = 3;
-
-    const electrode1 = {
-      state: ELECTRODE_STATE_TOP,
-      nextthink: 0,
-      mins: new Vector(-16, -16, -16),
-      maxs: new Vector(16, 16, 16),
-      absmin: new Vector(0, 0, 40),
-      _doorGoDown() {},
-    };
-    const electrode2 = {
-      state: ELECTRODE_STATE_TOP,
-      nextthink: 0,
-      mins: new Vector(-16, -16, -16),
-      maxs: new Vector(16, 16, 16),
-      absmin: new Vector(200, 0, 40),
-      _doorGoDown() {},
-    };
-    boss.takeLightningDamage = (entity) => {
-      damageCalls += 1;
-      assert.equal(entity, activator);
-    };
-
-    lightning.findFirstEntityByFieldAndValue = (fieldName, value) => {
-      if (fieldName === 'target' && value === 'lightning') {
-        return electrode1;
-      }
-      if (fieldName === 'classname' && value === BossMonster.classname) {
-        return boss;
-      }
-      return null;
-    };
-    lightning.findNextEntityByFieldAndValue = (fieldName, value, current) => {
-      if (fieldName === 'target' && value === 'lightning' && current === electrode1) {
-        return electrode2;
-      }
-      return null;
-    };
-    lightning.engine.DispatchBeamEvent = (eventType, edictId, start, end) => {
-      beams.push({ eventType, edictId, start, end });
-    };
-    lightning.startSound = (_channel, soundName) => {
-      sounds.push(soundName);
-    };
-
-    lightning.use(activator);
-
-    assert.equal(lightning.lightning_end, 6);
-    assert.equal(electrode1.nextthink, -1);
-    assert.equal(electrode2.nextthink, -1);
-    assert.deepEqual(sounds, ['misc/power.wav']);
-    assert.equal(beams.length, 1);
-    assert.equal(beams[0].eventType, tentType.TE_LIGHTNING3);
-    assert.equal(damageCalls, 1);
-  });
-});
diff --git a/test/game/id1-buttons.test.mjs b/test/game/id1-buttons.test.mjs
deleted file mode 100644
index 6d342d81..00000000
--- a/test/game/id1-buttons.test.mjs
+++ /dev/null
@@ -1,255 +0,0 @@
-import { describe, test } from 'node:test';
-import assert from 'node:assert/strict';
-
-import Vector from '../../source/shared/Vector.ts';
-import { damage, moveType, solid } from '../../source/game/id1/Defs.ts';
-
-await import('../../source/game/id1/GameAPI.ts');
-
-const { PlayerEntity } = await import('../../source/game/id1/entity/Player.ts');
-const { ButtonEntity } = await import('../../source/game/id1/entity/props/Buttons.ts');
-const { state } = await import('../../source/game/id1/entity/props/BasePropEntity.ts');
-
-/**
- * Create a minimal button fixture for focused behavior tests.
- * @returns {{ button: ButtonEntity, engine: object, setModelCalls: string[], precachedSounds: string[] }} Button fixture data.
- */
-function createButtonFixture() {
-  const setModelCalls = [];
-  const precachedSounds = [];
-  const edict = {
-    num: 1,
-    entity: null,
-    freeEdict() {},
-    setOrigin() {},
-    setModel(model) {
-      setModelCalls.push(model);
-    },
-    setMinMaxSize() {},
-    walkMove() {
-      return false;
-    },
-    changeYaw() {
-      return 0;
-    },
-    dropToFloor() {
-      return true;
-    },
-    isOnTheFloor() {
-      return false;
-    },
-    makeStatic() {},
-    aim() {
-      return null;
-    },
-    moveToGoal() {
-      return false;
-    },
-    isInPXS() {
-      return true;
-    },
-    getNextBestClient() {
-      return null;
-    },
-  };
-
-  const engine = {
-    IsLoading() {
-      return false;
-    },
-    PrecacheModel() {},
-    PrecacheSound(sound) {
-      precachedSounds.push(sound);
-    },
-    ParseQC() {
-      return null;
-    },
-    StartSound() {},
-    SpawnEntity() {
-      return { entity: null };
-    },
-    DispatchTempEntityEvent() {},
-    FindByFieldAndValue() {
-      return null;
-    },
-    FindAllByFieldAndValue() {
-      return [];
-    },
-    eventBus: {
-      publish() {},
-    },
-  };
-
-  const gameAPI = {
-    engine,
-    time: 3,
-    deathmatch: 0,
-    nomonsters: 0,
-  };
-
-  const button = new ButtonEntity(edict, gameAPI).initializeEntity().precacheEntity();
-  edict.entity = button;
-  button.origin = new Vector(10, 20, 30);
-  button.angles = new Vector();
-  button.size = new Vector(64, 16, 8);
-  button.model = 'progs/button.bsp';
-
-  return { button, engine, setModelCalls, precachedSounds };
-}
-
-void describe('ButtonEntity spawn', () => {
-  void test('applies QC defaults and computes the travel destination', () => {
-    const { button, precachedSounds, setModelCalls } = createButtonFixture();
-    let setMovedirCalls = 0;
-
-    button._sub = {
-      setMovedir() {
-        setMovedirCalls++;
-        button.movedir.setTo(1, 0, 0);
-      },
-      calcMove() {},
-      useTargets() {},
-    };
-
-    button.spawn();
-
-    assert.deepEqual(precachedSounds, ['buttons/airbut1.wav']);
-    assert.equal(setMovedirCalls, 1);
-    assert.deepEqual(setModelCalls, ['progs/button.bsp']);
-    assert.equal(button.movetype, moveType.MOVETYPE_PUSH);
-    assert.equal(button.solid, solid.SOLID_BSP);
-    assert.equal(button.speed, 40);
-    assert.equal(button.wait, 1);
-    assert.equal(button.lip, 4);
-    assert.equal(button.state, state.STATE_BOTTOM);
-    assert.ok(button.pos1.equalsTo(10, 20, 30));
-    assert.ok(button.pos2.equalsTo(70, 20, 30));
-  });
-
-  void test('enables takedamage and stores max health for shootable buttons', () => {
-    const { button } = createButtonFixture();
-
-    button._sub = {
-      setMovedir() {
-        button.movedir.setTo(0, 1, 0);
-      },
-      calcMove() {},
-      useTargets() {},
-    };
-    button.health = 25;
-
-    button.spawn();
-
-    assert.equal(button.max_health, 25);
-    assert.equal(button.takedamage, damage.DAMAGE_YES);
-  });
-});
-
-void describe('ButtonEntity interaction', () => {
-  void test('touch ignores non-player entities and shootable buttons', () => {
-    const { button } = createButtonFixture();
-    const player = Object.create(PlayerEntity.prototype);
-    const pushVector = new Vector();
-    const firedWith = [];
-
-    button._buttonFire = (userEntity) => {
-      firedWith.push(userEntity);
-    };
-
-    button.touch(button, pushVector);
-    button.max_health = 5;
-    button.touch(player, pushVector);
-
-    assert.deepEqual(firedWith, []);
-  });
-
-  void test('use starts the opening move and ignores repeat triggers while already active', () => {
-    const { button } = createButtonFixture();
-    const calcMoveCalls = [];
-    const soundCalls = [];
-    const userEntity = button;
-
-    button._sub = {
-      setMovedir() {},
-      calcMove(target, speed, callback) {
-        calcMoveCalls.push({ target, speed, callback });
-      },
-      useTargets() {},
-    };
-    button.pos2 = new Vector(100, 20, 30);
-    button.speed = 55;
-    button.noise = 'buttons/switch02.wav';
-    button.state = state.STATE_BOTTOM;
-    button.startSound = (_channel, soundName) => {
-      soundCalls.push(soundName);
-    };
-
-    button.use(userEntity);
-    button.use(userEntity);
-
-    assert.equal(button.state, state.STATE_UP);
-    assert.deepEqual(soundCalls, ['buttons/switch02.wav']);
-    assert.equal(calcMoveCalls.length, 1);
-    assert.ok(calcMoveCalls[0].target.equalsTo(100, 20, 30));
-    assert.equal(calcMoveCalls[0].speed, 55);
-    assert.equal(typeof calcMoveCalls[0].callback, 'function');
-  });
-
-  void test('wait, return, and death preserve the QC button cycle', () => {
-    const { button } = createButtonFixture();
-    const calcMoveCalls = [];
-    const scheduledThinks = [];
-    const usedTargets = [];
-    const attacker = button;
-
-    button._sub = {
-      setMovedir() {},
-      calcMove(target, speed, callback) {
-        calcMoveCalls.push({ target, speed, callback });
-      },
-      useTargets(userEntity) {
-        usedTargets.push(userEntity);
-      },
-    };
-    button._scheduleThink = (nextThink, callback) => {
-      scheduledThinks.push({ nextThink, callback });
-    };
-    button.pos1 = new Vector(10, 20, 30);
-    button.speed = 30;
-    button.wait = 2;
-    button.ltime = 5;
-    button.health = 9;
-    button.max_health = 9;
-    button.takedamage = damage.DAMAGE_YES;
-    button.noise = 'buttons/airbut1.wav';
-    button.state = state.STATE_BOTTOM;
-
-    button.thinkDie(attacker);
-
-    assert.equal(button.health, 9);
-    assert.equal(button.takedamage, damage.DAMAGE_NO);
-    assert.equal(button.state, state.STATE_UP);
-    assert.equal(calcMoveCalls.length, 1);
-
-    calcMoveCalls[0].callback();
-
-    assert.equal(button.state, state.STATE_TOP);
-    assert.equal(button.frame, 1);
-    assert.deepEqual(usedTargets, [attacker]);
-    assert.equal(scheduledThinks.length, 1);
-    assert.equal(scheduledThinks[0].nextThink, 7);
-
-    scheduledThinks[0].callback();
-
-    assert.equal(button.state, state.STATE_DOWN);
-    assert.equal(button.frame, 0);
-    assert.equal(button.takedamage, damage.DAMAGE_YES);
-    assert.equal(calcMoveCalls.length, 2);
-    assert.ok(calcMoveCalls[1].target.equalsTo(10, 20, 30));
-    assert.equal(calcMoveCalls[1].speed, 30);
-
-    calcMoveCalls[1].callback();
-
-    assert.equal(button.state, state.STATE_BOTTOM);
-  });
-});
diff --git a/test/game/id1-client.test.mjs b/test/game/id1-client.test.mjs
deleted file mode 100644
index 9e28075c..00000000
--- a/test/game/id1-client.test.mjs
+++ /dev/null
@@ -1,335 +0,0 @@
-import assert from 'node:assert/strict';
-import { describe, test } from 'node:test';
-
-import Vector from '../../source/shared/Vector.ts';
-
-const { clientEvent, clientEventName, effect, items } = await import('../../source/game/id1/Defs.ts');
-await import('../../source/game/id1/GameAPI.ts');
-
-const syncModule = await import('../../source/game/id1/client/Sync.ts');
-const hudModule = await import('../../source/game/id1/client/HUD.ts');
-const clientApiModule = await import('../../source/game/id1/client/ClientAPI.ts');
-
-const { ClientStats, ServerInfo } = syncModule;
-const { Q1HUD } = hudModule;
-const { ClientGameAPI } = clientApiModule;
-
-/**
- * Create an event bus with subscribe and publish support.
- * @returns {object} Mock event bus.
- */
-function createEventBus() {
-  const listeners = new Map();
-
-  return {
-    subscribe(eventName, handler) {
-      const handlers = listeners.get(eventName) ?? [];
-      handlers.push(handler);
-      listeners.set(eventName, handlers);
-
-      return () => {
-        const currentHandlers = listeners.get(eventName) ?? [];
-        listeners.set(eventName, currentHandlers.filter((currentHandler) => currentHandler !== handler));
-      };
-    },
-
-    publish(eventName, ...args) {
-      for (const handler of listeners.get(eventName) ?? []) {
-        handler(...args);
-      }
-    },
-  };
-}
-
-/**
- * Create a mock texture with the surface expected by HUD and ClientGameAPI.
- * @param {string} name Debug name.
- * @param {number} width Texture width.
- * @param {number} height Texture height.
- * @returns {object} Mock texture.
- */
-function createMockTexture(name, width = 24, height = 24) {
-  return {
-    name,
-    width,
-    height,
-    freed: false,
-    free() {
-      this.freed = true;
-    },
-    wrapClamped() {
-    },
-  };
-}
-
-/**
- * Create a minimal client engine API mock for HUD and client API tests.
- * @param {object} overrides Override values.
- * @returns {object} Mock engine API.
- */
-function createMockClientEngine(overrides = {}) {
-  const eventBus = createEventBus();
-  const sounds = [];
-  const commands = new Map();
-
-  return {
-    eventBus,
-    sounds,
-    commands,
-    DrawPic() {
-    },
-    DrawRect() {
-    },
-    DrawString() {
-    },
-    LoadPicFromWad(name) {
-      return createMockTexture(name);
-    },
-    LoadPicFromLump(name) {
-      return createMockTexture(name, 64, 16);
-    },
-    LoadPicFromFile(name) {
-      return Promise.resolve(createMockTexture(name));
-    },
-    LoadSound(name) {
-      const sound = {
-        name,
-        playCount: 0,
-        play() {
-          this.playCount += 1;
-        },
-      };
-      sounds.push(sound);
-      return sound;
-    },
-    ConsoleDebug() {
-    },
-    ConsoleError() {
-    },
-    ConsolePrint() {
-    },
-    RegisterCommand(name, handler) {
-      commands.set(name, handler);
-    },
-    UnregisterCommand(name) {
-      commands.delete(name);
-    },
-    ContentShift() {
-    },
-    IndexToRGB() {
-      return [1.0, 1.0, 1.0];
-    },
-    PlaceDecal() {
-    },
-    ModForName(name) {
-      return { name };
-    },
-    AllocDlight() {
-      return {};
-    },
-    VID: {
-      width: 320,
-      height: 200,
-    },
-    SCR: {
-      viewsize: 100,
-    },
-    CL: {
-      gametime: 0,
-      frametime: 0.1,
-      entityNum: 1,
-      intermission: false,
-      levelname: 'e1m1',
-      maxclients: 1,
-      time: 0,
-      viewangles: new Vector(),
-      vieworigin: new Vector(),
-      score() {
-        return {
-          isActive: false,
-          frags: 0,
-          name: '',
-          ping: 0,
-          colors: 0,
-        };
-      },
-    },
-    ...overrides,
-  };
-}
-
-/**
- * Create a minimal clientdata map for HUD and client API tests.
- * @param {object} overrides Override values.
- * @returns {object} Mock clientdata.
- */
-function createClientdata(overrides = {}) {
-  return {
-    health: 100,
-    armorvalue: 0,
-    armortype: 0,
-    items: 0,
-    ammo_shells: 0,
-    ammo_nails: 0,
-    ammo_rockets: 0,
-    ammo_cells: 0,
-    weapon: 0,
-    weaponframe: 0,
-    effects: 0,
-    ...overrides,
-  };
-}
-
-void describe('id1 client sync', () => {
-  void test('updates stats and server info from client events', () => {
-    const engine = createMockClientEngine();
-    const stats = new ClientStats(engine);
-    const serverInfo = new ServerInfo(engine);
-
-    engine.eventBus.publish(clientEventName(clientEvent.STATS_INIT), 'monsters_total', 13);
-    engine.eventBus.publish(clientEventName(clientEvent.STATS_UPDATED), 'secrets_found', 2);
-    engine.eventBus.publish('client.server-info.ready', {
-      hostname: 'Shub Hub',
-      coop: '1',
-      deathmatch: '0',
-      skill: '3',
-      map: 'e1m8',
-    });
-    engine.eventBus.publish('client.server-info.updated', 'hostname', 'Slipgate Complex');
-
-    assert.equal(stats.monsters_total, 13);
-    assert.equal(stats.secrets_found, 2);
-    assert.equal(serverInfo.hostname, 'Slipgate Complex');
-    assert.equal(serverInfo.coop, '1');
-    assert.equal(serverInfo.map, 'e1m8');
-  });
-
-  void test('parses numeric stat strings and ignores non-numeric stat strings', () => {
-    const engine = createMockClientEngine();
-    const stats = new ClientStats(engine);
-
-    engine.eventBus.publish(clientEventName(clientEvent.STATS_INIT), 'monsters_total', '13');
-    engine.eventBus.publish(clientEventName(clientEvent.STATS_UPDATED), 'secrets_found', ' 2 ');
-    engine.eventBus.publish(clientEventName(clientEvent.STATS_UPDATED), 'monsters_killed', 'not-a-number');
-
-    assert.equal(stats.monsters_total, 13);
-    assert.equal(stats.secrets_found, 2);
-    assert.equal(stats.monsters_killed, 0);
-  });
-});
-
-void describe('id1 client HUD state', () => {
-  void test('restores saved vectors and stat counters when loading HUD state', () => {
-    const engine = createMockClientEngine();
-    const game = {
-      clientdata: createClientdata(),
-      serverInfo: new ServerInfo(engine),
-    };
-    const hud = new Q1HUD(game, engine);
-
-    hud.init();
-    hud.loadState({
-      damage: {
-        time: 4,
-        attackOrigin: [1, 2, 3],
-        damageReceived: 9,
-      },
-      intermission: {
-        running: true,
-        message: 'Episode complete',
-        mapCompletedTime: 17,
-      },
-      stats: {
-        monsters_total: 10,
-        monsters_killed: 7,
-        secrets_total: 5,
-        secrets_found: 4,
-      },
-    });
-
-    assert.ok(hud.damage.attackOrigin instanceof Vector);
-    assert.deepEqual(Array.from(hud.damage.attackOrigin), [1, 2, 3]);
-    assert.equal(hud.damage.damageReceived, 9);
-    assert.equal(hud.intermission.message, 'Episode complete');
-    assert.equal(hud.stats.monsters_killed, 7);
-  });
-});
-
-void describe('id1 client API', () => {
-  void test('publishes client events and restores saved game state', () => {
-    const engine = createMockClientEngine();
-    const receivedEvents = [];
-    const clientGame = new ClientGameAPI(engine);
-
-    clientGame.init();
-
-    engine.eventBus.subscribe(clientEventName(clientEvent.TEST_EVENT), (...args) => {
-      receivedEvents.push(args);
-    });
-
-    clientGame.clientdata.health = 33;
-    clientGame.serverInfo.hostname = 'Old Name';
-    clientGame.hud.damage.time = 2;
-    clientGame.hud.damage.damageReceived = 11;
-    clientGame.hud.damage.attackOrigin = new Vector(4, 5, 6);
-
-    const savedGame = clientGame.saveGame();
-
-    clientGame.clientdata.health = 100;
-    clientGame.serverInfo.hostname = 'New Name';
-    clientGame.handleClientEvent(clientEvent.TEST_EVENT, 'alpha', 7);
-    clientGame.loadGame(savedGame);
-
-    assert.deepEqual(receivedEvents, [['alpha', 7]]);
-    assert.equal(clientGame.clientdata.health, 33);
-    assert.equal(clientGame.serverInfo.hostname, 'Old Name');
-    assert.ok(clientGame.hud.damage.attackOrigin instanceof Vector);
-    assert.deepEqual(Array.from(clientGame.hud.damage.attackOrigin), [4, 5, 6]);
-  });
-
-  void test('updates the viewmodel and muzzleflash effects during the frame', () => {
-    const dlight = {};
-    const engine = createMockClientEngine({
-      AllocDlight() {
-        return dlight;
-      },
-      CL: {
-        gametime: 0,
-        frametime: 0.1,
-        entityNum: 3,
-        intermission: false,
-        levelname: 'e1m1',
-        maxclients: 1,
-        time: 10,
-        viewangles: new Vector(),
-        vieworigin: new Vector(10, 20, 30),
-        score() {
-          return {
-            isActive: false,
-            frags: 0,
-            name: '',
-            ping: 0,
-            colors: 0,
-          };
-        },
-      },
-    });
-    const clientGame = new ClientGameAPI(engine);
-
-    clientGame.init();
-    clientGame.clientdata = createClientdata({
-      weapon: items.IT_SHOTGUN,
-      weaponframe: 3,
-      effects: effect.EF_MUZZLEFLASH,
-    });
-
-    clientGame.startFrame();
-
-    assert.equal(clientGame.viewmodel.visible, true);
-    assert.equal(clientGame.viewmodel.model.name, 'progs/v_shot.mdl');
-    assert.equal(clientGame.viewmodel.frame, 3);
-    assert.deepEqual(Array.from(dlight.origin), [30, 20, 62]);
-    assert.equal(dlight.minlight, 32);
-    assert.equal(dlight.die, 10.2);
-  });
-});
diff --git a/test/game/id1-demon.test.mjs b/test/game/id1-demon.test.mjs
deleted file mode 100644
index 85b24c57..00000000
--- a/test/game/id1-demon.test.mjs
+++ /dev/null
@@ -1,122 +0,0 @@
-import { describe, test } from 'node:test';
-import assert from 'node:assert/strict';
-
-await import('../../source/game/id1/GameAPI.ts');
-
-const { default: DemonMonster } = await import('../../source/game/id1/entity/monster/Demon.ts');
-
-DemonMonster._initStates();
-
-void describe('DemonMonster class metadata', () => {
-  void test('classname is monster_demon1', () => {
-    assert.equal(DemonMonster.classname, 'monster_demon1');
-  });
-
-  void test('health is 300', () => {
-    assert.equal(DemonMonster._health, 300);
-  });
-
-  void test('models are precached from demon assets', () => {
-    assert.equal(DemonMonster._modelDefault, 'progs/demon.mdl');
-    assert.equal(DemonMonster._modelHead, 'progs/h_demon.mdl');
-  });
-
-  void test('size vectors are correct', () => {
-    const [mins, maxs] = DemonMonster._size;
-    assert.deepEqual([mins[0], mins[1], mins[2]], [-32, -32, -24]);
-    assert.deepEqual([maxs[0], maxs[1], maxs[2]], [32, 32, 64]);
-  });
-
-  void test('serializableFields is a frozen array from @entity', () => {
-    const { serializableFields } = /** @type {{ serializableFields: unknown }} */ (/** @type {unknown} */ (DemonMonster));
-    assert.ok(Array.isArray(serializableFields));
-    assert.ok(Object.isFrozen(serializableFields));
-    assert.deepEqual(serializableFields, ['_isLeaping']);
-  });
-});
-
-void describe('DemonMonster state machine', () => {
-  void test('_states is populated after _initStates', () => {
-    assert.ok(DemonMonster['_states'] !== null);
-    assert.equal(typeof DemonMonster['_states'], 'object');
-  });
-
-  void test('stand sequence has 13 frames that loop', () => {
-    const states = DemonMonster['_states'];
-    for (let i = 1; i <= 13; i++) {
-      const key = `demon1_stand${i}`;
-      assert.ok(key in states, `missing state ${key}`);
-      assert.equal(states[key].keyframe, `stand${i}`);
-    }
-    assert.equal(states.demon1_stand13.nextState, 'demon1_stand1');
-  });
-
-  void test('walk and run sequences loop', () => {
-    const states = DemonMonster['_states'];
-    for (let i = 1; i <= 8; i++) {
-      const key = `demon1_walk${i}`;
-      assert.ok(key in states, `missing state ${key}`);
-      assert.equal(states[key].keyframe, `walk${i}`);
-    }
-    assert.equal(states.demon1_walk8.nextState, 'demon1_walk1');
-
-    for (let i = 1; i <= 6; i++) {
-      const key = `demon1_run${i}`;
-      assert.ok(key in states, `missing state ${key}`);
-      assert.equal(states[key].keyframe, `run${i}`);
-    }
-    assert.equal(states.demon1_run6.nextState, 'demon1_run1');
-  });
-
-  void test('jump sequence keeps the retry loop and returns to run', () => {
-    const states = DemonMonster['_states'];
-    for (let i = 1; i <= 10; i++) {
-      const key = `demon1_jump${i}`;
-      assert.ok(key in states, `missing state ${key}`);
-      assert.equal(states[key].keyframe, `leap${i}`);
-    }
-    assert.equal(states.demon1_jump10.nextState, 'demon1_jump1');
-    assert.equal(states.demon1_jump11.keyframe, 'leap11');
-    assert.equal(states.demon1_jump12.keyframe, 'leap12');
-    assert.equal(states.demon1_jump12.nextState, 'demon1_run1');
-  });
-
-  void test('attack sequence ends at demon1_run1', () => {
-    const states = DemonMonster['_states'];
-    for (let i = 1; i <= 15; i++) {
-      const key = `demon1_atta${i}`;
-      assert.ok(key in states, `missing state ${key}`);
-      assert.equal(states[key].keyframe, `attacka${i}`);
-    }
-    assert.equal(states.demon1_atta15.nextState, 'demon1_run1');
-  });
-
-  void test('pain and death sequences terminate as expected', () => {
-    const states = DemonMonster['_states'];
-    for (let i = 1; i <= 6; i++) {
-      const key = `demon1_pain${i}`;
-      assert.ok(key in states, `missing state ${key}`);
-      assert.equal(states[key].keyframe, `pain${i}`);
-    }
-    assert.equal(states.demon1_pain6.nextState, 'demon1_run1');
-
-    for (let i = 1; i <= 9; i++) {
-      const key = `demon1_die${i}`;
-      assert.ok(key in states, `missing state ${key}`);
-      assert.equal(states[key].keyframe, `death${i}`);
-    }
-    assert.equal(states.demon1_die9.nextState, null);
-  });
-
-  void test('active states keep handlers and passive states omit them', () => {
-    const states = DemonMonster['_states'];
-
-    for (const name of ['demon1_stand1', 'demon1_walk1', 'demon1_run1', 'demon1_jump1', 'demon1_jump3', 'demon1_jump5', 'demon1_jump10', 'demon1_atta5', 'demon1_die6', 'demon1_die9']) {
-      assert.equal(typeof states[name].handler, 'function', `${name} handler should be a function`);
-    }
-
-    for (const name of ['demon1_jump11', 'demon1_jump12', 'demon1_pain1', 'demon1_pain6']) {
-      assert.equal(states[name].handler, null, `${name} handler should be omitted`);
-    }
-  });
-});
diff --git a/test/game/id1-dog.test.mjs b/test/game/id1-dog.test.mjs
deleted file mode 100644
index bb2c1c9e..00000000
--- a/test/game/id1-dog.test.mjs
+++ /dev/null
@@ -1,138 +0,0 @@
-import { describe, test } from 'node:test';
-import assert from 'node:assert/strict';
-
-await import('../../source/game/id1/GameAPI.ts');
-
-const { default: DogMonsterEntity } = await import('../../source/game/id1/entity/monster/Dog.ts');
-
-DogMonsterEntity._initStates();
-
-void describe('DogMonsterEntity class metadata', () => {
-  void test('classname is monster_dog', () => {
-    assert.equal(DogMonsterEntity.classname, 'monster_dog');
-  });
-
-  void test('health is 25', () => {
-    assert.equal(DogMonsterEntity._health, 25);
-  });
-
-  void test('models are precached from dog assets', () => {
-    assert.equal(DogMonsterEntity._modelDefault, 'progs/dog.mdl');
-    assert.equal(DogMonsterEntity._modelHead, 'progs/h_dog.mdl');
-  });
-
-  void test('size vectors are correct', () => {
-    const [mins, maxs] = DogMonsterEntity._size;
-    assert.deepEqual([mins[0], mins[1], mins[2]], [-32, -32, -24]);
-    assert.deepEqual([maxs[0], maxs[1], maxs[2]], [32, 32, 40]);
-  });
-
-  void test('serializableFields is a frozen array from @entity', () => {
-    assert.ok(Array.isArray(DogMonsterEntity.serializableFields));
-    assert.ok(Object.isFrozen(DogMonsterEntity.serializableFields));
-    assert.deepEqual(DogMonsterEntity.serializableFields, ['_isLeaping']);
-  });
-});
-
-void describe('DogMonsterEntity state machine', () => {
-  void test('_states is populated after _initStates', () => {
-    assert.ok(DogMonsterEntity._states !== null);
-    assert.equal(typeof DogMonsterEntity._states, 'object');
-  });
-
-  void test('stand sequence has 9 frames that loop', () => {
-    const states = DogMonsterEntity._states;
-    for (let i = 1; i <= 9; i++) {
-      const key = `dog_stand${i}`;
-      assert.ok(key in states, `missing state ${key}`);
-      assert.equal(states[key].keyframe, `stand${i}`);
-    }
-    assert.equal(states.dog_stand9.nextState, 'dog_stand1');
-  });
-
-  void test('walk sequence has 8 frames that loop', () => {
-    const states = DogMonsterEntity._states;
-    for (let i = 1; i <= 8; i++) {
-      const key = `dog_walk${i}`;
-      assert.ok(key in states, `missing state ${key}`);
-      assert.equal(states[key].keyframe, `walk${i}`);
-    }
-    assert.equal(states.dog_walk8.nextState, 'dog_walk1');
-  });
-
-  void test('run sequence has 12 frames that loop', () => {
-    const states = DogMonsterEntity._states;
-    for (let i = 1; i <= 12; i++) {
-      const key = `dog_run${i}`;
-      assert.ok(key in states, `missing state ${key}`);
-      assert.equal(states[key].keyframe, `run${i}`);
-    }
-    assert.equal(states.dog_run12.nextState, 'dog_run1');
-  });
-
-  void test('attack sequence has 8 frames ending at dog_run1', () => {
-    const states = DogMonsterEntity._states;
-    for (let i = 1; i <= 8; i++) {
-      const key = `dog_atta${i}`;
-      assert.ok(key in states, `missing state ${key}`);
-      assert.equal(states[key].keyframe, `attack${i}`);
-    }
-    assert.equal(states.dog_atta8.nextState, 'dog_run1');
-  });
-
-  void test('leap sequence has 9 frames ending at dog_run1', () => {
-    const states = DogMonsterEntity._states;
-    for (let i = 1; i <= 9; i++) {
-      const key = `dog_leap${i}`;
-      assert.ok(key in states, `missing state ${key}`);
-      assert.equal(states[key].keyframe, `leap${i}`);
-    }
-    assert.equal(states.dog_leap9.nextState, 'dog_run1');
-  });
-
-  void test('pain sequences end at dog_run1', () => {
-    const states = DogMonsterEntity._states;
-    for (let i = 1; i <= 6; i++) {
-      const key = `dog_pain${i}`;
-      assert.ok(key in states, `missing state ${key}`);
-      assert.equal(states[key].keyframe, `pain${i}`);
-    }
-    assert.equal(states.dog_pain6.nextState, 'dog_run1');
-
-    for (let i = 1; i <= 16; i++) {
-      const key = `dog_painb${i}`;
-      assert.ok(key in states, `missing state ${key}`);
-      assert.equal(states[key].keyframe, `painb${i}`);
-    }
-    assert.equal(states.dog_painb16.nextState, 'dog_run1');
-  });
-
-  void test('death sequences do not loop', () => {
-    const states = DogMonsterEntity._states;
-    for (let i = 1; i <= 9; i++) {
-      const key = `dog_die${i}`;
-      assert.ok(key in states, `missing state ${key}`);
-      assert.equal(states[key].keyframe, `death${i}`);
-    }
-    assert.equal(states.dog_die9.nextState, null);
-
-    for (let i = 1; i <= 9; i++) {
-      const key = `dog_dieb${i}`;
-      assert.ok(key in states, `missing state ${key}`);
-      assert.equal(states[key].keyframe, `deathb${i}`);
-    }
-    assert.equal(states.dog_dieb9.nextState, null);
-  });
-
-  void test('active states keep handlers and passive states omit them', () => {
-    const states = DogMonsterEntity._states;
-
-    for (const name of ['dog_stand1', 'dog_walk1', 'dog_run1', 'dog_atta1', 'dog_leap1', 'dog_leap2', 'dog_painb1', 'dog_painb2']) {
-      assert.equal(typeof states[name].handler, 'function', `${name} handler should be a function`);
-    }
-
-    for (const name of ['dog_leap9', 'dog_pain1', 'dog_pain6', 'dog_painb16', 'dog_die1', 'dog_die9', 'dog_dieb1', 'dog_dieb9']) {
-      assert.equal(states[name].handler, null, `${name} handler should be omitted`);
-    }
-  });
-});
diff --git a/test/game/id1-doors.test.mjs b/test/game/id1-doors.test.mjs
deleted file mode 100644
index 893acbe9..00000000
--- a/test/game/id1-doors.test.mjs
+++ /dev/null
@@ -1,347 +0,0 @@
-import { describe, test } from 'node:test';
-import assert from 'node:assert/strict';
-
-import Vector from '../../source/shared/Vector.ts';
-import { attn, channel, damage, items, moveType, solid, worldType } from '../../source/game/id1/Defs.ts';
-
-await import('../../source/game/id1/GameAPI.ts');
-
-const { PlayerEntity } = await import('../../source/game/id1/entity/Player.ts');
-const { DoorEntity, SecretDoorEntity, flag } = await import('../../source/game/id1/entity/props/Doors.ts');
-const { state } = await import('../../source/game/id1/entity/props/BasePropEntity.ts');
-
-/**
- * Create a minimal engine/game harness for door tests.
- * @returns {{ edict: object, engine: object, gameAPI: object, precachedSounds: string[], portalCalls: Array<{ portal: number | null, isOpen: boolean }>, setModelCalls: Array<string | null>, spawnRequests: Array<{ classname: string, initialData: object }> }} Harness data.
- */
-function createDoorHarness() {
-  const precachedSounds = [];
-  const portalCalls = [];
-  const setModelCalls = [];
-  const spawnRequests = [];
-  let boundEntity = null;
-
-  const edict = {
-    num: 1,
-    entity: null,
-    freeEdict() {},
-    setOrigin(origin) {
-      boundEntity?.origin.set(origin);
-    },
-    setModel(model) {
-      setModelCalls.push(model);
-    },
-    setMinMaxSize() {},
-    walkMove() {
-      return false;
-    },
-    changeYaw() {
-      return 0;
-    },
-    dropToFloor() {
-      return true;
-    },
-    isOnTheFloor() {
-      return false;
-    },
-    makeStatic() {},
-    aim() {
-      return null;
-    },
-    moveToGoal() {
-      return false;
-    },
-    isInPXS() {
-      return true;
-    },
-    getNextBestClient() {
-      return null;
-    },
-  };
-
-  const engine = {
-    IsLoading() {
-      return false;
-    },
-    PrecacheModel() {},
-    PrecacheSound(sound) {
-      precachedSounds.push(sound);
-    },
-    ParseQC() {
-      return null;
-    },
-    StartSound() {},
-    SpawnEntity(classname, initialData = {}) {
-      spawnRequests.push({ classname, initialData });
-      return { entity: null };
-    },
-    FindByFieldAndValue() {
-      return null;
-    },
-    FindAllByFieldAndValue() {
-      return [];
-    },
-    SetAreaPortalState(portal, isOpen) {
-      portalCalls.push({ portal, isOpen });
-    },
-    GetModelPortal() {
-      return 7;
-    },
-    eventBus: {
-      publish() {},
-    },
-  };
-
-  const gameAPI = {
-    engine,
-    worldspawn: {
-      worldtype: worldType.MEDIEVAL,
-    },
-    time: 3,
-    deathmatch: 0,
-    nomonsters: 0,
-  };
-
-  return {
-    edict,
-    engine,
-    gameAPI,
-    precachedSounds,
-    portalCalls,
-    setModelCalls,
-    spawnRequests,
-    bindEntity(entity) {
-      boundEntity = entity;
-      edict.entity = entity;
-    },
-  };
-}
-
-/**
- * Create a minimal DoorEntity fixture that exercises explicit instance precache.
- * @returns {{ door: import('../../source/game/id1/entity/props/Doors.ts').DoorEntity, gameAPI: object, precachedSounds: string[], portalCalls: Array<{ portal: number | null, isOpen: boolean }>, setModelCalls: Array<string | null>, spawnRequests: Array<{ classname: string, initialData: object }> }} Fixture data.
- */
-function createDoorFixture() {
-  const harness = createDoorHarness();
-  const door = new DoorEntity(harness.edict, harness.gameAPI).initializeEntity().precacheEntity();
-  harness.bindEntity(door);
-  return { door, ...harness };
-}
-
-/**
- * Create a minimal SecretDoorEntity fixture for focused behavior tests.
- * @returns {{ door: import('../../source/game/id1/entity/props/Doors.ts').SecretDoorEntity, gameAPI: object, precachedSounds: string[], portalCalls: Array<{ portal: number | null, isOpen: boolean }>, setModelCalls: Array<string | null>, spawnRequests: Array<{ classname: string, initialData: object }> }} Fixture data.
- */
-function createSecretDoorFixture() {
-  const harness = createDoorHarness();
-  const door = new SecretDoorEntity(harness.edict, harness.gameAPI).initializeEntity().precacheEntity();
-  harness.bindEntity(door);
-  return { door, ...harness };
-}
-
-void describe('DoorEntity instance precache', () => {
-  void test('defaults sounds before precache so map load does not crash', () => {
-    const { door, precachedSounds } = createDoorFixture();
-
-    assert.equal(door.sounds, 1);
-    assert.deepEqual(precachedSounds, [
-      'doors/medtry.wav',
-      'doors/meduse.wav',
-      'doors/drclos4.wav',
-      'doors/doormv1.wav',
-    ]);
-  });
-});
-
-void describe('DoorEntity spawn and touch', () => {
-  void test('applies QC defaults, key-door setup, and portal state during spawn', () => {
-    const { door, portalCalls, setModelCalls } = createDoorFixture();
-    const scheduledThinks = [];
-    let setMovedirCalls = 0;
-
-    door._sub = {
-      setMovedir() {
-        setMovedirCalls++;
-        door.movedir.setTo(1, 0, 0);
-      },
-      calcMove() {},
-      useTargets() {},
-      reset() {},
-    };
-    door._scheduleThink = (nextThink, callback) => {
-      scheduledThinks.push({ nextThink, callback });
-    };
-    door.origin = new Vector(10, 20, 30);
-    door.size = new Vector(64, 16, 8);
-    door.model = 'progs/door.bsp';
-    door.health = 20;
-    door.spawnflags = flag.DOOR_SILVER_KEY;
-
-    door.spawn();
-
-    assert.equal(setMovedirCalls, 1);
-    assert.deepEqual(setModelCalls, ['progs/door.bsp']);
-    assert.equal(door.movetype, moveType.MOVETYPE_PUSH);
-    assert.equal(door.solid, solid.SOLID_BSP);
-    assert.equal(door.speed, 100);
-    assert.equal(door.wait, -1);
-    assert.equal(door.lip, 8);
-    assert.equal(door.dmg, 2);
-    assert.equal(door.items, items.IT_KEY1);
-    assert.equal(door.max_health, 20);
-    assert.equal(door.takedamage, damage.DAMAGE_YES);
-    assert.equal(door.state, state.STATE_BOTTOM);
-    assert.equal(door.noise1, 'doors/drclos4.wav');
-    assert.equal(door.noise2, 'doors/doormv1.wav');
-    assert.equal(door.noise3, 'doors/medtry.wav');
-    assert.equal(door.noise4, 'doors/meduse.wav');
-    assert.ok(door.pos1.equalsTo(10, 20, 30));
-    assert.ok(door.pos2.equalsTo(66, 20, 30));
-    assert.deepEqual(portalCalls, [{ portal: 7, isOpen: false }]);
-    assert.equal(scheduledThinks.length, 1);
-    assert.equal(scheduledThinks[0].nextThink, 0.1);
-  });
-
-  void test('touch prints messages, enforces keys, and consumes the used key', () => {
-    const { door, gameAPI } = createDoorFixture();
-    const centerPrints = [];
-    const soundCalls = [];
-    const usedBy = [];
-    const player = Object.create(PlayerEntity.prototype);
-
-    player.items = 0;
-    player.centerPrint = (message) => {
-      centerPrints.push(message);
-    };
-    player.startSound = (...args) => {
-      soundCalls.push(args);
-    };
-
-    door.owner = door;
-    door._linkedDoor = door;
-    door.use = (usedByEntity) => {
-      usedBy.push(usedByEntity);
-    };
-
-    door.message = 'Door message';
-    door.items = 0;
-    door.touch(player);
-
-    assert.deepEqual(centerPrints, ['Door message']);
-    assert.deepEqual(soundCalls, [[channel.CHAN_VOICE, 'misc/talk.wav', 1.0, attn.ATTN_NONE]]);
-
-    centerPrints.length = 0;
-    soundCalls.length = 0;
-    gameAPI.time = 6;
-
-    door.message = null;
-    door._doorKeyUsed = false;
-    door.items = items.IT_KEY1;
-    door.owner.attack_finished = 0;
-    door.touch(player);
-
-    assert.deepEqual(centerPrints, ['You need the Silver Key']);
-    assert.deepEqual(soundCalls, [[channel.CHAN_VOICE, 'misc/talk.wav', 1.0, attn.ATTN_NONE]]);
-    assert.deepEqual(usedBy, []);
-
-    centerPrints.length = 0;
-    soundCalls.length = 0;
-    player.items = items.IT_KEY1;
-    door.owner.attack_finished = 0;
-    gameAPI.time = 9;
-
-    door.touch(player);
-
-    assert.equal(player.items, 0);
-    assert.equal(door._doorKeyUsed, true);
-    assert.deepEqual(usedBy, [player]);
-    assert.deepEqual(centerPrints, []);
-  });
-});
-
-void describe('SecretDoorEntity', () => {
-  void test('spawn applies defaults and closes the linked area portal', () => {
-    const { door, portalCalls, setModelCalls } = createSecretDoorFixture();
-
-    door.model = 'progs/secret.bsp';
-    door.origin = new Vector(4, 5, 6);
-    door.angles = new Vector();
-    door.size = new Vector(16, 32, 64);
-
-    door.spawn();
-
-    assert.equal(door.sounds, 3);
-    assert.equal(door.movetype, moveType.MOVETYPE_PUSH);
-    assert.equal(door.solid, solid.SOLID_BSP);
-    assert.equal(door.speed, 50);
-    assert.equal(door.wait, 5);
-    assert.equal(door.health, 10000);
-    assert.equal(door.takedamage, damage.DAMAGE_YES);
-    assert.deepEqual(setModelCalls, ['progs/secret.bsp']);
-    assert.deepEqual(portalCalls, [{ portal: 7, isOpen: false }]);
-    assert.ok(door.oldorigin.equalsTo(4, 5, 6));
-  });
-
-  void test('use runs the open-close sequence and restores the closed state', () => {
-    const { door, portalCalls } = createSecretDoorFixture();
-    const calcMoveCalls = [];
-    const scheduledThinks = [];
-    const usedTargets = [];
-    const soundCalls = [];
-
-    door.model = 'progs/secret.bsp';
-    door.origin = new Vector();
-    door.angles = new Vector();
-    door.size = new Vector(16, 32, 64);
-    door.spawn();
-
-    door._sub = {
-      calcMove(target, speed, callback) {
-        calcMoveCalls.push({ target: target.copy(), speed, callback });
-      },
-      useTargets(usedByEntity) {
-        usedTargets.push(usedByEntity);
-      },
-      reset() {},
-      setMovedir() {},
-    };
-    door._scheduleThink = (nextThink, callback) => {
-      scheduledThinks.push({ nextThink, callback });
-    };
-    door.startSound = (_channel, soundName) => {
-      soundCalls.push(soundName);
-    };
-
-    door.use(door);
-
-    assert.deepEqual(usedTargets, [door]);
-    assert.equal(door.takedamage, damage.DAMAGE_NO);
-    assert.equal(calcMoveCalls.length, 1);
-    assert.equal(calcMoveCalls[0].speed, 50);
-    assert.deepEqual(portalCalls.at(-1), { portal: 7, isOpen: true });
-
-    calcMoveCalls[0].callback();
-    assert.equal(scheduledThinks.length, 1);
-
-    scheduledThinks[0].callback();
-    assert.equal(calcMoveCalls.length, 2);
-
-    calcMoveCalls[1].callback();
-    assert.equal(scheduledThinks.length, 2);
-
-    scheduledThinks[1].callback();
-    assert.equal(calcMoveCalls.length, 3);
-
-    calcMoveCalls[2].callback();
-    assert.equal(scheduledThinks.length, 3);
-
-    scheduledThinks[2].callback();
-    assert.equal(calcMoveCalls.length, 4);
-
-    calcMoveCalls[3].callback();
-
-    assert.equal(door.takedamage, damage.DAMAGE_YES);
-    assert.deepEqual(portalCalls.at(-1), { portal: 7, isOpen: false });
-    assert.equal(soundCalls.at(-1), 'doors/basesec2.wav');
-  });
-});
diff --git a/test/game/id1-fish.test.mjs b/test/game/id1-fish.test.mjs
deleted file mode 100644
index 3fbb237b..00000000
--- a/test/game/id1-fish.test.mjs
+++ /dev/null
@@ -1,115 +0,0 @@
-import { describe, test } from 'node:test';
-import assert from 'node:assert/strict';
-
-// Establish correct ESM evaluation order — GameAPI is the production entry point.
-await import('../../source/game/id1/GameAPI.ts');
-
-const { default: FishMonsterEntity } = await import('../../source/game/id1/entity/monster/Fish.ts');
-
-// _initStates is normally called by the game registry during bootstrap.
-// In unit tests we trigger it manually so the state machine is available.
-FishMonsterEntity._initStates();
-
-void describe('FishMonsterEntity class metadata', () => {
-  void test('classname is monster_fish', () => {
-    assert.equal(FishMonsterEntity.classname, 'monster_fish');
-  });
-
-  void test('health is 25', () => {
-    assert.equal(FishMonsterEntity._health, 25);
-  });
-
-  void test('model default is progs/fish.mdl', () => {
-    assert.equal(FishMonsterEntity._modelDefault, 'progs/fish.mdl');
-  });
-
-  void test('size vectors are correct', () => {
-    const [mins, maxs] = FishMonsterEntity._size;
-    assert.deepEqual([mins[0], mins[1], mins[2]], [-16, -16, -24]);
-    assert.deepEqual([maxs[0], maxs[1], maxs[2]], [16, 16, 24]);
-  });
-
-  void test('serializableFields is a frozen array from @entity', () => {
-    assert.ok(Array.isArray(FishMonsterEntity.serializableFields));
-    assert.ok(Object.isFrozen(FishMonsterEntity.serializableFields));
-  });
-});
-
-void describe('FishMonsterEntity state machine', () => {
-  void test('_states is populated after _initStates', () => {
-    assert.ok(FishMonsterEntity._states !== null);
-    assert.equal(typeof FishMonsterEntity._states, 'object');
-  });
-
-  void test('stand sequence has 18 frames that loop', () => {
-    const states = FishMonsterEntity._states;
-    // f_stand1 through f_stand18, last loops to f_stand1
-    for (let i = 1; i <= 18; i++) {
-      const key = `f_stand${i}`;
-      assert.ok(key in states, `missing state ${key}`);
-      assert.equal(states[key].keyframe, `swim${i}`);
-    }
-    assert.equal(states.f_stand18.nextState, 'f_stand1');
-  });
-
-  void test('walk sequence has 18 frames that loop', () => {
-    const states = FishMonsterEntity._states;
-    for (let i = 1; i <= 18; i++) {
-      const key = `f_walk${i}`;
-      assert.ok(key in states, `missing state ${key}`);
-      assert.equal(states[key].keyframe, `swim${i}`);
-    }
-    assert.equal(states.f_walk18.nextState, 'f_walk1');
-  });
-
-  void test('run sequence uses odd swim frames and loops', () => {
-    const states = FishMonsterEntity._states;
-    // 9 run frames: swim1, swim3, swim5, ..., swim17
-    const expectedKeyframes = [1, 3, 5, 7, 9, 11, 13, 15, 17];
-    for (let i = 0; i < 9; i++) {
-      const key = `f_run${i + 1}`;
-      assert.ok(key in states, `missing state ${key}`);
-      assert.equal(states[key].keyframe, `swim${expectedKeyframes[i]}`);
-    }
-    assert.equal(states.f_run9.nextState, 'f_run1');
-  });
-
-  void test('attack sequence has 18 frames ending at f_run1', () => {
-    const states = FishMonsterEntity._states;
-    for (let i = 1; i <= 18; i++) {
-      const key = `f_atta${i}`;
-      assert.ok(key in states, `missing state ${key}`);
-      assert.equal(states[key].keyframe, `attack${i}`);
-    }
-    // Last attack frame transitions to run, not loop
-    assert.equal(states.f_atta18.nextState, 'f_run1');
-  });
-
-  void test('death sequence has 21 frames and does not loop', () => {
-    const states = FishMonsterEntity._states;
-    for (let i = 1; i <= 21; i++) {
-      const key = `f_death${i}`;
-      assert.ok(key in states, `missing state ${key}`);
-      assert.equal(states[key].keyframe, `death${i}`);
-    }
-    // Last death frame has no next state
-    assert.equal(states.f_death21.nextState, null);
-  });
-
-  void test('pain sequence has 9 frames ending at f_run1', () => {
-    const states = FishMonsterEntity._states;
-    for (let i = 1; i <= 9; i++) {
-      const key = `f_pain${i}`;
-      assert.ok(key in states, `missing state ${key}`);
-      assert.equal(states[key].keyframe, `pain${i}`);
-    }
-    assert.equal(states.f_pain9.nextState, 'f_run1');
-  });
-
-  void test('all state handlers are functions', () => {
-    const states = FishMonsterEntity._states;
-    for (const [name, state] of Object.entries(states)) {
-      assert.equal(typeof state.handler, 'function', `${name} handler should be a function`);
-    }
-  });
-});
diff --git a/test/game/id1-fog.test.mjs b/test/game/id1-fog.test.mjs
deleted file mode 100644
index b2ed10b8..00000000
--- a/test/game/id1-fog.test.mjs
+++ /dev/null
@@ -1,54 +0,0 @@
-import { describe, test } from 'node:test';
-import assert from 'node:assert/strict';
-
-await import('../../source/game/id1/GameAPI.ts');
-
-const { FogEntity } = await import('../../source/game/id1/entity/props/Misc.ts');
-
-/**
- * Create a minimal game API surface for fog entity tests.
- * @returns {{ entity: import('../../source/game/id1/entity/props/Misc.ts').FogEntity }} Fixture data.
- */
-function createFogFixture() {
-  const gameAPI = {
-    engine: {
-      IsLoading() {
-        return false;
-      },
-    },
-  };
-
-  const entity = new FogEntity(null, gameAPI).initializeEntity();
-  return { entity };
-}
-
-void describe('FogEntity', () => {
-  void test('uses decorated defaults for fog fields', () => {
-    const { entity } = createFogFixture();
-    const serialized = entity._serializer.serialize();
-
-    assert.equal(entity.fog_color, '128 128 128');
-    assert.equal(entity.fog_density, 0.01);
-    assert.equal(entity.fog_max_opacity, 0.8);
-    assert.ok(FogEntity.serializableFields.includes('fog_color'));
-    assert.ok(FogEntity.serializableFields.includes('fog_density'));
-    assert.ok(FogEntity.serializableFields.includes('fog_max_opacity'));
-    assert.ok('fog_color' in serialized);
-    assert.ok('fog_density' in serialized);
-    assert.ok('fog_max_opacity' in serialized);
-  });
-
-  void test('assignInitialData overrides fog parameters with map values', () => {
-    const { entity } = createFogFixture();
-
-    entity.assignInitialData({
-      fog_color: '10 20 30',
-      fog_density: '0.05',
-      fog_max_opacity: '0.4',
-    });
-
-    assert.equal(entity.fog_color, '10 20 30');
-    assert.equal(entity.fog_density, 0.05);
-    assert.equal(entity.fog_max_opacity, 0.4);
-  });
-});
diff --git a/test/game/id1-game-api.test.mjs b/test/game/id1-game-api.test.mjs
deleted file mode 100644
index 0df24b93..00000000
--- a/test/game/id1-game-api.test.mjs
+++ /dev/null
@@ -1,258 +0,0 @@
-import assert from 'node:assert/strict';
-import { describe, test } from 'node:test';
-
-const { ServerGameAPI } = await import('../../source/game/id1/GameAPI.ts');
-const { default: BaseEntity } = await import('../../source/game/id1/entity/BaseEntity.ts');
-
-/**
- * Create a mutable mock cvar.
- * @param {number|string} initialValue Initial cvar value.
- * @returns {object} Mock cvar.
- */
-function createMockCvar(initialValue) {
-  const normalizedValue = Number(initialValue);
-
-  return {
-    value: normalizedValue,
-    string: String(normalizedValue),
-    set(nextValue) {
-      this.value = Number(nextValue);
-      this.string = String(this.value);
-    },
-    free() {
-    },
-  };
-}
-
-/**
- * Create the static cvar table used by ServerGameAPI tests.
- * @param {object} overrides Override values for selected cvars.
- * @returns {object} Mock static cvar registry.
- */
-function createStaticCvars(overrides = {}) {
-  return {
-    nomonster: createMockCvar(0),
-    fraglimit: createMockCvar(20),
-    timelimit: createMockCvar(15),
-    samelevel: createMockCvar(0),
-    noexit: createMockCvar(0),
-    skill: createMockCvar(1),
-    deathmatch: createMockCvar(0),
-    coop: createMockCvar(0),
-    ...overrides,
-  };
-}
-
-/**
- * Create the minimal server engine surface required by ServerGameAPI construction tests.
- * @param {object} overrides Optional engine overrides.
- * @returns {object} Mock server engine.
- */
-function createMockServerEngine(overrides = {}) {
-  const cvars = {
-    teamplay: createMockCvar(0),
-    sv_gravity: createMockCvar(800),
-    sv_nextmap: createMockCvar(0),
-  };
-
-  return {
-    GetCvar(name) {
-      return cvars[name] ?? createMockCvar(0);
-    },
-    eventBus: {
-      subscribe() {
-        return () => {};
-      },
-    },
-    maxplayers: 1,
-    ...overrides,
-  };
-}
-
-void describe('ServerGameAPI serialization', () => {
-  void test('preserves the legacy serialized field set with decorator registration', () => {
-    const gameAPI = new ServerGameAPI(createMockServerEngine());
-
-    assert.deepEqual(ServerGameAPI.serializableFields, [
-      'mapname',
-      'force_retouch',
-      'stats',
-      'parm1',
-      'parm2',
-      'parm3',
-      'parm4',
-      'parm5',
-      'parm6',
-      'parm7',
-      'parm8',
-      'parm9',
-      'parm10',
-      'parm11',
-      'parm12',
-      'parm13',
-      'parm14',
-      'parm15',
-      'parm16',
-      'serverflags',
-      'time',
-      'framecount',
-      'frametime',
-      'worldspawn',
-      'lastspawn',
-      'gameover',
-      'intermission_running',
-      'intermission_exittime',
-      'nextmap',
-    ]);
-
-    const serialized = gameAPI.serialize();
-
-    assert.deepEqual(Object.keys(serialized), ServerGameAPI.serializableFields);
-    assert.deepEqual(serialized.stats, ['S', {
-      monsters_total: ['P', 0],
-      monsters_killed: ['P', 0],
-      secrets_total: ['P', 0],
-      secrets_found: ['P', 0],
-    }]);
-    assert.equal(Object.hasOwn(serialized, 'gameAI'), false);
-    assert.equal(Object.hasOwn(serialized, 'bodyque_head'), false);
-  });
-});
-
-void describe('ServerGameAPI cvar access', () => {
-  void test('getters read initialized cvars directly', () => {
-    const originalCvars = ServerGameAPI._cvars;
-
-    try {
-      ServerGameAPI._cvars = createStaticCvars({
-        skill: createMockCvar(3),
-        deathmatch: createMockCvar(1),
-      });
-
-      const gameAPI = Object.create(ServerGameAPI.prototype);
-      gameAPI.constructor = ServerGameAPI;
-      gameAPI._cvars = {
-        teamplay: createMockCvar(2),
-        gravity: createMockCvar(900),
-        nextmap: createMockCvar(0),
-      };
-
-      assert.equal(gameAPI.skill, 3);
-      assert.equal(gameAPI.deathmatch, 1);
-      assert.equal(gameAPI.teamplay, 2);
-      assert.equal(gameAPI.gravity, 900);
-    } finally {
-      ServerGameAPI._cvars = originalCvars;
-    }
-  });
-
-  void test('init normalizes guaranteed cvars in place', () => {
-    const originalCvars = ServerGameAPI._cvars;
-    let subscribedToEvents = false;
-    let precachedResources = false;
-    let initializedNextMap = false;
-
-    try {
-      const cvars = createStaticCvars({
-        coop: createMockCvar(1),
-        deathmatch: createMockCvar(1),
-        skill: createMockCvar(9),
-      });
-      ServerGameAPI._cvars = cvars;
-
-      const gameAPI = Object.create(ServerGameAPI.prototype);
-      gameAPI.constructor = ServerGameAPI;
-      gameAPI.mapname = null;
-      gameAPI.serverflags = 0;
-      gameAPI.stats = {
-        subscribeToEvents() {
-          subscribedToEvents = true;
-        },
-      };
-      gameAPI._precacheResources = () => {
-        precachedResources = true;
-      };
-      gameAPI._initNextMap = () => {
-        initializedNextMap = true;
-      };
-
-      gameAPI.init('e1m1', 7);
-
-      assert.equal(gameAPI.mapname, 'e1m1');
-      assert.equal(gameAPI.serverflags, 7);
-      assert.equal(cvars.coop.value, 1);
-      assert.equal(cvars.deathmatch.value, 0);
-      assert.equal(cvars.skill.value, 3);
-      assert.equal(subscribedToEvents, true);
-      assert.equal(precachedResources, true);
-      assert.equal(initializedNextMap, true);
-    } finally {
-      ServerGameAPI._cvars = originalCvars;
-    }
-  });
-});
-
-void describe('ServerGameAPI entity lifecycle', () => {
-  void test('prepareEntity precaches after assigned initial data is applied', () => {
-    class DeferredInitEntity extends BaseEntity {
-      static classname = 'deferred_init_entity';
-
-      constructor(edict, gameAPI) {
-        super(edict, gameAPI);
-        this.constructorValue = 3;
-      }
-
-      _declareFields() {
-        super._declareFields();
-        this._serializer.startFields();
-        this.initializerReady = 0;
-        this.constructorValue = 0;
-        this.precacheObservedValue = -1;
-        this._serializer.endFields();
-      }
-
-      _precache() {
-        this.precacheObservedValue = this.initializerReady;
-      }
-    }
-
-    const originalRegistry = ServerGameAPI._entityRegistry;
-    const originalCvars = ServerGameAPI._cvars;
-
-    try {
-      ServerGameAPI._cvars = createStaticCvars();
-      ServerGameAPI._entityRegistry = {
-        has(classname) {
-          return classname === DeferredInitEntity.classname;
-        },
-        get(classname) {
-          return classname === DeferredInitEntity.classname ? DeferredInitEntity : null;
-        },
-      };
-
-      const gameAPI = Object.create(ServerGameAPI.prototype);
-      gameAPI.constructor = ServerGameAPI;
-      gameAPI.engine = {
-        ConsoleWarning() {},
-        IsLoading() {
-          return false;
-        },
-      };
-      gameAPI._missingEntityClassStats = {};
-      gameAPI._isPreparingEntityAllowed = () => true;
-
-      const edict = { entity: null };
-
-      const prepared = gameAPI.prepareEntity(edict, DeferredInitEntity.classname, {
-        initializerReady: 7,
-      });
-
-      assert.equal(prepared, true);
-      assert.equal(edict.entity.precacheObservedValue, 7);
-      assert.equal(edict.entity.constructorValue, 0);
-    } finally {
-      ServerGameAPI._entityRegistry = originalRegistry;
-      ServerGameAPI._cvars = originalCvars;
-    }
-  });
-});
diff --git a/test/game/id1-game-stats.test.mjs b/test/game/id1-game-stats.test.mjs
deleted file mode 100644
index 0ac3adf1..00000000
--- a/test/game/id1-game-stats.test.mjs
+++ /dev/null
@@ -1,144 +0,0 @@
-import assert from 'node:assert/strict';
-import { describe, test } from 'node:test';
-
-const { clientEvent } = await import('../../source/game/id1/Defs.ts');
-const gameStatsModule = await import('../../source/game/id1/helper/GameStats.ts');
-
-const GameStats = gameStatsModule.default;
-const { gameStatSlots } = gameStatsModule;
-
-/**
- * Create an event bus with subscribe/publish support for stats tests.
- * @returns {object} Mock event bus.
- */
-function createEventBus() {
-  const listeners = new Map();
-
-  return {
-    subscribe(eventName, handler) {
-      const handlers = listeners.get(eventName) ?? [];
-      handlers.push(handler);
-      listeners.set(eventName, handlers);
-
-      return () => {
-        const currentHandlers = listeners.get(eventName) ?? [];
-        listeners.set(eventName, currentHandlers.filter((currentHandler) => currentHandler !== handler));
-      };
-    },
-
-    publish(eventName, ...args) {
-      for (const handler of listeners.get(eventName) ?? []) {
-        handler(...args);
-      }
-    },
-  };
-}
-
-/**
- * Create the minimal engine API surface used by GameStats.
- * @returns {object} Mock engine API.
- */
-function createEngineAPI() {
-  const eventBus = createEventBus();
-  const broadcasts = [];
-  const dispatches = [];
-
-  return {
-    eventBus,
-    broadcasts,
-    dispatches,
-    BroadcastClientEvent(...args) {
-      broadcasts.push(args);
-    },
-    DispatchClientEvent(...args) {
-      dispatches.push(args);
-    },
-  };
-}
-
-/**
- * Create a mock entity wrapper with an edict number.
- * @param {number} edictNum Edict slot number.
- * @returns {object} Mock entity.
- */
-function createEntity(edictNum) {
-  return {
-    edict: { num: edictNum },
-  };
-}
-
-void describe('GameStats', () => {
-  void test('tracks decorated stat fields for serialization', () => {
-    const engineAPI = createEngineAPI();
-    const stats = new GameStats({}, engineAPI);
-
-    assert.ok(Array.isArray(GameStats.serializableFields));
-    assert.ok(Object.isFrozen(GameStats.serializableFields));
-    assert.deepEqual(GameStats.serializableFields, [...gameStatSlots]);
-    assert.deepEqual(stats._serializer.serialize(), {
-      monsters_killed: ['P', 0],
-      monsters_total: ['P', 0],
-      secrets_found: ['P', 0],
-      secrets_total: ['P', 0],
-    });
-  });
-
-  void test('subscribes to gameplay events and broadcasts stat updates', () => {
-    const engineAPI = createEngineAPI();
-    const stats = new GameStats({}, engineAPI);
-    const secretFinder = createEntity(17);
-    const attacker = createEntity(42);
-
-    stats.subscribeToEvents();
-
-    engineAPI.eventBus.publish('game.secret.spawned');
-    engineAPI.eventBus.publish('game.monster.spawned');
-    engineAPI.eventBus.publish('game.secret.found', createEntity(8), secretFinder);
-    engineAPI.eventBus.publish('game.monster.killed', createEntity(9), attacker);
-
-    assert.equal(stats.secrets_total, 1);
-    assert.equal(stats.monsters_total, 1);
-    assert.equal(stats.secrets_found, 1);
-    assert.equal(stats.monsters_killed, 1);
-    assert.deepEqual(engineAPI.broadcasts, [
-      [true, clientEvent.STATS_UPDATED, 'secrets_found', 1, secretFinder.edict],
-      [true, clientEvent.STATS_UPDATED, 'monsters_killed', 1, attacker.edict],
-    ]);
-  });
-
-  void test('sends every stat slot to a player in slot order', () => {
-    const engineAPI = createEngineAPI();
-    const stats = new GameStats({}, engineAPI);
-    const playerEntity = createEntity(7);
-
-    stats.monsters_total = 10;
-    stats.monsters_killed = 4;
-    stats.secrets_total = 3;
-    stats.secrets_found = 2;
-
-    stats.sendToPlayer(playerEntity);
-
-    assert.deepEqual(engineAPI.dispatches, [
-      [playerEntity.edict, true, clientEvent.STATS_INIT, 'monsters_total', 10],
-      [playerEntity.edict, true, clientEvent.STATS_INIT, 'monsters_killed', 4],
-      [playerEntity.edict, true, clientEvent.STATS_INIT, 'secrets_total', 3],
-      [playerEntity.edict, true, clientEvent.STATS_INIT, 'secrets_found', 2],
-    ]);
-  });
-
-  void test('reset clears all stat counters', () => {
-    const engineAPI = createEngineAPI();
-    const stats = new GameStats({}, engineAPI);
-
-    stats.monsters_total = 8;
-    stats.monsters_killed = 5;
-    stats.secrets_total = 4;
-    stats.secrets_found = 1;
-
-    stats.reset();
-
-    for (const statSlot of gameStatSlots) {
-      assert.equal(stats[statSlot], 0);
-    }
-  });
-});
diff --git a/test/game/id1-items.test.mjs b/test/game/id1-items.test.mjs
deleted file mode 100644
index 8da76f85..00000000
--- a/test/game/id1-items.test.mjs
+++ /dev/null
@@ -1,188 +0,0 @@
-import assert from 'node:assert/strict';
-import { describe, test } from 'node:test';
-
-import { channel, items, solid, tentType, worldType } from '../../source/game/id1/Defs.ts';
-
-await import('../../source/game/id1/GameAPI.ts');
-
-const { default: BaseEntity } = await import('../../source/game/id1/entity/BaseEntity.ts');
-const {
-  BackpackEntity,
-  HealthItemEntity,
-  ItemShellsEntity,
-  SilverKeyEntity,
-} = await import('../../source/game/id1/entity/Items.ts');
-
-/**
- * Create the minimal game API surface required by the item tests.
- * @param {object} overrides Optional engine/game overrides.
- * @returns {object} Mock game API.
- */
-function createMockGameAPI(overrides = {}) {
-  const engine = {
-    DispatchTempEntityEvent() {},
-    FindAllByFieldAndValue() {
-      return [];
-    },
-    IsLoading() {
-      return false;
-    },
-    PrecacheModel() {},
-    PrecacheSound() {},
-    SpawnEntity() {
-      return null;
-    },
-    StartSound() {},
-    ...overrides.engine,
-  };
-
-  return {
-    time: 0,
-    deathmatch: 0,
-    coop: 0,
-    serverflags: 0,
-    engine,
-    worldspawn: overrides.worldspawn ?? {
-      worldtype: worldType.MEDIEVAL,
-      findNextEntityByFieldAndValue() {
-        return null;
-      },
-    },
-    ...overrides,
-  };
-}
-
-void describe('Items', () => {
-  void test('serializes shared pickup fields and backpack timeout fields', () => {
-    const backpack = new BackpackEntity(null, createMockGameAPI()).initializeEntity();
-    const serialized = backpack._serializer.serialize();
-
-    for (const field of [
-      'ammo_shells',
-      'ammo_nails',
-      'ammo_rockets',
-      'ammo_cells',
-      'items',
-      'weapon',
-      'regeneration_time',
-      '_model_original',
-      'noise',
-      'netname',
-      'remove_after',
-    ]) {
-      assert.ok(field in serialized, `missing serialized field "${field}"`);
-    }
-  });
-
-  void test('hides picked items in deathmatch and restores them on regeneration', () => {
-    const gameAPI = createMockGameAPI({ deathmatch: 1, time: 12 });
-    const activator = new BaseEntity(null, gameAPI).initializeEntity();
-    const backpack = new BackpackEntity(null, gameAPI).initializeEntity();
-    const scheduled = [];
-    const sounds = [];
-    const tempEvents = [];
-
-    backpack.model = 'progs/backpack.mdl';
-    backpack.regeneration_time = 30;
-    backpack._scheduleThink = (time, callback, identifier) => {
-      scheduled.push({ time, callback, identifier });
-    };
-    backpack.setOrigin = () => {};
-    backpack.startSound = (soundChannel, sfxName) => {
-      sounds.push({ soundChannel, sfxName });
-    };
-    backpack.engine.DispatchTempEntityEvent = (eventType, origin) => {
-      tempEvents.push({ eventType, origin: origin.copy() });
-    };
-
-    backpack._afterTouch(activator);
-
-    assert.equal(backpack.solid, solid.SOLID_NOT);
-    assert.equal(backpack.model, null);
-    assert.equal(backpack._model_original, 'progs/backpack.mdl');
-    assert.equal(scheduled.length, 1);
-    assert.equal(scheduled[0].time, 42);
-
-    scheduled[0].callback.call(backpack, backpack);
-
-    assert.equal(backpack.model, 'progs/backpack.mdl');
-    assert.equal(backpack.solid, solid.SOLID_TRIGGER);
-    assert.deepEqual(sounds, [{ soundChannel: channel.CHAN_VOICE, sfxName: 'items/itembk2.wav' }]);
-    assert.equal(tempEvents.length, 1);
-    assert.equal(tempEvents[0].eventType, tentType.TE_TELEPORT);
-  });
-
-  void test('prefers the super shotgun when a shell pickup makes it usable', () => {
-    const shellBox = new ItemShellsEntity(null, createMockGameAPI()).initializeEntity();
-    let appliedBackpack = false;
-
-    shellBox.ammo_shells = 20;
-    shellBox.weapon = items.IT_SHOTGUN;
-
-    const player = {
-      items: items.IT_SUPER_SHOTGUN,
-      ammo_shells: 0,
-      applyBackpack(entity) {
-        appliedBackpack = entity === shellBox;
-        return true;
-      },
-    };
-
-    assert.equal(shellBox._pickup(player), true);
-    assert.equal(shellBox.weapon, items.IT_SUPER_SHOTGUN);
-    assert.equal(appliedBackpack, true);
-  });
-
-  void test('falls back to medieval key assets for unknown world types', () => {
-    const key = new SilverKeyEntity(null, createMockGameAPI({
-      worldspawn: { worldtype: 99 },
-    })).initializeEntity();
-
-    key._setInfo();
-
-    assert.equal(key.noise, 'misc/medkey.wav');
-    assert.equal(key.netname, 'silver key');
-    assert.equal(key.model, 'progs/w_s_key.mdl');
-  });
-
-  void test('chips megahealth back to max and clears the superhealth flag', () => {
-    const gameAPI = createMockGameAPI({ time: 5 });
-    const megaHealth = new HealthItemEntity(null, gameAPI).initializeEntity();
-    const scheduled = [];
-    let removed = false;
-
-    megaHealth.spawnflags = HealthItemEntity.H_MEGA;
-    megaHealth.model = 'maps/b_bh100.bsp';
-    megaHealth._scheduleThink = (time, callback, identifier) => {
-      scheduled.push({ time, callback, identifier });
-    };
-    megaHealth.remove = () => {
-      removed = true;
-    };
-
-    const player = {
-      health: 101,
-      max_health: 100,
-      items: items.IT_SUPERHEALTH,
-    };
-
-    megaHealth._afterTouch(player);
-
-    assert.equal(megaHealth.owner, player);
-    assert.equal(megaHealth.model, null);
-    assert.equal(scheduled.length, 1);
-    assert.equal(scheduled[0].time, 10);
-
-    scheduled.length = 0;
-    megaHealth._takeHealth();
-    assert.equal(player.health, 100);
-    assert.equal(scheduled.length, 1);
-    assert.equal(scheduled[0].time, 6);
-
-    scheduled.length = 0;
-    megaHealth._takeHealth();
-    assert.equal(player.items & items.IT_SUPERHEALTH, 0);
-    assert.equal(megaHealth.owner, null);
-    assert.equal(removed, true);
-  });
-});
diff --git a/test/game/id1-knights.test.mjs b/test/game/id1-knights.test.mjs
deleted file mode 100644
index 3966b5cb..00000000
--- a/test/game/id1-knights.test.mjs
+++ /dev/null
@@ -1,235 +0,0 @@
-import { describe, test } from 'node:test';
-import assert from 'node:assert/strict';
-
-import Vector from '../../source/shared/Vector.ts';
-
-await import('../../source/game/id1/GameAPI.ts');
-
-const { channel, tentType } = await import('../../source/game/id1/Defs.ts');
-const { HellKnightMonster, KnightMonster, KnightSpike } = await import('../../source/game/id1/entity/monster/Knights.ts');
-
-KnightMonster._initStates();
-HellKnightMonster._initStates();
-
-function createMonsterFixture(MonsterClass, gameOverrides = {}) {
-  const soundCalls = [];
-  const spawnRequests = [];
-  const edict = { entity: null };
-  const engine = {
-    IsLoading() {
-      return false;
-    },
-    ParseQC() {
-      return null;
-    },
-    PrecacheSound() {
-    },
-    PrecacheModel() {
-    },
-    SpawnEntity(classname, initialData = {}) {
-      spawnRequests.push({ classname, initialData });
-      return { entity: null };
-    },
-    DispatchTempEntityEvent() {
-    },
-    FindByFieldAndValue() {
-      return null;
-    },
-    FindAllByFieldAndValue() {
-      return [];
-    },
-    eventBus: {
-      publish() {
-      },
-    },
-  };
-  const gameAPI = {
-    engine,
-    time: 10,
-    skill: 1,
-    deathmatch: 0,
-    nomonsters: 0,
-    gravity: 800,
-    hasFeature() {
-      return false;
-    },
-    ...gameOverrides,
-  };
-
-  const entity = new MonsterClass(edict, gameAPI).initializeEntity();
-  edict.entity = entity;
-  entity.origin = new Vector();
-  entity.view_ofs = new Vector();
-  entity.movedir = new Vector();
-  entity.startSound = (...args) => {
-    soundCalls.push(args);
-  };
-
-  return { entity, gameAPI, soundCalls, spawnRequests };
-}
-
-function assertVectorNear(actual, expected, epsilon = 1e-6) {
-  for (let i = 0; i < 3; i++) {
-    assert.ok(Math.abs(actual[i] - expected[i]) <= epsilon, `component ${i} mismatch: ${actual[i]} !== ${expected[i]}`);
-  }
-}
-
-void describe('KnightMonster metadata', () => {
-  void test('class metadata matches the original monster', () => {
-    assert.equal(KnightMonster.classname, 'monster_knight');
-    assert.equal(KnightMonster._health, 75);
-    assert.equal(KnightMonster._modelDefault, 'progs/knight.mdl');
-    assert.equal(KnightMonster._modelHead, 'progs/h_knight.mdl');
-  });
-
-  void test('size vectors are correct', () => {
-    const [mins, maxs] = KnightMonster._size;
-    assert.deepEqual([mins[0], mins[1], mins[2]], [-16, -16, -24]);
-    assert.deepEqual([maxs[0], maxs[1], maxs[2]], [16, 16, 40]);
-  });
-});
-
-void describe('KnightMonster state machine', () => {
-  void test('core movement sequences loop', () => {
-    const states = KnightMonster._states;
-    assert.equal(states.knight_stand9.nextState, 'knight_stand1');
-    assert.equal(states.knight_walk14.nextState, 'knight_walk1');
-    assert.equal(states.knight_run8.nextState, 'knight_run1');
-  });
-
-  void test('combat and death chains return or terminate correctly', () => {
-    const states = KnightMonster._states;
-    assert.equal(states.knight_runatk11.nextState, 'knight_run1');
-    assert.equal(states.knight_atk10.nextState, 'knight_run1');
-    assert.equal(states.knight_pain3.nextState, 'knight_run1');
-    assert.equal(states.knight_painb11.nextState, 'knight_run1');
-    assert.equal(states.knight_die10.nextState, null);
-    assert.equal(states.knight_dieb11.nextState, null);
-  });
-
-  void test('bow states keep the kneel loop and return to walking', () => {
-    const states = KnightMonster._states;
-    assert.equal(states.knight_bow5.nextState, 'knight_bow5');
-    assert.equal(states.knight_bow10.nextState, 'knight_walk1');
-  });
-
-  void test('sequence-generated handlers remain present on knight states', () => {
-    const states = KnightMonster._states;
-    assert.equal(typeof states.knight_runatk2.handler, 'function');
-    assert.equal(typeof states.knight_bow1.handler, 'function');
-    assert.equal(typeof states.knight_die1.handler, 'function');
-    assert.equal(typeof states.knight_pain2.handler, 'function');
-  });
-
-  void test('thinkMelee keeps the legacy distance split between melee and run attack', () => {
-    const { entity } = createMonsterFixture(KnightMonster);
-    const runStates = [];
-
-    entity._runState = (state) => {
-      runStates.push(state);
-      return true;
-    };
-
-    entity.enemy = {
-      origin: new Vector(60, 0, 0),
-      view_ofs: new Vector(),
-    };
-    entity.thinkMelee();
-
-    entity.enemy = {
-      origin: new Vector(120, 0, 0),
-      view_ofs: new Vector(),
-    };
-    entity.thinkMelee();
-
-    entity.enemy = null;
-    entity.thinkMelee();
-
-    assert.deepEqual(runStates, ['knight_atk1', 'knight_runatk1', 'knight_atk1']);
-  });
-});
-
-void describe('KnightSpike metadata', () => {
-  void test('projectile metadata matches the original spike', () => {
-    assert.equal(KnightSpike.classname, 'knightspike');
-    assert.equal(KnightSpike._damage, 9);
-    assert.equal(KnightSpike._tentType, tentType.TE_SPIKE);
-    assert.equal(KnightSpike._model, 'progs/k_spike.mdl');
-  });
-});
-
-void describe('HellKnightMonster metadata', () => {
-  void test('class metadata matches the original monster', () => {
-    assert.equal(HellKnightMonster.classname, 'monster_hell_knight');
-    assert.equal(HellKnightMonster._health, 250);
-    assert.equal(HellKnightMonster._modelDefault, 'progs/hknight.mdl');
-    assert.equal(HellKnightMonster._modelHead, 'progs/h_hellkn.mdl');
-  });
-});
-
-void describe('HellKnightMonster state machine', () => {
-  void test('core movement sequences loop', () => {
-    const states = HellKnightMonster._states;
-    assert.equal(states.hknight_stand9.nextState, 'hknight_stand1');
-    assert.equal(states.hknight_walk20.nextState, 'hknight_walk1');
-    assert.equal(states.hknight_run8.nextState, 'hknight_run1');
-  });
-
-  void test('missile and charge chains return as expected', () => {
-    const states = HellKnightMonster._states;
-    assert.equal(states.hknight_magica14.nextState, 'hknight_run1');
-    assert.equal(states.hknight_magicb13.nextState, 'hknight_run1');
-    assert.equal(states.hknight_magicc11.nextState, 'hknight_run1');
-    assert.equal(states.hknight_char_a16.nextState, 'hknight_run1');
-    assert.equal(states.hknight_char_b6.nextState, 'hknight_char_b1');
-    assert.equal(states.hknight_slice10.nextState, 'hknight_run1');
-    assert.equal(states.hknight_smash11.nextState, 'hknight_run1');
-    assert.equal(states.hknight_watk22.nextState, 'hknight_run1');
-  });
-
-  void test('death chains terminate correctly', () => {
-    const states = HellKnightMonster._states;
-    assert.equal(states.hknight_die12.nextState, null);
-    assert.equal(states.hknight_dieb9.nextState, null);
-  });
-
-  void test('sequence-generated handlers remain present on hell knight states', () => {
-    const states = HellKnightMonster._states;
-    assert.equal(typeof states.hknight_run1.handler, 'function');
-    assert.equal(typeof states.hknight_char_b1.handler, 'function');
-    assert.equal(typeof states.hknight_pain2.handler, 'function');
-    assert.equal(typeof states.hknight_dieb1.handler, 'function');
-  });
-
-  void test('attackShot preserves the projectile spawn contract and aimed movedir', () => {
-    const { entity, soundCalls, spawnRequests } = createMonsterFixture(HellKnightMonster);
-    const originalRandom = Math.random;
-
-    entity.origin = new Vector(5, -10, 20);
-    entity.enemy = {
-      origin: new Vector(45, 10, 20),
-    };
-
-    Math.random = () => 0.5;
-
-    try {
-      entity.attackShot(2);
-    } finally {
-      Math.random = originalRandom;
-    }
-
-    const offsetAngles = entity.enemy.origin.copy().subtract(entity.origin).toAngles();
-    offsetAngles[1] += 12;
-    const { forward } = offsetAngles.angleVectors();
-    forward.normalize();
-    forward[2] = -forward[2];
-
-    assert.equal(spawnRequests.length, 1);
-    assert.equal(spawnRequests[0].classname, KnightSpike.classname);
-    assert.equal(spawnRequests[0].initialData.speed, 300);
-    assert.equal(spawnRequests[0].initialData.owner, entity);
-    assert.equal(soundCalls.length, 1);
-    assert.deepEqual(soundCalls[0].slice(0, 2), [channel.CHAN_WEAPON, 'hknight/attack1.wav']);
-    assertVectorNear(entity.movedir, forward);
-  });
-});
diff --git a/test/game/id1-misc.test.mjs b/test/game/id1-misc.test.mjs
deleted file mode 100644
index 8e24d3b6..00000000
--- a/test/game/id1-misc.test.mjs
+++ /dev/null
@@ -1,154 +0,0 @@
-import assert from 'node:assert/strict';
-import { describe, test } from 'node:test';
-
-await import('../../source/game/id1/GameAPI.ts');
-
-const { default: BaseEntity } = await import('../../source/game/id1/entity/BaseEntity.ts');
-const { default: BaseMonster } = await import('../../source/game/id1/entity/monster/BaseMonster.ts');
-const {
-  BubbleSpawnerEntity,
-  IntermissionCameraEntity,
-  LightEntity,
-  PathCornerEntity,
-} = await import('../../source/game/id1/entity/Misc.ts');
-
-/**
- * Create a minimal mock game API for Misc entity tests.
- * @param {object} overrides Optional engine and game overrides.
- * @returns {object} Mock game API object.
- */
-function createMockGameAPI(overrides = {}) {
-  const engine = {
-    Lightstyle() {},
-    SpawnEntity() {
-      return null;
-    },
-    PrecacheModel() {},
-    PrecacheSound() {},
-    SpawnAmbientSound() {},
-    StartSound() {},
-    DispatchTempEntityEvent() {},
-    DeterminePointContents() {
-      return 0;
-    },
-    eventBus: {
-      publish() {},
-    },
-    ...overrides.engine,
-  };
-
-  return {
-    time: 0,
-    engine,
-    deathmatch: 0,
-    nomonsters: 0,
-    serverflags: 0,
-    worldspawn: overrides.worldspawn ?? null,
-    ...overrides,
-  };
-}
-
-class TestEntity extends BaseEntity {
-  static classname = 'test_misc_entity';
-
-  removed = false;
-
-  remove() {
-    this.removed = true;
-  }
-}
-
-class TestMonster extends BaseMonster {
-  static classname = 'test_misc_monster';
-
-  reachedCorner = null;
-
-  moveTargetReached(pathCornerEntity) {
-    this.reachedCorner = pathCornerEntity;
-  }
-
-  spawn() {}
-}
-
-void describe('Misc entity port', () => {
-  void test('IntermissionCameraEntity uses decorated defaults', () => {
-    const entity = new IntermissionCameraEntity(null, createMockGameAPI()).initializeEntity();
-
-    assert.ok(IntermissionCameraEntity.serializableFields.includes('mangle'));
-    assert.ok(entity.mangle.equalsTo(0, 0, 0));
-  });
-
-  void test('LightEntity removes inert lights and toggles targeted styles', () => {
-    const styles = [];
-    const inert = new LightEntity(null, createMockGameAPI()).initializeEntity();
-    let removed = false;
-    inert.remove = () => {
-      removed = true;
-    };
-    inert.spawn();
-    assert.equal(removed, true);
-
-    const active = new LightEntity(null, createMockGameAPI({
-      engine: {
-        Lightstyle(style, value) {
-          styles.push({ style, value });
-        },
-      },
-    })).initializeEntity();
-    active.targetname = 'target_light';
-    active.style = 35;
-    active.spawnflags = LightEntity.START_OFF;
-
-    active.spawn();
-    active.use(active);
-
-    assert.deepEqual(styles, [
-      { style: 35, value: 'a' },
-      { style: 35, value: 'm' },
-    ]);
-  });
-
-  void test('PathCornerEntity only advances idle monsters at their current movetarget', () => {
-    const corner = new PathCornerEntity(null, createMockGameAPI()).initializeEntity();
-    const otherCorner = new PathCornerEntity(null, createMockGameAPI()).initializeEntity();
-    const monster = new TestMonster(null, createMockGameAPI()).initializeEntity();
-    corner.equals = (otherEntity) => otherEntity === corner;
-
-    monster.movetarget = otherCorner;
-    corner.touch(monster);
-    assert.equal(monster.reachedCorner, null);
-
-    monster.movetarget = corner;
-    monster.enemy = new TestEntity(null, createMockGameAPI()).initializeEntity();
-    corner.touch(monster);
-    assert.equal(monster.reachedCorner, null);
-
-    monster.enemy = null;
-    corner.touch(monster);
-    assert.equal(monster.reachedCorner, corner);
-  });
-
-  void test('BubbleSpawnerEntity.bubble spawns a positioned helper spawner', () => {
-    const spawnCalls = [];
-    const spawner = new BubbleSpawnerEntity(null, createMockGameAPI()).initializeEntity();
-    const originator = new TestEntity(null, createMockGameAPI({
-      engine: {
-        SpawnEntity(classname, initialData) {
-          spawnCalls.push({ classname, initialData });
-          return { entity: spawner };
-        },
-      },
-    })).initializeEntity();
-    originator.origin.setTo(100, 200, 300);
-    originator.view_ofs.setTo(1, 2, 3);
-
-    const result = BubbleSpawnerEntity.bubble(originator, 6);
-
-    assert.equal(result, spawner);
-    assert.equal(spawnCalls.length, 1);
-    assert.equal(spawnCalls[0].classname, BubbleSpawnerEntity.classname);
-    assert.ok(spawnCalls[0].initialData.origin.equalsTo(101, 202, 303));
-    assert.equal(spawnCalls[0].initialData.bubble_count, 6);
-    assert.equal(spawnCalls[0].initialData.spread, 5);
-  });
-});
diff --git a/test/game/id1-ogre.test.mjs b/test/game/id1-ogre.test.mjs
deleted file mode 100644
index 6f8b5d3c..00000000
--- a/test/game/id1-ogre.test.mjs
+++ /dev/null
@@ -1,72 +0,0 @@
-import { describe, test } from 'node:test';
-import assert from 'node:assert/strict';
-
-await import('../../source/game/id1/GameAPI.ts');
-
-const { default: OgreMonsterEntity } = await import('../../source/game/id1/entity/monster/Ogre.ts');
-
-OgreMonsterEntity._initStates();
-
-void describe('OgreMonsterEntity metadata', () => {
-  void test('class metadata matches the original monster', () => {
-    assert.equal(OgreMonsterEntity.classname, 'monster_ogre');
-    assert.equal(OgreMonsterEntity._health, 200);
-    assert.equal(OgreMonsterEntity._modelDefault, 'progs/ogre.mdl');
-    assert.equal(OgreMonsterEntity._modelHead, 'progs/h_ogre.mdl');
-  });
-
-  void test('size vectors are correct', () => {
-    const [mins, maxs] = OgreMonsterEntity._size;
-    assert.deepEqual([mins[0], mins[1], mins[2]], [-32, -32, -24]);
-    assert.deepEqual([maxs[0], maxs[1], maxs[2]], [32, 32, 64]);
-  });
-
-  void test('serializableFields is a frozen empty array', () => {
-    const { serializableFields } = /** @type {{ serializableFields: unknown }} */ (/** @type {unknown} */ (OgreMonsterEntity));
-    assert.ok(Array.isArray(serializableFields));
-    assert.ok(Object.isFrozen(serializableFields));
-    assert.deepEqual(serializableFields, []);
-  });
-});
-
-void describe('OgreMonsterEntity state machine', () => {
-  void test('core movement sequences loop', () => {
-    const states = OgreMonsterEntity['_states'];
-    assert.equal(states.ogre_stand9.nextState, 'ogre_stand1');
-    assert.equal(states.ogre_walk16.nextState, 'ogre_walk1');
-    assert.equal(states.ogre_run8.nextState, 'ogre_run1');
-  });
-
-  void test('melee and missile attacks return to the run loop', () => {
-    const states = OgreMonsterEntity['_states'];
-    assert.equal(states.ogre_swing14.nextState, 'ogre_run1');
-    assert.equal(states.ogre_smash14.nextState, 'ogre_run1');
-    assert.equal(states.ogre_nail7.nextState, 'ogre_run1');
-  });
-
-  void test('pain variants return to the run loop', () => {
-    const states = OgreMonsterEntity['_states'];
-    assert.equal(states.ogre_pain5.nextState, 'ogre_run1');
-    assert.equal(states.ogre_pain1b3.nextState, 'ogre_run1');
-    assert.equal(states.ogre_pain1c6.nextState, 'ogre_run1');
-    assert.equal(states.ogre_pain1d16.nextState, 'ogre_run1');
-    assert.equal(states.ogre_pain1e15.nextState, 'ogre_run1');
-  });
-
-  void test('death chains terminate correctly', () => {
-    const states = OgreMonsterEntity['_states'];
-    assert.equal(states.ogre_die14.nextState, null);
-    assert.equal(states.ogre_bdie10.nextState, null);
-  });
-
-  void test('sequence handlers remain present on active states', () => {
-    const states = OgreMonsterEntity['_states'];
-    assert.equal(typeof states.ogre_stand5.handler, 'function');
-    assert.equal(typeof states.ogre_walk6.handler, 'function');
-    assert.equal(typeof states.ogre_run1.handler, 'function');
-    assert.equal(typeof states.ogre_swing5.handler, 'function');
-    assert.equal(typeof states.ogre_smash12.handler, 'function');
-    assert.equal(typeof states.ogre_nail4.handler, 'function');
-    assert.equal(typeof states.ogre_bdie2.handler, 'function');
-  });
-});
diff --git a/test/game/id1-oldone.test.mjs b/test/game/id1-oldone.test.mjs
deleted file mode 100644
index af1ab10d..00000000
--- a/test/game/id1-oldone.test.mjs
+++ /dev/null
@@ -1,224 +0,0 @@
-import { describe, test } from 'node:test';
-import assert from 'node:assert/strict';
-
-import Vector from '../../source/shared/Vector.ts';
-import { damage, moveType, solid } from '../../source/game/id1/Defs.ts';
-
-await import('../../source/game/id1/GameAPI.ts');
-
-const { default: OldOneMonster } = await import('../../source/game/id1/entity/monster/OldOne.ts');
-
-OldOneMonster._initStates();
-
-/**
- * Create a minimal OldOne fixture for focused behavior tests.
- * @param {typeof OldOneMonster} MonsterClass Monster constructor under test.
- * @param {object} [gameOverrides] Optional game API overrides.
- * @returns {OldOneMonster} Monster fixture instance.
- */
-function createMonsterFixture(MonsterClass, gameOverrides = {}) {
-  const edict = {
-    num: 1,
-    entity: null,
-    freeEdict() {},
-    setOrigin() {},
-    setModel() {},
-    setMinMaxSize() {},
-    walkMove() {
-      return false;
-    },
-    changeYaw() {
-      return 0;
-    },
-    dropToFloor() {
-      return true;
-    },
-    isOnTheFloor() {
-      return false;
-    },
-    makeStatic() {},
-    aim() {
-      return null;
-    },
-    moveToGoal() {
-      return false;
-    },
-    isInPXS() {
-      return true;
-    },
-    getNextBestClient() {
-      return null;
-    },
-  };
-
-  const engine = {
-    IsLoading() {
-      return false;
-    },
-    PrecacheModel() {},
-    PrecacheSound() {},
-    ParseQC() {
-      return null;
-    },
-    StartSound() {},
-    SpawnEntity() {
-      return { entity: null };
-    },
-    FindByFieldAndValue() {
-      return null;
-    },
-    FindAllByFieldAndValue() {
-      return [];
-    },
-    DispatchTempEntityEvent() {},
-    Lightstyle() {},
-    PlayTrack() {},
-    eventBus: {
-      publish() {},
-    },
-  };
-
-  const gameAPI = {
-    engine,
-    time: 10,
-    deathmatch: 0,
-    nomonsters: 0,
-    intermission_running: 0,
-    intermission_exittime: 0,
-    ...gameOverrides,
-  };
-
-  const entity = new MonsterClass(edict, gameAPI).initializeEntity();
-  edict.entity = entity;
-  entity.origin = new Vector(10, 20, 30);
-  entity.angles = new Vector();
-
-  return entity;
-}
-
-void describe('OldOneMonster metadata', () => {
-  void test('class metadata matches the original monster', () => {
-    assert.equal(OldOneMonster.classname, 'monster_oldone');
-    assert.equal(OldOneMonster._modelDefault, 'progs/oldone.mdl');
-    assert.ok(Array.isArray(OldOneMonster.serializableFields));
-    assert.ok(Object.isFrozen(OldOneMonster.serializableFields));
-  });
-
-  void test('thrash light levels preserve the QuakeC sequence', () => {
-    assert.deepEqual(OldOneMonster._thrashLightLevels, ['m', 'k', 'k', 'i', 'g', 'e', 'c', 'a', 'c', 'e', 'g', 'i', 'k', 'm', 'm', 'g', 'c', 'b', 'a', 'a']);
-  });
-});
-
-void describe('OldOneMonster state machine', () => {
-  void test('idle sequence keeps all 46 frames and loops', () => {
-    const states = OldOneMonster._states;
-
-    for (let i = 1; i <= 46; i++) {
-      assert.equal(states[`old_idle${i}`].keyframe, `old${i}`);
-    }
-    assert.equal(states.old_idle46.nextState, 'old_idle1');
-  });
-
-  void test('thrash sequence keeps the duplicate shake12 frame and terminal loop', () => {
-    const states = OldOneMonster._states;
-
-    for (let i = 1; i <= 11; i++) {
-      assert.equal(states[`old_thrash${i}`].keyframe, `shake${i}`);
-    }
-    assert.equal(states.old_thrash12.keyframe, 'shake12');
-    assert.equal(states.old_thrash13.keyframe, 'shake13');
-    assert.equal(states.old_thrash20.keyframe, 'shake20');
-    assert.equal(states.old_thrash20.nextState, 'old_thrash20');
-  });
-});
-
-void describe('OldOneMonster QC fixes', () => {
-  void test('pain resets health so only the telefrag finale can kill the boss', () => {
-    const oldOne = createMonsterFixture(OldOneMonster);
-
-    oldOne.health = 1;
-    oldOne.thinkPain();
-
-    assert.equal(oldOne.health, 40000);
-  });
-
-  void test('thrash15 restarts the cycle until the third pass', () => {
-    const oldOne = createMonsterFixture(OldOneMonster);
-    const lightStyles = [];
-    let stateName = null;
-
-    oldOne.engine.Lightstyle = (_style, level) => {
-      lightStyles.push(level);
-    };
-    oldOne._runState = (nextState) => {
-      stateName = nextState;
-      return true;
-    };
-
-    oldOne._thrash15Callback();
-    assert.equal(oldOne.cnt, 1);
-    assert.deepEqual(lightStyles, ['m']);
-    assert.equal(stateName, 'old_thrash1');
-
-    stateName = null;
-    oldOne.cnt = 2;
-    oldOne._thrash15Callback();
-    assert.equal(oldOne.cnt, 3);
-    assert.equal(stateName, null);
-  });
-
-  void test('spawn sets the classic boss bounds and telefrag-only health', () => {
-    const oldOne = createMonsterFixture(OldOneMonster);
-    let stateName = null;
-    let published = null;
-
-    oldOne._runState = (nextState) => {
-      stateName = nextState;
-      return true;
-    };
-    oldOne.engine.eventBus.publish = (eventName, entity) => {
-      published = { eventName, entity };
-    };
-
-    oldOne.spawn();
-
-    assert.equal(oldOne.movetype, moveType.MOVETYPE_STEP);
-    assert.equal(oldOne.solid, solid.SOLID_SLIDEBOX);
-    assert.equal(oldOne.health, 40000);
-    assert.equal(oldOne.takedamage, damage.DAMAGE_YES);
-    assert.equal(stateName, 'old_idle1');
-    assert.deepEqual(published, { eventName: 'game.monster.spawned', entity: oldOne });
-  });
-
-  void test('finale4 tolerates a stand-in edict without an entity', () => {
-    const oldOne = createMonsterFixture(OldOneMonster);
-    let playTrack = null;
-    const lightStyles = [];
-    let removed = false;
-
-    oldOne.engine.SpawnEntity = (classname) => {
-      if (classname === 'misc_null') {
-        return { entity: null };
-      }
-
-      return { entity: null };
-    };
-    oldOne.engine.PlayTrack = (track) => {
-      playTrack = track;
-    };
-    oldOne.engine.Lightstyle = (_style, level) => {
-      lightStyles.push(level);
-    };
-    oldOne.remove = () => {
-      removed = true;
-    };
-
-    assert.doesNotThrow(() => {
-      oldOne._finale4();
-    });
-
-    assert.equal(playTrack, 3);
-    assert.deepEqual(lightStyles, ['m']);
-    assert.equal(removed, true);
-  });
-});
diff --git a/test/game/id1-platforms.test.mjs b/test/game/id1-platforms.test.mjs
deleted file mode 100644
index d2238f8a..00000000
--- a/test/game/id1-platforms.test.mjs
+++ /dev/null
@@ -1,287 +0,0 @@
-import { describe, test } from 'node:test';
-import assert from 'node:assert/strict';
-
-import Vector from '../../source/shared/Vector.ts';
-import { moveType, solid } from '../../source/game/id1/Defs.ts';
-
-await import('../../source/game/id1/GameAPI.ts');
-
-const { PathCornerEntity } = await import('../../source/game/id1/entity/Misc.ts');
-const { PlatformEntity, PlatformTriggerEntity, TrainEntity, TeleportTrainEntity } = await import('../../source/game/id1/entity/props/Platforms.ts');
-const { state } = await import('../../source/game/id1/entity/props/BasePropEntity.ts');
-
-/**
- * Create a minimal mover harness for platform-family entity tests.
- * @returns {{ edict: object, engine: object, gameAPI: object, precachedSounds: string[], precachedModels: string[], setModelCalls: string[], spawnRequests: Array<{ classname: string, initialData: object }>, scheduledThinks: Array<{ nextThink: number, callback: Function, identifier?: string | null }> }} Harness data.
- */
-function createMoverHarness() {
-  const precachedSounds = [];
-  const precachedModels = [];
-  const setModelCalls = [];
-  const spawnRequests = [];
-  const scheduledThinks = [];
-  let boundEntity = null;
-
-  const edict = {
-    num: 1,
-    entity: null,
-    freeEdict() {},
-    setOrigin(origin) {
-      boundEntity?.origin.set(origin);
-    },
-    setModel(model) {
-      setModelCalls.push(model);
-      if (boundEntity !== null) {
-        boundEntity.model = model;
-        boundEntity.modelindex = model ? 1 : 0;
-      }
-    },
-    setMinMaxSize(mins, maxs) {
-      if (boundEntity !== null) {
-        boundEntity.mins.set(mins);
-        boundEntity.maxs.set(maxs);
-        boundEntity.size = maxs.copy().subtract(mins);
-      }
-    },
-    walkMove() {
-      return false;
-    },
-    changeYaw() {
-      return 0;
-    },
-    dropToFloor() {
-      return true;
-    },
-    isOnTheFloor() {
-      return false;
-    },
-    makeStatic() {},
-    aim() {
-      return null;
-    },
-    moveToGoal() {
-      return false;
-    },
-    isInPXS() {
-      return true;
-    },
-    getNextBestClient() {
-      return null;
-    },
-  };
-
-  const engine = {
-    IsLoading() {
-      return false;
-    },
-    PrecacheModel(model) {
-      precachedModels.push(model);
-    },
-    PrecacheSound(sound) {
-      precachedSounds.push(sound);
-    },
-    StartSound() {},
-    SpawnAmbientSound() {},
-    SpawnEntity(classname, initialData = {}) {
-      spawnRequests.push({ classname, initialData });
-      return { entity: null };
-    },
-    FindByFieldAndValue() {
-      return null;
-    },
-    FindAllByFieldAndValue() {
-      return [];
-    },
-    ParseQC() {
-      return null;
-    },
-    Traceline() {
-      return null;
-    },
-    SetAreaPortalState() {},
-    GetCvar() {
-      return { value: 0 };
-    },
-  };
-
-  const gameAPI = {
-    engine,
-    time: 0,
-  };
-
-  return {
-    edict,
-    engine,
-    gameAPI,
-    precachedSounds,
-    precachedModels,
-    setModelCalls,
-    spawnRequests,
-    scheduledThinks,
-    bindEntity(entity) {
-      boundEntity = entity;
-      edict.entity = entity;
-      entity._scheduleThink = (nextThink, callback, identifier = null) => {
-        scheduledThinks.push({ nextThink, callback, identifier });
-      };
-    },
-  };
-}
-
-/**
- * Build a platform fixture for focused gameplay tests.
- * @returns {{ entity: InstanceType<typeof PlatformEntity>, edict: object, engine: object, gameAPI: object, precachedSounds: string[], precachedModels: string[], setModelCalls: string[], spawnRequests: Array<{ classname: string, initialData: object }>, scheduledThinks: Array<{ nextThink: number, callback: Function, identifier?: string | null }> }} Fixture data.
- */
-function createPlatformFixture() {
-  const harness = createMoverHarness();
-  const entity = new PlatformEntity(harness.edict, harness.gameAPI).initializeEntity().precacheEntity();
-  harness.bindEntity(entity);
-  return { entity, ...harness };
-}
-
-/**
- * Build a train-family fixture for focused gameplay tests.
- * @param {typeof TrainEntity | typeof TeleportTrainEntity} [EntityClass] Constructor under test.
- * @returns {{ entity: InstanceType<typeof TrainEntity>, edict: object, engine: object, gameAPI: object, precachedSounds: string[], precachedModels: string[], setModelCalls: string[], spawnRequests: Array<{ classname: string, initialData: object }>, scheduledThinks: Array<{ nextThink: number, callback: Function, identifier?: string | null }> }} Fixture data.
- */
-function createTrainFixture(EntityClass = TrainEntity) {
-  const harness = createMoverHarness();
-  const entity = new EntityClass(harness.edict, harness.gameAPI).initializeEntity().precacheEntity();
-  harness.bindEntity(entity);
-  return { entity, ...harness };
-}
-
-void describe('PlatformEntity', () => {
-  void test('spawn applies QC defaults, positions the plat, and spawns its trigger', () => {
-    const { entity, spawnRequests, setModelCalls, precachedSounds } = createPlatformFixture();
-
-    entity.origin = new Vector(10, 20, 30);
-    entity.model = 'progs/plat.bsp';
-    entity.mins = new Vector(-32, -32, 0);
-    entity.maxs = new Vector(32, 32, 64);
-    entity.size = new Vector(64, 64, 64);
-
-    entity.spawn();
-
-    assert.deepEqual(precachedSounds, ['plats/medplat1.wav', 'plats/medplat2.wav']);
-    assert.equal(entity.speed, 150);
-    assert.equal(entity.t_length, 80);
-    assert.equal(entity.t_width, 10);
-    assert.equal(entity.movetype, moveType.MOVETYPE_PUSH);
-    assert.equal(entity.solid, solid.SOLID_BSP);
-    assert.equal(entity.state, state.STATE_BOTTOM);
-    assert.equal(entity.noise, 'plats/medplat1.wav');
-    assert.equal(entity.noise1, 'plats/medplat2.wav');
-    assert.ok(entity.pos1.equalsTo(10, 20, 30));
-    assert.ok(entity.pos2.equalsTo(10, 20, -26));
-    assert.ok(entity.origin.equalsTo(10, 20, -26));
-    assert.deepEqual(setModelCalls, ['progs/plat.bsp']);
-    assert.deepEqual(spawnRequests, [{ classname: PlatformTriggerEntity.classname, initialData: { owner: entity } }]);
-  });
-
-  void test('targeted plats only honor the remote use once, matching QC plat_use', () => {
-    const { entity } = createPlatformFixture();
-    const calcMoveCalls = [];
-
-    entity.origin = new Vector();
-    entity.model = 'progs/plat_targeted.bsp';
-    entity.mins = new Vector(-16, -16, 0);
-    entity.maxs = new Vector(16, 16, 32);
-    entity.size = new Vector(32, 32, 32);
-    entity.targetname = 'remote_plat';
-    entity._sub = {
-      calcMove(target, speed, callback) {
-        calcMoveCalls.push({ target: target.copy(), speed, callback });
-      },
-      setMovedir() {},
-      useTargets() {},
-      reset() {},
-    };
-
-    entity.spawn();
-    entity.use(entity);
-    entity.state = state.STATE_UP;
-    entity.use(entity);
-
-    assert.equal(calcMoveCalls.length, 1);
-    assert.equal(entity.state, state.STATE_UP);
-  });
-});
-
-void describe('TrainEntity', () => {
-  void test('finds the first corner, updates target to the next corner, and only activates once when targeted', () => {
-    const { entity } = createTrainFixture();
-    const calcMoveCalls = [];
-    const firstCorner = Object.assign(Object.create(PathCornerEntity.prototype), {
-      origin: new Vector(100, 200, 300),
-      target: 'corner_2',
-      wait: 0,
-    });
-    const secondCorner = Object.assign(Object.create(PathCornerEntity.prototype), {
-      origin: new Vector(400, 500, 600),
-      target: 'corner_3',
-      wait: 1.5,
-    });
-
-    entity.model = 'progs/train.bsp';
-    entity.target = 'corner_1';
-    entity.targetname = 'remote_train';
-    entity.mins = new Vector(-16, -16, -16);
-    entity.maxs = new Vector(16, 16, 16);
-    entity.size = new Vector(32, 32, 32);
-    entity._sub = {
-      calcMove(target, speed, callback) {
-        calcMoveCalls.push({ target: target.copy(), speed, callback });
-      },
-      setMovedir() {},
-      useTargets() {},
-      reset() {},
-    };
-    entity.findFirstEntityByFieldAndValue = (_field, value) => {
-      if (value === 'corner_1') {
-        return firstCorner;
-      }
-      if (value === 'corner_2') {
-        return secondCorner;
-      }
-      return null;
-    };
-
-    entity.spawn();
-    entity._trainFind();
-
-    assert.ok(entity.origin.equalsTo(116, 216, 316));
-    assert.equal(entity.target, 'corner_2');
-
-    entity.use(entity);
-    entity.use(entity);
-
-    assert.equal(calcMoveCalls.length, 1);
-    assert.ok(calcMoveCalls[0].target.equalsTo(416, 516, 616));
-    assert.equal(calcMoveCalls[0].speed, 100);
-    assert.equal(entity.target, 'corner_3');
-    assert.equal(entity.wait, 1.5);
-  });
-});
-
-void describe('TeleportTrainEntity', () => {
-  void test('spawns with the teleport model, no collision, and the initial find think', () => {
-    const { entity, setModelCalls, precachedModels, precachedSounds, scheduledThinks } = createTrainFixture(TeleportTrainEntity);
-
-    entity.target = 'tele_corner';
-    entity.mins = new Vector(-8, -8, -8);
-    entity.maxs = new Vector(8, 8, 8);
-    entity.size = new Vector(16, 16, 16);
-
-    entity.spawn();
-
-    assert.deepEqual(precachedSounds, ['misc/null.wav']);
-    assert.deepEqual(precachedModels, ['progs/teleport.mdl']);
-    assert.deepEqual(setModelCalls, ['progs/teleport.mdl']);
-    assert.equal(entity.movetype, moveType.MOVETYPE_PUSH);
-    assert.equal(entity.solid, solid.SOLID_NOT);
-    assert.ok(entity.avelocity.equalsTo(100, 200, 300));
-    assert.equal(scheduledThinks.length, 1);
-    assert.equal(scheduledThinks[0].nextThink, 0.1);
-  });
-});
diff --git a/test/game/id1-player-lifecycle.test.mjs b/test/game/id1-player-lifecycle.test.mjs
deleted file mode 100644
index e2e48c21..00000000
--- a/test/game/id1-player-lifecycle.test.mjs
+++ /dev/null
@@ -1,264 +0,0 @@
-import assert from 'node:assert/strict';
-import { describe, test } from 'node:test';
-
-await import('../../source/game/id1/GameAPI.ts');
-
-const defsModule = await import('../../source/game/id1/Defs.ts');
-const playerModule = await import('../../source/game/id1/entity/Player.ts');
-const worldspawnModule = await import('../../source/game/id1/entity/Worldspawn.ts');
-const vectorModule = await import('../../source/shared/Vector.ts');
-
-const { clientEvent, items } = defsModule;
-const { PlayerEntity } = playerModule;
-const { BodyqueEntity } = worldspawnModule;
-const { default: Vector } = vectorModule;
-
-/**
- * Create a minimal game API surface for BodyqueEntity construction.
- * @returns {{engine: object}} Minimal game API object.
- */
-function createBodyqueGameAPI() {
-  return {
-    engine: {},
-  };
-}
-
-/**
- * Create a body queue node with edict-bound methods stubbed for unit tests.
- * @returns {BodyqueEntity} Stubbed body queue entity.
- */
-function createBodyqueNode() {
-  const body = new BodyqueEntity(null, createBodyqueGameAPI()).initializeEntity();
-
-  body.setModel = function setModel(model) {
-    this.model = model;
-  };
-
-  body.setOrigin = function setOrigin(origin) {
-    this.origin = origin.copy();
-  };
-
-  body.setSize = function setSize(mins, maxs) {
-    this.mins = mins.copy();
-    this.maxs = maxs.copy();
-  };
-
-  return body;
-}
-
-void describe('PlayerEntity respawn flow', () => {
-  void test('singleplayer respawn restarts the map', () => {
-    const appendedConsoleText = [];
-    const player = {
-      game: {
-        coop: false,
-        deathmatch: false,
-      },
-      engine: {
-        AppendConsoleText(command) {
-          appendedConsoleText.push(command);
-        },
-      },
-    };
-
-    PlayerEntity.prototype._respawn.call(player);
-
-    assert.deepEqual(appendedConsoleText, ['restart\n']);
-  });
-
-  void test('deathmatch respawn refreshes spawn state and advances the body queue ring', () => {
-    const bodyA = createBodyqueNode();
-    const bodyB = createBodyqueNode();
-    bodyA.owner = bodyB;
-    bodyB.owner = bodyA;
-
-    const calls = [];
-    const player = {
-      game: {
-        coop: false,
-        deathmatch: true,
-        bodyque_head: bodyA,
-      },
-      angles: new Vector(1, 2, 3),
-      model: 'progs/player.mdl',
-      frame: 4,
-      colormap: 16,
-      movetype: 7,
-      velocity: new Vector(10, 20, 30),
-      origin: new Vector(100, 200, 300),
-      mins: new Vector(-16, -16, -24),
-      maxs: new Vector(16, 16, 32),
-      clear() {
-        calls.push('clear');
-      },
-      putPlayerInServer() {
-        calls.push('putPlayerInServer');
-      },
-      _freshSpawnParameters() {
-        calls.push('freshSpawnParameters');
-      },
-    };
-
-    PlayerEntity.prototype._respawn.call(player);
-
-    assert.deepEqual(calls, ['freshSpawnParameters', 'clear', 'putPlayerInServer']);
-    assert.equal(player.game.bodyque_head, bodyB);
-    assert.equal(bodyA.model, 'progs/player.mdl');
-    assert.deepEqual(bodyA.origin, new Vector(100, 200, 300));
-    assert.deepEqual(bodyA.velocity, new Vector(10, 20, 30));
-  });
-});
-
-void describe('PlayerEntity intermission flow', () => {
-  void test('deathmatch intermission exits directly to the next map', () => {
-    let loadNextMapCalls = 0;
-    const player = {
-      game: {
-        deathmatch: true,
-        intermission_exittime: 0,
-        intermission_running: 1,
-        time: 10,
-        loadNextMap() {
-          loadNextMapCalls++;
-        },
-      },
-    };
-
-    PlayerEntity.prototype._intermissionExit.call(player);
-
-    assert.equal(loadNextMapCalls, 1);
-  });
-
-  void test('episode-ending intermission prints finale text before loading the next map', () => {
-    const centerPrints = [];
-    let trackPlayed = null;
-    let loadNextMapCalls = 0;
-    const player = {
-      game: {
-        deathmatch: false,
-        intermission_exittime: 0,
-        intermission_running: 1,
-        time: 42,
-        mapname: 'e1m7',
-        serverflags: 0,
-        loadNextMap() {
-          loadNextMapCalls++;
-        },
-      },
-      engine: {
-        registered: true,
-        PlayTrack(track) {
-          trackPlayed = track;
-        },
-      },
-      centerPrint(message) {
-        centerPrints.push(message);
-      },
-      _getEpisodeFinaleText: PlayerEntity.prototype._getEpisodeFinaleText,
-    };
-
-    PlayerEntity.prototype._intermissionExit.call(player);
-
-    assert.equal(player.game.intermission_running, 2);
-    assert.equal(player.game.intermission_exittime, 43);
-    assert.equal(trackPlayed, 2);
-    assert.equal(centerPrints.length, 1);
-    assert.equal(centerPrints[0].includes('Rune of Earth'), true);
-    assert.equal(loadNextMapCalls, 0);
-  });
-});
-
-void describe('PlayerEntity powerup timers', () => {
-  void test('expired invisibility restores the player model and clears the item flag', () => {
-    const dispatchedEvents = [];
-    const sounds = [];
-    const player = {
-      health: 100,
-      game: { time: 20 },
-      items: items.IT_INVISIBILITY,
-      invisible_finished: 19,
-      invisible_time: 5,
-      invisible_sound: 0,
-      invincible_finished: 0,
-      super_damage_finished: 0,
-      radsuit_finished: 0,
-      air_finished: 0,
-      modelindex: 5,
-      _modelIndex: {
-        player: 11,
-        eyes: 22,
-      },
-      frame: 3,
-      dispatchEvent(eventType) {
-        dispatchedEvents.push(eventType);
-      },
-      consolePrint() {
-      },
-      startSound(_channel, soundName) {
-        sounds.push(soundName);
-      },
-    };
-
-    PlayerEntity.prototype._powerupFrame.call(player);
-
-    assert.equal(player.items & items.IT_INVISIBILITY, 0);
-    assert.equal(player.invisible_finished, 0);
-    assert.equal(player.invisible_time, 0);
-    assert.equal(player.modelindex, 11);
-    assert.deepEqual(dispatchedEvents, [clientEvent.BONUS_FLASH]);
-    assert.deepEqual(sounds, ['items/inv3.wav']);
-  });
-
-  void test('expired invulnerability clears cached attacker sound gates', () => {
-    const player = {
-      health: 100,
-      game: { time: 20 },
-      items: items.IT_INVULNERABILITY,
-      invisible_finished: 0,
-      invincible_finished: 19,
-      invincible_time: 5,
-      invincible_sound_time: { 1: 9, 7: 15 },
-      super_damage_finished: 0,
-      radsuit_finished: 0,
-      air_finished: 0,
-      dispatchEvent() {
-      },
-      consolePrint() {
-      },
-      startSound() {
-      },
-    };
-
-    PlayerEntity.prototype._powerupFrame.call(player);
-
-    assert.equal(player.items & items.IT_INVULNERABILITY, 0);
-    assert.equal(player.invincible_finished, 0);
-    assert.equal(player.invincible_time, 0);
-    assert.deepEqual(player.invincible_sound_time, {});
-  });
-
-  void test('expiring biosuit keeps resetting air supply until the suit ends', () => {
-    const player = {
-      health: 100,
-      game: { time: 10 },
-      items: items.IT_SUIT,
-      invisible_finished: 0,
-      invincible_finished: 0,
-      super_damage_finished: 0,
-      radsuit_finished: 11,
-      rad_time: 0,
-      air_finished: 0,
-      dispatchEvent() {
-      },
-      consolePrint() {
-      },
-      startSound() {
-      },
-    };
-
-    PlayerEntity.prototype._powerupFrame.call(player);
-
-    assert.equal(player.air_finished, 22);
-    assert.equal(player.items & items.IT_SUIT, items.IT_SUIT);
-  });
-});
diff --git a/test/game/id1-player-weapons.test.mjs b/test/game/id1-player-weapons.test.mjs
deleted file mode 100644
index a617b34e..00000000
--- a/test/game/id1-player-weapons.test.mjs
+++ /dev/null
@@ -1,153 +0,0 @@
-import assert from 'node:assert/strict';
-import { describe, test } from 'node:test';
-
-await import('../../source/game/id1/GameAPI.ts');
-
-const defsModule = await import('../../source/game/id1/Defs.ts');
-const playerModule = await import('../../source/game/id1/entity/Player.ts');
-const weaponsModule = await import('../../source/game/id1/entity/Weapons.ts');
-
-const { items, waterlevel } = defsModule;
-const { PlayerEntity } = playerModule;
-const { DamageHandler, PlayerWeapons, weaponConfig } = weaponsModule;
-
-PlayerEntity._initStates();
-
-/**
- * Create a player-like object for weapon selection tests.
- * @param {object} overrides Field overrides for the mock player.
- * @returns {object} Mock player state.
- */
-function createWeaponSelectionPlayer(overrides = {}) {
-  return {
-    items: items.IT_AXE,
-    ammo_shells: 0,
-    ammo_nails: 0,
-    ammo_rockets: 0,
-    ammo_cells: 0,
-    waterlevel: waterlevel.WATERLEVEL_NONE,
-    ...overrides,
-  };
-}
-
-void describe('Player and weapon module surface', () => {
-  void test('exports the current gameplay classes and weapon config map', () => {
-    assert.equal(typeof PlayerEntity, 'function');
-    assert.equal(typeof playerModule.GibEntity, 'function');
-    assert.equal(typeof PlayerWeapons, 'function');
-    assert.equal(typeof DamageHandler, 'function');
-    assert.equal(weaponConfig instanceof Map, true);
-  });
-
-  void test('registers player-specific state through serializer decorators', () => {
-    const serializableFields = Reflect.get(PlayerEntity, 'serializableFields');
-
-    assert.equal(Array.isArray(serializableFields), true);
-    assert.equal(serializableFields.includes('_spawnParameters'), true);
-    assert.equal(serializableFields.includes('weapon'), true);
-    assert.equal(serializableFields.includes('invincible_sound_time'), true);
-    assert.equal(serializableFields.includes('_modelIndex'), true);
-  });
-});
-
-void describe('PlayerEntity state machine', () => {
-  void test('standing and running loops wrap correctly', () => {
-    const states = PlayerEntity._states;
-
-    assert.equal(states.player_stand5.nextState, 'player_stand1');
-    assert.equal(states.player_stand_axe12.nextState, 'player_stand_axe1');
-    assert.equal(states.player_run6.nextState, 'player_run1');
-    assert.equal(states.player_run_axe6.nextState, 'player_run_axe1');
-  });
-
-  void test('continuous-fire states alternate correctly', () => {
-    const states = PlayerEntity._states;
-
-    assert.equal(states.player_nail1.keyframe, 'nailatt1');
-    assert.equal(states.player_nail1.nextState, 'player_nail2');
-    assert.equal(states.player_nail2.nextState, 'player_nail1');
-
-    assert.equal(states.player_light1.keyframe, 'nailatt1');
-    assert.equal(states.player_light1.nextState, 'player_light2');
-    assert.equal(states.player_light2.nextState, 'player_light1');
-  });
-
-  void test('pain and death chains terminate and keep handlers where needed', () => {
-    const states = PlayerEntity._states;
-
-    assert.equal(states.player_pain6.nextState, null);
-    assert.equal(states.player_pain_axe6.nextState, null);
-    assert.equal(states.player_diea11.nextState, null);
-    assert.equal(states.player_die_ax9.nextState, null);
-
-    assert.equal(typeof states.player_stand1.handler, 'function');
-    assert.equal(typeof states.player_shot1.handler, 'function');
-    assert.equal(typeof states.player_nail1.handler, 'function');
-    assert.equal(typeof states.player_light1.handler, 'function');
-  });
-});
-
-void describe('PlayerEntity weapon selection', () => {
-  void test('falls back to the axe when stronger owned weapons are out of ammo', () => {
-    const player = createWeaponSelectionPlayer({
-      items: items.IT_AXE | items.IT_SHOTGUN | items.IT_SUPER_SHOTGUN,
-    });
-
-    assert.equal(PlayerEntity.prototype.chooseBestWeapon.call(player), items.IT_AXE);
-  });
-
-  void test('skips lightning underwater and keeps the best safe weapon', () => {
-    const player = createWeaponSelectionPlayer({
-      items: items.IT_AXE | items.IT_ROCKET_LAUNCHER | items.IT_LIGHTNING,
-      ammo_rockets: 5,
-      ammo_cells: 30,
-      waterlevel: waterlevel.WATERLEVEL_WAIST,
-    });
-
-    assert.equal(PlayerEntity.prototype.chooseBestWeapon.call(player), items.IT_ROCKET_LAUNCHER);
-  });
-
-  void test('prefers the highest-priority usable weapon', () => {
-    const player = createWeaponSelectionPlayer({
-      items: items.IT_AXE | items.IT_SHOTGUN | items.IT_SUPER_NAILGUN | items.IT_GRENADE_LAUNCHER,
-      ammo_shells: 25,
-      ammo_nails: 20,
-      ammo_rockets: 1,
-    });
-
-    assert.equal(PlayerEntity.prototype.chooseBestWeapon.call(player), items.IT_GRENADE_LAUNCHER);
-  });
-
-  void test('applyBackpack caps ammo and switches to the picked weapon outside deathmatch', () => {
-    const selectedWeapons = [];
-    const player = {
-      ...createWeaponSelectionPlayer({
-        ammo_shells: 95,
-        ammo_rockets: 99,
-        items: items.IT_AXE | items.IT_SHOTGUN,
-        weapon: items.IT_SHOTGUN,
-      }),
-      constructor: PlayerEntity,
-      game: { deathmatch: false },
-      setWeapon(weapon) {
-        selectedWeapons.push(weapon);
-        this.weapon = weapon;
-      },
-    };
-
-    const changed = PlayerEntity.prototype.applyBackpack.call(player, {
-      ammo_shells: 10,
-      ammo_nails: 0,
-      ammo_rockets: 5,
-      ammo_cells: 0,
-      items: items.IT_ROCKET_LAUNCHER,
-      weapon: items.IT_ROCKET_LAUNCHER,
-    });
-
-    assert.equal(changed, true);
-    assert.equal(player.ammo_shells, 100);
-    assert.equal(player.ammo_rockets, 100);
-    assert.equal(player.items & items.IT_ROCKET_LAUNCHER, items.IT_ROCKET_LAUNCHER);
-    assert.deepEqual(selectedWeapons, [items.IT_ROCKET_LAUNCHER]);
-  });
-});
diff --git a/test/game/id1-registry.test.mjs b/test/game/id1-registry.test.mjs
deleted file mode 100644
index 062a0bed..00000000
--- a/test/game/id1-registry.test.mjs
+++ /dev/null
@@ -1,102 +0,0 @@
-import assert from 'node:assert/strict';
-import { describe, test } from 'node:test';
-
-import BaseEntity from '../../source/game/id1/entity/BaseEntity.ts';
-
-const registryModule = await import('../../source/game/id1/helper/Registry.ts');
-
-const EntityRegistry = registryModule.default;
-
-class RegisteredEntity extends BaseEntity {
-  static classname = 'registered_entity';
-  static clientEntityFields = ['origin', 'angles'];
-  static precacheCalls = 0;
-  static parseModelDataCalls = 0;
-  static initStatesCalls = 0;
-
-  static _precache(_engineAPI) {
-    void _engineAPI;
-    this.precacheCalls += 1;
-  }
-
-  static _parseModelData(_engineAPI) {
-    void _engineAPI;
-    this.parseModelDataCalls += 1;
-  }
-
-  static _initStates() {
-    this.initStatesCalls += 1;
-  }
-}
-
-class ServerOnlyEntity extends BaseEntity {
-  static classname = 'server_only_entity';
-  static clientEntityFields = [];
-  static precacheCalls = 0;
-  static parseModelDataCalls = 0;
-  static initStatesCalls = 0;
-
-  static _precache(_engineAPI) {
-    void _engineAPI;
-    this.precacheCalls += 1;
-  }
-
-  static _parseModelData(_engineAPI) {
-    void _engineAPI;
-    this.parseModelDataCalls += 1;
-  }
-
-  static _initStates() {
-    this.initStatesCalls += 1;
-  }
-}
-
-/**
- * Reset static hook counters for both test entity classes.
- * @returns {void}
- */
-function resetCounters() {
-  RegisteredEntity.precacheCalls = 0;
-  RegisteredEntity.parseModelDataCalls = 0;
-  RegisteredEntity.initStatesCalls = 0;
-  ServerOnlyEntity.precacheCalls = 0;
-  ServerOnlyEntity.parseModelDataCalls = 0;
-  ServerOnlyEntity.initStatesCalls = 0;
-}
-
-void describe('EntityRegistry', () => {
-  void test('registers entity classes by classname', () => {
-    const registry = new EntityRegistry([RegisteredEntity, ServerOnlyEntity]);
-
-    assert.equal(registry.has('registered_entity'), true);
-    assert.equal(registry.has('missing_entity'), false);
-    assert.equal(registry.get('registered_entity'), RegisteredEntity);
-    assert.equal(registry.get('missing_entity'), null);
-    assert.deepEqual([...registry.getAll()], [RegisteredEntity, ServerOnlyEntity]);
-  });
-
-  void test('runs bootstrap hooks across every registered entity class', () => {
-    resetCounters();
-
-    const registry = new EntityRegistry([RegisteredEntity, ServerOnlyEntity]);
-    const engineAPI = {};
-
-    registry.precacheAll(engineAPI);
-    registry.initializeAll(engineAPI);
-
-    assert.equal(RegisteredEntity.precacheCalls, 1);
-    assert.equal(RegisteredEntity.parseModelDataCalls, 1);
-    assert.equal(RegisteredEntity.initStatesCalls, 1);
-    assert.equal(ServerOnlyEntity.precacheCalls, 1);
-    assert.equal(ServerOnlyEntity.parseModelDataCalls, 1);
-    assert.equal(ServerOnlyEntity.initStatesCalls, 1);
-  });
-
-  void test('returns only entities with client-exposed fields', () => {
-    const registry = new EntityRegistry([RegisteredEntity, ServerOnlyEntity]);
-
-    assert.deepEqual(registry.getClientEntityFields(), {
-      registered_entity: ['origin', 'angles'],
-    });
-  });
-});
diff --git a/test/game/id1-shalrath.test.mjs b/test/game/id1-shalrath.test.mjs
deleted file mode 100644
index e2c446b3..00000000
--- a/test/game/id1-shalrath.test.mjs
+++ /dev/null
@@ -1,211 +0,0 @@
-import { describe, test } from 'node:test';
-import assert from 'node:assert/strict';
-
-import Vector from '../../source/shared/Vector.ts';
-import { effect } from '../../source/game/id1/Defs.ts';
-
-await import('../../source/game/id1/GameAPI.ts');
-
-const { default: ShalrathMonsterEntity, ShalrathMissileEntity } = await import('../../source/game/id1/entity/monster/Shalrath.ts');
-
-ShalrathMonsterEntity._initStates();
-
-/**
- * Create a minimal Shalrath fixture for focused behavior tests.
- * @param {typeof ShalrathMonsterEntity} MonsterClass Monster constructor under test.
- * @returns {ShalrathMonsterEntity} Monster fixture instance.
- */
-function createMonsterFixture(MonsterClass) {
-  const edict = {
-    num: 1,
-    entity: null,
-    freeEdict() {},
-    setOrigin() {},
-    setModel() {},
-    setMinMaxSize() {},
-    walkMove() {
-      return false;
-    },
-    changeYaw() {
-      return 0;
-    },
-    dropToFloor() {
-      return true;
-    },
-    isOnTheFloor() {
-      return false;
-    },
-    makeStatic() {},
-    aim() {
-      return null;
-    },
-    moveToGoal() {
-      return false;
-    },
-    isInPXS() {
-      return true;
-    },
-    getNextBestClient() {
-      return null;
-    },
-  };
-
-  const engine = {
-    IsLoading() {
-      return false;
-    },
-    PrecacheModel() {},
-    PrecacheSound() {},
-    ParseQC() {
-      return null;
-    },
-    StartSound() {},
-    SpawnEntity() {
-      return { entity: null };
-    },
-    eventBus: {
-      publish() {},
-    },
-  };
-
-  const gameAPI = {
-    engine,
-    time: 0,
-    skill: 1,
-    deathmatch: 0,
-    nomonsters: 0,
-  };
-
-  const entity = new MonsterClass(edict, gameAPI).initializeEntity();
-  edict.entity = entity;
-  entity.origin = new Vector(10, 20, 30);
-  entity.angles = new Vector();
-  entity.enemy = {
-    origin: new Vector(90, 20, 30),
-    health: 100,
-  };
-
-  return entity;
-}
-
-void describe('ShalrathMonsterEntity metadata', () => {
-  void test('class metadata matches the original monster', () => {
-    assert.equal(ShalrathMonsterEntity.classname, 'monster_shalrath');
-    assert.equal(ShalrathMonsterEntity._health, 400);
-    assert.equal(ShalrathMonsterEntity._modelDefault, 'progs/shalrath.mdl');
-    assert.equal(ShalrathMonsterEntity._modelHead, 'progs/h_shal.mdl');
-  });
-
-  void test('size vectors are correct', () => {
-    const [mins, maxs] = ShalrathMonsterEntity._size;
-    assert.deepEqual([mins[0], mins[1], mins[2]], [-32, -32, -24]);
-    assert.deepEqual([maxs[0], maxs[1], maxs[2]], [32, 32, 64]);
-  });
-});
-
-void describe('ShalrathMonsterEntity state machine', () => {
-  void test('walk and run loops match the QuakeC frame counts', () => {
-    const states = ShalrathMonsterEntity._states;
-
-    assert.equal(states.shal_stand.keyframe, 'walk1');
-    assert.equal(states.shal_stand.nextState, 'shal_stand');
-
-    for (let i = 1; i <= 12; i++) {
-      assert.ok(states[`shal_walk${i}`], `missing shal_walk${i}`);
-      assert.ok(states[`shal_run${i}`], `missing shal_run${i}`);
-    }
-    assert.equal(states.shal_walk12.nextState, 'shal_walk1');
-    assert.equal(states.shal_run12.nextState, 'shal_run1');
-  });
-
-  void test('attack, pain, and death chains keep the original frame counts', () => {
-    const states = ShalrathMonsterEntity._states;
-
-    for (let i = 1; i <= 11; i++) {
-      assert.equal(states[`shal_attack${i}`].keyframe, `attack${i}`);
-    }
-    assert.equal(states.shal_attack11.nextState, 'shal_run1');
-
-    for (let i = 1; i <= 5; i++) {
-      assert.equal(states[`shal_pain${i}`].keyframe, `pain${i}`);
-    }
-    assert.equal(states.shal_pain5.nextState, 'shal_run1');
-
-    for (let i = 1; i <= 7; i++) {
-      assert.equal(states[`shal_death${i}`].keyframe, `death${i}`);
-    }
-    assert.equal(states.shal_death7.nextState, null);
-  });
-});
-
-void describe('ShalrathMonsterEntity QC fixes', () => {
-  void test('launchMissile adds muzzleflash, plays attack2, and spawns a missile', () => {
-    const shalrath = createMonsterFixture(ShalrathMonsterEntity);
-    const spawned = [];
-    const sounds = [];
-
-    shalrath.engine.SpawnEntity = (classname, initialData) => {
-      spawned.push({ classname, initialData });
-      return { entity: null };
-    };
-    shalrath.startSound = (_channel, soundName) => {
-      sounds.push(soundName);
-    };
-
-    shalrath.launchMissile();
-
-    assert.equal((shalrath.effects & effect.EF_MUZZLEFLASH) !== 0, true);
-    assert.deepEqual(sounds, ['shalrath/attack2.wav']);
-    assert.equal(spawned.length, 1);
-    assert.equal(spawned[0].classname, ShalrathMissileEntity.classname);
-    assert.equal(spawned[0].initialData.owner, shalrath);
-  });
-
-  void test('missile spawn starts above the owner and adds the classic spin', () => {
-    const owner = createMonsterFixture(ShalrathMonsterEntity);
-    const edict = {
-      num: 2,
-      entity: null,
-      freeEdict() {},
-      setOrigin() {},
-      setModel() {},
-      setMinMaxSize() {},
-      walkMove() {
-        return false;
-      },
-      changeYaw() {
-        return 0;
-      },
-      dropToFloor() {
-        return true;
-      },
-      isOnTheFloor() {
-        return false;
-      },
-      makeStatic() {},
-      aim() {
-        return null;
-      },
-      moveToGoal() {
-        return false;
-      },
-      isInPXS() {
-        return true;
-      },
-      getNextBestClient() {
-        return null;
-      },
-    };
-
-    const missile = new ShalrathMissileEntity(edict, owner.game).initializeEntity();
-    edict.entity = missile;
-    missile.owner = owner;
-    owner.movedir = new Vector(1, 0, 0);
-
-    missile.spawn();
-
-    assert.deepEqual([missile.origin[0], missile.origin[1], missile.origin[2]], [10, 20, 40]);
-    assert.deepEqual([missile.avelocity[0], missile.avelocity[1], missile.avelocity[2]], [300, 300, 300]);
-    assert.equal(Math.round(missile.velocity.len()), 400);
-  });
-});
diff --git a/test/game/id1-shambler.test.mjs b/test/game/id1-shambler.test.mjs
deleted file mode 100644
index 8cbde700..00000000
--- a/test/game/id1-shambler.test.mjs
+++ /dev/null
@@ -1,218 +0,0 @@
-import { describe, test } from 'node:test';
-import assert from 'node:assert/strict';
-
-import Vector from '../../source/shared/Vector.ts';
-
-await import('../../source/game/id1/GameAPI.ts');
-
-const { default: ShamblerMonsterEntity } = await import('../../source/game/id1/entity/monster/Shambler.ts');
-
-ShamblerMonsterEntity._initStates();
-
-/**
- * Create a minimal Shambler fixture for focused behavior tests.
- * @param {typeof ShamblerMonsterEntity} MonsterClass Monster constructor under test.
- * @returns {ShamblerMonsterEntity} Monster fixture instance.
- */
-function createMonsterFixture(MonsterClass) {
-  const edict = {
-    num: 1,
-    entity: null,
-    freeEdict() {},
-    setOrigin() {},
-    setModel() {},
-    setMinMaxSize() {},
-    walkMove() {
-      return false;
-    },
-    changeYaw() {
-      return 0;
-    },
-    dropToFloor() {
-      return true;
-    },
-    isOnTheFloor() {
-      return false;
-    },
-    makeStatic() {},
-    aim() {
-      return null;
-    },
-    moveToGoal() {
-      return false;
-    },
-    isInPXS() {
-      return true;
-    },
-    getNextBestClient() {
-      return null;
-    },
-  };
-
-  const engine = {
-    IsLoading() {
-      return false;
-    },
-    PrecacheModel() {},
-    PrecacheSound() {},
-    ParseQC() {
-      return null;
-    },
-    StartSound() {},
-    SpawnEntity() {
-      return { entity: null };
-    },
-    DispatchTempEntityEvent() {},
-    eventBus: {
-      publish() {},
-    },
-  };
-
-  const gameAPI = {
-    engine,
-    time: 0,
-    skill: 1,
-    deathmatch: 0,
-    nomonsters: 0,
-  };
-
-  const entity = new MonsterClass(edict, gameAPI).initializeEntity();
-  edict.entity = entity;
-  entity.origin = new Vector();
-  entity.angles = new Vector();
-  entity.enemy = null;
-
-  return entity;
-}
-
-void describe('ShamblerMonsterEntity metadata', () => {
-  void test('class metadata matches the original monster', () => {
-    assert.equal(ShamblerMonsterEntity.classname, 'monster_shambler');
-    assert.equal(ShamblerMonsterEntity._health, 600);
-    assert.equal(ShamblerMonsterEntity._modelDefault, 'progs/shambler.mdl');
-    assert.equal(ShamblerMonsterEntity._modelHead, 'progs/h_shams.mdl');
-  });
-
-  void test('size vectors are correct', () => {
-    const [mins, maxs] = ShamblerMonsterEntity._size;
-    assert.deepEqual([mins[0], mins[1], mins[2]], [-32, -32, -24]);
-    assert.deepEqual([maxs[0], maxs[1], maxs[2]], [32, 32, 64]);
-  });
-});
-
-void describe('ShamblerMonsterEntity state machine', () => {
-  void test('stand, walk, and run loops match the QuakeC frame counts', () => {
-    const states = ShamblerMonsterEntity._states;
-
-    for (let i = 1; i <= 17; i++) {
-      assert.equal(states[`sham_stand${i}`].keyframe, `stand${i}`);
-    }
-    assert.equal(states.sham_stand17.nextState, 'sham_stand1');
-
-    for (let i = 1; i <= 12; i++) {
-      assert.equal(states[`sham_walk${i}`].keyframe, `walk${i}`);
-    }
-    assert.equal(states.sham_walk12.nextState, 'sham_walk1');
-
-    for (let i = 1; i <= 6; i++) {
-      assert.equal(states[`sham_run${i}`].keyframe, `run${i}`);
-    }
-    assert.equal(states.sham_run6.nextState, 'sham_run1');
-  });
-
-  void test('melee chains return to the run loop', () => {
-    const states = ShamblerMonsterEntity._states;
-
-    for (let i = 1; i <= 12; i++) {
-      assert.equal(states[`sham_smash${i}`].keyframe, `smash${i}`);
-    }
-    assert.equal(states.sham_smash12.nextState, 'sham_run1');
-
-    for (let i = 1; i <= 9; i++) {
-      assert.equal(states[`sham_swingl${i}`].keyframe, `swingl${i}`);
-      assert.equal(states[`sham_swingr${i}`].keyframe, `swingr${i}`);
-    }
-    assert.equal(states.sham_swingl9.nextState, 'sham_run1');
-    assert.equal(states.sham_swingr9.nextState, 'sham_run1');
-  });
-
-  void test('magic sequence keeps the legacy extra magic3 state and skips directly to magic9', () => {
-    const states = ShamblerMonsterEntity._states;
-
-    assert.equal(states.sham_magic1.keyframe, 'magic1');
-    assert.equal(states.sham_magic2.keyframe, 'magic2');
-    assert.equal(states.sham_magic3.keyframe, 'magic3');
-    assert.equal(states.sham_magic3.nextState, 'sham_magic3b');
-    assert.equal(states.sham_magic3b.keyframe, 'magic3');
-    assert.equal(states.sham_magic3b.nextState, 'sham_magic4');
-    assert.equal(states.sham_magic4.keyframe, 'magic4');
-    assert.equal(states.sham_magic5.keyframe, 'magic5');
-    assert.equal(states.sham_magic6.keyframe, 'magic6');
-    assert.equal(states.sham_magic6.nextState, 'sham_magic9');
-    assert.equal(states.sham_magic9.keyframe, 'magic9');
-    assert.equal(states.sham_magic10.keyframe, 'magic10');
-    assert.equal(states.sham_magic11.keyframe, 'magic11');
-    assert.equal(states.sham_magic12.keyframe, 'magic12');
-    assert.equal(states.sham_magic12.nextState, 'sham_run1');
-  });
-
-  void test('pain and death sequences transition correctly', () => {
-    const states = ShamblerMonsterEntity._states;
-
-    for (let i = 1; i <= 6; i++) {
-      assert.equal(states[`sham_pain${i}`].keyframe, `pain${i}`);
-    }
-    assert.equal(states.sham_pain6.nextState, 'sham_run1');
-
-    for (let i = 1; i <= 11; i++) {
-      assert.equal(states[`sham_death${i}`].keyframe, `death${i}`);
-    }
-    assert.equal(states.sham_death11.nextState, null);
-  });
-
-  void test('active states keep handlers while passive pain and death frames omit them', () => {
-    const states = ShamblerMonsterEntity._states;
-
-    for (const name of ['sham_stand1', 'sham_walk12', 'sham_run6', 'sham_smash10', 'sham_swingl7', 'sham_swingr7', 'sham_magic1', 'sham_magic3', 'sham_magic3b', 'sham_magic11']) {
-      assert.equal(typeof states[name].handler, 'function', `${name} handler should be a function`);
-    }
-
-    for (const name of ['sham_pain1', 'sham_pain6', 'sham_magic12']) {
-      assert.equal(states[name].handler, null, `${name} handler should be omitted`);
-    }
-
-    for (const name of ['sham_death1', 'sham_death11']) {
-      assert.equal(typeof states[name].handler, 'function', `${name} handler should be a function`);
-    }
-  });
-});
-
-void describe('ShamblerMonsterEntity QC fixes', () => {
-  void test('castLightning does not replay the boom sound on every pulse', () => {
-    const shambler = createMonsterFixture(ShamblerMonsterEntity);
-    let soundCalls = 0;
-    let beamCalls = 0;
-
-    shambler.enemy = {
-      origin: new Vector(64, 0, 0),
-    };
-    shambler._ai.face = () => {};
-    shambler.startSound = () => {
-      soundCalls += 1;
-    };
-    shambler.traceline = () => ({
-      point: new Vector(64, 0, 0),
-    });
-    shambler._damageInflictor = {
-      lightningDamage() {},
-      dispatchBeamEvent() {
-        beamCalls += 1;
-      },
-    };
-
-    shambler.castLightning();
-
-    assert.equal(soundCalls, 0);
-    assert.equal(beamCalls, 1);
-  });
-});
diff --git a/test/game/id1-soldier.test.mjs b/test/game/id1-soldier.test.mjs
deleted file mode 100644
index 07024091..00000000
--- a/test/game/id1-soldier.test.mjs
+++ /dev/null
@@ -1,282 +0,0 @@
-import { describe, test } from 'node:test';
-import assert from 'node:assert/strict';
-
-import Vector from '../../source/shared/Vector.ts';
-
-await import('../../source/game/id1/GameAPI.ts');
-
-const { ArmySoldierMonster, ArmyEnforcerMonster } = await import('../../source/game/id1/entity/monster/Soldier.ts');
-const { Laser } = await import('../../source/game/id1/entity/Weapons.ts');
-
-ArmySoldierMonster._initStates();
-ArmyEnforcerMonster._initStates();
-
-function createMonsterFixture(MonsterClass, gameOverrides = {}) {
-  const spawnRequests = [];
-  const edict = { entity: null };
-  const engine = {
-    IsLoading() {
-      return false;
-    },
-    ParseQC() {
-      return null;
-    },
-    PrecacheModel() {
-    },
-    PrecacheSound() {
-    },
-    SpawnEntity(classname, initialData = {}) {
-      spawnRequests.push({ classname, initialData });
-      return { entity: null };
-    },
-    DispatchTempEntityEvent() {
-    },
-    FindByFieldAndValue() {
-      return null;
-    },
-    FindAllByFieldAndValue() {
-      return [];
-    },
-    eventBus: {
-      publish() {
-      },
-    },
-  };
-  const gameAPI = {
-    engine,
-    time: 10,
-    skill: 1,
-    deathmatch: 0,
-    nomonsters: 0,
-    gravity: 800,
-    hasFeature() {
-      return false;
-    },
-    ...gameOverrides,
-  };
-
-  const entity = new MonsterClass(edict, gameAPI).initializeEntity();
-  edict.entity = entity;
-  entity.origin = new Vector();
-
-  return { entity, gameAPI, spawnRequests };
-}
-
-function assertVectorNear(actual, expected, epsilon = 1e-6) {
-  for (let i = 0; i < 3; i++) {
-    assert.ok(Math.abs(actual[i] - expected[i]) <= epsilon, `component ${i} mismatch: ${actual[i]} !== ${expected[i]}`);
-  }
-}
-
-void describe('ArmySoldierMonster class metadata', () => {
-  void test('classname is monster_army', () => {
-    assert.equal(ArmySoldierMonster.classname, 'monster_army');
-  });
-
-  void test('health and model metadata match QC setup', () => {
-    assert.equal(ArmySoldierMonster._health, 30);
-    assert.equal(ArmySoldierMonster._modelDefault, 'progs/soldier.mdl');
-    assert.equal(ArmySoldierMonster._modelHead, 'progs/h_guard.mdl');
-  });
-
-  void test('size vectors are correct', () => {
-    const [mins, maxs] = ArmySoldierMonster._size;
-    assert.deepEqual([mins[0], mins[1], mins[2]], [-16, -16, -24]);
-    assert.deepEqual([maxs[0], maxs[1], maxs[2]], [16, 16, 40]);
-  });
-
-  void test('preserves the legacy serialized AI state field and keeps helpers runtime-only', () => {
-    const { entity } = createMonsterFixture(ArmySoldierMonster);
-    const serialized = entity._serializer.serialize();
-
-    assert.ok(Array.isArray(ArmySoldierMonster.serializableFields));
-    assert.ok(Object.isFrozen(ArmySoldierMonster.serializableFields));
-    assert.deepEqual(ArmySoldierMonster.serializableFields, ['_aiState']);
-    assert.equal(entity._aiState, null);
-    assert.ok('_aiState' in serialized);
-    assert.ok(!('_damageInflictor' in serialized));
-  });
-
-  void test('fire keeps the QuakeC lead target calculation and spread values', () => {
-    const { entity } = createMonsterFixture(ArmySoldierMonster);
-    const shots = [];
-    let faceCalls = 0;
-
-    entity.enemy = {
-      origin: new Vector(100, 20, 40),
-      velocity: new Vector(15, -10, 0),
-    };
-    entity._ai = {
-      face() {
-        faceCalls++;
-      },
-    };
-    entity.attackSound = () => {
-    };
-    entity._damageInflictor.fireBullets = (count, direction, spread) => {
-      shots.push({ count, direction: direction.copy(), spread: spread.copy() });
-    };
-
-    entity._fire();
-
-    const expectedDirection = entity.enemy.origin.copy()
-      .subtract(entity.enemy.velocity.copy().multiply(0.2))
-      .subtract(entity.origin);
-    expectedDirection.normalize();
-
-    assert.equal(faceCalls, 1);
-    assert.equal(shots.length, 1);
-    assert.equal(shots[0].count, 4);
-    assertVectorNear(shots[0].direction, expectedDirection);
-    assertVectorNear(shots[0].spread, new Vector(0.1, 0.1, 0));
-  });
-});
-
-void describe('ArmySoldierMonster state machine', () => {
-  void test('stand, walk, and run sequences loop correctly', () => {
-    const states = ArmySoldierMonster._states;
-
-    for (let i = 1; i <= 8; i++) {
-      assert.equal(states[`army_stand${i}`].keyframe, `stand${i}`);
-      assert.equal(states[`army_run${i}`].keyframe, `run${i}`);
-    }
-    assert.equal(states.army_stand8.nextState, 'army_stand1');
-    assert.equal(states.army_run8.nextState, 'army_run1');
-
-    for (let i = 1; i <= 24; i++) {
-      assert.equal(states[`army_walk${i}`].keyframe, `prowl_${i}`);
-    }
-    assert.equal(states.army_walk24.nextState, 'army_walk1');
-  });
-
-  void test('attack, pain, and death transitions match the QuakeC flow', () => {
-    const states = ArmySoldierMonster._states;
-
-    for (let i = 1; i <= 9; i++) {
-      assert.equal(states[`army_atk${i}`].keyframe, `shoot${i}`);
-    }
-    assert.equal(states.army_atk9.nextState, 'army_run1');
-    assert.equal(states.army_pain6.nextState, 'army_run1');
-    assert.equal(states.army_painb14.nextState, 'army_run1');
-    assert.equal(states.army_painc13.nextState, 'army_run1');
-    assert.equal(states.army_die10.nextState, null);
-    assert.equal(states.army_cdie11.nextState, null);
-  });
-
-  void test('inactive sequences omit handlers where expected', () => {
-    const states = ArmySoldierMonster._states;
-    assert.equal(states.army_pain1.handler, null);
-    assert.equal(states.army_pain6.handler !== null, true);
-    assert.equal(typeof states.army_painb2.handler, 'function');
-    assert.equal(typeof states.army_atk4.handler, 'function');
-  });
-});
-
-void describe('ArmyEnforcerMonster class metadata', () => {
-  void test('classname is monster_enforcer', () => {
-    assert.equal(ArmyEnforcerMonster.classname, 'monster_enforcer');
-  });
-
-  void test('health and model metadata match QC setup', () => {
-    assert.equal(ArmyEnforcerMonster._health, 80);
-    assert.equal(ArmyEnforcerMonster._modelDefault, 'progs/enforcer.mdl');
-    assert.equal(ArmyEnforcerMonster._modelHead, 'progs/h_mega.mdl');
-  });
-
-  void test('size vectors are correct', () => {
-    const [mins, maxs] = ArmyEnforcerMonster._size;
-    assert.deepEqual([mins[0], mins[1], mins[2]], [-16, -16, -24]);
-    assert.deepEqual([maxs[0], maxs[1], maxs[2]], [16, 16, 40]);
-  });
-
-  void test('serializableFields is a frozen empty array', () => {
-    assert.ok(Array.isArray(ArmyEnforcerMonster.serializableFields));
-    assert.ok(Object.isFrozen(ArmyEnforcerMonster.serializableFields));
-    assert.deepEqual(ArmyEnforcerMonster.serializableFields, []);
-  });
-
-  void test('fire spawns a laser from the muzzle origin and updates movedir', () => {
-    const { entity, spawnRequests } = createMonsterFixture(ArmyEnforcerMonster);
-    let laserOrigin = null;
-    const laser = Object.create(Laser.prototype);
-
-    laser.setOrigin = (origin) => {
-      laserOrigin = origin.copy();
-    };
-
-    entity.origin = new Vector(10, 20, 30);
-    entity.angles = new Vector();
-    entity.enemy = {
-      origin: new Vector(70, 60, 30),
-    };
-    entity.engine.SpawnEntity = (classname, initialData = {}) => {
-      spawnRequests.push({ classname, initialData });
-      return {
-        entity: laser,
-      };
-    };
-
-    entity.fire();
-
-    const movedir = entity.enemy.origin.copy().subtract(entity.origin);
-    movedir.normalize();
-    const { forward, right } = entity.angles.angleVectors();
-    const expectedOrigin = entity.origin.copy().add(forward.multiply(30)).add(right.multiply(8.5)).add(new Vector(0, 0, 16));
-
-    assert.equal(spawnRequests.length, 1);
-    assert.equal(spawnRequests[0].initialData.owner, entity);
-    assertVectorNear(entity.movedir, movedir);
-    assertVectorNear(laserOrigin, expectedOrigin);
-  });
-});
-
-void describe('ArmyEnforcerMonster state machine', () => {
-  void test('stand, walk, and run sequences loop correctly', () => {
-    const states = ArmyEnforcerMonster._states;
-
-    for (let i = 1; i <= 7; i++) {
-      assert.equal(states[`enf_stand${i}`].keyframe, `stand${i}`);
-    }
-    assert.equal(states.enf_stand7.nextState, 'enf_stand1');
-
-    for (let i = 1; i <= 16; i++) {
-      assert.equal(states[`enf_walk${i}`].keyframe, `walk${i}`);
-    }
-    assert.equal(states.enf_walk16.nextState, 'enf_walk1');
-
-    for (let i = 1; i <= 8; i++) {
-      assert.equal(states[`enf_run${i}`].keyframe, `run${i}`);
-    }
-    assert.equal(states.enf_run8.nextState, 'enf_run1');
-  });
-
-  void test('attack and pain sequences transition back to run', () => {
-    const states = ArmyEnforcerMonster._states;
-    const attackFrames = ['attack1', 'attack2', 'attack3', 'attack4', 'attack5', 'attack6', 'attack7', 'attack8', 'attack5', 'attack6', 'attack7', 'attack8', 'attack9', 'attack10'];
-
-    for (let i = 0; i < attackFrames.length; i++) {
-      assert.equal(states[`enf_atk${i + 1}`].keyframe, attackFrames[i]);
-    }
-
-    assert.equal(states.enf_atk14.nextState, 'enf_run1');
-    assert.equal(states.enf_paina4.nextState, 'enf_run1');
-    assert.equal(states.enf_painb5.nextState, 'enf_run1');
-    assert.equal(states.enf_painc8.nextState, 'enf_run1');
-    assert.equal(states.enf_paind19.nextState, 'enf_run1');
-  });
-
-  void test('death sequences remain terminal', () => {
-    const states = ArmyEnforcerMonster._states;
-    assert.equal(states.enf_die14.nextState, 'enf_die14');
-    assert.equal(states.enf_fdie11.nextState, 'enf_fdie11');
-  });
-
-  void test('inactive sequences omit handlers where expected', () => {
-    const states = ArmyEnforcerMonster._states;
-    assert.equal(states.enf_paina1.handler, null);
-    assert.equal(states.enf_painb1.handler, null);
-    assert.equal(states.enf_painc1.handler, null);
-    assert.equal(typeof states.enf_paind4.handler, 'function');
-    assert.equal(typeof states.enf_atk6.handler, 'function');
-  });
-});
diff --git a/test/game/id1-subs.test.mjs b/test/game/id1-subs.test.mjs
deleted file mode 100644
index 89e35107..00000000
--- a/test/game/id1-subs.test.mjs
+++ /dev/null
@@ -1,219 +0,0 @@
-import assert from 'node:assert/strict';
-import { describe, test } from 'node:test';
-
-import Vector from '../../source/shared/Vector.ts';
-
-await import('../../source/game/id1/GameAPI.ts');
-
-const { default: BaseEntity } = await import('../../source/game/id1/entity/BaseEntity.ts');
-const { DelayedThinkEntity, Sub, TriggerFieldEntity, TriggerFieldFlag } = await import('../../source/game/id1/entity/Subs.ts');
-
-/**
- * Create a minimal mock game API for helper tests.
- * @param {object} overrides Optional engine/game overrides.
- * @returns {object} Mock game API object.
- */
-function createMockGameAPI(overrides = {}) {
-  const engine = {
-    SpawnEntity() {
-      return null;
-    },
-    FindAllByFieldAndValue() {
-      return [];
-    },
-    PrecacheSound() {},
-    StartSound() {},
-    ...overrides.engine,
-  };
-
-  return {
-    time: 0,
-    engine,
-    worldspawn: overrides.worldspawn ?? null,
-    ...overrides,
-  };
-}
-
-class TestTargetEntity extends BaseEntity {
-  static classname = 'test_subs_target';
-
-  usedBy = null;
-  removed = false;
-
-  use(activatorEntity) {
-    this.usedBy = activatorEntity;
-  }
-
-  remove() {
-    this.removed = true;
-  }
-}
-
-void describe('Sub helpers', () => {
-  void test('useTargets keeps stock killtarget early-return behavior', () => {
-    const activator = new TestTargetEntity(null, createMockGameAPI()).initializeEntity();
-    const firstKilltarget = new TestTargetEntity(null, createMockGameAPI()).initializeEntity();
-    const target = new TestTargetEntity(null, createMockGameAPI()).initializeEntity();
-
-    let findCallCount = 0;
-    const worldspawn = new TestTargetEntity(null, createMockGameAPI()).initializeEntity();
-    worldspawn.findNextEntityByFieldAndValue = (field, value) => {
-      assert.equal(field, 'targetname');
-      assert.equal(value, 'remove_me');
-      findCallCount++;
-      return findCallCount === 1 ? firstKilltarget : null;
-    };
-    firstKilltarget.findNextEntityByFieldAndValue = () => {
-      findCallCount++;
-      return null;
-    };
-
-    const owner = new TestTargetEntity(null, createMockGameAPI({
-      worldspawn,
-      engine: {
-        FindAllByFieldAndValue() {
-          return [{ entity: target }];
-        },
-      },
-    })).initializeEntity();
-    owner.killtarget = 'remove_me';
-    owner.target = 'fire_me';
-
-    const sub = new Sub(owner);
-    sub.useTargets(activator);
-
-    assert.equal(firstKilltarget.removed, true);
-    assert.equal(target.usedBy, null);
-  });
-
-  void test('useTargets spawns delayed helper entities when delay is set', () => {
-    const activator = new TestTargetEntity(null, createMockGameAPI()).initializeEntity();
-    const spawnCalls = [];
-    const owner = new TestTargetEntity(null, createMockGameAPI({
-      engine: {
-        SpawnEntity(classname, initialData) {
-          spawnCalls.push({ classname, initialData });
-          return null;
-        },
-      },
-    })).initializeEntity();
-    owner.delay = 0.75;
-
-    const sub = new Sub(owner);
-    sub.useTargets(activator);
-
-    assert.equal(spawnCalls.length, 1);
-    assert.equal(spawnCalls[0].classname, DelayedThinkEntity.classname);
-    assert.equal(spawnCalls[0].initialData.owner, owner);
-    assert.equal(spawnCalls[0].initialData.activator, activator);
-    assert.equal(spawnCalls[0].initialData.delay, 0.75);
-  });
-});
-
-void describe('TriggerFieldEntity', () => {
-  void test('expands the touch bounds on spawn', () => {
-    const sizeCalls = [];
-    const entity = new TriggerFieldEntity(null, createMockGameAPI()).initializeEntity();
-    entity.mins.setTo(10, 20, 30);
-    entity.maxs.setTo(40, 50, 60);
-    entity.setSize = (mins, maxs) => {
-      sizeCalls.push({ mins: mins.copy(), maxs: maxs.copy() });
-    };
-
-    entity.spawn();
-
-    assert.equal(sizeCalls.length, 1);
-    assert.ok(sizeCalls[0].mins.equalsTo(-50, -40, 22));
-    assert.ok(sizeCalls[0].maxs.equalsTo(100, 110, 68));
-  });
-
-  void test('respects actor and debounce gating before forwarding use', () => {
-    const usedBy = [];
-    const owner = new TestTargetEntity(null, createMockGameAPI()).initializeEntity();
-    owner.use = (entity) => {
-      usedBy.push(entity);
-    };
-
-    const field = new TriggerFieldEntity(null, createMockGameAPI()).initializeEntity();
-    field.owner = owner;
-
-    const nonActor = new TestTargetEntity(null, createMockGameAPI()).initializeEntity();
-    field.touch(nonActor);
-    assert.equal(usedBy.length, 0);
-
-    class ActorEntity extends TestTargetEntity {
-      isActor() {
-        return true;
-      }
-    }
-
-    const actor = new ActorEntity(null, createMockGameAPI()).initializeEntity();
-    actor.health = 25;
-    field.touch(actor);
-    assert.equal(usedBy.length, 1);
-    assert.equal(usedBy[0], actor);
-    assert.equal(field.attack_finished, 1);
-
-    field.touch(actor);
-    assert.equal(usedBy.length, 1);
-
-    field.game.time = 1.5;
-    field.flags = TriggerFieldFlag.TFF_ANY_ENTITY_TRIGGERS;
-    field.touch(nonActor);
-    assert.equal(usedBy.length, 2);
-    assert.equal(usedBy[1], nonActor);
-  });
-});
-
-void describe('Sub movement helpers', () => {
-  void test('setMovedir preserves Quake up/down angle sentinels', () => {
-    const entity = new TestTargetEntity(null, createMockGameAPI()).initializeEntity();
-    entity.angles.setTo(0, -1, 0);
-
-    const sub = new Sub(entity);
-    sub.setMovedir();
-    assert.ok(entity.movedir.equalsTo(0, 0, 1));
-    assert.ok(entity.angles.equalsTo(0, 0, 0));
-
-    entity.angles.setTo(0, -2, 0);
-    sub.setMovedir();
-    assert.ok(entity.movedir.equalsTo(0, 0, -1));
-
-    entity.angles.setTo(0, 0, 0);
-    sub.setMovedir();
-    assert.ok(entity.movedir.equalsTo(1, 0, 0));
-  });
-
-  void test('calcMove schedules a completion think and velocity toward the destination', () => {
-    const scheduleCalls = [];
-    const entity = new TestTargetEntity(null, createMockGameAPI()).initializeEntity();
-    entity.origin.setTo(0, 0, 0);
-    entity.ltime = 10;
-    entity._scheduleThink = (time, callback, identifier) => {
-      scheduleCalls.push({ time, callback, identifier });
-    };
-    entity.setOrigin = (origin) => {
-      entity.origin.set(origin);
-    };
-
-    const sub = new Sub(entity);
-  entity._sub = sub;
-    const destination = new Vector(100, 0, 0);
-    let callbackCount = 0;
-
-    sub.calcMove(destination, 50, function () {
-      callbackCount++;
-    });
-
-    assert.equal(scheduleCalls.length, 1);
-    assert.equal(scheduleCalls[0].time, 12);
-    assert.equal(scheduleCalls[0].identifier, 'sub-calcmove');
-    assert.ok(entity.velocity.equalsTo(50, 0, 0));
-
-    scheduleCalls[0].callback.call(entity, entity);
-
-    assert.ok(entity.origin.equalsTo(100, 0, 0));
-    assert.ok(entity.velocity.equalsTo(0, 0, 0));
-    assert.equal(callbackCount, 1);
-  });
-});
diff --git a/test/game/id1-tarbaby.test.mjs b/test/game/id1-tarbaby.test.mjs
deleted file mode 100644
index 10617bd4..00000000
--- a/test/game/id1-tarbaby.test.mjs
+++ /dev/null
@@ -1,178 +0,0 @@
-import { describe, test } from 'node:test';
-import assert from 'node:assert/strict';
-
-import Vector from '../../source/shared/Vector.ts';
-import { tentType } from '../../source/game/id1/Defs.ts';
-
-await import('../../source/game/id1/GameAPI.ts');
-
-const { default: TarbabyMonsterEntity } = await import('../../source/game/id1/entity/monster/Tarbaby.ts');
-
-TarbabyMonsterEntity._initStates();
-
-/**
- * Create a minimal Tarbaby fixture for focused behavior tests.
- * @param {typeof TarbabyMonsterEntity} MonsterClass Monster constructor under test.
- * @returns {{ entity: TarbabyMonsterEntity, events: Array<{ eventType: number, origin: Vector }> }} Monster fixture and captured temp events.
- */
-function createMonsterFixture(MonsterClass) {
-  const edict = {
-    num: 1,
-    entity: null,
-    freeEdict() {},
-    setOrigin() {},
-    setModel() {},
-    setMinMaxSize() {},
-    walkMove() {
-      return false;
-    },
-    changeYaw() {
-      return 0;
-    },
-    dropToFloor() {
-      return true;
-    },
-    isOnTheFloor() {
-      return false;
-    },
-    makeStatic() {},
-    aim() {
-      return null;
-    },
-    moveToGoal() {
-      return false;
-    },
-    isInPXS() {
-      return true;
-    },
-    getNextBestClient() {
-      return null;
-    },
-  };
-
-  const events = [];
-
-  const engine = {
-    IsLoading() {
-      return false;
-    },
-    PrecacheModel() {},
-    PrecacheSound() {},
-    ParseQC() {
-      return null;
-    },
-    StartSound() {},
-    SpawnEntity() {
-      return { entity: null };
-    },
-    DispatchTempEntityEvent(eventType, origin) {
-      events.push({ eventType, origin: origin.copy() });
-    },
-    eventBus: {
-      publish() {},
-    },
-  };
-
-  const gameAPI = {
-    engine,
-    time: 0,
-    skill: 1,
-    deathmatch: 0,
-    nomonsters: 0,
-  };
-
-  const entity = new MonsterClass(edict, gameAPI).initializeEntity();
-  edict.entity = entity;
-  entity.origin = new Vector(10, 20, 30);
-  entity.velocity = new Vector(100, 0, 0);
-
-  return { entity, events };
-}
-
-void describe('TarbabyMonsterEntity metadata', () => {
-  void test('class metadata matches the original monster', () => {
-    assert.equal(TarbabyMonsterEntity.classname, 'monster_tarbaby');
-    assert.equal(TarbabyMonsterEntity._health, 80);
-    assert.equal(TarbabyMonsterEntity._modelDefault, 'progs/tarbaby.mdl');
-  });
-
-  void test('size vectors are correct', () => {
-    const [mins, maxs] = TarbabyMonsterEntity._size;
-    assert.deepEqual([mins[0], mins[1], mins[2]], [-16, -16, -24]);
-    assert.deepEqual([maxs[0], maxs[1], maxs[2]], [16, 16, 40]);
-  });
-});
-
-void describe('TarbabyMonsterEntity state machine', () => {
-  void test('stand and hang states loop on a single frame', () => {
-    const states = TarbabyMonsterEntity._states;
-
-    assert.equal(states.tbaby_stand1.keyframe, 'walk1');
-    assert.equal(states.tbaby_stand1.nextState, 'tbaby_stand1');
-    assert.equal(states.tbaby_hang1.keyframe, 'walk1');
-    assert.equal(states.tbaby_hang1.nextState, 'tbaby_hang1');
-  });
-
-  void test('walk and run loops match the QuakeC frame counts', () => {
-    const states = TarbabyMonsterEntity._states;
-
-    for (let i = 1; i <= 25; i++) {
-      assert.equal(states[`tbaby_walk${i}`].keyframe, `walk${i}`);
-      assert.equal(states[`tbaby_run${i}`].keyframe, `run${i}`);
-    }
-    assert.equal(states.tbaby_walk25.nextState, 'tbaby_walk1');
-    assert.equal(states.tbaby_run25.nextState, 'tbaby_run1');
-  });
-
-  void test('jump and fly chains follow the legacy bounce cycle', () => {
-    const states = TarbabyMonsterEntity._states;
-
-    for (let i = 1; i <= 6; i++) {
-      assert.equal(states[`tbaby_jump${i}`].keyframe, `jump${i}`);
-    }
-    assert.equal(states.tbaby_jump6.nextState, 'tbaby_fly1');
-
-    for (let i = 1; i <= 4; i++) {
-      assert.equal(states[`tbaby_fly${i}`].keyframe, `fly${i}`);
-    }
-    assert.equal(states.tbaby_fly4.nextState, 'tbaby_fly1');
-  });
-
-  void test('death sequence terminates after the explosion frame', () => {
-    const states = TarbabyMonsterEntity._states;
-
-    assert.equal(states.tbaby_die1.keyframe, 'exp');
-    assert.equal(states.tbaby_die1.nextState, 'tbaby_die2');
-    assert.equal(states.tbaby_die2.keyframe, 'exp');
-    assert.equal(states.tbaby_die2.nextState, null);
-  });
-
-  void test('all tarbaby states currently carry handlers', () => {
-    const states = TarbabyMonsterEntity._states;
-
-    for (const name of ['tbaby_stand1', 'tbaby_hang1', 'tbaby_walk1', 'tbaby_walk25', 'tbaby_run1', 'tbaby_run25', 'tbaby_jump5', 'tbaby_jump6', 'tbaby_fly1', 'tbaby_fly4', 'tbaby_die1', 'tbaby_die2']) {
-      assert.equal(typeof states[name].handler, 'function', `${name} handler should be a function`);
-    }
-  });
-});
-
-void describe('TarbabyMonsterEntity QC fixes', () => {
-  void test('death explosion emits TE_TAREXPLOSION and removes the entity', () => {
-    const { entity, events } = createMonsterFixture(TarbabyMonsterEntity);
-    let removed = false;
-
-    entity._damageInflictor = {
-      blastDamage() {},
-    };
-    entity.startSound = () => {};
-    entity.remove = () => {
-      removed = true;
-    };
-
-    entity._dieInAnExplosion();
-
-    assert.equal(events.length, 1);
-    assert.equal(events[0].eventType, tentType.TE_TAREXPLOSION);
-    assert.equal(removed, true);
-  });
-});
diff --git a/test/game/id1-triggers.test.mjs b/test/game/id1-triggers.test.mjs
deleted file mode 100644
index ec5e2224..00000000
--- a/test/game/id1-triggers.test.mjs
+++ /dev/null
@@ -1,211 +0,0 @@
-import assert from 'node:assert/strict';
-import { describe, test } from 'node:test';
-
-import Vector from '../../source/shared/Vector.ts';
-
-await import('../../source/game/id1/GameAPI.ts');
-
-const { damage, flags, solid } = await import('../../source/game/id1/Defs.ts');
-const { default: BaseEntity } = await import('../../source/game/id1/entity/BaseEntity.ts');
-const { TeleportEffectEntity } = await import('../../source/game/id1/entity/Misc.ts');
-const { PlayerEntity, TelefragTriggerEntity } = await import('../../source/game/id1/entity/Player.ts');
-const {
-  CountTriggerEntity,
-  InfoTeleportDestination,
-  MultipleTriggerEntity,
-  TeleportTriggerEntity,
-  TriggerMonsterjumpEntity,
-} = await import('../../source/game/id1/entity/Triggers.ts');
-
-/**
- * Create a minimal mock game API for trigger tests.
- * @param {object} overrides Optional engine/game overrides.
- * @returns {object} Mock game API object.
- */
-function createMockGameAPI(overrides = {}) {
-  const engine = {
-    SpawnEntity() {
-      return null;
-    },
-    SpawnAmbientSound() {},
-    PrecacheSound() {},
-    BroadcastPrint() {},
-    SetCvar() {},
-    eventBus: {
-      publish() {},
-    },
-    ...overrides.engine,
-  };
-
-  return {
-    time: 0,
-    engine,
-    noexit: 0,
-    mapname: 'e1m1',
-    coop: 0,
-    deathmatch: 0,
-    force_retouch: 0,
-    loadNextMap() {},
-    startIntermission() {},
-    ...overrides,
-  };
-}
-
-class TestEntity extends BaseEntity {
-  static classname = 'test_trigger_entity';
-
-  removed = false;
-
-  remove() {
-    this.removed = true;
-  }
-}
-
-/**
- * Build a player-shaped test double that satisfies instanceof checks.
- * @param {object} overrides Optional field or method overrides.
- * @returns {PlayerEntity} Player-like test entity.
- */
-function createPlayerStub(overrides = {}) {
-  return Object.assign(Object.create(PlayerEntity.prototype), {
-    health: 100,
-    solid: solid.SOLID_SLIDEBOX,
-    flags: flags.FL_ONGROUND,
-    origin: new Vector(),
-    angles: new Vector(),
-    velocity: new Vector(),
-    fixangle: false,
-    teleport_time: 0,
-    fly_time: 0,
-    netname: 'Player',
-    centerPrint() {},
-    startSound() {},
-    setOrigin(origin) {
-      this.origin.set(origin);
-    },
-    ...overrides,
-  });
-}
-
-void describe('Triggers port', () => {
-  void test('MultipleTriggerEntity applies QC defaults and rearms health-gated triggers', () => {
-    const scheduledThinks = [];
-    const entity = new MultipleTriggerEntity(null, createMockGameAPI()).initializeEntity();
-    entity.model = '*1';
-    entity.health = 12;
-    entity.setModel = () => {};
-    entity.setOrigin = () => {};
-    entity._scheduleThink = (nextThink, callback) => {
-      scheduledThinks.push({ nextThink, callback });
-    };
-
-    entity.spawn();
-
-    assert.equal(entity.wait, 0.2);
-    assert.equal(entity.max_health, 12);
-    assert.equal(entity.takedamage, damage.DAMAGE_YES);
-    assert.equal(entity.solid, solid.SOLID_BBOX);
-
-    entity._sub = {
-      useTargets() {},
-      setMovedir() {},
-    };
-    entity._trigger(new TestEntity(null, createMockGameAPI()).initializeEntity());
-
-    assert.equal(scheduledThinks.length, 1);
-    scheduledThinks[0].callback();
-    assert.equal(entity._isActive, false);
-    assert.equal(entity.health, 12);
-  });
-
-  void test('CountTriggerEntity shows countdown text and fires when it reaches zero', () => {
-    const prints = [];
-    const usedTargets = [];
-    const player = createPlayerStub({
-      centerPrint(message) {
-        prints.push(message);
-      },
-    });
-    const entity = new CountTriggerEntity(null, createMockGameAPI()).initializeEntity();
-    entity._sub = {
-      useTargets(userEntity) {
-        usedTargets.push(userEntity);
-      },
-      setMovedir() {},
-    };
-    entity.lazyRemove = () => {
-      entity.removed = true;
-    };
-    entity.count = 2;
-
-    entity.use(player);
-    entity.use(player);
-
-    assert.deepEqual(prints, ['Only 1 more to go...', 'Sequence completed!']);
-    assert.deepEqual(usedTargets, [player]);
-  });
-
-  void test('TeleportTriggerEntity moves players, spawns effects, and sets exit velocity', () => {
-    const spawnRequests = [];
-    const usedTargets = [];
-    const player = createPlayerStub();
-    player.origin.setTo(10, 20, 30);
-    player.velocity.setTo(1, 2, 3);
-
-    const destination = new InfoTeleportDestination(null, createMockGameAPI()).initializeEntity();
-    destination.origin.setTo(100, 200, 300);
-    destination.mangle.setTo(0, 0, 0);
-
-    const entity = new TeleportTriggerEntity(null, createMockGameAPI({
-      time: 5,
-      engine: {
-        SpawnEntity(classname, initialData) {
-          spawnRequests.push({ classname, initialData });
-          return { entity: null };
-        },
-      },
-    })).initializeEntity();
-    entity._sub = {
-      useTargets(userEntity) {
-        usedTargets.push(userEntity);
-      },
-      setMovedir() {},
-    };
-    entity.target = 'tele_dest';
-    entity.findFirstEntityByFieldAndValue = () => destination;
-
-    entity.touch(player);
-
-    assert.deepEqual(usedTargets, [player]);
-    assert.equal(spawnRequests.length, 3);
-    assert.equal(spawnRequests[0].classname, TeleportEffectEntity.classname);
-    assert.equal(spawnRequests[1].classname, TeleportEffectEntity.classname);
-    assert.equal(spawnRequests[2].classname, TelefragTriggerEntity.classname);
-    assert.ok(player.origin.equalsTo(100, 200, 300));
-    assert.ok(player.angles.equalsTo(0, 0, 0));
-    assert.equal(player.fixangle, true);
-    assert.equal(player.teleport_time, 5.7);
-    assert.ok(player.velocity.equalsTo(300, 0, 0));
-    assert.equal((player.flags & flags.FL_ONGROUND) === 0, true);
-  });
-
-  void test('TriggerMonsterjumpEntity applies defaults and launches grounded monsters', () => {
-    const entity = new TriggerMonsterjumpEntity(null, createMockGameAPI()).initializeEntity();
-    entity.model = '*2';
-    entity.setModel = () => {};
-    entity.spawn();
-
-    assert.equal(entity.speed, 200);
-    assert.equal(entity.height, 200);
-    entity.movedir.setTo(1, 0, 0);
-
-    const monster = new TestEntity(null, createMockGameAPI()).initializeEntity();
-    monster.flags = flags.FL_MONSTER | flags.FL_ONGROUND;
-    monster.velocity.setTo(0, 0, 5);
-
-    entity.touch(monster);
-
-    assert.ok(monster.velocity.equalsTo(200, 0, 200));
-    assert.equal((monster.flags & flags.FL_ONGROUND) === 0, true);
-  });
-});
diff --git a/test/game/id1-weapons.test.mjs b/test/game/id1-weapons.test.mjs
deleted file mode 100644
index f8ae7799..00000000
--- a/test/game/id1-weapons.test.mjs
+++ /dev/null
@@ -1,60 +0,0 @@
-import assert from 'node:assert/strict';
-import { describe, test } from 'node:test';
-
-await import('../../source/game/id1/GameAPI.ts');
-
-const weaponsModule = await import('../../source/game/id1/entity/Weapons.ts');
-
-const { Backpack, Spike } = weaponsModule;
-
-/**
- * Create the minimal game API surface required by the weapon helper tests.
- * @returns {object} Mock game API.
- */
-function createMockGameAPI() {
-  return {
-    time: 0,
-    engine: {
-      IsLoading() {
-        return false;
-      },
-    },
-  };
-}
-
-void describe('Weapons projectile helpers', () => {
-  void test('registers Backpack ammo and weapon fields through serializer decorators', () => {
-    const serializableFields = Reflect.get(Backpack, 'serializableFields');
-
-    assert.equal(Array.isArray(serializableFields), true);
-    assert.equal(serializableFields.includes('ammo_shells'), true);
-    assert.equal(serializableFields.includes('ammo_nails'), true);
-    assert.equal(serializableFields.includes('ammo_rockets'), true);
-    assert.equal(serializableFields.includes('ammo_cells'), true);
-    assert.equal(serializableFields.includes('items'), true);
-    assert.equal(serializableFields.includes('weapon'), true);
-  });
-
-  void test('inherits the shared explosion state chain on projectile classes', () => {
-    Spike._initStates();
-
-    const states = Spike._states;
-
-    assert.equal(states.s_explode1.keyframe, 0);
-    assert.equal(states.s_explode1.nextState, 's_explode2');
-    assert.equal(states.s_explode5.nextState, 's_explode6');
-    assert.equal(states.s_explode6.nextState, null);
-    assert.equal(typeof states.s_explode6.handler, 'function');
-  });
-
-  void test('keeps spike speed serializable while helper wrappers stay runtime-only', () => {
-    const spike = new Spike(null, createMockGameAPI()).initializeEntity();
-    const serialized = spike._serializer.serialize();
-
-    assert.equal(spike.speed, 0);
-    assert.ok('_damageInflictor' in spike);
-    assert.ok('speed' in serialized);
-    assert.ok(!('_damageInflictor' in serialized), '_damageInflictor should not be serialized');
-    assert.ok(!('_explosions' in serialized), '_explosions should not be serialized');
-  });
-});
diff --git a/test/game/id1-wizard.test.mjs b/test/game/id1-wizard.test.mjs
deleted file mode 100644
index 7762559d..00000000
--- a/test/game/id1-wizard.test.mjs
+++ /dev/null
@@ -1,240 +0,0 @@
-import { describe, test } from 'node:test';
-import assert from 'node:assert/strict';
-
-import Vector from '../../source/shared/Vector.ts';
-import { range } from '../../source/game/id1/Defs.ts';
-import { ATTACK_STATE } from '../../source/game/id1/helper/AI.ts';
-
-await import('../../source/game/id1/GameAPI.ts');
-
-const { default: WizardMonsterEntity } = await import('../../source/game/id1/entity/monster/Wizard.ts');
-
-WizardMonsterEntity._initStates();
-
-/**
- * Create a minimal Wizard fixture for focused behavior tests.
- * @param {typeof WizardMonsterEntity} MonsterClass Monster constructor under test.
- * @returns {WizardMonsterEntity} Monster fixture instance.
- */
-function createMonsterFixture(MonsterClass) {
-  const edict = {
-    num: 1,
-    entity: null,
-    freeEdict() {},
-    setOrigin() {},
-    setModel() {},
-    setMinMaxSize() {},
-    walkMove() {
-      return false;
-    },
-    changeYaw() {
-      return 0;
-    },
-    dropToFloor() {
-      return true;
-    },
-    isOnTheFloor() {
-      return false;
-    },
-    makeStatic() {},
-    aim() {
-      return null;
-    },
-    moveToGoal() {
-      return false;
-    },
-    isInPXS() {
-      return true;
-    },
-    getNextBestClient() {
-      return null;
-    },
-  };
-
-  const engine = {
-    IsLoading() {
-      return false;
-    },
-    PrecacheModel() {},
-    PrecacheSound() {},
-    ParseQC() {
-      return null;
-    },
-    StartSound() {},
-    SpawnEntity() {
-      return { entity: null };
-    },
-    eventBus: {
-      publish() {},
-    },
-  };
-
-  const gameAPI = {
-    engine,
-    time: 5,
-    skill: 1,
-    deathmatch: 0,
-    nomonsters: 0,
-  };
-
-  const entity = new MonsterClass(edict, gameAPI).initializeEntity();
-  edict.entity = entity;
-  entity.origin = new Vector();
-  entity.angles = new Vector();
-  entity.enemy = {
-    origin: new Vector(128, 0, 0),
-    velocity: new Vector(),
-    view_ofs: new Vector(0, 0, 22),
-    mins: new Vector(-16, -16, -24),
-    size: new Vector(32, 32, 56),
-    health: 100,
-  };
-
-  return entity;
-}
-
-void describe('WizardMonsterEntity metadata', () => {
-  void test('class metadata matches the original monster', () => {
-    assert.equal(WizardMonsterEntity.classname, 'monster_wizard');
-    assert.equal(WizardMonsterEntity._health, 80);
-    assert.equal(WizardMonsterEntity._modelDefault, 'progs/wizard.mdl');
-    assert.equal(WizardMonsterEntity._modelHead, 'progs/h_wizard.mdl');
-  });
-
-  void test('size vectors are correct', () => {
-    const [mins, maxs] = WizardMonsterEntity._size;
-    assert.deepEqual([mins[0], mins[1], mins[2]], [-16, -16, -24]);
-    assert.deepEqual([maxs[0], maxs[1], maxs[2]], [16, 16, 40]);
-  });
-});
-
-void describe('WizardMonsterEntity state machine', () => {
-  void test('stand, walk, side, and run loops match the QuakeC frame counts', () => {
-    const states = WizardMonsterEntity._states;
-
-    for (let i = 1; i <= 8; i++) {
-      assert.equal(states[`wiz_stand${i}`].keyframe, `hover${i}`);
-      assert.equal(states[`wiz_walk${i}`].keyframe, `hover${i}`);
-      assert.equal(states[`wiz_side${i}`].keyframe, `hover${i}`);
-    }
-    assert.equal(states.wiz_stand8.nextState, 'wiz_stand1');
-    assert.equal(states.wiz_walk8.nextState, 'wiz_walk1');
-    assert.equal(states.wiz_side8.nextState, 'wiz_side1');
-
-    for (let i = 1; i <= 14; i++) {
-      assert.equal(states[`wiz_run${i}`].keyframe, `fly${i}`);
-    }
-    assert.equal(states.wiz_run14.nextState, 'wiz_run1');
-  });
-
-  void test('fast attack, pain, and death chains keep the original frame ordering', () => {
-    const states = WizardMonsterEntity._states;
-
-    assert.equal(states.wiz_fast1.keyframe, 'magatt1');
-    assert.equal(states.wiz_fast7.keyframe, 'magatt5');
-    assert.equal(states.wiz_fast8.keyframe, 'magatt4');
-    assert.equal(states.wiz_fast10.keyframe, 'magatt2');
-    assert.equal(states.wiz_fast10.nextState, 'wiz_run1');
-
-    for (let i = 1; i <= 4; i++) {
-      assert.equal(states[`wiz_pain${i}`].keyframe, `pain${i}`);
-    }
-    assert.equal(states.wiz_pain4.nextState, 'wiz_run1');
-
-    for (let i = 1; i <= 8; i++) {
-      assert.equal(states[`wiz_death${i}`].keyframe, `death${i}`);
-    }
-    assert.equal(states.wiz_death8.nextState, null);
-  });
-});
-
-void describe('WizardMonsterEntity QC fixes', () => {
-  void test('pain can fail to flinch on low damage', () => {
-    const wizard = createMonsterFixture(WizardMonsterEntity);
-    const originalRandom = Math.random;
-    let stateName = null;
-
-    wizard.startSound = () => {};
-    wizard._ai = {
-      foundTarget() {},
-    };
-    wizard._runState = (nextState) => {
-      stateName = nextState;
-      return true;
-    };
-
-    try {
-      Math.random = () => 0.99;
-      wizard.thinkPain({ origin: new Vector() }, 10);
-    } finally {
-      Math.random = originalRandom;
-    }
-
-    assert.equal(stateName, null);
-  });
-
-  void test('pain still flinches when the damage check succeeds', () => {
-    const wizard = createMonsterFixture(WizardMonsterEntity);
-    const originalRandom = Math.random;
-    let stateName = null;
-
-    wizard.startSound = () => {};
-    wizard._ai = {
-      foundTarget() {},
-    };
-    wizard._runState = (nextState) => {
-      stateName = nextState;
-      return true;
-    };
-
-    try {
-      Math.random = () => 0;
-      wizard.thinkPain({ origin: new Vector() }, 10);
-    } finally {
-      Math.random = originalRandom;
-    }
-
-    assert.equal(stateName, 'wiz_pain1');
-  });
-
-  void test('attack finish applies the original cooldown and resumes straight movement at mid range', () => {
-    const wizard = createMonsterFixture(WizardMonsterEntity);
-    let stateName = null;
-
-    wizard._ai = {
-      enemyRange: range.RANGE_MID,
-      enemyIsVisible: true,
-      _attackState: ATTACK_STATE.AS_MISSILE,
-    };
-    wizard._runState = (nextState) => {
-      stateName = nextState;
-      return true;
-    };
-
-    wizard._attackFinished();
-
-    assert.equal(wizard.attack_finished, 7);
-    assert.equal(wizard._ai._attackState, ATTACK_STATE.AS_STRAIGHT);
-    assert.equal(stateName, 'wiz_run1');
-  });
-
-  void test('attack finish switches to sliding movement at close visible range', () => {
-    const wizard = createMonsterFixture(WizardMonsterEntity);
-    let stateName = null;
-
-    wizard._ai = {
-      enemyRange: range.RANGE_NEAR,
-      enemyIsVisible: true,
-      _attackState: ATTACK_STATE.AS_MISSILE,
-    };
-    wizard._runState = (nextState) => {
-      stateName = nextState;
-      return true;
-    };
-
-    wizard._attackFinished();
-
-    assert.equal(wizard._ai._attackState, ATTACK_STATE.AS_SLIDING);
-    assert.equal(stateName, 'wiz_side1');
-  });
-});
diff --git a/test/game/id1-worldspawn.test.mjs b/test/game/id1-worldspawn.test.mjs
deleted file mode 100644
index 07fe08bd..00000000
--- a/test/game/id1-worldspawn.test.mjs
+++ /dev/null
@@ -1,187 +0,0 @@
-import { describe, test } from 'node:test';
-import assert from 'node:assert/strict';
-
-import Vector from '../../source/shared/Vector.ts';
-import { moveType } from '../../source/game/id1/Defs.ts';
-
-await import('../../source/game/id1/GameAPI.ts');
-
-const { BodyqueEntity, CopyToBodyQue, WorldspawnEntity } = await import('../../source/game/id1/entity/Worldspawn.ts');
-
-/**
- * Create a mock server edict that keeps entity fields in sync.
- * @param {number} num Edict slot number.
- * @returns {import('../../source/shared/GameInterfaces.ts').ServerEdict} Mock edict.
- */
-function createMockEdict(num) {
-  const entityRef = { current: null };
-
-  return /** @type {import('../../source/shared/GameInterfaces.ts').ServerEdict} */ ({
-    num,
-    entity: null,
-    freeEdict() {},
-    setOrigin(origin) {
-      entityRef.current.origin = origin.copy();
-    },
-    setModel(model) {
-      entityRef.current.model = model;
-    },
-    setMinMaxSize(mins, maxs) {
-      entityRef.current.mins = mins.copy();
-      entityRef.current.maxs = maxs.copy();
-    },
-    walkMove() {
-      return false;
-    },
-    changeYaw() {
-      return 0;
-    },
-    dropToFloor() {
-      return true;
-    },
-    isOnTheFloor() {
-      return false;
-    },
-    makeStatic() {},
-    aim() {
-      return null;
-    },
-    moveToGoal() {
-      return false;
-    },
-    isInPXS() {
-      return true;
-    },
-    getNextBestClient() {
-      return null;
-    },
-    __setEntity(entity) {
-      entityRef.current = entity;
-      this.entity = entity;
-    },
-  });
-}
-
-/**
- * Create a minimal worldspawn fixture with spawnable body queue entities.
- * @returns {{ worldspawn: WorldspawnEntity, gameAPI: object, precachedSounds: string[], precachedModels: string[], lightstyles: Array<{ style: number, value: string }>, cvars: Array<{ name: string, value: string }>, spawnClassnames: string[] }} Fixture data.
- */
-function createWorldspawnFixture() {
-  const precachedSounds = [];
-  const precachedModels = [];
-  const lightstyles = [];
-  const cvars = [];
-  const spawnClassnames = [];
-  let nextEdictNum = 10;
-  const gameAPI = {
-    engine: null,
-    worldspawn: /** @type {WorldspawnEntity|null} */ (null),
-    lastspawn: /** @type {WorldspawnEntity|null} */ (null),
-    bodyque_head: /** @type {BodyqueEntity|null} */ (null),
-  };
-
-  const engine = {
-    IsLoading() {
-      return false;
-    },
-    PrecacheSound(sound) {
-      precachedSounds.push(sound);
-    },
-    PrecacheModel(model) {
-      precachedModels.push(model);
-    },
-    ParseQC() {
-      return null;
-    },
-    SetCvar(name, value) {
-      cvars.push({ name, value });
-    },
-    Lightstyle(style, value) {
-      lightstyles.push({ style, value });
-    },
-    SpawnEntity(classname) {
-      spawnClassnames.push(classname);
-      if (classname !== BodyqueEntity.classname) {
-        return { entity: null };
-      }
-
-      const edict = createMockEdict(nextEdictNum++);
-      const entity = new BodyqueEntity(edict, gameAPI).initializeEntity().precacheEntity();
-      edict.__setEntity(entity);
-      return { entity };
-    },
-  };
-
-  gameAPI.engine = engine;
-
-  const worldspawnEdict = createMockEdict(1);
-  const worldspawn = new WorldspawnEntity(worldspawnEdict, gameAPI).initializeEntity().precacheEntity();
-  worldspawnEdict.__setEntity(worldspawn);
-  worldspawn.origin = new Vector();
-  worldspawn.model = 'maps/start.bsp';
-
-  return { worldspawn, gameAPI, precachedSounds, precachedModels, lightstyles, cvars, spawnClassnames };
-}
-
-void describe('WorldspawnEntity spawn', () => {
-  void test('creates a four-entry QC body queue ring and initializes world lighting', () => {
-    const previousWorldspawn = /** @type {WorldspawnEntity} */ ({ marker: 'previous' });
-    const { worldspawn, gameAPI, cvars, lightstyles, spawnClassnames, precachedSounds, precachedModels } = createWorldspawnFixture();
-
-    gameAPI.worldspawn = previousWorldspawn;
-    worldspawn.model = 'maps/e1m8.bsp';
-
-    worldspawn.spawn();
-
-    assert.equal(gameAPI.lastspawn, previousWorldspawn);
-    assert.equal(gameAPI.worldspawn, worldspawn);
-    assert.equal(spawnClassnames.length, 4);
-    assert.ok(gameAPI.bodyque_head instanceof BodyqueEntity);
-    assert.equal(gameAPI.bodyque_head.owner.owner.owner.owner, gameAPI.bodyque_head);
-    assert.deepEqual(cvars, [{ name: 'sv_gravity', value: '100' }]);
-    assert.equal(lightstyles.length, 13);
-    assert.deepEqual(lightstyles[0], { style: 0, value: 'm' });
-    assert.deepEqual(lightstyles.at(-1), { style: 63, value: 'a' });
-    assert.ok(precachedSounds.includes('demon/dland2.wav'));
-    assert.ok(precachedSounds.includes('misc/talk.wav'));
-    assert.ok(precachedModels.includes('progs/bolt3.mdl'));
-  });
-
-  void test('uses normal gravity outside END and copies corpse data into the body queue', () => {
-    const { worldspawn, gameAPI, cvars } = createWorldspawnFixture();
-    worldspawn.spawn();
-
-    const firstBody = gameAPI.bodyque_head;
-    const nextBody = firstBody.owner;
-    const player = {
-      angles: new Vector(10, 20, 30),
-      model: 'progs/player.mdl',
-      frame: 7,
-      colormap: 5,
-      movetype: moveType.MOVETYPE_WALK,
-      velocity: new Vector(1, 2, 3),
-      origin: new Vector(100, 200, 300),
-      mins: new Vector(-16, -16, -24),
-      maxs: new Vector(16, 16, 32),
-    };
-
-    CopyToBodyQue(gameAPI, /** @type {import('../../source/game/id1/entity/Player.ts').PlayerEntity} */ (player));
-
-    assert.deepEqual(cvars, [{ name: 'sv_gravity', value: '800' }]);
-    assert.ok(firstBody.angles.equalsTo(10, 20, 30));
-    assert.equal(firstBody.model, 'progs/player.mdl');
-    assert.equal(firstBody.frame, 7);
-    assert.equal(firstBody.colormap, 5);
-    assert.equal(firstBody.movetype, moveType.MOVETYPE_WALK);
-    assert.ok(firstBody.velocity.equalsTo(1, 2, 3));
-    assert.ok(firstBody.origin.equalsTo(100, 200, 300));
-    assert.ok(firstBody.mins.equalsTo(-16, -16, -24));
-    assert.ok(firstBody.maxs.equalsTo(16, 16, 32));
-    assert.equal(gameAPI.bodyque_head, nextBody);
-
-    player.angles.setTo(1, 1, 1);
-    player.velocity.setTo(9, 9, 9);
-    assert.ok(firstBody.angles.equalsTo(10, 20, 30));
-    assert.ok(firstBody.velocity.equalsTo(1, 2, 3));
-  });
-});
diff --git a/test/game/id1-zombie.test.mjs b/test/game/id1-zombie.test.mjs
deleted file mode 100644
index 080b40bb..00000000
--- a/test/game/id1-zombie.test.mjs
+++ /dev/null
@@ -1,233 +0,0 @@
-import { describe, test } from 'node:test';
-import assert from 'node:assert/strict';
-
-import Vector from '../../source/shared/Vector.ts';
-import { damage, moveType, solid } from '../../source/game/id1/Defs.ts';
-
-await import('../../source/game/id1/GameAPI.ts');
-
-const { default: ZombieMonster } = await import('../../source/game/id1/entity/monster/Zombie.ts');
-
-ZombieMonster._initStates();
-
-/**
- * Create a minimal Zombie fixture for focused behavior tests.
- * @param {typeof ZombieMonster} MonsterClass Monster constructor under test.
- * @returns {ZombieMonster} Monster fixture instance.
- */
-function createMonsterFixture(MonsterClass) {
-  const edict = {
-    num: 1,
-    entity: null,
-    freeEdict() {},
-    setOrigin() {},
-    setModel() {},
-    setMinMaxSize() {},
-    walkMove() {
-      return false;
-    },
-    changeYaw() {
-      return 0;
-    },
-    dropToFloor() {
-      return true;
-    },
-    isOnTheFloor() {
-      return false;
-    },
-    makeStatic() {},
-    aim() {
-      return null;
-    },
-    moveToGoal() {
-      return false;
-    },
-    isInPXS() {
-      return true;
-    },
-    getNextBestClient() {
-      return null;
-    },
-  };
-
-  const engine = {
-    IsLoading() {
-      return false;
-    },
-    PrecacheModel() {},
-    PrecacheSound() {},
-    ParseQC() {
-      return null;
-    },
-    StartSound() {},
-    SpawnEntity() {
-      return { entity: null };
-    },
-    eventBus: {
-      publish() {},
-    },
-  };
-
-  const gameAPI = {
-    engine,
-    time: 10,
-    skill: 1,
-    deathmatch: 0,
-    nomonsters: 0,
-  };
-
-  const entity = new MonsterClass(edict, gameAPI).initializeEntity();
-  edict.entity = entity;
-  entity.origin = new Vector();
-  entity.angles = new Vector();
-  entity.enemy = {
-    origin: new Vector(128, 0, 0),
-  };
-
-  return entity;
-}
-
-void describe('ZombieMonster metadata', () => {
-  void test('class metadata matches the original monster', () => {
-    assert.equal(ZombieMonster.classname, 'monster_zombie');
-    assert.equal(ZombieMonster._health, 60);
-    assert.equal(ZombieMonster._modelDefault, 'progs/zombie.mdl');
-    assert.equal(ZombieMonster._modelHead, 'progs/h_zombie.mdl');
-  });
-
-  void test('size vectors are correct', () => {
-    const [mins, maxs] = ZombieMonster._size;
-    assert.deepEqual([mins[0], mins[1], mins[2]], [-16, -16, -24]);
-    assert.deepEqual([maxs[0], maxs[1], maxs[2]], [16, 16, 40]);
-  });
-});
-
-void describe('ZombieMonster state machine', () => {
-  void test('stand, walk, and run loops match the QuakeC frame counts', () => {
-    const states = ZombieMonster._states;
-
-    for (let i = 1; i <= 15; i++) {
-      assert.equal(states[`zombie_stand${i}`].keyframe, `stand${i}`);
-    }
-    assert.equal(states.zombie_stand15.nextState, 'zombie_stand1');
-
-    for (let i = 1; i <= 19; i++) {
-      assert.equal(states[`zombie_walk${i}`].keyframe, `walk${i}`);
-    }
-    assert.equal(states.zombie_walk19.nextState, 'zombie_walk1');
-
-    for (let i = 1; i <= 18; i++) {
-      assert.equal(states[`zombie_run${i}`].keyframe, `run${i}`);
-    }
-    assert.equal(states.zombie_run18.nextState, 'zombie_run1');
-  });
-
-  void test('grenade and pain sequences return to the run loop', () => {
-    const states = ZombieMonster._states;
-
-    assert.equal(states.zombie_atta13.nextState, 'zombie_run1');
-    assert.equal(states.zombie_attb14.nextState, 'zombie_run1');
-    assert.equal(states.zombie_attc12.nextState, 'zombie_run1');
-
-    assert.equal(states.zombie_paina12.nextState, 'zombie_run1');
-    assert.equal(states.zombie_painb28.nextState, 'zombie_run1');
-    assert.equal(states.zombie_painc18.nextState, 'zombie_run1');
-    assert.equal(states.zombie_paind13.nextState, 'zombie_run1');
-    assert.equal(states.zombie_paine30.nextState, 'zombie_run1');
-  });
-
-  void test('crucified idle loop keeps all six frames', () => {
-    const states = ZombieMonster._states;
-
-    for (let i = 1; i <= 6; i++) {
-      assert.equal(states[`zombie_cruc${i}`].keyframe, `cruc_${i}`);
-    }
-    assert.equal(states.zombie_cruc6.nextState, 'zombie_cruc1');
-  });
-});
-
-void describe('ZombieMonster QC fixes', () => {
-  void test('crucified spawn disables damage and collision', () => {
-    const zombie = createMonsterFixture(ZombieMonster);
-    let stateName = null;
-
-    zombie.spawnflags = ZombieMonster.SPAWN_CRUCIFIED;
-    zombie._runState = (nextState) => {
-      stateName = nextState;
-      return true;
-    };
-
-    zombie._postSpawn();
-
-    assert.equal(zombie.movetype, moveType.MOVETYPE_NONE);
-    assert.equal(zombie.takedamage, damage.DAMAGE_NO);
-    assert.equal(zombie.solid, solid.SOLID_NOT);
-    assert.equal(zombie._damageHandler, null);
-    assert.equal(stateName, 'zombie_cruc1');
-  });
-
-  void test('major pain hits reset health to 60 and knock the zombie down', () => {
-    const zombie = createMonsterFixture(ZombieMonster);
-    let stateName = null;
-
-    zombie.health = 5;
-    zombie._runState = (nextState) => {
-      stateName = nextState;
-      return true;
-    };
-    zombie._ai = {
-      foundTarget() {},
-    };
-
-    zombie.thinkPain({ origin: new Vector() }, 25);
-
-    assert.equal(zombie.health, 60);
-    assert.equal(zombie.inpain, 2);
-    assert.equal(stateName, 'zombie_paine1');
-  });
-
-  void test('blocked stand-up retries the paine11 recovery frame', () => {
-    const zombie = createMonsterFixture(ZombieMonster);
-    let stateName = null;
-
-    zombie.walkMove = () => false;
-    zombie._runState = (nextState) => {
-      stateName = nextState;
-      return true;
-    };
-    zombie.startSound = () => {};
-
-    zombie._standUp();
-
-    assert.equal(zombie.health, 60);
-    assert.equal(zombie.solid, solid.SOLID_SLIDEBOX);
-    assert.equal(stateName, 'zombie_paine11');
-  });
-
-  void test('missile choice keeps the original attack thresholds', () => {
-    const zombie = createMonsterFixture(ZombieMonster);
-    const originalRandom = Math.random;
-    let stateName = null;
-
-    zombie._runState = (nextState) => {
-      stateName = nextState;
-      return true;
-    };
-
-    try {
-      Math.random = () => 0.2;
-      zombie.thinkMissile();
-      assert.equal(stateName, 'zombie_atta1');
-
-      Math.random = () => 0.5;
-      zombie.thinkMissile();
-      assert.equal(stateName, 'zombie_attb1');
-
-      Math.random = () => 0.9;
-      zombie.thinkMissile();
-      assert.equal(stateName, 'zombie_attc1');
-    } finally {
-      Math.random = originalRandom;
-    }
-  });
-});
diff --git a/test/game/quake-entity-ai.test.mjs b/test/game/quake-entity-ai.test.mjs
deleted file mode 100644
index 91730c2c..00000000
--- a/test/game/quake-entity-ai.test.mjs
+++ /dev/null
@@ -1,307 +0,0 @@
-import { describe, test } from 'node:test';
-import assert from 'node:assert/strict';
-
-import Vector from '../../source/shared/Vector.ts';
-
-import { flags, items, worldType } from '../../source/game/id1/Defs.ts';
-import { entityClasses } from '../../source/game/id1/GameAPI.ts';
-
-const OgreEntity = entityClasses.find((entityClass) => entityClass.classname === 'monster_ogre');
-const PlayerCtor = entityClasses.find((entityClass) => entityClass.classname === 'player');
-
-assert.ok(OgreEntity, 'monster_ogre must be registered in GameAPI');
-assert.ok(PlayerCtor, 'player must be registered in GameAPI');
-
-/**
- * Create a minimal edict stub for AI tests.
- * @param {number} num Edict slot number.
- * @returns {object} Mock edict.
- */
-function createMockEdict(num) {
-  return {
-    num,
-    entity: null,
-    equals(other) {
-      return this === other;
-    },
-    freeEdict() {},
-    setOrigin() {},
-    setModel() {},
-    setMinMaxSize() {},
-    walkMove() {
-      return false;
-    },
-    changeYaw() {
-      return 0;
-    },
-    dropToFloor() {
-      return true;
-    },
-    isOnTheFloor() {
-      return false;
-    },
-    makeStatic() {},
-    aim() {
-      return null;
-    },
-    getNextBestClient() {
-      return null;
-    },
-    moveToGoal() {
-      return false;
-    },
-    isInPXS() {
-      return true;
-    },
-  };
-}
-
-/**
- * Create the minimal engine surface required by the AI harness.
- * @returns {object} Mock engine API.
- */
-function createMockEngine() {
-  return {
-    IsLoading() {
-      return false;
-    },
-    PrecacheModel() {},
-    PrecacheSound() {},
-    StartSound() {},
-    SpawnAmbientSound() {},
-    SpawnEntity() {
-      return { entity: null };
-    },
-    FindByFieldAndValue() {
-      return null;
-    },
-    FindAllByFieldAndValue() {
-      return [];
-    },
-    ParseQC() {
-      return null;
-    },
-    Traceline() {
-      return null;
-    },
-    SetAreaPortalState() {},
-    GetCvar() {
-      return { value: 0 };
-    },
-    GetPHS() {
-      return null;
-    },
-    GetAreaForPoint() {
-      return 0;
-    },
-    AreasConnected() {
-      return true;
-    },
-    NavigateAsync() {
-      return Promise.resolve(null);
-    },
-    ConsoleDebug() {},
-    eventBus: {
-      publish() {},
-    },
-  };
-}
-
-/**
- * Create shared game-wide AI state for the harness.
- * @returns {object} Mock game AI state.
- */
-function createMockGameAI() {
-  return {
-    _sightEntity: null,
-    _sightEntityTime: 0,
-    _sightEntityLastOrigin: new Vector(),
-  };
-}
-
-/**
- * @returns {InstanceType<typeof OgreEntity>} monster fixture with a minimal engine API
- */
-function createMonsterVisibilityFixture() {
-  const edict = createMockEdict(1);
-  const engine = createMockEngine();
-
-  const gameAPI = {
-    engine,
-    time: 1,
-    coop: 0,
-    worldspawn: {
-      worldtype: worldType.MEDIEVAL,
-    },
-    gameAI: createMockGameAI(),
-  };
-
-  const entity = new OgreEntity(edict, gameAPI).initializeEntity();
-  edict.entity = entity;
-
-  entity.health = 200;
-  entity.origin = new Vector();
-  entity.view_ofs = new Vector();
-  entity.angles = new Vector();
-  entity.enemy = null;
-  entity.goalentity = null;
-  entity.movetarget = null;
-  entity.show_hostile = 0;
-  entity.spawnflags = 0;
-  entity.effects = 0;
-  entity.flags = 0;
-  entity.items = 0;
-  entity.ideal_yaw = 0;
-  entity.attack_finished = 0;
-  entity.nextthink = 0;
-  entity.yaw_speed = 20;
-  entity.pausetime = Infinity;
-  entity.sightSound = () => {};
-  entity.thinkRun = () => {};
-  entity.thinkStand = () => {};
-  entity.thinkWalk = () => {};
-  entity._scheduleThink = (...args) => {
-    entity._scheduledThinkArgs = args;
-  };
-  entity.attackFinished = (delay) => {
-    entity.attack_finished = gameAPI.time + delay;
-  };
-  entity.getNextBestClient = () => null;
-
-  return entity;
-}
-
-/**
- * Create a player fixture compatible with the monster AI routines.
- * @returns {InstanceType<typeof PlayerCtor>} Mock player entity.
- */
-function createPlayerFixture() {
-  const edict = createMockEdict(2);
-  const engine = createMockEngine();
-
-  const gameAPI = {
-    engine,
-    time: 0,
-    coop: 0,
-    worldspawn: {
-      worldtype: worldType.MEDIEVAL,
-    },
-    gameAI: createMockGameAI(),
-    stats: {
-      sendToPlayer() {},
-    },
-  };
-
-  const player = new PlayerCtor(edict, gameAPI).initializeEntity();
-  edict.entity = player;
-
-  player.health = 100;
-  player.origin = new Vector(64, 0, 0);
-  player.view_ofs = new Vector(0, 0, 22);
-  player.flags = flags.FL_CLIENT;
-  player.effects = 0;
-  player.items = 0;
-  player.show_hostile = 0;
-
-  return player;
-}
-
-void describe('QuakeEntityAI._isVisible', () => {
-  void test('treats a clear ignoreMonsters traceline as visible even when no entity is returned', () => {
-    const entity = createMonsterVisibilityFixture();
-    const target = createMonsterVisibilityFixture();
-
-    entity.engine.Traceline = () => ({
-      fraction: 1.0,
-      entity: null,
-      contents: {
-        inOpen: false,
-        inWater: false,
-      },
-    });
-
-    assert.equal(entity._ai._isVisible(target), true);
-  });
-
-  void test('rejects blocked sight lines when the trace stops short', () => {
-    const entity = createMonsterVisibilityFixture();
-    const target = createMonsterVisibilityFixture();
-
-    entity.engine.Traceline = () => ({
-      fraction: 0.5,
-      entity: null,
-      contents: {
-        inOpen: false,
-        inWater: false,
-      },
-    });
-
-    assert.equal(entity._ai._isVisible(target), false);
-  });
-});
-
-void describe('QuakeEntityAI.findTarget', () => {
-  void test('acquires a visible player and schedules a run state', () => {
-    const monster = createMonsterVisibilityFixture();
-    const player = createPlayerFixture();
-
-    monster.getNextBestClient = () => player;
-    monster.engine.Traceline = () => ({
-      fraction: 1.0,
-      entity: null,
-      contents: {
-        inOpen: false,
-        inWater: false,
-      },
-    });
-
-    const found = monster._ai.findTarget();
-
-    assert.equal(found, true);
-    assert.equal(monster.enemy, player);
-    assert.equal(monster.goalentity, player);
-    assert.equal(monster.show_hostile, monster.game.time + 1.0);
-    assert.deepEqual(monster.game.gameAI._sightEntityLastOrigin, player.origin);
-    assert.equal(monster._scheduledThinkArgs[0], monster.game.time + 0.05);
-    assert.equal(typeof monster._scheduledThinkArgs[1], 'function');
-    assert.equal(monster._scheduledThinkArgs[2], 'animation-state-machine');
-  });
-
-  void test('rejects invisible players before visibility and range checks', () => {
-    const monster = createMonsterVisibilityFixture();
-    const player = createPlayerFixture();
-
-    player.items = items.IT_INVISIBILITY;
-
-    let visibilityChecks = 0;
-    monster.getNextBestClient = () => player;
-    monster.engine.Traceline = () => {
-      visibilityChecks += 1;
-      return {
-        fraction: 1.0,
-        entity: null,
-        contents: {
-          inOpen: false,
-          inWater: false,
-        },
-      };
-    };
-
-    const found = monster._ai.findTarget();
-
-    assert.equal(found, false);
-    assert.equal(monster.enemy, null);
-    assert.equal(visibilityChecks, 0);
-  });
-
-  void test('ignores undefined client lookups without throwing', () => {
-    const monster = createMonsterVisibilityFixture();
-
-    monster.getNextBestClient = () => undefined;
-
-    assert.doesNotThrow(() => {
-      assert.equal(monster._ai.findTarget(), false);
-    });
-    assert.equal(monster.enemy, null);
-  });
-});
diff --git a/tsconfig.json b/tsconfig.json
index 76a2c435..090352e0 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -22,7 +22,7 @@
       "@/*": ["./source/*"]
     }
   },
-  "exclude": ["node_modules", "dist"],
+  "exclude": ["node_modules", "dist", "source/game/**/test/**"],
   "include": [
     "./source/engine/**/*.mjs",
     "./source/engine/**/*.cjs",

From 14bb1f2de6c887b83ce5487c9bb6b046c0d5365d Mon Sep 17 00:00:00 2001
From: Christian R <github@chrisnew.de>
Date: Wed, 8 Apr 2026 17:02:17 +0300
Subject: [PATCH 66/67] npm audit fix

---
 package-lock.json | 48 +++++++++++++++++++++++------------------------
 1 file changed, 24 insertions(+), 24 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 8c42532a..62f6a18d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -559,9 +559,9 @@
       "license": "MIT"
     },
     "node_modules/@eslint/config-array/node_modules/brace-expansion": {
-      "version": "1.1.12",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz",
-      "integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==",
+      "version": "1.1.13",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.13.tgz",
+      "integrity": "sha512-9ZLprWS6EENmhEOpjCYW2c8VkmOvckIJZfkr7rBW6dObmfgJ/L1GpSYW5Hpo9lDz4D1+n0Ckz8rU7FwHDQiG/w==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -640,9 +640,9 @@
       "license": "MIT"
     },
     "node_modules/@eslint/eslintrc/node_modules/brace-expansion": {
-      "version": "1.1.12",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz",
-      "integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==",
+      "version": "1.1.13",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.13.tgz",
+      "integrity": "sha512-9ZLprWS6EENmhEOpjCYW2c8VkmOvckIJZfkr7rBW6dObmfgJ/L1GpSYW5Hpo9lDz4D1+n0Ckz8rU7FwHDQiG/w==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -1741,9 +1741,9 @@
       "license": "MIT"
     },
     "node_modules/brace-expansion": {
-      "version": "5.0.4",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.4.tgz",
-      "integrity": "sha512-h+DEnpVvxmfVefa4jFbCf5HdH5YMDXRsmKflpf1pILZWRFlTbJpxeU55nJl4Smt5HQaGzg1o6RHFPJaOqnmBDg==",
+      "version": "5.0.5",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.5.tgz",
+      "integrity": "sha512-VZznLgtwhn+Mact9tfiwx64fA9erHH/MCXEUfB/0bX/6Fz6ny5EGTXYltMocqg4xFAQZtnO3DHWWXi8RiuN7cQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -2242,9 +2242,9 @@
       "license": "MIT"
     },
     "node_modules/eslint/node_modules/brace-expansion": {
-      "version": "1.1.12",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz",
-      "integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==",
+      "version": "1.1.13",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.13.tgz",
+      "integrity": "sha512-9ZLprWS6EENmhEOpjCYW2c8VkmOvckIJZfkr7rBW6dObmfgJ/L1GpSYW5Hpo9lDz4D1+n0Ckz8rU7FwHDQiG/w==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -2553,9 +2553,9 @@
       }
     },
     "node_modules/flatted": {
-      "version": "3.3.3",
-      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.3.3.tgz",
-      "integrity": "sha512-GX+ysw4PBCz0PzosHDepZGANEuFCMLrnRTiEy9McGjmkCQYwRq4A/X786G/fjM/+OjsWSU1ZrY5qyARZmO/uwg==",
+      "version": "3.4.2",
+      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.4.2.tgz",
+      "integrity": "sha512-PjDse7RzhcPkIJwy5t7KPWQSZ9cAbzQXcafsetQoD7sOJRQlGikNbx7yZp2OotDnJyrDcbyRq3Ttb18iYOqkxA==",
       "dev": true,
       "license": "ISC"
     },
@@ -3188,9 +3188,9 @@
       }
     },
     "node_modules/path-to-regexp": {
-      "version": "0.1.12",
-      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.12.tgz",
-      "integrity": "sha512-RA1GjUVMnvYFxuqovrEqZoxxW5NUZqbwKtYz/Tt7nXerk0LbLblQmrsgdeOxV5SFHf0UDggjS/bSeOZwt1pmEQ==",
+      "version": "0.1.13",
+      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.13.tgz",
+      "integrity": "sha512-A/AGNMFN3c8bOlvV9RreMdrv7jsmF9XIfDeCd87+I8RNg6s78BhJxMu69NEMHBSJFxKidViTEdruRwEk/WIKqA==",
       "license": "MIT"
     },
     "node_modules/picocolors": {
@@ -3201,9 +3201,9 @@
       "license": "ISC"
     },
     "node_modules/picomatch": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz",
-      "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.4.tgz",
+      "integrity": "sha512-QP88BAKvMam/3NxH6vj2o21R6MjxZUAd6nlwAS/pnGvN9IVLocLHxGYIzFhg6fUQ+5th6P4dv4eW9jX3DSIj7A==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -3797,9 +3797,9 @@
       }
     },
     "node_modules/vite": {
-      "version": "7.3.1",
-      "resolved": "https://registry.npmjs.org/vite/-/vite-7.3.1.tgz",
-      "integrity": "sha512-w+N7Hifpc3gRjZ63vYBXA56dvvRlNWRczTdmCBBa+CotUzAPf5b7YMdMR/8CQoeYE5LX3W4wj6RYTgonm1b9DA==",
+      "version": "7.3.2",
+      "resolved": "https://registry.npmjs.org/vite/-/vite-7.3.2.tgz",
+      "integrity": "sha512-Bby3NOsna2jsjfLVOHKes8sGwgl4TT0E6vvpYgnAYDIF/tie7MRaFthmKuHx1NSXjiTueXH3do80FMQgvEktRg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {

From 08d54eaa21e4ae4fc95f2eeca1984ff47689fc1c Mon Sep 17 00:00:00 2001
From: Christian R <github@chrisnew.de>
Date: Wed, 8 Apr 2026 17:43:11 +0300
Subject: [PATCH 67/67] documentation updates

---
 .../code-style-guide.instructions.md          |  6 +--
 README.md                                     |  2 +-
 docs/code-style-guide.md                      | 40 +++++++++++++------
 docs/dedicated.md                             |  5 ++-
 docs/webrtc.md                                |  2 +-
 5 files changed, 36 insertions(+), 19 deletions(-)

diff --git a/.github/instructions/code-style-guide.instructions.md b/.github/instructions/code-style-guide.instructions.md
index a71f4c99..28fa10f4 100644
--- a/.github/instructions/code-style-guide.instructions.md
+++ b/.github/instructions/code-style-guide.instructions.md
@@ -53,10 +53,10 @@ Use `eventBus` for **business logic events and lifecycle hooks**.
 
 ## File Organization
 
-### No index.mjs Files
+### No index.ts Files
 
 - **Avoid barrel exports**. Use direct imports instead.
-- Example: Import `BrushModelRenderer` from `./renderer/BrushModelRenderer.mjs`, not `./renderer`.
+- Example: Import `BrushModelRenderer` from `./renderer/BrushModelRenderer.ts`, not `./renderer`.
 
 ## General Style Guidelines
 
@@ -188,7 +188,7 @@ class GL {
   - `model` (or `clmodel`) instead of `m`.
   - `entity` instead of `ent` or `e`.
 - **Constants:** UPPER_CASE.
-- **Files:** PascalCase for classes (`BrushModelRenderer.mjs`), camelCase for utils (`modelUtils.mjs`). Always `.mjs`.
+- **Files:** PascalCase for classes (`BrushModelRenderer.ts`), camelCase for utils (`modelUtils.ts`). Always `.ts` for TypeScript source files.
 
 ## Comments
 
diff --git a/README.md b/README.md
index 6f99db71..32daa1b8 100644
--- a/README.md
+++ b/README.md
@@ -83,7 +83,7 @@ Open http://localhost:3000/ and enjoy hacking.
 
 The dedicated server can be started using `npm run dedicated:start`, but this will run with many `console.assert(…)` in hot paths and is only really suitable for development work.
 
-That’s why you should compile the dedicated server with `npm run dedicated:build:production` and start it using `npm run dedicated:start:production`.
+That’s why you should compile the dedicated server with `npm run dedicated:build:production` and start it using `npm run dedicated:start`.
 
 ### Deploy to a CDN
 
diff --git a/docs/code-style-guide.md b/docs/code-style-guide.md
index 1d464b95..abcee39d 100644
--- a/docs/code-style-guide.md
+++ b/docs/code-style-guide.md
@@ -61,7 +61,7 @@ This document outlines the coding conventions and style rules for the Quakeshack
 5. **Use specific types from imports**
    ```javascript
    // ✅ GOOD
-   /** @type {import('./ClientEntities.mjs').ClientEdict} */
+   /** @type {import('./ClientEntities.ts').ClientEdict} */
 
    // ✅ GOOD for model types
    /** @type {import('../../common/model/BSP.ts').BrushModel} */
@@ -188,16 +188,16 @@ eventBus.subscribe('gl.ready', () => {
 
 ## File Organization
 
-### No index.mjs Files
+### No index.ts Files
 
 Avoid barrel exports - use direct imports instead:
 
 ```javascript
-// ❌ BAD (using index.mjs)
+// ❌ BAD (using index.ts)
 import { BrushModelRenderer } from './renderer';
 
 // ✅ GOOD (direct import)
-import { BrushModelRenderer } from './renderer/BrushModelRenderer.mjs';
+import { BrushModelRenderer } from './renderer/BrushModelRenderer.ts';
 ```
 
 **Rationale:**
@@ -262,17 +262,33 @@ getModelType() {
 }
 ```
 
-### Private Methods
+### Protected and Private Methods
 
-Use `_` prefix for private methods and add `@private` JSDoc tag:
+Use native TypeScript access modifiers in `.ts` files. Keep `_` prefixes for protected members that subclasses override, and use `#` for methods that are truly private:
 
 ```javascript
 /**
- * Render opaque surfaces
+ * Render opaque surfaces.
+ */
+protected _renderOpaqueSurfaces(clmodel) {
+  // Implementation
+}
+
+class SignalingClient {
+  #connectSignaling() {
+    // Implementation
+  }
+}
+```
+
+Keep `@protected` and `@private` tags only when a mixed JS/TS boundary still needs them.
+
+```javascript
+/**
+ * Render legacy compatibility state.
  * @private
- * @param {BrushModel} clmodel The brush model
  */
-_renderOpaqueSurfaces(clmodel) {
+#renderCompatibilityState() {
   // Implementation
 }
 ```
@@ -289,9 +305,9 @@ _renderOpaqueSurfaces(clmodel) {
 - Use native enums like `ModelType.brush` for enum-like values
 
 ### Files
-- Use PascalCase for class files: `BrushModelRenderer.mjs`
-- Use camelCase for utility files: `modelUtils.mjs`
-- Always use `.mjs` extension
+- Use PascalCase for class files: `BrushModelRenderer.ts`
+- Use camelCase for utility files: `modelUtils.ts`
+- Always use `.ts` extension for TypeScript source files
 
 ## Comments
 
diff --git a/docs/dedicated.md b/docs/dedicated.md
index b1d1cd83..5f954121 100644
--- a/docs/dedicated.md
+++ b/docs/dedicated.md
@@ -2,10 +2,11 @@
 
 QuakeShack supports running as a dedicated server in a Node.js environment. A dedicated server allows you to host multiplayer games with better performance and without requiring a client GUI to be actively running.
 
-To start a dedicated server for production use, you can use the command:
+To build and start a dedicated server for production use, run:
 
 ```sh
-npm run dedicated:start:production
+npm run dedicated:build:production
+npm run dedicated:start
 ```
 
 It will automatically execute `server.cfg` upon start.
diff --git a/docs/webrtc.md b/docs/webrtc.md
index 417e0976..940f867d 100644
--- a/docs/webrtc.md
+++ b/docs/webrtc.md
@@ -26,7 +26,7 @@ The WebRTC implementation allows clients to connect directly to each other for m
 
 ### Components
 
-1.  **WebRTCDriver (`engine/source/engine/network/NetworkDrivers.mjs`)**:
+1.  **WebRTCDriver (`engine/source/engine/network/NetworkDrivers.ts`)**:
     *   Implements the `BaseDriver` interface.
     *   Handles signaling handshake via WebSocket.
     *   Manages `RTCPeerConnection` and `RTCDataChannel`s.