From 1a4ca8ca1e977208731515c3328c5275d77c4bd1 Mon Sep 17 00:00:00 2001
From: tresabhi <43380238+tresabhi@users.noreply.github.com>
Date: Sat, 14 Nov 2026 11:28:46 -0600
Subject: [PATCH] init

---
 .../core/src/blitzkit/api/server/0_base.ts     |  3 ---
 packages/core/src/blitzkit/vfs/client.ts       | 18 +++++++++---------
 packages/scripts/src/vfs/vfs.ts                |  2 +-
 packages/website/src/core/blitzkit/vfs.ts      |  2 +-
 4 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/packages/core/src/blitzkit/api/server/0_base.ts b/packages/core/src/blitzkit/api/server/0_base.ts
index 034122e00..05996a84e 100644
--- a/packages/core/src/blitzkit/api/server/0_base.ts
+++ b/packages/core/src/blitzkit/api/server/0_base.ts
@@ -116,9 +116,6 @@ export abstract class ServerBlitzKitAPI0 extends BlitzKitAPI {
     const { existsSync } = await import("fs");
     const { readFile, writeFile, mkdir } = await import("fs/promises");
 
-    console.log("Initializing virtual file system...");
-    await this.vfs.init();
-
     console.log("Fetching game data...");
     this.nationsDir = await this.vfs
       .dir("Data/XML/item_defs/vehicles")
diff --git a/packages/core/src/blitzkit/vfs/client.ts b/packages/core/src/blitzkit/vfs/client.ts
index 663e2c32d..9a314801b 100644
--- a/packages/core/src/blitzkit/vfs/client.ts
+++ b/packages/core/src/blitzkit/vfs/client.ts
@@ -1,18 +1,18 @@
 import { assertSecret } from "@blitzkit/core";
+import { AbstractVFS } from "./abstract";
 import { LocalVFS } from "./local";
-import { MixedVFS } from "./mixed";
 import { ZipVFS } from "./zip";
 
-// zip reads straight from the remote archive; CLIENT_DIR stays first so SmartDLC patches override it
-export function createClientVFS() {
-  const local = new LocalVFS(assertSecret(import.meta.env.CLIENT_DIR));
+export async function createClientVFS() {
+  let vfs: AbstractVFS;
 
   if (import.meta.env.CLIENT_PROVIDER === "zip") {
-    return new MixedVFS([
-      local,
-      new ZipVFS(assertSecret(import.meta.env.CLIENT_SOURCE)),
-    ]);
+    vfs = new ZipVFS(assertSecret(import.meta.env.CLIENT_SOURCE));
+  } else {
+    vfs = new LocalVFS(assertSecret(import.meta.env.CLIENT_DIR));
   }
 
-  return local;
+  await vfs.init();
+
+  return vfs;
 }
diff --git a/packages/scripts/src/vfs/vfs.ts b/packages/scripts/src/vfs/vfs.ts
index cf3fe8c5f..48d6baa82 100644
--- a/packages/scripts/src/vfs/vfs.ts
+++ b/packages/scripts/src/vfs/vfs.ts
@@ -1,3 +1,3 @@
 import { createClientVFS } from "@blitzkit/core/src/blitzkit/vfs/client";
 
-export const vfs = createClientVFS();
+export const vfs = await createClientVFS();
diff --git a/packages/website/src/core/blitzkit/vfs.ts b/packages/website/src/core/blitzkit/vfs.ts
index cf3fe8c5f..48d6baa82 100644
--- a/packages/website/src/core/blitzkit/vfs.ts
+++ b/packages/website/src/core/blitzkit/vfs.ts
@@ -1,3 +1,3 @@
 import { createClientVFS } from "@blitzkit/core/src/blitzkit/vfs/client";
 
-export const vfs = createClientVFS();
+export const vfs = await createClientVFS();