From 91f136774e1e4e7e789f579d82c56c5b289831d9 Mon Sep 17 00:00:00 2001
From: Indyuce <cym.peyrat@yahoo.fr>
Date: Sun, 28 Nov 2021 10:01:47 +0100
Subject: [PATCH] Fixed default config sound names + better sound name
 compatibility

---
 .../net/Indyuce/mmoitems/api/ItemAttackMetadata.java   | 10 ++++++----
 .../net/Indyuce/mmoitems/api/interaction/Tool.java     |  7 +++++--
 .../java/net/Indyuce/mmoitems/stat/CustomSounds.java   |  6 ++++--
 src/main/resources/default/item/consumable.yml         |  8 ++++----
 4 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/src/main/java/net/Indyuce/mmoitems/api/ItemAttackMetadata.java b/src/main/java/net/Indyuce/mmoitems/api/ItemAttackMetadata.java
index 7f8c4a4d..d492d039 100644
--- a/src/main/java/net/Indyuce/mmoitems/api/ItemAttackMetadata.java
+++ b/src/main/java/net/Indyuce/mmoitems/api/ItemAttackMetadata.java
@@ -6,15 +6,17 @@ import io.lumine.mythic.lib.api.stat.StatMap;
 import io.lumine.mythic.lib.damage.AttackMetadata;
 import io.lumine.mythic.lib.damage.DamageMetadata;
 import io.lumine.mythic.lib.damage.DamageType;
-import net.Indyuce.mmoitems.ability.Ability;
 import net.Indyuce.mmoitems.api.player.PlayerData;
 import org.bukkit.entity.LivingEntity;
 
 /**
- * The attack metadata used here in MMOItems. It
- * extends the default attack metadata from MythicLib
- * to benefit from all its methods
+ * The attack metadata used here in MMOItems. It extends the default
+ * attack metadata from MythicLib to benefit from all its methods
+ *
+ * @deprecated Elemental damage calculation will be moved to MythicLib and this
+ *         class will therefore be 100% useless
  */
+@Deprecated
 public class ItemAttackMetadata extends AttackMetadata {
     public ItemAttackMetadata(DamageMetadata damage, StatMap.CachedStatMap damager) {
         super(damage, damager);
diff --git a/src/main/java/net/Indyuce/mmoitems/api/interaction/Tool.java b/src/main/java/net/Indyuce/mmoitems/api/interaction/Tool.java
index e92c377d..a1705de7 100644
--- a/src/main/java/net/Indyuce/mmoitems/api/interaction/Tool.java
+++ b/src/main/java/net/Indyuce/mmoitems/api/interaction/Tool.java
@@ -26,6 +26,10 @@ public class Tool extends UseItem {
         return MythicLib.plugin.getFlags().isFlagAllowed(player, CustomFlag.MI_TOOLS) && playerData.getRPG().canUse(getNBTItem(), true);
     }
 
+    /**
+     * @param block Block being broken
+     * @return If the mining event should be canceled
+     */
     public boolean miningEffects(Block block) {
         boolean cancel = false;
 
@@ -46,8 +50,7 @@ public class Tool extends UseItem {
                 int j = 0;
 
                 public void run() {
-                    j++;
-                    if (j > 10)
+                    if (j++ > 10)
                         cancel();
 
                     loc.add(v);
diff --git a/src/main/java/net/Indyuce/mmoitems/stat/CustomSounds.java b/src/main/java/net/Indyuce/mmoitems/stat/CustomSounds.java
index 0d4f8fa7..77c0b83b 100644
--- a/src/main/java/net/Indyuce/mmoitems/stat/CustomSounds.java
+++ b/src/main/java/net/Indyuce/mmoitems/stat/CustomSounds.java
@@ -238,8 +238,10 @@ public class CustomSounds extends ItemStat implements GemStoneStat, PlayerConsum
 		if (cs == null) playDefaultSound(player);
 
 			// Play custom sound lets go
-		else
-			player.getWorld().playSound(player.getLocation(), cs.getSound(), (float) cs.getVolume(), (float) cs.getPitch());
+		else {
+			String fixedSoundName = cs.getSound().toLowerCase().replace("_", ".");
+			player.getWorld().playSound(player.getLocation(), fixedSoundName, (float) cs.getVolume(), (float) cs.getPitch());
+		}
 	}
 
 	void playDefaultSound(@NotNull Player player) { player.getWorld().playSound(player.getLocation(), Sound.ENTITY_GENERIC_EAT, 1, 1); }
diff --git a/src/main/resources/default/item/consumable.yml b/src/main/resources/default/item/consumable.yml
index e6d53ef7..2ed79b3b 100644
--- a/src/main/resources/default/item/consumable.yml
+++ b/src/main/resources/default/item/consumable.yml
@@ -164,7 +164,7 @@ LARGE_HEALTH_POTION:
     name: '&fLarge Health Potion'
     item-cooldown: 10.0
     sounds:
-      on-consume: ENTITY_GENERIC_DRINK
+      on-consume: entity.generic.drink
     restore-health: 10.0
 LARGE_MANA_POTION:
   base:
@@ -179,7 +179,7 @@ LARGE_MANA_POTION:
       max-spread: 0.13
     item-cooldown: 15.0
     sounds:
-      on-consume: ENTITY_GENERIC_DRINK
+      on-consume: entity.generic.drink
 TACO:
   base:
     material: PLAYER_HEAD
@@ -295,7 +295,7 @@ SANTA_COOKIE:
     lore:
     - '&7&oWhere are the darn cookies!'
     sounds:
-      on-consume: ENTITY_PLAYER_BURP
+      on-consume: entity.player.burp
     item-cooldown: 2.0
     effects:
       SPEED:
@@ -314,7 +314,7 @@ ENDER_NOTE:
     name: '&5Ender Tome'
     item-cooldown: 180
     sounds:
-      on-consume: ENTITY_ENDERMAN_TELEPORT
+      on-consume: entity.enderman.teleport
     lore:
     - '&7Teleports you &5miles&7 away.'
     effects: