Skip to content

Commit

Permalink
update versions, add editorconfig
Browse files Browse the repository at this point in the history
  • Loading branch information
btwonion committed Apr 18, 2024
1 parent 4d09ecc commit 092420b
Show file tree
Hide file tree
Showing 3 changed files with 52 additions and 11 deletions.
40 changes: 40 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -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
19 changes: 10 additions & 9 deletions telekinesis-fabric/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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")!!)!!)

Expand Down Expand Up @@ -88,7 +89,7 @@ tasks {
"name" to modName,
"description" to modDescription,
"version" to project.version,
"github" to githubRepo,
"github" to githubRepo
)
}
}
Expand All @@ -103,11 +104,11 @@ tasks {
}

withType<KotlinCompile> {
kotlinOptions.jvmTarget = "17"
kotlinOptions.jvmTarget = "21"
}

withType<JavaCompile> {
options.release.set(17)
options.release.set(21)
}

loom {
Expand Down
4 changes: 2 additions & 2 deletions telekinesis-fabric/src/main/resources/fabric.mod.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -50,4 +50,4 @@
}
}
}
}
}

0 comments on commit 092420b

Please sign in to comment.