Skip to content

Commit e55960d

Browse files
committed
Fix naming, shading and relocating
1 parent ceea259 commit e55960d

File tree

1 file changed

+20
-7
lines changed

1 file changed

+20
-7
lines changed

stonecutter.gradle.kts

Lines changed: 20 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
12
import dev.kikugie.stonecutter.build.StonecutterBuildExtension
23
import net.fabricmc.loom.api.LoomGradleExtensionAPI
34
import net.fabricmc.loom.task.RemapJarTask
@@ -19,7 +20,7 @@ plugins {
1920
stonecutter active "1.20.1"
2021

2122
allprojects {
22-
group = "xyz.bluspring"
23+
group = mod.group
2324

2425
repositories {
2526
mavenCentral()
@@ -54,9 +55,6 @@ allprojects {
5455
if (project.extensions.findByType<StonecutterBuildExtension>() == null)
5556
return@allprojects
5657

57-
if (false)
58-
return@allprojects
59-
6058
val sc = project.extensions.getByType<StonecutterBuildExtension>()
6159
val common = sc.node.sibling("")
6260

@@ -70,6 +68,10 @@ allprojects {
7068

7169
val loader = try { project.property("loom.platform") as? String? } catch (_: Throwable) { null } ?: "unknown"
7270

71+
project.extensions.configure<BasePluginExtension>("base") {
72+
archivesName.set(mod.name)
73+
}
74+
7375
version = "${mod.version}+$minecraftVersion-$loader"
7476

7577
sc.constants.match(
@@ -135,9 +137,20 @@ allprojects {
135137
archiveClassifier = "dev"
136138
}
137139

138-
// tasks.named<ShadowJar>("shadowJar") {
139-
// relocate("org.")
140-
// }
140+
tasks.named<ShadowJar>("shadowJar") {
141+
mergeServiceFiles()
142+
143+
val shadowPackage = "${mod.group}.${mod.id}.shaded"
144+
145+
exclude("org/jetbrains/**/*", "org/intellij/**/*", "org/slf4j/**/*", "kotlin/**/*", "kotlinx/**/*")
146+
relocate("com.mayakapps.kache", "$shadowPackage.kache")
147+
148+
if (loader.contains("forge")) {
149+
relocate("org.java_websocket", "$shadowPackage.java_websocket")
150+
relocate("okhttp3", "$shadowPackage.okhttp3")
151+
relocate("jnr", "$shadowPackage.jnr")
152+
}
153+
}
141154

142155
tasks.named<RemapJarTask>("remapJar") {
143156
injectAccessWidener = true

0 commit comments

Comments
 (0)