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

tags on ingame blocks

Browse Source
This commit is contained in:
minjaesong
2022-03-11 15:05:06 +09:00
parent 6c7cbc02ae
commit b5aacd976c
4 changed files with 134 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/net/torvald/terrarum/blockproperties/BlockCodex.kt
View File

@@ -210,6 +210,9 @@ class BlockCodex {
prop.reflectance = record.floatVal("refl")
prop.tags = record.get("tags").split(',').map { it.trim() }.toHashSet()
prop.material = record.get("mate")
blockProps[prop.id] = prop
printdbg(this, "Setting prop ${prop.id} ->>\t${prop.nameKey}\tsolid:${prop.isSolid}")
@@ -221,12 +224,9 @@ fun CSVRecord.str16ToInt(s: String): Int {
try {
ret = this.get(s).toLong(16).toInt()
}
catch (e: NumberFormatException) {
}
catch (e1: IllegalStateException) {
}
catch (e2: NullPointerException) {
}
catch (e: NumberFormatException) { }
catch (e1: IllegalStateException) { }
catch (e2: NullPointerException) { }
return ret
}
@@ -236,12 +236,9 @@ fun CSVRecord.intVal(s: String): Int {
try {
ret = this.get(s).toInt()
}
catch (e: NumberFormatException) {
}
catch (e1: IllegalStateException) {
}
catch (e2: NullPointerException) {
}
catch (e: NumberFormatException) { }
catch (e1: IllegalStateException) { }
catch (e2: NullPointerException) { }
return ret
}
@@ -251,12 +248,9 @@ fun CSVRecord.floatVal(s: String): Float {
try {
ret = this.get(s).toFloat()
}
catch (e: NumberFormatException) {
}
catch (e1: IllegalStateException) {
}
catch (e2: NullPointerException) {
}
catch (e: NumberFormatException) { }
catch (e1: IllegalStateException) { }
catch (e2: NullPointerException) { }
return ret
}