@@ -398,11 +398,17 @@ provideInstallationSettings({
|
|||||||
const currentPlatform = server.value?.loader?.toLowerCase() ?? 'vanilla'
|
const currentPlatform = server.value?.loader?.toLowerCase() ?? 'vanilla'
|
||||||
const platformChanged = platform !== currentPlatform
|
const platformChanged = platform !== currentPlatform
|
||||||
|
|
||||||
|
let resolvedLoaderVersion = loaderVersionId
|
||||||
|
if (!resolvedLoaderVersion && platform !== 'vanilla') {
|
||||||
|
const versions = getLoaderVersionsForGameVersion(platform, gameVersion)
|
||||||
|
resolvedLoaderVersion = versions[0]?.id ?? null
|
||||||
|
}
|
||||||
|
|
||||||
debug('save: emitting reinstall before API call')
|
debug('save: emitting reinstall before API call')
|
||||||
emit(
|
emit(
|
||||||
'reinstall',
|
'reinstall',
|
||||||
platformChanged
|
platformChanged
|
||||||
? { loader: platform, lVersion: loaderVersionId, mVersion: gameVersion }
|
? { loader: platform, lVersion: resolvedLoaderVersion, mVersion: gameVersion }
|
||||||
: { mVersion: gameVersion },
|
: { mVersion: gameVersion },
|
||||||
)
|
)
|
||||||
try {
|
try {
|
||||||
@@ -410,7 +416,7 @@ provideInstallationSettings({
|
|||||||
const request: Archon.Content.v1.InstallWorldContent = {
|
const request: Archon.Content.v1.InstallWorldContent = {
|
||||||
content_variant: 'bare',
|
content_variant: 'bare',
|
||||||
loader: toApiLoader(platform),
|
loader: toApiLoader(platform),
|
||||||
version: loaderVersionId ?? '',
|
version: resolvedLoaderVersion ?? '',
|
||||||
game_version: gameVersion || undefined,
|
game_version: gameVersion || undefined,
|
||||||
soft_override: true,
|
soft_override: true,
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -212,8 +212,8 @@ const deleteHovered = ref(false)
|
|||||||
>
|
>
|
||||||
<span ref="versionNumberRef" class="truncate">{{
|
<span ref="versionNumberRef" class="truncate">{{
|
||||||
version.version_number.slice(0, Math.ceil(version.version_number.length / 2))
|
version.version_number.slice(0, Math.ceil(version.version_number.length / 2))
|
||||||
}}</span>
|
}}</span
|
||||||
<span class="shrink-0">{{
|
><span class="shrink-0">{{
|
||||||
version.version_number.slice(Math.ceil(version.version_number.length / 2))
|
version.version_number.slice(Math.ceil(version.version_number.length / 2))
|
||||||
}}</span>
|
}}</span>
|
||||||
</AutoLink>
|
</AutoLink>
|
||||||
@@ -223,8 +223,8 @@ const deleteHovered = ref(false)
|
|||||||
>
|
>
|
||||||
<span ref="fileNameRef" class="truncate">{{
|
<span ref="fileNameRef" class="truncate">{{
|
||||||
version.file_name.slice(0, Math.ceil(version.file_name.length / 2))
|
version.file_name.slice(0, Math.ceil(version.file_name.length / 2))
|
||||||
}}</span>
|
}}</span
|
||||||
<span class="shrink-0">{{
|
><span class="shrink-0">{{
|
||||||
version.file_name.slice(Math.ceil(version.file_name.length / 2))
|
version.file_name.slice(Math.ceil(version.file_name.length / 2))
|
||||||
}}</span>
|
}}</span>
|
||||||
</span>
|
</span>
|
||||||
|
|||||||
@@ -115,6 +115,7 @@ const contentQuery = useQuery({
|
|||||||
queryFn: () =>
|
queryFn: () =>
|
||||||
client.archon.content_v1.getAddons(serverId, worldId.value!, { from_modpack: false }),
|
client.archon.content_v1.getAddons(serverId, worldId.value!, { from_modpack: false }),
|
||||||
enabled: computed(() => worldId.value !== null),
|
enabled: computed(() => worldId.value !== null),
|
||||||
|
staleTime: 0,
|
||||||
})
|
})
|
||||||
|
|
||||||
const modpackProjectId = computed(() => contentQuery.data.value?.modpack?.spec.project_id ?? null)
|
const modpackProjectId = computed(() => contentQuery.data.value?.modpack?.spec.project_id ?? null)
|
||||||
@@ -483,7 +484,7 @@ function addonToContentItem(addon: Archon.Content.v1.Addon): ContentItem {
|
|||||||
link: `/${addon.owner.type}/${addon.owner.id}`,
|
link: `/${addon.owner.type}/${addon.owner.id}`,
|
||||||
}
|
}
|
||||||
: undefined,
|
: undefined,
|
||||||
id: addon.id,
|
id: addon.id ?? addon.filename,
|
||||||
enabled: !addon.disabled,
|
enabled: !addon.disabled,
|
||||||
file_name: addon.filename,
|
file_name: addon.filename,
|
||||||
project_type: addon.kind,
|
project_type: addon.kind,
|
||||||
|
|||||||
Reference in New Issue
Block a user