fix: restore spigot chat listener

Reviewed-on: #4

.gitea/workflows/build.yml

@@ -23,7 +23,7 @@ jobs:
       - name: Set up Node
         uses: actions/setup-node@v4
         with:
-          node-version: 20
+          node-version: 22.14.0
 
       - name: Install Node dependencies
         run: npm install

Dockerfile

@@ -1,4 +1,4 @@
-FROM gradle:8.14-jdk21
+FROM gradle:9.3-jdk21
 
 WORKDIR /workspace
 

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.0-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradlew

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 #
-# Copyright © 2015-2021 the original authors.
+# Copyright © 2015 the original authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -114,7 +114,6 @@ case "$( uname )" in                #(
   NONSTOP* )        nonstop=true ;;
 esac
 
-CLASSPATH="\\\"\\\""
 
 
 # Determine the Java command to use to start the JVM.
@@ -172,7 +171,6 @@ fi
 # For Cygwin or MSYS, switch paths to Windows format before running java
 if "$cygwin" || "$msys" ; then
     APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
-    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
 
     JAVACMD=$( cygpath --unix "$JAVACMD" )
 
@@ -212,7 +210,6 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \
-        -classpath "$CLASSPATH" \
         -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
         "$@"
 

gradlew.bat

@@ -70,11 +70,10 @@ goto fail
 :execute
 @rem Setup the command line
 
-set CLASSPATH=
 
 
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
 
 :end
 @rem End local scope for the variables with windows NT shell

package.json

@@ -2,10 +2,10 @@
   "name": "prometheus-spigot",
   "private": true,
   "devDependencies": {
-    "@commitlint/cli": "^19.5.0",
-    "@commitlint/config-conventional": "^19.5.0",
-    "@semantic-release/exec": "^6.0.3",
+    "@commitlint/cli": "^20.0.0",
+    "@commitlint/config-conventional": "^20.0.0",
+    "@semantic-release/exec": "^7.0.0",
     "@semantic-release/git": "^10.0.1",
-    "semantic-release": "^23.1.1"
+    "semantic-release": "^25.0.0"
   }
 }

src/main/java/com/prometheus/spigot/PrometheusSpigotPlugin.java

@@ -9,6 +9,7 @@ import com.prometheus.spigot.listeners.CommandListener;
 import com.prometheus.spigot.listeners.ConnectionListener;
 import com.prometheus.spigot.listeners.CraftListener;
 import com.prometheus.spigot.listeners.DeathListener;
+import com.prometheus.spigot.listeners.EntityKillListener;
 import com.prometheus.spigot.listeners.MoveListener;
 import com.prometheus.spigot.listeners.PluginListener;
 import com.prometheus.spigot.metrics.MetricsRegistry;
@@ -82,6 +83,7 @@ public final class PrometheusSpigotPlugin extends JavaPlugin {
         pluginManager.registerEvents(new ChunkListener(metricsRegistry), this);
         pluginManager.registerEvents(new PluginListener(metricsRegistry), this);
         pluginManager.registerEvents(new CraftListener(metricsRegistry), this);
+        pluginManager.registerEvents(new EntityKillListener(metricsRegistry), this);
     }
 
     private void startHttpServer() {

src/main/java/com/prometheus/spigot/listeners/ChatListener.java

@@ -2,6 +2,7 @@ package com.prometheus.spigot.listeners;
 
 import com.prometheus.spigot.metrics.MetricsRegistry;
 import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
 import org.bukkit.event.player.AsyncPlayerChatEvent;
 
@@ -12,7 +13,7 @@ public final class ChatListener implements Listener {
         this.registry = registry;
     }
 
-    @EventHandler
+    @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
     public void onChat(AsyncPlayerChatEvent event) {
         registry.incrementChatMessages();
     }

src/main/java/com/prometheus/spigot/listeners/EntityKillListener.java

@@ -0,0 +1,22 @@
+package com.prometheus.spigot.listeners;
+
+import com.prometheus.spigot.metrics.MetricsRegistry;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.Listener;
+import org.bukkit.event.entity.EntityDeathEvent;
+
+public final class EntityKillListener implements Listener {
+    private final MetricsRegistry registry;
+
+    public EntityKillListener(MetricsRegistry registry) {
+        this.registry = registry;
+    }
+
+    @EventHandler
+    public void onEntityDeath(EntityDeathEvent event) {
+        Player killer = event.getEntity().getKiller();
+        String killerLabel = killer != null ? killer.getName() : "null";
+        registry.incrementEntityKill(event.getEntity().getType(), killerLabel);
+    }
+}

src/main/java/com/prometheus/spigot/metrics/MetricsRegistry.java

@@ -51,6 +51,7 @@ public final class MetricsRegistry {
     private final ConcurrentHashMap<String, LongAdder> commandsBlocked = new ConcurrentHashMap<>();
     private final ConcurrentHashMap<LabelPair, LongAdder> commandsExecuted = new ConcurrentHashMap<>();
     private final ConcurrentHashMap<String, LongAdder> itemsCraftedByMaterial = new ConcurrentHashMap<>();
+    private final ConcurrentHashMap<LabelPair, LongAdder> entityKills = new ConcurrentHashMap<>();
 
     public MetricsRegistry(Server server, boolean enableJvm, boolean enableProcess) {
         this.server = server;
@@ -133,6 +134,12 @@ public final class MetricsRegistry {
         incrementLabeledCounter(itemsCraftedByMaterial, material.name());
     }
 
+    public void incrementEntityKill(EntityType entityType, String killer) {
+        String normalizedEntity = normalizeLabel(entityType.name());
+        String normalizedKiller = normalizeLabel(killer);
+        entityKills.computeIfAbsent(new LabelPair(normalizedEntity, normalizedKiller), key -> new LongAdder()).increment();
+    }
+
     public void refreshEntitySnapshots() {
         Map<String, Long> entityCounts = new HashMap<>();
         Map<String, Long> tileCounts = new HashMap<>();
@@ -184,6 +191,7 @@ public final class MetricsRegistry {
         appendLabeledCounterAdder(builder, "spigot_commands_blocked_total", "Blocked commands by name", "command", commandsBlocked);
         appendLabeledCounterAdder(builder, "spigot_commands_executed_total", "Commands executed by source", "command", "source", commandsExecuted);
         appendLabeledCounterAdder(builder, "spigot_items_crafted_total", "Items crafted by material", "material", itemsCraftedByMaterial);
+        appendLabeledCounterAdder(builder, "spigot_entities_killed_total", "Entities killed by player", "entity", "killer", entityKills);
 
         appendGauge(builder, "spigot_players_online", "Online player count", server.getOnlinePlayers().size());
         appendGauge(builder, "spigot_players_max", "Max player slots", server.getMaxPlayers());