Abort amethyst completely if using a vanilla profile, don't show mods…

… list on vanilla profiles
FrederoxDev · Feb 13, 2024 · 5344525 · 5344525
1 parent 70c61f1
commit 5344525
Show file tree

Hide file tree

Showing 5 changed files with 41 additions and 28 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-launcher",
-  "version": "2.1.1-pre-release",
+  "version": "2.1.2",
   "main": "public/electron.js",
   "author": "FrederoxDev",
   "description": "AmethystLauncher",

diff --git a/proxy/dllmain.cpp b/proxy/dllmain.cpp
@@ -90,6 +90,11 @@ static void InjectIntoMinecraft(std::wstring& path)
 
 static void Proxy()
 {
+    std::wstring path = FindRuntimeDllPath();
+    if (path == L"Vanilla") {
+        return;
+    }
+
     Log::InitializeConsole();
     Log::Info("[AmethystProxy] Using 'AmethystProxy@{}'", PROXY_VERSION);
     Log::Info("[AmethystProxy] McThreadID: {}, McThreadHandle: {}", dMcThreadID, hMcThreadHandle);
@@ -120,12 +125,7 @@ static void Proxy()
     NtResumeThread = (NtResumeThreadPtr)_NtResumeThread;
 
     SuspendMinecraftThread();
-    std::wstring path = FindRuntimeDllPath();
-    if (path == L"Vanilla") {
-        ResumeMinecraftThread();
-        Log::Info("Playing Vanilla, no mods have been loaded...");
-        return;
-    }
+
 
     InjectIntoMinecraft(path);
 

diff --git a/public/proxy/dxgi.dll b/public/proxy/dxgi.dll
diff --git a/src/components/Title.tsx b/src/components/Title.tsx
@@ -3,7 +3,7 @@ export default function Header() {
         <>
             <div className="h-[42px] bg-[#E6E8EB] flex flex-col justify-center items-center">
                 <p className="minecraft-ten block translate-y-[6px]">Amethyst Launcher</p>
-                <p className="minecraft-seven block text-[12px] text-[#464749]">v2.1.1-pre-release</p>
+                <p className="minecraft-seven block text-[12px] text-[#464749]">v2.1.2</p>
             </div>
 
 

diff --git a/src/pages/ProfileEditor.tsx b/src/pages/ProfileEditor.tsx
@@ -35,7 +35,14 @@ export default function ProfileEditor() {
 
         return (
             <div onMouseEnter={() => setIsHovered(true)} onMouseLeave={() => setIsHovered(false)} 
-                onClick={() => toggleModActive(name)}  
+                onClick={() => {
+                    if (profileRuntime == "Vanilla") {
+                        alert("Cannot add mods to a vanilla profile");
+                        return;
+                    }
+
+                    toggleModActive(name);
+                }}  
             >
                 <DividedSection className="cursor-pointer" style={{ backgroundColor: isHovered ? "#5A5B5C" : "#48494A", padding: "1px", paddingLeft: "4px", paddingRight: "4px" }}>
                     <p className="minecraft-seven text-white">{ name }</p>
@@ -99,27 +106,33 @@ export default function ProfileEditor() {
             </DividedSection>
 
             {/* Mod Selection */}
-            <DividedSection className="flex-grow flex justify-around gap-[8px]">
-                <div className=" w-[50%] h-full flex flex-col">
-                    <p className="text-white minecraft-seven">Active Mods</p>
-                    <div className="border-[2px] border-[#1E1E1F] bg-[#313233] flex-grow">
-                        {
-                            allMods.length > 0 ? allMods.filter(mod => profileActiveMods.includes(mod))
-                                .map((mod, index) => <ModButton name={mod} key={index} />) : <></>
-                        }
+            {
+                profileRuntime === "Vanilla" 
+                ? <DividedSection className="flex-grow flex justify-around gap-[8px]">
+                    <div className="h-full flex flex-col"></div>
+                </DividedSection>
+                : <DividedSection className="flex-grow flex justify-around gap-[8px]">
+                    <div className=" w-[50%] h-full flex flex-col">
+                        <p className="text-white minecraft-seven">Active Mods</p>
+                        <div className="border-[2px] border-[#1E1E1F] bg-[#313233] flex-grow">
+                            {
+                                allMods.length > 0 ? allMods.filter(mod => profileActiveMods.includes(mod))
+                                    .map((mod, index) => <ModButton name={mod} key={index} />) : <></>
+                            }
+                        </div>
                     </div>
-                </div>
-                <div className=" w-[50%] h-full flex flex-col">
-                    <p className="text-white minecraft-seven">Inactive Mods</p>
-                    <div className="border-[2px] border-[#1E1E1F] bg-[#313233] flex-grow">
-                    {
-                            allMods.length > 0 ? allMods.filter(mod => !profileActiveMods.includes(mod))
-                                .map((mod, index) => <ModButton name={mod} key={index} />) : <></>
-                        }
+                    <div className=" w-[50%] h-full flex flex-col">
+                        <p className="text-white minecraft-seven">Inactive Mods</p>
+                        <div className="border-[2px] border-[#1E1E1F] bg-[#313233] flex-grow">
+                        {
+                                allMods.length > 0 ? allMods.filter(mod => !profileActiveMods.includes(mod))
+                                    .map((mod, index) => <ModButton name={mod} key={index} />) : <></>
+                            }
+                        </div>
                     </div>
-                </div>
-            </DividedSection>
-
+                </DividedSection>
+            }
+            
             {/* Profile Actions */}
             <DividedSection className="flex justify-around gap-[8px]">
                 <div className="w-[50%]"><MinecraftButton text="Save Profile" onClick={() => saveProfile()} /></div>