From c4266fb61d4007065252a1c77a69332a57438b81 Mon Sep 17 00:00:00 2001
From: Gunging <gungingbross@gmail.com>
Date: Mon, 29 Mar 2021 09:42:22 -0500
Subject: [PATCH] Custom crafting with shaped and shapless recipes rework
 ready...

---
 .../mmoitems/listener/DurabilityListener.java | 39 ++-----------------
 1 file changed, 4 insertions(+), 35 deletions(-)

diff --git a/src/main/java/net/Indyuce/mmoitems/listener/DurabilityListener.java b/src/main/java/net/Indyuce/mmoitems/listener/DurabilityListener.java
index f0aec3ff..3875dea8 100644
--- a/src/main/java/net/Indyuce/mmoitems/listener/DurabilityListener.java
+++ b/src/main/java/net/Indyuce/mmoitems/listener/DurabilityListener.java
@@ -3,10 +3,14 @@ package net.Indyuce.mmoitems.listener;
 import net.Indyuce.mmoitems.api.interaction.util.DurabilityItem;
 import org.bukkit.Material;
 import org.bukkit.Sound;
+import org.bukkit.entity.EntityType;
+import org.bukkit.entity.LivingEntity;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
+import org.bukkit.event.entity.EntityDamageByEntityEvent;
+import org.bukkit.event.entity.EntityDamageEvent;
 import org.bukkit.event.entity.EntityDamageEvent.DamageCause;
 import org.bukkit.event.entity.EntityShootBowEvent;
 import org.bukkit.event.player.PlayerItemDamageEvent;
@@ -26,40 +30,6 @@ public class DurabilityListener implements Listener {
 	/**
 	 * Handles custom durability for non-'vanilla durability' items
 	 */
-<<<<<<< src/main/java/net/Indyuce/mmoitems/listener/DurabilityListener.java
-//	@EventHandler(ignoreCancelled = true)
-//	public void playerDamage(EntityDamageEvent event) {
-//		if (event.getEntityType() != EntityType.PLAYER || ignoredCauses.contains(event.getCause()))
-//			return;
-//
-//		Player player = (Player) event.getEntity();
-//		int damage = Math.max((int) event.getDamage() / 4, 1);
-//		for(EquipmentSlot slot : slots)
-//			if(hasItem(player, slot))
-//				handleVanillaDamage(player.getInventory().getItem(slot), player, slot, damage);
-//	}
-//
-//	@EventHandler(ignoreCancelled = true)
-//	public void playerMeleeAttack(EntityDamageByEntityEvent event) {
-//		if (event.getDamage() == 0 || event.getCause() != DamageCause.ENTITY_ATTACK || !(event.getEntity() instanceof LivingEntity)
-//				|| !(event.getDamager() instanceof Player) || event.getEntity().hasMetadata("NPC") || event.getDamager().hasMetadata("NPC"))
-//			return;
-//		Player player = (Player) event.getDamager();
-//		ItemStack item = player.getInventory().getItemInMainHand();
-//
-//		handleVanillaDamage(item, player, EquipmentSlot.HAND, 1);
-//	}
-//
-//	@EventHandler(ignoreCancelled = true)
-//	public void playerBowAttack(EntityShootBowEvent event) {
-//		if (!(event.getEntity() instanceof Player))
-//			return;
-//		Player player = (Player) event.getEntity();
-//		ItemStack item = event.getBow();
-//
-//		handleVanillaDamage(item, player, EquipmentSlot.HAND, 1);
-//	}
-=======
 	@EventHandler(ignoreCancelled = true)
 	public void playerDamage(EntityDamageEvent event) {
 		if (event.getEntityType() != EntityType.PLAYER || ignoredCauses.contains(event.getCause()))
@@ -92,7 +62,6 @@ public class DurabilityListener implements Listener {
 
 		handleVanillaDamage(item, player, EquipmentSlot.HAND, 1);
 	}
->>>>>>> src/main/java/net/Indyuce/mmoitems/listener/DurabilityListener.java
 
 	@EventHandler(ignoreCancelled = true)
 	public void itemDamage(PlayerItemDamageEvent event) {