diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSAbstractFont.java b/runescape-api/src/main/java/net/runelite/rs/api/RSAbstractFont.java new file mode 100644 index 0000000000..41e96907fb --- /dev/null +++ b/runescape-api/src/main/java/net/runelite/rs/api/RSAbstractFont.java @@ -0,0 +1,18 @@ +package net.runelite.rs.api; + +import net.runelite.api.FontTypeFace; +import net.runelite.mapping.Import; + +public interface RSAbstractFont extends FontTypeFace +{ + @Import("stringWidth") + @Override + int getTextWidth(String text); + + @Import("ascent") + @Override + int getBaseline(); + + @Import("draw") + void drawTextLeftAligned(String text, int x, int y, int fontColor, int shadowColor); +} diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSAbstractIndexCache.java b/runescape-api/src/main/java/net/runelite/rs/api/RSAbstractIndexCache.java new file mode 100644 index 0000000000..f561f1e562 --- /dev/null +++ b/runescape-api/src/main/java/net/runelite/rs/api/RSAbstractIndexCache.java @@ -0,0 +1,10 @@ +package net.runelite.rs.api; + +import net.runelite.api.IndexDataBase; +import net.runelite.mapping.Import; + +public interface RSAbstractIndexCache extends IndexDataBase +{ + @Import("takeRecord") + byte[] getConfigData(int archiveId, int fileId); +} diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSAbstractRasterProvider.java b/runescape-api/src/main/java/net/runelite/rs/api/RSAbstractRasterProvider.java new file mode 100644 index 0000000000..c84af22d51 --- /dev/null +++ b/runescape-api/src/main/java/net/runelite/rs/api/RSAbstractRasterProvider.java @@ -0,0 +1,50 @@ +/* + * BSD 2-Clause License + * + * Copyright (c) 2019, ThatGamerBlue + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, this + * list of conditions and the following disclaimer. + * + * 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 HOLDER 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.rs.api; + +import net.runelite.api.BufferProvider; +import net.runelite.mapping.Import; + +public interface RSAbstractRasterProvider extends BufferProvider +{ + @Import("pixels") + @Override + int[] getPixels(); + + @Import("width") + @Override + int getWidth(); + + @Import("height") + @Override + int getHeight(); + + @Import("apply") + void setRaster(); +} diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSActor.java b/runescape-api/src/main/java/net/runelite/rs/api/RSActor.java index 801cf4413a..24cc729f68 100644 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSActor.java +++ b/runescape-api/src/main/java/net/runelite/rs/api/RSActor.java @@ -27,19 +27,23 @@ package net.runelite.rs.api; import net.runelite.api.Actor; import net.runelite.mapping.Import; -public interface RSActor extends RSRenderable, Actor +public interface RSActor extends RSEntity, Actor { - @Import("interacting") + @Import("targetIndex") int getRSInteracting(); - @Import("overhead") + // Overhead text + + @Import("overheadText") @Override String getOverheadText(); - @Import("overhead") + @Import("overheadText") @Override void setOverheadText(String overheadText); + // Coord stuff + @Import("x") int getX(); @@ -52,76 +56,88 @@ public interface RSActor extends RSRenderable, Actor @Import("pathY") int[] getPathY(); - @Import("animation") + // Animation + + @Import("sequence") @Override int getAnimation(); - @Import("animation") + @Import("sequence") @Override void setAnimation(int animation); - @Import("graphic") + @Import("sequenceFrame") @Override - int getGraphic(); + int getActionFrame(); - @Import("graphic") + @Import("sequenceFrame") @Override - void setGraphic(int graphic); + void setActionFrame(int frame); - @Import("combatInfoList") - RSCombatInfoList getCombatInfoList(); + @Import("sequenceFrameCycle") + @Override + int getActionFrameCycle(); + + // Spot animation (aka graphic) + + @Import("spotAnimation") + @Override + int getSpotAnimation(); + + @Import("spotAnimation") + @Override + void setSpotAnimation(int id); + + @Import("spotAnimationFrame") + int getSpotAnimationFrame(); + + @Import("spotAnimationFrame") + @Override + void setSpotAnimationFrame(int id); + + @Import("spotAnimationFrameCycle") + int getSpotAnimationFrameCycle(); + + // Idle animation + + @Import("idleSequence") + @Override + void setIdlePoseAnimation(int animation); + + // Movement animation (aka poseAnimation) + + @Import("movementSequence") + @Override + void setPoseAnimation(int animation); + + @Import("movementFrame") + int getPoseFrame(); + + @Import("movementFrame") + void setPoseFrame(int frame); + + @Import("movementFrameCycle") + int getPoseFrameCycle(); + + @Import("defaultHeight") + @Override + int getLogicalHeight(); @Import("orientation") @Override int getOrientation(); - @Import("logicalHeight") - @Override - int getLogicalHeight(); + // Health stuff - @Import("idlePoseAnimation") - @Override - void setIdlePoseAnimation(int animation); + @Import("healthBars") + RSIterableNodeDeque getHealthBars(); - @Import("poseAnimation") - @Override - void setPoseAnimation(int animation); - - @Import("actionFrame") - int getActionFrame(); - - @Import("actionFrame") - @Override - void setActionFrame(int frame); - - @Import("actionFrameCycle") - int getActionFrameCycle(); - - @Import("poseFrame") - int getPoseFrame(); - - @Import("poseFrame") - void setPoseFrame(int frame); - - @Import("poseFrameCycle") - int getPoseFrameCycle(); - - @Import("spotAnimFrame") - int getSpotAnimFrame(); - - @Import("spotAnimFrame") - @Override - void setSpotAnimFrame(int frame); - - @Import("spotAnimFrameCycle") - int getSpotAnimFrameCycle(); - - @Import("hitsplatValues") + @Import("hitSplatValues") int[] getHitsplatValues(); - @Import("hitsplatTypes") + @Import("hitSplatTypes") int[] getHitsplatTypes(); - @Import("hitsplatCycles") + @Import("hitSplatCycles") int[] getHitsplatCycles(); } diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSFrame.java b/runescape-api/src/main/java/net/runelite/rs/api/RSAnimation.java similarity index 88% rename from runescape-api/src/main/java/net/runelite/rs/api/RSFrame.java rename to runescape-api/src/main/java/net/runelite/rs/api/RSAnimation.java index 6169518500..86df180557 100644 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSFrame.java +++ b/runescape-api/src/main/java/net/runelite/rs/api/RSAnimation.java @@ -26,26 +26,26 @@ package net.runelite.rs.api; import net.runelite.mapping.Import; -public interface RSFrame +public interface RSAnimation { - @Import("skin") - RSFrameMap getSkin(); + @Import("skeleton") + RSSkeleton getSkin(); @Import("transformCount") int getTransformCount(); - @Import("transformTypes") + @Import("transformSkeletonLabels") int[] getTransformTypes(); - @Import("translator_x") + @Import("transformXs") int[] getTranslatorX(); - @Import("translator_y") + @Import("transformYs") int[] getTranslatorY(); - @Import("translator_z") + @Import("transformZs") int[] getTranslatorZ(); - @Import("showing") + @Import("hasAlphaTransform") boolean isShowing(); } diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSBoundaryObject.java b/runescape-api/src/main/java/net/runelite/rs/api/RSBoundaryObject.java new file mode 100644 index 0000000000..650ee24834 --- /dev/null +++ b/runescape-api/src/main/java/net/runelite/rs/api/RSBoundaryObject.java @@ -0,0 +1,41 @@ +package net.runelite.rs.api; + +import net.runelite.api.WallObject; +import net.runelite.mapping.Import; + +public interface RSBoundaryObject extends WallObject +{ + @Import("tag") + @Override + long getHash(); + + @Import("x") + @Override + int getX(); + + @Import("y") + @Override + int getY(); + + @Import("orientationA") + @Override + int getOrientationA(); + + @Import("orientationB") + @Override + int getOrientationB(); + + @Import("entity1") + @Override + RSEntity getRenderable1(); + + @Import("entity2") + @Override + RSEntity getRenderable2(); + + @Import("flags") + @Override + int getConfig(); + + void setPlane(int plane); +} diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSBuddy.java b/runescape-api/src/main/java/net/runelite/rs/api/RSBuddy.java new file mode 100644 index 0000000000..8904aed13d --- /dev/null +++ b/runescape-api/src/main/java/net/runelite/rs/api/RSBuddy.java @@ -0,0 +1,14 @@ +package net.runelite.rs.api; + +import net.runelite.api.ChatPlayer; +import net.runelite.mapping.Import; + +public interface RSBuddy extends ChatPlayer, RSUser +{ + @Import("world") + @Override + int getWorld(); + + @Import("rank") + int getRSRank(); +} diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSBuffer.java b/runescape-api/src/main/java/net/runelite/rs/api/RSBuffer.java index 0c357c3fee..93fdebb463 100644 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSBuffer.java +++ b/runescape-api/src/main/java/net/runelite/rs/api/RSBuffer.java @@ -1,36 +1,12 @@ -/* - * Copyright (c) 2016-2017, Adam - * 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.rs.api; import net.runelite.mapping.Import; public interface RSBuffer extends RSNode { - @Import("payload") + @Import("array") byte[] getPayload(); - @Import("offset") + @Import("index") int getOffset(); -} +} \ No newline at end of file diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSBufferProvider.java b/runescape-api/src/main/java/net/runelite/rs/api/RSBufferProvider.java deleted file mode 100644 index c46cfa6b7c..0000000000 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSBufferProvider.java +++ /dev/null @@ -1,46 +0,0 @@ -/* - * Copyright (c) 2017, Adam - * 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.rs.api; - -import net.runelite.api.BufferProvider; -import net.runelite.mapping.Import; - -public interface RSBufferProvider extends BufferProvider -{ - @Import("pixels") - @Override - int[] getPixels(); - - @Import("width") - @Override - int getWidth(); - - @Import("height") - @Override - int getHeight(); - - @Import("setRaster") - void setRaster(); -} diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSCanvas.java b/runescape-api/src/main/java/net/runelite/rs/api/RSCanvas.java new file mode 100644 index 0000000000..f0295a0770 --- /dev/null +++ b/runescape-api/src/main/java/net/runelite/rs/api/RSCanvas.java @@ -0,0 +1,5 @@ +package net.runelite.rs.api; + +public interface RSCanvas +{ +} diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSChatChannel.java b/runescape-api/src/main/java/net/runelite/rs/api/RSChatChannel.java new file mode 100644 index 0000000000..1adc2a9483 --- /dev/null +++ b/runescape-api/src/main/java/net/runelite/rs/api/RSChatChannel.java @@ -0,0 +1,18 @@ +package net.runelite.rs.api; + +import net.runelite.api.ChatLineBuffer; +import net.runelite.mapping.Import; + +public interface RSChatChannel extends ChatLineBuffer +{ + @Import("messages") + @Override + RSMessage[] getLines(); + + @Import("count") + @Override + int getLength(); + + @Import("count") + void setLength(int length); +} diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSChatLineBuffer.java b/runescape-api/src/main/java/net/runelite/rs/api/RSChatLineBuffer.java deleted file mode 100644 index 9aa9b35c3b..0000000000 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSChatLineBuffer.java +++ /dev/null @@ -1,45 +0,0 @@ -/* - * Copyright (c) 2017. l2- - * - * 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.rs.api; - -import net.runelite.api.ChatLineBuffer; -import net.runelite.api.MessageNode; -import net.runelite.mapping.Import; - -public interface RSChatLineBuffer extends ChatLineBuffer -{ - @Import("lines") - @Override - MessageNode[] getLines(); - - @Import("length") - @Override - int getLength(); - - @Import("length") - void setLength(int length); -} \ No newline at end of file diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSChatPlayer.java b/runescape-api/src/main/java/net/runelite/rs/api/RSChatPlayer.java deleted file mode 100644 index 8bf5cffe1d..0000000000 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSChatPlayer.java +++ /dev/null @@ -1,38 +0,0 @@ -/* - * Copyright (c) 2016-2018, Adam - * 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.rs.api; - -import net.runelite.api.ChatPlayer; -import net.runelite.mapping.Import; - -public interface RSChatPlayer extends ChatPlayer, RSNameable -{ - @Import("world") - @Override - int getWorld(); - - @Import("rank") - int getRSRank(); -} diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSClanChat.java b/runescape-api/src/main/java/net/runelite/rs/api/RSClanChat.java new file mode 100644 index 0000000000..4b13f47147 --- /dev/null +++ b/runescape-api/src/main/java/net/runelite/rs/api/RSClanChat.java @@ -0,0 +1,12 @@ +package net.runelite.rs.api; + +import net.runelite.mapping.Import; + +public interface RSClanChat extends RSUserList +{ + @Import("owner") + String getClanOwner(); + + @Import("name") + String getClanChatName(); +} diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSClanMate.java b/runescape-api/src/main/java/net/runelite/rs/api/RSClanMate.java new file mode 100644 index 0000000000..1bcfb5b6df --- /dev/null +++ b/runescape-api/src/main/java/net/runelite/rs/api/RSClanMate.java @@ -0,0 +1,7 @@ +package net.runelite.rs.api; + +import net.runelite.api.ClanMember; + +public interface RSClanMate extends RSBuddy, ClanMember +{ +} diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSClanMember.java b/runescape-api/src/main/java/net/runelite/rs/api/RSClanMember.java deleted file mode 100644 index ba65238fa4..0000000000 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSClanMember.java +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Copyright (c) 2016-2017, Adam - * 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.rs.api; - -import net.runelite.api.ClanMember; - -public interface RSClanMember extends RSChatPlayer, ClanMember -{ -} diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSClanMemberManager.java b/runescape-api/src/main/java/net/runelite/rs/api/RSClanMemberManager.java deleted file mode 100644 index 36a486c28b..0000000000 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSClanMemberManager.java +++ /dev/null @@ -1,36 +0,0 @@ -/* - * Copyright (c) 2018, Adam - * 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.rs.api; - -import net.runelite.mapping.Import; - -public interface RSClanMemberManager extends RSNameableContainer -{ - @Import("clanOwner") - String getClanOwner(); - - @Import("clanChatName") - String getClanChatName(); -} diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSClassInfo.java b/runescape-api/src/main/java/net/runelite/rs/api/RSClassInfo.java deleted file mode 100644 index 52dbd172d1..0000000000 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSClassInfo.java +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Copyright (c) 2016-2017, Adam - * 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.rs.api; - -import java.lang.reflect.Field; -import java.lang.reflect.Method; -import net.runelite.mapping.Import; - -public interface RSClassInfo -{ - @Import("methods") - Method[] getMethods(); - - @Import("fields") - Field[] getFields(); - - @Import("args") - byte[][][] getArgs(); -} diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSClient.java b/runescape-api/src/main/java/net/runelite/rs/api/RSClient.java index f5e9d4c139..8e0ebf9e97 100644 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSClient.java +++ b/runescape-api/src/main/java/net/runelite/rs/api/RSClient.java @@ -1,60 +1,64 @@ /* - * Copyright (c) 2016-2017, Adam + * BSD 2-Clause License + * + * Copyright (c) 2019, ThatGamerBlue * 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. + * Redistributions of source code must retain the above copyright notice, this + * list of conditions and the following disclaimer. * - * 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. + * 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 HOLDER 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.rs.api; -import java.util.Map; import net.runelite.api.Client; -import net.runelite.api.SpritePixels; +import net.runelite.api.Sprite; import net.runelite.api.World; import net.runelite.api.widgets.Widget; +import java.util.Map; import net.runelite.mapping.Construct; import net.runelite.mapping.Import; -public interface RSClient extends RSGameEngine, Client +public interface RSClient extends RSGameShell, Client { @Import("cameraX") @Override int getCameraX(); - @Import("cameraY") + @Import("cameraZ") // <--- This is correct! @Override int getCameraY(); - @Import("cameraZ") + @Import("cameraY") // <--- This is correct! @Override int getCameraZ(); - @Import("cameraX2") + @Import("Scene_cameraX") @Override int getCameraX2(); - @Import("cameraY2") + @Import("Scene_cameraY") @Override int getCameraY2(); - @Import("cameraZ2") + @Import("Scene_cameraZ") @Override int getCameraZ2(); @@ -73,33 +77,33 @@ public interface RSClient extends RSGameEngine, Client @Override int getCameraYaw(); - @Import("world") + @Import("worldId") int getWorld(); - @Import("FPS") + @Import("fps") @Override int getFPS(); - @Import("mapAngle") + @Import("minimapOrientation") @Override int getMapAngle(); - @Import("tileHeights") + @Import("Tiles_heights") @Override int[][][] getTileHeights(); - @Import("tileSettings") + @Import("Tiles_renderFlags") @Override byte[][][] getTileSettings(); - @Import("clientVarps") + @Import("Varps_main") @Override int[] getVarps(); @Import("varcs") RSVarcs getVarcs(); - @Import("energy") + @Import("runEnergy") @Override int getEnergy(); @@ -115,15 +119,15 @@ public interface RSClient extends RSGameEngine, Client @Override int getBaseY(); - @Import("boostedSkillLevels") + @Import("currentLevels") @Override int[] getBoostedSkillLevels(); - @Import("realSkillLevels") + @Import("levels") @Override int[] getRealSkillLevels(); - @Import("skillExperiences") + @Import("experience") @Override int[] getSkillExperiences(); @@ -143,33 +147,33 @@ public interface RSClient extends RSGameEngine, Client @Override void setCheckClick(boolean checkClick); - @Import("mouseX2") + @Import("Scene_selectedScreenX") void setMouseCanvasHoverPositionX(int x); - @Import("mouseY2") + @Import("Scene_selectedScreenY") void setMouseCanvasHoverPositionY(int y); - @Import("mouseCurrentButton") + @Import("MouseHandler_currentButton") @Override int getMouseCurrentButton(); - @Import("selectedSceneTileX") + @Import("Scene_selectedX") int getSelectedSceneTileX(); - @Import("selectedSceneTileX") + @Import("Scene_selectedX") void setSelectedSceneTileX(int selectedSceneTileX); - @Import("selectedSceneTileY") + @Import("Scene_selectedY") int getSelectedSceneTileY(); - @Import("selectedSceneTileY") + @Import("Scene_selectedY") void setSelectedSceneTileY(int selectedSceneTileY); - @Import("draggingWidget") + @Import("isDraggingWidget") @Override boolean isDraggingWidget(); - @Import("draggedWidget") + @Import("clickedWidget") @Override RSWidget getDraggedWidget(); @@ -189,7 +193,7 @@ public interface RSClient extends RSGameEngine, Client * * @param groupId the group ID * @return the widget group - * @see net.runelite.api.widgets.WidgetID + * @see api.widgets.WidgetID */ RSWidget[] getGroup(int groupId); @@ -201,66 +205,58 @@ public interface RSClient extends RSGameEngine, Client @Override RSPlayer getLocalPlayer(); - @Import("npcIndexesCount") + @Import("npcCount") int getNpcIndexesCount(); @Import("npcIndices") int[] getNpcIndices(); - @Import("cachedNPCs") + @Import("npcs") @Override RSNPC[] getCachedNPCs(); @Import("collisionMaps") - RSCollisionData[] getCollisionMaps(); + RSCollisionMap[] getCollisionMaps(); - @Import("playerIndexesCount") + @Import("Players_count") int getPlayerIndexesCount(); - @Import("playerIndices") + @Import("Players_indices") int[] getPlayerIndices(); - @Import("cachedPlayers") + @Import("players") @Override RSPlayer[] getCachedPlayers(); - @Import("localInteractingIndex") + @Import("combatTargetPlayerIndex") int getLocalInteractingIndex(); - @Import("groundItemDeque") - RSDeque[][][] getGroundItemDeque(); + @Import("groundItems") + RSNodeDeque[][][] getGroundItemDeque(); @Import("projectiles") - RSDeque getProjectilesDeque(); + RSNodeDeque getProjectilesDeque(); - @Import("graphicsObjectDeque") - RSDeque getGraphicsObjectDeque(); + @Import("graphicsObjects") + RSNodeDeque getGraphicsObjectDeque(); - @Import("username") + @Import("Login_username") @Override String getUsername(); - @Import("username") + @Import("Login_username") @Override void setUsername(String username); - @Import("password") + @Import("Login_password") @Override void setPassword(String password); - @Import("otp") - @Override - void setOtp(String otp); - @Import("currentLoginField") @Override int getCurrentLoginField(); - @Import("loginIndex") - @Override - int getLoginIndex(); - - @Import("playerOptions") + @Import("playerMenuActions") @Override String[] getPlayerOptions(); @@ -268,20 +264,20 @@ public interface RSClient extends RSGameEngine, Client @Override boolean[] getPlayerOptionsPriorities(); - @Import("playerMenuTypes") + @Import("playerMenuOpcodes") @Override int[] getPlayerMenuTypes(); - @Import("mouseX") + @Import("MouseHandler_x0") int getMouseX(); - @Import("mouseY") + @Import("MouseHandler_y0") int getMouseY(); - @Import("mouseX2") + @Import("Scene_selectedScreenX") int getMouseX2(); - @Import("mouseY2") + @Import("Scene_selectedScreenY") int getMouseY2(); @Import("containsBounds") @@ -290,34 +286,34 @@ public interface RSClient extends RSGameEngine, Client @Import("checkClick") boolean isCheckClick(); - @Import("menuOptionCount") + @Import("menuOptionsCount") int getMenuOptionCount(); - @Import("menuOptionCount") + @Import("menuOptionsCount") void setMenuOptionCount(int menuOptionCount); - @Import("menuOptions") + @Import("menuActions") String[] getMenuOptions(); - @Import("menuTargets") + @Import("menuTargetNames") String[] getMenuTargets(); - @Import("menuIdentifiers") + @Import("menuArguments0") int[] getMenuIdentifiers(); - @Import("menuTypes") + @Import("menuOpcodes") int[] getMenuTypes(); - @Import("menuActionParams0") + @Import("menuArguments1") int[] getMenuActionParams0(); - @Import("menuActionParams1") + @Import("menuArguments2") int[] getMenuActionParams1(); - @Import("menuForceLeftClick") + @Import("menuShiftClick") boolean[] getMenuForceLeftClick(); - @Import("worldList") + @Import("worlds") @Override RSWorld[] getWorldList(); @@ -326,13 +322,13 @@ public interface RSClient extends RSGameEngine, Client @Override @Import("getObjectDefinition") - RSObjectComposition getObjectDefinition(int objectId); + RSObjectDefinition getObjectDefinition(int objectId); @Override @Import("getNpcDefinition") - RSNPCComposition getNpcDefinition(int npcId); + RSNPCDefinition getNpcDefinition(int npcId); - @Import("scale") + @Import("viewportZoom") @Override int getScale(); @@ -352,36 +348,37 @@ public interface RSClient extends RSGameEngine, Client @Override int getViewportWidth(); - @Import("Viewport_xOffset") + @Import("viewportOffsetX") @Override int getViewportXOffset(); - @Import("Viewport_yOffset") + @Import("viewportOffsetY") @Override int getViewportYOffset(); - @Import("isResized") + @Import("isResizable") @Override boolean isResized(); - @Import("widgetPositionX") + @Import("rootWidgetXs") @Override int[] getWidgetPositionsX(); - @Import("widgetPositionY") + @Import("rootWidgetYs") @Override int[] getWidgetPositionsY(); @Import("itemContainers") - RSHashTable getItemContainers(); + RSNodeHashTable getItemContainers(); @Import("getItemDefinition") @Override - RSItemComposition getItemDefinition(int itemId); + RSItemDefinition getItemDefinition(int itemId); - @Import("createSprite") - RSSpritePixels createItemSprite(int itemId, int quantity, int thickness, int borderColor, int stackable, boolean noted); + @Import("getItemSprite") + RSSprite createItemSprite(int itemId, int quantity, int thickness, int borderColor, int stackable, boolean noted); + @Import("menuAction") @Override void invokeMenuAction(int n2, int n3, int n4, int n5, String string, String string2, int n6, int n7); @@ -409,11 +406,11 @@ public interface RSClient extends RSGameEngine, Client @Import("indexedSpriteOffsetYs") void setIndexedSpriteOffsetYs(int[] indexedSpriteOffsetYs); - @Import("indexSpriteWidths") - int[] getIndexSpriteWidths(); + @Import("indexedSpriteWidths") + int[] getIndexedSpriteWidths(); - @Import("indexSpriteWidths") - void setIndexSpriteWidths(int[] indexSpriteWidths); + @Import("indexedSpriteWidths") + void setIndexedSpriteWidths(int[] indexedSpriteWidths); @Import("indexedSpriteHeights") int[] getIndexedSpriteHeights(); @@ -431,23 +428,23 @@ public interface RSClient extends RSGameEngine, Client int[] getIndexedSpritePalette(); @Import("indexedSpritePalette") - void setIndexSpritePalette(int[] indexSpritePalette); + void setIndexedSpritePalette(int[] indexedSpritePalette); - @Import("indexSprites") + @Import("indexCache8") @Override - RSIndexDataBase getIndexSprites(); + RSAbstractIndexCache getIndexSprites(); - @Import("indexScripts") + @Import("indexCache12") @Override - RSIndexDataBase getIndexScripts(); + RSAbstractIndexCache getIndexScripts(); - @Import("widgetFlags") + @Import("widgetClickMasks") @Override - RSHashTable getWidgetFlags(); + RSNodeHashTable getWidgetFlags(); - @Import("componentTable") + @Import("widgetGroupParents") @Override - RSHashTable getComponentTable(); + RSNodeHashTable getComponentTable(); @Import("grandExchangeOffers") RSGrandExchangeOffer[] getGrandExchangeOffers(); @@ -456,30 +453,31 @@ public interface RSClient extends RSGameEngine, Client @Override boolean isMenuOpen(); - @Import("gameCycle") + @Import("cycle") @Override int getGameCycle(); - @Import("packetHandler") - void packetHandler(); + // unused + //@Import("packetHandler") + //void packetHandler(); - @Import("chatLineMap") + @Import("Messages_channels") @Override Map getChatLineMap(); - @Import("messages") + @Import("Messages_hashTable") @Override - RSIterableHashTable getMessages(); + RSIterableNodeHashTable getMessages(); @Import("revision") @Override int getRevision(); - @Import("mapRegions") + @Import("regions") @Override int[] getMapRegions(); - @Import("instanceTemplateChunks") + @Import("instanceChunkTemplates") @Override int[][][] getInstanceTemplateChunks(); @@ -507,29 +505,29 @@ public interface RSClient extends RSGameEngine, Client * * @return */ - @Import("widgetRoot") + @Import("rootWidgetGroup") int getWidgetRoot(); - @Import("mapElementConfigs") + @Import("WorldMapElement_cached") @Override - RSMapElementConfig[] getMapElementConfigs(); + RSWorldMapElement[] getMapElementConfigs(); - @Import("mapscene") + @Import("mapSceneSprites") @Override RSIndexedSprite[] getMapScene(); @Import("mapIcons") @Override - RSSpritePixels[] getMapIcons(); + RSSprite[] getMapIcons(); - @Import("mapDots") - RSSpritePixels[] getMapDots(); + @Import("mapDotSprites") + RSSprite[] getMapDots(); - @Import("modIcons") + @Import("modIconSprites") @Override RSIndexedSprite[] getModIcons(); - @Import("modIcons") + @Import("modIconSprites") void setRSModIcons(RSIndexedSprite[] modIcons); @Construct @@ -538,7 +536,7 @@ public interface RSClient extends RSGameEngine, Client @Construct @Override - RSSpritePixels createSpritePixels(int[] pixels, int width, int height); + RSSprite createSprite(int[] pixels, int width, int height); @Import("destinationX") int getDestinationX(); @@ -546,10 +544,10 @@ public interface RSClient extends RSGameEngine, Client @Import("destinationY") int getDestinationY(); - @Import("audioEffects") + @Import("soundEffects") RSSoundEffect[] getAudioEffects(); - @Import("queuedSoundEffectIDs") + @Import("soundEffectIds") int[] getQueuedSoundEffectIDs(); @Import("soundLocations") @@ -561,88 +559,88 @@ public interface RSClient extends RSGameEngine, Client @Import("queuedSoundEffectDelays") int[] getQueuedSoundEffectDelays(); - @Import("queuedSoundEffectCount") + @Import("soundEffectCount") int getQueuedSoundEffectCount(); - @Import("queuedSoundEffectCount") + @Import("soundEffectCount") void setQueuedSoundEffectCount(int queuedSoundEffectCount); @Import("rasterProvider") @Override - RSBufferProvider getBufferProvider(); + RSAbstractRasterProvider getBufferProvider(); - @Import("mouseIdleTicks") + @Import("MouseHandler_idleCycles") @Override int getMouseIdleTicks(); - @Import("mouseLastPressedTimeMillis") + @Import("MouseHandler_lastPressedTimeMillis") @Override long getMouseLastPressedMillis(); - @Import("keyboardIdleTicks") + @Import("KeyHandler_idleCycles") @Override int getKeyboardIdleTicks(); - @Import("lowMemory") + @Import("isLowDetail") void setLowMemory(boolean lowMemory); - @Import("sceneLowMemory") + @Import("Scene_isLowDetail") void setSceneLowMemory(boolean lowMemory); - @Import("audioHighMemory") + @Import("isStereo") void setAudioHighMemory(boolean highMemory); - @Import("objectCompositionLowDetail") - void setObjectCompositionLowDetail(boolean lowDetail); + @Import("ObjectDefinition_isLowDetail") + void setObjectDefinitionLowDetail(boolean lowDetail); @Construct - RSItem createItem(); + RSGroundItem createItem(); - @Import("intStackSize") + @Import("Interpreter_intStackSize") @Override int getIntStackSize(); - @Import("intStackSize") + @Import("Interpreter_intStackSize") @Override void setIntStackSize(int stackSize); - @Import("intStack") + @Import("Interpreter_intStack") @Override int[] getIntStack(); - @Import("scriptStringStackSize") + @Import("Interpreter_stringStackSize") @Override int getStringStackSize(); - @Import("scriptStringStackSize") + @Import("Interpreter_stringStackSize") @Override void setStringStackSize(int stackSize); - @Import("scriptStringStack") + @Import("Interpreter_stringStack") @Override String[] getStringStack(); - @Import("friendManager") - RSFriendManager getFriendManager(); + @Import("friendSystem") + RSFriendSystem getFriendManager(); - @Import("clanMemberManager") - RSClanMemberManager getClanMemberManager(); + @Import("clanChat") + RSClanChat getClanMemberManager(); @Import("loginType") - RSJagexLoginType getLoginType(); + RSLoginType getLoginType(); @Construct - RSName createName(String name, RSJagexLoginType type); + RSUsername createName(String name, RSLoginType type); @Import("getVarbit") int getVarbit(int varbitId); - @Import("varbits") - RSNodeCache getVarbitCache(); + @Import("VarbitDefinition_cached") + RSEvictingDualNodeHashTable getVarbitCache(); - @Import("preferences") + @Import("clientPreferences") @Override - RSPreferences getPreferences(); + RSClientPreferences getPreferences(); /** * This is the pitch the user has set the camera to. @@ -658,16 +656,16 @@ public interface RSClient extends RSGameEngine, Client @Import("cameraPitchTarget") void setCameraPitchTarget(int pitch); - @Import("pitchSin") + @Import("Scene_cameraPitchSine") void setPitchSin(int v); - @Import("pitchCos") + @Import("Scene_cameraPitchCosine") void setPitchCos(int v); - @Import("yawSin") + @Import("Scene_cameraYawSine") void setYawSin(int v); - @Import("yawCos") + @Import("Scene_cameraYawCosine") void setYawCos(int v); @Import("Rasterizer3D_zoom") @@ -693,16 +691,16 @@ public interface RSClient extends RSGameEngine, Client @Override int getRasterizer3D_clipMidY2(); - @Import("centerX") + @Import("Rasterizer3D_clipMidX") @Override int getCenterX(); - @Import("centerY") + @Import("Rasterizer3D_clipMidY") @Override int getCenterY(); - @Import("renderOverview") - RSRenderOverview getRenderOverview(); + @Import("worldMap0") + RSWorldMap getRenderOverview(); @Import("changeWorld") @Override @@ -712,23 +710,23 @@ public interface RSClient extends RSGameEngine, Client @Override RSWorld createWorld(); - @Import("animOffsetX") + @Import("Model_transformTempX") void setAnimOffsetX(int animOffsetX); - @Import("animOffsetY") + @Import("Model_transformTempY") void setAnimOffsetY(int animOffsetY); - @Import("animOffsetZ") + @Import("Model_transformTempZ") void setAnimOffsetZ(int animOffsetZ); @Import("getFrames") RSFrames getFrames(int frameId); - @Import("minimapSprite") - RSSpritePixels getMinimapSprite(); + @Import("sceneMinimapSprite") + RSSprite getMinimapSprite(); - @Import("minimapSprite") - void setMinimapSprite(SpritePixels spritePixels); + @Import("sceneMinimapSprite") + void setMinimapSprite(Sprite spritePixels); @Import("drawObject") void drawObject(int z, int x, int y, int randomColor1, int randomColor2); @@ -736,13 +734,13 @@ public interface RSClient extends RSGameEngine, Client @Construct RSScriptEvent createScriptEvent(); - @Import("runScript") + @Import("runScript0") void runScript(RSScriptEvent ev, int ex); - @Import("hintArrowTargetType") + @Import("hintArrowType") void setHintArrowTargetType(int value); - @Import("hintArrowTargetType") + @Import("hintArrowType") int getHintArrowTargetType(); @Import("hintArrowX") @@ -757,48 +755,47 @@ public interface RSClient extends RSGameEngine, Client @Import("hintArrowY") int getHintArrowY(); - @Import("hintArrowOffsetX") + @Import("hintArrowSubX") void setHintArrowOffsetX(int value); - @Import("hintArrowOffsetY") + @Import("hintArrowSubY") void setHintArrowOffsetY(int value); - @Import("hintArrowNpcTargetIdx") + @Import("hintArrowNpcIndex") void setHintArrowNpcTargetIdx(int value); - @Import("hintArrowNpcTargetIdx") + @Import("hintArrowNpcIndex") int getHintArrowNpcTargetIdx(); - @Import("hintArrowPlayerTargetIdx") + @Import("hintArrowPlayerIndex") void setHintArrowPlayerTargetIdx(int value); - @Import("hintArrowPlayerTargetIdx") + @Import("hintArrowPlayerIndex") int getHintArrowPlayerTargetIdx(); - @Import("isDynamicRegion") + @Import("isInInstance") @Override boolean isInInstancedRegion(); - @Import("itemPressedDuration") - @Override + @Import("itemDragDuration") int getItemPressedDuration(); - @Import("itemPressedDuration") + @Import("itemDragDuration") void setItemPressedDuration(int duration); - @Import("flags") + @Import("worldProperties") int getFlags(); @Import("compass") - void setCompass(SpritePixels spritePixels); + void setCompass(Sprite spritePixels); @Import("widgetSpriteCache") @Override - RSNodeCache getWidgetSpriteCache(); + RSEvictingDualNodeHashTable getWidgetSpriteCache(); - @Import("items") + @Import("ItemDefinition_cached") @Override - RSNodeCache getItemCompositionCache(); + RSEvictingDualNodeHashTable getItemDefinitionCache(); @Import("oculusOrbState") @Override @@ -812,96 +809,93 @@ public interface RSClient extends RSGameEngine, Client @Override void setOculusOrbNormalSpeed(int state); - @Import("lookingAtX") + @Import("oculusOrbFocalPointX") @Override int getOculusOrbFocalPointX(); - @Import("lookingAtY") + @Import("oculusOrbFocalPointY") @Override int getOculusOrbFocalPointY(); - RSItem getLastItemDespawn(); + RSGroundItem getLastItemDespawn(); - void setLastItemDespawn(RSItem lastItemDespawn); + void setLastItemDespawn(RSGroundItem lastItemDespawn); @Construct RSWidget createWidget(); - @Import("revalidateWidget") + @Import("alignWidget") void revalidateWidget(Widget w); @Import("revalidateWidgetScroll") void revalidateWidgetScroll(Widget[] group, Widget w, boolean postEvent); - @Import("menuAction") - void menuAction(int var0, int var1, int var2, int var3, String var4, String var5, int var6, int var7); - - @Import("Viewport_entityCountAtMouse") + @Import("ViewportMouse_entityCount") int getEntitiesAtMouseCount(); - @Import("Viewport_entityCountAtMouse") + @Import("ViewportMouse_entityCount") void setEntitiesAtMouseCount(int i); - @Import("Viewport_entitiesAtMouse") + @Import("ViewportMouse_entityTags") long[] getEntitiesAtMouse(); - @Import("Viewport_mouseX") + @Import("ViewportMouse_x") int getViewportMouseX(); - @Import("Viewport_mouseY") + @Import("ViewportMouse_y") int getViewportMouseY(); @Import("textureProvider") @Override RSTextureProvider getTextureProvider(); - @Import("occupiedTilesTick") + @Import("tileLastDrawnActor") int[][] getOccupiedTilesTick(); - @Import("cachedModels2") - RSNodeCache getCachedModels2(); + @Import("ObjectDefinition_cachedModels") + RSEvictingDualNodeHashTable getCachedModels2(); - @Import("cycle") + @Import("Scene_drawnCount") int getCycle(); - @Import("cycle") + @Import("Scene_drawnCount") void setCycle(int cycle); - @Import("visibilityMaps") + @Import("visibilityMap") boolean[][][][] getVisibilityMaps(); - @Import("renderArea") + @Import("visibleTiles") void setRenderArea(boolean[][] renderArea); - @Import("cameraX2") + @Import("Scene_cameraX") void setCameraX2(int cameraX2); - @Import("cameraY2") + @Import("Scene_cameraY") void setCameraY2(int cameraY2); - @Import("cameraZ2") + @Import("Scene_cameraZ") void setCameraZ2(int cameraZ2); - @Import("screenCenterX") + @Import("Scene_cameraXTile") void setScreenCenterX(int screenCenterX); - @Import("screenCenterZ") - void setScreenCenterZ(int screenCenterZ); + @Import("Scene_cameraYTile") + void setScreenCenterZ(int screenCenterZ); // <-- This is correct! @Import("Scene_plane") void setScenePlane(int scenePlane); - @Import("minTileX") + @Import("Scene_cameraXTileMin") void setMinTileX(int i); - @Import("minTileZ") - void setMinTileZ(int i); + @Import("Scene_cameraYTileMin") + void setMinTileZ(int i); // <-- This is correct! - @Import("maxTileX") + @Import("Scene_cameraXTileMax") void setMaxTileX(int i); - @Import("maxTileZ") - void setMaxTileZ(int i); + @Import("Scene_cameraYTileMax") + void setMaxTileZ(int i); // <-- This is correct! @Import("tileUpdateCount") int getTileUpdateCount(); @@ -909,47 +903,39 @@ public interface RSClient extends RSGameEngine, Client @Import("tileUpdateCount") void setTileUpdateCount(int tileUpdateCount); - @Import("Viewport_containsMouse") + @Import("ViewportMouse_isInViewport") boolean getViewportContainsMouse(); - @Import("graphicsPixels") + @Import("Rasterizer2D_pixels") int[] getGraphicsPixels(); - @Import("graphicsPixelsWidth") + @Import("Rasterizer2D_width") int getGraphicsPixelsWidth(); - @Import("graphicsPixelsHeight") + @Import("Rasterizer2D_height") int getGraphicsPixelsHeight(); - @Import("fillRectangle") - void RasterizerFillRectangle(int x, int y, int w, int h, int rgb); + @Import("Rasterizer2D_fillRectangle") + void rasterizerFillRectangle(int x, int y, int w, int h, int rgb); - @Import("startX") + @Import("Rasterizer2D_xClipStart") int getStartX(); - @Import("startY") + @Import("Rasterizer2D_yClipStart") int getStartY(); - @Import("endX") + @Import("Rasterizer2D_xClipEnd") int getEndX(); - @Import("endY") + @Import("Rasterizer2D_yClipEnd") int getEndY(); - @Import("if1DraggedWidget") - @Override - RSWidget getIf1DraggedWidget(); - - @Import("if1DraggedItemIndex") - @Override - int getIf1DraggedItemIndex(); - - @Import("spellSelected") + @Import("isSpellSelected") @Override void setSpellSelected(boolean selected); @Import("getEnum") - RSEnum getRsEnum(int id); + RSEnumDefinition getRsEnum(int id); @Import("menuX") int getMenuX(); @@ -966,35 +952,31 @@ public interface RSClient extends RSGameEngine, Client @Import("fontBold12") RSFont getFontBold12(); - @Import("drawHorizontalLine") - void RasterizerDrawHorizontalLine(int x, int y, int w, int rgb); + @Import("Rasterizer2D_drawHorizontalLine") + void rasterizerDrawHorizontalLine(int x, int y, int w, int rgb); - @Import("drawVerticalLine") - void RasterizerDrawVerticalLine(int x, int y, int h, int rgb); + @Import("Rasterizer2D_drawVerticalLine") + void rasterizerDrawVerticalLine(int x, int y, int h, int rgb); @Import("drawGradient") - void RasterizerDrawGradient(int x, int y, int w, int h, int rgbTop, int rgbBottom); + void rasterizerDrawGradient(int x, int y, int w, int h, int rgbTop, int rgbBottom); - @Import("fillRectangleAlpha") - void RasterizerFillRectangleAlpha(int x, int y, int w, int h, int rgb, int a); + @Import("Rasterizer2D_drawRectangleAlpha") + void rasterizerFillRectangleAlpha(int x, int y, int w, int h, int rgb, int a); - @Import("drawRectangle") - void RasterizerDrawRectangle(int x, int y, int w, int h, int rgb); + @Import("Rasterizer2D_drawRectangle") + void rasterizerDrawRectangle(int x, int y, int w, int h, int rgb); @Import("drawCircle") - void RasterizerDrawCircle(int x, int y, int r, int rgb); + void rasterizerDrawCircle(int x, int y, int r, int rgb); - @Import("healthbarCache") + @Import("HealthBarDefinition_cached") @Override - RSNodeCache getHealthBarCache(); - + RSEvictingDualNodeHashTable getHealthBarCache(); + @Import("renderSelf") - void toggleRenderSelf(); - + void setRenderSelf(boolean enabled); + @Import("mouseRecorder") RSMouseRecorder getMouseRecorder(); - - @Import("printMenuActions") - void setPrintMenuActions(boolean b); - } diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSClientPreferences.java b/runescape-api/src/main/java/net/runelite/rs/api/RSClientPreferences.java new file mode 100644 index 0000000000..e9a5e09e55 --- /dev/null +++ b/runescape-api/src/main/java/net/runelite/rs/api/RSClientPreferences.java @@ -0,0 +1,15 @@ +package net.runelite.rs.api; + +import net.runelite.api.Preferences; +import net.runelite.mapping.Import; + +public interface RSClientPreferences extends Preferences +{ + @Import("rememberedUsername") + @Override + String getRememberedUsername(); + + @Import("rememberedUsername") + @Override + void setRememberedUsername(String username); +} diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSCollisionData.java b/runescape-api/src/main/java/net/runelite/rs/api/RSCollisionData.java deleted file mode 100644 index 8df6236650..0000000000 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSCollisionData.java +++ /dev/null @@ -1,34 +0,0 @@ -/* - * Copyright (c) 2016-2017, Adam - * 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.rs.api; - -import net.runelite.api.CollisionData; -import net.runelite.mapping.Import; - -public interface RSCollisionData extends CollisionData -{ - @Import("flags") - int[][] getFlags(); -} diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSCollisionMap.java b/runescape-api/src/main/java/net/runelite/rs/api/RSCollisionMap.java new file mode 100644 index 0000000000..926f303b0b --- /dev/null +++ b/runescape-api/src/main/java/net/runelite/rs/api/RSCollisionMap.java @@ -0,0 +1,10 @@ +package net.runelite.rs.api; + +import net.runelite.api.CollisionData; +import net.runelite.mapping.Import; + +public interface RSCollisionMap extends CollisionData +{ + @Import("flags") + int[][] getFlags(); +} diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSCombatInfo1.java b/runescape-api/src/main/java/net/runelite/rs/api/RSCombatInfo1.java deleted file mode 100644 index 7f9519718b..0000000000 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSCombatInfo1.java +++ /dev/null @@ -1,36 +0,0 @@ -/* - * Copyright (c) 2016-2017, Adam - * 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.rs.api; - -import net.runelite.mapping.Import; - -public interface RSCombatInfo1 -{ - @Import("healthRatio") - int getHealthRatio(); - - @Import("health") - int getHealth(); -} diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSCombatInfoList.java b/runescape-api/src/main/java/net/runelite/rs/api/RSCombatInfoList.java deleted file mode 100644 index 297556f8ec..0000000000 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSCombatInfoList.java +++ /dev/null @@ -1,36 +0,0 @@ -/* - * Copyright (c) 2016-2017, Adam - * 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.rs.api; - -import net.runelite.mapping.Import; - -/** - * Created by bold on 2/2/17. - */ -public interface RSCombatInfoList -{ - @Import("node") - RSNode getNode(); -} diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSCombatInfoListHolder.java b/runescape-api/src/main/java/net/runelite/rs/api/RSCombatInfoListHolder.java deleted file mode 100644 index dcfab0d976..0000000000 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSCombatInfoListHolder.java +++ /dev/null @@ -1,36 +0,0 @@ -/* - * Copyright (c) 2016-2017, Adam - * 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.rs.api; - -import net.runelite.mapping.Import; - -public interface RSCombatInfoListHolder extends RSNode -{ - @Import("combatInfo1") - RSCombatInfoList getCombatInfo1(); - - @Import("healthBar") - RSHealthBar getHealthBar(); -} diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSDecorativeObject.java b/runescape-api/src/main/java/net/runelite/rs/api/RSDecorativeObject.java deleted file mode 100644 index 910c5acc1b..0000000000 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSDecorativeObject.java +++ /dev/null @@ -1,60 +0,0 @@ -/* - * Copyright (c) 2017, Adam - * 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.rs.api; - -import net.runelite.api.DecorativeObject; -import net.runelite.mapping.Import; - -public interface RSDecorativeObject extends DecorativeObject -{ - @Import("hash") - @Override - long getHash(); - - @Import("x") - int getX(); - - @Import("y") - int getY(); - - @Import("offsetX") - int getXOffset(); - - @Import("offsetY") - int getYOffset(); - - @Import("rotation") - int getOrientation(); - - @Import("renderable1") - @Override - RSRenderable getRenderable(); - - @Import("renderable2") - @Override - RSRenderable getRenderable2(); - - void setPlane(int plane); -} diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSDeque.java b/runescape-api/src/main/java/net/runelite/rs/api/RSDeque.java deleted file mode 100644 index 9a0c2aa303..0000000000 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSDeque.java +++ /dev/null @@ -1,36 +0,0 @@ -/* - * Copyright (c) 2016-2017, Adam - * 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.rs.api; - -import net.runelite.mapping.Import; - -public interface RSDeque -{ - @Import("current") - RSNode getCurrent(); - - @Import("head") - RSNode getHead(); -} diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSCacheableNode.java b/runescape-api/src/main/java/net/runelite/rs/api/RSDualNode.java similarity index 95% rename from runescape-api/src/main/java/net/runelite/rs/api/RSCacheableNode.java rename to runescape-api/src/main/java/net/runelite/rs/api/RSDualNode.java index 44d7b876cc..034a2e144d 100644 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSCacheableNode.java +++ b/runescape-api/src/main/java/net/runelite/rs/api/RSDualNode.java @@ -26,8 +26,8 @@ package net.runelite.rs.api; import net.runelite.mapping.Import; -public interface RSCacheableNode extends RSNode +public interface RSDualNode extends RSNode { - @Import("unlinkDual") + @Import("removeDual") void unlinkDual(); } diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSDynamicObject.java b/runescape-api/src/main/java/net/runelite/rs/api/RSDynamicObject.java index 4d18bdd26a..44dd3cadf5 100644 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSDynamicObject.java +++ b/runescape-api/src/main/java/net/runelite/rs/api/RSDynamicObject.java @@ -1,43 +1,19 @@ -/* - * Copyright (c) 2018, Adam - * 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.rs.api; import net.runelite.api.Renderable; import net.runelite.mapping.Import; -public interface RSDynamicObject extends Renderable, RSRenderable +public interface RSDynamicObject extends RSEntity, Renderable { @Import("id") int getId(); - @Import("animFrame") + @Import("frame") int getAnimFrame(); - @Import("animFrame") + @Import("frame") void setAnimFrame(int frame); - @Import("animCycleCount") + @Import("cycleStart") int getAnimCycleCount(); } diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSRenderable.java b/runescape-api/src/main/java/net/runelite/rs/api/RSEntity.java similarity index 93% rename from runescape-api/src/main/java/net/runelite/rs/api/RSRenderable.java rename to runescape-api/src/main/java/net/runelite/rs/api/RSEntity.java index 398c68088a..89229d0fb6 100644 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSRenderable.java +++ b/runescape-api/src/main/java/net/runelite/rs/api/RSEntity.java @@ -27,12 +27,12 @@ package net.runelite.rs.api; import net.runelite.api.Renderable; import net.runelite.mapping.Import; -public interface RSRenderable extends RSNode, Renderable +public interface RSEntity extends RSNode, Renderable { - @Import("modelHeight") + @Import("height") int getModelHeight(); - @Import("modelHeight") + @Import("height") @Override void setModelHeight(int modelHeight); @@ -40,7 +40,7 @@ public interface RSRenderable extends RSNode, Renderable @Override RSModel getModel(); - @Import("draw") + @Import("renderDraw") @Override void draw(int orientation, int pitchSin, int pitchCos, int yawSin, int yawCos, int x, int y, int z, long hash); } diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSEnum.java b/runescape-api/src/main/java/net/runelite/rs/api/RSEnum.java deleted file mode 100644 index afad5c131e..0000000000 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSEnum.java +++ /dev/null @@ -1,49 +0,0 @@ -/* - * Copyright (c) 2019, Adam - * 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.rs.api; - -import net.runelite.api.EnumComposition; -import net.runelite.mapping.Import; - -public interface RSEnum extends EnumComposition, RSCacheableNode -{ - @Import("keys") - @Override - int[] getKeys(); - - @Import("intVals") - @Override - int[] getIntVals(); - - @Import("stringVals") - @Override - String[] getStringVals(); - - @Import("defaultInt") - int getDefaultInt(); - - @Import("defaultString") - String getDefaultString(); -} diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSEnumDefinition.java b/runescape-api/src/main/java/net/runelite/rs/api/RSEnumDefinition.java new file mode 100644 index 0000000000..0e4206e29a --- /dev/null +++ b/runescape-api/src/main/java/net/runelite/rs/api/RSEnumDefinition.java @@ -0,0 +1,25 @@ +package net.runelite.rs.api; + +import net.runelite.api.EnumDefinition; +import net.runelite.mapping.Import; + +public interface RSEnumDefinition extends EnumDefinition, RSDualNode +{ + @Import("keys") + @Override + int[] getKeys(); + + @Import("intVals") + @Override + int[] getIntVals(); + + @Import("stringVals") + @Override + String[] getStringVals(); + + @Import("defaultInt") + int getDefaultInt(); + + @Import("defaultString") + String getDefaultString(); +} diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSEvictingDualNodeHashTable.java b/runescape-api/src/main/java/net/runelite/rs/api/RSEvictingDualNodeHashTable.java new file mode 100644 index 0000000000..3f59cdaa47 --- /dev/null +++ b/runescape-api/src/main/java/net/runelite/rs/api/RSEvictingDualNodeHashTable.java @@ -0,0 +1,22 @@ +package net.runelite.rs.api; + +import net.runelite.api.NodeCache; +import net.runelite.mapping.Import; + +public interface RSEvictingDualNodeHashTable extends NodeCache +{ + @Import("get") + RSDualNode get(long id); + + @Import("clear") + @Override + void reset(); + + @Import("capacity") + @Override + void setCapacity(int capacity); + + @Import("remainingCapacity") + @Override + void setRemainingCapacity(int remainingCapacity); +} diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSFileOnDisk.java b/runescape-api/src/main/java/net/runelite/rs/api/RSFileOnDisk.java index e7f07e34ee..8f73327bae 100644 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSFileOnDisk.java +++ b/runescape-api/src/main/java/net/runelite/rs/api/RSFileOnDisk.java @@ -1,27 +1,3 @@ -/* - * Copyright (c) 2016-2017, Adam - * 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.rs.api; import java.io.RandomAccessFile; @@ -32,9 +8,9 @@ public interface RSFileOnDisk @Import("file") RandomAccessFile getFile(); - @Import("position") + @Import("index") long getPosition(); - @Import("length") + @Import("capacity") long getLength(); } diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSFloorDecoration.java b/runescape-api/src/main/java/net/runelite/rs/api/RSFloorDecoration.java new file mode 100644 index 0000000000..e20c1056d7 --- /dev/null +++ b/runescape-api/src/main/java/net/runelite/rs/api/RSFloorDecoration.java @@ -0,0 +1,23 @@ +package net.runelite.rs.api; + +import net.runelite.api.GroundObject; +import net.runelite.mapping.Import; + +public interface RSFloorDecoration extends GroundObject +{ + @Import("tag") + @Override + long getHash(); + + @Import("x") + int getX(); + + @Import("y") + int getY(); + + @Import("entity") + @Override + RSEntity getRenderable(); + + void setPlane(int plane); +} diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSFont.java b/runescape-api/src/main/java/net/runelite/rs/api/RSFont.java index 243193302a..b12c97d946 100644 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSFont.java +++ b/runescape-api/src/main/java/net/runelite/rs/api/RSFont.java @@ -1,30 +1,5 @@ -/* - * Copyright (c) 2019, Ron Young - * 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.rs.api; -public interface RSFont extends RSFontTypeFace +public interface RSFont extends RSAbstractFont { } diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSFontTypeFace.java b/runescape-api/src/main/java/net/runelite/rs/api/RSFontTypeFace.java deleted file mode 100644 index 36fe246e0f..0000000000 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSFontTypeFace.java +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Copyright (c) 2018 Abex - * 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.rs.api; - -import net.runelite.api.FontTypeFace; -import net.runelite.mapping.Import; - -public interface RSFontTypeFace extends FontTypeFace -{ - @Import("getTextWidth") - @Override - int getTextWidth(String text); - - @Import("verticalSpace") - @Override - int getBaseline(); - - @Import("drawTextLeftAligned") - void drawTextLeftAligned(String text, int x, int y, int fontColor, int shadowColor); -} diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSFrames.java b/runescape-api/src/main/java/net/runelite/rs/api/RSFrames.java index 947549248d..69b065d90f 100644 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSFrames.java +++ b/runescape-api/src/main/java/net/runelite/rs/api/RSFrames.java @@ -26,8 +26,8 @@ package net.runelite.rs.api; import net.runelite.mapping.Import; -public interface RSFrames extends RSCacheableNode +public interface RSFrames extends RSDualNode { - @Import("skeletons") - RSFrame[] getFrames(); + @Import("frames") + RSAnimation[] getFrames(); } diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSFriend.java b/runescape-api/src/main/java/net/runelite/rs/api/RSFriend.java index 0948c5fc85..3b4e047066 100644 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSFriend.java +++ b/runescape-api/src/main/java/net/runelite/rs/api/RSFriend.java @@ -1,31 +1,7 @@ -/* - * Copyright (c) 2016-2017, Adam - * 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.rs.api; import net.runelite.api.Friend; -public interface RSFriend extends Friend, RSChatPlayer +public interface RSFriend extends Friend, RSBuddy { } diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSFriendContainer.java b/runescape-api/src/main/java/net/runelite/rs/api/RSFriendContainer.java deleted file mode 100644 index 2b3793f478..0000000000 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSFriendContainer.java +++ /dev/null @@ -1,29 +0,0 @@ -/* - * Copyright (c) 2018, Adam - * 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.rs.api; - -public interface RSFriendContainer extends RSNameableContainer -{ -} diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSFriendManager.java b/runescape-api/src/main/java/net/runelite/rs/api/RSFriendManager.java deleted file mode 100644 index 4ff789bc5b..0000000000 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSFriendManager.java +++ /dev/null @@ -1,40 +0,0 @@ -/* - * Copyright (c) 2018, Adam - * 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.rs.api; - -import net.runelite.api.FriendManager; -import net.runelite.mapping.Import; - -public interface RSFriendManager extends FriendManager -{ - @Import("friendContainer") - RSFriendContainer getFriendContainer(); - - @Import("ignoreContainer") - RSIgnoreContainer getIgnoreContainer(); - - @Import("isFriended") - boolean isFriended(RSName var1, boolean var2); -} diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSFriendSystem.java b/runescape-api/src/main/java/net/runelite/rs/api/RSFriendSystem.java new file mode 100644 index 0000000000..017971b308 --- /dev/null +++ b/runescape-api/src/main/java/net/runelite/rs/api/RSFriendSystem.java @@ -0,0 +1,16 @@ +package net.runelite.rs.api; + +import net.runelite.api.FriendManager; +import net.runelite.mapping.Import; + +public interface RSFriendSystem extends FriendManager +{ + @Import("friendsList") + RSFriendsList getFriendContainer(); + + @Import("ignoreList") + RSIgnoreList getIgnoreContainer(); + + @Import("isFriended") + boolean isFriended(RSUsername var1, boolean var2); +} diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSFriendsList.java b/runescape-api/src/main/java/net/runelite/rs/api/RSFriendsList.java new file mode 100644 index 0000000000..5617d00bc0 --- /dev/null +++ b/runescape-api/src/main/java/net/runelite/rs/api/RSFriendsList.java @@ -0,0 +1,5 @@ +package net.runelite.rs.api; + +public interface RSFriendsList extends RSUserList +{ +} diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSGameCanvas.java b/runescape-api/src/main/java/net/runelite/rs/api/RSGameCanvas.java deleted file mode 100644 index f23456261a..0000000000 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSGameCanvas.java +++ /dev/null @@ -1,29 +0,0 @@ -/* - * Copyright (c) 2016-2017, Adam - * 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.rs.api; - -public interface RSGameCanvas -{ -} diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSGameObject.java b/runescape-api/src/main/java/net/runelite/rs/api/RSGameObject.java index b77453c325..068cce5e3f 100644 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSGameObject.java +++ b/runescape-api/src/main/java/net/runelite/rs/api/RSGameObject.java @@ -1,27 +1,3 @@ -/* - * Copyright (c) 2016-2017, Adam - * 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.rs.api; import net.runelite.api.GameObject; @@ -29,29 +5,29 @@ import net.runelite.mapping.Import; public interface RSGameObject extends GameObject { - @Import("renderable") - RSRenderable getRenderable(); + @Import("entity") + RSEntity getRenderable(); @Import("plane") int getPlane(); - @Import("relativeX") + @Import("startX") int getRelativeX(); - @Import("relativeY") + @Import("startY") int getRelativeY(); - @Import("offsetX") + @Import("endX") int getOffsetX(); - @Import("offsetY") + @Import("endY") int getOffsetY(); - @Import("x") + @Import("centerX") @Override int getX(); - @Import("y") + @Import("centerY") @Override int getY(); @@ -61,7 +37,7 @@ public interface RSGameObject extends GameObject @Import("orientation") int getRsOrientation(); - @Import("hash") + @Import("tag") @Override long getHash(); diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSGameEngine.java b/runescape-api/src/main/java/net/runelite/rs/api/RSGameShell.java similarity index 92% rename from runescape-api/src/main/java/net/runelite/rs/api/RSGameEngine.java rename to runescape-api/src/main/java/net/runelite/rs/api/RSGameShell.java index 87bc24ca15..969e4f4cb3 100644 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSGameEngine.java +++ b/runescape-api/src/main/java/net/runelite/rs/api/RSGameShell.java @@ -24,11 +24,11 @@ */ package net.runelite.rs.api; +import net.runelite.api.GameShell; import java.awt.Canvas; -import net.runelite.api.GameEngine; import net.runelite.mapping.Import; -public interface RSGameEngine extends GameEngine +public interface RSGameShell extends GameShell { @Import("canvas") Canvas getCanvas(); @@ -46,10 +46,10 @@ public interface RSGameEngine extends GameEngine @Import("resizeCanvasNextFrame") void setResizeCanvasNextFrame(boolean resize); - @Import("replaceCanvasNextFrame") + @Import("isCanvasInvalid") boolean isReplaceCanvasNextFrame(); - @Import("replaceCanvasNextFrame") + @Import("isCanvasInvalid") void setReplaceCanvasNextFrame(boolean replace); @Import("maxCanvasWidth") diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSGrandExchangeOffer.java b/runescape-api/src/main/java/net/runelite/rs/api/RSGrandExchangeOffer.java index d88e582ef7..3998a383eb 100644 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSGrandExchangeOffer.java +++ b/runescape-api/src/main/java/net/runelite/rs/api/RSGrandExchangeOffer.java @@ -1,27 +1,3 @@ -/* - * Copyright (c) 2016-2017, Adam - * 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.rs.api; import net.runelite.api.GrandExchangeOffer; @@ -29,11 +5,11 @@ import net.runelite.mapping.Import; public interface RSGrandExchangeOffer extends GrandExchangeOffer { - @Import("quantitySold") + @Import("currentQuantity") @Override int getQuantitySold(); - @Import("itemId") + @Import("id") @Override int getItemId(); @@ -41,16 +17,14 @@ public interface RSGrandExchangeOffer extends GrandExchangeOffer @Override int getTotalQuantity(); - @Import("price") + @Import("unitPrice") @Override int getPrice(); - @Import("spent") + @Import("currentPrice") @Override int getSpent(); @Import("state") byte getRSState(); - - } diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSGraphicsObject.java b/runescape-api/src/main/java/net/runelite/rs/api/RSGraphicsObject.java index 2edde942f1..74fc9bccd2 100644 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSGraphicsObject.java +++ b/runescape-api/src/main/java/net/runelite/rs/api/RSGraphicsObject.java @@ -1,33 +1,9 @@ -/* - * Copyright (c) 2018, Woox - * 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.rs.api; import net.runelite.api.GraphicsObject; import net.runelite.mapping.Import; -public interface RSGraphicsObject extends GraphicsObject, RSRenderable +public interface RSGraphicsObject extends GraphicsObject, RSEntity { @Import("id") @Override @@ -39,11 +15,11 @@ public interface RSGraphicsObject extends GraphicsObject, RSRenderable @Import("y") int getY(); - @Import("startCycle") + @Import("cycleStart") @Override int getStartCycle(); - @Import("level") + @Import("plane") @Override int getLevel(); diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSGroundItem.java b/runescape-api/src/main/java/net/runelite/rs/api/RSGroundItem.java new file mode 100644 index 0000000000..f4823f14b0 --- /dev/null +++ b/runescape-api/src/main/java/net/runelite/rs/api/RSGroundItem.java @@ -0,0 +1,36 @@ +package net.runelite.rs.api; + +import net.runelite.api.Item; +import net.runelite.api.Tile; +import net.runelite.mapping.Import; + +public interface RSGroundItem extends RSEntity, Item +{ + @Import("id") + @Override + int getId(); + + @Import("id") + void setId(int id); + + @Import("quantity") + @Override + int getQuantity(); + + @Import("quantity") + void setQuantity(int quantity); + + int getX(); + + void setX(int x); + + int getY(); + + void setY(int y); + + /** + * Get the tile this item is on + * @return + */ + Tile getTile(); +} diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSGroundItemPile.java b/runescape-api/src/main/java/net/runelite/rs/api/RSGroundItemPile.java new file mode 100644 index 0000000000..b96870fcb3 --- /dev/null +++ b/runescape-api/src/main/java/net/runelite/rs/api/RSGroundItemPile.java @@ -0,0 +1,34 @@ +package net.runelite.rs.api; + +import net.runelite.api.ItemLayer; +import net.runelite.mapping.Import; + +public interface RSGroundItemPile extends ItemLayer +{ + @Import("x") + int getX(); + + @Import("y") + int getY(); + + @Import("tag") + @Override + long getHash(); + + @Import("height") + int getHeight(); + + @Import("third") + @Override + RSEntity getBottom(); + + @Import("second") + @Override + RSEntity getMiddle(); + + @Import("first") + @Override + RSEntity getTop(); + + void setPlane(int plane); +} diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSGroundObject.java b/runescape-api/src/main/java/net/runelite/rs/api/RSGroundObject.java deleted file mode 100644 index efd272cdff..0000000000 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSGroundObject.java +++ /dev/null @@ -1,47 +0,0 @@ -/* - * Copyright (c) 2017, Adam - * 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.rs.api; - -import net.runelite.api.GroundObject; -import net.runelite.mapping.Import; - -public interface RSGroundObject extends GroundObject -{ - @Import("hash") - @Override - long getHash(); - - @Import("x") - int getX(); - - @Import("y") - int getY(); - - @Import("renderable") - @Override - RSRenderable getRenderable(); - - void setPlane(int plane); -} diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSHashTable.java b/runescape-api/src/main/java/net/runelite/rs/api/RSHashTable.java deleted file mode 100644 index e1462ce1dd..0000000000 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSHashTable.java +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Copyright (c) 2016-2017, Adam - * 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.rs.api; - -import net.runelite.api.HashTable; -import net.runelite.mapping.Import; - -public interface RSHashTable extends HashTable -{ - @Import("get") - @Override - RSNode get(long value); - - @Import("size") - int getSize(); - - @Import("buckets") - RSNode[] getBuckets(); -} diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSHealthBar.java b/runescape-api/src/main/java/net/runelite/rs/api/RSHealthBar.java index 758bf8cb83..248ec7d624 100644 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSHealthBar.java +++ b/runescape-api/src/main/java/net/runelite/rs/api/RSHealthBar.java @@ -1,46 +1,12 @@ -/* - * Copyright (c) 2016-2017, Adam - * 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.rs.api; -import net.runelite.api.HealthBar; import net.runelite.mapping.Import; -public interface RSHealthBar extends RSCacheableNode, HealthBar +public interface RSHealthBar extends RSNode { - @Import("healthScale") - int getHealthScale(); + @Import("updates") + RSIterableNodeDeque getUpdates(); // "combatinfolist" but only thing it has is getNode so this works - @Import("getHealthBarFrontSprite") - @Override - RSSpritePixels getHealthBarFrontSprite(); - - @Import("getHealthBarBackSprite") - @Override - RSSpritePixels getHealthBarBackSprite(); - - @Import("healthBarPadding") - @Override - void setPadding(int padding); + @Import("definition") + RSHealthBarDefinition getDefinition(); } diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSHealthBarDefinition.java b/runescape-api/src/main/java/net/runelite/rs/api/RSHealthBarDefinition.java new file mode 100644 index 0000000000..377a0934a1 --- /dev/null +++ b/runescape-api/src/main/java/net/runelite/rs/api/RSHealthBarDefinition.java @@ -0,0 +1,20 @@ +package net.runelite.rs.api; + +import net.runelite.api.HealthBar; +import net.runelite.mapping.Import; + +public interface RSHealthBarDefinition extends RSDualNode, HealthBar +{ + @Import("width") + int getHealthScale(); + + @Import("getSprite1") + RSSprite getHealthBarFrontSprite(); + + @Import("getSprite2") + RSSprite getHealthBarBackSprite(); + + @Import("widthPadding") + @Override + void setPadding(int padding); +} diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSHealthBarUpdate.java b/runescape-api/src/main/java/net/runelite/rs/api/RSHealthBarUpdate.java new file mode 100644 index 0000000000..6541b7f328 --- /dev/null +++ b/runescape-api/src/main/java/net/runelite/rs/api/RSHealthBarUpdate.java @@ -0,0 +1,12 @@ +package net.runelite.rs.api; + +import net.runelite.mapping.Import; + +public interface RSHealthBarUpdate +{ + @Import("health") + int getHealthRatio(); + + @Import("health2") // not sure about that one but it isn't used and I am sure about the other one + int getHealth(); +} diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSIgnore.java b/runescape-api/src/main/java/net/runelite/rs/api/RSIgnore.java deleted file mode 100644 index f4c3c8150b..0000000000 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSIgnore.java +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Copyright (c) 2018, Adam - * 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.rs.api; - -import net.runelite.api.Ignore; - -public interface RSIgnore extends Ignore, RSNameable -{ -} diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSIgnoreContainer.java b/runescape-api/src/main/java/net/runelite/rs/api/RSIgnoreContainer.java deleted file mode 100644 index 74fb4d5f37..0000000000 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSIgnoreContainer.java +++ /dev/null @@ -1,29 +0,0 @@ -/* - * Copyright (c) 2018, Adam - * 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.rs.api; - -public interface RSIgnoreContainer extends RSNameableContainer -{ -} diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSIgnoreList.java b/runescape-api/src/main/java/net/runelite/rs/api/RSIgnoreList.java new file mode 100644 index 0000000000..802fe122a0 --- /dev/null +++ b/runescape-api/src/main/java/net/runelite/rs/api/RSIgnoreList.java @@ -0,0 +1,5 @@ +package net.runelite.rs.api; + +public interface RSIgnoreList extends RSUserList +{ +} diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSIgnored.java b/runescape-api/src/main/java/net/runelite/rs/api/RSIgnored.java new file mode 100644 index 0000000000..5fcca27e00 --- /dev/null +++ b/runescape-api/src/main/java/net/runelite/rs/api/RSIgnored.java @@ -0,0 +1,7 @@ +package net.runelite.rs.api; + +import net.runelite.api.Ignore; + +public interface RSIgnored extends Ignore, RSUser +{ +} diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSIndexCache.java b/runescape-api/src/main/java/net/runelite/rs/api/RSIndexCache.java new file mode 100644 index 0000000000..bf68b6cba4 --- /dev/null +++ b/runescape-api/src/main/java/net/runelite/rs/api/RSIndexCache.java @@ -0,0 +1,9 @@ +package net.runelite.rs.api; + +import net.runelite.mapping.Import; + +public interface RSIndexCache extends RSAbstractIndexCache +{ + @Import("index") + int getIndex(); +} diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSIndexData.java b/runescape-api/src/main/java/net/runelite/rs/api/RSIndexData.java deleted file mode 100644 index 6ec1b9d3b6..0000000000 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSIndexData.java +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Copyright (c) 2018, Adam - * 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.rs.api; - -import net.runelite.mapping.Import; - -public interface RSIndexData extends RSIndexDataBase -{ - @Import("index") - int getIndex(); -} diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSIndexDataBase.java b/runescape-api/src/main/java/net/runelite/rs/api/RSIndexDataBase.java deleted file mode 100644 index 26a5a507df..0000000000 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSIndexDataBase.java +++ /dev/null @@ -1,34 +0,0 @@ -/* - * Copyright (c) 2018, Adam - * 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.rs.api; - -import net.runelite.api.IndexDataBase; -import net.runelite.mapping.Import; - -public interface RSIndexDataBase extends IndexDataBase -{ - @Import("getConfigData") - byte[] getConfigData(int archiveId, int fileId); -} diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSIndexedSprite.java b/runescape-api/src/main/java/net/runelite/rs/api/RSIndexedSprite.java index 01988e04cc..c2b13deffa 100644 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSIndexedSprite.java +++ b/runescape-api/src/main/java/net/runelite/rs/api/RSIndexedSprite.java @@ -1,27 +1,3 @@ -/* - * Copyright (c) 2017, Adam - * 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.rs.api; import net.runelite.api.IndexedSprite; @@ -45,51 +21,51 @@ public interface RSIndexedSprite extends IndexedSprite @Override void setPalette(int[] palette); - @Import("originalWidth") + @Import("width") @Override int getOriginalWidth(); - @Import("originalWidth") + @Import("width") @Override void setOriginalWidth(int originalWidth); - @Import("originalHeight") + @Import("height") @Override int getOriginalHeight(); - @Import("originalHeight") + @Import("height") @Override void setOriginalHeight(int originalHeight); - @Import("height") + @Import("subHeight") @Override int getHeight(); - @Import("height") + @Import("subHeight") @Override void setHeight(int height); - @Import("offsetX") + @Import("xOffset") @Override int getOffsetX(); - @Import("offsetX") + @Import("xOffset") @Override void setOffsetX(int offsetX); - @Import("offsetY") + @Import("yOffset") @Override int getOffsetY(); - @Import("offsetY") + @Import("yOffset") @Override void setOffsetY(int offsetY); - @Import("width") + @Import("subWidth") @Override int getWidth(); - @Import("width") + @Import("subWidth") @Override void setWidth(int width); } diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSIntegerNode.java b/runescape-api/src/main/java/net/runelite/rs/api/RSIntegerNode.java index 2f31190951..2a5e5bb3bb 100644 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSIntegerNode.java +++ b/runescape-api/src/main/java/net/runelite/rs/api/RSIntegerNode.java @@ -1,27 +1,3 @@ -/* - * Copyright (c) 2018, Adam - * 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.rs.api; import net.runelite.api.IntegerNode; @@ -29,11 +5,11 @@ import net.runelite.mapping.Import; public interface RSIntegerNode extends RSNode, IntegerNode { - @Import("value") + @Import("integer") @Override int getValue(); - @Import("value") + @Import("integer") @Override void setValue(int value); } \ No newline at end of file diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSItem.java b/runescape-api/src/main/java/net/runelite/rs/api/RSItem.java deleted file mode 100644 index 4f451cf028..0000000000 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSItem.java +++ /dev/null @@ -1,60 +0,0 @@ -/* - * Copyright (c) 2016-2017, Adam - * 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.rs.api; - -import net.runelite.api.Item; -import net.runelite.api.Tile; -import net.runelite.mapping.Import; - -public interface RSItem extends RSRenderable, Item -{ - @Import("id") - @Override - int getId(); - - @Import("id") - void setId(int id); - - @Import("quantity") - @Override - int getQuantity(); - - @Import("quantity") - void setQuantity(int quantity); - - int getX(); - - void setX(int x); - - int getY(); - - void setY(int y); - - /** - * Get the tile this item is on - * @return - */ - Tile getTile(); -} diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSItemComposition.java b/runescape-api/src/main/java/net/runelite/rs/api/RSItemComposition.java deleted file mode 100644 index fcc649ca72..0000000000 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSItemComposition.java +++ /dev/null @@ -1,92 +0,0 @@ -/* - * Copyright (c) 2016-2017, Adam - * 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.rs.api; - -import net.runelite.api.ItemComposition; -import net.runelite.mapping.Import; - -/** - * ItemComposition is an interface that represents the various properties of an - * item. Imports several values from runescape-client/ItemComposition, and allows - * direct access to them by calling these methods. - */ -public interface RSItemComposition extends ItemComposition -{ - @Import("name") - @Override - String getName(); - - @Import("id") - @Override - int getId(); - - @Import("notedTemplate") - @Override - int getNote(); - - @Import("note") - @Override - int getLinkedNoteId(); - - @Import("placeholderId") - @Override - int getPlaceholderId(); - - @Import("placeholderTemplateId") - @Override - int getPlaceholderTemplateId(); - - @Import("price") - @Override - int getPrice(); - - @Import("isMembers") - @Override - boolean isMembers(); - - @Import("isTradable") - @Override - boolean isTradeable(); - - /** - * You probably want {@link #isStackable} - *

