ra/runelite
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Merge pull request #2955 from open-osrs/api-develop

Browse Source 
api: getItemDefinition > getItemComposition
This commit is contained in:
Tyler Bochard
2021-02-27 16:51:53 -05:00
committed by GitHub
parent 13d6e223c3 9abd595df8
commit d3ad73fb9d
5 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
runelite-api/src/main/java/net/runelite/api/Client.java
View File

@@ -401,7 +401,7 @@ public interface Client extends GameEngine
* @see ItemID * @see ItemID
*/ */
@Nonnull @Nonnull
ItemComposition getItemDefinition(int id); ItemComposition getItemComposition(int id);
/** /**
* Creates an item icon sprite with passed variables. * Creates an item icon sprite with passed variables.

2
runelite-client/src/main/java/net/runelite/client/game/ItemManager.java
View File

@@ -200,7 +200,7 @@ public class ItemManager
@Override @Override
public ItemComposition load(Integer key) throws Exception public ItemComposition load(Integer key) throws Exception
{ {
return client.getItemDefinition(key); return client.getItemComposition(key);
} }
}); });

2
runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/item/MultipleOfItemRequirement.java
View File

@@ -67,7 +67,7 @@ public class MultipleOfItemRequirement implements ItemRequirement
@Override @Override
public String getCollectiveName(Client client) public String getCollectiveName(Client client)
{ {
ItemComposition definition = client.getItemDefinition(itemId); ItemComposition definition = client.getItemComposition(itemId);
if (definition == null) if (definition == null)
{ {

2
runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/item/SingleItemRequirement.java
View File

@@ -60,7 +60,7 @@ public class SingleItemRequirement implements ItemRequirement
@Override @Override
public String getCollectiveName(Client client) public String getCollectiveName(Client client)
{ {
ItemComposition definition = client.getItemDefinition(itemId); ItemComposition definition = client.getItemComposition(itemId);
if (definition == null) if (definition == null)
{ {

2
runelite-mixins/src/main/java/net/runelite/mixins/RSClientMixin.java
View File

@@ -2038,7 +2038,7 @@ public abstract class RSClientMixin implements RSClient
@Inject @Inject
@Override @Override
@Nonnull @Nonnull
public ItemComposition getItemDefinition(int id) public ItemComposition getItemComposition(int id)
{ {
assert this.isClientThread() : "getItemDefinition must be called on client thread"; assert this.isClientThread() : "getItemDefinition must be called on client thread";
return getRSItemDefinition(id); return getRSItemDefinition(id);