diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock index 78ec07828..82c3e9bb5 100644 Binary files a/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ diff --git a/.gradle/buildOutputCleanup/outputFiles.bin b/.gradle/buildOutputCleanup/outputFiles.bin index 05d293324..d357e2a96 100644 Binary files a/.gradle/buildOutputCleanup/outputFiles.bin and b/.gradle/buildOutputCleanup/outputFiles.bin differ diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 6aee664cf..76e4e2111 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -15,7 +15,8 @@ - + + @@ -244,7 +245,7 @@ - + 1630004325334 @@ -269,7 +270,23 @@ - diff --git a/build.gradle.kts b/build.gradle.kts index edae6705a..5af6091fa 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -83,13 +83,9 @@ versionBody.set(providers.gradleProperty("changelog").map { file(it).readText(Ch }*/ } - configurations { - val provided by configurations.creating - val shade by configurations.creating - - provided.extendsFrom(shade) - implementation.extendsFrom(provided) - } + configurations.create("shade") + configurations.create("provided").extendsFrom(configurations.getByName("shade")) + configurations.implementation.extendsFrom(configurations.getByName("provided")) tasks.jar { setClassifier("base") @@ -111,24 +107,27 @@ versionBody.set(providers.gradleProperty("changelog").map { file(it).readText(Ch } subprojects { -/* shadowJar { - setClassifier("shadow") - configurations = [project.configurations.shade] + tasks.shadowJar { + setClassifier("shadow") + configurations = listOf(project.configurations.getByName("shade")) - dependencies { - include project (":") - } + dependencies { + include(project(":")) + } - manifest { - attributes["MixinConfigs"] = "mixins.movecraft.json" - } + manifest { + attributes["FMLAT"] = "META-INF/movecraft_at.cfg" + attributes["TweakClass"] = "org.spongepowered.asm.launch.MixinTweaker" + attributes["MixinConfigs"] = "mixins.movecraft.json" + attributes["FMLCorePluginContainsFMLMod"] = "true" } - dependencies { - provided project(path = ":", configuration = "provided") - shade project(path = ":", transitive = false) - shade project(path = ":", configuration = "shade") - }*/ + /*dependencies { + "provided" project (path = ":", configuration = "provided") + shade project (path = ":", transitive = false) + shade project (path = ":", configuration = "shade") + }*/ + } } dependencies {