Skip to content

Commit a9412d0

Browse files
committed
Complete migration from Kotlin to Java
1 parent 7de512a commit a9412d0

23 files changed

Lines changed: 261 additions & 157 deletions

build.gradle

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
plugins {
22
id 'fabric-loom'
33
id 'maven-publish'
4-
id 'org.jetbrains.kotlin.jvm'
54
}
65

76
sourceCompatibility = JavaVersion.VERSION_21
@@ -16,16 +15,12 @@ repositories {
1615
}
1716

1817
dependencies {
19-
//to change the versions see the gradle.properties file
2018
minecraft "com.mojang:minecraft:${project.minecraft_version}"
2119
mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2"
2220
modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
2321

24-
// Fabric API. This is technically optional, but you probably want it anyway.
2522
modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
2623

27-
modImplementation "net.fabricmc:fabric-language-kotlin:${project.fabric_kotlin_version}"
28-
2924
modImplementation("com.terraformersmc:modmenu:${project.modmenu_version}") {
3025
exclude module: "fabric-api"
3126
}
@@ -39,9 +34,6 @@ processResources {
3934
}
4035
}
4136

42-
// ensure that the encoding is set to UTF-8, no matter what the system default is
43-
// this fixes some edge cases with special characters not displaying correctly
44-
// see http://yodaconditions.net/blog/fix-for-java-file-encoding-problems-with-gradle.html
4537
tasks.withType(JavaCompile) {
4638
it.options.encoding = "UTF-8"
4739
it.options.release = 21
@@ -59,6 +51,4 @@ jar {
5951

6052
loom {
6153
accessWidenerPath = file("src/main/resources/bindcmd.accesswidener")
62-
}
63-
64-
compileKotlin.kotlinOptions.jvmTarget = "21"
54+
}

gradle.properties

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,19 @@
1-
kotlin.code.style=official
21
org.gradle.jvmargs=-Xmx4G
32

43
# Fabric Properties
54
# Check these on https://fabricmc.net/develop/
65
minecraft_version=1.21.10
7-
yarn_mappings=1.21.10+build.2
8-
loader_version=0.17.3
6+
yarn_mappings=1.21.10+build.3
7+
loader_version=0.18.1
98

109
# Fabric API
11-
fabric_version=0.136.0+1.21.10
10+
fabric_version=0.138.3+1.21.10
1211
loom_version=1.13-SNAPSHOT
1312

1413
# Mod Properties
15-
mod_version=1.8.1
14+
mod_version=2.0.0-beta.1
1615
maven_group=net.immortaldevs
1716
archives_base_name=fabric-bind-cmd
1817

19-
# Kotlin
20-
kotlin_version=2.2.21
21-
fabric_kotlin_version=1.13.7+kotlin.2.2.21
18+
# Dependencies
2219
modmenu_version=16.0.0-rc.1

gradle/wrapper/gradle-wrapper.jar

-15.1 KB
Binary file not shown.

gradle/wrapper/gradle-wrapper.properties

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,7 @@
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
5+
networkTimeout=10000
6+
validateDistributionUrl=true
57
zipStoreBase=GRADLE_USER_HOME
68
zipStorePath=wrapper/dists

0 commit comments

Comments
 (0)