chore(deps): update dependency gradle to v8.14.4

.gitea/workflows/build.yml

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

Dockerfile

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

README.md

@@ -84,7 +84,6 @@ Some metrics depend on server implementations (TPS/MSPT, player ping, tile entit
 | --- | --- | --- | --- |
 | spigot_chat_messages_total | counter | none | Total chat messages sent |
 | spigot_player_movements_total | counter | none | Total player movement events |
-| spigot_player_movements_by_player_total | counter | player | Player movements by player |
 | spigot_players_joined_total | counter | none | Total player joins |
 | spigot_players_quit_total | counter | none | Total player quits |
 | spigot_chunk_loads_total | counter | none | Total chunk load events |
@@ -93,12 +92,6 @@ Some metrics depend on server implementations (TPS/MSPT, player ping, tile entit
 | spigot_plugin_enable_total | counter | none | Total plugin enable events |
 | spigot_plugin_disable_total | counter | none | Total plugin disable events |
 | spigot_blocks_broken_total | counter | material | Blocks broken by material |
-| spigot_blocks_broken_by_player_total | counter | player,material | Blocks broken by player and material |
-| spigot_blocks_placed_total | counter | material | Blocks placed by material |
-| spigot_blocks_placed_by_player_total | counter | player,material | Blocks placed by player and material |
-| spigot_items_crafted_total | counter | material | Items crafted by material |
-| spigot_items_crafted_by_player_total | counter | player,material | Items crafted by player and material |
-| spigot_entities_killed_total | counter | entity,killer | Entities killed by player |
 | spigot_player_deaths_total | counter | cause | Player deaths by cause |
 | spigot_player_logins_failed_total | counter | reason | Failed player logins by reason |
 | spigot_commands_blocked_total | counter | command | Blocked commands by name |

gradle/wrapper/gradle-wrapper.properties

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

gradlew

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 #
-# Copyright © 2015 the original authors.
+# Copyright © 2015-2021 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,6 +114,7 @@ case "$( uname )" in                #(
   NONSTOP* )        nonstop=true ;;
 esac
 
+CLASSPATH="\\\"\\\""
 
 
 # Determine the Java command to use to start the JVM.
@@ -171,6 +172,7 @@ 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" )
 
@@ -210,6 +212,7 @@ 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,10 +70,11 @@ 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%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
+"%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" %*
 
 :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": "^20.0.0",
-    "@commitlint/config-conventional": "^20.0.0",
-    "@semantic-release/exec": "^7.0.0",
+    "@commitlint/cli": "^19.5.0",
+    "@commitlint/config-conventional": "^19.5.0",
+    "@semantic-release/exec": "^6.0.3",
     "@semantic-release/git": "^10.0.1",
-    "semantic-release": "^25.0.0"
+    "semantic-release": "^23.1.1"
   }
 }

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

@@ -2,14 +2,11 @@ package com.prometheus.spigot;
 
 import com.prometheus.spigot.http.MetricsHttpHandler;
 import com.prometheus.spigot.listeners.BlockBreakListener;
-import com.prometheus.spigot.listeners.BlockPlaceListener;
 import com.prometheus.spigot.listeners.ChatListener;
 import com.prometheus.spigot.listeners.ChunkListener;
 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;
