diff --git a/.idea/.gitignore b/.idea/.gitignore deleted file mode 100644 index 72e8ffc..0000000 --- a/.idea/.gitignore +++ /dev/null @@ -1 +0,0 @@ -* diff --git a/build.gradle.kts b/build.gradle.kts index d3b2436..695c711 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -30,9 +30,8 @@ subprojects { maven("https://maven.resourcefulbees.com/repository/terrarium/") { content { includeGroupAndSubgroups("earth.terrarium") } } - exclusiveContent { - forRepository { maven("https://api.modrinth.com/maven") { name = "Modrinth" } } - filter { includeGroup("maven.modrinth") } + maven("https://api.modrinth.com/maven") { + content { includeGroup("maven.modrinth") } } } } diff --git a/settings.gradle.kts b/settings.gradle.kts index f139f6a..632b234 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -1,123 +1,25 @@ -pluginManagement { - repositories { - mavenCentral() - gradlePluginPortal() - maven("https://maven.fabricmc.net/") { name = "Fabric" } - maven("https://maven.quiltmc.org/repository/release") { name = "Quilt" } - maven("https://maven.minecraftforge.net/") { name = "Forge" } - maven("https://repo.spongepowered.org/repository/maven-public/") { name = "Sponge" } - } - - resolutionStrategy { - eachPlugin { - if (requested.id.id == "org.spongepowered.mixin") { - useModule("org.spongepowered:mixingradle:${requested.version}") - } - } - } -} - -dependencyResolutionManagement.versionCatalogs.create("catalog") { - // https://plugins.gradle.org/plugin/org.jetbrains.gradle.plugin.idea-ext - plugin("idea-ext", "org.jetbrains.gradle.plugin.idea-ext").version("1.1.7") - - // https://plugins.gradle.org/plugin/org.jetbrains.kotlin.jvm - val kotlin = "1.9.21" - version("kotlin", kotlin) - plugin("kotlin-jvm", "org.jetbrains.kotlin.jvm").version(kotlin) - plugin("kotlin-plugin-serialization", "org.jetbrains.kotlin.plugin.serialization") - .version(kotlin) - - // https://plugins.gradle.org/plugin/com.diffplug.spotless - plugin("spotless", "com.diffplug.spotless").version("6.23.3") - - // https://github.com/jmongard/Git.SemVersioning.Gradle - plugin("semver", "com.github.jmongard.git-semver-plugin").version("0.11.0") - - // https://fabricmc.net/develop/ - plugin("fabric-loom", "fabric-loom").version("1.4.+") +apply( + from = "https://github.com/SettingDust/FabricKotlinTemplate/raw/main/common.settings.gradle.kts" +) - val minecraft = "1.20.1" - version("minecraft", minecraft) - library("minecraft", "com.mojang", "minecraft").version(minecraft) - - library("yarn", "net.fabricmc", "yarn").version("$minecraft+build.10") - - library("fabric-loader", "net.fabricmc", "fabric-loader").version("0.15.3") - - val fabricApi = "0.90.7" - library("fabric-api", "net.fabricmc.fabric-api", "fabric-api").version("$fabricApi+$minecraft") - - // https://modrinth.com/mod/fabric-language-kotlin/versions - library( - "fabric-kotlin", - "net.fabricmc", - "fabric-language-kotlin", - ) - .version("1.10.16+kotlin.$kotlin") - - // https://modrinth.com/mod/modmenu/versions?g=1.20.1 - library("modmenu", "com.terraformersmc", "modmenu").version("7.2.2") - - /** - * *********** - * Quilt - * ************ - */ - // https://github.com/QuiltMC/quilt-loom - // Using 1.2 for https://github.com/QuiltMC/quilt-loom/issues/38 - plugin("quilt-loom", "org.quiltmc.loom").version("1.2.+") - - // https://github.com/QuiltMC/quilt-loader/tags - library( - "quilt-loader", - "org.quiltmc", - "quilt-loader", - ) - .version("0.23.0-beta.1") - - // https://modrinth.com/mod/qsl/versions?g=1.20.1 - library( - "quilt-fabric-api", - "org.quiltmc.quilted-fabric-api", - "quilted-fabric-api", - ) - .version("7.4.0+0.90.0-$minecraft") - - /** - * *********** - * Forge - * ************ - */ - // https://maven.neoforged.net/#/releases/net/neoforged/gradle/userdev - plugin("forge-gradle", "net.minecraftforge.gradle").version("6.+") - - // https://files.minecraftforge.net/net/minecraftforge/forge/index_1.20.1.html - library("forge", "net.minecraftforge", "forge").version("$minecraft-47.2.18") - - // https://github.com/SpongePowered/MixinGradle - plugin("mixin-gradle", "org.spongepowered.mixin").version("0.7-SNAPSHOT") - - // https://modrinth.com/mod/connector/versions - library("connector", "dev.su5ed.sinytra", "Connector").version("1.0.0-beta.32+$minecraft") - // https://modrinth.com/mod/forgified-fabric-api/versions - library("forgified-fabric-api", "dev.su5ed.sinytra.fabric-api", "fabric-api") - .version("$fabricApi+1.10.3+$minecraft") - // https://modrinth.com/mod/connector-extras/versions - library("connector-extras", "maven.modrinth", "connector-extras").version("1.8.0+$minecraft") +val minecraft = settings.extra["minecraft"] +val kotlin = settings.extra["kotlin"] +dependencyResolutionManagement.versionCatalogs.named("catalog") { /** * *********** * Libraries * ************ */ - val heracles = "1.1.7" - library("heracles-fabric", "earth.terrarium.heracles", "heracles-fabric-$minecraft") - .version(heracles) - library("heracles-forge", "earth.terrarium.heracles", "heracles-forge-$minecraft") - .version(heracles) - - val resourcefullib = "2.1.20" + // https://modrinth.com/mod/heracles/versions + val heracles = "1.1.11" + library("heracles-fabric", "maven.modrinth", "heracles") + .version("$heracles-fabric") + library("heracles-forge", "maven.modrinth", "heracles") + .version("$heracles-forge") + + // https://modrinth.com/mod/resourceful-lib/versions + val resourcefullib = "2.1.23" library( "resourceful-lib-fabric", "com.teamresourceful.resourcefullib", @@ -139,13 +41,14 @@ dependencyResolutionManagement.versionCatalogs.create("catalog") { // https://modrinth.com/mod/guard-villagers-(fabricquilt)/versions library("guard-villagers", "maven.modrinth", "guard-villagers-(fabricquilt)") - .version("2.0.8-$minecraft") + .version("2.0.9-$minecraft") } plugins { + // https://plugins.gradle.org/plugin/org.gradle.toolchains.foojay-resolver-convention id("org.gradle.toolchains.foojay-resolver-convention") version "0.8.0" // https://github.com/DanySK/gradle-pre-commit-git-hooks - id("org.danilopianini.gradle-pre-commit-git-hooks") version "2.0.0" + id("org.danilopianini.gradle-pre-commit-git-hooks") version "2.0.3" } gitHooks {