Merge pull request #108 from hyperdefined/dependabot/maven/org.apache.maven.plugins-maven-clean-plugin-3.5.0

Bump org.apache.maven.plugins:maven-clean-plugin from 3.4.1 to 3.5.0

README.md

@@ -4,7 +4,7 @@
 	<a href="https://modrinth.com/plugin/ToolStats"><img alt="modrinth" height="40" src="https://cdn.jsdelivr.net/npm/@intergrav/devins-badges@3/assets/compact/available/modrinth_vector.svg"></a>
 	<a href="https://hangar.papermc.io/hyperdefined/ToolStats"><img alt="hangar" height="40" src="https://cdn.jsdelivr.net/npm/@intergrav/devins-badges@3/assets/compact/available/hangar_vector.svg"></a>
 	<a href="https://papermc.io"><img alt="paper" height="40" src="https://cdn.jsdelivr.net/npm/@intergrav/devins-badges@3/assets/compact/supported/paper_vector.svg"></a>
-	<a href="https://github.com/hyperdefined/ToolStats/wiki"><img alt="ghpages" height="40" src="https://cdn.jsdelivr.net/npm/@intergrav/devins-badges@3/assets/compact/documentation/ghpages_vector.svg"></a>
+	<a href="https://docs.hyper.lol/plugins/toolstats/about/"><img alt="ghpages" height="40" src="https://cdn.jsdelivr.net/npm/@intergrav/devins-badges@3/assets/compact/documentation/ghpages_vector.svg"></a>
 	<a href="https://discord.gg/rJuQXVcJz8"><img alt="discord-singular" height="40" src="https://cdn.jsdelivr.net/npm/@intergrav/devins-badges@3/assets/compact/social/discord-singular_vector.svg"></a>
 	<a href="https://buymeacoffee.com/hyperdefined"><img alt="buymeacoffee-singular" height="40" src="https://cdn.jsdelivr.net/npm/@intergrav/devins-badges@3/assets/compact/donate/buymeacoffee-singular_vector.svg"></a>
 </p>