@@ -74,7 +71,6 @@ public final class PrometheusSpigotPlugin extends JavaPlugin {
     private void registerListeners() {
         var pluginManager = getServer().getPluginManager();
         pluginManager.registerEvents(new BlockBreakListener(metricsRegistry), this);
-        pluginManager.registerEvents(new BlockPlaceListener(metricsRegistry), this);
         pluginManager.registerEvents(new DeathListener(metricsRegistry), this);
         pluginManager.registerEvents(new ChatListener(metricsRegistry), this);
         pluginManager.registerEvents(new MoveListener(metricsRegistry, countBlockMovementOnly), this);
@@ -82,8 +78,6 @@ public final class PrometheusSpigotPlugin extends JavaPlugin {
         pluginManager.registerEvents(new CommandListener(metricsRegistry), this);
         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/BlockBreakListener.java

@@ -15,6 +15,5 @@ public final class BlockBreakListener implements Listener {
     @EventHandler
     public void onBlockBreak(BlockBreakEvent event) {
         registry.incrementBlocksBroken(event.getBlock().getType());
-        registry.incrementBlocksBroken(event.getBlock().getType(), event.getPlayer().getName());
     }
 }

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

@@ -1,20 +0,0 @@
-package com.prometheus.spigot.listeners;
-
-import com.prometheus.spigot.metrics.MetricsRegistry;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.Listener;
-import org.bukkit.event.block.BlockPlaceEvent;
-
-public final class BlockPlaceListener implements Listener {
-    private final MetricsRegistry registry;
-
-    public BlockPlaceListener(MetricsRegistry registry) {
-        this.registry = registry;
-    }
-
-    @EventHandler
-    public void onBlockPlace(BlockPlaceEvent event) {
-        registry.incrementBlocksPlaced(event.getBlockPlaced().getType());
-        registry.incrementBlocksPlaced(event.getBlockPlaced().getType(), event.getPlayer().getName());
-    }
-}

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

@@ -2,7 +2,6 @@ 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;
 
@@ -13,7 +12,7 @@ public final class ChatListener implements Listener {
         this.registry = registry;
     }
 
-    @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
+    @EventHandler
     public void onChat(AsyncPlayerChatEvent event) {
         registry.incrementChatMessages();
     }

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

@@ -1,29 +0,0 @@
-package com.prometheus.spigot.listeners;
-
-import com.prometheus.spigot.metrics.MetricsRegistry;
-import org.bukkit.Material;
-import org.bukkit.entity.Player;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.Listener;
-import org.bukkit.event.inventory.CraftItemEvent;
-import org.bukkit.inventory.ItemStack;
-
-public final class CraftListener implements Listener {
-    private final MetricsRegistry registry;
-
-    public CraftListener(MetricsRegistry registry) {
-        this.registry = registry;
-    }
-
-    @EventHandler
-    public void onCraft(CraftItemEvent event) {
-        ItemStack result = event.getRecipe() != null ? event.getRecipe().getResult() : null;
-        if (result == null || result.getType() == Material.AIR) {
-            return;
-        }
-        registry.incrementItemsCrafted(result.getType());
-        if (event.getWhoClicked() instanceof Player player) {
-            registry.incrementItemsCrafted(result.getType(), player.getName());
-        }
-    }
-}

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

@@ -1,22 +0,0 @@
-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/listeners/MoveListener.java

@@ -20,7 +20,6 @@ public final class MoveListener implements Listener {
             return;
         }
         registry.incrementPlayerMovements();
-        registry.incrementPlayerMovements(event.getPlayer().getName());
     }
 
     private boolean hasChangedBlock(PlayerMoveEvent event) {

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

@@ -44,18 +44,11 @@ public final class MetricsRegistry {
     private final LongAdder chunkGenerations = new LongAdder();
     private final LongAdder pluginEnables = new LongAdder();
     private final LongAdder pluginDisables = new LongAdder();
-    private final ConcurrentHashMap<String, LongAdder> blocksPlacedByMaterial = new ConcurrentHashMap<>();
     private final ConcurrentHashMap<String, LongAdder> blocksBrokenByMaterial = new ConcurrentHashMap<>();
-    private final ConcurrentHashMap<LabelPair, LongAdder> blocksBrokenByPlayerMaterial = new ConcurrentHashMap<>();
-    private final ConcurrentHashMap<LabelPair, LongAdder> blocksPlacedByPlayerMaterial = new ConcurrentHashMap<>();
     private final ConcurrentHashMap<String, LongAdder> deathsByCause = new ConcurrentHashMap<>();
     private final ConcurrentHashMap<String, LongAdder> loginFailuresByReason = new ConcurrentHashMap<>();
     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> itemsCraftedByPlayerMaterial = new ConcurrentHashMap<>();
-    private final ConcurrentHashMap<LabelPair, LongAdder> entityKills = new ConcurrentHashMap<>();
-    private final ConcurrentHashMap<String, LongAdder> playerMovementsByPlayer = new ConcurrentHashMap<>();
 
     public MetricsRegistry(Server server, boolean enableJvm, boolean enableProcess) {
         this.server = server;
@@ -76,10 +69,6 @@ public final class MetricsRegistry {
         playerMovements.increment();
     }
 
-    public void incrementPlayerMovements(String player) {
-        incrementLabeledCounter(playerMovementsByPlayer, player);
-    }
-
     public void incrementPlayerJoins() {
         playerJoins.increment();
     }
@@ -96,26 +85,6 @@ public final class MetricsRegistry {
         incrementLabeledCounter(blocksBrokenByMaterial, material.name());
     }
 
-    public void incrementBlocksBroken(Material material, String player) {
-        String normalizedMaterial = normalizeLabel(material.name());
-        String normalizedPlayer = normalizeLabel(player);
-        blocksBrokenByPlayerMaterial
-            .computeIfAbsent(new LabelPair(normalizedPlayer, normalizedMaterial), key -> new LongAdder())
-            .increment();
-    }
-
-    public void incrementBlocksPlaced(Material material) {
-        incrementLabeledCounter(blocksPlacedByMaterial, material.name());
-    }
-
-    public void incrementBlocksPlaced(Material material, String player) {
-        String normalizedMaterial = normalizeLabel(material.name());
-        String normalizedPlayer = normalizeLabel(player);
-        blocksPlacedByPlayerMaterial
-            .computeIfAbsent(new LabelPair(normalizedPlayer, normalizedMaterial), key -> new LongAdder())
-            .increment();
-    }
-
     public void incrementPlayerDeath(EntityDamageEvent.DamageCause cause) {
         incrementLabeledCounter(deathsByCause, cause.name());
     }
@@ -154,24 +123,6 @@ public final class MetricsRegistry {
         pluginDisables.increment();
     }
 
-    public void incrementItemsCrafted(Material material) {
-        incrementLabeledCounter(itemsCraftedByMaterial, material.name());
-    }
-
-    public void incrementItemsCrafted(Material material, String player) {
-        String normalizedMaterial = normalizeLabel(material.name());
-        String normalizedPlayer = normalizeLabel(player);
-        itemsCraftedByPlayerMaterial
-            .computeIfAbsent(new LabelPair(normalizedPlayer, normalizedMaterial), key -> new LongAdder())
-            .increment();
-    }
-
-    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<>();
@@ -217,21 +168,10 @@ public final class MetricsRegistry {
         appendCounter(builder, "spigot_plugin_disable_total", "Total plugin disable events", pluginDisables.sum());
 
         appendLabeledCounterAdder(builder, "spigot_blocks_broken_total", "Blocks broken by material", "material", blocksBrokenByMaterial);
-        appendLabeledCounterAdder(builder, "spigot_blocks_broken_by_player_total", "Blocks broken by player and material", "player",
-            "material", blocksBrokenByPlayerMaterial);
-        appendLabeledCounterAdder(builder, "spigot_blocks_placed_total", "Blocks placed by material", "material", blocksPlacedByMaterial);
-        appendLabeledCounterAdder(builder, "spigot_blocks_placed_by_player_total", "Blocks placed by player and material", "player",
-            "material", blocksPlacedByPlayerMaterial);
         appendLabeledCounterAdder(builder, "spigot_player_deaths_total", "Player deaths by cause", "cause", deathsByCause);
         appendLabeledCounterAdder(builder, "spigot_player_logins_failed_total", "Failed player logins by reason", "reason", loginFailuresByReason);
         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_items_crafted_by_player_total", "Items crafted by player and material", "player",
-            "material", itemsCraftedByPlayerMaterial);
-        appendLabeledCounterAdder(builder, "spigot_entities_killed_total", "Entities killed by player", "entity", "killer", entityKills);
-        appendLabeledCounterAdder(builder, "spigot_player_movements_by_player_total", "Player movements by player", "player",
-            playerMovementsByPlayer);
 
         appendGauge(builder, "spigot_players_online", "Online player count", server.getOnlinePlayers().size());
         appendGauge(builder, "spigot_players_max", "Max player slots", server.getMaxPlayers());