From dfd6ec59f998462862ff3b3ac7395d8e53fca4e3 Mon Sep 17 00:00:00 2001
From: Traqueur <54551467+Traqueur-dev@users.noreply.github.com>
Date: Mon, 14 Apr 2025 21:23:59 +0200
Subject: [PATCH] fix: ia hook (#23)

---
 gradle.properties                                   |  2 +-
 .../traqueur/recipes/impl/PrepareCraftListener.java |  2 +-
 .../impl/hook/hooks/ItemsAdderIngredient.java       | 13 ++++++++++---
 src/main/resources/version.properties               |  2 +-
 4 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index e997a9a..516314f 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1 +1 @@
-version=2.0.0
\ No newline at end of file
+version=2.0.1
\ No newline at end of file
diff --git a/src/main/java/fr/traqueur/recipes/impl/PrepareCraftListener.java b/src/main/java/fr/traqueur/recipes/impl/PrepareCraftListener.java
index 7a82c7e..903f406 100644
--- a/src/main/java/fr/traqueur/recipes/impl/PrepareCraftListener.java
+++ b/src/main/java/fr/traqueur/recipes/impl/PrepareCraftListener.java
@@ -193,7 +193,7 @@ private void checkGoodShapedRecipe(ItemRecipe itemRecipe, PrepareItemCraftEvent
      * @param event the event
      */
     private void checkGoodShapelessRecipe(ItemRecipe itemRecipe, PrepareItemCraftEvent event) {
-        List<ItemStack> matrix = Arrays.stream(event.getInventory().getMatrix()).filter(Objects::nonNull).toList();
+        List<ItemStack> matrix = Arrays.stream(event.getInventory().getMatrix()).filter(Objects::nonNull).filter(it -> it.getType() != Material.AIR).toList();
         Ingredient[] itemIngredients = itemRecipe.ingredients();
 
         AtomicBoolean isSimilar = new AtomicBoolean(true);
diff --git a/src/main/java/fr/traqueur/recipes/impl/hook/hooks/ItemsAdderIngredient.java b/src/main/java/fr/traqueur/recipes/impl/hook/hooks/ItemsAdderIngredient.java
index 621b97d..e92fe02 100644
--- a/src/main/java/fr/traqueur/recipes/impl/hook/hooks/ItemsAdderIngredient.java
+++ b/src/main/java/fr/traqueur/recipes/impl/hook/hooks/ItemsAdderIngredient.java
@@ -23,10 +23,10 @@ public class ItemsAdderIngredient extends Ingredient {
      */
     public ItemsAdderIngredient(String data, Character sign) {
         super(sign);
-        if(!CustomStack.isInRegistry(data)) {
+        this.customStack = CustomStack.getInstance(data);
+        if(this.customStack == null) {
             throw new IllegalArgumentException("The item " + data + " is not registered in ItemsAdder.");
         }
-        this.customStack = CustomStack.getInstance(data);
     }
 
     /**
@@ -42,7 +42,10 @@ public ItemsAdderIngredient(String data) {
      */
     @Override
     public boolean isSimilar(ItemStack ingredient) {
-        return this.customStack.getItemStack().isSimilar(ingredient);
+        CustomStack item = CustomStack.byItemStack(ingredient);
+        if (item == null) return false;
+        if (!item.getNamespacedID().equals(this.customStack.getNamespacedID())) return false;
+        return true;
     }
 
     /**
@@ -53,4 +56,8 @@ public RecipeChoice choice() {
         return new RecipeChoice.MaterialChoice(this.customStack.getItemStack().getType());
     }
 
+    @Override
+    public String toString() {
+        return this.customStack.getNamespacedID();
+    }
 }
diff --git a/src/main/resources/version.properties b/src/main/resources/version.properties
index e997a9a..516314f 100644
--- a/src/main/resources/version.properties
+++ b/src/main/resources/version.properties
@@ -1 +1 @@
-version=2.0.0
\ No newline at end of file
+version=2.0.1
\ No newline at end of file