diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 79ff4d3a..8f544ddc 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -30,4 +30,4 @@ jobs: uses: actions/upload-artifact@v3 with: name: MC-Discord-Chat ${{ steps.get_short_commit_hash.outputs.short_sha }} - path: wrapper/build/libs/*.jar \ No newline at end of file + path: build/*.jar \ No newline at end of file diff --git a/settings.gradle b/settings.gradle index 55604da6..f5200636 100644 --- a/settings.gradle +++ b/settings.gradle @@ -44,9 +44,12 @@ for (String version : versions) { proj.buildFileName = "../../common.gradle" } -include(":wrapper") +include(":active") +def active = project(":active") +active.name = "active" +active.projectDir = file("wrapper/active") include(":compat") def compat = project(":compat") -compat.projectDir = file("wrapper") -compat.buildFileName = "compat.gradle" \ No newline at end of file +compat.name = "compat" +compat.projectDir = file("wrapper/compat") \ No newline at end of file diff --git a/wrapper/build.gradle b/wrapper/active/build.gradle similarity index 94% rename from wrapper/build.gradle rename to wrapper/active/build.gradle index c4ed0293..027a7895 100644 --- a/wrapper/build.gradle +++ b/wrapper/active/build.gradle @@ -13,6 +13,10 @@ base { archivesName = archives_base_name } +sourceSets { + main.resources.srcDir "../src/main/resources" +} + dependencies { minecraft("com.mojang:minecraft:${minecraft_version}") mappings("net.fabricmc:yarn:${yarn_mappings}:v2") @@ -40,7 +44,7 @@ dependencies { } def fabric_subprojects = parent.subprojects.findAll({ - it.name != "wrapper" && !it.name.contains("compat") + it.name != "active" && !it.name.contains("compat") }) remapJar { @@ -92,4 +96,8 @@ processResources { writer.flush() writer.close() } +} + +clean { + delete file("../../build") } \ No newline at end of file diff --git a/wrapper/compat.gradle b/wrapper/compat/build.gradle similarity index 87% rename from wrapper/compat.gradle rename to wrapper/compat/build.gradle index 40c3c270..f9784f9a 100644 --- a/wrapper/compat.gradle +++ b/wrapper/compat/build.gradle @@ -13,6 +13,10 @@ base { archivesName = archives_base_name } +sourceSets { + main.resources.srcDir "../src/main/resources" +} + dependencies { minecraft("com.mojang:minecraft:${minecraft_version}") mappings("net.fabricmc:yarn:${yarn_mappings}:v2") @@ -43,8 +47,8 @@ def fabric_subprojects = parent.subprojects.findAll({ it.name.contains("compat_") }) -compileJava.dependsOn(":wrapper:jar") -processResources.dependsOn(":wrapper:jar") +compileJava.dependsOn(":active:jar") +processResources.dependsOn(":active:jar") remapJar { outputs.upToDateWhen { false } @@ -53,7 +57,7 @@ remapJar { fabric_subprojects.collect { it.tasks.remapJar } - ":wrapper:remapJar" + ":active:remapJar" } doFirst { @@ -72,6 +76,18 @@ remapJar { rename { "${it}_${archives_base_name}" } } from("build/tmp/versions") + + doLast { + delete fileTree("../../build") + copy { + from "../active/build/libs" + into "../../build" + } + copy { + from "build/libs" + into "../../build" + } + } } processResources {