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

moved Codices out of the singleton so they can be serialised

Browse Source
This commit is contained in:
minjaesong
2021-09-04 17:55:37 +09:00
parent 57e4b83649
commit 6bea9c9f07
42 changed files with 180 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/net/torvald/terrarum/itemproperties/ItemCodex.kt
View File

@@ -20,7 +20,7 @@ import java.util.*
*
* Created by minjaesong on 2016-03-15.
*/
object ItemCodex {
class ItemCodex {
/**
* <ItemID or RefID for Actor, TheItem>
@@ -30,7 +30,9 @@ object ItemCodex {
val dynamicItemDescription = HashMap<ItemID, GameItem>()
val dynamicToStaticTable = HashMap<ItemID, ItemID>()
val ACTORID_MIN = ReferencingRanges.ACTORS.first
@Transient val ACTORID_MIN = ReferencingRanges.ACTORS.first
internal constructor()
fun clear() {
itemCodex.clear()

8
src/net/torvald/terrarum/itemproperties/Material.kt
View File

@@ -28,12 +28,14 @@ class Material {
var identifier: String = "Name not set"
}
object MaterialCodex {
class MaterialCodex {
val materialProps = HashMap<String, Material>()
private val nullMaterial = Material()
@Transient private val nullMaterial = Material()
operator fun invoke(module: String, path: String) {
private constructor()
internal constructor(module: String, path: String) : this() {
register(CSVFetcher.readFromModule(module, path))
}