Fix gradle build

Author: ChanceSD

.github/workflows/gradle.yml

@@ -21,20 +21,39 @@ jobs:
       contents: read
 
     steps:
-    - uses: actions/checkout@v4
-    - name: Set up JDK 21
-      uses: actions/setup-java@v4
+    - uses: actions/checkout@v5
+    - name: Set up JDK 23
+      uses: actions/setup-java@v5
       with:
-        java-version: '21'
+        java-version: '23'
         distribution: 'temurin'
 
     # Configure Gradle for optimal use in GitHub Actions, including caching of downloaded dependencies.
     # 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 clean build
 
     # 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,13 +5,16 @@ plugins {
 
 group = 'me.chancesd.pvpmanager'
 
+java {
+    toolchain.languageVersion.set(JavaLanguageVersion.of(21))
+}
+
 subprojects {
     apply plugin: 'java'
 
     java {
-        toolchain {
-            languageVersion = JavaLanguageVersion.of(21)
-        }
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
     }
 
     repositories {
@@ -35,14 +38,8 @@ subprojects {
         testImplementation 'org.mockito:mockito-core:5.18.0'
     }
 
-    test {
-        useJUnitPlatform()
-    }
-
     tasks.withType(JavaCompile) {
         options.encoding = 'UTF-8'
-        sourceCompatibility = '17'
-        targetCompatibility = '17'
     }
 }
 

gradle/gradle-daemon-jvm.properties

@@ -0,0 +1,2 @@
+#This file is generated by updateDaemonJvm
+toolchainVersion=23

gradle/wrapper/gradle-wrapper.properties

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

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;
 		}
 	}