1.21 Fabric (#8)

Prep for release of version 1.1.0 (MC 1.21 for Fabric only)

.github/workflows/build.yml

@@ -2,8 +2,7 @@ name: Build
 
 on:
   push:
-    branches-ignore:
-      - main
+  pull_request:
 
 jobs:
   build:
@@ -11,11 +10,11 @@ jobs:
     env:
       CI_DEV_BUILD: true
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set up JDK 17
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
-          java-version: '17'
+          java-version: '21'
           distribution: 'temurin'
       - name: Setup build number
         run: echo "BUILD_NUMBER=$(echo $GITHUB_SHA | cut -c 1-6)" >> $GITHUB_ENV
@@ -26,7 +25,7 @@ jobs:
         with:
           arguments: build
       - name: Upload Build Results
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: weather-changer-build
           path: |

.github/workflows/release.yml

@@ -2,16 +2,16 @@ name: Release
 
 on:
   push:
-    branches:
-      - main
+    tags:
+      - 'v[0-9]+.[0-9]+.[0-9]+'
 
 jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set up JDK 17
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           java-version: '17'
           distribution: 'temurin'
@@ -22,7 +22,7 @@ jobs:
         with:
           arguments: build
       - name: Upload Build Results
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: build
           path: |
@@ -37,8 +37,8 @@ jobs:
       GH_TOKEN: ${{ github.token }}
     needs: [build]
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/download-artifact@v3
+      - uses: actions/checkout@v4
+      - uses: actions/download-artifact@v4
       - name: Create Release
         run: |
           mkdir dist

README.md

@@ -1,3 +1,5 @@
+<!-- modrinth_exclude.start -->
+
 <!--suppress HtmlDeprecatedAttribute -->
 <p align="center" style="display: block;margin-left: auto;margin-right: auto;margin-bottom: 0">
     <img src="assets/logo-242x242.png" alt="Weather Changer Logo"/>
@@ -13,6 +15,8 @@
     <img src="assets/banner.png"  alt="Weather Changer Banner"/>
 </p>
 
+<!-- modrinth_exclude.end -->
+
 ## Overview
 Changes the weather on client side (only visible to you) to clear, rain, or thunder, this mod does not affect the server or send any packets to the server.
 
@@ -43,13 +47,13 @@ You can download the mod from any of the platforms below.
 **Modrinth (_recommended_)**: https://modrinth.com/mod/weather-changer <br>
 **Curseforge**: https://www.curseforge.com/minecraft/mc-mods/weather-changer <br>
 **GitHub Releases:** https://github.com/Lucaslah/WeatherChanger/releases <br>
-**Release Server**: https://release.cssudii.xyz/projects/weatherchanger
 
 <!-- modrinth_exclude.end -->
 
 ## Release History
 | Version | MC Version    | Mod loaders   | Git Tag                                                                | Supported |
 |---------|---------------|---------------|------------------------------------------------------------------------|-----------|
+| v1.1.0  | 1.21          | fabric        | [1.1.0](https://github.com/Lucaslah/WeatherChanger/releases/tag/1.1.0) | Yes       |
 | v1.0.1  | 1.20.1-1.20.6 | fabric, forge | [1.0.1](https://github.com/Lucaslah/WeatherChanger/releases/tag/1.0.1) | Yes       |
 | v1.0.0  | 1.20.1-1.20.4 | fabric, forge | [1.0.0](https://github.com/Lucaslah/WeatherChanger/releases/tag/1.0.0) | No        |
 
@@ -63,6 +67,7 @@ You can download the mod from any of the platforms below.
 ## Minecraft Versions
 | Version | Status                          |
 |---------|---------------------------------|
+| 1.21    | Supported                       |
 | 1.20.6  | Supported                       |
 | 1.20.5  | Supported                       |
 | 1.20.4  | Supported                       |

build.gradle.kts

@@ -1,14 +1,9 @@
-import io.github.themrmilchmann.gradle.publish.curseforge.ChangelogFormat
-import io.github.themrmilchmann.gradle.publish.curseforge.GameVersion
-import io.github.themrmilchmann.gradle.publish.curseforge.ReleaseType
 import net.fabricmc.loom.task.RemapJarTask
 import net.fabricmc.loom.task.RemapSourcesJarTask
 
 plugins {
     id("architectury-plugin") version "3.4.+"
-    id ("dev.architectury.loom") version "1.5.+" apply false
-    id("com.modrinth.minotaur") version "2.+"
-    id("io.github.themrmilchmann.curseforge-publish") version "0.6.1"
+    id ("dev.architectury.loom") version "1.6.+" apply false
 }
 
 architectury {
@@ -55,48 +50,3 @@ allprojects {
 
     group = properties["maven_group"].toString()
 }
-
-modrinth {
-    token.set(System.getenv("MODRINTH_TOKEN"))
-    projectId.set("nhSHTGyl")
-    versionNumber.set(properties["mod_version"].toString())
-    versionType.set(properties["release_channel"].toString())
-    uploadFile.set("build/libs/weather-changer-1.0.0.jar")
-    gameVersions.addAll("1.20", "1.20.1", "1.20.2", "1.20.3", "1.20.4")
-
-    loaders.add("fabric")
-    loaders.add("forge")
-
-    dependencies {
-        required.project("fabric-api")
-    }
-
-    syncBodyFrom = rootProject.file("README.md").readText()
-}
-
-curseforge {
-    apiToken = System.getenv("CURSEFORGE_TOKEN")
-    publications {
-        register("curseForge") {
-            projectId = "682513"
-
-            gameVersions.add(GameVersion("minecraft-1-20", "1.20"))
-            gameVersions.add(GameVersion("minecraft-1-20", "1.20.1"))
-            gameVersions.add(GameVersion("minecraft-1-20", "1.20.2"))
-            gameVersions.add(GameVersion("minecraft-1-20", "1.20.3"))
-            gameVersions.add(GameVersion("minecraft-1-20", "1.20.4"))
-
-            artifacts.register("main") {
-                displayName = "Weather Changer"
-                // TODO: read from file
-                releaseType = ReleaseType.BETA
-
-                changelog {
-                    // TODO: get from git diff
-                    format = ChangelogFormat.MARKDOWN
-                    from(file("CHANGELOG.md"))
-                }
-            }
-        }
-    }
-}

common/src/main/java/me/lucaslah/weatherchanger/commands/WeatherChangerCommand.java

@@ -54,7 +54,7 @@ public class WeatherChangerCommand extends Command {
 
     @Override
     public Identifier getId() {
-        return new Identifier("weatherchanger", "corecommand");
+        return Identifier.of("weatherchanger", "corecommand");
     }
 
     @Override

common/src/main/java/me/lucaslah/weatherchanger/keys/ToggleClearKey.java

@@ -25,7 +25,7 @@ public class ToggleClearKey extends Key {
 
     @Override
     public Identifier getId() {
-        return new Identifier("weatherchanger", "toggleclearkey");
+        return Identifier.of("weatherchanger", "toggleclearkey");
     }
 
     @Override

common/src/main/java/me/lucaslah/weatherchanger/keys/ToggleOffKey.java

@@ -25,7 +25,7 @@ public class ToggleOffKey extends Key {
 
     @Override
     public Identifier getId() {
-        return new Identifier("weatherchanger", "toggleoffkey");
+        return Identifier.of("weatherchanger", "toggleoffkey");
     }
 
     @Override

common/src/main/java/me/lucaslah/weatherchanger/keys/ToggleRainKey.java

@@ -25,7 +25,7 @@ public class ToggleRainKey extends Key {
 
     @Override
     public Identifier getId() {
-        return new Identifier("weatherchanger", "togglerainkey");
+        return Identifier.of("weatherchanger", "togglerainkey");
     }
 
     @Override

common/src/main/java/me/lucaslah/weatherchanger/keys/ToggleThunderKey.java

@@ -25,7 +25,7 @@ public class ToggleThunderKey extends Key {
 
     @Override
     public Identifier getId() {
-        return new Identifier("weatherchanger", "togglethunderkey");
+        return Identifier.of("weatherchanger", "togglethunderkey");
     }
 
     @Override

common/src/main/resources/weatherchanger.mixins.json

@@ -2,7 +2,7 @@
   "required": true,
   "minVersion": "0.8",
   "package": "me.lucaslah.weatherchanger.mixin",
-  "compatibilityLevel": "JAVA_17",
+  "compatibilityLevel": "JAVA_21",
   "mixins": [
   ],
   "client": [

gradle.properties

@@ -1,27 +1,30 @@
 # Done to increase the memory available to gradle.
 org.gradle.jvmargs=-Xmx2G
 
+# Kotlin
+kotlin.code.style=official
+
 # Minecraft Properties
-minecraft_version=1.20.1
-minecraft_base=1.20.0
-yarn_mappings=1.20.1+build.8
+minecraft_version=1.21
+minecraft_base=1.21
+yarn_mappings=1.21+build.7
 
 # Architectury Properties
 enabled_platforms=fabric,forge
 
 # Mod Properties
-mod_version = 1.0.1
+mod_version = 1.1.0
 mod_id = weatherchanger
 maven_group = me.lucaslah.weatherchanger
 archives_base_name = weather-changer
 
 # Release Properties
-# options: none,alpha,beta,release
-release_channel=none
+# options: alpha,beta,release
+release_channel=release
 
 # Fabric
-fabric.loader_version=0.14.21
-fabric.version=0.84.0+1.20.1
+fabric.loader_version=0.15.11
+fabric.version=0.100.1+1.21
 
 # Forge
-forge.version=1.20.1-47.0.3
+forge.version=1.21-51.0.21

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME