From 89c67c2a9c234fb059a43c187bdf38cd2d083e4a Mon Sep 17 00:00:00 2001 From: DeDiamondPro <67508414+DeDiamondPro@users.noreply.github.com> Date: Sun, 26 May 2024 16:38:48 +0200 Subject: [PATCH] bump deps --- build.gradle.kts | 3 +-- gradle/libs.versions.toml | 4 ++-- root.gradle.kts | 8 ++++---- settings.gradle.kts | 6 +++--- versions/1.20.5-neoforge/gradle.properties | 1 - .../{1.20.5-fabric => 1.20.6-fabric}/gradle.properties | 1 + .../src/main/resources/resourcify.accesswidener | 0 versions/1.20.6-neoforge/gradle.properties | 4 ++++ .../src/main/resources/resourcify.accesswidener | 0 9 files changed, 15 insertions(+), 12 deletions(-) delete mode 100644 versions/1.20.5-neoforge/gradle.properties rename versions/{1.20.5-fabric => 1.20.6-fabric}/gradle.properties (89%) rename versions/{1.20.5-fabric => 1.20.6-fabric}/src/main/resources/resourcify.accesswidener (100%) create mode 100644 versions/1.20.6-neoforge/gradle.properties rename versions/{1.20.5-neoforge => 1.20.6-neoforge}/src/main/resources/resourcify.accesswidener (100%) diff --git a/build.gradle.kts b/build.gradle.kts index 35425f3..dcde1ed 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -115,7 +115,6 @@ dependencies { val elementaPlatform: String? by project val universalPlatform: String? by project val universalVersion = libs.versions.universal.get() + when { - project.platform.mcVersion == 12005 && platform.isFabric -> "+diamond.1.20.5" project.platform.isNeoForge -> "+diamond.neoforge" else -> "" } @@ -347,7 +346,7 @@ tasks { // Function to get the range of mc versions supported by a version we are building for. // First value is start of range, second value is end of range or null to leave the range open fun getSupportedVersionRange(): Pair = when (platform.mcVersion) { - 12005 -> "1.20.5" to null + 12006 -> "1.20.5" to null 12004 -> "1.20.2" to "1.20.4" 12001 -> "1.20" to "1.20.1" 11904 -> "1.19.4" to "1.19.4" diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index e07d0be..55d92e1 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -4,8 +4,8 @@ kotlin = "1.9.23" fabric_language_kotlin = "1.7.1+kotlin.1.6.10" # Essential Dependencies -universal = "325" -elementa = "DIAMOND-8" +universal = "337" +elementa = "DIAMOND-9" # Markdown minemark = "1.0.2" diff --git a/root.gradle.kts b/root.gradle.kts index 65afa33..da484e1 100644 --- a/root.gradle.kts +++ b/root.gradle.kts @@ -33,7 +33,7 @@ preprocess { val forge12004 = createNode("1.20.4-forge", 12004, "srg") val neoforge12004 = createNode("1.20.4-neoforge", 12004, "srg") - val neoforge12005 = createNode("1.20.5-neoforge", 12005, "srg") + val neoforge12006 = createNode("1.20.6-neoforge", 12006, "srg") val fabric11602 = createNode("1.16.2-fabric", 11602, "yarn") val fabric11801 = createNode("1.18.2-fabric", 11802, "yarn") @@ -41,7 +41,7 @@ preprocess { val fabric11904 = createNode("1.19.4-fabric", 11904, "yarn") val fabric12001 = createNode("1.20.1-fabric", 12001, "yarn") val fabric12004 = createNode("1.20.4-fabric", 12004, "yarn") - val fabric12005 = createNode("1.20.5-fabric", 12005, "yarn") + val fabric12006 = createNode("1.20.6-fabric", 12006, "yarn") forge11202.link(forge10809) forge11602.link(forge11202, file("versions/1.12.2-forge-1.16.2-forge")) @@ -52,7 +52,7 @@ preprocess { forge12004.link(forge12001) neoforge12004.link(forge12004) - neoforge12005.link(fabric12005) + neoforge12006.link(fabric12006) fabric11602.link(forge11602) fabric11801.link(fabric11602) @@ -60,5 +60,5 @@ preprocess { fabric11904.link(fabric11902) fabric12001.link(fabric11904) fabric12004.link(fabric12001) - fabric12005.link(fabric12004) + fabric12006.link(fabric12004) } \ No newline at end of file diff --git a/settings.gradle.kts b/settings.gradle.kts index 2a88667..489347e 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -27,7 +27,7 @@ pluginManagement { maven("https://repo.polyfrost.org/releases") mavenLocal() } - val egtVersion = "0.5.0+neoforge1" + val egtVersion = "0.6.0" plugins { id("gg.essential.multi-version.root") version egtVersion } @@ -64,8 +64,8 @@ listOf( "1.20.4-forge", "1.20.4-neoforge", "1.20.4-fabric", - "1.20.5-neoforge", - "1.20.5-fabric", + "1.20.6-neoforge", + "1.20.6-fabric", ).forEach { version -> include(":$version") project(":$version").apply { diff --git a/versions/1.20.5-neoforge/gradle.properties b/versions/1.20.5-neoforge/gradle.properties deleted file mode 100644 index c936f69..0000000 --- a/versions/1.20.5-neoforge/gradle.properties +++ /dev/null @@ -1 +0,0 @@ -kotlinForForgeVersion=5.0.1 \ No newline at end of file diff --git a/versions/1.20.5-fabric/gradle.properties b/versions/1.20.6-fabric/gradle.properties similarity index 89% rename from versions/1.20.5-fabric/gradle.properties rename to versions/1.20.6-fabric/gradle.properties index 2298df4..de23fc4 100644 --- a/versions/1.20.5-fabric/gradle.properties +++ b/versions/1.20.6-fabric/gradle.properties @@ -1,5 +1,6 @@ fabricApiVersion=0.97.6+1.20.5 irisVersion=1.7.0+1.20.5 +elementaPlatform=1.18.1-fabric essential.defaults.loom.minecraft=com.mojang:minecraft:1.20.5 essential.defaults.loom.mappings=net.fabricmc:yarn:1.20.5+build.1 diff --git a/versions/1.20.5-fabric/src/main/resources/resourcify.accesswidener b/versions/1.20.6-fabric/src/main/resources/resourcify.accesswidener similarity index 100% rename from versions/1.20.5-fabric/src/main/resources/resourcify.accesswidener rename to versions/1.20.6-fabric/src/main/resources/resourcify.accesswidener diff --git a/versions/1.20.6-neoforge/gradle.properties b/versions/1.20.6-neoforge/gradle.properties new file mode 100644 index 0000000..3050df8 --- /dev/null +++ b/versions/1.20.6-neoforge/gradle.properties @@ -0,0 +1,4 @@ +elementaPlatform=1.20.4-neoforge + +kotlinForForgeVersion=5.0.1 +essential.defaults.loom.neoForge=net.neoforged:neoforge:20.6.2-beta \ No newline at end of file diff --git a/versions/1.20.5-neoforge/src/main/resources/resourcify.accesswidener b/versions/1.20.6-neoforge/src/main/resources/resourcify.accesswidener similarity index 100% rename from versions/1.20.5-neoforge/src/main/resources/resourcify.accesswidener rename to versions/1.20.6-neoforge/src/main/resources/resourcify.accesswidener