Update pom.xml

fixes #14

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>

pom.xml

@@ -23,7 +23,7 @@
 
     <groupId>lol.hyper</groupId>
     <artifactId>toolstats</artifactId>
-    <version>1.4</version>
+    <version>1.4.2</version>
     <packaging>jar</packaging>
 
     <name>ToolStats</name>
@@ -139,7 +139,7 @@
         <dependency>
             <groupId>net.kyori</groupId>
             <artifactId>adventure-platform-bukkit</artifactId>
-            <version>4.1.0</version>
+            <version>4.1.1</version>
             <scope>compile</scope>
         </dependency>
     </dependencies>

src/main/java/lol/hyper/toolstats/ToolStats.java

@@ -33,6 +33,7 @@ import org.bukkit.plugin.java.JavaPlugin;
 
 import java.io.File;
 import java.io.IOException;
+import java.text.DecimalFormat;
 import java.text.SimpleDateFormat;
 import java.util.Locale;
 import java.util.logging.Logger;
@@ -58,12 +59,9 @@ public final class ToolStats extends JavaPlugin {
     // used for tracking new elytras
     public final NamespacedKey newElytra = new NamespacedKey(this, "new");
 
-    public final String[] allValidItems = {
-            "pickaxe", "sword", "shovel", "axe", "hoe", "bow", "helmet", "chestplate", "leggings", "boots", "fishing"
-    };
-    public final String[] meleeItems = {"sword", "trident", "axe"};
-    public final String[] mineItems = {"pickaxe", "axe", "hoe", "shovel", "shear"};
     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;

src/main/java/lol/hyper/toolstats/commands/CommandToolStats.java

@@ -18,7 +18,7 @@
 package lol.hyper.toolstats.commands;
 
 import lol.hyper.toolstats.ToolStats;
-import lol.hyper.toolstats.UUIDDataType;
+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;
@@ -58,7 +58,7 @@ public class CommandToolStats implements TabExecutor {
         }
         switch (args[0]) {
             case "reload": {
-                if (sender.isOp() || sender.hasPermission("toolstats.reload")) {
+                if (sender.hasPermission("toolstats.reload")) {
                     toolStats.loadConfig();
                     audiences.sender(sender).sendMessage(Component.text("Configuration reloaded!").color(NamedTextColor.GREEN));
                 } else {
@@ -192,7 +192,7 @@ public class CommandToolStats implements TabExecutor {
                             break;
                         }
                         case "LOOTED": {
-                            lore.add(toolStats.getLoreFromConfig("looted.foundon", true).replace("{date}", toolStats.dateFormat.format(new Date(time))));
+                            lore.add(toolStats.getLoreFromConfig("looted.found-on", true).replace("{date}", toolStats.dateFormat.format(new Date(time))));
                             break;
                         }
                         case "TRADED": {
@@ -207,7 +207,7 @@ public class CommandToolStats implements TabExecutor {
             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}", Integer.toString(kills)));
+                    lore.add(toolStats.getLoreFromConfig("kills.player", true).replace("{kills}", toolStats.commaFormat.format(kills)));
                 }
             }
         }
@@ -215,7 +215,7 @@ public class CommandToolStats implements TabExecutor {
             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}", Integer.toString(kills)));
+                    lore.add(toolStats.getLoreFromConfig("kills.mob", true).replace("{kills}", toolStats.commaFormat.format(kills)));
                 }
             }
         }
@@ -223,7 +223,7 @@ public class CommandToolStats implements TabExecutor {
             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}", Integer.toString(blocksMined)));
+                    lore.add(toolStats.getLoreFromConfig("blocks-mined", true).replace("{blocks}", toolStats.commaFormat.format(blocksMined)));
                 }
             }
         }
@@ -231,7 +231,7 @@ public class CommandToolStats implements TabExecutor {
             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}", Integer.toString(fish)));
+                    lore.add(toolStats.getLoreFromConfig("fished.fish-caught", true).replace("{fish}", toolStats.commaFormat.format(fish)));
                 }
             }
         }
@@ -239,15 +239,15 @@ public class CommandToolStats implements TabExecutor {
             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}", Integer.toString(sheep)));
