cache: Store ID in ScriptLoader

This commit is contained in:
Max Weber
2018-09-11 18:01:42 -06:00
parent 1a14aa295e
commit f7c83db941
3 changed files with 4 additions and 3 deletions

View File

@@ -38,6 +38,7 @@ public class ScriptLoader
public ScriptDefinition load(int id, byte[] b)
{
ScriptDefinition def = new ScriptDefinition();
def.setId(id);
InputStream in = new InputStream(b);
in.setOffset(in.getLength() - 2);

View File

@@ -48,7 +48,7 @@ public class ScriptSaverTest
instructions.init();
ScriptDefinition script = new Assembler(instructions).assemble(getClass().getResourceAsStream(SCRIPT_RESOURCE));
byte[] saved = new ScriptSaver().save(script);
ScriptDefinition loadedScripot = new ScriptLoader().load(42, saved);
ScriptDefinition loadedScripot = new ScriptLoader().load(0, saved);
assertEquals(script, loadedScripot);
}
@@ -59,7 +59,7 @@ public class ScriptSaverTest
instructions.init();
ScriptDefinition script = new Assembler(instructions).assemble(getClass().getResourceAsStream(SCRIPT_RESOURCE_UNICODE));
byte[] saved = new ScriptSaver().save(script);
ScriptDefinition loadedScripot = new ScriptLoader().load(42, saved);
ScriptDefinition loadedScripot = new ScriptLoader().load(0, saved);
assertEquals(script, loadedScripot);
}

View File

@@ -71,7 +71,7 @@ public class DisassemblerTest
continue;
}
ScriptDefinition script = loader.load(0, contents);
ScriptDefinition script = loader.load(archive.getArchiveId(), contents);
File outFile = new File(outDir, archive.getArchiveId() + ".rs2asm");