feat: mÃodernize and fix error for craft with same item

Author: Traqueur-dev

.github/workflows/gradle.yml

@@ -1,68 +1,30 @@
-# This workflow uses actions that are not certified by GitHub.
-# They are provided by a third-party and are governed by
-# separate terms of service, privacy policy, and support
-# documentation.
-# This workflow will build a Java project with Gradle and cache/restore any dependencies to improve the workflow execution time
-# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-java-with-gradle
-
-name: Java CI with Gradle
+name: Build Action
 
 on:
   push:
-    branches: [ "main" ]
+    branches: [ main, develop ]
   pull_request:
-    branches: [ "main" ]
-
-jobs:
-  build:
-
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-
-    steps:
-    - uses: actions/checkout@v4
-    - name: Set up JDK 21
-      uses: actions/setup-java@v4
-      with:
-        java-version: '21'
-        distribution: 'temurin'
+    types: [ opened, synchronize, reopened ]
+  workflow_dispatch:
 
-    # Configure Gradle for optimal use in GitHub Actions, including caching of downloaded dependencies.
-    # See: https://github.com/gradle/actions/blob/main/setup-gradle/README.md
-    - name: Setup Gradle
-      uses: gradle/actions/setup-gradle@af1da67850ed9a4cedd57bfd976089dd991e2582 # v4.0.0
-    - name: Grant Access
-      run: chmod +x ./gradlew
-    - name: Build with Gradle Wrapper
-      run: ./gradlew build
+permissions:
+  contents: read
+  packages: write
 
-    # NOTE: The Gradle Wrapper is the default and recommended way to run Gradle (https://docs.gradle.org/current/userguide/gradle_wrapper.html).
-    # If your project does not have the Gradle Wrapper configured, you can use the following configuration to run Gradle with a specified version.
-    #
-    # - name: Setup Gradle
-    #   uses: gradle/actions/setup-gradle@af1da67850ed9a4cedd57bfd976089dd991e2582 # v4.0.0
-    #   with:
-    #     gradle-version: '8.9'
-    #
-    # - name: Build with Gradle 8.9
-    #   run: gradle build
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
 
-  dependency-submission:
-
-    runs-on: ubuntu-latest
-    permissions:
-      contents: write
-
-    steps:
-    - uses: actions/checkout@v4
-    - name: Set up JDK 21
-      uses: actions/setup-java@v4
-      with:
-        java-version: '21'
-        distribution: 'temurin'
-
-    # Generates and submits a dependency graph, enabling Dependabot Alerts for all project dependencies.
-    # See: https://github.com/gradle/actions/blob/main/dependency-submission/README.md
-    - name: Generate and submit dependency graph
-      uses: gradle/actions/dependency-submission@af1da67850ed9a4cedd57bfd976089dd991e2582 # v4.0.0
+jobs:
+  build:
+    name: Build and Publish RecipesAPI
+    uses: GroupeZ-dev/actions/.github/workflows/build.yml@main
+    with:
+      project-name: "RecipesAPI"
+      publish: true
+      publish-on-discord: false
+      project-to-publish: "publish"
+    secrets:
+      MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }}
+      MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }}
+      WEBHOOK_URL: ""

build.gradle

@@ -1,11 +1,20 @@
 plugins {
-    id 'java'
-    id 'maven-publish'
+    id 'java-library'
+    id 're.alwyn974.groupez.publish' version '1.0.0'
+    id 'com.gradleup.shadow' version '9.0.0-beta11'
 }
 
 group = 'fr.traqueur'
 version = property("version")
 
