From fd2e2f9c7bf81954b799f79b19dce869bc6d79aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tr=C3=A8sAbhi?= <43380238+tresabhi@users.noreply.github.com>
Date: Sun, 8 Sep 2024 10:21:08 -0500
Subject: [PATCH] fix: more imports 4

---
 packages/core/src/blitz/searchPlayersAcrossRegions/index.ts | 2 ++
 packages/scripts/src/buildAssets/tankArmors.ts              | 2 +-
 packages/scripts/src/buildAssets/tankModels.ts              | 2 +-
 .../{website => scripts}/src/core/blitz/extractArmor.ts     | 2 +-
 .../src/core/blitz/extractModel/constants.ts                | 0
 .../src/core/blitz/extractModel/index.ts                    | 6 +++---
 .../src/core/blitz}/readTexture/constants.ts                | 0
 .../src/core/blitz}/readTexture/index.ts                    | 2 +-
 .../{website => scripts}/src/core/github/assetCommit.ts     | 4 ++--
 packages/scripts/src/core/github/commitMultipleFiles.ts     | 5 +----
 .../core/blitzkit => scripts/src/core/github}/createBlob.ts | 4 ++--
 11 files changed, 14 insertions(+), 15 deletions(-)
 rename packages/{website => scripts}/src/core/blitz/extractArmor.ts (98%)
 rename packages/{website => scripts}/src/core/blitz/extractModel/constants.ts (100%)
 rename packages/{website => scripts}/src/core/blitz/extractModel/index.ts (97%)
 rename packages/{website/src/core/blitzkit => scripts/src/core/blitz}/readTexture/constants.ts (100%)
 rename packages/{website/src/core/blitzkit => scripts/src/core/blitz}/readTexture/index.ts (96%)
 rename packages/{website => scripts}/src/core/github/assetCommit.ts (92%)
 rename packages/{website/src/core/blitzkit => scripts/src/core/github}/createBlob.ts (89%)

diff --git a/packages/core/src/blitz/searchPlayersAcrossRegions/index.ts b/packages/core/src/blitz/searchPlayersAcrossRegions/index.ts
index c41882bf3..49ba8ab27 100644
--- a/packages/core/src/blitz/searchPlayersAcrossRegions/index.ts
+++ b/packages/core/src/blitz/searchPlayersAcrossRegions/index.ts
@@ -58,3 +58,5 @@ export async function searchPlayersAcrossRegions(search: string, limit = 25) {
     return [] as AccountListWithServer;
   }
 }
+
+export * from './constants';
diff --git a/packages/scripts/src/buildAssets/tankArmors.ts b/packages/scripts/src/buildAssets/tankArmors.ts
index f2f2f4a06..99ff4c4c7 100644
--- a/packages/scripts/src/buildAssets/tankArmors.ts
+++ b/packages/scripts/src/buildAssets/tankArmors.ts
@@ -1,7 +1,7 @@
 import { NodeIO } from '@gltf-transform/core';
 import { readdir } from 'fs/promises';
-import { extractArmor } from '../../../website/src/core/blitz/extractArmor';
 import { toUniqueId } from '../../../website/src/core/blitz/toUniqueId';
+import { extractArmor } from '../core/blitz/extractArmor';
 import { readXMLDVPL } from '../core/blitz/readXMLDVPL';
 import { commitAssets } from '../core/github/commitAssets';
 import { FileChange } from '../core/github/commitMultipleFiles';
diff --git a/packages/scripts/src/buildAssets/tankModels.ts b/packages/scripts/src/buildAssets/tankModels.ts
index 24f683b5d..acde34e3b 100644
--- a/packages/scripts/src/buildAssets/tankModels.ts
+++ b/packages/scripts/src/buildAssets/tankModels.ts
@@ -1,7 +1,7 @@
 import { NodeIO } from '@gltf-transform/core';
 import { readdir } from 'fs/promises';
-import { extractModel } from '../../../website/src/core/blitz/extractModel';
 import { toUniqueId } from '../../../website/src/core/blitz/toUniqueId';
+import { extractModel } from '../core/blitz/extractModel';
 import { readXMLDVPL } from '../core/blitz/readXMLDVPL';
 import { readYAMLDVPL } from '../core/blitz/readYAMLDVPL';
 import { commitAssets } from '../core/github/commitAssets';
diff --git a/packages/website/src/core/blitz/extractArmor.ts b/packages/scripts/src/core/blitz/extractArmor.ts
similarity index 98%
rename from packages/website/src/core/blitz/extractArmor.ts
rename to packages/scripts/src/core/blitz/extractArmor.ts
index 5e4b1addb..fc30d840c 100644
--- a/packages/website/src/core/blitz/extractArmor.ts
+++ b/packages/scripts/src/core/blitz/extractArmor.ts
@@ -6,11 +6,11 @@ import {
 } from '@blitzkit/core';
 import { Accessor, Document, Node, Scene } from '@gltf-transform/core';
 import { times } from 'lodash';
-import { readDVPLFile } from '../../../../scripts/src/core/blitz/readDVPLFile';
 import {
   vertexAttributeGLTFName,
   vertexAttributeGltfVectorSizes,
 } from './extractModel/constants';
