Merge branch 'GregTechCEu:1.20.1' into 1.20.1

.github/actions/build_setup/action.yml

@@ -6,20 +6,23 @@ inputs:
     description: If cache should be updated
     required: false
     default: 'false'
+  ref:
+    description: 'Ref to checkout'
+    required: false
 
 runs:
   using: 'composite'
-
   steps:
     - uses: actions/checkout@v4
       with:
-        submodules: true
-
-    - name: Set up JDK 17
+        ref: ${{ inputs.ref || github.ref }}
+    - name: Set up JDK
       uses: actions/setup-java@v4
+      env:
+        REF: ${{ inputs.ref || github.ref }}
       with:
-        distribution: adopt
-        java-version: 17
+        distribution: temurin
+        java-version: ${{ contains(env.REF, '1.20.1') && '17' || '21' }}
 
     - name: Validate Gradle wrapper
       uses: gradle/actions/wrapper-validation@v3

.github/json/config-latest.json

@@ -0,0 +1,22 @@
+{
+  "categories": [
+    {
+      "title": "### Added",
+      "labels": ["type: feature"]
+    },
+    {
+      "title": "### Fixed",
+      "labels": ["type: bugfix"]
+    },
+    {
+      "title": "### Changed",
+      "labels": ["type: refactor", "type: translation"]
+    }
+  ],
+  "sort": "ASC",
+  "template": "## What's Changed\n#{{CHANGELOG}}",
+  "pr_template": "- #{{TITLE}} by @#{{AUTHOR}} in [##{{NUMBER}}](#{{URL}})",
+  "ignore_labels": ["ignore changelog"],
+  "max_pull_requests": 1000,
+  "max_back_track_time_days": 90
+}

.github/json/config.json

@@ -0,0 +1,35 @@
+{
+  "categories": [
+    {
+      "title": "### Added",
+      "labels": ["type: feature"]
+    },
+    {
+      "title": "### Fixed",
+      "labels": ["type: bugfix"]
+    },
+    {
+      "title": "### Changed",
+      "labels": ["type: refactor", "type: translation"]
+    }
+  ],
+  "sort": "ASC",
+  "template": "## Version [#{{TO_TAG}}](#{{RELEASE_DIFF}})\n#{{CHANGELOG}} ",
+  "pr_template": "- #{{TITLE}} by @#{{AUTHOR}} in [##{{NUMBER}}](#{{URL}})",
+  "empty_template": "- No changes",
+  "ignore_labels": ["ignore changelog"],
+  "tag_resolver": {
+    "method": "semver",
+    "filter": {
+      "pattern": "^(?!v?(1\\.20\\.1-)?[0-9\\.]+$).+$",
+      "flags": "gu"
+    },
+    "transformer": {
+      "pattern": "v?([0-9\\.]+-)?([0-9\\.]+)",
+      "target": "$2"
+    }
+  },
+  "max_pull_requests": 1000,
+  "max_back_track_time_days": 90,
+  "base_branches": ["1.20.1"]
+}

.github/workflows/auto-build.yml

@@ -1,58 +1,60 @@
-name: auto-build
+name: Latest Build
 
 on:
   push:
-    branches:
-      - '1.20.1'
+    branches: ['1.20.1', '1.21']
+    paths-ignore: ['.github/**', '**/*.md']
+
+concurrency:
+  group: auto-build-${{ github.ref }}
+  cancel-in-progress: true
 
 jobs:
   build:
     runs-on: ubuntu-latest
     env:
-      MAVEN_PASS: ${{ secrets.MAVEN_PASS }}
+      MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }}
       MAVEN_USER: ${{ secrets.MAVEN_USER }}
       SNAPSHOT: true
+      GITHUB_TOKEN: ${{ github.token }}
     permissions:
       contents: write
     steps:
       - uses: actions/checkout@v4
-        with:
-          submodules: true
-
       - name: Setup Build
         uses: ./.github/actions/build_setup
-
+      - name: Get Version
+        id: ver
+        run: echo "version=$(./gradlew -q printVersion)" >> $GITHUB_OUTPUT
       - name: Build
-        uses: gradle/gradle-build-action@v2
-        with:
-          arguments: build
-
+        run: ./gradlew build --build-cache
       - name: Publish to Maven
