> 4.18.4

> Implemented new system to allow IA items to work in CustomCrafting recipes as ingredients and or as result items.

Signed-off-by: petulikan1 <petulikan@gmail.com>

Took 6 hours 21 minutes

Author: petulikan1

gradle.properties

@@ -21,4 +21,4 @@
 #
 
 group = com.wolfyscript.customcrafting
-version = 4.18.3-petu
+version = 4.18.4-petu

spigot/src/main/java/me/wolfyscript/customcrafting/configs/MainConfig.java

@@ -144,6 +144,10 @@ public boolean isPrettyPrinting() {
         return getBoolean("recipes.pretty_printing");
     }
 
+    public boolean isIaFix(){
+        return getBoolean("recipes.ia_fix");
+    }
+
     @Deprecated(forRemoval = true)
     public boolean isNMSBasedCrafting() {
         return false;

spigot/src/main/java/me/wolfyscript/customcrafting/listeners/crafting/CraftListener.java

@@ -27,7 +27,11 @@
 import me.wolfyscript.customcrafting.utils.CraftManager;
 import org.bukkit.Bukkit;
 import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.HandlerList;
 import org.bukkit.event.Listener;
+import org.bukkit.event.inventory.PrepareItemCraftEvent;
+import org.bukkit.plugin.RegisteredListener;
 
 public class CraftListener implements Listener {
 
@@ -37,6 +41,19 @@ public class CraftListener implements Listener {
     public CraftListener(CustomCrafting customCrafting) {
         this.customCrafting = customCrafting;
         this.craftManager = customCrafting.getCraftManager();
+
+        if(customCrafting.getConfigHandler().getConfig().isIaFix()) {
+            HandlerList handlerList = PrepareItemCraftEvent.getHandlerList();
+            for (RegisteredListener rl : handlerList.getRegisteredListeners()) {
+                if (rl.getListener().getClass().getCanonicalName().contains("itemsadder")) {
+                    if (rl.getPriority() == EventPriority.MONITOR) {
+                        RegisteredListener newRl = new RegisteredListener(rl.getListener(), rl.getExecutor(), EventPriority.HIGHEST, rl.getPlugin(), rl.isIgnoringCancelled());
+                        handlerList.unregister(rl);
+                        handlerList.register(newRl);
+                    }
+                }
+            }
+        }
         Bukkit.getPluginManager().registerEvents(new EventBasedCraftRecipeHandler(customCrafting, craftManager), customCrafting);
     }
 

spigot/src/main/java/me/wolfyscript/customcrafting/recipes/AbstractRecipeShaped.java

@@ -186,7 +186,7 @@ public void setShape(@NotNull String... shape) {
         }
         this.shape = keepShapeAsIs ? shape : RecipeUtil.formatShape(shape).toArray(new String[0]);
         var flattenShape = String.join("", this.shape);
-        Preconditions.checkArgument(!flattenShape.isEmpty() && !flattenShape.isBlank(), "Shape must not be empty! (Shape: \"" + Arrays.toString(this.shape) + "\")!");
+        Preconditions.checkArgument(!flattenShape.isBlank(), "Shape must not be empty! (Shape: \"" + Arrays.toString(this.shape) + "\")!");
         Map<Character, Ingredient> newIngredients = new HashMap<>();
         flattenShape.chars().mapToObj(value -> (char) value).forEach(character -> newIngredients.put(character, this.mappedIngredients.get(character)));
         this.mappedIngredients = newIngredients;
@@ -199,7 +199,7 @@ public Shape getInternalShape() {
     private void createFlatIngredients() {
         //Create flatten ingredients. This makes it possible to use a key multiple times in one shape.
         var flattenShape = String.join("", this.shape);
-        Preconditions.checkArgument(!flattenShape.isEmpty() && !flattenShape.isBlank(), "Shape must not be empty! (Shape: \"" + Arrays.toString(this.shape) + "\")!");
+        Preconditions.checkArgument(!flattenShape.isBlank(), "Shape must not be empty! (Shape: \"" + Arrays.toString(this.shape) + "\")!");
         this.ingredients = flattenShape.chars().mapToObj(key -> mappedIngredients.getOrDefault((char) key, new Ingredient())).toList();
         //Create internal shape, which is more performant when used in checks later on.
         this.internalShape = new Shape();

spigot/src/main/resources/config.yml

@@ -155,6 +155,8 @@ custom_items:
   update: true
 
 recipes:
+  # Allow ItemsAdder items to be used as ingredient or a result item in recipes. (Might break crafting of ItemsAdder items so if you encounter issues, turn this off)
+  ia_fix: true
   # Toggle the Brewing Recipes. They are off by default to prevent possible duplication issues
   brewing: false
   # Used to block any kind of custom recipe. If enabled no one will be able to craft any custom recipe anymore.