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>
@@ -36,5 +36,8 @@ If item lore is ever incorrect, you can run `/toolstats reset` to reset the item
 ![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).

pom.xml

@@ -23,7 +23,7 @@
 
     <groupId>lol.hyper</groupId>
     <artifactId>toolstats</artifactId>
-    <version>1.3.2</version>
+    <version>1.4.2</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.10.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>

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.text.DecimalFormat;
-import java.util.Set;
+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() {
@@ -154,20 +155,24 @@ 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 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);
         }
@@ -198,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":
@@ -210,8 +218,9 @@ public final class ToolStats extends JavaPlugin {
 
     /**
      * 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.
+     * @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) {
@@ -253,4 +262,11 @@ public final class ToolStats extends JavaPlugin {
         }
         return lore;
     }
+
+    public BukkitAudiences getAdventure() {
+        if(this.adventure == null) {
+            throw new IllegalStateException("Tried to access Adventure when the plugin was disabled!");
+        }
+        return this.adventure;
+    }
 }

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

@@ -18,8 +18,11 @@
 package lol.hyper.toolstats.commands;
 
 import lol.hyper.toolstats.ToolStats;
-import lol.hyper.toolstats.UUIDDataType;
+import lol.hyper.toolstats.tools.UUIDDataType;
-import org.bukkit.*;
+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.CommandSender;
 import org.bukkit.command.TabExecutor;
@@ -31,34 +34,35 @@ import org.bukkit.persistence.PersistentDataType;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-import java.text.SimpleDateFormat;
 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();
     }
-    private final SimpleDateFormat format = new SimpleDateFormat("M/dd/yyyy", Locale.ENGLISH);
 
     @Override
     public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, @NotNull String[] args) {
         if (!sender.hasPermission("toolstats.use")) {
-            sender.sendMessage(ChatColor.RED + "You do not have permission for this command.");
+            audiences.sender(sender).sendMessage(Component.text("You do not have permission for this command.").color(NamedTextColor.RED));
             return true;
         }
         if (args.length == 0) {
-            sender.sendMessage(ChatColor.GREEN + "ToolStats version " + toolStats.getDescription().getVersion() + ". Created by hyperdefined.");
+            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.isOp() || sender.hasPermission("toolstats.reload")) {
+                if (sender.hasPermission("toolstats.reload")) {
                     toolStats.loadConfig();
-                    sender.sendMessage(ChatColor.GREEN + "Configuration reloaded!");
+                    audiences.sender(sender).sendMessage(Component.text("Configuration reloaded!").color(NamedTextColor.GREEN));
                 } else {
-                    sender.sendMessage(ChatColor.RED + "You do not have permission for this command.");
+                    audiences.sender(sender).sendMessage(Component.text("You do not have permission for this command.").color(NamedTextColor.RED));
                 }
                 return true;
             }
@@ -67,21 +71,21 @@ public class CommandToolStats implements TabExecutor {
                     Player player = (Player) sender;
                     ItemStack heldItem = player.getInventory().getItemInMainHand();
                     if (heldItem.getType() == Material.AIR) {
-                        sender.sendMessage(ChatColor.RED + "You must hold an item!");
+                        audiences.sender(sender).sendMessage(Component.text("You must hold an item!").color(NamedTextColor.RED));
                         return true;
                     }
                     fixItemLore(heldItem, player);
-                    sender.sendMessage(ChatColor.GREEN + "The lore was reset!");
+                    audiences.sender(sender).sendMessage(Component.text("The lore was reset!").color(NamedTextColor.GREEN));
                     return true;
                 }
-                sender.sendMessage(ChatColor.GREEN + "This will remove ALL current lore from the held item and replace it with the correct lore.");
+                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));
-                sender.sendMessage(ChatColor.GREEN + "The item owner will be who ever is currently running this command.");
+                audiences.sender(sender).sendMessage(Component.text("The item owner will be who ever is currently running this command.").color(NamedTextColor.GREEN));
-                sender.sendMessage(ChatColor.GREEN + "Only use this if the tags on the tool are incorrect.");
+                audiences.sender(sender).sendMessage(Component.text("Only use this if the tags on the tool are incorrect.").color(NamedTextColor.GREEN));
-                sender.sendMessage(ChatColor.GREEN + "Type /toolstats reset confirm to confirm this.");
+                audiences.sender(sender).sendMessage(Component.text("Type /toolstats reset confirm to confirm this.").color(NamedTextColor.GREEN));
                 return true;
             }
             default: {
-                sender.sendMessage(ChatColor.RED + "Invalid sub-command.");
+                audiences.sender(sender).sendMessage(Component.text("Invalid sub-command.").color(NamedTextColor.RED));
             }
         }
         return true;
@@ -89,8 +93,9 @@ public class CommandToolStats implements TabExecutor {
 
     /**
      * 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.
+     * @param player   The player running the command.
      */
     private void fixItemLore(ItemStack original, Player player) {
         ItemStack finalItem = original.clone();
@@ -137,7 +142,7 @@ public class CommandToolStats implements TabExecutor {
                 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}", format.format(new Date(time))));
+                        lore.add(toolStats.getLoreFromConfig("looted.found-on", true).replace("{date}", toolStats.dateFormat.format(new Date(time))));
                     }
                 }
                 finalMeta.setLore(lore);
