From ecb77fc84703c943597c8aeb7fd0f8bd5fa1fa21 Mon Sep 17 00:00:00 2001 From: TheMode Date: Mon, 12 Apr 2021 00:07:38 +0200 Subject: [PATCH] Rename FillOption to TransactionOption --- .../server/inventory/AbstractInventory.java | 30 +++++++++---------- ...FillOption.java => TransactionOption.java} | 8 ++--- src/test/java/demo/commands/GiveCommand.java | 4 +-- 3 files changed, 21 insertions(+), 21 deletions(-) rename src/main/java/net/minestom/server/inventory/{FillOption.java => TransactionOption.java} (78%) diff --git a/src/main/java/net/minestom/server/inventory/AbstractInventory.java b/src/main/java/net/minestom/server/inventory/AbstractInventory.java index d90300c01..1385a7c4d 100644 --- a/src/main/java/net/minestom/server/inventory/AbstractInventory.java +++ b/src/main/java/net/minestom/server/inventory/AbstractInventory.java @@ -53,11 +53,11 @@ public abstract class AbstractInventory implements InventoryClickHandler, DataCo /** * Adds an {@link ItemStack} to the inventory and sends relevant update to the viewer(s). * - * @param itemStack the item to add - * @param fillOption the filling option + * @param itemStack the item to add + * @param transactionOption the transaction option * @return true if the item has been successfully added, false otherwise */ - public synchronized @NotNull T addItemStack(@NotNull ItemStack itemStack, @NotNull FillOption fillOption) { + public synchronized @NotNull T addItemStack(@NotNull ItemStack itemStack, @NotNull TransactionOption transactionOption) { Int2ObjectMap itemChangesMap = new Int2ObjectOpenHashMap<>(); final StackingRule stackingRule = itemStack.getStackingRule(); @@ -99,25 +99,25 @@ public abstract class AbstractInventory implements InventoryClickHandler, DataCo break; } - return fillOption.fill(this, itemStack, itemChangesMap); + return transactionOption.fill(this, itemStack, itemChangesMap); } public synchronized boolean addItemStack(@NotNull ItemStack itemStack) { - return addItemStack(itemStack, FillOption.ALL_OR_NOTHING); + return addItemStack(itemStack, TransactionOption.ALL_OR_NOTHING); } /** * Adds {@link ItemStack}s to the inventory and sends relevant updates to the viewer(s). * - * @param itemStacks items to add - * @param fillOption the filling option + * @param itemStacks items to add + * @param transactionOption the transaction option * @return the operation results */ - public @NotNull List<@NotNull T> addItemStacks(@NotNull List itemStacks, @NotNull FillOption fillOption) { + public @NotNull List<@NotNull T> addItemStacks(@NotNull List itemStacks, @NotNull TransactionOption transactionOption) { List result = new ArrayList<>(itemStacks.size()); itemStacks.forEach(itemStack -> { - T fillResult = addItemStack(itemStack, fillOption); - result.add(fillResult); + T transactionResult = addItemStack(itemStack, transactionOption); + result.add(transactionResult); }); return result; } @@ -128,7 +128,7 @@ public abstract class AbstractInventory implements InventoryClickHandler, DataCo * @param itemStack the item to take * @return true if the item has been successfully fully taken, false otherwise */ - public T takeItemStack(@NotNull ItemStack itemStack, @NotNull FillOption fillOption) { + public T takeItemStack(@NotNull ItemStack itemStack, @NotNull TransactionOption transactionOption) { Int2ObjectMap itemChangesMap = new Int2ObjectOpenHashMap<>(); final StackingRule stackingRule = itemStack.getStackingRule(); for (int i = 0; i < getInnerSize(); i++) { @@ -153,7 +153,7 @@ public abstract class AbstractInventory implements InventoryClickHandler, DataCo } } - return fillOption.fill(this, itemStack, itemChangesMap); + return transactionOption.fill(this, itemStack, itemChangesMap); } /** @@ -162,11 +162,11 @@ public abstract class AbstractInventory implements InventoryClickHandler, DataCo * @param itemStacks items to take * @return the operation results */ - public @NotNull List takeItemStacks(@NotNull List itemStacks, @NotNull FillOption fillOption) { + public @NotNull List takeItemStacks(@NotNull List itemStacks, @NotNull TransactionOption transactionOption) { List result = new ArrayList<>(itemStacks.size()); itemStacks.forEach(itemStack -> { - T fillResult = takeItemStack(itemStack, fillOption); - result.add(fillResult); + T transactionResult = takeItemStack(itemStack, transactionOption); + result.add(transactionResult); }); return result; } diff --git a/src/main/java/net/minestom/server/inventory/FillOption.java b/src/main/java/net/minestom/server/inventory/TransactionOption.java similarity index 78% rename from src/main/java/net/minestom/server/inventory/FillOption.java rename to src/main/java/net/minestom/server/inventory/TransactionOption.java index 3d8b46086..313f9a3ed 100644 --- a/src/main/java/net/minestom/server/inventory/FillOption.java +++ b/src/main/java/net/minestom/server/inventory/TransactionOption.java @@ -6,14 +6,14 @@ import org.jetbrains.annotations.NotNull; import java.util.Map; @FunctionalInterface -public interface FillOption { +public interface TransactionOption { /** * Place as much as the item as possible. *

* The remaining, can be air. */ - FillOption<@NotNull ItemStack> ALL = (inventory, result, itemChangesMap) -> { + TransactionOption<@NotNull ItemStack> ALL = (inventory, result, itemChangesMap) -> { itemChangesMap.forEach(inventory::safeItemInsert); return result; }; @@ -23,7 +23,7 @@ public interface FillOption { *

* Returns true if the item has been added, false if nothing changed. */ - FillOption<@NotNull Boolean> ALL_OR_NOTHING = (inventory, result, itemChangesMap) -> { + TransactionOption<@NotNull Boolean> ALL_OR_NOTHING = (inventory, result, itemChangesMap) -> { if (result.isAir()) { // Item can be fully placed inside the inventory, do so itemChangesMap.forEach(inventory::safeItemInsert); @@ -39,7 +39,7 @@ public interface FillOption { *

* Returns true if the item can be fully added, false otherwise. */ - FillOption<@NotNull Boolean> DRY_RUN = (inventory, result, itemChangesMap) -> result.isAir(); + TransactionOption<@NotNull Boolean> DRY_RUN = (inventory, result, itemChangesMap) -> result.isAir(); @NotNull T fill(@NotNull AbstractInventory inventory, @NotNull ItemStack result, diff --git a/src/test/java/demo/commands/GiveCommand.java b/src/test/java/demo/commands/GiveCommand.java index a10373666..e4d03307c 100644 --- a/src/test/java/demo/commands/GiveCommand.java +++ b/src/test/java/demo/commands/GiveCommand.java @@ -4,7 +4,7 @@ import net.kyori.adventure.text.Component; import net.minestom.server.command.builder.Command; import net.minestom.server.entity.Entity; import net.minestom.server.entity.Player; -import net.minestom.server.inventory.FillOption; +import net.minestom.server.inventory.TransactionOption; import net.minestom.server.item.ItemStack; import net.minestom.server.utils.entity.EntityFinder; @@ -44,7 +44,7 @@ public class GiveCommand extends Command { for (Entity target : targets) { if (target instanceof Player) { Player player = (Player) target; - player.getInventory().addItemStacks(itemStacks, FillOption.ALL); + player.getInventory().addItemStacks(itemStacks, TransactionOption.ALL); } }