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

quickslot selections are controlled by the ingame rather than the 'bar UI'

Browse Source
This commit is contained in:
minjaesong
2019-01-13 02:17:49 +09:00
parent 822b9bf4fd
commit d9c7d3c681
10 changed files with 45 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/net/torvald/terrarum/utils/JsonFetcher.kt
View File

@@ -1,15 +1,6 @@
package net.torvald.terrarum.utils
import com.google.gson.JsonObject
import com.google.gson.JsonParser
import net.torvald.terrarum.AppLoader.printdbg
import java.io.File
import java.io.IOException
import java.nio.file.FileSystems
import java.nio.file.Files
import java.util.ArrayList
import java.util.function.Consumer
/**
* Created by minjaesong on 2016-02-15.
@@ -18,7 +9,7 @@ object JsonFetcher {
private var jsonString: StringBuffer? = null
@Throws(java.io.IOException::class)
@Throws(java.nio.file.NoSuchFileException::class)
operator fun invoke(jsonFilePath: String): com.google.gson.JsonObject {
jsonString = StringBuffer() // reset buffer every time it called
readJsonFileAsString(jsonFilePath)
@@ -35,7 +26,7 @@ object JsonFetcher {
return jsonObj
}
@Throws(java.io.IOException::class)
@Throws(java.nio.file.NoSuchFileException::class)
operator fun invoke(jsonFile: java.io.File): com.google.gson.JsonObject {
jsonString = StringBuffer() // reset buffer every time it called
readJsonFileAsString(jsonFile.canonicalPath)
@@ -52,15 +43,11 @@ object JsonFetcher {
return jsonObj
}
@Throws(java.nio.file.NoSuchFileException::class)
private fun readJsonFileAsString(path: String) {
try {
java.nio.file.Files.lines(java.nio.file.FileSystems.getDefault().getPath(path)).forEach(
{ jsonString!!.append(it) }
) // JSON does not require line break
}
catch (e: IOException) {
System.err.println("[JsonFetcher] An error occurred while reading $path")
e.printStackTrace()
}
java.nio.file.Files.lines(java.nio.file.FileSystems.getDefault().getPath(path)).forEach(
{ jsonString!!.append(it) }
) // JSON does not require line break
}
}

13
src/net/torvald/terrarum/utils/JsonWriter.kt
View File

@@ -1,17 +1,12 @@
package net.torvald.terrarum.utils
import com.google.gson.Gson
import com.google.gson.JsonElement
import com.google.gson.JsonObject
import java.io.FileWriter
import java.io.IOException
/**
* Created by minjaesong on 2016-03-04.
*/
object JsonWriter {
private val formattingRegex = Regex("""(?<=[\{,\[])|(?=[\]}])""")
/**
* serialise a class to the file as JSON, using Google GSON.
*
@@ -23,7 +18,7 @@ object JsonWriter {
val classElem = com.google.gson.Gson().toJsonTree(c)
val jsonString = classElem.toString()
val writer = java.io.FileWriter(path)
writer.write(jsonString)
writer.write(jsonString.replace(formattingRegex, "\n"))
writer.close()
}
@@ -36,7 +31,7 @@ object JsonWriter {
@Throws(java.io.IOException::class)
fun writeToFile(jsonObject: com.google.gson.JsonObject, path: String) {
val writer = java.io.FileWriter(path)
writer.write(jsonObject.toString())
writer.write(jsonObject.toString().replace(formattingRegex, "\n"))
writer.close()
}