diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4525aca..74c97ad 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -15,11 +15,11 @@ jobs: steps: - uses: actions/checkout@v3 - - name: Set up JDK 17 + - name: Set up JDK 21 uses: actions/setup-java@v3 with: distribution: temurin - java-version: 17 + java-version: 21 - name: Grant execute permission for gradlew run: chmod +x gradlew diff --git a/build.gradle b/build.gradle index 2a91df1..3020404 100644 --- a/build.gradle +++ b/build.gradle @@ -1,10 +1,10 @@ plugins { - id 'fabric-loom' version '0.12-SNAPSHOT' + id 'fabric-loom' version '1.6-SNAPSHOT' id 'maven-publish' } -sourceCompatibility = JavaVersion.VERSION_17 -targetCompatibility = JavaVersion.VERSION_17 +sourceCompatibility = JavaVersion.VERSION_21 +targetCompatibility = JavaVersion.VERSION_21 archivesBaseName = project.archives_base_name version = project.mod_version @@ -35,7 +35,7 @@ processResources { tasks.withType(JavaCompile).configureEach { // Minecraft 1.18 (1.18-pre2) upwards uses Java 17. - it.options.release = 17 + it.options.release = 21 } java { diff --git a/gradle.properties b/gradle.properties index 28ba022..a04d66d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,10 +3,10 @@ org.gradle.jvmargs=-Xmx1G # Fabric Properties # check these on https://fabricmc.net/develop - minecraft_version=1.20.1 - loader_version=0.15.5 + minecraft_version=1.20.6 + loader_version=0.15.10 # Mod Properties - mod_version = 1.0.2 + mod_version = 1.1.0 maven_group = one.devos.nautical archives_base_name = rainbethunder diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 41dfb87..48c0a02 100644 --- 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.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 27ef0d1..2775870 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -31,6 +31,6 @@ "depends": { "fabricloader": "*", "minecraft": "*", - "java": ">=17" + "java": "*" } } diff --git a/src/main/resources/rainbethunder.mixins.json b/src/main/resources/rainbethunder.mixins.json index 666e253..f0188c6 100644 --- a/src/main/resources/rainbethunder.mixins.json +++ b/src/main/resources/rainbethunder.mixins.json @@ -2,9 +2,8 @@ "required": true, "minVersion": "0.8", "package": "one.devos.nautical.rainbethunder.mixin", - "compatibilityLevel": "JAVA_17", - "mixins": [], - "server": [ + "compatibilityLevel": "JAVA_21", + "mixins": [ "RainRemover" ], "injectors": {