From 9abd595df8cdf160253c0c8020188e83beb216ff Mon Sep 17 00:00:00 2001 From: zeruth Date: Sat, 27 Feb 2021 16:22:33 -0500 Subject: [PATCH] api: getItemDefinition > getItemComposition --- runelite-api/src/main/java/net/runelite/api/Client.java | 2 +- .../src/main/java/net/runelite/client/game/ItemManager.java | 2 +- .../cluescrolls/clues/item/MultipleOfItemRequirement.java | 2 +- .../plugins/cluescrolls/clues/item/SingleItemRequirement.java | 2 +- .../src/main/java/net/runelite/mixins/RSClientMixin.java | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) 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 700f4e3d88..817626165e 100644 --- a/runelite-api/src/main/java/net/runelite/api/Client.java +++ b/runelite-api/src/main/java/net/runelite/api/Client.java @@ -401,7 +401,7 @@ public interface Client extends GameEngine * @see ItemID */ @Nonnull - ItemComposition getItemDefinition(int id); + ItemComposition getItemComposition(int id); /** * Creates an item icon sprite with passed variables. diff --git a/runelite-client/src/main/java/net/runelite/client/game/ItemManager.java b/runelite-client/src/main/java/net/runelite/client/game/ItemManager.java index 2d2ef2eb91..7ae68ebcfc 100644 --- a/runelite-client/src/main/java/net/runelite/client/game/ItemManager.java +++ b/runelite-client/src/main/java/net/runelite/client/game/ItemManager.java @@ -200,7 +200,7 @@ public class ItemManager @Override public ItemComposition load(Integer key) throws Exception { - return client.getItemDefinition(key); + return client.getItemComposition(key); } }); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/item/MultipleOfItemRequirement.java b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/item/MultipleOfItemRequirement.java index 88432a4ca3..77668c64a9 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/item/MultipleOfItemRequirement.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/item/MultipleOfItemRequirement.java @@ -67,7 +67,7 @@ public class MultipleOfItemRequirement implements ItemRequirement @Override public String getCollectiveName(Client client) { - ItemComposition definition = client.getItemDefinition(itemId); + ItemComposition definition = client.getItemComposition(itemId); if (definition == null) { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/item/SingleItemRequirement.java b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/item/SingleItemRequirement.java index 1571e004af..57d6528aa6 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/item/SingleItemRequirement.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/item/SingleItemRequirement.java @@ -60,7 +60,7 @@ public class SingleItemRequirement implements ItemRequirement @Override public String getCollectiveName(Client client) { - ItemComposition definition = client.getItemDefinition(itemId); + ItemComposition definition = client.getItemComposition(itemId); if (definition == null) { 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 6eb966ec17..669502c1d3 100644 --- a/runelite-mixins/src/main/java/net/runelite/mixins/RSClientMixin.java +++ b/runelite-mixins/src/main/java/net/runelite/mixins/RSClientMixin.java @@ -2038,7 +2038,7 @@ public abstract class RSClientMixin implements RSClient @Inject @Override @Nonnull - public ItemComposition getItemDefinition(int id) + public ItemComposition getItemComposition(int id) { assert this.isClientThread() : "getItemDefinition must be called on client thread"; return getRSItemDefinition(id);