fix: only reward valid CLV fishing and block events

.github/workflows/build.yml

@@ -37,10 +37,3 @@ jobs:
         run: |
           VERSION=$(./gradlew -q properties | awk -F': ' '/^version:/ {print $2; exit}')
           echo "VERSION=$VERSION" >> "$GITHUB_ENV"
-
-      - name: Upload CyberLevels artifact
-        uses: actions/upload-artifact@v4
-        with:
-          name: CyberLevels-artifacts-${{ env.VERSION }}
-          if-no-files-found: error
-          path: build/libs/CyberLevels-${{ env.VERSION }}.jar

.github/workflows/release.yml

@@ -29,37 +29,39 @@ jobs:
           ref: ${{ github.event.workflow_run.head_sha }}
           fetch-depth: 0
 
-      - name: Download build artifact
-        env:
-          GH_TOKEN: ${{ github.token }}
-          RUN_ID: ${{ github.event.workflow_run.id }}
+      - name: Set up Java
+        uses: actions/setup-java@v4
+        with:
+          distribution: temurin
+          java-version: "21"
+
+      - name: Set up Gradle
+        uses: gradle/actions/setup-gradle@v4
+
+      - name: Build release jar
+        shell: bash
         run: |
           set -euo pipefail
+          PROJECT_NAME="CyberLevels"
+          chmod +x ./gradlew
+          ./gradlew --no-daemon clean build shadowJar
 
-          gh run download "$RUN_ID" \
-            --repo "$GITHUB_REPOSITORY" \
-            --dir downloaded-artifacts
-
-          JAR=$(find downloaded-artifacts -type f \
-            -name 'CyberLevels-*.jar' \
-            ! -name '*-sources.jar' \
-            ! -name '*-javadoc.jar' \
-            -print -quit)
+          VERSION=$(./gradlew --no-daemon -q properties --property version | awk -F': ' '$1 == "version" { print $2; exit }')
+          JAR_SOURCE=$(find . -type f -path "*/build/libs/${PROJECT_NAME}-${VERSION}.jar" -print -quit)
 
-          if [ -z "$JAR" ]; then
-            echo "Could not find final CyberLevels jar in downloaded artifacts."
-            find downloaded-artifacts -type f
+          if [ -z "$JAR_SOURCE" ]; then
+            echo "Could not find final ${PROJECT_NAME} jar in build outputs."
+            find . -path "*/build/libs/*.jar" -type f -print
             exit 1
           fi
 
-          VERSION=$(basename "$JAR" | sed -E 's/^CyberLevels-(.+)\.jar$/\1/')
           mkdir -p release-assets
-          cp "$JAR" "release-assets/CyberLevels-$VERSION.jar"
+          RELEASE_JAR="release-assets/${PROJECT_NAME}-${VERSION}.jar"
+          cp "$JAR_SOURCE" "$RELEASE_JAR"
 
+          echo "RELEASE_JAR=$RELEASE_JAR" >> "$GITHUB_ENV"
           echo "VERSION=$VERSION" >> "$GITHUB_ENV"
           echo "TAG=$VERSION" >> "$GITHUB_ENV"
-          echo "RELEASE_JAR=release-assets/CyberLevels-$VERSION.jar" >> "$GITHUB_ENV"
-
       - name: Build release notes
         env:
           GH_TOKEN: ${{ github.token }}
@@ -156,8 +158,17 @@ jobs:
             local login
 
             while IFS= read -r line; do
-              if [[ "$line" =~ ^Co-authored-by:[[:space:]]*.*[<]([^>]+)[>][[:space:]]*$ ]]; then
-                email="${BASH_REMATCH[1]}"
+              case "$line" in
+                Co-authored-by:*"<"*">"*)
+                  email="${line##*<}"
+                  email="${email%%>*}"
+                  ;;
+                *)
+                  email=""
+                  ;;
+              esac
+
+              if [ -n "$email" ]; then
                 login=""
 
                 if [[ "$email" =~ ^[0-9]+\+([^@]+)@users\.noreply\.github\.com$ ]]; then

build.gradle.kts

@@ -10,7 +10,7 @@ plugins {
 }
 
 group = "com.bitaspire"
-version = "1.2.6"
+version = "1.2.7"
 
 repositories {
     mavenLocal()

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.6.0-bin.zip
 networkTimeout=10000
 retries=0
 retryBackOffMs=500

src/main/java/com/bitaspire/cyberlevels/cache/EarnExp.java

@@ -28,7 +28,6 @@
 import org.bukkit.event.player.*;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.meta.PotionMeta;
-import org.bukkit.metadata.FixedMetadataValue;
 import org.bukkit.potion.PotionType;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -155,9 +154,6 @@ void onPlayerDeath(PlayerDeathEvent event) {
             private void onPlacing(BlockPlaceEvent event) {
                 if (event.isCancelled()) return;
 
-                if (main.cache().antiAbuse().onlyNaturalBlocks())
-                    event.getBlock().setMetadata("CLV_PLACED", new FixedMetadataValue(main, true));
-
                 sendExp(event.getPlayer(), s,
                         BlockExpKeys.blockKey(event.getBlock(), main.serverVersion()));
             }
@@ -331,9 +327,7 @@ private void onEnchant(EnchantItemEvent event) {
         events.get("fishing").setListener(s -> new Listener() {
             @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
             private void onFishing(PlayerFishEvent event) {
-                final PlayerFishEvent.State state = event.getState();
-                if (state != PlayerFishEvent.State.CAUGHT_FISH
-                        && state != PlayerFishEvent.State.CAUGHT_ENTITY)
+                if (event.getState() != PlayerFishEvent.State.CAUGHT_FISH)
                     return;
 
                 Entity caught = event.getCaught();

src/main/java/com/bitaspire/cyberlevels/listener/Listeners.java

@@ -6,10 +6,12 @@
 import org.bukkit.block.Block;
 import org.bukkit.block.BlockFace;
 import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
 import org.bukkit.event.HandlerList;
 import org.bukkit.event.Listener;
 import org.bukkit.event.block.BlockPistonExtendEvent;
 import org.bukkit.event.block.BlockPistonRetractEvent;
+import org.bukkit.event.block.BlockPlaceEvent;
 import org.bukkit.event.player.PlayerJoinEvent;
 import org.bukkit.event.player.PlayerQuitEvent;
 import org.bukkit.metadata.FixedMetadataValue;
@@ -53,6 +55,12 @@ private void onLeave(PlayerQuitEvent event) {
         };
 
         new ExpListener() {
+            @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
+            private void onPlace(BlockPlaceEvent event) {
+                if (main.cache().antiAbuse().onlyNaturalBlocks())
+                    event.getBlockPlaced().setMetadata("CLV_PLACED", new FixedMetadataValue(main, true));
+            }
+
             @EventHandler
             private void onPistonExtend(BlockPistonExtendEvent event) {
                 if (!event.isCancelled()) fixPlacedAbuse(event.getBlocks(), event.getDirection());