Merge pull request #180 from LCE-Hub/main

merge main into diamond

src/components/common/ClickParticles.tsx

@@ -1,4 +1,5 @@
 import React, { useEffect, useState } from "react";
+import { useConfig } from "../../context/LauncherContext";
 
 const SGA_CHARS = "abcdefghijklmnopqrstuvwxyz".split("");
 
@@ -15,7 +16,11 @@ interface Particle {
 export const ClickParticles: React.FC = React.memo(() => {
   const [bursts, setBursts] = useState<Particle[]>([]);
 
+  const { animationsEnabled } = useConfig();
+
   useEffect(() => {
+    if (!animationsEnabled) return;
+
     const handlePressSound = (e: MouseEvent) => {
       const newParticles: Particle[] = [];
       const particleCount = 8;
@@ -40,8 +45,14 @@ export const ClickParticles: React.FC = React.memo(() => {
 
     window.addEventListener("mousedown", handlePressSound);
     return () => window.removeEventListener("mousedown", handlePressSound);
-  }, []);
+    }, [animationsEnabled]);
 
+    useEffect(() => {
+      if (!animationsEnabled) {
+        setBursts([]);
+      }
+    }, [animationsEnabled])
+    
   return (
     <div className="fixed inset-0 pointer-events-none z-[9999] overflow-hidden">
       {bursts.map((p) => (

src/context/LauncherContext.tsx

@@ -7,6 +7,7 @@ import { useSkinSync } from "../hooks/useSkinSync";
 import { useDiscordRPC } from "../hooks/useDiscordRPC";
 import { useGamepad } from "../hooks/useGamepad";
 import { useUpdateCheck } from "../hooks/useUpdateCheck";
+import RpcService from "../services/RpcService";
 
 interface UIContextType {
   activeView: string;
@@ -161,8 +162,11 @@ export function LauncherProvider({ children }: { children: React.ReactNode }) {
     const setupVisibilityDetection = async () => {
       try {
         const { listen } = await import("@tauri-apps/api/event");
-        const unlistenClose = await listen("tauri://close-requested", () => {
+        const unlistenClose = await listen("tauri://close-requested", async () => {
           setIsWindowVisible(false);
+          if (config.rpcEnabled) {
+            await RpcService.StopRPC();
+          }
         });
 
         const unlistenShow = await listen("tauri://window-shown", () => {
@@ -190,7 +194,7 @@ export function LauncherProvider({ children }: { children: React.ReactNode }) {
     };
 
     setupVisibilityDetection();
-  }, []);
+  }, [config.rpcEnabled]);
 
   const uiValue = useMemo(() => ({
     activeView, setActiveView, showIntro, setShowIntro,

src/services/RpcService.ts

@@ -1,4 +1,4 @@
-import { setActivity, start } from "tauri-plugin-drpc";
+import { setActivity, start, clearActivity, stop } from "tauri-plugin-drpc";
 import {
   Activity,
   ActivityType,
@@ -72,6 +72,19 @@ class RPC {
       console.error("Failed to set RPC activity:", e);
     }
   }
+
+  public async StopRPC() {
+      try {
+        await clearActivity();
+        await stop();
+      } catch (e) {
+        // no need to handle errors here as the launcher will close anyways!
+      } finally {
+        this.initialized = false;
+        this.initializationPromise = null;
+        sessionStorage.removeItem("lce_rpc_started");
+      }
+  }
 }
 
 export default new RPC();