Update pom.xml

* when opening a loot chest
* when trading items
* when fishing for items

README.md

@@ -8,9 +8,20 @@
 	<a href="https://en.cryptobadges.io/donate/0xF3b4e87E4c11f586949ca8740eD33A1e473F924c"><img src="https://en.cryptobadges.io/badge/micro/0xF3b4e87E4c11f586949ca8740eD33A1e473F924c" alt="Donate with Ethereum"></a>
 	<a href="https://ko-fi.com/hyperdefined"><img src="https://img.shields.io/badge/Donate-Ko--fi-red" alt="Donate via Ko-fi"></a>
 	<a href="https://www.gnu.org/licenses/gpl-3.0"><img src="https://img.shields.io/badge/License-GPLv3-blue.svg" alt="License: GPL v3"></a>
+	<a href="https://wakatime.com/badge/user/992a7647-176a-477c-8086-e1abfba87ff4/project/0200f07a-f303-4103-a5f2-34b38c9c1fa4"><img src="https://wakatime.com/badge/user/992a7647-176a-477c-8086-e1abfba87ff4/project/0200f07a-f303-4103-a5f2-34b38c9c1fa4.svg" alt="wakatime"></a>
 </p>
 
-ToolStats is a small plugin that display various stats about tools. This plugin is inspired off of [GearStats](https://www.spigotmc.org/resources/gearstats.12960/). You can disable/enable which stats are shown on which tools via the config. Note: stats are tracked regardless of config setting.
+ToolStats is a small plugin that display various stats about tools. This plugin is inspired off of [GearStats](https://www.spigotmc.org/resources/gearstats.12960/). You can disable/enable which stats are shown on which tools via the config. Note: stats are tracked regardless of config setting. The config is to disable the lore on the item.
+
+Here is everything it tracks:
+* Blocks mined (pickaxes, shovels, axes, hoes, shears)
+* Player/mob kills (swords, axes, tridents, bows/crossbows)
+* Ownership of items when crafted, looted (from chests), traded, and caught from fishing.
+* Armor damage taken.
+* Fish caught.
+* Sheep sheared.
+
+The best part is, this data is stored on the item itself.
 
 ![Image](https://raw.githubusercontent.com/hyperdefined/ToolStats/master/images/image.png)
 ![Image](https://raw.githubusercontent.com/hyperdefined/ToolStats/master/images/image2.png)
@@ -18,6 +29,10 @@ ToolStats is a small plugin that display various stats about tools. This plugin
 ![Image](https://raw.githubusercontent.com/hyperdefined/ToolStats/master/images/image4.png)
 ![Image](https://raw.githubusercontent.com/hyperdefined/ToolStats/master/images/image5.png)
 ![Image](https://raw.githubusercontent.com/hyperdefined/ToolStats/master/images/image6.png)
+![Image](https://raw.githubusercontent.com/hyperdefined/ToolStats/master/images/image7.png)
+![Image](https://raw.githubusercontent.com/hyperdefined/ToolStats/master/images/image8.png)
+![Image](https://raw.githubusercontent.com/hyperdefined/ToolStats/master/images/image9.png)
+![Image](https://raw.githubusercontent.com/hyperdefined/ToolStats/master/images/image10.png)
 
 ## License
-This plugin is released under GNU General Public License v3. See [LICENSE](https://github.com/hyperdefined/ToolStats/blob/master/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.0</version>
+    <version>1.1</version>
     <packaging>jar</packaging>
 
     <name>ToolStats</name>

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

@@ -37,10 +37,10 @@ import java.util.logging.Logger;
 
 public final class ToolStats extends JavaPlugin {
 
-    // stores who crafted an item
-    public final NamespacedKey craftedOwner = new NamespacedKey(this, "owner");
-    // stores when an item was crafted
-    public final NamespacedKey craftedTime = new NamespacedKey(this, "time-created");
+    // stores who created an item
+    public final NamespacedKey genericOwner = new NamespacedKey(this, "owner");
+    // stores when an item was created
+    public final NamespacedKey timeCreated = new NamespacedKey(this, "time-created");
     // stores how many player kills by sword
     public final NamespacedKey swordPlayerKills = new NamespacedKey(this, "player-kills");
     // stores how many mob kills by sword
@@ -53,21 +53,27 @@ public final class ToolStats extends JavaPlugin {
     public final NamespacedKey shearsSheared = new NamespacedKey(this, "sheared");
     // stores how much damage armor has taken
     public final NamespacedKey armorDamage = new NamespacedKey(this, "damage-taken");
+    // used for tracking new elytras
+    public final NamespacedKey newElytra = new NamespacedKey(this, "new");
 
     public final Set<NamespacedKey> keys = new HashSet<>();
 
     public BlocksMined blocksMined;
+    public ChunkPopulate chunkPopulate;
     public CraftItem craftItem;
     public EntityDeath entityDeath;
+    public GenerateLoot generateLoot;
+    public PickupItem pickupItem;
     public EntityDamage mobKill;
     public PlayerFish playerFish;
     public SheepShear sheepShear;
+    public VillagerTrade villagerTrade;
     public CommandToolStats commandToolStats;
 
     public final Logger logger = this.getLogger();
     public final File configFile = new File(this.getDataFolder(), "config.yml");
     public FileConfiguration config;
-    public final int CONFIG_VERSION = 1;
+    public final int CONFIG_VERSION = 2;
 
     @Override
     public void onEnable() {
@@ -78,18 +84,26 @@ public final class ToolStats extends JavaPlugin {
         loadConfig();
         blocksMined = new BlocksMined(this);
         craftItem = new CraftItem(this);
+        chunkPopulate = new ChunkPopulate(this);
         entityDeath = new EntityDeath(this);
+        generateLoot = new GenerateLoot(this);
+        pickupItem = new PickupItem(this);
         mobKill = new EntityDamage(this);
         playerFish = new PlayerFish(this);
         sheepShear = new SheepShear(this);
+        villagerTrade = new VillagerTrade(this);
         commandToolStats = new CommandToolStats(this);
 
         Bukkit.getServer().getPluginManager().registerEvents(blocksMined, this);
+        Bukkit.getServer().getPluginManager().registerEvents(chunkPopulate, this);
         Bukkit.getServer().getPluginManager().registerEvents(craftItem, this);
         Bukkit.getServer().getPluginManager().registerEvents(entityDeath, this);
+        Bukkit.getServer().getPluginManager().registerEvents(generateLoot, this);
+        Bukkit.getServer().getPluginManager().registerEvents(pickupItem, this);
         Bukkit.getServer().getPluginManager().registerEvents(mobKill, this);
         Bukkit.getServer().getPluginManager().registerEvents(playerFish, this);
         Bukkit.getServer().getPluginManager().registerEvents(sheepShear, this);
+        Bukkit.getServer().getPluginManager().registerEvents(villagerTrade, this);
 
         this.getCommand("toolstats").setExecutor(commandToolStats);
 
@@ -97,8 +111,8 @@ public final class ToolStats extends JavaPlugin {
 
         Bukkit.getScheduler().runTaskAsynchronously(this, this::checkForUpdates);
 
-        keys.add(craftedOwner);
-        keys.add(craftedTime);
+        keys.add(genericOwner);
+        keys.add(timeCreated);
         keys.add(swordPlayerKills);
         keys.add(swordMobKills);
         keys.add(genericMined);
@@ -177,7 +191,10 @@ public final class ToolStats extends JavaPlugin {
             case "bow": {
                 return config.getBoolean("enabled." + configName + ".bow");
             }
-            case "armor": {
+            case "helmet":
+            case "chestplate":
+            case "leggings":
+            case "boots": {
                 return config.getBoolean("enabled." + configName + ".armor");
             }
         }

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

@@ -0,0 +1,73 @@
+/*
+ * 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.Chunk;
+import org.bukkit.Material;
+import org.bukkit.World;
+import org.bukkit.entity.Entity;
+import org.bukkit.entity.ItemFrame;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.Listener;
+import org.bukkit.event.world.ChunkPopulateEvent;
+import org.bukkit.inventory.ItemStack;
+import org.bukkit.inventory.meta.ItemMeta;
+import org.bukkit.persistence.PersistentDataContainer;
+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
+
+    private final ToolStats toolStats;
+
+    public ChunkPopulate(ToolStats toolStats) {
+        this.toolStats = toolStats;
+    }
+
+    @EventHandler
+    public void onPopulate(ChunkPopulateEvent event) {
+        if (event.getChunk().getWorld().getEnvironment() != World.Environment.THE_END) {
+            return;
+        }
+        // this is delayed because entities are not loaded instantly
+        // we just check 1 second later
+        Bukkit.getScheduler().runTaskLater(toolStats, () -> {
+            Chunk chunk = event.getChunk();
+            for (Entity entity : chunk.getEntities()) {
+                if (entity instanceof ItemFrame) {
+                    ItemFrame itemFrame = (ItemFrame) entity;
+                    if (itemFrame.getItem().getType() == Material.ELYTRA) {
+                        ItemStack elytraCopy = itemFrame.getItem();
+                        ItemMeta meta = elytraCopy.getItemMeta();
+                        if (meta == null) {
+                            return;
+                        }
+                        PersistentDataContainer container = meta.getPersistentDataContainer();
+                        container.set(toolStats.newElytra, PersistentDataType.INTEGER, 1);
+                        elytraCopy.setItemMeta(meta);
+                        itemFrame.setItem(elytraCopy);
+                    }
+                }
+            }
+        }, 20);
+    }
+}

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

@@ -71,8 +71,8 @@ public class CraftItem implements Listener {
         long timeCreated = System.currentTimeMillis();
         Date finalDate = new Date(timeCreated);
         PersistentDataContainer container = meta.getPersistentDataContainer();
-        container.set(toolStats.craftedTime, PersistentDataType.LONG, timeCreated);
-        container.set(toolStats.craftedOwner, new UUIDDataType(), owner.getUniqueId());
+        container.set(toolStats.timeCreated, PersistentDataType.LONG, timeCreated);
+        container.set(toolStats.genericOwner, new UUIDDataType(), owner.getUniqueId());
         List<String> lore;
         if (meta.hasLore()) {
             lore = meta.getLore();
@@ -80,10 +80,10 @@ public class CraftItem implements Listener {
         } else {
             lore = new ArrayList<>();
         }
-        if (toolStats.checkConfig(itemStack, "crafted-date")) {
+        if (toolStats.checkConfig(itemStack, "created-date")) {
             lore.add(timeCreatedLore.replace("X", format.format(finalDate)));
         }
-        if (toolStats.checkConfig(itemStack, "crafted-by")) {
+        if (toolStats.checkConfig(itemStack, "created-by")) {
             lore.add(ownerLore.replace("X", owner.getName()));
         }
         meta.setLore(lore);

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

@@ -21,9 +21,7 @@ import lol.hyper.toolstats.ToolStats;
 import org.bukkit.ChatColor;
 import org.bukkit.GameMode;
 import org.bukkit.Material;
-import org.bukkit.entity.LivingEntity;
-import org.bukkit.entity.Player;
-import org.bukkit.entity.Trident;
+import org.bukkit.entity.*;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.bukkit.event.entity.EntityDamageByBlockEvent;
@@ -55,6 +53,9 @@ public class EntityDamage implements Listener {
 
     @EventHandler
     public void onDamage(EntityDamageByEntityEvent event) {
+        if (!(event.getEntity() instanceof LivingEntity)) {
+            return;
+        }
         LivingEntity livingEntity = (LivingEntity) event.getEntity();
         // mob is going to die
         if (livingEntity.getHealth() - event.getFinalDamage() <= 0) {
@@ -94,6 +95,23 @@ public class EntityDamage implements Listener {
                 }
                 trident.setItem(clone);
             }
+            if (event.getDamager() instanceof Arrow) {
+                Arrow arrow = (Arrow) event.getDamager();
+                if (arrow.getShooter() instanceof Player) {
+                    Player player = (Player) arrow.getShooter();
+                    ItemStack heldItem = player.getInventory().getItem(player.getInventory().getHeldItemSlot());
+                    if (heldItem == null) {
+                        return;
+                    }
+                    if (heldItem.getType() == Material.BOW || heldItem.getType() == Material.CROSSBOW) {
+                        if (livingEntity instanceof Player) {
+                            player.getInventory().setItem(player.getInventory().getHeldItemSlot(), updatePlayerKills(heldItem));
+                        } else {
+                            player.getInventory().setItem(player.getInventory().getHeldItemSlot(), updateMobKills(heldItem));
+                        }
+                    }
+                }
+            }
         }
         // player is taken damage but not being killed
         if (livingEntity instanceof Player) {
@@ -109,6 +127,9 @@ public class EntityDamage implements Listener {
 
     @EventHandler
     public void onDamage(EntityDamageEvent event) {
+        if (!(event.getEntity() instanceof LivingEntity)) {
+            return;
+        }
         LivingEntity livingEntity = (LivingEntity) event.getEntity();
         if (livingEntity instanceof Player) {
             Player player = (Player) livingEntity;

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

@@ -0,0 +1,107 @@
+/*
+ * 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 lol.hyper.toolstats.UUIDDataType;
+import org.bukkit.Bukkit;
+import org.bukkit.ChatColor;
+import org.bukkit.Material;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.Listener;
+import org.bukkit.event.world.LootGenerateEvent;
+import org.bukkit.inventory.Inventory;
+import org.bukkit.inventory.InventoryHolder;
+import org.bukkit.inventory.ItemStack;
+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;
+    private final String LOOT_OWNER = ChatColor.GRAY + "Looted by: " + ChatColor.DARK_GRAY + "X";
+    private final String LOOT_TIME = ChatColor.GRAY + "Looted on: " + ChatColor.DARK_GRAY + "X";
+    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;
+    }
+
+    @EventHandler
+    public void onGenerateLoot(LootGenerateEvent event) {
+        InventoryHolder inventoryHolder = event.getInventoryHolder();
+        if (inventoryHolder == null) {
+            return;
+        }
+        Inventory chest = inventoryHolder.getInventory();
+        Bukkit.getScheduler().runTaskLater(toolStats, () -> {
+            Player player = (Player) chest.getViewers().get(0);
+            for (int i = 0; i < chest.getContents().length; i++) {
+                ItemStack itemStack = chest.getItem(i);
+                if (itemStack == null || itemStack.getType() == Material.AIR) {
+                    continue;
+                }
+                String name = itemStack.getType().toString().toLowerCase(Locale.ROOT);
+                for (String x : validItems) {
+                    if (name.contains(x)) {
+                        chest.setItem(i, addLore(itemStack, player));
+                    }
+                }
+            }
+
+        },1);
+    }
+
+    private ItemStack addLore(ItemStack itemStack, Player owner) {
+        ItemStack newItem = itemStack.clone();
+        ItemMeta meta = itemStack.getItemMeta();
+        if (meta == null) {
+            return null;
+        }
+        long timeCreated = System.currentTimeMillis();
+        Date finalDate = new Date(timeCreated);
+        PersistentDataContainer container = meta.getPersistentDataContainer();
+        container.set(toolStats.timeCreated, PersistentDataType.LONG, timeCreated);
+        container.set(toolStats.genericOwner, new UUIDDataType(), owner.getUniqueId());
+        List<String> lore;
+        if (meta.hasLore()) {
+            lore = meta.getLore();
+            assert lore != null;
+        } else {
+            lore = new ArrayList<>();
+        }
+        if (toolStats.checkConfig(newItem, "looted-tag")) {
+            lore.add(LOOT_TIME.replace("X", format.format(finalDate)));
+            lore.add(LOOT_OWNER.replace("X", owner.getName()));
+        }
+        meta.setLore(lore);
+        newItem.setItemMeta(meta);
+        return newItem;
+    }
+}

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

@@ -0,0 +1,95 @@
+/*
+ * 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 lol.hyper.toolstats.UUIDDataType;
+import org.bukkit.ChatColor;
+import org.bukkit.Material;
+import org.bukkit.entity.Entity;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.Listener;
+import org.bukkit.event.entity.EntityPickupItemEvent;
+import org.bukkit.inventory.ItemStack;
+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 String FOUND_BY = ChatColor.GRAY + "Found by: " + ChatColor.DARK_GRAY + "X";
+    private final String FOUND_ON = ChatColor.GRAY + "Found on: " + ChatColor.DARK_GRAY + "X";
+    private final SimpleDateFormat format = new SimpleDateFormat("M/dd/yyyy", Locale.ENGLISH);
+
+    public PickupItem(ToolStats toolStats) {
+        this.toolStats = toolStats;
+    }
+
+    @EventHandler
+    public void onPickup(EntityPickupItemEvent event) {
+        Entity entity = event.getEntity();
+        if (entity instanceof Player) {
+            ItemStack itemStack = event.getItem().getItemStack();
+            if (itemStack.getType() == Material.ELYTRA) {
+                ItemMeta meta = itemStack.getItemMeta();
+                if (meta == null) {
+                    return;
+                }
+                PersistentDataContainer container = meta.getPersistentDataContainer();
+                // the elytra has the new key, set the lore to it
+                if (container.has(toolStats.newElytra, PersistentDataType.INTEGER)) {
+                    container.remove(toolStats.newElytra);
+                    addLore(itemStack, (Player) event.getEntity());
+                }
+            }
+        }
+    }
+
+    private void addLore(ItemStack itemStack, Player owner) {
+        ItemMeta meta = itemStack.getItemMeta();
+        if (meta == null) {
+            return;
+        }
+        long timeCreated = System.currentTimeMillis();
+        Date finalDate = new Date(timeCreated);
+        PersistentDataContainer container = meta.getPersistentDataContainer();
+        container.set(toolStats.timeCreated, PersistentDataType.LONG, timeCreated);
+        container.set(toolStats.genericOwner, new UUIDDataType(), owner.getUniqueId());
+        List<String> lore;
+        if (meta.hasLore()) {
+            lore = meta.getLore();
+            assert lore != null;
+        } else {
+            lore = new ArrayList<>();
+        }
+        if (toolStats.config.getBoolean("enabled.elytra-tag")) {
+            lore.add(FOUND_ON.replace("X", format.format(finalDate)));
+            lore.add(FOUND_BY.replace("X", owner.getName()));
+        }
+        meta.setLore(lore);
+        itemStack.setItemMeta(meta);
+    }
+}

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

@@ -18,8 +18,10 @@
 package lol.hyper.toolstats.events;
 
 import lol.hyper.toolstats.ToolStats;
+import lol.hyper.toolstats.UUIDDataType;
 import org.bukkit.ChatColor;
 import org.bukkit.Material;
+import org.bukkit.entity.Item;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
@@ -29,13 +31,22 @@ 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;
     private final String fishCaughtLore = ChatColor.GRAY + "Fish caught: " + ChatColor.DARK_GRAY + "X";
+    private final String FISH_OWNER = ChatColor.GRAY + "Caught by: " + ChatColor.DARK_GRAY + "X";
+    private final String FISH_TIME = ChatColor.GRAY + "Caught on: " + ChatColor.DARK_GRAY + "X";
+    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;
@@ -53,10 +64,19 @@ public class PlayerFish implements Listener {
         if (heldItem == null || heldItem.getType() == Material.AIR || heldItem.getType() != Material.FISHING_ROD) {
             return;
         }
-        addLore(heldItem);
+        updateFishCount(heldItem);
+        if (event.getCaught() == null) {
+            return;
+        }
+        ItemStack caughtItem = ((Item) event.getCaught()).getItemStack();
+        for (String x : validItems) {
+            if (caughtItem.getType().toString().toLowerCase(Locale.ROOT).contains(x)) {
+                addNewLore(caughtItem, player);
+            }
+        }
     }
 
-    private void addLore(ItemStack itemStack) {
+    private void updateFishCount(ItemStack itemStack) {
         ItemMeta meta = itemStack.getItemMeta();
         if (meta == null) {
             return;
@@ -100,4 +120,29 @@ public class PlayerFish implements Listener {
         }
         itemStack.setItemMeta(meta);
     }
+
+    private void addNewLore(ItemStack itemStack, Player owner) {
+        ItemMeta meta = itemStack.getItemMeta();
+        if (meta == null) {
+            return;
+        }
+        long timeCreated = System.currentTimeMillis();
+        Date finalDate = new Date(timeCreated);
+        PersistentDataContainer container = meta.getPersistentDataContainer();
+        container.set(toolStats.timeCreated, PersistentDataType.LONG, timeCreated);
+        container.set(toolStats.genericOwner, new UUIDDataType(), owner.getUniqueId());
+        List<String> lore;
+        if (meta.hasLore()) {
+            lore = meta.getLore();
+            assert lore != null;
+        } else {
+            lore = new ArrayList<>();
+        }
+        if (toolStats.checkConfig(itemStack, "fished-tag")) {
+            lore.add(FISH_TIME.replace("X", format.format(finalDate)));
+            lore.add(FISH_OWNER.replace("X", owner.getName()));
+        }
+        meta.setLore(lore);
+        itemStack.setItemMeta(meta);
+    }
 }

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

@@ -0,0 +1,99 @@
+/*
+ * 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 lol.hyper.toolstats.UUIDDataType;
+import org.bukkit.ChatColor;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.Listener;
+import org.bukkit.event.inventory.InventoryClickEvent;
+import org.bukkit.event.inventory.InventoryType;
+import org.bukkit.inventory.Inventory;
+import org.bukkit.inventory.ItemStack;
+import org.bukkit.inventory.MerchantInventory;
+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;
+    private final String TRADED_OWNER = ChatColor.GRAY + "Traded by: " + ChatColor.DARK_GRAY + "X";
+    private final String TRADED_TIME = ChatColor.GRAY + "Traded on: " + ChatColor.DARK_GRAY + "X";
+    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;
+    }
+
+    @EventHandler
+    public void onTrade(InventoryClickEvent event) {
+        if (event.isCancelled() || event.getCurrentItem() == null) {
+            return;
+        }
+        Inventory inventory = event.getClickedInventory();
+        if (inventory instanceof MerchantInventory) {
+            if (event.getSlotType() == InventoryType.SlotType.RESULT) {
+                ItemStack item = event.getCurrentItem();
+                for (String x : validItems) {
+                    if (item.getType().toString().toLowerCase(Locale.ROOT).contains(x)) {
+                        ItemStack newItem = addLore(item, (Player) event.getWhoClicked());
+                        event.getView().setCursor(newItem);
+                    }
+                }
+            }
+        }
+    }
+
+    private ItemStack addLore(ItemStack itemStack, Player owner) {
+        ItemMeta meta = itemStack.getItemMeta();
+        if (meta == null) {
+            return null;
+        }
+        long timeCreated = System.currentTimeMillis();
+        Date finalDate = new Date(timeCreated);
+        PersistentDataContainer container = meta.getPersistentDataContainer();
+        container.set(toolStats.timeCreated, PersistentDataType.LONG, timeCreated);
+        container.set(toolStats.genericOwner, new UUIDDataType(), owner.getUniqueId());
+        List<String> lore;
+        if (meta.hasLore()) {
+            lore = meta.getLore();
+            assert lore != null;
+        } else {
+            lore = new ArrayList<>();
+        }
+        if (toolStats.checkConfig(itemStack, "traded-tag")) {
+            lore.add(TRADED_TIME.replace("X", format.format(finalDate)));
+            lore.add(TRADED_OWNER.replace("X", owner.getName()));
+        }
+        meta.setLore(lore);
+        itemStack.setItemMeta(meta);
+        return itemStack;
+    }
+}

src/main/resources/config.yml

@@ -1,5 +1,6 @@
 enabled:
-  crafted-by:
+  # Will show ownership of items when they are created/found.
+  created-by:
     pickaxe: true
     sword: true
     shovel: true
@@ -8,7 +9,38 @@ enabled:
     shears: true
     bow: true
     armor: true
-  crafted-date:
+  # Will show time the item is created
+  created-date:
+    pickaxe: true
+    sword: true
+    shovel: true
+    axe: true
+    hoe: true
+    shears: true
+    bow: true
+    armor: true
+  # Will show "Fished by <player>"
+  fished-tag:
+    pickaxe: true
+    sword: true
+    shovel: true
+    axe: true
+    hoe: true
+    shears: true
+    bow: true
+    armor: true
+  # Will show "Found by <player>"
+  looted-tag:
+    pickaxe: true
+    sword: true
+    shovel: true
+    axe: true
+    hoe: true
+    shears: true
+    bow: true
+    armor: true
+  # Will show "Trade by <player>"
+  traded-tag:
     pickaxe: true
     sword: true
     shovel: true
@@ -21,10 +53,12 @@ enabled:
     sword: true
     axe: true
     trident: true
+    bow: true
   mob-kills:
     sword: true
     axe: true
     trident: true
+    bow: true
   blocks-mined:
     pickaxe: true
     shovel: true
@@ -35,5 +69,6 @@ enabled:
   sheep-sheared: true
   armor-damage: true
   dropped-by: true
+  elytra-tag: true
 
-config-version: 1
+config-version: 2