- * This is the {@code int} that client code uses internally to represent this true/false value. It appears to only ever be set to 1 or 0 - * @return 0 when this type of item isn't stackable, 1 otherwise - */ - @Import("isStackable") - int getIsStackable(); - - @Import("maleModel") - int getMaleModel(); - - @Import("inventoryActions") - @Override - String[] getInventoryActions(); - - @Import("getShiftClickActionIndex") - @Override - int getShiftClickActionIndex(); -} diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSItemContainer.java b/runescape-api/src/main/java/net/runelite/rs/api/RSItemContainer.java index d84a50971b..abbad17e57 100644 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSItemContainer.java +++ b/runescape-api/src/main/java/net/runelite/rs/api/RSItemContainer.java @@ -1,27 +1,3 @@ -/* - * Copyright (c) 2016-2017, Adam - * 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.rs.api; import net.runelite.api.ItemContainer; @@ -29,9 +5,9 @@ import net.runelite.mapping.Import; public interface RSItemContainer extends RSNode, ItemContainer { - @Import("itemIds") + @Import("ids") int[] getItemIds(); - @Import("stackSizes") + @Import("quantities") int[] getStackSizes(); } diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSItemDefinition.java b/runescape-api/src/main/java/net/runelite/rs/api/RSItemDefinition.java new file mode 100644 index 0000000000..67c0cdb459 --- /dev/null +++ b/runescape-api/src/main/java/net/runelite/rs/api/RSItemDefinition.java @@ -0,0 +1,63 @@ +package net.runelite.rs.api; + +import net.runelite.api.ItemDefinition; +import net.runelite.mapping.Import; + +public interface RSItemDefinition extends ItemDefinition +{ + @Import("name") + @Override + String getName(); + + @Import("id") + @Override + int getId(); + + @Import("noteTemplate") + @Override + int getNote(); + + @Import("notedId") + @Override + int getLinkedNoteId(); + + @Import("placeholder") + @Override + int getPlaceholderId(); + + @Import("placeholderTemplate") + @Override + int getPlaceholderTemplateId(); + + @Import("price") + @Override + int getPrice(); + + @Import("isMembersOnly") + @Override + boolean isMembers(); + + @Import("isTradable") + @Override + boolean isTradeable(); + + /** + * You probably want {@link #isStackable} + *

