mirror of
https://github.com/Anvilcraft/modpacktools
synced 2024-06-02 10:39:59 +02:00
use readAsJson instead of JsonReader
This commit is contained in:
parent
45032e3a98
commit
8938ad2456
|
@ -1,6 +1,5 @@
|
||||||
package ley.anvil.modpacktools.commands
|
package ley.anvil.modpacktools.commands
|
||||||
|
|
||||||
import com.google.gson.stream.JsonReader
|
|
||||||
import ley.anvil.addonscript.curse.ManifestJSON
|
import ley.anvil.addonscript.curse.ManifestJSON
|
||||||
import ley.anvil.modpacktools.GSON
|
import ley.anvil.modpacktools.GSON
|
||||||
import ley.anvil.modpacktools.MPJH
|
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.CommandReturn.Companion.success
|
||||||
import ley.anvil.modpacktools.command.ICommand
|
import ley.anvil.modpacktools.command.ICommand
|
||||||
import ley.anvil.modpacktools.command.LoadCommand
|
import ley.anvil.modpacktools.command.LoadCommand
|
||||||
|
import ley.anvil.modpacktools.util.readAsJson
|
||||||
import net.sourceforge.argparse4j.ArgumentParsers
|
import net.sourceforge.argparse4j.ArgumentParsers
|
||||||
import net.sourceforge.argparse4j.impl.type.FileArgumentType
|
import net.sourceforge.argparse4j.impl.type.FileArgumentType
|
||||||
import net.sourceforge.argparse4j.inf.ArgumentParser
|
import net.sourceforge.argparse4j.inf.ArgumentParser
|
||||||
import net.sourceforge.argparse4j.inf.Namespace
|
import net.sourceforge.argparse4j.inf.Namespace
|
||||||
import java.io.File
|
import java.io.File
|
||||||
import java.io.FileReader
|
|
||||||
import java.io.FileWriter
|
import java.io.FileWriter
|
||||||
|
|
||||||
@LoadCommand
|
@LoadCommand
|
||||||
|
@ -42,7 +41,7 @@ object Import : ICommand {
|
||||||
println("Converting...")
|
println("Converting...")
|
||||||
MPJH.modpackJsonFile.parentFile.mkdirs()
|
MPJH.modpackJsonFile.parentFile.mkdirs()
|
||||||
val mpjWriter = FileWriter(MPJH.modpackJsonFile)
|
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()
|
mpjWriter.close()
|
||||||
return success("Converted sucessfully")
|
return success("Converted sucessfully")
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue