Merge pull request #11 from Proxwian/screenshot-viewer

Screenshot viewer

Author: Proxwian

README.md

@@ -1,3 +1,3 @@
 # OxLAUNCHER [![OxLAUNCHER CI](https://github.com/Proxwian/OxLAUNCHER/actions/workflows/nodejs.yml/badge.svg)](https://github.com/Proxwian/OxLAUNCHER/actions/workflows/nodejs.yml)
 
-Latest version: 1.4.0
+Latest version: 1.4.1

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "oxlauncher",
-  "version": "1.4.0",
+  "version": "1.4.1",
   "description": "OxLAUNCHER is simple and powerful tool to download and manage minecraft modpacks. Based on GDLauncher",
   "keywords": [
     "minecraft",

package.json

@@ -7,7 +7,7 @@ let activity;
 const initialAppStartup = Math.floor(Date.now() / 1000);
 
 const defaultValue = {
-  details: 'Смотрит сборки',
+  details: 'На главном экране',
   startTimestamp: initialAppStartup,
   largeImageKey: 'default_big',
   largeImageText: 'OxLAUNCHER - Лучший Minecraft лаунчер для установки сборок с модификациями и не только',
@@ -38,7 +38,7 @@ exports.update = details => {
   activity = {
     ...activity,
     startTimestamp: Math.floor(Date.now() / 1000),
-    details: `Играет в ${details}`
+    details: `${details}`
   };
   client.setActivity(activity);
 };

public/discordRPC.js

@@ -81,25 +81,25 @@ function DesktopRoot({ store }) {
 
     const manifests = await dispatch(initManifests());
 
-    let isJava8OK = javaPath;
-    let isJavaLatestOk = javaLatestPath;
-
-    if (!javaPath) {
-      ({ isValid: isJava8OK } = await isLatestJavaDownloaded(
-        manifests,
-        userData,
-        true
-      ));
-    }
-
-    if (!isJavaLatestOk) {
-      ({ isValid: isJavaLatestOk } = await isLatestJavaDownloaded(
-        manifests,
-        userData,
-        true,
-        LATEST_JAVA_VERSION
-      ));
-    }
+    let isJava8OK = true;
+    let isJavaLatestOk = true;
+
+    // if (!javaPath) {
+    //   ({ isValid: isJava8OK } = await isLatestJavaDownloaded(
+    //     manifests,
+    //     userData,
+    //     true
+    //   ));
+    // }
+
+    // if (!isJavaLatestOk) {
+    //   ({ isValid: isJavaLatestOk } = await isLatestJavaDownloaded(
+    //     manifests,
+    //     userData,
+    //     true,
+    //     LATEST_JAVA_VERSION
+    //   ));
+    // }
 
     if (!isJava8OK || !isJavaLatestOk) {
       dispatch(openModal('JavaSetup', { preventClose: true }));

src/app/desktop/DesktopRoot.js

@@ -18,7 +18,8 @@ import {
   faBoxOpen,
   faCopy,
   faServer,
-  faHammer
+  faHammer,
+  faImage
 } from '@fortawesome/free-solid-svg-icons';
 import psTree from 'ps-tree';
 import { ContextMenuTrigger, ContextMenu, MenuItem } from 'react-contextmenu';
@@ -250,11 +251,8 @@ const Instance = ({ instanceName }) => {
     finallyUpdate;  
     setNeedUpdate(false);  
   }
-  const updatePack = () => {
-    dispatch(openModal('InstanceManager', { instanceName: instanceName, openUpdater: true }));
-  };
-  const openBisectModal = () => {
-    dispatch(openModal('BisectHosting'));
+  const openScreenshots = () => {
+    dispatch(openModal('InstanceManager', { instanceName: instanceName, openScreenshots: true }));
   };
   const instanceExportCurseForge = () => {
     dispatch(openModal('InstanceExportCurseForge', { instanceName }));
@@ -392,31 +390,41 @@ const Instance = ({ instanceName }) => {
             </MenuItem>
           )}
           {Boolean(isNeedUpdate) && (
-          <MenuItem disabled={Boolean(isInQueue)}
-            css={`
+            <MenuItem disabled={Boolean(isInQueue)}
+              css={`
+                    color: #6D4D52;
+                    `}
+              onClick={updateDatapack}>
+              <FontAwesomeIcon
+                icon={faSpinner}
+                css={`
                   color: #6D4D52;
-                  `}
-            onClick={updateDatapack}>
+                  margin-right: 10px;
+                  width: 25px !important;
+                `}
+              />
+              Обновить
+            </MenuItem>
+          )}
+          <MenuItem disabled={Boolean(isInQueue)} onClick={manageInstance}>
             <FontAwesomeIcon
-              icon={faSpinner}
+              icon={faWrench}
               css={`
-                color: #6D4D52;
                 margin-right: 10px;
                 width: 25px !important;
               `}
             />
-            Обновить
+            Управление
           </MenuItem>
-          )}
-          <MenuItem disabled={Boolean(isInQueue)} onClick={manageInstance}>
+          <MenuItem disabled={Boolean(isInQueue)} onClick={openScreenshots}>
             <FontAwesomeIcon
-              icon={faWrench}
+              icon={faImage}
               css={`
                 margin-right: 10px;
                 width: 25px !important;
               `}
             />
-            Настройки
+            Скриншоты
           </MenuItem>
           <MenuItem onClick={openFolder}>
             <FontAwesomeIcon

src/app/desktop/components/Instances/Instance.js

@@ -911,18 +911,16 @@ export const getPlayerSkinMojang = async (uuid) => {
   return decoded?.textures?.SKIN?.url;
 };
 
-export const getPlayerSkinOx = async (nickname) => {
-  return oxGetPlayerSkin(nickname);
-  const playerSkin = await oxGetPlayerSkin(nickname);
+export const getPlayerSkinOx = async (uuid) => {
+  const playerSkin = await oxGetPlayerSkin(uuid);
   const { data } = playerSkin;
   const base64 = data.properties[0].value;
   const decoded = JSON.parse(Buffer.from(base64, 'base64').toString());
   return decoded?.textures?.SKIN?.url;
 };
 
-export const getPlayerSkinElyBy = async (nickname) => {
-  return elybyGetPlayerSkin(nickname);
-  const playerSkin = await elybyGetPlayerSkin(nickname);
+export const getPlayerSkinElyBy = async (uuid) => {
+  const playerSkin = await elybyGetPlayerSkin(uuid);
   const { data } = playerSkin;
   const base64 = data.properties[0].value;
   const decoded = JSON.parse(Buffer.from(base64, 'base64').toString());

src/app/desktop/utils/index.js

@@ -1,7 +1,7 @@
 import React, { useState, useEffect, memo, useMemo } from 'react';
 import styled from 'styled-components';
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
-import { faPlus } from '@fortawesome/free-solid-svg-icons';
+import { faImages, faPlus } from '@fortawesome/free-solid-svg-icons';
 import { Button } from 'antd';
 import { useSelector, useDispatch } from 'react-redux';
 import { ipcRenderer } from 'electron';
@@ -21,14 +21,20 @@ import { updateLastUpdateVersion } from '../../../common/reducers/actions';
 import { _getInstances, _getInstancesPath, _getTempPath } from '../../../common/utils/selectors';
 
 import { useDebouncedCallback } from 'use-debounce';
-import { ACCOUNT_MICROSOFT } from '../../../common/utils/constants';
+import { ACCOUNT_ELYBY, ACCOUNT_MICROSOFT, ACCOUNT_OFFLINE, ACCOUNT_OXAUTH } from '../../../common/utils/constants';
 
 const AddInstanceIcon = styled(Button)`
   position: fixed;
   bottom: 20px;
   left: 20px;
 `;
 
+const ShowScreenshotsIcon = styled(Button)`
+  position: fixed;
+  bottom: 20px;
+  left: 80px;
+`;
+
 const AccountContainer = styled(Button)`
   position: fixed;
   bottom: 20px;
@@ -55,6 +61,8 @@ const Home = () => {
   const [annoucement, setAnnoucement] = useState(null);
 
   useEffect(() => {
+    const discordRPCDetails = `На главной`;
+    ipcRenderer.invoke('update-discord-rpc', discordRPCDetails);
     const init = async () => {
 		// setInstalling(false);
 		// setInitinstall(false);
@@ -79,23 +87,6 @@ const Home = () => {
   useEffect(() => {
     extractFace(account.skin).then(setProfileImage).catch(console.error);
   }, [account]);
-  
-  const getInstances = (instances, sortOrder) => {
-  // Data normalization for missing fields
-  const inst = instances.map(instance => {
-    return {
-      ...instance,
-      timePlayed: instance.timePlayed || 0,
-      lastPlayed: instance.lastPlayed || 0
-    };
-  });
-
-  switch (sortOrder) {
-    default:
-      return inst;
-  }
-  };
-
 
   return (
     <div>
@@ -112,16 +103,26 @@ const Home = () => {
           {annoucement}
         </div>
       ) : null}
-      <Instances 
-      css={`
-        bottom: 20px;
-        left: 20px;`
-      }/>
+      <Instances
+        css={`
+          bottom: 20px;
+          left: 20px;`
+        }/>
       <AddInstanceIcon type="primary" onClick={() => openAddInstanceModal(0)}>
         <FontAwesomeIcon icon={faPlus} />
       </AddInstanceIcon>
-      <AccountContainer type="primary" onClick={openAccountModal}>
-        {profileImage && account.accountType === ACCOUNT_MICROSOFT ? (
+      <ShowScreenshotsIcon type="primary" onClick={() => dispatch(openModal('ScreenshotManager'))}>
+        <FontAwesomeIcon icon={faImages} />
+      </ShowScreenshotsIcon>
+      <AccountContainer
+        type="primary"
+        onClick={openAccountModal}
+        css={`
+          background-color: ${account.accountType == ACCOUNT_OFFLINE ? (`#545454`) : account.accountType == ACCOUNT_OXAUTH ? (`#3c6a5b`) : account.accountType == ACCOUNT_ELYBY ? (`#187c41`) : (`#830d0d`)};
+          border-color: ${account.accountType == ACCOUNT_OFFLINE ? (`#545454`) : account.accountType == ACCOUNT_OXAUTH ? (`#3c6a5b`) : account.accountType == ACCOUNT_ELYBY ? (`#187c41`) : (`#830d0d`)};
+        `}
+      >
+        {profileImage && account.accountType !== ACCOUNT_OFFLINE ? (
           <img
             src={`data:image/jpeg;base64,${profileImage}`}
             css={`

src/app/desktop/views/Home.js

@@ -383,7 +383,7 @@ const Login = () => {
                 `}
               >
                 <center>
-                  <a onClick={() => dispatch(openModal('ChangeLogs'))}>v. 1.4.0</a>
+                  <a onClick={() => dispatch(openModal('ChangeLogs'))}>v. 1.4.1</a>
                 </center>
               </div>
               <div

src/app/desktop/views/Login.js

@@ -8,7 +8,6 @@ import {
   faLongArrowAltUp,
   faLongArrowAltDown
 } from '@fortawesome/free-solid-svg-icons';
-import backgroundVideo from '../../../common/assets/onboarding.webm';
 import { _getCurrentAccount } from '../../../common/utils/selectors';
 import BisectHosting from '../../../ui/BisectHosting';
 import KoFiButton from '../../../common/assets/ko-fi.png';