feat: ✨ v4.3.2

Author: TBHGodPro

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "solartweaks",
-  "version": "4.3.1",
+  "version": "4.3.2",
   "author": "SolarTweaks",
   "contributors": [
     "RichardDorian",

package.json

@@ -257,6 +257,17 @@ body[data-theme='light'] {
   }
 }
 
+@keyframes fade_down {
+  from {
+    transform: translateY(-15px);
+    opacity: 0;
+  }
+  to {
+    transform: translateY(0);
+    opacity: 1;
+  }
+}
+
 @keyframes scale_down {
   from {
     transform: scale(1.6);
@@ -275,4 +286,4 @@ body[data-theme='light'] {
   to {
     transform: scale(0.95);
   }
-}
+}

src/assets/global.css

@@ -8,7 +8,7 @@
     <div id="options-title-container">
       <div class="options-title-section">
         <img
-          :src="`https://raw.githubusercontent.com/Solar-Tweaks/Engine-Icons/8baaf723c0c991b4feaa2963c55794fffb98eaaa/${menu.module.name}.png`"
+          :src="`https://raw.githubusercontent.com/Solar-Tweaks/Engine-Icons/main/${menu.module.name}.png`"
           id="options-icon"
           :alt="`${menu.module.name} Image`"
         />
@@ -65,7 +65,7 @@
     <div id="options-title-container">
       <div class="options-title-section">
         <img
-          src="https://raw.githubusercontent.com/Solar-Tweaks/Engine-Icons/8baaf723c0c991b4feaa2963c55794fffb98eaaa/customCommands.png"
+          src="https://raw.githubusercontent.com/Solar-Tweaks/Engine-Icons/main/customCommands.png"
           id="options-icon-custom-commands"
           alt="Command Aliases Image"
         />
@@ -141,7 +141,7 @@
     >
       <div class="customization-icon-container">
         <img
-          :src="`https://raw.githubusercontent.com/Solar-Tweaks/Engine-Icons/8baaf723c0c991b4feaa2963c55794fffb98eaaa/${item.name}.png`"
+          :src="`https://raw.githubusercontent.com/Solar-Tweaks/Engine-Icons/main/${item.name}.png`"
           class="customization-icon"
           :alt="`${item.name} Image`"
         />
@@ -171,7 +171,7 @@
     >
       <div class="customization-icon-container">
         <img
-          src="https://raw.githubusercontent.com/Solar-Tweaks/Engine-Icons/8baaf723c0c991b4feaa2963c55794fffb98eaaa/customCommands.png"
+          src="https://raw.githubusercontent.com/Solar-Tweaks/Engine-Icons/main/customCommands.png"
           class="customization-icon"
           alt="Command Aliases Image"
         />

src/components/Content/Engine.vue

@@ -1,6 +1,6 @@
 <template>
   <div id="home-container">
-    <div id="quick-play-container">
+    <div id="quick-play-container" v-if="starredServers.length">
       <div class="quick-play-content">
         <div class="quick-play-servers">
           <div
@@ -15,7 +15,15 @@
       </div>
     </div>
     <div id="posts-container">
-      <div v-for="post in posts" v-bind:key="post.url" class="post-container">
+      <div
+        v-for="post in posts"
+        v-bind:key="post.url"
+        class="post-container"
+        :class="{
+          'post-container-normal': starredServers.length,
+          'post-container-large': !starredServers.length,
+        }"
+      >
         <div class="post-image-container">
           <img
             :src="post.imageUrl"
@@ -26,7 +34,15 @@
             alt="Post Image"
           />
         </div>
-        <p class="post-description">{{ post.description }}</p>
+        <p
+          class="post-description"
+          :class="{
+            'post-description-normal': starredServers.length,
+            'post-description-large': !starredServers.length,
+          }"
+        >
+          {{ post.description }}
+        </p>
         <div id="post-bottom-container">
           <div class="post-author-container">
             <p class="post-author">
@@ -257,13 +273,18 @@ export default {
 }
 .post-container {
   width: 400px;
-  height: 285px;
   border-radius: 0.5rem;
   margin: 0 5px;
   background: var(--card-background);
   box-shadow: rgb(0 0 0 / 13%) 0px 1px 5px 0px;
   transition: transform 0.4s ease;
 }
