feat: instances v2 (#6431)

* feat: base of instances v2

* feat: use old profiles with compat layer

* prototype: instances v2

* fix: install_from using profile

* fix: skins migration fix

* fix: frontend still using profile path

* fix: add update proj multiselect guard

* fix: cargo fmt

* fix: content missing fields

* feat: break up app-lib/api/instance.rs

* fix: check_content_updates mismatch

* fix: updater modal cleanup w/new structure

* feat: better update all handling

* fix: remove preview_update_all

* fix: feedback on bulk update + lint

* fix: rem transitions

* fix: change to jsonb

* feat: app db backup after update

* fix: lint

* fix: sqlx prepare + use sqlx macros

* fix: lint

* fix: bugs

* feat: defuck the installing process up

* fix: bug of hell

* fix: shear

* fix: fmt

* fix: install progress spacing + change mc/content/overrides to bytes

* fix: lint

* fix: prepr

* fix: navtabs anim not working in app

* fix: worlds.vue improvements + browse page fixes

* feat: optimise queries + adapter fns

* fix: lint

* fix: lint

* feat: shared modrinth-content-management crate (#6469)

* feat: disable warnings setting

* feat: add instances shortcuts (#6329)

* Add modrinth://launch deep link to start a profile

Support external profile launching via modrinth://launch/{profile_path} for integrations such as Stream Deck.

* Change route to /launch/profile/{id} for future extensibility

* fix: ensure profile path is url decoded

* fix: URL-decode profile path from deep link

* fix: use urlencoding crate for URL decoding

* feat: implement app instance shortcuts

* feat: change windows shortcut creation to use windows api instead

* feat: implement creating a shortcut launching world/server

* format

* fmt

* fix multiline inline tables

* pnpm prepr

* feat: move create shortcut to last item

* refactor: split up shortcuts.rs for individual platforms

* refactor: turn profile launch url into url type

* use string literal and add safety comment

* pt2

* refactor: rename anything that's profile into instance

* update mac shortcut

---------

Co-authored-by: DJCheesusReal <134006619+DJCheesusReal@users.noreply.github.com>

---------

Co-authored-by: Truman Gao <106889354+tdgao@users.noreply.github.com>
Co-authored-by: DJCheesusReal <134006619+DJCheesusReal@users.noreply.github.com>

apps/app-frontend/src/components/ui/world/InstanceItem.vue

@@ -27,10 +27,10 @@ import { useRouter } from 'vue-router'
 import { trackEvent } from '@/helpers/analytics'
 import { get_project } from '@/helpers/cache'
 import { process_listener } from '@/helpers/events'
-import { get_by_profile_path } from '@/helpers/process'
-import { kill, run } from '@/helpers/profile'
+import { kill, run } from '@/helpers/instance'
+import { get_by_instance_id } from '@/helpers/process'
 import type { GameInstance } from '@/helpers/types'
-import { showProfileInFolder } from '@/helpers/utils'
+import { showInstanceInFolder } from '@/helpers/utils'
 import { handleSevereError } from '@/store/error'
 
 const { handleError } = injectNotificationManager()
@@ -52,13 +52,13 @@ const props = defineProps<{
 	last_played: Dayjs
 }>()
 
-const loadingModpack = ref(!!props.instance.linked_data)
+const loadingModpack = ref(!!props.instance.link)
 
 const modpack = ref()
 
-if (props.instance.linked_data) {
+if (props.instance.link) {
 	nextTick().then(async () => {
-		modpack.value = await get_project(props.instance.linked_data?.project_id, 'must_revalidate')
+		modpack.value = await get_project(props.instance.link?.project_id, 'must_revalidate')
 		loadingModpack.value = false
 	})
 }
@@ -81,8 +81,8 @@ const playing = ref(false)
 const play = async (event: MouseEvent) => {
 	event?.stopPropagation()
 	loading.value = true
-	await run(props.instance.path)
-		.catch((err) => handleSevereError(err, { profilePath: props.instance.path }))
+	await run(props.instance.id)
+		.catch((err) => handleSevereError(err, { instanceId: props.instance.id }))
 		.finally(() => {
 			trackEvent('InstanceStart', {
 				loader: props.instance.loader,
@@ -97,7 +97,7 @@ const play = async (event: MouseEvent) => {
 const stop = async (event: MouseEvent) => {
 	event?.stopPropagation()
 	loading.value = true
-	await kill(props.instance.path).catch(handleError)
+	await kill(props.instance.id).catch(handleError)
 	trackEvent('InstanceStop', {
 		loader: props.instance.loader,
 		game_version: props.instance.game_version,
@@ -112,7 +112,7 @@ const unlistenProcesses = await process_listener(async () => {
 })
 
 const checkProcess = async () => {
-	const runningProcesses = await get_by_profile_path(props.instance.path).catch(handleError)
+	const runningProcesses = await get_by_instance_id(props.instance.id).catch(handleError)
 
 	playing.value = runningProcesses.length > 0
 }
@@ -130,7 +130,7 @@ onUnmounted(() => {
 		<template #clickable>
 			<router-link
 				class="no-click-animation"
-				:to="`/instance/${encodeURIComponent(instance.path)}`"
+				:to="`/instance/${encodeURIComponent(instance.id)}`"
 			/>
 		</template>
 		<div
@@ -138,7 +138,7 @@ onUnmounted(() => {
 		>
 			<Avatar
 				:src="instanceIcon ? convertFileSrc(instanceIcon) : undefined"
-				:tint-by="instance.path"
+				:tint-by="instance.id"
 				size="48px"
 			/>
 			<div class="flex flex-col col-span-2 justify-between h-full">
@@ -206,12 +206,12 @@ onUnmounted(() => {
 						:options="[
 							{
 								id: 'open-instance',
-								shown: !!instance.path,
-								action: () => router.push(encodeURI(`/instance/${instance.path}`)),
+								shown: !!instance.id,
+								action: () => router.push(encodeURI(`/instance/${instance.id}`)),
 							},
 							{
 								id: 'open-folder',
-								action: () => showProfileInFolder(instance.path),
+								action: () => showInstanceInFolder(instance.id),
 							},
 						]"
 					>

apps/app-frontend/src/components/ui/world/RecentWorldsList.vue

@@ -10,13 +10,13 @@ import { computed, onMounted, onUnmounted, ref, watch } from 'vue'
 import InstanceItem from '@/components/ui/world/InstanceItem.vue'
 import WorldItem from '@/components/ui/world/WorldItem.vue'
 import { trackEvent } from '@/helpers/analytics'
-import { process_listener, profile_listener } from '@/helpers/events'
+import { instance_listener, process_listener } from '@/helpers/events'
+import { kill, run } from '@/helpers/instance'
 import { get_all } from '@/helpers/process'
-import { kill, run } from '@/helpers/profile'
 import { get_game_versions } from '@/helpers/tags'
 import type { GameInstance } from '@/helpers/types'
 import {
-	get_profile_protocol_version,
+	get_instance_protocol_version,
 	get_recent_worlds,
 	getWorldIdentifier,
 	hasServerQuickPlaySupport,
@@ -27,7 +27,7 @@ import {
 	type ServerWorld,
 	start_join_server,
 	start_join_singleplayer_world,
-	type WorldWithProfile,
+	type WorldWithInstance,
 } from '@/helpers/worlds.ts'
 import { handleSevereError } from '@/store/error'
 import { useTheming } from '@/store/theme.ts'
@@ -66,7 +66,7 @@ type InstanceJumpBackInItem = BaseJumpBackInItem & {
 
 type WorldJumpBackInItem = BaseJumpBackInItem & {
 	type: 'world'
-	world: WorldWithProfile
+	world: WorldWithInstance
 }
 
 type JumpBackInItem = InstanceJumpBackInItem | WorldJumpBackInItem
@@ -100,7 +100,7 @@ async function populateJumpBackIn() {
 		const worlds = await get_recent_worlds(MAX_JUMP_BACK_IN, ['normal', 'favorite'])
 
 		worlds.forEach((world) => {
-			const instance = props.recentInstances.find((instance) => instance.path === world.profile)
+			const instance = props.recentInstances.find((instance) => instance.id === world.instance_id)
 
 			if (!instance || !world.last_played) {
 				return
@@ -115,23 +115,23 @@ async function populateJumpBackIn() {
 		})
 
 		const servers: {
-			instancePath: string
+			instanceId: string
 			address: string
 		}[] = worldItems
 			.filter((item) => item.world.type === 'server' && item.instance)
 			.map((item) => ({
-				instancePath: item.instance.path,
+				instanceId: item.instance.id,
 				address: (item.world as ServerWorld).address,
 			}))
 
 		// fetch protocol versions for all unique MC versions with server worlds
-		const uniqueServerInstances = new Set<string>(servers.map((x) => x.instancePath))
+		const uniqueServerInstances = new Set<string>(servers.map((x) => x.instanceId))
 		await Promise.all(
-			[...uniqueServerInstances].map((path) =>
-				get_profile_protocol_version(path)
-					.then((protoVer) => (protocolVersions.value[path] = protoVer))
+			[...uniqueServerInstances].map((instanceId) =>
+				get_instance_protocol_version(instanceId)
+					.then((protoVer) => (protocolVersions.value[instanceId] = protoVer))
 					.catch(() => {
-						console.error(`Failed to get profile protocol for: ${path} `)
+						console.error(`Failed to get instance protocol for: ${instanceId} `)
 					}),
 			),
 		)
@@ -145,14 +145,14 @@ async function populateJumpBackIn() {
 			}
 		})
 
-		servers.forEach(({ instancePath, address }) =>
-			refreshServerData(serverData.value[address], protocolVersions.value[instancePath], address),
+		servers.forEach(({ instanceId, address }) =>
+			refreshServerData(serverData.value[address], protocolVersions.value[instanceId], address),
 		)
 	}
 
 	const instanceItems: InstanceJumpBackInItem[] = []
 	for (const instance of props.recentInstances) {
-		const worldItem = worldItems.find((item) => item.instance.path === instance.path)
+		const worldItem = worldItems.find((item) => item.instance.id === instance.id)
 		if ((worldItem && worldItem.last_played.isAfter(TWO_WEEKS_AGO)) || !instance.last_played) {
 			continue
 		}
@@ -171,14 +171,14 @@ async function populateJumpBackIn() {
 		.slice(0, MAX_JUMP_BACK_IN)
 }
 
-function refreshServer(address: string, instancePath: string) {
-	refreshServerData(serverData.value[address], protocolVersions.value[instancePath], address)
+function refreshServer(address: string, instanceId: string) {
+	refreshServerData(serverData.value[address], protocolVersions.value[instanceId], address)
 }
 
-async function joinWorld(world: WorldWithProfile, instance?: GameInstance) {
+async function joinWorld(world: WorldWithInstance, instance?: GameInstance) {
 	console.log(`Joining world ${getWorldIdentifier(world)}`)
 	if (world.type === 'server') {
-		await start_join_server(world.profile, world.address).catch(handleError)
+		await start_join_server(world.instance_id, world.address).catch(handleError)
 		if (instance) {
 			trackEvent('InstanceStart', {
 				loader: instance.loader,
@@ -187,13 +187,13 @@ async function joinWorld(world: WorldWithProfile, instance?: GameInstance) {
 			})
 		}
 	} else if (world.type === 'singleplayer') {
-		await start_join_singleplayer_world(world.profile, world.path).catch(handleError)
+		await start_join_singleplayer_world(world.instance_id, world.path).catch(handleError)
 	}
 }
 
 async function playInstance(instance: GameInstance) {
-	await run(instance.path)
-		.catch((err) => handleSevereError(err, { profilePath: instance.path }))
+	await run(instance.id)
+		.catch((err) => handleSevereError(err, { instanceId: instance.id }))
 		.finally(() => {
 			trackEvent('InstanceStart', {
 				loader: instance.loader,
@@ -210,14 +210,14 @@ async function stopInstance(path: string) {
 	})
 }
 
-const currentProfile = ref<string>()
+const currentInstance = ref<string>()
 const currentWorld = ref<string>()
 
 const unlistenProcesses = await process_listener(async () => {
 	await checkProcesses()
 })
 
-const unlistenProfiles = await profile_listener(async () => {
+const unlistenInstances = await instance_listener(async () => {
 	await populateJumpBackIn().catch(() => {
 		console.error('Failed to populate jump back in')
 	})
@@ -227,18 +227,18 @@ const runningInstances = ref<string[]>([])
 
 type ProcessMetadata = {
 	uuid: string
-	profile_path: string
+	instance_id: string
 	start_time: string
 }
 
 const checkProcesses = async () => {
 	const runningProcesses: ProcessMetadata[] = await get_all().catch(handleError)
 
-	const runningPaths = runningProcesses.map((x) => x.profile_path)
+	const runningPaths = runningProcesses.map((x) => x.instance_id)
 
 	const stoppedInstances = runningInstances.value.filter((x) => !runningPaths.includes(x))
-	if (currentProfile.value && stoppedInstances.includes(currentProfile.value)) {
-		currentProfile.value = undefined
+	if (currentInstance.value && stoppedInstances.includes(currentInstance.value)) {
+		currentInstance.value = undefined
 		currentWorld.value = undefined
 	}
 
@@ -252,7 +252,7 @@ onMounted(() => {
 
 onUnmounted(() => {
 	unlistenProcesses()
-	unlistenProfiles()
+	unlistenInstances()
 })
 </script>
 
@@ -278,14 +278,14 @@ onUnmounted(() => {
 		<div class="grid-when-huge flex flex-col w-full gap-2">
 			<template
 				v-for="item in jumpBackInItems"
-				:key="`${item.instance.path}-${item.type === 'world' ? getWorldIdentifier(item.world) : 'instance'}`"
+				:key="`${item.instance.id}-${item.type === 'world' ? getWorldIdentifier(item.world) : 'instance'}`"
 			>
 				<WorldItem
 					v-if="item.type === 'world'"
 					:world="item.world"
-					:playing-instance="runningInstances.includes(item.instance.path)"
+					:playing-instance="runningInstances.includes(item.instance.id)"
 					:playing-world="
-						currentProfile === item.instance.path && currentWorld === getWorldIdentifier(item.world)
+						currentInstance === item.instance.id && currentWorld === getWorldIdentifier(item.world)
 					"
 					:refreshing="
 						item.world.type === 'server'
@@ -306,34 +306,34 @@ onUnmounted(() => {
 					:rendered-motd="
 						item.world.type === 'server' ? serverData[item.world.address].renderedMotd : undefined
 					"
-					:current-protocol="protocolVersions[item.instance.path]"
+					:current-protocol="protocolVersions[item.instance.id]"
 					:game-mode="
 						item.world.type === 'singleplayer' ? GAME_MODES[item.world.game_mode] : undefined
 					"
-					:instance-path="item.instance.path"
+					:instance-id="item.instance.id"
 					:instance-name="item.instance.name"
 					:instance-icon="item.instance.icon_path"
 					@refresh="
 						() =>
 							item.world.type === 'server'
-								? refreshServer(item.world.address, item.instance.path)
+								? refreshServer(item.world.address, item.instance.id)
 								: {}
 					"
 					@update="() => populateJumpBackIn()"
 					@play="
 						() => {
-							currentProfile = item.instance.path
+							currentInstance = item.instance.id
 							currentWorld = getWorldIdentifier(item.world)
 							joinWorld(item.world, item.instance)
 						}
 					"
 					@play-instance="
 						() => {
-							currentProfile = item.instance.path
+							currentInstance = item.instance.id
 							playInstance(item.instance)
 						}
 					"
-					@stop="() => stopInstance(item.instance.path)"
+					@stop="() => stopInstance(item.instance.id)"
 				/>
 				<InstanceItem v-else :instance="item.instance" :last_played="item.last_played" />
 			</template>

apps/app-frontend/src/components/ui/world/WorldItem.vue

@@ -2,6 +2,7 @@
 import {
 	ClipboardCopyIcon,
 	EditIcon,
+	ExternalIcon,
 	EyeIcon,
 	FolderOpenIcon,
 	IssuesIcon,
@@ -23,6 +24,7 @@ import {
 	ButtonStyled,
 	commonMessages,
 	defineMessages,
+	injectNotificationManager,
 	OverflowMenu,
 	SmartClickable,
 	TagItem,
@@ -39,7 +41,7 @@ import type { Component } from 'vue'
 import { computed } from 'vue'
 import { useRouter } from 'vue-router'
 
-import { copyToClipboard } from '@/helpers/utils'
+import { copyToClipboard, createInstanceShortcut } from '@/helpers/utils'
 import type {
 	ProtocolVersion,
 	ServerStatus,
@@ -60,6 +62,7 @@ const formatDateTime = useFormatDateTime({
 })
 
 const router = useRouter()
+const { addNotification } = injectNotificationManager()
 
 const emit = defineEmits<{
 	(e: 'play' | 'play-instance' | 'update' | 'stop' | 'refresh' | 'edit' | 'delete'): void
@@ -91,9 +94,10 @@ const props = withDefaults(
 		managed?: boolean
 
 		// Instance
-		instancePath?: string
+		instanceId?: string
 		instanceName?: string
 		instanceIcon?: string
+		shortcutInstanceId?: string
 	}>(),
 	{
 		playingInstance: false,
@@ -110,9 +114,10 @@ const props = withDefaults(
 		gameMode: undefined,
 		managed: false,
 
-		instancePath: undefined,
+		instanceId: undefined,
 		instanceName: undefined,
 		instanceIcon: undefined,
+		shortcutInstanceId: undefined,
 	},
 )
 
@@ -131,6 +136,33 @@ const serverIncompatible = computed(
 
 const locked = computed(() => props.world.type === 'singleplayer' && props.world.locked)
 const managed = computed(() => props.managed)
+const shortcutInstanceId = computed(() => props.shortcutInstanceId ?? props.instanceId)
+
+async function createShortcut() {
+	if (!shortcutInstanceId.value) return
+
+	try {
+		const shortcutPath = await createInstanceShortcut(
+			props.world.name,
+			shortcutInstanceId.value,
+			props.world.type === 'server'
+				? { server: (props.world as ServerWorld).address }
+				: { singleplayerWorld: (props.world as SingleplayerWorld).path },
+		)
+		if (!shortcutPath) return
+
+		addNotification({
+			type: 'success',
+			title: 'Shortcut created',
+		})
+	} catch (error) {
+		addNotification({
+			type: 'error',
+			title: 'Failed to create shortcut',
+			text: error instanceof Error ? error.message : '',
+		})
+	}
+}
 
 const messages = defineMessages({
 	hardcore: {
@@ -185,6 +217,10 @@ const messages = defineMessages({
 		id: 'instance.worlds.dont_show_on_home',
 		defaultMessage: `Don't show on Home`,
 	},
+	createShortcut: {
+		id: 'instance.worlds.create_shortcut',
+		defaultMessage: 'Create shortcut',
+	},
 	linkedServer: {
 		id: 'instance.worlds.linked_server',
 		defaultMessage: 'Managed by server project',
@@ -209,10 +245,10 @@ const messages = defineMessages({
 </script>
 <template>
 	<SmartClickable>
-		<template v-if="instancePath" #clickable>
+		<template v-if="instanceId" #clickable>
 			<router-link
 				class="no-click-animation"
-				:to="`/instance/${encodeURIComponent(instancePath)}/worlds?highlight=${encodeURIComponent(getWorldIdentifier(world))}`"
+				:to="`/instance/${encodeURIComponent(instanceId)}/worlds?highlight=${encodeURIComponent(getWorldIdentifier(world))}`"
 			/>
 		</template>
 		<div
@@ -324,16 +360,16 @@ const messages = defineMessages({
 						</template>
 						<template v-else> {{ formatMessage(messages.notPlayedYet) }} </template>
 					</div>
-					<template v-if="instancePath">
+					<template v-if="instanceId">
 						•
 						<router-link
 							class="flex items-center gap-1 truncate hover:underline text-secondary smart-clickable:allow-pointer-events"
-							:to="`/instance/${instancePath}`"
+							:to="`/instance/${instanceId}`"
 						>
 							<Avatar
 								:src="instanceIcon ? convertFileSrc(instanceIcon) : undefined"
 								size="16px"
-								:tint-by="instancePath"
+								:tint-by="instanceId"
 								class="shrink-0"
 							/>
 							<span class="truncate">{{ instanceName }}</span>
@@ -420,14 +456,14 @@ const messages = defineMessages({
 						:options="[
 							{
 								id: 'play-instance',
-								shown: !!instancePath,
+								shown: !!instanceId,
 								disabled: playingInstance,
 								action: () => emit('play-instance'),
 							},
 							{
 								id: 'open-instance',
-								shown: !!instancePath,
-								action: () => router.push(encodeURI(`/instance/${instancePath}`)),
+								shown: !!instanceId,
+								action: () => router.push(`/instance/${encodeURIComponent(instanceId)}`),
 							},
 							{
 								id: 'refresh',
@@ -442,7 +478,7 @@ const messages = defineMessages({
 							{
 								id: 'edit',
 								action: () => emit('edit'),
-								shown: !instancePath,
+								shown: !instanceId,
 								disabled: locked || managed,
 								tooltip: locked
 									? formatMessage(messages.worldInUse)
@@ -457,14 +493,14 @@ const messages = defineMessages({
 							},
 							{
 								divider: true,
-								shown: !!instancePath,
+								shown: !!instanceId,
 							},
 							{
 								id: 'dont-show-on-home',
-								shown: !!instancePath,
+								shown: !!instanceId,
 								action: () => {
 									set_world_display_status(
-										instancePath,
+										instanceId,
 										world.type,
 										getWorldIdentifier(world),
 										'hidden',
@@ -473,16 +509,21 @@ const messages = defineMessages({
 									})
 								},
 							},
+							{
+								id: 'create-shortcut',
+								shown: !!shortcutInstanceId,
+								action: () => createShortcut(),
+							},
 							{
 								divider: true,
-								shown: !instancePath,
+								shown: !instanceId,
 							},
 							{
 								id: 'delete',
 								color: 'red',
 								hoverFilled: true,
 								action: () => emit('delete'),
-								shown: !instancePath,
+								shown: !instanceId,
 								disabled: locked || managed,
 								tooltip: locked
 									? formatMessage(messages.worldInUse)
@@ -517,6 +558,10 @@ const messages = defineMessages({
 							<UpdatedIcon aria-hidden="true" />
 							{{ formatMessage(commonMessages.refreshButton) }}
 						</template>
+						<template #create-shortcut>
+							<ExternalIcon aria-hidden="true" />
+							{{ formatMessage(messages.createShortcut) }}
+						</template>
 						<template #dont-show-on-home>
 							<XIcon aria-hidden="true" />
 							{{ formatMessage(messages.dontShowOnHome) }}

apps/app-frontend/src/components/ui/world/modal/AddServerModal.vue

@@ -12,7 +12,11 @@ import { ref } from 'vue'
 
 import ServerModalBody from '@/components/ui/world/modal/ServerModalBody.vue'
 import type { GameInstance } from '@/helpers/types'
-import { add_server_to_profile, type ServerPackStatus, type ServerWorld } from '@/helpers/worlds.ts'
+import {
+	add_server_to_instance,
+	type ServerPackStatus,
+	type ServerWorld,
+} from '@/helpers/worlds.ts'
 
 const { handleError } = injectNotificationManager()
 const { formatMessage } = useVIntl()
@@ -35,8 +39,8 @@ async function addServer(play: boolean) {
 	const serverName = name.value ? name.value : address.value
 	const resourcePackStatus = resourcePack.value
 	const index =
-		(await add_server_to_profile(
-			props.instance.path,
+		(await add_server_to_instance(
+			props.instance.id,
 			serverName,
 			address.value,
 			resourcePackStatus,

apps/app-frontend/src/components/ui/world/modal/ConfirmRemoveWorldModal.vue

@@ -0,0 +1,124 @@
+<script setup lang="ts">
+import { TrashIcon, XIcon } from '@modrinth/assets'
+import {
+	Admonition,
+	ButtonStyled,
+	commonMessages,
+	defineMessages,
+	NewModal,
+	useVIntl,
+} from '@modrinth/ui'
+import { computed, ref } from 'vue'
+
+import type { World } from '@/helpers/worlds.ts'
+
+const { formatMessage } = useVIntl()
+
+const props = defineProps<{
+	world: World | null
+}>()
+
+const emit = defineEmits<{
+	confirm: [world: World]
+}>()
+
+const messages = defineMessages({
+	removeServerTitle: {
+		id: 'app.instance.worlds.remove-server-modal.title',
+		defaultMessage: 'Remove server',
+	},
+	deleteWorldTitle: {
+		id: 'app.instance.worlds.delete-world-modal.title',
+		defaultMessage: 'Delete world',
+	},
+	removeServerWarningHeader: {
+		id: 'app.instance.worlds.remove-server-modal.warning-header',
+		defaultMessage: 'Removing {name}',
+	},
+	deleteWorldWarningHeader: {
+		id: 'app.instance.worlds.delete-world-modal.warning-header',
+		defaultMessage: 'Deleting {name}',
+	},
+	removeServerWarningBody: {
+		id: 'app.instance.worlds.remove-server-modal.warning-body',
+		defaultMessage:
+			'This server will be removed from your server list and from the in-game server list. You can add it again later if you know the address.',
+	},
+	deleteWorldWarningBody: {
+		id: 'app.instance.worlds.delete-world-modal.warning-body',
+		defaultMessage:
+			'This world will be permanently deleted from this instance. This action cannot be undone.',
+	},
+	removeServerButton: {
+		id: 'app.instance.worlds.remove-server-modal.remove-button',
+		defaultMessage: 'Remove server',
+	},
+	deleteWorldButton: {
+		id: 'app.instance.worlds.delete-world-modal.delete-button',
+		defaultMessage: 'Delete world',
+	},
+})
+
+const modal = ref<InstanceType<typeof NewModal>>()
+
+const isServer = computed(() => props.world?.type === 'server')
+const isSingleplayer = computed(() => props.world?.type === 'singleplayer')
+const titleMessage = computed(() =>
+	isServer.value ? messages.removeServerTitle : messages.deleteWorldTitle,
+)
+const actionMessage = computed(() =>
+	isServer.value ? messages.removeServerButton : messages.deleteWorldButton,
+)
+const warningHeaderMessage = computed(() =>
+	isServer.value ? messages.removeServerWarningHeader : messages.deleteWorldWarningHeader,
+)
+const warningBodyMessage = computed(() =>
+	isServer.value ? messages.removeServerWarningBody : messages.deleteWorldWarningBody,
+)
+
+function show() {
+	modal.value?.show()
+}
+
+function hide() {
+	modal.value?.hide()
+}
+
+function confirm() {
+	if (!props.world) return
+	emit('confirm', props.world)
+	hide()
+}
+
+defineExpose({ show, hide })
+</script>
+
+<template>
+	<NewModal ref="modal" :header="formatMessage(titleMessage)" fade="danger" max-width="500px">
+		<div class="flex flex-col gap-4">
+			<Admonition
+				type="critical"
+				:header="formatMessage(warningHeaderMessage, { name: world?.name })"
+			>
+				{{ formatMessage(warningBodyMessage) }}
+			</Admonition>
+		</div>
+
+		<template #actions>
+			<div class="flex gap-2 justify-end">
+				<ButtonStyled type="outlined">
+					<button @click="hide">
+						<XIcon />
+						{{ formatMessage(commonMessages.cancelButton) }}
+					</button>
+				</ButtonStyled>
+				<ButtonStyled color="red">
+					<button :disabled="!isServer && !isSingleplayer" @click="confirm">
+						<TrashIcon />
+						{{ formatMessage(actionMessage) }}
+					</button>
+				</ButtonStyled>
+			</div>
+		</template>
+	</NewModal>
+</template>

apps/app-frontend/src/components/ui/world/modal/EditServerModal.vue

@@ -15,7 +15,7 @@ import ServerModalBody from '@/components/ui/world/modal/ServerModalBody.vue'
 import type { GameInstance } from '@/helpers/types'
 import {
 	type DisplayStatus,
-	edit_server_in_profile,
+	edit_server_in_instance,
 	type ServerPackStatus,
 	type ServerWorld,
 	set_world_display_status,
@@ -46,8 +46,8 @@ const newDisplayStatus = computed(() => (hideFromHome.value ? 'hidden' : 'normal
 async function saveServer() {
 	const serverName = name.value ? name.value : address.value
 	const resourcePackStatus = resourcePack.value
-	await edit_server_in_profile(
-		props.instance.path,
+	await edit_server_in_instance(
+		props.instance.id,
 		index.value,
 		serverName,
 		address.value,
@@ -56,7 +56,7 @@ async function saveServer() {
 
 	if (newDisplayStatus.value !== displayStatus.value) {
 		await set_world_display_status(
-			props.instance.path,
+			props.instance.id,
 			'server',
 			address.value,
 			newDisplayStatus.value,

apps/app-frontend/src/components/ui/world/modal/EditSingleplayerWorldModal.vue

@@ -40,14 +40,14 @@ const hideFromHome = ref(false)
 const newDisplayStatus = computed(() => (hideFromHome.value ? 'hidden' : 'normal'))
 
 async function saveWorld() {
-	await rename_world(props.instance.path, path.value, name.value).catch(handleError)
+	await rename_world(props.instance.id, path.value, name.value).catch(handleError)
 
 	if (removeIcon.value) {
-		await reset_world_icon(props.instance.path, path.value).catch(handleError)
+		await reset_world_icon(props.instance.id, path.value).catch(handleError)
 	}
 	if (newDisplayStatus.value !== displayStatus.value) {
 		await set_world_display_status(
-			props.instance.path,
+			props.instance.id,
 			'singleplayer',
 			path.value,
 			newDisplayStatus.value,