+import { readDVPLFile } from './readDVPLFile';
 
 export async function extractArmor(data: string, fileName: string) {
   const sc2Path = `${data}/3d/Tanks/CollisionMeshes/${fileName}.sc2.dvpl`;
diff --git a/packages/website/src/core/blitz/extractModel/constants.ts b/packages/scripts/src/core/blitz/extractModel/constants.ts
similarity index 100%
rename from packages/website/src/core/blitz/extractModel/constants.ts
rename to packages/scripts/src/core/blitz/extractModel/constants.ts
diff --git a/packages/website/src/core/blitz/extractModel/index.ts b/packages/scripts/src/core/blitz/extractModel/index.ts
similarity index 97%
rename from packages/website/src/core/blitz/extractModel/index.ts
rename to packages/scripts/src/core/blitz/extractModel/index.ts
index c6b3c4432..abb0fdcac 100644
--- a/packages/website/src/core/blitz/extractModel/index.ts
+++ b/packages/scripts/src/core/blitz/extractModel/index.ts
@@ -9,9 +9,9 @@ import { Document, Material, Node, Scene } from '@gltf-transform/core';
 import { times } from 'lodash';
 import { dirname } from 'path';
 import { Matrix4, Quaternion, Vector3, Vector4Tuple } from 'three';
-import { readDVPLFile } from '../../../../../scripts/src/core/blitz/readDVPLFile';
-import { readTexture } from '../../blitzkit/readTexture';
-import { TextureMutation } from '../../blitzkit/readTexture/constants';
+import { readDVPLFile } from '../readDVPLFile';
+import { readTexture } from '../readTexture';
+import { TextureMutation } from '../readTexture/constants';
 import {
   vertexAttributeGLTFName,
   vertexAttributeGltfVectorSizes,
diff --git a/packages/website/src/core/blitzkit/readTexture/constants.ts b/packages/scripts/src/core/blitz/readTexture/constants.ts
similarity index 100%
rename from packages/website/src/core/blitzkit/readTexture/constants.ts
rename to packages/scripts/src/core/blitz/readTexture/constants.ts
diff --git a/packages/website/src/core/blitzkit/readTexture/index.ts b/packages/scripts/src/core/blitz/readTexture/index.ts
similarity index 96%
rename from packages/website/src/core/blitzkit/readTexture/index.ts
rename to packages/scripts/src/core/blitz/readTexture/index.ts
index 89c9a0cc8..ce3ff9e88 100644
--- a/packages/website/src/core/blitzkit/readTexture/index.ts
+++ b/packages/scripts/src/core/blitz/readTexture/index.ts
@@ -1,7 +1,7 @@
 import { DdsReadStream, PvrReadStream } from '@blitzkit/core';
 import { existsSync } from 'fs';
 import sharp from 'sharp';
-import { readDVPLFile } from '../../../../../scripts/src/core/blitz/readDVPLFile';
+import { readDVPLFile } from '../readDVPLFile';
 import { TextureMutation } from './constants';
 
 export async function readTexture(path: string, mutation?: TextureMutation) {
diff --git a/packages/website/src/core/github/assetCommit.ts b/packages/scripts/src/core/github/assetCommit.ts
similarity index 92%
rename from packages/website/src/core/github/assetCommit.ts
rename to packages/scripts/src/core/github/assetCommit.ts
index 550abaf64..a5979da0f 100644
--- a/packages/website/src/core/github/assetCommit.ts
+++ b/packages/scripts/src/core/github/assetCommit.ts
@@ -1,6 +1,6 @@
 import { assertSecret } from '@blitzkit/core';
-import { GithubChangeBlob, createBlob } from '../blitzkit/createBlob';
-import { octokit } from '../blitzkit/octokit';
+import { octokit } from '../../../../website/src/core/blitzkit/octokit';
+import { GithubChangeBlob, createBlob } from './createBlob';
 
 export class AssetCommit {
   constructor(public message: string) {}
diff --git a/packages/scripts/src/core/github/commitMultipleFiles.ts b/packages/scripts/src/core/github/commitMultipleFiles.ts
index e7dc1739c..9fdeb2151 100644
--- a/packages/scripts/src/core/github/commitMultipleFiles.ts
+++ b/packages/scripts/src/core/github/commitMultipleFiles.ts
@@ -1,9 +1,6 @@
 import ProgressBar from 'progress';
-import {
-  GithubChangeBlob,
-  createBlob,
-} from '../../../../website/src/core/blitzkit/createBlob';
 import { octokit } from '../../../../website/src/core/blitzkit/octokit';
+import { GithubChangeBlob, createBlob } from './createBlob';
 
 export interface FileChange {
   path: string;
diff --git a/packages/website/src/core/blitzkit/createBlob.ts b/packages/scripts/src/core/github/createBlob.ts
similarity index 89%
rename from packages/website/src/core/blitzkit/createBlob.ts
rename to packages/scripts/src/core/github/createBlob.ts
index 1265acba8..37c55c6bc 100644
--- a/packages/website/src/core/blitzkit/createBlob.ts
+++ b/packages/scripts/src/core/github/createBlob.ts
@@ -1,6 +1,6 @@
 import { throttle } from 'lodash';
-import { FileChange } from '../../../../scripts/src/core/github/commitMultipleFiles';
-import { octokit } from './octokit';
+import { octokit } from '../../../../website/src/core/blitzkit/octokit';
+import { FileChange } from './commitMultipleFiles';
 
 export interface GithubChangeBlob {
   sha: string;