diff --git a/build.gradle b/build.gradle index e80a542..6160861 100644 --- a/build.gradle +++ b/build.gradle @@ -2,49 +2,40 @@ plugins { id 'fabric-loom' version '1.9-SNAPSHOT' id 'maven-publish' } - version = project.mod_version group = project.maven_group - base { archivesName = project.archives_base_name } - repositories { mavenCentral() } - dependencies { minecraft "com.mojang:minecraft:${project.minecraft_version}" mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2" modImplementation "net.fabricmc:fabric-loader:${project.loader_version}" modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_api_version}" } - processResources { inputs.property 'version', project.version filesMatching('fabric.mod.json') { expand version: project.version } } - tasks.withType(JavaCompile).configureEach { it.options.release = 21 it.options.encoding = 'UTF-8' } - java { withSourcesJar() sourceCompatibility = JavaVersion.VERSION_21 targetCompatibility = JavaVersion.VERSION_21 } - jar { from('LICENSE') { rename { "${it}_${project.base.archivesName.get()}" } } } - publishing { publications { create('mavenJava', MavenPublication) { @@ -53,7 +44,6 @@ publishing { } } } - // ===================================================================== // Datapack / Resourcepack zip packaging — standalone task. // Not wired into build/jar; run explicitly, e.g. as a separate CI step @@ -62,9 +52,10 @@ publishing { // Zips are written straight to build/libs/, run AFTER `build` has // already finished so remapJar/assemble can't wipe them out. // ===================================================================== - -def datapackSrc = file("packs/macroEngine-Datapack") -def resourcepackSrc = file("packs/macroEngine-Resourcepack") +def datapackSrc = file("packs/macroEngine-Datapack") +def resourcepackSrc = file("packs/macroEngine-Resourcepack") +def datapackSrc1212 = file("packs/macroEngine-Datapack-1.21.2") +def resourcepackSrc1212 = file("packs/macroEngine-Resourcepack-1.21.2") tasks.register("zipDatapack", Zip) { group = "build" @@ -74,7 +65,6 @@ tasks.register("zipDatapack", Zip) { archiveFileName.set("macroEngine-Datapack.zip") destinationDirectory.set(layout.buildDirectory.dir("libs")) } - tasks.register("zipResourcepack", Zip) { group = "build" description = "Packages packs/macroEngine-Resourcepack as a .zip" @@ -83,7 +73,6 @@ tasks.register("zipResourcepack", Zip) { archiveFileName.set("macroEngine-Resourcepack.zip") destinationDirectory.set(layout.buildDirectory.dir("libs")) } - tasks.register("zipDatapack1212", Zip) { group = "build" description = "Packages packs/macroEngine-Datapack-1.21.2 as a .zip" @@ -92,7 +81,6 @@ tasks.register("zipDatapack1212", Zip) { archiveFileName.set("macroEngine-Datapack-1.21.2.zip") destinationDirectory.set(layout.buildDirectory.dir("libs")) } - tasks.register("zipResourcepack1212", Zip) { group = "build" description = "Packages packs/macroEngine-Resourcepack-1.21.2 as a .zip" @@ -101,27 +89,8 @@ tasks.register("zipResourcepack1212", Zip) { archiveFileName.set("macroEngine-Resourcepack-1.21.2.zip") destinationDirectory.set(layout.buildDirectory.dir("libs")) } - -tasks.register("zipDatapack1212", Zip) { - group = "build" - description = "Packages packs/macroEngine-Datapack-1.21.2 as a .zip" - onlyIf { datapackSrc1212.exists() } - from(datapackSrc1212) - archiveFileName.set("macroEngine-Datapack-1.21.2.zip") - destinationDirectory.set(layout.buildDirectory.dir("libs")) -} - -tasks.register("zipResourcepack1212", Zip) { - group = "build" - description = "Packages packs/macroEngine-Resourcepack-1.21.2 as a .zip" - onlyIf { resourcepackSrc1212.exists() } - from(resourcepackSrc1212) - archiveFileName.set("macroEngine-Resourcepack-1.21.2.zip") - destinationDirectory.set(layout.buildDirectory.dir("libs")) -} - tasks.register("packZips") { group = "build" description = "Runs zipDatapack and zipResourcepack. Intended to run as its own step, after ./gradlew build has completed." - dependsOn "zipDatapack", "zipResourcepack", "zipDatapack1212", "zipResourcepack1212", "zipDatapack1212", "zipResourcepack1212" + dependsOn "zipDatapack", "zipResourcepack", "zipDatapack1212", "zipResourcepack1212" }