From a671ac2d564f5ef1789d90712398b5ff5a0e6399 Mon Sep 17 00:00:00 2001 From: NoComment1105 Date: Mon, 9 Jan 2023 07:53:08 +0000 Subject: [PATCH] Update editorconfig for kotlin gradle files and fix indentation in files --- .editorconfig | 6 +- build.gradle.kts | 182 +++++++++++++++--------------- gradle/libs.versions.toml | 2 +- settings.gradle.kts | 26 ++--- src/main/resources/quilt.mod.json | 84 +++++++------- 5 files changed, 150 insertions(+), 150 deletions(-) diff --git a/.editorconfig b/.editorconfig index c49a86c..4899471 100644 --- a/.editorconfig +++ b/.editorconfig @@ -7,13 +7,13 @@ insert_final_newline = true tab_width = 4 trim_trailing_whitespace = true -[*.gradle] +[*.gradle.kts] indent_style = tab [*.java] indent_style = tab -[*.kotlin] +[*.kt] indent_size = tab [*.json] @@ -34,4 +34,4 @@ indent_size = 2 [.editorconfig] indent_style = space -indent_size = 4 \ No newline at end of file +indent_size = 4 diff --git a/build.gradle.kts b/build.gradle.kts index 1a4fdd2..462a2de 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -4,11 +4,11 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { - java - `maven-publish` + java + `maven-publish` - alias(libs.plugins.kotlin) - alias(libs.plugins.quilt.loom) + alias(libs.plugins.kotlin) + alias(libs.plugins.quilt.loom) } val archives_base_name: String by project @@ -17,125 +17,125 @@ base.archivesName.set(archives_base_name) val javaVersion = 17 repositories { - // Add repositories to retrieve artifacts from in here. - // You should only use this when depending on other mods because - // Loom adds the essential maven repositories to download Minecraft and libraries from automatically. - // See https://docs.gradle.org/current/userguide/declaring_repositories.html - // for more information about repositories. + // Add repositories to retrieve artifacts from in here. + // You should only use this when depending on other mods because + // Loom adds the essential maven repositories to download Minecraft and libraries from automatically. + // See https://docs.gradle.org/current/userguide/declaring_repositories.html + // for more information about repositories. } // All the dependencies are declared at gradle/libs.version.toml and referenced with "libs." // See https://docs.gradle.org/current/userguide/platforms.html for information on how version catalogs work. dependencies { - minecraft(libs.minecraft) - mappings( - variantOf(libs.quilt.mappings) { - classifier("intermediary-v2") - } - ) + minecraft(libs.minecraft) + mappings( + variantOf(libs.quilt.mappings) { + classifier("intermediary-v2") + } + ) - // Replace the above line with the block below if you want to use Mojang mappings as your primary mappings, falling back on QM for parameters and Javadocs - /* - mappings( - loom.layered { - mappings(variantOf(libs.quilt.mappings) { classifier("intermediary-v2") }) - officialMojangMappings() - } - ) - */ + // Replace the above line with the block below if you want to use Mojang mappings as your primary mappings, falling back on QM for parameters and Javadocs + /* + mappings( + loom.layered { + mappings(variantOf(libs.quilt.mappings) { classifier("intermediary-v2") }) + officialMojangMappings() + } + ) + */ - modImplementation(libs.quilt.loader) + modImplementation(libs.quilt.loader) - // QSL is not a complete API; You will need Quilted Fabric API to fill in the gaps. - // Quilted Fabric API will automatically pull in the correct QSL version. - modImplementation(libs.qfapi) - // modImplementation(libs.bundles.qfapi) // If you wish to use the deprecated Fabric API modules + // QSL is not a complete API; You will need Quilted Fabric API to fill in the gaps. + // Quilted Fabric API will automatically pull in the correct QSL version. + modImplementation(libs.qfapi) + // modImplementation(libs.bundles.qfapi) // If you wish to use the deprecated Fabric API modules - modImplementation(libs.qkl) + modImplementation(libs.qkl) } tasks { - withType { - kotlinOptions { - jvmTarget = javaVersion.toString() - // languageVersion: A.B of the kotlin plugin version A.B.C - languageVersion = libs.plugins.kotlin.get().version.requiredVersion.substringBeforeLast('.') - } - } + withType { + kotlinOptions { + jvmTarget = javaVersion.toString() + // languageVersion: A.B of the kotlin plugin version A.B.C + languageVersion = libs.plugins.kotlin.get().version.requiredVersion.substringBeforeLast('.') + } + } - withType.configureEach { - options.encoding = "UTF-8" - options.isDeprecation = true - options.release.set(javaVersion) - } + withType.configureEach { + options.encoding = "UTF-8" + options.isDeprecation = true + options.release.set(javaVersion) + } - processResources { - filteringCharset = "UTF-8" - inputs.property("version", project.version) + processResources { + filteringCharset = "UTF-8" + inputs.property("version", project.version) - filesMatching("quilt.mod.json") { - expand( - mapOf( - "version" to project.version - ) - ) - } - } + filesMatching("quilt.mod.json") { + expand( + mapOf( + "version" to project.version + ) + ) + } + } - javadoc { - options.encoding = "UTF-8" - } + javadoc { + options.encoding = "UTF-8" + } - // Run `./gradlew wrapper --gradle-version ` or `gradle wrapper --gradle-version ` to update gradle scripts - // BIN distribution should be sufficient for the majority of mods - wrapper { - distributionType = Wrapper.DistributionType.BIN - } + // Run `./gradlew wrapper --gradle-version ` or `gradle wrapper --gradle-version ` to update gradle scripts + // BIN distribution should be sufficient for the majority of mods + wrapper { + distributionType = Wrapper.DistributionType.BIN + } - jar { - from("LICENSE") { - rename { "LICENSE_${archives_base_name}" } - } - } + jar { + from("LICENSE") { + rename { "LICENSE_${archives_base_name}" } + } + } } val targetJavaVersion = JavaVersion.toVersion(javaVersion) if (JavaVersion.current() < targetJavaVersion) { - kotlin.jvmToolchain(javaVersion) + kotlin.jvmToolchain(javaVersion) - java.toolchain { - languageVersion.set(JavaLanguageVersion.of(javaVersion)) - } + java.toolchain { + languageVersion.set(JavaLanguageVersion.of(javaVersion)) + } } java { - // Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task if it is present. - // If you remove this line, sources will not be generated. - withSourcesJar() + // Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task if it is present. + // If you remove this line, sources will not be generated. + withSourcesJar() - // If this mod is going to be a library, then it should also generate Javadocs in order to aid with development. - // Uncomment this line to generate them. - // withJavadocJar() + // If this mod is going to be a library, then it should also generate Javadocs in order to aid with development. + // Uncomment this line to generate them. + // withJavadocJar() - // Still required by IDEs such as Eclipse and VSC - sourceCompatibility = targetJavaVersion - targetCompatibility = targetJavaVersion + // Still required by IDEs such as Eclipse and VSC + sourceCompatibility = targetJavaVersion + targetCompatibility = targetJavaVersion } // Configure the maven publication publishing { - publications { - register("Maven") { - from(components.getByName("java")) - } - } + publications { + register("Maven") { + from(components.getByName("java")) + } + } - // See https://docs.gradle.org/current/userguide/publishing_maven.html for information on how to set up publishing. - repositories { - // Add repositories to publish to here. - // Notice: This block does NOT have the same function as the block in the top level. - // The repositories here will be used for publishing your artifact, not for - // retrieving dependencies. - } + // See https://docs.gradle.org/current/userguide/publishing_maven.html for information on how to set up publishing. + repositories { + // Add repositories to publish to here. + // Notice: This block does NOT have the same function as the block in the top level. + // The repositories here will be used for publishing your artifact, not for + // retrieving dependencies. + } } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 3dd6441..d800442 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -14,7 +14,7 @@ qfapi = { module = "org.quiltmc.quilted-fabric-api:quilted-fabric-api", version. qfapi_deprecated = { module = "org.quiltmc.quilted-fabric-api:quilted-fabric-api-deprecated", version.ref = "qfapi" } -qkl = { module = "org.quiltmc.quilt-kotlin-libraries:quilt-kotlin-libraries", version.ref = "qkl"} +qkl = { module = "org.quiltmc.quilt-kotlin-libraries:quilt-kotlin-libraries", version.ref = "qkl" } quilt_loader = { module = "org.quiltmc:quilt-loader", version.ref = "loader" } quilt_mappings = { module = "org.quiltmc:quilt-mappings", version.ref = "mappings" } diff --git a/settings.gradle.kts b/settings.gradle.kts index 3fcb4ad..5bce76a 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -1,18 +1,18 @@ pluginManagement { - 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/") - } + 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() - mavenCentral() - } + gradlePluginPortal() + mavenCentral() + } } rootProject.name = "quilt-kotlin-template-mod" diff --git a/src/main/resources/quilt.mod.json b/src/main/resources/quilt.mod.json index 1592438..1b38110 100644 --- a/src/main/resources/quilt.mod.json +++ b/src/main/resources/quilt.mod.json @@ -1,47 +1,47 @@ { - "schema_version": 1, - "quilt_loader": { - "group": "com.example", - "id": "example_mod", - "version": "${version}", - "metadata": { - "name": "Mod Name", - "description": "A short description of your mod.", - "contributors": { - "Your name here": "Owner" - }, - "contact": { - "homepage": "https://example.com/", - "issues": "https://github.com/QuiltMC/quilt-kotlin-template-mod/issues", - "sources": "https://github.com/QuiltMC/quilt-kotlin-template-mod" - }, - "icon": "assets/example_mod/icon.png" - }, - "intermediate_mappings": "net.fabricmc:intermediary", - "entrypoints": { - "init": { + "schema_version": 1, + "quilt_loader": { + "group": "com.example", + "id": "example_mod", + "version": "${version}", + "metadata": { + "name": "Mod Name", + "description": "A short description of your mod.", + "contributors": { + "Your name here": "Owner" + }, + "contact": { + "homepage": "https://example.com/", + "issues": "https://github.com/QuiltMC/quilt-kotlin-template-mod/issues", + "sources": "https://github.com/QuiltMC/quilt-kotlin-template-mod" + }, + "icon": "assets/example_mod/icon.png" + }, + "intermediate_mappings": "net.fabricmc:intermediary", + "entrypoints": { + "init": { "adapter": "kotlin", "value": "com.example.example_mod.ExampleMod" } - }, - "depends": [ - { - "id": "quilt_loader", - "versions": ">=0.17.0-" - }, - { - "id": "quilted_fabric_api", - "versions": ">=4.0.0-" - }, - { - "id": "qkl", - "versions": ">=0.1.4-" - }, - { - "id": "minecraft", - "versions": ">=1.19.2" - } - ] - }, - "mixin": "example_mod.mixins.json" + }, + "depends": [ + { + "id": "quilt_loader", + "versions": ">=0.17.0-" + }, + { + "id": "quilted_fabric_api", + "versions": ">=4.0.0-" + }, + { + "id": "qkl", + "versions": ">=0.1.4-" + }, + { + "id": "minecraft", + "versions": ">=1.19.2" + } + ] + }, + "mixin": "example_mod.mixins.json" }