Merge pull request #17 from saturnclientmc/added-versions
Tauri Release Build / Build (ubuntu-latest) (release) Failing after 1m53s
Tauri Release Build / Build (macos-latest) (release) Canceled after 0s
Tauri Release Build / Build (windows-latest) (release) Canceled after 0s
Tauri Release Build / Upload to GitHub Release (release) Canceled after 0s
Tauri Release Build / Build (ubuntu-latest) (release) Failing after 1m53s
Tauri Release Build / Build (macos-latest) (release) Canceled after 0s
Tauri Release Build / Build (windows-latest) (release) Canceled after 0s
Tauri Release Build / Upload to GitHub Release (release) Canceled after 0s
Added versions
This commit is contained in:
+1
-1
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"name": "saturn-launcher",
|
"name": "saturn-launcher",
|
||||||
"private": true,
|
"private": true,
|
||||||
"version": "0.1.1",
|
"version": "0.1.3",
|
||||||
"type": "module",
|
"type": "module",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"dev": "vite",
|
"dev": "vite",
|
||||||
|
|||||||
Generated
+1
-1
@@ -3887,7 +3887,7 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "saturn-launcher"
|
name = "saturn-launcher"
|
||||||
version = "0.1.1"
|
version = "0.1.3"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"futures",
|
"futures",
|
||||||
"lyceris",
|
"lyceris",
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
[package]
|
[package]
|
||||||
name = "saturn-launcher"
|
name = "saturn-launcher"
|
||||||
version = "0.1.1"
|
version = "0.1.3"
|
||||||
description = "A minecraft launcher for Saturn Client"
|
description = "A minecraft launcher for Saturn Client"
|
||||||
authors = ["SaturnClient"]
|
authors = ["SaturnClient"]
|
||||||
edition = "2021"
|
edition = "2021"
|
||||||
|
|||||||
@@ -53,7 +53,7 @@ impl Default for AppState {
|
|||||||
max_memory: 2048,
|
max_memory: 2048,
|
||||||
features: FeatureSettings::default(),
|
features: FeatureSettings::default(),
|
||||||
},
|
},
|
||||||
version: String::from("1.21.6"),
|
version: String::from("1.21.11"),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"$schema": "https://schema.tauri.app/config/2",
|
"$schema": "https://schema.tauri.app/config/2",
|
||||||
"productName": "saturn-launcher",
|
"productName": "saturn-launcher",
|
||||||
"version": "0.1.1",
|
"version": "0.1.3",
|
||||||
"identifier": "org.saturnclient.saturn-launcher",
|
"identifier": "org.saturnclient.saturn-launcher",
|
||||||
"build": {
|
"build": {
|
||||||
"beforeDevCommand": "npm run dev",
|
"beforeDevCommand": "npm run dev",
|
||||||
@@ -12,7 +12,7 @@
|
|||||||
"app": {
|
"app": {
|
||||||
"windows": [
|
"windows": [
|
||||||
{
|
{
|
||||||
"title": "Saturn Launcher v0.1.1",
|
"title": "Saturn Launcher v0.1.3",
|
||||||
"width": 1000,
|
"width": 1000,
|
||||||
"height": 650,
|
"height": 650,
|
||||||
"backgroundColor": "#0a0a0a",
|
"backgroundColor": "#0a0a0a",
|
||||||
|
|||||||
@@ -22,6 +22,7 @@ import { motion, AnimatePresence } from "framer-motion";
|
|||||||
import { GameVersion, Mod } from "@/lib/types";
|
import { GameVersion, Mod } from "@/lib/types";
|
||||||
import { versions } from "@/lib/launcher";
|
import { versions } from "@/lib/launcher";
|
||||||
import toast from "react-hot-toast";
|
import toast from "react-hot-toast";
|
||||||
|
import { useRef } from "react";
|
||||||
|
|
||||||
function cn(...inputs: ClassValue[]) {
|
function cn(...inputs: ClassValue[]) {
|
||||||
return twMerge(clsx(inputs));
|
return twMerge(clsx(inputs));
|
||||||
@@ -44,18 +45,21 @@ const ModsSection: React.FC<ModsSectionProps> = ({ version }) => {
|
|||||||
string[]
|
string[]
|
||||||
>([]);
|
>([]);
|
||||||
|
|
||||||
|
const requestIdRef = useRef(0);
|
||||||
|
|
||||||
const loadMods = async () => {
|
const loadMods = async () => {
|
||||||
|
const requestId = ++requestIdRef.current;
|
||||||
|
|
||||||
if (activeTab === "installed") {
|
if (activeTab === "installed") {
|
||||||
const m = await getInstalledMods(version.id);
|
const m = await getInstalledMods(version.id);
|
||||||
setMods(m);
|
|
||||||
if (activeTab === "installed") {
|
if (requestId === requestIdRef.current) {
|
||||||
// Fix: If discover mods takes too long and the user switches tabs it glitches
|
|
||||||
setMods(m);
|
setMods(m);
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
const m = await discoverMods(searchQuery);
|
const m = await discoverMods(searchQuery);
|
||||||
if (activeTab === "discover") {
|
|
||||||
// Fix: If discover mods takes too long and the user switches tabs it glitches
|
if (requestId === requestIdRef.current) {
|
||||||
setMods(m);
|
setMods(m);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+28
-3
@@ -6,17 +6,42 @@ export const versions: GameVersion[] = [
|
|||||||
{
|
{
|
||||||
id: "1.21.4",
|
id: "1.21.4",
|
||||||
name: "Fabric 1.21.4",
|
name: "Fabric 1.21.4",
|
||||||
loader_version: "0.18.6",
|
loader_version: "0.19.0",
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
id: "1.21.5",
|
id: "1.21.5",
|
||||||
name: "Fabric 1.21.5",
|
name: "Fabric 1.21.5",
|
||||||
loader_version: "0.18.6",
|
loader_version: "0.19.0",
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
id: "1.21.6",
|
id: "1.21.6",
|
||||||
name: "Fabric 1.21.6",
|
name: "Fabric 1.21.6",
|
||||||
loader_version: "0.18.6",
|
loader_version: "0.19.0",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
id: "1.21.7",
|
||||||
|
name: "Fabric 1.21.7",
|
||||||
|
loader_version: "0.19.0",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
id: "1.21.8",
|
||||||
|
name: "Fabric 1.21.8",
|
||||||
|
loader_version: "0.19.0",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
id: "1.21.9",
|
||||||
|
name: "Fabric 1.21.9",
|
||||||
|
loader_version: "0.19.0",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
id: "1.21.10",
|
||||||
|
name: "Fabric 1.21.10",
|
||||||
|
loader_version: "0.19.0",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
id: "1.21.11",
|
||||||
|
name: "Fabric 1.21.11",
|
||||||
|
loader_version: "0.19.0",
|
||||||
},
|
},
|
||||||
];
|
];
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user