feat: resource packs apply order and incompatible packs prepare to re…

…lease 0.0.5-alpha
FreshKernel · Feb 11, 2025 · 19b48f0 · 19b48f0
1 parent 45a55d0
commit 19b48f0
Show file tree

Hide file tree

Showing 4 changed files with 40 additions and 8 deletions.
diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
diff --git a/common/src/main/kotlin/syncInfo/models/resourcePack/ResourcePackSyncInfo.kt b/common/src/main/kotlin/syncInfo/models/resourcePack/ResourcePackSyncInfo.kt
@@ -28,6 +28,26 @@ data class ResourcePackSyncInfo(
      * TODO: Add an option to override the apply order
      */
     val applyResourcePacks: Boolean = false,
+    /**
+     * The applied resource-packs in the game options (`options.txt`).
+     *
+     * Resource packs listed first have lower priority, while those listed last have higher priority.
+     *
+     * Example:
+     * `resourcePacks:["file/FantasticCombatMusic.synced.zip","file/EFM_IronsV2.0.synced.zip","file/LowOnFire_1.20.1.synced.zip","file/Enhanced Audio r6.synced.zip","file/Alacrity.synced.zip","file/EpicFightSoundOverhaul2.1_modified.synced.zip","file/Minimal-Rain-and-Snow-2.2.synced.zip","file/[1.4.1] Enhanced Boss Bars.synced.zip","file/TZP_1.20.1_2.7.synced.zip","file/FreshAnimations_v1.9.2.synced.zip","file/FA All_Extensions-v1.4.synced.zip","file/Icon_Xaero_X_FA_v2.4_1.20.2.synced.zip","file/Icon_Xaeros_1.2_HF.synced.zip"]`.
+     *
+     * Only applicable if [applyResourcePacks] is `true`.
+     *
+     * @see [incompatibleResourcePacks]
+     * */
+    val resourcePacksOrder: List<String>? = null,
+    /**
+     * By default, resource-packs that are made for newer or older Minecraft versions will be marked
+     * as incompatible and will be disabled by defaults on game launch unless they are declared in this list.
+     *
+     * Only applicable if [applyResourcePacks] is `true`.
+     * */
+    val incompatibleResourcePacks: List<String>? = null,
     /**
      * Will override [SyncInfo.verifyAssetFilesIntegrity] for the resource-packs
      *

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,5 +1,5 @@
 [versions]
-project = "0.0.4-alpha"
+project = "0.0.5-alpha"
 
 kotlin = "2.1.10"
 kotlinx-serialization = "1.8.0"

diff --git a/sync-script/src/main/kotlin/syncService/ResourcePacksSyncService.kt b/sync-script/src/main/kotlin/syncService/ResourcePacksSyncService.kt
@@ -132,7 +132,7 @@ class ResourcePacksSyncService :
                 }
                 Logger.info {
                     "\uD83D\uDEAB The resource-pack: '$resourcePackFileName' has invalid integrity. Deleting the resource-pack " +
-                        "and downloading it again."
+                            "and downloading it again."
                 }
                 resourcePackFilePath.deleteExistingOrTerminate(
                     fileEntityType = "resource-pack",
@@ -172,7 +172,7 @@ class ResourcePacksSyncService :
                         progress = downloadedProgress.toInt(),
                         detailsText =
                             "${downloadedBytes.convertBytesToReadableMegabytesAsString()} MB /" +
-                                " ${bytesToDownload.convertBytesToReadableMegabytesAsString()} MB",
+                                    " ${bytesToDownload.convertBytesToReadableMegabytesAsString()} MB",
                     )
                 },
             ).downloadFile(fileEntityType = "Resource pack")
@@ -185,7 +185,7 @@ class ResourcePacksSyncService :
                     title = "❌ File Integrity Check Failed",
                     message =
                         "\uD83D\uDEA8 The newly downloaded file has failed the integrity check. This might be due to a bug " +
-                            "in the script \uD83D\uDC1B or an incorrect integrity info value provided by the admin.",
+                                "in the script \uD83D\uDC1B or an incorrect integrity info value provided by the admin.",
                 )
             }
         }
@@ -203,15 +203,21 @@ class ResourcePacksSyncService :
             optionsResourcePacks
                 ?.filterIsInstance<MinecraftOptionsManager.ResourcePack.BuiltIn>()
 
+        fun mapResourcePacksToResourcePacksMinecraft(resourcePacks: List<String>) = resourcePacks.map {
+            if (it.startsWith("file/")) MinecraftOptionsManager.ResourcePack.File(
+                it.replace("file/", "")
+            ) else MinecraftOptionsManager.ResourcePack.BuiltIn(it)
+        }
+
         MinecraftOptionsManager.setResourcePacks(
-            resourcePacks =
-                buildList {
+            resourcePacks = resourcePackSyncInfo.resourcePacksOrder?.let { mapResourcePacksToResourcePacksMinecraft(it) }
+                ?: buildList {
                     builtInOptionsResourcePacks?.let { addAll(it) }
                     if (resourcePackSyncInfo.allowUsingOthers) {
                         val userOptionsResourcePacks =
                             optionsResourcePacks?.filter {
                                 it is MinecraftOptionsManager.ResourcePack.File &&
-                                    !isScriptResourcePackFile(Paths.get(it.resourcePackZipFileName))
+                                        !isScriptResourcePackFile(Paths.get(it.resourcePackZipFileName))
                             }
                         userOptionsResourcePacks?.let { addAll(userOptionsResourcePacks) }
                     }
@@ -222,6 +228,12 @@ class ResourcePacksSyncService :
                     )
                 },
         )
+
+        resourcePackSyncInfo.incompatibleResourcePacks?.let {
+            MinecraftOptionsManager.setIncompatibleResourcePacks(
+                mapResourcePacksToResourcePacksMinecraft(it)
+            )
+        }
     }
 
     private fun getResourcePackFilePath(resourcePack: ResourcePack): Path =