Merge pull request #37 from rowan-vr/35-fix-crafting-multiple-using-s…

…hift

Fixed multiple crafting counted as one

core/src/main/java/me/tippie/customadvancements/advancement/types/CraftItem.java

@@ -5,6 +5,9 @@
 import org.bukkit.Material;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.inventory.CraftItemEvent;
+import org.bukkit.inventory.CraftingInventory;
+import org.bukkit.inventory.Inventory;
+import org.bukkit.inventory.ItemStack;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -21,8 +24,37 @@ public void onBlockPlace(final CraftItemEvent event) {
 
 	@Override protected void onProgress(final CraftItemEvent event, String value, final String path) {
 		val player = event.getView().getPlayer();
+
+		int recipeAmount = event.getRecipe().getResult().getAmount();
+
+		switch (event.getClick()) {
+			case NUMBER_KEY:
+				if (event.getWhoClicked().getInventory().getItem(event.getHotbarButton()) != null)
+					recipeAmount = 0;
+				break;
+			case DROP:
+			case CONTROL_DROP:
+				ItemStack cursor = event.getCursor();
+				if (cursor == null || cursor.getType() != Material.AIR)
+					recipeAmount = 0;
+				break;
+			case SHIFT_RIGHT:
+			case SHIFT_LEFT:
+				if (recipeAmount == 0)
+					break;
+
+				int maxCraftable = getMaxCraftAmount(event.getInventory());
+				int capacity = fits(event.getRecipe().getResult(), event.getView().getBottomInventory());
+				if (capacity < maxCraftable)
+					maxCraftable = ((capacity + recipeAmount - 1) / recipeAmount) * recipeAmount;
+
+				recipeAmount = maxCraftable;
+				break;
+			default:
+		}
+
 		if (value == null || value.equalsIgnoreCase("any")) {
-			progression(1, path, player.getUniqueId());
+			progression(recipeAmount, path, player.getUniqueId());
 		} else {
 			boolean not = false;
 			if (value.startsWith("!")) {
@@ -34,8 +66,35 @@ public void onBlockPlace(final CraftItemEvent event) {
 			for (final String materialString : materialStrings)
 				materials.add(Material.getMaterial(materialString.toUpperCase()));
 			if ((materials.contains(event.getRecipe().getResult().getType()) && !not) || (!materials.contains(event.getRecipe().getResult().getType()) && not)) {
-				progression(1, path, player.getUniqueId());
+				progression(recipeAmount, path, player.getUniqueId());
 			}
 		}
 	}
+
+	private static int getMaxCraftAmount(CraftingInventory inventory) {
+		if (inventory.getResult() == null)
+			return 0;
+
+		int resultCount = inventory.getResult().getAmount();
+		int materialCount = Integer.MAX_VALUE;
+
+		for (ItemStack item : inventory.getMatrix())
+			if (item != null && item.getAmount() < materialCount)
+				materialCount = item.getAmount();
+
+		return resultCount * materialCount;
+	}
+
+	private static int fits(ItemStack item, Inventory inventory) {
+		ItemStack[] contents = inventory.getContents();
+		int result = 0;
+
+		for (ItemStack is : contents)
+			if (is == null)
+				result += item.getMaxStackSize();
+			else if (is.isSimilar(item))
+				result += Math.max(item.getMaxStackSize() - is.getAmount(), 0);
+
+		return result;
+	}
 }

core/src/main/resources/advancement-trees/example.yml

@@ -9,7 +9,7 @@ options:
   item: OAK_SAPLING
   gui_location: auto
   minecraft-gui-display: true
-  minecraft-gui-background: "textures/block/dirt"
+  minecraft-gui-background: "textures/block/anvil.png"
 advancements:
   requirementadvancement:
     type: BlockBreak