Merge branch 'main' into 1.21

.github/workflows/gradle_build.yml

@@ -7,26 +7,37 @@ on:
 
 jobs:
   build:
-    strategy:
-      matrix:
-        java: [ 21 ]
-        os: [ubuntu-latest, macos-latest, windows-latest]
-    runs-on: ${{ matrix.os }}
+    runs-on: ubuntu-latest
+
     steps:
-      - uses: actions/checkout@v4
-      - name: Set up JDK ${{ matrix.java }}
+      - name: Checkout sources
+        uses: actions/checkout@v4
+
+      - name: Set up JDK
         uses: actions/setup-java@v4
         with:
-          java-version: ${{ matrix.java }}
+          java-version: 21
           distribution: 'temurin'
 
-      - name: Set up Gradle
-        uses: gradle/actions/setup-gradle@v3
+      - name: Initialize caches
+        uses: actions/cache@v4
+        with:
+          path: |
+            ~/.gradle/caches
+            ~/.gradle/loom-cache
+            ~/.gradle/wrapper
+          key: ${{ runner.os }}-build-${{ hashFiles('gradle/wrapper/gradle-wrapper.properties') }}
+          restore-keys: |
+            ${{ runner.os }}-build-
+            ${{ runner.os }}-
+
+      - name: Make gradlew executable
+        run: chmod +x ./gradlew
 
       - name: Build with Gradle
-        run: ./gradlew build --stacktrace
+        run: ./gradlew build
 
       - uses: actions/upload-artifact@v4
         with:
           name: Artifacts
-          path: build/libs/
+          path: build/libs/*.jar

.github/workflows/gradle_release.yml

@@ -0,0 +1,85 @@
+name: Gradle Release
+
+on:
+  workflow_dispatch:
+    inputs:
+      version:
+        description: 'Version'
+        required: true
+        type: string
+
+jobs:
+  build:
+    permissions:
+      contents: write
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout sources
+        uses: actions/checkout@v4
+
+      - name: Set up JDK
+        uses: actions/setup-java@v4
+        with:
+          java-version: 21
+          distribution: 'temurin'
+
+      - name: Initialize caches
+        uses: actions/cache@v4
+        with:
+          path: |
+            ~/.gradle/caches
+            ~/.gradle/loom-cache
+            ~/.gradle/wrapper
+          key: ${{ runner.os }}-build-${{ hashFiles('gradle/wrapper/gradle-wrapper.properties') }}
+          restore-keys: |
+            ${{ runner.os }}-build-
+            ${{ runner.os }}-
+
+      - name: Make gradlew executable
+        run: chmod +x ./gradlew
+
+      - name: Build with Gradle
+        run: ./gradlew build
+
+      - uses: actions/upload-artifact@v4
+        with:
+          name: Artifacts
+          path: build/libs/*.jar
+
+      - name: Publish release
+        uses: Kir-Antipov/mc-publish@v3.3
+        with:
+          modrinth-id: m5T5xmUy
+          modrinth-featured: false
+          modrinth-token: ${{ secrets.MODRINTH_TOKEN }}
+
+          curseforge-id: 1026394
+          curseforge-token: ${{ secrets.CURSEFORGE_TOKEN }}
+
+          github-tag: ${{ inputs.version }}
+          github-generate-changelog: false
+          github-draft: false
+          github-prerelease: false
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+
+          files: |
+            build/libs/!(*-@(sources)).jar
+            build/libs/*-@(sources).jar
+
+          name: FabricBetterGrass ${{ inputs.version }}
+          version: ${{ inputs.version }}
+          version-type: release
+          changelog-file: CHANGELOG.md
+
+          loaders: |
+            fabric
+          game-versions: |
+            [1.21,)
+          game-version-filter: releases
+          dependencies: |
+            fabric-api(required){modrinth:P7dR8mSH}{curseforge:306612}#(ignore:github)
+            midnightlib(required){modrinth:codAaoxh}{curseforge:488090}#(ignore:github)
+
+          retry-attempts: 2
+          retry-delay: 10000
+          fail-mode: fail

CHANGELOG.md

@@ -0,0 +1,4 @@
+**Full Changelog: [1.0.4+1.20.6...1.0.4+1.21](https://github.com/UltimatChamp/FabricBetterGrass/compare/1.0.4+1.20.6...1.0.4+1.21)**
+
+### 1.0.4+1.21
+- Port to `1.21`!

README.md

@@ -2,7 +2,7 @@
 
 <center>
 
-[![Discord](https://img.shields.io/discord/1186925300236427264?style=for-the-badge&logo=discord&logoColor=%23fff&color=%235865F2)](https://discord.gg/kfKjjhv3pn) [![Recommended Launcher: Modrinth Theseus](https://img.shields.io/badge/Recommended%20Launcher-Modrinth%20App-%2300AF5C?style=for-the-badge&logo=modrinth)](https://modrinth.com/app) [![Website](https://img.shields.io/badge/modpack-%2300AF5C?style=for-the-badge&logo=modrinth&label=my)](https://modrinth.com/modpack/optimum-fuse)
+[![Discord](https://img.shields.io/discord/1186925300236427264?style=for-the-badge&logo=discord&logoColor=%23fff&color=%235865F2)](https://discord.gg/kfKjjhv3pn) [![Modrinth](https://img.shields.io/badge/On-Modrinth-%2300AF5C?style=for-the-badge&logo=modrinth)](https://modrinth.com/mod/fabricbettergrass) [![CurseForge](https://img.shields.io/badge/On-CurseForge-%23f16436?style=for-the-badge&logo=curseforge)](https://www.curseforge.com/minecraft/mc-mods/fabricbettergrass) [![Modpack](https://img.shields.io/badge/modpack-%2300AF5C?style=for-the-badge&logo=modrinth&label=my)](https://modrinth.com/modpack/optimum-fuse)
 
 </center>
 

gradle.properties

@@ -6,7 +6,7 @@ yarn_mappings=1.21-pre2+build.2
 loader_version=0.15.11
 
 # Mod Properties
-mod_version=1.0.1+1.21-pre2
+mod_version=1.0.4+1.21-pre2
 maven_group=dev.ultimatchamp
 archives_base_name=FabricBetterGrass