diff --git a/.github/workflows/dev_build.yml b/.github/workflows/dev_build.yml index 05f693a..41125af 100644 --- a/.github/workflows/dev_build.yml +++ b/.github/workflows/dev_build.yml @@ -4,21 +4,30 @@ on: push jobs: build: runs-on: ubuntu-latest + steps: - name: Checkout Repository uses: actions/checkout@v4 + with: + persist-credentials: false + + - name: Set up Gradle + uses: gradle/actions/setup-gradle@v4 + - name: Set up Java uses: actions/setup-java@v4 with: + distribution: 'temurin' java-version: 21 - distribution: adopt + - name: Build with Gradle run: ./gradlew build + - name: Release uses: marvinpinto/action-automatic-releases@latest with: repo_token: '${{ secrets.GITHUB_TOKEN }}' - automatic_release_tag: latest + automatic_release_tag: snapshot prerelease: true title: Dev Build files: | diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index e0b5026..cda6812 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -4,18 +4,28 @@ on: pull_request jobs: build: runs-on: ubuntu-latest + steps: - name: Checkout Repository uses: actions/checkout@v4 + with: + persist-credentials: false + - name: Wrapper Validation - uses: gradle/actions/wrapper-validation@v3 + uses: gradle/actions/wrapper-validation@v4 + + - name: Set up Gradle + uses: gradle/actions/setup-gradle@v4 + - name: Set up Java uses: actions/setup-java@v4 with: + distribution: 'temurin' java-version: 21 - distribution: adopt + - name: Build with Gradle run: ./gradlew build + - name: Release uses: actions/upload-artifact@v4 with: diff --git a/README.md b/README.md index 92043ce..809c5f4 100644 --- a/README.md +++ b/README.md @@ -70,10 +70,10 @@ Here is a brief explanation of the ones you might need to modify: You can add your own mixins in the `client` array. - `fabric.mod.json`: Contains the metadata of the addon. Edit the various fields to reflect the metadata of your addon. -- `build.gradle`: Contains the Gradle build script. +- `build.gradle.kts`: Contains the Gradle build script. You can manage the dependencies of the addon here. Remember to keep the `fabric-loom` version up-to-date. -- `gradle.properties`: Contains the properties of the Gradle build. +- `gradle.properties.kts`: Contains the properties of the Gradle build. These will be used by the build script. - `LICENSE`: Contains the license of the addon. You can edit this file to change the license of your addon. diff --git a/build.gradle b/build.gradle deleted file mode 100644 index bf7ed78..0000000 --- a/build.gradle +++ /dev/null @@ -1,59 +0,0 @@ -plugins { - id "fabric-loom" version "1.8-SNAPSHOT" -} - -base { - archivesBaseName = project.archives_base_name - version = project.mod_version - group = project.maven_group -} - -repositories { - maven { - name = "Meteor Dev Releases" - url = "https://maven.meteordev.org/releases" - } - maven { - name = "Meteor Dev Snapshots" - url = "https://maven.meteordev.org/snapshots" - } -} - -dependencies { - // Fabric - minecraft "com.mojang:minecraft:${project.minecraft_version}" - mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2" - modImplementation "net.fabricmc:fabric-loader:${project.loader_version}" - - // Meteor - modImplementation "meteordevelopment:meteor-client:${project.minecraft_version}-SNAPSHOT" -} - -tasks { - processResources { - def propertyMap = [ - "version" : project.version, - "mc_version": project.minecraft_version, - ] - - filesMatching("fabric.mod.json") { - expand(propertyMap) - } - } - - jar { - from("LICENSE") { - rename { "${it}_${project.base.archivesBaseName}" } - } - } - - java { - sourceCompatibility = JavaVersion.VERSION_21 - targetCompatibility = JavaVersion.VERSION_21 - } - - tasks.withType(JavaCompile).configureEach { - it.options.encoding = "UTF-8" - it.options.release = 21 - } -} diff --git a/build.gradle.kts b/build.gradle.kts new file mode 100644 index 0000000..b03b029 --- /dev/null +++ b/build.gradle.kts @@ -0,0 +1,60 @@ +plugins { + id("fabric-loom") version "1.9-SNAPSHOT" +} + +base { + archivesName = properties["archives_base_name"] as String + version = properties["mod_version"] as String + group = properties["maven_group"] as String +} + +repositories { + maven { + name = "meteor-maven" + url = uri("https://maven.meteordev.org/releases") + } + maven { + name = "meteor-maven-snapshots" + url = uri("https://maven.meteordev.org/snapshots") + } +} + +dependencies { + // Fabric + minecraft("com.mojang:minecraft:${properties["minecraft_version"] as String}") + mappings("net.fabricmc:yarn:${properties["yarn_mappings"] as String}:v2") + modImplementation("net.fabricmc:fabric-loader:${properties["loader_version"] as String}") + + // Meteor + modImplementation("meteordevelopment:meteor-client:${properties["minecraft_version"] as String}-SNAPSHOT") +} + +tasks { + processResources { + val propertyMap = mapOf( + "version" to project.version, + "mc_version" to project.property("minecraft_version"), + ) + + filesMatching("fabric.mod.json") { + expand(propertyMap) + } + } + + jar { + val licenseSuffix = project.base.archivesName.get() + from("LICENSE") { + rename { "${it}_${licenseSuffix}" } + } + } + + java { + sourceCompatibility = JavaVersion.VERSION_21 + targetCompatibility = JavaVersion.VERSION_21 + } + + withType { + options.encoding = "UTF-8" + options.release = 21 + } +} diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 943f0cb..a4b76b9 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 9355b41..cea7a79 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew index 65dcd68..f3b75f3 100755 --- a/gradlew +++ b/gradlew @@ -15,6 +15,8 @@ # See the License for the specific language governing permissions and # limitations under the License. # +# SPDX-License-Identifier: Apache-2.0 +# ############################################################################## # @@ -55,7 +57,7 @@ # Darwin, MinGW, and NonStop. # # (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt # within the Gradle project. # # You can find Gradle at https://github.com/gradle/gradle/. @@ -83,10 +85,8 @@ done # This is normally unused # shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} -APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit - -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum @@ -133,10 +133,13 @@ location of your Java installation." fi else JAVACMD=java - which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the location of your Java installation." + fi fi # Increase the maximum file descriptors if we can. @@ -144,7 +147,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then case $MAX_FD in #( max*) # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. - # shellcheck disable=SC3045 + # shellcheck disable=SC2039,SC3045 MAX_FD=$( ulimit -H -n ) || warn "Could not query maximum file descriptor limit" esac @@ -152,7 +155,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then '' | soft) :;; #( *) # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. - # shellcheck disable=SC3045 + # shellcheck disable=SC2039,SC3045 ulimit -n "$MAX_FD" || warn "Could not set maximum file descriptor limit to $MAX_FD" esac @@ -197,11 +200,15 @@ if "$cygwin" || "$msys" ; then done fi -# Collect all arguments for the java command; -# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of -# shell script including quotes and variable substitutions, so put them in -# double quotes to make sure that they get re-expanded; and -# * put everything else in single quotes, so that it's not re-expanded. + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. set -- \ "-Dorg.gradle.appname=$APP_BASE_NAME" \ diff --git a/gradlew.bat b/gradlew.bat index 93e3f59..9d21a21 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -13,6 +13,8 @@ @rem See the License for the specific language governing permissions and @rem limitations under the License. @rem +@rem SPDX-License-Identifier: Apache-2.0 +@rem @if "%DEBUG%"=="" @echo off @rem ########################################################################## @@ -43,11 +45,11 @@ set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 if %ERRORLEVEL% equ 0 goto execute -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 goto fail @@ -57,11 +59,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe if exist "%JAVA_EXE%" goto execute -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 goto fail diff --git a/settings.gradle b/settings.gradle.kts similarity index 60% rename from settings.gradle rename to settings.gradle.kts index b02216b..a7f3f56 100644 --- a/settings.gradle +++ b/settings.gradle.kts @@ -1,8 +1,8 @@ pluginManagement { repositories { maven { - name = 'Fabric' - url = 'https://maven.fabricmc.net/' + name = "Fabric" + url = uri("https://maven.fabricmc.net/") } mavenCentral() gradlePluginPortal()