From 66b464c5103d6beed2d2825d1d7157de9c1c3b59 Mon Sep 17 00:00:00 2001 From: Burak Inan Date: Wed, 17 Feb 2021 00:48:03 +0100 Subject: [PATCH 1/2] Add Actor#isMoving --- runelite-api/src/main/java/net/runelite/api/Actor.java | 2 ++ .../src/main/java/net/runelite/mixins/RSActorMixin.java | 6 ++++++ .../src/main/java/net/runelite/rs/api/RSActor.java | 3 +++ 3 files changed, 11 insertions(+) diff --git a/runelite-api/src/main/java/net/runelite/api/Actor.java b/runelite-api/src/main/java/net/runelite/api/Actor.java index 1a06b2dc7f..4a0a3eade0 100644 --- a/runelite-api/src/main/java/net/runelite/api/Actor.java +++ b/runelite-api/src/main/java/net/runelite/api/Actor.java @@ -290,4 +290,6 @@ public interface Actor extends Renderable, Locatable * @return */ boolean isDead(); + + boolean isMoving(); } diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/RSActorMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/RSActorMixin.java index 15000aee40..4542442d05 100644 --- a/runelite-mixins/src/main/java/net/runelite/mixins/RSActorMixin.java +++ b/runelite-mixins/src/main/java/net/runelite/mixins/RSActorMixin.java @@ -292,4 +292,10 @@ public abstract class RSActorMixin implements RSActor event.setHitsplat(hitsplat); client.getCallbacks().post(event); } + + @Inject + @Override + public boolean isMoving() { + return getPathLength() > 0; + } } diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSActor.java b/runescape-api/src/main/java/net/runelite/rs/api/RSActor.java index cbf1a3810a..6d7bc1b0ec 100644 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSActor.java +++ b/runescape-api/src/main/java/net/runelite/rs/api/RSActor.java @@ -184,4 +184,7 @@ public interface RSActor extends RSRenderable, Actor int getRunAnimation(); void setDead(boolean dead); + + @Import("pathLength") + int getPathLength(); } From 4c18883972a932f3521337a4a472ba13fb3db6b0 Mon Sep 17 00:00:00 2001 From: Burak Inan Date: Wed, 17 Feb 2021 01:05:02 +0100 Subject: [PATCH 2/2] Fix checkstyle --- .../net/runelite/client/config/ConfigItem.java | 2 -- .../net/runelite/client/plugins/Plugin.java | 1 - .../mixins/EntityHiderBridgeMixin.java | 8 +++----- .../net/runelite/mixins/EntityHiderMixin.java | 18 +++--------------- .../java/net/runelite/mixins/RSActorMixin.java | 3 ++- 5 files changed, 8 insertions(+), 24 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/config/ConfigItem.java b/runelite-client/src/main/java/net/runelite/client/config/ConfigItem.java index 17a8fbad51..a9a511cc08 100644 --- a/runelite-client/src/main/java/net/runelite/client/config/ConfigItem.java +++ b/runelite-client/src/main/java/net/runelite/client/config/ConfigItem.java @@ -24,8 +24,6 @@ */ package net.runelite.client.config; -import com.openosrs.client.OpenOSRS; - import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/Plugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/Plugin.java index 80aafcc860..ac68df9b48 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/Plugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/Plugin.java @@ -29,7 +29,6 @@ import com.google.inject.Injector; import com.google.inject.Module; import lombok.Getter; import org.pf4j.ExtensionPoint; -import net.runelite.client.RuneLite; public abstract class Plugin implements Module, ExtensionPoint { diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/EntityHiderBridgeMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/EntityHiderBridgeMixin.java index 0327b9473e..54745afbf2 100644 --- a/runelite-mixins/src/main/java/net/runelite/mixins/EntityHiderBridgeMixin.java +++ b/runelite-mixins/src/main/java/net/runelite/mixins/EntityHiderBridgeMixin.java @@ -25,15 +25,13 @@ */ package net.runelite.mixins; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Set; import net.runelite.api.mixins.Inject; import net.runelite.api.mixins.Mixin; import net.runelite.rs.api.RSClient; +import java.util.ArrayList; +import java.util.List; + @Mixin(RSClient.class) public abstract class EntityHiderBridgeMixin implements RSClient { diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/EntityHiderMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/EntityHiderMixin.java index e99e8f9659..6a07951e73 100644 --- a/runelite-mixins/src/main/java/net/runelite/mixins/EntityHiderMixin.java +++ b/runelite-mixins/src/main/java/net/runelite/mixins/EntityHiderMixin.java @@ -25,22 +25,10 @@ */ package net.runelite.mixins; -import java.util.HashMap; +import net.runelite.api.mixins.*; +import net.runelite.rs.api.*; + import java.util.List; -import java.util.Set; -import net.runelite.api.mixins.Copy; -import net.runelite.api.mixins.Inject; -import net.runelite.api.mixins.Mixin; -import net.runelite.api.mixins.Replace; -import net.runelite.api.mixins.Shadow; -import net.runelite.api.util.Text; -import net.runelite.rs.api.RSActor; -import net.runelite.rs.api.RSClient; -import net.runelite.rs.api.RSNPC; -import net.runelite.rs.api.RSPlayer; -import net.runelite.rs.api.RSProjectile; -import net.runelite.rs.api.RSRenderable; -import net.runelite.rs.api.RSScene; @Mixin(RSScene.class) public abstract class EntityHiderMixin implements RSScene diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/RSActorMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/RSActorMixin.java index 4542442d05..1096f359fe 100644 --- a/runelite-mixins/src/main/java/net/runelite/mixins/RSActorMixin.java +++ b/runelite-mixins/src/main/java/net/runelite/mixins/RSActorMixin.java @@ -295,7 +295,8 @@ public abstract class RSActorMixin implements RSActor @Inject @Override - public boolean isMoving() { + public boolean isMoving() + { return getPathLength() > 0; } }