From 3a5a61f697dd3ade802ef8d863d842bdd75e9201 Mon Sep 17 00:00:00 2001 From: Johann Bernhardt Date: Sun, 7 Nov 2021 00:55:35 +0100 Subject: [PATCH] Implemented suggestion --- build.gradle | 44 ++++++++++++++++++++++++++++++-------------- 1 file changed, 30 insertions(+), 14 deletions(-) diff --git a/build.gradle b/build.gradle index 573575a..3493d78 100644 --- a/build.gradle +++ b/build.gradle @@ -150,18 +150,26 @@ task generateAssets { } shadowJar { + def manifestAttributes = [:] + manifestAttributes += ["FMLCorePluginContainsFMLMod" : true] + + if(accessTransformersFile.isEmpty() == false) { + manifestAttributes += ["FMLAT" : accessTransformersFile.toString()] + } + if(usesMixins.toBoolean()) { from refMap manifest { - attributes([ - "FMLAT" : accessTransformersFile.toString(), - "TweakClass" : "org.spongepowered.asm.launch.MixinTweaker", - "MixinConfigs" : mixinConfigJson, - "FMLCorePluginContainsFMLMod": true, - "ForceLoadAsMod" : loadNormalModAfterApplingMixins.toBoolean() - ]) + manifestAttributes += [ + "TweakClass" : "org.spongepowered.asm.launch.MixinTweaker", + "MixinConfigs" : mixinConfigJson, + "ForceLoadAsMod" : loadNormalModAfterApplingMixins.toBoolean() + ] } } + manifest { + attributes(manifestAttributes) + } minimize() configurations = [project.configurations.shadowImplementation] @@ -169,18 +177,26 @@ shadowJar { } jar { + def manifestAttributes = [:] + manifestAttributes += ["FMLCorePluginContainsFMLMod" : true] + + if(accessTransformersFile.isEmpty() == false) { + manifestAttributes += ["FMLAT" : accessTransformersFile.toString()] + } + if(usesMixins.toBoolean()) { from refMap manifest { - attributes([ - "FMLAT" : accessTransformersFile.toString(), - "TweakClass" : "org.spongepowered.asm.launch.MixinTweaker", - "MixinConfigs" : mixinConfigJson, - "FMLCorePluginContainsFMLMod": true, - "ForceLoadAsMod" : loadNormalModAfterApplingMixins.toBoolean() - ]) + manifestAttributes += [ + "TweakClass" : "org.spongepowered.asm.launch.MixinTweaker", + "MixinConfigs" : mixinConfigJson, + "ForceLoadAsMod" : loadNormalModAfterApplingMixins.toBoolean() + ] } } + manifest { + attributes(manifestAttributes) + } if(usesShadowedDependencies.toBoolean()) { dependsOn(shadowJar)