Skip to content

Commit 100a489

Browse files
committed
change: mix official and yarn mappings
see https://github.com/TeamGalacticraft/mojarn
1 parent 09b529f commit 100a489

File tree

3 files changed

+13
-7
lines changed

3 files changed

+13
-7
lines changed

build.gradle.kts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ val modName = project.property("mod.name").toString()
3030

3131
val minecraft = project.property("minecraft.version").toString()
3232
val loader = project.property("loader.version").toString()
33-
val parchment = project.property("parchment.version").toString()
33+
val yarn = project.property("yarn.build").toString()
3434

3535
val badpackets = project.property("badpackets.version").toString()
3636
val energy = project.property("energy.version").toString()
@@ -41,12 +41,15 @@ val rei = project.property("rei.version").toString()
4141
val architectury = project.property("architectury.version").toString()
4242
val wthit = project.property("wthit.version").toString()
4343

44+
val isCI = System.getenv().getOrDefault("CI", "false") == "true";
45+
4446
plugins {
4547
java
4648
`maven-publish`
4749
id("fabric-loom") version("1.5-SNAPSHOT")
4850
id("org.cadixdev.licenser") version("0.6.1")
4951
id("org.ajoberstar.grgit") version("5.2.1")
52+
id("dev.galacticraft.mojarn") version("0.1.1")
5053
}
5154

5255
group = "dev.galacticraft"
@@ -156,11 +159,8 @@ repositories {
156159

157160
dependencies {
158161
minecraft("com.mojang:minecraft:$minecraft")
159-
mappings(if (parchment.isNotEmpty()) {
160-
loom.layered {
161-
officialMojangMappings()
162-
parchment("org.parchmentmc.data:parchment-1.20.2:$parchment@zip")
163-
}
162+
mappings(if (!isCI && yarn.isNotEmpty()) {
163+
mojarn.mappings("net.fabricmc:yarn:$minecraft+build.$yarn:v2")
164164
} else {
165165
loom.officialMojangMappings()
166166
})

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ mod.version=0.4.1
88
# Minecraft and Fabric Loader
99
minecraft.version=1.20.4
1010
loader.version=0.15.6
11-
parchment.version=2023.12.10
11+
yarn.build=3
1212

1313
# Mod Dependencies
1414
badpackets.version=0.6.0

settings.gradle.kts

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,12 @@ pluginManagement {
88
includeGroup("fabric-loom")
99
}
1010
}
11+
maven("https://maven.galacticraft.net/repository/maven-releases/") {
12+
content {
13+
includeGroup("dev.galacticraft")
14+
includeGroup("dev.galacticraft.mojarn")
15+
}
16+
}
1117
gradlePluginPortal()
1218
}
1319
}

0 commit comments

Comments
 (0)