fixed typo

Update pom.xml
fixed reseting lore for armor
2025-12-06 06:41:44 +00:00 · 2022-06-16 00:04:23 -04:00 · 2022-06-16 00:00:19 -04:00 · 2022-06-16 00:00:04 -04:00 · 2022-06-15 23:59:19 -04:00 · 2022-06-15 23:48:39 -04:00
18 changed files with 804 additions and 178 deletions
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 <h1 align="center">ToolStats</h1>

 <p align="center">
-	<img src="https://img.shields.io/badge/Minecraft-1.15+-orange" alt="Minecraft versions">
+	<img src="https://img.shields.io/badge/Minecraft-1.15--1.19-orange" alt="Minecraft versions">
 	<img src="https://img.shields.io/github/v/release/hyperdefined/ToolStats" alt="GitHub release (latest by date)">
 	<a href="https://github.com/hyperdefined/ToolStats/releases"><img src="https://img.shields.io/github/downloads/hyperdefined/ToolStats/total?logo=github" alt="Downloads"></a>
 	<a href="https://en.cryptobadges.io/donate/1F29aNKQzci3ga5LDcHHawYzFPXvELTFoL"><img src="https://en.cryptobadges.io/badge/micro/1F29aNKQzci3ga5LDcHHawYzFPXvELTFoL" alt="Donate with Bitcoin"></a>
@@ -23,6 +23,8 @@ Here is everything it tracks:

 The best part is, this data is stored on the item itself. You can also change how the lore is displayed on the items!

