Reworked showvanilla files (#459)

* Reworked showvanilla files

* Removed unnesscary trigger

.github/workflows/pull-request.yml

@@ -4,7 +4,6 @@ name: PR
 
 on:
   push: {}
-  pull_request: {}
   workflow_dispatch: {}
 
 jobs:

client/package.json

@@ -24,8 +24,11 @@
   },
   "dependencies": {
     "@blockception/shared": "^0.0.1",
+    "@types/node-fetch": "^2.6.2",
     "bc-minecraft-bedrock-project": "^1.19.50-1",
+    "bc-minecraft-bedrock-vanilla-data": "^1.19.60-0",
     "node": "^19.0.0",
+    "node-fetch": "^2.6.9",
     "vscode-languageclient": "^8.0.2"
   },
   "devDependencies": {

client/src/Commands/Vanilla/ShowVanillaFile.ts

@@ -1,39 +1,42 @@
-import path from "path";
-import { commands, ExtensionContext, Uri, window } from "vscode";
-import { Commands, GetBedrockInstallationFolder } from "@blockception/shared";
-import { Glob } from "../../Glob";
+import { commands, ExtensionContext, Uri, window, workspace } from "vscode";
+import { Commands } from "@blockception/shared";
+import { GithubFiles } from "bc-minecraft-bedrock-vanilla-data/lib/src/Lib/Vanilla/sources";
+import fetch, { RequestInit } from "node-fetch";
 
 export function Activate(context: ExtensionContext): void {
-  context.subscriptions.push(commands.registerCommand(Commands.ShowVanillaFile, ShowVanillaFile));
-}
+  async function ShowVanillaFile(args: any) {
+    const source = GithubFiles.source;
+    const files = GithubFiles.files;
 
-function ShowVanillaFile(args: any) {
-  const dir = path.join(GetBedrockInstallationFolder(), "data");
-  const files = Glob.GetFiles(["{behavior_packs,resource_packs}/vanilla**/**/*.json"], ["behavior_trees", "contents.json"], dir);
+    if (files.length === 0) {
+      return;
+    }
 
-  if (files.length === 0) {
-    window.showErrorMessage("No vanilla files found");
-    return;
-  }
+    window.showQuickPick(files).then((filepath) => {
+      if (!filepath) {
+        return;
+      }
 
-  const options: Record<string, string> = {};
-
-  files.forEach((file) => {
-    const key = path.basename(file);
-    options[key] = file;
-  });
+      const uri = Uri.parse(source + filepath);
+      const options: RequestInit = {
+        method: "GET",
+        redirect: "error",
+      };
 
-  const keys = Object.keys(options);
-  keys.sort();
+      console.log("Downloading vanilla file", filepath)
+      return fetch(uri.toString(), options)
+        .then(data => data.text())
+        .then(text => {
+          workspace.openTextDocument({ language: "json", content: text }).then(doc => window.showTextDocument(doc))
+        })        
+        .catch(err => {
+          window.showErrorMessage("Failed to download vanilla file", filepath as string, JSON.stringify(err));
+        }).finally(() => {
+          console.log("Downloaded vanilla file", filepath)
+        });
 
-  window.showQuickPick(keys).then((key) => {
-    if (key) {
-      let file = options[key];
-      if (file) {
-        const uri = Uri.file(file);
+    });
+  }
 
-        window.showTextDocument(uri, { preview: false });
-      }
-    }
-  });
+  context.subscriptions.push(commands.registerCommand(Commands.ShowVanillaFile, ShowVanillaFile));
 }

client/src/Console/Console.ts

@@ -10,8 +10,8 @@ export class Console {
   }
 
   /**Sends a error to the console log of the server*/
-  static Log(message: string): void {
-    console.log(message);
+  static Log(message: string, ...optionalParams: any): void {
+    console.log(message, ...optionalParams);
   }
 
   /**Sends a error to the console log of the server*/