eightequal/AstralRinth
1
0
Fork 0
forked from didirus/AstralRinth
Code Pull Requests Activity

chore: update dependencies (#1103)

Browse Source 
* update trivial dependencies

* switch to sha1_smol

* update async_zip

* fix cli

* clippy & fmt

* js lints

* fix build for ci
This commit is contained in:
ToBinio
2024-04-07 21:13:35 +02:00
committed by GitHub
parent 6699b4cb33
commit 3e7fd80824
57 changed files with 2720 additions and 2038 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
theseus_gui/src/App.vue
View File

@@ -107,7 +107,7 @@ defineExpose({
title: 'Warning',
text: e.message,
type: 'warn',
})
}),
)
if (showOnboarding.value) {
@@ -127,7 +127,7 @@ const confirmClose = async () => {
{
title: 'Modrinth',
type: 'warning',
}
},
)
return confirmed
}

4
theseus_gui/src/components/GridDisplay.vue
View File

@@ -45,7 +45,7 @@ const confirmModal = ref(null)
async function deleteProfile() {
if (currentDeleteInstance.value) {
instanceComponents.value = instanceComponents.value.filter(
(x) => x.instance.path !== currentDeleteInstance.value
(x) => x.instance.path !== currentDeleteInstance.value,
)
await remove(currentDeleteInstance.value).catch(handleError)
}
@@ -88,7 +88,7 @@ const handleRightClick = (event, profilePathId) => {
color: 'primary',
},
...baseOptions,
]
],
)
}

8
theseus_gui/src/components/RowDisplay.vue
View File

@@ -50,7 +50,7 @@ const props = defineProps({
})
const actualInstances = computed(() =>
props.instances.filter((x) => x && x.instances && x.instances[0])
props.instances.filter((x) => x && x.instances && x.instances[0]),
)
const modsRow = ref(null)
@@ -171,7 +171,7 @@ const handleOptionsClick = async (args) => {
case 'install': {
const versions = await useFetch(
`https://api.modrinth.com/v2/project/${args.item.project_id}/version`,
'project versions'
'project versions',
)
if (args.item.project_type === 'modpack') {
@@ -179,7 +179,7 @@ const handleOptionsClick = async (args) => {
args.item.project_id,
versions[0].id,
args.item.title,
args.item.icon_url
args.item.icon_url,
)
} else {
modInstallModal.value.show(args.item.project_id, versions)
@@ -197,7 +197,7 @@ const handleOptionsClick = async (args) => {
break
case 'copy_link':
await navigator.clipboard.writeText(
`https://modrinth.com/${args.item.project_type}/${args.item.slug}`
`https://modrinth.com/${args.item.project_type}/${args.item.slug}`,
)
break
}

2
theseus_gui/src/components/modrinth-loading-indicator.js
View File

@@ -66,7 +66,7 @@ export default defineComponent({
zIndex: 6,
},
},
slots
slots,
)
},
})

4
theseus_gui/src/components/ui/AccountsCard.vue
View File

