From d9ec52b562f34d95930f06e57281157c9617e9f8 Mon Sep 17 00:00:00 2001 From: James Lee Date: Sat, 29 Jun 2024 13:37:44 +0100 Subject: [PATCH] Ported to 1.21 --- build.gradle | 17 ++++++++--------- changelog.txt | 2 +- gradle.properties | 14 +++++++------- gradle/wrapper/gradle-wrapper.properties | 2 +- src/client/resources/autorun.client.mixins.json | 2 +- src/main/resources/fabric.mod.json | 6 +++--- 6 files changed, 21 insertions(+), 22 deletions(-) diff --git a/build.gradle b/build.gradle index 8ff2b94..1111e2b 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,5 @@ plugins { - id 'fabric-loom' version '1.2-SNAPSHOT' + id 'fabric-loom' version '1.7-SNAPSHOT' id 'maven-publish' id "com.matthewprenger.cursegradle" version "1.4.0" id "com.modrinth.minotaur" version "2.+" @@ -56,14 +56,14 @@ processResources { } tasks.withType(JavaCompile).configureEach { - it.options.release = 17 + it.options.release = 21 } java { withSourcesJar() - sourceCompatibility = JavaVersion.VERSION_17 - targetCompatibility = JavaVersion.VERSION_17 + sourceCompatibility = JavaVersion.VERSION_21 + targetCompatibility = JavaVersion.VERSION_21 } jar { @@ -98,9 +98,8 @@ curseforge { changelogType = "text" changelog = file("changelog.txt") - addGameVersion "1.20" - addGameVersion "1.20.1" - addGameVersion "Java 17" + addGameVersion "1.21" + addGameVersion "Java 21" addGameVersion "Fabric" relations { @@ -123,9 +122,9 @@ import com.modrinth.minotaur.dependencies.ModDependency modrinth { token = project.hasProperty("modrinthApiKey") ? project.property("modrinthApiKey") : System.getenv("modrinthApiKey") projectId = "2i7tg1Wv" - versionName = "v${project.mod_version} (Minecraft 1.20)" + versionName = "v${project.mod_version} (Minecraft 1.21)" versionNumber = version uploadFile = remapJar - gameVersions = ["1.20", "1.20.1"] + gameVersions = ["1.21"] loaders = ["fabric"] } diff --git a/changelog.txt b/changelog.txt index cf533d3..bb980f4 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1 +1 @@ -* Ported to 1.20 \ No newline at end of file +* Ported to 1.21 \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index e77b002..600cc6a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,20 +4,20 @@ org.gradle.parallel=false # Fabric Properties # check these on https://fabricmc.net/develop -minecraft_version=1.20 -yarn_mappings=1.20+build.1 -loader_version=0.14.21 +minecraft_version=1.21 +yarn_mappings=1.21+build.7 +loader_version=0.15.11 # Mod Properties mod_version=0.5.0 -supported_versions=1.20.X +supported_versions=1.21.X maven_group=com.emonadeo archives_base_name=autorun # Dependencies -fabric_version=0.83.0+1.20 -modmenu_version=7.0.1 -cloth_version=11.0.99 +fabric_version=0.100.4+1.21 +modmenu_version=11.0.1 +cloth_version=15.0.127 # CurseGradle project_id=279429 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 37aef8d..2617362 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/src/client/resources/autorun.client.mixins.json b/src/client/resources/autorun.client.mixins.json index 2a7a10e..429873a 100644 --- a/src/client/resources/autorun.client.mixins.json +++ b/src/client/resources/autorun.client.mixins.json @@ -1,7 +1,7 @@ { "required": true, "package": "com.emonadeo.autorun.mixin.client", - "compatibilityLevel": "JAVA_17", + "compatibilityLevel": "JAVA_21", "client": [ "AutoRunMixin" ], diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 192785d..fdd7e0b 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -25,9 +25,9 @@ } ], "depends": { - "fabricloader": ">=0.14.21", - "minecraft": "~1.20", - "java": ">=17", + "fabricloader": ">=0.15.11", + "minecraft": "~1.21", + "java": ">=21", "fabric-api": "*" } } \ No newline at end of file