diff --git a/.github/workflows/test-local-action.yml b/.github/workflows/test-local-action.yml index a889bed..5076e67 100644 --- a/.github/workflows/test-local-action.yml +++ b/.github/workflows/test-local-action.yml @@ -33,7 +33,7 @@ name: Test local action default: "1.3.5+85d85a934f" hmc-version: description: HeadlessMC version - default: "2.9.0" + default: "2.10.0" env: java_version: ${{ github.event.inputs.java }} diff --git a/26.2/.gitignore b/26_2/.gitignore similarity index 100% rename from 26.2/.gitignore rename to 26_2/.gitignore diff --git a/26.2/build.gradle b/26_2/build.gradle similarity index 100% rename from 26.2/build.gradle rename to 26_2/build.gradle diff --git a/26.2/gradle.properties b/26_2/gradle.properties similarity index 100% rename from 26.2/gradle.properties rename to 26_2/gradle.properties diff --git a/26.2/gradle/wrapper/gradle-wrapper.jar b/26_2/gradle/wrapper/gradle-wrapper.jar similarity index 100% rename from 26.2/gradle/wrapper/gradle-wrapper.jar rename to 26_2/gradle/wrapper/gradle-wrapper.jar diff --git a/26.2/gradle/wrapper/gradle-wrapper.properties b/26_2/gradle/wrapper/gradle-wrapper.properties similarity index 100% rename from 26.2/gradle/wrapper/gradle-wrapper.properties rename to 26_2/gradle/wrapper/gradle-wrapper.properties diff --git a/26.2/gradlew b/26_2/gradlew old mode 100644 new mode 100755 similarity index 100% rename from 26.2/gradlew rename to 26_2/gradlew diff --git a/26.2/gradlew.bat b/26_2/gradlew.bat similarity index 100% rename from 26.2/gradlew.bat rename to 26_2/gradlew.bat diff --git a/26.2/settings.gradle b/26_2/settings.gradle similarity index 100% rename from 26.2/settings.gradle rename to 26_2/settings.gradle diff --git a/26.2/src/fabric/resources/fabric.mod.json b/26_2/src/fabric/resources/fabric.mod.json similarity index 100% rename from 26.2/src/fabric/resources/fabric.mod.json rename to 26_2/src/fabric/resources/fabric.mod.json diff --git a/26.2/src/lexforge/java/me/earth/mc_runtime_test/forge/ForgeMod.java b/26_2/src/lexforge/java/me/earth/mc_runtime_test/forge/ForgeMod.java similarity index 100% rename from 26.2/src/lexforge/java/me/earth/mc_runtime_test/forge/ForgeMod.java rename to 26_2/src/lexforge/java/me/earth/mc_runtime_test/forge/ForgeMod.java diff --git a/26.2/src/lexforge/resources/META-INF/mods.toml b/26_2/src/lexforge/resources/META-INF/mods.toml similarity index 100% rename from 26.2/src/lexforge/resources/META-INF/mods.toml rename to 26_2/src/lexforge/resources/META-INF/mods.toml diff --git a/26.2/src/lexforge/resources/pack.mcmeta b/26_2/src/lexforge/resources/pack.mcmeta similarity index 100% rename from 26.2/src/lexforge/resources/pack.mcmeta rename to 26_2/src/lexforge/resources/pack.mcmeta diff --git a/26.2/src/main/java/me/earth/mc_runtime_test/McGameTestRunner.java b/26_2/src/main/java/me/earth/mc_runtime_test/McGameTestRunner.java similarity index 100% rename from 26.2/src/main/java/me/earth/mc_runtime_test/McGameTestRunner.java rename to 26_2/src/main/java/me/earth/mc_runtime_test/McGameTestRunner.java diff --git a/26.2/src/main/java/me/earth/mc_runtime_test/mixin/ICreateWorldScreen.java b/26_2/src/main/java/me/earth/mc_runtime_test/mixin/ICreateWorldScreen.java similarity index 100% rename from 26.2/src/main/java/me/earth/mc_runtime_test/mixin/ICreateWorldScreen.java rename to 26_2/src/main/java/me/earth/mc_runtime_test/mixin/ICreateWorldScreen.java diff --git a/26.2/src/main/java/me/earth/mc_runtime_test/mixin/MixinGui.java b/26_2/src/main/java/me/earth/mc_runtime_test/mixin/MixinGui.java similarity index 100% rename from 26.2/src/main/java/me/earth/mc_runtime_test/mixin/MixinGui.java rename to 26_2/src/main/java/me/earth/mc_runtime_test/mixin/MixinGui.java diff --git a/26.2/src/main/java/me/earth/mc_runtime_test/mixin/MixinMinecraft.java b/26_2/src/main/java/me/earth/mc_runtime_test/mixin/MixinMinecraft.java similarity index 100% rename from 26.2/src/main/java/me/earth/mc_runtime_test/mixin/MixinMinecraft.java rename to 26_2/src/main/java/me/earth/mc_runtime_test/mixin/MixinMinecraft.java diff --git a/26.2/src/main/resources/mc_runtime_test.mixins.json b/26_2/src/main/resources/mc_runtime_test.mixins.json similarity index 100% rename from 26.2/src/main/resources/mc_runtime_test.mixins.json rename to 26_2/src/main/resources/mc_runtime_test.mixins.json diff --git a/26.2/src/neoforge/java/me/earth/mc_runtime_test/neoforge/NeoForgeMod.java b/26_2/src/neoforge/java/me/earth/mc_runtime_test/neoforge/NeoForgeMod.java similarity index 100% rename from 26.2/src/neoforge/java/me/earth/mc_runtime_test/neoforge/NeoForgeMod.java rename to 26_2/src/neoforge/java/me/earth/mc_runtime_test/neoforge/NeoForgeMod.java diff --git a/26.2/src/neoforge/resources/META-INF/neoforge.mods.toml b/26_2/src/neoforge/resources/META-INF/neoforge.mods.toml similarity index 100% rename from 26.2/src/neoforge/resources/META-INF/neoforge.mods.toml rename to 26_2/src/neoforge/resources/META-INF/neoforge.mods.toml diff --git a/26.2/src/neoforge/resources/pack.mcmeta b/26_2/src/neoforge/resources/pack.mcmeta similarity index 100% rename from 26.2/src/neoforge/resources/pack.mcmeta rename to 26_2/src/neoforge/resources/pack.mcmeta diff --git a/README.md b/README.md index 0afa3f6..9cfe13d 100644 --- a/README.md +++ b/README.md @@ -34,7 +34,7 @@ This project helps streamline that process by automating the client launch and b ### Supported Minecraft Versions and Modloaders | Version | Forge | Fabric | NeoForge | |-----------------|----------------|----------------|----------------| -| 26.1 - 26.1.2 | ✔️ | ✔️ | ✔️ | +| 26.1 - 26.2 | ✔️ | ✔️ | ✔️ | | 1.21 - 1.21.11 | ✔️ | ✔️ | ✔️ | | 1.20.2 - 1.20.6 | ✔️ | ✔️ | ✔️ | | 1.20.1 | ✔️ | ✔️ | ⚠️ | @@ -113,7 +113,7 @@ The following table summarizes the available inputs for customization: | `fabric-api` | Fabric API version to download or none | | `0.97.0`, `none` | | `fabric-gametest-api` | Fabric GameTest API version or none | | `1.3.5+85d85a934f`, `none` | | `download-hmc` | Download HeadlessMC | | `true`, `false` | -| `hmc-version` | HeadlessMC version | | `2.9.0`, `1.5.0` | +| `hmc-version` | HeadlessMC version | | `2.10.0`, `1.5.0` | | `cache-mc` | Cache `.minecraft`
(`true` defaults to `blacksmith`) | | `github`, `blacksmith`, `true`, `false` | --- diff --git a/action.yml b/action.yml index 1e87f6f..a519605 100644 --- a/action.yml +++ b/action.yml @@ -41,7 +41,7 @@ inputs: default: "true" hmc-version: description: HeadlessMC version - default: "2.9.0" + default: "2.10.0" cache-mc: description: Cache .minecraft (blacksmith, github, true (defaults to blacksmith), false) default: "github" @@ -56,6 +56,7 @@ runs: cat <> HeadlessMC/config.properties hmc.java.versions=$JAVA_HOME/bin/java hmc.gamedir=$PWD/run + hmc.mcdir=$HOME/.minecraft hmc.offline=true hmc.rethrow.launch.exceptions=true hmc.exit.on.failed.command=true @@ -68,9 +69,11 @@ runs: New-Item -ItemType Directory -Force -Path HeadlessMC, run/mods | Out-Null $currentDir = (Get-Location).Path -replace '\\', '\\\\' $javaPath = "$env:JAVA_HOME\bin\java.exe" -replace '\\', '\\\\' + $mcDir = "$HOME\.minecraft" -replace '\\', '\\\\' $config = @( "hmc.java.versions=$javaPath", "hmc.gamedir=$currentDir\\run", + "hmc.mcdir=$mcDir", "hmc.offline=true", "hmc.rethrow.launch.exceptions=true", "hmc.exit.on.failed.command=true" @@ -95,15 +98,15 @@ runs: name: Cache Minecraft uses: useblacksmith/cache@c5fe29eb0efdf1cf4186b9f7fcbbcbc0cf025662 # v5 with: - path: /home/runner/.minecraft - key: ${{ inputs.mc }}-${{ inputs.modloader }}-hmc + path: ~/.minecraft + key: ${{ runner.os }}-${{ inputs.mc }}-${{ inputs.modloader }}-hmc - if: inputs.cache-mc == 'github' name: Cache Minecraft uses: actions/cache@v4 with: - path: /home/runner/.minecraft - key: ${{ inputs.mc }}-${{ inputs.modloader }}-hmc + path: ~/.minecraft + key: ${{ runner.os }}-${{ inputs.mc }}-${{ inputs.modloader }}-hmc - name: Download ${{ inputs.modloader }}-${{ inputs.mc }} run: |