+ * This is the {@code int} that client code uses internally to represent this true/false value. It appears to only ever be set to 1 or 0 + * @return 0 when this type of item isn't stackable, 1 otherwise + */ + @Import("isStackable") + int getIsStackable(); + + @Import("maleModel") + int getMaleModel(); + + @Import("inventoryActions") + @Override + String[] getInventoryActions(); + + @Import("getShiftClickIndex") + @Override + int getShiftClickActionIndex(); +} diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSItemLayer.java b/runescape-api/src/main/java/net/runelite/rs/api/RSItemLayer.java deleted file mode 100644 index 4afd479296..0000000000 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSItemLayer.java +++ /dev/null @@ -1,58 +0,0 @@ -/* - * Copyright (c) 2016-2017, Adam - * 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.rs.api; - -import net.runelite.api.ItemLayer; -import net.runelite.mapping.Import; - -public interface RSItemLayer extends ItemLayer -{ - @Import("x") - int getX(); - - @Import("y") - int getY(); - - @Import("hash") - @Override - long getHash(); - - @Import("height") - int getHeight(); - - @Import("bottom") - @Override - RSRenderable getBottom(); - - @Import("middle") - @Override - RSRenderable getMiddle(); - - @Import("top") - @Override - RSRenderable getTop(); - - void setPlane(int plane); -} diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSIterableHashTable.java b/runescape-api/src/main/java/net/runelite/rs/api/RSIterableHashTable.java deleted file mode 100644 index 404f2c32bb..0000000000 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSIterableHashTable.java +++ /dev/null @@ -1,35 +0,0 @@ -/* - * Copyright (c) 2018, Adam - * 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.rs.api; - -import net.runelite.api.IterableHashTable; -import net.runelite.mapping.Import; - -public interface RSIterableHashTable extends IterableHashTable -{ - @Import("get") - @Override - RSNode get(long hash); -} diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSIterableNodeDeque.java b/runescape-api/src/main/java/net/runelite/rs/api/RSIterableNodeDeque.java new file mode 100644 index 0000000000..6068b7380a --- /dev/null +++ b/runescape-api/src/main/java/net/runelite/rs/api/RSIterableNodeDeque.java @@ -0,0 +1,9 @@ +package net.runelite.rs.api; + +import net.runelite.mapping.Import; + +public interface RSIterableNodeDeque +{ + @Import("current") + RSNode getCurrent(); +} diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSIterableNodeHashTable.java b/runescape-api/src/main/java/net/runelite/rs/api/RSIterableNodeHashTable.java new file mode 100644 index 0000000000..3d8c5efab0 --- /dev/null +++ b/runescape-api/src/main/java/net/runelite/rs/api/RSIterableNodeHashTable.java @@ -0,0 +1,11 @@ +package net.runelite.rs.api; + +import net.runelite.api.IterableHashTable; +import net.runelite.mapping.Import; + +public interface RSIterableNodeHashTable extends IterableHashTable +{ + @Import("get") + @Override + RSNode get(long hash); +} diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSJagexLoginType.java b/runescape-api/src/main/java/net/runelite/rs/api/RSJagexLoginType.java deleted file mode 100644 index 5446d5d4bb..0000000000 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSJagexLoginType.java +++ /dev/null @@ -1,30 +0,0 @@ -/* - * Copyright (c) 2018, Adam - * 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.rs.api; - -public interface RSJagexLoginType -{ - -} diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSKeyFocusListener.java b/runescape-api/src/main/java/net/runelite/rs/api/RSKeyFocusListener.java deleted file mode 100644 index 9ef296251b..0000000000 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSKeyFocusListener.java +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Copyright (c) 2018, Adam - * 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.rs.api; - -import java.awt.event.FocusListener; -import java.awt.event.KeyListener; -import net.runelite.api.KeyFocusListener; - -public interface RSKeyFocusListener extends KeyListener, FocusListener, KeyFocusListener -{ -} diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSKeyHandler.java b/runescape-api/src/main/java/net/runelite/rs/api/RSKeyHandler.java new file mode 100644 index 0000000000..c683aa129a --- /dev/null +++ b/runescape-api/src/main/java/net/runelite/rs/api/RSKeyHandler.java @@ -0,0 +1,9 @@ +package net.runelite.rs.api; + +import net.runelite.api.KeyFocusListener; +import java.awt.event.FocusListener; +import java.awt.event.KeyListener; + +public interface RSKeyHandler extends KeyListener, FocusListener, KeyFocusListener +{ +} diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSLoginType.java b/runescape-api/src/main/java/net/runelite/rs/api/RSLoginType.java new file mode 100644 index 0000000000..ecbde757f7 --- /dev/null +++ b/runescape-api/src/main/java/net/runelite/rs/api/RSLoginType.java @@ -0,0 +1,5 @@ +package net.runelite.rs.api; + +public interface RSLoginType +{ +} diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSMainBufferProvider.java b/runescape-api/src/main/java/net/runelite/rs/api/RSMainBufferProvider.java deleted file mode 100644 index 8b27911a27..0000000000 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSMainBufferProvider.java +++ /dev/null @@ -1,43 +0,0 @@ -/* - * Copyright (c) 2017, Adam - * 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.rs.api; - -import java.awt.Component; -import java.awt.Image; -import net.runelite.api.MainBufferProvider; -import net.runelite.mapping.Import; - -public interface RSMainBufferProvider extends RSBufferProvider, MainBufferProvider -{ - @Import("image") - @Override - Image getImage(); - - @Import("image") - void setImage(Image image); - - @Import("canvas") - Component getCanvas(); -} diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSMapElementConfig.java b/runescape-api/src/main/java/net/runelite/rs/api/RSMapElementConfig.java deleted file mode 100644 index 028f5269a5..0000000000 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSMapElementConfig.java +++ /dev/null @@ -1,35 +0,0 @@ -/* - * Copyright (c) 2017, Adam - * 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.rs.api; - -import net.runelite.api.MapElementConfig; -import net.runelite.mapping.Import; - -public interface RSMapElementConfig extends RSCacheableNode, MapElementConfig -{ - @Import("getMapIcon") - @Override - RSSpritePixels getMapIcon(boolean var1); -} diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSMessage.java b/runescape-api/src/main/java/net/runelite/rs/api/RSMessage.java new file mode 100644 index 0000000000..4bbbfb74a0 --- /dev/null +++ b/runescape-api/src/main/java/net/runelite/rs/api/RSMessage.java @@ -0,0 +1,38 @@ +package net.runelite.rs.api; + +import net.runelite.api.MessageNode; +import net.runelite.mapping.Import; + +public interface RSMessage extends MessageNode +{ + @Import("count") + @Override + int getId(); + + @Import("type") + int getRSType(); + + @Import("prefix") + @Override + String getName(); + + @Import("prefix") + @Override + void setName(String name); + + @Import("sender") + @Override + String getSender(); + + @Import("sender") + @Override + void setSender(String sender); + + @Import("text") + @Override + String getValue(); + + @Import("text") + @Override + void setValue(String value); +} diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSMessageNode.java b/runescape-api/src/main/java/net/runelite/rs/api/RSMessageNode.java deleted file mode 100644 index f673e58c7a..0000000000 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSMessageNode.java +++ /dev/null @@ -1,62 +0,0 @@ -/* - * Copyright (c) 2016-2017, Adam - * 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.rs.api; - -import net.runelite.api.MessageNode; -import net.runelite.mapping.Import; - -public interface RSMessageNode extends MessageNode -{ - @Import("id") - @Override - int getId(); - - @Import("type") - int getRSType(); - - @Import("name") - @Override - String getName(); - - @Import("name") - @Override - void setName(String name); - - @Import("sender") - @Override - String getSender(); - - @Import("sender") - @Override - void setSender(String sender); - - @Import("value") - @Override - String getValue(); - - @Import("value") - @Override - void setValue(String value); -} diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSModel.java b/runescape-api/src/main/java/net/runelite/rs/api/RSModel.java index a447b080c1..e05e02599e 100644 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSModel.java +++ b/runescape-api/src/main/java/net/runelite/rs/api/RSModel.java @@ -24,11 +24,11 @@ */ package net.runelite.rs.api; -import java.awt.Polygon; import net.runelite.api.Model; +import java.awt.Polygon; import net.runelite.mapping.Import; -public interface RSModel extends RSRenderable, Model +public interface RSModel extends RSEntity, Model { @Import("verticesCount") @Override @@ -74,7 +74,7 @@ public interface RSModel extends RSRenderable, Model @Override int[] getFaceColors3(); - @Import("triangleTransparencies") + @Import("faceAlphas") @Override byte[] getTriangleTransparencies(); @@ -82,70 +82,70 @@ public interface RSModel extends RSRenderable, Model @Override byte[] getFaceRenderPriorities(); - @Import("vertexGroups") + @Import("vertexLabels") int[][] getVertexGroups(); - @Import("modelHeight") + @Import("height") @Override int getModelHeight(); - @Import("animate") + @Import("transform") void animate(int type, int[] list, int x, int y, int z); @Import("calculateBoundsCylinder") @Override void calculateBoundsCylinder(); - @Import("calculateExtreme") + @Import("calculateBoundingBox") @Override void calculateExtreme(int orientation); @Import("resetBounds") void resetBounds(); - @Import("toSharedModel") + @Import("toSharedSequenceModel") RSModel toSharedModel(boolean b); - @Import("toSharedSpotAnimModel") + @Import("toSharedSpotAnimationModel") RSModel toSharedSpotAnimModel(boolean b); @Import("rotateY90Ccw") void rotateY90Ccw(); - @Import("rotateY180Ccw") + @Import("rotateY180") void rotateY180Ccw(); @Import("rotateY270Ccw") void rotateY270Ccw(); - @Import("isClickable") - boolean isClickable(); + @Import("isSingleTile") + boolean isSingleTile(); @Import("radius") @Override int getRadius(); - @Import("centerX") + @Import("xMid") @Override int getCenterX(); - @Import("centerY") + @Import("yMid") @Override int getCenterY(); - @Import("centerZ") + @Import("zMid") @Override int getCenterZ(); - @Import("extremeX") + @Import("xMidOffset") @Override int getExtremeX(); - @Import("extremeY") + @Import("yMidOffset") @Override int getExtremeY(); - @Import("extremeZ") + @Import("zMidOffset") @Override int getExtremeZ(); @@ -153,12 +153,12 @@ public interface RSModel extends RSRenderable, Model @Override short[] getFaceTextures(); - @Import("XYZMag") + @Import("xzRadius") @Override int getXYZMag(); void interpolateFrames(RSFrames frames, int frameId, RSFrames nextFrames, int nextFrameId, int interval, - int intervalCount); + int intervalCount); /** * Compute the convex hull of this model diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSModelData.java b/runescape-api/src/main/java/net/runelite/rs/api/RSModelData.java index 4503e75729..77eaf9ce9c 100644 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSModelData.java +++ b/runescape-api/src/main/java/net/runelite/rs/api/RSModelData.java @@ -1,52 +1,28 @@ -/* - * Copyright (c) 2018, Adam - * 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.rs.api; import net.runelite.mapping.Import; -public interface RSModelData extends RSRenderable +public interface RSModelData extends RSEntity { - @Import("triangleFaceCount") + @Import("faceCount") int getTriangleFaceCount(); - @Import("trianglePointsX") + @Import("indices1") int[] getTrianglePointsX(); - @Import("trianglePointsY") + @Import("indices2") int[] getTrianglePointsY(); - @Import("trianglePointsZ") + @Import("indices3") int[] getTrianglePointsZ(); - @Import("vertexX") + @Import("verticesX") int[] getVertexX(); - @Import("vertexY") + @Import("verticesY") int[] getVertexY(); - @Import("vertexZ") + @Import("verticesZ") int[] getVertexZ(); @Import("texTriangleX") diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSMouseHandler.java b/runescape-api/src/main/java/net/runelite/rs/api/RSMouseHandler.java new file mode 100644 index 0000000000..b89b833c85 --- /dev/null +++ b/runescape-api/src/main/java/net/runelite/rs/api/RSMouseHandler.java @@ -0,0 +1,9 @@ +package net.runelite.rs.api; + +import java.awt.event.FocusListener; +import java.awt.event.MouseListener; +import java.awt.event.MouseMotionListener; + +public interface RSMouseHandler extends MouseListener, MouseMotionListener, FocusListener +{ +} diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSMouseInput.java b/runescape-api/src/main/java/net/runelite/rs/api/RSMouseInput.java deleted file mode 100644 index 7db688d071..0000000000 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSMouseInput.java +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Copyright (c) 2018, Adam - * 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.rs.api; - -import java.awt.event.FocusListener; -import java.awt.event.MouseListener; -import java.awt.event.MouseMotionListener; - -public interface RSMouseInput extends MouseListener, MouseMotionListener, FocusListener -{ -} diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSMouseRecorder.java b/runescape-api/src/main/java/net/runelite/rs/api/RSMouseRecorder.java index 8cbbe545f7..d7eeba34d1 100644 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSMouseRecorder.java +++ b/runescape-api/src/main/java/net/runelite/rs/api/RSMouseRecorder.java @@ -1,28 +1,3 @@ -/* - * Copyright (c) 2019, ThatGamerBlue - * 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.rs.api; import net.runelite.api.MouseRecorder; @@ -30,17 +5,15 @@ import net.runelite.mapping.Import; public interface RSMouseRecorder extends MouseRecorder { - @Import("xs") int[] getXs(); - + @Import("ys") int[] getYs(); - + @Import("millis") long[] getMillis(); - + @Import("index") int getIndex(); - } diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSMouseWheelHandler.java b/runescape-api/src/main/java/net/runelite/rs/api/RSMouseWheelHandler.java index bd50e7a428..2add3af142 100644 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSMouseWheelHandler.java +++ b/runescape-api/src/main/java/net/runelite/rs/api/RSMouseWheelHandler.java @@ -1,27 +1,3 @@ -/* - * Copyright (c) 2018, Adam - * 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.rs.api; import java.awt.event.MouseWheelListener; diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSNPC.java b/runescape-api/src/main/java/net/runelite/rs/api/RSNPC.java index fc4bfcc714..c34ce43381 100644 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSNPC.java +++ b/runescape-api/src/main/java/net/runelite/rs/api/RSNPC.java @@ -1,27 +1,3 @@ -/* - * Copyright (c) 2016-2017, Adam - * 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.rs.api; import net.runelite.api.NPC; @@ -29,9 +5,9 @@ import net.runelite.mapping.Import; public interface RSNPC extends RSActor, NPC { - @Import("composition") + @Import("definition") @Override - RSNPCComposition getComposition(); + RSNPCDefinition getDefinition(); @Override int getIndex(); diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSNPCComposition.java b/runescape-api/src/main/java/net/runelite/rs/api/RSNPCComposition.java deleted file mode 100644 index 87c781cea8..0000000000 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSNPCComposition.java +++ /dev/null @@ -1,78 +0,0 @@ -/* - * Copyright (c) 2016-2017, Adam - * 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.rs.api; - -import net.runelite.api.NPCComposition; -import net.runelite.mapping.Import; - -public interface RSNPCComposition extends NPCComposition -{ - @Import("name") - @Override - String getName(); - - @Import("models") - @Override - int[] getModels(); - - @Import("actions") - @Override - String[] getActions(); - - @Import("isClickable") - @Override - boolean isClickable(); - - @Import("isMinimapVisible") - @Override - boolean isMinimapVisible(); - - @Import("isVisible") - @Override - boolean isVisible(); - - @Import("id") - @Override - int getId(); - - @Import("combatLevel") - @Override - int getCombatLevel(); - - @Import("configs") - @Override - int[] getConfigs(); - - @Import("transform") - @Override - RSNPCComposition transform(); - - @Import("size") - @Override - int getSize(); - - @Import("headIcon") - int getRsOverheadIcon(); -} diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSNPCDefinition.java b/runescape-api/src/main/java/net/runelite/rs/api/RSNPCDefinition.java new file mode 100644 index 0000000000..fef328c669 --- /dev/null +++ b/runescape-api/src/main/java/net/runelite/rs/api/RSNPCDefinition.java @@ -0,0 +1,54 @@ +package net.runelite.rs.api; + +import net.runelite.api.NPCDefinition; +import net.runelite.mapping.Import; + +public interface RSNPCDefinition extends NPCDefinition +{ + @Import("name") + @Override + String getName(); + + @Import("archives") + @Override + int[] getModels(); + + @Import("actions") + @Override + String[] getActions(); + + @Import("isClickable") + @Override + boolean isClickable(); + + @Import("drawMapDot") + @Override + boolean isMinimapVisible(); + + @Import("isVisible") + @Override + boolean isVisible(); + + @Import("id") + @Override + int getId(); + + @Import("combatLevel") + @Override + int getCombatLevel(); + + @Import("transforms") + @Override + int[] getConfigs(); + + @Import("transform") + @Override + RSNPCDefinition transform(); + + @Import("size") + @Override + int getSize(); + + @Import("headIconPrayer") + int getRsOverheadIcon(); +} diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSNameable.java b/runescape-api/src/main/java/net/runelite/rs/api/RSNameable.java deleted file mode 100644 index 6b7feef4ab..0000000000 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSNameable.java +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Copyright (c) 2018, Adam - * 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.rs.api; - -import net.runelite.api.Nameable; -import net.runelite.mapping.Import; - -public interface RSNameable extends Nameable, Comparable -{ - @Import("name") - RSName getRsName(); - - @Import("prevName") - RSName getRsPrevName(); -} diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSNameableContainer.java b/runescape-api/src/main/java/net/runelite/rs/api/RSNameableContainer.java deleted file mode 100644 index 33f2070048..0000000000 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSNameableContainer.java +++ /dev/null @@ -1,55 +0,0 @@ -/* - * Copyright (c) 2018, Adam - * 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.rs.api; - -import net.runelite.mapping.Import; - -public interface RSNameableContainer -{ - @Import("count") - int getCount(); - - @Import("nameables") - T[] getNameables(); - - @Import("isMember") - boolean isMember(RSName var1); - - @Import("findByName") - T findByName(RSName name); - - /** - * Method called by the container when an element is added - * @param name - * @param prevName - */ - void rl$add(RSName name, RSName prevName); - - /** - * Method called by the container when an element is removed - * @param nameable - */ - void rl$remove(RSNameable nameable); -} diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSNode.java b/runescape-api/src/main/java/net/runelite/rs/api/RSNode.java index ab24b70dda..80dc2b7c2f 100644 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSNode.java +++ b/runescape-api/src/main/java/net/runelite/rs/api/RSNode.java @@ -33,7 +33,7 @@ public interface RSNode extends Node @Override RSNode getNext(); - @Import("hash") + @Import("key") @Override long getHash(); @@ -41,7 +41,7 @@ public interface RSNode extends Node @Override RSNode getPrevious(); - @Import("unlink") + @Import("remove") void unlink(); /** diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSNodeCache.java b/runescape-api/src/main/java/net/runelite/rs/api/RSNodeCache.java deleted file mode 100644 index 6a7eb9e2ec..0000000000 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSNodeCache.java +++ /dev/null @@ -1,46 +0,0 @@ -/* - * Copyright (c) 2018, Adam - * 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.rs.api; - -import net.runelite.api.NodeCache; -import net.runelite.mapping.Import; - -public interface RSNodeCache extends NodeCache -{ - @Import("get") - RSCacheableNode get(long id); - - @Import("reset") - @Override - void reset(); - - @Import("capacity") - @Override - void setCapacity(int capacity); - - @Import("remainingCapacity") - @Override - void setRemainingCapacity(int remainingCapacity); -} \ No newline at end of file diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSNodeDeque.java b/runescape-api/src/main/java/net/runelite/rs/api/RSNodeDeque.java new file mode 100644 index 0000000000..c903f20f8c --- /dev/null +++ b/runescape-api/src/main/java/net/runelite/rs/api/RSNodeDeque.java @@ -0,0 +1,12 @@ +package net.runelite.rs.api; + +import net.runelite.mapping.Import; + +public interface RSNodeDeque +{ + @Import("current") + RSNode getCurrent(); + + @Import("sentinel") + RSNode getHead(); +} diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSNodeHashTable.java b/runescape-api/src/main/java/net/runelite/rs/api/RSNodeHashTable.java new file mode 100644 index 0000000000..e93b478531 --- /dev/null +++ b/runescape-api/src/main/java/net/runelite/rs/api/RSNodeHashTable.java @@ -0,0 +1,17 @@ +package net.runelite.rs.api; + +import net.runelite.api.HashTable; +import net.runelite.mapping.Import; + +public interface RSNodeHashTable extends HashTable +{ + @Import("get") + @Override + RSNode get(long value); + + @Import("size") + int getSize(); + + @Import("buckets") + RSNode[] getBuckets(); +} diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSObjectComposition.java b/runescape-api/src/main/java/net/runelite/rs/api/RSObjectComposition.java deleted file mode 100644 index 3df00175f5..0000000000 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSObjectComposition.java +++ /dev/null @@ -1,59 +0,0 @@ -/* - * Copyright (c) 2016-2017, Adam - * 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.rs.api; - -import net.runelite.api.ObjectComposition; -import net.runelite.mapping.Import; - -public interface RSObjectComposition extends ObjectComposition -{ - @Import("id") - @Override - int getId(); - - @Import("name") - @Override - String getName(); - - @Import("actions") - @Override - String[] getActions(); - - @Import("mapSceneId") - @Override - int getMapSceneId(); - - @Import("mapIconId") - @Override - int getMapIconId(); - - @Import("impostorIds") - @Override - int[] getImpostorIds(); - - @Import("getImpostor") - @Override - RSObjectComposition getImpostor(); -} diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSObjectDefinition.java b/runescape-api/src/main/java/net/runelite/rs/api/RSObjectDefinition.java new file mode 100644 index 0000000000..7bd9db4f4e --- /dev/null +++ b/runescape-api/src/main/java/net/runelite/rs/api/RSObjectDefinition.java @@ -0,0 +1,35 @@ +package net.runelite.rs.api; + +import net.runelite.api.ObjectDefinition; +import net.runelite.mapping.Import; + +public interface RSObjectDefinition extends ObjectDefinition +{ + @Import("id") + @Override + int getId(); + + @Import("name") + @Override + String getName(); + + @Import("actions") + @Override + String[] getActions(); + + @Import("mapSceneId") + @Override + int getMapSceneId(); + + @Import("mapIconId") + @Override + int getMapIconId(); + + @Import("transforms") + @Override + int[] getImpostorIds(); + + @Import("transform") + @Override + RSObjectDefinition getImpostor(); +} diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSPacketBuffer.java b/runescape-api/src/main/java/net/runelite/rs/api/RSPacketBuffer.java index 2a79d8983b..614734671d 100644 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSPacketBuffer.java +++ b/runescape-api/src/main/java/net/runelite/rs/api/RSPacketBuffer.java @@ -1,27 +1,3 @@ -/* - * Copyright (c) 2017, Adam - * 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.rs.api; import net.runelite.api.PacketBuffer; diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSPlayer.java b/runescape-api/src/main/java/net/runelite/rs/api/RSPlayer.java index ec8db1f005..33b4c5e51a 100644 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSPlayer.java +++ b/runescape-api/src/main/java/net/runelite/rs/api/RSPlayer.java @@ -29,21 +29,21 @@ import net.runelite.mapping.Import; public interface RSPlayer extends RSActor, Player { - @Import("name") - RSName getRsName(); + @Import("username") + RSUsername getRsName(); - @Import("playerId") + @Import("index") int getPlayerId(); - @Import("composition") + @Import("appearance") @Override - RSPlayerComposition getPlayerComposition(); + RSPlayerAppearance getPlayerAppearance(); @Import("combatLevel") @Override int getCombatLevel(); - @Import("totalLevel") + @Import("skillLevel") int getTotalLevel(); @Import("team") @@ -58,9 +58,9 @@ public interface RSPlayer extends RSActor, Player @Override boolean isFriend(); - @Import("overheadIcon") + @Import("headIconPrayer") int getRsOverheadIcon(); - @Import("skullIcon") + @Import("headIconPk") int getRsSkullIcon(); } diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSPlayerAppearance.java b/runescape-api/src/main/java/net/runelite/rs/api/RSPlayerAppearance.java new file mode 100644 index 0000000000..3f084e3114 --- /dev/null +++ b/runescape-api/src/main/java/net/runelite/rs/api/RSPlayerAppearance.java @@ -0,0 +1,25 @@ +package net.runelite.rs.api; + +import net.runelite.api.PlayerAppearance; +import net.runelite.mapping.Import; + +public interface RSPlayerAppearance extends PlayerAppearance +{ + @Import("isFemale") + boolean isFemale(); + + @Import("bodyColors") + int[] getBodyPartColours(); + + @Import("equipment") + @Override + int[] getEquipmentIds(); + + @Import("npcTransformId") + @Override + void setTransformedNpcId(int id); + + @Import("setHash") + @Override + void setHash(); +} diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSPlayerComposition.java b/runescape-api/src/main/java/net/runelite/rs/api/RSPlayerComposition.java deleted file mode 100644 index 15a3fb0e58..0000000000 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSPlayerComposition.java +++ /dev/null @@ -1,49 +0,0 @@ -/* - * Copyright (c) 2016-2017, Adam - * 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.rs.api; - -import net.runelite.api.PlayerComposition; -import net.runelite.mapping.Import; - -public interface RSPlayerComposition extends PlayerComposition -{ - @Import("isFemale") - boolean isFemale(); - - @Import("bodyPartColours") - int[] getBodyPartColours(); - - @Import("equipmentIds") - @Override - int[] getEquipmentIds(); - - @Import("transformedNpcId") - @Override - void setTransformedNpcId(int id); - - @Import("setHash") - @Override - void setHash(); -} diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSPreferences.java b/runescape-api/src/main/java/net/runelite/rs/api/RSPreferences.java deleted file mode 100644 index eca6b3d5bb..0000000000 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSPreferences.java +++ /dev/null @@ -1,39 +0,0 @@ -/* - * Copyright (c) 2018, Lotto - * 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.rs.api; - -import net.runelite.api.Preferences; -import net.runelite.mapping.Import; - -public interface RSPreferences extends Preferences -{ - @Import("rememberedUsername") - @Override - String getRememberedUsername(); - - @Import("rememberedUsername") - @Override - void setRememberedUsername(String username); -} diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSProjectile.java b/runescape-api/src/main/java/net/runelite/rs/api/RSProjectile.java index db90a83067..ae8ab12836 100644 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSProjectile.java +++ b/runescape-api/src/main/java/net/runelite/rs/api/RSProjectile.java @@ -1,42 +1,46 @@ /* - * Copyright (c) 2016-2017, Adam + * BSD 2-Clause License + * + * Copyright (c) 2019, ThatGamerBlue * 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. + * Redistributions of source code must retain the above copyright notice, this + * list of conditions and the following disclaimer. * - * 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. + * 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 HOLDER 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.rs.api; import net.runelite.api.Projectile; import net.runelite.mapping.Import; -public interface RSProjectile extends RSRenderable, Projectile +public interface RSProjectile extends RSEntity, Projectile { @Import("id") @Override int getId(); - @Import("interacting") + @Import("targetIndex") int getRsInteracting(); - @Import("height") + @Import("sourceZ") @Override int getHeight(); @@ -44,23 +48,23 @@ public interface RSProjectile extends RSRenderable, Projectile @Override int getEndHeight(); - @Import("x1") + @Import("sourceX") @Override int getX1(); - @Import("y1") + @Import("sourceY") @Override int getY1(); - @Import("floor") + @Import("plane") @Override int getFloor(); - @Import("startMovementCycle") + @Import("cycleStart") @Override int getStartMovementCycle(); - @Import("endCycle") + @Import("cycleEnd") @Override int getEndCycle(); @@ -84,19 +88,19 @@ public interface RSProjectile extends RSRenderable, Projectile @Override double getZ(); - @Import("scalar") + @Import("speed") @Override double getScalar(); - @Import("velocityX") + @Import("speedX") @Override double getVelocityX(); - @Import("velocityY") + @Import("speedY") @Override double getVelocityY(); - @Import("velocityZ") + @Import("speedZ") @Override double getVelocityZ(); } diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSRasterProvider.java b/runescape-api/src/main/java/net/runelite/rs/api/RSRasterProvider.java new file mode 100644 index 0000000000..5ef9913681 --- /dev/null +++ b/runescape-api/src/main/java/net/runelite/rs/api/RSRasterProvider.java @@ -0,0 +1,47 @@ +/* + * BSD 2-Clause License + * + * Copyright (c) 2019, ThatGamerBlue + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, this + * list of conditions and the following disclaimer. + * + * 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 HOLDER 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.rs.api; + +import net.runelite.api.MainBufferProvider; +import java.awt.Component; +import java.awt.Image; +import net.runelite.mapping.Import; + +public interface RSRasterProvider extends RSAbstractRasterProvider, MainBufferProvider +{ + @Import("image") + @Override + Image getImage(); + + @Import("image") + void setImage(Image image); + + @Import("component0") + Component getCanvas(); +} diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSReflectionCheck.java b/runescape-api/src/main/java/net/runelite/rs/api/RSReflectionCheck.java new file mode 100644 index 0000000000..616206cd71 --- /dev/null +++ b/runescape-api/src/main/java/net/runelite/rs/api/RSReflectionCheck.java @@ -0,0 +1,17 @@ +package net.runelite.rs.api; + +import java.lang.reflect.Field; +import java.lang.reflect.Method; +import net.runelite.mapping.Import; + +public interface RSReflectionCheck +{ + @Import("methods") + Method[] getMethods(); + + @Import("fields") + Field[] getFields(); + + @Import("arguments") + byte[][][] getArgs(); +} diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSRenderOverview.java b/runescape-api/src/main/java/net/runelite/rs/api/RSRenderOverview.java deleted file mode 100644 index ddc348a11b..0000000000 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSRenderOverview.java +++ /dev/null @@ -1,77 +0,0 @@ -/* - * Copyright (c) 2018, Adam - * 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.rs.api; - -import net.runelite.api.RenderOverview; -import net.runelite.api.WorldMapData; -import net.runelite.mapping.Import; - -public interface RSRenderOverview extends RenderOverview -{ - @Import("worldMapX") - int getWorldMapX(); - - @Import("worldMapY") - int getWorldMapY(); - - @Import("worldMapZoom") - float getWorldMapZoom(); - - @Import("worldMapTargetX") - int getWorldMapTargetX(); - - @Import("worldMapTargetY") - int getWorldMapTargetY(); - - @Import("worldMapDisplayWidth") - int getWorldMapDisplayWidth(); - - @Import("worldMapDisplayHeight") - int getWorldMapDisplayHeight(); - - @Import("worldMapDisplayX") - int getWorldMapDisplayX(); - - @Import("worldMapDisplayY") - int getWorldMapDisplayY(); - - @Import("setWorldMapPosition") - void setWorldMapPosition(int worldMapX, int worldMapY, boolean changedSurface); - - @Import("setWorldMapPositionTargetWorldPoint") - void setWorldMapPositionTarget(int worldPointX, int worldPointY); - - @Import("worldMapManager") - @Override - RSWorldMapManager getWorldMapManager(); - - @Import("initializeWorldMap") - @Override - void initializeWorldMap(WorldMapData var1); - - @Import("worldMapData") - @Override - RSWorldMapData getWorldMapData(); -} diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSRunException.java b/runescape-api/src/main/java/net/runelite/rs/api/RSRunException.java index de6f6e670b..872d1a9f90 100644 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSRunException.java +++ b/runescape-api/src/main/java/net/runelite/rs/api/RSRunException.java @@ -1,33 +1,9 @@ -/* - * Copyright (c) 2018, Lotto - * 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.rs.api; import net.runelite.mapping.Import; public interface RSRunException { - @Import("parent") + @Import("throwable") Throwable getParent(); } diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSScene.java b/runescape-api/src/main/java/net/runelite/rs/api/RSScene.java index 3cfeed4fe5..facd9897e0 100644 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSScene.java +++ b/runescape-api/src/main/java/net/runelite/rs/api/RSScene.java @@ -1,27 +1,3 @@ -/* - * Copyright (c) 2016-2017, Adam - * 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.rs.api; import net.runelite.api.Scene; @@ -30,34 +6,34 @@ import net.runelite.mapping.Import; public interface RSScene extends Scene { - @Import("objects") - RSGameObject[] getObjects(); + //@Import("Scene_gameObjects") --- unused and causing trouble + //RSGameObject[] getObjects(); @Import("tiles") @Override RSTile[][][] getTiles(); - @Import("draw") + @Import("drawTile") void draw(Tile tile, boolean var2); @Import("tileHeights") int[][][] getTileHeights(); - @Import("drawTile") + @Import("drawTileMinimap") void drawTile(int[] pixels, int pixelOffset, int width, int z, int x, int y); - @Import("updateOccluders") + @Import("occlude") void updateOccluders(); - @Import("maxX") + @Import("xSize") int getMaxX(); - @Import("maxY") + @Import("planes") int getMaxY(); - @Import("maxZ") + @Import("ySize") int getMaxZ(); - @Import("minLevel") + @Import("Scene_minPlane") int getMinLevel(); } diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSSceneTileModel.java b/runescape-api/src/main/java/net/runelite/rs/api/RSSceneTileModel.java deleted file mode 100644 index 35c3fa6e5c..0000000000 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSSceneTileModel.java +++ /dev/null @@ -1,87 +0,0 @@ -/* - * Copyright (c) 2016-2017, Adam - * 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.rs.api; - -import net.runelite.api.SceneTileModel; -import net.runelite.mapping.Import; - -public interface RSSceneTileModel extends SceneTileModel -{ - @Import("underlay") - @Override - int getModelUnderlay(); - - @Import("overlay") - @Override - int getModelOverlay(); - - @Import("shape") - @Override - int getShape(); - - @Import("rotation") - @Override - int getRotation(); - - @Import("faceX") - @Override - int[] getFaceX(); - - @Import("faceY") - @Override - int[] getFaceY(); - - @Import("faceZ") - @Override - int[] getFaceZ(); - - @Import("vertexX") - @Override - int[] getVertexX(); - - @Import("vertexY") - @Override - int[] getVertexY(); - - @Import("vertexZ") - @Override - int[] getVertexZ(); - - @Import("triangleColorA") - @Override - int[] getTriangleColorA(); - - @Import("triangleColorB") - @Override - int[] getTriangleColorB(); - - @Import("triangleColorC") - @Override - int[] getTriangleColorC(); - - @Import("triangleTextureId") - @Override - int[] getTriangleTextureId(); -} diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSSceneTilePaint.java b/runescape-api/src/main/java/net/runelite/rs/api/RSSceneTilePaint.java deleted file mode 100644 index 99c6b9f763..0000000000 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSSceneTilePaint.java +++ /dev/null @@ -1,55 +0,0 @@ -/* - * Copyright (c) 2016-2017, Adam - * 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.rs.api; - -import net.runelite.api.SceneTilePaint; -import net.runelite.mapping.Import; - -public interface RSSceneTilePaint extends SceneTilePaint -{ - @Import("rgb") - @Override - int getRBG(); - - @Import("swColor") - @Override - int getSwColor(); - - @Import("seColor") - @Override - int getSeColor(); - - @Import("nwColor") - @Override - int getNwColor(); - - @Import("neColor") - @Override - int getNeColor(); - - @Import("texture") - @Override - int getTexture(); -} diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSScript.java b/runescape-api/src/main/java/net/runelite/rs/api/RSScript.java index 5bf9a0d094..7a1c730f5a 100644 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSScript.java +++ b/runescape-api/src/main/java/net/runelite/rs/api/RSScript.java @@ -1,39 +1,15 @@ -/* - * Copyright (c) 2018 Abex - * 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.rs.api; import net.runelite.api.Script; import net.runelite.mapping.Import; -public interface RSScript extends Script, RSCacheableNode +public interface RSScript extends Script, RSDualNode { @Import("intOperands") @Override int[] getIntOperands(); - @Import("instructions") + @Import("opcodes") @Override int[] getInstructions(); } diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSScriptEvent.java b/runescape-api/src/main/java/net/runelite/rs/api/RSScriptEvent.java index a2f293b417..d2acea2db3 100644 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSScriptEvent.java +++ b/runescape-api/src/main/java/net/runelite/rs/api/RSScriptEvent.java @@ -1,27 +1,3 @@ -/* - * Copyright (c) 2018 Abex - * 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.rs.api; import net.runelite.api.ScriptEvent; @@ -30,18 +6,18 @@ import net.runelite.mapping.Import; public interface RSScriptEvent extends ScriptEvent { - @Import("params") + @Import("args0") Object[] getArguments(); - @Import("params") + @Import("args0") void setArguments(Object[] args); - @Import("source") + @Import("widget") Widget getSource(); - @Import("op") + @Import("opIndex") int getOp(); - @Import("opbase") + @Import("targetName") String getOpbase(); } diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSSequence.java b/runescape-api/src/main/java/net/runelite/rs/api/RSSequence.java deleted file mode 100644 index 0bea230793..0000000000 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSSequence.java +++ /dev/null @@ -1,51 +0,0 @@ -/* - * Copyright (c) 2016-2017, Adam - * 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.rs.api; - -import net.runelite.mapping.Import; - -public interface RSSequence -{ - @Import("stretches") - boolean getStretches(); - - @Import("maxLoops") - int getMaxLoops(); - - @Import("precedenceAnimating") - int getPrecedenceAnimating(); - - @Import("replyMode") - int getReplyMode(); - - @Import("interleaveLeave") - int[] getInterleaveLeave(); - - @Import("frameIDs") - int[] getFrameIDs(); - - @Import("frameLengths") - int[] getFrameLenths(); -} diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSSequenceDefinition.java b/runescape-api/src/main/java/net/runelite/rs/api/RSSequenceDefinition.java new file mode 100644 index 0000000000..97c8d9a91a --- /dev/null +++ b/runescape-api/src/main/java/net/runelite/rs/api/RSSequenceDefinition.java @@ -0,0 +1,27 @@ +package net.runelite.rs.api; + +import net.runelite.mapping.Import; + +public interface RSSequenceDefinition +{ +// @Import("stretches") +// boolean getStretches(); +// +// @Import("maxLoops") +// int getMaxLoops(); +// +// @Import("precedenceAnimating") --- All unused +// int getPrecedenceAnimating(); +// +// @Import("replyMode") +// int getReplyMode(); +// +// @Import("interleaveLeave") +// int[] getInterleaveLeave(); + + @Import("frameIds") + int[] getFrameIDs(); + + @Import("frameLengths") + int[] getFrameLenths(); +} diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSFrameMap.java b/runescape-api/src/main/java/net/runelite/rs/api/RSSkeleton.java similarity index 94% rename from runescape-api/src/main/java/net/runelite/rs/api/RSFrameMap.java rename to runescape-api/src/main/java/net/runelite/rs/api/RSSkeleton.java index 215f3be17b..9ed93c5c43 100644 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSFrameMap.java +++ b/runescape-api/src/main/java/net/runelite/rs/api/RSSkeleton.java @@ -26,14 +26,14 @@ package net.runelite.rs.api; import net.runelite.mapping.Import; -public interface RSFrameMap extends RSNode +public interface RSSkeleton extends RSNode { @Import("count") int getCount(); - @Import("types") + @Import("transformTypes") int[] getTypes(); - @Import("list") + @Import("labels") int[][] getList(); } diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSSoundEffect.java b/runescape-api/src/main/java/net/runelite/rs/api/RSSoundEffect.java index 4ced2f19d5..027828e79a 100644 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSSoundEffect.java +++ b/runescape-api/src/main/java/net/runelite/rs/api/RSSoundEffect.java @@ -1,27 +1,3 @@ -/* - * Copyright (c) 2018, SomeoneWithAnInternetConnection - * 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.rs.api; public interface RSSoundEffect diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSSprite.java b/runescape-api/src/main/java/net/runelite/rs/api/RSSprite.java index 6f6cd9b67c..272bdd09a8 100644 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSSprite.java +++ b/runescape-api/src/main/java/net/runelite/rs/api/RSSprite.java @@ -1,29 +1,38 @@ -/* - * Copyright (c) 2016-2017, Adam - * 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.rs.api; -public interface RSSprite +import net.runelite.api.Sprite; +import net.runelite.mapping.Import; + +public interface RSSprite extends Sprite { + @Import("drawAt") + @Override + void drawAt(int x, int y); + + @Import("subHeight") + @Override + int getHeight(); + + @Import("subWidth") + @Override + int getWidth(); + + @Import("pixels") + @Override + int[] getPixels(); + + @Import("setRaster") + void setRaster(); + + @Import("width") + void setMaxWidth(int maxWidth); + + @Import("height") + void setMaxHeight(int maxHeight); + + @Import("xOffset") + void setOffsetX(int offsetX); + + @Import("yOffset") + void setOffsetY(int offsetY); } diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSSpritePixels.java b/runescape-api/src/main/java/net/runelite/rs/api/RSSpritePixels.java deleted file mode 100644 index f69f90ed35..0000000000 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSSpritePixels.java +++ /dev/null @@ -1,62 +0,0 @@ -/* - * Copyright (c) 2016-2017, Adam - * 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.rs.api; - -import net.runelite.api.SpritePixels; -import net.runelite.mapping.Import; - -public interface RSSpritePixels extends SpritePixels -{ - @Import("drawAt") - @Override - void drawAt(int x, int y); - - @Import("height") - @Override - int getHeight(); - - @Import("width") - @Override - int getWidth(); - - @Import("pixels") - @Override - int[] getPixels(); - - @Import("setRaster") - void setRaster(); - - @Import("maxWidth") - void setMaxWidth(int maxWidth); - - @Import("maxHeight") - void setMaxHeight(int maxHeight); - - @Import("offsetX") - void setOffsetX(int offsetX); - - @Import("offsetY") - void setOffsetY(int offsetY); -} diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSTexture.java b/runescape-api/src/main/java/net/runelite/rs/api/RSTexture.java index 60cbe94b03..c3171219dd 100644 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSTexture.java +++ b/runescape-api/src/main/java/net/runelite/rs/api/RSTexture.java @@ -1,27 +1,3 @@ -/* - * Copyright (c) 2018, Adam - * 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.rs.api; import net.runelite.api.Texture; @@ -41,7 +17,7 @@ public interface RSTexture extends Texture, RSNode @Override int getAnimationSpeed(); - @Import("loaded") + @Import("isLoaded") @Override boolean isLoaded(); } diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSTextureProvider.java b/runescape-api/src/main/java/net/runelite/rs/api/RSTextureProvider.java index 2651367376..f39ac5085d 100644 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSTextureProvider.java +++ b/runescape-api/src/main/java/net/runelite/rs/api/RSTextureProvider.java @@ -1,27 +1,3 @@ -/* - * Copyright (c) 2018, Tomas Slusny - * 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.rs.api; import net.runelite.api.TextureProvider; @@ -29,7 +5,7 @@ import net.runelite.mapping.Import; public interface RSTextureProvider extends TextureProvider { - @Import("brightness") + @Import("brightness0") @Override double getBrightness(); @@ -37,10 +13,10 @@ public interface RSTextureProvider extends TextureProvider @Override void setBrightness(double brightness); - @Import("maxSize") + @Import("capacity") void setMaxSize(int maxSize); - @Import("size") + @Import("remaining") void setSize(int size); @Import("textures") diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSTile.java b/runescape-api/src/main/java/net/runelite/rs/api/RSTile.java index 30a81196a5..0e803b8327 100644 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSTile.java +++ b/runescape-api/src/main/java/net/runelite/rs/api/RSTile.java @@ -1,27 +1,3 @@ -/* - * Copyright (c) 2016-2017, Adam - * 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.rs.api; import net.runelite.api.DecorativeObject; @@ -36,23 +12,23 @@ import net.runelite.mapping.Import; public interface RSTile extends Tile { - @Import("objects") + @Import("gameObjects") @Override GameObject[] getGameObjects(); - @Import("itemLayer") + @Import("groundItemPile") @Override ItemLayer getItemLayer(); - @Import("decorativeObject") + @Import("wallDecoration") @Override DecorativeObject getDecorativeObject(); - @Import("groundObject") + @Import("floorDecoration") @Override GroundObject getGroundObject(); - @Import("wallObject") + @Import("boundaryObject") @Override WallObject getWallObject(); @@ -60,7 +36,7 @@ public interface RSTile extends Tile @Override SceneTilePaint getSceneTilePaint(); - @Import("overlay") + @Import("model") @Override SceneTileModel getSceneTileModel(); @@ -74,35 +50,35 @@ public interface RSTile extends Tile @Override int getPlane(); - @Import("renderLevel") + @Import("originalPlane") @Override int getRenderLevel(); - @Import("physicalLevel") + @Import("minPlane") int getPhysicalLevel(); - @Import("flags") - int getFlags(); + //@Import("flags") + //int getFlags(); ---- unused, think it's gameobjectedgemask - @Import("bridge") + @Import("linkedBelowTile") @Override RSTile getBridge(); - @Import("draw") + @Import("drawPrimary") boolean isDraw(); - @Import("draw") + @Import("drawPrimary") void setDraw(boolean draw); - @Import("visible") + @Import("drawSecondary") boolean isVisible(); - @Import("visible") + @Import("drawSecondary") void setVisible(boolean visible); - @Import("drawEntities") + @Import("drawGameObjects") void setDrawEntities(boolean drawEntities); - @Import("wallCullDirection") + @Import("drawGameObjectEdges") void setWallCullDirection(int wallCullDirection); } diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSTileModel.java b/runescape-api/src/main/java/net/runelite/rs/api/RSTileModel.java new file mode 100644 index 0000000000..616380d9dc --- /dev/null +++ b/runescape-api/src/main/java/net/runelite/rs/api/RSTileModel.java @@ -0,0 +1,63 @@ +package net.runelite.rs.api; + +import net.runelite.api.SceneTileModel; +import net.runelite.mapping.Import; + +public interface RSTileModel extends SceneTileModel +{ + @Import("underlayRgb") + @Override + int getModelUnderlay(); + + @Import("overlayRgb") + @Override + int getModelOverlay(); + + @Import("shape") + @Override + int getShape(); + + @Import("rotation") + @Override + int getRotation(); + + @Import("faceX") + @Override + int[] getFaceX(); + + @Import("faceY") + @Override + int[] getFaceY(); + + @Import("faceZ") + @Override + int[] getFaceZ(); + + @Import("vertexX") + @Override + int[] getVertexX(); + + @Import("vertexY") + @Override + int[] getVertexY(); + + @Import("vertexZ") + @Override + int[] getVertexZ(); + + @Import("triangleColorA") + @Override + int[] getTriangleColorA(); + + @Import("triangleColorB") + @Override + int[] getTriangleColorB(); + + @Import("triangleColorC") + @Override + int[] getTriangleColorC(); + + @Import("triangleTextureId") + @Override + int[] getTriangleTextureId(); +} diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSTilePaint.java b/runescape-api/src/main/java/net/runelite/rs/api/RSTilePaint.java new file mode 100644 index 0000000000..46588a2561 --- /dev/null +++ b/runescape-api/src/main/java/net/runelite/rs/api/RSTilePaint.java @@ -0,0 +1,31 @@ +package net.runelite.rs.api; + +import net.runelite.api.SceneTilePaint; +import net.runelite.mapping.Import; + +public interface RSTilePaint extends SceneTilePaint +{ + @Import("rgb") + @Override + int getRBG(); + + @Import("swColor") + @Override + int getSwColor(); + + @Import("seColor") + @Override + int getSeColor(); + + @Import("nwColor") + @Override + int getNwColor(); + + @Import("neColor") + @Override + int getNeColor(); + + @Import("texture") + @Override + int getTexture(); +} diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSUser.java b/runescape-api/src/main/java/net/runelite/rs/api/RSUser.java new file mode 100644 index 0000000000..798e7a8aa8 --- /dev/null +++ b/runescape-api/src/main/java/net/runelite/rs/api/RSUser.java @@ -0,0 +1,13 @@ +package net.runelite.rs.api; + +import net.runelite.api.Nameable; +import net.runelite.mapping.Import; + +public interface RSUser extends Nameable, Comparable +{ + @Import("username") + RSUsername getRsName(); + + @Import("previousUsername") + RSUsername getRsPrevName(); +} diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSUserList.java b/runescape-api/src/main/java/net/runelite/rs/api/RSUserList.java new file mode 100644 index 0000000000..b530f68019 --- /dev/null +++ b/runescape-api/src/main/java/net/runelite/rs/api/RSUserList.java @@ -0,0 +1,31 @@ +package net.runelite.rs.api; + +import net.runelite.mapping.Import; + +public interface RSUserList +{ + @Import("size0") + int getCount(); + + @Import("array") + T[] getNameables(); + + @Import("contains") + boolean isMember(RSUsername var1); + + @Import("getByUsername") + T findByName(RSUsername name); + + /** + * Method called by the container when an element is added + * @param name + * @param prevName + */ + void rl$add(RSUsername name, RSUsername prevName); + + /** + * Method called by the container when an element is removed + * @param nameable + */ + void rl$remove(RSUser nameable); +} diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSName.java b/runescape-api/src/main/java/net/runelite/rs/api/RSUsername.java similarity index 95% rename from runescape-api/src/main/java/net/runelite/rs/api/RSName.java rename to runescape-api/src/main/java/net/runelite/rs/api/RSUsername.java index 4b2c83abfe..52d1a14802 100644 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSName.java +++ b/runescape-api/src/main/java/net/runelite/rs/api/RSUsername.java @@ -26,8 +26,8 @@ package net.runelite.rs.api; import net.runelite.mapping.Import; -public interface RSName extends Comparable +public interface RSUsername extends Comparable { - @Import("name") + @Import("getName") String getName(); } diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSVarbit.java b/runescape-api/src/main/java/net/runelite/rs/api/RSVarbit.java deleted file mode 100644 index 94990d561e..0000000000 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSVarbit.java +++ /dev/null @@ -1,39 +0,0 @@ -/* - * Copyright (c) 2018, Adam - * 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.rs.api; - -import net.runelite.mapping.Import; - -public interface RSVarbit extends RSCacheableNode -{ - @Import("configId") - int getIndex(); - - @Import("leastSignificantBit") - int getLeastSignificantBit(); - - @Import("mostSignificantBit") - int getMostSignificantBit(); -} diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSVarbitDefinition.java b/runescape-api/src/main/java/net/runelite/rs/api/RSVarbitDefinition.java new file mode 100644 index 0000000000..2624226dd5 --- /dev/null +++ b/runescape-api/src/main/java/net/runelite/rs/api/RSVarbitDefinition.java @@ -0,0 +1,15 @@ +package net.runelite.rs.api; + +import net.runelite.mapping.Import; + +public interface RSVarbitDefinition extends RSDualNode +{ + @Import("varp") + int getIndex(); + + @Import("lowBit") + int getLeastSignificantBit(); + + @Import("highBit") + int getMostSignificantBit(); +} diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSVarcs.java b/runescape-api/src/main/java/net/runelite/rs/api/RSVarcs.java index 527377ae7b..8fbd54e337 100644 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSVarcs.java +++ b/runescape-api/src/main/java/net/runelite/rs/api/RSVarcs.java @@ -1,27 +1,3 @@ -/* - * Copyright (c) 2018, Tomas Slusny - * 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.rs.api; import java.util.Map; @@ -29,6 +5,6 @@ import net.runelite.mapping.Import; public interface RSVarcs { - @Import("varcMap") + @Import("map") Map getVarcMap(); } diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSWallDecoration.java b/runescape-api/src/main/java/net/runelite/rs/api/RSWallDecoration.java new file mode 100644 index 0000000000..32509b1183 --- /dev/null +++ b/runescape-api/src/main/java/net/runelite/rs/api/RSWallDecoration.java @@ -0,0 +1,36 @@ +package net.runelite.rs.api; + +import net.runelite.api.DecorativeObject; +import net.runelite.mapping.Import; + +public interface RSWallDecoration extends DecorativeObject +{ + @Import("tag") + @Override + long getHash(); + + @Import("x") + int getX(); + + @Import("y") + int getY(); + + @Import("xOffset") + int getXOffset(); + + @Import("yOffset") + int getYOffset(); + + @Import("orientation") + int getOrientation(); + + @Import("entity1") + @Override + RSEntity getRenderable(); + + @Import("entity2") + @Override + RSEntity getRenderable2(); + + void setPlane(int plane); +} diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSWallObject.java b/runescape-api/src/main/java/net/runelite/rs/api/RSWallObject.java deleted file mode 100644 index 1406f49e5d..0000000000 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSWallObject.java +++ /dev/null @@ -1,65 +0,0 @@ -/* - * Copyright (c) 2017, Adam - * 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.rs.api; - -import net.runelite.api.WallObject; -import net.runelite.mapping.Import; - -public interface RSWallObject extends WallObject -{ - @Import("hash") - @Override - long getHash(); - - @Import("x") - @Override - int getX(); - - @Import("y") - @Override - int getY(); - - @Import("orientationA") - @Override - int getOrientationA(); - - @Import("orientationB") - @Override - int getOrientationB(); - - @Import("renderable1") - @Override - RSRenderable getRenderable1(); - - @Import("renderable2") - @Override - RSRenderable getRenderable2(); - - @Import("config") - @Override - int getConfig(); - - void setPlane(int plane); -} diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSWidget.java b/runescape-api/src/main/java/net/runelite/rs/api/RSWidget.java index 0dd5b24d4f..527e50b0e3 100644 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSWidget.java +++ b/runescape-api/src/main/java/net/runelite/rs/api/RSWidget.java @@ -1,27 +1,31 @@ /* - * Copyright (c) 2016-2017, Adam + * BSD 2-Clause License + * + * Copyright (c) 2019, ThatGamerBlue * 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. + * Redistributions of source code must retain the above copyright notice, this + * list of conditions and the following disclaimer. * - * 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. + * 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 HOLDER 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.rs.api; import net.runelite.api.widgets.Widget; @@ -62,8 +66,8 @@ public interface RSWidget extends Widget @Import("clickMask") void setClickMask(int mask); - @Import("boundsIndex") - int getBoundsIndex(); + //@Import("boundsIndex") -- unused for now + //int getBoundsIndex(); @Import("modelId") @Override @@ -85,45 +89,45 @@ public interface RSWidget extends Widget @Import("text") String getRSText(); - @Import("name") + @Import("dataText") String getRSName(); - @Import("name") + @Import("dataText") void setRSName(String name); @Import("text") @Override void setText(String text); - @Import("textColor") + @Import("color") @Override int getTextColor(); - @Import("textColor") + @Import("color") @Override void setTextColor(int textColor); - @Import("opacity") + @Import("transparency") @Override int getOpacity(); - @Import("opacity") + @Import("transparency") @Override void setOpacity(int opacity); - @Import("relativeX") + @Import("x") @Override int getRelativeX(); - @Import("relativeX") + @Import("x") @Override void setRelativeX(int x); - @Import("relativeY") + @Import("y") @Override int getRelativeY(); - @Import("relativeY") + @Import("y") @Override void setRelativeY(int y); @@ -150,20 +154,20 @@ public interface RSWidget extends Widget @Import("isHidden") void setHidden(boolean hidden); - @Import("index") + @Import("childIndex") int getIndex(); - @Import("index") + @Import("childIndex") void setIndex(int index); - @Import("rotationX") - int getRotationX(); + //@Import("rotationX") + //int getRotationX(); - @Import("rotationY") - int getRotationY(); + //@Import("rotationY") --- All unused + //int getRotationY(); - @Import("rotationZ") - int getRotationZ(); + //@Import("rotationZ") + //int getRotationZ(); @Import("contentType") @Override @@ -221,11 +225,11 @@ public interface RSWidget extends Widget @Override void setSpriteId(int spriteId); - @Import("borderType") + @Import("outline") @Override int getBorderType(); - @Import("borderType") + @Import("outline") @Override void setBorderType(int type); @@ -245,47 +249,47 @@ public interface RSWidget extends Widget @Override void setItemQuantity(int quantity); - @Import("originalX") + @Import("rawX") @Override int getOriginalX(); - @Import("originalX") + @Import("rawX") @Override void setOriginalX(int originalX); - @Import("originalY") + @Import("rawY") @Override int getOriginalY(); - @Import("originalY") + @Import("rawY") @Override void setOriginalY(int originalY); - @Import("originalHeight") + @Import("rawHeight") @Override int getOriginalHeight(); - @Import("originalHeight") + @Import("rawHeight") @Override void setOriginalHeight(int originalHeight); - @Import("originalWidth") + @Import("rawWidth") @Override int getOriginalWidth(); - @Import("originalWidth") + @Import("rawWidth") @Override void setOriginalWidth(int originalWidth); - @Import("xPitch") + @Import("paddingX") int getXPitch(); - @Import("yPitch") + @Import("paddingY") int getYPitch(); void broadcastHidden(boolean hidden); - @Import("onOpListener") + @Import("onOp") @Override void setOnOpListener(Object... args); @@ -312,7 +316,7 @@ public interface RSWidget extends Widget @Override Object[] getOnKeyListener(); - @Import("onLoadListener") + @Import("onLoad") @Override Object[] getOnLoadListener(); @@ -324,27 +328,27 @@ public interface RSWidget extends Widget @Override void setOnKeyListener(Object... args); - @Import("onMouseOverListener") + @Import("onMouseOver") @Override void setOnMouseOverListener(Object... args); - @Import("onMouseRepeatListener") + @Import("onMouseRepeat") @Override void setOnMouseRepeatListener(Object... args); - @Import("onMouseLeaveListener") + @Import("onMouseLeave") @Override void setOnMouseLeaveListener(Object... args); - @Import("onTimerListener") + @Import("onTimer") @Override void setOnTimerListener(Object... args); - @Import("onTargetEnterListener") + @Import("onTargetEnter") @Override void setOnTargetEnterListener(Object... args); - @Import("onTargetLeaveListener") + @Import("onTargetLeave") @Override void setOnTargetLeaveListener(Object... args); @@ -364,19 +368,19 @@ public interface RSWidget extends Widget @Override void setTextShadowed(boolean shadowed); - @Import("dragDeadZone") + @Import("dragZoneSize") @Override int getDragDeadZone(); - @Import("dragDeadZone") + @Import("dragZoneSize") @Override void setDragDeadZone(int deadZone); - @Import("dragDeadTime") + @Import("dragThreshold") @Override int getDragDeadTime(); - @Import("dragDeadTime") + @Import("dragThreshold") @Override void setDragDeadTime(int deadTime); @@ -388,71 +392,71 @@ public interface RSWidget extends Widget @Override void setItemQuantityMode(int itemQuantityMode); - @Import("xPositionMode") + @Import("xAlignment") @Override int getXPositionMode(); - @Import("xPositionMode") + @Import("xAlignment") @Override void setXPositionMode(int xpm); - @Import("yPositionMode") + @Import("yAlignment") @Override int getYPositionMode(); - @Import("yPositionMode") + @Import("yAlignment") @Override void setYPositionMode(int ypm); - @Import("xTextAlignment") + @Import("textXAlignment") @Override int getXTextAlignment(); - @Import("xTextAlignment") + @Import("textXAlignment") @Override void setXTextAlignment(int xta); - @Import("yTextAlignment") + @Import("textYAlignment") @Override int getYTextAlignment(); - @Import("yTextAlignment") + @Import("textYAlignment") @Override void setYTextAlignment(int yta); - @Import("widthMode") + @Import("widthAlignment") @Override int getWidthMode(); - @Import("widthMode") + @Import("widthAlignment") @Override void setWidthMode(int widthMode); - - @Import("heightMode") + + @Import("heightAlignment") @Override int getHeightMode(); - @Import("heightMode") + @Import("heightAlignment") @Override void setHeightMode(int heightMode); @Import("getFont") @Override - RSFontTypeFace getFont(); + RSAbstractFont getFont(); - @Import("filled") + @Import("fill") @Override boolean isFilled(); - @Import("filled") + @Import("fill") @Override void setFilled(boolean filled); - @Import("targetVerb") + @Import("spellActionName") @Override String getTargetVerb(); - @Import("targetVerb") + @Import("spellActionName") @Override void setTargetVerb(String targetVerb); diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSWidgetGroupParent.java b/runescape-api/src/main/java/net/runelite/rs/api/RSWidgetGroupParent.java new file mode 100644 index 0000000000..34c867e031 --- /dev/null +++ b/runescape-api/src/main/java/net/runelite/rs/api/RSWidgetGroupParent.java @@ -0,0 +1,11 @@ +package net.runelite.rs.api; + +import net.runelite.api.WidgetNode; +import net.runelite.mapping.Import; + +public interface RSWidgetGroupParent extends RSNode, WidgetNode +{ + @Import("group") + @Override + int getId(); +} diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSWidgetNode.java b/runescape-api/src/main/java/net/runelite/rs/api/RSWidgetNode.java deleted file mode 100644 index 9c08a5a977..0000000000 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSWidgetNode.java +++ /dev/null @@ -1,35 +0,0 @@ -/* - * Copyright (c) 2016-2017, Adam - * 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.rs.api; - -import net.runelite.api.WidgetNode; -import net.runelite.mapping.Import; - -public interface RSWidgetNode extends RSNode, WidgetNode -{ - @Import("id") - @Override - int getId(); -} diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSWorld.java b/runescape-api/src/main/java/net/runelite/rs/api/RSWorld.java index 2a4a8c4925..ecd6aa2278 100644 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSWorld.java +++ b/runescape-api/src/main/java/net/runelite/rs/api/RSWorld.java @@ -1,27 +1,3 @@ -/* - * Copyright (c) 2016-2017, Adam - * 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.rs.api; import net.runelite.api.World; @@ -29,17 +5,17 @@ import net.runelite.mapping.Import; public interface RSWorld extends World { - @Import("mask") + @Import("properties") int getMask(); - @Import("mask") + @Import("properties") void setMask(int mask); - @Import("playerCount") + @Import("population") @Override int getPlayerCount(); - @Import("playerCount") + @Import("population") @Override void setPlayerCount(int playerCount); @@ -75,11 +51,11 @@ public interface RSWorld extends World @Override void setActivity(String activity); - @Import("address") + @Import("host") @Override String getAddress(); - @Import("address") + @Import("host") @Override void setAddress(String address); } diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSWorldMap.java b/runescape-api/src/main/java/net/runelite/rs/api/RSWorldMap.java new file mode 100644 index 0000000000..ae6b8a4365 --- /dev/null +++ b/runescape-api/src/main/java/net/runelite/rs/api/RSWorldMap.java @@ -0,0 +1,53 @@ +package net.runelite.rs.api; + +import net.runelite.api.RenderOverview; +import net.runelite.api.WorldMapData; +import net.runelite.mapping.Import; + +public interface RSWorldMap extends RenderOverview +{ + @Import("worldMapX") + int getWorldMapX(); + + @Import("worldMapY") + int getWorldMapY(); + + @Import("zoomTarget") + float getWorldMapZoom(); + + @Import("worldMapTargetX") + int getWorldMapTargetX(); + + @Import("worldMapTargetY") + int getWorldMapTargetY(); + + //@Import("worldMapDisplayWidth") + //int getWorldMapDisplayWidth(); +//Both unused + //@Import("worldMapDisplayHeight") + //int getWorldMapDisplayHeight(); + + //@Import("worldMapDisplayX") + //int getWorldMapDisplayX(); + + //@Import("worldMapDisplayY") + //int getWorldMapDisplayY(); + + @Import("setWorldMapPosition") + void setWorldMapPosition(int worldMapX, int worldMapY, boolean changedSurface); + + @Import("setWorldMapPositionTarget") + void setWorldMapPositionTarget(int worldPointX, int worldPointY); + + @Import("worldMapManager") + @Override + RSWorldMapManager getWorldMapManager(); + + @Import("initializeWorldMap") + @Override + void initializeWorldMap(WorldMapData var1); + + @Import("mainMapArea") + @Override + RSWorldMapArea getWorldMapData(); +} diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSWorldMapArea.java b/runescape-api/src/main/java/net/runelite/rs/api/RSWorldMapArea.java new file mode 100644 index 0000000000..75f5079120 --- /dev/null +++ b/runescape-api/src/main/java/net/runelite/rs/api/RSWorldMapArea.java @@ -0,0 +1,10 @@ +package net.runelite.rs.api; + +import net.runelite.api.WorldMapData; +import net.runelite.mapping.Import; + +public interface RSWorldMapArea extends WorldMapData +{ + @Import("containsPosition") + boolean surfaceContainsPosition(int x, int y); +} diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSWorldMapData.java b/runescape-api/src/main/java/net/runelite/rs/api/RSWorldMapData.java deleted file mode 100644 index 5638d6813c..0000000000 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSWorldMapData.java +++ /dev/null @@ -1,34 +0,0 @@ -/* - * Copyright (c) 2018, Adam - * 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.rs.api; - -import net.runelite.api.WorldMapData; -import net.runelite.mapping.Import; - -public interface RSWorldMapData extends WorldMapData -{ - @Import("surfaceContainsPosition") - boolean surfaceContainsPosition(int x, int y); -} diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSWorldMapElement.java b/runescape-api/src/main/java/net/runelite/rs/api/RSWorldMapElement.java new file mode 100644 index 0000000000..f627dd8a63 --- /dev/null +++ b/runescape-api/src/main/java/net/runelite/rs/api/RSWorldMapElement.java @@ -0,0 +1,11 @@ +package net.runelite.rs.api; + +import net.runelite.api.MapElementConfig; +import net.runelite.mapping.Import; + +public interface RSWorldMapElement extends RSDualNode, MapElementConfig +{ + @Import("getSprite") + @Override + RSSprite getMapIcon(boolean var1); +} diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSWorldMapManager.java b/runescape-api/src/main/java/net/runelite/rs/api/RSWorldMapManager.java index 60377bc659..9a534ce187 100644 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSWorldMapManager.java +++ b/runescape-api/src/main/java/net/runelite/rs/api/RSWorldMapManager.java @@ -1,27 +1,3 @@ -/* - * Copyright (c) 2018, Adam - * 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.rs.api; import net.runelite.api.WorldMapManager; @@ -29,14 +5,14 @@ import net.runelite.mapping.Import; public interface RSWorldMapManager extends WorldMapManager { - @Import("loaded") + @Import("isLoaded0") @Override boolean isLoaded(); - @Import("mapSurfaceBaseOffsetX") + @Import("surfaceOffsetX") int getSurfaceOffsetX(); - @Import("mapSurfaceBaseOffsetY") + @Import("surfaceOffsetY") int getSurfaceOffsetY(); @Import("getPixelsPerTile")