curioustorvald/Terrarum
1
0
Fork 0
mirror of https://github.com/curioustorvald/Terrarum.git synced 2026-06-11 19:14:05 +09:00
Code Issues Packages Projects Releases Wiki Activity

external classloader from modmgr

Browse Source
This commit is contained in:
minjaesong
2025-03-30 17:00:39 +09:00
parent 852c0b7dcc
commit 0c35faa548
24 changed files with 200 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
src/net/torvald/terrarum/ModMgr.kt
View File

@@ -519,6 +519,38 @@ object ModMgr {
return filesList.toList()
}
fun <T> getJavaClass(module: String, className: String, constructorTypes: Array<Class<*>>, initArgs: Array<Any>): T {
checkExistence(module)
moduleClassloader[module].let {
if (it == null) {
val loadedClass = Class.forName(className)
val loadedClassConstructor = loadedClass.getConstructor(*constructorTypes)
return loadedClassConstructor.newInstance(*initArgs) as T
}
else {
val loadedClass = it.loadClass(className)
val loadedClassConstructor = loadedClass.getConstructor(*constructorTypes)
return loadedClassConstructor.newInstance(*initArgs) as T
}
}
}
fun <T> getJavaClass(module: String, className: String): T {
checkExistence(module)
moduleClassloader[module].let {
if (it == null) {
val loadedClass = Class.forName(className)
val loadedClassConstructor = loadedClass.getConstructor()
return loadedClassConstructor.newInstance() as T
}
else {
val loadedClass = it.loadClass(className)
val loadedClassConstructor = loadedClass.getConstructor()
return loadedClassConstructor.newInstance() as T
}
}
}
fun disposeMods() {
entryPointClasses.forEach { it.dispose() }
}
@@ -668,26 +700,14 @@ object ModMgr {
csv.forEach {
val className: String = it["classname"].toString()
val internalID: Int = it["id"].toInt()
val itemName: String = "item@$module:$internalID"
val itemName: ItemID = "item@$module:$internalID"
val tags = it["tags"].split(',').map { it.trim().toUpperCase() }.toHashSet()
printdbg(this, "Reading item ${itemName} <<- internal #$internalID with className $className")
moduleClassloader[module].let {
if (it == null) {
val loadedClass = Class.forName(className)
val loadedClassConstructor = loadedClass.getConstructor(ItemID::class.java)
val loadedClassInstance = loadedClassConstructor.newInstance(itemName)
ItemCodex[itemName] = loadedClassInstance as GameItem
ItemCodex[itemName]!!.tags.addAll(tags)
}
else {
val loadedClass = it.loadClass(className)
val loadedClassConstructor = loadedClass.getConstructor(ItemID::class.java)
val loadedClassInstance = loadedClassConstructor.newInstance(itemName)
ItemCodex[itemName] = loadedClassInstance as GameItem
ItemCodex[itemName]!!.tags.addAll(tags)
}
ModMgr.getJavaClass<GameItem>(module, className, arrayOf(ItemID::class.java), arrayOf(itemName)).let {
ItemCodex[itemName] = it
ItemCodex[itemName]!!.tags.addAll(tags)
}
}
}