Feat/improve (#27)

* fix: ia hook (#23)

* feat: improve

* feat: remove some useless usage of variable

Author: Traqueur-dev

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

@@ -1,6 +1,7 @@
 package fr.traqueur.recipes.api;
 
 import org.bukkit.NamespacedKey;
+import org.bukkit.plugin.Plugin;
 import org.bukkit.plugin.java.JavaPlugin;
 
 import java.util.List;
@@ -47,7 +48,7 @@ public enum RecipeType {
     /**
      * The plugin that registered this enum.
      */
-    private static JavaPlugin plugin;
+    private static Plugin plugin;
 
     /**
      * The maximum number of ingredients that can be used in this recipe.
@@ -83,7 +84,7 @@ public NamespacedKey getNamespacedKey(String key) {
      * Registers the plugin that is using this enum.
      * @param plugin the plugin
      */
-    public static void registerPlugin(JavaPlugin plugin) {
+    public static void registerPlugin(Plugin plugin) {
         RecipeType.plugin = plugin;
     }
 

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

@@ -6,6 +6,7 @@
 import fr.traqueur.recipes.impl.domains.recipes.RecipeConfiguration;
 import fr.traqueur.recipes.impl.updater.Updater;
 import org.bukkit.configuration.file.YamlConfiguration;
+import org.bukkit.plugin.Plugin;
 import org.bukkit.plugin.java.JavaPlugin;
 
 import java.io.File;
@@ -29,7 +30,7 @@ public final class RecipesAPI {
     /**
      * The plugin instance
      */
-    private final JavaPlugin plugin;
+    private final Plugin plugin;
 
     /**
      * If the debug mode is enabled
@@ -46,7 +47,7 @@ public final class RecipesAPI {
      * @param plugin The plugin instance
      * @param debug If the debug mode is enabled
      */
-    public RecipesAPI(JavaPlugin plugin, boolean debug) {
+    public RecipesAPI(Plugin plugin, boolean debug) {
         this(plugin, debug, true);
     }
 
@@ -56,7 +57,7 @@ public RecipesAPI(JavaPlugin plugin, boolean debug) {
      * @param debug If the debug mode is enabled
      * @param enableYmlSupport If the yml support is enabled
      */
-    public RecipesAPI(JavaPlugin plugin, boolean debug, boolean enableYmlSupport) {
+    public RecipesAPI(Plugin plugin, boolean debug, boolean enableYmlSupport) {
         this.debug = debug;
         this.plugin = plugin;
         this.recipes = new ArrayList<>();
@@ -77,7 +78,7 @@ public RecipesAPI(JavaPlugin plugin, boolean debug, boolean enableYmlSupport) {
 
         if(this.debug) {
             Hook.HOOKS.stream()
-                    .filter(hook -> hook.isEnable(plugin))
+                    .filter(Hook::isEnable)
                     .forEach(hook -> this.plugin.getLogger().info("Hook enabled: " + hook.getPluginName()));
 
             Updater.update("RecipesAPI");
@@ -134,7 +135,7 @@ private void addConfiguredRecipes(File recipeFolder) {
      */
     private void loadRecipe(File file) {
         YamlConfiguration configuration = YamlConfiguration.loadConfiguration(file);
-        var recipe = new RecipeConfiguration(this.plugin, file.getName().replace(".yml", ""), configuration)
+        var recipe = new RecipeConfiguration(file.getName().replace(".yml", ""), configuration)
                 .build();
         this.addRecipe(recipe);
     }
@@ -190,7 +191,7 @@ public List<ItemRecipe> getRecipes() {
      * Get the plugin instance
      * @return The plugin instance
      */
-    public JavaPlugin getPlugin() {
+    public Plugin getPlugin() {
         return plugin;
     }
 

src/main/java/fr/traqueur/recipes/api/hook/Hook.java

@@ -2,6 +2,7 @@
 
 import fr.traqueur.recipes.api.domains.Ingredient;
 import fr.traqueur.recipes.impl.hook.Hooks;
+import org.bukkit.Bukkit;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.plugin.java.JavaPlugin;
 
@@ -42,12 +43,16 @@ static void addHook(Hook hook) {
 
     /**
      * Check if the plugin is enabled
-     * @param plugin The plugin which use the API
      * @return If the plugin is enabled
      */
-    default boolean isEnable(JavaPlugin plugin) {
-        return plugin.getServer().getPluginManager().getPlugin(getPluginName()) != null;
+    default boolean isEnable() {
+        return Bukkit.getPluginManager().getPlugin(getPluginName()) != null;
     }
 
+    /**
+     * Get the ItemStack from a result part
+     * @param resultPart The result part to get the ItemStack from
+     * @return The ItemStack from the result part
+     */
     ItemStack getItemStack(String resultPart);
 }

src/main/java/fr/traqueur/recipes/impl/domains/recipes/RecipeConfiguration.java

@@ -80,22 +80,20 @@ public class RecipeConfiguration implements Recipe {
 
     /**
      * The constructor of the recipe.
-     * @param plugin the plugin of the recipe.
      * @param name the name of the recipe.
      * @param configuration the configuration of the recipe.
      */
-    public RecipeConfiguration(JavaPlugin plugin, String name, YamlConfiguration configuration) {
-        this(plugin, name, "", configuration);
+    public RecipeConfiguration(String name, YamlConfiguration configuration) {
+        this(name, "", configuration);
     }
 
     /**
      * The constructor of the recipe.
-     * @param plugin the plugin of the recipe.
      * @param name the name of the recipe.
      * @param path the path of the recipe.
      * @param configuration the configuration of the recipe.
      */
-    public RecipeConfiguration(JavaPlugin plugin, String name, String path, YamlConfiguration configuration) {
+    public RecipeConfiguration(String name, String path, YamlConfiguration configuration) {
         this.name = name.replace(".yml", "");
         if(!path.endsWith(".") && !path.isEmpty()) {
             path += ".";
@@ -140,7 +138,7 @@ public RecipeConfiguration(JavaPlugin plugin, String name, String path, YamlConf
                        yield new ItemStackIngredient(this.getItemStack(data[1]), sign);
                    }
                    default -> Hook.HOOKS.stream()
-                           .filter(hook -> hook.isEnable(plugin))
+                           .filter(Hook::isEnable)
                            .filter(hook -> hook.getPluginName().equalsIgnoreCase(data[0]))
                            .findFirst()
                            .orElseThrow(() -> new IllegalArgumentException("The data " + data[0] + " isn't valid."))
@@ -163,7 +161,7 @@ public RecipeConfiguration(JavaPlugin plugin, String name, String path, YamlConf
                 case "material" -> new ItemStack(this.getMaterial(resultParts[1]));
                 case "item", "base64" -> this.getItemStack(resultParts[1]);
                 default -> Hook.HOOKS.stream()
-                        .filter(hook -> hook.isEnable(plugin))
+                        .filter(Hook::isEnable)
                         .filter(hook -> hook.getPluginName().equalsIgnoreCase(resultParts[0]))
                         .findFirst()
                         .orElseThrow(() -> new IllegalArgumentException("The result " + strItem + " isn't valid."))