Update README.md

* 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. You can also change how the lore is displayed on the items!
 
 ![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.2</version>
     <packaging>jar</packaging>
 
     <name>ToolStats</name>

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

@@ -23,6 +23,7 @@ import lol.hyper.toolstats.commands.CommandToolStats;
 import lol.hyper.toolstats.events.*;
 import org.bstats.bukkit.Metrics;
 import org.bukkit.Bukkit;
+import org.bukkit.ChatColor;
 import org.bukkit.NamespacedKey;
 import org.bukkit.configuration.file.FileConfiguration;
 import org.bukkit.configuration.file.YamlConfiguration;
@@ -37,10 +38,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 +54,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 +85,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 +112,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,10 +192,50 @@ 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");
             }
         }
         return false;
     }
+
+    public String getLoreFromConfig(String configName, boolean raw) {
+        String lore = config.getString("messages." + configName);
+        if (lore == null) {
+            return null;
+        }
+        if (raw) {
+            return ChatColor.translateAlternateColorCodes('&', lore);
+        } else {
+            // we basically add the color codes then remove them
+            // this is a dirty trick to remove color codes
+            lore = ChatColor.translateAlternateColorCodes('&', lore);
+            lore = ChatColor.stripColor(lore);
+            if (lore.contains("{player}")) {
+                lore = lore.replace("{player}", "");
+            }
+            if (lore.contains("{date}")) {
+                lore = lore.replace("{date}", "");
+            }
+            if (lore.contains("{name}")) {
+                lore = lore.replace("{name}", "");
+            }
+            if (lore.contains("{kills}")) {
+                lore = lore.replace("{kills}", "");
+            }
+            if (lore.contains("{blocks}")) {
+                lore = lore.replace("{blocks}", "");
+            }
+            if (lore.contains("{sheep}")) {
+                lore = lore.replace("{sheep}", "");
+            }
+            if (lore.contains("{damage}")) {
+                lore = lore.replace("{damage}", "");
+            }
+        }
+        return lore;
+    }
 }

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

@@ -18,7 +18,6 @@
 package lol.hyper.toolstats.events;
 
 import lol.hyper.toolstats.ToolStats;
-import org.bukkit.ChatColor;
 import org.bukkit.GameMode;
 import org.bukkit.Material;
 import org.bukkit.entity.Player;
