fix: java downloading from cluster screen
This commit is contained in:
parent
a5d898b5d5
commit
087f36d6fc
4 changed files with 21 additions and 11 deletions
|
|
@ -74,6 +74,12 @@
|
|||
"deb": {
|
||||
"depends": [],
|
||||
"desktopTemplate": "../../packages/distribution/linux/org.polyfrost.launcher.desktop.template"
|
||||
},
|
||||
"rpm": {
|
||||
"desktopTemplate": "../../packages/distribution/linux/org.polyfrost.launcher.desktop.template"
|
||||
},
|
||||
"appimage": {
|
||||
|
||||
}
|
||||
},
|
||||
"shortDescription": "OneLauncher",
|
||||
|
|
|
|||
|
|
@ -41,7 +41,7 @@ function PageSettings(cluster: Accessor<Cluster>) {
|
|||
|
||||
// JVM
|
||||
const javaVersion = createSetting<bridge.JavaVersion | null>(cluster().java?.custom_version || null);
|
||||
const javaVersions = settings().java_versions;
|
||||
const javaVersions = createSetting(settings().java_versions);
|
||||
const javaArgs = createSetting(cluster().java?.custom_arguments, settings().custom_java_args);
|
||||
const envVars = createSetting(cluster().java?.custom_env_arguments, settings().custom_env_args);
|
||||
|
||||
|
|
|
|||
|
|
@ -301,7 +301,7 @@ export function JvmSettings(props: {
|
|||
} & ({
|
||||
clusterId: string;
|
||||
javaVersion: CreateSetting<JavaVersion | null>;
|
||||
javaVersions: JavaVersions;
|
||||
javaVersions: CreateSetting<JavaVersions>;
|
||||
} | {
|
||||
javaVersion: undefined;
|
||||
javaVersions: CreateSetting<JavaVersions>;
|
||||
|
|
@ -466,7 +466,7 @@ export default SettingsMinecraft;
|
|||
function ClusterJavaVersionModal(props: ModalProps & {
|
||||
clusterId: string;
|
||||
javaVersion: CreateSetting<JavaVersion | null>;
|
||||
javaVersions: JavaVersions;
|
||||
javaVersions: CreateSetting<JavaVersions>;
|
||||
}) {
|
||||
const [_, modalProps] = splitProps(props, ['javaVersion', 'javaVersions']);
|
||||
|
||||
|
|
@ -486,8 +486,12 @@ function ClusterJavaVersionModal(props: ModalProps & {
|
|||
}
|
||||
});
|
||||
|
||||
const setPackage = (pkg: JavaVersion) => {
|
||||
const setPackage = (pkg: JavaVersion, version: string) => {
|
||||
props.javaVersion.set(pkg);
|
||||
props.javaVersions.set({
|
||||
...props.javaVersions?.get(),
|
||||
[`JAVA_${version}`]: pkg,
|
||||
});
|
||||
};
|
||||
|
||||
const onChange = (selected: number) => {
|
||||
|
|
@ -495,11 +499,11 @@ function ClusterJavaVersionModal(props: ModalProps & {
|
|||
if (!version)
|
||||
return;
|
||||
|
||||
const meta = props.javaVersions[version];
|
||||
const meta = props.javaVersions.get()[version];
|
||||
if (!meta)
|
||||
return;
|
||||
|
||||
setPackage(meta);
|
||||
setPackage(meta, version);
|
||||
};
|
||||
|
||||
return (
|
||||
|
|
@ -535,7 +539,7 @@ function GlobalJavaVersionModal(props: ModalProps & {
|
|||
}) {
|
||||
const [_, modalProps] = splitProps(props, ['javaVersions']);
|
||||
|
||||
const setPackage = (pkg: JavaVersion, version?: number) => {
|
||||
const setPackage = (pkg: JavaVersion, version: string) => {
|
||||
props.javaVersions?.set({
|
||||
...props.javaVersions?.get(),
|
||||
[`JAVA_${version}`]: pkg,
|
||||
|
|
@ -561,7 +565,7 @@ function GlobalJavaVersionModal(props: ModalProps & {
|
|||
</span>
|
||||
<TextField
|
||||
onValidSubmit={(value) => {
|
||||
setPackage({ ...meta, path: value }, Number.parseInt(major));
|
||||
setPackage({ ...meta, path: value }, major);
|
||||
}}
|
||||
value={meta.path}
|
||||
/>
|
||||
|
|
@ -575,7 +579,7 @@ function GlobalJavaVersionModal(props: ModalProps & {
|
|||
}
|
||||
|
||||
function BaseJavaVersionModal(props: ModalProps & {
|
||||
setPackage: (pkg: JavaVersion, version?: number) => void;
|
||||
setPackage: (pkg: JavaVersion, version: string) => void;
|
||||
}) {
|
||||
const [selectedPackageIndex, setSelectedPackageIndex] = createSignal<number>(-1);
|
||||
|
||||
|
|
@ -600,7 +604,7 @@ function BaseJavaVersionModal(props: ModalProps & {
|
|||
version: pkg.java_version.join('.'),
|
||||
path,
|
||||
arch: '',
|
||||
}, pkg.java_version[0]!);
|
||||
}, pkg.java_version[0]!.toString());
|
||||
};
|
||||
|
||||
return (
|
||||
|
|
|
|||
|
|
@ -8,5 +8,5 @@ Terminal=false
|
|||
StartupNotify=true
|
||||
Categories=Game;ActionGame;AdventureGame;Simulation;
|
||||
Keywords=mc;minecraft;game
|
||||
StartupWMClass=OneLauncher
|
||||
StartupWMClass={{exec}}
|
||||
Version=1.4
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue