diff --git a/gradle.properties b/gradle.properties index c06a37a..5bd0113 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,3 +1,3 @@ group=com.mineinabyss version=0.6 -idofrontVersion=0.24.19 +idofrontVersion=0.24.20 diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 52c7d12..548962c 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,5 +1,5 @@ [versions] -gearyPaper = "0.30.10-dev.9" +gearyPaper = "0.30.10-dev.10" guiy="0.12.1" [libraries] diff --git a/src/main/kotlin/com/mineinabyss/packy/PackyGenerator.kt b/src/main/kotlin/com/mineinabyss/packy/PackyGenerator.kt index 23a9e69..5d242a4 100644 --- a/src/main/kotlin/com/mineinabyss/packy/PackyGenerator.kt +++ b/src/main/kotlin/com/mineinabyss/packy/PackyGenerator.kt @@ -57,9 +57,9 @@ object PackyGenerator { // Filters out all required files as they are already in defaultPack // Filter all TemplatePacks that are not default or not in players enabledPackAddons packy.templates.values.filter { !it.required && it.id in templateIds } - .mapNotNull { ResourcePacks.readToResourcePack(it.path.toFile()) }.forEach { ResourcePacks.mergeResourcePacks(cachedPack, it) } + .mapNotNull { ResourcePacks.readToResourcePack(it.path.toFile()) } + .forEach { ResourcePacks.mergeResourcePacks(cachedPack, it) } - ResourcePacks.sortItemOverrides(cachedPack) PackObfuscator(cachedPack).obfuscatePack() val builtPack = ResourcePacks.resourcePackWriter.build(cachedPack)