@@ -38,7 +37,6 @@ public class BlocksMined implements Listener {
 
     private final ToolStats toolStats;
     private final String[] validTools = {"pickaxe", "axe", "hoe", "shovel", "shear"};
-    private final String blocksMinedLore = ChatColor.GRAY + "Blocks mined: " + ChatColor.DARK_GRAY + "X";
 
     public BlocksMined(ToolStats toolStats) {
         this.toolStats = toolStats;
@@ -78,6 +76,9 @@ public class BlocksMined implements Listener {
         }
         container.set(toolStats.genericMined, PersistentDataType.INTEGER, blocksMined);
 
+        String configLore = toolStats.getLoreFromConfig("blocks-mined", false);
+        String configLoreRaw = toolStats.getLoreFromConfig("blocks-mined", true);
+
         List<String> lore;
         if (meta.hasLore()) {
             lore = meta.getLore();
@@ -85,21 +86,25 @@ public class BlocksMined implements Listener {
             boolean hasLore = false;
             // we do a for loop like this, we can keep track of index
             // this doesn't mess the lore up of existing items
+            if (configLore == null || configLoreRaw == null) {
+                toolStats.logger.warning("There is no lore message for messages.blocks-mined!");
+                return;
+            }
             for (int x = 0; x < lore.size(); x++) {
-                if (lore.get(x).contains("Blocks mined")) {
+                if (lore.get(x).contains(configLore)) {
                     hasLore = true;
-                    lore.set(x, blocksMinedLore.replace("X", Integer.toString(blocksMined)));
+                    lore.set(x, configLoreRaw.replace("{blocks}", Integer.toString(blocksMined)));
                     break;
                 }
             }
             // if the item has lore but doesn't have the tag, add it
             if (!hasLore) {
-                lore.add(blocksMinedLore.replace("X", Integer.toString(blocksMined)));
+                lore.add(configLoreRaw.replace("{blocks}", Integer.toString(blocksMined)));
             }
         } else {
             // if the item has no lore, create a new list and add the string
             lore = new ArrayList<>();
-            lore.add(blocksMinedLore.replace("X", Integer.toString(blocksMined)));
+            lore.add(configLoreRaw.replace("{blocks}", Integer.toString(blocksMined)));
         }
         if (toolStats.checkConfig(itemStack, "blocks-mined")) {
             meta.setLore(lore);

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

@@ -19,7 +19,6 @@ 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.Player;
 import org.bukkit.event.EventHandler;
@@ -39,8 +38,6 @@ public class CraftItem implements Listener {
     public final String[] validItems = {
             "pickaxe", "sword", "shovel", "axe", "hoe", "bow", "helmet", "chestplate", "leggings", "boots", "fishing"
     };
-    private final String timeCreatedLore = ChatColor.GRAY + "Crafted on: " + ChatColor.DARK_GRAY + "X";
-    private final String ownerLore = ChatColor.GRAY + "Crafted by: " + ChatColor.DARK_GRAY + "X";
     private final SimpleDateFormat format = new SimpleDateFormat("M/dd/yyyy", Locale.ENGLISH);
 
     public CraftItem(ToolStats toolStats) {
@@ -57,6 +54,9 @@ public class CraftItem implements Listener {
         String name = itemStack.getType().toString().toLowerCase(Locale.ROOT);
         for (String x : validItems) {
             if (name.contains(x)) {
+                if (addLore(itemStack, player) == null) {
+                    return;
+                }
                 event.setCurrentItem(addLore(itemStack, player));
             }
         }
@@ -71,8 +71,21 @@ 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());
+
+        String createdByRaw = toolStats.getLoreFromConfig("created.created-by", true);
+        String createdOnRaw = toolStats.getLoreFromConfig("created.created-on", true);
+
+        if (createdOnRaw == null) {
+            toolStats.logger.warning("There is no lore message for messages.created.created-on!");
+            return null;
+        }
+        if (createdByRaw == null) {
+            toolStats.logger.warning("There is no lore message for messages.created.created-by!");
+            return null;
+        }
+
         List<String> lore;
         if (meta.hasLore()) {
             lore = meta.getLore();
@@ -80,11 +93,11 @@ public class CraftItem implements Listener {
         } else {
             lore = new ArrayList<>();
         }
-        if (toolStats.checkConfig(itemStack, "crafted-date")) {
-            lore.add(timeCreatedLore.replace("X", format.format(finalDate)));
+        if (toolStats.checkConfig(itemStack, "created-date")) {
+            lore.add(createdOnRaw.replace("{date}", format.format(finalDate)));
         }
-        if (toolStats.checkConfig(itemStack, "crafted-by")) {
-            lore.add(ownerLore.replace("X", owner.getName()));
+        if (toolStats.checkConfig(itemStack, "created-by")) {
+            lore.add(createdByRaw.replace("{player}", owner.getName()));
         }
         meta.setLore(lore);
         newItem.setItemMeta(meta);

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

@@ -18,12 +18,9 @@
 package lol.hyper.toolstats.events;
 
 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;
@@ -43,9 +40,6 @@ public class EntityDamage implements Listener {
 
     private final ToolStats toolStats;
     private final String[] validTools = {"sword", "trident", "axe"};
-    private final String playerKillsLore = ChatColor.GRAY + "Player kills: " + ChatColor.DARK_GRAY + "X";
-    private final String mobKillsLore = ChatColor.GRAY + "Mob kills: " + ChatColor.DARK_GRAY + "X";
-    private final String damageTakenLore = ChatColor.GRAY + "Damage taken: " + ChatColor.DARK_GRAY + "X";
     private final DecimalFormat decimalFormat = new DecimalFormat("0.00");
     public final Set<UUID> trackedMobs = new HashSet<>();
 
@@ -55,6 +49,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 +91,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 +123,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;
@@ -153,6 +170,14 @@ public class EntityDamage implements Listener {
         }
         container.set(toolStats.swordPlayerKills, PersistentDataType.INTEGER, playerKills);
 
+        String playerKillsLore = toolStats.getLoreFromConfig("kills.player", false);
+        String playerKillsLoreRaw = toolStats.getLoreFromConfig("kills.player", true);
+
+        if (playerKillsLore == null || playerKillsLoreRaw == null) {
+            toolStats.logger.warning("There is no lore message for messages.kills.player!");
+            return null;
+        }
+
         List<String> lore;
         if (meta.hasLore()) {
             lore = meta.getLore();
@@ -161,20 +186,20 @@ public class EntityDamage implements Listener {
             // we do a for loop like this, we can keep track of index
             // this doesn't mess the lore up of existing items
             for (int x = 0; x < lore.size(); x++) {
-                if (lore.get(x).contains("Player kills")) {
+                if (lore.get(x).contains(playerKillsLore)) {
                     hasLore = true;
-                    lore.set(x, playerKillsLore.replace("X", Integer.toString(playerKills)));
+                    lore.set(x, playerKillsLoreRaw.replace("{kills}", Integer.toString(playerKills)));
                     break;
                 }
             }
             // if the item has lore but doesn't have the tag, add it
             if (!hasLore) {
-                lore.add(playerKillsLore.replace("X", Integer.toString(playerKills)));
+                lore.add(playerKillsLoreRaw.replace("{kills}", Integer.toString(playerKills)));
             }
         } else {
             // if the item has no lore, create a new list and add the string
             lore = new ArrayList<>();
-            lore.add(playerKillsLore.replace("X", Integer.toString(playerKills)));
+            lore.add(playerKillsLoreRaw.replace("{kills}", Integer.toString(playerKills)));
         }
         if (toolStats.checkConfig(itemStack, "player-kills")) {
             meta.setLore(lore);
@@ -201,6 +226,14 @@ public class EntityDamage implements Listener {
         }
         container.set(toolStats.swordMobKills, PersistentDataType.INTEGER, mobKills);
 
+        String mobKillsLore = toolStats.getLoreFromConfig("kills.mob", false);
+        String mobKillsLoreRaw = toolStats.getLoreFromConfig("kills.mob", true);
+
+        if (mobKillsLore == null || mobKillsLoreRaw == null) {
+            toolStats.logger.warning("There is no lore message for messages.kills.mob!");
+            return null;
+        }
+
         List<String> lore;
         if (meta.hasLore()) {
             lore = meta.getLore();
@@ -209,20 +242,20 @@ public class EntityDamage implements Listener {
             // we do a for loop like this, we can keep track of index
             // this doesn't mess the lore up of existing items
             for (int x = 0; x < lore.size(); x++) {
-                if (lore.get(x).contains("Mob kills")) {
+                if (lore.get(x).contains(mobKillsLore)) {
                     hasLore = true;
-                    lore.set(x, mobKillsLore.replace("X", Integer.toString(mobKills)));
+                    lore.set(x, mobKillsLoreRaw.replace("{kills}", Integer.toString(mobKills)));
                     break;
                 }
             }
             // if the item has lore but doesn't have the tag, add it
             if (!hasLore) {
-                lore.add(mobKillsLore.replace("X", Integer.toString(mobKills)));
+                lore.add(mobKillsLoreRaw.replace("{kills}", Integer.toString(mobKills)));
             }
         } else {
             // if the item has no lore, create a new list and add the string
             lore = new ArrayList<>();
-            lore.add(mobKillsLore.replace("X", Integer.toString(mobKills)));
+            lore.add(mobKillsLoreRaw.replace("{kills}", Integer.toString(mobKills)));
         }
         if (toolStats.checkConfig(itemStack, "mob-kills")) {
             meta.setLore(lore);
@@ -249,6 +282,14 @@ public class EntityDamage implements Listener {
         decimalFormat.setRoundingMode(RoundingMode.DOWN);
         container.set(toolStats.armorDamage, PersistentDataType.DOUBLE, damageTaken);
 
+        String damageTakenLore = toolStats.getLoreFromConfig("damage-taken", false);
+        String damageTakenLoreRaw = toolStats.getLoreFromConfig("damage-taken", true);
+
+        if (damageTakenLore == null || damageTakenLoreRaw == null) {
+            toolStats.logger.warning("There is no lore message for messages.damage-taken!");
+            return;
+        }
+
         List<String> lore;
         if (meta.hasLore()) {
             lore = meta.getLore();
@@ -257,20 +298,20 @@ public class EntityDamage implements Listener {
             // we do a for loop like this, we can keep track of index
             // this doesn't mess the lore up of existing items
             for (int x = 0; x < lore.size(); x++) {
-                if (lore.get(x).contains("Damage taken")) {
+                if (lore.get(x).contains(damageTakenLore)) {
                     hasLore = true;
-                    lore.set(x, damageTakenLore.replace("X", decimalFormat.format(damageTaken)));
+                    lore.set(x, damageTakenLoreRaw.replace("{damage}", decimalFormat.format(damageTaken)));
                     break;
                 }
             }
             // if the item has lore but doesn't have the tag, add it
             if (!hasLore) {
-                lore.add(damageTakenLore.replace("X", decimalFormat.format(damageTaken)));
+                lore.add(damageTakenLoreRaw.replace("{damage}", decimalFormat.format(damageTaken)));
             }
         } else {
             // if the item has no lore, create a new list and add the string
             lore = new ArrayList<>();
-            lore.add(damageTakenLore.replace("X", decimalFormat.format(damageTaken)));
+            lore.add(damageTakenLoreRaw.replace("{damage}", decimalFormat.format(damageTaken)));
         }
         if (toolStats.config.getBoolean("enabled.armor-damage")) {
             meta.setLore(lore);

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

@@ -18,7 +18,6 @@
 package lol.hyper.toolstats.events;
 
 import lol.hyper.toolstats.ToolStats;
-import org.bukkit.ChatColor;
 import org.bukkit.entity.LivingEntity;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
@@ -32,7 +31,6 @@ import java.util.*;
 public class EntityDeath implements Listener {
 
     private final ToolStats toolStats;
-    private final String droppedLore = ChatColor.GRAY + "Dropped by: " + ChatColor.DARK_GRAY + "X";
 
     public EntityDeath(ToolStats toolStats) {
         this.toolStats = toolStats;
@@ -64,14 +62,23 @@ public class EntityDeath implements Listener {
             return;
         }
         boolean hasTag = false;
+
+        String droppedByLore = toolStats.getLoreFromConfig("dropped-by", false);
+        String droppedByLoreRaw = toolStats.getLoreFromConfig("dropped-by", true);
+
+        if (droppedByLore == null || droppedByLoreRaw == null) {
+            toolStats.logger.warning("There is no lore message for messages.dropped-by!");
+            return;
+        }
+
         List<String> lore;
         if (meta.hasLore()) {
             lore = meta.getLore();
             assert lore != null;
             for (int x = 0; x < lore.size(); x++) {
-                if (lore.get(x).contains("Dropped by")) {
+                if (lore.get(x).contains(droppedByLore)) {
                     // replace existing tag
-                    lore.set(x, droppedLore.replace("X", mob));
+                    lore.set(x, droppedByLoreRaw.replace("{name}", mob));
                     hasTag = true;
                 }
             }
@@ -80,7 +87,7 @@ public class EntityDeath implements Listener {
             lore = new ArrayList<>();
         }
         if (!hasTag) {
-            lore.add(droppedLore.replace("X", mob));
+            lore.add(droppedByLoreRaw.replace("X", mob));
         }
         if (toolStats.config.getBoolean("enabled.dropped-by")) {
             meta.setLore(lore);

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

@@ -0,0 +1,113 @@
+/*
+ * 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.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;
+    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());
+
+        String foundByLoreRaw = toolStats.getLoreFromConfig("looted.found-by", true);
+        String foundOnLoreRaw = toolStats.getLoreFromConfig("looted.found-on", true);
+
+        if (foundByLoreRaw == null || foundOnLoreRaw == null) {
+            toolStats.logger.warning("There is no lore message for messages.looted!");
+            return null;
+        }
+
+        List<String> lore;
+        if (meta.hasLore()) {
+            lore = meta.getLore();
+            assert lore != null;
+        } else {
+            lore = new ArrayList<>();
+        }
+        if (toolStats.checkConfig(newItem, "looted-tag")) {
+            lore.add(foundOnLoreRaw.replace("{date}", format.format(finalDate)));
+            lore.add(foundByLoreRaw.replace("{player}", owner.getName()));
+        }
+        meta.setLore(lore);
+        newItem.setItemMeta(meta);
+        return newItem;
+    }
+}

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

@@ -0,0 +1,101 @@
+/*
+ * 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.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 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());
+
+        String foundByLoreRaw = toolStats.getLoreFromConfig("looted.found-by", true);
+        String foundOnLoreRaw = toolStats.getLoreFromConfig("looted.found-on", true);
+
+        if (foundByLoreRaw == null || foundOnLoreRaw == null) {
+            toolStats.logger.warning("There is no lore message for messages.looted!");
+            return;
+        }
+
+        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(foundOnLoreRaw.replace("{date}", format.format(finalDate)));
+            lore.add(foundByLoreRaw.replace("{player}", owner.getName()));
+        }
+        meta.setLore(lore);
+        itemStack.setItemMeta(meta);
+    }
+}

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

@@ -18,8 +18,9 @@
 package lol.hyper.toolstats.events;
 
 import lol.hyper.toolstats.ToolStats;
-import org.bukkit.ChatColor;
+import lol.hyper.toolstats.UUIDDataType;
 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 +30,19 @@ 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";
+    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 +60,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;
@@ -72,6 +88,15 @@ public class PlayerFish implements Listener {
             fishCaught++;
         }
         container.set(toolStats.fishingRodCaught, PersistentDataType.INTEGER, fishCaught);
+
+        String fishCaughtLore = toolStats.getLoreFromConfig("fished.fish-caught", false);
+        String fishCaughtLoreRaw = toolStats.getLoreFromConfig("fished.fish-caught", true);
+
+        if (fishCaughtLore == null || fishCaughtLoreRaw == null) {
+            toolStats.logger.warning("There is no lore message for messages.fish-caught!");
+            return;
+        }
+
         List<String> lore;
         if (meta.hasLore()) {
             lore = meta.getLore();
@@ -80,24 +105,58 @@ public class PlayerFish implements Listener {
             // we do a for loop like this, we can keep track of index
             // this doesn't mess the lore up of existing items
             for (int x = 0; x < lore.size(); x++) {
-                if (lore.get(x).contains("Fish caught")) {
+                if (lore.get(x).contains(fishCaughtLore)) {
                     hasLore = true;
-                    lore.set(x, fishCaughtLore.replace("X", Integer.toString(fishCaught)));
+                    lore.set(x, fishCaughtLoreRaw.replace("{fish}", Integer.toString(fishCaught)));
                     break;
                 }
             }
             // if the item has lore but doesn't have the tag, add it
             if (!hasLore) {
-                lore.add(fishCaughtLore.replace("X", Integer.toString(fishCaught)));
+                lore.add(fishCaughtLoreRaw.replace("{fish}", Integer.toString(fishCaught)));
             }
         } else {
             // if the item has no lore, create a new list and add the string
             lore = new ArrayList<>();
-            lore.add(fishCaughtLore.replace("X", Integer.toString(fishCaught)));
+            lore.add(fishCaughtLoreRaw.replace("{fish}", Integer.toString(fishCaught)));
         }
         if (toolStats.config.getBoolean("enabled.fish-caught")) {
             meta.setLore(lore);
         }
         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());
+
+        String caughtByLoreRaw = toolStats.getLoreFromConfig("fished.caught-by", true);
+        String caughtOnLoreRaw = toolStats.getLoreFromConfig("fished.caught-on", true);
+
+        if (caughtByLoreRaw == null || caughtOnLoreRaw == null) {
+            toolStats.logger.warning("There is no lore message for messages.fished!");
+            return;
+        }
+
+        List<String> lore;
+        if (meta.hasLore()) {
+            lore = meta.getLore();
+            assert lore != null;
+        } else {
+            lore = new ArrayList<>();
+        }
+        if (toolStats.checkConfig(itemStack, "fished-tag")) {
+            lore.add(caughtOnLoreRaw.replace("{date}", format.format(finalDate)));
+            lore.add(caughtByLoreRaw.replace("{player}", owner.getName()));
+        }
+        meta.setLore(lore);
+        itemStack.setItemMeta(meta);
+    }
 }

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

@@ -18,7 +18,6 @@
 package lol.hyper.toolstats.events;
 
 import lol.hyper.toolstats.ToolStats;
-import org.bukkit.ChatColor;
 import org.bukkit.Material;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.Player;
@@ -37,7 +36,6 @@ import java.util.List;
 public class SheepShear implements Listener {
 
     private final ToolStats toolStats;
-    private final String sheepShearLore = ChatColor.GRAY + "Sheep sheared: " + ChatColor.DARK_GRAY + "X";
 
     public SheepShear(ToolStats toolStats) {
         this.toolStats = toolStats;
@@ -77,6 +75,15 @@ public class SheepShear implements Listener {
             sheepSheared++;
         }
         container.set(toolStats.shearsSheared, PersistentDataType.INTEGER, sheepSheared);
+
+        String sheepShearedLore = toolStats.getLoreFromConfig("sheep-sheared", false);
+        String sheepShearedLoreRaw = toolStats.getLoreFromConfig("sheep-sheared", true);
+
+        if (sheepShearedLore == null || sheepShearedLoreRaw == null) {
+            toolStats.logger.warning("There is no lore message for messages.sheep-sheared!");
+            return;
+        }
+
         List<String> lore;
         if (meta.hasLore()) {
             lore = meta.getLore();
@@ -85,20 +92,20 @@ public class SheepShear implements Listener {
             // we do a for loop like this, we can keep track of index
             // this doesn't mess the lore up of existing items
             for (int x = 0; x < lore.size(); x++) {
-                if (lore.get(x).contains("Sheep sheared")) {
+                if (lore.get(x).contains(sheepShearedLore)) {
                     hasLore = true;
-                    lore.set(x, sheepShearLore.replace("X", Integer.toString(sheepSheared)));
+                    lore.set(x, sheepShearedLoreRaw.replace("{sheep}", Integer.toString(sheepSheared)));
                     break;
                 }
             }
             // if the item has lore but doesn't have the tag, add it
             if (!hasLore) {
-                lore.add(sheepShearLore.replace("X", Integer.toString(sheepSheared)));
+                lore.add(sheepShearedLoreRaw.replace("{sheep}", Integer.toString(sheepSheared)));
             }
         } else {
             // if the item has no lore, create a new list and add the string
             lore = new ArrayList<>();
-            lore.add(sheepShearLore.replace("X", Integer.toString(sheepSheared)));
+            lore.add(sheepShearedLoreRaw.replace("{sheep}", Integer.toString(sheepSheared)));
         }
         if (toolStats.config.getBoolean("enabled.sheep-sheared")) {
             meta.setLore(lore);

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

@@ -0,0 +1,109 @@
+/*
+ * 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.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;
+    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());
+                        if (newItem == null) {
+                            return;
+                        }
+                        Bukkit.getScheduler().runTaskLater(toolStats, ()-> event.setCurrentItem(newItem), 5);
+                    }
+                }
+            }
+        }
+    }
+
+    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());
+
+        String tradedByLoreRaw = toolStats.getLoreFromConfig("traded.traded-by", true);
+        String tradedOnLoreRaw = toolStats.getLoreFromConfig("traded.traded-on", true);
+
+        if (tradedByLoreRaw == null || tradedOnLoreRaw == null) {
+            toolStats.logger.warning("There is no lore message for messages.traded!");
+            return null;
+        }
+
+        List<String> lore;
+        if (meta.hasLore()) {
+            lore = meta.getLore();
+            assert lore != null;
+        } else {
+            lore = new ArrayList<>();
+        }
+        if (toolStats.checkConfig(itemStack, "traded-tag")) {
+            lore.add(tradedOnLoreRaw.replace("{date}", format.format(finalDate)));
+            lore.add(tradedByLoreRaw.replace("{player}", 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,28 @@ enabled:
   sheep-sheared: true
   armor-damage: true
   dropped-by: true
+  elytra-tag: true
 
-config-version: 1
+messages:
+  created:
+    created-by: "&7Crafted by: &8{player}"
+    created-on: "&7Crafted on: &8{date}"
+  fished:
+    caught-by: "&7Caught by: &8{player}"
+    caught-on: "&7Caught on: &8{date}"
+    fish-caught: "&7Fish caught: &8{fish}"
+  looted:
+    found-by: "&7Found by: &8{player}"
+    found-on: "&7Found on: &8{date}"
+  traded:
+    traded-by: "&7Traded by: &8{player}"
+    traded-on: "&7Traded on: &8{date}"
+  kills:
+    mob: "&7Mob kills: &8{kills}"
+    player: "&7Player kills: &8{kills}"
+  blocks-mined: "&7Blocks mined: &8{blocks}"
+  sheep-sheared: "&7Sheep sheared: &8{sheep}"
+  dropped-by: "&7Dropped by: &8{name}" # name will be player/mob name
+  damage-taken: "&7Damage taken: &8{damage}"
+
+config-version: 2