From 528e9dd5e75d0b0e510793f1d7b47489bf043684 Mon Sep 17 00:00:00 2001 From: therealunull Date: Sun, 13 Dec 2020 12:47:59 -0500 Subject: [PATCH] openrune: ItemDefinition -> ItemComposition --- .../src/main/java/net/runelite/api/Client.java | 2 +- .../src/main/java/net/runelite/api/Constants.java | 2 +- .../api/{ItemDefinition.java => ItemComposition.java} | 2 +- .../net/runelite/api/events/PostItemDefinition.java | 6 +++--- .../main/java/net/runelite/mixins/RSClientMixin.java | 4 ++-- ...efinitionMixin.java => RSItemCompositionMixin.java} | 10 +++++----- .../src/main/java/net/runelite/rs/api/RSClient.java | 2 +- .../{RSItemDefinition.java => RSItemComposition.java} | 4 ++-- 8 files changed, 16 insertions(+), 16 deletions(-) rename runelite-api/src/main/java/net/runelite/api/{ItemDefinition.java => ItemComposition.java} (99%) rename runelite-mixins/src/main/java/net/runelite/mixins/{RSItemDefinitionMixin.java => RSItemCompositionMixin.java} (89%) rename runescape-api/src/main/java/net/runelite/rs/api/{RSItemDefinition.java => RSItemComposition.java} (93%) 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 96fb1e8229..29089d93f8 100644 --- a/runelite-api/src/main/java/net/runelite/api/Client.java +++ b/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. diff --git a/runelite-api/src/main/java/net/runelite/api/Constants.java b/runelite-api/src/main/java/net/runelite/api/Constants.java index bdcb8f6374..42ac6527bf 100644 --- a/runelite-api/src/main/java/net/runelite/api/Constants.java +++ b/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; diff --git a/runelite-api/src/main/java/net/runelite/api/ItemDefinition.java b/runelite-api/src/main/java/net/runelite/api/ItemComposition.java similarity index 99% rename from runelite-api/src/main/java/net/runelite/api/ItemDefinition.java rename to runelite-api/src/main/java/net/runelite/api/ItemComposition.java index b79db8b109..b556ef1748 100644 --- a/runelite-api/src/main/java/net/runelite/api/ItemDefinition.java +++ b/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. diff --git a/runelite-api/src/main/java/net/runelite/api/events/PostItemDefinition.java b/runelite-api/src/main/java/net/runelite/api/events/PostItemDefinition.java index c21c9e1fa6..ecdd479ae5 100644 --- a/runelite-api/src/main/java/net/runelite/api/events/PostItemDefinition.java +++ b/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; } 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 57b0e6c345..58934db68f 100644 --- a/runelite-mixins/src/main/java/net/runelite/mixins/RSClientMixin.java +++ b/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); diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/RSItemDefinitionMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/RSItemCompositionMixin.java similarity index 89% rename from runelite-mixins/src/main/java/net/runelite/mixins/RSItemDefinitionMixin.java rename to runelite-mixins/src/main/java/net/runelite/mixins/RSItemCompositionMixin.java index 59ec61453b..84ecf380d2 100644 --- a/runelite-mixins/src/main/java/net/runelite/mixins/RSItemDefinitionMixin.java +++ b/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) -public abstract class RSItemDefinitionMixin implements RSItemDefinition +@Mixin(RSItemComposition.class) +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); } 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 e16b83701f..391c5f6704 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 @@ -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); diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSItemDefinition.java b/runescape-api/src/main/java/net/runelite/rs/api/RSItemComposition.java similarity index 93% rename from runescape-api/src/main/java/net/runelite/rs/api/RSItemDefinition.java rename to runescape-api/src/main/java/net/runelite/rs/api/RSItemComposition.java index 5810edcc9c..4575fc6299 100644 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSItemDefinition.java +++ b/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