From d3e276adbb7763eeb4be77b4dc51b4701af4f380 Mon Sep 17 00:00:00 2001 From: therealunull Date: Sun, 13 Dec 2020 12:49:41 -0500 Subject: [PATCH] openrune: NPCDefinition -> NPCComposition --- .../src/main/java/net/runelite/api/Client.java | 2 +- .../src/main/java/net/runelite/api/NPC.java | 6 +++--- .../{NPCDefinition.java => NPCComposition.java} | 4 ++-- .../runelite/api/events/NpcActionChanged.java | 6 +++--- .../java/net/runelite/mixins/RSActorMixin.java | 4 ++-- .../java/net/runelite/mixins/RSClientMixin.java | 4 ++-- ...tionMixin.java => RSNPCCompositionMixin.java} | 8 ++++---- .../java/net/runelite/mixins/RSNPCMixin.java | 16 ++++++++-------- .../main/java/net/runelite/rs/api/RSClient.java | 2 +- .../src/main/java/net/runelite/rs/api/RSNPC.java | 2 +- ...SNPCDefinition.java => RSNPCComposition.java} | 6 +++--- 11 files changed, 30 insertions(+), 30 deletions(-) rename runelite-api/src/main/java/net/runelite/api/{NPCDefinition.java => NPCComposition.java} (97%) rename runelite-mixins/src/main/java/net/runelite/mixins/{RSNPCDefinitionMixin.java => RSNPCCompositionMixin.java} (84%) rename runescape-api/src/main/java/net/runelite/rs/api/{RSNPCDefinition.java => RSNPCComposition.java} (86%) diff --git a/runelite-api/src/main/java/net/runelite/api/Client.java b/runelite-api/src/main/java/net/runelite/api/Client.java index 29089d93f8..c61e5a8658 100644 --- a/runelite-api/src/main/java/net/runelite/api/Client.java +++ b/runelite-api/src/main/java/net/runelite/api/Client.java @@ -941,7 +941,7 @@ public interface Client extends GameShell * @return the corresponding NPC composition * @see NpcID */ - NPCDefinition getNpcDefinition(int npcId); + NPCComposition getNpcDefinition(int npcId); /** * Gets an array of all world areas diff --git a/runelite-api/src/main/java/net/runelite/api/NPC.java b/runelite-api/src/main/java/net/runelite/api/NPC.java index a0cf84c28b..9b29fc210a 100644 --- a/runelite-api/src/main/java/net/runelite/api/NPC.java +++ b/runelite-api/src/main/java/net/runelite/api/NPC.java @@ -59,7 +59,7 @@ public interface NPC extends Actor * * @return the composition */ - NPCDefinition getDefinition(); + NPCComposition getDefinition(); /** * Get the composition for this NPC and transform it if required @@ -67,7 +67,7 @@ public interface NPC extends Actor * @return the transformed NPC */ @Nullable - NPCDefinition getTransformedDefinition(); + NPCComposition getTransformedDefinition(); - void onDefinitionChanged(NPCDefinition composition); + void onDefinitionChanged(NPCComposition composition); } diff --git a/runelite-api/src/main/java/net/runelite/api/NPCDefinition.java b/runelite-api/src/main/java/net/runelite/api/NPCComposition.java similarity index 97% rename from runelite-api/src/main/java/net/runelite/api/NPCDefinition.java rename to runelite-api/src/main/java/net/runelite/api/NPCComposition.java index 94d74bea3c..d730529e42 100644 --- a/runelite-api/src/main/java/net/runelite/api/NPCDefinition.java +++ b/runelite-api/src/main/java/net/runelite/api/NPCComposition.java @@ -27,7 +27,7 @@ package net.runelite.api; /** * Information about a specific {@link NpcID} */ -public interface NPCDefinition +public interface NPCComposition { /** * Gets the name of the NPC. @@ -87,7 +87,7 @@ public interface NPCDefinition * * @throws NullPointerException if {@link #getConfigs()} is null */ - NPCDefinition transform(); + NPCComposition transform(); /** * How many tiles wide this NPC is diff --git a/runelite-api/src/main/java/net/runelite/api/events/NpcActionChanged.java b/runelite-api/src/main/java/net/runelite/api/events/NpcActionChanged.java index 76e1a0d973..20f831e328 100644 --- a/runelite-api/src/main/java/net/runelite/api/events/NpcActionChanged.java +++ b/runelite-api/src/main/java/net/runelite/api/events/NpcActionChanged.java @@ -25,10 +25,10 @@ package net.runelite.api.events; import lombok.Data; -import net.runelite.api.NPCDefinition; +import net.runelite.api.NPCComposition; /** - * An event where an action of an {@link NPCDefinition} has changed. + * An event where an action of an {@link NPCComposition} has changed. */ @Data public class NpcActionChanged implements Event @@ -36,7 +36,7 @@ public class NpcActionChanged implements Event /** * The NPC composition that has been changed. */ - private NPCDefinition npcDefinition; + private NPCComposition npcComposition; /** * The raw index of the modified action. */ 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 515aed461c..177a9a7908 100644 --- a/runelite-mixins/src/main/java/net/runelite/mixins/RSActorMixin.java +++ b/runelite-mixins/src/main/java/net/runelite/mixins/RSActorMixin.java @@ -27,7 +27,7 @@ package net.runelite.mixins; import net.runelite.api.Actor; import net.runelite.api.Hitsplat; import net.runelite.api.NPC; -import net.runelite.api.NPCDefinition; +import net.runelite.api.NPCComposition; import net.runelite.api.Perspective; import net.runelite.api.Player; import net.runelite.api.Point; @@ -229,7 +229,7 @@ public abstract class RSActorMixin implements RSActor int size = 1; if (this instanceof NPC) { - NPCDefinition composition = ((NPC)this).getDefinition(); + NPCComposition composition = ((NPC)this).getDefinition(); if (composition != null && composition.getConfigs() != null) { composition = composition.transform(); diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/RSClientMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/RSClientMixin.java index 58934db68f..961bad7268 100644 --- a/runelite-mixins/src/main/java/net/runelite/mixins/RSClientMixin.java +++ b/runelite-mixins/src/main/java/net/runelite/mixins/RSClientMixin.java @@ -64,7 +64,7 @@ import static net.runelite.api.MenuAction.PLAYER_SIXTH_OPTION; import static net.runelite.api.MenuAction.PLAYER_THIRD_OPTION; import net.runelite.api.MessageNode; import net.runelite.api.NPC; -import net.runelite.api.NPCDefinition; +import net.runelite.api.NPCComposition; import net.runelite.api.NameableContainer; import net.runelite.api.Node; import net.runelite.api.ObjectDefinition; @@ -1942,7 +1942,7 @@ public abstract class RSClientMixin implements RSClient @Inject @Override - public NPCDefinition getNpcDefinition(int id) + public NPCComposition getNpcDefinition(int id) { assert this.isClientThread() : "getNpcDefinition must be called on client thread"; return getRSNpcDefinition(id); diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/RSNPCDefinitionMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/RSNPCCompositionMixin.java similarity index 84% rename from runelite-mixins/src/main/java/net/runelite/mixins/RSNPCDefinitionMixin.java rename to runelite-mixins/src/main/java/net/runelite/mixins/RSNPCCompositionMixin.java index 345605597a..e781737751 100644 --- a/runelite-mixins/src/main/java/net/runelite/mixins/RSNPCDefinitionMixin.java +++ b/runelite-mixins/src/main/java/net/runelite/mixins/RSNPCCompositionMixin.java @@ -11,10 +11,10 @@ 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.RSNPCDefinition; +import net.runelite.rs.api.RSNPCComposition; -@Mixin(RSNPCDefinition.class) -public abstract class RSNPCDefinitionMixin implements RSNPCDefinition +@Mixin(RSNPCComposition.class) +public abstract class RSNPCCompositionMixin implements RSNPCComposition { @Shadow("client") private static RSClient client; @@ -43,7 +43,7 @@ public abstract class RSNPCDefinitionMixin implements RSNPCDefinition public void actionsHook(int idx) { NpcActionChanged npcActionChanged = new NpcActionChanged(); - npcActionChanged.setNpcDefinition(this); + npcActionChanged.setNpcComposition(this); npcActionChanged.setIdx(idx); client.getCallbacks().post(NpcActionChanged.class, npcActionChanged); } 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 1e054a3102..f301405544 100644 --- a/runelite-mixins/src/main/java/net/runelite/mixins/RSNPCMixin.java +++ b/runelite-mixins/src/main/java/net/runelite/mixins/RSNPCMixin.java @@ -26,7 +26,7 @@ package net.runelite.mixins; import java.awt.Shape; import net.runelite.api.AnimationID; -import net.runelite.api.NPCDefinition; +import net.runelite.api.NPCComposition; import net.runelite.api.Perspective; import net.runelite.api.coords.LocalPoint; import net.runelite.api.events.NpcDefinitionChanged; @@ -40,7 +40,7 @@ import net.runelite.api.mixins.Shadow; import net.runelite.rs.api.RSClient; import net.runelite.rs.api.RSModel; import net.runelite.rs.api.RSNPC; -import net.runelite.rs.api.RSNPCDefinition; +import net.runelite.rs.api.RSNPCComposition; @Mixin(RSNPC.class) public abstract class RSNPCMixin implements RSNPC @@ -55,7 +55,7 @@ public abstract class RSNPCMixin implements RSNPC @Override public int getId() { - RSNPCDefinition composition = getDefinition(); + RSNPCComposition composition = getDefinition(); if (composition != null && composition.getConfigs() != null) { composition = composition.transform(); @@ -67,7 +67,7 @@ public abstract class RSNPCMixin implements RSNPC @Override public String getName() { - RSNPCDefinition composition = getDefinition(); + RSNPCComposition composition = getDefinition(); if (composition != null && composition.getConfigs() != null) { composition = composition.transform(); @@ -79,7 +79,7 @@ public abstract class RSNPCMixin implements RSNPC @Override public int getCombatLevel() { - RSNPCDefinition composition = getDefinition(); + RSNPCComposition composition = getDefinition(); if (composition != null && composition.getConfigs() != null) { composition = composition.transform(); @@ -103,7 +103,7 @@ public abstract class RSNPCMixin implements RSNPC @FieldHook(value = "definition", before = true) @Inject - public void onDefinitionChanged(RSNPCDefinition composition) + public void onDefinitionChanged(RSNPCComposition composition) { if (composition == null) { @@ -148,9 +148,9 @@ public abstract class RSNPCMixin implements RSNPC @Inject @Override - public NPCDefinition getTransformedDefinition() + public NPCComposition getTransformedDefinition() { - RSNPCDefinition composition = getDefinition(); + RSNPCComposition composition = getDefinition(); if (composition != null && composition.getConfigs() != null) { composition = composition.transform(); 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 391c5f6704..dacc020063 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 @@ -341,7 +341,7 @@ public interface RSClient extends RSGameShell, Client RSObjectDefinition getRSObjectDefinition(int objectId); @Import("getNpcDefinition") - RSNPCDefinition getRSNpcDefinition(int npcId); + RSNPCComposition getRSNpcDefinition(int npcId); @Import("viewportZoom") @Override diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSNPC.java b/runescape-api/src/main/java/net/runelite/rs/api/RSNPC.java index dbc957b794..8f3b7f5a52 100644 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSNPC.java +++ b/runescape-api/src/main/java/net/runelite/rs/api/RSNPC.java @@ -7,7 +7,7 @@ public interface RSNPC extends RSActor, NPC { @Import("definition") @Override - RSNPCDefinition getDefinition(); + RSNPCComposition getDefinition(); @Override int getIndex(); diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSNPCDefinition.java b/runescape-api/src/main/java/net/runelite/rs/api/RSNPCComposition.java similarity index 86% rename from runescape-api/src/main/java/net/runelite/rs/api/RSNPCDefinition.java rename to runescape-api/src/main/java/net/runelite/rs/api/RSNPCComposition.java index d0f4e75070..41e9a15942 100644 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSNPCDefinition.java +++ b/runescape-api/src/main/java/net/runelite/rs/api/RSNPCComposition.java @@ -1,9 +1,9 @@ package net.runelite.rs.api; -import net.runelite.api.NPCDefinition; +import net.runelite.api.NPCComposition; import net.runelite.mapping.Import; -public interface RSNPCDefinition extends NPCDefinition +public interface RSNPCComposition extends NPCComposition { @Import("name") @Override @@ -51,7 +51,7 @@ public interface RSNPCDefinition extends NPCDefinition @Import("transform") @Override - RSNPCDefinition transform(); + RSNPCComposition transform(); @Import("size") @Override