@@ -179,19 +184,19 @@ public class CommandToolStats implements TabExecutor {
                     // 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}", format.format(new Date(time))));
+                            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}", format.format(new Date(time))));
+                            lore.add(toolStats.getLoreFromConfig("fished.caught-on", true).replace("{date}", toolStats.dateFormat.format(new Date(time))));
                             break;
                         }
                         case "LOOTED": {
-                            lore.add(toolStats.getLoreFromConfig("looted.foundon", true).replace("{date}", format.format(new Date(time))));
+                            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}", format.format(new Date(time))));
+                            lore.add(toolStats.getLoreFromConfig("traded.traded-on", true).replace("{date}", toolStats.dateFormat.format(new Date(time))));
                             break;
                         }
                     }
@@ -202,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)));
                 }
             }
         }
@@ -210,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)));
                 }
             }
         }
@@ -218,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)));
                 }
             }
         }
@@ -226,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)));
                 }
             }
         }
@@ -234,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)) {
+            if (container.has(toolStats.armorDamage, PersistentDataType.DOUBLE)) {
-                Integer damage = container.get(toolStats.armorDamage, PersistentDataType.INTEGER);
+                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,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,8 +47,7 @@ public class BlocksMined implements Listener {
             return;
         }
         Player player = event.getPlayer();
-        // ignore creative mode
+        if (player.getGameMode() == GameMode.CREATIVE || player.getGameMode() == GameMode.SPECTATOR) {
-        if (player.getGameMode() != GameMode.SURVIVAL) {
             return;
         }
         // if the player mines something with their fist
@@ -58,8 +56,7 @@ public class BlocksMined implements Listener {
             return;
         }
         // only check certain items
-        String itemName = heldItem.getType().toString().toLowerCase();
+        if (!ItemChecker.isMineTool(heldItem.getType())) {
-        if (Arrays.stream(validTools).noneMatch(itemName::contains)) {
             return;
         }
         // if it's an item we want, update the stats
@@ -84,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);
 
@@ -103,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;
@@ -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,40 @@ 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 certain items
-        // only check for items we want
+        if (!ItemChecker.isValidItem(itemStack.getType())) {
-        for (String x : validItems) {
+            return;
-            if (name.contains(x)) {
+        }
-                // if the player shift clicks, send them this warning
+
-                if (event.isShiftClick()) {
+        // if the player shift clicks, send them this warning
-                    String configMessage = toolStats.config.getString("messages.shift-click-warning.crafting");
+        if (event.isShiftClick()) {
-                    if (configMessage != null) {
+            String configMessage = toolStats.config.getString("messages.shift-click-warning.crafting");
-                        if (configMessage.length() != 0) {
+            if (configMessage != null) {
-                            event.getWhoClicked().sendMessage(ChatColor.translateAlternateColorCodes('&', configMessage));
+                if (configMessage.length() != 0) {
-                        }
+                    event.getWhoClicked().sendMessage(ChatColor.translateAlternateColorCodes('&', configMessage));
-                    }
                 }
-                // test the item before setting it
-                if (addLore(itemStack, player) == null) {
-                    return;
-                }
-                // set the result
-                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.
+     * @param owner     The player crafting.
      * @return A copy of the item with the tags + lore.
      */
     private ItemStack addLore(ItemStack itemStack, Player owner) {
@@ -127,7 +127,7 @@ public class CraftItem implements Listener {
         }
         // 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()));

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,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
@@ -69,9 +66,8 @@ public class EntityDamage implements Listener {
                 if (heldItem == null || heldItem.getType() == Material.AIR) {
                     return;
                 }
-                // check items we want
+                // only check certain items
-                String itemName = heldItem.getType().toString().toLowerCase();
+                if (!ItemChecker.isMeleeWeapon(heldItem.getType())) {
-                if (Arrays.stream(validTools).noneMatch(itemName::contains)) {
                     return;
                 }
                 // a player is killing another player
@@ -104,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;
@@ -123,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());
+                    }
                 }
             }
         }
@@ -141,10 +145,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());
+                    }
                 }
             }
         }
@@ -159,10 +168,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());
+                    }
                 }
             }
         }
