Skip to content

Commit e9d054a

Browse files
committed
use libVersion
1 parent 5edca84 commit e9d054a

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

build.gradle.kts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ version = "0.1.1"
99

1010
repositories {
1111
mavenCentral()
12+
maven(url = "https://jitpack.io")
1213
}
1314

1415
dependencies {
@@ -24,6 +25,8 @@ dependencies {
2425

2526
implementation("io.github.microutils:kotlin-logging-jvm:2.1.0")
2627
implementation("ch.qos.logback:logback-classic:1.2.7")
28+
29+
implementation("org.bundleproject:libversion:0.0.2")
2730
}
2831

2932
tasks {

src/main/kotlin/org/bundleproject/launchwrapper/Launcher.kt

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
package org.bundleproject.launchwrapper
22

33
import org.bundleproject.launchwrapper.utils.*
4+
import org.bundleproject.libversion.Version
45
import java.io.File
56
import kotlin.reflect.KClass
67
import kotlin.reflect.full.callSuspend
7-
import kotlin.reflect.full.createType
88
import kotlin.reflect.full.functions
99
import kotlin.reflect.full.primaryConstructor
1010

@@ -21,6 +21,7 @@ suspend fun launch(args: Array<String>, gameDir: File, classLoader: ClassLoader)
2121
(args["bundleMainClass"]?.let { Class.forName(it).kotlin } ?: findEntrypoint())?.run {
2222
val version = args["version"]
2323
?.takeIf { it != "MultiMC5" }
24+
?.let(Version::of)
2425
val modFolderName = "mods"
2526

2627
val bundleClass = runCatching { Class.forName(bundleClassName, true, classLoader).kotlin }
@@ -31,8 +32,8 @@ suspend fun launch(args: Array<String>, gameDir: File, classLoader: ClassLoader)
3132
.getOrThrow()
3233

3334
logger.info("Invoking constructor...")
34-
bundleClass.constructors.find { it.typeParameters[1] == String::class.createType() }
35-
?.call(gameDir, version, modFolderName)
35+
bundleClass.primaryConstructor?.call(gameDir, version, modFolderName)
36+
?: logger.error("Couldn't invoke constructor!")
3637

3738
logger.info("Starting Bundle... Goodbye, Launchwrapper...")
3839
bundleClass.functions.find { it.name == "start" }?.callSuspend()

0 commit comments

Comments
 (0)