Traqueur-dev
diff --git a/‎README.md‎
Lines changed: 224 additions & 2 deletions b/‎README.md‎
Lines changed: 224 additions & 2 deletions
diff --git a/‎build.gradle‎
Lines changed: 3 additions & 1 deletion b/‎build.gradle‎
Lines changed: 3 additions & 1 deletion
diff --git a/‎jitpack.yml‎
Lines changed: 3 additions & 1 deletion b/‎jitpack.yml‎
Lines changed: 3 additions & 1 deletion
diff --git a/‎src/main/java/fr/traqueur/recipes/api/RecipeLoader.java‎
Lines changed: 19 additions & 19 deletions b/‎src/main/java/fr/traqueur/recipes/api/RecipeLoader.java‎
Lines changed: 19 additions & 19 deletions
@@ -6,7 +6,9 @@
 
 ## Features
 - **Create Custom Recipes**: Add shaped, shapeless, furnace, and other types of recipes with ease.
+- **Recipe Priority System**: Control recipe registration order to handle conflicting recipes (higher priority = registered first).
 - **Advanced Recipe Handling**: Support for custom ingredients with metadata (lore, custom model data, persistent data container).
+- **Strict Ingredient Matching**: Option to require exact item matches including all metadata for precise recipe control.
 - **Easy Integration**: Simple API to integrate into any Spigot plugin.
 - **Plugin Hooks**: Built-in support for ItemsAdder and Oraxen items. You can create your own hook with your custom item systems.
 - **Version Compatibility**: Works with recent Spigot versions and allows you to create recipes dynamically.
@@ -90,9 +92,19 @@ public final class TestPlugin extends JavaPlugin {
                 .setName("example-custom-ingredient")
                 .setResult(new ItemStack(Material.DIAMOND))
                 .setAmount(64)
-                .addIngredient(magicPaper)
+                .addIngredient(magicPaper, false)  // false = normal matching (lore must match)
                 .build();
 
+        // 3b. Same recipe but with strict matching (exact item required)
+        ItemRecipe recipe3strict = new RecipeBuilder()
+                .setType(RecipeType.CRAFTING_SHAPELESS)
+                .setName("example-custom-ingredient-strict")
+                .setResult(new ItemStack(Material.EMERALD))
+                .setAmount(32)
+                .addIngredient(magicPaper, true)  // true = strict matching (all metadata must match)
+                .setPriority(10)  // Higher priority than normal recipes
+                .build();
+        
         // 4. Furnace smelting recipe with cooking time and experience
         ItemRecipe recipe4 = new RecipeBuilder()
                 .setType(RecipeType.SMELTING)
@@ -108,6 +120,7 @@ public final class TestPlugin extends JavaPlugin {
         recipesAPI.addRecipe(recipe1);
         recipesAPI.addRecipe(recipe2);
         recipesAPI.addRecipe(recipe3);
+        recipesAPI.addRecipe(recipe3strict);
         recipesAPI.addRecipe(recipe4);
     }
 }
@@ -176,6 +189,37 @@ The API supports several types of ingredients:
 - **Tag**: Minecraft tags (e.g., planks, logs, wool)
 - **Plugin Items**: ItemsAdder and Oraxen custom items
 
+<<<<<<< HEAD
+### Ingredient Matching Modes
+
+**Normal Mode** (default):
+- Only checks metadata that is present in the recipe ingredient
+- Player can add extra metadata without breaking the recipe
+- Display name is NOT checked (players can rename items)
+- Lore, Custom Model Data, and PDC keys present in ingredient must match
+
+**Strict Mode** (`strict: true`):
+- Requires exact match using Bukkit's `ItemStack.isSimilar()`
+- All metadata must match exactly
+- Use this when you need precise ingredient control
+
+Example in code:
+```java
+// Normal mode - flexible matching
+.addIngredient(customItem, 'C', false)
+
+// Strict mode - exact matching
+.addIngredient(customItem, 'C', true)
+```
+
+Example in YAML:
+```yaml
+ingredients:
+  - item: item:COBBLESTONE
+    sign: 'C'
+    strict: true  # Requires exact match
+```
+
 ### Important Notes
 - **Display Name**: Player can rename items - only lore, custom model data, and PDC are checked
 - **Strict Mode**: Use `.addIngredient(item, sign, true)` to require exact match including display name