@@ -170,6 +184,7 @@ public class EntityDamage implements Listener {
 
     /**
      * Updates a weapon's player kills.
+     *
      * @param itemStack The item to update.
      * @return A copy of the item.
      */
@@ -209,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")) {
@@ -232,6 +247,7 @@ public class EntityDamage implements Listener {
 
     /**
      * Updates a weapon's mob kills.
+     *
      * @param itemStack The item to update.
      * @return A copy of the item.
      */
@@ -271,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")) {
@@ -294,8 +310,9 @@ public class EntityDamage implements Listener {
 
     /**
      * Updates a player's armor damage stats.
+     *
      * @param itemStack The armor piece.
-     * @param damage How much damage is being added.
+     * @param damage    How much damage is being added.
      */
     private void updateArmorDamage(ItemStack itemStack, double damage) {
         ItemMeta meta = itemStack.getItemMeta();
@@ -312,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);
@@ -333,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);

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);
+                if (ItemChecker.isValidItem(current.getType())) {
-                for (String item : toolStats.craftItem.validItems) {
+                    addLore(current, livingEntity.getName());
-                    if (name.contains(item)) {
-                        addLore(current, livingEntity.getName());
-                    }
                 }
             }
             toolStats.mobKill.trackedMobs.remove(livingEntityUUID);
@@ -59,8 +57,9 @@ public class EntityDeath implements Listener {
 
     /**
      * Adds "drop by" tag to item.
+     *
      * @param itemStack The item to add lore to.
-     * @param mob The mob or player name.
+     * @param mob       The mob or player name.
      */
     private void addLore(ItemStack itemStack, String mob) {
         ItemMeta meta = itemStack.getItemMeta();

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,32 +55,76 @@ public class GenerateLoot implements Listener {
         if (inventoryHolder == null) {
             return;
         }
-        Inventory chest = inventoryHolder.getInventory();
+        Location lootLocation = event.getLootContext().getLocation();
-        // run task later since if it runs on the same tick it breaks idk
+        Inventory chestInv = inventoryHolder.getInventory();
-        Bukkit.getScheduler().runTaskLater(toolStats, () -> {
+
-            Player player = (Player) chest.getViewers().get(0);
+        if (inventoryHolder instanceof Chest) {
-            // do a classic for loot so we keep track of chest index of item
+            Block openedChest = null;
-            for (int i = 0; i < chest.getContents().length; i++) {
+            // look at the current list of opened chest and get the distance
-                ItemStack itemStack = chest.getItem(i);
+            // between the lootcontext location and chest location
-                // ignore air
+            // if the distance is less than 1, it's the same chest
-                if (itemStack == null || itemStack.getType() == Material.AIR) {
+            for (Block chest : toolStats.playerInteract.openedChests.keySet()) {
-                    continue;
+                Location chestLocation = chest.getLocation();
-                }
+                if (chest.getWorld() == lootLocation.getWorld()) {
-                String name = itemStack.getType().toString().toLowerCase(Locale.ROOT);
+                    double distance = lootLocation.distance(chestLocation);
-                for (String x : validItems) {
+                    if (distance <= 1.0) {
-                    if (name.contains(x)) {
+                        openedChest = chest;
-                        chest.setItem(i, addLore(itemStack, player));
                     }
                 }
             }
+            // 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);
+                        }
+                    }
+                }
+            }
+        }
     }
 
     /**
      * Adds lore to newly generated items.
+     *
      * @param itemStack The item to add lore to.
-     * @param owner The player that found the item.
+     * @param owner     The player that found the item.
      * @return The item with the lore.
      */
     private ItemStack addLore(ItemStack itemStack, Player owner) {
@@ -117,7 +160,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);

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.*;
-import org.bukkit.entity.Player;
 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,16 +49,26 @@ public class PickupItem implements Listener {
         }
         Entity entity = event.getEntity();
         if (entity instanceof Player) {
-            ItemStack itemStack = event.getItem().getItemStack();
+            Player player = (Player) entity;
-            if (itemStack.getType() == Material.ELYTRA) {
+            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) {
                     return;
                 }
                 PersistentDataContainer container = meta.getPersistentDataContainer();
-                // the elytra has the new key, set the lore to it
+                if (itemStack.getType() == Material.ELYTRA) {
-                if (container.has(toolStats.newElytra, PersistentDataType.INTEGER)) {
+                    // the elytra has the new key, set the lore to it
-                    addLore(itemStack, (Player) event.getEntity());
+                    if (container.has(toolStats.newElytra, PersistentDataType.INTEGER)) {
+                        ItemStack newElytra = addLore(itemStack, (Player) event.getEntity());
+                        if (newElytra != null) {
+                            item.setItemStack(newElytra);
+                        }
+                    }
                 }
             }
         }
@@ -69,13 +76,15 @@ public class PickupItem implements Listener {
 
     /**
      * Adds "looted by" tags for elytras.
+     *
      * @param itemStack The elytra to add lore to.
-     * @param owner The player who found it.
+     * @param owner     The player who found it.
      */
-    private void addLore(ItemStack itemStack, Player owner) {
+    private ItemStack addLore(ItemStack itemStack, Player owner) {
-        ItemMeta meta = itemStack.getItemMeta();
+        ItemStack finalItem = itemStack.clone();
+        ItemMeta meta = finalItem.getItemMeta();
         if (meta == null) {
-            return;
+            return null;
         }
         long timeCreated = System.currentTimeMillis();
         Date finalDate = new Date(timeCreated);
@@ -89,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;
@@ -100,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;
     }
 }

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,15 +67,14 @@ public class PlayerFish implements Listener {
             return;
         }
         ItemStack caughtItem = ((Item) event.getCaught()).getItemStack();
-        for (String x : validItems) {
+        if (ItemChecker.isValidItem(caughtItem.getType())) {
-            if (caughtItem.getType().toString().toLowerCase(Locale.ROOT).contains(x)) {
+            addNewLore(caughtItem, player);
-                addNewLore(caughtItem, player);
-            }
         }
     }
 
     /**
      * Updates a fishing rod's count.
+     *
      * @param itemStack The fishing rod to update.
      */
     private void updateFishCount(ItemStack itemStack) {
@@ -114,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);
@@ -135,8 +133,9 @@ public class PlayerFish implements Listener {
 
     /**
      * Adds "caught by" tags to newly fished items.
+     *
      * @param itemStack The item to add lore to.
-     * @param owner The player who caught the item.
+     * @param owner     The player who caught the item.
      */
     private void addNewLore(ItemStack itemStack, Player owner) {
         ItemMeta meta = itemStack.getItemMeta();
@@ -170,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);

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

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;
@@ -66,6 +70,7 @@ public class SheepShear implements Listener {
 
     /**
      * Adds tags to shears.
+     *
      * @param itemStack The shears.
      */
     private void addLore(ItemStack itemStack) {
@@ -103,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;
@@ -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,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 : validItems) {
+                if (ItemChecker.isValidItem(item.getType())) {
-                    if (item.getType().toString().toLowerCase(Locale.ROOT).contains(x)) {
+                    // if the player shift clicks, show the warning
-                        // if the player shift clicks show the warning
+                    if (event.isShiftClick()) {
-                        if (event.isShiftClick()) {
+                        String configMessage = toolStats.config.getString("messages.shift-click-warning.trading");
-                            String configMessage = toolStats.config.getString("messages.shift-click-warning.trading");
+                        if (configMessage != null) {
-                            if (configMessage != null) {
+                            event.getWhoClicked().sendMessage(ChatColor.translateAlternateColorCodes('&', configMessage));
-                                event.getWhoClicked().sendMessage(ChatColor.translateAlternateColorCodes('&', configMessage));
-                            }
-                        }
-                        ItemStack newItem = addLore(item, (Player) event.getWhoClicked());
-                        if (newItem == null) {
-                            return;
                         }
+                    }
+                    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);
-                        Bukkit.getScheduler().runTaskLater(toolStats, ()-> event.setCurrentItem(newItem), 5);
+                        return;
                     }
                 }
             }
@@ -87,8 +87,9 @@ public class VillagerTrade implements Listener {
 
     /**
      * Adds "traded by" tags to item.
+     *
      * @param itemStack The item to add lore.
-     * @param owner The player who traded.
+     * @param owner     The player who traded.
      * @return The item with lore.
      */
     private ItemStack addLore(ItemStack itemStack, Player owner) {
@@ -123,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);

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;