From c61af0d39ddd30324b59703cd4c78077cdd15db3 Mon Sep 17 00:00:00 2001 From: ThatGamerBlue Date: Sun, 28 Feb 2021 01:18:12 +0000 Subject: [PATCH] mixin: add getItemDefinition, fuck it, let's have both --- .../src/main/java/net/runelite/api/Client.java | 10 ++++++++++ .../main/java/net/runelite/mixins/RSClientMixin.java | 10 +++++++++- 2 files changed, 19 insertions(+), 1 deletion(-) 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 817626165e..1273b569ec 100644 --- a/runelite-api/src/main/java/net/runelite/api/Client.java +++ b/runelite-api/src/main/java/net/runelite/api/Client.java @@ -403,6 +403,16 @@ public interface Client extends GameEngine @Nonnull ItemComposition getItemComposition(int id); + /** + * Gets the item composition corresponding to an items ID. + * + * @param id the item ID + * @return the corresponding item composition + * @see ItemID + */ + @Nonnull + ItemComposition getItemDefinition(int id); + /** * Creates an item icon sprite with passed variables. * 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 669502c1d3..6a9ae945dd 100644 --- a/runelite-mixins/src/main/java/net/runelite/mixins/RSClientMixin.java +++ b/runelite-mixins/src/main/java/net/runelite/mixins/RSClientMixin.java @@ -2040,10 +2040,18 @@ public abstract class RSClientMixin implements RSClient @Nonnull public ItemComposition getItemComposition(int id) { - assert this.isClientThread() : "getItemDefinition must be called on client thread"; + assert this.isClientThread() : "getItemComposition must be called on client thread"; return getRSItemDefinition(id); } + @Inject + @Override + @Nonnull + public ItemComposition getItemDefinition(int id) + { + return getItemComposition(id); + } + @Inject @Override public NPCComposition getNpcDefinition(int id)