-        uses: gradle/gradle-build-action@v2
+        if: github.repository_owner == 'GregTechCEu'
+        run: ./gradlew publish --build-cache
+      - name: Upload Artifacts
+        uses: actions/upload-artifact@v4
         with:
-          arguments: publish
-
-      - name: Get Version
-        id: var
-        run: |
-          MESSAGE=$(ls build/libs/* | grep sources.jar -v | grep shadow.jar -v | grep slim.jar -v | awk -F 'gtceu-|-SNAPSHOT.jar' '{print $2}')
-          mv "build/libs/gtceu-$MESSAGE-SNAPSHOT.jar" "build/libs/gtceu-$MESSAGE-build_${{ github.run_number }}-SNAPSHOT.jar"
-          mv "build/libs/gtceu-$MESSAGE-SNAPSHOT-slim.jar" "build/libs/gtceu-$MESSAGE-build_${{ github.run_number }}-SNAPSHOT-slim.jar"
-          mv "build/libs/gtceu-$MESSAGE-SNAPSHOT-dev-shadow.jar" "build/libs/gtceu-$MESSAGE-build_${{ github.run_number }}-SNAPSHOT-dev-shadow.jar"
-          echo "version=$MESSAGE-build_${{ github.run_number }}" >> $GITHUB_OUTPUT
-
-      - name: Release
-        id: release
-        uses: Kir-Antipov/[email protected]
+          name: build-artifacts
+          path: build/libs/*
+          if-no-files-found: error
+          retention-days: 90
+      - name: Changelog
+        id: changelog
+        uses: mikepenz/release-changelog-builder-action@v5
         with:
-          name: ${{ steps.var.outputs.version }}
-          github-tag: ${{ steps.var.outputs.version }}
-          github-token: ${{ secrets.GITHUB_TOKEN }}
-          files: |
-            build/libs/!(*-@(dev|sources|javadoc)).jar
-
-      - name: Print Output
-        run: |
-          echo "Release tag: ${{ steps.release.outputs.github-tag }}"
-          echo "Release URL: ${{ steps.release.outputs.github-url }}"
-          echo "Released files: ${{ steps.release.outputs.github-files }}"
+          configuration: ./.github/json/config-latest.json
+          fromTag: latest-${{ github.ref_name }}
+          toTag: ${{ github.ref }}
+          fetchViaCommits: true
+          failOnError: false
+      - name: Release Latest
+        uses: andelf/nightly-release@46e2d5f80828ecc5c2c3c819eb31186a7cf2156c
+        with:
+          tag_name: latest-${{ github.ref_name }}
+          name: '${{ github.ref_name }}-${{ steps.ver.outputs.version}} SNAPSHOT $$'
+          prerelease: true
+          body: |
+            The latest build of GTM for Minecraft ${{ github.ref_name }}.
+            Please report any [issues](https://github.com/GregTechCEu/GregTech-Modern/issues).
+            ${{ steps.changelog.outputs.changelog }}
+          files: build/libs/*.jar

.github/workflows/auto-publish.yml

@@ -27,7 +27,7 @@ jobs:
   build:
     runs-on: ubuntu-latest
     env:
-      MAVEN_PASS: ${{ secrets.MAVEN_PASS }}
+      MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }}
       MAVEN_USER: ${{ secrets.MAVEN_USER }}
     permissions:
       contents: write
@@ -36,31 +36,20 @@ jobs:
         with:
           submodules: true
 
-      - uses: actions/setup-java@v4
-        with:
-          java-version: '17'
-          distribution: 'adopt'
-
       - name: Setup Build
         uses: ./.github/actions/build_setup
 
       - name: Build
-        uses: gradle/gradle-build-action@v2
-        with:
-          arguments: build
+        run: ./gradlew build --build-cache
 
       - if: ${{ inputs.publishMaven }}
         name: Publish to Maven
-        uses: gradle/gradle-build-action@v2
-        with:
-          arguments: publish
+        run: ./gradlew publish --build-cache
 
       - if: ${{ inputs.publishCurseForgeAndModrinth }}
         name: Get Version
         id: var
-        run: |
-          MESSAGE=$(ls build/libs/* | grep sources.jar -v | grep shadow.jar -v | grep slim.jar -v | awk -F 'gtceu-|.jar' '{print $2}')
-          echo version=$MESSAGE >> $GITHUB_OUTPUT
+        run: echo "version=$(./gradlew -q printVersion)" >> $GITHUB_OUTPUT
 
       - if: ${{ inputs.publishCurseForgeAndModrinth }}
         name: mc-publish-forge
@@ -80,13 +69,13 @@ jobs:
           curseforge-token: ${{ secrets.CURSEFORGE_TOKEN }}
 
           files: |
-            build/libs/!(*-@(dev|sources|javadoc|dev-shadow|slim)).jar
+            build/libs/!(*-@(dev|dev-all|dev-slim|sources|javadoc|dev-shadow|slim)).jar
             build/libs/*-@(dev|sources|javadoc|dev-shadow|slim).jar
 
           name: GregTechCEu ${{ steps.var.outputs.version }}
           version: mc${{ steps.var.outputs.version }}
           version-type: ${{ inputs.releaseType }}
-          changelog-file: CHANGELOG.*
+          changelog-file: RELEASE.*
 
           loaders: |
             forge

.github/workflows/build-on-push.yml

@@ -4,42 +4,37 @@ on:
   pull_request:
     paths: ['**']
 
+# Cancel previous jobs if PR gets another push
+concurrency:
+  group: PR-build-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   build:
     runs-on: ubuntu-latest
-    env:
-      GITHUB_RUN_NUMBER: ${{ vars.GITHUB_RUN_NUMBER }}
     steps:
       - uses: actions/checkout@v4
-        with:
-          submodules: true
-
       - name: Check Path Filter
         uses: dorny/paths-filter@v3
         id: filter
         with:
           filters: |
             code:
               - 'src/**'
-              - '**.gradle'
+              - '*.gradle'
               - 'gradle.properties'
-              - 'gradlew**'
+              - 'gradlew*'
               - 'gradle/**'
-
       - name: Setup Build
         if: steps.filter.outputs.code == 'true'
         uses: ./.github/actions/build_setup
-
       - name: Build
         if: steps.filter.outputs.code == 'true'
-        uses: gradle/gradle-build-action@v2
-        with:
-          arguments: assemble
-
+        run: ./gradlew assemble --build-cache
       - name: Upload Artifact
         if: steps.filter.outputs.code == 'true'
         uses: actions/[email protected]
         with:
           name: build output
           path: build/libs/*
-          retention-days: 30
+          retention-days: 15

.github/workflows/clean.yml

@@ -0,0 +1,18 @@
+name: Clean Gradle
+
+on:
+  workflow_dispatch:
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+    steps:
+      - uses: actions/checkout@v4
+      - name: Setup Build
+        uses: ./.github/actions/build_setup
+        with:
+          update-cache: true
+      - name: Clean
+        run: ./gradlew clean --build-cache

.github/workflows/format-java.yml

@@ -3,25 +3,24 @@ name: Java Formatting
 
 on:
   push:
-    branches:
-      - 1.20.1
+    branches: ['1.20.1', '1.21']
     paths: ['src/main/java/**', 'src/test/**']
   pull_request:
     paths: ['**']
 
 concurrency:
-  group: formatting-${{ github.head_ref || github.ref }}
+  group: formatting-${{ github.ref }}
   cancel-in-progress: true
 
 jobs:
   formatting:
     name: Formatting
     runs-on: ubuntu-latest
-
+    permissions:
+      pull-requests: read
     steps:
       - name: Checkout Repository
         uses: actions/checkout@v4
-
       - name: Check Path Filter
         uses: dorny/paths-filter@v3
         id: filter
@@ -30,11 +29,9 @@ jobs:
             code:
               - 'src/main/java/**'
               - 'src/test/**'
-
       - name: Setup Build
         if: steps.filter.outputs.code == 'true'
         uses: ./.github/actions/build_setup
-
       - name: Run Spotless Formatting Check with Gradle
         if: steps.filter.outputs.code == 'true'
         run: ./gradlew spotlessCheck --warning-mode all --build-cache