4
0
Fork 0
mirror of https://github.com/Anvilcraft/modpacktools synced 2024-05-19 20:04:07 +02:00

use readAsJson instead of JsonReader

This commit is contained in:
LordMZTE 2020-08-14 15:31:03 +02:00
parent 45032e3a98
commit 8938ad2456

View file

@ -1,6 +1,5 @@
package ley.anvil.modpacktools.commands
import com.google.gson.stream.JsonReader
import ley.anvil.addonscript.curse.ManifestJSON
import ley.anvil.modpacktools.GSON
import ley.anvil.modpacktools.MPJH
@ -9,12 +8,12 @@ import ley.anvil.modpacktools.command.CommandReturn.Companion.fail
import ley.anvil.modpacktools.command.CommandReturn.Companion.success
import ley.anvil.modpacktools.command.ICommand
import ley.anvil.modpacktools.command.LoadCommand
import ley.anvil.modpacktools.util.readAsJson
import net.sourceforge.argparse4j.ArgumentParsers
import net.sourceforge.argparse4j.impl.type.FileArgumentType
import net.sourceforge.argparse4j.inf.ArgumentParser
import net.sourceforge.argparse4j.inf.Namespace
import java.io.File
import java.io.FileReader
import java.io.FileWriter
@LoadCommand
@ -42,7 +41,7 @@ object Import : ICommand {
println("Converting...")
MPJH.modpackJsonFile.parentFile.mkdirs()
val mpjWriter = FileWriter(MPJH.modpackJsonFile)
GSON.fromJson<ManifestJSON>(JsonReader(FileReader(manifest)), ManifestJSON::class.java).toAS().write(mpjWriter)
GSON.fromJson<ManifestJSON>(manifest.readAsJson(), ManifestJSON::class.java).toAS().write(mpjWriter)
mpjWriter.close()
return success("Converted sucessfully")
}