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

watch is semitransparent when EL is off

Browse Source
This commit is contained in:
Minjae Song
2019-01-01 22:29:18 +09:00
parent db110d1ca4
commit edd15a4f79
5 changed files with 38 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/net/torvald/terrarum/utils/CSVFetcher.kt
View File

@@ -1,22 +1,22 @@
package net.torvald.terrarum.utils
import net.torvald.terrarum.AppLoader
import net.torvald.terrarum.AppLoader.printdbg
import net.torvald.terrarum.ModMgr
import org.apache.commons.csv.CSVFormat
import org.apache.commons.csv.CSVParser
import org.apache.commons.csv.CSVRecord
import java.io.IOException
import java.io.InputStreamReader
import java.nio.file.FileSystems
import java.nio.file.Files
/**
* Created by minjaesong on 2016-02-16.
*/
object CSVFetcher {
val terrarumCSVFormat: CSVFormat = org.apache.commons.csv.CSVFormat.DEFAULT.withIgnoreSurroundingSpaces()
.withHeader()
.withIgnoreEmptyLines()
.withDelimiter(';')
.withCommentMarker('#')
.withNullString("N/A")
.withRecordSeparator('\n')
private var csvString: StringBuffer? = null
fun readFromFile(csvFilePath: String): List<org.apache.commons.csv.CSVRecord> {
@@ -27,13 +27,7 @@ object CSVFetcher {
val csvParser = org.apache.commons.csv.CSVParser.parse(
net.torvald.terrarum.utils.CSVFetcher.csvString!!.toString(),
org.apache.commons.csv.CSVFormat.DEFAULT.withIgnoreSurroundingSpaces()
.withHeader()
.withIgnoreEmptyLines()
.withDelimiter(';')
.withCommentMarker('#')
.withNullString("N/A")
.withRecordSeparator('\n')
terrarumCSVFormat
)
val csvRecordList = csvParser.records
@@ -47,13 +41,7 @@ object CSVFetcher {
fun readFromString(csv: String): List<org.apache.commons.csv.CSVRecord> {
val csvParser = org.apache.commons.csv.CSVParser.parse(
csv,
org.apache.commons.csv.CSVFormat.DEFAULT.withIgnoreSurroundingSpaces()
.withHeader()
.withIgnoreEmptyLines()
.withDelimiter(';')
.withCommentMarker('#')
.withNullString("N/A")
.withRecordSeparator('\n')
terrarumCSVFormat
)
val csvRecordList = csvParser.records