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

wtfman

Browse Source
This commit is contained in:
minjaesong
2021-12-03 17:59:12 +09:00
parent ebc762e90a
commit 1a250ee095
1 changed files with 46 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -11,14 +11,17 @@ import net.torvald.terrarum.itemproperties.ItemCodex
import net.torvald.terrarum.itemproperties.MaterialCodex import net.torvald.terrarum.itemproperties.MaterialCodex
import net.torvald.terrarum.langpack.Lang import net.torvald.terrarum.langpack.Lang
import net.torvald.terrarum.savegame.ByteArray64GrowableOutputStream import net.torvald.terrarum.savegame.ByteArray64GrowableOutputStream
import net.torvald.terrarum.savegame.ByteArray64OutputStream
import net.torvald.terrarum.savegame.ByteArray64Reader import net.torvald.terrarum.savegame.ByteArray64Reader
import net.torvald.terrarum.utils.CSVFetcher import net.torvald.terrarum.utils.CSVFetcher
import net.torvald.terrarum.utils.JsonFetcher import net.torvald.terrarum.utils.JsonFetcher
import org.apache.commons.csv.CSVFormat import org.apache.commons.csv.CSVFormat
import org.apache.commons.csv.CSVParser import org.apache.commons.csv.CSVParser
import org.apache.commons.csv.CSVRecord import org.apache.commons.csv.CSVRecord
import java.io.* import java.io.File
import java.io.FileInputStream
import java.io.FileNotFoundException
import java.io.PrintStream
import java.net.MalformedURLException
import java.net.URL import java.net.URL
import java.net.URLClassLoader import java.net.URLClassLoader
import java.nio.file.FileSystems import java.nio.file.FileSystems
@@ -128,17 +131,18 @@ object ModMgr {
// that does not contain entry "basegame:0" // that does not contain entry "basegame:0"
// for modules that has JAR defined // for modules that has JAR defined
// if (jar.isNotBlank()) { if (jar.isNotBlank()) {
// val child = URLClassLoader(arrayOf<URL>(File("$modDir/$moduleName/$jar").toURI().toURL()), // val urls = arrayOf<URL>()
// this.javaClass.classLoader
// ) // val cl = JarFileLoader(urls)
// moduleClassloader[moduleName] = child // cl.addFile("${File(modDir).absolutePath}/$moduleName/$jar")
// newClass = Class.forName(entryPoint, true, child) // moduleClassloader[moduleName] = cl
// } // newClass = cl.loadClass(entryPoint)
}
// for modules that are not (meant to be used by the "basegame" kind of modules) // for modules that are not (meant to be used by the "basegame" kind of modules)
// else { else {
newClass = Class.forName(entryPoint) newClass = Class.forName(entryPoint)
// } }
} }
catch (e: Throwable) { catch (e: Throwable) {
printdbgerr(this, "$moduleName failed to load, skipping...") printdbgerr(this, "$moduleName failed to load, skipping...")
@@ -151,18 +155,23 @@ object ModMgr {
moduleInfo.remove(moduleName) moduleInfo.remove(moduleName)
} }
newClass?.let { if (newClass != null) {
val newClassConstructor = newClass.getConstructor(/* no args defined */) val newClassConstructor = newClass.getConstructor(/* no args defined */)
val newClassInstance = newClassConstructor.newInstance(/* no args defined */) val newClassInstance = newClassConstructor.newInstance(/* no args defined */)
entryPointClasses.add(newClassInstance as ModuleEntryPoint) entryPointClasses.add(newClassInstance as ModuleEntryPoint)
(newClassInstance as ModuleEntryPoint).invoke() (newClassInstance as ModuleEntryPoint).invoke()
printdbg(this, "$moduleName loaded successfully")
}
else {
moduleInfo.remove(moduleName)
printdbg(this, "$moduleName did not load...")
} }
} }
printdbg(this, "Module $moduleName processed")
printdbg(this, "$moduleName loaded successfully")
} }
catch (noSuchModule: FileNotFoundException) { catch (noSuchModule: FileNotFoundException) {
printdbgerr(this, "No such module: $moduleName, skipping...") printdbgerr(this, "No such module: $moduleName, skipping...")
@@ -339,14 +348,22 @@ object ModMgr {
printdbg(this, "Reading item ${itemName} <<- internal #$internalID with className $className") printdbg(this, "Reading item ${itemName} <<- internal #$internalID with className $className")
val loadedClass = if (moduleClassloader[module] != null) moduleClassloader[module].let {
Class.forName(className, true, moduleClassloader[module]) if (it == null) {
else val loadedClass = Class.forName(className)
Class.forName(className) val loadedClassConstructor = loadedClass.getConstructor(ItemID::class.java)
val loadedClassConstructor = loadedClass.getConstructor(ItemID::class.java) val loadedClassInstance = loadedClassConstructor.newInstance(itemName)
val loadedClassInstance = loadedClassConstructor.newInstance(itemName)
ItemCodex[itemName] = loadedClassInstance as GameItem ItemCodex[itemName] = loadedClassInstance as GameItem
}
else {
val loadedClass = it.loadClass(className)
val loadedClassConstructor = loadedClass.getConstructor(ItemID::class.java)
val loadedClassInstance = loadedClassConstructor.newInstance(itemName)
ItemCodex[itemName] = loadedClassInstance as GameItem
}
}
} }
} }
} }
@@ -366,4 +383,12 @@ object ModMgr {
Terrarum.materialCodex = MaterialCodex(module, matePath + "materials.csv") Terrarum.materialCodex = MaterialCodex(module, matePath + "materials.csv")
} }
} }
}
private class JarFileLoader(urls: Array<URL>) : URLClassLoader(urls) {
@Throws(MalformedURLException::class)
fun addFile(path: String) {
val urlPath = "jar:file://$path!/"
addURL(URL(urlPath))
}
} }