Fix gradle build

Author: ChanceSD

.github/workflows/gradle.yml

@@ -32,9 +32,28 @@ jobs:
     # See: https://github.com/gradle/actions/blob/main/setup-gradle/README.md
     - name: Setup Gradle
       uses: gradle/actions/setup-gradle@v4
+      with:
+        cache-read-only: false
+
+    # Verify Java setup
+    - name: Debug Java and Gradle setup
+      run: |
+        echo "=== Java Information ==="
+        echo "JAVA_HOME: $JAVA_HOME"
+        java -version
+        which java
+        echo ""
+        echo "=== Gradle Java Toolchains ==="
+        ./gradlew -q javaToolchains
+        echo ""
+        echo "=== Gradle Properties ==="
+        ./gradlew -q properties | grep -E "(java|version|toolchain)"
+        echo ""
+        echo "=== Environment Variables ==="
+        env | grep -E "(JAVA|GRADLE)"
 
     - name: Build with Gradle Wrapper
-      run: ./gradlew build
+      run: ./gradlew build --info --stacktrace
 
     # NOTE: The Gradle Wrapper is the default and recommended way to run Gradle (https://docs.gradle.org/current/userguide/gradle_wrapper.html).
     # If your project does not have the Gradle Wrapper configured, you can use the following configuration to run Gradle with a specified version.

.github/workflows/maven.yml

@@ -5,7 +5,7 @@ name: Java CI with Maven
 
 on:
   push:
-    branches: [ "master**", "dependabot/**" ]
+    branches: [ "master**" ]
   pull_request:
     types: [opened, synchronize, reopened]
 

build.gradle

@@ -5,15 +5,27 @@ plugins {
 
 group = 'me.chancesd.pvpmanager'
 
-subprojects {
+// Apply to ALL projects (root + subprojects)
+allprojects {
     apply plugin: 'java'
 
     java {
         toolchain {
             languageVersion = JavaLanguageVersion.of(21)
         }
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
+    }
+
+    // Force Gradle to use Java 21 for dependency resolution
+    configurations.all {
+        attributes {
+            attribute(TargetJvmVersion.TARGET_JVM_VERSION_ATTRIBUTE, 21)
+        }
     }
+}
 
+subprojects {
     repositories {
         mavenCentral()
         mavenLocal()
@@ -41,8 +53,6 @@ subprojects {
 
     tasks.withType(JavaCompile) {
         options.encoding = 'UTF-8'
-        sourceCompatibility = '17'
-        targetCompatibility = '17'
     }
 }
 

pvpmanager-folia/build.gradle

@@ -6,7 +6,7 @@ plugins {
 }
 
 group = 'me.chancesd.pvpmanager'
-version = '3.18.30'
+version = '4.0.0'
 description = 'A powerful plugin to manage various PvP combat features'
 
 dependencies {

pvpmanager/build.gradle

@@ -59,12 +59,10 @@ public PM(final PluginCommand pluginCommand, final PvPManager plugin) {
 	public void execute(final CommandSender sender, final String label, final List<CommandArgument> args) {
 		if (args.isEmpty()) {
 			helpCommand.helpMenu(sender, 1);
-			return;
 		} else if (args.size() == 1) {
 			final int page = getArgument(args, "page").getAsInt();
 			if (page > 0) {
 				helpCommand.helpMenu(sender, page);
-				return;
 			}
 		}
 	}

pvpmanager/src/main/java/me/chancesd/pvpmanager/command/PM.java

@@ -78,7 +78,7 @@ private String pvpListOffline() {
 			if (!pvpState && name != null)
 				list.append(name).append(", ");
 		}
-		if (list.toString().isEmpty())
+		if (list.isEmpty())
 			return Lang.PVP_LIST_NO_RESULTS.msg();
 		list.delete(list.length() - 2, list.length());
 		return list.toString();
@@ -92,7 +92,7 @@ private String pvpList(final CommandSender sender, final boolean enabled, final
 				list.append(p.getName()).append(", ");
 			}
 		}
-		if (list.toString().isEmpty())
+		if (list.isEmpty())
 			return Lang.PVP_LIST_NO_RESULTS.msg();
 		list.delete(list.length() - 2, list.length());
 		return list.toString();

pvpmanager/src/main/java/me/chancesd/pvpmanager/command/PvPList.java

@@ -49,7 +49,6 @@ public void execute(final CommandSender sender, final String label, final List<C
 			} else {
 				sender.sendMessage("§cConsole must use '/pmr worlds list' to see world information.");
 			}
-			return;
 		}
 	}
 

pvpmanager/src/main/java/me/chancesd/pvpmanager/command/Worlds.java

@@ -36,6 +36,7 @@
 
 public class DebugEntityListener implements Listener {
 
+	private static final String CONSIDERED_NOT_PVP = "Ignoring damage because it wasn't considered PvP";
 	private final PlayerManager ph;
 	private final WorldGuardDependency wg;
 	private final Cache<LightningStrike, Location> lightningCache = CacheBuilder.newBuilder().expireAfterWrite(2, TimeUnit.SECONDS).build();
@@ -60,7 +61,7 @@ public final void onPlayerDamage(final EntityDamageByEntityEvent event) {
 
 		if (!CombatUtils.isPvP(event)) {
 			if (!(event.getEntity() instanceof Player)) {
-				Log.debug("Ignoring damage because it wasn't considered PvP");
+				Log.debug(CONSIDERED_NOT_PVP);
 				return;
 			}
 			final CombatPlayer attacked = ph.get((Player) event.getEntity());
@@ -70,7 +71,7 @@ public final void onPlayerDamage(final EntityDamageByEntityEvent event) {
 				return;
 			} else if (event.getDamager() instanceof final LightningStrike lightning) {
 				if (!lightningCache.asMap().containsKey(lightning)) {
-					Log.debug("Ignoring damage because it wasn't considered PvP");
+					Log.debug(CONSIDERED_NOT_PVP);
 					return;
 				}
 				if (!attacked.hasPvPEnabled() || attacked.isNewbie() || attacked.hasRespawnProtection()) {
@@ -79,7 +80,7 @@ public final void onPlayerDamage(final EntityDamageByEntityEvent event) {
 					return;
 				}
 			}
-			Log.debug("Ignoring damage because it wasn't considered PvP");
+			Log.debug(CONSIDERED_NOT_PVP);
 			return;
 		}