diff --git a/eco-api/src/main/java/com/willfp/eco/core/items/builder/ItemBuilder.java b/eco-api/src/main/java/com/willfp/eco/core/items/builder/ItemBuilder.java index a6d698b0..8c17f196 100644 --- a/eco-api/src/main/java/com/willfp/eco/core/items/builder/ItemBuilder.java +++ b/eco-api/src/main/java/com/willfp/eco/core/items/builder/ItemBuilder.java @@ -4,7 +4,6 @@ import org.bukkit.NamespacedKey; import org.bukkit.enchantments.Enchantment; import org.bukkit.inventory.ItemFlag; import org.bukkit.inventory.ItemStack; -import org.bukkit.inventory.meta.ItemMeta; import org.bukkit.persistence.PersistentDataType; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -12,14 +11,14 @@ import org.jetbrains.annotations.Nullable; import java.util.List; import java.util.function.Supplier; -public interface ItemBuilder> { +public interface ItemBuilder { /** * Set the ItemStack amount. * * @param amount The amount. * @return The builder. */ - U setAmount(int amount); + ItemBuilder setAmount(int amount); /** * Set the ItemStack amount. @@ -27,7 +26,7 @@ public interface ItemBuilder> { * @param amount The amount. * @return The builder. */ - U setAmount(@NotNull Supplier amount); + ItemBuilder setAmount(@NotNull Supplier amount); /** * Add an enchantment to the item. @@ -36,7 +35,7 @@ public interface ItemBuilder> { * @param level The level. * @return The builder.r */ - U addEnchantment(@NotNull Enchantment enchantment, + ItemBuilder addEnchantment(@NotNull Enchantment enchantment, int level); /** @@ -46,7 +45,7 @@ public interface ItemBuilder> { * @param level The level. * @return The builder. */ - U addEnchantment(@NotNull Supplier enchantment, + ItemBuilder addEnchantment(@NotNull Supplier enchantment, @NotNull Supplier level); /** @@ -55,7 +54,7 @@ public interface ItemBuilder> { * @param name The name. * @return The builder. */ - U setDisplayName(@NotNull String name); + ItemBuilder setDisplayName(@NotNull String name); /** * Set the item display name. @@ -63,7 +62,7 @@ public interface ItemBuilder> { * @param name The name. * @return The builder. */ - U setDisplayName(@NotNull Supplier name); + ItemBuilder setDisplayName(@NotNull Supplier name); /** * Add lore line. @@ -71,7 +70,7 @@ public interface ItemBuilder> { * @param line The line. * @return The builder. */ - U addLoreLine(@NotNull String line); + ItemBuilder addLoreLine(@NotNull String line); /** * Add lore line. @@ -79,7 +78,7 @@ public interface ItemBuilder> { * @param line The line. * @return The builder. */ - U addLoreLine(@NotNull Supplier line); + ItemBuilder addLoreLine(@NotNull Supplier line); /** * Add lore lines. @@ -87,7 +86,7 @@ public interface ItemBuilder> { * @param lines The lines. * @return The builder. */ - U addLoreLines(@NotNull List lines); + ItemBuilder addLoreLines(@NotNull List lines); /** * Add lore lines. @@ -95,7 +94,7 @@ public interface ItemBuilder> { * @param lines The lines. * @return The builder. */ - U addLoreLines(@NotNull Supplier> lines); + ItemBuilder addLoreLines(@NotNull Supplier> lines); /** * Add ItemFlags. @@ -103,7 +102,7 @@ public interface ItemBuilder> { * @param itemFlags The flags. * @return The builder. */ - U addItemFlag(@NotNull ItemFlag... itemFlags); + ItemBuilder addItemFlag(@NotNull ItemFlag... itemFlags); /** * Add ItemFlags. @@ -111,7 +110,7 @@ public interface ItemBuilder> { * @param itemFlags The flags. * @return The builder. */ - U addItemFlag(@NotNull Supplier itemFlags); + ItemBuilder addItemFlag(@NotNull Supplier itemFlags); /** * Write meta key. @@ -123,7 +122,7 @@ public interface ItemBuilder> { * @param The type. * @return The builder. */ - U writeMetaKey(@NotNull NamespacedKey key, + ItemBuilder writeMetaKey(@NotNull NamespacedKey key, @NotNull PersistentDataType type, @NotNull B value); @@ -137,7 +136,7 @@ public interface ItemBuilder> { * @param The type. * @return The builder. */ - U writeMetaKey(@NotNull Supplier key, + ItemBuilder writeMetaKey(@NotNull Supplier key, @NotNull Supplier> type, @NotNull Supplier value); @@ -147,7 +146,7 @@ public interface ItemBuilder> { * @param unbreakable If the item should be unbreakable. * @return The builder. */ - U setUnbreakable(boolean unbreakable); + ItemBuilder setUnbreakable(boolean unbreakable); /** * Set unbreakable. @@ -155,7 +154,7 @@ public interface ItemBuilder> { * @param unbreakable If the item should be unbreakable. * @return The builder. */ - U setUnbreakable(@NotNull Supplier unbreakable); + ItemBuilder setUnbreakable(@NotNull Supplier unbreakable); /** * Set custom model data. @@ -163,7 +162,7 @@ public interface ItemBuilder> { * @param data The data. * @return The builder. */ - U setCustomModelData(@Nullable Integer data); + ItemBuilder setCustomModelData(@Nullable Integer data); /** * Set custom model data. @@ -171,7 +170,7 @@ public interface ItemBuilder> { * @param data The data. * @return The builder. */ - U setCustomModelData(@NotNull Supplier data); + ItemBuilder setCustomModelData(@NotNull Supplier data); /** * Build the item. diff --git a/eco-api/src/main/java/com/willfp/eco/internal/items/AbstractItemStackBuilder.java b/eco-api/src/main/java/com/willfp/eco/internal/items/AbstractItemStackBuilder.java index b95a188a..1c291ed1 100644 --- a/eco-api/src/main/java/com/willfp/eco/internal/items/AbstractItemStackBuilder.java +++ b/eco-api/src/main/java/com/willfp/eco/internal/items/AbstractItemStackBuilder.java @@ -20,7 +20,7 @@ import java.util.List; import java.util.function.Supplier; @SuppressWarnings("unchecked") -public abstract class AbstractItemStackBuilder> implements ItemBuilder { +public abstract class AbstractItemStackBuilder> implements ItemBuilder { /** * The ItemMeta used while building. */