@@ -291,6 +335,7 @@ category: "MISC"
 - `category` - Recipe category (BUILDING, REDSTONE, EQUIPMENT, MISC for crafting; FOOD, BLOCKS, MISC for cooking)
 - `cooking-time` - Cooking time in ticks for smelting recipes (default: 0)
 - `experience` - Experience reward for smelting recipes (default: 0.0)
+- `priority` - Recipe registration priority (default: 0, higher = registered first)
 
 ### Pattern Validation
 
@@ -301,6 +346,62 @@ For `CRAFTING_SHAPED` recipes, the pattern is validated:
 - Empty rows are not allowed
 
 ### Ingredient Types in YAML
+
+#### Basic Format
+```yaml
+ingredients:
+  - item: <type>:<value>
+    sign: 'X'      # Optional: Required for shaped recipes
+    strict: true   # Optional: Enable strict matching (default: false)
+```
+
+#### Supported Types
+
+- **Simple Material** (auto-detected):
+  ```yaml
+  - item: DIAMOND  # No prefix = Material
+  ```
+
+- **Explicit Material** (same as above):
+  ```yaml
+  - item: material:DIAMOND
+  ```
+
+- **ItemStack from Material** (with metadata support):
+  ```yaml
+  - item: item:COBBLESTONE
+    strict: true  # Recommended for items with metadata
+  ```
+  Creates an ItemStack that can have metadata (lore, custom model data, PDC)
+
+- **ItemStack from Base64**:
+  ```yaml
+  - item: base64:BASE64_ENCODED_ITEM_STRING
+    strict: true  # Recommended for custom items
+  ```
+  Load a custom item from a serialized Base64 string
+
+- **Minecraft Tag**:
+  ```yaml
+  - item: tag:planks  # Accepts any plank type
+  ```
+
+- **ItemsAdder Item**:
+  ```yaml
+  - item: itemsadder:custom_item_id
+  ```
+
+- **Oraxen Item**:
+  ```yaml
+  - item: oraxen:custom_item_id
+  ```
+
+- **Custom Plugin Hook**:
+  ```yaml
+  - item: yourplugin:custom_item_id
+  ```
+
+#### Field Details
 - `item: MATERIAL_NAME` - Simple material
 - `item: material:MATERIAL_NAME` - Explicit material
 - `item: tag:TAG_NAME` - Minecraft tag
@@ -329,13 +430,134 @@ category: MISC
 ```yaml
 type: CRAFTING_SHAPELESS
 ingredients:
-  - item: item:BASE64_ENCODED_ITEM_HERE
+  - item: base64:BASE64_ENCODED_ITEM_HERE
     strict: true
 result:
   item: DIAMOND
   amount: 1
 ```
 
+## Recipe Priority System
+
+When multiple recipes have similar ingredients, the **priority** field determines which recipe is checked first. This is crucial for handling conflicting recipes.
+
+### How Priority Works
+- Recipes are sorted by priority before registration (higher priority = registered first)
+- Default priority is `0`
+- Higher priority recipes are checked before lower priority ones
+- Useful for specific recipes that should take precedence over generic ones
+
+### Example Use Case: Compressed Cobblestone
+
+```yaml
+# cobblestone_to_compressed_x1.yml
+type: CRAFTING_SHAPED
+priority: 0  # Lower priority (default)
+pattern:
+  - "CCC"
+  - "CCC"
+  - "CCC"
+ingredients:
+  - item: material:COBBLESTONE
+    sign: 'C'
+result:
+  item: yourplugin:compressed_cobblestone_x1
+  amount: 1
+```
+
+```yaml
+# compressed_x1_to_x2.yml
+type: CRAFTING_SHAPED
+priority: 10  # Higher priority - checked first!
+pattern:
+  - "CCC"
+  - "CCC"
+  - "CCC"
+ingredients:
+  - item: item:COMPRESSED_COBBLESTONE_X1  # Custom item with metadata
+    sign: 'C'
+    strict: true  # Important: ensures exact match
+result:
+  item: yourplugin:compressed_cobblestone_x2
+  amount: 1
+```
+
+In this example, the x1→x2 recipe will be checked first because it has `priority: 10`. The `strict: true` flag ensures that only compressed x1 cobblestone (not regular cobblestone) triggers this recipe.
+
+### Priority in Code
+
+```java
+ItemRecipe highPriorityRecipe = new RecipeBuilder()
+    .setType(RecipeType.CRAFTING_SHAPED)
+    .setName("specific-recipe")
+    .setPriority(10)  // Higher priority
+    .setPattern("AAA", "AAA", "AAA")
+    .addIngredient(specificItem, 'A', true)  // Strict matching
+    .setResult(new ItemStack(Material.DIAMOND))
+    .build();
+
+ItemRecipe lowPriorityRecipe = new RecipeBuilder()
+    .setType(RecipeType.CRAFTING_SHAPED)
+    .setName("generic-recipe")
+    .setPriority(0)  // Default priority
+    .setPattern("AAA", "AAA", "AAA")
+    .addIngredient(Material.STONE, 'A')
+    .setResult(new ItemStack(Material.COAL))
+    .build();
+```
+
+## Parsing Ingredients Programmatically
+
+RecipesAPI provides a public utility method to parse ingredients from strings, useful for loading recipes from custom sources or configuration files.
+
+### Using Util.parseIngredient()
+
+```java
+import fr.traqueur.recipes.api.Util;
+import fr.traqueur.recipes.api.domains.Ingredient;
+
+// Parse a simple material
+Ingredient diamond = Util.parseIngredient("DIAMOND");
+
+// Parse with a sign for shaped recipes
+Ingredient stone = Util.parseIngredient("item:STONE", 'S');
+
+// Parse with strict mode enabled
+Ingredient customItem = Util.parseIngredient("item:COBBLESTONE", 'C', true);
+
+// Parse from base64
+Ingredient base64Item = Util.parseIngredient("base64:YOUR_BASE64_STRING", null, true);
+
+// Parse from tags
+Ingredient planks = Util.parseIngredient("tag:planks", 'P');
+
+// Parse from plugin items
+Ingredient iaItem = Util.parseIngredient("itemsadder:custom_item", 'I');
+Ingredient oraxenItem = Util.parseIngredient("oraxen:custom_sword", 'S');
+```
+
+### Method Signatures
+
+```java
+// Full control
+public static Ingredient parseIngredient(String itemString, Character sign, boolean strict)
+
+// Without strict mode (default: false)
+public static Ingredient parseIngredient(String itemString, Character sign)
+
+// Shapeless recipe (no sign)
+public static Ingredient parseIngredient(String itemString)
+```
+
+### Supported Formats
+All formats supported in YAML are also supported here:
+- `"MATERIAL_NAME"` → MaterialIngredient
+- `"material:MATERIAL_NAME"` → MaterialIngredient
+- `"item:MATERIAL_NAME"` → ItemStackIngredient (supports metadata)
+- `"base64:BASE64_STRING"` → ItemStackIngredient from serialized item
+- `"tag:TAG_NAME"` → TagIngredient
+- `"pluginname:item_id"` → Custom plugin hook
+
 ## Resources
 
 - **Javadoc**: [API Documentation](https://jitpack.io/com/github/Traqueur-dev/RecipesAPI/latest/javadoc/)
 
@@ -24,7 +24,7 @@ repositories {
 }
 
 dependencies {
-    compileOnly "org.spigotmc:spigot-api:1.21.3-R0.1-SNAPSHOT"
+    compileOnly "org.spigotmc:spigot-api:1.21.4-R0.1-SNAPSHOT"
 
     // Hooks
     compileOnly 'io.th0rgal:oraxen:1.181.0'
@@ -44,6 +44,8 @@ tasks.register('generateVersionProperties') {
 processResources.dependsOn generateVersionProperties
 
 java {
+    sourceCompatibility = JavaVersion.VERSION_21
+    targetCompatibility = JavaVersion.VERSION_21
     withSourcesJar()
     withJavadocJar()
 }
 
@@ -1,2 +1,4 @@
 jdk:
-  - openjdk21
+  - openjdk21
+install:
+  - ./gradlew clean publishToMavenLocal -xtest --no-daemon --console=plain
@@ -149,22 +149,28 @@ private void extractDefaultsFromJar(String jarPath) {
      * @return The number of recipes loaded
      */
     public int load() {
-        int count = 0;
+        List<ItemRecipe> recipes = new ArrayList<>();
 
         // Load from folders
         for (File folder : folders) {
-            count += loadFromFolder(folder);
+            loadFromFolder(folder, recipes);
         }
 
         // Load from individual files
         for (File file : files) {
-            if (loadRecipe(file)) {
-                count++;
-            }
+            loadRecipe(file, recipes);
+        }
+
+        // Sort recipes by priority (higher priority first)
+        recipes.sort((r1, r2) -> Integer.compare(r2.priority(), r1.priority()));
+
+        // Register sorted recipes
+        for (ItemRecipe recipe : recipes) {
+            api.addRecipe(recipe);
         }
 
-        plugin.getLogger().info("Loaded " + count + " recipes via RecipeLoader.");
-        return count;
+        plugin.getLogger().info("Loaded " + recipes.size() + " recipes via RecipeLoader.");
+        return recipes.size();
     }
 
     /**
@@ -180,45 +186,39 @@ public int reload() {
     /**
      * Load all recipes from a folder (recursive)
      * @param folder The folder to load recipes from
-     * @return The number of recipes loaded
+     * @param recipes The list to add loaded recipes to
      */
-    private int loadFromFolder(File folder) {
-        int count = 0;
+    private void loadFromFolder(File folder, List<ItemRecipe> recipes) {
         try (Stream<Path> stream = Files.walk(folder.toPath())) {
             List<File> ymlFiles = stream.map(Path::toFile)
                     .filter(File::isFile)
                     .filter(f -> f.getName().endsWith(".yml"))
                     .toList();
 
             for (File file : ymlFiles) {
-                if (loadRecipe(file)) {
-                    count++;
-                }
+                loadRecipe(file, recipes);
             }
         } catch (IOException exception) {
             plugin.getLogger().severe("Could not load recipes from folder " + folder.getAbsolutePath() + ": " + exception.getMessage());
         }
-        return count;
     }
 
     /**
      * Load a recipe from a file
      * @param file The file to load the recipe from
-     * @return true if the recipe was loaded successfully, false otherwise
+     * @param recipes The list to add the loaded recipe to
      */
-    private boolean loadRecipe(File file) {
+    private void loadRecipe(File file, List<ItemRecipe> recipes) {
         try {
             YamlConfiguration configuration = YamlConfiguration.loadConfiguration(file);
             ItemRecipe recipe = new RecipeConfiguration(file.getName().replace(".yml", ""), configuration)
                     .build();
-            api.addRecipe(recipe);
-            return true;
+            recipes.add(recipe);
         } catch (Exception e) {
             plugin.getLogger().severe("Could not load recipe from file " + file.getAbsolutePath() + ": " + e.getMessage());
             if (api.isDebug()) {
                 e.printStackTrace();
             }
-            return false;
         }
     }
 }
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ repositories {`
`24`	`24`	`}`
`25`	`25`
`26`	`26`	`dependencies {`
`27`		`- compileOnly "org.spigotmc:spigot-api:1.21.3-R0.1-SNAPSHOT"`
	`27`	`+ compileOnly "org.spigotmc:spigot-api:1.21.4-R0.1-SNAPSHOT"`
`28`	`28`
`29`	`29`	`// Hooks`
`30`	`30`	`compileOnly 'io.th0rgal:oraxen:1.181.0'`
`@@ -44,6 +44,8 @@ tasks.register('generateVersionProperties') {`
`44`	`44`	`processResources.dependsOn generateVersionProperties`
`45`	`45`
`46`	`46`	`java {`
	`47`	`+ sourceCompatibility = JavaVersion.VERSION_21`
	`48`	`+ targetCompatibility = JavaVersion.VERSION_21`
`47`	`49`	`withSourcesJar()`
`48`	`50`	`withJavadocJar()`
`49`	`51`	`}`