From 4984f6b2aa827b3d2f337999ec9ca6bdad7e91d9 Mon Sep 17 00:00:00 2001
From: solvedDev <33347616+solvedDev@users.noreply.github.com>
Date: Sun, 19 May 2019 22:19:51 +0200
Subject: [PATCH] update!

- bridge. can now play audio
- you can once again run multiple bridge. instances
- fixed discord rich presence
- fixed format_version position of entity template
- fixed potential cache error (path === null)
- fixed animation_references using cache
---
 package-lock.json                             |  39 +++
 package.json                                  |   2 +
 src/index.ejs                                 |   2 +-
 src/main/Discord.js                           |  22 +-
 src/main/index.js                             | 222 ++++++++----------
 .../components/editor_shell/AudioPlayer.vue   |  75 ++++++
 .../components/editor_shell/FileManager.vue   |  27 ++-
 .../components/sidebar/content/Explorer.vue   |   2 +
 src/renderer/scripts/FileSystem.js            |   4 +-
 src/renderer/scripts/TabSystem.js             |   2 +
 .../scripts/autoCompletions/Dynamic.js        |   8 +-
 src/renderer/scripts/utilities/Cache.js       |   3 +-
 src/renderer/store/modules/Explorer.js        |   7 +-
 src/shared/Paths.js                           |   3 +
 static/file_creator/entity.json               |   2 +-
 15 files changed, 271 insertions(+), 149 deletions(-)
 create mode 100644 src/renderer/components/editor_shell/AudioPlayer.vue
 create mode 100644 src/shared/Paths.js

diff --git a/package-lock.json b/package-lock.json
index dd1b6550d..ac2d1dec3 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -522,6 +522,11 @@
       "integrity": "sha512-NW2cX8m1Q7KPA7a5M2ULQeZ2wR5qI5PAbw5L0UOMxdioVk9PMZ0h1TmyZEkPYrCvYjDlFICusOu1dlEKAAeXBw==",
       "dev": true
     },
+    "async-limiter": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.0.tgz",
+      "integrity": "sha512-jp/uFnooOiO+L211eZOoSyzpOITMXx1rBITauYykG3BRYPu8h0UcxsPNB04RR5vo4Tyz3+ay17tR6JVf9qzYWg=="
+    },
     "asynckit": {
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
@@ -3323,6 +3328,11 @@
         "assert-plus": "^1.0.0"
       }
     },
+    "dataurl": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/dataurl/-/dataurl-0.1.0.tgz",
+      "integrity": "sha1-H0c0/t3sBf/kRXR5eNhnWcSzMZk="
+    },
     "date-now": {
       "version": "0.1.4",
       "resolved": "https://registry.npmjs.org/date-now/-/date-now-0.1.4.tgz",
@@ -3521,6 +3531,22 @@
         "command-line-usage": "^5.0.5"
       }
     },
+    "discord-rich-presence": {
+      "version": "0.0.8",
+      "resolved": "https://registry.npmjs.org/discord-rich-presence/-/discord-rich-presence-0.0.8.tgz",
+      "integrity": "sha512-IpVMPjv15C9UvppxvrrGdv6bzQHOW1P1vLoMH15HvdJwGJ3dBd2bnrJ63Uy36YRUfrAMxGLiwUDHncvC8AuPaQ==",
+      "requires": {
+        "discord-rpc": "github:discordjs/rpc"
+      }
+    },
+    "discord-rpc": {
+      "version": "github:discordjs/rpc#2dc7ca3e78d632c07ca965a65ba669afe26fdc7f",
+      "from": "github:discordjs/rpc",
+      "requires": {
+        "node-fetch": "^2.3.0",
+        "ws": "^6.1.1"
+      }
+    },
     "dmg-builder": {
       "version": "6.6.1",
       "resolved": "https://registry.npmjs.org/dmg-builder/-/dmg-builder-6.6.1.tgz",
@@ -7438,6 +7464,11 @@
         "lower-case": "^1.1.1"
       }
     },
