diff --git a/runelite-api/src/main/java/net/runelite/api/Projectile.java b/runelite-api/src/main/java/net/runelite/api/Projectile.java new file mode 100644 index 0000000000..bad70f9717 --- /dev/null +++ b/runelite-api/src/main/java/net/runelite/api/Projectile.java @@ -0,0 +1,32 @@ +/* + * Copyright (c) 2017, Adam + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, this + * list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR + * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ +package net.runelite.api; + +public interface Projectile +{ + int getId(); + + Actor getInteracting(); +} diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/RSProjectileMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/RSProjectileMixin.java new file mode 100644 index 0000000000..20113ddb2a --- /dev/null +++ b/runelite-mixins/src/main/java/net/runelite/mixins/RSProjectileMixin.java @@ -0,0 +1,71 @@ +/* + * Copyright (c) 2016-2017, Adam + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, this + * list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR + * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ +package net.runelite.mixins; + +import net.runelite.api.Actor; +import net.runelite.api.mixins.Inject; +import net.runelite.api.mixins.Mixin; +import net.runelite.api.mixins.Shadow; +import net.runelite.rs.api.RSClient; +import net.runelite.rs.api.RSNPC; +import net.runelite.rs.api.RSPlayer; +import net.runelite.rs.api.RSProjectile; + +@Mixin(RSProjectile.class) +public abstract class RSProjectileMixin implements RSProjectile +{ + @Shadow("clientInstance") + private static RSClient client; + + @Inject + @Override + public Actor getInteracting() + { + int interactingIndex = getRsInteracting(); + if (interactingIndex == 0) + { + return null; + } + + if (interactingIndex > 0) + { + int idx = interactingIndex - 1; + RSNPC[] npcs = client.getCachedNPCs(); + return npcs[idx]; + } + else + { + int idx = -interactingIndex - 1; + + if (idx == client.getLocalInteractingIndex()) + { + return client.getLocalPlayer(); + } + + RSPlayer[] players = client.getCachedPlayers(); + return players[idx]; + } + } +} diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSClient.java b/runescape-api/src/main/java/net/runelite/rs/api/RSClient.java index 088e10b066..6a437ad0be 100644 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSClient.java +++ b/runescape-api/src/main/java/net/runelite/rs/api/RSClient.java @@ -139,6 +139,9 @@ public interface RSClient extends RSGameEngine, Client @Import("cachedPlayers") RSPlayer[] getCachedPlayers(); + @Import("localInteractingIndex") + int getLocalInteractingIndex(); + @Import("groundItemDeque") RSDeque[][][] getGroundItemDeque(); diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSProjectile.java b/runescape-api/src/main/java/net/runelite/rs/api/RSProjectile.java index 98068354b7..1a5e1f6e8f 100644 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSProjectile.java +++ b/runescape-api/src/main/java/net/runelite/rs/api/RSProjectile.java @@ -24,25 +24,15 @@ */ package net.runelite.rs.api; +import net.runelite.api.Projectile; import net.runelite.mapping.Import; -public interface RSProjectile +public interface RSProjectile extends Projectile { - @Import("isMoving") - boolean isMoving(); + @Import("id") + @Override + int getId(); - @Import("animationSequence") - RSSequence getAnimationSequence(); - - @Import("velocityY") - double getVelocityY(); - - @Import("velocityX") - double getVelocityX(); - - @Import("velocityZ") - double getVelocityZ(); - - @Import("scalar") - double getScalar(); + @Import("interacting") + int getRsInteracting(); }