move main project to a subdirectory & subprojects to root directory

.github/workflows/build.yaml

@@ -38,5 +38,5 @@ jobs:
         uses: actions/upload-artifact@v4
         with:
           name: kit-tunes-artifacts
-          path: build/libs
+          path: kit-tunes/build/libs
           if-no-files-found: error

build-logic/src/main/java/net/pixaurora/kit_tunes/build_logic/ProjectMetadata.java

@@ -5,11 +5,9 @@
 import org.gradle.api.Project;
 
 public class ProjectMetadata {
-	private final Project project;
     private final ProjectProperties properties;
 
     public ProjectMetadata(Project project) {
-		this.project = project;
         this.properties = new ProjectProperties(project);
     }
 
@@ -25,25 +23,25 @@ public String modId() {
         return modId;
     }
 
-	public String version() {
-		return this.properties.requireString(Property.MOD_VERSION);
-	}
+    public String version() {
+        return this.properties.requireString(Property.MOD_VERSION);
+    }
 
     public String archiveName() {
         String base = this.modId().replace("_", "-");
 
-        if (this.isRootProject()) {
+        if (this.isMainProject()) {
             base += "-" + this.properties.requireString(Property.UPDATE_TITLE);
         }
 
-        if (!this.project.hasProperty(Property.MINECRAFT_VERSION_MIN.key())) {
+        if (!this.properties.has(Property.MINECRAFT_VERSION_MIN)) {
             return base;
         } else {
             return base + "-minecraft-" + this.properties.requireString(Property.MINECRAFT_VERSION_MIN);
         }
     }
 
-    private boolean isRootProject() {
-        return this.project.getRootProject().equals(this.project);
+    private boolean isMainProject() {
+        return this.properties.has(Property.IS_MAIN_PROJECT);
     }
 }

build-logic/src/main/java/net/pixaurora/kit_tunes/build_logic/ProjectProperties.java

@@ -22,4 +22,8 @@ public Optional<String> optionalString(Property property) {
     public String requireString(Property property) {
         return this.optionalString(property).get();
     }
+
+    public boolean has(Property property) {
+        return this.project.hasProperty(property.key());
+    }
 }

build-logic/src/main/java/net/pixaurora/kit_tunes/build_logic/Property.java

@@ -5,7 +5,8 @@ public enum Property {
 	SUB_MOD_ID("sub_mod_name"),
 	MOD_VERSION("mod_version"),
     UPDATE_TITLE("update_title"),
-    MINECRAFT_VERSION_MIN("minecraft_version_min");
+    MINECRAFT_VERSION_MIN("minecraft_version_min"),
+    IS_MAIN_PROJECT("main_project");
 
     private final String key;
 

subprojects/core/build.gradle.kts → heart/build.gradle.kts

@@ -4,7 +4,7 @@ plugins {
 }
 
 dependencies {
-    implementation(project(":subprojects:api"))
+    implementation(project(":api"))
 
     implementation(libs.annotations)
     implementation(libs.quilt.loader)

kit-tunes/build.gradle.kts

@@ -0,0 +1,18 @@
+plugins {
+	id("kit_tunes.java.17")
+	id("kit_tunes.module")
+}
+
+dependencies {
+	include(project(":api"))
+	include(project(":heart"))
+
+	include(project(":sound_events:r1.20.4"))
+
+	include(project(":ui:r1.20.4"))
+	include(project(":ui:r1.21.0"))
+}
+
+tasks.withType<Jar> {
+    from("LICENSE")
+}

kit-tunes/gradle.properties

@@ -0,0 +1 @@
+main_project=

settings.gradle.kts

@@ -19,10 +19,12 @@ plugins {
 
 includeBuild("build-logic")
 
-include("subprojects:api")
-include("subprojects:core")
+include("kit-tunes")
 
-include("subprojects:sound_events:r1.20.4")
+include("api")
+include("heart")
 
-include("subprojects:ui:r1.20.4")
-include("subprojects:ui:r1.21.0")
+include("sound_events:r1.20.4")
+
+include("ui:r1.20.4")
+include("ui:r1.21.0")

sound_events/r1.20.4/build.gradle.kts

@@ -0,0 +1,9 @@
+plugins {
+    id("kit_tunes.java.17")
+    id("kit_tunes.module")
+}
+
+dependencies {
+    implementation(project(":api"))
+    implementation(project(":heart"))
+}

subprojects/ui/r1.20.4/build.gradle.kts → ui/r1.20.4/build.gradle.kts

@@ -11,8 +11,8 @@ repositories {
 }
 
 dependencies {
-    implementation(project(":subprojects:api"))
-    implementation(project(":subprojects:core"))
+    implementation(project(":api"))
+    implementation(project(":heart"))
 
     modImplementation(libs.qsl.resource.loader)
 

subprojects/ui/r1.21.0/build.gradle.kts → ui/r1.21.0/build.gradle.kts

@@ -11,8 +11,8 @@ repositories {
 }
 
 dependencies {
-    implementation(project(":subprojects:api"))
-    implementation(project(":subprojects:core"))
+    implementation(project(":api"))
+    implementation(project(":heart"))
 
     modImplementation(fabricApi.module("fabric-resource-loader-v0", project.property("fabric_api_version").toString()))