RSApi

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);
+}

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);
+}

runescape-api/src/main/java/net/runelite/rs/api/RSAbstractRasterProvider.java

@@ -0,0 +1,50 @@
+/*
+ * BSD 2-Clause License
+ *
+ * Copyright (c) 2019, ThatGamerBlue <thatgamerblue@gmail.com>
+ * 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();
+}

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")
+	@Import("sequenceFrameCycle")
-	RSCombatInfoList getCombatInfoList();
+	@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")
+	// Health stuff
-	@Override
-	int getLogicalHeight();
 
-	@Import("idlePoseAnimation")
+	@Import("healthBars")
-	@Override
+	RSIterableNodeDeque getHealthBars();
-	void setIdlePoseAnimation(int animation);
 
-	@Import("poseAnimation")
+	@Import("hitSplatValues")
-	@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")
 	int[] getHitsplatValues();
 
-	@Import("hitsplatTypes")
+	@Import("hitSplatTypes")
 	int[] getHitsplatTypes();
 
-	@Import("hitsplatCycles")
+	@Import("hitSplatCycles")
 	int[] getHitsplatCycles();
 }

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")
+	@Import("skeleton")
-	RSFrameMap getSkin();
+	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();
 }

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);
+}

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();
+}

runescape-api/src/main/java/net/runelite/rs/api/RSBuffer.java

@@ -1,36 +1,12 @@
-/*
- * Copyright (c) 2016-2017, Adam <Adam@sigterm.info>
- * 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();
 }

runescape-api/src/main/java/net/runelite/rs/api/RSBufferProvider.java

@@ -1,46 +0,0 @@
-/*
- * Copyright (c) 2017, Adam <Adam@sigterm.info>
- * 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();
-}

runescape-api/src/main/java/net/runelite/rs/api/RSCanvas.java

@@ -0,0 +1,5 @@
+package net.runelite.rs.api;
+
+public interface RSCanvas
+{
+}

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);
+}

runescape-api/src/main/java/net/runelite/rs/api/RSChatLineBuffer.java

@@ -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);
-}

runescape-api/src/main/java/net/runelite/rs/api/RSChatPlayer.java

@@ -1,38 +0,0 @@
-/*
- * Copyright (c) 2016-2018, Adam <Adam@sigterm.info>
- * 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();
-}

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<RSClanMate>
+{
+	@Import("owner")
+	String getClanOwner();
+
+	@Import("name")
+	String getClanChatName();
+}

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
+{
+}

runescape-api/src/main/java/net/runelite/rs/api/RSClanMember.java

@@ -1,31 +0,0 @@
-/*
- * Copyright (c) 2016-2017, Adam <Adam@sigterm.info>
- * 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
-{
-}

runescape-api/src/main/java/net/runelite/rs/api/RSClanMemberManager.java

@@ -1,36 +0,0 @@
-/*
- * Copyright (c) 2018, Adam <Adam@sigterm.info>
- * 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<RSClanMember>
-{
-	@Import("clanOwner")
-	String getClanOwner();
-
-	@Import("clanChatName")
-	String getClanChatName();
-}

runescape-api/src/main/java/net/runelite/rs/api/RSClassInfo.java

@@ -1,41 +0,0 @@
-/*
- * Copyright (c) 2016-2017, Adam <Adam@sigterm.info>
- * 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();
-}

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);
+}

runescape-api/src/main/java/net/runelite/rs/api/RSCollisionData.java

@@ -1,34 +0,0 @@
-/*
- * Copyright (c) 2016-2017, Adam <Adam@sigterm.info>
- * 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();
-}

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();
+}

runescape-api/src/main/java/net/runelite/rs/api/RSCombatInfo1.java

@@ -1,36 +0,0 @@
-/*
- * Copyright (c) 2016-2017, Adam <Adam@sigterm.info>
- * 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();
-}

runescape-api/src/main/java/net/runelite/rs/api/RSCombatInfoList.java

@@ -1,36 +0,0 @@
-/*
- * Copyright (c) 2016-2017, Adam <Adam@sigterm.info>
- * 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();
-}

runescape-api/src/main/java/net/runelite/rs/api/RSCombatInfoListHolder.java

@@ -1,36 +0,0 @@
-/*
- * Copyright (c) 2016-2017, Adam <Adam@sigterm.info>
- * 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();
-}

runescape-api/src/main/java/net/runelite/rs/api/RSDecorativeObject.java

@@ -1,60 +0,0 @@
-/*
- * Copyright (c) 2017, Adam <Adam@sigterm.info>
- * 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);
-}

runescape-api/src/main/java/net/runelite/rs/api/RSDeque.java

@@ -1,36 +0,0 @@
-/*
- * Copyright (c) 2016-2017, Adam <Adam@sigterm.info>
- * 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();
-}

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();
 }

runescape-api/src/main/java/net/runelite/rs/api/RSDynamicObject.java

@@ -1,43 +1,19 @@
-/*
- * Copyright (c) 2018, Adam <Adam@sigterm.info>
- * 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();
 }

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);
 }

runescape-api/src/main/java/net/runelite/rs/api/RSEnum.java

@@ -1,49 +0,0 @@
-/*
- * Copyright (c) 2019, Adam <Adam@sigterm.info>
- * 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();
-}

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();
+}

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);
+}

runescape-api/src/main/java/net/runelite/rs/api/RSFileOnDisk.java

@@ -1,27 +1,3 @@
-/*
- * Copyright (c) 2016-2017, Adam <Adam@sigterm.info>
- * 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();
 }

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);
+}

runescape-api/src/main/java/net/runelite/rs/api/RSFont.java

@@ -1,30 +1,5 @@
-/*
- * Copyright (c) 2019, Ron Young <https://github.com/raiyni>
- * 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
 {
 }

runescape-api/src/main/java/net/runelite/rs/api/RSFontTypeFace.java

@@ -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);
-}

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")
+	@Import("frames")
-	RSFrame[] getFrames();
+	RSAnimation[] getFrames();
 }

runescape-api/src/main/java/net/runelite/rs/api/RSFriend.java

@@ -1,31 +1,7 @@
-/*
- * Copyright (c) 2016-2017, Adam <Adam@sigterm.info>
- * 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
 {
 }

runescape-api/src/main/java/net/runelite/rs/api/RSFriendContainer.java

@@ -1,29 +0,0 @@
-/*
- * Copyright (c) 2018, Adam <Adam@sigterm.info>
- * 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<RSFriend>
-{
-}

runescape-api/src/main/java/net/runelite/rs/api/RSFriendManager.java

@@ -1,40 +0,0 @@
-/*
- * Copyright (c) 2018, Adam <Adam@sigterm.info>
- * 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);
-}

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);
+}

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<RSFriend>
+{
+}

runescape-api/src/main/java/net/runelite/rs/api/RSGameCanvas.java

@@ -1,29 +0,0 @@
-/*
- * Copyright (c) 2016-2017, Adam <Adam@sigterm.info>
- * 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
-{
-}

runescape-api/src/main/java/net/runelite/rs/api/RSGameObject.java

@@ -1,27 +1,3 @@
-/*
- * Copyright (c) 2016-2017, Adam <Adam@sigterm.info>
- * 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")
+	@Import("entity")
-	RSRenderable getRenderable();
+	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();
 

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")

runescape-api/src/main/java/net/runelite/rs/api/RSGrandExchangeOffer.java

@@ -1,27 +1,3 @@
-/*
- * Copyright (c) 2016-2017, Adam <Adam@sigterm.info>
- * 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();
-
-
 }

runescape-api/src/main/java/net/runelite/rs/api/RSGraphicsObject.java

@@ -1,33 +1,9 @@
-/*
- * Copyright (c) 2018, Woox <https://github.com/wooxsolo>
- * 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();
 

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();
+}

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);
+}

runescape-api/src/main/java/net/runelite/rs/api/RSGroundObject.java

@@ -1,47 +0,0 @@
-/*
- * Copyright (c) 2017, Adam <Adam@sigterm.info>
- * 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);
-}

runescape-api/src/main/java/net/runelite/rs/api/RSHashTable.java

@@ -1,41 +0,0 @@
-/*
- * Copyright (c) 2016-2017, Adam <Adam@sigterm.info>
- * 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();
-}

runescape-api/src/main/java/net/runelite/rs/api/RSHealthBar.java

@@ -1,46 +1,12 @@
-/*
- * Copyright (c) 2016-2017, Adam <Adam@sigterm.info>
- * 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")
+	@Import("updates")
-	int getHealthScale();
+	RSIterableNodeDeque getUpdates(); // "combatinfolist" but only thing it has is getNode so this works
 
-	@Import("getHealthBarFrontSprite")
+	@Import("definition")
-	@Override
+	RSHealthBarDefinition getDefinition();
-	RSSpritePixels getHealthBarFrontSprite();
-
-	@Import("getHealthBarBackSprite")
-	@Override
-	RSSpritePixels getHealthBarBackSprite();
-
-	@Import("healthBarPadding")
-	@Override
-	void setPadding(int padding);
 }

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);
+}

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();
+}

runescape-api/src/main/java/net/runelite/rs/api/RSIgnore.java

@@ -1,31 +0,0 @@
-/*
- * Copyright (c) 2018, Adam <Adam@sigterm.info>
- * 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
-{
-}

runescape-api/src/main/java/net/runelite/rs/api/RSIgnoreContainer.java

@@ -1,29 +0,0 @@
-/*
- * Copyright (c) 2018, Adam <Adam@sigterm.info>
- * 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<RSIgnore>
-{
-}

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<RSIgnored>
+{
+}

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
+{
+}

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();
+}

runescape-api/src/main/java/net/runelite/rs/api/RSIndexData.java

@@ -1,33 +0,0 @@
-/*
- * Copyright (c) 2018, Adam <Adam@sigterm.info>
- * 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();
-}

runescape-api/src/main/java/net/runelite/rs/api/RSIndexDataBase.java

@@ -1,34 +0,0 @@
-/*
- * Copyright (c) 2018, Adam <Adam@sigterm.info>
- * 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);
-}

runescape-api/src/main/java/net/runelite/rs/api/RSIndexedSprite.java

@@ -1,27 +1,3 @@
-/*
- * Copyright (c) 2017, Adam <Adam@sigterm.info>
- * 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);
 }

runescape-api/src/main/java/net/runelite/rs/api/RSIntegerNode.java

@@ -1,27 +1,3 @@
-/*
- * Copyright (c) 2018, Adam <Adam@sigterm.info>
- * 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);
 }

runescape-api/src/main/java/net/runelite/rs/api/RSItem.java

@@ -1,60 +0,0 @@
-/*
- * Copyright (c) 2016-2017, Adam <Adam@sigterm.info>
- * 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();
-}

runescape-api/src/main/java/net/runelite/rs/api/RSItemComposition.java

@@ -1,92 +0,0 @@
-/*
- * Copyright (c) 2016-2017, Adam <Adam@sigterm.info>
- * 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}
-	 * <p>
-	 * This is the <b>{@code int}</b> 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();
-}

runescape-api/src/main/java/net/runelite/rs/api/RSItemContainer.java

@@ -1,27 +1,3 @@
-/*
- * Copyright (c) 2016-2017, Adam <Adam@sigterm.info>
- * 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();
 }

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}
+	 * <p>
+	 * This is the <b>{@code int}</b> 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();
+}

runescape-api/src/main/java/net/runelite/rs/api/RSItemLayer.java

@@ -1,58 +0,0 @@
-/*
- * Copyright (c) 2016-2017, Adam <Adam@sigterm.info>
- * 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);
-}

runescape-api/src/main/java/net/runelite/rs/api/RSIterableHashTable.java

@@ -1,35 +0,0 @@
-/*
- * Copyright (c) 2018, Adam <Adam@sigterm.info>
- * 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);
-}

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();
+}

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);
+}

runescape-api/src/main/java/net/runelite/rs/api/RSJagexLoginType.java

@@ -1,30 +0,0 @@
-/*
- * Copyright (c) 2018, Adam <Adam@sigterm.info>
- * 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
-{
-
-}

runescape-api/src/main/java/net/runelite/rs/api/RSKeyFocusListener.java

@@ -1,33 +0,0 @@
-/*
- * Copyright (c) 2018, Adam <Adam@sigterm.info>
- * 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
-{
-}

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
+{
+}

runescape-api/src/main/java/net/runelite/rs/api/RSLoginType.java

@@ -0,0 +1,5 @@
+package net.runelite.rs.api;
+
+public interface RSLoginType
+{
+}

runescape-api/src/main/java/net/runelite/rs/api/RSMainBufferProvider.java

@@ -1,43 +0,0 @@
-/*
- * Copyright (c) 2017, Adam <Adam@sigterm.info>
- * 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();
-}

runescape-api/src/main/java/net/runelite/rs/api/RSMapElementConfig.java

@@ -1,35 +0,0 @@
-/*
- * Copyright (c) 2017, Adam <Adam@sigterm.info>
- * 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);
-}

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);
+}

runescape-api/src/main/java/net/runelite/rs/api/RSMessageNode.java

@@ -1,62 +0,0 @@
-/*
- * Copyright (c) 2016-2017, Adam <Adam@sigterm.info>
- * 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);
-}

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")
+	@Import("isSingleTile")
-	boolean isClickable();
+	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,7 +153,7 @@ public interface RSModel extends RSRenderable, Model
 	@Override
 	short[] getFaceTextures();
 
-	@Import("XYZMag")
+	@Import("xzRadius")
 	@Override
 	int getXYZMag();
 

runescape-api/src/main/java/net/runelite/rs/api/RSModelData.java

@@ -1,52 +1,28 @@
-/*
- * Copyright (c) 2018, Adam <Adam@sigterm.info>
- * 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")

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
+{
+}

runescape-api/src/main/java/net/runelite/rs/api/RSMouseInput.java

@@ -1,33 +0,0 @@
-/*
- * Copyright (c) 2018, Adam <Adam@sigterm.info>
- * 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
-{
-}

runescape-api/src/main/java/net/runelite/rs/api/RSMouseRecorder.java

@@ -1,28 +1,3 @@
-/*
- *  Copyright (c) 2019, ThatGamerBlue <thatgamerblue@gmail.com>
- *  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,7 +5,6 @@ import net.runelite.mapping.Import;
 
 public interface RSMouseRecorder extends MouseRecorder
 {
-	
 	@Import("xs")
 	int[] getXs();
 
@@ -42,5 +16,4 @@ public interface RSMouseRecorder extends MouseRecorder
 
 	@Import("index")
 	int getIndex();
-	
 }

runescape-api/src/main/java/net/runelite/rs/api/RSMouseWheelHandler.java

@@ -1,27 +1,3 @@
-/*
- * Copyright (c) 2018, Adam <Adam@sigterm.info>
- * 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;

runescape-api/src/main/java/net/runelite/rs/api/RSNPC.java

@@ -1,27 +1,3 @@
-/*
- * Copyright (c) 2016-2017, Adam <Adam@sigterm.info>
- * 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();

runescape-api/src/main/java/net/runelite/rs/api/RSNPCComposition.java

@@ -1,78 +0,0 @@
-/*
- * Copyright (c) 2016-2017, Adam <Adam@sigterm.info>
- * 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();
-}

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();
+}

runescape-api/src/main/java/net/runelite/rs/api/RSNameable.java

@@ -1,37 +0,0 @@
-/*
- * Copyright (c) 2018, Adam <Adam@sigterm.info>
- * 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();
-}

runescape-api/src/main/java/net/runelite/rs/api/RSNameableContainer.java

@@ -1,55 +0,0 @@
-/*
- * Copyright (c) 2018, Adam <Adam@sigterm.info>
- * 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<T extends RSNameable>
-{
-	@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);
-}

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();
 
 	/**

runescape-api/src/main/java/net/runelite/rs/api/RSNodeCache.java

@@ -1,46 +0,0 @@
-/*
- * Copyright (c) 2018, Adam <Adam@sigterm.info>
- * 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);
-}

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();
+}

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();
+}

runescape-api/src/main/java/net/runelite/rs/api/RSObjectComposition.java

@@ -1,59 +0,0 @@
-/*
- * Copyright (c) 2016-2017, Adam <Adam@sigterm.info>
- * 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();
-}

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();
+}

runescape-api/src/main/java/net/runelite/rs/api/RSPacketBuffer.java

@@ -1,27 +1,3 @@
-/*
- * Copyright (c) 2017, Adam <Adam@sigterm.info>
- * 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;

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")
+	@Import("username")
-	RSName getRsName();
+	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();
 }

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();
+}