From f06fb8c32e2bf6c2d9055819f9fdeeff66f273a9 Mon Sep 17 00:00:00 2001 From: embeddedt <42941056+embeddedt@users.noreply.github.com> Date: Fri, 26 Dec 2025 18:29:35 -0500 Subject: [PATCH] Fix several issues running production jar --- build.gradle.kts | 18 ++++++++++++++++-- .../modernfix/core/ModernFixMixinPlugin.java | 2 +- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index d17ff60c..189c1e41 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -83,7 +83,10 @@ mixin { tasks.named("jar") { 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 { implementation(project(":annotations")) + embed(project(":annotations")) "additionalRuntimeClasspath"(project(":annotations")) annotationProcessor(project(path = ":annotation-processor", configuration = "shadow")) @@ -151,6 +161,10 @@ dependencies { modCompileOnly("curse.maven:kubejs-238086:5853326") } +tasks.named("jar") { + from(embed.map { if (it.isDirectory) it else zipTree(it) }) +} + // For the AP tasks.withType().configureEach { if (!name.lowercase().contains("test")) { @@ -186,7 +200,7 @@ val finalJarTask = "reobfJar" tasks.register("copyJarNameConsistent") { from(tasks.named(finalJarTask).get().outputs.files) into(project.file("build/libs")) - rename { name -> "modernfix-" + project.name + "-latest.jar" } + rename { _ -> "modernfix-" + project.name + "-latest.jar" } } tasks.register("copyJarToBin") { diff --git a/src/main/java/org/embeddedt/modernfix/core/ModernFixMixinPlugin.java b/src/main/java/org/embeddedt/modernfix/core/ModernFixMixinPlugin.java index fc2c7eba..c8575355 100644 --- a/src/main/java/org/embeddedt/modernfix/core/ModernFixMixinPlugin.java +++ b/src/main/java/org/embeddedt/modernfix/core/ModernFixMixinPlugin.java @@ -114,7 +114,7 @@ public class ModernFixMixinPlugin implements IMixinConfigPlugin { @Override public String getRefMapperConfig() { - return null; + return "modernfix.refmap.json"; } @Override