5 Commits

9 changed files with 43 additions and 30 deletions

View File

@@ -14,6 +14,7 @@
"@tauri-apps/plugin-dialog": "^2.4.0",
"@tauri-apps/plugin-fs": "^2.4.2",
"@tauri-apps/plugin-shell": "^2.3.1",
"@types/umami": "^2.10.1",
"animejs": "^4.1.3",
"buffer": "^6.0.3",
"crypto-js": "^4.2.0",
@@ -347,6 +348,8 @@
"@types/semver": ["@types/semver@7.7.1", "", {}, "sha512-FmgJfu+MOcQ370SD0ev7EI8TlCAfKYU+B4m5T3yXc1CiRN94g/SZPtsCkk506aUDtlMnFZvasDwHHUcZUEaYuA=="],
"@types/umami": ["@types/umami@2.10.1", "", {}, "sha512-CvOEMq+BFOUXj8yciq4hPsdOt0o9KBg5jQXnF1FrdOMKZMxJiwryyZNLa9Ud2NVO6nXSwU22YMKR3E+Xhbo+DA=="],
"@typescript-eslint/eslint-plugin": ["@typescript-eslint/eslint-plugin@8.42.0", "", { "dependencies": { "@eslint-community/regexpp": "^4.10.0", "@typescript-eslint/scope-manager": "8.42.0", "@typescript-eslint/type-utils": "8.42.0", "@typescript-eslint/utils": "8.42.0", "@typescript-eslint/visitor-keys": "8.42.0", "graphemer": "^1.4.0", "ignore": "^7.0.0", "natural-compare": "^1.4.0", "ts-api-utils": "^2.1.0" }, "peerDependencies": { "@typescript-eslint/parser": "^8.42.0", "eslint": "^8.57.0 || ^9.0.0", "typescript": ">=4.8.4 <6.0.0" } }, "sha512-Aq2dPqsQkxHOLfb2OPv43RnIvfj05nw8v/6n3B2NABIPpHnjQnaLo9QGMTvml+tv4korl/Cjfrb/BYhoL8UUTQ=="],
"@typescript-eslint/parser": ["@typescript-eslint/parser@8.42.0", "", { "dependencies": { "@typescript-eslint/scope-manager": "8.42.0", "@typescript-eslint/types": "8.42.0", "@typescript-eslint/typescript-estree": "8.42.0", "@typescript-eslint/visitor-keys": "8.42.0", "debug": "^4.3.4" }, "peerDependencies": { "eslint": "^8.57.0 || ^9.0.0", "typescript": ">=4.8.4 <6.0.0" } }, "sha512-r1XG74QgShUgXph1BYseJ+KZd17bKQib/yF3SR+demvytiRXrwd12Blnz5eYGm8tXaeRdd4x88MlfwldHoudGg=="],

View File

