Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: apply resource packs in the specified order #29

Merged
merged 1 commit into from
Aug 22, 2024
Merged

fix: apply resource packs in the specified order #29

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 8 additions & 6 deletions sync-script/src/main/kotlin/syncService/ResourcePacksSyncService.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ class ResourcePacksSyncService :
)

if (resourcePackSyncInfo.applyResourcePacks) {
applyResourcePacks()
applyResourcePacks(resourcePacks = resourcePacks)
}

Logger.info {
Expand Down Expand Up @@ -191,9 +191,10 @@ class ResourcePacksSyncService :
}
}

private suspend fun applyResourcePacks() {
val resourcePackFilePaths = getScriptLocalResourcePackFilePathsOrAll()

/**
* @param resourcePacks The list of resource packs to apply, the ones that are synced using the script
* */
private fun applyResourcePacks(resourcePacks: List<ResourcePack>) {
MinecraftOptionsManager.loadPropertiesFromFile(createIfMissing = true)

val optionsResourcePacks: List<MinecraftOptionsManager.ResourcePack>? =
Expand All @@ -215,8 +216,9 @@ class ResourcePacksSyncService :
userOptionsResourcePacks?.let { addAll(userOptionsResourcePacks) }
}
addAll(
resourcePackFilePaths
.map { MinecraftOptionsManager.ResourcePack.File(it.name) },
resourcePacks.map {
MinecraftOptionsManager.ResourcePack.File(getResourcePackFilePath(it).name)
},
)
},
)
Expand Down