From 723d5c2f6bf5eeb834980da725d43610790b33d5 Mon Sep 17 00:00:00 2001 From: aromaa Date: Thu, 10 Oct 2024 21:41:12 +0300 Subject: [PATCH 1/2] Add overload with BlockChangeFlag to ArchetypeVolume#applyToWorld --- .../volume/archetype/ArchetypeVolume.java | 22 +++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/spongepowered/api/world/volume/archetype/ArchetypeVolume.java b/src/main/java/org/spongepowered/api/world/volume/archetype/ArchetypeVolume.java index 18b5002490..5ed26a6494 100644 --- a/src/main/java/org/spongepowered/api/world/volume/archetype/ArchetypeVolume.java +++ b/src/main/java/org/spongepowered/api/world/volume/archetype/ArchetypeVolume.java @@ -29,6 +29,7 @@ import org.spongepowered.api.event.EventContextKeys; import org.spongepowered.api.event.cause.entity.SpawnType; import org.spongepowered.api.util.transformation.Transformation; +import org.spongepowered.api.world.BlockChangeFlag; import org.spongepowered.api.world.BlockChangeFlags; import org.spongepowered.api.world.server.ServerWorld; import org.spongepowered.api.world.volume.archetype.block.entity.BlockEntityArchetypeVolume; @@ -76,6 +77,24 @@ default Vector3d logicalCenter() { * @param spawnContext The context value used for processing spawn entities. */ default void applyToWorld(final ServerWorld target, final Vector3i placement, final Supplier spawnContext) { + this.applyToWorld(target, placement, spawnContext, BlockChangeFlags.DEFAULT_PLACEMENT); + } + + /** + * Attempts to apply all of the contents of this + * {@link ArchetypeVolume volume} onto the target {@link ServerWorld world} + * with a relative {@code placement}. This default implementation can be + * used as a guide for utilizing + * {@link org.spongepowered.api.world.volume.stream.VolumeStream VolumeStreams} + * and their companion types. + * + * @param target The target world + * @param placement The target origin, where the diff of relative position + * compared to this volume's min position as the offset + * @param spawnContext The context value used for processing spawn entities. + * @param flag The various change flags controlling some interactions + */ + default void applyToWorld(final ServerWorld target, final Vector3i placement, final Supplier spawnContext, final BlockChangeFlag flag) { Objects.requireNonNull(target, "Target world cannot be null"); Objects.requireNonNull(placement, "Target position cannot be null"); try (final CauseStackManager.StackFrame frame = Sponge.server().causeStackManager().pushCauseFrame()) { @@ -83,7 +102,7 @@ default void applyToWorld(final ServerWorld target, final Vector3i placement, fi .apply(VolumeCollectors.of( target, VolumePositionTranslators.relativeTo(placement), - VolumeApplicators.applyBlocks(BlockChangeFlags.DEFAULT_PLACEMENT) + VolumeApplicators.applyBlocks(flag) )); this.biomeStream(this.min(), this.max(), StreamOptions.lazily()) @@ -107,5 +126,4 @@ default void applyToWorld(final ServerWorld target, final Vector3i placement, fi )); } } - } From 196f5d5d701555a3a5e7d27bf1a877dc18360a70 Mon Sep 17 00:00:00 2001 From: MrHell228 <82652479+MrHell228@users.noreply.github.com> Date: Sat, 12 Oct 2024 18:22:54 +0300 Subject: [PATCH 2/2] Move deprecated ItemStackLike related methods to Common (#2565) --- .../api/advancement/DisplayInfo.java | 16 ------- .../api/block/entity/Jukebox.java | 9 ---- .../cause/entity/damage/DamageModifier.java | 16 ------- .../api/item/enchantment/EnchantmentType.java | 17 ------- .../api/item/inventory/ArmorEquipable.java | 48 ------------------- .../api/item/inventory/Container.java | 8 ---- .../api/item/inventory/Equipable.java | 32 ------------- .../api/item/inventory/Inventory.java | 48 ------------------- .../api/item/inventory/Slot.java | 8 ---- .../equipment/EquipmentInventory.java | 16 ------- .../item/inventory/slot/FilteringSlot.java | 9 ---- .../api/item/inventory/slot/SidedSlot.java | 25 ---------- .../InventoryTransactionResult.java | 16 ------- .../transaction/SlotTransaction.java | 9 ---- .../item/inventory/type/GridInventory.java | 8 ---- .../api/item/inventory/type/Inventory2D.java | 8 ---- .../inventory/type/ViewableInventory.java | 9 ---- .../api/item/merchant/TradeOffer.java | 25 ---------- .../api/item/recipe/RecipeManager.java | 33 ------------- .../item/recipe/cooking/CookingRecipe.java | 42 ---------------- .../api/item/recipe/crafting/Ingredient.java | 33 ------------- .../api/item/recipe/crafting/RecipeInput.java | 16 ------- .../recipe/crafting/ShapedCraftingRecipe.java | 27 ----------- .../crafting/ShapelessCraftingRecipe.java | 26 ---------- .../crafting/SpecialCraftingRecipe.java | 9 ---- .../item/recipe/single/StoneCutterRecipe.java | 26 ---------- .../item/recipe/smithing/SmithingRecipe.java | 26 ---------- 27 files changed, 565 deletions(-) diff --git a/src/main/java/org/spongepowered/api/advancement/DisplayInfo.java b/src/main/java/org/spongepowered/api/advancement/DisplayInfo.java index 14cee4b0ab..952cebd81b 100644 --- a/src/main/java/org/spongepowered/api/advancement/DisplayInfo.java +++ b/src/main/java/org/spongepowered/api/advancement/DisplayInfo.java @@ -164,22 +164,6 @@ default Builder icon(ItemType itemType) { return this.icon(ItemStack.of(itemType, 1)); } - /** - * @deprecated Use {@link #icon(ItemStackLike)} instead. - */ - @Deprecated(forRemoval = true) - default Builder icon(ItemStack itemStack) { - return this.icon((ItemStackLike) itemStack); - } - - /** - * @deprecated Use {@link #icon(ItemStackLike)} instead. - */ - @Deprecated(forRemoval = true) - default Builder icon(ItemStackSnapshot itemStackSnapshot) { - return this.icon((ItemStackLike) itemStackSnapshot); - } - /** * Sets the icon of the advancement with the * specified {@link ItemStackLike}. diff --git a/src/main/java/org/spongepowered/api/block/entity/Jukebox.java b/src/main/java/org/spongepowered/api/block/entity/Jukebox.java index c85906436e..39ca0dffd2 100644 --- a/src/main/java/org/spongepowered/api/block/entity/Jukebox.java +++ b/src/main/java/org/spongepowered/api/block/entity/Jukebox.java @@ -26,7 +26,6 @@ import org.spongepowered.api.data.Keys; import org.spongepowered.api.data.value.Value; -import org.spongepowered.api.item.inventory.ItemStack; import org.spongepowered.api.item.inventory.ItemStackLike; import org.spongepowered.api.item.inventory.ItemStackSnapshot; @@ -60,14 +59,6 @@ default Value.Mutable item() { */ void eject(); - /** - * @deprecated Use {@link #insert(ItemStackLike)} instead. - */ - @Deprecated(forRemoval = true) - default void insert(ItemStack disc) { - this.insert((ItemStackLike) disc); - } - /** * Ejects the current music disc item in this Jukebox and inserts the given one. * diff --git a/src/main/java/org/spongepowered/api/event/cause/entity/damage/DamageModifier.java b/src/main/java/org/spongepowered/api/event/cause/entity/damage/DamageModifier.java index 19079591c3..65e99fa592 100644 --- a/src/main/java/org/spongepowered/api/event/cause/entity/damage/DamageModifier.java +++ b/src/main/java/org/spongepowered/api/event/cause/entity/damage/DamageModifier.java @@ -163,22 +163,6 @@ public Builder group(final String group) { return this; } - /** - * @deprecated Use {@link #item(ItemStackLike)} instead. - */ - @Deprecated(forRemoval = true) - public Builder item(final ItemStack itemStack) { - return this.item((ItemStackLike) itemStack); - } - - /** - * @deprecated Use {@link #item(ItemStackLike)} instead. - */ - @Deprecated(forRemoval = true) - public Builder item(final ItemStackSnapshot snapshot) { - return this.item((ItemStackLike) snapshot); - } - public Builder item(final ItemStackLike item) { this.snapshot = java.util.Objects.requireNonNull(item, "item").asImmutable(); return this; diff --git a/src/main/java/org/spongepowered/api/item/enchantment/EnchantmentType.java b/src/main/java/org/spongepowered/api/item/enchantment/EnchantmentType.java index 2d324dabc2..804eaa1bc8 100644 --- a/src/main/java/org/spongepowered/api/item/enchantment/EnchantmentType.java +++ b/src/main/java/org/spongepowered/api/item/enchantment/EnchantmentType.java @@ -26,7 +26,6 @@ import net.kyori.adventure.text.ComponentLike; import org.spongepowered.api.block.entity.EnchantmentTable; -import org.spongepowered.api.item.inventory.ItemStack; import org.spongepowered.api.item.inventory.ItemStackLike; import org.spongepowered.api.registry.DefaultedRegistryValue; import org.spongepowered.api.tag.EnchantmenTypeTags; @@ -82,14 +81,6 @@ public interface EnchantmentType extends DefaultedRegistryValue, ComponentLike, */ int maximumEnchantabilityForLevel(int level); - /** - * @deprecated Use {@link #canBeAppliedToStack(ItemStackLike)} instead, - */ - @Deprecated(forRemoval = true) - default boolean canBeAppliedToStack(ItemStack stack) { - return this.canBeAppliedToStack((ItemStackLike) stack); - } - /** * Test if this enchantment type can be applied to an {@link ItemStackLike}. * @@ -98,14 +89,6 @@ default boolean canBeAppliedToStack(ItemStack stack) { */ boolean canBeAppliedToStack(ItemStackLike stack); - /** - * @deprecated Use {@link #canBeAppliedToStack(ItemStackLike)} instead, - */ - @Deprecated(forRemoval = true) - default boolean canBeAppliedByTable(ItemStack stack) { - return this.canBeAppliedByTable((ItemStackLike) stack); - } - /** * Test if this enchantment type can be applied to an {@link ItemStackLike} by * the {@link EnchantmentTable}. diff --git a/src/main/java/org/spongepowered/api/item/inventory/ArmorEquipable.java b/src/main/java/org/spongepowered/api/item/inventory/ArmorEquipable.java index 964fd3e6d8..6f238811ce 100644 --- a/src/main/java/org/spongepowered/api/item/inventory/ArmorEquipable.java +++ b/src/main/java/org/spongepowered/api/item/inventory/ArmorEquipable.java @@ -46,14 +46,6 @@ public interface ArmorEquipable extends Equipable { */ ItemStack head(); - /** - * @deprecated Use {@link #setHead(ItemStackLike)} instead. - */ - @Deprecated(forRemoval = true) - default void setHead(ItemStack head) { - this.setHead((ItemStackLike) head); - } - /** * Sets the head. * @@ -68,14 +60,6 @@ default void setHead(ItemStack head) { */ ItemStack chest(); - /** - * @deprecated Use {@link #setChest(ItemStackLike)} instead. - */ - @Deprecated(forRemoval = true) - default void setChest(ItemStack chest) { - this.setChest((ItemStackLike) chest); - } - /** * Sets the chest. * @@ -90,14 +74,6 @@ default void setChest(ItemStack chest) { */ ItemStack legs(); - /** - * @deprecated Use {@link #setLegs(ItemStackLike)} instead. - */ - @Deprecated(forRemoval = true) - default void setLegs(ItemStack legs) { - this.setLegs((ItemStackLike) legs); - } - /** * Sets the legs. * @@ -112,14 +88,6 @@ default void setLegs(ItemStack legs) { */ ItemStack feet(); - /** - * @deprecated Use {@link #setFeet(ItemStackLike)} instead. - */ - @Deprecated(forRemoval = true) - default void setFeet(ItemStack feet) { - this.setFeet((ItemStackLike) feet); - } - /** * Sets the feet. * @@ -145,14 +113,6 @@ default ItemStack itemInHand(Supplier handType) { */ ItemStack itemInHand(HandType handType); - /** - * @deprecated Use {@link #setItemInHand(Supplier, ItemStackLike)} instead. - */ - @Deprecated(forRemoval = true) - default void setItemInHand(Supplier handType, ItemStack itemInHand) { - this.setItemInHand(handType, (ItemStackLike) itemInHand); - } - /** * Sets the equipped item in hand. * @@ -163,14 +123,6 @@ default void setItemInHand(Supplier handType, ItemStackLike this.setItemInHand(handType.get(), itemInHand); } - /** - * @deprecated Use {@link #setItemInHand(HandType, ItemStackLike)} instead. - */ - @Deprecated(forRemoval = true) - default void setItemInHand(HandType handType, ItemStack itemInHand) { - this.setItemInHand(handType, (ItemStackLike) itemInHand); - } - /** * Sets the equipped item in hand. * diff --git a/src/main/java/org/spongepowered/api/item/inventory/Container.java b/src/main/java/org/spongepowered/api/item/inventory/Container.java index 35e360e428..f68406c003 100644 --- a/src/main/java/org/spongepowered/api/item/inventory/Container.java +++ b/src/main/java/org/spongepowered/api/item/inventory/Container.java @@ -59,14 +59,6 @@ public interface Container extends Inventory { */ List viewed(); - /** - * @deprecated Use {@link #setCursor(ItemStackLike)} instead. - */ - @Deprecated(forRemoval = true) - default boolean setCursor(ItemStack item) { - return this.setCursor((ItemStackLike) item); - } - /** * Sets the viewing players cursor item. *

