Skip to content

Commit f1daa11

Browse files
committed
Fix possible bug & update properties
1 parent e582262 commit f1daa11

4 files changed

Lines changed: 19 additions & 16 deletions

File tree

build.gradle

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
task openBuildDirFabric {
22
doLast {
3-
def buildDir = file("D:/ProgrammingProjects/TimeLoop/fabric/build/libs").absolutePath
43
if (System.properties['os.name'].toString().toLowerCase().contains('windows')) {
4+
def buildDir = file("${project.projectDir}/fabric/build/libs").absolutePath
55
def command = ['explorer', buildDir]
66
new ProcessBuilder(command).start()
77
} else {
@@ -12,8 +12,8 @@ task openBuildDirFabric {
1212

1313
task openBuildDirNeoForge {
1414
doLast {
15-
def buildDir = file("D:/ProgrammingProjects/TimeLoop/neoforge/build/libs").absolutePath
1615
if (System.properties['os.name'].toString().toLowerCase().contains('windows')) {
16+
def buildDir = file("${project.projectDir}/neoforge/build/libs").absolutePath
1717
def command = ['explorer', buildDir]
1818
new ProcessBuilder(command).start()
1919
} else {
@@ -26,7 +26,7 @@ subprojects {
2626
apply plugin: 'java'
2727

2828
base {
29-
archivesName = "${archives_name}-${project.name.toUpperCase()}-${minecraft_version}"
29+
archivesName = "${archives_name}-${project.name.toLowerCase()}-${minecraft_version}"
3030
}
3131

3232
processResources {
@@ -48,8 +48,7 @@ subprojects {
4848
"archives_name" : archives_name,
4949

5050
"minecraft_version" : minecraft_version,
51-
"yarn_mappings" : yarn_mappings,
52-
51+
5352
"fabric_loader_version" : fabric_loader_version,
5453
"fabric_api_version" : fabric_api_version,
5554
"neoforge_version" : neoforge_version,
@@ -64,7 +63,7 @@ subprojects {
6463
jar {
6564
exclude "assets/time-loop/icon.psd"
6665
}
67-
66+
6867
if (project.name == "fabric") {
6968
tasks.named("jar") {
7069
finalizedBy rootProject.tasks.named("openBuildDirFabric")
@@ -74,7 +73,7 @@ subprojects {
7473
finalizedBy rootProject.tasks.named("openBuildDirNeoForge")
7574
}
7675
}
77-
76+
7877
if (project.name in ["fabric", "neoforge"]) {
7978
dependencies
8079
{
@@ -98,4 +97,4 @@ subprojects {
9897
tasks.withType(JavaCompile).configureEach {
9998
it.options.release = 21
10099
}
101-
}
100+
}

common/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ version = project.mod_version // Set version from root project
1414

1515
dependencies {
1616
minecraft "com.mojang:minecraft:${minecraft_version}"
17-
// mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2"
17+
1818
mappings loom.officialMojangMappings()
1919

2020
compileOnly "org.spongepowered:mixin:0.8.5:processor"

fabric/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ dependencies {
2222

2323
mappings loom.layered {
2424
officialMojangMappings()
25-
parchment("org.parchmentmc.data:parchment-${parchment_minecraft}:${parchment_version}@zip")
25+
parchment("org.parchmentmc.data:parchment-${minecraft_version}:${parchment_version}@zip")
2626
}
2727

2828

gradle.properties

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,22 +18,26 @@ enabled_platforms = fabric,neoforge
1818

1919
# Minecraft properties
2020
minecraft_version = 1.21.1
21-
yarn_mappings = 1.21.1+build.1
2221

23-
# Dependencies
22+
# Loaders
23+
# https://github.com/FabricMC/fabric-loader/releases
24+
# https://modrinth.com/mod/fabric-api/versions?c=release
25+
# https://projects.neoforged.net/neoforged/neoforge
2426
fabric_loader_version = 0.16.14
2527
fabric_api_version = 0.115.6+1.21.1
2628
neoforge_version = 21.1.145
27-
yarn_mappings_patch_neoforge_version = 1.21+build.4
28-
29-
fabric_loom_version=1.10-SNAPSHOT
30-
neoforge_moddev_version=2.0.80
3129

3230
# Mappings
3331
# https://parchmentmc.org/docs/getting-started
3432
parchment_minecraft=1.21.1
3533
parchment_version=2024.11.17
3634

35+
# Gradle dependencies
36+
# https://github.com/FabricMC/fabric-loom/releases
37+
# https://projects.neoforged.net/neoforged/ModDevGradle
38+
fabric_loom_version=1.10-SNAPSHOT
39+
neoforge_moddev_version=2.0.80
40+
3741
# Gradle configuration
3842
org.gradle.jvmargs=-Xmx3G
3943
org.gradle.daemon=false

0 commit comments

Comments
 (0)