+                    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.INTEGER)) {
-                Integer damage = container.get(toolStats.armorDamage, PersistentDataType.INTEGER);
+            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}", Integer.toString(damage)));
+                    lore.add(toolStats.getLoreFromConfig("damage-taken", true).replace("{damage}", toolStats.commaFormat.format(damage)));
                 }
             }
         }

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,7 +31,6 @@ 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 {
@@ -47,8 +47,7 @@ public class BlocksMined implements Listener {
             return;
         }
         Player player = event.getPlayer();
-        // ignore creative mode
-        if (player.getGameMode() != GameMode.SURVIVAL) {
+        if (player.getGameMode() == GameMode.CREATIVE || player.getGameMode() == GameMode.SPECTATOR) {
             return;
         }
         // if the player mines something with their fist
@@ -57,8 +56,7 @@ public class BlocksMined implements Listener {
             return;
         }
         // only check certain items
-        String itemName = heldItem.getType().toString().toLowerCase();
-        if (Arrays.stream(toolStats.mineItems).noneMatch(itemName::contains)) {
+        if (!ItemChecker.isMineTool(heldItem.getType())) {
             return;
         }
         // if it's an item we want, update the stats
@@ -83,7 +81,6 @@ 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);
 
@@ -102,18 +99,18 @@ public class BlocksMined implements Listener {
             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")) {

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;
 

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;
@@ -46,32 +48,33 @@ 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);
-        // only check for items we want
-        for (String x : toolStats.allValidItems) {
-            if (name.contains(x)) {
-                // 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));
-                        }
-                    }
+        // 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));
                 }
-                // test the item before setting it
-                ItemStack newItem = addLore(itemStack, player);
-                if (newItem == null) {
-                    return;
-                }
-                // set the result
-                event.setCurrentItem(newItem);
             }
         }
+        // test the item before setting it
+        ItemStack newItem = addLore(itemStack, player);
+        if (newItem != null) {
+            // set the result
+            event.setCurrentItem(newItem);
+        }
     }
 
     /**

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,14 +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 DecimalFormat decimalFormat = new DecimalFormat("0.00");
     public final Set<UUID> trackedMobs = new HashSet<>();
 
     public EntityDamage(ToolStats toolStats) {
@@ -60,7 +58,7 @@ 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
@@ -68,9 +66,8 @@ public class EntityDamage implements Listener {
                 if (heldItem == null || heldItem.getType() == Material.AIR) {
                     return;
                 }
-                // check items we want
-                String itemName = heldItem.getType().toString().toLowerCase();
-                if (Arrays.stream(toolStats.meleeItems).noneMatch(itemName::contains)) {
+                // only check certain items
+                if (!ItemChecker.isMeleeWeapon(heldItem.getType())) {
                     return;
                 }
                 // a player is killing another player
@@ -103,6 +100,9 @@ public class EntityDamage implements Listener {
                 // 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;
@@ -122,10 +122,13 @@ 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) {
-                    if (isArmor(armor.getType().toString().toLowerCase(Locale.ROOT))) {
+                    if (ItemChecker.isArmor(armor.getType())) {
                         updateArmorDamage(armor, event.getFinalDamage());
                     }
                 }
@@ -142,10 +145,13 @@ 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) {
-                    if (isArmor(armor.getType().toString().toLowerCase(Locale.ROOT))) {
+                    if (ItemChecker.isArmor(armor.getType())) {
                         updateArmorDamage(armor, event.getFinalDamage());
                     }
                 }
@@ -162,10 +168,13 @@ 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) {
-                    if (isArmor(armor.getType().toString().toLowerCase(Locale.ROOT))) {
+                    if (ItemChecker.isArmor(armor.getType())) {
                         updateArmorDamage(armor, event.getFinalDamage());
                     }
                 }
@@ -215,18 +224,18 @@ 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")) {
@@ -278,18 +287,18 @@ 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")) {
@@ -320,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);
@@ -341,32 +349,22 @@ 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);
         }
         itemStack.setItemMeta(meta);
     }
-
-    /**
-     * Check if item is an armor piece.
-     *
-     * @param itemType The item type, not name.
-     * @return If the item is an armor piece.
-     */
-    private boolean isArmor(String itemType) {
-        return itemType.endsWith("_helmet") || itemType.endsWith("_chestplate") || itemType.endsWith("_leggings") || itemType.endsWith("_boots");
-    }
 }

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;
@@ -46,11 +47,8 @@ public class EntityDeath implements Listener {
         // 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.allValidItems) {
-                    if (name.contains(item)) {
-                        addLore(current, livingEntity.getName());
-                    }
+                if (ItemChecker.isValidItem(current.getType())) {
+                    addLore(current, livingEntity.getName());
                 }
             }
             toolStats.mobKill.trackedMobs.remove(livingEntityUUID);

src/main/java/lol/hyper/toolstats/events/GenerateLoot.java

