Merge pull request #538 from VolmitSoftware/Development

1.16.5

Author: AvianAeternum

src/main/java/com/volmit/adapt/api/world/AdaptComponent.java

@@ -19,6 +19,7 @@
 package com.volmit.adapt.api.world;
 
 import com.volmit.adapt.Adapt;
+import com.volmit.adapt.util.reflect.registries.Materials;
 import org.bukkit.Material;
 import org.bukkit.block.data.BlockData;
 import org.bukkit.entity.Player;
@@ -42,13 +43,17 @@ default boolean isItem(ItemStack is) {
     }
 
     default boolean isTool(ItemStack is) {
-        return isAxe(is) || isPickaxe(is) || isHoe(is) || isShovel(is) || isSword(is) || isTrident(is);
+        return isAxe(is) || isPickaxe(is) || isHoe(is) || isShovel(is) || isSword(is) || isTrident(is) || isMace(is);
     }
 
     default boolean isMelee(ItemStack is) {
         return isTool(is);
     }
 
+    default boolean isMace(ItemStack is) {
+        return is.getType().getKey().equals(Materials.MACE_KEY);
+    }
+
     default boolean isShield(ItemStack is) {
         return is.getType().equals(Material.SHIELD);
     }

src/main/java/com/volmit/adapt/util/reflect/registries/Materials.java

@@ -1,7 +1,9 @@
 package com.volmit.adapt.util.reflect.registries;
 
 import org.bukkit.Material;
+import org.bukkit.NamespacedKey;
 
 public class Materials {
     public static final Material GRASS = RegistryUtil.find(Material.class, "grass", "short_grass");
+    public static final NamespacedKey MACE_KEY = NamespacedKey.minecraft("mace");
 }