refactor: Rebase to upstream (#14)

* chore(mod): 1.21.5 (headlesshq#64)

* chore(deps): update googleapis/release-please-action digest to a02a34c (headlesshq#62)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* feat(deps): support 1.21.5 and update to HeadlessMc 2.5.1

* chore(main): release 3.1.0 (headlesshq#68)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* chore(docs): escape characters in README (headlesshq#69)

* fix(action): Change cache keys to prevent prefix fallback to cache of incorrect version (headlesshq#71)

* chore(main): release 3.1.1 (headlesshq#72)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* chore(deps): update useblacksmith/setup-gradle digest to 7f7b355 (headlesshq#75)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* chore(deps): update actions/download-artifact digest to d3f86a1 (headlesshq#65)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* chore(deps): update useblacksmith/setup-java digest to 4ef8123 (headlesshq#63)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* chore(deps): update actions/upload-artifact digest to ea165f8 (headlesshq#55)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* fix(deps): update dependency net.fabricmc.fabric-api:fabric-gametest-api-v1 to v1.3.16+1172e8970d (headlesshq#76)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* feat!: Default to github cache, blacksmith or no cache are configurable, extensive 1.7.10 logging (headlesshq#74)

Co-authored-by: Chip Wolf ‮ <hello@chipwolf.uk>
Co-authored-by: Chip Wolf ‮ <chipukyt@gmail.com>
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

* chore(main): release 4.0.0 (headlesshq#78)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* chore(ci): automatic PR when new Mc version is available (headlesshq#85)

* chore(ci): add requirements.txt

* chore(ci): fix new mc version workflow (headlesshq#88)

* chore(ci): fix reviewers and syntax in new mc version workflow (headlesshq#90)

* chore(ci): run matrix based on PR message (headlesshq#92)

* chore(ci): use find-comment action to find PR comment (headlesshq#94)

* chore(ci): use pull_request.body

* chore(ci): log PR comment body matching

* chore(ci): Fixed regex for PR comment body matching

* chore(ci): Fixed regex for PR comments not matching zeros

* chore(ci): modify README in new mc version workflow (headlesshq#103)

* feat(mod): Support 1.21.6 (headlesshq#81)

Co-authored-by: okafke <65917827+okafke@users.noreply.github.com>

* fix(action): switch from wget to curl to support windows (headlesshq#104)

* chore(main): release 4.1.0 (headlesshq#106)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* chore(docs): add supported versions to README

* chore(ci): read build & run data from file (headlesshq#111)

* chore(ci): improve README modification

* chore(deps): update dependency urllib3 to v2.6.0 [security] (headlesshq#113)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* refactor: 1.21.10 already handled by 1_21_9

* ci: null2264

* ci: Use github cache

* ci: Use github cache

* refactor: Switching to uv

---------

Co-authored-by: 3arthqu4ke <56741599+3arthqu4ke@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Chip Wolf ‮ <hello@chipwolf.uk>
Co-authored-by: Chip Wolf ‮ <chipukyt@gmail.com>
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
Co-authored-by: okafke <65917827+okafke@users.noreply.github.com>

Author: 7 people

.github/workflows/lifecycle.yml

@@ -41,7 +41,7 @@ jobs:
       - if: github.event_name == 'push' # TODO: explicit on push to master
         id: release-please
         name: Run Release Please
-        uses: googleapis/release-please-action@7987652d64b4581673a76e33ad5e98e3dd56832f # v4
+        uses: googleapis/release-please-action@a02a34c4d625f9be7cb89156071d8567266a2445 # v4
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
 
@@ -82,143 +82,41 @@ jobs:
 
       - id: matrices # TODO: build origin matrices dynamically, consider collapsing this into a .py
         name: Construct matrices
+        env:
+          PR_COMMENT_BODY: ${{ github.event.pull_request.body }}
         run: |
           import os
           import json
+          import re
 
           build_matrix = {"include": []}
           run_matrix = {"version": []}
 
-          build_data = [
-            {"dir": "api", "java": "8"},
-            {"dir": "1_21_9", "mc": "1.21.10", "lex": "", "neo": "0-beta", "java": "21"},
-            {"dir": "1_21_9", "mc": "1.21.9", "lex": "", "neo": "1-beta", "java": "21"},
-            {"dir": "1_21_6", "mc": "1.21.8", "lex": "58.1.0", "neo": "40", "java": "21"},
-            {"dir": "1_21_6", "mc": "1.21.7", "lex": "57.0.3", "neo": "25-beta", "java": "21"},
-            {"dir": "1_21_6", "mc": "1.21.6", "lex": "56.0.9", "neo": "20-beta", "java": "21"},
-            {"dir": "1_21_5", "mc": "1.21.5", "lex": "55.0.3", "neo": "76", "java": "21"},
-            {"dir": "1_21", "mc": "1.21.4", "lex": "54.1.0", "neo": "124", "java": "21"},
-            {"dir": "1_21", "mc": "1.21.3", "lex": "53.1.0", "neo": "66", "java": "21"},
-            {"dir": "1_21", "mc": "1.21.1", "lex": "52.1.0", "neo": "143", "java": "21"},
-            {"dir": "1_21", "mc": "1.21", "lex": "51.0.33", "neo": "167", "java": "21"},
-            {"dir": "1_20_6", "mc": "1.20.6", "lex": "50.1.10", "neo": "119", "java": "21"},
-            {"dir": "1_20", "mc": "1.20.4", "lex": "49.0.38", "neo": "219", "java": "17"},
-            {"dir": "1_20", "mc": "1.20.3", "lex": "49.0.2", "neo": "8-beta", "java": "17"},
-            {"dir": "1_20", "mc": "1.20.2", "lex": "48.1.0", "neo": "88", "java": "17"},
-            {"dir": "1_20_1", "mc": "1.20.1", "lex": "47.2.23", "java": "17"},
-            {"dir": "1_19", "mc": "1.19.4", "lex": "45.2.9", "java": "17"},
-            {"dir": "1_19", "mc": "1.19.3", "lex": "44.1.23", "java": "17"},
-            {"dir": "1_19", "mc": "1.19.2", "lex": "43.3.9", "java": "17"},
-            {"dir": "1_19", "mc": "1.19.1", "lex": "42.0.9", "java": "17"},
-            {"dir": "1_19", "mc": "1.19", "lex": "41.1.0", "java": "17"},
-            {"dir": "1_18", "mc": "1.18.2", "lex": "40.2.18", "java": "17"},
-            {"dir": "1_17", "mc": "1.17.1", "lex": "37.1.1", "java": "16"},
-            {"dir": "1_16", "mc": "1.16.5", "lex": "36.2.42", "java": "8"},
-            {"dir": "1_12", "mc": "1.12.2", "lex": "14.23.5.2860", "java": "8"},
-            {"dir": "1_8_9", "mc": "1.8.9", "lex": "11.15.1.2318-1.8.9", "java": "8"},
-            {"dir": "1_7_10", "mc": "1.7.10", "lex": "10.13.4.1614-1.7.10", "java": "8"}
-          ]
-
-          run_data = [
-            # FIXME: LexForge is once again holding us back
-            # {"mc": "1.21.10", "type": "lexforge", "modloader": "forge", "regex": ".*forge.*", "java": "21"},
-            {"mc": "1.21.10", "type": "neoforge", "modloader": "neoforge", "regex": ".*neoforge.*", "java": "21"},
-            {"mc": "1.21.10", "type": "fabric", "modloader": "fabric", "regex": ".*fabric.*", "java": "21"},
-
-            # FIXME: LexForge is once again holding us back
-            # {"mc": "1.21.9", "type": "lexforge", "modloader": "forge", "regex": ".*forge.*", "java": "21"},
-            {"mc": "1.21.9", "type": "neoforge", "modloader": "neoforge", "regex": ".*neoforge.*", "java": "21"},
-            {"mc": "1.21.9", "type": "fabric", "modloader": "fabric", "regex": ".*fabric.*", "java": "21"},
-
-            {"mc": "1.21.8", "type": "lexforge", "modloader": "forge", "regex": ".*forge.*", "java": "21"},
-            {"mc": "1.21.8", "type": "neoforge", "modloader": "neoforge", "regex": ".*neoforge.*", "java": "21"},
-            {"mc": "1.21.8", "type": "fabric", "modloader": "fabric", "regex": ".*fabric.*", "java": "21"},
-
-            {"mc": "1.21.7", "type": "lexforge", "modloader": "forge", "regex": ".*forge.*", "java": "21"},
-            {"mc": "1.21.7", "type": "neoforge", "modloader": "neoforge", "regex": ".*neoforge.*", "java": "21"},
-            {"mc": "1.21.7", "type": "fabric", "modloader": "fabric", "regex": ".*fabric.*", "java": "21"},
-
-            {"mc": "1.21.6", "type": "lexforge", "modloader": "forge", "regex": ".*forge.*", "java": "21"},
-            {"mc": "1.21.6", "type": "neoforge", "modloader": "neoforge", "regex": ".*neoforge.*", "java": "21"},
-            {"mc": "1.21.6", "type": "fabric", "modloader": "fabric", "regex": ".*fabric.*", "java": "21"},
-
-            {"mc": "1.21.5", "type": "lexforge", "modloader": "forge", "regex": ".*forge.*", "java": "21"},
-            {"mc": "1.21.5", "type": "neoforge", "modloader": "neoforge", "regex": ".*neoforge.*", "java": "21"},
-            {"mc": "1.21.5", "type": "fabric", "modloader": "fabric", "regex": ".*fabric.*", "java": "21"},
-
-            {"mc": "1.21.4", "type": "lexforge", "modloader": "forge", "regex": ".*forge.*", "java": "21"},
-            {"mc": "1.21.4", "type": "neoforge", "modloader": "neoforge", "regex": ".*neoforge.*", "java": "21"},
-            {"mc": "1.21.4", "type": "fabric", "modloader": "fabric", "regex": ".*fabric.*", "java": "21"},
-
-            {"mc": "1.21.3", "type": "lexforge", "modloader": "forge", "regex": ".*forge.*", "java": "21"},
-            {"mc": "1.21.3", "type": "neoforge", "modloader": "neoforge", "regex": ".*neoforge.*", "java": "21"},
-            {"mc": "1.21.3", "type": "fabric", "modloader": "fabric", "regex": ".*fabric.*", "java": "21"},
-
-            {"mc": "1.21.1", "type": "lexforge", "modloader": "forge", "regex": ".*forge.*", "java": "21"},
-            {"mc": "1.21.1", "type": "neoforge", "modloader": "neoforge", "regex": ".*neoforge.*", "java": "21"},
-            {"mc": "1.21.1", "type": "fabric", "modloader": "fabric", "regex": ".*fabric.*", "java": "21"},
-
-            {"mc": "1.21", "type": "lexforge", "modloader": "forge", "regex": ".*forge.*", "java": "21"},
-            {"mc": "1.21", "type": "neoforge", "modloader": "neoforge", "regex": ".*neoforge.*", "java": "21"},
-            {"mc": "1.21", "type": "fabric", "modloader": "fabric", "regex": ".*fabric.*", "java": "21"},
-
-            {"mc": "1.20.6", "type": "lexforge", "modloader": "forge", "regex": ".*forge.*", "java": "21"},
-            {"mc": "1.20.6", "type": "neoforge", "modloader": "neoforge", "regex": ".*neoforge.*", "java": "21"},
-            {"mc": "1.20.6", "type": "fabric", "modloader": "fabric", "regex": ".*fabric.*", "java": "21"},
-
-            {"mc": "1.20.4", "type": "lexforge", "modloader": "forge", "regex": ".*forge.*", "java": "17"},
-            {"mc": "1.20.4", "type": "neoforge", "modloader": "neoforge", "regex": ".*neoforge.*", "java": "17"},
-            {"mc": "1.20.4", "type": "fabric", "modloader": "fabric", "regex": ".*fabric.*", "java": "17"},
-
-            {"mc": "1.20.3", "type": "lexforge", "modloader": "forge", "regex": ".*forge.*", "java": "17"},
-            {"mc": "1.20.3", "type": "neoforge", "modloader": "neoforge", "regex": ".*neoforge.*", "java": "17"},
-            {"mc": "1.20.3", "type": "fabric", "modloader": "fabric", "regex": ".*fabric.*", "java": "17"},
-
-            {"mc": "1.20.2", "type": "lexforge", "modloader": "forge", "regex": ".*forge.*", "java": "17"},
-            {"mc": "1.20.2", "type": "neoforge", "modloader": "neoforge", "regex": ".*neoforge.*", "java": "17"},
-            {"mc": "1.20.2", "type": "fabric", "modloader": "fabric", "regex": ".*fabric.*", "java": "17"},
-
-            {"mc": "1.20.1", "type": "lexforge", "modloader": "forge", "regex": ".*forge.*", "java": "17"},
-            {"mc": "1.20.1", "type": "fabric", "modloader": "fabric", "regex": ".*fabric.*", "java": "17"},
-
-            {"mc": "1.19.4", "type": "fabric", "modloader": "fabric", "regex": ".*fabric.*", "java": "17"},
-            {"mc": "1.19.4", "type": "lexforge", "modloader": "forge", "regex": ".*forge.*", "java": "17"},
-
-            {"mc": "1.19.3", "type": "fabric", "modloader": "fabric", "regex": ".*fabric.*", "java": "17"},
-            {"mc": "1.19.3", "type": "lexforge", "modloader": "forge", "regex": ".*forge.*", "java": "17"},
-
-            {"mc": "1.19.2", "type": "fabric", "modloader": "fabric", "regex": ".*fabric.*", "java": "17"},
-            {"mc": "1.19.2", "type": "lexforge", "modloader": "forge", "regex": ".*forge.*", "java": "17"},
-
-            {"mc": "1.19.1", "type": "fabric", "modloader": "fabric", "regex": ".*fabric.*", "java": "17"},
-            {"mc": "1.19.1", "type": "lexforge", "modloader": "forge", "regex": ".*forge.*", "java": "17"},
-
-            {"mc": "1.19", "type": "fabric", "modloader": "fabric", "regex": ".*fabric.*", "java": "17"},
-            {"mc": "1.19", "type": "lexforge", "modloader": "forge", "regex": ".*forge.*", "java": "17"},
-
-            {"mc": "1.18.2", "type": "fabric", "modloader": "fabric", "regex": ".*fabric.*", "java": "17"},
-            {"mc": "1.18.2", "type": "lexforge", "modloader": "forge", "regex": ".*forge.*", "java": "17"},
-
-            {"mc": "1.17.1", "type": "fabric", "modloader": "fabric", "regex": ".*fabric.*", "java": "16"},
-            {"mc": "1.17.1", "type": "lexforge", "modloader": "forge", "regex": ".*forge.*", "java": "16"},
-
-            {"mc": "1.16.5", "type": "fabric", "modloader": "fabric", "regex": ".*fabric.*", "java": "8"},
-            {"mc": "1.16.5", "type": "lexforge", "modloader": "forge", "regex": ".*forge.*", "java": "8"},
-
-            {"mc": "1.12.2", "type": "lexforge", "modloader": "forge", "regex": ".*forge.*", "java": "8"},
-
-            {"mc": "1.8.9", "type": "lexforge", "modloader": "forge", "regex": ".*orge.*", "java": "8"},
-
-            {"mc": "1.7.10", "type": "lexforge", "modloader": "forge", "regex": ".*orge.*", "java": "8"}
-          ]
+          with open('ci-data.json') as f:
+              ci_data = json.load(f)
+          
+          build_data = ci_data['build_data']
+          run_data = ci_data['run_data']
 
           dirs_to_filter = []
+          mc_versions = []
 
           match os.getenv('GITHUB_EVENT_NAME'):
             case 'pull_request':
               if "${{ steps.filter.outcome }}" == "success":
                 # Filter matrices based on the detected changes
                 dirs_to_filter = json.loads('${{ steps.filter.outputs.changes }}')
+                comment_body = os.getenv('PR_COMMENT_BODY')
+                print("PR-comment:", comment_body)
+                if comment_body:
+                  pattern = r'Automatic commit: build and run ([0-9\.]*[0-9]*) in ([0-9_]*[0-9]*)'
+                  match = re.search(pattern, comment_body)
+                  if match:
+                    mc_versions = [ match.group(1) ]
+                    dirs_to_filter = [ match.group(2) ]
+                    print('Matched PR body', mc_versions, dirs_to_filter)
+                  else:
+                    print('PR body did not match')
 
             case 'workflow_dispatch':
               input_dirs = '${{ github.event.inputs.dirs }}'
@@ -238,8 +136,8 @@ jobs:
                 build_matrix['include'], run_matrix['version'] = build_data, run_data
 
           if dirs_to_filter:
-            build_matrix['include'].extend([item for item in build_data if item["dir"] in dirs_to_filter])
-            mc_versions = [item.get("mc") for item in build_matrix["include"] if "mc" in item]
+            build_matrix['include'].extend([item for item in build_data if item["dir"] in dirs_to_filter and (item["mc"] in mc_versions or not mc_versions)])
+            mc_versions = mc_versions if mc_versions else [item.get("mc") for item in build_matrix["include"] if "mc" in item]
             run_matrix['version'].extend([item for item in run_data if item["mc"] in mc_versions])
 
           with open(os.environ['GITHUB_OUTPUT'], 'a') as fh:
@@ -303,6 +201,7 @@ jobs:
         timeout-minutes: 10
         uses: ./
         with:
+          cache-mc: "github"
           mc: ${{ matrix.version.mc }}
           mc-runtime-test: none
           modloader: ${{ matrix.version.modloader }}

.github/workflows/new-mc-version.yml

@@ -0,0 +1,52 @@
+name: Check for new mc version
+on:
+  workflow_dispatch:
+  schedule:
+    - cron: "0 0 * * *"
+
+jobs:
+  check-for-new-mc-version:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+      pull-requests: write
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Set up Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: "3.11"
+
+      - name: Install dependencies
+        run: pip install -r new-versions/requirements.txt
+
+      - name: Run Python script
+        run: python new-versions/main.py
+
+      - name: Check for changes
+        id: git-check
+        run: |
+          git config user.name "github-actions[bot]"
+          git config user.email "github-actions[bot]@users.noreply.github.com"
+          if [[ -n "$(git status --porcelain)" ]]; then
+            echo "changes=true" >> $GITHUB_OUTPUT
+          else
+            echo "changes=false" >> $GITHUB_OUTPUT
+          fi
+
+      - name: Create Pull Request
+        if: steps.git-check.outputs.changes == 'true' && env.LATEST_VERSION != ''
+        uses: peter-evans/create-pull-request@v7
+        with:
+          # TODO: check if this works from the cron job, but it does not work from workflow_dispatch
+          author: 'github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>'
+          assignees: null2264
+          #reviewers: null2264
+          commit-message: "feat: ${{ env.LATEST_VERSION }}"
+          delete-branch: true
+          branch: version-${{ env.LATEST_VERSION }}
+          title: "feat: ${{ env.LATEST_VERSION }}"
+          body: "Automatic commit: build and run ${{ env.LATEST_VERSION }} in ${{ env.LATEST_VERSION_DIR }}"

.github/workflows/run-gametests.yml

@@ -66,6 +66,7 @@ jobs: # TODO: add cleanup job
         timeout-minutes: 3
         uses: ./
         with:
+          cache-mc: "github"
           mc: ${{ matrix.mc }}
           modloader: ${{ matrix.modloader }}
           regex: ${{ matrix.regex }}

.github/workflows/test-local-action.yml

@@ -30,7 +30,7 @@ name: Test local action
         default: "1.3.5+85d85a934f"
       hmc-version:
         description: HeadlessMC version
-        default: "2.4.1"
+        default: "2.7.0"
 
 env:
   java_version: ${{ github.event.inputs.java }}

.gitignore

@@ -41,3 +41,7 @@ replay_*.log
 /libs/
 /logs/
 /.architectury-transformer/
+
+# python
+.python-version
+.venv/

1_20_1/build.gradle

@@ -201,7 +201,7 @@ afterEvaluate {
                 maven {
                     name = 'BuildDirMaven'
                     // this project is in 1_20/1_20_1, so use parent twice
-                    url = rootProject.projectDir.toPath().parent.parent.resolve('build').resolve('maven')
+                    url = rootProject.projectDir.toPath().parent.resolve('build').resolve('maven')
                 }
             } else {
                 maven {

1_21/gradle.properties

@@ -7,4 +7,4 @@ neoforge_version = 11-beta
 lexforge_version = 53.0.7
 fabric_version = 0.15.9
 # Whether to use the headlessmc lwjgl agent or not
-hmc.lwjgl=false
+hmc.lwjgl=false

1_21_5/build.gradle

@@ -4,7 +4,7 @@ plugins {
     id 'com.github.johnrengelman.shadow' version '7.1.2'
     id 'java'
     id 'maven-publish'
-    id 'xyz.wagyourtail.unimined' version '1.3.10-SNAPSHOT'
+    id 'xyz.wagyourtail.unimined' version '1.3.14'
 }
 
 group 'me.earth'

1_21_5/gradle.properties

@@ -3,7 +3,7 @@ org.gradle.jvmargs = -Xmx2G
 minecraft_version = 1.21.5
 # TODO: can this be removed?
 mapping_version = 1
-neoforge_version = 23-beta
+neoforge_version = 24-beta
 lexforge_version = 55.0.3
 fabric_version = 0.16.14
 # Whether to use the headlessmc lwjgl agent or not

1_21_5/src/main/java/me/earth/mc_runtime_test/McGameTestRunner.java

@@ -30,7 +30,7 @@ public class McGameTestRunner {
      * We just exit with an error code if a test fails.
      *
      * @param playerUUID the uuid of the player.
-     * @param server the server to run the tests on.
+     * @param server     the server to run the tests on.
      */
     public static @Nullable MultipleTestTracker runGameTests(UUID playerUUID, MinecraftServer server) throws ExecutionException, InterruptedException, TimeoutException {
         return server.submit(() -> {