diff options
| -rw-r--r-- | common/build.gradle.kts | 3 | ||||
| -rw-r--r-- | fabric/build.gradle.kts | 6 | ||||
| -rw-r--r-- | forge/build.gradle.kts | 7 | ||||
| -rw-r--r-- | gradle/libs.versions.toml | 22 |
4 files changed, 21 insertions, 17 deletions
diff --git a/common/build.gradle.kts b/common/build.gradle.kts index 405755a..7d5ece7 100644 --- a/common/build.gradle.kts +++ b/common/build.gradle.kts @@ -27,8 +27,7 @@ dependencies { }) modImplementation(libs.fabric.loader) - implementation(libs.twelvemonkeys.imageio.core) - implementation(libs.twelvemonkeys.imageio.webp) + implementation(libs.bundles.twelvemonkeys.imageio) } java { diff --git a/fabric/build.gradle.kts b/fabric/build.gradle.kts index 52dfda3..813def2 100644 --- a/fabric/build.gradle.kts +++ b/fabric/build.gradle.kts @@ -40,11 +40,7 @@ dependencies { ).forEach { modApi(fabricApi.module(it, libs.versions.fabric.api.get())) } modApi(libs.mod.menu) - libs.twelvemonkeys.imageio.core.let { - implementation(it) - include(it) - } - libs.twelvemonkeys.imageio.webp.let { + libs.bundles.twelvemonkeys.imageio.let { implementation(it) include(it) } diff --git a/forge/build.gradle.kts b/forge/build.gradle.kts index c926445..3103f0e 100644 --- a/forge/build.gradle.kts +++ b/forge/build.gradle.kts @@ -45,15 +45,10 @@ dependencies { }) forge(libs.forge) - libs.twelvemonkeys.imageio.core.let { + libs.bundles.twelvemonkeys.imageio.let { implementation(it) - forgeRuntimeLibrary(it) include(it) - } - libs.twelvemonkeys.imageio.webp.let { - implementation(it) forgeRuntimeLibrary(it) - include(it) } "common"(project(path = ":common", configuration = "namedElements")) { isTransitive = false } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 8aaf92f..feb8ac8 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,18 +1,18 @@ [versions] # Plugins -architectury_loom = "1.1.+" +architectury_loom = "1.2.+" architectury_plugin = "3.4.+" shadow = "7.1.+" -quilt_quiltflower = "1.8.+" +quilt_quiltflower = "1.10.+" minotaur = "2.7.+" cursegradle = "2.+" github_release = "2.+" machete = "2.+" grgit = "5.0.+" -minecraft = "1.20-pre4" +minecraft = "1.20" quilt_mappings = "1" -fabric_loader = "0.14.19" +fabric_loader = "0.14.21" # Common Dependencies mixin_extras = "0.2.0-beta.8" @@ -33,6 +33,10 @@ fabric_loader = { module = "net.fabricmc:fabric-loader", version.ref = "fabric_l mixin_extras_common = { module = "com.github.llamalad7.mixinextras:mixinextras-common", version.ref = "mixin_extras" } twelvemonkeys_imageio_core = { module = "com.twelvemonkeys.imageio:imageio-core", version.ref = "twelvemonkeys_imageio" } twelvemonkeys_imageio_webp = { module = "com.twelvemonkeys.imageio:imageio-webp", version.ref = "twelvemonkeys_imageio" } +twelvemonkeys_imageio_metadata = { module = "com.twelvemonkeys.imageio:imageio-metadata", version.ref = "twelvemonkeys_imageio" } +twelvemonkeys_common_lang = { module = "com.twelvemonkeys.common:common-lang", version.ref = "twelvemonkeys_imageio" } +twelvemonkeys_common_io = { module = "com.twelvemonkeys.common:common-io", version.ref = "twelvemonkeys_imageio" } +twelvemonkeys_common_image = { module = "com.twelvemonkeys.common:common-image", version.ref = "twelvemonkeys_imageio" } # Fabric-like Dependencies fabric_api = { module = "net.fabricmc.fabric-api:fabric-api", version.ref = "fabric_api" } @@ -41,6 +45,16 @@ mod_menu = { module = "com.terraformersmc:modmenu", version.ref = "mod_menu" } # Forge Dependencies forge = { module = "net.minecraftforge:forge", version.ref = "forge" } +[bundles] +twelvemonkeys_imageio = [ + "twelvemonkeys_imageio_core", + "twelvemonkeys_imageio_webp", + "twelvemonkeys_imageio_metadata", + "twelvemonkeys_common_lang", + "twelvemonkeys_common_io", + "twelvemonkeys_common_image" +] + [plugins] architectury_loom = { id = "dev.architectury.loom", version.ref = "architectury_loom" } architectury_plugin = { id = "architectury-plugin", version.ref = "architectury_plugin" } |