Rewrite of the Custom item into RecipeItem

and Ingredient with subclasses
Implemented adding custom items to Ingredients
Added support for plugin-items

src/com/dre/brewery/integration/IntegrationListener.java

@@ -1,18 +1,30 @@
 package com.dre.brewery.integration;
 
 import com.dre.brewery.Barrel;
-import com.dre.brewery.utility.LegacyUtil;
 import com.dre.brewery.P;
 import com.dre.brewery.api.events.barrel.BarrelAccessEvent;
 import com.dre.brewery.api.events.barrel.BarrelDestroyEvent;
 import com.dre.brewery.api.events.barrel.BarrelRemoveEvent;
 import com.dre.brewery.filedata.BConfig;
+import com.dre.brewery.integration.barrel.GriefPreventionBarrel;
+import com.dre.brewery.integration.barrel.LWCBarrel;
+import com.dre.brewery.integration.barrel.LogBlockBarrel;
+import com.dre.brewery.integration.item.MMOItemsPluginItem;
+import com.dre.brewery.recipe.BCauldronRecipe;
+import com.dre.brewery.recipe.RecipeItem;
+import com.dre.brewery.utility.LegacyUtil;
+import net.Indyuce.mmoitems.MMOItems;
+import net.Indyuce.mmoitems.api.item.NBTItem;
+import org.bukkit.Material;
 import org.bukkit.block.Block;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
+import org.bukkit.event.block.Action;
 import org.bukkit.event.inventory.InventoryCloseEvent;
+import org.bukkit.event.player.PlayerInteractEvent;
+import org.bukkit.inventory.EquipmentSlot;
 import org.bukkit.plugin.Plugin;
 
 public class IntegrationListener implements Listener {
@@ -173,4 +185,36 @@ public class IntegrationListener implements Listener {
 			}
 		}
 	}
+
+	@EventHandler(priority = EventPriority.LOW, ignoreCancelled = true)
+	public void onInteract(PlayerInteractEvent event) {
+		// Cancel the Interact Event early, so MMOItems does not act before us and consume the item when trying to add item to Cauldron
+		if (!P.use1_9) return;
+		if (BConfig.hasMMOItems == null) {
+			BConfig.hasMMOItems = P.p.getServer().getPluginManager().isPluginEnabled("MMOItems");
+		}
+		if (!BConfig.hasMMOItems) return;
+		try {
+			if (event.getAction() == Action.RIGHT_CLICK_BLOCK && event.hasItem() && event.getHand() == EquipmentSlot.HAND) {
+				if (event.getClickedBlock() != null && event.getClickedBlock().getType() == Material.CAULDRON) {
+					NBTItem item = MMOItems.plugin.getNMS().getNBTItem(event.getItem());
+					if (item.hasType()) {
+						for (RecipeItem rItem : BCauldronRecipe.acceptedCustom) {
+							if (rItem instanceof MMOItemsPluginItem) {
+								MMOItemsPluginItem mmo = ((MMOItemsPluginItem) rItem);
+								if (mmo.matches(event.getItem())) {
+									event.setCancelled(true);
+									P.p.playerListener.onPlayerInteract(event);
+									return;
+								}
+							}
+						}
+					}
+				}
+			}
+		} catch (Throwable e) {
+			P.p.errorLog("Could not check MMOItems for Item");
+			e.printStackTrace();
+		}
+	}
 }

src/com/dre/brewery/integration/barrel/CitadelBarrel.java

@@ -1,4 +1,4 @@
-package com.dre.brewery.integration;
+package com.dre.brewery.integration.barrel;
 
 import org.bukkit.block.Block;
 import org.bukkit.entity.Player;
