From 1eeeaba3a4ab2f3637fd64d958bafbb74e29eef1 Mon Sep 17 00:00:00 2001 From: Daniel Walsh Date: Wed, 11 Mar 2020 01:53:59 +0000 Subject: [PATCH 1/4] Add getItem() --- .../me/mrCookieSlime/Slimefun/api/SlimefunItemStack.java | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/main/java/me/mrCookieSlime/Slimefun/api/SlimefunItemStack.java b/src/main/java/me/mrCookieSlime/Slimefun/api/SlimefunItemStack.java index 1354fac9a..e66fa636c 100644 --- a/src/main/java/me/mrCookieSlime/Slimefun/api/SlimefunItemStack.java +++ b/src/main/java/me/mrCookieSlime/Slimefun/api/SlimefunItemStack.java @@ -150,6 +150,15 @@ public class SlimefunItemStack extends CustomItem { return id; } + /** + * Gets the {@link SlimefunItem} associated for this SlimefunItemStack. Null if no item is found. + * + * @return The {@link SlimefunItem} for this SlimefunItemStack, null if not found. + */ + public SlimefunItem getItem() { + return SlimefunItem.getById(this.id); + } + public ImmutableItemMeta getImmutableMeta() { return immutableMeta; } From c1aa385faee18dae279047c7bcf5dfd3cc7d1617 Mon Sep 17 00:00:00 2001 From: Daniel Walsh Date: Wed, 11 Mar 2020 02:06:22 +0000 Subject: [PATCH 2/4] Import --- .../java/me/mrCookieSlime/Slimefun/api/SlimefunItemStack.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/me/mrCookieSlime/Slimefun/api/SlimefunItemStack.java b/src/main/java/me/mrCookieSlime/Slimefun/api/SlimefunItemStack.java index e66fa636c..6a0ec7da2 100644 --- a/src/main/java/me/mrCookieSlime/Slimefun/api/SlimefunItemStack.java +++ b/src/main/java/me/mrCookieSlime/Slimefun/api/SlimefunItemStack.java @@ -19,6 +19,7 @@ import org.bukkit.potion.PotionEffectType; import io.github.thebusybiscuit.cscorelib2.item.CustomItem; import io.github.thebusybiscuit.cscorelib2.item.ImmutableItemMeta; import io.github.thebusybiscuit.cscorelib2.skull.SkullItem; +import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.SlimefunItem; import me.mrCookieSlime.Slimefun.SlimefunPlugin; public class SlimefunItemStack extends CustomItem { From 865ff25d4c1a0589ba2d38ce4b0babbaca86d15c Mon Sep 17 00:00:00 2001 From: Daniel Walsh Date: Wed, 11 Mar 2020 02:10:57 +0000 Subject: [PATCH 3/4] (By the way, you know this breaks convention) --- .../java/me/mrCookieSlime/Slimefun/api/SlimefunItemStack.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/me/mrCookieSlime/Slimefun/api/SlimefunItemStack.java b/src/main/java/me/mrCookieSlime/Slimefun/api/SlimefunItemStack.java index 6a0ec7da2..d5b32c18d 100644 --- a/src/main/java/me/mrCookieSlime/Slimefun/api/SlimefunItemStack.java +++ b/src/main/java/me/mrCookieSlime/Slimefun/api/SlimefunItemStack.java @@ -157,7 +157,7 @@ public class SlimefunItemStack extends CustomItem { * @return The {@link SlimefunItem} for this SlimefunItemStack, null if not found. */ public SlimefunItem getItem() { - return SlimefunItem.getById(this.id); + return SlimefunItem.getByID(this.id); } public ImmutableItemMeta getImmutableMeta() { From 4c1953ef60dc7fa886daa4577133c710fb73cfdd Mon Sep 17 00:00:00 2001 From: Daniel Walsh Date: Wed, 11 Mar 2020 02:13:58 +0000 Subject: [PATCH 4/4] Link SlimefunItemStack --- .../java/me/mrCookieSlime/Slimefun/api/SlimefunItemStack.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/me/mrCookieSlime/Slimefun/api/SlimefunItemStack.java b/src/main/java/me/mrCookieSlime/Slimefun/api/SlimefunItemStack.java index d5b32c18d..9c1b37413 100644 --- a/src/main/java/me/mrCookieSlime/Slimefun/api/SlimefunItemStack.java +++ b/src/main/java/me/mrCookieSlime/Slimefun/api/SlimefunItemStack.java @@ -152,9 +152,9 @@ public class SlimefunItemStack extends CustomItem { } /** - * Gets the {@link SlimefunItem} associated for this SlimefunItemStack. Null if no item is found. + * Gets the {@link SlimefunItem} associated for this {@link SlimefunItemStack}. Null if no item is found. * - * @return The {@link SlimefunItem} for this SlimefunItemStack, null if not found. + * @return The {@link SlimefunItem} for this {@link SlimefunItemStack}, null if not found. */ public SlimefunItem getItem() { return SlimefunItem.getByID(this.id);