New translations en.json (Ukrainian)

[ci skip]

.github/workflows/assets.yml

@@ -73,14 +73,10 @@ jobs:
         with:
           repo-token: ${{ secrets.GH_TOKEN }}
       - uses: oven-sh/setup-bun@v2
-
       - run: bun run setup
 
       - name: AppArmor hack
         run: echo 0 | sudo tee /proc/sys/kernel/apparmor_restrict_unprivileged_userns
 
-      - name: Install patches
-        run: bun run setup:patches --source=${{ github.event.inputs.asset_source || 'steam:444200/444202' }}
-
       - name: Build assets
         run: bun run build:assets --all-targets --source=${{ github.event.inputs.asset_source || 'steam:444200/444202' }}

bun.lock

@@ -6,7 +6,6 @@
       "name": "blitzkit",
       "dependencies": {
         "@prisma/client": "^6.18.0",
-        "lz4js": "^0.2.0",
         "prisma": "^6.18.0",
         "sharp": "^0.34.5",
         "typescript": "^5.9.3",
@@ -79,6 +78,7 @@
         "dotenv": "^17.2.2",
         "fast-xml-parser": "^5.3.2",
         "lodash-es": "^4.17.21",
+        "lz4js": "^0.2.0",
         "pickleparser": "^0.2.1",
         "protobufjs": "^7.5.4",
         "three": "^0.180.0",
@@ -118,6 +118,7 @@
         "fast-xml-parser": "^5.2.5",
         "googleapis": "^162.0.0",
         "lodash-es": "^4.17.21",
+        "lz4js": "^0.2.0",
         "progress": "^2.0.3",
         "puppeteer": "^24.22.3",
         "sharp": "^0.34.4",

docs/changelogs/1.30.4.md

@@ -1,5 +0,0 @@
-# BlitzKit 1.30.3
-
-## Fixes
-
-- BlitzKit now correctly implements minor WoTB updates

package.json

@@ -1,6 +1,6 @@
 {
   "name": "blitzkit",
-  "version": "1.30.4",
+  "version": "1.30.3",
   "license": "BlitzKit License",
   "private": true,
   "scripts": {
@@ -21,7 +21,7 @@
     "dev": "bun run dev:website",
     "dev:api": "bun --filter=@blitzkit/api run dev",
     "setup:depotdownloader": "bun --filter=@blitzkit/scripts run setup:depotdownloader",
-    "setup:patches": "mkdir -p packages/closed/node_modules && ln -sf ../../../node_modules/lz4js packages/closed/node_modules/lz4js && cd packages/scripts && bun run setup:patches",
+    "setup:patches": "bun --filter=@blitzkit/scripts run setup:patches",
     "start:website": "bun --filter=@blitzkit/website run start",
     "host:docs": "vitepress preview docs",
     "lint": "tsc",
@@ -35,7 +35,7 @@
     "build:reviews": "cd packages/scripts && bun build:reviews",
     "build:ids": "cd packages/scripts && bun build:ids",
     "prunestrings": "cd packages/scripts && bun prunestrings",
-    "setup": "bun install && bun run build:prisma",
+    "setup": "bun install && bun run build:prisma && bun run build:proxyclient",
     "patchnotes": "cd packages/scripts && bun run patchnotes"
   },
   "type": "module",
@@ -44,7 +44,6 @@
   ],
   "dependencies": {
     "@prisma/client": "^6.18.0",
-    "lz4js": "^0.2.0",
     "prisma": "^6.18.0",
     "sharp": "^0.34.5",
     "typescript": "^5.9.3"

packages/core/package.json

@@ -19,6 +19,7 @@
     "dotenv": "^17.2.2",
     "fast-xml-parser": "^5.3.2",
     "lodash-es": "^4.17.21",
+    "lz4js": "^0.2.0",
     "pickleparser": "^0.2.1",
     "protobufjs": "^7.5.4",
     "three": "^0.180.0",

packages/i18n/strings/uk.json

@@ -919,13 +919,13 @@
                 "external": "External",
                 "gap": "Gap",
                 "gun": "Gun",
-                "track": "Гусениці"
+                "track": "Tracks"
               },
               "status": {
                 "penetration": "{damage}hp penetration",
                 "blocked": "Заблоковано",
                 "ricochet": "Рикошет",
-                "splash": "{damage} Од"
+                "splash": "{damage}hp splash"
               },
               "stats": {
                 "thickness_and_angle": "{thickness}mm {angle}°",
@@ -1048,7 +1048,7 @@
             "caliber": "Калібр",
             "penetration": "Бронепробиття",
             "damage": "Шкода",
-            "damageWithoutAssault": "Шкода без урахування золотих снарядів",
+            "damageWithoutAssault": "Damage without assault shells",
             "clipDamage": "Clipping potential",
             "moduleDamage": "Шкода по модулях",
             "explosionRadius": "Радіус розльоту уламків",

packages/scripts/package.json

@@ -24,6 +24,7 @@
     "fast-xml-parser": "^5.2.5",
     "googleapis": "^162.0.0",
     "lodash-es": "^4.17.21",
+    "lz4js": "^0.2.0",
     "progress": "^2.0.3",
     "puppeteer": "^24.22.3",
     "sharp": "^0.34.4",

packages/scripts/src/applyPatches.ts

@@ -4,7 +4,7 @@ import { mkdir, writeFile } from "fs/promises";
 import { parse as parsePath } from "path";
 import ProgressBar from "progress";
 import { parse as parseYaml, stringify as stringifyYaml } from "yaml";
-import { PATCHES_ROOT, vfs } from "./buildAssets/constants";
+import { vfs } from "./buildAssets/constants";
 import { writeDVPL } from "./core/blitz/writeDVPL";
 
 const versionTextFile = await vfs.text(`Data/version.txt`);
@@ -20,30 +20,27 @@ let patchIndex = 1;
 while (true) {
   const response = await fetch(
     `${assertSecret(
-      import.meta.env.WOTB_DLC_CDN,
-    )}/dlc/s${currentVersion}_${patchIndex}.yaml`,
+      import.meta.env.WOTB_DLC_CDN
+    )}/dlc/s${currentVersion}_${patchIndex}.yaml`
   );
 
-  console.log(patchIndex, response.status)
-
-  if (!response.ok) break;
-  
+  if (response.status === 200) {
     console.log(`Applying patch ${patchIndex}...`);
 
     const data = parseYaml(await response.text());
     const dvpm = await fetch(
-      `${assertSecret(import.meta.env.WOTB_DLC_CDN)}/dlc/${data.dx11}`,
+      `${assertSecret(import.meta.env.WOTB_DLC_CDN)}/dlc/${data.dx11}`
     ).then((response) => response.arrayBuffer());
     const dvpd = await fetch(
       `${assertSecret(import.meta.env.WOTB_DLC_CDN)}/dlc/${data.dx11.replace(
         ".dvpm",
-        ".dvpd",
-      )}`,
+        ".dvpd"
+      )}`
     ).then((response) => response.arrayBuffer());
     const files = await dvp(dvpm, dvpd);
     const bar = new ProgressBar(
       `Patching ${files.length} files :bar`,
-      files.length,
+      files.length
     );
 
     for (const { path, data } of files) {
@@ -52,55 +49,43 @@ while (true) {
       const { dir } = parsePath(path);
 
       try {
-        await mkdir(`${PATCHES_ROOT}/Data/${dir}`, { recursive: true });
+        await mkdir(`Data/${dir}`, { recursive: true });
       } catch (error) {
         console.warn(`Failed to make directory "${dir}"`);
       }
 
+      const isDvpl = path.endsWith(".dvpl");
       const buffer = Buffer.from(data);
 
       await writeFile(
-        `${PATCHES_ROOT}/Data/${path}`,
-        new Uint8Array(buffer),
+        `Data/${path}${isDvpl ? "" : ".dvpl"}`,
+        new Uint8Array(isDvpl ? buffer : writeDVPL(buffer))
       );
 
       bar.tick();
     }
 
-    console.log('patches done for patch')
-
     if ("dynamicContentLocalizationsDir" in data) {
-      console.log(
-        `${assertSecret(import.meta.env.WOTB_DLC_CDN)}/dlc/${
-          data.dynamicContentLocalizationsDir
-        }/en.yaml`,
-      );
+      console.log("Found dynamic content localizations; patching...");
+
       const localizationsResponse = await fetch(
         `${assertSecret(import.meta.env.WOTB_DLC_CDN)}/dlc/${
           data.dynamicContentLocalizationsDir
-        }/en.yaml`,
+        }/en.yaml`
       );
-      console.log('fetched')
       const newStrings = parseYaml(await localizationsResponse.text());
-      console.log('got new strings')
-      const oldStrings =
-        await vfs.yaml<Record<string, string>>(`Data/Strings/en.yaml`);
-      console.log('got old strings')
+      const oldStrings = await vfs.yaml<Record<string, string>>(
+        `Data/Strings/en.yaml`
+      );
       const patchedStrings = { ...oldStrings, ...newStrings };
       const patchedContent = stringifyYaml(patchedStrings);
-      console.log('stringified')
 
-      await mkdir(`${PATCHES_ROOT}/Data/Strings`, { recursive: true });
-      console.log('mkdir')
       await writeFile(
-        `${PATCHES_ROOT}/Data/Strings/en.yaml`,
-        new Uint8Array((Buffer.from(patchedContent))),
+        `Data/Strings/en.yaml`,
+        new Uint8Array(writeDVPL(Buffer.from(patchedContent)))
       );
-      console.log('file')
     }
 
     patchIndex++;
+  } else break;
 }
-
-vfs.dispose()
-process.exit(0);

packages/scripts/src/buildAssets/constants.ts

@@ -3,9 +3,6 @@ import { AbstractVFS } from "../core/vfs/abstract";
 import { LocalVFS } from "../core/vfs/local";
 import { SteamVFS } from "../core/vfs/steam";
 import { ZipVFS } from "../core/vfs/zip";
-import { MixedVFS } from "../core/vfs/mixed";
-
-export const PATCHES_ROOT = "../../temp/patches";
 
 const steamPattern = /steam:(\d+)\/(\d+)/;
 const zipPattern = /zip:(.+)/;
@@ -38,6 +35,4 @@ if (!source) {
   throw new Error("No valid source specified");
 }
 
-resolved = new MixedVFS([new LocalVFS(PATCHES_ROOT), resolved]);
-
 export const vfs = resolved;

packages/scripts/src/core/vfs/mixed.ts

@@ -1,49 +0,0 @@
-import { AbstractVFS } from "./abstract";
-
-export class MixedVFS extends AbstractVFS {
-  constructor(private vfses: AbstractVFS[]) {
-    super();
-  }
-
-  async init() {
-    for (const vfs of this.vfses) {
-      await vfs.init();
-    }
-
-    return this;
-  }
-
-  dispose() {
-    for (const vfs of this.vfses) {
-      vfs.dispose();
-    }
-  }
-
-  async has(path: string) {
-    for (const vfs of this.vfses) {
-      if (await vfs.has(path)) return true;
-    }
-
-    return false;
-  }
-
-  async raw(path: string) {
-    for (const vfs of this.vfses) {
-      if (await vfs.has(path)) return await vfs.raw(path);
-    }
-
-    throw new Error(`File not found: ${path}`);
-  }
-
-  async dir(path: string) {
-    const files = new Set<string>();
-
-    for (const vfs of this.vfses) {
-      for (const file of await vfs.dir(path)) {
-        files.add(file);
-      }
-    }
-
-    return Array.from(files);
-  }
-}