Merge pull request #2 from LostLuma/feature/build-script-improvements

Improve build logic

build-logic/build.gradle.kts

@@ -0,0 +1,24 @@
+plugins {
+    `kotlin-dsl`
+}
+
+repositories {
+    maven {
+        name = "Quilt"
+        url = uri("https://maven.quiltmc.org/repository/release")
+    }
+    // Currently needed for Intermediary and other temporary dependencies
+    maven {
+        name = "Fabric"
+        url = uri("https://maven.fabricmc.net/")
+    }
+    gradlePluginPortal()
+}
+
+dependencies {
+    implementation(libs.quilt.loom)
+}
+
+kotlin {
+    jvmToolchain(21)
+}

build-logic/settings.gradle → build-logic/settings.gradle.kts

@@ -4,9 +4,9 @@ pluginManagement {
 	}
 }
 
-dependencyResolutionManagement{
+dependencyResolutionManagement {
 	versionCatalogs {
-		libs {
+		create("libs") {
 			from(files("../gradle/libs.versions.toml"))
 		}
 	}

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

@@ -5,13 +5,15 @@
 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);
     }
 
-    public String mod_id() {
+    public String modId() {
         String modId = String.valueOf(properties.requireString(Property.BASE_MOD_ID));
 
         Optional<String> subModId = properties.optionalString(Property.SUB_MOD_ID);
@@ -23,14 +25,25 @@ public String mod_id() {
         return modId;
     }
 
-    public String base_file_name() {
-        String modId = this.mod_id().replace("_", "-");
+	public String version() {
+		return this.properties.requireString(Property.MOD_VERSION);
+	}
 
-        return modId + "-" + this.properties.requireString(Property.UPDATE_TITLE) + "-"
-                + this.properties.requireString(Property.MOD_VERSION);
+    public String archiveName() {
+        String base = this.modId().replace("_", "-");
+
+        if (this.isRootProject()) {
+            base += "-" + this.properties.requireString(Property.UPDATE_TITLE);
+        }
+
+        if (!this.project.hasProperty(Property.MINECRAFT_VERSION_MIN.key())) {
+            return base;
+        } else {
+            return base + "-minecraft-" + this.properties.requireString(Property.MINECRAFT_VERSION_MIN);
+        }
     }
 
-    public String game_mod_file_name() {
-        return this.base_file_name() + "+minecraft-" + this.properties.requireString(Property.MINECRAFT_VERSION);
+    private boolean isRootProject() {
+        return this.project.getRootProject().equals(this.project);
     }
 }

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

@@ -1,8 +1,11 @@
 package net.pixaurora.kit_tunes.build_logic;
 
 public enum Property {
-    BASE_MOD_ID("archives_base_name"), SUB_MOD_ID("sub_mod_name"), MOD_VERSION("mod_version"),
-    UPDATE_TITLE("update_title"), MINECRAFT_VERSION("minecraft_version");
+    BASE_MOD_ID("archives_base_name"),
+	SUB_MOD_ID("sub_mod_name"),
+	MOD_VERSION("mod_version"),
+    UPDATE_TITLE("update_title"),
+    MINECRAFT_VERSION_MIN("minecraft_version_min");
 
     private final String key;
 

build-logic/src/main/kotlin/kit_tunes.base.gradle.kts

@@ -0,0 +1,30 @@
+import net.pixaurora.kit_tunes.build_logic.ProjectMetadata
+
+plugins {
+    id("base")
+}
+
+val metadata = ProjectMetadata(project)
+extra.set("metadata", metadata)
+
+version = metadata.version()
+
+base {
+	archivesName = metadata.archiveName()
+}
+
+repositories {
+	mavenCentral()
+	maven {
+		name = "Quilt"
+		url = uri("https://maven.quiltmc.org/repository/release")
+	}
+}
+
+tasks.withType<ProcessResources> {
+	inputs.property("version", metadata.version())
+
+	filesMatching("quilt.mod.json") {
+		expand(inputs.properties)
+	}
+}

build-logic/src/main/kotlin/kit_tunes.java.08.gradle.kts

@@ -0,0 +1,19 @@
+plugins {
+    id("java")
+}
+
+java {
+    withSourcesJar()
+
+    toolchain {
+        languageVersion = JavaLanguageVersion.of(8)
+    }
+}
+
+tasks.withType<JavaCompile> {
+    options.encoding = "UTF-8"
+
+    javaCompiler = javaToolchains.compilerFor {
+        languageVersion = JavaLanguageVersion.of(8)
+    }
+}

build-logic/src/main/kotlin/kit_tunes.java.17.gradle.kts

@@ -0,0 +1,19 @@
+plugins {
+    id("java")
+}
+
+java {
+    withSourcesJar()
+
+    toolchain {
+        languageVersion = JavaLanguageVersion.of(17)
+    }
+}
+
+tasks.withType<JavaCompile> {
+    options.encoding = "UTF-8"
+
+    javaCompiler = javaToolchains.compilerFor {
+        languageVersion = JavaLanguageVersion.of(17)
+    }
+}

build-logic/src/main/kotlin/kit_tunes.java.21.gradle.kts

@@ -0,0 +1,19 @@
+plugins {
+    id("java")
+}
+
+java {
+    withSourcesJar()
+
+    toolchain {
+        languageVersion = JavaLanguageVersion.of(21)
+    }
+}
+
+tasks.withType<JavaCompile> {
+    options.encoding = "UTF-8"
+
+    javaCompiler = javaToolchains.compilerFor {
+        languageVersion = JavaLanguageVersion.of(21)
+    }
+}

build-logic/src/main/kotlin/kit_tunes.module.gradle.kts

@@ -0,0 +1,21 @@
+import net.pixaurora.kit_tunes.build_logic.ProjectMetadata
+
+plugins {
+    id("kit_tunes.base")
+    id("org.quiltmc.loom")
+}
+
+val metadata = extra.get("metadata") as ProjectMetadata
+
+loom {
+    mods.create(metadata.modId()) {
+        sourceSet(sourceSets.main.get())
+    }
+}
+
+dependencies {
+    modImplementation("org.quiltmc:quilt-loader:0.26.0")
+
+    mappings(loom.officialMojangMappings())
+    minecraft("com.mojang:minecraft:${project.property("minecraft_version")}")
+}