+.post-container-normal {
+  height: 285px;
+}
+.post-container-large {
+  height: 355px;
+}
 .post-image-container {
   width: 400px;
   height: 170px;
@@ -288,7 +309,6 @@ export default {
   letter-spacing: 0.35px;
   line-height: 20px;
   margin: 0 5px;
-  height: 45px;
   overflow: hidden;
   text-overflow: ellipsis;
   display: -webkit-box;
@@ -299,6 +319,12 @@ export default {
   overflow-y: scroll;
   margin-top: 5px;
 }
+.post-description-normal {
+  height: 45px;
+}
+.post-description-large {
+  height: 115px;
+}
 
 #post-bottom-container {
   display: flex;

src/components/Content/Home.vue

@@ -2,11 +2,8 @@
   <div>
     <div
       id="play-container"
-      :style="
-        'height: ' +
-        $store.getters.getPlayContainerHeight +
-        'px;'
-      "
+      :style="'height: ' + $store.getters.getPlayContainerHeight + 'px;'"
+      @keydown="closeVersionSelection"
     >
       <div id="buttons" :class="{ disabled: $store.state.isLaunching }">
         <button
@@ -260,7 +257,7 @@ export default {
      */
 
     async closeVersionSelection(event) {
-      if (event.key === 'Escape' && this.isSelectingVersion) {
+      if (event.key === 'Escape') {
         await settings.set('version', this.selectedSubversion.id);
         await settings.set('module', this.selectedModule);
         await this.updateLaunchButton();

src/components/Content/Play.vue

@@ -35,11 +35,7 @@
             <i class="fa-solid fa-brush titlebar-button-icon"></i>
           </button>
         </div>
-        <button
-          class="titlebar-button"
-          id="shortcut-btn"
-          @click="showTutorial()"
-        >
+        <button class="titlebar-button" @click="showTutorial()">
           <i class="fa-solid fa-book titlebar-button-icon"></i>
         </button>
         <button class="titlebar-button" id="close-btn" @click="closeWindow()">
@@ -130,7 +126,7 @@ export default {
 
     async registerClick() {
       this.clickCount++;
-      if (this.clickCount == 10) {
+      if (this.clickCount >= 10) {
         await settings.set('themeSwapperEnabled', true);
         if (this.theme === 'dark') this.toggleTheme();
       }
@@ -147,7 +143,8 @@ export default {
             keysDone += event.key;
           else keysDone = '';
           if (keysDone.length == keysAll.length) {
-            this.links.push({ name: 'Debug', active: false });
+            if (!this.links.find((link) => link.name == 'Debug'))
+              this.links.push({ name: 'Debug', active: false });
             await settings.set('DeveloperMode', true);
             document.removeEventListener('keydown', listener);
           }

src/components/TitleBar.vue

@@ -406,6 +406,10 @@ export async function checkNatives(metadata) {
     icon: 'fa-solid fa-file',
   });
 
+  await rm(join(constants.DOTLUNARCLIENT, 'offline', 'multiver', 'natives'))
+    .then(() => logger.log('Deleted Natives Directory'))
+    .catch(() => logger.log('Natives Directory does not Exist'));
+
   const artifact = metadata.launchTypeData.artifacts.find(
     (artifact) => artifact.type === 'NATIVES'
   );
@@ -414,26 +418,18 @@ export async function checkNatives(metadata) {
       join(constants.DOTLUNARCLIENT, 'offline', 'multiver', artifact.name)
     )
   ) {
-    if (
-      !existsSync(
-        join(constants.DOTLUNARCLIENT, 'offline', 'multiver', 'natives')
-      )
-    ) {
-      await extractZip(
-        join(constants.DOTLUNARCLIENT, 'offline', 'multiver', artifact.name),
-        {
-          dir: join(constants.DOTLUNARCLIENT, 'offline', 'multiver', 'natives'),
-        }
-      )
-        .then(() => {
-          logger.debug('Extracted natives');
-        })
-        .catch((error) => {
-          logger.throw('Failed to extract natives', error);
-        });
-    } else {
-      logger.debug('Natives already extracted');
-    }
+    await extractZip(
+      join(constants.DOTLUNARCLIENT, 'offline', 'multiver', artifact.name),
+      {
+        dir: join(constants.DOTLUNARCLIENT, 'offline', 'multiver', 'natives'),
+      }
+    )
+      .then(() => {
+        logger.debug('Extracted natives');
+      })
+      .catch((error) => {
+        logger.throw('Failed to extract natives', error);
+      });
   } else {
     logger.error('Natives not found, this should not happen');
   }
@@ -763,19 +759,15 @@ export async function checkAndLaunch(serverIp = null) {
   store.commit('setLaunching', true);
   updateActivity('In the launcher', 'Launching game');
 
+  const version = await settings.get('version');
+  const skipChecks = await settings.get('skipChecks');
+
   let success = true;
 
   function error(action, err) {
-    console.error(action, err);
-    store.commit('setLaunchingState', {
-      title: `LAUNCH ${version}`,
-      message: 'READY TO LAUNCH',
-      icon: 'fa-solid fa-gamepad',
-    });
-    store.commit('setLaunching', false);
+    success = false;
     store.commit('setErrorMessage', `${action} Error: ` + (err.stack ?? err));
     store.commit('setErrorModal', true);
-    success = false;
     logger.throw(`Failed to ${action}`, err);
   }
 
@@ -786,7 +778,7 @@ export async function checkAndLaunch(serverIp = null) {
 
   if (!metadata) return logger.error('No Metadata for Launch');
 
-  if (!(await settings.get('skipChecks'))) {
+  if (!skipChecks) {
     // Check JRE
     if (!(await checkJRE(metadata).catch((err) => error('Check JRE', err))))
       return;
@@ -819,15 +811,22 @@ export async function checkAndLaunch(serverIp = null) {
     await checkEngine().catch((err) => error('Check Engine', err));
   }
 
-  if (!success) return;
+  if (!success) {
+    remote.getCurrentWindow().setProgressBar(-1);
+    store.commit('setLaunching', false);
+    return store.commit('setLaunchingState', {
+      title: `LAUNCH ${version}`,
+      message: 'READY TO LAUNCH',
+      icon: 'fa-solid fa-gamepad',
+    });
+  }
 
   // Launch game
   await launchGame(metadata, serverIp, await settings.get('debugMode')).catch(
     (err) => error('Launch Game', err)
   );
 
   // Trackers
-  const version = await settings.get('version');
   await axios
     .post(`${constants.API_URL}${constants.ENDPOINTS.LAUNCH}`, {
       item: 'launcher',

src/javascript/minecraft.js

@@ -51,30 +51,37 @@ export async function checkForUpdates() {
         'Downloading update in the background. Please wait.\n\nThis may take a while depending on your internet speed. You can close this window and use the launcher, we will notify you when the update is ready.',
     });
 
-    const filename = `launcher-${release.data.index.stable.launcher}-update-temp.exe`;
-    const filePath = join(constants.SOLARTWEAKS_DIR, filename);
+    const updateReady = async () => {
+      const choice2 = await remote.dialog.showMessageBox({
+        type: 'question',
+        title: 'Update ready',
+        message: `The update is ready to be installed.`,
+        buttons: ['Cancel update', 'Install update'],
+      });
 
-    await downloadAndSaveFile(
-      `${constants.API_URL}${constants.UPDATERS.LAUNCHER.replace(
-        '{version}',
-        release.data.index.stable.launcher
-      )}`,
-      filePath,
-      'blob'
-    );
+      if (choice2.response === 1) return true;
+      else return false; // Cancel update or closed
+    };
 
-    const choice2 = await remote.dialog.showMessageBox({
-      type: 'question',
-      title: 'Update ready',
-      message: `The update is ready to be installed.`,
-      buttons: ['Cancel update', 'Install update'],
-    });
+    if (platform === 'win32') {
+      const filename = `launcher-${release.data.index.stable.launcher}-update-temp.exe`;
+      const filePath = join(constants.SOLARTWEAKS_DIR, filename);
+
+      await downloadAndSaveFile(
+        `${constants.API_URL}${constants.UPDATERS.LAUNCHER.replace(
+          '{version}',
+          release.data.index.stable.launcher
+        )}`,
+        filePath,
+        'blob'
+      );
 
-    if (choice2.response !== 1) return; // Cancel update or closed
+      if (!(await updateReady())) return;
 
-    execSync(filePath);
+      execSync(filePath);
 
-    await unlink(filePath);
+      await unlink(filePath);
+    }
 
     remote.app.quit();
   } else logger.info('Launcher up to date');