From ebc7bfa30a0f3c71c09a39647088823da64ec2d4 Mon Sep 17 00:00:00 2001 From: LoJoSho Date: Sat, 6 May 2023 09:37:54 -0500 Subject: [PATCH] feat: menu now passes int slot to gui item types --- common/src/main/java/com/hibiscusmc/hmccosmetics/gui/Menu.java | 2 +- .../main/java/com/hibiscusmc/hmccosmetics/gui/type/Type.java | 2 +- .../hibiscusmc/hmccosmetics/gui/type/types/TypeCosmetic.java | 2 +- .../com/hibiscusmc/hmccosmetics/gui/type/types/TypeEmpty.java | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/common/src/main/java/com/hibiscusmc/hmccosmetics/gui/Menu.java b/common/src/main/java/com/hibiscusmc/hmccosmetics/gui/Menu.java index 84ddf7d7..8d57d6a2 100644 --- a/common/src/main/java/com/hibiscusmc/hmccosmetics/gui/Menu.java +++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/gui/Menu.java @@ -196,7 +196,7 @@ public class Menu { @NotNull private ItemStack updateItem(CosmeticUser user, @NotNull ItemStack itemStack, Type type, ConfigurationNode config, int slot) { if (itemStack.hasItemMeta()) { - itemStack = type.setItem(user, config, itemStack); + itemStack = type.setItem(user, config, itemStack, slot); } return itemStack; } diff --git a/common/src/main/java/com/hibiscusmc/hmccosmetics/gui/type/Type.java b/common/src/main/java/com/hibiscusmc/hmccosmetics/gui/type/Type.java index 66455047..4c5cbddf 100644 --- a/common/src/main/java/com/hibiscusmc/hmccosmetics/gui/type/Type.java +++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/gui/type/Type.java @@ -25,5 +25,5 @@ public abstract class Type { public abstract void run(CosmeticUser user, ConfigurationNode config, ClickType clickType); - public abstract ItemStack setItem(CosmeticUser user, ConfigurationNode config, ItemStack itemStack); + public abstract ItemStack setItem(CosmeticUser user, ConfigurationNode config, ItemStack itemStack, int slot); } diff --git a/common/src/main/java/com/hibiscusmc/hmccosmetics/gui/type/types/TypeCosmetic.java b/common/src/main/java/com/hibiscusmc/hmccosmetics/gui/type/types/TypeCosmetic.java index 5ee9b815..8ebdbe4d 100644 --- a/common/src/main/java/com/hibiscusmc/hmccosmetics/gui/type/types/TypeCosmetic.java +++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/gui/type/types/TypeCosmetic.java @@ -99,7 +99,7 @@ public class TypeCosmetic extends Type { } @Override - public ItemStack setItem(CosmeticUser user, @NotNull ConfigurationNode config, ItemStack itemStack) { + public ItemStack setItem(CosmeticUser user, @NotNull ConfigurationNode config, ItemStack itemStack, int slot) { ItemMeta itemMeta = itemStack.getItemMeta(); if (config.node("cosmetic").virtual()) { diff --git a/common/src/main/java/com/hibiscusmc/hmccosmetics/gui/type/types/TypeEmpty.java b/common/src/main/java/com/hibiscusmc/hmccosmetics/gui/type/types/TypeEmpty.java index 6c4a7cc4..94f08ad7 100644 --- a/common/src/main/java/com/hibiscusmc/hmccosmetics/gui/type/types/TypeEmpty.java +++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/gui/type/types/TypeEmpty.java @@ -54,7 +54,7 @@ public class TypeEmpty extends Type { @Override @SuppressWarnings("Duplicates") - public ItemStack setItem(CosmeticUser user, ConfigurationNode config, @NotNull ItemStack itemStack) { + public ItemStack setItem(CosmeticUser user, ConfigurationNode config, @NotNull ItemStack itemStack, int slot) { List processedLore = new ArrayList<>(); ItemMeta itemMeta = itemStack.getItemMeta();