@@ -18,12 +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;
@@ -37,7 +40,6 @@ import org.bukkit.persistence.PersistentDataType;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
-import java.util.Locale;
 
 public class GenerateLoot implements Listener {
 
@@ -55,42 +57,67 @@ public class GenerateLoot implements Listener {
         }
         Location lootLocation = event.getLootContext().getLocation();
         Inventory chestInv = inventoryHolder.getInventory();
-        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 = 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 : toolStats.allValidItems) {
-                    if (name.contains(x)) {
-                        chestInv.setItem(i, addLore(itemStack, player));
+        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();
+                if (chest.getWorld() == lootLocation.getWorld()) {
+                    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;
+            }
 
-        }, 1);
+            // run task later since if it runs on the same tick it breaks idk
+            Block finalOpenedChest = openedChest;
+            Bukkit.getScheduler().runTaskLater(toolStats, () -> {
+                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;
+                    }
+                    if (ItemChecker.isValidItem(itemStack.getType())) {
+                        ItemStack newItem = addLore(itemStack, player);
+                        if (newItem != null) {
+                            chestInv.setItem(i, newItem);
+                        }
+                    }
+                }
+
+            }, 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);
+                        }
+                    }
+                }
+            }
+        }
     }
 
     /**

src/main/java/lol/hyper/toolstats/events/PickupItem.java

@@ -18,7 +18,8 @@
 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.*;
 import org.bukkit.event.EventHandler;
@@ -48,19 +49,25 @@ 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();
                 ItemMeta meta = itemStack.getItemMeta();
                 if (meta == null) {
-                    toolStats.logger.info("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)) {
-                        addLore(itemStack, (Player) event.getEntity());
+                        ItemStack newElytra = addLore(itemStack, (Player) event.getEntity());
+                        if (newElytra != null) {
+                            item.setItemStack(newElytra);
+                        }
                     }
                 }
             }
@@ -73,10 +80,11 @@ public class PickupItem implements Listener {
      * @param itemStack The elytra to add lore to.
      * @param owner     The player who found it.
      */
-    private void addLore(ItemStack itemStack, Player owner) {
-        ItemMeta meta = itemStack.getItemMeta();
+    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);
@@ -90,7 +98,7 @@ public class PickupItem implements Listener {
 
         if (foundByLoreRaw == null || foundOnLoreRaw == null) {
             toolStats.logger.warning("There is no lore message for messages.looted!");
-            return;
+            return null;
         }
 
         List<String> lore;
@@ -105,6 +113,7 @@ public class PickupItem implements Listener {
             lore.add(foundByLoreRaw.replace("{player}", owner.getName()));
         }
         meta.setLore(lore);
-        itemStack.setItemMeta(meta);
+        finalItem.setItemMeta(meta);
+        return finalItem;
     }
 }

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;
@@ -33,7 +35,6 @@ import org.bukkit.persistence.PersistentDataType;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
-import java.util.Locale;
 
 public class PlayerFish implements Listener {
 
@@ -54,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;
@@ -63,10 +67,8 @@ public class PlayerFish implements Listener {
             return;
         }
         ItemStack caughtItem = ((Item) event.getCaught()).getItemStack();
-        for (String x : toolStats.allValidItems) {
-            if (caughtItem.getType().toString().toLowerCase(Locale.ROOT).contains(x)) {
-                addNewLore(caughtItem, player);
-            }
+        if (ItemChecker.isValidItem(caughtItem.getType())) {
+            addNewLore(caughtItem, player);
         }
     }
 
@@ -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);

src/main/java/lol/hyper/toolstats/events/PlayerInteract.java

@@ -19,12 +19,17 @@ 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;
@@ -34,6 +39,7 @@ 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;
@@ -49,12 +55,30 @@ public class PlayerInteract implements Listener {
         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
-        // this is used to detect who opens a newly spawned chest
-        // since that is not really tracked on the lootevent
         if (block.getType() != Material.AIR && block.getType() == Material.CHEST) {
-            openedChests.put(block, event.getPlayer());
+            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);
+        }
+    }
 }

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,6 +48,9 @@ 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;
@@ -104,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);

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;
@@ -36,7 +38,6 @@ import org.bukkit.persistence.PersistentDataType;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
-import java.util.Locale;
 
 public class VillagerTrade implements Listener {
 
@@ -52,28 +53,32 @@ 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();
                 // only check items we want
-                for (String x : toolStats.allValidItems) {
-                    if (item.getType().toString().toLowerCase(Locale.ROOT).contains(x)) {
-                        // 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) {
-                            return;
+                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);
+                    if (newItem != null) {
                         // this gets delayed since villager inventories suck for no reason
-                        // if you don't delay this it doesn't work idk
                         Bukkit.getScheduler().runTaskLater(toolStats, () -> event.setCurrentItem(newItem), 5);
+                        return;
                     }
                 }
             }

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));
+    }
+}

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;