diff --git a/runelite-api/src/main/java/net/runelite/api/Animation.java b/runelite-api/src/main/java/net/runelite/api/Animation.java index 77c8a8af2e..972ed7f3cb 100644 --- a/runelite-api/src/main/java/net/runelite/api/Animation.java +++ b/runelite-api/src/main/java/net/runelite/api/Animation.java @@ -29,4 +29,10 @@ package net.runelite.api; */ public interface Animation { + /** + * Get the id for this animation + * @see AnimationID + * @return + */ + int getId(); } diff --git a/runelite-api/src/main/java/net/runelite/api/DynamicObject.java b/runelite-api/src/main/java/net/runelite/api/DynamicObject.java new file mode 100644 index 0000000000..cd3a9c1fb7 --- /dev/null +++ b/runelite-api/src/main/java/net/runelite/api/DynamicObject.java @@ -0,0 +1,37 @@ +/* + * Copyright (c) 2022, Adam + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, this + * list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR + * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ +package net.runelite.api; + +/** + * An animated object + */ +public interface DynamicObject extends Renderable +{ + /** + * Get the animation applied to the object + * @return + */ + Animation getAnimation(); +} diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/devtools/DevToolsOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/devtools/DevToolsOverlay.java index 4217036796..60d9635535 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/devtools/DevToolsOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/devtools/DevToolsOverlay.java @@ -38,9 +38,11 @@ import java.util.List; import java.util.Set; import javax.inject.Inject; import javax.inject.Singleton; +import net.runelite.api.Animation; import net.runelite.api.Client; import net.runelite.api.Constants; import net.runelite.api.DecorativeObject; +import net.runelite.api.DynamicObject; import net.runelite.api.GameObject; import net.runelite.api.GraphicsObject; import net.runelite.api.ItemLayer; @@ -355,7 +357,21 @@ class DevToolsOverlay extends Overlay { if (gameObject != null && gameObject.getSceneMinLocation().equals(tile.getSceneLocation())) { - renderTileObject(graphics, gameObject, player, GREEN); + if (player.getLocalLocation().distanceTo(gameObject.getLocalLocation()) <= MAX_DISTANCE) + { + StringBuilder stringBuilder = new StringBuilder(); + stringBuilder.append("ID: ").append(gameObject.getId()); + if (gameObject.getRenderable() instanceof DynamicObject) + { + Animation animation = ((DynamicObject) gameObject.getRenderable()).getAnimation(); + if (animation != null) + { + stringBuilder.append(" A: ").append(animation.getId()); + } + } + + OverlayUtil.renderTileOverlay(graphics, gameObject, stringBuilder.toString(), GREEN); + } } } }