Update pom.xml

closes #6

pom.xml

@@ -23,7 +23,7 @@
 
     <groupId>lol.hyper</groupId>
     <artifactId>toolstats</artifactId>
-    <version>1.3.1</version>
+    <version>1.3.4</version>
     <packaging>jar</packaging>
 
     <name>ToolStats</name>
@@ -51,7 +51,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.9.0</version>
+                <version>3.10.0</version>
                 <configuration>
                     <source>${java.version}</source>
                     <target>${java.version}</target>

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

@@ -57,8 +57,6 @@ public final class ToolStats extends JavaPlugin {
     // used for tracking new elytras
     public final NamespacedKey newElytra = new NamespacedKey(this, "new");
 
-    public final Set<NamespacedKey> keys = new HashSet<>();
-
     public BlocksMined blocksMined;
     public ChunkPopulate chunkPopulate;
     public CraftItem craftItem;
@@ -111,15 +109,6 @@ public final class ToolStats extends JavaPlugin {
         new Metrics(this, 14110);
 
         Bukkit.getScheduler().runTaskAsynchronously(this, this::checkForUpdates);
-
-        keys.add(genericOwner);
-        keys.add(timeCreated);
-        keys.add(swordPlayerKills);
-        keys.add(swordMobKills);
-        keys.add(genericMined);
-        keys.add(fishingRodCaught);
-        keys.add(shearsSheared);
-        keys.add(armorDamage);
     }
 
     public void loadConfig() {

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

@@ -51,6 +51,7 @@ public class CommandToolStats implements TabExecutor {
         }
         if (args.length == 0) {
             sender.sendMessage(ChatColor.GREEN + "ToolStats version " + toolStats.getDescription().getVersion() + ". Created by hyperdefined.");
+            return true;
         }
         switch (args[0]) {
             case "reload": {
@@ -129,6 +130,25 @@ public class CommandToolStats implements TabExecutor {
                 }
             }
         }
+
+        // hard code elytras
+        if (finalItem.getType() == Material.ELYTRA) {
+            if (toolStats.config.getBoolean("enabled.elytra-tag")) {
+                lore.add(toolStats.getLoreFromConfig("looted.found-by", true).replace("{player}", player.getName()));
+                if (container.has(toolStats.timeCreated, PersistentDataType.LONG)) {
+                    Long time = container.get(toolStats.timeCreated, PersistentDataType.LONG);
+                    if (time != null) {
+                        lore.add(toolStats.getLoreFromConfig("looted.found-on", true).replace("{date}", format.format(new Date(time))));
+                    }
+                }
+                finalMeta.setLore(lore);
+                finalItem.setItemMeta(finalMeta);
+                int slot = player.getInventory().getHeldItemSlot();
+                player.getInventory().setItem(slot, finalItem);
+                return;
+            }
+        }
+
         if (toolStats.checkConfig(original, "created-by")) {
             if (container.has(toolStats.genericOwner, new UUIDDataType())) {
                 container.set(toolStats.genericOwner, new UUIDDataType(), player.getUniqueId());
@@ -143,7 +163,7 @@ public class CommandToolStats implements TabExecutor {
                         break;
                     }
                     case "LOOTED": {
-                        lore.add(toolStats.getLoreFromConfig("looted.looted-by", true).replace("{player}", player.getName()));
+                        lore.add(toolStats.getLoreFromConfig("looted.found-by", true).replace("{player}", player.getName()));
                         break;
                     }
                     case "TRADED": {
@@ -156,26 +176,25 @@ public class CommandToolStats implements TabExecutor {
         if (toolStats.checkConfig(original, "created-date")) {
             if (container.has(toolStats.timeCreated, PersistentDataType.LONG)) {
                 Long time = container.get(toolStats.timeCreated, PersistentDataType.LONG);
-                if (time == null) {
+                if (time != null) {
-                    return;
+                    // show how when the item was created based on the previous lore
-                }
+                    switch (type) {
-                // show how when the item was created based on the previous lore
+                        case "DEFAULT": {
-                switch (type) {
+                            lore.add(toolStats.getLoreFromConfig("created.created-on", true).replace("{date}", format.format(new Date(time))));
-                    case "DEFAULT": {
+                            break;
-                        lore.add(toolStats.getLoreFromConfig("created.created-on", true).replace("{date}", format.format(new Date(time))));
+                        }
-                        break;
+                        case "CAUGHT": {
-                    }
+                            lore.add(toolStats.getLoreFromConfig("fished.caught-on", true).replace("{date}", format.format(new Date(time))));
-                    case "CAUGHT": {
+                            break;
-                        lore.add(toolStats.getLoreFromConfig("fished.caught-on", true).replace("{date}", format.format(new Date(time))));
+                        }
-                        break;
+                        case "LOOTED": {
-                    }
+                            lore.add(toolStats.getLoreFromConfig("looted.foundon", true).replace("{date}", format.format(new Date(time))));
-                    case "LOOTED": {
+                            break;
-                        lore.add(toolStats.getLoreFromConfig("looted.looted-on", true).replace("{date}", format.format(new Date(time))));
+                        }
-                        break;
+                        case "TRADED": {
-                    }
+                            lore.add(toolStats.getLoreFromConfig("traded.traded-on", true).replace("{date}", format.format(new Date(time))));
-                    case "TRADED": {
+                            break;
-                        lore.add(toolStats.getLoreFromConfig("traded.traded-on", true).replace("{date}", format.format(new Date(time))));
+                        }
-                        break;
                     }
                 }
             }
@@ -183,59 +202,55 @@ public class CommandToolStats implements TabExecutor {
         if (toolStats.checkConfig(original, "player-kills")) {
             if (container.has(toolStats.swordPlayerKills, PersistentDataType.INTEGER)) {
                 Integer kills = container.get(toolStats.swordPlayerKills, PersistentDataType.INTEGER);
-                if (kills == null) {
+                if (kills != null) {
-                    return;
+                    lore.add(toolStats.getLoreFromConfig("kills.player", true).replace("{kills}", Integer.toString(kills)));
                 }
-                lore.add(toolStats.getLoreFromConfig("kills.player", true).replace("{kills}", Integer.toString(kills)));
             }
         }
         if (toolStats.checkConfig(original, "mob-kills")) {
             if (container.has(toolStats.swordMobKills, PersistentDataType.INTEGER)) {
                 Integer kills = container.get(toolStats.swordMobKills, PersistentDataType.INTEGER);
-                if (kills == null) {
+                if (kills != null) {
-                    return;
+                    lore.add(toolStats.getLoreFromConfig("kills.mob", true).replace("{kills}", Integer.toString(kills)));
                 }
-                lore.add(toolStats.getLoreFromConfig("kills.mob", true).replace("{kills}", Integer.toString(kills)));
             }
         }
         if (toolStats.checkConfig(original, "blocks-mined")) {
             if (container.has(toolStats.genericMined, PersistentDataType.INTEGER)) {
                 Integer blocksMined = container.get(toolStats.genericMined, PersistentDataType.INTEGER);
-                if (blocksMined == null) {
+                if (blocksMined != null) {
-                    return;
+                    lore.add(toolStats.getLoreFromConfig("blocks-mined", true).replace("{blocks}", Integer.toString(blocksMined)));
                 }
-                lore.add(toolStats.getLoreFromConfig("blocks-mined", true).replace("{blocks}", Integer.toString(blocksMined)));
             }
         }
         if (toolStats.config.getBoolean("enabled.fish-caught")) {
             if (container.has(toolStats.fishingRodCaught, PersistentDataType.INTEGER)) {
                 Integer fish = container.get(toolStats.fishingRodCaught, PersistentDataType.INTEGER);
-                if (fish == null) {
+                if (fish != null) {
-                    return;
+                    lore.add(toolStats.getLoreFromConfig("fished.fish-caught", true).replace("{fish}", Integer.toString(fish)));
                 }
-                lore.add(toolStats.getLoreFromConfig("fished.fish-caught", true).replace("{fish}", Integer.toString(fish)));
             }
         }
         if (toolStats.config.getBoolean("enabled.sheep-sheared")) {
             if (container.has(toolStats.shearsSheared, PersistentDataType.INTEGER)) {
                 Integer sheep = container.get(toolStats.shearsSheared, PersistentDataType.INTEGER);
-                if (sheep == null) {
+                if (sheep != null) {
-                    return;
+                    lore.add(toolStats.getLoreFromConfig("sheep-sheared", true).replace("{sheep}", Integer.toString(sheep)));
                 }
-                lore.add(toolStats.getLoreFromConfig("sheep-sheared", true).replace("{sheep}", Integer.toString(sheep)));
             }
         }
         if (toolStats.config.getBoolean("enabled.armor-damage")) {
             if (container.has(toolStats.armorDamage, PersistentDataType.INTEGER)) {
                 Integer damage = container.get(toolStats.armorDamage, PersistentDataType.INTEGER);
-                if (damage == null) {
+                if (damage != null) {
-                    return;
+                    lore.add(toolStats.getLoreFromConfig("damage-taken", true).replace("{damage}", Integer.toString(damage)));
                 }
-                lore.add(toolStats.getLoreFromConfig("damage-taken", true).replace("{damage}", Integer.toString(damage)));
             }
         }
         finalMeta.setLore(lore);
         finalItem.setItemMeta(finalMeta);
+        int slot = player.getInventory().getHeldItemSlot();
+        player.getInventory().setItem(slot, finalItem);
     }
 
     @Nullable

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

@@ -126,7 +126,9 @@ public class EntityDamage implements Listener {
             PlayerInventory inventory = player.getInventory();
             for (ItemStack armor : inventory.getArmorContents()) {
                 if (armor != null) {
-                    updateArmorDamage(armor, event.getDamage());
+                    if (isArmor(armor.getType().toString().toLowerCase(Locale.ROOT))) {
+                        updateArmorDamage(armor, event.getFinalDamage());
+                    }
                 }
             }
         }
@@ -144,7 +146,9 @@ public class EntityDamage implements Listener {
             PlayerInventory inventory = player.getInventory();
             for (ItemStack armor : inventory.getArmorContents()) {
                 if (armor != null) {
-                    updateArmorDamage(armor, event.getDamage());
+                    if (isArmor(armor.getType().toString().toLowerCase(Locale.ROOT))) {
+                        updateArmorDamage(armor, event.getFinalDamage());
+                    }
                 }
             }
         }
@@ -162,7 +166,9 @@ public class EntityDamage implements Listener {
             PlayerInventory inventory = player.getInventory();
             for (ItemStack armor : inventory.getArmorContents()) {
                 if (armor != null) {
-                    updateArmorDamage(armor, event.getDamage());
+                    if (isArmor(armor.getType().toString().toLowerCase(Locale.ROOT))) {
+                        updateArmorDamage(armor, event.getFinalDamage());
+                    }
                 }
             }
         }
@@ -351,4 +357,13 @@ public class EntityDamage implements Listener {
         }
         itemStack.setItemMeta(meta);
     }
+
+    /**
+     * Check if item is an armor piece.
+     * @param itemType The item type, not name.
+     * @return If the item is an armor piece.
+     */
+    private boolean isArmor(String itemType) {
+        return itemType.endsWith("_helmet") || itemType.endsWith("_chestplate") || itemType.endsWith("_leggings") || itemType.endsWith("_boots");
+    }
 }

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

@@ -61,7 +61,6 @@ public class PickupItem implements Listener {
                 PersistentDataContainer container = meta.getPersistentDataContainer();
                 // the elytra has the new key, set the lore to it
                 if (container.has(toolStats.newElytra, PersistentDataType.INTEGER)) {
-                    container.remove(toolStats.newElytra);
                     addLore(itemStack, (Player) event.getEntity());
                 }
             }
@@ -83,6 +82,7 @@ public class PickupItem implements Listener {
         PersistentDataContainer container = meta.getPersistentDataContainer();
         container.set(toolStats.timeCreated, PersistentDataType.LONG, timeCreated);
         container.set(toolStats.genericOwner, new UUIDDataType(), owner.getUniqueId());
+        container.remove(toolStats.newElytra);
 
         String foundByLoreRaw = toolStats.getLoreFromConfig("looted.found-by", true);
         String foundOnLoreRaw = toolStats.getLoreFromConfig("looted.found-on", true);