Skip to content

Commit

Permalink
Update properties
Browse files Browse the repository at this point in the history
kikugie committed Aug 31, 2024
1 parent 4f8bd5e commit 9acfef5
Showing 7 changed files with 31 additions and 30 deletions.
30 changes: 15 additions & 15 deletions build.gradle.kts
Original file line number Diff line number Diff line change
@@ -37,27 +37,27 @@ loom {
}

repositories {
exclusiveContent {
forRepository { maven("https://www.cursemaven.com") { name = "CurseForge" } }
filter { includeGroup("curse.maven") }
}
exclusiveContent {
forRepository { maven("https://api.modrinth.com/maven") { name = "Modrinth" } }
filter { includeGroup("maven.modrinth") }
fun strictMaven(url: String, alias: String, vararg groups: String) = exclusiveContent {
forRepository { maven(url) { name = alias } }
filter { groups.forEach(::includeGroup) }
}
strictMaven("https://www.cursemaven.com", "CurseForge", "curse.maven")
strictMaven("https://api.modrinth.com/maven", "Modrinth", "maven.modrinth")
}

dependencies {
fun fapi(vararg modules: String) {
modules.forEach { fabricApi.module(it, deps["fapi"]) }
fun fapi(vararg modules: String) = modules.forEach {
modImplementation(fabricApi.module(it, deps["fabric_api"]))
}

minecraft("com.mojang:minecraft:${mcVersion}")
mappings("net.fabricmc:yarn:${mcVersion}+build.${deps["yarn_build"]}:v2")
minecraft("com.mojang:minecraft:$mcVersion")
mappings("net.fabricmc:yarn:$mcVersion+build.${deps["yarn_build"]}:v2")
modImplementation("net.fabricmc:fabric-loader:${deps["fabric_loader"]}")

modLocalRuntime("net.fabricmc.fabric-api:fabric-api:${deps["fabric_api"]}")
vineflowerDecompilerClasspath("org.vineflower:vineflower:1.10.1")
fapi(
// Add modules from https://github.com/FabricMC/fabric
"fabric-lifecycle-events-v1",
)
}

loom {
@@ -68,15 +68,15 @@ loom {
}

runConfigs.all {
ideConfigGenerated(stonecutter.current.isActive)
ideConfigGenerated(true)
vmArgs("-Dmixin.debug.export=true")
runDir = "../../run"
}
}

java {
withSourcesJar()
val java = if (stonecutter.compare(mcVersion, "1.20.6") >= 0) JavaVersion.VERSION_21 else JavaVersion.VERSION_17
val java = if (stonecutter.eval(mcVersion, ">=1.20.6")) JavaVersion.VERSION_21 else JavaVersion.VERSION_17
targetCompatibility = java
sourceCompatibility = java
}
5 changes: 4 additions & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
# Done to increase the memory available to gradle.
org.gradle.jvmargs=-Xmx1G
org.gradle.parallel=true
org.gradle.caching=true
org.gradle.caching.debug=false
org.gradle.configureondemand=true

# Mod properties
mod.version=0.1.0
@@ -16,7 +19,7 @@ mod.mc_title=[VERSIONED]
mod.mc_targets=[VERSIONED]

# Global dependencies
deps.fabric_loader=0.15.11
deps.fabric_loader=0.16.3

# Versioned dependencies
deps.yarn_build=[VERSIONED]
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -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-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
8 changes: 3 additions & 5 deletions settings.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
import dev.kikugie.stonecutter.StonecutterSettings

pluginManagement {
repositories {
mavenCentral()
@@ -9,15 +7,15 @@ pluginManagement {
}

plugins {
id("dev.kikugie.stonecutter") version "0.4.3"
id("dev.kikugie.stonecutter") version "0.4.4"
}

extensions.configure<StonecutterSettings> {
stonecutter {
kotlinController = true
centralScript = "build.gradle.kts"

shared {
versions("1.20.1", "1.20.4", "1.20.6", "1.21")
versions("1.20.1", "1.20.4", "1.20.6", "1.21.1")
}
create(rootProject)
}
4 changes: 2 additions & 2 deletions stonecutter.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
plugins {
id("dev.kikugie.stonecutter")
id("fabric-loom") version "1.7-SNAPSHOT" apply false
//id("dev.kikugie.j52j") version "1.0" apply false // Enables asset processing by writing json5 files
//id("me.modmuss50.mod-publish-plugin") version "0.5.+" apply false // Publishes builds to hosting websites
//id("dev.kikugie.j52j") version "1.0.2" apply false // Enables asset processing by writing json5 files
//id("me.modmuss50.mod-publish-plugin") version "0.7.+" apply false // Publishes builds to hosting websites
}
stonecutter active "1.20.1" /* [SC] DO NOT EDIT */

6 changes: 6 additions & 0 deletions versions/1.21.1/gradle.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
deps.yarn_build=3
deps.fabric_api=0.103.0+1.21.1

mod.mc_dep=>=1.21 <=1.21.1
mod.mc_title=1.21.1
mod.mc_targets=1.21 1.21.1
6 changes: 0 additions & 6 deletions versions/1.21/gradle.properties

This file was deleted.

0 comments on commit 9acfef5

Please sign in to comment.