From 44813001a1c7bf89ce918f8cd737a84cef06cb51 Mon Sep 17 00:00:00 2001 From: Moritz Zwerger Date: Fri, 12 Jan 2024 21:16:30 +0100 Subject: [PATCH] fix assets on windows Windows uses drive letters and backspaces, hence it breaks a lot. --- .../minosoft/assets/directory/DirectoryAssetsManager.kt | 2 +- .../de/bixilon/minosoft/assets/file/ResourcesAssetsUtil.kt | 4 ++-- .../config/profile/profiles/other/updater/UpdaterC.kt | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/de/bixilon/minosoft/assets/directory/DirectoryAssetsManager.kt b/src/main/java/de/bixilon/minosoft/assets/directory/DirectoryAssetsManager.kt index 2e5fd5475..34121c7b2 100644 --- a/src/main/java/de/bixilon/minosoft/assets/directory/DirectoryAssetsManager.kt +++ b/src/main/java/de/bixilon/minosoft/assets/directory/DirectoryAssetsManager.kt @@ -58,7 +58,7 @@ class DirectoryAssetsManager( continue } if (root) continue // root path just allows folders - val path = file.toPath().relativeTo(basePath).toString().removePrefix(File.separator).toAssetName(false, prefix) ?: continue + val path = file.toPath().relativeTo(basePath).toString().replace("\\", "/").removePrefix("/").toAssetName(false, prefix) ?: continue assets += path } } diff --git a/src/main/java/de/bixilon/minosoft/assets/file/ResourcesAssetsUtil.kt b/src/main/java/de/bixilon/minosoft/assets/file/ResourcesAssetsUtil.kt index c01f973c5..1d37b8987 100644 --- a/src/main/java/de/bixilon/minosoft/assets/file/ResourcesAssetsUtil.kt +++ b/src/main/java/de/bixilon/minosoft/assets/file/ResourcesAssetsUtil.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2023 Moritz Zwerger + * Copyright (C) 2020-2024 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -33,7 +33,7 @@ object ResourcesAssetsUtil { } return when (rootResources.protocol) { - "file" -> DirectoryAssetsManager(Path.of(rootResources.path).parent, canUnload, prefix) // Read them directly from the folder + "file" -> DirectoryAssetsManager(Path.of(rootResources.toURI()).parent, canUnload, prefix) // Read them directly from the folder "jar" -> { val path: String = rootResources.path val jarPath = path.substring(5, path.indexOf("!")) diff --git a/src/main/java/de/bixilon/minosoft/config/profile/profiles/other/updater/UpdaterC.kt b/src/main/java/de/bixilon/minosoft/config/profile/profiles/other/updater/UpdaterC.kt index dbed24923..28091b25a 100644 --- a/src/main/java/de/bixilon/minosoft/config/profile/profiles/other/updater/UpdaterC.kt +++ b/src/main/java/de/bixilon/minosoft/config/profile/profiles/other/updater/UpdaterC.kt @@ -32,7 +32,7 @@ class UpdaterC(profile: OtherProfile) { /** * Update channel - * If automatic, it chooses either stable or beta matching the current executed version + * If set to `auto`, it will download the update from the same branch as the running version */ var channel by StringDelegate(profile, "auto")