+ext.targetFolder = file("target/")
+ext.classifier = System.getProperty("archive.classifier")
+ext.sha = System.getProperty("github.sha")
+
+if (ext.sha) {
+    version = ext.sha
+}
+
 repositories {
     mavenCentral()
     maven {
@@ -24,7 +33,7 @@ repositories {
 }
 
 dependencies {
-    compileOnly "org.spigotmc:spigot-api:1.21.4-R0.1-SNAPSHOT"
+    compileOnly "org.spigotmc:spigot-api:1.21.8-R0.1-SNAPSHOT"
 
     // Hooks
     compileOnly 'io.th0rgal:oraxen:1.181.0'
@@ -43,18 +52,21 @@ tasks.register('generateVersionProperties') {
 
 processResources.dependsOn generateVersionProperties
 
+build.dependsOn shadowJar
+
+shadowJar {
+    archiveClassifier.set("")
+    destinationDirectory.set(project.ext.targetFolder)
+}
+
 java {
     sourceCompatibility = JavaVersion.VERSION_21
     targetCompatibility = JavaVersion.VERSION_21
     withSourcesJar()
     withJavadocJar()
 }
 
-
-publishing {
-    publications {
-        maven(MavenPublication) {
-            from components.java
-        }
-    }
-}
+publishConfig {
+    githubOwner = "Traqueur-dev"
+    useRootProjectName = true
+}

gradle.properties

@@ -1 +1 @@
-version=3.1.1
+version=3.2.0

jitpack.yml

@@ -1,3 +1,13 @@
+pluginManagement {
+    repositories {
+        maven {
+            name = "groupezReleases"
+            url = uri("https://repo.groupez.dev/releases")
+        }
+        gradlePluginPortal()
+    }
+}
+
 rootProject.name = 'RecipesAPI'
 
 include ':test-plugin'

settings.gradle

@@ -3,6 +3,7 @@
 import fr.traqueur.recipes.api.hook.Hook;
 import fr.traqueur.recipes.impl.PrepareCraftListener;
 import fr.traqueur.recipes.impl.domains.ItemRecipe;
+import fr.traqueur.recipes.impl.domains.recipes.RecipeBuilder;
 import fr.traqueur.recipes.impl.updater.Updater;
 import org.bukkit.plugin.Plugin;
 
@@ -135,4 +136,13 @@ public void debug(String message, Object... args) {
     public RecipeLoader createLoader() {
         return new RecipeLoader(plugin, this);
     }
+
+    /**
+     * Create a new blank {@link RecipeBuilder} ready to be configured.
+     * Shortcut for {@code new RecipeBuilder()}.
+     * @return a fresh RecipeBuilder
+     */
+    public RecipeBuilder recipe() {
+        return new RecipeBuilder();
+    }
 }

src/main/java/fr/traqueur/recipes/api/RecipesAPI.java

@@ -1,5 +1,12 @@
 package fr.traqueur.recipes.api.domains;
 
+import fr.traqueur.recipes.api.hook.Hook;
+import fr.traqueur.recipes.impl.domains.ingredients.ItemStackIngredient;
+import fr.traqueur.recipes.impl.domains.ingredients.MaterialIngredient;
+import fr.traqueur.recipes.impl.domains.ingredients.StrictItemStackIngredient;
+import fr.traqueur.recipes.impl.domains.ingredients.TagIngredient;
+import org.bukkit.Material;
+import org.bukkit.Tag;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.RecipeChoice;
 
@@ -42,4 +49,77 @@ public Character sign() {
      * @return The choice of the ingredient.
      */
     public abstract RecipeChoice choice();
+
+    // ── Factory methods ────────────────────────────────────────────────────────
+
+    /** Create a material-based ingredient (matches any item of that type). */
+    public static Ingredient of(Material material) {
+        return new MaterialIngredient(material, null);
+    }
+
+    /** Create a material-based ingredient with a shaped-recipe sign. */
+    public static Ingredient of(Material material, Character sign) {
+        return new MaterialIngredient(material, sign);
+    }
+
+    /** Create an ItemStack-based ingredient (checks meta, PDC, lore…). */
+    public static Ingredient of(ItemStack item) {
+        return new ItemStackIngredient(item, null);
+    }
+
+    /** Create an ItemStack-based ingredient with a shaped-recipe sign. */
+    public static Ingredient of(ItemStack item, Character sign) {
+        return new ItemStackIngredient(item, sign);
+    }
+
+    /**
+     * Create an ItemStack-based ingredient.
+     * @param strict if true, uses Bukkit's native {@code ItemStack.isSimilar()} (exact meta match)
+     */
+    public static Ingredient of(ItemStack item, boolean strict) {
+        return strict ? new StrictItemStackIngredient(item, null) : new ItemStackIngredient(item, null);
+    }
+
+    /**
+     * Create an ItemStack-based ingredient with a shaped-recipe sign.
+     * @param strict if true, uses Bukkit's native {@code ItemStack.isSimilar()} (exact meta match)
+     */
+    public static Ingredient of(ItemStack item, Character sign, boolean strict) {
+        return strict ? new StrictItemStackIngredient(item, sign) : new ItemStackIngredient(item, sign);
+    }
+
+    /** Create a tag-based ingredient (matches any item in the given Bukkit tag). */
+    public static Ingredient of(Tag<Material> tag) {
+        return new TagIngredient(tag, null);
+    }
+
+    /** Create a tag-based ingredient with a shaped-recipe sign. */
+    public static Ingredient of(Tag<Material> tag, Character sign) {
+        return new TagIngredient(tag, sign);
+    }
+
+    /**
+     * Create an ingredient from a hook plugin (e.g. {@code "oraxen"} or {@code "itemsadder"}).
+     * The hook must be enabled on the server.
+     * @param pluginName the hook plugin name (case-insensitive)
+     * @param itemId     the custom item id recognised by that plugin
+     */
+    public static Ingredient ofHook(String pluginName, String itemId) {
+        return ofHook(pluginName, itemId, null);
+    }
+
+    /**
+     * Create a hook-based ingredient with a shaped-recipe sign.
+     * @param pluginName the hook plugin name (case-insensitive)
+     * @param itemId     the custom item id recognised by that plugin
+     * @param sign       the shaped-recipe sign, or {@code null} for shapeless
+     */
+    public static Ingredient ofHook(String pluginName, String itemId, Character sign) {
+        return Hook.HOOKS.stream()
+                .filter(Hook::isEnable)
+                .filter(h -> h.getPluginName().equalsIgnoreCase(pluginName))
+                .findFirst()
+                .orElseThrow(() -> new IllegalArgumentException("No enabled hook found for plugin: " + pluginName))
+                .getIngredient(itemId, sign);
+    }
 }

src/main/java/fr/traqueur/recipes/api/domains/Ingredient.java

@@ -1,6 +1,7 @@
 package fr.traqueur.recipes.api.domains;
 
 import fr.traqueur.recipes.api.RecipeType;
+import fr.traqueur.recipes.api.Util;
 import fr.traqueur.recipes.impl.domains.ItemRecipe;
 import fr.traqueur.recipes.impl.domains.ingredients.ItemStackIngredient;
 import fr.traqueur.recipes.impl.domains.ingredients.MaterialIngredient;
@@ -150,6 +151,39 @@ default Recipe addIngredient(Material material, Character sign) {
      */
     Recipe addIngredient(Ingredient ingredient);
 
+    /**
+     * Add an ingredient parsed from a string identifier.
+     * Supports the same formats as YAML config:
+     * {@code "MATERIAL"}, {@code "material:NAME"}, {@code "item:NAME"},
+     * {@code "base64:XXX"}, {@code "tag:NAME"}, {@code "oraxen:id"}, {@code "itemsadder:id"}, etc.
+     * @param itemIdentifier the string identifier
+     * @return The recipe.
+     */
+    default Recipe addIngredient(String itemIdentifier) {
+        return addIngredient(Util.parseIngredient(itemIdentifier, null, false));
+    }
+
+    /**
+     * Add an ingredient parsed from a string identifier with a shaped-recipe sign.
+     * @param itemIdentifier the string identifier
+     * @param sign the sign character used in the shaped pattern
+     * @return The recipe.
+     */
+    default Recipe addIngredient(String itemIdentifier, Character sign) {
+        return addIngredient(Util.parseIngredient(itemIdentifier, sign, false));
+    }
+
+    /**
+     * Add an ingredient parsed from a string identifier.
+     * @param itemIdentifier the string identifier
+     * @param sign the sign character (null for shapeless)
+     * @param strict if true, uses strict matching ({@link StrictItemStackIngredient})
+     * @return The recipe.
+     */
+    default Recipe addIngredient(String itemIdentifier, Character sign, boolean strict) {
+        return addIngredient(Util.parseIngredient(itemIdentifier, sign, strict));
+    }
+
     /**
      * Set the group of the recipe.
      * @param group The group of the recipe.