Pass in byte[] to all definition loaders, not InputStream

This commit is contained in:
UniquePassive
2017-03-24 19:04:53 +01:00
parent aa02330722
commit 72c82ae298
11 changed files with 46 additions and 40 deletions

View File

@@ -69,7 +69,7 @@ public class SequenceDumper
for (File file : archive.getFiles())
{
SequenceLoader loader = new SequenceLoader();
SequenceDefinition seq = loader.load(file.getFileId(), new InputStream(file.getContents()));
SequenceDefinition seq = loader.load(file.getFileId(), file.getContents());
Files.write(gson.toJson(seq), new java.io.File(outDir, file.getFileId() + ".json"), Charset.defaultCharset());
++count;

View File

@@ -74,7 +74,7 @@ public class SpriteDumperTest
byte[] contents = file.getContents();
SpriteLoader loader = new SpriteLoader();
SpriteDefinition[] sprites = loader.load(a.getArchiveId(), new InputStream(contents));
SpriteDefinition[] sprites = loader.load(a.getArchiveId(), contents);
for (SpriteDefinition def : sprites)
{