From f7c83db941c1dc8711803e92f652ee0c6c5404ba Mon Sep 17 00:00:00 2001 From: Max Weber Date: Tue, 11 Sep 2018 18:01:42 -0600 Subject: [PATCH] cache: Store ID in ScriptLoader --- .../net/runelite/cache/definitions/loaders/ScriptLoader.java | 1 + .../runelite/cache/definitions/savers/ScriptSaverTest.java | 4 ++-- .../runelite/cache/script/disassembler/DisassemblerTest.java | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/cache/src/main/java/net/runelite/cache/definitions/loaders/ScriptLoader.java b/cache/src/main/java/net/runelite/cache/definitions/loaders/ScriptLoader.java index 1bb228eee9..6f8512695a 100644 --- a/cache/src/main/java/net/runelite/cache/definitions/loaders/ScriptLoader.java +++ b/cache/src/main/java/net/runelite/cache/definitions/loaders/ScriptLoader.java @@ -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); diff --git a/cache/src/test/java/net/runelite/cache/definitions/savers/ScriptSaverTest.java b/cache/src/test/java/net/runelite/cache/definitions/savers/ScriptSaverTest.java index 447b392ae3..694610a6d9 100644 --- a/cache/src/test/java/net/runelite/cache/definitions/savers/ScriptSaverTest.java +++ b/cache/src/test/java/net/runelite/cache/definitions/savers/ScriptSaverTest.java @@ -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); } diff --git a/cache/src/test/java/net/runelite/cache/script/disassembler/DisassemblerTest.java b/cache/src/test/java/net/runelite/cache/script/disassembler/DisassemblerTest.java index 30f6fd46d9..a97ca27586 100644 --- a/cache/src/test/java/net/runelite/cache/script/disassembler/DisassemblerTest.java +++ b/cache/src/test/java/net/runelite/cache/script/disassembler/DisassemblerTest.java @@ -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");