@@ -147,11 +147,11 @@ defineExpose({
await refreshValues()
const displayAccounts = computed(() =>
accounts.value.filter((account) => settings.value.default_user !== account.id)
accounts.value.filter((account) => settings.value.default_user !== account.id),
)
const selectedAccount = computed(() =>
accounts.value.find((account) => account.id === settings.value.default_user)
accounts.value.find((account) => account.id === settings.value.default_user),
)
async function setAccount(account) {

4
theseus_gui/src/components/ui/Breadcrumbs.vue
View File

@@ -44,8 +44,8 @@ const breadcrumbs = computed(() => {
route.meta.useContext === true
? breadcrumbData.context
: route.meta.useRootContext === true
? breadcrumbData.rootContext
: null
? breadcrumbData.rootContext
: null
return additionalContext ? [additionalContext, ...route.meta.breadcrumb] : route.meta.breadcrumb
})
</script>

4
theseus_gui/src/components/ui/ExportModal.vue
View File

@@ -63,7 +63,7 @@ const initFiles = async () => {
} else {
files.value.push(pathData)
}
})
}),
)
folders.value = [...newFolders.entries()].map(([name, value]) => [
{
@@ -97,7 +97,7 @@ const exportPack = async () => {
filesToExport,
versionInput.value,
exportDescription.value,
nameInput.value
nameInput.value,
).catch((err) => handleError(err))
exportModal.value.hide()
}

2
theseus_gui/src/components/ui/IncompatibilityWarningModal.vue
View File

@@ -82,7 +82,7 @@ defineExpose({
selectedVersions,
extMarkInstalled,
projectIdVal,
projectTypeVal
projectTypeVal,
) => {
instance.value = instanceVal
projectTitle.value = projectTitleVal

2
theseus_gui/src/components/ui/InstallConfirmModal.vue
View File

@@ -36,7 +36,7 @@ async function install() {
projectId.value,
version.value,
title.value,
icon.value ? icon.value : null
icon.value ? icon.value : null,
).catch(handleError)
mixpanel_track('PackInstall', {
id: projectId.value,

17
theseus_gui/src/components/ui/Instance.vue
View File

@@ -33,7 +33,7 @@ const playing = ref(false)
const uuid = ref(null)
const modLoading = ref(
props.instance.install_stage ? props.instance.install_stage !== 'installed' : false
props.instance.install_stage ? props.instance.install_stage !== 'installed' : false,
)
watch(
@@ -42,7 +42,7 @@ watch(
modLoading.value = props.instance.install_stage
? props.instance.install_stage !== 'installed'
: false
}
},
)
const router = useRouter()
@@ -72,7 +72,7 @@ const install = async (e) => {
modLoading.value = true
const versions = await useFetch(
`https://api.modrinth.com/v2/project/${props.instance.project_id}/version`,
'project versions'
'project versions',
)
if (props.instance.project_type === 'modpack') {
@@ -89,7 +89,7 @@ const install = async (e) => {
props.instance.project_id,
versions[0].id,
props.instance.title,
props.instance.icon_url
props.instance.icon_url,
).catch(handleError)
modLoading.value = false
@@ -104,14 +104,14 @@ const install = async (e) => {
props.instance.project_id,
versions[0].id,
props.instance.title,
props.instance.icon_url
props.instance.icon_url,
)
} else {
modInstallModal.value.show(
props.instance.project_id,
versions,
props.instance.title,
props.instance.project_type
props.instance.project_type,
)
}
@@ -267,7 +267,10 @@ onUnmounted(() => unlisten())
right: calc(var(--gap-md) * 2);
bottom: 3.25rem;
opacity: 0;
transition: 0.2s ease-in-out bottom, 0.2s ease-in-out opacity, 0.1s ease-in-out filter !important;
transition:
0.2s ease-in-out bottom,
0.2s ease-in-out opacity,
0.1s ease-in-out filter !important;
cursor: pointer;
box-shadow: var(--shadow-floating);

26
theseus_gui/src/components/ui/InstanceCreationModal.vue
View File

@@ -177,14 +177,14 @@
loading
? 'Importing...'
: Array.from(profiles.values())
.flatMap((e) => e)
.some((e) => e.selected)
? `Import ${
Array.from(profiles.values())
.flatMap((e) => e)
.filter((e) => e.selected).length
} profiles`
: 'Select profiles to import'
.some((e) => e.selected)
? `Import ${
Array.from(profiles.values())
.flatMap((e) => e)
.filter((e) => e.selected).length
} profiles`
: 'Select profiles to import'
}}
</Button>
<ProgressBar
@@ -317,7 +317,7 @@ const [
.then((value) =>
value
.filter((item) => item.supported_project_types.includes('modpack'))
.map((item) => item.name.toLowerCase())
.map((item) => item.name.toLowerCase()),
)
.then(ref)
.catch(handleError),
@@ -367,7 +367,7 @@ const create_instance = async () => {
game_version.value,
loader.value,
loader.value === 'vanilla' ? null : loader_version_value ?? 'stable',
icon.value
icon.value,
).catch(handleError)
mixpanel_track('InstanceCreate', {
@@ -441,7 +441,7 @@ const profiles = ref(
['ATLauncher', []],
['Curseforge', []],
['PrismLauncher', []],
])
]),
)
const loading = ref(false)
@@ -470,7 +470,7 @@ const promises = profileOptions.value.map(async (option) => {
profileOptions.value.find((profile) => profile.name === option.name).path = path
profiles.value.set(
option.name,
instances.map((name) => ({ name, selected: false }))
instances.map((name) => ({ name, selected: false })),
)
} catch (error) {
// Allow failure silently
@@ -489,12 +489,12 @@ const selectLauncherPath = async () => {
const reload = async () => {
const instances = await get_importable_instances(
selectedProfileType.value.name,
selectedProfileType.value.path
selectedProfileType.value.path,
).catch(handleError)
if (instances) {
profiles.value.set(
selectedProfileType.value.name,
instances.map((name) => ({ name, selected: false }))
instances.map((name) => ({ name, selected: false })),
)
} else {
profiles.value.set(selectedProfileType.value.name, [])

2
theseus_gui/src/components/ui/JavaSelector.vue
View File

@@ -112,7 +112,7 @@ async function testJava() {
testingJavaSuccess.value = await test_jre(
props.modelValue ? props.modelValue.path : '',
1,
props.version
props.version,
)
testingJava.value = false

13
theseus_gui/src/components/ui/ModInstallModal.vue
View File

@@ -112,7 +112,8 @@ async function getData() {
.flatMap((v) => v.loaders)
.some(
(value) =>
value === profile.metadata.loader || ['minecraft', 'iris', 'optifine'].includes(value)
value === profile.metadata.loader ||
['minecraft', 'iris', 'optifine'].includes(value),
)
)
})
@@ -175,7 +176,7 @@ const createInstance = async () => {
versions.value[0].game_versions[0],
loader,
'latest',
icon.value
icon.value,
).catch(handleError)
await installMod(id, versions.value[0].id).catch(handleError)
@@ -264,10 +265,10 @@ const check_valid = computed(() => {
profile.installing
? 'Installing...'
: profile.installedMod
? 'Installed'
: profile.metadata.linked_data && profile.metadata.linked_data.locked
? 'Paired'
: 'Install'
? 'Installed'
: profile.metadata.linked_data && profile.metadata.linked_data.locked
? 'Paired'
: 'Install'
}}
</Button>
</div>

6
theseus_gui/src/components/ui/ProjectCard.vue
View File

@@ -74,7 +74,7 @@ const install = async (e) => {
installing.value = true
const versions = await useFetch(
`https://api.modrinth.com/v2/project/${props.project.project_id}/version`,
'project versions'
'project versions',
)
if (props.project.project_type === 'modpack') {
@@ -91,7 +91,7 @@ const install = async (e) => {
props.project.project_id,
versions[0].id,
props.project.title,
props.project.icon_url
props.project.icon_url,
).catch(handleError)
installing.value = false
} else
@@ -99,7 +99,7 @@ const install = async (e) => {
props.project.project_id,
versions[0].id,
props.project.title,
props.project.icon_url
props.project.icon_url,
)
} else {
props.modInstallModal.show(props.project.project_id, versions)

2
theseus_gui/src/components/ui/RunningAppBar.vue
View File

@@ -196,7 +196,7 @@ const refreshInfo = async () => {
}
return x
}
},
)
if (currentLoadingBars.value.length === 0) {
showCard.value = false

13
theseus_gui/src/components/ui/SearchCard.vue
View File

@@ -136,7 +136,7 @@ async function install() {
installing.value = true
const versions = await useFetch(
`https://api.modrinth.com/v2/project/${props.project.project_id}/version`,
'project versions'
'project versions',
)
let queuedVersionData
@@ -146,7 +146,8 @@ async function install() {
queuedVersionData = versions.find(
(v) =>
v.game_versions.includes(props.instance.metadata.game_version) &&
(props.project.project_type !== 'mod' || v.loaders.includes(props.instance.metadata.loader))
(props.project.project_type !== 'mod' ||
v.loaders.includes(props.instance.metadata.loader)),
)
}
@@ -162,7 +163,7 @@ async function install() {
props.project.project_id,
queuedVersionData.id,
props.project.title,
props.project.icon_url
props.project.icon_url,
).catch(handleError)
mixpanel_track('PackInstall', {
@@ -176,7 +177,7 @@ async function install() {
props.project.project_id,
queuedVersionData.id,
props.project.title,
props.project.icon_url
props.project.icon_url,
)
}
} else {
@@ -188,7 +189,7 @@ async function install() {
versions,
() => (installed.value = true),
props.project.project_id,
props.project.project_type
props.project.project_type,
)
installing.value = false
return
@@ -211,7 +212,7 @@ async function install() {
props.project.project_id,
versions,
props.project.title,
props.project.project_type
props.project.project_type,
)
installing.value = false
return

16
theseus_gui/src/components/ui/URLConfirmModal.vue
View File

@@ -21,28 +21,28 @@ defineExpose({
if (event.event === 'InstallVersion') {
version.value = await useFetch(
`https://api.modrinth.com/v2/version/${encodeURIComponent(event.id)}`,
'version'
'version',
)
project.value = await useFetch(
`https://api.modrinth.com/v2/project/${encodeURIComponent(version.value.project_id)}`,
'project'
'project',
)
} else {
project.value = await useFetch(
`https://api.modrinth.com/v2/project/${encodeURIComponent(event.id)}`,
'project'
'project',
)
version.value = await useFetch(
`https://api.modrinth.com/v2/version/${encodeURIComponent(project.value.versions[0])}`,
'version'
'version',
)
}
categories.value = (await get_categories().catch(handleError)).filter(
(cat) => project.value.categories.includes(cat.name) && cat.project_type === 'mod'
(cat) => project.value.categories.includes(cat.name) && cat.project_type === 'mod',
)
confirmModal.value.show()
categories.value = (await get_categories().catch(handleError)).filter(
(cat) => project.value.categories.includes(cat.name) && cat.project_type === 'mod'
(cat) => project.value.categories.includes(cat.name) && cat.project_type === 'mod',
)
confirmModal.value.show()
},
@@ -55,7 +55,7 @@ async function install() {
project.value.id,
version.value.id,
project.value.title,
project.value.icon_url
project.value.icon_url,
).catch(handleError)
mixpanel.track('PackInstall', {
@@ -69,7 +69,7 @@ async function install() {
project.value.id,
[version.value],
project.value.title,
project.value.project_type
project.value.project_type,
)
}
}

2
theseus_gui/src/components/ui/tutorial/FakeSearch.vue
View File

@@ -100,7 +100,7 @@ defineProps({
v-for="loader in loaders.filter(
(l) =>
(projectType !== 'mod' && l.supported_project_types?.includes(projectType)) ||
(projectType === 'mod' && ['fabric', 'forge', 'quilt'].includes(l.name))
(projectType === 'mod' && ['fabric', 'forge', 'quilt'].includes(l.name)),
)"
:key="loader"
>

22
theseus_gui/src/components/ui/tutorial/ImportingCard.vue
View File

@@ -36,7 +36,7 @@ const profiles = ref(
['ATLauncher', []],
['Curseforge', []],
['PrismLauncher', []],
])
]),
)
const loading = ref(false)
@@ -63,7 +63,7 @@ const promises = profileOptions.value.map(async (option) => {
profileOptions.value.find((profile) => profile.name === option.name).path = path
profiles.value.set(
option.name,
instances.map((name) => ({ name, selected: false }))
instances.map((name) => ({ name, selected: false })),
)
} catch (error) {
// Allow failure silently
@@ -82,11 +82,11 @@ const selectLauncherPath = async () => {
const reload = async () => {
const instances = await get_importable_instances(
selectedProfileType.value.name,
selectedProfileType.value.path
selectedProfileType.value.path,
).catch(handleError)
profiles.value.set(
selectedProfileType.value.name,
instances.map((name) => ({ name, selected: false }))
instances.map((name) => ({ name, selected: false })),
)
}
@@ -198,14 +198,14 @@ const next = async () => {
loading
? 'Importing...'
: Array.from(profiles.values())
.flatMap((e) => e)
.some((e) => e.selected)
? `Import ${
Array.from(profiles.values())
.flatMap((e) => e)
.filter((e) => e.selected).length
} profiles`
: 'Select profiles to import'
.some((e) => e.selected)
? `Import ${
Array.from(profiles.values())
.flatMap((e) => e)
.filter((e) => e.selected).length
} profiles`
: 'Select profiles to import'
}}
</Button>
<Button class="transparent" @click="nextPage"> Next </Button>

4
theseus_gui/src/components/ui/tutorial/ModrinthLoginScreen.vue
View File

@@ -75,7 +75,7 @@ async function signIn() {
const creds = await login_pass(
username.value,
password.value,
window.turnstile.getResponse()
window.turnstile.getResponse(),
).catch(handleError)
window.turnstile.reset()
@@ -102,7 +102,7 @@ async function createAccount() {
email.value,
password.value,
window.turnstile.getResponse(),
subscribe.value
subscribe.value,
).catch(handleError)
window.turnstile.reset()

3
theseus_gui/src/components/ui/tutorial/OnboardingScreen.vue
View File

@@ -489,7 +489,8 @@ onMounted(async () => {
}
.onboarding {
background: top linear-gradient(0deg, #31375f, rgba(8, 14, 55, 0)),
background:
top linear-gradient(0deg, #31375f, rgba(8, 14, 55, 0)),
url(https://cdn.modrinth.com/landing-new/landing-lower.webp);
background-size: cover;
height: 100vh;

4
theseus_gui/src/helpers/mixpanel.js
View File

@@ -23,7 +23,7 @@ function optOutTrackingWrapper(originalOptOutTracking) {
}
}
export const mixpanel_opt_out_tracking = optOutTrackingWrapper(
mixpanel.opt_out_tracking.bind(mixpanel)
mixpanel.opt_out_tracking.bind(mixpanel),
)
// mixpanel_opt_in_tracking()
@@ -37,7 +37,7 @@ function optInTrackingWrapper(originalOptInTracking) {
}
}
export const mixpanel_opt_in_tracking = optInTrackingWrapper(
mixpanel.opt_in_tracking.bind(mixpanel)
mixpanel.opt_in_tracking.bind(mixpanel),
)
// mixpanel_init

4
theseus_gui/src/helpers/pack.js
View File

@@ -21,7 +21,7 @@ export async function install(projectId, versionId, packTitle, iconUrl) {
profile_creator.gameVersion,
profile_creator.modloader,
profile_creator.loaderVersion,
profile_creator.icon
profile_creator.icon,
)
return await invoke('plugin:pack|pack_install', { location, profile })
@@ -39,7 +39,7 @@ export async function install_from_file(path) {
profile_creator.gameVersion,
profile_creator.modloader,
profile_creator.loaderVersion,
profile_creator.icon
profile_creator.icon,
)
return await invoke('plugin:pack|pack_install', { location, profile })
}

2
theseus_gui/src/helpers/profile.js
View File

@@ -133,7 +133,7 @@ export async function export_profile_mrpack(
includedOverrides,
versionId,
description,
name
name,
) {
return await invoke('plugin:profile|profile_export_mrpack', {
path,

4
theseus_gui/src/helpers/utils.js
View File

@@ -69,12 +69,12 @@ export const installVersionDependencies = async (profile, version) => {
continue
const depVersions = await useFetch(
`https://api.modrinth.com/v2/project/${dep.project_id}/version`,
'dependency versions'
'dependency versions',
)
const latest = depVersions.find(
(v) =>
v.game_versions.includes(profile.metadata.game_version) &&
v.loaders.includes(profile.metadata.loader)
v.loaders.includes(profile.metadata.loader),
)
if (latest) {
await installMod(profile.path, latest.id).catch(handleError)

27
theseus_gui/src/pages/Browse.vue
View File

@@ -75,7 +75,7 @@ const ignoreInstanceGameVersions = ref(false)
const results = shallowRef([])
const pageCount = computed(() =>
results.value ? Math.ceil(results.value.total_hits / results.value.limit) : 1
results.value ? Math.ceil(results.value.total_hits / results.value.limit) : 1,
)
function getArrayOrString(x) {
@@ -179,7 +179,9 @@ async function refreshSearch() {
formattedFacets.push(orFacets.value)
} else if (projectType.value === 'mod') {
formattedFacets.push(
['forge', 'fabric', 'quilt', 'neoforge'].map((x) => `categories:'${encodeURIComponent(x)}'`)
['forge', 'fabric', 'quilt', 'neoforge'].map(
(x) => `categories:'${encodeURIComponent(x)}'`,
),
)
} else if (projectType.value === 'datapack') {
formattedFacets.push(['datapack'].map((x) => `categories:'${encodeURIComponent(x)}'`))
@@ -230,7 +232,7 @@ async function refreshSearch() {
const installedMods = await get(instanceContext.value.path, false).then((x) =>
Object.values(x.projects)
.filter((x) => x.metadata.project)
.map((x) => x.metadata.project.id)
.map((x) => x.metadata.project.id),
)
installedMods.map((x) => [`project_id != ${x}`]).forEach((x) => formattedFacets.push(x))
console.log(`facets=${JSON.stringify(formattedFacets)}`)
@@ -262,7 +264,7 @@ async function refreshSearch() {
if (instanceContext.value) {
for (val of rawResults.hits) {
val.installed = await check_installed(instanceContext.value.path, val.project_id).then(
(x) => (val.installed = x)
(x) => (val.installed = x),
)
}
}
@@ -374,7 +376,7 @@ function getSearchUrl(offset, useObj) {
const sortedCategories = computed(() => {
const values = new Map()
for (const category of categories.value.filter(
(cat) => cat.project_type === (projectType.value === 'datapack' ? 'mod' : projectType.value)
(cat) => cat.project_type === (projectType.value === 'datapack' ? 'mod' : projectType.value),
)) {
if (!values.has(category.header)) {
values.set(category.header, [])
@@ -478,7 +480,7 @@ watch(
loading.value = true
await clearFilters()
loading.value = false
}
},
)
const [categories, loaders, availableGameVersions] = await Promise.all([
@@ -500,7 +502,7 @@ const selectableProjectTypes = computed(() => {
if (instanceContext.value) {
if (
availableGameVersions.value.findIndex(
(x) => x.version === instanceContext.value.metadata.game_version
(x) => x.version === instanceContext.value.metadata.game_version,
) <= availableGameVersions.value.findIndex((x) => x.version === '1.13')
) {
values.unshift({ label: 'Data Packs', href: `/browse/datapack` })
@@ -519,7 +521,7 @@ const selectableProjectTypes = computed(() => {
})
const showVersions = computed(
() => instanceContext.value === null || ignoreInstanceGameVersions.value
() => instanceContext.value === null || ignoreInstanceGameVersions.value,
)
const showLoaders = computed(
() =>
@@ -527,7 +529,7 @@ const showLoaders = computed(
projectType.value !== 'resourcepack' &&
projectType.value !== 'shader' &&
instanceContext.value === null) ||
ignoreInstanceLoaders.value
ignoreInstanceLoaders.value,
)
onUnmounted(() => unlistenOffline())
@@ -605,7 +607,8 @@ onUnmounted(() => unlistenOffline())
v-for="loader in loaders.filter(
(l) =>
(projectType !== 'mod' && l.supported_project_types?.includes(projectType)) ||
(projectType === 'mod' && ['fabric', 'forge', 'quilt', 'neoforge'].includes(l.name))
(projectType === 'mod' &&
['fabric', 'forge', 'quilt', 'neoforge'].includes(l.name)),
)"
:key="loader"
>
@@ -752,12 +755,12 @@ onUnmounted(() => unlistenOffline())
:categories="[
...categories.filter(
(cat) =>
result?.display_categories.includes(cat.name) && cat.project_type === projectType
result?.display_categories.includes(cat.name) && cat.project_type === projectType,
),
...loaders.filter(
(loader) =>
result?.display_categories.includes(loader.name) &&
loader.supported_project_types?.includes(projectType)
loader.supported_project_types?.includes(projectType),
),
]"
:confirm-modal="confirmModal"

4
theseus_gui/src/pages/Index.vue
View File

@@ -42,7 +42,7 @@ const getFeaturedModpacks = async () => {
const response = await useFetch(
`https://api.modrinth.com/v2/search?facets=[["project_type:modpack"]]&limit=10&index=follows&filters=${filter.value}`,
'featured modpacks',
offline.value
offline.value,
)
if (response) {
featuredModpacks.value = response.hits
@@ -54,7 +54,7 @@ const getFeaturedMods = async () => {
const response = await useFetch(
'https://api.modrinth.com/v2/search?facets=[["project_type:mod"]]&limit=10&index=follows',
'featured mods',
offline.value
offline.value,
)
if (response) {
featuredMods.value = response.hits

6
theseus_gui/src/pages/Settings.vue
View File

@@ -73,13 +73,13 @@ watch(
if (setSettings.java_globals.JAVA_8?.path) {
setSettings.java_globals.JAVA_8.path = setSettings.java_globals.JAVA_8.path.replace(
'java.exe',
'javaw.exe'
'javaw.exe',
)
}
if (setSettings.java_globals.JAVA_17?.path) {
setSettings.java_globals.JAVA_17.path = setSettings.java_globals.JAVA_17?.path.replace(
'java.exe',
'javaw.exe'
'javaw.exe',
)
}
@@ -102,7 +102,7 @@ watch(
await set(setSettings)
},
{ deep: true }
{ deep: true },
)
const credentials = ref(await getCreds().catch(handleError))

6
theseus_gui/src/pages/instance/Index.vue
View File

@@ -165,7 +165,7 @@ breadcrumbs.setName(
'Instance',
instance.value.metadata.name.length > 40
? instance.value.metadata.name.substring(0, 40) + '...'
: instance.value.metadata.name
: instance.value.metadata.name,
)
breadcrumbs.setContext({
@@ -212,7 +212,7 @@ const modrinthVersions = ref([])
if (!(await isOffline()) && instance.value.metadata.linked_data?.project_id) {
modrinthVersions.value = await useFetch(
`https://api.modrinth.com/v2/project/${instance.value.metadata.linked_data.project_id}/version`,
'project'
'project',
)
}
@@ -259,7 +259,7 @@ const handleRightClick = (event) => {
color: 'primary',
},
...baseOptions,
]
],
)
}

8
theseus_gui/src/pages/instance/Logs.vue
View File

@@ -225,7 +225,7 @@ async function getLiveStdLog() {
} else {
const logCursor = await get_latest_log_cursor(
props.instance.path,
currentLiveLogCursor.value
currentLiveLogCursor.value,
).catch(handleError)
if (logCursor.new_file) {
currentLiveLog.value = ''
@@ -248,7 +248,7 @@ async function getLogs() {
log.filename !== 'latest_stdout.log' &&
log.filename !== 'latest_stdout' &&
log.stdout !== '' &&
log.filename.includes('.log')
log.filename.includes('.log'),
)
.map((log) => {
log.name = log.filename || 'Unknown'
@@ -291,7 +291,7 @@ watch(selectedLogIndex, async (newIndex) => {
logs.value[newIndex].stdout = 'Loading...'
logs.value[newIndex].stdout = await get_output_by_filename(
props.instance.path,
logs.value[newIndex].filename
logs.value[newIndex].filename,
).catch(handleError)
}
})
@@ -307,7 +307,7 @@ const deleteLog = async () => {
let deleteIndex = selectedLogIndex.value
selectedLogIndex.value = deleteIndex - 1
await delete_logs_by_filename(props.instance.path, logs.value[deleteIndex].filename).catch(
handleError
handleError,
)
await setLogs()
}

16
theseus_gui/src/pages/instance/Mods.vue
View File

@@ -505,7 +505,7 @@ const initProjects = (initInstance) => {
selectionMap.value.get(project.path) ??
selectionMap.value.get(project.path.slice(0, -9)) ??
selectionMap.value.get(project.path + '.disabled') ??
false
false,
)
}
selectionMap.value = newSelectionMap
@@ -517,14 +517,14 @@ watch(
() => props.instance.projects,
() => {
initProjects(props.instance)
}
},
)
watch(
() => props.offline,
() => {
if (props.instance) initProjects(props.instance)
}
},
)
const modpackVersionModal = ref(null)
@@ -551,11 +551,11 @@ const selected = computed(() =>
})
.map((args) => {
return projects.value.find((x) => x.path === args[0])
})
}),
)
const functionValues = computed(() =>
selected.value.length > 0 ? selected.value : Array.from(projects.value.values())
selected.value.length > 0 ? selected.value : Array.from(projects.value.values()),
)
const selectableProjectTypes = computed(() => {
@@ -781,7 +781,7 @@ const shareUrls = async () => {
functionValues.value
.filter((x) => x.slug)
.map((x) => `https://modrinth.com/${x.project_type}/${x.slug}`)
.join('\n')
.join('\n'),
)
}
@@ -794,7 +794,7 @@ const shareMarkdown = async () => {
}
return x.name
})
.join('\n')
.join('\n'),
)
}
@@ -839,7 +839,7 @@ const handleRightClick = (event, mod) => {
{
link: `https://modrinth.com/${mod.project_type}/${mod.slug}`,
},
[{ name: 'open_link' }, { name: 'copy_link' }]
[{ name: 'open_link' }, { name: 'copy_link' }],
)
}
}

16
theseus_gui/src/pages/instance/Options.vue
View File

@@ -596,7 +596,7 @@ const availableGroups = ref([
...new Set(
instancesList.reduce((acc, obj) => {
return acc.concat(obj.metadata.groups)
}, [])
}, []),
),
])
@@ -641,7 +641,9 @@ const javaArgs = ref((javaSettings.extra_arguments ?? globalSettings.custom_java
const overrideEnvVars = ref(!!javaSettings.custom_env_args)
const envVars = ref(
(javaSettings.custom_env_args ?? globalSettings.custom_env_args).map((x) => x.join('=')).join(' ')
(javaSettings.custom_env_args ?? globalSettings.custom_env_args)
.map((x) => x.join('='))
.join(' '),
)
const overrideMemorySettings = ref(!!props.instance.memory)
@@ -688,7 +690,7 @@ watch(
async () => {
await edit(props.instance.path, editProfileObject.value)
},
{ deep: true }
{ deep: true },
)
const getLocalVersion = (path) => {
@@ -716,7 +718,7 @@ const editProfileObject = computed(() => {
editProfile.java.override_version = javaInstall.value
editProfile.java.override_version.path = editProfile.java.override_version.path.replace(
'java.exe',
'javaw.exe'
'javaw.exe',
)
}
}
@@ -848,7 +850,7 @@ const [
.then((value) =>
value
.filter((item) => item.supported_project_types.includes('modpack'))
.map((item) => item.name.toLowerCase())
.map((item) => item.name.toLowerCase()),
)
.then(ref)
.catch(handleError),
@@ -893,8 +895,8 @@ const selectableLoaderVersions = computed(() => {
})
const loaderVersionIndex = ref(
selectableLoaderVersions.value.findIndex(
(x) => x.id === props.instance.metadata.loader_version?.id
)
(x) => x.id === props.instance.metadata.loader_version?.id,
),
)
const isValid = computed(() => {

8
theseus_gui/src/pages/project/Gallery.vue
View File

@@ -276,7 +276,9 @@ const expandImage = (item, index) => {
display: flex;
flex-direction: column;
max-width: 40rem;
transition: opacity 0.25s ease-in-out, transform 0.25s ease-in-out;
transition:
opacity 0.25s ease-in-out,
transform 0.25s ease-in-out;
text-shadow: 1px 1px 10px #000000d4;
margin-bottom: 0.25rem;
gap: 0.5rem;
@@ -297,7 +299,9 @@ const expandImage = (item, index) => {
background-color: var(--color-raised-bg);
padding: var(--gap-md);
border-radius: var(--radius-md);
transition: opacity 0.25s ease-in-out, transform 0.25s ease-in-out;
transition:
opacity 0.25s ease-in-out,
transform 0.25s ease-in-out;
}
}
}

24
theseus_gui/src/pages/project/Index.vue
View File

@@ -38,7 +38,7 @@
class="tags"
:categories="
categories.filter(
(cat) => data.categories.includes(cat.name) && cat.project_type === 'mod'
(cat) => data.categories.includes(cat.name) && cat.project_type === 'mod',
)
"
type="ignored"
@@ -328,7 +328,7 @@ async function fetchProjectData() {
breadcrumbs.setName('Project', data.value.title)
installedVersion.value = instance.value
? Object.values(instance.value.projects).find(
(p) => p?.metadata?.version?.project_id === data.value.id
(p) => p?.metadata?.version?.project_id === data.value.id,
)?.metadata?.version?.id
: null
}
@@ -341,7 +341,7 @@ watch(
if (route.params.id && route.path.startsWith('/project')) {
await fetchProjectData()
}
}
},
)
dayjs.extend(relativeTime)
@@ -380,7 +380,7 @@ async function install(version) {
queuedVersionData = versions.value[0]
} else {
queuedVersionData = versions.value.find((v) =>
v.game_versions.includes(data.value.game_versions[0])
v.game_versions.includes(data.value.game_versions[0]),
)
}
}
@@ -397,7 +397,7 @@ async function install(version) {
data.value.id,
queuedVersionData.id,
data.value.title,
data.value.icon_url
data.value.icon_url,
).catch(handleError)
mixpanel_track('PackInstall', {
@@ -411,7 +411,7 @@ async function install(version) {
data.value.id,
queuedVersionData.id,
data.value.title,
data.value.icon_url
data.value.icon_url,
)
}
} else {
@@ -424,7 +424,7 @@ async function install(version) {
v.game_versions.includes(gameVersion) &&
(data.value.project_type === 'mod'
? v.loaders.includes(loader) || v.loaders.includes('minecraft')
: true)
: true),
)
if (!selectedVersion) {
incompatibilityWarning.value.show(
@@ -433,7 +433,7 @@ async function install(version) {
versions.value,
markInstalled,
data.value.id,
data.value.project_type
data.value.project_type,
)
installing.value = false
return
@@ -460,7 +460,7 @@ async function install(version) {
v.game_versions.includes(gameVersion) &&
(data.value.project_type === 'mod'
? v.loaders.includes(loader) || v.loaders.includes('minecraft')
: true)
: true),
)
if (compatible) {
await installMod(instance.value.path, queuedVersionData.id).catch(handleError)
@@ -482,7 +482,7 @@ async function install(version) {
[queuedVersionData],
markInstalled,
data.value.id,
data.value.project_type
data.value.project_type,
)
installing.value = false
return
@@ -494,7 +494,7 @@ async function install(version) {
data.value.id,
version ? [versions.value.find((v) => v.id === queuedVersionData.id)] : versions.value,
data.value.title,
data.value.project_type
data.value.project_type,
)
}
}
@@ -527,7 +527,7 @@ const handleOptionsClick = (args) => {
break
case 'copy_link':
navigator.clipboard.writeText(
`https://modrinth.com/${args.item.project_type}/${args.item.slug}`
`https://modrinth.com/${args.item.project_type}/${args.item.slug}`,
)
break
}

12
theseus_gui/src/pages/project/Version.vue
View File

@@ -26,8 +26,8 @@
installing
? 'Installing...'
: installed && installedVersion === version.id
? 'Installed'
: 'Install'
? 'Installed'
: 'Install'
}}
</Button>
<Button>
@@ -252,11 +252,11 @@ watch(
version.value = props.versions.find((version) => version.id === route.params.version)
breadcrumbs.setName('Version', version.value.name)
}
}
},
)
const author = computed(() =>
props.members.find((member) => member.user.id === version.value.author_id)
props.members.find((member) => member.user.id === version.value.author_id),
)
const displayDependencies = computed(() =>
@@ -264,7 +264,7 @@ const displayDependencies = computed(() =>
const version = props.dependencies.versions.find((obj) => obj.id === dependency.version_id)
if (version) {
const project = props.dependencies.projects.find(
(obj) => obj.id === version.project_id || obj.id === dependency.project_id
(obj) => obj.id === version.project_id || obj.id === dependency.project_id,
)
return {
icon: project?.icon_url,
@@ -291,7 +291,7 @@ const displayDependencies = computed(() =>
}
}
}
})
}),
)
</script>

4
theseus_gui/src/pages/project/Versions.vue
View File

@@ -210,12 +210,12 @@ const filteredVersions = computed(() => {
(projectVersion) =>
(filterGameVersions.value.length === 0 ||
filterGameVersions.value.some((gameVersion) =>
projectVersion.game_versions.includes(gameVersion)
projectVersion.game_versions.includes(gameVersion),
)) &&
(filterLoader.value.length === 0 ||
filterLoader.value.some((loader) => projectVersion.loaders.includes(loader))) &&
(filterVersions.value.length === 0 ||
filterVersions.value.includes(projectVersion.version_type))
filterVersions.value.includes(projectVersion.version_type)),
)
})