Changelog update and crucial bugfix

Gatohost · Oct 20, 2021 · 73faa0f · 73faa0f
1 parent 2a451be
commit 73faa0f
Show file tree

Hide file tree

Showing 30 changed files with 357 additions and 38 deletions.
diff --git a/GatoClientElectron/.vs/GatoClientElectron/v16/.suo b/GatoClientElectron/.vs/GatoClientElectron/v16/.suo
diff --git a/GatoClientElectron/.vs/VSWorkspaceState.json b/GatoClientElectron/.vs/VSWorkspaceState.json
@@ -3,8 +3,8 @@
     "",
     "\\app",
     "\\app\\scripts",
-    "\\app\\settings"
+    "\\app\\splash"
   ],
-  "SelectedNode": "\\app\\main.js",
+  "SelectedNode": "\\app\\splash\\splashPreload.js",
   "PreviewInSolutionExplorer": false
 }
diff --git a/GatoClientElectron/.vs/slnx.sqlite b/GatoClientElectron/.vs/slnx.sqlite
diff --git a/GatoClientElectron/app/.vs/ProjectSettings.json b/GatoClientElectron/app/.vs/ProjectSettings.json
@@ -0,0 +1,3 @@
+{
+  "CurrentProjectSetting": null
+}
diff --git a/GatoClientElectron/app/.vs/slnx.sqlite b/GatoClientElectron/app/.vs/slnx.sqlite
diff --git a/GatoClientElectron/app/changelog/changelog.html b/GatoClientElectron/app/changelog/changelog.html
@@ -0,0 +1,27 @@
+<head>
+    <link rel="stylesheet" href="css/changelog.css">
+</head>
+<body>
+    <div class="titleHolder">
+        <img src="images/logo.png" class="titleImage" width="75" height="75">
+        <h3 class="title">Gatoclient Changelog</h3>
+    </div>
+    <div class="container">
+        <div id="content">
+            <form action="">
+                <div>
+					<h2>General</h2>
+					<p>Added Changelog Menu</p>
+					<p>Changed Krunker Update Log Button to Gatoclient</p>
+					<p>Updated Some CSS to fit the Update Log (More Soon)</p>
+				</div>
+				<div>
+					<h2>Fixes</h2>
+					<p>Fixed FPS Uncap (again...)</p>
+					<p>Another Potential Update Splash Screen Fix</p>
+					<p>Fixed my cat...</p>
+				</div>
+            </form>
+        </div>
+    </div>
+</body>
diff --git a/GatoClientElectron/app/changelog/css/changelog.css b/GatoClientElectron/app/changelog/css/changelog.css
@@ -0,0 +1,77 @@
+@font-face {
+  font-family: BaiJamjuree-Light;
+  src: url(../fonts/BaiJamjuree-Light.ttf);
+  font-weight: normal;
+}
+@font-face {
+  font-family: BaiJamjuree-Bold;
+  src: url(../fonts/BaiJamjuree-Bold.ttf);
+  font-weight: normal;
+}
+body {
+ background-image: url("../images/background.jpg");
+ background-size: cover;
+ background-repeat: no-repeat;
+ background-color: #cccccc;
+ font-family: BaiJamjuree-Light;
+ color:white;
+ padding: 0px 0px 0px 0px;
+ overflow: hidden !important; 
+}
+.titleHolder {
+    margin: 0px 20px 0px 0px;  
+    overflow: auto;
+	color:#f1f1f1;
+	font-size: 24px;
+	border:solid #fff;
+	border-radius:4px;
+	padding:10px 30px 0px 30px;
+	background-color: rgba(0,0,0,0.2);
+	width:400px;
+    border-width: 0px 2px 0px 2px;
+}
+.titleImage {
+    float: left
+}
+.titleImage img {
+    display: block
+}
+.title {
+    margin-left: 80px; 
+	font-family: BaiJamjuree-Bold;
+	position:relative;
+	top:-5px;
+}
+h2 {  
+    overflow: auto;
+	color:#f1f1f1;
+	border:solid #fff;
+	border-width: 0px 2px 0px 2px;
+	border-radius:4px;
+	padding:10px 30px 10px 30px;
+	background-color: rgba(0,0,0,0.2);
+	width:400px;
+	margin-top:8px;
+	margin-bottom:8px;
+	font-family: BaiJamjuree-Bold;
+}
+p {  
+    overflow: auto;
+	color:#d4d4d4;
+	border:solid #b5b5b5;
+	border-width: 0px 2px 0px 2px;
+	border-radius:4px;
+	padding:10px 30px 10px 30px;
+	background-color: rgba(0,0,0,0.2);
+	width:400px;
+	margin-top:2px;
+	margin-bottom:2px;
+}
+p:nth-child(even) {  
+	padding:10px 30px 10px 30px;
+	background-color: rgba(92, 92, 92,0.4);
+}
+p:nth-child(odd) {  
+	padding:10px 30px 10px 30px;
+	background-color: rgba(48, 48, 48,0.3);
+}
diff --git a/GatoClientElectron/app/changelog/fonts/BaiJamjuree-Bold.ttf b/GatoClientElectron/app/changelog/fonts/BaiJamjuree-Bold.ttf
diff --git a/GatoClientElectron/app/changelog/fonts/BaiJamjuree-Light.ttf b/GatoClientElectron/app/changelog/fonts/BaiJamjuree-Light.ttf
diff --git a/GatoClientElectron/app/changelog/images/background.jpg b/GatoClientElectron/app/changelog/images/background.jpg
diff --git a/GatoClientElectron/app/changelog/images/logo.png b/GatoClientElectron/app/changelog/images/logo.png
diff --git a/GatoClientElectron/app/main.js b/GatoClientElectron/app/main.js
@@ -77,6 +77,31 @@ ipcMain.on('openSettings', (event) => {
     })
 });
 
+// When Changelog Clicked Open Changelog
+ipcMain.on('openChangelog', (event) => {
+    // Settings Menu Initialized
+    let chlgWindow = new BrowserWindow({
+        width: 490,
+        height: 725,
+        resizable: false
+    });
+    chlgWindow.loadURL(path.join(__dirname, 'changelog/changelog.html'));
+    chlgWindow.show();
+    chlgWindow.center();
+    chlgWindow.removeMenu();
+
+    // Close on main close
+    mainWindow.on('close', function () {
+        if (chlgWindow != null)
+            chlgWindow.close();
+    })
+
+    // Fix Object Destroyed Error with Closing
+    chlgWindow.on('close', function () {
+        chlgWindow = null;
+    })
+});
+
 // Save settings when sent to main process
 let inputs;
 ipcMain.on('savedSettings', (event, preferences) => {
@@ -89,49 +114,110 @@ ipcMain.on('savedSettings', (event, preferences) => {
 ipcMain.on('preloadNeedSettings', (event) => {
     mainWindow.webContents.send('preloadSettings', path.join(app.getPath("documents"), "GatoclientResourceSwapper/settings.json"));
 });
+ipcMain.on('splashNeedInfo', (event) => {
+    splashWindow.webContents.send('splashInfo', app.getVersion());
+});
 
-//Listen for app to get ready
-app.on('ready', function () {
-    // Before we can read the settings, we need to make sure they exist, if they don't, then we create a template
-    if (fs.existsSync(path.join(app.getPath("documents"), "GatoclientResourceSwapper/settings.json")) == false) {
-        fs.writeFileSync(path.join(app.getPath("documents"), "GatoclientResourceSwapper/settings.json"), '{ "fpsUncap": false, "discordrpc": true, "skyColor": false, "skyColorValue": "#FF0000" }', { flag: 'wx' }, function (err) {
-            if (err) throw err;
-            console.log("It's saved!");
-        });
-    }
+function sleep(ms) {
+    return new Promise((resolve) => {
+        setTimeout(resolve, ms);
+    });
+}
 
-    // Read settings to apply them to the command line arguments
-    let filePath = path.join(app.getPath("documents"), "GatoclientResourceSwapper/settings.json");
-    let userPrefs = JSON.parse(fs.readFileSync(filePath));
-    if (userPrefs['fpsUncap'] == true) {
-        app.commandLine.appendSwitch('disable-frame-rate-limit');
-        app.commandLine.appendSwitch("disable-gpu-vsync");
-    }
+// Before we can read the settings, we need to make sure they exist, if they don't, then we create a template
+if (fs.existsSync(path.join(app.getPath("documents"), "GatoclientResourceSwapper/settings.json")) == false) {
+    fs.writeFileSync(path.join(app.getPath("documents"), "GatoclientResourceSwapper/settings.json"), '{ "fpsUncap": false, "discordrpc": true, "skyColor": false, "skyColorValue": "#FF0000" }', { flag: 'wx' }, function (err) {
+        if (err) throw err;
+        console.log("It's saved!");
+    });
+}
+
+// Read settings to apply them to the command line arguments
+let filePath = path.join(app.getPath("documents"), "GatoclientResourceSwapper/settings.json");
+let userPrefs = JSON.parse(fs.readFileSync(filePath));
+if (userPrefs['fpsUncap'] == true) {
+    app.commandLine.appendSwitch('disable-frame-rate-limit');
+    app.commandLine.appendSwitch("disable-gpu-vsync");
+}
     // Heres some unused command line switches that I am too lazy to implement right now
     // app.commandLine.appendSwitch("autoplay-policy", "no-user-gesture-required");
     // app.commandLine.appendSwitch("disable-accelerated-2d-canvas", "true");
     // app.commandLine.appendSwitch("in-process-gpu");
 
-    //Make the window
-    mainWindow = new BrowserWindow({
+//Listen for app to get ready
+app.on('ready', function () {
+    // Make Splash Screen
+    splashWindow = new BrowserWindow({
         autoHideMenuBar: true,
+        frame: false,
+        skipTaskbar: true,
         webPreferences: {
-            preload: path.join(__dirname, 'preload.js'),
+            preload: path.join(__dirname, 'splash/splashPreload.js')
         }
     });
-    mainWindow.setSize(1600, 900);
-    mainWindow.loadURL(url.format({
-        pathname: 'https://krunker.io',
+    splashWindow.setAlwaysOnTop(true, 'pop-up-menu');
+    splashWindow.loadURL(url.format({
+        pathname: path.join(__dirname, 'splash/splash.html'),
         icon: __dirname + 'src/cat.ico' // Doesn't work anymore just ignore it
     }));
-    mainWindow.center();
-    mainWindow.removeMenu();
-    var mainWindowIsFullscreen = false;
+    splashWindow.setSize(512, 256);
+    splashWindow.center();
+    splashWindow.removeMenu();
 
     // Check for updates
-    mainWindow.once('ready-to-show', () => {
-        autoUpdater.checkForUpdatesAndNotify();
+    splashWindow.once('ready-to-show', () => {
+        autoUpdate();
     });
+    async function autoUpdate() {
+        return new Promise((resolve, reject) => {
+            autoUpdater.checkForUpdatesAndNotify();
+
+            // Testing Only
+            launchGame();
+            resolve();
+
+            // Splash screen no update
+            autoUpdater.on('update-not-available', () => {
+                launchGame();
+                resolve();
+            });
+            // Splash screen update shits
+            autoUpdater.on('update-available', () => {
+                splashWindow.webContents.send('newVersion');
+                mainWindow.close();
+            });
+            autoUpdater.on('update-downloaded', () => {
+                autoUpdater.quitAndInstall();
+            });
+        });
+    }
+    // Splash Screen Shit
+    function launchGame() {
+        splashWindow.webContents.send('latest');
+        setTimeout(() => launchMainWindow(), 2000);
+        setTimeout(() => splashWindow.destroy(), 2000);
+    }
+
+    //Make the window
+    mainWindow = new BrowserWindow({
+        autoHideMenuBar: true,
+        webPreferences: {
+            preload: path.join(__dirname, 'preload.js'),
+        }
+    });
+    mainWindow.hide();
+
+    function launchMainWindow() {
+        mainWindow.show();
+        mainWindow.setSize(1600, 900);
+        mainWindow.loadURL(url.format({
+            pathname: 'https://krunker.io',
+            icon: __dirname + 'src/cat.ico' // Doesn't work anymore just ignore it
+        }));
+        mainWindow.center();
+        mainWindow.removeMenu();
+        var mainWindowIsFullscreen = false;
+    }
 
     // Rich Presence
     ipcMain.handle("rpc-activity",
@@ -189,14 +275,6 @@ app.on('ready', function () {
     })
 });
 
-// Handle Updating
-autoUpdater.on('update-available', () => {
-    // mainWindow.webContents.send('update_available');
-});
-autoUpdater.on('update-downloaded', () => {
-    autoUpdater.quitAndInstall();
-});
-
 // Just to make sure the Client Closes fully
 app.on('window-close-all', () => {
     app.quit();

diff --git a/GatoClientElectron/app/packagedCSS/main_custom.css b/GatoClientElectron/app/packagedCSS/main_custom.css
@@ -71,4 +71,12 @@
 	transform:translate(-50%,-50%);
 	position:fixed;
 	top:55%;
+}
+
+/* Flashing Updates Box */
+#updateAd{
+	box-shadow:unset;
+	animation-name:freeKRPulse;
+	animation-duration:2s;
+	animation-iteration-count:infinite
 }
diff --git a/GatoClientElectron/app/preload.js b/GatoClientElectron/app/preload.js
@@ -33,6 +33,36 @@ document.addEventListener("DOMContentLoaded", (event) => {
     const { ipcRenderer } = require('electron');
     ipcRenderer.send('preloadNeedSettings');
     menuItem.addEventListener("click", (event) => { ipcRenderer.send('openSettings'); });
+
+    // Remove the broken revjet ad
+    if (document.contains(document.getElementById("revjet_container"))) {
+        document.getElementById("revjet_container").remove();
+    }
+
+    // Changelogs
+    const oldIcon = document.getElementById("updateAdIcon");
+    const updateHolder = document.getElementById("updateAd");
+    oldIcon.remove();
+    const newIcon = document.createElement("img");
+    newIcon.setAttribute("id", "helpPIcon");
+    newIcon.setAttribute("src", "https://cdn.discordapp.com/attachments/661004708852269080/899301043672842250/settingIcon.png");
+    updateHolder.insertBefore(newIcon, updateHolder.children[0]);
+    const updateDetailText = document.getElementById("updateAdVersion");
+    const HelpTextHoldersArray = document.querySelectorAll("#helpTxtHol");
+    console.log(HelpTextHoldersArray);
+    const updateDetailHolder = HelpTextHoldersArray[5];
+    updateDetailText.remove();
+    const newDetailText = document.createElement("div");
+    newDetailText.setAttribute("id", "helpGuidOpn");
+    newDetailText.innerHTML = "Gatoclient Updates";
+    updateDetailHolder.appendChild(newDetailText);
+
+    // Changelogs Click Event
+    const updateAdHolder = document.getElementById("updateAd");
+    updateAdHolder.removeAttribute("onclick");
+    updateAdHolder.addEventListener("click", (event) => {
+        ipcRenderer.send('openChangelog');
+    });
 })
 
 // Fix settings importing

diff --git a/GatoClientElectron/app/splash/fonts/FFF-Forward.ttf b/GatoClientElectron/app/splash/fonts/FFF-Forward.ttf
diff --git a/GatoClientElectron/app/splash/images/splash.png b/GatoClientElectron/app/splash/images/splash.png