v2.4.1

Author: stairman06

CHANGELOG.md

@@ -4,12 +4,14 @@ Changelogs for development versions are located in their corresponding branch.
 
 ## 2.4.1
 
-#### Currently WIP
+#### Released 2020-05-09
 
 ### Features
 
+- New sidebar design in Edit Pages and Settings
 - Improved UI consistency
 - Better usage via keyboard
+- Improved Error Handling
 
 ## 2.4.0
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "minecraft-manager",
-  "version": "2.4.0",
+  "version": "2.4.1",
   "license": "GPL-3.0",
   "main": "main.js",
   "author": "theemeraldtree",
@@ -115,4 +115,4 @@
     "ci": "yarn run compile && yarn pub",
     "license-disclaimer": "yarn licenses generate-disclaimer > src/assets/licenseDisclaimer.txt"
   }
-}
+}

src/component/button/button.jsx

@@ -1,4 +1,4 @@
-import styled from 'styled-components';
+import styled, { css } from 'styled-components';
 
 function getColor(name) {
   switch (name) {
@@ -33,8 +33,8 @@ const Button = styled.button.attrs(props => ({
   border: 2px solid transparent;
   ${props =>
     props.disabled &&
-    `
-        filter: brightness(0.65);
+    css`
+      filter: brightness(0.65);
     `}
   img {
     width: 90%;
@@ -52,14 +52,14 @@ const Button = styled.button.attrs(props => ({
   &:hover {
     ${props =>
       !props.disabled &&
-      `
-            filter: brightness(0.75);
-        `}
+      css`
+        filter: brightness(0.75);
+      `}
     ${props =>
       props.disabled &&
-      `
-            cursor: not-allowed;
-        `}
+      css`
+        cursor: not-allowed;
+      `}
   }
   &:focus-visible {
     border-color: yellow;

src/manager/launcherManager.js

@@ -142,7 +142,10 @@ const LauncherManager = {
   },
   getMCAccounts() {
     logger.info('Getting Minecraft accounts...');
-    return FSU.readJSONSync(this.getLauncherProfiles()).authenticationDatabase;
+    if (fs.existsSync(Global.PROFILES_PATH)) {
+      return FSU.readJSONSync(this.getLauncherProfiles()).authenticationDatabase;
+    }
+    return undefined;
   }
 };
 

src/page/editprofile/components/subAssetEditor.jsx

@@ -22,6 +22,7 @@ import MoveToOverlay from './moveToOverlay';
 import CustomDropdown from '../../../component/customdropdown/customdropdown';
 import ErrorManager from '../../../manager/errorManager';
 import useKeyPress from '../../../util/useKeyPress';
+import AlertManager from '../../../manager/alertManager';
 
 const { dialog } = require('electron').remote;
 
@@ -303,15 +304,25 @@ export default function SubAssetEditor({ id, assetType, dpWorld }) {
 
   const deleteClick = assetid => {
     if (assetType !== 'datapack') {
-      const asset = profile.getSubAssetFromID(assetType, assetid);
-      profile
-        .deleteSubAsset(assetType, asset)
-        .then(() => {
-          updateProgressStates();
-        })
-        .catch(e => {
-          ToastManager.createToast('Unable to delete', ErrorManager.makeReadable(e, 'subasset'));
-        });
+      const del = () => {
+        const asset = profile.getSubAssetFromID(assetType, assetid);
+        profile
+          .deleteSubAsset(assetType, asset)
+          .then(() => {
+            // hacky fix
+            setTimeout(() => {
+              updateProgressStates();
+            }, 100);
+          })
+          .catch(e => {
+            ToastManager.createToast('Unable to delete', ErrorManager.makeReadable(e, 'subasset'));
+          });
+      };
+      if (assetType === 'world') {
+        AlertManager.alert('are you sure?', '', del, 'delete', 'cancel');
+      } else {
+        del();
+      }
     } else {
       const asset = dpWorld.datapacks.find(dp => dp.id === assetid);
       dpWorld.deleteDatapack(profile, asset);
@@ -458,6 +469,22 @@ export default function SubAssetEditor({ id, assetType, dpWorld }) {
                   })
                   .map(asset => {
                     if (displayState === 'assetsList') {
+                      if (!asset.name) {
+                        return (
+                          <AssetCard
+                            progressState={progressState}
+                            key="undefinedasset"
+                            compact
+                            asset={{
+                              id: asset.id,
+                              name: 'Undefined Asset',
+                              version: { displayName: 'Something has gone wrong - please delete' }
+                            }}
+                            showDelete
+                            deleteClick={deleteClick}
+                          />
+                        );
+                      }
                       if (asset.name.toLowerCase().includes(liveSearchTerm.toLowerCase())) {
                         return (
                           <AssetCard

src/page/settings/components/section.jsx

@@ -2,7 +2,7 @@ import styled from 'styled-components';
 
 const Section = styled.div`
   max-width: 680px;
-  background-color: #404040;
+  background-color: #2b2b2b;
   margin: 10px;
   padding: 10px;
   h2 {
@@ -13,6 +13,10 @@ const Section = styled.div`
     margin-top: 5px;
     margin-bottom: 5px;
   }
+
+  & > div {
+    margin-top: 5px;
+  }
 `;
 
 export default Section;

src/page/settings/pages/about.jsx

@@ -28,7 +28,7 @@ const AboutTop = styled.div`
     font-weight: thin;
     font-size: 13pt;
   }
-  background-color: #505050;
+  background-color: #353535;
 `;
 
 const AboutBottom = styled.div`
@@ -235,7 +235,7 @@ export default function About() {
             }
             color="green"
           >
-            view full license information
+            view full license info
           </Button>
         </div>
         <div>

src/page/settings/pages/defaults.jsx

@@ -1,24 +1,9 @@
 import React, { useReducer } from 'react';
-import styled from 'styled-components';
 import InputContainer from '../../editprofile/components/inputcontainer';
 import Checkbox from '../../../component/checkbox/checkbox';
 import Detail from '../../../component/detail/detail';
 import SettingsManager from '../../../manager/settingsManager';
-
-const Panel = styled.div`
-  background-color: #2b2b2b;
-  padding: 10px;
-  width: 380px;
-  margin-bottom: 5px;
-
-  h3 {
-    margin: 0;
-  }
-
-  & > div {
-    margin-top: 5px;
-  }
-`;
+import Section from '../components/section';
 
 export default function Defaults() {
   const [, forceUpdate] = useReducer(x => x + 1, 0);
@@ -34,7 +19,7 @@ export default function Defaults() {
       <p>
         The following are default settings that are used for <b>new</b> profiles only
       </p>
-      <Panel>
+      <Section>
         <h3>Sync Options</h3>
         <InputContainer>
           <Checkbox
@@ -60,7 +45,7 @@ export default function Defaults() {
           />
           <Detail>Sync in-game server list</Detail>
         </InputContainer>
-      </Panel>
+      </Section>
     </>
   );
 }

src/page/settings/settingsPage.jsx

@@ -15,30 +15,34 @@ const Sidebar = styled.div`
 `;
 
 const Item = styled.p`
-  margin-top: 10px;
-  width: 100%;
+  width: calc(100% - 5px);
   display: block;
   height: 25px;
-  text-align: center;
   color: white;
   text-decoration: none;
-  font-size: 15pt;
-  font-weight: 100;
+  font-size: 12pt;
+  font-weight: 400;
   cursor: pointer;
   &:hover {
     filter: brightness(0.75);
   }
+
   ${props =>
     props.active &&
     `
-        font-weight: bolder;
-        &:hover {
-            filter: brightness(1.0);
-        }
-    `}
+      filter: brightness(1);
+      background: #424242;
+      &:hover {
+        filter: brightness(1);
+      }
+  `}
 
-  margin-bottom: 15px;
-  transition: font-weight 150ms;
+  margin-bottom: 0;
+  margin-top: 0;
+  padding-top: 10px;
+  padding-bottom: 4px;
+  padding-left: 5px;
+  transition: background 150ms;
 `;
 
 const Container = styled.div`

src/type/profile.js

@@ -532,7 +532,7 @@ export default class Profile extends OAMFAsset {
           this.mods.splice(this.mods.indexOf(asset), 1);
           this.progressState[asset.id] = undefined;
           fs.unlink(path.join(this.gameDir, `/${asset.getMainFile().path}`), e => {
-            if (e.code !== 'ENOENT') {
+            if (e && e.code !== 'ENOENT') {
               if (e) {
                 this.logger.error(`Unable to delete subasset ${asset.id}: ${e.toString()}`);
                 this.mods.push(asset);