@@ -12,37 +12,38 @@
 ToolStats is a Paper plugin that display various stats about tools. This plugin is inspired off of [GearStats](https://www.spigotmc.org/resources/gearstats.12960/). You can either track all statistics by default, or a use a token system to add statistics to tool/armor. You can configure how each statistic is shown on the item, or disable it!
 
 Here is everything it tracks:
-* Blocks mined (pickaxes, shovels, axes, hoes, shears)
-* Crops mined (hoes)
-* Player/mob kills (swords, axes, tridents, bows/crossbows, mace)
+* Blocks mined (pickaxes, shovels, axes, hoes, shears).
+* Crops mined (hoes).
+* Player/mob kills (swords, axes, tridents, bows/crossbows, mace).
 * Ownership of items when crafted, looted (from chests), traded, spawned via creative, and caught from fishing.
 * Armor damage taken.
+* Damage done with weapons.
 * Fish caught.
 * Sheep sheared.
-* Arrows shot (bows/crossbows)
+* Arrows shot (bows/crossbows).
 * Flight time with elytras.
 
 The best part is, this data is stored on the item itself.
 
 If item lore is ever incorrect/missing, you can run `/toolstats reset`. This command fixes the lore on whatever item you are holding.
 
-![Image](https://raw.githubusercontent.com/hyperdefined/ToolStats/master/images/image.png)
-![Image](https://raw.githubusercontent.com/hyperdefined/ToolStats/master/images/image2.png)
-![Image](https://raw.githubusercontent.com/hyperdefined/ToolStats/master/images/image3.png)
-![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)
-![Image](https://raw.githubusercontent.com/hyperdefined/ToolStats/master/images/image11.png)
-![Image](https://raw.githubusercontent.com/hyperdefined/ToolStats/master/images/image13.png)
-![Image](https://raw.githubusercontent.com/hyperdefined/ToolStats/master/images/image14.png)
-![Image](https://raw.githubusercontent.com/hyperdefined/ToolStats/master/images/image12.png)
+![Image](https://docs.hyper.lol/plugins/toolstats/assets/image.png)
+![Image](https://docs.hyper.lol/plugins/toolstats/assets/image2.png)
+![Image](https://docs.hyper.lol/plugins/toolstats/assets/image3.png)
+![Image](https://docs.hyper.lol/plugins/toolstats/assets/image4.png)
+![Image](https://docs.hyper.lol/plugins/toolstats/assets/image5.png)
+![Image](https://docs.hyper.lol/plugins/toolstats/assets/image6.png)
+![Image](https://docs.hyper.lol/plugins/toolstats/assets/image7.png)
+![Image](https://docs.hyper.lol/plugins/toolstats/assets/image8.png)
+![Image](https://docs.hyper.lol/plugins/toolstats/assets/image9.png)
+![Image](https://docs.hyper.lol/plugins/toolstats/assets/image10.png)
+![Image](https://docs.hyper.lol/plugins/toolstats/assets/image11.png)
+![Image](https://docs.hyper.lol/plugins/toolstats/assets/image13.png)
+![Image](https://docs.hyper.lol/plugins/toolstats/assets/image14.png)
+![Image](https://docs.hyper.lol/plugins/toolstats/assets/image12.png)
 
 ## Documentation
-Visit the [wiki](https://github.com/hyperdefined/ToolStats/wiki) for help.
+Visit the [wiki](https://docs.hyper.lol/plugins/toolstats/about/) 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.9.5</version>
+    <version>1.9.7</version>
     <packaging>jar</packaging>
 
     <name>ToolStats</name>
@@ -37,7 +37,7 @@
         <plugins>
             <plugin>
                 <artifactId>maven-clean-plugin</artifactId>
-                <version>3.4.1</version>
+                <version>3.5.0</version>
                 <executions>
                     <execution>
                         <id>auto-clean</id>

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

@@ -25,7 +25,6 @@ import lol.hyper.toolstats.events.*;
 import lol.hyper.toolstats.tools.*;
 import lol.hyper.toolstats.tools.config.ConfigTools;
 import lol.hyper.toolstats.tools.config.ConfigUpdater;
-import lol.hyper.toolstats.tools.config.TokenItems;
 import org.bstats.bukkit.Metrics;
 import org.bukkit.Bukkit;
 import org.bukkit.NamespacedKey;
@@ -93,6 +92,10 @@ public final class ToolStats extends JavaPlugin {
      * Key for arrows shot.
      */
     public final NamespacedKey arrowsShot = new NamespacedKey(this, "arrows-shot");
+    /**
+     * Key for arrows shot.
+     */
+    public final NamespacedKey droppedBy = new NamespacedKey(this, "dropped-by");
     /**
      * Key for tracking flight time.
      */
@@ -117,7 +120,7 @@ public final class ToolStats extends JavaPlugin {
      */
     public final NamespacedKey originType = new NamespacedKey(this, "origin");
 
-    public final int CONFIG_VERSION = 11;
+    public final int CONFIG_VERSION = 13;
     public final Logger logger = this.getLogger();
     public final File configFile = new File(this.getDataFolder(), "config.yml");
     public boolean tokens = false;
@@ -146,8 +149,7 @@ public final class ToolStats extends JavaPlugin {
     public ItemChecker itemChecker;
     public ShootBow shootBow;
     public ConfigTools configTools;
-    public TokenItems tokenItems;
-    public TokenCrafting tokenCrafting;
+    public TokenData tokenData;
     public AnvilEvent anvilEvent;
     public PrepareCraft prepareCraft;
 
@@ -160,10 +162,9 @@ public final class ToolStats extends JavaPlugin {
 
         loadConfig();
         configTools = new ConfigTools(this);
-        tokenItems = new TokenItems(this);
-        tokenCrafting = new TokenCrafting(this);
-        tokenCrafting.setup();
-        for (ShapedRecipe recipe : tokenCrafting.getRecipes()) {
+        tokenData = new TokenData(this);
+        tokenData.setup();
+        for (ShapedRecipe recipe : tokenData.getRecipes()) {
             if (tokens && config.getBoolean("tokens.craft-tokens")) {
                 Bukkit.addRecipe(recipe);
             }

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

@@ -38,6 +38,7 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.*;
+import java.util.stream.Collectors;
 
 public class CommandToolStats implements TabExecutor {
 
@@ -62,8 +63,8 @@ public class CommandToolStats implements TabExecutor {
                 if (sender.hasPermission("toolstats.reload")) {
                     boolean oldTokensStatus = toolStats.tokens;
                     toolStats.loadConfig();
-                    toolStats.tokenCrafting.getRecipes().clear();
-                    toolStats.tokenCrafting.setup();
+                    toolStats.tokenData.getRecipes().clear();
+                    toolStats.tokenData.setup();
                     // if the server went from tokens off -> on, add the recipes
                     // if the server went from tokens on -> off, remove the recipes
                     if (toolStats.tokens != oldTokensStatus) {
@@ -71,14 +72,14 @@ public class CommandToolStats implements TabExecutor {
                         if (toolStats.tokens) {
                             sender.sendMessage(Component.text("It looks like you ENABLED the token system. While this is fine, it can break. Please restart your server instead.", NamedTextColor.YELLOW));
                             if (toolStats.config.getBoolean("tokens.craft-token")) {
-                                for (ShapedRecipe recipe : toolStats.tokenCrafting.getRecipes()) {
+                                for (ShapedRecipe recipe : toolStats.tokenData.getRecipes()) {
                                     Bukkit.addRecipe(recipe);
                                 }
                             }
                         } else {
                             // tokens are now disabled
                             sender.sendMessage(Component.text("It looks like you DISABLED the token system. While this is fine, it can break. Please restart your server instead.", NamedTextColor.YELLOW));
-                            for (ShapedRecipe recipe : toolStats.tokenCrafting.getRecipes()) {
+                            for (ShapedRecipe recipe : toolStats.tokenData.getRecipes()) {
                                 Bukkit.removeRecipe(recipe.getKey());
                             }
                         }
@@ -89,6 +90,41 @@ public class CommandToolStats implements TabExecutor {
                 }
                 return true;
             }
+            // /toolstats edit stat value
+            case "edit": {
+                if (!sender.hasPermission("toolstats.edit")) {
+                    sender.sendMessage(Component.text("You do not have permission for this command.", NamedTextColor.RED));
+                    return true;
+                }
+                if (sender instanceof ConsoleCommandSender) {
+                    sender.sendMessage(Component.text("You must be a player for this command.", NamedTextColor.RED));
+                    return true;
+                }
+                if (args.length < 3) {
+                    sender.sendMessage(Component.text("Invalid syntax. Usage: /toolstats edit <stat> <value>", NamedTextColor.RED));
+                    return true;
+                }
+                handleEdit(args[1], args[2], (Player) sender);
+                return true;
+            }
+            // /toolstats remove stat
+            case "remove": {
+                if (!sender.hasPermission("toolstats.remove")) {
+                    sender.sendMessage(Component.text("You do not have permission for this command.", NamedTextColor.RED));
+                    return true;
+                }
+                if (sender instanceof ConsoleCommandSender) {
+                    sender.sendMessage(Component.text("You must be a player for this command.", NamedTextColor.RED));
+                    return true;
+                }
+                if (args.length < 2) {
+                    sender.sendMessage(Component.text("Invalid syntax. Usage: /toolstats remove <stat>", NamedTextColor.RED));
+                    return true;
+                }
+                handleRemove(args[1], (Player) sender);
+                return true;
+
+            }
             case "reset": {
                 if (!sender.hasPermission("toolstats.reset")) {
                     sender.sendMessage(Component.text("You do not have permission for this command.", NamedTextColor.RED));
@@ -135,7 +171,7 @@ public class CommandToolStats implements TabExecutor {
                     return true;
                 }
                 String tokenType = args[2];
-                if (!toolStats.tokenCrafting.getTokenTypes().contains(tokenType)) {
+                if (!toolStats.tokenData.getTokenTypes().contains(tokenType)) {
                     sender.sendMessage(Component.text("Invalid token type.", NamedTextColor.RED));
                     return true;
                 }
@@ -229,84 +265,109 @@ public class CommandToolStats implements TabExecutor {
             player.getInventory().setItem(slot, finalItem);
         }
 
-        if (toolStats.configTools.checkConfig(original.getType(), "created-by")) {
-            if (container.has(toolStats.itemOwner, new UUIDDataType())) {
-                UUID owner = container.get(toolStats.itemOwner, new UUIDDataType());
-                String ownerName = null;
-                // if we can read the current owner
-                if (owner != null) {
-                    OfflinePlayer offlinePlayer = Bukkit.getOfflinePlayer(owner);
-                    ownerName = offlinePlayer.getName();
-                }
-
-                // if the owner's name is null for whatever reason, set the new owner
-                // to the current player running the command
-                if (ownerName == null) {
-                    player.sendMessage(Component.text("The owner of this item is null. Setting to " + player.getName() + ".", NamedTextColor.RED));
-                    ownerName = player.getName();
-                    container.set(toolStats.itemOwner, new UUIDDataType(), player.getUniqueId());
-                }
-
-                // show how the item was created based on the previous lore
-                switch (origin) {
-                    case 0: {
-                        lore.add(toolStats.configTools.formatLore("created.created-by", "{player}", ownerName));
-                        break;
-                    }
-                    case 2: {
-                        lore.add(toolStats.configTools.formatLore("looted.looted-by", "{player}", ownerName));
-                        break;
-                    }
-                    case 3: {
-                        lore.add(toolStats.configTools.formatLore("traded.traded-by", "{player}", ownerName));
-                        break;
-                    }
-                    case 4: {
-                        lore.add(toolStats.configTools.formatLore("looted.found-by", "{player}", ownerName));
-                        break;
-                    }
-                    case 5: {
-                        lore.add(toolStats.configTools.formatLore("fished.caught-by", "{player}", ownerName));
-                        break;
-                    }
-                    case 6: {
-                        lore.add(toolStats.configTools.formatLore("spawned-in.spawned-by", "{player}", ownerName));
-                        break;
-                    }
+        if (container.has(toolStats.droppedBy, PersistentDataType.STRING)) {
+            if (toolStats.config.getBoolean("enabled.dropped-by")) {
+                if (container.has(toolStats.droppedBy)) {
+                    String droppedBy = container.get(toolStats.droppedBy, PersistentDataType.STRING);
+                    lore.add(toolStats.configTools.formatLore("dropped-by", "{name}", droppedBy));
+                } else {
+                    player.sendMessage(Component.text("Unable to set 'dropped-by', as this item has no record of it."));
                 }
             }
         }
-        if (toolStats.configTools.checkConfig(original.getType(), "created-date")) {
-            if (container.has(toolStats.timeCreated, PersistentDataType.LONG)) {
-                Long time = container.get(toolStats.timeCreated, PersistentDataType.LONG);
-                if (time != null) {
-                    String date = toolStats.numberFormat.formatDate(new Date(time));
-                    // show how when the item was created based on the previous lore
-                    switch (origin) {
-                        case 0: {
-                            lore.add(toolStats.configTools.formatLore("created.created-on", "{date}", date));
-                            break;
+
+        if (container.has(toolStats.itemOwner, new UUIDDataType())) {
+            UUID owner = container.get(toolStats.itemOwner, new UUIDDataType());
+            String ownerName = null;
+            // if we can read the current owner
+            if (owner != null) {
+                OfflinePlayer offlinePlayer = Bukkit.getOfflinePlayer(owner);
+                ownerName = offlinePlayer.getName();
+            }
+
+            // if the owner's name is null for whatever reason, set the new owner
+            // to the current player running the command
+            if (ownerName == null) {
+                player.sendMessage(Component.text("The owner of this item is null. Setting to " + player.getName() + ".", NamedTextColor.RED));
+                ownerName = player.getName();
+                container.set(toolStats.itemOwner, new UUIDDataType(), player.getUniqueId());
+            }
+
+            // show how the item was created based on the previous lore
+            switch (origin) {
+                case 0: {
+                    if (toolStats.configTools.checkConfig(original.getType(), "crafted-by")) {
+                        lore.add(toolStats.configTools.formatLore("crafted.crafted-by", "{player}", ownerName));
+                    }
+                    break;
+                }
+                case 2: {
+                    if (toolStats.configTools.checkConfig(original.getType(), "looted-by")) {
+                        lore.add(toolStats.configTools.formatLore("looted.looted-by", "{player}", ownerName));
+                    }
+                    break;
+                }
+                case 3: {
+                    if (toolStats.configTools.checkConfig(original.getType(), "traded-by")) {
+                        lore.add(toolStats.configTools.formatLore("traded.traded-by", "{player}", ownerName));
+                    }
+                    break;
+                }
+                case 5: {
+                    if (toolStats.configTools.checkConfig(original.getType(), "fished-by")) {
+                        lore.add(toolStats.configTools.formatLore("fished.caught-by", "{player}", ownerName));
+                    }
+                    break;
+                }
+                case 6: {
+                    if (toolStats.configTools.checkConfig(original.getType(), "spawned-in-by")) {
+                        lore.add(toolStats.configTools.formatLore("spawned-in.spawned-by", "{player}", ownerName));
+                    }
+                    break;
+                }
+            }
+        }
+        if (container.has(toolStats.timeCreated, PersistentDataType.LONG)) {
+            Long time = container.get(toolStats.timeCreated, PersistentDataType.LONG);
+            if (time != null) {
+                String date = toolStats.numberFormat.formatDate(new Date(time));
+                // show how when the item was created based on the previous lore
+                switch (origin) {
+                    case 0: {
+                        if (toolStats.configTools.checkConfig(original.getType(), "crafted-on")) {
+                            lore.add(toolStats.configTools.formatLore("crafted.crafted-on", "{date}", date));
                         }
-                        case 2: {
+                        break;
+                    }
+                    case 1: {
+                        if (toolStats.config.getBoolean("enabled.dropped-on")) {
+                            lore.add(toolStats.configTools.formatLore("dropped-on", "{date}", date));
+                        }
+                        break;
+                    }
+                    case 2: {
+                        if (toolStats.configTools.checkConfig(original.getType(), "looted-on")) {
                             lore.add(toolStats.configTools.formatLore("looted.looted-on", "{date}", date));
-                            break;
                         }
-                        case 3: {
+                        break;
+                    }
+                    case 3: {
+                        if (toolStats.configTools.checkConfig(original.getType(), "traded-on")) {
                             lore.add(toolStats.configTools.formatLore("traded.traded-on", "{date}", date));
-                            break;
                         }
-                        case 4: {
-                            lore.add(toolStats.configTools.formatLore("looted.found-on", "{date}", date));
-                            break;
-                        }
-                        case 5: {
+                        break;
+                    }
+                    case 5: {
+                        if (toolStats.configTools.checkConfig(original.getType(), "fished-on")) {
                             lore.add(toolStats.configTools.formatLore("fished.caught-on", "{date}", date));
-                            break;
                         }
-                        case 6: {
+                        break;
+                    }
+                    case 6: {
+                        if (toolStats.configTools.checkConfig(original.getType(), "spawned-in-on")) {
                             lore.add(toolStats.configTools.formatLore("spawned-in.spawned-on", "{date}", date));
-                            break;
                         }
+                        break;
                     }
                 }
             }
@@ -396,80 +457,603 @@ public class CommandToolStats implements TabExecutor {
      * @param tokenType The token type.
      */
     private void giveToken(Player target, String tokenType, int amount) {
-        switch (tokenType) {
-            case "crops-mined": {
-                ItemStack itemStack = toolStats.tokenItems.cropsMined();
-                itemStack.setAmount(amount);
-                target.getInventory().addItem(itemStack);
+        ItemStack token = toolStats.tokenData.createToken(tokenType);
+        token.setAmount(amount);
+        target.getInventory().addItem(token);
+    }
+
+    /**
+     * Handle edit subcommand.
+     *
+     * @param stat      The stat to edit.
+     * @param userValue The value the user entered.
+     * @param player    The player using the command.
+     */
+    private void handleEdit(String stat, Object userValue, Player player) {
+        ItemStack editedItem = player.getInventory().getItemInMainHand().clone();
+        if (!toolStats.itemChecker.isValidItem(editedItem.getType())) {
+            player.sendMessage(Component.text("This is not a valid item.", NamedTextColor.RED));
+            return;
+        }
+        ItemMeta editedItemMeta = editedItem.getItemMeta();
+        PersistentDataContainer container = editedItemMeta.getPersistentDataContainer();
+        switch (stat) {
+            case "crops-harvested": {
+                if (!toolStats.config.getBoolean("enabled.crops-harvested")) {
+                    player.sendMessage(Component.text("This stat is disabled.", NamedTextColor.RED));
+                    return;
+                }
+                if (container.has(toolStats.cropsHarvested)) {
+                    int value;
+                    try {
+                        value = Integer.parseInt((String) userValue);
+                    } catch (NumberFormatException exception) {
+                        player.sendMessage(Component.text("That is not a valid number.", NamedTextColor.RED));
+                        return;
+                    }
+                    if (value < 0) {
+                        player.sendMessage(Component.text("Number must be positive.", NamedTextColor.RED));
+                        return;
+                    }
+                    Integer statValue = container.get(toolStats.cropsHarvested, PersistentDataType.INTEGER);
+                    if (statValue == null) {
+                        player.sendMessage(Component.text("Unable to get stat from item.", NamedTextColor.RED));
+                        return;
+                    }
+                    int difference = value - statValue;
+                    editedItemMeta = toolStats.itemLore.updateCropsMined(editedItem, difference);
+                } else {
+                    player.sendMessage(Component.text("This item does not have that stat.", NamedTextColor.RED));
+                }
                 break;
             }
             case "blocks-mined": {
-                ItemStack itemStack = toolStats.tokenItems.blocksMined();
-                itemStack.setAmount(amount);
-                target.getInventory().addItem(itemStack);
+                if (!toolStats.configTools.checkConfig(editedItem.getType(), "blocks-mined")) {
+                    player.sendMessage(Component.text("This stat is disabled.", NamedTextColor.RED));
+                    return;
+                }
+                if (container.has(toolStats.blocksMined)) {
+                    int value;
+                    try {
+                        value = Integer.parseInt((String) userValue);
+                    } catch (NumberFormatException exception) {
+                        player.sendMessage(Component.text("That is not a valid number.", NamedTextColor.RED));
+                        return;
+                    }
+                    if (value < 0) {
+                        player.sendMessage(Component.text("Number must be positive.", NamedTextColor.RED));
+                        return;
+                    }
+                    Integer statValue = container.get(toolStats.blocksMined, PersistentDataType.INTEGER);
+                    if (statValue == null) {
+                        player.sendMessage(Component.text("Unable to get stat from item.", NamedTextColor.RED));
+                        return;
+                    }
+                    int difference = value - statValue;
+                    editedItemMeta = toolStats.itemLore.updateBlocksMined(editedItem, difference);
+                } else {
+                    player.sendMessage(Component.text("This item does not have that stat.", NamedTextColor.RED));
+                }
                 break;
             }
             case "damage-taken": {
-                ItemStack itemStack = toolStats.tokenItems.damageTaken();
-                itemStack.setAmount(amount);
-                target.getInventory().addItem(itemStack);
+                if (!toolStats.config.getBoolean("enabled.armor-damage")) {
+                    player.sendMessage(Component.text("This stat is disabled.", NamedTextColor.RED));
+                    return;
+                }
+                if (container.has(toolStats.armorDamage)) {
+                    double value;
+                    try {
+                        value = Double.parseDouble((String) userValue);
+                    } catch (NumberFormatException exception) {
+                        player.sendMessage(Component.text("That is not a valid number.", NamedTextColor.RED));
+                        return;
+                    }
+                    if (value < 0) {
+                        player.sendMessage(Component.text("Number must be positive.", NamedTextColor.RED));
+                        return;
+                    }
+                    Double statValue = container.get(toolStats.armorDamage, PersistentDataType.DOUBLE);
+                    if (statValue == null) {
+                        player.sendMessage(Component.text("Unable to get stat from item.", NamedTextColor.RED));
+                        return;
+                    }
+                    double difference = value - statValue;
+                    editedItemMeta = toolStats.itemLore.updateArmorDamage(editedItem, difference, false);
+                } else {
+                    player.sendMessage(Component.text("This item does not have that stat.", NamedTextColor.RED));
+                }
                 break;
             }
             case "damage-done": {
-                ItemStack itemStack = toolStats.tokenItems.damageDone();
-                itemStack.setAmount(amount);
-                target.getInventory().addItem(itemStack);
+                if (!toolStats.configTools.checkConfig(editedItem.getType(), "damage-done")) {
+                    player.sendMessage(Component.text("This stat is disabled.", NamedTextColor.RED));
+                    return;
+                }
+                if (container.has(toolStats.damageDone)) {
+                    double value;
+                    try {
+                        value = Double.parseDouble((String) userValue);
+                    } catch (NumberFormatException exception) {
+                        player.sendMessage(Component.text("That is not a valid number.", NamedTextColor.RED));
+                        return;
+                    }
+                    if (value < 0) {
+                        player.sendMessage(Component.text("Number must be positive.", NamedTextColor.RED));
+                        return;
+                    }
+                    Double statValue = container.get(toolStats.damageDone, PersistentDataType.DOUBLE);
+                    if (statValue == null) {
+                        player.sendMessage(Component.text("Unable to get stat from item.", NamedTextColor.RED));
+                        return;
+                    }
+                    double difference = value - statValue;
+                    editedItemMeta = toolStats.itemLore.updateWeaponDamage(editedItem, difference, false);
+                } else {
+                    player.sendMessage(Component.text("This item does not have that stat.", NamedTextColor.RED));
+                }
                 break;
             }
             case "mob-kills": {
-                ItemStack itemStack = toolStats.tokenItems.mobKills();
-                itemStack.setAmount(amount);
-                target.getInventory().addItem(itemStack);
+                if (!toolStats.configTools.checkConfig(editedItem.getType(), "mob-kills")) {
+                    player.sendMessage(Component.text("This stat is disabled.", NamedTextColor.RED));
+                    return;
+                }
+                if (container.has(toolStats.mobKills)) {
+                    int value;
+                    try {
+                        value = Integer.parseInt((String) userValue);
+                    } catch (NumberFormatException exception) {
+                        player.sendMessage(Component.text("That is not a valid number.", NamedTextColor.RED));
+                        return;
+                    }
+                    if (value < 0) {
+                        player.sendMessage(Component.text("Number must be positive.", NamedTextColor.RED));
+                        return;
+                    }
+                    Integer statValue = container.get(toolStats.mobKills, PersistentDataType.INTEGER);
+                    if (statValue == null) {
+                        player.sendMessage(Component.text("Unable to get stat from item.", NamedTextColor.RED));
+                        return;
+                    }
+                    int difference = value - statValue;
+                    editedItemMeta = toolStats.itemLore.updateMobKills(editedItem, difference);
+                } else {
+                    player.sendMessage(Component.text("This item does not have that stat.", NamedTextColor.RED));
+                }
                 break;
             }
             case "player-kills": {
-                ItemStack itemStack = toolStats.tokenItems.playerKills();
-                itemStack.setAmount(amount);
-                target.getInventory().addItem(itemStack);
+                if (!toolStats.configTools.checkConfig(editedItem.getType(), "player-kills")) {
+                    player.sendMessage(Component.text("This stat is disabled.", NamedTextColor.RED));
+                    return;
+                }
+                if (container.has(toolStats.playerKills)) {
+                    int value;
+                    try {
+                        value = Integer.parseInt((String) userValue);
+                    } catch (NumberFormatException exception) {
+                        player.sendMessage(Component.text("That is not a valid number.", NamedTextColor.RED));
+                        return;
+                    }
+                    if (value < 0) {
+                        player.sendMessage(Component.text("Number must be positive.", NamedTextColor.RED));
+                        return;
+                    }
+                    Integer statValue = container.get(toolStats.playerKills, PersistentDataType.INTEGER);
+                    if (statValue == null) {
+                        player.sendMessage(Component.text("Unable to get stat from item.", NamedTextColor.RED));
+                        return;
+                    }
+                    int difference = value - statValue;
+                    editedItemMeta = toolStats.itemLore.updatePlayerKills(editedItem, difference);
+                } else {
+                    player.sendMessage(Component.text("This item does not have that stat.", NamedTextColor.RED));
+                }
                 break;
             }
             case "arrows-shot": {
-                ItemStack itemStack = toolStats.tokenItems.arrowsShot();
-                itemStack.setAmount(amount);
-                target.getInventory().addItem(itemStack);
+                if (!toolStats.config.getBoolean("enabled.arrows-shot")) {
+                    player.sendMessage(Component.text("This stat is disabled.", NamedTextColor.RED));
+                    return;
+                }
+                if (container.has(toolStats.arrowsShot)) {
+                    int value;
+                    try {
+                        value = Integer.parseInt((String) userValue);
+                    } catch (NumberFormatException exception) {
+                        player.sendMessage(Component.text("That is not a valid number.", NamedTextColor.RED));
+                        return;
+                    }
+                    if (value < 0) {
+                        player.sendMessage(Component.text("Number must be positive.", NamedTextColor.RED));
+                        return;
+                    }
+                    Integer statValue = container.get(toolStats.arrowsShot, PersistentDataType.INTEGER);
+                    if (statValue == null) {
+                        player.sendMessage(Component.text("Unable to get stat from item.", NamedTextColor.RED));
+                        return;
+                    }
+                    int difference = value - statValue;
+                    editedItemMeta = toolStats.itemLore.updateArrowsShot(editedItem, difference);
+                } else {
+                    player.sendMessage(Component.text("This item does not have that stat.", NamedTextColor.RED));
+                }
                 break;
             }
             case "sheep-sheared": {
-                ItemStack itemStack = toolStats.tokenItems.sheepSheared();
-                itemStack.setAmount(amount);
-                target.getInventory().addItem(itemStack);
+                if (!toolStats.config.getBoolean("enabled.sheep-sheared")) {
+                    player.sendMessage(Component.text("This stat is disabled.", NamedTextColor.RED));
+                    return;
+                }
+                if (container.has(toolStats.sheepSheared)) {
+                    int value;
+                    try {
+                        value = Integer.parseInt((String) userValue);
+                    } catch (NumberFormatException exception) {
+                        player.sendMessage(Component.text("That is not a valid number.", NamedTextColor.RED));
+                        return;
+                    }
+                    if (value < 0) {
+                        player.sendMessage(Component.text("Number must be positive.", NamedTextColor.RED));
+                        return;
+                    }
+                    Integer statValue = container.get(toolStats.sheepSheared, PersistentDataType.INTEGER);
+                    if (statValue == null) {
+                        player.sendMessage(Component.text("Unable to get stat from item.", NamedTextColor.RED));
+                        return;
+                    }
+                    int difference = value - statValue;
+                    editedItemMeta = toolStats.itemLore.updateSheepSheared(editedItem, difference);
+                } else {
+                    player.sendMessage(Component.text("This item does not have that stat.", NamedTextColor.RED));
+                }
                 break;
             }
             case "flight-time": {
-                ItemStack itemStack = toolStats.tokenItems.flightTime();
-                itemStack.setAmount(amount);
-                target.getInventory().addItem(itemStack);
+                if (!toolStats.config.getBoolean("enabled.flight-time")) {
+                    player.sendMessage(Component.text("This stat is disabled.", NamedTextColor.RED));
+                    return;
+                }
+                if (container.has(toolStats.flightTime)) {
+                    int value;
+                    try {
+                        value = Integer.parseInt((String) userValue);
+                    } catch (NumberFormatException exception) {
+                        player.sendMessage(Component.text("That is not a valid number.", NamedTextColor.RED));
+                        return;
+                    }
+                    if (value < 0) {
+                        player.sendMessage(Component.text("Number must be positive.", NamedTextColor.RED));
+                        return;
+                    }
+                    Long statValue = container.get(toolStats.flightTime, PersistentDataType.LONG);
+                    if (statValue == null) {
+                        player.sendMessage(Component.text("Unable to get stat from item.", NamedTextColor.RED));
+                        return;
+                    }
+                    long difference = value - statValue;
+                    editedItemMeta = toolStats.itemLore.updateFlightTime(editedItem, difference);
+                } else {
+                    player.sendMessage(Component.text("This item does not have that stat.", NamedTextColor.RED));
+                }
                 break;
             }
-            case "fish-caught": {
-                ItemStack itemStack = toolStats.tokenItems.fishCaught();
-                itemStack.setAmount(amount);
-                target.getInventory().addItem(itemStack);
+            case "fight-caught": {
+                if (!toolStats.config.getBoolean("enabled.fight-caught")) {
+                    player.sendMessage(Component.text("This stat is disabled.", NamedTextColor.RED));
+                    return;
+                }
+                if (container.has(toolStats.fishCaught)) {
+                    int value;
+                    try {
+                        value = Integer.parseInt((String) userValue);
+                    } catch (NumberFormatException exception) {
+                        player.sendMessage(Component.text("That is not a valid number.", NamedTextColor.RED));
+                        return;
+                    }
+                    if (value < 0) {
+                        player.sendMessage(Component.text("Number must be positive.", NamedTextColor.RED));
+                        return;
+                    }
+                    Integer statValue = container.get(toolStats.fishCaught, PersistentDataType.INTEGER);
+                    if (statValue == null) {
+                        player.sendMessage(Component.text("Unable to get stat from item.", NamedTextColor.RED));
+                        return;
+                    }
+                    int difference = value - statValue;
+                    editedItemMeta = toolStats.itemLore.updateFishCaught(editedItem, difference);
+                } else {
+                    player.sendMessage(Component.text("This item does not have that stat.", NamedTextColor.RED));
+                }
                 break;
             }
-            case "reset": {
-                ItemStack itemStack = toolStats.tokenItems.resetToken();
-                itemStack.setAmount(amount);
-                target.getInventory().addItem(itemStack);
-                break;
-            }
-            case "remove": {
-                ItemStack itemStack = toolStats.tokenItems.removeToken();
-                itemStack.setAmount(amount);
-                target.getInventory().addItem(itemStack);
-                break;
+            default: {
+                player.sendMessage(Component.text("That is not a valid stat to update.", NamedTextColor.RED));
+                return;
             }
         }
+        editedItem.setItemMeta(editedItemMeta);
+        player.getInventory().setItemInMainHand(editedItem);
+        player.sendMessage(Component.text("Updated stat " + stat + " for held item!", NamedTextColor.GREEN));
+    }
+
+    /**
+     * Handle remove subcommand.
+     *
+     * @param stat   The stat to remove.
+     * @param player The player using the command.
+     */
+    private void handleRemove(String stat, Player player) {
+        ItemStack editedItem = player.getInventory().getItemInMainHand().clone();
+        if (!toolStats.itemChecker.isValidItem(editedItem.getType())) {
+            player.sendMessage(Component.text("This is not a valid item.", NamedTextColor.RED));
+            return;
+        }
+        ItemMeta editedItemMeta = editedItem.getItemMeta();
+        PersistentDataContainer container = editedItemMeta.getPersistentDataContainer();
+        switch (stat) {
+            case "crops-harvested": {
+                if (container.has(toolStats.cropsHarvested)) {
+                    Integer statValue = container.get(toolStats.cropsHarvested, PersistentDataType.INTEGER);
+                    if (statValue == null) {
+                        player.sendMessage(Component.text("Unable to get stat from item.", NamedTextColor.RED));
+                        return;
+                    }
+                    String tokens = container.get(toolStats.tokenApplied, PersistentDataType.STRING);
+                    if (tokens == null) {
+                        player.sendMessage(Component.text("Unable to get tokens from item.", NamedTextColor.RED));
+                        return;
+                    }
+                    container.remove(toolStats.cropsHarvested);
+                    List<String> newTokens = toolStats.itemChecker.removeToken(tokens, "crops-mined");
+                    if (newTokens.isEmpty()) {
+                        container.remove(toolStats.tokenApplied);
+                    } else {
+                        container.set(toolStats.tokenApplied, PersistentDataType.STRING, String.join(",", newTokens));
+                    }
+
+                    Component oldLine = toolStats.configTools.formatLore("crops-harvested", "{crops}", toolStats.numberFormat.formatInt(statValue));
+                    List<Component> newLore = toolStats.itemLore.removeLore(editedItemMeta.lore(), oldLine);
+                    editedItemMeta.lore(newLore);
+                } else {
+                    player.sendMessage(Component.text("This item does not have that stat.", NamedTextColor.RED));
+                }
+                break;
+            }
+            case "blocks-mined": {
+                if (container.has(toolStats.blocksMined)) {
+                    Integer statValue = container.get(toolStats.blocksMined, PersistentDataType.INTEGER);
+                    if (statValue == null) {
+                        player.sendMessage(Component.text("Unable to get stat from item.", NamedTextColor.RED));
+                        return;
+                    }
+                    String tokens = container.get(toolStats.tokenApplied, PersistentDataType.STRING);
+                    if (tokens == null) {
+                        player.sendMessage(Component.text("Unable to get tokens from item.", NamedTextColor.RED));
+                        return;
+                    }
+                    container.remove(toolStats.blocksMined);
+                    List<String> newTokens = toolStats.itemChecker.removeToken(tokens, "blocks-mined");
+                    if (newTokens.isEmpty()) {
+                        container.remove(toolStats.tokenApplied);
+                    } else {
+                        container.set(toolStats.tokenApplied, PersistentDataType.STRING, String.join(",", newTokens));
+                    }
+
+                    Component oldLine = toolStats.configTools.formatLore("blocks-mined", "{blocks}", toolStats.numberFormat.formatInt(statValue));
+                    List<Component> newLore = toolStats.itemLore.removeLore(editedItemMeta.lore(), oldLine);
+                    editedItemMeta.lore(newLore);
+                } else {
+                    player.sendMessage(Component.text("This item does not have that stat.", NamedTextColor.RED));
+                }
+                break;
+            }
+            case "damage-taken": {
+                if (container.has(toolStats.armorDamage)) {
+                    Double statValue = container.get(toolStats.armorDamage, PersistentDataType.DOUBLE);
+                    if (statValue == null) {
+                        player.sendMessage(Component.text("Unable to get stat from item.", NamedTextColor.RED));
+                        return;
+                    }
+                    String tokens = container.get(toolStats.tokenApplied, PersistentDataType.STRING);
+                    if (tokens == null) {
+                        player.sendMessage(Component.text("Unable to get tokens from item.", NamedTextColor.RED));
+                        return;
+                    }
+                    container.remove(toolStats.armorDamage);
+                    List<String> newTokens = toolStats.itemChecker.removeToken(tokens, "damage-taken");
+                    if (newTokens.isEmpty()) {
+                        container.remove(toolStats.tokenApplied);
+                    } else {
+                        container.set(toolStats.tokenApplied, PersistentDataType.STRING, String.join(",", newTokens));
+                    }
+
+                    Component oldLine = toolStats.configTools.formatLore("damage-taken", "{damage}", toolStats.numberFormat.formatDouble(statValue));
+                    List<Component> newLore = toolStats.itemLore.removeLore(editedItemMeta.lore(), oldLine);
+                    editedItemMeta.lore(newLore);
+                } else {
+                    player.sendMessage(Component.text("This item does not have that stat.", NamedTextColor.RED));
+                }
+                break;
+            }
+            case "damage-done": {
+                if (container.has(toolStats.damageDone)) {
+                    Double statValue = container.get(toolStats.damageDone, PersistentDataType.DOUBLE);
+                    if (statValue == null) {
+                        player.sendMessage(Component.text("Unable to get stat from item.", NamedTextColor.RED));
+                        return;
+                    }
+                    String tokens = container.get(toolStats.tokenApplied, PersistentDataType.STRING);
+                    if (tokens == null) {
+                        player.sendMessage(Component.text("Unable to get tokens from item.", NamedTextColor.RED));
+                        return;
+                    }
+                    container.remove(toolStats.damageDone);
+                    List<String> newTokens = toolStats.itemChecker.removeToken(tokens, "damage-done");
+                    if (newTokens.isEmpty()) {
+                        container.remove(toolStats.tokenApplied);
+                    } else {
+                        container.set(toolStats.tokenApplied, PersistentDataType.STRING, String.join(",", newTokens));
+                    }
+
+                    Component oldLine = toolStats.configTools.formatLore("damage-done", "{damage}", toolStats.numberFormat.formatDouble(statValue));
+                    List<Component> newLore = toolStats.itemLore.removeLore(editedItemMeta.lore(), oldLine);
+                    editedItemMeta.lore(newLore);
+                } else {
+                    player.sendMessage(Component.text("This item does not have that stat.", NamedTextColor.RED));
+                }
+                break;
+            }
+            case "mob-kills": {
+                if (container.has(toolStats.mobKills)) {
+                    Integer statValue = container.get(toolStats.mobKills, PersistentDataType.INTEGER);
+                    if (statValue == null) {
+                        player.sendMessage(Component.text("Unable to get stat from item.", NamedTextColor.RED));
+                        return;
+                    }
+                    String tokens = container.get(toolStats.tokenApplied, PersistentDataType.STRING);
+                    if (tokens == null) {
+                        player.sendMessage(Component.text("Unable to get tokens from item.", NamedTextColor.RED));
+                        return;
+                    }
+                    container.remove(toolStats.mobKills);
+                    List<String> newTokens = toolStats.itemChecker.removeToken(tokens, "mob-kills");
+                    if (newTokens.isEmpty()) {
+                        container.remove(toolStats.tokenApplied);
+                    } else {
+                        container.set(toolStats.tokenApplied, PersistentDataType.STRING, String.join(",", newTokens));
+                    }
+
+                    Component oldLine = toolStats.configTools.formatLore("kills.mob", "{kills}", toolStats.numberFormat.formatInt(statValue));
+                    List<Component> newLore = toolStats.itemLore.removeLore(editedItemMeta.lore(), oldLine);
+                    editedItemMeta.lore(newLore);
+                } else {
+                    player.sendMessage(Component.text("This item does not have that stat.", NamedTextColor.RED));
+                }
+                break;
+            }
+            case "player-kills": {
+                if (container.has(toolStats.playerKills)) {
+                    Integer statValue = container.get(toolStats.playerKills, PersistentDataType.INTEGER);
+                    if (statValue == null) {
+                        player.sendMessage(Component.text("Unable to get stat from item.", NamedTextColor.RED));
+                        return;
+                    }
+                    String tokens = container.get(toolStats.tokenApplied, PersistentDataType.STRING);
+                    if (tokens == null) {
+                        player.sendMessage(Component.text("Unable to get tokens from item.", NamedTextColor.RED));
+                        return;
+                    }
+                    container.remove(toolStats.playerKills);
+                    List<String> newTokens = toolStats.itemChecker.removeToken(tokens, "player-kills");
+                    if (newTokens.isEmpty()) {
+                        container.remove(toolStats.tokenApplied);
+                    } else {
+                        container.set(toolStats.tokenApplied, PersistentDataType.STRING, String.join(",", newTokens));
+                    }
+
+                    Component oldLine = toolStats.configTools.formatLore("kills.player", "{kills}", toolStats.numberFormat.formatInt(statValue));
+                    List<Component> newLore = toolStats.itemLore.removeLore(editedItemMeta.lore(), oldLine);
+                    editedItemMeta.lore(newLore);
+                } else {
+                    player.sendMessage(Component.text("This item does not have that stat.", NamedTextColor.RED));
+                }
+                break;
+            }
+            case "sheep-sheared": {
+                if (container.has(toolStats.sheepSheared)) {
+                    Integer statValue = container.get(toolStats.sheepSheared, PersistentDataType.INTEGER);
+                    if (statValue == null) {
+                        player.sendMessage(Component.text("Unable to get stat from item.", NamedTextColor.RED));
+                        return;
+                    }
+                    String tokens = container.get(toolStats.tokenApplied, PersistentDataType.STRING);
+                    if (tokens == null) {
+                        player.sendMessage(Component.text("Unable to get tokens from item.", NamedTextColor.RED));
+                        return;
+                    }
+                    container.remove(toolStats.sheepSheared);
+                    List<String> newTokens = toolStats.itemChecker.removeToken(tokens, "sheep-sheared");
+                    if (newTokens.isEmpty()) {
+                        container.remove(toolStats.tokenApplied);
+                    } else {
+                        container.set(toolStats.tokenApplied, PersistentDataType.STRING, String.join(",", newTokens));
+                    }
+
+                    Component oldLine = toolStats.configTools.formatLore("sheep-sheared", "{sheep}", toolStats.numberFormat.formatInt(statValue));
+                    List<Component> newLore = toolStats.itemLore.removeLore(editedItemMeta.lore(), oldLine);
+                    editedItemMeta.lore(newLore);
+                } else {
+                    player.sendMessage(Component.text("This item does not have that stat.", NamedTextColor.RED));
+                }
+                break;
+            }
+            case "flight-time": {
+                if (container.has(toolStats.flightTime)) {
+                    Long statValue = container.get(toolStats.flightTime, PersistentDataType.LONG);
+                    if (statValue == null) {
+                        player.sendMessage(Component.text("Unable to get stat from item.", NamedTextColor.RED));
+                        return;
+                    }
+                    String tokens = container.get(toolStats.tokenApplied, PersistentDataType.STRING);
+                    if (tokens == null) {
+                        player.sendMessage(Component.text("Unable to get tokens from item.", NamedTextColor.RED));
+                        return;
+                    }
+                    container.remove(toolStats.flightTime);
+                    List<String> newTokens = toolStats.itemChecker.removeToken(tokens, "flight-time");
+                    if (newTokens.isEmpty()) {
+                        container.remove(toolStats.tokenApplied);
+                    } else {
+                        container.set(toolStats.tokenApplied, PersistentDataType.STRING, String.join(",", newTokens));
+                    }
+
+                    Map<String, String> timeFormatted = toolStats.numberFormat.formatTime(statValue);
+                    Component oldLine = toolStats.configTools.formatLoreMultiplePlaceholders("flight-time", timeFormatted);
+                    List<Component> newLore = toolStats.itemLore.removeLore(editedItemMeta.lore(), oldLine);
+                    editedItemMeta.lore(newLore);
+                } else {
+                    player.sendMessage(Component.text("This item does not have that stat.", NamedTextColor.RED));
+                }
+                break;
+            }
+            case "fight-caught": {
+                if (container.has(toolStats.fishCaught)) {
+                    Integer statValue = container.get(toolStats.fishCaught, PersistentDataType.INTEGER);
+                    if (statValue == null) {
+                        player.sendMessage(Component.text("Unable to get stat from item.", NamedTextColor.RED));
+                        return;
+                    }
+                    String tokens = container.get(toolStats.tokenApplied, PersistentDataType.STRING);
+                    if (tokens == null) {
+                        player.sendMessage(Component.text("Unable to get tokens from item.", NamedTextColor.RED));
+                        return;
+                    }
+                    container.remove(toolStats.fishCaught);
+                    List<String> newTokens = toolStats.itemChecker.removeToken(tokens, "fight-caught");
+                    if (newTokens.isEmpty()) {
+                        container.remove(toolStats.tokenApplied);
+                    } else {
+                        container.set(toolStats.tokenApplied, PersistentDataType.STRING, String.join(",", newTokens));
+                    }
+
+                    Component oldLine = toolStats.configTools.formatLore("fished.fish-caught", "{fish}", toolStats.numberFormat.formatInt(statValue));
+                    List<Component> newLore = toolStats.itemLore.removeLore(editedItemMeta.lore(), oldLine);
+                    editedItemMeta.lore(newLore);
+                } else {
+                    player.sendMessage(Component.text("This item does not have that stat.", NamedTextColor.RED));
+                }
+                break;
+            }
+            default: {
+                player.sendMessage(Component.text("That is not a valid stat to update.", NamedTextColor.RED));
+                return;
+            }
+        }
+        editedItem.setItemMeta(editedItemMeta);
+        player.getInventory().setItemInMainHand(editedItem);
+        player.sendMessage(Component.text("Removed stat " + stat + " for held item!", NamedTextColor.GREEN));
     }
 
     @Nullable
@@ -486,14 +1070,34 @@ public class CommandToolStats implements TabExecutor {
             if (sender.hasPermission("toolstats.givetokens")) {
                 suggestions.add("givetokens");
             }
+            if (sender.hasPermission("toolstats.edit")) {
+                suggestions.add("edit");
+            }
+            if (sender.hasPermission("toolstats.remove")) {
+                suggestions.add("remove");
+            }
             return suggestions.isEmpty() ? null : suggestions;
         }
 
         if (args.length == 2 && args[0].equalsIgnoreCase("reset") && sender.hasPermission("toolstats.reset.confirm")) {
             return Collections.singletonList("confirm");
         }
+        if (args.length == 2 && args[0].equalsIgnoreCase("edit") && sender.hasPermission("toolstats.edit")) {
+            // yes I am lazy
+            return toolStats.tokenData.getTokenTypes().stream()
+                    .filter(s -> !s.equals("remove") && !s.equals("reset"))
+                    .map(s -> s.equals("crops-mined") ? "crops-harvested" : s)
+                    .collect(Collectors.toList());
+        }
+        if (args.length == 2 && args[0].equalsIgnoreCase("remove") && sender.hasPermission("toolstats.remove")) {
+            // yes I am lazy
+            return toolStats.tokenData.getTokenTypes().stream()
+                    .filter(s -> !s.equals("remove") && !s.equals("reset"))
+                    .map(s -> s.equals("crops-mined") ? "crops-harvested" : s)
+                    .collect(Collectors.toList());
+        }
         if (args.length == 3 && args[0].equalsIgnoreCase("givetokens") && sender.hasPermission("toolstats.givetokens")) {
-            return toolStats.tokenCrafting.getTokenTypes();
+            return toolStats.tokenData.getTokenTypes();
         }
 
         return null;

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

@@ -57,7 +57,6 @@ public class AnvilEvent implements Listener {
         }
 
         Material firstSlotMaterial = firstSlot.getType();
-        Material secondSlotMaterial = secondSlot.getType();
 
         // make sure the first item is a valid item
         if (!toolStats.itemChecker.isValidItem(firstSlotMaterial)) {
@@ -67,7 +66,7 @@ public class AnvilEvent implements Listener {
         PersistentDataContainer secondSlotContainer = secondSlot.getItemMeta().getPersistentDataContainer();
 
         // make sure the 2nd item is one of ours
-        if (secondSlotMaterial != Material.PAPER || !secondSlotContainer.has(toolStats.tokenType, PersistentDataType.STRING)) {
+        if (!secondSlotContainer.has(toolStats.tokenType, PersistentDataType.STRING)) {
             return;
         }
 

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

@@ -48,7 +48,7 @@ public class BlockBreak implements Listener {
             return;
         }
         Player player = event.getPlayer();
-        if (player.getGameMode() == GameMode.CREATIVE || player.getGameMode() == GameMode.SPECTATOR) {
+        if (player.getGameMode() == GameMode.CREATIVE && !toolStats.config.getBoolean("allow-creative")) {
             return;
         }
         PlayerInventory inventory = player.getInventory();

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

@@ -50,7 +50,7 @@ public class CraftItem implements Listener {
             return;
         }
         Player player = (Player) event.getWhoClicked();
-        if (player.getGameMode() == GameMode.CREATIVE || player.getGameMode() == GameMode.SPECTATOR) {
+        if (player.getGameMode() == GameMode.CREATIVE && !toolStats.config.getBoolean("allow-creative")) {
             return;
         }
         ItemStack craftedItem = event.getCurrentItem();
@@ -121,7 +121,13 @@ public class CraftItem implements Listener {
         }
         // get the current time
         long timeCreated = System.currentTimeMillis();
-        Date finalDate = new Date(timeCreated);
+        Date finalDate;
+        if (toolStats.config.getBoolean("normalize-time-creation")) {
+            finalDate = toolStats.numberFormat.normalizeTime(timeCreated);
+            timeCreated = finalDate.getTime();
+        } else {
+            finalDate = new Date(timeCreated);
+        }
         PersistentDataContainer container = meta.getPersistentDataContainer();
 
         // if the item already has the tag
@@ -139,12 +145,12 @@ public class CraftItem implements Listener {
         }
 
         // if creation date is enabled, add it
-        if (toolStats.configTools.checkConfig(itemStack.getType(), "created-date")) {
+        if (toolStats.configTools.checkConfig(itemStack.getType(), "crafted-on")) {
             container.set(toolStats.timeCreated, PersistentDataType.LONG, timeCreated);
             container.set(toolStats.originType, PersistentDataType.INTEGER, 0);
 
             String date = toolStats.numberFormat.formatDate(finalDate);
-            Component newLine = toolStats.configTools.formatLore("created.created-on", "{date}", date);
+            Component newLine = toolStats.configTools.formatLore("crafted.crafted-on", "{date}", date);
             if (newLine == null) {
                 return null;
             }
@@ -153,11 +159,11 @@ public class CraftItem implements Listener {
         }
 
         // if creation owner is enabled, add it
-        if (toolStats.configTools.checkConfig(itemStack.getType(), "created-by")) {
+        if (toolStats.configTools.checkConfig(itemStack.getType(), "crafted-by")) {
             container.set(toolStats.itemOwner, new UUIDDataType(), owner.getUniqueId());
             container.set(toolStats.originType, PersistentDataType.INTEGER, 0);
 
-            Component newLine = toolStats.configTools.formatLore("created.created-by", "{player}", owner.getName());
+            Component newLine = toolStats.configTools.formatLore("crafted.crafted-by", "{player}", owner.getName());
             if (newLine == null) {
                 return null;
             }

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

@@ -30,6 +30,7 @@ import org.bukkit.inventory.meta.ItemMeta;
 import org.bukkit.persistence.PersistentDataContainer;
 import org.bukkit.persistence.PersistentDataType;
 
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
@@ -87,7 +88,13 @@ public class CreativeEvent implements Listener {
         }
         // get the current time
         long timeCreated = System.currentTimeMillis();
-        Date finalDate = new Date(timeCreated);
+        Date finalDate;
+        if (toolStats.config.getBoolean("normalize-time-creation")) {
+            finalDate = toolStats.numberFormat.normalizeTime(timeCreated);
+            timeCreated = finalDate.getTime();
+        } else {
+            finalDate = new Date(timeCreated);
+        }
         PersistentDataContainer container = meta.getPersistentDataContainer();
 
         // if the item already has the tag
@@ -96,22 +103,45 @@ public class CreativeEvent implements Listener {
             return null;
         }
 
+        // get the current lore the item
+        List<Component> lore;
+        if (meta.hasLore()) {
+            lore = meta.lore();
+        } else {
+            lore = new ArrayList<>();
+        }
+
+        if (toolStats.configTools.checkConfig(itemStack.getType(), "spawned-in-on")) {
+            container.set(toolStats.timeCreated, PersistentDataType.LONG, timeCreated);
+            container.set(toolStats.originType, PersistentDataType.INTEGER, 6);
+
+            String date = toolStats.numberFormat.formatDate(finalDate);
+            Component newLine = toolStats.configTools.formatLore("spawned-in.spawned-on", "{date}", date);
+            if (newLine == null) {
+                return null;
+            }
+            lore.add(newLine);
+            meta.lore(lore);
+        }
+
+        if (toolStats.configTools.checkConfig(itemStack.getType(), "spawned-in-by")) {
+            container.set(toolStats.itemOwner, new UUIDDataType(), owner.getUniqueId());
+            container.set(toolStats.originType, PersistentDataType.INTEGER, 6);
+
+            Component newLine = toolStats.configTools.formatLore("spawned-in.spawned-by", "{player}", owner.getName());
+            if (newLine == null) {
+                return null;
+            }
+            lore.add(newLine);
+            meta.lore(lore);
+        }
+
         // if hash is enabled, add it
         if (toolStats.config.getBoolean("generate-hash-for-items")) {
             String hash = toolStats.hashMaker.makeHash(newSpawnedItem.getType(), owner.getUniqueId(), timeCreated);
             container.set(toolStats.hash, PersistentDataType.STRING, hash);
         }
 
-        // if spawned in is enabled, add it
-        if (toolStats.configTools.checkConfig(newSpawnedItem.getType(), "spawned-in")) {
-            container.set(toolStats.timeCreated, PersistentDataType.LONG, timeCreated);
-            container.set(toolStats.itemOwner, new UUIDDataType(), owner.getUniqueId());
-            container.set(toolStats.originType, PersistentDataType.INTEGER, 6);
-
-            String formattedDate = toolStats.numberFormat.formatDate(finalDate);
-            List<Component> newLore = toolStats.itemLore.addNewOwner(meta, owner.getName(), formattedDate);
-            meta.lore(newLore);
-        }
         newSpawnedItem.setItemMeta(meta);
         return newSpawnedItem;
     }

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

@@ -156,7 +156,7 @@ public class EntityDamage implements Listener {
 
         // player is taking damage
         if (mobBeingAttacked instanceof Player playerTakingDamage) {
-            if (playerTakingDamage.getGameMode() == GameMode.CREATIVE || playerTakingDamage.getGameMode() == GameMode.SPECTATOR) {
+            if (playerTakingDamage.getGameMode() == GameMode.CREATIVE && !toolStats.config.getBoolean("allow-creative")) {
                 return;
             }
             updateArmorDamage(playerTakingDamage.getInventory(), event.getFinalDamage());

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

@@ -30,6 +30,8 @@ import org.bukkit.inventory.meta.ItemMeta;
 import org.bukkit.persistence.PersistentDataContainer;
 import org.bukkit.persistence.PersistentDataType;
 
+import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 import java.util.UUID;
 
@@ -84,19 +86,44 @@ public class EntityDeath implements Listener {
             return null;
         }
 
-        if (!toolStats.config.getBoolean("enabled.dropped-by")) {
-            return null;
+        long timeCreated = System.currentTimeMillis();
+        Date finalDate;
+        if (toolStats.config.getBoolean("normalize-time-creation")) {
+            finalDate = toolStats.numberFormat.normalizeTime(timeCreated);
+            timeCreated = finalDate.getTime();
+        } else {
+            finalDate = new Date(timeCreated);
         }
 
         PersistentDataContainer container = meta.getPersistentDataContainer();
-        container.set(toolStats.originType, PersistentDataType.INTEGER, 1);
         String mobName = toolStats.config.getString("messages.mob." + entity.getType());
         if (mobName == null) {
             mobName = entity.getName();
         }
-        Component newLine = toolStats.configTools.formatLore("dropped-by", "{name}", mobName);
-        List<Component> newLore = toolStats.itemLore.addItemLore(meta, newLine);
-        meta.lore(newLore);
+
+        List<Component> lore;
+        if (meta.hasLore()) {
+            lore = meta.lore();
+        } else {
+            lore = new ArrayList<>();
+        }
+
+        if (toolStats.config.getBoolean("enabled.dropped-on")) {
+            container.set(toolStats.originType, PersistentDataType.INTEGER, 1);
+            container.set(toolStats.timeCreated, PersistentDataType.LONG, timeCreated);
+            String date = toolStats.numberFormat.formatDate(finalDate);
+            Component droppedOn = toolStats.configTools.formatLore("dropped-on", "{date}", date);
+            lore.add(droppedOn);
+        }
+
+        if (toolStats.config.getBoolean("enabled.dropped-by")) {
+            container.set(toolStats.originType, PersistentDataType.INTEGER, 1);
+            container.set(toolStats.droppedBy, PersistentDataType.STRING, mobName);
+            Component droppedBy = toolStats.configTools.formatLore("dropped-by", "{name}", mobName);
+            lore.add(droppedBy);
+        }
+
+        meta.lore(lore);
         newItem.setItemMeta(meta);
         return newItem;
     }

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

@@ -36,6 +36,7 @@ import org.bukkit.inventory.meta.ItemMeta;
 import org.bukkit.persistence.PersistentDataContainer;
 import org.bukkit.persistence.PersistentDataType;
 
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
@@ -99,29 +100,58 @@ public class GenerateLoot implements Listener {
             return null;
         }
         long timeCreated = System.currentTimeMillis();
-        Date finalDate = new Date(timeCreated);
-        PersistentDataContainer container = meta.getPersistentDataContainer();
-
-        if (!toolStats.configTools.checkConfig(newItem.getType(), "looted-tag")) {
-            return null;
+        Date finalDate;
+        if (toolStats.config.getBoolean("normalize-time-creation")) {
+            finalDate = toolStats.numberFormat.normalizeTime(timeCreated);
+            timeCreated = finalDate.getTime();
+        } else {
+            finalDate = new Date(timeCreated);
         }
+        PersistentDataContainer container = meta.getPersistentDataContainer();
 
         if (container.has(toolStats.timeCreated, PersistentDataType.LONG) || container.has(toolStats.itemOwner, PersistentDataType.LONG)) {
             return null;
         }
 
-        // only make the hash if it's enabled
+        // get the current lore the item
+        List<Component> lore;
+        if (meta.hasLore()) {
+            lore = meta.lore();
+        } else {
+            lore = new ArrayList<>();
+        }
+
+        if (toolStats.configTools.checkConfig(newItem.getType(), "looted-on")) {
+            container.set(toolStats.timeCreated, PersistentDataType.LONG, timeCreated);
+            container.set(toolStats.originType, PersistentDataType.INTEGER, 2);
+
+            String date = toolStats.numberFormat.formatDate(finalDate);
+            Component newLine = toolStats.configTools.formatLore("looted.looted-on", "{date}", date);
+            if (newLine == null) {
+                return null;
+            }
+            lore.add(newLine);
+            meta.lore(lore);
+        }
+
+        if (toolStats.configTools.checkConfig(newItem.getType(), "looted-by")) {
+            container.set(toolStats.itemOwner, new UUIDDataType(), owner.getUniqueId());
+            container.set(toolStats.originType, PersistentDataType.INTEGER, 2);
+
+            Component newLine = toolStats.configTools.formatLore("looted.looted-by", "{player}", owner.getName());
+            if (newLine == null) {
+                return null;
+            }
+            lore.add(newLine);
+            meta.lore(lore);
+        }
+
+        // if hash is enabled, add it
         if (toolStats.config.getBoolean("generate-hash-for-items")) {
             String hash = toolStats.hashMaker.makeHash(newItem.getType(), owner.getUniqueId(), timeCreated);
             container.set(toolStats.hash, PersistentDataType.STRING, hash);
         }
 
-        container.set(toolStats.timeCreated, PersistentDataType.LONG, timeCreated);
-        container.set(toolStats.itemOwner, new UUIDDataType(), owner.getUniqueId());
-        container.set(toolStats.originType, PersistentDataType.INTEGER, 2);
-        String formattedDate = toolStats.numberFormat.formatDate(finalDate);
-        List<Component> newLore = toolStats.itemLore.addNewOwner(meta, owner.getName(), formattedDate);
-        meta.lore(newLore);
         newItem.setItemMeta(meta);
         return newItem;
     }

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

@@ -35,6 +35,7 @@ import org.bukkit.inventory.meta.ItemMeta;
 import org.bukkit.persistence.PersistentDataContainer;
 import org.bukkit.persistence.PersistentDataType;
 
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
@@ -53,7 +54,7 @@ public class PickupItem implements Listener {
         }
         Entity entity = event.getEntity();
         if (entity instanceof Player player) {
-            if (player.getGameMode() == GameMode.CREATIVE || player.getGameMode() == GameMode.SPECTATOR) {
+            if (player.getGameMode() == GameMode.CREATIVE && !toolStats.config.getBoolean("allow-creative")) {
                 return;
             }
             Item item = event.getItem();
@@ -90,7 +91,13 @@ public class PickupItem implements Listener {
             return null;
         }
         long timeCreated = System.currentTimeMillis();
-        Date finalDate = new Date(timeCreated);
+        Date finalDate;
+        if (toolStats.config.getBoolean("normalize-time-creation")) {
+            finalDate = toolStats.numberFormat.normalizeTime(timeCreated);
+            timeCreated = finalDate.getTime();
+        } else {
+            finalDate = new Date(timeCreated);
+        }
         PersistentDataContainer container = meta.getPersistentDataContainer();
 
         if (!toolStats.config.getBoolean("enabled.elytra-tag")) {
@@ -103,13 +110,25 @@ public class PickupItem implements Listener {
             container.set(toolStats.hash, PersistentDataType.STRING, hash);
         }
 
+        // get the current lore the item
+        List<Component> lore;
+        if (meta.hasLore()) {
+            lore = meta.lore();
+        } else {
+            lore = new ArrayList<>();
+        }
+
         container.set(toolStats.timeCreated, PersistentDataType.LONG, timeCreated);
         container.set(toolStats.itemOwner, new UUIDDataType(), owner.getUniqueId());
         container.set(toolStats.originType, PersistentDataType.INTEGER, 4);
         container.remove(toolStats.newElytra);
+
         String formattedDate = toolStats.numberFormat.formatDate(finalDate);
-        List<Component> newLore = toolStats.itemLore.addNewOwner(meta, owner.getName(), formattedDate);
-        meta.lore(newLore);
+        Component dateCreatedLore = toolStats.configTools.formatLore("looted.found-on", "{date}", formattedDate);
+        Component itemOwnerLore = toolStats.configTools.formatLore("looted.found-by", "{player}", owner.getName());
+        lore.add(dateCreatedLore);
+        lore.add(itemOwnerLore);
+        meta.lore(lore);
         finalItem.setItemMeta(meta);
         return finalItem;
     }

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

@@ -34,6 +34,7 @@ import org.bukkit.inventory.meta.ItemMeta;
 import org.bukkit.persistence.PersistentDataContainer;
 import org.bukkit.persistence.PersistentDataType;
 
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
@@ -56,7 +57,7 @@ public class PlayerFish implements Listener {
         }
 
         Player player = event.getPlayer();
-        if (player.getGameMode() == GameMode.CREATIVE || player.getGameMode() == GameMode.SPECTATOR) {
+        if (player.getGameMode() == GameMode.CREATIVE && !toolStats.config.getBoolean("allow-creative")) {
             return;
         }
 
@@ -88,7 +89,7 @@ public class PlayerFish implements Listener {
         ItemStack caughtItem = ((Item) event.getCaught()).getItemStack();
         Item caughtItemEntity = (Item) event.getCaught();
         if (toolStats.itemChecker.isValidItem(caughtItem.getType())) {
-            ItemStack newItem = addNewLore(caughtItem, player);
+            ItemStack newItem = addFishedOrigin(caughtItem, player);
             if (newItem != null) {
                 caughtItemEntity.setItemStack(newItem);
             }
@@ -102,36 +103,65 @@ public class PlayerFish implements Listener {
      * @param owner        The player who caught it.
      * @return A copy of the new item with lore.
      */
-    private ItemStack addNewLore(ItemStack originalItem, Player owner) {
+    private ItemStack addFishedOrigin(ItemStack originalItem, Player owner) {
         ItemStack newItem = originalItem.clone();
         ItemMeta meta = originalItem.getItemMeta();
         if (meta == null) {
             return null;
         }
         long timeCreated = System.currentTimeMillis();
-        Date finalDate = new Date(timeCreated);
-        PersistentDataContainer container = meta.getPersistentDataContainer();
-
-        if (!toolStats.configTools.checkConfig(newItem.getType(), "fished-tag")) {
-            return null;
+        Date finalDate;
+        if (toolStats.config.getBoolean("normalize-time-creation")) {
+            finalDate = toolStats.numberFormat.normalizeTime(timeCreated);
+            timeCreated = finalDate.getTime();
+        } else {
+            finalDate = new Date(timeCreated);
         }
+        PersistentDataContainer container = meta.getPersistentDataContainer();
 
         if (container.has(toolStats.timeCreated, PersistentDataType.LONG) || container.has(toolStats.itemOwner, PersistentDataType.LONG)) {
             return null;
         }
 
-        // only make the hash if it's enabled
+        // get the current lore the item
+        List<Component> lore;
+        if (meta.hasLore()) {
+            lore = meta.lore();
+        } else {
+            lore = new ArrayList<>();
+        }
+
+        if (toolStats.configTools.checkConfig(newItem.getType(), "fished-on")) {
+            container.set(toolStats.timeCreated, PersistentDataType.LONG, timeCreated);
+            container.set(toolStats.originType, PersistentDataType.INTEGER, 5);
+
+            String date = toolStats.numberFormat.formatDate(finalDate);
+            Component newLine = toolStats.configTools.formatLore("fished.caught-on", "{date}", date);
+            if (newLine == null) {
+                return null;
+            }
+            lore.add(newLine);
+            meta.lore(lore);
+        }
+
+        if (toolStats.configTools.checkConfig(newItem.getType(), "fished-by")) {
+            container.set(toolStats.itemOwner, new UUIDDataType(), owner.getUniqueId());
+            container.set(toolStats.originType, PersistentDataType.INTEGER, 5);
+
+            Component newLine = toolStats.configTools.formatLore("fished.caught-by", "{player}", owner.getName());
+            if (newLine == null) {
+                return null;
+            }
+            lore.add(newLine);
+            meta.lore(lore);
+        }
+
+        // if hash is enabled, add it
         if (toolStats.config.getBoolean("generate-hash-for-items")) {
             String hash = toolStats.hashMaker.makeHash(newItem.getType(), owner.getUniqueId(), timeCreated);
             container.set(toolStats.hash, PersistentDataType.STRING, hash);
         }
 
-        container.set(toolStats.timeCreated, PersistentDataType.LONG, timeCreated);
-        container.set(toolStats.itemOwner, new UUIDDataType(), owner.getUniqueId());
-        container.set(toolStats.originType, PersistentDataType.INTEGER, 5);
-        String formattedDate = toolStats.numberFormat.formatDate(finalDate);
-        List<Component> newLore = toolStats.itemLore.addNewOwner(meta, owner.getName(), formattedDate);
-        meta.lore(newLore);
         newItem.setItemMeta(meta);
         return newItem;
     }

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

@@ -58,7 +58,7 @@ public class PlayerInteract implements Listener {
         }
 
         Player player = event.getPlayer();
-        if (player.getGameMode() == GameMode.CREATIVE || player.getGameMode() == GameMode.SPECTATOR) {
+        if (player.getGameMode() == GameMode.CREATIVE && !toolStats.config.getBoolean("allow-creative")) {
             return;
         }
         // store when a player opens a chest
@@ -72,7 +72,7 @@ public class PlayerInteract implements Listener {
     public void onInteract(PlayerInteractEntityEvent event) {
         Entity clicked = event.getRightClicked();
         Player player = event.getPlayer();
-        if (player.getGameMode() == GameMode.CREATIVE || player.getGameMode() == GameMode.SPECTATOR) {
+        if (player.getGameMode() == GameMode.CREATIVE && !toolStats.config.getBoolean("allow-creative")) {
             return;
         }
         // store when a player opens a minecart

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

@@ -18,7 +18,6 @@
 package lol.hyper.toolstats.events;
 
 import lol.hyper.toolstats.ToolStats;
-import org.bukkit.Material;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
@@ -40,7 +39,7 @@ public class PrepareCraft implements Listener {
         // get the items in the crafting grid
         ItemStack[] grid = event.getInventory().getMatrix();
         for (ItemStack item : grid) {
-            if (item == null || item.getType() != Material.PAPER) {
+            if (item == null) {
                 continue;
             }
             ItemMeta meta = item.getItemMeta();

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

@@ -45,7 +45,7 @@ public class SheepShear implements Listener {
             return;
         }
         Player player = event.getPlayer();
-        if (player.getGameMode() == GameMode.CREATIVE || player.getGameMode() == GameMode.SPECTATOR) {
+        if (player.getGameMode() == GameMode.CREATIVE && !toolStats.config.getBoolean("allow-creative")) {
             return;
         }
         Entity entity = event.getRightClicked();

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

@@ -46,7 +46,7 @@ public class ShootBow implements Listener {
             return;
         }
 
-        if (player.getGameMode() == GameMode.CREATIVE || player.getGameMode() == GameMode.ADVENTURE) {
+        if (player.getGameMode() == GameMode.CREATIVE && !toolStats.config.getBoolean("allow-creative")) {
             return;
         }
 

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

@@ -35,6 +35,7 @@ import org.bukkit.inventory.meta.ItemMeta;
 import org.bukkit.persistence.PersistentDataContainer;
 import org.bukkit.persistence.PersistentDataType;
 
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
@@ -126,29 +127,58 @@ public class VillagerTrade implements Listener {
             return null;
         }
         long timeCreated = System.currentTimeMillis();
-        Date finalDate = new Date(timeCreated);
+        Date finalDate;
+        if (toolStats.config.getBoolean("normalize-time-creation")) {
+            finalDate = toolStats.numberFormat.normalizeTime(timeCreated);
+            timeCreated = finalDate.getTime();
+        } else {
+            finalDate = new Date(timeCreated);
+        }
         PersistentDataContainer container = meta.getPersistentDataContainer();
 
         if (container.has(toolStats.timeCreated, PersistentDataType.LONG) || container.has(toolStats.itemOwner, PersistentDataType.LONG)) {
             return null;
         }
 
-        if (!toolStats.configTools.checkConfig(newItem.getType(), "traded-tag")) {
-            return null;
+        // get the current lore the item
+        List<Component> lore;
+        if (meta.hasLore()) {
+            lore = meta.lore();
+        } else {
+            lore = new ArrayList<>();
         }
 
-        // only make the hash if it's enabled
+        if (toolStats.configTools.checkConfig(newItem.getType(), "traded-on")) {
+            container.set(toolStats.timeCreated, PersistentDataType.LONG, timeCreated);
+            container.set(toolStats.originType, PersistentDataType.INTEGER, 3);
+
+            String date = toolStats.numberFormat.formatDate(finalDate);
+            Component newLine = toolStats.configTools.formatLore("traded.traded-on", "{date}", date);
+            if (newLine == null) {
+                return null;
+            }
+            lore.add(newLine);
+            meta.lore(lore);
+        }
+
+        if (toolStats.configTools.checkConfig(newItem.getType(), "traded-by")) {
+            container.set(toolStats.itemOwner, new UUIDDataType(), owner.getUniqueId());
+            container.set(toolStats.originType, PersistentDataType.INTEGER, 3);
+
+            Component newLine = toolStats.configTools.formatLore("traded.traded-by", "{player}", owner.getName());
+            if (newLine == null) {
+                return null;
+            }
+            lore.add(newLine);
+            meta.lore(lore);
+        }
+
+        // if hash is enabled, add it
         if (toolStats.config.getBoolean("generate-hash-for-items")) {
             String hash = toolStats.hashMaker.makeHash(newItem.getType(), owner.getUniqueId(), timeCreated);
             container.set(toolStats.hash, PersistentDataType.STRING, hash);
         }
 
-        container.set(toolStats.timeCreated, PersistentDataType.LONG, timeCreated);
-        container.set(toolStats.itemOwner, new UUIDDataType(), owner.getUniqueId());
-        container.set(toolStats.originType, PersistentDataType.INTEGER, 3);
-        String formattedDate = toolStats.numberFormat.formatDate(finalDate);
-        List<Component> newLore = toolStats.itemLore.addNewOwner(meta, owner.getName(), formattedDate);
-        meta.lore(newLore);
         newItem.setItemMeta(meta);
         return newItem;
     }

src/main/java/lol/hyper/toolstats/tools/ItemLore.java

@@ -102,131 +102,6 @@ public class ItemLore {
         return newLore;
     }
 
-    /**
-     * Adds new ownership to an item.
-     *
-     * @param itemMeta      The item meta.
-     * @param playerName    The new owner of item.
-     * @param formattedDate The date of the ownership.
-     * @return The item's new lore.
-     */
-    public List<Component> addNewOwner(ItemMeta itemMeta, String playerName, String formattedDate) {
-        Component dateCreatedLore;
-        Component itemOwnerLore;
-        Integer origin = null;
-        PersistentDataContainer container = itemMeta.getPersistentDataContainer();
-        if (container.has(toolStats.originType, PersistentDataType.INTEGER)) {
-            origin = container.get(toolStats.originType, PersistentDataType.INTEGER);
-        }
-
-        // if the origin is broken, don't try to set the lore
-        if (origin == null) {
-            toolStats.logger.info("Unable to determine origin for item " + itemMeta.getAsString());
-            toolStats.logger.info("This IS a bug, please report this to the GitHub.");
-            return itemMeta.lore();
-        }
-
-        // set the lore based on the origin
-        switch (origin) {
-            case 2: {
-                dateCreatedLore = toolStats.configTools.formatLore("looted.looted-on", "{date}", formattedDate);
-                itemOwnerLore = toolStats.configTools.formatLore("looted.looted-by", "{player}", playerName);
-
-                if (dateCreatedLore == null) {
-                    toolStats.logger.warning("messages.looted.looted-on is not set in your config!");
-                    toolStats.logger.warning("Unable to update lore for item.");
-                    return itemMeta.lore();
-                }
-                if (itemOwnerLore == null) {
-                    toolStats.logger.warning("messages.looted.looted-by is not set in your config!");
-                    toolStats.logger.warning("Unable to update lore for item.");
-                    return itemMeta.lore();
-                }
-                break;
-            }
-            case 3: {
-                dateCreatedLore = toolStats.configTools.formatLore("traded.traded-on", "{date}", formattedDate);
-                itemOwnerLore = toolStats.configTools.formatLore("traded.traded-by", "{player}", playerName);
-
-                if (dateCreatedLore == null) {
-                    toolStats.logger.warning("messages.traded.traded-on is not set in your config!");
-                    toolStats.logger.warning("Unable to update lore for item.");
-                    return itemMeta.lore();
-                }
-                if (itemOwnerLore == null) {
-                    toolStats.logger.warning("messages.traded.traded-by is not set in your config!");
-                    toolStats.logger.warning("Unable to update lore for item.");
-                    return itemMeta.lore();
-                }
-                break;
-            }
-            case 4: {
-                dateCreatedLore = toolStats.configTools.formatLore("looted.found-on", "{date}", formattedDate);
-                itemOwnerLore = toolStats.configTools.formatLore("looted.found-by", "{player}", playerName);
-
-                if (dateCreatedLore == null) {
-                    toolStats.logger.warning("messages.looted.found-on is not set in your config!");
-                    toolStats.logger.warning("Unable to update lore for item.");
-                    return itemMeta.lore();
-                }
-                if (itemOwnerLore == null) {
-                    toolStats.logger.warning("messages.looted.found-by is not set in your config!");
-                    toolStats.logger.warning("Unable to update lore for item.");
-                    return itemMeta.lore();
-                }
-                break;
-            }
-            case 5: {
-                dateCreatedLore = toolStats.configTools.formatLore("fished.caught-on", "{date}", formattedDate);
-                itemOwnerLore = toolStats.configTools.formatLore("fished.caught-by", "{player}", playerName);
-
-                if (dateCreatedLore == null) {
-                    toolStats.logger.warning("messages.fished.caught-on is not set in your config!");
-                    toolStats.logger.warning("Unable to update lore for item.");
-                    return itemMeta.lore();
-                }
-                if (itemOwnerLore == null) {
-                    toolStats.logger.warning("messages.fished.caught-by is not set in your config!");
-                    toolStats.logger.warning("Unable to update lore for item.");
-                    return itemMeta.lore();
-                }
-                break;
-            }
-            case 6: {
-                dateCreatedLore = toolStats.configTools.formatLore("spawned-in.spawned-on", "{date}", formattedDate);
-                itemOwnerLore = toolStats.configTools.formatLore("spawned-in.spawned-by", "{player}", playerName);
-
-                if (dateCreatedLore == null) {
-                    toolStats.logger.warning("messages.spawned-in.spawned-on is not set in your config!");
-                    toolStats.logger.warning("Unable to update lore for item.");
-                    return itemMeta.lore();
-                }
-                if (itemOwnerLore == null) {
-                    toolStats.logger.warning("messages.spawned-in.spawned-by is not set in your config!");
-                    toolStats.logger.warning("Unable to update lore for item.");
-                    return itemMeta.lore();
-                }
-                break;
-            }
-            default: {
-                toolStats.logger.warning("Origin " + origin + " was found. Data was modified OR something REALLY broke.");
-                toolStats.logger.warning(itemMeta.getAsString());
-                return itemMeta.lore();
-            }
-        }
-
-        List<Component> newLore;
-        if (itemMeta.hasLore()) {
-            newLore = itemMeta.lore();
-        } else {
-            newLore = new ArrayList<>();
-        }
-
-        newLore.add(dateCreatedLore);
-        newLore.add(itemOwnerLore);
-        return newLore;
-    }
-
     /**
      * Add x to the crops mined stat.
      *

src/main/java/lol/hyper/toolstats/tools/NumberFormat.java

@@ -22,6 +22,10 @@ import lol.hyper.toolstats.ToolStats;
 import java.text.DecimalFormat;
 import java.text.DecimalFormatSymbols;
 import java.text.SimpleDateFormat;
+import java.time.Instant;
+import java.time.LocalDate;
+import java.time.ZoneId;
+import java.time.ZonedDateTime;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Locale;
@@ -35,6 +39,7 @@ public class NumberFormat {
 
     /**
      * Utility class to format different numbers
+     *
      * @param toolStats Plugin instance.
      */
     public NumberFormat(ToolStats toolStats) {
@@ -140,8 +145,9 @@ public class NumberFormat {
     }
 
     /**
-     * Returns a human readable form of time in milliseconds.
-     * E.g. given 3752348000L outputs 1 years, 5 months, 3 days, 14 hours, 12 minutes, 28 seconds.
+     * Returns a human-readable form of time in milliseconds.
+     * E.g. given 3752348000L outputs 1 year, 5 months, 3 days, 14 hours, 12 minutes, 28 seconds.
+     *
      * @param time The time in ms.
      * @return Map with units as keys and time value, e.g. "years" (key) -> 1 (value)
      */
@@ -155,7 +161,7 @@ public class NumberFormat {
         long totalSeconds = time / 1000;
 
         Map<String, String> timeUnits = new HashMap<>();
-        
+
         long years = totalSeconds / (DAYS_PER_YEAR * HOURS_PER_DAY * MINUTES_PER_HOUR * SECONDS_PER_MINUTE);
         if (years > 0) {
             timeUnits.put("years", Long.toString(years));
@@ -190,7 +196,16 @@ public class NumberFormat {
         if (seconds > 0 || timeUnits.isEmpty()) {  // Always include seconds if everything else is zero
             timeUnits.put("seconds", Long.toString(seconds));
         }
-        
+
         return timeUnits;
     }
+
+    public Date normalizeTime(Long time) {
+        Instant instant = Instant.ofEpochMilli(time);
+        ZoneId zone = ZoneId.systemDefault();
+
+        LocalDate localDate = instant.atZone(zone).toLocalDate();
+        ZonedDateTime midnight = localDate.atStartOfDay(zone);
+        return Date.from(midnight.toInstant());
+    }
 }

src/main/java/lol/hyper/toolstats/tools/TokenData.java

@@ -17,104 +17,110 @@
 
 package lol.hyper.toolstats.tools;
 
+import io.papermc.paper.datacomponent.DataComponentTypes;
+import io.papermc.paper.datacomponent.item.CustomModelData;
 import lol.hyper.toolstats.ToolStats;
+import net.kyori.adventure.text.Component;
 import org.bukkit.Material;
 import org.bukkit.NamespacedKey;
+import org.bukkit.configuration.ConfigurationSection;
+import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.ShapedRecipe;
+import org.bukkit.inventory.meta.ItemMeta;
+import org.bukkit.persistence.PersistentDataContainer;
+import org.bukkit.persistence.PersistentDataType;
 
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.Set;
+import java.util.*;
 
-public class TokenCrafting {
+public class TokenData {
 
     private final ToolStats toolStats;
     private final Set<ShapedRecipe> recipes = new HashSet<>();
     private final ArrayList<String> tokenTypes = new ArrayList<>();
 
-    public TokenCrafting(ToolStats toolStats) {
+    public TokenData(ToolStats toolStats) {
         this.toolStats = toolStats;
     }
 
     public void setup() {
         NamespacedKey playerKillsKey = new NamespacedKey(toolStats, "player-kills-token");
-        ShapedRecipe playerKillRecipe = new ShapedRecipe(playerKillsKey, toolStats.tokenItems.playerKills());
+        ShapedRecipe playerKillRecipe = new ShapedRecipe(playerKillsKey, createToken("player-kills"));
         playerKillRecipe.shape(" P ", "PSP", " P ");
         playerKillRecipe.setIngredient('P', Material.PAPER);
         playerKillRecipe.setIngredient('S', Material.WOODEN_SWORD);
         recipes.add(playerKillRecipe);
 
         NamespacedKey mobKillsKey = new NamespacedKey(toolStats, "mob-kills-token");
-        ShapedRecipe mobKillsRecipe = new ShapedRecipe(mobKillsKey, toolStats.tokenItems.mobKills());
+        ShapedRecipe mobKillsRecipe = new ShapedRecipe(mobKillsKey, createToken("mob-kills"));
         mobKillsRecipe.shape(" P ", "PRP", " P ");
         mobKillsRecipe.setIngredient('P', Material.PAPER);
         mobKillsRecipe.setIngredient('R', Material.ROTTEN_FLESH);
         recipes.add(mobKillsRecipe);
 
         NamespacedKey blocksMinedKey = new NamespacedKey(toolStats, "blocks-mined-token");
-        ShapedRecipe blocksMinedRecipe = new ShapedRecipe(blocksMinedKey, toolStats.tokenItems.blocksMined());
+        ShapedRecipe blocksMinedRecipe = new ShapedRecipe(blocksMinedKey, createToken("blocks-mined"));
         blocksMinedRecipe.shape(" P ", "PSP", " P ");
         blocksMinedRecipe.setIngredient('P', Material.PAPER);
         blocksMinedRecipe.setIngredient('S', Material.WOODEN_PICKAXE);
         recipes.add(blocksMinedRecipe);
 
         NamespacedKey cropsMinedKey = new NamespacedKey(toolStats, "crops-mined-token");
-        ShapedRecipe cropsMinedRecipe = new ShapedRecipe(cropsMinedKey, toolStats.tokenItems.cropsMined());
+        ShapedRecipe cropsMinedRecipe = new ShapedRecipe(cropsMinedKey, createToken("crops-mined"));
         cropsMinedRecipe.shape(" P ", "PHP", " P ");
         cropsMinedRecipe.setIngredient('P', Material.PAPER);
         cropsMinedRecipe.setIngredient('H', Material.WOODEN_HOE);
         recipes.add(cropsMinedRecipe);
 
         NamespacedKey fishCaughtKey = new NamespacedKey(toolStats, "fish-caught-token");
-        ShapedRecipe fishCaughtRecipe = new ShapedRecipe(fishCaughtKey, toolStats.tokenItems.fishCaught());
+        ShapedRecipe fishCaughtRecipe = new ShapedRecipe(fishCaughtKey, createToken("fish-caught"));
         fishCaughtRecipe.shape(" P ", "PCP", " P ");
         fishCaughtRecipe.setIngredient('P', Material.PAPER);
         fishCaughtRecipe.setIngredient('C', Material.COD);
         recipes.add(fishCaughtRecipe);
 
         NamespacedKey sheepShearedKey = new NamespacedKey(toolStats, "sheep-sheared-token");
-        ShapedRecipe sheepShearedRecipe = new ShapedRecipe(sheepShearedKey, toolStats.tokenItems.sheepSheared());
+        ShapedRecipe sheepShearedRecipe = new ShapedRecipe(sheepShearedKey, createToken("sheep-sheared"));
         sheepShearedRecipe.shape(" P ", "PWP", " P ");
         sheepShearedRecipe.setIngredient('P', Material.PAPER);
         sheepShearedRecipe.setIngredient('W', Material.WHITE_WOOL);
         recipes.add(sheepShearedRecipe);
 
         NamespacedKey armorDamageKey = new NamespacedKey(toolStats, "damage-taken-token");
-        ShapedRecipe armorDamageRecipe = new ShapedRecipe(armorDamageKey, toolStats.tokenItems.damageTaken());
+        ShapedRecipe armorDamageRecipe = new ShapedRecipe(armorDamageKey, createToken("damage-taken"));
         armorDamageRecipe.shape(" P ", "PCP", " P ");
         armorDamageRecipe.setIngredient('P', Material.PAPER);
         armorDamageRecipe.setIngredient('C', Material.LEATHER_CHESTPLATE);
         recipes.add(armorDamageRecipe);
 
         NamespacedKey damageDoneKey = new NamespacedKey(toolStats, "damage-done-token");
-        ShapedRecipe damageDoneRecipe = new ShapedRecipe(damageDoneKey, toolStats.tokenItems.damageDone());
+        ShapedRecipe damageDoneRecipe = new ShapedRecipe(damageDoneKey, createToken("damage-done"));
         damageDoneRecipe.shape(" P ", "PSP", " P ");
         damageDoneRecipe.setIngredient('P', Material.PAPER);
         damageDoneRecipe.setIngredient('S', Material.SHIELD);
         recipes.add(damageDoneRecipe);
 
         NamespacedKey arrowsShotKey = new NamespacedKey(toolStats, "arrows-shot-token");
-        ShapedRecipe arrowsShotRecipe = new ShapedRecipe(arrowsShotKey, toolStats.tokenItems.arrowsShot());
+        ShapedRecipe arrowsShotRecipe = new ShapedRecipe(arrowsShotKey, createToken("arrows-shot"));
         arrowsShotRecipe.shape(" P ", "PAP", " P ");
         arrowsShotRecipe.setIngredient('P', Material.PAPER);
         arrowsShotRecipe.setIngredient('A', Material.ARROW);
         recipes.add(arrowsShotRecipe);
 
         NamespacedKey flightTimeKey = new NamespacedKey(toolStats, "flight-time-token");
-        ShapedRecipe flightTimeRecipe = new ShapedRecipe(flightTimeKey, toolStats.tokenItems.flightTime());
+        ShapedRecipe flightTimeRecipe = new ShapedRecipe(flightTimeKey, createToken("flight-time"));
         flightTimeRecipe.shape(" P ", "PFP", " P ");
         flightTimeRecipe.setIngredient('P', Material.PAPER);
         flightTimeRecipe.setIngredient('F', Material.FEATHER);
         recipes.add(flightTimeRecipe);
 
         NamespacedKey resetKey = new NamespacedKey(toolStats, "reset-token");
-        ShapedRecipe resetRecipe = new ShapedRecipe(resetKey, toolStats.tokenItems.resetToken());
+        ShapedRecipe resetRecipe = new ShapedRecipe(resetKey, createToken("reset"));
         resetRecipe.shape(" P ", "PPP", " P ");
         resetRecipe.setIngredient('P', Material.PAPER);
         recipes.add(resetRecipe);
 
         NamespacedKey removeKey = new NamespacedKey(toolStats, "remove-token");
-        ShapedRecipe removeRecipe = new ShapedRecipe(removeKey, toolStats.tokenItems.removeToken());
+        ShapedRecipe removeRecipe = new ShapedRecipe(removeKey, createToken("remove"));
         removeRecipe.shape(" P ", "P P", " P ");
         removeRecipe.setIngredient('P', Material.PAPER);
         recipes.add(removeRecipe);
@@ -140,4 +146,79 @@ public class TokenCrafting {
     public ArrayList<String> getTokenTypes() {
         return tokenTypes;
     }
+
+    public ItemStack createToken(String tokenType) {
+        // we don't have to check if the token exists
+        // we do that prior
+        ConfigurationSection tokenConfig = toolStats.config.getConfigurationSection("tokens.data." + tokenType);
+
+        String materialFromConfig = tokenConfig.getString("material");
+        if (materialFromConfig == null) {
+            toolStats.logger.warning("Could not find material config for token " + tokenType);
+            toolStats.logger.warning("Using PAPER as default.");
+            materialFromConfig = "PAPER";
+        }
+        Material material = Material.getMaterial(materialFromConfig);
+        if (material == null) {
+            toolStats.logger.warning("Material " + materialFromConfig + " is not a valid Minecraft material.");
+            toolStats.logger.warning("Using PAPER as default.");
+            material = Material.PAPER;
+        }
+
+        ItemStack token = new ItemStack(material);
+        ItemMeta tokenMeta = token.getItemMeta();
+        PersistentDataContainer tokenData = tokenMeta.getPersistentDataContainer();
+
+        // set the title and lore
+        Component title = toolStats.configTools.format("tokens.data." + tokenType + ".title");
+        List<Component> lore = toolStats.configTools.getTokenLore(tokenType);
+        tokenMeta.displayName(title);
+        tokenMeta.lore(lore);
+
+        // set the PDC
+        tokenData.set(toolStats.tokenType, PersistentDataType.STRING, tokenType);
+        token.setItemMeta(tokenMeta);
+
+        // set the custom model data
+        if (tokenConfig.getBoolean("custom-model-data.enabled")) {
+            String type = tokenConfig.getString("custom-model-data.type");
+            Object value = tokenConfig.get("custom-model-data.value");
+            if (type == null || value == null) {
+                toolStats.logger.info("Could not find custom model data for token " + tokenType);
+                toolStats.logger.info("Type: " + type);
+                toolStats.logger.info("Value: " + value);
+                return null;
+            }
+            CustomModelData data = setData(type, value);
+            if (data != null) {
+                token.setData(DataComponentTypes.CUSTOM_MODEL_DATA, data);
+            } else {
+                return null;
+            }
+        }
+
+        return token;
+    }
+
+    private CustomModelData setData(String type, Object data) {
+        switch (type.toLowerCase(Locale.ROOT)) {
+            case "float": {
+                float f;
+                try {
+                    f = Float.parseFloat(data.toString());
+                } catch (NumberFormatException e) {
+                    toolStats.logger.info(data + " is not a valid float!");
+                    return null;
+                }
+                return CustomModelData.customModelData().addFloat(f).build();
+            }
+            case "string": {
+                return CustomModelData.customModelData().addString(data.toString()).build();
+            }
+            default: {
+                toolStats.logger.info(data + " is not a valid data type!");
+                return null;
+            }
+        }
+    }
 }

src/main/java/lol/hyper/toolstats/tools/config/ConfigTools.java

@@ -49,6 +49,11 @@ public class ConfigTools {
      * @return If we want to add data or not.
      */
     public boolean checkConfig(Material material, String configName) {
+        if (toolStats.config.getConfigurationSection("enabled." + configName) == null) {
+            toolStats.logger.warning("Missing config section for enabled" + configName);
+            return false;
+        }
+
         String itemName = material.toString().toLowerCase();
         String itemType = null;
         // hardcode these
@@ -75,7 +80,6 @@ public class ConfigTools {
         } else {
             itemType = itemName.substring(itemName.indexOf('_') + 1);
         }
-
         return switch (itemType) {
             case "pickaxe" -> toolStats.config.getBoolean("enabled." + configName + ".pickaxe");
             case "sword" -> toolStats.config.getBoolean("enabled." + configName + ".sword");
@@ -240,6 +244,13 @@ public class ConfigTools {
 
         List<Component> finalLore = new ArrayList<>();
         for (String line : raw) {
+            if (line.contains("{levels}")) {
+                Integer levels = toolStats.config.getInt("tokens.data." + tokenType + ".levels");
+                // will return 0 if it doesn't exist
+                if (levels != 0) {
+                    line = line.replace("{levels}", String.valueOf(levels));
+                }
+            }
             Component component;
             // if we match the old color codes, then format them as so
             Matcher hexMatcher = CONFIG_HEX_PATTERN.matcher(line);

src/main/java/lol/hyper/toolstats/tools/config/ConfigUpdater.java

@@ -31,35 +31,15 @@ public class ConfigUpdater {
     public void updateConfig() {
         int version = toolStats.config.getInt("config-version");
 
-        // Version 5 to 6
-        if (version == 5) {
-            Version6 version6 = new Version6(toolStats);
-            version6.update();
-        }
-        // Version 6 to 7
-        if (version == 6) {
-            Version7 version7 = new Version7(toolStats);
-            version7.update();
-        }
-        // Version 7 to 8
-        if (version == 7) {
-            Version8 version8 = new Version8(toolStats);
-            version8.update();
-        }
-        // Version 8 to 9
-        if (version == 8) {
-            Version9 version9 = new Version9(toolStats);
-            version9.update();
-        }
-        // Version 9 to 10
-        if (version == 9) {
-            Version10 version10 = new Version10(toolStats);
-            version10.update();
-        }
-        // Version 10 to 11
-        if (version == 10) {
-            Version11 version11 = new Version11(toolStats);
-            version11.update();
+        switch (version) {
+            case 5 -> new Version6(toolStats).update(); // 5 to 6
+            case 6 -> new Version7(toolStats).update(); // 6 to 7
+            case 7 -> new Version8(toolStats).update(); // 7 to 8
+            case 8 -> new Version9(toolStats).update(); // 8 to 9
+            case 9 -> new Version10(toolStats).update(); // 9 to 10
+            case 10 -> new Version11(toolStats).update(); // 10 to 11
+            case 11 -> new Version12(toolStats).update(); // 11 to 12
+            case 12 -> new Version13(toolStats).update(); // 12 to 13
         }
     }
 }

src/main/java/lol/hyper/toolstats/tools/config/TokenItems.java

@@ -1,253 +0,0 @@
-/*
- * 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.config;
-
-import lol.hyper.toolstats.ToolStats;
-import net.kyori.adventure.text.Component;
-import org.bukkit.Material;
-import org.bukkit.inventory.ItemStack;
-import org.bukkit.inventory.meta.ItemMeta;
-import org.bukkit.persistence.PersistentDataContainer;
-import org.bukkit.persistence.PersistentDataType;
-
-import java.util.List;
-
-public class TokenItems {
-
-    private final ToolStats toolStats;
-
-    public TokenItems(ToolStats toolStats) {
-        this.toolStats = toolStats;
-    }
-
-    public ItemStack playerKills() {
-        // set up the item
-        ItemStack token = new ItemStack(Material.PAPER);
-        ItemMeta tokenMeta = token.getItemMeta();
-        PersistentDataContainer tokenData = tokenMeta.getPersistentDataContainer();
-
-        // set the title and lore
-        Component title = toolStats.configTools.format("tokens.data.player-kills.title");
-        List<Component> lore = toolStats.configTools.getTokenLore("player-kills");
-        tokenMeta.displayName(title);
-        tokenMeta.lore(lore);
-
-        // set the PDC
-        tokenData.set(toolStats.tokenType, PersistentDataType.STRING, "player-kills");
-        token.setItemMeta(tokenMeta);
-        return token;
-    }
-
-    public ItemStack mobKills() {
-        // set up the item
-        ItemStack token = new ItemStack(Material.PAPER);
-        ItemMeta tokenMeta = token.getItemMeta();
-        PersistentDataContainer tokenData = tokenMeta.getPersistentDataContainer();
-
-        // set the title and lore
-        Component title = toolStats.configTools.format("tokens.data.mob-kills.title");
-        List<Component> lore = toolStats.configTools.getTokenLore("mob-kills");
-        tokenMeta.displayName(title);
-        tokenMeta.lore(lore);
-
-        // set the PDC
-        tokenData.set(toolStats.tokenType, PersistentDataType.STRING, "mob-kills");
-        token.setItemMeta(tokenMeta);
-        return token;
-    }
-
-    public ItemStack blocksMined() {
-        // set up the item
-        ItemStack token = new ItemStack(Material.PAPER);
-        ItemMeta tokenMeta = token.getItemMeta();
-        PersistentDataContainer tokenData = tokenMeta.getPersistentDataContainer();
-
-        // set the title and lore
-        Component title = toolStats.configTools.format("tokens.data.blocks-mined.title");
-        List<Component> lore = toolStats.configTools.getTokenLore("blocks-mined");
-        tokenMeta.displayName(title);
-        tokenMeta.lore(lore);
-
-        // set the PDC
-        tokenData.set(toolStats.tokenType, PersistentDataType.STRING, "blocks-mined");
-        token.setItemMeta(tokenMeta);
-        return token;
-    }
-
-    public ItemStack cropsMined() {
-        // set up the item
-        ItemStack token = new ItemStack(Material.PAPER);
-        ItemMeta tokenMeta = token.getItemMeta();
-        PersistentDataContainer tokenData = tokenMeta.getPersistentDataContainer();
-
-        // set the title and lore
-        Component title = toolStats.configTools.format("tokens.data.crops-mined.title");
-        List<Component> lore = toolStats.configTools.getTokenLore("crops-mined");
-        tokenMeta.displayName(title);
-        tokenMeta.lore(lore);
-
-        // set the PDC
-        tokenData.set(toolStats.tokenType, PersistentDataType.STRING, "crops-mined");
-        token.setItemMeta(tokenMeta);
-        return token;
-    }
-
-    public ItemStack fishCaught() {
-        // set up the item
-        ItemStack token = new ItemStack(Material.PAPER);
-        ItemMeta tokenMeta = token.getItemMeta();
-        PersistentDataContainer tokenData = tokenMeta.getPersistentDataContainer();
-
-        // set the title and lore
-        Component title = toolStats.configTools.format("tokens.data.fish-caught.title");
-        List<Component> lore = toolStats.configTools.getTokenLore("fight-caught");
-        tokenMeta.displayName(title);
-        tokenMeta.lore(lore);
-
-        // set the PDC
-        tokenData.set(toolStats.tokenType, PersistentDataType.STRING, "fish-caught");
-        token.setItemMeta(tokenMeta);
-        return token;
-    }
-
-    public ItemStack sheepSheared() {
-        // set up the item
-        ItemStack token = new ItemStack(Material.PAPER);
-        ItemMeta tokenMeta = token.getItemMeta();
-        PersistentDataContainer tokenData = tokenMeta.getPersistentDataContainer();
-
-        // set the title and lore
-        Component title = toolStats.configTools.format("tokens.data.sheep-sheared.title");
-        List<Component> lore = toolStats.configTools.getTokenLore("sheep-sheared");
-        tokenMeta.displayName(title);
-        tokenMeta.lore(lore);
-
-        // set the PDC
-        tokenData.set(toolStats.tokenType, PersistentDataType.STRING, "sheep-sheared");
-        token.setItemMeta(tokenMeta);
-        return token;
-    }
-
-    public ItemStack damageTaken() {
-        // set up the item
-        ItemStack token = new ItemStack(Material.PAPER);
-        ItemMeta tokenMeta = token.getItemMeta();
-        PersistentDataContainer tokenData = tokenMeta.getPersistentDataContainer();
-
-        // set the title and lore
-        Component title = toolStats.configTools.format("tokens.data.damage-taken.title");
-        List<Component> lore = toolStats.configTools.getTokenLore("damage-taken");
-        tokenMeta.displayName(title);
-        tokenMeta.lore(lore);
-
-        // set the PDC
-        tokenData.set(toolStats.tokenType, PersistentDataType.STRING, "damage-taken");
-        token.setItemMeta(tokenMeta);
-        return token;
-    }
-
-    public ItemStack damageDone() {
-        // set up the item
-        ItemStack token = new ItemStack(Material.PAPER);
-        ItemMeta tokenMeta = token.getItemMeta();
-        PersistentDataContainer tokenData = tokenMeta.getPersistentDataContainer();
-
-        // set the title and lore
-        Component title = toolStats.configTools.format("tokens.data.damage-done.title");
-        List<Component> lore = toolStats.configTools.getTokenLore("damage-done");
-        tokenMeta.displayName(title);
-        tokenMeta.lore(lore);
-
-        // set the PDC
-        tokenData.set(toolStats.tokenType, PersistentDataType.STRING, "damage-done");
-        token.setItemMeta(tokenMeta);
-        return token;
-    }
-
-    public ItemStack arrowsShot() {
-        // set up the item
-        ItemStack token = new ItemStack(Material.PAPER);
-        ItemMeta tokenMeta = token.getItemMeta();
-        PersistentDataContainer tokenData = tokenMeta.getPersistentDataContainer();
-
-        // set the title and lore
-        Component title = toolStats.configTools.format("tokens.data.arrows-shot.title");
-        List<Component> lore = toolStats.configTools.getTokenLore("arrows-shot");
-        tokenMeta.displayName(title);
-        tokenMeta.lore(lore);
-
-        // set the PDC
-        tokenData.set(toolStats.tokenType, PersistentDataType.STRING, "arrows-shot");
-        token.setItemMeta(tokenMeta);
-        return token;
-    }
-
-    public ItemStack flightTime() {
-        // set up the item
-        ItemStack token = new ItemStack(Material.PAPER);
-        ItemMeta tokenMeta = token.getItemMeta();
-        PersistentDataContainer tokenData = tokenMeta.getPersistentDataContainer();
-
-        // set the title and lore
-        Component title = toolStats.configTools.format("tokens.data.flight-time.title");
-        List<Component> lore = toolStats.configTools.getTokenLore("flight-time");
-        tokenMeta.displayName(title);
-        tokenMeta.lore(lore);
-
-        // set the PDC
-        tokenData.set(toolStats.tokenType, PersistentDataType.STRING, "flight-time");
-        token.setItemMeta(tokenMeta);
-        return token;
-    }
-
-    public ItemStack resetToken() {
-        // set up the item
-        ItemStack token = new ItemStack(Material.PAPER);
-        ItemMeta tokenMeta = token.getItemMeta();
-        PersistentDataContainer tokenData = tokenMeta.getPersistentDataContainer();
-
-        // set the title and lore
-        Component title = toolStats.configTools.format("tokens.data.reset.title");
-        List<Component> lore = toolStats.configTools.getTokenLore("reset");
-        tokenMeta.displayName(title);
-        tokenMeta.lore(lore);
-
-        // set the PDC
-        tokenData.set(toolStats.tokenType, PersistentDataType.STRING, "reset");
-        token.setItemMeta(tokenMeta);
-        return token;
-    }
-
-    public ItemStack removeToken() {
-        // set up the item
-        ItemStack token = new ItemStack(Material.PAPER);
-        ItemMeta tokenMeta = token.getItemMeta();
-        PersistentDataContainer tokenData = tokenMeta.getPersistentDataContainer();
-
-        // set the title and lore
-        Component title = toolStats.configTools.format("tokens.data.remove.title");
-        List<Component> lore = toolStats.configTools.getTokenLore("remove");
-        tokenMeta.displayName(title);
-        tokenMeta.lore(lore);
-
-        // set the PDC
-        tokenData.set(toolStats.tokenType, PersistentDataType.STRING, "remove");
-        token.setItemMeta(tokenMeta);
-        return token;
-    }
-}

src/main/java/lol/hyper/toolstats/tools/config/versions/Version12.java

@@ -0,0 +1,117 @@
+/*
+ * 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.config.versions;
+
+import lol.hyper.toolstats.ToolStats;
+import org.bukkit.configuration.ConfigurationSection;
+
+import java.io.File;
+import java.io.IOException;
+
+public class Version12 {
+
+    private final ToolStats toolStats;
+
+    /**
+     * Used for updating from version 11 to 12.
+     *
+     * @param toolStats ToolStats instance.
+     */
+    public Version12(ToolStats toolStats) {
+        this.toolStats = toolStats;
+    }
+
+    /**
+     * Perform the config update.
+     */
+    public void update() {
+        // save the old config first
+        try {
+            toolStats.config.save("plugins" + File.separator + "ToolStats" + File.separator + "config-11.yml");
+        } catch (IOException exception) {
+            toolStats.logger.severe("Unable to save config-11.yml!");
+            throw new RuntimeException(exception);
+        }
+
+        toolStats.logger.info("Updating config.yml to version 12.");
+        toolStats.config.set("config-version", 12);
+
+        transfer("enabled.created-by", "enabled.crafted-by");
+        transfer("enabled.created-date", "enabled.crafted-on");
+
+        transfer("enabled.fished-tag", "enabled.fished-by");
+        transfer("enabled.fished-tag", "enabled.fished-on");
+
+        transfer("enabled.looted-tag", "enabled.looted-by");
+        transfer("enabled.looted-tag", "enabled.looted-on");
+
+        transfer("enabled.traded-tag", "enabled.traded-by");
+        transfer("enabled.traded-tag", "enabled.traded-on");
+
+        transfer("enabled.spawned-in", "enabled.spawned-in-by");
+        transfer("enabled.spawned-in", "enabled.spawned-in-on");
+
+        transfer("messages.created", "messages.crafted");
+
+        toolStats.config.set("enabled.created-by", null);
+        toolStats.config.set("enabled.created-date", null);
+        toolStats.config.set("enabled.fished-tag", null);
+        toolStats.config.set("enabled.looted-tag", null);
+        toolStats.config.set("enabled.traded-tag", null);
+        toolStats.config.set("enabled.spawned-in", null);
+
+        toolStats.logger.info("Adding enabled.dropped-on");
+        boolean droppedBy = toolStats.config.getBoolean("enabled.dropped-by");
+        toolStats.config.set("enabled.dropped-on", droppedBy);
+
+        toolStats.logger.info("Adding messages.dropped-on");
+        toolStats.config.set("messages.dropped-on", "&7Dropped on: &8{date}");
+
+
+        // rename crafted to crafted here
+        // copy the old ones first
+        String craftedByMessage = toolStats.config.getString("messages.created.created-by");
+        String craftedOnMessage = toolStats.config.getString("messages.created.created-on");
+
+        toolStats.config.set("messages.created", null);
+        toolStats.config.set("messages.crafted.created-by", null);
+        toolStats.config.set("messages.crafted.created-on", null);
+
+        toolStats.config.set("messages.crafted.crafted-by", craftedByMessage);
+        toolStats.config.set("messages.crafted.crafted-on", craftedOnMessage);
+
+        toolStats.logger.info("Adding normalize-time-creation");
+        toolStats.config.set("normalize-time-creation", false);
+
+        // save the config and reload it
+        try {
+            toolStats.config.save("plugins" + File.separator + "ToolStats" + File.separator + "config.yml");
+        } catch (IOException exception) {
+            toolStats.logger.severe("Unable to save config.yml!");
+            throw new RuntimeException(exception);
+        }
+        toolStats.loadConfig();
+        toolStats.logger.info("Config has been updated to version 12. A copy of version 11 has been saved as config-11.yml");
+    }
+
+    private void transfer(String oldSection, String newSection) {
+        toolStats.logger.info("Moving " + oldSection + " to " + newSection);
+        ConfigurationSection old = toolStats.config.getConfigurationSection(oldSection);
+        toolStats.config.set(newSection, old);
+    }
+}

src/main/java/lol/hyper/toolstats/tools/config/versions/Version13.java

@@ -0,0 +1,74 @@
+/*
+ * 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.config.versions;
+
+import lol.hyper.toolstats.ToolStats;
+
+import java.io.File;
+import java.io.IOException;
+
+public class Version13 {
+
+    private final ToolStats toolStats;
+
+    /**
+     * Used for updating from version 12 to 13.
+     *
+     * @param toolStats ToolStats instance.
+     */
+    public Version13(ToolStats toolStats) {
+        this.toolStats = toolStats;
+    }
+
+    /**
+     * Perform the config update.
+     */
+    public void update() {
+        // save the old config first
+        try {
+            toolStats.config.save("plugins" + File.separator + "ToolStats" + File.separator + "config-12.yml");
+        } catch (IOException exception) {
+            toolStats.logger.severe("Unable to save config-12.yml!");
+            throw new RuntimeException(exception);
+        }
+
+        toolStats.logger.info("Updating config.yml to version 13.");
+        toolStats.config.set("config-version", 13);
+
+        for (String key : toolStats.config.getConfigurationSection("tokens.data").getKeys(false)) {
+            toolStats.logger.info("Adding tokens.data." + key + ".material");
+            toolStats.config.set("tokens.data." + key + ".material", "PAPER");
+            toolStats.logger.info("Adding tokens.data." + key + ".custom-model-data.enabled");
+            toolStats.config.set("tokens.data." + key + ".custom-model-data.enabled", false);
+            toolStats.logger.info("Adding tokens.data." + key + ".custom-model-data.type");
+            toolStats.config.set("tokens.data." + key + ".custom-model-data.type", "float");
+            toolStats.logger.info("Adding tokens.data." + key + ".custom-model-data.value");
+            toolStats.config.set("tokens.data." + key + ".custom-model-data.value", 1001);
+        }
+
+        // save the config and reload it
+        try {
+            toolStats.config.save("plugins" + File.separator + "ToolStats" + File.separator + "config.yml");
+        } catch (IOException exception) {
+            toolStats.logger.severe("Unable to save config.yml!");
+            throw new RuntimeException(exception);
+        }
+        toolStats.loadConfig();
+        toolStats.logger.info("Config has been updated to version 13. A copy of version 12 has been saved as config-12.yml");
+    }
+}

src/main/resources/config.yml

@@ -8,66 +8,138 @@ tokens:
       title: "&7ToolStats: &8Player Kills Token"
       lore:
         - "&8Combine with a melee or ranged weapon in an anvil to track player kills."
+        - "&8Uses &7{levels} &8level."
       levels: 1
+      material: PAPER
+      custom-model-data:
+        enabled: false
+        type: float
+        value: 1001
     mob-kills:
       title: "&7ToolStats: &8Mob Kills Token"
       lore:
         - "&8Combine with a melee or ranged weapon in an anvil to track mob kills."
+        - "&8Uses &7{levels} &8level."
       levels: 1
+      material: PAPER
+      custom-model-data:
+        enabled: false
+        type: float
+        value: 1001
     blocks-mined:
       title: "&7ToolStats: &8Blocks Mined Token"
       lore:
         - "&8Combine with a pickaxe, axe, shovel, or shears in an anvil to track blocks mined."
+        - "&8Uses &7{levels} &8level."
       levels: 1
+      material: PAPER
+      custom-model-data:
+        enabled: false
+        type: float
+        value: 1001
     crops-mined:
       title: "&7ToolStats: &8Crops Mined Token"
       lore:
         - "&8Combine with a hoe in an anvil to track crops broken."
+        - "&8Uses &7{levels} &8level."
       levels: 1
+      material: PAPER
+      custom-model-data:
+        enabled: false
+        type: float
+        value: 1001
     fish-caught:
       title: "&7ToolStats: &8Fish Caught Token"
       lore:
         - "&8Combine with a fishing rod in an anvil to track fish caught."
+        - "&8Uses &7{levels} &8level."
       levels: 1
+      material: PAPER
+      custom-model-data:
+        enabled: false
+        type: float
+        value: 1001
     sheep-sheared:
       title: "&7ToolStats: &8Sheep Sheared Token"
       lore:
         - "&8Combine with shears in an anvil to track sheep sheared."
+        - "&8Uses &7{levels} &8level."
       levels: 1
+      material: PAPER
+      custom-model-data:
+        enabled: false
+        type: float
+        value: 1001
     damage-taken:
       title: "&7ToolStats: &8Damage Taken Token"
       lore:
         - "&8Combine with an armor piece in an anvil to track damage taken."
+        - "&8Uses &7{levels} &8level."
       levels: 1
+      material: PAPER
+      custom-model-data:
+        enabled: false
+        type: float
+        value: 1001
     damage-done:
       title: "&7ToolStats: &8Damage Done Token"
       lore:
         - "&8Combine with a melee or ranged weapon in an anvil to track damage done."
+        - "&8Uses &7{levels} &8level."
       levels: 1
+      material: PAPER
+      custom-model-data:
+        enabled: false
+        type: float
+        value: 1001
     arrows-shot:
       title: "&7ToolStats: &8Arrows Shot Token"
       lore:
         - "&8Combine with a bow or crossbow in an anvil to track arrows shot."
+        - "&8Uses &7{levels} &8level."
       levels: 1
+      material: PAPER
+      custom-model-data:
+        enabled: false
+        type: float
+        value: 1001
     flight-time:
       title: "&7ToolStats: &8Flight Time Token"
       lore:
         - "&8Combine with an elytra in an anvil to track flight time."
+        - "&8Uses &7{levels} &8level."
       levels: 1
+      material: PAPER
+      custom-model-data:
+        enabled: false
+        type: float
+        value: 1001
     reset:
       title: "&7ToolStats: &8Reset Token"
       lore:
         - "&8Combine in an anvil with to reset ALL stats for this item. Tokens on this item stay."
+        - "&8Uses &7{levels} &8level."
       levels: 1
+      material: PAPER
+      custom-model-data:
+        enabled: false
+        type: float
+        value: 1001
     remove:
       title: "&7ToolStats: &8Remove Token"
       lore:
         - "&8Combine in an anvil with to REMOVE ALL stats and tokens for this item."
+        - "&8Uses &7{levels} &8level."
       levels: 1
+      material: PAPER
+      custom-model-data:
+        enabled: false
+        type: float
+        value: 1001
 
 enabled:
-  # Will show ownership of items when they are created/found.
-  created-by:
+  # Will show "Crafted by <player>"
+  crafted-by:
     pickaxe: true
     sword: true
     shovel: true
@@ -78,8 +150,8 @@ enabled:
     armor: true
     mace: true
     fishing-rod: true
-  # Will show time the item is created
-  created-date:
+  # Will show "Crafted on <date>"
+  crafted-on:
     pickaxe: true
     sword: true
     shovel: true
@@ -91,7 +163,18 @@ enabled:
     mace: true
     fishing-rod: true
   # Will show "Fished by <player>"
-  fished-tag:
+  fished-by:
+    pickaxe: true
+    sword: true
+    shovel: true
+    axe: true
+    hoe: true
+    shears: true
+    bow: true
+    armor: true
+    fishing-rod: true
+  # Will show "Fished on <date>"
+  fished-on:
     pickaxe: true
     sword: true
     shovel: true
@@ -102,7 +185,7 @@ enabled:
     armor: true
     fishing-rod: true
   # Will show "Found by <player>"
-  looted-tag:
+  looted-by:
     pickaxe: true
     sword: true
     shovel: true
@@ -112,8 +195,30 @@ enabled:
     bow: true
     armor: true
     fishing-rod: true
-  # Will show "Trade by <player>"
-  traded-tag:
+  # Will show "Found on <date>"
+  looted-on:
+    pickaxe: true
+    sword: true
+    shovel: true
+    axe: true
+    hoe: true
+    shears: true
+    bow: true
+    armor: true
+    fishing-rod: true
+  # Will show "Traded by <player>"
+  traded-by:
+    pickaxe: true
+    sword: true
+    shovel: true
+    axe: true
+    hoe: true
+    shears: true
+    bow: true
+    armor: true
+    fishing-rod: true
+  # Will show "Traded on <date>"
+  traded-on:
     pickaxe: true
     sword: true
     shovel: true
@@ -148,7 +253,19 @@ enabled:
     hoe: true
     shears: true
   # Will show "Spawned in by <player>"
-  spawned-in:
+  spawned-in-by:
+    pickaxe: true
+    sword: true
+    shovel: true
+    axe: true
+    hoe: true
+    shears: true
+    bow: true
+    armor: true
+    mace: true
+    fishing-rod: true
+  # Will show "Spawned in on <date>"
+  spawned-in-on:
     pickaxe: true
     sword: true
     shovel: true
@@ -163,15 +280,16 @@ enabled:
   sheep-sheared: true
   armor-damage: true
   dropped-by: true
+  dropped-on: true
   elytra-tag: true
   arrows-shot: true
   flight-time: true
   crops-harvested: true
 
 messages:
-  created:
-    created-by: "&7Crafted by: &8{player}"
-    created-on: "&7Crafted on: &8{date}"
+  crafted:
+    crafted-by: "&7Crafted by: &8{player}"
+    crafted-on: "&7Crafted on: &8{date}"
   fished:
     caught-by: "&7Caught by: &8{player}"
     caught-on: "&7Caught on: &8{date}"
@@ -193,7 +311,8 @@ messages:
   blocks-mined: "&7Blocks mined: &8{blocks}"
   crops-harvested: "&7Crops harvested: &8{crops}"
   sheep-sheared: "&7Sheep sheared: &8{sheep}"
-  dropped-by: "&7Dropped by: &8{name}" # name will be player/mob name
+  dropped-by: "&7Dropped by: &8{name}" # name will be mob name
+  dropped-on: "&7Dropped on: &8{date}"
   damage-taken: "&7Damage taken: &8{damage}"
   arrows-shot: "&7Arrows shot: &8{arrows}"
   flight-time: "&7Flight time: &8{years}y {months}m {days}d {hours}h {minutes}m {seconds}s"
@@ -220,4 +339,11 @@ number-formats:
 # This has no use currently, but can be used for future features for dupe detection.
 generate-hash-for-items: false
 
-config-version: 11
+# Make when items are created at midnight on the date.
+# This makes dates for items more "normalized" instead of being at different times.
+normalize-time-creation: false
+
+# Allows stats and origins to be tracked if the player is in creative mode.
+allow-creative: false
+
+config-version: 13

src/main/resources/plugin.yml

@@ -25,4 +25,10 @@ permissions:
     default: true
   toolstats.givetokens:
     description: Allows the usage of /toolstats givetoken.
+    default: op
+  toolstats.edit:
+    description: Allows the usage of /toolstats edit.
+    default: op
+  toolstats.remove:
+    description: Allows the usage of /toolstats remove.
     default: op