Skip to content

Commit 0913ed7

Browse files
committed
kotlinification has been completed.
1 parent 31f0272 commit 0913ed7

File tree

4 files changed

+42
-32
lines changed

4 files changed

+42
-32
lines changed

build.gradle.kts

+1-12
Original file line numberDiff line numberDiff line change
@@ -46,21 +46,10 @@ subprojects {
4646
maven { url = uri("https://maven.maxhenkel.de/repository/public") } // Simple Voice Chat
4747
}
4848

49-
val loom = project.extensions.getByName<LoomGradleExtensionAPI>("loom")
50-
51-
// loom {
52-
// silentMojangMappingsLicense()
53-
// runs.configureEach {
54-
// vmArg("-Dmixin.debug.export=true")
55-
// vmArg("-Dmixin.env.remapRefMap=true")
56-
// vmArg("-Dmixin.env.refMapRemappingFile=${projectDir}/build/createSrgToMcp/output.srg")
57-
// }
58-
// }
59-
6049
dependencies {
6150
"minecraft"("com.mojang:minecraft:${"minecraft_version"()}")
6251
// layered mappings - Mojmap names, parchment and QM docs and parameters
63-
"mappings"(loom.layered {
52+
"mappings"(project.extensions.getByName<LoomGradleExtensionAPI>("loom").layered {
6453
mappings("org.quiltmc:quilt-mappings:${"minecraft_version"()}+build.${"qm_version"()}:intermediary-v2")
6554
parchment("org.parchmentmc.data:parchment-${"minecraft_version"()}:${"parchment_version"()}@zip")
6655
officialMojangMappings { nameSyntheticMembers = false }

common/build.gradle.kts

+11-6
Original file line numberDiff line numberDiff line change
@@ -65,12 +65,17 @@ tasks.processResources {
6565
exclude("**/*.bbmodel", "**/*.lnk", "**/*.xcf", "**/*.md", "**/*.txt", "**/*.blend", "**/*.blend1", "**/PlatformMethods.class")
6666

6767
// Minify all .json files in built jars
68-
//fixme
69-
// doLast {
70-
// fileTree(dir = outputs.files.asPath, include = "**/*.json").forEach { file ->
71-
// file.writeText(JsonOutput.toJson(JsonSlurper().parseText(file.readText())))
72-
// }
73-
// }
68+
doLast {
69+
val outputDir = File(outputs.files.asPath)
70+
outputDir.walkTopDown()
71+
.filter { it.isFile && it.extension == "json" }
72+
.forEach { file ->
73+
val jsonContent = file.readText()
74+
val parsedJson = JsonSlurper().parseText(jsonContent)
75+
val updatedJson = JsonOutput.toJson(parsedJson)
76+
file.writeText(updatedJson)
77+
}
78+
}
7479
}
7580

7681
sourceSets.main {

fabric/build.gradle.kts

+23-14
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
import net.fabricmc.loom.api.LoomGradleExtensionAPI
2+
import net.fabricmc.loom.configuration.FabricApiExtension.DataGenerationSettings
13
import java.io.ByteArrayOutputStream
24

35
plugins {
@@ -14,20 +16,27 @@ loom {
1416
val common = project(":common")
1517
accessWidenerPath = common.loom.accessWidenerPath
1618

17-
//fixme
18-
// runs {
19-
// datagen {
20-
// client()
21-
//
22-
// name = "Minecraft Data"
23-
// vmArg = "-Dfabric-api.datagen"
24-
// vmArg = "-Dfabric-api.datagen.output-dir=${common.file("src/generated/resources")}"
25-
// vmArg = "-Dfabric-api.datagen.modid=railways"
26-
// vmArg = "-Dporting_lib.datagen.existing_resources=${common.file("src/main/resources")}"
27-
//
28-
// environmentVariable("DATAGEN", "TRUE")
29-
// }
30-
// }
19+
silentMojangMappingsLicense()
20+
runs.configureEach {
21+
vmArg("-Dmixin.debug.export=true")
22+
vmArg("-Dmixin.env.remapRefMap=true")
23+
vmArg("-Dmixin.env.refMapRemappingFile=${projectDir}/build/createSrgToMcp/output.srg")
24+
}
25+
26+
27+
runs {
28+
create("datagen") {
29+
client()
30+
31+
name = "Minecraft Data"
32+
vmArg("-Dfabric-api.datagen")
33+
vmArg("-Dfabric-api.datagen.output-dir=${common.file("src/generated/resources")}")
34+
vmArg("-Dfabric-api.datagen.modid=railways")
35+
vmArg("-Dporting_lib.datagen.existing_resources=${common.file("src/main/resources")}")
36+
37+
environmentVariable("DATAGEN", "TRUE")
38+
}
39+
}
3140
}
3241

3342
val common: Configuration by configurations.creating

forge/build.gradle.kts

+7
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,13 @@ loom {
99
val common = project(":common")
1010
accessWidenerPath = common.loom.accessWidenerPath
1111

12+
silentMojangMappingsLicense()
13+
runs.configureEach {
14+
vmArg("-Dmixin.debug.export=true")
15+
vmArg("-Dmixin.env.remapRefMap=true")
16+
vmArg("-Dmixin.env.refMapRemappingFile=${projectDir}/build/createSrgToMcp/output.srg")
17+
}
18+
1219
forge {
1320
mixinConfig("railways-common.mixins.json")
1421
mixinConfig("railways.mixins.json")

0 commit comments

Comments
 (0)