+
+
+
+
+
+ );
+ });
+
+ const innerElementType = forwardRef(({ style, ...rest }, ref) => (
+
+ ));
+
+ return (
+ {modpack.title}
+ {
+ selectModrinthModpack(
+ modpack.project_id,
+ setVersion,
+ setModpack,
+ setStep
+ );
+ }}
+ >
+ Download Latest
+
+ {
+ const realModpack = await getModrinthProject(modpack.project_id);
+ dispatch(
+ openModal('ModpackDescription', {
+ modpack: realModpack,
+ setStep,
+ setVersion,
+ setModpack,
+ type: MODRINTH
+ })
+ );
+ }}
+ >
+ Explore / Versions
+
+ - {
+ // Manually bind ref to reset scroll
+ // eslint-disable-next-line
+ infiniteLoaderRef.current = list;
+ }}
+ >
+ {Item}
+
+
+ ) : (
+
+ No modpack has been found with the current filters.
+
+
+
+ )}
+
+ An error occurred while loading the modpacks list...
+
+ props.theme.palette.text.third};
+ &:hover {
+ color: ${props => props.theme.palette.text.primary};
+ }
+ transition: color 0.1s ease-in-out;
+ cursor: pointer;
+ `}
+ onClick={openModOverview}
+ >
+ {item.name}
+
+
+
+
+ )
+ ) : (
+
+ )}
+ -
+ {Row}
+
+
+ ) : (
+
+ No mods has been found with the current filters.
+
+
+
+ )}
+
+ An error occurred while loading the mods list...
+
+ setTimeout(resolve, 1000));
- await rollBackInstanceZip(
- isUpdate,
- instancesPath,
- instanceName,
- tempPath,
- dispatch,
- updateInstanceConfig
- );
+ // if instanceName is ever empty, this will delete ALL instances, so don't run it if we don't have a name
+ if (instanceName) {
+ await rollBackInstanceZip(
+ isUpdate,
+ instancesPath,
+ instanceName,
+ tempPath,
+ dispatch,
+ updateInstanceConfig
+ );
+ }
setLoading(false);
dispatch(addNextInstanceToCurrentDownload());
diff --git a/src/common/modals/InstanceManager/Modpack.js b/src/common/modals/InstanceManager/Modpack.js
index 378b71b..4c15353 100644
--- a/src/common/modals/InstanceManager/Modpack.js
+++ b/src/common/modals/InstanceManager/Modpack.js
@@ -4,19 +4,23 @@ import { Select, Button } from 'antd';
import { useDispatch, useSelector } from 'react-redux';
import ReactHtmlParser from 'react-html-parser';
import path from 'path';
+import pMap from 'p-map';
import {
getAddonFiles,
getAddonFileChangelog,
getFTBModpackData,
getFTBChangelog,
- getFTBModpackVersionData
+ getFTBModpackVersionData,
+ getModrinthProject,
+ getModrinthVersions
} from '../../api';
import { changeModpackVersion } from '../../reducers/actions';
import { closeModal } from '../../reducers/modals/actions';
import { _getInstancesPath, _getTempPath } from '../../utils/selectors';
import { makeInstanceRestorePoint } from '../../utils';
+import { CURSEFORGE, FTB, MODRINTH } from '../../utils/constants';
-const Modpack = ({ modpackId, instanceName, manifest, fileID }) => {
+const Modpack = ({ modpackId, instanceName, source, manifest, fileID }) => {
const [files, setFiles] = useState([]);
const [versionName, setVersionName] = useState(null);
const [selectedIndex, setSelectedIndex] = useState(null);
@@ -37,51 +41,99 @@ const Modpack = ({ modpackId, instanceName, manifest, fileID }) => {
}
};
+ const convertModrinthReleaseType = type => {
+ switch (type) {
+ case 'release':
+ return 1;
+ case 'beta':
+ return 2;
+ default:
+ return 3;
+ }
+ };
+
const initData = async () => {
setLoading(true);
- if (manifest) {
- setVersionName(`${manifest?.name} - ${manifest?.version}`);
- const data = await getAddonFiles(modpackId);
- const mappedFiles = await Promise.all(
- data.map(async v => {
- const changelog = await getAddonFileChangelog(modpackId, v.id);
- return {
- ...v,
- changelog
- };
- })
- );
- setFiles(mappedFiles);
- } else {
- const ftbModpack = await getFTBModpackData(modpackId);
- setVersionName(
- `${ftbModpack.name} - ${
- ftbModpack.versions.find(modpack => modpack.id === fileID).name
- }`
- );
+ switch (source) {
+ case CURSEFORGE: {
+ setVersionName(`${manifest?.name} - ${manifest?.version}`);
+ const data = await getAddonFiles(modpackId);
+ const mappedFiles = await Promise.all(
+ data.map(async v => {
+ const changelog = await getAddonFileChangelog(modpackId, v.id);
+ return {
+ ...v,
+ changelog
+ };
+ })
+ );
+ setFiles(mappedFiles);
+ break;
+ }
+ case FTB: {
+ const ftbModpack = await getFTBModpackData(modpackId);
+ setVersionName(
+ `${ftbModpack.name} - ${
+ ftbModpack.versions.find(modpack => modpack.id === fileID).name
+ }`
+ );
- const mappedVersions = await Promise.all(
- ftbModpack.versions.map(async version => {
- const changelog = await getFTBChangelog(modpackId, version.id);
- const newModpack = await getFTBModpackVersionData(
- modpackId,
- version.id
- );
+ const mappedVersions = await Promise.all(
+ ftbModpack.versions.map(async version => {
+ const changelog = await getFTBChangelog(modpackId, version.id);
+ const newModpack = await getFTBModpackVersionData(
+ modpackId,
+ version.id
+ );
+ return {
+ displayName: `${ftbModpack.name} ${version.name}`,
+ id: version.id,
+ gameVersions: [newModpack.targets[1]?.version],
+ releaseType: convertFtbReleaseType(version.type),
+ fileDate: version.updated * 1000,
+ imageUrl: ftbModpack.art[0].url,
+ changelog: changelog.content
+ };
+ })
+ );
+
+ setFiles(mappedVersions);
+ break;
+ }
+ case MODRINTH: {
+ const modpack = await getModrinthProject(modpackId);
+ const versions = (await getModrinthVersions(modpack.versions)).sort(
+ (a, b) => Date.parse(b.date_published) - Date.parse(a.date_published)
+ );
+ setVersionName(
+ `${modpack.name} - ${
+ versions.find(version => version.id === fileID).name
+ }`
+ );
+ const mappedVersions = await pMap(versions, async version => {
return {
- displayName: `${ftbModpack.name} ${version.name}`,
+ displayName: `${modpack.name} ${version.name}`,
id: version.id,
- gameVersions: [newModpack.targets[1]?.version],
- releaseType: convertFtbReleaseType(version.type),
- fileDate: version.updated * 1000,
- imageUrl: ftbModpack.art[0].url,
- changelog: changelog.content
+ gameVersions: version.game_versions,
+ releaseType: convertModrinthReleaseType(version.version_type),
+ fileDate: Date.parse(version.date_published),
+ imageUrl:
+ modpack.gallery?.find(img => img.featured)?.url ||
+ modpack.gallery?.at(0)?.url ||
+ modpack.icon_url ||
+ '',
+ changelog: version.changelog
};
- })
- );
+ });
- setFiles(mappedVersions);
+ setFiles(mappedVersions || []);
+ break;
+ }
+ default: {
+ throw Error(`Unknown modpack source: ${source}`);
+ }
}
setLoading(false);
};
@@ -147,7 +199,7 @@ const Modpack = ({ modpackId, instanceName, manifest, fileID }) => {
disabled={loading}
virtual={false}
>
- {(files || []).map((file, index) => (
+ {files.map((file, index) => (
- {changelog.content}
+ {changelog.content || changelog}
- ) : (
- ReactHtmlParser(changelog)
)}
) : (
diff --git a/src/common/modals/ModOverview.js b/src/common/modals/ModOverview.js
index 228b0b9..cf41c4d 100644
--- a/src/common/modals/ModOverview.js
+++ b/src/common/modals/ModOverview.js
@@ -3,19 +3,33 @@ import React, { useState, useEffect } from 'react';
import styled from 'styled-components';
import { useDispatch, useSelector } from 'react-redux';
import ReactHtmlParser from 'react-html-parser';
+import ReactMarkdown from 'react-markdown';
import path from 'path';
import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
import { faExternalLinkAlt, faInfo } from '@fortawesome/free-solid-svg-icons';
import { Button, Select } from 'antd';
import Modal from '../components/Modal';
import { transparentize } from 'polished';
-import { getAddonDescription, getAddonFiles, getAddon } from '../api';
+import {
+ getAddonDescription,
+ getAddonFiles,
+ getAddon,
+ getModrinthProject,
+ getModrinthVersions,
+ getModrinthUser
+} from '../api';
import CloseButton from '../components/CloseButton';
import { closeModal, openModal } from '../reducers/modals/actions';
import { installMod, updateInstanceConfig } from '../reducers/actions';
import { remove } from 'fs-extra';
import { _getInstancesPath, _getInstance } from '../utils/selectors';
-import { FABRIC, FORGE, CURSEFORGE_URL } from '../utils/constants';
+import {
+ FABRIC,
+ FORGE,
+ CURSEFORGE_URL,
+ CURSEFORGE,
+ MODRINTH
+} from '../utils/constants';
import { formatNumber, formatDate } from '../utils';
import {
filterFabricFilesByVersion,
@@ -24,6 +38,7 @@ import {
} from '../../app/desktop/utils';
const ModOverview = ({
+ modSource,
projectID,
fileID,
gameVersions,
@@ -32,7 +47,15 @@ const ModOverview = ({
}) => {
const dispatch = useDispatch();
const [description, setDescription] = useState(null);
+ // curseforge only
const [addon, setAddon] = useState(null);
+ // modrinth only
+ const [mod, setMod] = useState(null);
+ const [author, setAuthor] = useState('');
+ const [downloadCount, setDownloadCount] = useState(0);
+ const [updatedDate, setUpdatedDate] = useState(0);
+ const [gameVersion, setGameVersion] = useState('');
+ const [url, setUrl] = useState('');
const [files, setFiles] = useState([]);
const [selectedItem, setSelectedItem] = useState(fileID);
const [installedData, setInstalledData] = useState({ fileID, fileName });
@@ -44,32 +67,60 @@ const ModOverview = ({
useEffect(() => {
const init = async () => {
setLoadingFiles(true);
- await Promise.all([
- getAddon(projectID).then(data => setAddon(data)),
- getAddonDescription(projectID).then(data => {
- // Replace the beginning of all relative URLs with the Curseforge URL
- const modifiedData = data.replace(
- /href="(?!http)/g,
- `href="${CURSEFORGE_URL}`
- );
- setDescription(modifiedData);
- }),
- getAddonFiles(projectID).then(async data => {
- const isFabric =
- getPatchedInstanceType(instance) === FABRIC && projectID !== 361988;
- const isForge =
- getPatchedInstanceType(instance) === FORGE || projectID === 361988;
- let filteredFiles = [];
- if (isFabric) {
- filteredFiles = filterFabricFilesByVersion(data, gameVersions);
- } else if (isForge) {
- filteredFiles = filterForgeFilesByVersion(data, gameVersions);
- }
+ if (modSource === CURSEFORGE) {
+ await Promise.all([
+ getAddon(projectID).then(addon => {
+ setAddon(addon);
+ setAuthor(addon.author || addon.authors?.at(0).name);
+ setDownloadCount(addon.downloadCount);
+ setUpdatedDate(Date.parse(addon.dateModified));
+ setGameVersion(addon.latestFilesIndexes[0].gameVersion);
+ setUrl(addon.links?.websiteUrl);
+ }),
+ getAddonDescription(projectID).then(data => {
+ // Replace the beginning of all relative URLs with the Curseforge URL
+ const modifiedData = data.replace(
+ /href="(?!http)/g,
+ `href="${CURSEFORGE_URL}`
+ );
+ setDescription(modifiedData);
+ }),
+ getAddonFiles(projectID).then(async data => {
+ const isFabric =
+ getPatchedInstanceType(instance) === FABRIC &&
+ projectID !== 361988;
+ const isForge =
+ getPatchedInstanceType(instance) === FORGE ||
+ projectID === 361988;
+ let filteredFiles = [];
+ if (isFabric) {
+ filteredFiles = filterFabricFilesByVersion(data, gameVersions);
+ } else if (isForge) {
+ filteredFiles = filterForgeFilesByVersion(data, gameVersions);
+ }
- setFiles(filteredFiles);
- setLoadingFiles(false);
- })
- ]);
+ setFiles(filteredFiles);
+ setLoadingFiles(false);
+ })
+ ]);
+ } else if (modSource === MODRINTH) {
+ const project = await getModrinthProject(projectID);
+ setMod(project);
+
+ setDescription(project.body);
+ const versions = (await getModrinthVersions(project.versions)).sort(
+ (a, b) => Date.parse(b.date_published) - Date.parse(a.date_published)
+ );
+ setFiles(versions);
+ setLoadingFiles(false);
+ getModrinthUser(versions[0].author_id).then(user => {
+ setAuthor(user.username);
+ });
+ setDownloadCount(project.downloads);
+ setUpdatedDate(Date.parse(project.updated));
+ setGameVersion(versions[0].game_versions[0]);
+ setUrl(`https://modrinth.com/mod/${project.slug}`);
+ }
};
init();
@@ -86,8 +137,11 @@ const ModOverview = ({
};
const getReleaseType = id => {
+ if (typeof id === 'string' || id instanceof String) id = id.toUpperCase();
+
switch (id) {
case 1:
+ case 'RELEASE':
return (
);
case 2:
+ case 'BETA':
return (
);
case 3:
- default:
+ case 'ALPHA':
return (
);
+ default:
+ return (
+ props.theme.palette.colors.red};
+ `}
+ >
+ [Unknown]
+
+ );
}
};
const handleChange = value => setSelectedItem(JSON.parse(value));
- const primaryImage = addon?.logo;
+ const primaryImage = addon?.logo || mod?.icon_url;
return (
dispatch(closeModal())} />
-
+
- {addon?.name}
+ {addon?.name || mod?.name}
- {ReactHtmlParser(description)}
+
+ {modSource === CURSEFORGE ? (
+ ReactHtmlParser(description)
+ ) : (
+ {description}
+ )}
+
)}
{
{
- if (!item.fileID) return;
- dispatch(
- openModal('ModOverview', {
- projectID: item.projectID,
- fileID: item.fileID,
- fileName: item.fileName,
- gameVersions,
- instanceName
- })
- );
+ if (item.fileID) {
+ dispatch(
+ openModal('ModOverview', {
+ modSource: item.modSource,
+ projectID: item.projectID,
+ fileID: item.fileID,
+ fileName: item.fileName,
+ gameVersions,
+ instanceName
+ })
+ );
+ } else {
+ console.error(
+ `Mod "${name}" does not have a valid file/version ID. Cannot open Mod Overview.`
+ );
+ }
}}
className="rowCenterContent"
>
diff --git a/src/common/modals/InstanceManager/index.js b/src/common/modals/InstanceManager/index.js
index 4865582..555e6c1 100644
--- a/src/common/modals/InstanceManager/index.js
+++ b/src/common/modals/InstanceManager/index.js
@@ -424,6 +424,7 @@ const InstanceManager = ({ instanceName }) => {
modpackId={instance?.loader?.projectID}
fileID={instance?.loader?.fileID}
background={background}
+ source={instance?.loader?.source}
manifest={manifest}
/>
diff --git a/src/common/modals/ModChangelog.js b/src/common/modals/ModChangelog.js
index 9d103d5..b4745b8 100644
--- a/src/common/modals/ModChangelog.js
+++ b/src/common/modals/ModChangelog.js
@@ -5,10 +5,15 @@ import ReactHtmlParser from 'react-html-parser';
import { Select } from 'antd';
import ReactMarkdown from 'react-markdown';
import Modal from '../components/Modal';
-import { getAddonFileChangelog, getFTBChangelog } from '../api';
+import {
+ getAddonFileChangelog,
+ getFTBChangelog,
+ getModrinthVersionChangelog
+} from '../api';
+import { CURSEFORGE, FTB, MODRINTH } from '../utils/constants';
let latest = {};
-const ModChangelog = ({ modpackId, files, type, modpackName }) => {
+const ModChangelog = ({ projectID, files, type, projectName }) => {
const [changelog, setChangelog] = useState(null);
const [loading, setLoading] = useState(false);
const [selectedId, setSelectedId] = useState(null);
@@ -19,10 +24,18 @@ const ModChangelog = ({ modpackId, files, type, modpackName }) => {
setLoading(true);
let data;
try {
- if (type === 'ftb') {
- data = await getFTBChangelog(modpackId, id);
- } else {
- data = await getAddonFileChangelog(modpackId, id);
+ switch (type) {
+ case FTB:
+ data = await getFTBChangelog(projectID, id);
+ break;
+ case CURSEFORGE:
+ data = await getAddonFileChangelog(projectID, id);
+ break;
+ case MODRINTH:
+ data = await getModrinthVersionChangelog(id);
+ break;
+ default:
+ throw Error(`Unknown type: ${type}`);
}
} catch (err) {
console.error(err);
@@ -78,12 +91,16 @@ const ModChangelog = ({ modpackId, files, type, modpackName }) => {
{(files || []).map(v => (
- {type === 'ftb' ? `${modpackName} - ${v.name}` : v.displayName}
+ {type === 'ftb' || type === MODRINTH
+ ? `${projectName} - ${v.name}`
+ : v.displayName}
))}
@@ -96,23 +113,23 @@ const ModChangelog = ({ modpackId, files, type, modpackName }) => {
margin-bottom: 40px;
`}
>
- {type === 'ftb'
- ? `${modpackName} - ${
+ {type === 'ftb' || type === MODRINTH
+ ? `${projectName} - ${
(files || []).find(v => v.id === selectedId)?.name
}`
: (files || []).find(v => v.id === selectedId)?.displayName}
- {type === 'ftb' ? (
+ {type === CURSEFORGE ? (
+ ReactHtmlParser(changelog)
+ ) : (
- {addon?.authors[0].name}
+ {author}
- {addon?.downloadCount && (
+ {downloadCount && (
- {formatNumber(addon?.downloadCount)}
+ {formatNumber(downloadCount)}
)}
- {' '}
- {formatDate(addon?.dateModified)}
+ {formatDate(updatedDate)}
@@ -162,7 +226,7 @@ const ModOverview = ({