Update editorconfig for kotlin gradle files and fix indentation in files

This commit is contained in:
NoComment1105 2023-01-09 07:53:08 +00:00
parent 6565ba08e5
commit a671ac2d56
No known key found for this signature in database
GPG key ID: 4F0E376B44CBF79E
5 changed files with 150 additions and 150 deletions

View file

@ -7,13 +7,13 @@ insert_final_newline = true
tab_width = 4 tab_width = 4
trim_trailing_whitespace = true trim_trailing_whitespace = true
[*.gradle] [*.gradle.kts]
indent_style = tab indent_style = tab
[*.java] [*.java]
indent_style = tab indent_style = tab
[*.kotlin] [*.kt]
indent_size = tab indent_size = tab
[*.json] [*.json]

View file

@ -4,11 +4,11 @@
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
plugins { plugins {
java java
`maven-publish` `maven-publish`
alias(libs.plugins.kotlin) alias(libs.plugins.kotlin)
alias(libs.plugins.quilt.loom) alias(libs.plugins.quilt.loom)
} }
val archives_base_name: String by project val archives_base_name: String by project
@ -17,125 +17,125 @@ base.archivesName.set(archives_base_name)
val javaVersion = 17 val javaVersion = 17
repositories { repositories {
// Add repositories to retrieve artifacts from in here. // Add repositories to retrieve artifacts from in here.
// You should only use this when depending on other mods because // You should only use this when depending on other mods because
// Loom adds the essential maven repositories to download Minecraft and libraries from automatically. // Loom adds the essential maven repositories to download Minecraft and libraries from automatically.
// See https://docs.gradle.org/current/userguide/declaring_repositories.html // See https://docs.gradle.org/current/userguide/declaring_repositories.html
// for more information about repositories. // for more information about repositories.
} }
// All the dependencies are declared at gradle/libs.version.toml and referenced with "libs.<id>" // All the dependencies are declared at gradle/libs.version.toml and referenced with "libs.<id>"
// See https://docs.gradle.org/current/userguide/platforms.html for information on how version catalogs work. // See https://docs.gradle.org/current/userguide/platforms.html for information on how version catalogs work.
dependencies { dependencies {
minecraft(libs.minecraft) minecraft(libs.minecraft)
mappings( mappings(
variantOf(libs.quilt.mappings) { variantOf(libs.quilt.mappings) {
classifier("intermediary-v2") 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 // 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( mappings(
loom.layered { loom.layered {
mappings(variantOf(libs.quilt.mappings) { classifier("intermediary-v2") }) mappings(variantOf(libs.quilt.mappings) { classifier("intermediary-v2") })
officialMojangMappings() 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. // 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. // Quilted Fabric API will automatically pull in the correct QSL version.
modImplementation(libs.qfapi) modImplementation(libs.qfapi)
// modImplementation(libs.bundles.qfapi) // If you wish to use the deprecated Fabric API modules // modImplementation(libs.bundles.qfapi) // If you wish to use the deprecated Fabric API modules
modImplementation(libs.qkl) modImplementation(libs.qkl)
} }
tasks { tasks {
withType<KotlinCompile> { withType<KotlinCompile> {
kotlinOptions { kotlinOptions {
jvmTarget = javaVersion.toString() jvmTarget = javaVersion.toString()
// languageVersion: A.B of the kotlin plugin version A.B.C // languageVersion: A.B of the kotlin plugin version A.B.C
languageVersion = libs.plugins.kotlin.get().version.requiredVersion.substringBeforeLast('.') languageVersion = libs.plugins.kotlin.get().version.requiredVersion.substringBeforeLast('.')
} }
} }
withType<JavaCompile>.configureEach { withType<JavaCompile>.configureEach {
options.encoding = "UTF-8" options.encoding = "UTF-8"
options.isDeprecation = true options.isDeprecation = true
options.release.set(javaVersion) options.release.set(javaVersion)
} }
processResources { processResources {
filteringCharset = "UTF-8" filteringCharset = "UTF-8"
inputs.property("version", project.version) inputs.property("version", project.version)
filesMatching("quilt.mod.json") { filesMatching("quilt.mod.json") {
expand( expand(
mapOf( mapOf(
"version" to project.version "version" to project.version
) )
) )
} }
} }
javadoc { javadoc {
options.encoding = "UTF-8" options.encoding = "UTF-8"
} }
// Run `./gradlew wrapper --gradle-version <newVersion>` or `gradle wrapper --gradle-version <newVersion>` to update gradle scripts // Run `./gradlew wrapper --gradle-version <newVersion>` or `gradle wrapper --gradle-version <newVersion>` to update gradle scripts
// BIN distribution should be sufficient for the majority of mods // BIN distribution should be sufficient for the majority of mods
wrapper { wrapper {
distributionType = Wrapper.DistributionType.BIN distributionType = Wrapper.DistributionType.BIN
} }
jar { jar {
from("LICENSE") { from("LICENSE") {
rename { "LICENSE_${archives_base_name}" } rename { "LICENSE_${archives_base_name}" }
} }
} }
} }
val targetJavaVersion = JavaVersion.toVersion(javaVersion) val targetJavaVersion = JavaVersion.toVersion(javaVersion)
if (JavaVersion.current() < targetJavaVersion) { if (JavaVersion.current() < targetJavaVersion) {
kotlin.jvmToolchain(javaVersion) kotlin.jvmToolchain(javaVersion)
java.toolchain { java.toolchain {
languageVersion.set(JavaLanguageVersion.of(javaVersion)) languageVersion.set(JavaLanguageVersion.of(javaVersion))
} }
} }
java { java {
// Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task if it is present. // 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. // If you remove this line, sources will not be generated.
withSourcesJar() withSourcesJar()
// If this mod is going to be a library, then it should also generate Javadocs in order to aid with development. // 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. // Uncomment this line to generate them.
// withJavadocJar() // withJavadocJar()
// Still required by IDEs such as Eclipse and VSC // Still required by IDEs such as Eclipse and VSC
sourceCompatibility = targetJavaVersion sourceCompatibility = targetJavaVersion
targetCompatibility = targetJavaVersion targetCompatibility = targetJavaVersion
} }
// Configure the maven publication // Configure the maven publication
publishing { publishing {
publications { publications {
register<MavenPublication>("Maven") { register<MavenPublication>("Maven") {
from(components.getByName("java")) from(components.getByName("java"))
} }
} }
// See https://docs.gradle.org/current/userguide/publishing_maven.html for information on how to set up publishing. // See https://docs.gradle.org/current/userguide/publishing_maven.html for information on how to set up publishing.
repositories { repositories {
// Add repositories to publish to here. // Add repositories to publish to here.
// Notice: This block does NOT have the same function as the block in the top level. // 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 // The repositories here will be used for publishing your artifact, not for
// retrieving dependencies. // retrieving dependencies.
} }
} }

View file

@ -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" } 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_loader = { module = "org.quiltmc:quilt-loader", version.ref = "loader" }
quilt_mappings = { module = "org.quiltmc:quilt-mappings", version.ref = "mappings" } quilt_mappings = { module = "org.quiltmc:quilt-mappings", version.ref = "mappings" }

View file

@ -1,18 +1,18 @@
pluginManagement { pluginManagement {
repositories { repositories {
maven { maven {
name = "Quilt" name = "Quilt"
url = uri("https://maven.quiltmc.org/repository/release") url = uri("https://maven.quiltmc.org/repository/release")
} }
// Currently needed for Intermediary and other temporary dependencies // Currently needed for Intermediary and other temporary dependencies
maven { maven {
name = "Fabric" name = "Fabric"
url = uri("https://maven.fabricmc.net/") url = uri("https://maven.fabricmc.net/")
} }
gradlePluginPortal() gradlePluginPortal()
mavenCentral() mavenCentral()
} }
} }
rootProject.name = "quilt-kotlin-template-mod" rootProject.name = "quilt-kotlin-template-mod"

View file

@ -1,47 +1,47 @@
{ {
"schema_version": 1, "schema_version": 1,
"quilt_loader": { "quilt_loader": {
"group": "com.example", "group": "com.example",
"id": "example_mod", "id": "example_mod",
"version": "${version}", "version": "${version}",
"metadata": { "metadata": {
"name": "Mod Name", "name": "Mod Name",
"description": "A short description of your mod.", "description": "A short description of your mod.",
"contributors": { "contributors": {
"Your name here": "Owner" "Your name here": "Owner"
}, },
"contact": { "contact": {
"homepage": "https://example.com/", "homepage": "https://example.com/",
"issues": "https://github.com/QuiltMC/quilt-kotlin-template-mod/issues", "issues": "https://github.com/QuiltMC/quilt-kotlin-template-mod/issues",
"sources": "https://github.com/QuiltMC/quilt-kotlin-template-mod" "sources": "https://github.com/QuiltMC/quilt-kotlin-template-mod"
}, },
"icon": "assets/example_mod/icon.png" "icon": "assets/example_mod/icon.png"
}, },
"intermediate_mappings": "net.fabricmc:intermediary", "intermediate_mappings": "net.fabricmc:intermediary",
"entrypoints": { "entrypoints": {
"init": { "init": {
"adapter": "kotlin", "adapter": "kotlin",
"value": "com.example.example_mod.ExampleMod" "value": "com.example.example_mod.ExampleMod"
} }
}, },
"depends": [ "depends": [
{ {
"id": "quilt_loader", "id": "quilt_loader",
"versions": ">=0.17.0-" "versions": ">=0.17.0-"
}, },
{ {
"id": "quilted_fabric_api", "id": "quilted_fabric_api",
"versions": ">=4.0.0-" "versions": ">=4.0.0-"
}, },
{ {
"id": "qkl", "id": "qkl",
"versions": ">=0.1.4-" "versions": ">=0.1.4-"
}, },
{ {
"id": "minecraft", "id": "minecraft",
"versions": ">=1.19.2" "versions": ">=1.19.2"
} }
] ]
}, },
"mixin": "example_mod.mixins.json" "mixin": "example_mod.mixins.json"
} }