@@ -1,11 +1,11 @@
{
"name": "ezpplauncher",
"version": "3.0.5",
"version": "3.0.6",
"description": "",
"type": "module",
"scripts": {
"debug": "bun run tauri dev",
"build": "bun ./scripts/sync-version.ts && bun run tauri:build",
"build": "bun ./scripts/sync-version.ts && bun run vite:build && bun run tauri:build",
"vite:dev": "vite dev",
"vite:build": "vite build",
"tauri:build": "tauri build",
@@ -28,13 +28,14 @@
"@tauri-apps/plugin-dialog": "^2.4.0",
"@tauri-apps/plugin-fs": "^2.4.2",
"@tauri-apps/plugin-shell": "^2.3.1",
"@types/umami": "^2.10.1",
"animejs": "^4.1.3",
"buffer": "^6.0.3",
"crypto-js": "^4.2.0",
"lucide-svelte": "^0.542.0",
"semver": "^7.7.2",
"tw-animate-css": "^1.3.8",
"svelte-confetti": "^2.3.2"
"svelte-confetti": "^2.3.2",
"tw-animate-css": "^1.3.8"
},
"devDependencies": {
"@eslint/compat": "^1.3.2",

2
src-tauri/Cargo.lock generated
View File

@@ -1012,7 +1012,7 @@ dependencies = [
[[package]]
name = "ezpplauncher"
version = "3.0.5"
version = "3.0.6"
dependencies = [
"base64 0.22.1",
"discord-rich-presence",

View File

@@ -1,6 +1,6 @@
[package]
name = "ezpplauncher"
version = "3.0.5"
version = "3.0.6"
description = "EZPPLauncher redefined."
authors = ["HorizonCode"]
edition = "2024"

View File

@@ -1,7 +1,7 @@
{
"$schema": "https://schema.tauri.app/config/2",
"productName": "EZPPLauncher",
"version": "3.0.5",
"version": "3.0.6",
"identifier": "farm.EZPPFarm.Launcher",
"mainBinaryName": "ezpplauncher",
"build": {

View File

@@ -1,13 +1,15 @@
<!doctype html>
<html lang="en" class="dark">
<head>
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
<title>EZPPLauncher</title>
%sveltekit.head%
</head>
<body class="bg-theme-950" data-sveltekit-preload-data="hover">
<div style="display: contents">%sveltekit.body%</div>
</body>
</html>
<head>
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
<title>EZPPLauncher</title>
%sveltekit.head%
</head>
<body class="bg-theme-950" data-sveltekit-preload-data="hover">
<div style="display: contents">%sveltekit.body%</div>
</body>
</html>

View File

@@ -9,7 +9,7 @@ export function estimateRefreshRate(): Promise<number> {
if (now - last >= 1000) {
console.log(`Estimated Refresh Rate: ${frames - 2} FPS`);
resolve(frames - 2); // estimated Hz
resolve(frames - 2);
} else {
requestAnimationFrame(loop);
}

View File

@@ -1,10 +1,21 @@
<script lang="ts">
import { currentView } from '@/global';
import { currentView, launcherVersion } from '@/global';
import { fade } from 'svelte/transition';
const View = $derived($currentView);
</script>
<svelte:head>
{#if $launcherVersion !== ''}
<script
defer
src="https://analytics.ez-pp.farm/script.js"
data-website-id="b03f0013-64f0-42ce-85c0-abd56e8b3c64"
data-tag={$launcherVersion}
></script>
{/if}
</svelte:head>
{#key View}
<div in:fade={{ duration: 300 }}>
<View />

View File

@@ -114,11 +114,6 @@
const tabs = [
{ name: 'Home', key: 'home', show: true },
{
name: 'Skins',
key: 'skins',
show: false,
},
{
name: 'Settings',
key: 'settings',
@@ -182,6 +177,7 @@
};
const launch = async () => {
umami.track('app_launch_osu');
const osuRunning = await isOsuRunning();
if (osuRunning) {
toast.error('Hold on a second!', {
@@ -485,7 +481,7 @@
}
await runOsu(osuPath, true);
umami.track('app_exit_osu');
launchInfo = 'Cleaning up...';
await getCurrentWindow().show();
if (presenceUpdater) {
@@ -536,6 +532,7 @@
description: 'Failed to launch.',
});
launching.set(false);
umami.track('app_launch_fail', { error: err });
}
};
</script>
@@ -1035,11 +1032,12 @@
</div>
<Button
size="lg"
class="text-xl h-16 px-16 border-2 border-violet-500/40"
disabled={$launching || $osuInstallationPath === '' || $serverConnectionFails > 1}
onclick={launch}
>
<Play />
{$serverConnectionFails > 1 ? 'No connection' : 'Launch'}
<Play class="!size-5" />
{$launching ? 'Launching...' : $serverConnectionFails > 1 ? 'No connection' : 'Launch'}
</Button>
</div>
<div
@@ -1087,8 +1085,6 @@
</span>
</div>
</div>
{:else if selectedTab === 'skins'}
<p>list of skins here, option to set current skin (also a subpage to download new skins?)</p>
{:else if selectedTab === 'settings'}
<div
class="bg-theme-900/90 flex flex-col justify-center gap-3 border border-theme-800/90 rounded-lg"
@@ -1237,7 +1233,7 @@
label: 'Download .NET 8.0',
onClick: async () =>
await openURL(
'https://dotnet.microsoft.com/en-us/download/dotnet/thank-you/runtime-desktop-8.0.18-windows-x64-installer'
'https://dotnet.microsoft.com/en-us/download/dotnet/thank-you/runtime-desktop-8.0.22-windows-x64-installer'
),
},
});