Bump versions

.github/workflows/build.yml

@@ -48,7 +48,7 @@ jobs:
         uses: actions/setup-java@v4
         with:
           distribution: temurin
-          java-version: 21
+          java-version: 25
 
       - name: Setup Gradle
         uses: gradle/actions/setup-gradle@v4

NOTICE.md

@@ -55,10 +55,6 @@ The project includes software developed by third parties. For their full license
   - Licensed by: **sk89q, WorldEdit team and contributors**
   - License: **General Public License v3.0** (See `3rd_party_licenses/LICENSE-GPLv3`)
 
-- XGlow:
-  - Repository: `Xezard/XGlow`
-  - License: **Apache-2.0 License** (See `3rd_party_licenses/LICENSE-Apache_v2`)
-
 - packetevents:
   - Repository: `retrooper/packetevents`
   - License: **General Public License v3.0** (See `3rd_party_licenses/LICENSE-GPLv3`)

build.gradle

@@ -1,13 +1,13 @@
 plugins {
     id("dev.magicspells.msjava")
-    id("io.papermc.paperweight.userdev") version "2.0.0-beta.19" apply false
+    id("io.papermc.paperweight.userdev") version "2.0.0-beta.21" apply false
 }
 
 subprojects {
     apply plugin: "dev.magicspells.msjava"
 
     dependencies {
-        implementation("io.papermc.paper:paper-api:1.21.10-R0.1-SNAPSHOT")
+        implementation("io.papermc.paper:paper-api:26.1.1.build.+")
     }
 
     processResources {

buildSrc/build.gradle.kts

@@ -8,7 +8,7 @@ repositories {
 
 java {
     toolchain {
-        languageVersion.set(JavaLanguageVersion.of(21))
+        languageVersion.set(JavaLanguageVersion.of(25))
     }
 }
 
@@ -18,9 +18,5 @@ gradlePlugin {
             id = "dev.magicspells.msjava"
             implementationClass = "dev.magicspells.gradle.MSJavaPlugin"
         })
-        create("mspaperweight", Action {
-            id = "dev.magicspells.mspaperweight"
-            implementationClass = "dev.magicspells.gradle.MSPaperweight"
-        })
     }
 }

buildSrc/src/main/java/dev/magicspells/gradle/MSJavaPlugin.java

