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

27
src/net/torvald/terrarum/Terrarum.kt
View File

@@ -15,9 +15,13 @@ import net.torvald.UnsafeHelper
import net.torvald.random.HQRNG
import net.torvald.terrarum.AppLoader.*
import net.torvald.terrarum.TerrarumAppConfiguration.TILE_SIZE
import net.torvald.terrarum.blockproperties.BlockCodex
import net.torvald.terrarum.blockproperties.WireCodex
import net.torvald.terrarum.gameactors.Actor
import net.torvald.terrarum.gameactors.ActorID
import net.torvald.terrarum.gameactors.faction.FactionCodex
import net.torvald.terrarum.itemproperties.ItemCodex
import net.torvald.terrarum.itemproperties.MaterialCodex
import net.torvald.terrarum.ui.UICanvas
import net.torvald.terrarum.worlddrawer.WorldCamera
import net.torvald.terrarumsansbitmap.gdx.GameFontBase
@@ -52,6 +56,14 @@ object Terrarum : Disposable {
}
open lateinit var BlockCodex: BlockCodex
open lateinit var ItemCodex: ItemCodex
open lateinit var WireCodex: WireCodex
open lateinit var MaterialCodex: MaterialCodex
open lateinit var FactionCodex: FactionCodex
open var Apocryphas = HashMap<String, Any>()
//////////////////////////////
// GLOBAL IMMUTABLE CONFIGS //
//////////////////////////////
@@ -629,4 +641,17 @@ interface Id_UICanvasNullable {
fun <T> Array<T>.tail() = this.sliceArray(1 until this.size)
fun <T> Array<T>.init() = this.sliceArray(0 until this.lastIndex)
fun <T> List<T>.tail() = this.subList(1, this.size)
fun <T> List<T>.init() = this.subList(0, this.lastIndex)
fun <T> List<T>.init() = this.subList(0, this.lastIndex)
val BlockCodex: BlockCodex
get() = Terrarum.BlockCodex
val ItemCodex: ItemCodex
get() = Terrarum.ItemCodex
val WireCodex: WireCodex
get() = Terrarum.WireCodex
val MaterialCodex: MaterialCodex
get() = Terrarum.MaterialCodex
val FactionCodex: FactionCodex
get() = Terrarum.FactionCodex
val Apocryphas: HashMap<String, Any>
get() = Terrarum.Apocryphas