+If item lore is ever incorrect, you can run `/toolstats reset` to reset the item lore so it's correct.
+
 ![Image](https://raw.githubusercontent.com/hyperdefined/ToolStats/master/images/image.png)
 ![Image](https://raw.githubusercontent.com/hyperdefined/ToolStats/master/images/image2.png)
 ![Image](https://raw.githubusercontent.com/hyperdefined/ToolStats/master/images/image3.png)
@@ -34,5 +36,8 @@ The best part is, this data is stored on the item itself. You can also change ho
 ![Image](https://raw.githubusercontent.com/hyperdefined/ToolStats/master/images/image9.png)
 ![Image](https://raw.githubusercontent.com/hyperdefined/ToolStats/master/images/image10.png)

+## Documentation
+Visit the [wiki](https://github.com/hyperdefined/ToolStats/wiki) for help.
+
 ## License
 This plugin is released under GNU General Public License v3. See [LICENSE](https://github.com/hyperdefined/ToolStats/blob/master/LICENSE).
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@

    <groupId>lol.hyper</groupId>
    <artifactId>toolstats</artifactId>
-    <version>1.2.3</version>
+    <version>1.4.1</version>
    <packaging>jar</packaging>

    <name>ToolStats</name>
@@ -37,7 +37,7 @@
        <plugins>
            <plugin>
                <artifactId>maven-clean-plugin</artifactId>
-                <version>3.1.0</version>
+                <version>3.2.0</version>
                <executions>
                    <execution>
                        <id>auto-clean</id>
@@ -51,7 +51,7 @@
            <plugin>
                <groupId>org.apache.maven.plugins</groupId>
                <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.9.0</version>
+                <version>3.10.1</version>
                <configuration>
                    <source>${java.version}</source>
                    <target>${java.version}</target>
@@ -60,13 +60,21 @@
            <plugin>
                <groupId>org.apache.maven.plugins</groupId>
                <artifactId>maven-shade-plugin</artifactId>
-                <version>3.2.4</version>
+                <version>3.3.0</version>
                <configuration>
                    <relocations>
                        <relocation>
                            <pattern>org.bstats</pattern>
                            <shadedPattern>lol.hyper.toolstats.bstats</shadedPattern>
                        </relocation>
+                        <relocation>
+                            <pattern>net.kyori.adventure</pattern>
+                            <shadedPattern>lol.hyper.toolstats.adventure</shadedPattern>
+                        </relocation>
+                        <relocation>
+                            <pattern>lol.hyper.githubreleaseapi</pattern>
+                            <shadedPattern>lol.hyper.toolstats.updater</shadedPattern>
+                        </relocation>
                    </relocations>
                </configuration>
                <executions>
@@ -101,15 +109,9 @@
        <dependency>
            <groupId>org.spigotmc</groupId>
            <artifactId>spigot-api</artifactId>
-            <version>1.18.1-R0.1-SNAPSHOT</version>
+            <version>1.19-R0.1-SNAPSHOT</version>
            <scope>provided</scope>
        </dependency>
-        <dependency>
-            <groupId>org.jetbrains</groupId>
-            <artifactId>annotations</artifactId>
-            <version>23.0.0</version>
-            <scope>compile</scope>
-        </dependency>
        <dependency>
            <groupId>org.bstats</groupId>
            <artifactId>bstats-bukkit</artifactId>
@@ -119,7 +121,26 @@
        <dependency>
            <groupId>lol.hyper</groupId>
            <artifactId>github-release-api</artifactId>
-            <version>1.0.1</version>
+            <version>1.0.2</version>
+            <scope>compile</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.json</groupId>
+                    <artifactId>json</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>net.kyori</groupId>
+            <artifactId>adventure-text-minimessage</artifactId>
+            <version>4.11.0</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>net.kyori</groupId>
+            <artifactId>adventure-platform-bukkit</artifactId>
+            <version>4.1.1</version>
+            <scope>compile</scope>
        </dependency>
    </dependencies>
 </project>
--- a/src/main/java/lol/hyper/toolstats/ToolStats.java
+++ b/src/main/java/lol/hyper/toolstats/ToolStats.java
@@ -21,6 +21,7 @@ import lol.hyper.githubreleaseapi.GitHubRelease;
 import lol.hyper.githubreleaseapi.GitHubReleaseAPI;
 import lol.hyper.toolstats.commands.CommandToolStats;
 import lol.hyper.toolstats.events.*;
+import net.kyori.adventure.platform.bukkit.BukkitAudiences;
 import org.bstats.bukkit.Metrics;
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
@@ -32,8 +33,9 @@ import org.bukkit.plugin.java.JavaPlugin;

 import java.io.File;
 import java.io.IOException;
-import java.util.HashSet;
-import java.util.Set;
+import java.text.DecimalFormat;
+import java.text.SimpleDateFormat;
+import java.util.Locale;
 import java.util.logging.Logger;

 public final class ToolStats extends JavaPlugin {
@@ -57,7 +59,9 @@ public final class ToolStats extends JavaPlugin {
    // used for tracking new elytras
    public final NamespacedKey newElytra = new NamespacedKey(this, "new");

-    public final Set<NamespacedKey> keys = new HashSet<>();
+    public final SimpleDateFormat dateFormat = new SimpleDateFormat("M/dd/yyyy", Locale.ENGLISH);
+    public final DecimalFormat decimalFormat = new DecimalFormat("#,###.00");
+    public final DecimalFormat commaFormat = new DecimalFormat("#,###");

    public BlocksMined blocksMined;
    public ChunkPopulate chunkPopulate;
@@ -67,6 +71,7 @@ public final class ToolStats extends JavaPlugin {
    public PickupItem pickupItem;
    public EntityDamage mobKill;
    public PlayerFish playerFish;
+    public PlayerInteract playerInteract;
    public SheepShear sheepShear;
    public VillagerTrade villagerTrade;
    public CommandToolStats commandToolStats;
@@ -76,8 +81,11 @@ public final class ToolStats extends JavaPlugin {
    public FileConfiguration config;
    public final int CONFIG_VERSION = 3;

+    private BukkitAudiences adventure;
+
    @Override
    public void onEnable() {
+        this.adventure = BukkitAudiences.create(this);
        if (!configFile.exists()) {
            this.saveResource("config.yml", true);
            logger.info("Copying default config!");
@@ -91,6 +99,7 @@ public final class ToolStats extends JavaPlugin {
        pickupItem = new PickupItem(this);
        mobKill = new EntityDamage(this);
        playerFish = new PlayerFish(this);
+        playerInteract = new PlayerInteract(this);
        sheepShear = new SheepShear(this);
        villagerTrade = new VillagerTrade(this);
        commandToolStats = new CommandToolStats(this);
@@ -103,6 +112,7 @@ public final class ToolStats extends JavaPlugin {
        Bukkit.getServer().getPluginManager().registerEvents(pickupItem, this);
        Bukkit.getServer().getPluginManager().registerEvents(mobKill, this);
        Bukkit.getServer().getPluginManager().registerEvents(playerFish, this);
+        Bukkit.getServer().getPluginManager().registerEvents(playerInteract, this);
        Bukkit.getServer().getPluginManager().registerEvents(sheepShear, this);
        Bukkit.getServer().getPluginManager().registerEvents(villagerTrade, this);

@@ -111,15 +121,6 @@ public final class ToolStats extends JavaPlugin {
        new Metrics(this, 14110);

        Bukkit.getScheduler().runTaskAsynchronously(this, this::checkForUpdates);
-
-        keys.add(genericOwner);
-        keys.add(timeCreated);
-        keys.add(swordPlayerKills);
-        keys.add(swordMobKills);
-        keys.add(genericMined);
-        keys.add(fishingRodCaught);
-        keys.add(shearsSheared);
-        keys.add(armorDamage);
    }

    public void loadConfig() {
@@ -152,16 +153,26 @@ public final class ToolStats extends JavaPlugin {
        }
    }

+    /**
+     * Checks the config to see if we want to show lore on certain items.
+     *
+     * @param itemStack  The item to check.
+     * @param configName The config we are checking under.
+     * @return If we want to allow lore or not.
+     */
    public boolean checkConfig(ItemStack itemStack, String configName) {
        String itemName = itemStack.getType().toString().toLowerCase();
        String itemType = null;
-        if (itemName.contains("bow") || itemName.contains("shears")) {
+        if (itemName.contains("bow") || itemName.contains("shears") || itemName.contains("trident")) {
            if (itemName.contains("bow")) {
                itemType = "bow";
            }
            if (itemName.contains("shears")) {
                itemType = "shears";
            }
+            if (itemName.contains("trident")) {
+                itemType = "trident";
+            }
        } else {
            itemType = itemName.substring(itemName.indexOf("_") + 1);
        }
@@ -192,6 +203,9 @@ public final class ToolStats extends JavaPlugin {
            case "bow": {
                return config.getBoolean("enabled." + configName + ".bow");
            }
+            case "trident": {
+                return config.getBoolean("enabled." + configName + ".trident");
+            }
            case "helmet":
            case "chestplate":
            case "leggings":
@@ -202,6 +216,13 @@ public final class ToolStats extends JavaPlugin {
        return false;
    }

+    /**
+     * Gets the lore message from the config.
+     *
+     * @param configName The config name, "messages." is already in front.
+     * @param raw        If you want the raw message with the formatting codes and placeholders.
+     * @return The lore message.
+     */
    public String getLoreFromConfig(String configName, boolean raw) {
        String lore = config.getString("messages." + configName);
        if (lore == null) {
@@ -235,7 +256,17 @@ public final class ToolStats extends JavaPlugin {
            if (lore.contains("{damage}")) {
                lore = lore.replace("{damage}", "");
            }
+            if (lore.contains("{fish}")) {
+                lore = lore.replace("{fish}", "");
+            }
        }
        return lore;
    }
+
+    public BukkitAudiences getAdventure() {
+        if(this.adventure == null) {
+            throw new IllegalStateException("Tried to access Adventure when the plugin was disabled!");
+        }
+        return this.adventure;
+    }
 }
--- a/src/main/java/lol/hyper/toolstats/commands/CommandToolStats.java
+++ b/src/main/java/lol/hyper/toolstats/commands/CommandToolStats.java
@@ -18,36 +18,260 @@
 package lol.hyper.toolstats.commands;

 import lol.hyper.toolstats.ToolStats;
-import org.bukkit.ChatColor;
+import lol.hyper.toolstats.tools.UUIDDataType;
+import net.kyori.adventure.platform.bukkit.BukkitAudiences;
+import net.kyori.adventure.text.Component;
+import net.kyori.adventure.text.format.NamedTextColor;
+import org.bukkit.Material;
 import org.bukkit.command.Command;
-import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
+import org.bukkit.command.TabExecutor;
+import org.bukkit.entity.Player;
+import org.bukkit.inventory.ItemStack;
+import org.bukkit.inventory.meta.ItemMeta;
+import org.bukkit.persistence.PersistentDataContainer;
+import org.bukkit.persistence.PersistentDataType;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;

-public class CommandToolStats implements CommandExecutor {
+import java.util.*;
+
+public class CommandToolStats implements TabExecutor {

    private final ToolStats toolStats;
+    private final BukkitAudiences audiences;

    public CommandToolStats(ToolStats toolStats) {
        this.toolStats = toolStats;
+        this.audiences = toolStats.getAdventure();
    }

    @Override
    public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, @NotNull String[] args) {
-        if (args.length == 0) {
-            sender.sendMessage(ChatColor.GREEN + "ToolStats version " + toolStats.getDescription().getVersion() + ". Created by hyperdefined.");
-        } else if (args.length == 1) {
-            if (args[0].equalsIgnoreCase("reload")) {
-                if (sender.isOp() || sender.hasPermission("toolstats.reload")) {
-                    toolStats.loadConfig();
-                    sender.sendMessage(ChatColor.GREEN + "Configuration reloaded!");
-                } else {
-                    sender.sendMessage(ChatColor.RED + "You do not have permission for this command.");
+        if (!sender.hasPermission("toolstats.use")) {
+            audiences.sender(sender).sendMessage(Component.text("You do not have permission for this command.").color(NamedTextColor.RED));
+            return true;
        }
+        if (args.length == 0) {
+            audiences.sender(sender).sendMessage(Component.text("ToolStats version " + toolStats.getDescription().getVersion() + ". Created by hyperdefined.").color(NamedTextColor.GREEN));
+            return true;
+        }
+        switch (args[0]) {
+            case "reload": {
+                if (sender.hasPermission("toolstats.reload")) {
+                    toolStats.loadConfig();
+                    audiences.sender(sender).sendMessage(Component.text("Configuration reloaded!").color(NamedTextColor.GREEN));
                } else {
-                sender.sendMessage(ChatColor.RED + "Invalid sub-command.");
+                    audiences.sender(sender).sendMessage(Component.text("You do not have permission for this command.").color(NamedTextColor.RED));
+                }
+                return true;
+            }
+            case "reset": {
+                if (args.length == 2 && args[1].equalsIgnoreCase("confirm")) {
+                    Player player = (Player) sender;
+                    ItemStack heldItem = player.getInventory().getItemInMainHand();
+                    if (heldItem.getType() == Material.AIR) {
+                        audiences.sender(sender).sendMessage(Component.text("You must hold an item!").color(NamedTextColor.RED));
+                        return true;
+                    }
+                    fixItemLore(heldItem, player);
+                    audiences.sender(sender).sendMessage(Component.text("The lore was reset!").color(NamedTextColor.GREEN));
+                    return true;
+                }
+                audiences.sender(sender).sendMessage(Component.text("This will remove ALL current lore from the held item and replace it with the correct lore.").color(NamedTextColor.GREEN));
+                audiences.sender(sender).sendMessage(Component.text("The item owner will be who ever is currently running this command.").color(NamedTextColor.GREEN));
+                audiences.sender(sender).sendMessage(Component.text("Only use this if the tags on the tool are incorrect.").color(NamedTextColor.GREEN));
+                audiences.sender(sender).sendMessage(Component.text("Type /toolstats reset confirm to confirm this.").color(NamedTextColor.GREEN));
+                return true;
+            }
+            default: {
+                audiences.sender(sender).sendMessage(Component.text("Invalid sub-command.").color(NamedTextColor.RED));
            }
        }
        return true;
    }
+
+    /**
+     * Fixes lore on a given item. This will wipe all lore and reapply our custom ones.
+     *
+     * @param original The item we are fixing.
+     * @param player   The player running the command.
+     */
+    private void fixItemLore(ItemStack original, Player player) {
+        ItemStack finalItem = original.clone();
+        ItemMeta finalMeta = finalItem.getItemMeta();
+        if (finalMeta == null) {
+            return;
+        }
+        PersistentDataContainer container = finalMeta.getPersistentDataContainer();
+        List<String> lore = new ArrayList<>();
+
+        String caughtByLore = toolStats.getLoreFromConfig("fished.caught-by", false);
+        String lootedByLore = toolStats.getLoreFromConfig("looted.found-by", false);
+        String tradedByLore = toolStats.getLoreFromConfig("traded.traded-by", false);
+
+        // make sure the config messages are not null
+        if (caughtByLore == null || lootedByLore == null || tradedByLore == null) {
+            return;
+        }
+
+        // determine how the item was originally created
+        // this doesn't get saved, so we just rely on the lore
+        // if there isn't a tag, default to crafted
+        String type = "DEFAULT";
+        if (finalMeta.hasLore()) {
+            if (finalMeta.getLore() != null) {
+                for (String line : finalMeta.getLore()) {
+                    if (line.contains(caughtByLore)) {
+                        type = "CAUGHT";
+                    }
+                    if (line.contains(lootedByLore)) {
+                        type = "LOOTED";
+                    }
+                    if (line.contains(tradedByLore)) {
+                        type = "TRADED";
+                    }
+                }
+            }
+        }
+
+        // hard code elytras
+        if (finalItem.getType() == Material.ELYTRA) {
+            if (toolStats.config.getBoolean("enabled.elytra-tag")) {
+                lore.add(toolStats.getLoreFromConfig("looted.found-by", true).replace("{player}", player.getName()));
+                if (container.has(toolStats.timeCreated, PersistentDataType.LONG)) {
+                    Long time = container.get(toolStats.timeCreated, PersistentDataType.LONG);
+                    if (time != null) {
+                        lore.add(toolStats.getLoreFromConfig("looted.found-on", true).replace("{date}", toolStats.dateFormat.format(new Date(time))));
+                    }
+                }
+                finalMeta.setLore(lore);
+                finalItem.setItemMeta(finalMeta);
+                int slot = player.getInventory().getHeldItemSlot();
+                player.getInventory().setItem(slot, finalItem);
+                return;
+            }
+        }
+
+        if (toolStats.checkConfig(original, "created-by")) {
+            if (container.has(toolStats.genericOwner, new UUIDDataType())) {
+                container.set(toolStats.genericOwner, new UUIDDataType(), player.getUniqueId());
+                // show how the item was created based on the previous lore
+                switch (type) {
+                    case "DEFAULT": {
+                        lore.add(toolStats.getLoreFromConfig("created.created-by", true).replace("{player}", player.getName()));
+                        break;
+                    }
+                    case "CAUGHT": {
+                        lore.add(toolStats.getLoreFromConfig("fished.caught-by", true).replace("{player}", player.getName()));
+                        break;
+                    }
+                    case "LOOTED": {
+                        lore.add(toolStats.getLoreFromConfig("looted.found-by", true).replace("{player}", player.getName()));
+                        break;
+                    }
+                    case "TRADED": {
+                        lore.add(toolStats.getLoreFromConfig("traded.traded-by", true).replace("{player}", player.getName()));
+                        break;
+                    }
+                }
+            }
+        }
+        if (toolStats.checkConfig(original, "created-date")) {
+            if (container.has(toolStats.timeCreated, PersistentDataType.LONG)) {
+                Long time = container.get(toolStats.timeCreated, PersistentDataType.LONG);
+                if (time != null) {
+                    // show how when the item was created based on the previous lore
+                    switch (type) {
+                        case "DEFAULT": {
+                            lore.add(toolStats.getLoreFromConfig("created.created-on", true).replace("{date}", toolStats.dateFormat.format(new Date(time))));
+                            break;
+                        }
+                        case "CAUGHT": {
+                            lore.add(toolStats.getLoreFromConfig("fished.caught-on", true).replace("{date}", toolStats.dateFormat.format(new Date(time))));
+                            break;
+                        }
+                        case "LOOTED": {
+                            lore.add(toolStats.getLoreFromConfig("looted.found-on", true).replace("{date}", toolStats.dateFormat.format(new Date(time))));
+                            break;
+                        }
+                        case "TRADED": {
+                            lore.add(toolStats.getLoreFromConfig("traded.traded-on", true).replace("{date}", toolStats.dateFormat.format(new Date(time))));
+                            break;
+                        }
+                    }
+                }
+            }
+        }
+        if (toolStats.checkConfig(original, "player-kills")) {
+            if (container.has(toolStats.swordPlayerKills, PersistentDataType.INTEGER)) {
+                Integer kills = container.get(toolStats.swordPlayerKills, PersistentDataType.INTEGER);
+                if (kills != null) {
+                    lore.add(toolStats.getLoreFromConfig("kills.player", true).replace("{kills}", toolStats.commaFormat.format(kills)));
+                }
+            }
+        }
+        if (toolStats.checkConfig(original, "mob-kills")) {
+            if (container.has(toolStats.swordMobKills, PersistentDataType.INTEGER)) {
+                Integer kills = container.get(toolStats.swordMobKills, PersistentDataType.INTEGER);
+                if (kills != null) {
+                    lore.add(toolStats.getLoreFromConfig("kills.mob", true).replace("{kills}", toolStats.commaFormat.format(kills)));
+                }
+            }
+        }
+        if (toolStats.checkConfig(original, "blocks-mined")) {
+            if (container.has(toolStats.genericMined, PersistentDataType.INTEGER)) {
+                Integer blocksMined = container.get(toolStats.genericMined, PersistentDataType.INTEGER);
+                if (blocksMined != null) {
+                    lore.add(toolStats.getLoreFromConfig("blocks-mined", true).replace("{blocks}", toolStats.commaFormat.format(blocksMined)));
+                }
+            }
+        }
+        if (toolStats.config.getBoolean("enabled.fish-caught")) {
+            if (container.has(toolStats.fishingRodCaught, PersistentDataType.INTEGER)) {
+                Integer fish = container.get(toolStats.fishingRodCaught, PersistentDataType.INTEGER);
+                if (fish != null) {
+                    lore.add(toolStats.getLoreFromConfig("fished.fish-caught", true).replace("{fish}", toolStats.commaFormat.format(fish)));
+                }
+            }
+        }
+        if (toolStats.config.getBoolean("enabled.sheep-sheared")) {
+            if (container.has(toolStats.shearsSheared, PersistentDataType.INTEGER)) {
+                Integer sheep = container.get(toolStats.shearsSheared, PersistentDataType.INTEGER);
+                if (sheep != null) {
+                    lore.add(toolStats.getLoreFromConfig("sheep-sheared", true).replace("{sheep}", toolStats.commaFormat.format(sheep)));
+                }
+            }
+        }
+        if (toolStats.config.getBoolean("enabled.armor-damage")) {
+            if (container.has(toolStats.armorDamage, PersistentDataType.DOUBLE)) {
+                Double damage = container.get(toolStats.armorDamage, PersistentDataType.DOUBLE);
+                if (damage != null) {
+                    lore.add(toolStats.getLoreFromConfig("damage-taken", true).replace("{damage}", toolStats.commaFormat.format(damage)));
+                }
+            }
+        }
+        finalMeta.setLore(lore);
+        finalItem.setItemMeta(finalMeta);
+        int slot = player.getInventory().getHeldItemSlot();
+        player.getInventory().setItem(slot, finalItem);
+    }
+
+    @Nullable
+    @Override
+    public List<String> onTabComplete(@NotNull CommandSender sender, @NotNull Command command, @NotNull String alias, @NotNull String[] args) {
+        if (args.length == 1) {
+            if (sender.hasPermission("toolstats.reload")) {
+                return Arrays.asList("reset", "reload");
+            } else {
+                return Collections.singletonList("reset");
+            }
+        }
+        if (args.length == 2) {
+            if (args[0].equalsIgnoreCase("reset")) {
+                return Collections.singletonList("confirm");
+            }
+        }
+        return null;
+    }
 }
--- a/src/main/java/lol/hyper/toolstats/events/BlocksMined.java
+++ b/src/main/java/lol/hyper/toolstats/events/BlocksMined.java
@@ -18,6 +18,7 @@
 package lol.hyper.toolstats.events;

 import lol.hyper.toolstats.ToolStats;
+import lol.hyper.toolstats.tools.ItemChecker;
 import org.bukkit.GameMode;
 import org.bukkit.Material;
 import org.bukkit.entity.Player;
@@ -30,13 +31,11 @@ import org.bukkit.persistence.PersistentDataContainer;
 import org.bukkit.persistence.PersistentDataType;

 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;

 public class BlocksMined implements Listener {

    private final ToolStats toolStats;
-    private final String[] validTools = {"pickaxe", "axe", "hoe", "shovel", "shear"};

    public BlocksMined(ToolStats toolStats) {
        this.toolStats = toolStats;
@@ -48,17 +47,19 @@ public class BlocksMined implements Listener {
            return;
        }
        Player player = event.getPlayer();
-        if (player.getGameMode() != GameMode.SURVIVAL) {
+        if (player.getGameMode() == GameMode.CREATIVE || player.getGameMode() == GameMode.SPECTATOR) {
            return;
        }
+        // if the player mines something with their fist
        ItemStack heldItem = player.getInventory().getItem(player.getInventory().getHeldItemSlot());
        if (heldItem == null || heldItem.getType() == Material.AIR) {
            return;
        }
-        String itemName = heldItem.getType().toString().toLowerCase();
-        if (Arrays.stream(validTools).noneMatch(itemName::contains)) {
+        // only check certain items
+        if (!ItemChecker.isMineTool(heldItem.getType())) {
            return;
        }
+        // if it's an item we want, update the stats
        updateBlocksMined(heldItem);
    }

@@ -67,6 +68,8 @@ public class BlocksMined implements Listener {
        if (meta == null) {
            return;
        }
+        // read the current stats from the item
+        // if they don't exist, then start from 0
        Integer blocksMined = 0;
        PersistentDataContainer container = meta.getPersistentDataContainer();
        if (container.has(toolStats.genericMined, PersistentDataType.INTEGER)) {
@@ -78,10 +81,14 @@ public class BlocksMined implements Listener {
            blocksMined++;
        }
        container.set(toolStats.genericMined, PersistentDataType.INTEGER, blocksMined);
-
        String configLore = toolStats.getLoreFromConfig("blocks-mined", false);
        String configLoreRaw = toolStats.getLoreFromConfig("blocks-mined", true);

+        if (configLore == null || configLoreRaw == null) {
+            toolStats.logger.warning("There is no lore message for messages.blocks-mined!");
+            return;
+        }
+
        List<String> lore;
        if (meta.hasLore()) {
            lore = meta.getLore();
@@ -89,26 +96,23 @@ public class BlocksMined implements Listener {
            boolean hasLore = false;
            // we do a for loop like this, we can keep track of index
            // this doesn't mess the lore up of existing items
-            if (configLore == null || configLoreRaw == null) {
-                toolStats.logger.warning("There is no lore message for messages.blocks-mined!");
-                return;
-            }
            for (int x = 0; x < lore.size(); x++) {
                if (lore.get(x).contains(configLore)) {
                    hasLore = true;
-                    lore.set(x, configLoreRaw.replace("{blocks}", Integer.toString(blocksMined)));
+                    lore.set(x, configLoreRaw.replace("{blocks}", toolStats.commaFormat.format(blocksMined)));
                    break;
                }
            }
            // if the item has lore but doesn't have the tag, add it
            if (!hasLore) {
-                lore.add(configLoreRaw.replace("{blocks}", Integer.toString(blocksMined)));
+                lore.add(configLoreRaw.replace("{blocks}", toolStats.commaFormat.format(blocksMined)));
            }
        } else {
            // if the item has no lore, create a new list and add the string
            lore = new ArrayList<>();
-            lore.add(configLoreRaw.replace("{blocks}", Integer.toString(blocksMined)));
+            lore.add(configLoreRaw.replace("{blocks}", toolStats.commaFormat.format(blocksMined)));
        }
+        // do we add the lore based on the config?
        if (toolStats.checkConfig(itemStack, "blocks-mined")) {
            meta.setLore(lore);
        }
--- a/src/main/java/lol/hyper/toolstats/events/ChunkPopulate.java
+++ b/src/main/java/lol/hyper/toolstats/events/ChunkPopulate.java
@@ -35,7 +35,7 @@ import org.bukkit.persistence.PersistentDataType;
 public class ChunkPopulate implements Listener {

    // this tags all elytras with a "new" tag
-    // this let's use tag any new elytras player loot
+    // this let's us track any new elytras player loot

    private final ToolStats toolStats;

@@ -53,14 +53,17 @@ public class ChunkPopulate implements Listener {
        Bukkit.getScheduler().runTaskLater(toolStats, () -> {
            Chunk chunk = event.getChunk();
            for (Entity entity : chunk.getEntities()) {
+                // if there is a new item frame
                if (entity instanceof ItemFrame) {
                    ItemFrame itemFrame = (ItemFrame) entity;
+                    // if the item frame has an elytra
                    if (itemFrame.getItem().getType() == Material.ELYTRA) {
                        ItemStack elytraCopy = itemFrame.getItem();
                        ItemMeta meta = elytraCopy.getItemMeta();
                        if (meta == null) {
                            return;
                        }
+                        // add the new tag so we know it's new
                        PersistentDataContainer container = meta.getPersistentDataContainer();
                        container.set(toolStats.newElytra, PersistentDataType.INTEGER, 1);
                        elytraCopy.setItemMeta(meta);
--- a/src/main/java/lol/hyper/toolstats/events/CraftItem.java
+++ b/src/main/java/lol/hyper/toolstats/events/CraftItem.java
@@ -18,8 +18,10 @@
 package lol.hyper.toolstats.events;

 import lol.hyper.toolstats.ToolStats;
-import lol.hyper.toolstats.UUIDDataType;
+import lol.hyper.toolstats.tools.ItemChecker;
+import lol.hyper.toolstats.tools.UUIDDataType;
 import org.bukkit.ChatColor;
+import org.bukkit.GameMode;
 import org.bukkit.Material;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
@@ -30,16 +32,11 @@ import org.bukkit.inventory.meta.ItemMeta;
 import org.bukkit.persistence.PersistentDataContainer;
 import org.bukkit.persistence.PersistentDataType;

-import java.text.SimpleDateFormat;
 import java.util.*;

 public class CraftItem implements Listener {

    private final ToolStats toolStats;
-    public final String[] validItems = {
-            "pickaxe", "sword", "shovel", "axe", "hoe", "bow", "helmet", "chestplate", "leggings", "boots", "fishing"
-    };
-    private final SimpleDateFormat format = new SimpleDateFormat("M/dd/yyyy", Locale.ENGLISH);

    public CraftItem(ToolStats toolStats) {
        this.toolStats = toolStats;
@@ -51,37 +48,56 @@ public class CraftItem implements Listener {
            return;
        }
        Player player = (Player) event.getWhoClicked();
+        if (player.getGameMode() == GameMode.CREATIVE || player.getGameMode() == GameMode.SPECTATOR) {
+            return;
+        }
        ItemStack itemStack = event.getCurrentItem();
        if (itemStack == null || itemStack.getType() == Material.AIR) {
            return;
        }
-        String name = itemStack.getType().toString().toLowerCase(Locale.ROOT);
-        for (String x : validItems) {
-            if (name.contains(x)) {
+        // only check certain items
+        if (!ItemChecker.isValidItem(itemStack.getType())) {
+            return;
+        }
+
+        // if the player shift clicks, send them this warning
        if (event.isShiftClick()) {
            String configMessage = toolStats.config.getString("messages.shift-click-warning.crafting");
            if (configMessage != null) {
+                if (configMessage.length() != 0) {
                    event.getWhoClicked().sendMessage(ChatColor.translateAlternateColorCodes('&', configMessage));
                }
            }
-                if (addLore(itemStack, player) == null) {
-                    return;
-                }
-                event.setCurrentItem(addLore(itemStack, player));
        }
+        // test the item before setting it
+        ItemStack newItem = addLore(itemStack, player);
+        if (newItem != null) {
+            // set the result
+            event.setCurrentItem(newItem);
        }
    }

+    /**
+     * Adds crafted tags to item.
+     *
+     * @param itemStack The item add item to.
+     * @param owner     The player crafting.
+     * @return A copy of the item with the tags + lore.
+     */
    private ItemStack addLore(ItemStack itemStack, Player owner) {
+        // clone the item
        ItemStack newItem = itemStack.clone();
        ItemMeta meta = newItem.getItemMeta();
        if (meta == null) {
            return null;
        }
+        // get the current time
        long timeCreated = System.currentTimeMillis();
        Date finalDate = new Date(timeCreated);
        PersistentDataContainer container = meta.getPersistentDataContainer();

+        // if the item already has the tag
+        // this is to prevent duplicate tags
        if (container.has(toolStats.timeCreated, PersistentDataType.LONG) || container.has(toolStats.genericOwner, PersistentDataType.LONG)) {
            return null;
        }
@@ -102,14 +118,16 @@ public class CraftItem implements Listener {
        }

        List<String> lore;
+        // get the current lore the item
        if (meta.hasLore()) {
            lore = meta.getLore();
            assert lore != null;
        } else {
            lore = new ArrayList<>();
        }
+        // do we add the lore based on the config?
        if (toolStats.checkConfig(itemStack, "created-date")) {
-            lore.add(createdOnRaw.replace("{date}", format.format(finalDate)));
+            lore.add(createdOnRaw.replace("{date}", toolStats.dateFormat.format(finalDate)));
        }
        if (toolStats.checkConfig(itemStack, "created-by")) {
            lore.add(createdByRaw.replace("{player}", owner.getName()));
--- a/src/main/java/lol/hyper/toolstats/events/EntityDamage.java
+++ b/src/main/java/lol/hyper/toolstats/events/EntityDamage.java
@@ -18,6 +18,7 @@
 package lol.hyper.toolstats.events;

 import lol.hyper.toolstats.ToolStats;
+import lol.hyper.toolstats.tools.ItemChecker;
 import org.bukkit.GameMode;
 import org.bukkit.Material;
 import org.bukkit.entity.*;
@@ -32,15 +33,11 @@ import org.bukkit.inventory.meta.ItemMeta;
 import org.bukkit.persistence.PersistentDataContainer;
 import org.bukkit.persistence.PersistentDataType;

-import java.math.RoundingMode;
-import java.text.DecimalFormat;
 import java.util.*;

 public class EntityDamage implements Listener {

    private final ToolStats toolStats;
-    private final String[] validTools = {"sword", "trident", "axe"};
-    private final DecimalFormat decimalFormat = new DecimalFormat("0.00");
    public final Set<UUID> trackedMobs = new HashSet<>();

    public EntityDamage(ToolStats toolStats) {
@@ -61,15 +58,16 @@ public class EntityDamage implements Listener {
            // a player is killing something
            if (event.getDamager() instanceof Player) {
                Player player = (Player) event.getDamager();
-                if (player.getGameMode() != GameMode.SURVIVAL) {
+                if (player.getGameMode() == GameMode.CREATIVE || player.getGameMode() == GameMode.SPECTATOR) {
                    return;
                }
+                // a player killed something with their fist
                ItemStack heldItem = player.getInventory().getItem(player.getInventory().getHeldItemSlot());
                if (heldItem == null || heldItem.getType() == Material.AIR) {
                    return;
                }
-                String itemName = heldItem.getType().toString().toLowerCase();
-                if (Arrays.stream(validTools).noneMatch(itemName::contains)) {
+                // only check certain items
+                if (!ItemChecker.isMeleeWeapon(heldItem.getType())) {
                    return;
                }
                // a player is killing another player
@@ -81,9 +79,11 @@ public class EntityDamage implements Listener {
                player.getInventory().setItem(player.getInventory().getHeldItemSlot(), updateMobKills(heldItem));
                trackedMobs.add(livingEntity.getUniqueId());
            }
+            // trident is being thrown at something
            if (event.getDamager() instanceof Trident) {
                Trident trident = (Trident) event.getDamager();
                ItemStack clone;
+                // trident is killing player
                if (livingEntity instanceof Player) {
                    clone = updatePlayerKills(trident.getItem());
                } else {
@@ -94,14 +94,21 @@ public class EntityDamage implements Listener {
                }
                trident.setItem(clone);
            }
+            // arrow is being shot
            if (event.getDamager() instanceof Arrow) {
                Arrow arrow = (Arrow) event.getDamager();
+                // if the shooter is a player
                if (arrow.getShooter() instanceof Player) {
                    Player player = (Player) arrow.getShooter();
+                    if (player.getGameMode() == GameMode.CREATIVE || player.getGameMode() == GameMode.SPECTATOR) {
+                        return;
+                    }
                    ItemStack heldItem = player.getInventory().getItem(player.getInventory().getHeldItemSlot());
                    if (heldItem == null) {
                        return;
                    }
+                    // if the player is holding the bow/crossbow
+                    // if they switch then oh well
                    if (heldItem.getType() == Material.BOW || heldItem.getType() == Material.CROSSBOW) {
                        if (livingEntity instanceof Player) {
                            player.getInventory().setItem(player.getInventory().getHeldItemSlot(), updatePlayerKills(heldItem));
@@ -115,10 +122,15 @@ public class EntityDamage implements Listener {
        // player is taken damage but not being killed
        if (livingEntity instanceof Player) {
            Player player = (Player) livingEntity;
+            if (player.getGameMode() == GameMode.CREATIVE || player.getGameMode() == GameMode.SPECTATOR) {
+                return;
+            }
            PlayerInventory inventory = player.getInventory();
            for (ItemStack armor : inventory.getArmorContents()) {
                if (armor != null) {
-                    updateArmorDamage(armor, event.getDamage());
+                    if (ItemChecker.isArmor(armor.getType())) {
+                        updateArmorDamage(armor, event.getFinalDamage());
+                    }
                }
            }
        }
@@ -130,12 +142,18 @@ public class EntityDamage implements Listener {
            return;
        }
        LivingEntity livingEntity = (LivingEntity) event.getEntity();
+        // player is taken damage but not being killed
        if (livingEntity instanceof Player) {
            Player player = (Player) livingEntity;
+            if (player.getGameMode() == GameMode.CREATIVE || player.getGameMode() == GameMode.SPECTATOR) {
+                return;
+            }
            PlayerInventory inventory = player.getInventory();
            for (ItemStack armor : inventory.getArmorContents()) {
                if (armor != null) {
-                    updateArmorDamage(armor, event.getDamage());
+                    if (ItemChecker.isArmor(armor.getType())) {
+                        updateArmorDamage(armor, event.getFinalDamage());
+                    }
                }
            }
        }
@@ -147,17 +165,29 @@ public class EntityDamage implements Listener {
            return;
        }
        LivingEntity livingEntity = (LivingEntity) event.getEntity();
+        // player is taken damage but not being killed
        if (livingEntity instanceof Player) {
            Player player = (Player) livingEntity;
+            if (player.getGameMode() == GameMode.CREATIVE || player.getGameMode() == GameMode.SPECTATOR) {
+                return;
+            }
            PlayerInventory inventory = player.getInventory();
            for (ItemStack armor : inventory.getArmorContents()) {
                if (armor != null) {
-                    updateArmorDamage(armor, event.getDamage());
+                    if (ItemChecker.isArmor(armor.getType())) {
+                        updateArmorDamage(armor, event.getFinalDamage());
+                    }
                }
            }
        }
    }

+    /**
+     * Updates a weapon's player kills.
+     *
+     * @param itemStack The item to update.
+     * @return A copy of the item.
+     */
    private ItemStack updatePlayerKills(ItemStack itemStack) {
        ItemStack finalItem = itemStack.clone();
        ItemMeta meta = finalItem.getItemMeta();
@@ -194,19 +224,20 @@ public class EntityDamage implements Listener {
            for (int x = 0; x < lore.size(); x++) {
                if (lore.get(x).contains(playerKillsLore)) {
                    hasLore = true;
-                    lore.set(x, playerKillsLoreRaw.replace("{kills}", Integer.toString(playerKills)));
+                    lore.set(x, playerKillsLoreRaw.replace("{kills}", toolStats.commaFormat.format(playerKills)));
                    break;
                }
            }
            // if the item has lore but doesn't have the tag, add it
            if (!hasLore) {
-                lore.add(playerKillsLoreRaw.replace("{kills}", Integer.toString(playerKills)));
+                lore.add(playerKillsLoreRaw.replace("{kills}", toolStats.commaFormat.format(playerKills)));
            }
        } else {
            // if the item has no lore, create a new list and add the string
            lore = new ArrayList<>();
-            lore.add(playerKillsLoreRaw.replace("{kills}", Integer.toString(playerKills)));
+            lore.add(playerKillsLoreRaw.replace("{kills}", toolStats.commaFormat.format(playerKills)));
        }
+        // do we add the lore based on the config?
        if (toolStats.checkConfig(itemStack, "player-kills")) {
            meta.setLore(lore);
        }
@@ -214,6 +245,12 @@ public class EntityDamage implements Listener {
        return finalItem;
    }

+    /**
+     * Updates a weapon's mob kills.
+     *
+     * @param itemStack The item to update.
+     * @return A copy of the item.
+     */
    private ItemStack updateMobKills(ItemStack itemStack) {
        ItemStack finalItem = itemStack.clone();
        ItemMeta meta = finalItem.getItemMeta();
@@ -250,19 +287,20 @@ public class EntityDamage implements Listener {
            for (int x = 0; x < lore.size(); x++) {
                if (lore.get(x).contains(mobKillsLore)) {
                    hasLore = true;
-                    lore.set(x, mobKillsLoreRaw.replace("{kills}", Integer.toString(mobKills)));
+                    lore.set(x, mobKillsLoreRaw.replace("{kills}", toolStats.commaFormat.format(mobKills)));
                    break;
                }
            }
            // if the item has lore but doesn't have the tag, add it
            if (!hasLore) {
-                lore.add(mobKillsLoreRaw.replace("{kills}", Integer.toString(mobKills)));
+                lore.add(mobKillsLoreRaw.replace("{kills}", toolStats.commaFormat.format(mobKills)));
            }
        } else {
            // if the item has no lore, create a new list and add the string
            lore = new ArrayList<>();
-            lore.add(mobKillsLoreRaw.replace("{kills}", Integer.toString(mobKills)));
+            lore.add(mobKillsLoreRaw.replace("{kills}", toolStats.commaFormat.format(mobKills)));
        }
+        // do we add the lore based on the config?
        if (toolStats.checkConfig(itemStack, "mob-kills")) {
            meta.setLore(lore);
        }
@@ -270,6 +308,12 @@ public class EntityDamage implements Listener {
        return finalItem;
    }

+    /**
+     * Updates a player's armor damage stats.
+     *
+     * @param itemStack The armor piece.
+     * @param damage    How much damage is being added.
+     */
    private void updateArmorDamage(ItemStack itemStack, double damage) {
        ItemMeta meta = itemStack.getItemMeta();
        if (meta == null) {
@@ -285,7 +329,6 @@ public class EntityDamage implements Listener {
        } else {
            damageTaken = damageTaken + damage;
        }
-        decimalFormat.setRoundingMode(RoundingMode.DOWN);
        container.set(toolStats.armorDamage, PersistentDataType.DOUBLE, damageTaken);

        String damageTakenLore = toolStats.getLoreFromConfig("damage-taken", false);
@@ -306,18 +349,18 @@ public class EntityDamage implements Listener {
            for (int x = 0; x < lore.size(); x++) {
                if (lore.get(x).contains(damageTakenLore)) {
                    hasLore = true;
-                    lore.set(x, damageTakenLoreRaw.replace("{damage}", decimalFormat.format(damageTaken)));
+                    lore.set(x, damageTakenLoreRaw.replace("{damage}", toolStats.decimalFormat.format(damageTaken)));
                    break;
                }
            }
            // if the item has lore but doesn't have the tag, add it
            if (!hasLore) {
-                lore.add(damageTakenLoreRaw.replace("{damage}", decimalFormat.format(damageTaken)));
+                lore.add(damageTakenLoreRaw.replace("{damage}", toolStats.decimalFormat.format(damageTaken)));
            }
        } else {
            // if the item has no lore, create a new list and add the string
            lore = new ArrayList<>();
-            lore.add(damageTakenLoreRaw.replace("{damage}", decimalFormat.format(damageTaken)));
+            lore.add(damageTakenLoreRaw.replace("{damage}", toolStats.decimalFormat.format(damageTaken)));
        }
        if (toolStats.config.getBoolean("enabled.armor-damage")) {
            meta.setLore(lore);
--- a/src/main/java/lol/hyper/toolstats/events/EntityDeath.java
+++ b/src/main/java/lol/hyper/toolstats/events/EntityDeath.java
@@ -18,6 +18,7 @@
 package lol.hyper.toolstats.events;

 import lol.hyper.toolstats.ToolStats;
+import lol.hyper.toolstats.tools.ItemChecker;
 import org.bukkit.entity.LivingEntity;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
@@ -43,19 +44,23 @@ public class EntityDeath implements Listener {
            return;
        }
        UUID livingEntityUUID = event.getEntity().getUniqueId();
+        // if it's a mob we are tracking that matters
        if (toolStats.mobKill.trackedMobs.contains(livingEntityUUID)) {
            for (ItemStack current : event.getDrops()) {
-                String name = current.getType().toString().toLowerCase(Locale.ROOT);
-                for (String item : toolStats.craftItem.validItems) {
-                    if (name.contains(item)) {
+                if (ItemChecker.isValidItem(current.getType())) {
                    addLore(current, livingEntity.getName());
                }
            }
-            }
            toolStats.mobKill.trackedMobs.remove(livingEntityUUID);
        }
    }

+    /**
+     * Adds "drop by" tag to item.
+     *
+     * @param itemStack The item to add lore to.
+     * @param mob       The mob or player name.
+     */
    private void addLore(ItemStack itemStack, String mob) {
        ItemMeta meta = itemStack.getItemMeta();
        if (meta == null) {
@@ -87,7 +92,7 @@ public class EntityDeath implements Listener {
            lore = new ArrayList<>();
        }
        if (!hasTag) {
-            lore.add(droppedByLoreRaw.replace("X", mob));
+            lore.add(droppedByLoreRaw.replace("{name}", mob));
        }
        if (toolStats.config.getBoolean("enabled.dropped-by")) {
            meta.setLore(lore);
--- a/src/main/java/lol/hyper/toolstats/events/GenerateLoot.java
+++ b/src/main/java/lol/hyper/toolstats/events/GenerateLoot.java
@@ -18,10 +18,15 @@
 package lol.hyper.toolstats.events;

 import lol.hyper.toolstats.ToolStats;
-import lol.hyper.toolstats.UUIDDataType;
+import lol.hyper.toolstats.tools.ItemChecker;
+import lol.hyper.toolstats.tools.UUIDDataType;
 import org.bukkit.Bukkit;
+import org.bukkit.Location;
 import org.bukkit.Material;
+import org.bukkit.block.Block;
+import org.bukkit.block.Chest;
 import org.bukkit.entity.Player;
+import org.bukkit.entity.minecart.StorageMinecart;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.bukkit.event.world.LootGenerateEvent;
@@ -32,19 +37,13 @@ import org.bukkit.inventory.meta.ItemMeta;
 import org.bukkit.persistence.PersistentDataContainer;
 import org.bukkit.persistence.PersistentDataType;

-import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
-import java.util.Locale;

 public class GenerateLoot implements Listener {

    private final ToolStats toolStats;
-    public final String[] validItems = {
-            "pickaxe", "sword", "shovel", "axe", "hoe", "bow", "helmet", "chestplate", "leggings", "boots", "fishing"
-    };
-    private final SimpleDateFormat format = new SimpleDateFormat("M/dd/yyyy", Locale.ENGLISH);

    public GenerateLoot(ToolStats toolStats) {
        this.toolStats = toolStats;
@@ -56,25 +55,76 @@ public class GenerateLoot implements Listener {
        if (inventoryHolder == null) {
            return;
        }
-        Inventory chest = inventoryHolder.getInventory();
+        Location lootLocation = event.getLootContext().getLocation();
+        Inventory chestInv = inventoryHolder.getInventory();
+
+        if (inventoryHolder instanceof Chest) {
+            Block openedChest = null;
+            // look at the current list of opened chest and get the distance
+            // between the lootcontext location and chest location
+            // if the distance is less than 1, it's the same chest
+            for (Block chest : toolStats.playerInteract.openedChests.keySet()) {
+                Location chestLocation = chest.getLocation();
+                double distance = lootLocation.distance(chestLocation);
+                if (distance <= 1.0) {
+                    openedChest = chest;
+                }
+            }
+            // ignore if the chest is not in the same location
+            if (openedChest == null) {
+                return;
+            }
+
+            // run task later since if it runs on the same tick it breaks idk
+            Block finalOpenedChest = openedChest;
            Bukkit.getScheduler().runTaskLater(toolStats, () -> {
-            Player player = (Player) chest.getViewers().get(0);
-            for (int i = 0; i < chest.getContents().length; i++) {
-                ItemStack itemStack = chest.getItem(i);
+                Player player = toolStats.playerInteract.openedChests.get(finalOpenedChest);
+                // do a classic for loop, so we keep track of chest index of item
+                for (int i = 0; i < chestInv.getContents().length; i++) {
+                    ItemStack itemStack = chestInv.getItem(i);
+                    // ignore air
                    if (itemStack == null || itemStack.getType() == Material.AIR) {
                        continue;
                    }
-                String name = itemStack.getType().toString().toLowerCase(Locale.ROOT);
-                for (String x : validItems) {
-                    if (name.contains(x)) {
-                        chest.setItem(i, addLore(itemStack, player));
+                    if (ItemChecker.isValidItem(itemStack.getType())) {
+                        ItemStack newItem = addLore(itemStack, player);
+                        if (newItem != null) {
+                            chestInv.setItem(i, newItem);
                        }
                    }
                }

-        },1);
+            }, 1);
+        }
+        if (inventoryHolder instanceof StorageMinecart) {
+            StorageMinecart mineCart = (StorageMinecart) inventoryHolder;
+            if (toolStats.playerInteract.openedMineCarts.containsKey(mineCart)) {
+                Player player = toolStats.playerInteract.openedMineCarts.get(mineCart);
+                // player clicked this minecart
+                for (int i = 0; i < chestInv.getContents().length; i++) {
+                    ItemStack itemStack = chestInv.getItem(i);
+                    // ignore air
+                    if (itemStack == null || itemStack.getType() == Material.AIR) {
+                        continue;
+                    }
+                    if (ItemChecker.isValidItem(itemStack.getType())) {
+                        ItemStack newItem = addLore(itemStack, player);
+                        if (newItem != null) {
+                            chestInv.setItem(i, newItem);
+                        }
+                    }
+                }
+            }
+        }
    }

+    /**
+     * Adds lore to newly generated items.
+     *
+     * @param itemStack The item to add lore to.
+     * @param owner     The player that found the item.
+     * @return The item with the lore.
+     */
    private ItemStack addLore(ItemStack itemStack, Player owner) {
        ItemStack newItem = itemStack.clone();
        ItemMeta meta = itemStack.getItemMeta();
@@ -108,7 +158,7 @@ public class GenerateLoot implements Listener {
            lore = new ArrayList<>();
        }
        if (toolStats.checkConfig(newItem, "looted-tag")) {
-            lore.add(foundOnLoreRaw.replace("{date}", format.format(finalDate)));
+            lore.add(foundOnLoreRaw.replace("{date}", toolStats.dateFormat.format(finalDate)));
            lore.add(foundByLoreRaw.replace("{player}", owner.getName()));
        }
        meta.setLore(lore);
--- a/src/main/java/lol/hyper/toolstats/events/PickupItem.java
+++ b/src/main/java/lol/hyper/toolstats/events/PickupItem.java
@@ -18,10 +18,10 @@
 package lol.hyper.toolstats.events;

 import lol.hyper.toolstats.ToolStats;
-import lol.hyper.toolstats.UUIDDataType;
+import lol.hyper.toolstats.tools.UUIDDataType;
+import org.bukkit.GameMode;
 import org.bukkit.Material;
-import org.bukkit.entity.Entity;
-import org.bukkit.entity.Player;
+import org.bukkit.entity.*;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.bukkit.event.entity.EntityPickupItemEvent;
@@ -30,16 +30,13 @@ import org.bukkit.inventory.meta.ItemMeta;
 import org.bukkit.persistence.PersistentDataContainer;
 import org.bukkit.persistence.PersistentDataType;

-import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
-import java.util.Locale;

 public class PickupItem implements Listener {

    private final ToolStats toolStats;
-    private final SimpleDateFormat format = new SimpleDateFormat("M/dd/yyyy", Locale.ENGLISH);

    public PickupItem(ToolStats toolStats) {
        this.toolStats = toolStats;
@@ -52,39 +49,56 @@ public class PickupItem implements Listener {
        }
        Entity entity = event.getEntity();
        if (entity instanceof Player) {
+            Player player = (Player) entity;
+            if (player.getGameMode() == GameMode.CREATIVE || player.getGameMode() == GameMode.SPECTATOR) {
+                return;
+            }
+            Item item = event.getItem();
+            if (item.getType() == EntityType.DROPPED_ITEM) {
                ItemStack itemStack = event.getItem().getItemStack();
-            if (itemStack.getType() == Material.ELYTRA) {
                ItemMeta meta = itemStack.getItemMeta();
                if (meta == null) {
                    return;
                }
                PersistentDataContainer container = meta.getPersistentDataContainer();
+                if (itemStack.getType() == Material.ELYTRA) {
                    // the elytra has the new key, set the lore to it
                    if (container.has(toolStats.newElytra, PersistentDataType.INTEGER)) {
-                    container.remove(toolStats.newElytra);
-                    addLore(itemStack, (Player) event.getEntity());
+                        ItemStack newElytra = addLore(itemStack, (Player) event.getEntity());
+                        if (newElytra != null) {
+                            item.setItemStack(newElytra);
+                        }
+                    }
                }
            }
        }
    }

-    private void addLore(ItemStack itemStack, Player owner) {
-        ItemMeta meta = itemStack.getItemMeta();
+    /**
+     * Adds "looted by" tags for elytras.
+     *
+     * @param itemStack The elytra to add lore to.
+     * @param owner     The player who found it.
+     */
+    private ItemStack addLore(ItemStack itemStack, Player owner) {
+        ItemStack finalItem = itemStack.clone();
+        ItemMeta meta = finalItem.getItemMeta();
        if (meta == null) {
-            return;
+            return null;
        }
        long timeCreated = System.currentTimeMillis();
        Date finalDate = new Date(timeCreated);
        PersistentDataContainer container = meta.getPersistentDataContainer();
        container.set(toolStats.timeCreated, PersistentDataType.LONG, timeCreated);
        container.set(toolStats.genericOwner, new UUIDDataType(), owner.getUniqueId());
+        container.remove(toolStats.newElytra);

        String foundByLoreRaw = toolStats.getLoreFromConfig("looted.found-by", true);
        String foundOnLoreRaw = toolStats.getLoreFromConfig("looted.found-on", true);

        if (foundByLoreRaw == null || foundOnLoreRaw == null) {
            toolStats.logger.warning("There is no lore message for messages.looted!");
-            return;
+            return null;
        }

        List<String> lore;
@@ -95,10 +109,11 @@ public class PickupItem implements Listener {
            lore = new ArrayList<>();
        }
        if (toolStats.config.getBoolean("enabled.elytra-tag")) {
-            lore.add(foundOnLoreRaw.replace("{date}", format.format(finalDate)));
+            lore.add(foundOnLoreRaw.replace("{date}", toolStats.dateFormat.format(finalDate)));
            lore.add(foundByLoreRaw.replace("{player}", owner.getName()));
        }
        meta.setLore(lore);
-        itemStack.setItemMeta(meta);
+        finalItem.setItemMeta(meta);
+        return finalItem;
    }
 }
--- a/src/main/java/lol/hyper/toolstats/events/PlayerFish.java
+++ b/src/main/java/lol/hyper/toolstats/events/PlayerFish.java
@@ -18,7 +18,9 @@
 package lol.hyper.toolstats.events;

 import lol.hyper.toolstats.ToolStats;
-import lol.hyper.toolstats.UUIDDataType;
+import lol.hyper.toolstats.tools.ItemChecker;
+import lol.hyper.toolstats.tools.UUIDDataType;
+import org.bukkit.GameMode;
 import org.bukkit.Material;
 import org.bukkit.entity.Item;
 import org.bukkit.entity.Player;
@@ -30,19 +32,13 @@ import org.bukkit.inventory.meta.ItemMeta;
 import org.bukkit.persistence.PersistentDataContainer;
 import org.bukkit.persistence.PersistentDataType;

-import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
-import java.util.Locale;

 public class PlayerFish implements Listener {

    private final ToolStats toolStats;
-    public final String[] validItems = {
-            "pickaxe", "sword", "shovel", "axe", "hoe", "bow", "helmet", "chestplate", "leggings", "boots", "fishing"
-    };
-    private final SimpleDateFormat format = new SimpleDateFormat("M/dd/yyyy", Locale.ENGLISH);

    public PlayerFish(ToolStats toolStats) {
        this.toolStats = toolStats;
@@ -59,6 +55,9 @@ public class PlayerFish implements Listener {
        }

        Player player = event.getPlayer();
+        if (player.getGameMode() == GameMode.CREATIVE || player.getGameMode() == GameMode.SPECTATOR) {
+            return;
+        }
        ItemStack heldItem = player.getInventory().getItem(player.getInventory().getHeldItemSlot());
        if (heldItem == null || heldItem.getType() == Material.AIR || heldItem.getType() != Material.FISHING_ROD) {
            return;
@@ -68,13 +67,16 @@ public class PlayerFish implements Listener {
            return;
        }
        ItemStack caughtItem = ((Item) event.getCaught()).getItemStack();
-        for (String x : validItems) {
-            if (caughtItem.getType().toString().toLowerCase(Locale.ROOT).contains(x)) {
+        if (ItemChecker.isValidItem(caughtItem.getType())) {
            addNewLore(caughtItem, player);
        }
    }
-    }

+    /**
+     * Updates a fishing rod's count.
+     *
+     * @param itemStack The fishing rod to update.
+     */
    private void updateFishCount(ItemStack itemStack) {
        ItemMeta meta = itemStack.getItemMeta();
        if (meta == null) {
@@ -110,18 +112,18 @@ public class PlayerFish implements Listener {
            for (int x = 0; x < lore.size(); x++) {
                if (lore.get(x).contains(fishCaughtLore)) {
                    hasLore = true;
-                    lore.set(x, fishCaughtLoreRaw.replace("{fish}", Integer.toString(fishCaught)));
+                    lore.set(x, fishCaughtLoreRaw.replace("{fish}", toolStats.commaFormat.format(fishCaught)));
                    break;
                }
            }
            // if the item has lore but doesn't have the tag, add it
            if (!hasLore) {
-                lore.add(fishCaughtLoreRaw.replace("{fish}", Integer.toString(fishCaught)));
+                lore.add(fishCaughtLoreRaw.replace("{fish}", toolStats.commaFormat.format(fishCaught)));
            }
        } else {
            // if the item has no lore, create a new list and add the string
            lore = new ArrayList<>();
-            lore.add(fishCaughtLoreRaw.replace("{fish}", Integer.toString(fishCaught)));
+            lore.add(fishCaughtLoreRaw.replace("{fish}", toolStats.commaFormat.format(fishCaught)));
        }
        if (toolStats.config.getBoolean("enabled.fish-caught")) {
            meta.setLore(lore);
@@ -129,6 +131,12 @@ public class PlayerFish implements Listener {
        itemStack.setItemMeta(meta);
    }

+    /**
+     * Adds "caught by" tags to newly fished items.
+     *
+     * @param itemStack The item to add lore to.
+     * @param owner     The player who caught the item.
+     */
    private void addNewLore(ItemStack itemStack, Player owner) {
        ItemMeta meta = itemStack.getItemMeta();
        if (meta == null) {
@@ -161,7 +169,7 @@ public class PlayerFish implements Listener {
            lore = new ArrayList<>();
        }
        if (toolStats.checkConfig(itemStack, "fished-tag")) {
-            lore.add(caughtOnLoreRaw.replace("{date}", format.format(finalDate)));
+            lore.add(caughtOnLoreRaw.replace("{date}", toolStats.dateFormat.format(finalDate)));
            lore.add(caughtByLoreRaw.replace("{player}", owner.getName()));
        }
        meta.setLore(lore);
--- a/src/main/java/lol/hyper/toolstats/events/PlayerInteract.java
+++ b/src/main/java/lol/hyper/toolstats/events/PlayerInteract.java
@@ -0,0 +1,84 @@
+/*
+ * This file is part of ToolStats.
+ *
+ * ToolStats is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * ToolStats is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with ToolStats.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package lol.hyper.toolstats.events;
+
+import lol.hyper.toolstats.ToolStats;
+import org.bukkit.Bukkit;
+import org.bukkit.GameMode;
+import org.bukkit.Material;
+import org.bukkit.block.Block;
+import org.bukkit.entity.Entity;
+import org.bukkit.entity.EntityType;
+import org.bukkit.entity.Player;
+import org.bukkit.entity.minecart.StorageMinecart;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.Listener;
+import org.bukkit.event.block.Action;
+import org.bukkit.event.player.PlayerInteractEntityEvent;
+import org.bukkit.event.player.PlayerInteractEvent;
+
+import java.util.HashMap;
+
+public class PlayerInteract implements Listener {
+
+    private final ToolStats toolStats;
+
+    public final HashMap<Block, Player> openedChests = new HashMap<>();
+    public final HashMap<StorageMinecart, Player> openedMineCarts = new HashMap<>();
+
+    public PlayerInteract(ToolStats toolStats) {
+        this.toolStats = toolStats;
+    }
+
+    @EventHandler
+    public void onInteract(PlayerInteractEvent event) {
+        if (event.getAction() != Action.RIGHT_CLICK_BLOCK) {
+            return;
+        }
+
+        Block block = event.getClickedBlock();
+        if (block == null) {
+            return;
+        }
+
+        Player player = event.getPlayer();
+        if (player.getGameMode() == GameMode.CREATIVE || player.getGameMode() == GameMode.SPECTATOR) {
+            return;
+        }
+        // store when a player opens a chest
+        if (block.getType() != Material.AIR && block.getType() == Material.CHEST) {
+            openedChests.put(block, player);
+            Bukkit.getScheduler().runTaskLater(toolStats, () -> openedChests.remove(block), 20);
+        }
+    }
+
+    @EventHandler
+    public void onInteract(PlayerInteractEntityEvent event) {
+        Entity clicked = event.getRightClicked();
+        Player player = event.getPlayer();
+        if (player.getGameMode() == GameMode.CREATIVE || player.getGameMode() == GameMode.SPECTATOR) {
+            return;
+        }
+        // store when a player opens a minecart
+        if (clicked.getType() == EntityType.MINECART_CHEST) {
+            StorageMinecart storageMinecart = (StorageMinecart) clicked;
+            openedMineCarts.put(storageMinecart, player);
+            Bukkit.getScheduler().runTaskLater(toolStats, () -> openedMineCarts.remove(storageMinecart), 20);
+        }
+    }
+}
--- a/src/main/java/lol/hyper/toolstats/events/SheepShear.java
+++ b/src/main/java/lol/hyper/toolstats/events/SheepShear.java
@@ -18,6 +18,7 @@
 package lol.hyper.toolstats.events;

 import lol.hyper.toolstats.ToolStats;
+import org.bukkit.GameMode;
 import org.bukkit.Material;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.Player;
@@ -47,21 +48,31 @@ public class SheepShear implements Listener {
            return;
        }
        Player player = event.getPlayer();
+        if (player.getGameMode() == GameMode.CREATIVE || player.getGameMode() == GameMode.SPECTATOR) {
+            return;
+        }
        Entity entity = event.getRightClicked();
        if (!(entity instanceof Sheep)) {
            return;
        }
+        // check if the player is right-clicking with shears only
        ItemStack heldItem = player.getInventory().getItem(player.getInventory().getHeldItemSlot());
        if (heldItem == null || heldItem.getType() == Material.AIR || heldItem.getType() != Material.SHEARS) {
            return;
        }

        Sheep sheep = (Sheep) entity;
+        // make sure the sheep is not sheared
        if (!sheep.isSheared()) {
            addLore(heldItem);
        }
    }

+    /**
+     * Adds tags to shears.
+     *
+     * @param itemStack The shears.
+     */
    private void addLore(ItemStack itemStack) {
        ItemMeta meta = itemStack.getItemMeta();
        if (meta == null) {
@@ -97,18 +108,18 @@ public class SheepShear implements Listener {
            for (int x = 0; x < lore.size(); x++) {
                if (lore.get(x).contains(sheepShearedLore)) {
                    hasLore = true;
-                    lore.set(x, sheepShearedLoreRaw.replace("{sheep}", Integer.toString(sheepSheared)));
+                    lore.set(x, sheepShearedLoreRaw.replace("{sheep}", toolStats.commaFormat.format(sheepSheared)));
                    break;
                }
            }
            // if the item has lore but doesn't have the tag, add it
            if (!hasLore) {
-                lore.add(sheepShearedLoreRaw.replace("{sheep}", Integer.toString(sheepSheared)));
+                lore.add(sheepShearedLoreRaw.replace("{sheep}", toolStats.commaFormat.format(sheepSheared)));
            }
        } else {
            // if the item has no lore, create a new list and add the string
            lore = new ArrayList<>();
-            lore.add(sheepShearedLoreRaw.replace("{sheep}", Integer.toString(sheepSheared)));
+            lore.add(sheepShearedLoreRaw.replace("{sheep}", toolStats.commaFormat.format(sheepSheared)));
        }
        if (toolStats.config.getBoolean("enabled.sheep-sheared")) {
            meta.setLore(lore);
--- a/src/main/java/lol/hyper/toolstats/events/VillagerTrade.java
+++ b/src/main/java/lol/hyper/toolstats/events/VillagerTrade.java
@@ -18,9 +18,11 @@
 package lol.hyper.toolstats.events;

 import lol.hyper.toolstats.ToolStats;
-import lol.hyper.toolstats.UUIDDataType;
+import lol.hyper.toolstats.tools.ItemChecker;
+import lol.hyper.toolstats.tools.UUIDDataType;
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
+import org.bukkit.GameMode;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
@@ -33,19 +35,13 @@ import org.bukkit.inventory.meta.ItemMeta;
 import org.bukkit.persistence.PersistentDataContainer;
 import org.bukkit.persistence.PersistentDataType;

-import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
-import java.util.Locale;

 public class VillagerTrade implements Listener {

    private final ToolStats toolStats;
-    public final String[] validItems = {
-            "pickaxe", "sword", "shovel", "axe", "hoe", "bow", "helmet", "chestplate", "leggings", "boots", "fishing"
-    };
-    private final SimpleDateFormat format = new SimpleDateFormat("M/dd/yyyy", Locale.ENGLISH);

    public VillagerTrade(ToolStats toolStats) {
        this.toolStats = toolStats;
@@ -57,28 +53,45 @@ public class VillagerTrade implements Listener {
            return;
        }
        Inventory inventory = event.getClickedInventory();
+        if (!(event.getWhoClicked() instanceof Player)) {
+            return;
+        }
+        Player player = (Player) event.getWhoClicked();
+        if (player.getGameMode() == GameMode.CREATIVE || player.getGameMode() == GameMode.SPECTATOR) {
+            return;
+        }
+        // only check villager inventories
        if (inventory instanceof MerchantInventory) {
+            // only check the result slot (the item you receive)
            if (event.getSlotType() == InventoryType.SlotType.RESULT) {
                ItemStack item = event.getCurrentItem();
-                for (String x : validItems) {
-                    if (item.getType().toString().toLowerCase(Locale.ROOT).contains(x)) {
+                // only check items we want
+                if (ItemChecker.isValidItem(item.getType())) {
+                    // if the player shift clicks, show the warning
                    if (event.isShiftClick()) {
                        String configMessage = toolStats.config.getString("messages.shift-click-warning.trading");
                        if (configMessage != null) {
                            event.getWhoClicked().sendMessage(ChatColor.translateAlternateColorCodes('&', configMessage));
                        }
                    }
-                        ItemStack newItem = addLore(item, (Player) event.getWhoClicked());
-                        if (newItem == null) {
+                    ItemStack newItem = addLore(item, player);
+                    if (newItem != null) {
+                        // this gets delayed since villager inventories suck for no reason
+                        Bukkit.getScheduler().runTaskLater(toolStats, () -> event.setCurrentItem(newItem), 5);
                        return;
                    }
-                        Bukkit.getScheduler().runTaskLater(toolStats, ()-> event.setCurrentItem(newItem), 5);
-                    }
                }
            }
        }
    }

+    /**
+     * Adds "traded by" tags to item.
+     *
+     * @param itemStack The item to add lore.
+     * @param owner     The player who traded.
+     * @return The item with lore.
+     */
    private ItemStack addLore(ItemStack itemStack, Player owner) {
        ItemMeta meta = itemStack.getItemMeta();
        if (meta == null) {
@@ -111,7 +124,7 @@ public class VillagerTrade implements Listener {
            lore = new ArrayList<>();
        }
        if (toolStats.checkConfig(itemStack, "traded-tag")) {
-            lore.add(tradedOnLoreRaw.replace("{date}", format.format(finalDate)));
+            lore.add(tradedOnLoreRaw.replace("{date}", toolStats.dateFormat.format(finalDate)));
            lore.add(tradedByLoreRaw.replace("{player}", owner.getName()));
        }
        meta.setLore(lore);
--- a/src/main/java/lol/hyper/toolstats/tools/ItemChecker.java
+++ b/src/main/java/lol/hyper/toolstats/tools/ItemChecker.java
@@ -0,0 +1,71 @@
+/*
+ * This file is part of ToolStats.
+ *
+ * ToolStats is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * ToolStats is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with ToolStats.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package lol.hyper.toolstats.tools;
+
+import org.bukkit.Material;
+
+import java.util.Arrays;
+import java.util.Locale;
+
+public class ItemChecker {
+
+    private static final String[] validItems = { "pickaxe", "sword", "shovel", "axe", "hoe", "bow", "helmet", "chestplate", "leggings", "boots", "fishing" };
+    private static final String[] validArmor = { "helmet", "chestplate", "leggings", "boots" };
+    private static final String[] validMelee = {"sword", "trident", "axe"};
+    private static final String[] validMine = { "pickaxe", "axe", "hoe", "shovel", "shear" };
+
+    /**
+     * Check if item is an armor piece.
+     *
+     * @param itemType The item type, not name.
+     * @return If the item is an armor piece.
+     */
+    public static boolean isArmor(Material itemType) {
+        return Arrays.stream(validArmor).anyMatch(type -> itemType.toString().toLowerCase(Locale.ROOT).contains(type));
+    }
+
+    /**
+     * Check if item is a tool or armor piece we want to track.
+     *
+     * @param itemType The item type, not name.
+     * @return If the item something we want to track.
+     */
+    public static boolean isValidItem(Material itemType) {
+        return Arrays.stream(validItems).anyMatch(type -> itemType.toString().toLowerCase(Locale.ROOT).contains(type));
+    }
+
+    /**
+     * Check if item is a melee weapon.
+     *
+     * @param itemType The item type, not name.
+     * @return If the item is a melee weapon.
+     */
+    public static boolean isMeleeWeapon(Material itemType) {
+        return Arrays.stream(validMelee).anyMatch(type -> itemType.toString().toLowerCase(Locale.ROOT).contains(type));
+    }
+
+    /**
+     * Check if item is a mining tool.
+     *
+     * @param itemType The item type, not name.
+     * @return If the item is a mining tool.
+     */
+    public static boolean isMineTool(Material itemType) {
+        return Arrays.stream(validMine).anyMatch(type -> itemType.toString().toLowerCase(Locale.ROOT).contains(type));
+    }
+}
--- a/src/main/java/lol/hyper/toolstats/tools/UUIDDataType.java
+++ b/src/main/java/lol/hyper/toolstats/tools/UUIDDataType.java
@@ -15,7 +15,24 @@
 * along with ToolStats.  If not, see <https://www.gnu.org/licenses/>.
 */

-package lol.hyper.toolstats;
+/*
+ * This file is part of ToolStats.
+ *
+ * ToolStats is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * ToolStats is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with ToolStats.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package lol.hyper.toolstats.tools;

 import org.bukkit.persistence.PersistentDataAdapterContext;
 import org.bukkit.persistence.PersistentDataType;
--- a/src/main/resources/plugin.yml
+++ b/src/main/resources/plugin.yml
@@ -8,8 +8,11 @@ commands:
  toolstats:
    usage: /toolstats
    description: Main command.
-    permission: randomenchant.reload
+    permission: toolstats.main
 permissions:
-  randomenchant.reload:
-    description: Allows the usage of /randomenchant reload
+  toolstats.main:
+    description: Allows the usage of /toolstats
+    default: true
+  toolstats.reload:
+    description: Allows the usage of /toolstats reload
    default: op
Author	SHA1	Message	Date
hyperdefined	63d508fded	fixed typo	2022-06-16 00:04:23 -04:00
hyperdefined	59a8079ba2	Update pom.xml	2022-06-16 00:00:19 -04:00
hyperdefined	3767ee2f63	fixed reseting lore for armor	2022-06-16 00:00:04 -04:00
hyperdefined	7d5f73ae96	better number formatting	2022-06-15 23:59:19 -04:00
hyperdefined	b581d9d178	much better item checking	2022-06-15 23:48:39 -04:00
hyperdefined	d355b7a429	moved class	2022-06-15 23:26:20 -04:00
hyperdefined	d06a1c4a40	support for adding lore to minecart items	2022-06-15 23:25:21 -04:00
hyperdefined	e22fc7b530	Merge pull request #13 from hyperdefined/dependabot/maven/net.kyori-adventure-platform-bukkit-4.1.1 Bump adventure-platform-bukkit from 4.1.0 to 4.1.1	2022-06-13 18:32:54 -04:00
dependabot[bot]	8478411b8f	Bump adventure-platform-bukkit from 4.1.0 to 4.1.1 Bumps [adventure-platform-bukkit](https://github.com/KyoriPowered/adventure-platform) from 4.1.0 to 4.1.1. - [Release notes](https://github.com/KyoriPowered/adventure-platform/releases) - [Commits](https://github.com/KyoriPowered/adventure-platform/compare/v4.1.0...v4.1.1) --- updated-dependencies: - dependency-name: net.kyori:adventure-platform-bukkit dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2022-06-13 11:38:33 +00:00
hyperdefined	85d072667a	Update CommandToolStats.java	2022-06-13 03:10:39 -04:00
hyperdefined	010ca54144	gamemode check	2022-06-13 03:07:37 -04:00
hyperdefined	6af49d6c30	better null handling	2022-06-13 02:55:11 -04:00
hyperdefined	c4e4ce01fd	removed debug message	2022-06-13 02:21:32 -04:00
hyperdefined	983a35bd0b	Update README.md	2022-06-08 21:01:15 -04:00
hyperdefined	d9ad7ebcad	shade stuff	2022-06-07 17:58:46 -04:00
hyperdefined	995f80e159	Update plugin.yml	2022-06-06 13:26:05 -04:00
hyperdefined	56850c40d1	Merge pull request #11 from hyperdefined/dependabot/maven/net.kyori-adventure-text-minimessage-4.11.0 Bump adventure-text-minimessage from 4.10.1 to 4.11.0	2022-06-06 13:25:15 -04:00
dependabot[bot]	b9e4bbd1e8	Bump adventure-text-minimessage from 4.10.1 to 4.11.0 Bumps [adventure-text-minimessage](https://github.com/KyoriPowered/adventure) from 4.10.1 to 4.11.0. - [Release notes](https://github.com/KyoriPowered/adventure/releases) - [Commits](https://github.com/KyoriPowered/adventure/compare/v4.10.1...v4.11.0) --- updated-dependencies: - dependency-name: net.kyori:adventure-text-minimessage dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>	2022-06-02 11:28:36 +00:00
hyperdefined	6a23c7a724	version bump	2022-05-10 15:31:52 -04:00
hyperdefined	cd6cb999c0	handle item pickup better	2022-05-10 15:29:53 -04:00
hyperdefined	f9cff275b5	fixed trident lore not being added	2022-05-10 15:27:51 -04:00
hyperdefined	ba1ae01801	use minimessage for various messages	2022-05-10 14:41:01 -04:00
hyperdefined	fd35cf6e9c	Update README.md	2022-04-19 18:55:48 -04:00
hyperdefined	5971ecc919	Merge pull request #10 from hyperdefined/dependabot/maven/org.apache.maven.plugins-maven-clean-plugin-3.2.0 Bump maven-clean-plugin from 3.1.0 to 3.2.0	2022-04-06 11:38:22 -04:00
dependabot[bot]	4c4ca0c31e	Bump maven-clean-plugin from 3.1.0 to 3.2.0 Bumps [maven-clean-plugin](https://github.com/apache/maven-clean-plugin) from 3.1.0 to 3.2.0. - [Release notes](https://github.com/apache/maven-clean-plugin/releases) - [Commits](https://github.com/apache/maven-clean-plugin/compare/maven-clean-plugin-3.1.0...maven-clean-plugin-3.2.0) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-clean-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>	2022-04-05 11:24:12 +00:00
hyperdefined	294b753430	Merge pull request #9 from hyperdefined/dependabot/maven/org.apache.maven.plugins-maven-shade-plugin-3.3.0 Bump maven-shade-plugin from 3.2.4 to 3.3.0	2022-03-30 15:11:18 -04:00
dependabot[bot]	adf6a3149b	Bump maven-shade-plugin from 3.2.4 to 3.3.0 Bumps [maven-shade-plugin](https://github.com/apache/maven-shade-plugin) from 3.2.4 to 3.3.0. - [Release notes](https://github.com/apache/maven-shade-plugin/releases) - [Commits](https://github.com/apache/maven-shade-plugin/compare/maven-shade-plugin-3.2.4...maven-shade-plugin-3.3.0) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-shade-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>	2022-03-30 11:32:46 +00:00
hyperdefined	ea68650038	Merge pull request #8 from hyperdefined/dependabot/maven/org.apache.maven.plugins-maven-compiler-plugin-3.10.1 Bump maven-compiler-plugin from 3.10.0 to 3.10.1	2022-03-11 16:47:40 -05:00
dependabot[bot]	114a27e9b5	Bump maven-compiler-plugin from 3.10.0 to 3.10.1 Bumps [maven-compiler-plugin](https://github.com/apache/maven-compiler-plugin) from 3.10.0 to 3.10.1. - [Release notes](https://github.com/apache/maven-compiler-plugin/releases) - [Commits](https://github.com/apache/maven-compiler-plugin/compare/maven-compiler-plugin-3.10.0...maven-compiler-plugin-3.10.1) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-compiler-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2022-03-11 11:26:04 +00:00
hyperdefined	7cdb71df50	cleanup	2022-03-01 23:33:55 -05:00
hyperdefined	bd80d6718c	Update CommandToolStats.java	2022-03-01 23:33:26 -05:00
hyperdefined	b9907eedec	unify item arrays & date formats	2022-03-01 23:32:30 -05:00
hyperdefined	61cf44a407	handle finding who opens a newly spawned chest better	2022-03-01 23:21:09 -05:00
hyperdefined	337f88ce36	Update pom.xml	2022-02-24 11:46:50 -05:00
hyperdefined	42f100f0b0	added missing return (fixes #7 )	2022-02-24 11:46:08 -05:00
hyperdefined	63b3cb1d03	Update pom.xml	2022-02-23 19:57:41 -05:00
hyperdefined	7717b6b5a5	Update EntityDamage.java	2022-02-23 19:53:54 -05:00
hyperdefined	a421430fa8	only add damage to valid armor closes #6	2022-02-23 19:52:58 -05:00
hyperdefined	7a89b31766	removed unused set	2022-02-22 19:05:00 -05:00
hyperdefined	0334681971	`getFinalDamage()` instead because of armor reductions	2022-02-22 17:33:48 -05:00
hyperdefined	df23f40d6b	Update pom.xml	2022-02-22 15:08:38 -05:00
hyperdefined	0221ee40cf	handle logic of lore reset better	2022-02-22 15:07:51 -05:00
hyperdefined	a01d07af4a	fixed removing `new` tag for elytras this fixes #5	2022-02-22 15:07:30 -05:00
hyperdefined	e402d3078a	Merge pull request #4 from hyperdefined/dependabot/maven/org.apache.maven.plugins-maven-compiler-plugin-3.10.0 Bump maven-compiler-plugin from 3.9.0 to 3.10.0	2022-02-14 21:07:02 -05:00
dependabot[bot]	4f44ca0777	Bump maven-compiler-plugin from 3.9.0 to 3.10.0 Bumps [maven-compiler-plugin](https://github.com/apache/maven-compiler-plugin) from 3.9.0 to 3.10.0. - [Release notes](https://github.com/apache/maven-compiler-plugin/releases) - [Commits](https://github.com/apache/maven-compiler-plugin/compare/maven-compiler-plugin-3.9.0...maven-compiler-plugin-3.10.0) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-compiler-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>	2022-02-14 11:38:14 +00:00
hyperdefined	53fd7f734c	Update pom.xml	2022-02-12 20:47:52 -05:00
hyperdefined	75cd4fa17e	fixed small typo	2022-02-12 20:47:32 -05:00
hyperdefined	e296c27a5b	added comments to better explain what is going on	2022-02-11 19:19:05 -05:00
hyperdefined	adb1c637dc	smh	2022-02-11 18:34:42 -05:00
hyperdefined	4b8f8061b4	Merge branch 'master' of https://github.com/hyperdefined/ToolStats	2022-02-11 15:09:49 -05:00
hyperdefined	464916e08b	Update CommandToolStats.java	2022-02-11 15:09:32 -05:00
hyperdefined	6b6b65d1df	Update README.md	2022-02-11 15:05:55 -05:00
hyperdefined	a1c39dffd0	Update pom.xml	2022-02-11 15:05:18 -05:00
hyperdefined	88eab81906	added tab completions to sub commands	2022-02-11 15:03:37 -05:00
hyperdefined	be233de90d	fixed plugin.yml	2022-02-11 15:03:21 -05:00
hyperdefined	2437424e39	added reset lore command	2022-02-11 14:46:25 -05:00
hyperdefined	63b08062c8	Update CraftItem.java	2022-02-11 14:04:12 -05:00
hyperdefined	d23c2446dd	fix fishing rods not updating lore correctly	2022-02-11 14:03:51 -05:00