Update pom.xml

apparently minecraft:kill runs in multiple entity damage events?

pom.xml

@@ -23,7 +23,7 @@
 
     <groupId>lol.hyper</groupId>
     <artifactId>toolstats</artifactId>
-    <version>1.4.2</version>
+    <version>1.4.4</version>
     <packaging>jar</packaging>
 
     <name>ToolStats</name>
@@ -121,14 +121,8 @@
         <dependency>
             <groupId>lol.hyper</groupId>
             <artifactId>github-release-api</artifactId>
-            <version>1.0.2</version>
+            <version>1.0.4</version>
             <scope>compile</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.json</groupId>
-                    <artifactId>json</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>net.kyori</groupId>
@@ -139,7 +133,7 @@
         <dependency>
             <groupId>net.kyori</groupId>
             <artifactId>adventure-platform-bukkit</artifactId>
-            <version>4.1.1</version>
+            <version>4.1.2</version>
             <scope>compile</scope>
         </dependency>
     </dependencies>

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

@@ -48,7 +48,7 @@ public class CommandToolStats implements TabExecutor {
 
     @Override
     public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, @NotNull String[] args) {
-        if (!sender.hasPermission("toolstats.use")) {
+        if (!sender.hasPermission("toolstats.command")) {
             audiences.sender(sender).sendMessage(Component.text("You do not have permission for this command.").color(NamedTextColor.RED));
             return true;
         }
@@ -67,7 +67,15 @@ public class CommandToolStats implements TabExecutor {
                 return true;
             }
             case "reset": {
+                if (!sender.hasPermission("toolstats.reset")) {
+                    audiences.sender(sender).sendMessage(Component.text("You do not have permission for this command.").color(NamedTextColor.RED));
+                    return true;
+                }
                 if (args.length == 2 && args[1].equalsIgnoreCase("confirm")) {
+                    if (!sender.hasPermission("toolstats.reset.confirm")) {
+                        audiences.sender(sender).sendMessage(Component.text("You do not have permission for this command.").color(NamedTextColor.RED));
+                        return true;
+                    }
                     Player player = (Player) sender;
                     ItemStack heldItem = player.getInventory().getItemInMainHand();
                     if (heldItem.getType() == Material.AIR) {
@@ -263,13 +271,16 @@ public class CommandToolStats implements TabExecutor {
         if (args.length == 1) {
             if (sender.hasPermission("toolstats.reload")) {
                 return Arrays.asList("reset", "reload");
-            } else {
+            }
+            if (sender.hasPermission("toolstats.reset")) {
                 return Collections.singletonList("reset");
             }
         }
         if (args.length == 2) {
             if (args[0].equalsIgnoreCase("reset")) {
-                return Collections.singletonList("confirm");
+                if (sender.hasPermission("toolstats.reset.confirm")) {
+                    return Collections.singletonList("confirm");
+                }
             }
         }
         return null;

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

@@ -70,17 +70,18 @@ public class BlocksMined implements Listener {
         }
         // read the current stats from the item
         // if they don't exist, then start from 0
-        Integer blocksMined = 0;
+        Integer blocksMined = null;
         PersistentDataContainer container = meta.getPersistentDataContainer();
         if (container.has(toolStats.genericMined, PersistentDataType.INTEGER)) {
             blocksMined = container.get(toolStats.genericMined, PersistentDataType.INTEGER);
         }
         if (blocksMined == null) {
-            return;
-        } else {
-            blocksMined++;
+            blocksMined = 0;
         }
+
+        blocksMined++;
         container.set(toolStats.genericMined, PersistentDataType.INTEGER, blocksMined);
+
         String configLore = toolStats.getLoreFromConfig("blocks-mined", false);
         String configLoreRaw = toolStats.getLoreFromConfig("blocks-mined", true);
 

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

@@ -49,10 +49,18 @@ public class EntityDamage implements Listener {
         if (event.isCancelled()) {
             return;
         }
+
         if (!(event.getEntity() instanceof LivingEntity)) {
             return;
         }
         LivingEntity livingEntity = (LivingEntity) event.getEntity();
+
+        // ignore void and /kill damage
+        EntityDamageEvent.DamageCause cause = event.getCause();
+        if (cause == EntityDamageEvent.DamageCause.SUICIDE || cause == EntityDamageEvent.DamageCause.VOID) {
+            return;
+        }
+
         // mob is going to die
         if (livingEntity.getHealth() - event.getFinalDamage() <= 0) {
             // a player is killing something
@@ -141,6 +149,13 @@ public class EntityDamage implements Listener {
         if (!(event.getEntity() instanceof LivingEntity)) {
             return;
         }
+
+        // ignore void and /kill damage
+        EntityDamageEvent.DamageCause cause = event.getCause();
+        if (cause == EntityDamageEvent.DamageCause.SUICIDE || cause == EntityDamageEvent.DamageCause.VOID) {
+            return;
+        }
+
         LivingEntity livingEntity = (LivingEntity) event.getEntity();
         // player is taken damage but not being killed
         if (livingEntity instanceof Player) {
@@ -164,6 +179,13 @@ public class EntityDamage implements Listener {
         if (!(event.getEntity() instanceof LivingEntity)) {
             return;
         }
+
+        // ignore void and /kill damage
+        EntityDamageEvent.DamageCause cause = event.getCause();
+        if (cause == EntityDamageEvent.DamageCause.SUICIDE || cause == EntityDamageEvent.DamageCause.VOID) {
+            return;
+        }
+
         LivingEntity livingEntity = (LivingEntity) event.getEntity();
         // player is taken damage but not being killed
         if (livingEntity instanceof Player) {
@@ -194,16 +216,16 @@ public class EntityDamage implements Listener {
         if (meta == null) {
             return null;
         }
-        Integer playerKills = 0;
+        Integer playerKills = null;
         PersistentDataContainer container = meta.getPersistentDataContainer();
         if (container.has(toolStats.swordPlayerKills, PersistentDataType.INTEGER)) {
             playerKills = container.get(toolStats.swordPlayerKills, PersistentDataType.INTEGER);
         }
         if (playerKills == null) {
-            return null;
-        } else {
-            playerKills++;
+            playerKills = 0;
         }
+
+        playerKills++;
         container.set(toolStats.swordPlayerKills, PersistentDataType.INTEGER, playerKills);
 
         String playerKillsLore = toolStats.getLoreFromConfig("kills.player", false);
@@ -257,16 +279,16 @@ public class EntityDamage implements Listener {
         if (meta == null) {
             return null;
         }
-        Integer mobKills = 0;
+        Integer mobKills = null;
         PersistentDataContainer container = meta.getPersistentDataContainer();
         if (container.has(toolStats.swordMobKills, PersistentDataType.INTEGER)) {
             mobKills = container.get(toolStats.swordMobKills, PersistentDataType.INTEGER);
         }
         if (mobKills == null) {
-            return null;
-        } else {
-            mobKills++;
+            mobKills = 0;
         }
+
+        mobKills++;
         container.set(toolStats.swordMobKills, PersistentDataType.INTEGER, mobKills);
 
         String mobKillsLore = toolStats.getLoreFromConfig("kills.mob", false);
@@ -319,16 +341,16 @@ public class EntityDamage implements Listener {
         if (meta == null) {
             return;
         }
-        Double damageTaken = 0.0;
+        Double damageTaken = null;
         PersistentDataContainer container = meta.getPersistentDataContainer();
         if (container.has(toolStats.armorDamage, PersistentDataType.DOUBLE)) {
             damageTaken = container.get(toolStats.armorDamage, PersistentDataType.DOUBLE);
         }
         if (damageTaken == null) {
-            return;
-        } else {
-            damageTaken = damageTaken + damage;
+            damageTaken = 0.0;
         }
+
+        damageTaken = damageTaken + damage;
         container.set(toolStats.armorDamage, PersistentDataType.DOUBLE, damageTaken);
 
         String damageTakenLore = toolStats.getLoreFromConfig("damage-taken", false);

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

@@ -82,16 +82,16 @@ public class PlayerFish implements Listener {
         if (meta == null) {
             return;
         }
-        Integer fishCaught = 0;
+        Integer fishCaught = null;
         PersistentDataContainer container = meta.getPersistentDataContainer();
         if (container.has(toolStats.fishingRodCaught, PersistentDataType.INTEGER)) {
             fishCaught = container.get(toolStats.fishingRodCaught, PersistentDataType.INTEGER);
         }
         if (fishCaught == null) {
-            return;
-        } else {
-            fishCaught++;
+            fishCaught = 0;
         }
+
+        fishCaught++;
         container.set(toolStats.fishingRodCaught, PersistentDataType.INTEGER, fishCaught);
 
         String fishCaughtLore = toolStats.getLoreFromConfig("fished.fish-caught", false);

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

@@ -84,10 +84,10 @@ public class SheepShear implements Listener {
             sheepSheared = container.get(toolStats.shearsSheared, PersistentDataType.INTEGER);
         }
         if (sheepSheared == null) {
-            return;
-        } else {
-            sheepSheared++;
+            sheepSheared = 0;
         }
+
+        sheepSheared++;
         container.set(toolStats.shearsSheared, PersistentDataType.INTEGER, sheepSheared);
 
         String sheepShearedLore = toolStats.getLoreFromConfig("sheep-sheared", false);

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

@@ -78,7 +78,6 @@ public class VillagerTrade implements Listener {
                     if (newItem != null) {
                         // this gets delayed since villager inventories suck for no reason
                         Bukkit.getScheduler().runTaskLater(toolStats, () -> event.setCurrentItem(newItem), 5);
-                        return;
                     }
                 }
             }

src/main/resources/plugin.yml

@@ -7,12 +7,17 @@ description: Track various tool stats!
 commands:
   toolstats:
     usage: /toolstats
-    description: Main command.
-    permission: toolstats.main
+    permission: toolstats.command
 permissions:
-  toolstats.main:
-    description: Allows the usage of /toolstats
+  toolstats.command:
+    description: Allows the usage of /toolstats.
     default: true
   toolstats.reload:
-    description: Allows the usage of /toolstats reload
-    default: op
+    description: Allows the usage of /toolstats reload.
+    default: op
+  toolstats.reset:
+    description: Allows the usage of /toolstats reset.
+    default: true
+  toolstats.reset.confirm:
+    description: Allows the usage of /toolstats reset confirm.
+    default: true