Port to 1.20 (WIP)

RPMTW · Jun 9, 2023 · 511b070 · 511b070
1 parent e71709b
commit 511b070
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 69 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -7,7 +7,7 @@ plugins {
     base
     id("org.jetbrains.kotlin.jvm") version "1.8.21"
     id("architectury-plugin") version "3.4.143"
-    id("dev.architectury.loom") version "1.0.+" apply false
+    id("dev.architectury.loom") version "1.2.+" apply false
     id("com.github.johnrengelman.shadow") version "7.1.2"
 }
 

diff --git a/fabric-like/build.gradle.kts b/fabric-like/build.gradle.kts
@@ -2,17 +2,6 @@ architectury {
     common(project.property("enabled_platforms").toString().split(","))
 }
 
-val common by configurations.registering
-configurations {
-    compileClasspath {
-        extendsFrom(common.get())
-    }
-
-    runtimeClasspath {
-        extendsFrom(common.get())
-    }
-}
-
 repositories {
     mavenCentral()
     maven {
@@ -38,7 +27,7 @@ dependencies {
 //    modImplementation("vazkii.patchouli:Patchouli:${project.property("patchouli_version")}-FABRIC")
     modImplementation("com.terraformersmc:modmenu:${project.property("modmenu_version")}")
 
-    "compileClasspath"(project(path = ":common", configuration = "namedElements")) { isTransitive = false }
+    implementation(project(path = ":common", configuration = "namedElements")) { isTransitive = false }
 }
 
 val accessWidenerFile = project(":common").file("src/main/resources/rpmtw_platform_mod.accesswidener")

diff --git a/fabric/build.gradle.kts b/fabric/build.gradle.kts
@@ -17,19 +17,6 @@ repositories {
     }
 }
 
-val common by configurations.registering
-configurations {
-    compileClasspath {
-        extendsFrom(common.get())
-    }
-
-    runtimeClasspath {
-        extendsFrom(common.get())
-    }
-
-    getByName("developmentFabric").extendsFrom(common.get())
-}
-
 dependencies {
     modImplementation("net.fabricmc:fabric-loader:${project.property("fabric_loader_version")}")
     modApi("net.fabricmc.fabric-api:fabric-api:${project.property("fabric_api_version")}")
@@ -43,7 +30,7 @@ dependencies {
 // Patchouli currently doesn't support Minecraft 1.19.4
 //    modImplementation("vazkii.patchouli:Patchouli:${project.property("patchouli_version")}-FABRIC")
 
-    "common"(project(path = ":common", configuration = "namedElements")) { isTransitive = false }
+    implementation(project(path = ":common", configuration = "namedElements")) { isTransitive = false }
     bundle(project(path = ":common", configuration = "transformProductionFabric")) { isTransitive = false }
     bundle(
         "com.github.RPMTW:RPMTW-API-Client-Kotlin:${project.property("rpmtw_api_client_version")}"
@@ -52,7 +39,7 @@ dependencies {
         exclude("org.jetbrains.kotlinx")
         exclude("org.jetbrains.kotlin")
     }.let { implementation(it) }
-    "common"(project(path = ":fabric-like", configuration = "namedElements")) { isTransitive = false }
+    implementation(project(path = ":fabric-like", configuration = "namedElements")) { isTransitive = false }
     bundle(project(path = ":fabric-like", configuration = "transformProductionFabric")) { isTransitive = false }
 
     implementation(

diff --git a/forge/build.gradle.kts b/forge/build.gradle.kts
@@ -3,19 +3,6 @@ architectury {
     forge()
 }
 
-val common by configurations.registering
-configurations {
-    compileClasspath {
-        extendsFrom(common.get())
-    }
-
-    runtimeClasspath {
-        extendsFrom(common.get())
-    }
-
-    getByName("developmentForge").extendsFrom(common.get())
-}
-
 dependencies {
     forge("net.minecraftforge:forge:${project.property("forge_version").toString()}")
 
@@ -49,7 +36,7 @@ dependencies {
     forgeRuntimeLibrary(kotlin("reflect", "1.8.21"))
     forgeRuntimeLibrary("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4")
 
-    "common"(project(path = ":common", configuration = "namedElements")) { isTransitive = false }
+    implementation(project(path = ":common", configuration = "namedElements")) { isTransitive = false }
     bundle(project(path = ":common", configuration = "transformProductionForge")) { isTransitive = false }
 }
 

diff --git a/gradle.properties b/gradle.properties
@@ -1,34 +1,34 @@
 org.gradle.jvmargs=-Xmx4096M
 
-minecraft_version=1.19.4
+minecraft_version=1.20
 enabled_platforms=fabric,forge,quilt
-archives_base_name=rpmtw-platform-mod-1.19.4
+archives_base_name=rpmtw-platform-mod-1.20
 mod_version=1.5.6
 maven_group=com.rpmtw.rpmtw_platform_mod
-architectury_version=8.1.87
-# yarn_version=1.19.4+build.2
+architectury_version=9.0.7
+# yarn_version=1.20+build.1
 # Fabric
 # https://fabricmc.net/develop/
 fabric_loader_version=0.14.21
-fabric_api_version=0.83.0+1.19.4
+fabric_api_version=0.83.0+1.20
 fabric-kotlin_version=1.9.4+kotlin.1.8.21
 # Forge
 # https://files.minecraftforge.net/net/minecraftforge/forge/
-forge_version=1.19.4-45.0.66
+forge_version=1.20-46.0.2
 # https://github.com/thedarkcolour/KotlinForForge
 # https://modrinth.com/mod/kotlin-for-forge/versions
 kotlin_forge_version=4.2.0
 # Quilt
 # https://lambdaurora.dev/tools/import_quilt.html
-quilt_loader_version=0.19.0-beta.13
-qsl_version=5.0.0-beta.5
-quilted_fabric_api_version=6.0.0-beta.6+0.79.0
+quilt_loader_version=0.19.0-beta.18
+qsl_version=6.0.1
+quilted_fabric_api_version=7.0.1+0.83.0
 
 # Other mod
 # https://github.com/VazkiiMods/Patchouli/
 patchouli_version=1.19.3-78
-cloth_config_version=10.0.96
-modmenu_version=6.2.2
+cloth_config_version=11.0.99
+modmenu_version=7.0.1
 
 # Other Dependencies
 # https://github.com/RPMTW/RPMTW-API-Client-Kotlin

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/quilt/build.gradle.kts b/quilt/build.gradle.kts
@@ -23,19 +23,6 @@ architectury {
     loader("quilt")
 }
 
-val common by configurations.registering
-configurations {
-    compileClasspath {
-        extendsFrom(common.get())
-    }
-
-    runtimeClasspath {
-        extendsFrom(common.get())
-    }
-
-    getByName("developmentQuilt").extendsFrom(common.get())
-}
-
 val accessWidenerFile = project(":common").file("src/main/resources/rpmtw_platform_mod.accesswidener")
 
 loom {
@@ -89,9 +76,9 @@ dependencies {
         implementation(it)
     }
 
-    "common"(project(path = ":common", configuration = "namedElements")) { isTransitive = false }
+    implementation(project(path = ":common", configuration = "namedElements")) { isTransitive = false }
     bundle(project(path = ":common", configuration = "transformProductionQuilt")) { isTransitive = false }
-    "common"(project(path = ":fabric-like", configuration = "namedElements")) { isTransitive = false }
+    implementation(project(path = ":fabric-like", configuration = "namedElements")) { isTransitive = false }
     bundle(project(path = ":fabric-like", configuration = "transformProductionQuilt")) { isTransitive = false }
 
     implementation(