+    "node-fetch": {
+      "version": "2.6.0",
+      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.0.tgz",
+      "integrity": "sha512-8dG4H5ujfvFiqDmVu9fQ5bOHUC15JMjMY/Zumv26oOvvVJjM67KF8koCWIabKQ1GJIa9r2mMZscBq/TbdOcmNA=="
+    },
     "node-forge": {
       "version": "0.7.5",
       "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-0.7.5.tgz",
@@ -12031,6 +12062,14 @@
         "signal-exit": "^3.0.2"
       }
     },
+    "ws": {
+      "version": "6.2.1",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-6.2.1.tgz",
+      "integrity": "sha512-GIyAXC2cB7LjvpgMt9EKS2ldqr0MTrORaleiOno6TweZ6r3TKtoFQWay/2PceJ3RuBasOHzXNn5Lrw1X0bEjqA==",
+      "requires": {
+        "async-limiter": "~1.0.0"
+      }
+    },
     "xdg-basedir": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-3.0.0.tgz",
diff --git a/package.json b/package.json
index ec02fe26d..88ed41aa7 100644
--- a/package.json
+++ b/package.json
@@ -57,9 +57,11 @@
     "@mdi/font": "^3.3.92",
     "clean-css": "^4.2.1",
     "comment-json": "^1.1.3",
+    "dataurl": "^0.1.0",
     "deepmerge": "^3.0.0",
     "dir-to-json": "0.0.3",
     "dirtree2json": "^1.0.0",
+    "discord-rich-presence": "0.0.8",
     "highlightjs": "^9.12.0",
     "js-yaml": "^3.13.1",
     "mime": "^2.4.2",
diff --git a/src/index.ejs b/src/index.ejs
index c52eaa238..2a34a69fd 100644
--- a/src/index.ejs
+++ b/src/index.ejs
@@ -2,7 +2,7 @@
 <html>
   <head>
     <meta charset="utf-8">
