openrune: ItemDefinition -> ItemComposition

runelite-api/src/main/java/net/runelite/api/Client.java

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

runelite-api/src/main/java/net/runelite/api/Constants.java

@@ -101,7 +101,7 @@ public class Constants
 	/**
 	 * High alchemy = shop price * HIGH_ALCHEMY_MULTIPLIER
 	 *
-	 * @see ItemDefinition#getPrice
+	 * @see ItemComposition#getPrice
 	 */
 	public static final float HIGH_ALCHEMY_MULTIPLIER = 0.6f;
 

runelite-api/src/main/java/net/runelite/api/ItemComposition.java

@@ -5,7 +5,7 @@ import javax.annotation.Nullable;
 /**
  * Represents the template of a specific item type.
  */
-public interface ItemDefinition
+public interface ItemComposition
 {
 	/**
 	 * Gets the items name.

runelite-api/src/main/java/net/runelite/api/events/PostItemDefinition.java

@@ -25,10 +25,10 @@
 package net.runelite.api.events;
 
 import lombok.Data;
-import net.runelite.api.ItemDefinition;
+import net.runelite.api.ItemComposition;
 
 /**
- * An event called after a new {@link ItemDefinition} is created and
+ * An event called after a new {@link ItemComposition} is created and
  * its data is initialized.
  */
 @Data
@@ -37,5 +37,5 @@ public class PostItemDefinition implements Event
 	/**
 	 * The newly created item.
 	 */
-	private ItemDefinition itemDefinition;
+	private ItemComposition itemComposition;
 }

runelite-mixins/src/main/java/net/runelite/mixins/RSClientMixin.java

@@ -51,7 +51,7 @@ import net.runelite.api.IndexDataBase;
 import net.runelite.api.IndexedSprite;
 import net.runelite.api.IntegerNode;
 import net.runelite.api.InventoryID;
-import net.runelite.api.ItemDefinition;
+import net.runelite.api.ItemComposition;
 import net.runelite.api.MenuEntry;
 import net.runelite.api.MenuAction;
 import static net.runelite.api.MenuAction.PLAYER_EIGTH_OPTION;
@@ -1934,7 +1934,7 @@ public abstract class RSClientMixin implements RSClient
 	@Inject
 	@Override
 	@Nonnull
-	public ItemDefinition getItemDefinition(int id)
+	public ItemComposition getItemDefinition(int id)
 	{
 		assert this.isClientThread() : "getItemDefinition must be called on client thread";
 		return getRSItemDefinition(id);

runelite-mixins/src/main/java/net/runelite/mixins/RSItemCompositionMixin.java

@@ -8,11 +8,11 @@ import net.runelite.api.mixins.Mixin;
 import net.runelite.api.mixins.Replace;
 import net.runelite.api.mixins.Shadow;
 import net.runelite.rs.api.RSClient;
-import net.runelite.rs.api.RSItemDefinition;
+import net.runelite.rs.api.RSItemComposition;
 import net.runelite.rs.api.RSModel;
 
-@Mixin(RSItemDefinition.class)
+@Mixin(RSItemComposition.class)
-public abstract class RSItemDefinitionMixin implements RSItemDefinition
+public abstract class RSItemCompositionMixin implements RSItemComposition
 {
 	private static final int DEFAULT_CUSTOM_SHIFT_CLICK_INDEX = -2;
 
@@ -33,7 +33,7 @@ public abstract class RSItemDefinitionMixin implements RSItemDefinition
 	}
 
 	@Inject
-	RSItemDefinitionMixin()
+	RSItemCompositionMixin()
 	{
 	}
 
@@ -70,7 +70,7 @@ public abstract class RSItemDefinitionMixin implements RSItemDefinition
 	public void post()
 	{
 		final PostItemDefinition event = new PostItemDefinition();
-		event.setItemDefinition(this);
+		event.setItemComposition(this);
 		client.getCallbacks().post(PostItemDefinition.class, event);
 	}
 

runescape-api/src/main/java/net/runelite/rs/api/RSClient.java

@@ -402,7 +402,7 @@ public interface RSClient extends RSGameShell, Client
 	RSNodeHashTable getItemContainers();
 
 	@Import("ItemDefinition_get")
-	RSItemDefinition getRSItemDefinition(int itemId);
+	RSItemComposition getRSItemDefinition(int itemId);
 
 	@Import("getItemSprite")
 	RSSpritePixels createRSItemSprite(int itemId, int quantity, int thickness, int borderColor, int stackable, boolean noted);

runescape-api/src/main/java/net/runelite/rs/api/RSItemComposition.java

@@ -1,9 +1,9 @@
 package net.runelite.rs.api;
 
-import net.runelite.api.ItemDefinition;
+import net.runelite.api.ItemComposition;
 import net.runelite.mapping.Import;
 
-public interface RSItemDefinition extends ItemDefinition
+public interface RSItemComposition extends ItemComposition
 {
 	@Import("name")
 	@Override