Skip to content

Commit bff837d

Browse files
committed
build: new gradle
1 parent f44a8e3 commit bff837d

11 files changed

Lines changed: 70 additions & 45 deletions

File tree

build.gradle.kts

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@ repositories {
1616
dependencies {
1717
if (mod.isFabric) {
1818
val flkVersion = project.properties["flk_version"].toString()
19-
modCompileClasspath("net.fabricmc:fabric-language-kotlin:$flkVersion+kotlin.$kotlinVersion")
19+
20+
implementMod("net.fabricmc:fabric-language-kotlin:$flkVersion+kotlin.$kotlinVersion")
2021
} else {
2122
val klfVersion = project.properties["klf_version"].toString()
2223
val klfLoaderVersion = project.properties["klf_loader_version"].toString()
@@ -26,10 +27,16 @@ dependencies {
2627

2728
tasks.processResources {
2829
if (mod.isFabric) expand(
29-
"fabric_loader" to mod.prop("loader_version"),
30-
"java_version" to java.toolchain.languageVersion.toString(),
31-
"fabric_api" to mod.prop("fabric_version"), "flk_version" to "${mod.prop("flk_version")}+kotlin.$kotlinVersion"
30+
"fabric_loader" to mod.prop("loader_version"), "java_version" to java.toolchain
31+
.languageVersion.toString(), "fabric_api" to mod.prop("fabric_version"),
32+
"flk_version" to "${mod.prop("flk_version")}+kotlin.$kotlinVersion"
33+
) else expand(
34+
"neoforge_version" to mod.prop("loader_version"), "klf_version" to mod.prop("klf_version"),
3235
)
3336
}
3437

35-
38+
fun DependencyHandlerScope.implementMod(dependencyNotation: Any) {
39+
if (stonecutter.eval(mod.minecraftVersion, ">=26.1.0"))
40+
implementation(dependencyNotation)
41+
else "modImplementation"(dependencyNotation)
42+
}

gradle.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Done to increase the memory available to Gradle.
2-
org.gradle.jvmargs=-Xmx6G
3-
org.gradle.parallel=false
2+
org.gradle.jvmargs=-Xmx2G
3+
org.gradle.parallel=true
44

55
# Mod properties
66
kotlinVersion=2.3.21

settings.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ stonecutter {
3939
.filter {
4040
val props = Properties()
4141
props.load(it.absoluteFile.inputStream())
42-
!props.containsKey("build.ignore") && props["build.ignore"].toString() != "true"
42+
!props.containsKey("build.ignore") || props.getProperty("build.ignore", "false") != "true"
4343
}.forEach {
4444
val props = Properties()
4545
props.load(it.absoluteFile.inputStream())

src/main/kotlin/init/post/loot/SimpleGenerator.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ object SimpleGenerator {
144144
)
145145
}
146146
"fortune" -> functions += MCApplyBonus(enchantment = "minecraft:fortune", formula = "minecraft:ore_drops")
147-
"explosion_decay" -> functions += MCFunction.SingletonFunction("minecraft:explosion_decay")
147+
"explosion_decay" -> functions += MCExplosionDecayFunction
148148
} }
149149

150150
return MCEntry(
Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
modLoader = "klf"
2+
loaderVersion = "[${klf_version},)"
3+
issueTrackerURL = "https://github.com/AlgorithmLX/${name}/issues"
4+
license = "ARR"
5+
6+
[[mods]]
7+
modId = "${id}"
8+
version = "${version}"
9+
displayName = "${name}"
10+
authors = "AlgorithmLX"
11+
description = '''
12+
${description}
13+
'''
14+
logoFile = "logo.png"
15+
16+
[[dependencies.${id}]]
17+
modId = "neoforge"
18+
type = "required"
19+
versionRange = "[${neoforge_version},)"
20+
ordering = "NONE"
21+
side = "BOTH"
22+
23+
[[dependencies.${id}]]
24+
modId = "minecraft"
25+
type = "required"
26+
versionRange = "[${minecraftVersion},)"
27+
ordering = "NONE"
28+
side = "BOTH"
29+
30+
[[mixins]]
31+
config = "dimore.mixins.json"
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"issues": "https://github.com/AlgorithmLX/${mod_name}/issues",
1010
"sources": "https://github.com/AlgorithmLX/${mod_name}/"
1111
},
12-
"icon": "${id}-logo.png",
12+
"icon": "logo.png",
1313
"license": "All-Rights-Reserved",
1414
"environment": "*",
1515
"depends": {

src/main/templates/META-INF/neoforge.mods.toml

Lines changed: 0 additions & 31 deletions
This file was deleted.
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
mod.platforms=fabric,neoforge
2+
build.ignore=false
3+
4+
minecraft_version=1.21.1
5+
loader_version=0.17.3
6+
7+
fabric_version=0.116.7+1.21.1
8+
9+
neoforge_version=21.1.213
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
mod.platforms=fabric,neoforge
2+
build.ignore=false
3+
4+
minecraft_version=1.21.11
5+
loader_version=0.19.2
6+
7+
fabric_version=0.141.1+1.21.11
8+
9+
neoforge_version=21.11.36-beta

0 commit comments

Comments
 (0)