Skip to content

Commit

Permalink
change: mix official and yarn mappings
Browse files Browse the repository at this point in the history
  • Loading branch information
marcus8448 committed Mar 19, 2024
1 parent 09b529f commit 100a489
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 7 deletions.
12 changes: 6 additions & 6 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ val modName = project.property("mod.name").toString()

val minecraft = project.property("minecraft.version").toString()
val loader = project.property("loader.version").toString()
val parchment = project.property("parchment.version").toString()
val yarn = project.property("yarn.build").toString()

val badpackets = project.property("badpackets.version").toString()
val energy = project.property("energy.version").toString()
Expand All @@ -41,12 +41,15 @@ val rei = project.property("rei.version").toString()
val architectury = project.property("architectury.version").toString()
val wthit = project.property("wthit.version").toString()

val isCI = System.getenv().getOrDefault("CI", "false") == "true";

plugins {
java
`maven-publish`
id("fabric-loom") version("1.5-SNAPSHOT")
id("org.cadixdev.licenser") version("0.6.1")
id("org.ajoberstar.grgit") version("5.2.1")
id("dev.galacticraft.mojarn") version("0.1.1")
}

group = "dev.galacticraft"
Expand Down Expand Up @@ -156,11 +159,8 @@ repositories {

dependencies {
minecraft("com.mojang:minecraft:$minecraft")
mappings(if (parchment.isNotEmpty()) {
loom.layered {
officialMojangMappings()
parchment("org.parchmentmc.data:parchment-1.20.2:$parchment@zip")
}
mappings(if (!isCI && yarn.isNotEmpty()) {
mojarn.mappings("net.fabricmc:yarn:$minecraft+build.$yarn:v2")
} else {
loom.officialMojangMappings()
})
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ mod.version=0.4.1
# Minecraft and Fabric Loader
minecraft.version=1.20.4
loader.version=0.15.6
parchment.version=2023.12.10
yarn.build=3

# Mod Dependencies
badpackets.version=0.6.0
Expand Down
6 changes: 6 additions & 0 deletions settings.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,12 @@ pluginManagement {
includeGroup("fabric-loom")
}
}
maven("https://maven.galacticraft.net/repository/maven-releases/") {
content {
includeGroup("dev.galacticraft")
includeGroup("dev.galacticraft.mojarn")
}
}
gradlePluginPortal()
}
}
Expand Down

0 comments on commit 100a489

Please sign in to comment.