diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 0000000..4e0d1ae --- /dev/null +++ b/.editorconfig @@ -0,0 +1,40 @@ +# https://editorconfig.org +root = true + +[*] +indent_style = space +indent_size = 2 +max_line_length = 140 + +end_of_line = lf +charset = utf-8 +trim_trailing_whitespace = true +insert_final_newline = true + +[*.{java,kt,kts,scala,rs,xml,kt.spec,kts.spec}] +indent_size = 4 + +[*.{kt,kts}] +ktlint_code_style = ktlint_official +ktlint_ignore_back_ticked_identifier = true +ij_kotlin_allow_trailing_comma_on_call_site = false +ij_kotlin_allow_trailing_comma = false + +ktlint_standard = enabled + +# Don't allow any wildcard imports +ij_kotlin_packages_to_use_import_on_demand = unset + +# Prevent wildcard imports +ij_kotlin_name_count_to_use_star_import = 99 +ij_kotlin_name_count_to_use_star_import_for_members = 99 + +[*.md] +trim_trailing_whitespace = false +max_line_length = unset + +[gradle/verification-metadata.xml] +indent_size = 3 + +[*.yml] +ij_yaml_spaces_within_brackets = false \ No newline at end of file diff --git a/telekinesis-fabric/build.gradle.kts b/telekinesis-fabric/build.gradle.kts index 235f2c3..0229582 100644 --- a/telekinesis-fabric/build.gradle.kts +++ b/telekinesis-fabric/build.gradle.kts @@ -18,7 +18,7 @@ plugins { group = "dev.nyon" val majorVersion = "2.4.0" -val mcVersion = "24w13a" +val mcVersion = "1.20.5-pre4" val supportedMcVersions = listOf(mcVersion) version = "$majorVersion-$mcVersion" description = "Adds a telekinesis enchantment to minecraft" @@ -40,23 +40,24 @@ repositories { maven("https://maven.parchmentmc.org/") maven("https://jitpack.io") maven("https://oss.sonatype.org/content/repositories/snapshots/") + maven("https://maven.isxander.dev/snapshots") // remove in stable release } dependencies { minecraft("com.mojang:minecraft:$mcVersion") mappings( loom.layered { - parchment("org.parchmentmc.data:parchment-1.20.4:2024.02.25@zip") + parchment("org.parchmentmc.data:parchment-1.20.4:2024.04.14@zip") officialMojangMappings() - }, + } ) implementation("org.vineflower:vineflower:1.9.3") - modImplementation("net.fabricmc:fabric-loader:0.15.7") + modImplementation("net.fabricmc:fabric-loader:0.15.10") modImplementation("net.fabricmc:fabric-language-kotlin:1.10.19+kotlin.1.9.23") - modCompileOnly("dev.isxander.yacl:yet-another-config-lib-fabric:3.3.1+1.20.4") + modImplementation("dev.isxander.yacl:yet-another-config-lib-fabric:3.3.3+1.20.4+update.1.20.5-SNAPSHOT+update.1.20.5-SNAPSHOT") modImplementation("com.terraformersmc:modmenu:10.0.0-alpha.3") - modRuntimeOnly("net.fabricmc.fabric-api:fabric-api:0.96.13+1.20.5") + modRuntimeOnly("net.fabricmc.fabric-api:fabric-api:0.97.3+1.20.5") include(implementation(annotationProcessor("com.github.bawnorton.mixinsquared:mixinsquared-fabric:0.1.1")!!)!!) @@ -88,7 +89,7 @@ tasks { "name" to modName, "description" to modDescription, "version" to project.version, - "github" to githubRepo, + "github" to githubRepo ) } } @@ -103,11 +104,11 @@ tasks { } withType { - kotlinOptions.jvmTarget = "17" + kotlinOptions.jvmTarget = "21" } withType { - options.release.set(17) + options.release.set(21) } loom { diff --git a/telekinesis-fabric/src/main/resources/fabric.mod.json b/telekinesis-fabric/src/main/resources/fabric.mod.json index d803881..f873b06 100644 --- a/telekinesis-fabric/src/main/resources/fabric.mod.json +++ b/telekinesis-fabric/src/main/resources/fabric.mod.json @@ -20,7 +20,7 @@ "depends": { "fabric-language-kotlin": ">=1.10.19+kotlin.1.9.23", "yet_another_config_lib_v3": ">=3.3.1+1.20.4", - "minecraft": ">=1.20.5-alpha.24.13.a" + "minecraft": ">1.20.4" }, "suggests": { "modmenu": ">=10.0.0-alpha.3" @@ -50,4 +50,4 @@ } } } -} \ No newline at end of file +}