-    <title>bridge</title>
+    <title>bridge.</title>
     <% if (htmlWebpackPlugin.options.nodeModules) { %>
       <!-- Add `node_modules/` to global paths so `require` works properly in development -->
       <script>
diff --git a/src/main/Discord.js b/src/main/Discord.js
index 63ed301f9..ca436692c 100644
--- a/src/main/Discord.js
+++ b/src/main/Discord.js
@@ -1,13 +1,13 @@
-// import DRP from "discord-rich-presence";
-// import APP_VERSION from "../renderer/scripts/constants/app_version";
+import DRP from "discord-rich-presence";
+import APP_VERSION from "../renderer/scripts/constants/app_version";
 
-// const client = DRP("554245594332528651");
-// const START_TIME = Date.now();
+const client = DRP("554245594332528651");
+const START_TIME = Date.now();
 
-// client.updatePresence({
-//     state: process.env.NODE_ENV === "development" ? "Developing new features..." : "Developing add-ons...",
-//     startTimestamp: START_TIME,
-//     largeImageKey: "big_icon",
-//     largeImageText: "bridge. | " + APP_VERSION + (process.env.NODE_ENV === "development" ? "-dev" : ""),
-//     instance: true,
-// });
\ No newline at end of file
+client.updatePresence({
+    state: process.env.NODE_ENV === "development" ? "Developing new features..." : "Developing add-ons...",
+    startTimestamp: START_TIME,
+    largeImageKey: "big_icon",
+    largeImageText: "bridge. | " + APP_VERSION + (process.env.NODE_ENV === "development" ? "-dev" : ""),
+    instance: true,
+});
\ No newline at end of file
diff --git a/src/main/index.js b/src/main/index.js
index 17b4eb83c..075c217cc 100644
--- a/src/main/index.js
+++ b/src/main/index.js
@@ -1,151 +1,135 @@
 import { app, BrowserWindow, ipcMain, Menu } from "electron";
 import "./communicator.js";
 import "./Discord";
+import { BP_BASE_PATH } from "../shared/paths.js";
 
-/**
- * Set `__static` path to static files in production
- * https://simulatedgreg.gitbooks.io/electron-vue/content/en/using-static-assets.html
- */
+//Set __static path to static files in production
 if (process.env.NODE_ENV !== "development") {
-  global.__static = require("path").join(__dirname, "/static").replace(/\\/g, "\\\\")
+    global.__static = require("path").join(__dirname, "/static").replace(/\\/g, "\\\\")
 }
 
 let mainWindow, loadingWindow, windowOptions = {
-  height: 600,
-  useContentSize: true,
-  width: 1000,
-  frame: false,
-  minWidth: 900,
-  minHeight: 600,
-  show: false,
-  webPreferences: {
-    nodeIntegration: true
-  }
+    height: 600,
+    useContentSize: true,
+    width: 1000,
+    frame: false,
+    minWidth: 900,
+    minHeight: 600,
+    show: false,
+    webPreferences: {
+        nodeIntegration: true
+    }
 };
 const winURL = process.env.NODE_ENV === "development"
-  ? `http://localhost:9080`
-  : `file://${__dirname}/index.html`;
+    ? `http://localhost:9080`
+    : `file://${__dirname}/index.html`;
 
 function createWindow () {
-  /**
-   * Initial window options
-   */
-  mainWindow = new BrowserWindow(windowOptions);
-
-  mainWindow.loadURL(winURL);
-
-  mainWindow.on("closed", () => {
-    mainWindow = null;
-    if(loadingWindow) {
-      loadingWindow.close();
-    }
-  });
-
-  mainWindow.webContents.on("did-finish-load", () => {
-    if(loadingWindow) {
-      mainWindow.setPosition(...loadingWindow.getPosition());
-      // mainWindow.toggleDevTools();
-      loadingWindow.close();
-      mainWindow.show();
-    }
-  });
-
-  if(process.env.NODE_ENV === "development") mainWindow.setMenu(Menu.buildFromTemplate([
-    {
-      label: "View",
-      submenu: [
-        { role: "reload" }
-      ]
-    }
-  ]));
-  if(process.env.NODE_ENV !== "development") mainWindow.setMenu(null);
+    /**
+     * Initial window options
+     */
+    mainWindow = new BrowserWindow(windowOptions);
+
+    mainWindow.loadURL(winURL);
+
+    mainWindow.on("closed", () => {
+        mainWindow = null;
+        if(loadingWindow) {
+            loadingWindow.close();
+        }
+    });
+
+    mainWindow.webContents.on("did-finish-load", () => {
+        if(loadingWindow) {
+            mainWindow.setPosition(...loadingWindow.getPosition());
+            // mainWindow.toggleDevTools();
+            loadingWindow.close();
+            mainWindow.show();
+        }
+    });
+
+    if(process.env.NODE_ENV === "development") mainWindow.setMenu(Menu.buildFromTemplate([
+        {
+            label: "View",
+            submenu: [
+                { role: "reload" }
+            ]
+        }
+    ]));
+    if(process.env.NODE_ENV !== "development") mainWindow.setMenu(null);
 }
 
 function createSplashScreen() {
-  loadingWindow = new BrowserWindow({
-    height: 300,
-    useContentSize: true,
-    width: 300,
-    frame: false,
-    resizable: false
-  });
-
-  loadingWindow.loadURL(`file://${__static}/loading.html`);
-
-  loadingWindow.on("closed", () => {
-    loadingWindow = null;
-  });
-
-  loadingWindow.webContents.on("did-finish-load", () => {
-    loadingWindow.show();
-
-    if (process.platform == 'win32' && process.argv.length >= 2 && process.env.NODE_ENV !== "development") {
-      openFile(process.argv[1]);
-    }
-  });
+    loadingWindow = new BrowserWindow({
+        height: 300,
+        useContentSize: true,
+        width: 300,
+        frame: false,
+        resizable: false
+    });
+
+    loadingWindow.loadURL(`file://${__static}/loading.html`);
+
+    loadingWindow.on("closed", () => {
+        loadingWindow = null;
+    });
+
+    loadingWindow.webContents.on("did-finish-load", () => {
+        loadingWindow.show();
+
+        if(process.platform == 'win32' && process.argv.length >= 2 && process.env.NODE_ENV !== "development") {
+            openFile(process.argv[1]);
+        }
+    });
 }
 
 function openFile(file) {
-  mainWindow.webContents.send("openFile", file)
+    mainWindow.webContents.send("openFile", file)
 }
 
 const gotTheLock = app.requestSingleInstanceLock();
-if (!gotTheLock) {
-  app.quit();
+if(!gotTheLock) {
+    if(process.argv.length >= 2)
+        app.quit();
 } else {
-  app.on("second-instance", (event, argv, working_directory) => {
-    // Someone tried to run a second instance, we should focus our window.
-    if(mainWindow) {
-      if (mainWindow.isMinimized()) mainWindow.restore();
-      mainWindow.focus();
-    }
-    if(loadingWindow) {
-      if (loadingWindow.isMinimized()) loadingWindow.restore();
-      loadingWindow.focus();
-    }
-
-    if (process.platform == 'win32' && argv.length >= 2) {
-      openFile(argv[3]);
-    }
-  });
+    app.on("second-instance", (event, argv, working_directory) => {
+        if(mainWindow) {
+            if (mainWindow.isMinimized()) mainWindow.restore();
+            mainWindow.focus();
+        }
+        if(loadingWindow) {
+            if (loadingWindow.isMinimized()) loadingWindow.restore();
+            loadingWindow.focus();
+        }
+
+        if(process.platform == 'win32' && argv.length >= 2) {
+            openFile(argv[3]);
+        }
+    });
+}
 
-  // Create myWindow, load the rest of the app, etc...
-  app.on('ready', () => {
+app.on('ready', () => {
     createWindow();
     createSplashScreen();
-  });
-}
+});
 
 app.on("window-all-closed", () => {
-  if (process.platform !== "darwin") {
-    app.quit();
-  }
+    if (process.platform !== "darwin") {
+        app.quit();
+    }
 });
 
 app.on("activate", () => {
-  if (mainWindow === null) {
-    createWindow();
-  }
+    if (mainWindow === null) {
+        createWindow();
+    }
 });
 
-ipcMain.on("toggleDevTools", function() { mainWindow.toggleDevTools(); });
-
-/**
- * Auto Updater
- *
- * Uncomment the following code below and install `electron-updater` to
- * support auto updating. Code Signing with a valid certificate is required.
- * https://simulatedgreg.gitbooks.io/electron-vue/content/en/using-electron-builder.html#auto-updating
- */
-
-/*
-import { autoUpdater } from "electron-updater"
-
-autoUpdater.on("update-downloaded", () => {
-  autoUpdater.quitAndInstall()
-})
-
-app.on("ready", () => {
-  if (process.env.NODE_ENV === "production") autoUpdater.checkForUpdates()
-})
- */
+ipcMain.on("toggleDevTools", () => { mainWindow.toggleDevTools(); });
+ipcMain.on("bridge:setOverlayIcon", (event, project) => {
+    try {
+        mainWindow.setOverlayIcon((BP_BASE_PATH + project + "/pack_icon.png").replace(/\//g, "\\"), project);
+    } catch(e) {
+        mainWindow.setOverlayIcon(null, "");
+    }
+})
\ No newline at end of file
diff --git a/src/renderer/components/editor_shell/AudioPlayer.vue b/src/renderer/components/editor_shell/AudioPlayer.vue
new file mode 100644
index 000000000..0c5c8cd0e
--- /dev/null
+++ b/src/renderer/components/editor_shell/AudioPlayer.vue
@@ -0,0 +1,75 @@
+<template>
+    <v-container style="margin-top: 20%;">
+        <audio :src="src" ref="audio"/>
+        
+        <v-layout horizontal align-center>
+            <v-btn @click="$refs.audio.play()"><v-icon>mdi-play</v-icon></v-btn>
+            <v-btn @click="$refs.audio.pause()"><v-icon>mdi-pause</v-icon></v-btn>
+            <v-progress-circular
+                :rotate="-90"
+                :size="100"
+                :width="4"
+                :value="currentTime / duration * 100"
+                color="success"
+            />
+            <v-btn @click="() => toggleMute()">
+                <v-icon v-if="is_muted">mdi-volume-mute</v-icon>
+                <v-icon v-else>mdi-volume-plus</v-icon>
+            </v-btn>
+            <v-slider v-model="volume_wrapper" :color="is_muted ? 'error' : 'success'" :min="0" :max="1" :step="0.01"/>
+        </v-layout>
+        
+    </v-container>
+</template>
+
+<script>
+    export default {
+        name: "audio-player",
+        props: {
+            src: String
+        },
+        mounted() {
+            this.player = this.$refs.audio || {};
+            setTimeout(() => console.log(this.player, this.$refs), 1000);
+            requestAnimationFrame(this.updateTime);
+        },
+        destroyed() {
+            this.requestAnim = false;
+        },
+        data() {
+            return {
+                player: {},
+                is_muted: false,
+                currentTime: 0,
+                duration: 1,
+                requestAnim: true,
+                volume: 1,
+            }
+        },
+        computed: {
+            volume_wrapper: {
+                set(val) {
+                    this.toggleMute(false);
+                    this.volume = val;
+                },
+                get() {
+                    return this.volume;
+                }
+            }
+        },
+        methods: {
+            toggleMute(force=!this.is_muted) {
+                this.is_muted = force;
+                this.player.muted = this.is_muted;
+            },
+            updateTime() {
+                this.currentTime = this.player.currentTime;
+                this.duration = this.player.duration;
+                this.player.volume = this.volume;
+
+                if(this.requestAnim)
+                    setTimeout(() => requestAnimationFrame(this.updateTime), 200);
+            }
+        }
+    }
+</script>
diff --git a/src/renderer/components/editor_shell/FileManager.vue b/src/renderer/components/editor_shell/FileManager.vue
index 33516fe4f..217401dee 100644
--- a/src/renderer/components/editor_shell/FileManager.vue
+++ b/src/renderer/components/editor_shell/FileManager.vue
@@ -1,8 +1,9 @@
 <template>
     <span>
-        <v-container v-if="extension == 'png'">
+        <v-container v-if="extension === 'png'">
             <v-img class="image" :src="image" :style="`max-height: ${available_height}px;`"/>
         </v-container>
+        <audio-player v-else-if="extension === 'ogg'" :src="audio"/>
         <json-error-screen v-else-if="extension === 'json' && json_object == 'error'"/>
         <json-editor-main
             v-else-if="extension === 'json'"
@@ -55,13 +56,16 @@
     import EventBus from "../../scripts/EventBus";
     import TextProvider from "../../scripts/autoCompletions/TextProvider";
     import { webContents } from "electron";
+    import DataUrl from "dataurl";
+    import AudioPlayer from "./AudioPlayer";
 
     export default {
         name: "file-manager",
         components: {
             JsonEditorMain,
             JsonErrorScreen,
-            TextAutoCompletions
+            TextAutoCompletions,
+            AudioPlayer
         },
         props: {
             file: Object,
@@ -104,7 +108,7 @@
         },
         computed: {
             extension() {
-                if (this.file) return this.file.file_name.split(".").pop().toLowerCase();
+                if(this.file) return this.file.file_name.split(".").pop().toLowerCase();
             },
             use_uuid() {
                 return `${this.uuid}-${Math.random()})`;
@@ -112,11 +116,12 @@
 
             //FILE CONTENT
             image() {
-                if (this.file) {
-                    this.$store.commit("removeLoadingWindow", { id: "open-file" });
-                    let base64Data = btoa(String.fromCharCode.apply(null, this.file.raw_content));
-                    return `data:image/${this.extension};base64,${base64Data}`;
-                }
+                this.$store.commit("removeLoadingWindow", { id: "open-file" });
+                return this.getEncoded("image", this.extension, this.file.raw_content);
+            },
+            audio() {
+                this.$store.commit("removeLoadingWindow", { id: "open-file" });
+                return this.getEncoded("audio", this.extension, this.file.raw_content);
             },
             text: {
                 get() {
@@ -211,6 +216,12 @@
             },
             shouldUpdateSuggestions(event) {
                 TextProvider.compile(event.doc, this.file.file_path);
+            },
+            getEncoded(type, ext, data) {
+                return DataUrl.convert({
+                    data,
+                    mimetype: `${type}/${ext}`
+                });
             }
         },
         watch: {
diff --git a/src/renderer/components/sidebar/content/Explorer.vue b/src/renderer/components/sidebar/content/Explorer.vue
index c36560767..a8649a377 100644
--- a/src/renderer/components/sidebar/content/Explorer.vue
+++ b/src/renderer/components/sidebar/content/Explorer.vue
@@ -7,6 +7,7 @@
         </span>
         <v-select
             v-if="force_project_algorithm === undefined"
+            style="margin-bottom: 4px;"
             ref="project_select"
             :items="project_items" 
             :value="selected" 
@@ -16,6 +17,7 @@
             :loading="loading" 
             :disabled="items.length <= 1"
             @input="getDirectory"
+            hide-details
         />
         <v-subheader
             v-else
diff --git a/src/renderer/scripts/FileSystem.js b/src/renderer/scripts/FileSystem.js
index 863813eeb..53d2bafea 100644
--- a/src/renderer/scripts/FileSystem.js
+++ b/src/renderer/scripts/FileSystem.js
@@ -67,6 +67,8 @@ class FileSystem {
     }
 
     open(path, cb) {
+        if(typeof path !== "string") return;
+        
         this.Cache.get(path)
             .then((cache) => 
                 cache.content ? 
@@ -79,7 +81,7 @@ class FileSystem {
                     })
             )
             .catch((err) => {
-                console.log("[OPEN] Not opened from cache", err, );
+                console.log("[OPEN] Not opened from cache");
                 if(fs.statSync(path).isFile()) {
                     fs.readFile(path, (err, data) => {
                         if(err) throw err;
diff --git a/src/renderer/scripts/TabSystem.js b/src/renderer/scripts/TabSystem.js
index f5c764c1b..af2e13add 100644
--- a/src/renderer/scripts/TabSystem.js
+++ b/src/renderer/scripts/TabSystem.js
@@ -282,6 +282,8 @@ class TabSystem {
             return JSON.stringify(Format.toJSON(modified_data.content), null, this.use_tabs ? "\t" : "  ");
         } else if(ext == "png") {
             return current.raw_content;
+        } else if(ext == "ogg") {
+            return current.raw_content;
         } else {
             FileSystem.Cache.save(current.file_path, current.content, PluginEnv.trigger("bridge:cacheFile", { 
                 file_path: current.file_path,
diff --git a/src/renderer/scripts/autoCompletions/Dynamic.js b/src/renderer/scripts/autoCompletions/Dynamic.js
index dffeb7d82..fc8632bc1 100644
--- a/src/renderer/scripts/autoCompletions/Dynamic.js
+++ b/src/renderer/scripts/autoCompletions/Dynamic.js
@@ -83,7 +83,6 @@ export const DYNAMIC = {
             try {
                 return Object.keys(TabSystem.getSelected().content.get("minecraft:entity/events").toJSON());
             } catch(e) {
-                console.log(e);
                 return [];
             }
         },
@@ -94,7 +93,11 @@ export const DYNAMIC = {
             return JsonCacheUtils.events.map(e => "@s " + e);
         },
         animation_references() {
-            return JsonCacheUtils.animation_references;
+            try {
+                return Object.keys(TabSystem.getSelected().content.get("minecraft:entity/description/animations").toJSON());
+            } catch(e) {
+                return [];
+            }
         }
     },
     recipe: {
@@ -103,7 +106,6 @@ export const DYNAMIC = {
                 let data = TabSystem.getSelected().content.get("minecraft:recipe_shaped/pattern").toJSON();
                 return data.map(e => e.split("")).reduce((acc, curr) => acc.concat(curr), []);
             } catch(e) {
-                console.log(e);
                 return [];
             }
         }
diff --git a/src/renderer/scripts/utilities/Cache.js b/src/renderer/scripts/utilities/Cache.js
index ef9f65c8d..78c8e34f9 100644
--- a/src/renderer/scripts/utilities/Cache.js
+++ b/src/renderer/scripts/utilities/Cache.js
@@ -7,6 +7,7 @@ function getPath(path) {
     return BASE_PATH + path;
 }
 function getFileId(file_path) {
+    if(file_path === null) return;
     return file_path.replace(/\\/g, "/").replace(BASE_PATH.replace(/\\/g, "/"), "");
 }
 
@@ -38,7 +39,7 @@ export default class Cache {
         return new Promise((resolve, reject) => {
             this.getCache((cache) => {
                 let id = getFileId(file_path);
-                if(cache[id] == undefined) return reject(`File ${id} is not cached yet.`);
+                if(cache[id] === undefined) return reject(`File ${id} is not cached yet.`);
                 resolve(cache[id] || {});
             });
         });
diff --git a/src/renderer/store/modules/Explorer.js b/src/renderer/store/modules/Explorer.js
index b40981ffb..d6d824ddd 100644
--- a/src/renderer/store/modules/Explorer.js
+++ b/src/renderer/store/modules/Explorer.js
@@ -1,5 +1,6 @@
 import dirTree from "../../../../node_modules/dirtree2json/lib/index";
 import Vue from "vue";
+import { ipcRenderer } from "electron";
 
 const state = {
     project: {},
@@ -9,10 +10,8 @@ const state = {
 const mutations = {
     setExplorerProject(state, { store_key, project }) {
         Vue.set(state.project, store_key, project);
-    },
-    setExplorerFiles(state, files) {
-        // state.files = files;
-        console.warn("Using this commit is deprecated")
+        //Set the pack_icon as an overlay
+        // if(store_key === "explorer") ipcRenderer.send("bridge:setOverlayIcon", project);
     },
     loadExplorerDirectory(state, { store_key, path, force_reload }) {
         if(force_reload || state.files[store_key] === undefined) {
diff --git a/src/shared/Paths.js b/src/shared/Paths.js
new file mode 100644
index 000000000..7fd4e8aad
--- /dev/null
+++ b/src/shared/Paths.js
@@ -0,0 +1,3 @@
+export const MOJANG_PATH = `${process.env.LOCALAPPDATA.replace(/\\/g, "/")}/Packages/Microsoft.MinecraftUWP_8wekyb3d8bbwe/LocalState/games/com.mojang/`;
+export const BP_BASE_PATH = MOJANG_PATH + "development_behavior_packs/";
+export const RP_BASE_PATH = MOJANG_PATH + "development_resource_packs/";
\ No newline at end of file
diff --git a/static/file_creator/entity.json b/static/file_creator/entity.json
index 5312a5c7c..80b1a6078 100644
--- a/static/file_creator/entity.json
+++ b/static/file_creator/entity.json
@@ -5,8 +5,8 @@
     "path": "entities/",
     "templates": {
         "Blank Entity": {
+            "format_version": {},
             "minecraft:entity": {
-                "format_version": {},
                 "description": {
                     "identifier": "",
                     "runtime_identifier": ""