Updated launcher with new dynamic background

As well as various bug changes and fixes.
HenrikoMagnifico · May 2, 2021 · d3540cb · d3540cb
1 parent ac7b0b8
commit d3540cb
Show file tree

Hide file tree

Showing 10 changed files with 66 additions and 31 deletions.
diff --git a/app/assets/css/launcher.css b/app/assets/css/launcher.css
@@ -51,10 +51,12 @@ body, button {
     color: white;
 }
 
-/*body {
-    background: url('./../images/backgrounds/0.jpg') no-repeat center center fixed;
+/*
+body {
+    background: url('http://i.stack.imgur.com/kx8MT.gif') no-repeat center center fixed;
     background-size: cover;
-}*/
+}
+*/
 
 /*******************************************************************************
  *                                                                             *
@@ -239,7 +241,7 @@ body, button {
     position: relative;
 }
 
-/*
+
 .cloudDiv {
     position: absolute;
     height: 100%;
@@ -274,7 +276,7 @@ body, button {
         background-position: 230%;
     }
 }
-*/
+
 
 #welcomeImageSeal {
     border-radius: 50%;
@@ -2866,9 +2868,9 @@ input:checked + .toggleSwitchSlider:before {
 
 /* Divider bar between the external and internal icons. */
 .mediaDivider {
-    height: 4px;
-    width: 34px;
-    background: rgb(255, 255, 255);
+    height: 2px;
+    width: 44px;
+    background: rgb(156, 156, 156);
     margin: 10px 0px;
 }
 
@@ -2879,7 +2881,7 @@ input:checked + .toggleSwitchSlider:before {
     transition: 0.25s ease;
     cursor: pointer;
     height: 35px;
-    width: 35px;
+    width: 45px;
 }
 .mediaSVG:hover,
 .mediaURL:focus .mediaSVG,
@@ -2892,6 +2894,41 @@ input:checked + .toggleSwitchSlider:before {
     outline: none;
 }
 
+#modpack_banners {
+    /*
+    text-align: left;
+    align-items: center;
+    display: flex;
+    border: none;
+    background: none;
+    width: 80%;
+    height: 70%;
+    margin: auto;
+    padding-top: 10%;
+    */
+
+    background-color: rgb(165, 195, 37);
+    position: relative;
+    margin-top: 25px;
+    height: calc(100% - 90px);
+    width: 100px;
+    align-items: center;
+}
+
+.modpack_banner_img {
+    float: center;
+    text-align: left;
+    align-items: center;
+    display: flex;
+    padding: 30px;
+    margin-bottom: 40%;
+    border: none;
+    background: none;
+    margin-top: 20px;
+    width: 70%;
+    height: 70%;
+}
+
 /* Internal media button shared styles. */
 .mediaButton {
     background: none;
@@ -3007,8 +3044,8 @@ input:checked + .toggleSwitchSlider:before {
     height: 25px;
     width: 2px;
     background: rgba(107, 105, 105, 0.7);
-    margin-left: 70px;
-    margin-right: 30px;
+    margin-left: 80px;
+    margin-right: 38px;
 }
 
 /* * *

diff --git a/app/assets/images/backgrounds/henrikolauncher_background_gif_100q_night.gif b/app/assets/images/backgrounds/henrikolauncher_background_gif_100q_night.gif
diff --git a/app/assets/images/icons/link.svg b/app/assets/images/icons/link.svg
diff --git a/app/assets/js/configmanager.js b/app/assets/js/configmanager.js
@@ -56,7 +56,7 @@ exports.getAbsoluteMaxRAM = function(){
 
 function resolveMaxRAM(){
     const mem = os.totalmem()
-    return mem >= 8000000000 ? '4G' : (mem >= 6000000000 ? '3G' : '2G')
+    return mem >= 8000000000 ? '6G' : (mem >= 6000000000 ? '5G' : '4G') //Automatically sets the ram to 6GB if the user has more than ~8GB in their PC. If they have ~6GB or more, set it to 5GB or 4GB.
 }
 
 function resolveMinRAM(){
@@ -86,7 +86,7 @@ const DEFAULT_CONFIG = {
             resWidth: 1280,
             resHeight: 720,
             fullscreen: false,
-            autoConnect: true,
+            autoConnect: false,
             launchDetached: true
         },
         launcher: {

diff --git a/app/assets/js/scripts/settings.js b/app/assets/js/scripts/settings.js
@@ -1308,7 +1308,7 @@ function populateSettingsUpdateInformation(data){
         settingsUpdateButtonStatus('Check for Updates', false, () => {
             if(!isDev){
                 ipcRenderer.send('autoUpdateAction', 'checkForUpdate')
-                settingsUpdateButtonStatus('Checking for Updates..', true)
+                settingsUpdateButtonStatus('Checking for Updates...', true)
             }
         })
     }

diff --git a/app/assets/js/scripts/uibinder.js b/app/assets/js/scripts/uibinder.js
@@ -66,8 +66,10 @@ function showMainUI(data){
     updateSelectedServer(data.getServer(ConfigManager.getSelectedServer()))
     refreshServerStatus()
     setTimeout(() => {
+
         document.getElementById('frameBar').style.backgroundColor = 'rgba(0, 0, 0, 0.5)'
-        document.body.style.backgroundImage = `url('assets/images/backgrounds/${document.body.getAttribute('bkid')}.jpg')`
+        document.body.style.backgroundImage = `url('assets/images/backgrounds/henrikolauncher_background_gif_100q_night.gif')`
+        /*document.body.style.backgroundImage = `url('assets/images/backgrounds/${document.body.getAttribute('bkid')}.jpg')`*/
         $('#main').show()
 
         const isLoggedIn = Object.keys(ConfigManager.getAuthAccounts()).length > 0

diff --git a/app/assets/js/scripts/uicore.js b/app/assets/js/scripts/uicore.js
@@ -25,13 +25,6 @@ window.eval = global.eval = function () {
     throw new Error('Sorry, this app does not support window.eval().')
 }
 
-// Display warning when devtools window is opened.
-remote.getCurrentWebContents().on('devtools-opened', () => {
-    console.log('%cThe console is dark and full of terrors.', 'color: white; -webkit-text-stroke: 4px #a02d2a; font-size: 60px; font-weight: bold')
-    console.log('%cIf you\'ve been told to paste something here, you\'re being scammed.', 'font-size: 16px')
-    console.log('%cUnless you know exactly what you\'re doing, close this window.', 'font-size: 16px')
-})
-
 // Disable zoom, needed for darwin.
 webFrame.setZoomLevel(0)
 webFrame.setVisualZoomLevelLimits(1, 1)
@@ -42,14 +35,14 @@ if(!isDev){
     ipcRenderer.on('autoUpdateNotification', (event, arg, info) => {
         switch(arg){
             case 'checking-for-update':
-                loggerAutoUpdater.log('Checking for update..')
+                loggerAutoUpdater.log('Checking for update...')
                 settingsUpdateButtonStatus('Checking for Updates..', true)
                 break
             case 'update-available':
                 loggerAutoUpdaterSuccess.log('New update available', info.version)
 
                 if(process.platform === 'darwin'){
-                    info.darwindownload = `https://github.com/HenrikoMagnifico/HenrikoLauncher/releases/download/v${info.version}/helioslauncher-setup-${info.version}.dmg`
+                    info.darwindownload = `https://github.com/HenrikoMagnifico/HenrikoLauncher/releases/download/v${info.version}/default.henrikolauncher-setup-${info.version}.dmg`
                     showUpdateUI(info)
                 }
 

diff --git a/app/landing.ejs b/app/landing.ejs
@@ -1,4 +1,5 @@
 <div id="landingContainer" style="display: none;">
+
     <div id="upper">
         <div id="left">
             <div id="image_seal_container">
@@ -143,6 +144,7 @@
         </div>
         <div id="right">
             <div class="bot_wrapper">
+
                 <div id="launch_content">
                     <button id="launch_button">PLAY</button>
                     <div class="bot_divider"></div>
@@ -228,10 +230,11 @@
     <script src="./assets/js/scripts/landing.js"></script>
 </div>
 
+<!--
 <div>
-    <!-- <iframe src="https://www.henrikomagnifico.com/yao-pack-mod-list" style="width:100%; height:400px;"></iframe> -->
     <div style="border: 3px solid rgb(201, 0, 1); overflow: hidden; margin: 15px auto; max-width: 966px;" scrolling="no">
         <iframe scrolling="no" allowtransparency="true" src="https://www.henrikomagnifico.com/yao-pack-mod-list" style="border: 0px none; margin-left: -60px; height: 1359px; margin-top: -233px; width: 1086px; background: transparent; background-color: transparent;";>
         </iframe>
     </div>
-</div>
+</div>
+-->
diff --git a/app/settings.ejs b/app/settings.ejs
@@ -167,7 +167,7 @@
                                 <span id="settingsMinRAMLabel" class="settingsMemoryLabel">3G</span>
                             </div>
                         </div>
-                        <div id="settingsMemoryDesc">The recommended minimum RAM is 4 gigabytes. Setting the minimum and maximum values to the same value may reduce lag.</div>
+                        <div id="settingsMemoryDesc">The recommended minimum RAM is 4 gigabytes. 7GB or higher is recommended for an optimal experience. Setting the minimum and maximum values to the same value may reduce lag.</div>
                     </div>
                     <div id="settingsMemoryContentRight">
                         <div id="settingsMemoryStatus">

diff --git a/package.json b/package.json
@@ -1,10 +1,10 @@
 {
   "name": "henrikolauncher",
-  "version": "v1.0.1",
-  "productName": "HenrikoLauncher",
+  "version": "1.0.1",
+  "productName": "Henriko Launcher",
   "description": "Henriko Modpack Launcher",
   "author": "Created by Henriko Magnifico. Original author is Daniel Scalzi (https://github.com/dscalzi/)",
-  "license": "UNLICENSED",
+  "license": "All Rights Reserved",
   "homepage": "https://www.henrikomagnifico.com/",
   "bugs": {
     "url": "https://www.henrikomagnifico.com/"