@@ -10,36 +10,34 @@
 import org.gradle.api.publish.maven.plugins.MavenPublishPlugin;
 
 public class MSJavaPlugin implements Plugin<Project> {
+
+    private static final String[] MAVEN_URLS = new String[]{
+        "https://mvn.lib.co.nz/public/",
+        "https://repo.papermc.io/repository/maven-public/",
+        "https://jitpack.io",
+        "https://repo.codemc.org/repository/maven-public",
+        "https://maven.enginehub.org/repo/",
+        "https://repo.glaremasters.me/repository/towny/",
+        "https://repo.extendedclip.com/releases/",
+    };
+
     @Override
     public void apply(Project target) {
         target.getPlugins().apply(JavaPlugin.class);
         target.getPlugins().apply(JavaLibraryPlugin.class);
         target.getPlugins().apply(MavenPublishPlugin.class);
-        target.getExtensions().configure(JavaPluginExtension.class, (JavaPluginExtension ext) -> {
-            ext.toolchain((javaToolchainSpec -> {
-                javaToolchainSpec.getLanguageVersion().set(JavaLanguageVersion.of(21));
-            }));
-        });
+
+        target.getExtensions()
+            .getByType(JavaPluginExtension.class)
+            .getToolchain()
+            .getLanguageVersion()
+            .set(JavaLanguageVersion.of(25));
+
         RepositoryHandler repositories = target.getRepositories();
         repositories.mavenCentral();
-
-        String[] mavenUrls = new String[] {
-            "https://repo.dmulloy2.net/nexus/repository/public/",
-            "https://repo.md-5.net/content/repositories/releases/",
-            "https://repo.papermc.io/repository/maven-public/",
-            "https://oss.sonatype.org/content/repositories/central",
-            "https://oss.sonatype.org/content/repositories/snapshots",
-            "https://hub.spigotmc.org/nexus/content/repositories/snapshots/",
-            "https://jitpack.io",
-            "https://repo.codemc.org/repository/maven-public",
-            "https://cdn.rawgit.com/Rayzr522/maven-repo/master/",
-            "https://maven.enginehub.org/repo/",
-            "https://repo.glaremasters.me/repository/towny/",
-            "https://repo.extendedclip.com/content/repositories/placeholderapi",
-            "https://repo.md-5.net/content/repositories/snapshots",
-        };
-        for (String url : mavenUrls) {
-            repositories.maven(mavenArtifactRepository -> mavenArtifactRepository.setUrl(url));
+	    for (String url : MAVEN_URLS) {
+            repositories.maven(repo -> repo.setUrl(url));
         }
     }
+
 }

core/build.gradle

@@ -1,54 +1,40 @@
 plugins {
-    id("com.gradleup.shadow") version "9.2.2"
+    id("com.gradleup.shadow") version "9.4.1"
     id("antlr")
 }
 
 dependencies {
     shadow("org.apache.commons:commons-math4-core:4.0-beta1")
-    shadow("com.github.ben-manes.caffeine:caffeine:3.2.1")
+    shadow("com.github.ben-manes.caffeine:caffeine:3.2.2")
     shadow("com.github.Chronoken:EffectLib:4e37625")
     shadow("org.incendo:cloud-paper:2.0.0-beta.14")
-    shadow("org.incendo:cloud-minecraft-extras:2.0.0-beta.13")
+    shadow("org.incendo:cloud-minecraft-extras:2.0.0-SNAPSHOT")
     shadow("org.incendo:cloud-processors-requirements:1.0.0-rc.1")
-    shadow("org.bstats:bstats-bukkit:3.0.2")
-    shadow("com.github.ezylang:EvalEx:0dcb042")
+    shadow("org.bstats:bstats-bukkit:3.2.1")
+    shadow("com.github.ezylang:EvalEx:3.6.0")
 
     shadow("org.antlr:antlr4-runtime:4.13.2")
     antlr("org.antlr:antlr4:4.13.2")
 
     shadow(project(path: ":nms:shared", configuration: "apiElements"))
     shadow(project(path: ":nms:latest")) { transitive = false }
-    shadow(project(path: ":nms:v1_21_10")) { transitive = false }
 
-    implementation("com.github.retrooper:packetevents-spigot:2.10.1")
+    implementation("com.github.retrooper:packetevents-spigot:2.11.2")
     implementation("net.dmulloy2:ProtocolLib:5.4.0") { transitive = false }
-    implementation("me.libraryaddict.disguises:libsdisguises:10.0.44-SNAPSHOT") { transitive = false }
+    implementation("me.libraryaddict.disguises:libsdisguises:11.0.16-SNAPSHOT") { transitive = false }
     implementation("net.milkbowl.vault:VaultAPI:1.7") { transitive = false }
-    implementation("me.clip:placeholderapi:2.11.6") { transitive = false }
-    implementation("com.github.GriefPrevention:GriefPrevention:17.0.0") { transitive = false }
-    implementation("com.github.Xezard:XGlow:1.1.0") {
-        exclude(module: "XGlowPlugin")
-        exclude(module: "XGlowExample")
-    }
+    implementation("me.clip:placeholderapi:2.12.2") { transitive = false }
+    implementation("com.github.GriefPrevention:GriefPrevention:18.0.0") { transitive = false }
     implementation("com.sk89q.worldguard:worldguard-core:7.1.0-SNAPSHOT") { transitive = false }
     implementation("com.sk89q.worldguard:worldguard-bukkit:7.1.0-SNAPSHOT") { transitive = false }
     implementation("com.sk89q.worldedit:worldedit-core:7.4.0-SNAPSHOT") { transitive = false }
     implementation("com.sk89q.worldedit:worldedit-bukkit:7.4.0-SNAPSHOT") { transitive = false }
-
 }
 
 base {
     archivesName = "MagicSpells"
 }
 
-jar {
-    manifest {
-        attributes(
-            "paperweight-mappings-namespace": "mojang"
-        )
-    }
-}
-
 shadowJar {
     configurations = [project.configurations.shadow]
 

core/src/main/java/com/nisovin/magicspells/Spell.java

@@ -1568,7 +1568,7 @@ protected TargetInfo<LivingEntity> getTargetedEntity(SpellData data, boolean for
 		World world = caster.getWorld();
 
 		boolean targetPlayers = forceTargetPlayers || validTargetList.canTargetPlayers();
-		if (targetPlayers && MagicSpells.checkWorldPvpFlag() && caster instanceof Player && !isBeneficial() && Boolean.FALSE.equals(world.getGameRuleValue(GameRule.PVP))) {
+		if (targetPlayers && MagicSpells.checkWorldPvpFlag() && caster instanceof Player && !isBeneficial() && Boolean.FALSE.equals(world.getGameRuleValue(GameRules.PVP))) {
 			if (forceTargetPlayers) return new TargetInfo<>(null, data, false);
 			targetPlayers = false;
 		}