From e678c83ff987c589ec56e070d7a2cb221de90573 Mon Sep 17 00:00:00 2001 From: Noodleeater Date: Sat, 30 Jan 2021 20:37:02 +0000 Subject: [PATCH 1/4] added licence headers --- .../net/runelite/api/AbstractArchive.java | 48 +++++++++++++++++++ .../runelite/rs/api/RSAbstractArchive.java | 19 +++++++- 2 files changed, 66 insertions(+), 1 deletion(-) create mode 100644 runelite-api/src/main/java/net/runelite/api/AbstractArchive.java diff --git a/runelite-api/src/main/java/net/runelite/api/AbstractArchive.java b/runelite-api/src/main/java/net/runelite/api/AbstractArchive.java new file mode 100644 index 0000000000..f1aa2fd1b6 --- /dev/null +++ b/runelite-api/src/main/java/net/runelite/api/AbstractArchive.java @@ -0,0 +1,48 @@ +/* + * Copyright (c) 2020, Noodleeater + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, this + * list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR + * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ +package net.runelite.api; + +/** + * Represents an archive of data, which is split split into "groups" of "files". + */ +public interface AbstractArchive extends IndexDataBase +{ + /** + * the methods bellow are usefull for reading byte data from the cache + */ + int getGroupCount(); + + byte[] getConfigData(int archiveId, int fileId); + + int[] getFileIds(int groupId); + + int[][] getFileIds(); + + byte[] getFile(int groupId, int fileId); + + int getGroupFileCount(int groupId); + + int[] getFileCounts(); +} diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSAbstractArchive.java b/runescape-api/src/main/java/net/runelite/rs/api/RSAbstractArchive.java index fe3f6c7003..a9aaed036e 100644 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSAbstractArchive.java +++ b/runescape-api/src/main/java/net/runelite/rs/api/RSAbstractArchive.java @@ -1,9 +1,10 @@ package net.runelite.rs.api; +import net.runelite.api.AbstractArchive; import net.runelite.api.IndexDataBase; import net.runelite.mapping.Import; -public interface RSAbstractArchive extends IndexDataBase +public interface RSAbstractArchive extends IndexDataBase, AbstractArchive { @Import("takeFile") byte[] getConfigData(int archiveId, int fileId); @@ -11,4 +12,20 @@ public interface RSAbstractArchive extends IndexDataBase @Import("getGroupFileIds") @Override int[] getFileIds(int group); + + @Import("groupCount") + int getGroupCount(); + + @Import("fileIds") + int[][] getFileIds(); + + @Import("getFile") + byte[] getFile(int var1, int var2); + + @Import("getGroupFileCount") + + int getGroupFileCount(int var1); + + @Import("fileCounts") + int[] getFileCounts(); } From 9f1ed6d6de98083f85735fb2ca1bd027e8703824 Mon Sep 17 00:00:00 2001 From: Noodleeater Date: Sat, 30 Jan 2021 20:37:45 +0000 Subject: [PATCH 2/4] added licence headers --- .../src/main/java/net/runelite/api/AbstractArchive.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runelite-api/src/main/java/net/runelite/api/AbstractArchive.java b/runelite-api/src/main/java/net/runelite/api/AbstractArchive.java index f1aa2fd1b6..0be27dfa46 100644 --- a/runelite-api/src/main/java/net/runelite/api/AbstractArchive.java +++ b/runelite-api/src/main/java/net/runelite/api/AbstractArchive.java @@ -25,7 +25,7 @@ package net.runelite.api; /** - * Represents an archive of data, which is split split into "groups" of "files". + * Represents an archive of data, which is ordered into "groups" of "files". */ public interface AbstractArchive extends IndexDataBase { From 9d09bb722ef019a8ce7c7128bf7910e9d4837d3e Mon Sep 17 00:00:00 2001 From: Noodleeater Date: Sat, 30 Jan 2021 20:51:13 +0000 Subject: [PATCH 3/4] added @overide annotations --- .../main/java/net/runelite/rs/api/RSAbstractArchive.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSAbstractArchive.java b/runescape-api/src/main/java/net/runelite/rs/api/RSAbstractArchive.java index a9aaed036e..d15f48a266 100644 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSAbstractArchive.java +++ b/runescape-api/src/main/java/net/runelite/rs/api/RSAbstractArchive.java @@ -14,18 +14,22 @@ public interface RSAbstractArchive extends IndexDataBase, AbstractArchive int[] getFileIds(int group); @Import("groupCount") + @Override int getGroupCount(); @Import("fileIds") + @Override int[][] getFileIds(); @Import("getFile") + @Override byte[] getFile(int var1, int var2); @Import("getGroupFileCount") - + @Override int getGroupFileCount(int var1); @Import("fileCounts") + @Override int[] getFileCounts(); } From e827167e30afc6feb1f26ec40803e660bdd76127 Mon Sep 17 00:00:00 2001 From: Noodleeater Date: Sat, 30 Jan 2021 20:56:01 +0000 Subject: [PATCH 4/4] renamed method parameters --- .../main/java/net/runelite/rs/api/RSAbstractArchive.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSAbstractArchive.java b/runescape-api/src/main/java/net/runelite/rs/api/RSAbstractArchive.java index d15f48a266..bddfbe6f71 100644 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSAbstractArchive.java +++ b/runescape-api/src/main/java/net/runelite/rs/api/RSAbstractArchive.java @@ -7,11 +7,12 @@ import net.runelite.mapping.Import; public interface RSAbstractArchive extends IndexDataBase, AbstractArchive { @Import("takeFile") + @Override byte[] getConfigData(int archiveId, int fileId); @Import("getGroupFileIds") @Override - int[] getFileIds(int group); + int[] getFileIds(int groupId); @Import("groupCount") @Override @@ -23,11 +24,11 @@ public interface RSAbstractArchive extends IndexDataBase, AbstractArchive @Import("getFile") @Override - byte[] getFile(int var1, int var2); + byte[] getFile(int groupId, int fileId); @Import("getGroupFileCount") @Override - int getGroupFileCount(int var1); + int getGroupFileCount(int groupId); @Import("fileCounts") @Override