Returns false when the container is no longer open.

diff --git a/src/main/java/org/spongepowered/api/item/inventory/Equipable.java b/src/main/java/org/spongepowered/api/item/inventory/Equipable.java index 974c5c16d2..f7d75f15dc 100644 --- a/src/main/java/org/spongepowered/api/item/inventory/Equipable.java +++ b/src/main/java/org/spongepowered/api/item/inventory/Equipable.java @@ -56,14 +56,6 @@ default boolean canEquip(final Supplier type) { return this.canEquip(type.get()); } - /** - * @deprecated Use {@link #canEquip(EquipmentType, ItemStackLike)} instead. - */ - @Deprecated(forRemoval = true) - default boolean canEquip(EquipmentType type, ItemStack equipment) { - return this.canEquip(type, (ItemStackLike) equipment); - } - /** * Gets whether this {@link Equipable} can equip the supplied equipment in its slot of * the specified type (eg. whether calling {@link #equip} with the specified @@ -75,14 +67,6 @@ default boolean canEquip(EquipmentType type, ItemStack equipment) { */ boolean canEquip(EquipmentType type, ItemStackLike equipment); - /** - * @deprecated Use {@link #canEquip(Supplier, ItemStackLike)} instead. - */ - @Deprecated(forRemoval = true) - default boolean canEquip(final Supplier type, final ItemStack equipment) { - return this.canEquip(type, (ItemStackLike) equipment); - } - default boolean canEquip(final Supplier type, final ItemStackLike equipment) { return this.canEquip(type.get(), equipment); } @@ -100,14 +84,6 @@ default Optional equipped(final Supplier typ return this.equipped(type.get()); } - /** - * @deprecated Use {@link #equip(EquipmentType, ItemStackLike)} instead. - */ - @Deprecated(forRemoval = true) - default boolean equip(EquipmentType type, ItemStack equipment) { - return this.equip(type, (ItemStackLike) equipment); - } - /** * Sets the item currently equipped by the {@link Equipable} in the specified slot, if * the equipable has such a slot. @@ -121,14 +97,6 @@ default boolean equip(EquipmentType type, ItemStack equipment) { */ boolean equip(EquipmentType type, ItemStackLike equipment); - /** - * @deprecated Use {@link #equip(Supplier, ItemStackLike)} instead. - */ - @Deprecated(forRemoval = true) - default boolean equip(final Supplier type, final ItemStack equipment) { - return this.equip(type, (ItemStackLike) equipment); - } - default boolean equip(final Supplier type, final ItemStackLike equipment) { return this.equip(type.get(), equipment); } diff --git a/src/main/java/org/spongepowered/api/item/inventory/Inventory.java b/src/main/java/org/spongepowered/api/item/inventory/Inventory.java index a28eb59808..e74de518aa 100644 --- a/src/main/java/org/spongepowered/api/item/inventory/Inventory.java +++ b/src/main/java/org/spongepowered/api/item/inventory/Inventory.java @@ -142,14 +142,6 @@ static Builder builder() { */ ItemStack peek(); - /** - * @deprecated Use {@link #offer(ItemStackLike...)} instead. - */ - @Deprecated(forRemoval = true) - default InventoryTransactionResult offer(ItemStack... stacks) { - return this.offer((ItemStackLike[]) stacks); - } - /** * Adds one or more ItemStacks to this inventory. * @@ -160,14 +152,6 @@ default InventoryTransactionResult offer(ItemStack... stacks) { */ InventoryTransactionResult offer(ItemStackLike... stacks); - /** - * @deprecated Use {@link #canFit(ItemStackLike)} instead. - */ - @Deprecated(forRemoval = true) - default boolean canFit(ItemStack stack) { - return this.canFit((ItemStackLike) stack); - } - /** * Returns true if the entire stack can fit in this inventory. * @@ -214,14 +198,6 @@ default boolean canFit(ItemStack stack) { */ Optional peekAt(int index); - /** - * @deprecated Use {@link #offer(int, ItemStackLike)} instead. - */ - @Deprecated(forRemoval = true) - default InventoryTransactionResult offer(int index, ItemStack stack) { - return this.offer(index, (ItemStackLike) stack); - } - /** * Adds an ItemStack to the slot at given index. * Returns a {@link InventoryTransactionResult.Type#SUCCESS} only if the entire {@link ItemStackLike} fits the slot. @@ -234,14 +210,6 @@ default InventoryTransactionResult offer(int index, ItemStack stack) { */ InventoryTransactionResult offer(int index, ItemStackLike stack); - /** - * @deprecated Use {@link #set(int, ItemStackLike)} instead. - */ - @Deprecated(forRemoval = true) - default InventoryTransactionResult set(int index, ItemStack stack) { - return this.set(index, (ItemStackLike) stack); - } - /** * Adds the ItemStack to the slot at given index overwriting the existing item. * @@ -292,14 +260,6 @@ default InventoryTransactionResult set(int index, ItemStack stack) { */ int capacity(); - /** - * @deprecated Use {@link #contains(ItemStackLike)} instead. - */ - @Deprecated(forRemoval = true) - default boolean contains(ItemStack stack) { - return this.contains((ItemStackLike) stack); - } - /** * Checks whether the stacks quantity or more of given stack is contained in this Inventory. * To check if an inventory contains any amount use {@link #containsAny(ItemStackLike)}. @@ -319,14 +279,6 @@ default boolean contains(ItemStack stack) { */ boolean contains(ItemType type); - /** - * @deprecated Use {@link #containsAny(ItemStackLike)} instead. - */ - @Deprecated(forRemoval = true) - default boolean containsAny(ItemStack stack) { - return this.containsAny((ItemStackLike) stack); - } - /** * Checks whether the given stack is contained in this Inventory. * The stack size is ignored. diff --git a/src/main/java/org/spongepowered/api/item/inventory/Slot.java b/src/main/java/org/spongepowered/api/item/inventory/Slot.java index 446f005b3a..4ff3b1cb66 100644 --- a/src/main/java/org/spongepowered/api/item/inventory/Slot.java +++ b/src/main/java/org/spongepowered/api/item/inventory/Slot.java @@ -38,14 +38,6 @@ public interface Slot extends Inventory { */ Slot viewedSlot(); - /** - * @deprecated Use {@link #set(ItemStackLike)} instead. - */ - @Deprecated(forRemoval = true) - default InventoryTransactionResult set(ItemStack stack) { - return this.set((ItemStackLike) stack); - } - /** * Adds the ItemStack to this slot overwriting the existing item. * diff --git a/src/main/java/org/spongepowered/api/item/inventory/equipment/EquipmentInventory.java b/src/main/java/org/spongepowered/api/item/inventory/equipment/EquipmentInventory.java index 321069ebb1..9a3dd8cbac 100644 --- a/src/main/java/org/spongepowered/api/item/inventory/equipment/EquipmentInventory.java +++ b/src/main/java/org/spongepowered/api/item/inventory/equipment/EquipmentInventory.java @@ -89,14 +89,6 @@ default Optional peek(final Supplier equipme return this.peek(equipmentType.get()); } - /** - * @deprecated Use {@link #set(EquipmentType, ItemStackLike)} instead. - */ - @Deprecated(forRemoval = true) - default InventoryTransactionResult set(EquipmentType equipmentType, ItemStack stack) { - return this.set(equipmentType, (ItemStackLike) stack); - } - /** * Sets the item for the specified equipment type. * @@ -107,14 +99,6 @@ default InventoryTransactionResult set(EquipmentType equipmentType, ItemStack st */ InventoryTransactionResult set(EquipmentType equipmentType, ItemStackLike stack); - /** - * @deprecated Use {@link #set(Supplier, ItemStackLike)} instead. - */ - @Deprecated(forRemoval = true) - default InventoryTransactionResult set(final Supplier equipmentType, final ItemStack stack) { - return this.set(equipmentType, (ItemStackLike) stack); - } - default InventoryTransactionResult set(final Supplier equipmentType, final ItemStackLike stack) { return this.set(equipmentType.get(), stack); } diff --git a/src/main/java/org/spongepowered/api/item/inventory/slot/FilteringSlot.java b/src/main/java/org/spongepowered/api/item/inventory/slot/FilteringSlot.java index 97e94d11e0..a54883c7ba 100644 --- a/src/main/java/org/spongepowered/api/item/inventory/slot/FilteringSlot.java +++ b/src/main/java/org/spongepowered/api/item/inventory/slot/FilteringSlot.java @@ -25,7 +25,6 @@ package org.spongepowered.api.item.inventory.slot; import org.spongepowered.api.item.ItemType; -import org.spongepowered.api.item.inventory.ItemStack; import org.spongepowered.api.item.inventory.ItemStackLike; import org.spongepowered.api.item.inventory.Slot; @@ -34,14 +33,6 @@ */ public interface FilteringSlot extends Slot { - /** - * @deprecated Use {@link #isValidItem(ItemStackLike)} instead. - */ - @Deprecated(forRemoval = true) - default boolean isValidItem(ItemStack stack) { - return this.isValidItem((ItemStackLike) stack); - } - /** * Check whether the supplied item can be inserted into this slot. Returning * false from this method implies that {@link #offer} would always return diff --git a/src/main/java/org/spongepowered/api/item/inventory/slot/SidedSlot.java b/src/main/java/org/spongepowered/api/item/inventory/slot/SidedSlot.java index 754977e8a5..eb6eda3aa5 100644 --- a/src/main/java/org/spongepowered/api/item/inventory/slot/SidedSlot.java +++ b/src/main/java/org/spongepowered/api/item/inventory/slot/SidedSlot.java @@ -25,7 +25,6 @@ package org.spongepowered.api.item.inventory.slot; import org.spongepowered.api.item.inventory.Inventory; -import org.spongepowered.api.item.inventory.ItemStack; import org.spongepowered.api.item.inventory.ItemStackLike; import org.spongepowered.api.item.inventory.Slot; import org.spongepowered.api.util.Direction; @@ -35,14 +34,6 @@ */ public interface SidedSlot extends Slot { - /** - * @deprecated Use {@link #canAccept(ItemStackLike, Direction)} instead. - */ - @Deprecated(forRemoval = true) - default boolean canAccept(ItemStack stack, Direction from) { - return this.canAccept((ItemStackLike) stack, from); - } - /** * Gets whether this slot can accept the specified item from the specified * direction. @@ -54,14 +45,6 @@ default boolean canAccept(ItemStack stack, Direction from) { */ boolean canAccept(ItemStackLike stack, Direction from); - /** - * @deprecated Use {@link #offer(ItemStackLike, Direction)} instead. - */ - @Deprecated(forRemoval = true) - default boolean offer(ItemStack stack, Direction from) { - return this.offer((ItemStackLike) stack, from); - } - /** * Attempts to insert the supplied stack into this inventory from the * specified direction. @@ -74,14 +57,6 @@ default boolean offer(ItemStack stack, Direction from) { */ boolean offer(ItemStackLike stack, Direction from); - /** - * @deprecated Use {@link #canGet(ItemStackLike, Direction)} instead. - */ - @Deprecated(forRemoval = true) - default boolean canGet(ItemStack stack, Direction from) { - return this.canGet((ItemStackLike) stack, from); - } - /** * Gets whether automation can extract the specified item from the specified * direction. diff --git a/src/main/java/org/spongepowered/api/item/inventory/transaction/InventoryTransactionResult.java b/src/main/java/org/spongepowered/api/item/inventory/transaction/InventoryTransactionResult.java index a516faaa56..a4a626c002 100644 --- a/src/main/java/org/spongepowered/api/item/inventory/transaction/InventoryTransactionResult.java +++ b/src/main/java/org/spongepowered/api/item/inventory/transaction/InventoryTransactionResult.java @@ -179,14 +179,6 @@ interface Builder extends org.spongepowered.api.util.Builder itemStacks); - /** - * @deprecated Use {@link #poll(ItemStackLike)} instead. - */ - @Deprecated(forRemoval = true) - default Builder.PollBuilder poll(ItemStackSnapshot itemStack) { - return this.poll((ItemStackLike) itemStack); - } - /** * Sets the provided {@link ItemStackLike} as the stack that has been polled from the inventory. * diff --git a/src/main/java/org/spongepowered/api/item/inventory/transaction/SlotTransaction.java b/src/main/java/org/spongepowered/api/item/inventory/transaction/SlotTransaction.java index da31f15953..5caa09f7bd 100644 --- a/src/main/java/org/spongepowered/api/item/inventory/transaction/SlotTransaction.java +++ b/src/main/java/org/spongepowered/api/item/inventory/transaction/SlotTransaction.java @@ -25,7 +25,6 @@ package org.spongepowered.api.item.inventory.transaction; import org.spongepowered.api.data.Transaction; -import org.spongepowered.api.item.inventory.ItemStack; import org.spongepowered.api.item.inventory.ItemStackLike; import org.spongepowered.api.item.inventory.ItemStackSnapshot; import org.spongepowered.api.item.inventory.Slot; @@ -51,14 +50,6 @@ public SlotTransaction(Slot slot, ItemStackSnapshot original, ItemStackSnapshot this.slot = Objects.requireNonNull(slot, "Slot cannot be null!"); } - /** - * @deprecated Use {@link #setCustom(ItemStackLike)} instead. - */ - @Deprecated(forRemoval = true) - public void setCustom(ItemStack stack) { - this.setCustom((ItemStackLike) stack); - } - /** * Sets the custom {@link ItemStackLike} output of this * {@link SlotTransaction}. diff --git a/src/main/java/org/spongepowered/api/item/inventory/type/GridInventory.java b/src/main/java/org/spongepowered/api/item/inventory/type/GridInventory.java index 48b6fd8470..ef26ed275a 100644 --- a/src/main/java/org/spongepowered/api/item/inventory/type/GridInventory.java +++ b/src/main/java/org/spongepowered/api/item/inventory/type/GridInventory.java @@ -96,14 +96,6 @@ public interface GridInventory extends Inventory2D { */ Optional peek(int x, int y); - /** - * @deprecated Use {@link #set(int, int, ItemStackLike)} instead. - */ - @Deprecated(forRemoval = true) - default InventoryTransactionResult set(int x, int y, ItemStack stack) { - return this.set(x, y, (ItemStackLike) stack); - } - /** * Sets the item in the specified slot. * diff --git a/src/main/java/org/spongepowered/api/item/inventory/type/Inventory2D.java b/src/main/java/org/spongepowered/api/item/inventory/type/Inventory2D.java index 990fa0dbcf..45d8c6db6a 100644 --- a/src/main/java/org/spongepowered/api/item/inventory/type/Inventory2D.java +++ b/src/main/java/org/spongepowered/api/item/inventory/type/Inventory2D.java @@ -74,14 +74,6 @@ default Optional peek(Vector2i pos) { return this.slot(pos).map(Inventory::peek); } - /** - * @deprecated Use {@link #set(Vector2i, ItemStackLike)} instead. - */ - @Deprecated(forRemoval = true) - default InventoryTransactionResult set(Vector2i pos, ItemStack stack) { - return this.set(pos, (ItemStackLike) stack); - } - /** * Sets the item in the specified slot. * diff --git a/src/main/java/org/spongepowered/api/item/inventory/type/ViewableInventory.java b/src/main/java/org/spongepowered/api/item/inventory/type/ViewableInventory.java index af76ba85db..3287ee2a97 100644 --- a/src/main/java/org/spongepowered/api/item/inventory/type/ViewableInventory.java +++ b/src/main/java/org/spongepowered/api/item/inventory/type/ViewableInventory.java @@ -33,7 +33,6 @@ import org.spongepowered.api.item.inventory.ContainerType; import org.spongepowered.api.item.inventory.Inventory; import org.spongepowered.api.item.inventory.ItemStackLike; -import org.spongepowered.api.item.inventory.ItemStackSnapshot; import org.spongepowered.api.item.inventory.Slot; import org.spongepowered.api.item.inventory.menu.InventoryMenu; import org.spongepowered.math.vector.Vector2i; @@ -248,14 +247,6 @@ interface BuildingStep { interface DummyStep extends BuildingStep { - /** - * @deprecated Use {@link #item(ItemStackLike)} instead. - */ - @Deprecated(forRemoval = true) - default BuildingStep item(ItemStackSnapshot item) { - return this.item((ItemStackLike) item); - } - /** * Sets the default item for the dummy-slots. * diff --git a/src/main/java/org/spongepowered/api/item/merchant/TradeOffer.java b/src/main/java/org/spongepowered/api/item/merchant/TradeOffer.java index b57641df73..bbb93ff2f0 100644 --- a/src/main/java/org/spongepowered/api/item/merchant/TradeOffer.java +++ b/src/main/java/org/spongepowered/api/item/merchant/TradeOffer.java @@ -28,7 +28,6 @@ import org.spongepowered.api.data.persistence.DataBuilder; import org.spongepowered.api.data.persistence.DataSerializable; import org.spongepowered.api.entity.living.Humanoid; -import org.spongepowered.api.item.inventory.ItemStack; import org.spongepowered.api.item.inventory.ItemStackLike; import org.spongepowered.api.item.inventory.ItemStackSnapshot; import org.spongepowered.api.util.CopyableBuilder; @@ -165,14 +164,6 @@ static Builder builder() { */ interface Builder extends org.spongepowered.api.util.Builder, CopyableBuilder, DataBuilder { - /** - * @deprecated Use {@link #firstBuyingItem(ItemStackLike)} instead. - */ - @Deprecated(forRemoval = true) - default Builder firstBuyingItem(ItemStack item) { - return this.firstBuyingItem((ItemStackLike) item); - } - /** *

Sets the first selling item of the trade offer to be * generated.

@@ -184,14 +175,6 @@ default Builder firstBuyingItem(ItemStack item) { */ Builder firstBuyingItem(ItemStackLike item); - /** - * @deprecated Use {@link #secondBuyingItem(ItemStackLike)} instead. - */ - @Deprecated(forRemoval = true) - default Builder secondBuyingItem(ItemStack item) { - return this.secondBuyingItem((ItemStackLike) item); - } - /** * Sets the second selling item of the trade offer to be generated. * @@ -200,14 +183,6 @@ default Builder secondBuyingItem(ItemStack item) { */ Builder secondBuyingItem(ItemStackLike item); - /** - * @deprecated Use {@link #sellingItem(ItemStackLike)} instead. - */ - @Deprecated(forRemoval = true) - default Builder sellingItem(ItemStack item) { - return this.sellingItem((ItemStackLike) item); - } - /** * Sets the selling item of the trade offer to be generated. * diff --git a/src/main/java/org/spongepowered/api/item/recipe/RecipeManager.java b/src/main/java/org/spongepowered/api/item/recipe/RecipeManager.java index 5ddae2894c..84ea899a8a 100644 --- a/src/main/java/org/spongepowered/api/item/recipe/RecipeManager.java +++ b/src/main/java/org/spongepowered/api/item/recipe/RecipeManager.java @@ -26,7 +26,6 @@ import org.spongepowered.api.ResourceKey; import org.spongepowered.api.item.inventory.ItemStackLike; -import org.spongepowered.api.item.inventory.ItemStackSnapshot; import org.spongepowered.api.item.recipe.cooking.CookingRecipe; import org.spongepowered.api.item.recipe.crafting.RecipeInput; import org.spongepowered.api.world.server.ServerWorld; @@ -77,14 +76,6 @@ default > Collection allOfType(Supplier> Collection findByResult(RecipeType type, ItemStackSnapshot result) { - return this.findByResult(type, (ItemStackLike) result); - } - /** * Returns all registered recipes of given type and with given item as a result. * @@ -95,14 +86,6 @@ default > Collection findByResult(RecipeType type, Ite */ > Collection findByResult(RecipeType type, ItemStackLike result); - /** - * @deprecated Use {@link #findByResult(Supplier, ItemStackLike)} instead. - */ - @Deprecated(forRemoval = true) - default > Collection findByResult(Supplier> supplier, ItemStackSnapshot result) { - return this.findByResult(supplier, (ItemStackLike) result); - } - /** * Gets all recipes with given item as a result. * @@ -138,14 +121,6 @@ default > Optional findMatchingRec return this.findMatchingRecipe(supplier.get(), input, world); } - /** - * @deprecated Use {@link #findCookingRecipe(RecipeType, ItemStackLike)} instead. - */ - @Deprecated(forRemoval = true) - default Optional findCookingRecipe(RecipeType type, ItemStackSnapshot ingredient) { - return this.findCookingRecipe(type, (ItemStackLike) ingredient); - } - /** * Finds a matching cooking recipe for given type and ingredient * @@ -156,14 +131,6 @@ default Optional findCookingRecipe(RecipeType ty */ Optional findCookingRecipe(RecipeType type, ItemStackLike ingredient); - /** - * @deprecated Use {@link #findCookingRecipe(Supplier, ItemStackLike)} instead. - */ - @Deprecated(forRemoval = true) - default Optional findCookingRecipe(Supplier> supplier, ItemStackSnapshot ingredient) { - return this.findCookingRecipe(supplier, (ItemStackLike) ingredient); - } - /** * Finds a matching cooking recipe for given type and ingredient * diff --git a/src/main/java/org/spongepowered/api/item/recipe/cooking/CookingRecipe.java b/src/main/java/org/spongepowered/api/item/recipe/cooking/CookingRecipe.java index 776725f7e0..4961745192 100644 --- a/src/main/java/org/spongepowered/api/item/recipe/cooking/CookingRecipe.java +++ b/src/main/java/org/spongepowered/api/item/recipe/cooking/CookingRecipe.java @@ -28,9 +28,7 @@ import org.spongepowered.api.Sponge; import org.spongepowered.api.datapack.DataPack; import org.spongepowered.api.item.ItemType; -import org.spongepowered.api.item.inventory.ItemStack; import org.spongepowered.api.item.inventory.ItemStackLike; -import org.spongepowered.api.item.inventory.ItemStackSnapshot; import org.spongepowered.api.item.recipe.Recipe; import org.spongepowered.api.item.recipe.RecipeRegistration; import org.spongepowered.api.item.recipe.RecipeType; @@ -64,14 +62,6 @@ static Builder builder() { */ Ingredient ingredient(); - /** - * @deprecated Use {@link #isValid(ItemStackLike)} instead. - */ - @Deprecated(forRemoval = true) - default boolean isValid(ItemStackSnapshot ingredient) { - return this.isValid((ItemStackLike) ingredient); - } - /** * Checks if the given {@link ItemStackLike} fits the required * constraints to craft this {@link CookingRecipe}. @@ -82,14 +72,6 @@ default boolean isValid(ItemStackSnapshot ingredient) { */ boolean isValid(ItemStackLike ingredient); - /** - * @deprecated Use {@link #result(ItemStackLike)} instead. - */ - @Deprecated(forRemoval = true) - default Optional result(ItemStackSnapshot ingredient) { - return this.result((ItemStackLike) ingredient); - } - /** *

Returns the {@link CookingResult} containing the resulting * {@link ItemStackLike} and the amount of experience released.

@@ -199,22 +181,6 @@ default EndStep result(Supplier result) { return this.result(result.get()); } - /** - * @deprecated Use {@link #result(ItemStackLike)} instead. - */ - @Deprecated(forRemoval = true) - default EndStep result(ItemStack result) { - return this.result((ItemStackLike) result); - } - - /** - * @deprecated Use {@link #result(ItemStackLike)} instead. - */ - @Deprecated(forRemoval = true) - default EndStep result(ItemStackSnapshot result) { - return this.result((ItemStackLike) result); - } - /** * Changes the result and returns this builder. The result is the * {@link ItemStackLike} created when the recipe is fulfilled. @@ -225,14 +191,6 @@ default EndStep result(ItemStackSnapshot result) { */ EndStep result(ItemStackLike result); - /** - * @deprecated Use {@link #result(Function, ItemStackLike)} instead. - */ - @Deprecated(forRemoval = true) - default EndStep result(final Function resultFunction, final ItemStack exemplaryResult) { - return this.result(resultFunction, (ItemStackLike) exemplaryResult); - } - /** * Sets the result function and an exemplary result. * diff --git a/src/main/java/org/spongepowered/api/item/recipe/crafting/Ingredient.java b/src/main/java/org/spongepowered/api/item/recipe/crafting/Ingredient.java index abefa1b908..0c862cfb50 100644 --- a/src/main/java/org/spongepowered/api/item/recipe/crafting/Ingredient.java +++ b/src/main/java/org/spongepowered/api/item/recipe/crafting/Ingredient.java @@ -54,15 +54,6 @@ static Ingredient empty() { return Sponge.game().factoryProvider().provide(Factory.class).empty(); } - /** - * @deprecated Use {@link #test(ItemStackLike)} instead. - */ - @Deprecated(forRemoval = true) - @Override - default boolean test(ItemStack itemStack) { - return this.test((ItemStackLike) itemStack); - } - boolean test(ItemStackLike item); /** @@ -197,14 +188,6 @@ interface Builder extends org.spongepowered.api.util.Builder... types); - /** - * @deprecated Use {@link #with(ItemStackLike...)} instead - */ - @Deprecated(forRemoval = true) - default Builder with(ItemStack... types) { - return this.with((ItemStackLike[]) types); - } - /** * Sets one or more ItemStackLike for matching the ingredient. * @@ -213,14 +196,6 @@ default Builder with(ItemStack... types) { */ Builder with(ItemStackLike... types); - /** - * @deprecated Use {@link #with(ResourceKey, Predicate, ItemStackLike...)} instead. - */ - @Deprecated(forRemoval = true) - default Builder with(ResourceKey resourceKey, Predicate predicate, ItemStack... exemplaryTypes) { - return this.with(resourceKey, itemStack -> predicate.test(itemStack.asMutable()), (ItemStackLike[]) exemplaryTypes); - } - /** * Sets a Predicate for matching the ingredient. *

Exemplary types are used for the vanilla recipe book.

@@ -232,14 +207,6 @@ default Builder with(ResourceKey resourceKey, Predicate predicate, It */ Builder with(ResourceKey resourceKey, Predicate predicate, ItemStackLike... exemplaryTypes); - /** - * @deprecated Use {@link #with(ItemStackLike...)} instead - */ - @Deprecated(forRemoval = true) - default Builder with(ItemStackSnapshot... types) { - return this.with((ItemStackLike[]) types); - } - /** * Sets the item tag for matching the ingredient. * diff --git a/src/main/java/org/spongepowered/api/item/recipe/crafting/RecipeInput.java b/src/main/java/org/spongepowered/api/item/recipe/crafting/RecipeInput.java index d31e8dcd1b..7ed37af433 100644 --- a/src/main/java/org/spongepowered/api/item/recipe/crafting/RecipeInput.java +++ b/src/main/java/org/spongepowered/api/item/recipe/crafting/RecipeInput.java @@ -66,14 +66,6 @@ interface Crafting extends RecipeInput { interface Factory { - /** - * @deprecated Use {@link #single(ItemStackLike)} instead. - */ - @Deprecated(forRemoval = true) - default RecipeInput.Single single(ItemStack stack) { - return this.single((ItemStackLike) stack); - } - /** * Creates a recipe input for * {@link CookingRecipe} and @@ -85,14 +77,6 @@ default RecipeInput.Single single(ItemStack stack) { */ RecipeInput.Single single(ItemStackLike stack); - /** - * @deprecated Use {@link #smithing(ItemStackLike, ItemStackLike, ItemStackLike)} instead. - */ - @Deprecated(forRemoval = true) - default RecipeInput.Smithing smithing(ItemStack templateStack, ItemStack baseStack, ItemStack additionStack) { - return this.smithing((ItemStackLike) templateStack, (ItemStackLike) baseStack, (ItemStackLike) additionStack); - } - /** * Creates a recipe input for {@link SmithingRecipe} * diff --git a/src/main/java/org/spongepowered/api/item/recipe/crafting/ShapedCraftingRecipe.java b/src/main/java/org/spongepowered/api/item/recipe/crafting/ShapedCraftingRecipe.java index 388f2dbd46..51c66981a7 100644 --- a/src/main/java/org/spongepowered/api/item/recipe/crafting/ShapedCraftingRecipe.java +++ b/src/main/java/org/spongepowered/api/item/recipe/crafting/ShapedCraftingRecipe.java @@ -30,7 +30,6 @@ import org.spongepowered.api.datapack.DataPack; import org.spongepowered.api.item.inventory.ItemStack; import org.spongepowered.api.item.inventory.ItemStackLike; -import org.spongepowered.api.item.inventory.ItemStackSnapshot; import org.spongepowered.api.item.recipe.RecipeRegistration; import org.spongepowered.api.util.ResourceKeyedBuilder; @@ -215,27 +214,9 @@ interface ResultStep extends Builder { * @param remainingItemsFunction the remaining items function * * @return This builder, for chaining - * @deprecated Will be replaced with ItemStackLike variant */ - @Deprecated ResultStep remainingItems(Function> remainingItemsFunction); - /** - * @deprecated Use {@link #result(ItemStackLike)} instead. - */ - @Deprecated(forRemoval = true) - default EndStep result(ItemStackSnapshot result) { - return this.result((ItemStackLike) result); - } - - /** - * @deprecated Use {@link #result(ItemStackLike)} instead. - */ - @Deprecated(forRemoval = true) - default EndStep result(ItemStack result) { - return this.result((ItemStackLike) result); - } - /** * Sets the resultant {@link ItemStackLike} for when this shaped * recipe is correctly crafted. @@ -246,14 +227,6 @@ default EndStep result(ItemStack result) { */ EndStep result(ItemStackLike result); - /** - * @deprecated Use {@link #result(Function, ItemStackLike)} instead. - */ - @Deprecated(forRemoval = true) - default EndStep result(Function resultFunction, ItemStack exemplaryResult) { - return this.result(resultFunction, (ItemStackLike) exemplaryResult); - } - /** * Sets the result function and an exemplary result. *

Use {@link ItemStack#empty()} as exemplary result if the function returns different items.

diff --git a/src/main/java/org/spongepowered/api/item/recipe/crafting/ShapelessCraftingRecipe.java b/src/main/java/org/spongepowered/api/item/recipe/crafting/ShapelessCraftingRecipe.java index f32e54eab2..a14e4f9382 100644 --- a/src/main/java/org/spongepowered/api/item/recipe/crafting/ShapelessCraftingRecipe.java +++ b/src/main/java/org/spongepowered/api/item/recipe/crafting/ShapelessCraftingRecipe.java @@ -29,9 +29,7 @@ import org.spongepowered.api.Sponge; import org.spongepowered.api.datapack.DataPack; import org.spongepowered.api.item.ItemType; -import org.spongepowered.api.item.inventory.ItemStack; import org.spongepowered.api.item.inventory.ItemStackLike; -import org.spongepowered.api.item.inventory.ItemStackSnapshot; import org.spongepowered.api.item.recipe.RecipeRegistration; import org.spongepowered.api.util.ResourceKeyedBuilder; @@ -101,22 +99,6 @@ interface ResultStep extends Builder { */ ResultStep remainingItems(Function> remainingItemsFunction); - /** - * @deprecated Use {@link #result(ItemStackLike)} instead. - */ - @Deprecated(forRemoval = true) - default EndStep result(ItemStackSnapshot result) { - return this.result((ItemStackLike) result); - } - - /** - * @deprecated Use {@link #result(ItemStackLike)} instead. - */ - @Deprecated(forRemoval = true) - default EndStep result(ItemStack result) { - return this.result((ItemStackLike) result); - } - /** * Sets the result and returns this builder. The result is the * {@link ItemStackLike} created when the recipe is fulfilled. @@ -127,14 +109,6 @@ default EndStep result(ItemStack result) { */ EndStep result(ItemStackLike result); - /** - * @deprecated Use {@link #result(Function, ItemStackLike)} instead. - */ - @Deprecated(forRemoval = true) - default EndStep result(Function resultFunction, ItemStack exemplaryResult) { - return this.result(resultFunction, (ItemStackLike) exemplaryResult); - } - /** * Sets the result function and an exemplary result. *

The exemplary result is used for the recipe book.

diff --git a/src/main/java/org/spongepowered/api/item/recipe/crafting/SpecialCraftingRecipe.java b/src/main/java/org/spongepowered/api/item/recipe/crafting/SpecialCraftingRecipe.java index 8f5e35d5bc..c8be1acd85 100644 --- a/src/main/java/org/spongepowered/api/item/recipe/crafting/SpecialCraftingRecipe.java +++ b/src/main/java/org/spongepowered/api/item/recipe/crafting/SpecialCraftingRecipe.java @@ -26,7 +26,6 @@ import org.spongepowered.api.Sponge; import org.spongepowered.api.datapack.DataPack; -import org.spongepowered.api.item.inventory.ItemStack; import org.spongepowered.api.item.inventory.ItemStackLike; import org.spongepowered.api.item.recipe.RecipeRegistration; import org.spongepowered.api.util.ResourceKeyedBuilder; @@ -86,14 +85,6 @@ interface ResultStep extends Builder { */ EndStep result(Function resultFunction); - /** - * @deprecated Use {@link #result(ItemStackLike)} instead; - */ - @Deprecated(forRemoval = true) - default EndStep result(ItemStack result) { - return this.result((ItemStackLike) result); - } - /** * Sets the result * diff --git a/src/main/java/org/spongepowered/api/item/recipe/single/StoneCutterRecipe.java b/src/main/java/org/spongepowered/api/item/recipe/single/StoneCutterRecipe.java index 4f4ec3fce7..33e30fd3d3 100644 --- a/src/main/java/org/spongepowered/api/item/recipe/single/StoneCutterRecipe.java +++ b/src/main/java/org/spongepowered/api/item/recipe/single/StoneCutterRecipe.java @@ -29,9 +29,7 @@ import org.spongepowered.api.Sponge; import org.spongepowered.api.datapack.DataPack; import org.spongepowered.api.item.ItemType; -import org.spongepowered.api.item.inventory.ItemStack; import org.spongepowered.api.item.inventory.ItemStackLike; -import org.spongepowered.api.item.inventory.ItemStackSnapshot; import org.spongepowered.api.item.recipe.Recipe; import org.spongepowered.api.item.recipe.RecipeRegistration; import org.spongepowered.api.item.recipe.RecipeType; @@ -90,22 +88,6 @@ default ResultStep ingredient(Supplier ingredient) { interface ResultStep extends StoneCutterRecipe.Builder { - /** - * @deprecated Use {@link #result(ItemStackLike)} instead. - */ - @Deprecated(forRemoval = true) - default EndStep result(ItemStackSnapshot result) { - return this.result((ItemStackLike) result); - } - - /** - * @deprecated Use {@link #result(ItemStackLike)} instead. - */ - @Deprecated(forRemoval = true) - default EndStep result(ItemStack result) { - return this.result((ItemStackLike) result); - } - /** * Changes the result and returns this builder. The result is the * {@link ItemStackLike} created when the recipe is fulfilled. @@ -116,14 +98,6 @@ default EndStep result(ItemStack result) { */ EndStep result(ItemStackLike result); - /** - * @deprecated Use {@link #result(Function, ItemStackLike)} instead. - */ - @Deprecated(forRemoval = true) - default EndStep result(Function resultFunction, ItemStack exemplaryResult) { - return this.result(resultFunction, (ItemStackLike) exemplaryResult); - } - /** * Changes the result and returns this builder. The result is the * {@link ItemStackLike} created when the recipe is fulfilled. diff --git a/src/main/java/org/spongepowered/api/item/recipe/smithing/SmithingRecipe.java b/src/main/java/org/spongepowered/api/item/recipe/smithing/SmithingRecipe.java index 9520273623..dc344d53f3 100644 --- a/src/main/java/org/spongepowered/api/item/recipe/smithing/SmithingRecipe.java +++ b/src/main/java/org/spongepowered/api/item/recipe/smithing/SmithingRecipe.java @@ -29,9 +29,7 @@ import org.spongepowered.api.Sponge; import org.spongepowered.api.datapack.DataPack; import org.spongepowered.api.item.ItemType; -import org.spongepowered.api.item.inventory.ItemStack; import org.spongepowered.api.item.inventory.ItemStackLike; -import org.spongepowered.api.item.inventory.ItemStackSnapshot; import org.spongepowered.api.item.recipe.Recipe; import org.spongepowered.api.item.recipe.RecipeRegistration; import org.spongepowered.api.item.recipe.RecipeType; @@ -155,22 +153,6 @@ default ResultStep addition(Supplier ingredient) { interface ResultStep extends SmithingRecipe.Builder { - /** - * @deprecated Use {@link #result(ItemStackLike)} instead. - */ - @Deprecated(forRemoval = true) - default EndStep result(ItemStackSnapshot result) { - return this.result((ItemStackLike) result); - } - - /** - * @deprecated Use {@link #result(ItemStackLike)} instead. - */ - @Deprecated(forRemoval = true) - default EndStep result(ItemStack result) { - return this.result((ItemStackLike) result); - } - /** * Changes the result and returns this builder. The result is the * {@link ItemStackLike} created when the recipe is fulfilled. @@ -181,14 +163,6 @@ default EndStep result(ItemStack result) { */ EndStep result(ItemStackLike result); - /** - * @deprecated Use {@link #result(Function, ItemStackLike)} instead. - */ - @Deprecated(forRemoval = true) - default EndStep result(Function resultFunction, ItemStack exemplaryResult) { - return this.result(resultFunction, (ItemStackLike) exemplaryResult); - } - /** * Changes the result and returns this builder. The result is the * {@link ItemStackLike} created when the recipe is fulfilled.