@@ -13,7 +13,7 @@ import vg.civcraft.mc.citadel.reinforcement.Reinforcement;
 
 /**
  * Basic Citadel support to prevent randos from stealing your barrel aging brews
- * 
+ *
  * @author ProgrammerDan
  */
 public class CitadelBarrel {
@@ -21,11 +21,11 @@ public class CitadelBarrel {
 
 	public static boolean checkAccess(Player player, Block sign) {
 		ReinforcementManager manager = Citadel.getReinforcementManager();
-		
+
 		Reinforcement rein = manager.getReinforcement(sign);
-		
+
 		if (rein == null) return true; // no protections in place.
-		
+
 		if (rein instanceof PlayerReinforcement) {
 			PlayerReinforcement prein = (PlayerReinforcement) rein;
 			if (prein.canAccessChests(player)) {
@@ -35,7 +35,7 @@ public class CitadelBarrel {
 			return true;
 		}
 		// no support for multiblock atm, would require namelayer support.
-		
+
 		// special locked, or no access.
 		brewery.msg(player, brewery.languageReader.get("Error_NoBarrelAccess"));
 		return false;

src/com/dre/brewery/integration/barrel/GriefPreventionBarrel.java

@@ -1,4 +1,4 @@
-package com.dre.brewery.integration;
+package com.dre.brewery.integration.barrel;
 
 import com.dre.brewery.P;
 import com.dre.brewery.api.events.barrel.BarrelAccessEvent;

src/com/dre/brewery/integration/barrel/LWCBarrel.java

@@ -1,4 +1,4 @@
-package com.dre.brewery.integration;
+package com.dre.brewery.integration.barrel;
 
 import com.dre.brewery.Barrel;
 import com.dre.brewery.P;

src/com/dre/brewery/integration/barrel/LogBlockBarrel.java

@@ -1,4 +1,4 @@
-package com.dre.brewery.integration;
+package com.dre.brewery.integration.barrel;
 
 import com.dre.brewery.utility.LegacyUtil;
 import com.dre.brewery.P;

src/com/dre/brewery/integration/barrel/WGBarrel.java

@@ -1,4 +1,4 @@
-package com.dre.brewery.integration;
+package com.dre.brewery.integration.barrel;
 
 import org.bukkit.block.Block;
 import org.bukkit.entity.Player;

src/com/dre/brewery/integration/barrel/WGBarrel5.java

@@ -1,4 +1,4 @@
-package com.dre.brewery.integration;
+package com.dre.brewery.integration.barrel;
 
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;

src/com/dre/brewery/integration/barrel/WGBarrel6.java

@@ -1,4 +1,4 @@
-package com.dre.brewery.integration;
+package com.dre.brewery.integration.barrel;
 
 
 import com.sk89q.worldguard.bukkit.RegionQuery;

src/com/dre/brewery/integration/barrel/WGBarrel7.java

@@ -1,4 +1,4 @@
-package com.dre.brewery.integration;
+package com.dre.brewery.integration.barrel;
 
 
 import org.bukkit.block.Block;

src/com/dre/brewery/integration/item/BreweryPluginItem.java

@@ -0,0 +1,30 @@
+package com.dre.brewery.integration.item;
+
+import com.dre.brewery.Brew;
+import com.dre.brewery.recipe.BRecipe;
+import com.dre.brewery.recipe.PluginItem;
+import org.bukkit.ChatColor;
+import org.bukkit.inventory.ItemStack;
+
+/**
+ * For recipes that use Brewery Items as input
+ */
+public class BreweryPluginItem extends PluginItem {
+
+// When implementing this, put Brewery as softdepend in your plugin.yml!
+// We're calling this as server start:
+// PluginItem.registerForConfig("brewery", BreweryPluginItem::new);
+
+	@Override
+	public boolean matches(ItemStack item) {
+		Brew brew = Brew.get(item);
+		if (brew != null) {
+			BRecipe recipe = brew.getCurrentRecipe();
+			if (recipe != null) {
+				return recipe.getRecipeName().equalsIgnoreCase(getItemId()) || recipe.getName(10).equalsIgnoreCase(getItemId());
+			}
+			return ChatColor.stripColor(item.getItemMeta().getDisplayName()).equalsIgnoreCase(getItemId());
+		}
+		return false;
+	}
+}

src/com/dre/brewery/integration/item/MMOItemsPluginItem.java

@@ -0,0 +1,32 @@
+package com.dre.brewery.integration.item;
+
+import com.dre.brewery.P;
+import com.dre.brewery.filedata.BConfig;
+import com.dre.brewery.recipe.PluginItem;
+import net.Indyuce.mmoitems.MMOItems;
+import net.Indyuce.mmoitems.api.item.NBTItem;
+import org.bukkit.inventory.ItemStack;
+
+public class MMOItemsPluginItem extends PluginItem {
+
+// When implementing this, put Brewery as softdepend in your plugin.yml!
+// We're calling this as server start:
+// PluginItem.registerForConfig("mmoitems", MMOItemsPluginItem::new);
+
+	@Override
+	public boolean matches(ItemStack item) {
+		if (BConfig.hasMMOItems == null) {
+			BConfig.hasMMOItems = P.p.getServer().getPluginManager().isPluginEnabled("MMOItems");
+		}
+		if (!BConfig.hasMMOItems) return false;
+
+		try {
+			NBTItem nbtItem = MMOItems.plugin.getNMS().getNBTItem(item);
+			return nbtItem.hasType() && nbtItem.getString("MMOITEMS_ITEM_ID").equalsIgnoreCase(getItemId());
+		} catch (Throwable e) {
+			e.printStackTrace();
+			P.p.errorLog("Could not check MMOItems for Item ID");
+			return false;
+		}
+	}
+}

src/com/dre/brewery/integration/item/SlimefunPluginItem.java

@@ -0,0 +1,35 @@
+package com.dre.brewery.integration.item;
+
+import com.dre.brewery.P;
+import com.dre.brewery.filedata.BConfig;
+import com.dre.brewery.recipe.PluginItem;
+import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.SlimefunItem;
+import org.bukkit.inventory.ItemStack;
+
+public class SlimefunPluginItem extends PluginItem {
+
+// When implementing this, put Brewery as softdepend in your plugin.yml!
+// We're calling this as server start:
+// PluginItem.registerForConfig("slimefun", SlimefunPluginItem::new);
+// PluginItem.registerForConfig("exoticgarden", SlimefunPluginItem::new);
+
+	@Override
+	public boolean matches(ItemStack item) {
+		if (BConfig.hasSlimefun == null) {
+			BConfig.hasSlimefun = P.p.getServer().getPluginManager().isPluginEnabled("Slimefun");
+		}
+		if (!BConfig.hasSlimefun) return false;
+
+		try {
+			SlimefunItem sfItem = SlimefunItem.getByItem(item);
+			if (sfItem != null) {
+				return sfItem.getID().equalsIgnoreCase(getItemId());
+			}
+		} catch (Throwable e) {
+			e.printStackTrace();
+			P.p.errorLog("Could not check Slimefun for Item ID");
+			return false;
+		}
+		return false;
+	}
+}