Pipe support for crafter, decorated_pot and chiseled_bookshelf (#1333)

* add pipe support for crafter, decorated_pot and chiseled_bookshelf

added crafter, decorated_pot as pipe input and output
added chiseled_bookshelf as pipe input
fixed non book items getting deleted when using chiseled_bookshelf as pipe output

* fix pipe event leftovers not respecting disabled slots of crafters

---------

Co-authored-by: ANRAR4 <->

Author: ANRAR4

src/main/java/com/sk89q/craftbook/mechanics/pipe/Pipes.java

@@ -29,6 +29,7 @@
 import org.bukkit.block.Dropper;
 import org.bukkit.block.Furnace;
 import org.bukkit.block.Jukebox;
+import org.bukkit.block.Crafter;
 import org.bukkit.block.data.BlockData;
 import org.bukkit.block.data.Directional;
 import org.bukkit.block.data.type.Piston;
@@ -357,6 +358,9 @@ private void startPipe(Block block, List<ItemStack> items, boolean request) {
                     || fac.getType() == Material.DISPENSER
                     || fac.getType() == Material.HOPPER
                     || fac.getType() == Material.BARREL
+                    || fac.getType() == Material.CHISELED_BOOKSHELF
+                    || fac.getType() == Material.CRAFTER
+                    || fac.getType() == Material.DECORATED_POT
                     || Tag.SHULKER_BOXES.isTagged(fac.getType())) {
                 for (ItemStack stack : ((InventoryHolder) fac.getState()).getInventory().getContents()) {
 
@@ -382,9 +386,13 @@ private void startPipe(Block block, List<ItemStack> items, boolean request) {
                 }
 
                 if (!items.isEmpty()) {
-                    for (ItemStack item : items) {
-                        if (item == null) continue;
-                        leftovers.addAll(((InventoryHolder) fac.getState()).getInventory().addItem(item).values());
+                    if (fac.getType() == Material.CRAFTER)
+                        leftovers.addAll(InventoryUtil.addItemsToCrafter((Crafter) fac.getState(), items.toArray(new ItemStack[items.size()])));
+                    else {
+                        for (ItemStack item : items) {
+                            if (item == null) continue;
+                            leftovers.addAll(((InventoryHolder) fac.getState()).getInventory().addItem(item).values());
+                        }
                     }
                 }
             } else if (fac.getType() == Material.FURNACE || fac.getType() == Material.BLAST_FURNACE || fac.getType() == Material.SMOKER) {

src/main/java/com/sk89q/craftbook/util/InventoryUtil.java

@@ -4,6 +4,8 @@
 import org.bukkit.block.Block;
 import org.bukkit.block.BrewingStand;
 import org.bukkit.block.Chest;
+import org.bukkit.block.ChiseledBookshelf;
+import org.bukkit.block.Crafter;
 import org.bukkit.block.Furnace;
 import org.bukkit.block.ShulkerBox;
 import org.bukkit.entity.Player;
@@ -19,6 +21,7 @@
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
+import java.util.stream.IntStream;
 
 /**
  * Class for utilities that include adding items to a furnace based on if it is a fuel or not, and adding items to a chest. Also will include methdos for checking contents and removing.
@@ -49,6 +52,10 @@ public static List<ItemStack> addItemsToInventory(InventoryHolder container, boo
             return addItemsToFurnace((Furnace) container, stacks);
         } else if(container instanceof BrewingStand) {
             return addItemsToBrewingStand((BrewingStand) container, stacks);
+        } else if(container instanceof Crafter) {
+            return addItemsToCrafter((Crafter) container, stacks);
+        } else if(container instanceof ChiseledBookshelf) {
+            return addItemsToChiseledBookshelf((ChiseledBookshelf) container, stacks);
         } else { //Basic inventories like chests, dispensers, storage carts, etc.
             List<ItemStack> leftovers = new ArrayList<>();
             if (container instanceof ShulkerBox) {
@@ -156,6 +163,58 @@ public static List<ItemStack> addItemsToBrewingStand(BrewingStand brewingStand,
         return leftovers;
     }
 
+    /**
+     * Adds items to a Crafter, respecting disabled slots, returning the leftovers.
+     * 
+     * @param crafter The Crafter to add the items to.
+     * @param stacks The stacks to add to the inventory.
+     * @return The stacks that could not be added.
+     */
+    public static List<ItemStack> addItemsToCrafter(Crafter crafter, ItemStack ... stacks) {
+
+        List<ItemStack> leftovers = new ArrayList<>();
+        int[] availableSlots = IntStream.rangeClosed(0, crafter.getInventory().getSize() - 1).filter(slot -> !crafter.isSlotDisabled(slot)).toArray();
+        
+        for(ItemStack stack : stacks) {
+            Inventory inv = crafter.getInventory();
+            
+            for (int i : availableSlots) {
+                if (stack == null) {
+                    break;
+                }
+                if (inv.getItem(i) == null) {
+                    inv.setItem(i, stack);
+                    stack = null;
+                } else {
+                    stack = ItemUtil.addToStack(inv.getItem(i), stack);
+                }
+            }
+            if (stack != null) {
+                leftovers.add(stack);
+            }
+        }
+        return leftovers;
+    }
+
+    /**
+     * Adds items to a chiseled bookshelf.
+     * 
+     * @param chiseledBookshelf The chiseled bookshelf to add the items to.
+     * @param stacks The stacks to add to the inventory.
+     * @return The stacks that could not be added.
+     */
+    public static List<ItemStack> addItemsToChiseledBookshelf(ChiseledBookshelf chiseledBookshelf, ItemStack ... stacks) {
+
+        List<ItemStack> leftovers = new ArrayList<>();
+        
+        Arrays.stream(stacks).filter(item -> !ItemUtil.isAStorableBook(item)).forEach(leftovers::add);
+        stacks = Arrays.stream(stacks).filter(item -> ItemUtil.isAStorableBook(item)).toArray(ItemStack[]::new);
+
+        leftovers.addAll(chiseledBookshelf.getInventory().addItem(stacks).values());
+
+        return leftovers;
+    }
+
     /**
      * Checks whether the inventory contains all the given itemstacks.
      * 
@@ -308,6 +367,8 @@ public static boolean doesBlockHaveInventory(Block block) {
             case SMOKER:
             case BARREL:
             case CHISELED_BOOKSHELF:
+            case DECORATED_POT:
+            case CRAFTER:
                 return true;
             default:
                 return false;

src/main/java/com/sk89q/craftbook/util/ItemUtil.java

@@ -797,6 +797,26 @@ public static boolean isAPotionIngredient(ItemStack item) {
         }
     }
 
+    /**
+     * Checks whether an item can be put in a chiseled bookshelf.
+     * 
+     * @param item The item to check.
+     * @return If the item can be put in a chiseled bookshelf.
+     */
+    public static boolean isAStorableBook(ItemStack item) {
+
+        switch(item.getType()) {
+            case BOOK:
+            case WRITABLE_BOOK:
+            case WRITTEN_BOOK:
+            case ENCHANTED_BOOK:
+            case KNOWLEDGE_BOOK:
+                return true;
+            default:
+                return false;
+        }
+    }
+
     public static boolean containsRawFood(Inventory inv) {
 
         return getRawFood(inv).size() > 0;