Fix several issues running production jar

This commit is contained in:
embeddedt 2025-12-26 18:29:35 -05:00
parent 6ee15122f9
commit f06fb8c32e
No known key found for this signature in database
GPG Key ID: A69433EC199B5613
2 changed files with 17 additions and 3 deletions

View File

@ -83,7 +83,10 @@ mixin {
tasks.named<Jar>("jar") { tasks.named<Jar>("jar") {
manifest.attributes(mapOf( manifest.attributes(mapOf(
"MixinConfigs" to "modernfix-modernfix.mixins.json" "MixinConfigs" to "modernfix-modernfix.mixins.json",
"Specification-Version" to "1",
"Implementation-Title" to project.name,
"Implementation-Version" to version
)) ))
} }
@ -127,8 +130,15 @@ repositories {
} }
} }
val embed by configurations.creating {
isCanBeConsumed = false
isCanBeResolved = true
isTransitive = true
}
dependencies { dependencies {
implementation(project(":annotations")) implementation(project(":annotations"))
embed(project(":annotations"))
"additionalRuntimeClasspath"(project(":annotations")) "additionalRuntimeClasspath"(project(":annotations"))
annotationProcessor(project(path = ":annotation-processor", configuration = "shadow")) annotationProcessor(project(path = ":annotation-processor", configuration = "shadow"))
@ -151,6 +161,10 @@ dependencies {
modCompileOnly("curse.maven:kubejs-238086:5853326") modCompileOnly("curse.maven:kubejs-238086:5853326")
} }
tasks.named<Jar>("jar") {
from(embed.map { if (it.isDirectory) it else zipTree(it) })
}
// For the AP // For the AP
tasks.withType<JavaCompile>().configureEach { tasks.withType<JavaCompile>().configureEach {
if (!name.lowercase().contains("test")) { if (!name.lowercase().contains("test")) {
@ -186,7 +200,7 @@ val finalJarTask = "reobfJar"
tasks.register<Copy>("copyJarNameConsistent") { tasks.register<Copy>("copyJarNameConsistent") {
from(tasks.named<Jar>(finalJarTask).get().outputs.files) from(tasks.named<Jar>(finalJarTask).get().outputs.files)
into(project.file("build/libs")) into(project.file("build/libs"))
rename { name -> "modernfix-" + project.name + "-latest.jar" } rename { _ -> "modernfix-" + project.name + "-latest.jar" }
} }
tasks.register<Copy>("copyJarToBin") { tasks.register<Copy>("copyJarToBin") {

View File

@ -114,7 +114,7 @@ public class ModernFixMixinPlugin implements IMixinConfigPlugin {
@Override @Override
public String getRefMapperConfig() { public String getRefMapperConfig() {
return null; return "modernfix.refmap.json";
} }
@Override @Override