From 4cbfc8dda00a59d9d7fb0e7074b2da6c7ff346be Mon Sep 17 00:00:00 2001 From: Ganom Date: Mon, 1 Jul 2019 16:12:00 -0400 Subject: [PATCH] Refactor NpcCompositionChanged to NpcDefinitionChanged to stay consistent with mixin naming. --- .../{NpcCompositionChanged.java => NpcDefinitionChanged.java} | 2 +- .../client/plugins/npchighlight/NpcIndicatorsPlugin.java | 4 ++-- .../java/net/runelite/client/plugins/slayer/SlayerPlugin.java | 4 ++-- .../src/main/java/net/runelite/mixins/RSNPCMixin.java | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) rename runelite-api/src/main/java/net/runelite/api/events/{NpcCompositionChanged.java => NpcDefinitionChanged.java} (97%) diff --git a/runelite-api/src/main/java/net/runelite/api/events/NpcCompositionChanged.java b/runelite-api/src/main/java/net/runelite/api/events/NpcDefinitionChanged.java similarity index 97% rename from runelite-api/src/main/java/net/runelite/api/events/NpcCompositionChanged.java rename to runelite-api/src/main/java/net/runelite/api/events/NpcDefinitionChanged.java index 29cdd890b6..7d9569f5bd 100644 --- a/runelite-api/src/main/java/net/runelite/api/events/NpcCompositionChanged.java +++ b/runelite-api/src/main/java/net/runelite/api/events/NpcDefinitionChanged.java @@ -31,7 +31,7 @@ import net.runelite.api.NPC; * Fires after the composition of an {@link NPC} changes. */ @Value -public class NpcCompositionChanged +public class NpcDefinitionChanged { /** * The NPC of which the composition changed. diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/npchighlight/NpcIndicatorsPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/npchighlight/NpcIndicatorsPlugin.java index 07b877e1a8..63ec966f6d 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/npchighlight/NpcIndicatorsPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/npchighlight/NpcIndicatorsPlugin.java @@ -59,7 +59,7 @@ import net.runelite.api.events.GameTick; import net.runelite.api.events.GraphicsObjectCreated; import net.runelite.api.events.MenuEntryAdded; import net.runelite.api.events.MenuOptionClicked; -import net.runelite.api.events.NpcCompositionChanged; +import net.runelite.api.events.NpcDefinitionChanged; import net.runelite.api.events.NpcDespawned; import net.runelite.api.events.NpcSpawned; import net.runelite.client.callback.ClientThread; @@ -333,7 +333,7 @@ public class NpcIndicatorsPlugin extends Plugin } @Subscribe - public void onNpcCompositionChanged(NpcCompositionChanged event) + public void onNpcDefinitionChanged(NpcDefinitionChanged event) { NPC npc = event.getNpc(); highlightNpcIfMatch(npc); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/slayer/SlayerPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/slayer/SlayerPlugin.java index d54b21f7dd..b805edd030 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/slayer/SlayerPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/slayer/SlayerPlugin.java @@ -67,7 +67,7 @@ import net.runelite.api.events.ExperienceChanged; import net.runelite.api.events.GameStateChanged; import net.runelite.api.events.GameTick; import net.runelite.api.events.InteractingChanged; -import net.runelite.api.events.NpcCompositionChanged; +import net.runelite.api.events.NpcDefinitionChanged; import net.runelite.api.events.NpcDespawned; import net.runelite.api.events.NpcSpawned; import net.runelite.api.events.VarbitChanged; @@ -351,7 +351,7 @@ public class SlayerPlugin extends Plugin } @Subscribe - public void onNpcCompositionChanged(NpcCompositionChanged event) + public void onNpcDefinitionChanged(NpcDefinitionChanged event) { NPC npc = event.getNpc(); diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/RSNPCMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/RSNPCMixin.java index 327886a637..e33afa700b 100644 --- a/runelite-mixins/src/main/java/net/runelite/mixins/RSNPCMixin.java +++ b/runelite-mixins/src/main/java/net/runelite/mixins/RSNPCMixin.java @@ -29,7 +29,7 @@ import net.runelite.api.AnimationID; import net.runelite.api.NPCDefinition; import net.runelite.api.Perspective; import net.runelite.api.coords.LocalPoint; -import net.runelite.api.events.NpcCompositionChanged; +import net.runelite.api.events.NpcDefinitionChanged; import net.runelite.api.events.NpcDespawned; import net.runelite.api.mixins.Copy; import net.runelite.api.mixins.FieldHook; @@ -114,7 +114,7 @@ public abstract class RSNPCMixin implements RSNPC } else if (this.getId() != -1) { - client.getCallbacks().post(new NpcCompositionChanged(this)); + client.getCallbacks().post(new NpcDefinitionChanged(this)); } }