diff --git a/build.gradle b/build.gradle index 848a233..35e44d7 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,5 @@ plugins { - id 'fabric-loom' version '1.7-SNAPSHOT' + id 'fabric-loom' version '1.8-SNAPSHOT' id 'maven-publish' id 'com.matthewprenger.cursegradle' version '1.4.0' id 'com.modrinth.minotaur' version '2.+' @@ -19,7 +19,17 @@ loom { repositories { maven { url 'https://maven.shedaniel.me/' } maven { url 'https://maven.terraformersmc.com/' } - maven { url 'https://jitpack.io' } + exclusiveContent { + forRepository { + maven { + name = "Modrinth" + url = "https://api.modrinth.com/maven" + } + } + filter { + includeGroup "maven.modrinth" + } + } mavenCentral() } @@ -27,8 +37,6 @@ dependencies { minecraft "com.mojang:minecraft:${project.minecraft_version}" mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2" - implementation(annotationProcessor("io.github.llamalad7:mixinextras-fabric:${mixin_extras_version}")) - modImplementation "net.fabricmc:fabric-loader:${project.loader_version}" modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_api_version}" @@ -40,7 +48,7 @@ dependencies { exclude(group: "net.fabricmc.fabric-api") } - modCompileOnly "com.github.Fourmisain:fabric-seasons:jitpack-SNAPSHOT" + modImplementation "maven.modrinth:fabric-seasons:${project.fabric_seasons_version}" } processResources { @@ -48,7 +56,7 @@ processResources { def stringProperties = providers.gradlePropertiesPrefixedBy('').get() stringProperties.each { inputs.property(it.key, it.value) } - ['fabric.mod.json', "${project.mod_id}.mixins.json"].each { + ['*.mod.json', "*.mixins.json"].each { filesMatching(it) { expand(stringProperties) { escapeBackslash = true @@ -104,6 +112,8 @@ modrinth { } } +tasks.modrinth.dependsOn("build") + curseforge { def CURSEFORGE_TOKEN = System.getenv('CURSEFORGE_TOKEN') if (CURSEFORGE_TOKEN != null) { diff --git a/gradle.properties b/gradle.properties index 7906117..5475f1e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,9 +4,9 @@ org.gradle.warning.mode=all # Fabric Properties # check these on https://fabricmc.net/versions.html -minecraft_version=1.21 -yarn_mappings=1.21+build.1 -loader_version=0.15.11 +minecraft_version=1.21.1 +yarn_mappings=1.21.1+build.3 +loader_version=0.16.7 # Mod Properties mod_version=1.16.2 @@ -14,14 +14,12 @@ maven_group=randommcsomethin mod_id=fallingleaves archives_base_name=fallingleaves -# Required Dependencies +# Dependencies java_version=21 -mixin_extras_version=0.3.5 -fabric_api_version=0.100.1+1.21 -cloth_config_version=15.0.127 - -# Suggested Dependencies -modmenu_version=11.0.0-beta.1 +fabric_api_version=0.106.0+1.21.1 +cloth_config_version=15.0.140 +modmenu_version=11.0.3 +fabric_seasons_version=2.4.2-BETA+1.21 # Publishing modrinth_id=WhbRG4iK diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index e644113..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 a441313..df97d72 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.8-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew index b740cf1..f5feea6 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 +# ############################################################################## # @@ -84,7 +86,8 @@ done # shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) -APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s +' "$PWD" ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum diff --git a/gradlew.bat b/gradlew.bat index 25da30d..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 ##########################################################################