only flag spaces if we haven't met an underscore

PAPIComponents Deserializer Support

.github/CONTRIBUTING.md

@@ -38,7 +38,7 @@ PlaceholderAPI provides a feature to have expansions (separate jar files) for pl
 In those cases should you report the issue to the issue tracker of the expansion or plugin.
 
 ## Pull requests
-As an open source project are we welcoming all contributions to improve PlaceholderAPI, being it changes to its code, or contributions to its documentation such as the [Wiki] or the Javadocs.
+As an open source project we are welcoming all contributions to improve PlaceholderAPI, being it changes to its code, or contributions to its documentation such as the [Wiki] or the Javadocs.
 
 > [!IMPORTANT]
 > When contributing, make sure to both base of and target the mentioned branch. Pull requests targeting the wrong branch may get closed without a warning.

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -18,13 +18,13 @@ body:
     label: Confirmation
     description: Please make sure to have followed the following checks.
     options:
-      - label: My issue isn't already found on the Issue tracker.
+      - label: "My issue isn't already found on the Issue tracker."
         required: true
-      - label: My issue is about **PlaceholderAPI** and not any expansion or external plugin
+      - label: "My issue is about **PlaceholderAPI** and not any expansion or external plugin."
         required: true
-      - label: The issue isn't already fixed in a Spigot Release or Development Build.
+      - label: "The issue isn't already fixed in a Spigot Release or Development Build."
         required: true
-      - label: The [Common Issues](https://github.com/PlaceholderAPI/PlaceholderAPI/wiki/Common-Issues) page doesn't mention this issue.
+      - label: "The [Common Issues](https://wiki.placeholderapi.com/common-issues/) page doesn't mention this issue."
         required: true
 - type: dropdown
   attributes:
@@ -85,6 +85,8 @@ body:
     description: |-
       Get the latest content of your `latest.log` file an upload it to https://paste.helpch.at
       Take the generated URL and paste it into this field.
+
+      **Always provide the full `latest.log` and not just parts of it or just the error (if any)!**
     placeholder: "https://paste.helpch.at/latest.log"
 - type: input
   id: "error"
@@ -99,5 +101,5 @@ body:
     description: |-
       Add any extra info you think is nessesary for this Bug report.
       - If you selected `API Bug` will you need to include code-examples here to reproduce the issue.
-      - If you selected `Plugin/Server Incompatability` should you include extra Server info such as a Timings or Spark-Report or info about the plugin in question.
+      - If you selected `Plugin/Server Incompatability` should you include extra Server info such as Spark-Report or info about the plugin in question.
     placeholder: "Put any extra info you like into this field..."

.github/PULL_REQUEST_TEMPLATE.md

@@ -21,7 +21,7 @@
 ### Description
 <!-- What does your Pull request change? -->
 
-Closes N/A <!-- If your PR is based on an issue, change "N/A" the the issue ID (#id) -->
+Closes N/A <!-- If your PR is based on an issue, change "N/A" to the issue ID (#id) -->
 
 
 <!-- DO NOT ALTER ANYTHING BELOW THIS LINE! -->

.github/workflows/pr_build_jars.yml

@@ -5,8 +5,10 @@ on:
     branches:
     - development
     paths:
-    - "src/**"
-    - "build.gradle"
+    - "../../spigot/**"
+    - "../../paper/**"
+    - "build.gradle.kts"
+    - "settings.gradle.kts"
 
 jobs:
   testBuilds:

.github/workflows/pr_wiki_validation.yml

@@ -0,0 +1,55 @@
+#
+# Validates Pull requests targeting the wiki branch
+# to ensure that the site can be build successfully
+# without broken links, navigation, etc.
+#
+name: "Validate Wiki Build"
+
+on:
+  pull_request_target:
+    types:
+      - opened
+      - reopened
+      - synchronize
+    paths-ignore:
+      - "README.md"
+    branches:
+      - wiki
+  workflow_dispatch:
+
+permissions:
+  contents: read
+  issues: write
+
+env:
+  RUN_URL: "${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_number }}"
+
+jobs:
+  buildWiki:
+    runs-on: ubuntu-latest
+    steps:
+      - name: "Checkout Repository"
+        uses: actions/checkout@v6
+        with:
+          fetch-depth: 0
+          ref: "${{ github.event.pull_request.head.sha }}"
+      - name: "Setup Python 3.x"
+        uses: actions/setup-python@v6
+        with:
+          python-version: 3.x
+      - name: "Install dependencies"
+        run: "python -m pip install mkdocs-material"
+      - name: "Build Site"
+        run: "mkdocs build --strict"
+      - name: "Create Comment"
+        uses: peter-evans/create-or-update-comment@v5
+        if: ${{ failure() }}
+        with:
+          body: |-
+            ## Wiki Build failure
+
+            Something went wrong while creating a test-build of the Wiki for this Pull request.
+            Please check the [Workflow Logs](${{ env.RUN_URL }}) for any errors.
+          issue-number: "${{ github.event.pull_request.number }}"
+          token: "${{ secrets.GITHUB_TOKEN }}"
+          edit-mode: replace

README.md

@@ -9,7 +9,7 @@
 [spigot]: https://www.spigotmc.org/resources/6245/
 [hangar]: https://hangar.papermc.io/HelpChat/PlaceholderAPI
 [modrinth]: https://modrinth.com/plugin/placeholderapi
-[Expansions cloud]: https://api.extendedclip.com/home
+[Expansions cloud]: https://ecloud.placeholderapi.com
 [placeholder list]: https://helpch.at/placeholders
 [statistics]: https://bstats.org/plugin/bukkit/PlaceholderAPI
 
@@ -32,7 +32,7 @@
 
 Support for specific plugins are provided either by the plugin itself or through expansions. The expansions may be downloaded in-game through the PAPI Expansion Cloud. There are currently over 240+ expansions that support a wide variety of plugins, such as Essentials, Factions, LuckPerms, and Vault. 
 
-PlaceholderAPI has been downloaded over 1,700,000 times on Spigot and has been used concurrently on over 45,000 servers, which makes it a must-have for a server of any type or scale.
+PlaceholderAPI has been downloaded over 2,000,000 times on Spigot and has been used concurrently on over 50,000 servers, which makes it a must-have for a server of any type or scale.
 
 ## Contribute
 If you would like to contribute towards PlaceholderAPI should you take a look at our [Contributing file][contributing] for the ins and outs on how you can do that and what you need to keep in mind.

build.gradle.kts

@@ -3,15 +3,24 @@ import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
 plugins {
     `java-library`
     `maven-publish`
-    id("com.github.hierynomus.license") version "0.16.1"
-    id("io.github.goooler.shadow") version "8.1.7"
+//    id("com.github.hierynomus.license") version "0.16.1"
+    id("com.gradleup.shadow") version "9.3.1"
+    id("me.champeau.jmh") version "0.7.2"
 }
 
 group = "me.clip"
-version = "2.11.8-DEV-${System.getProperty("BUILD_NUMBER")}"
+version = "2.12.3-DEV-${System.getProperty("BUILD_NUMBER")}"
 
 description = "An awesome placeholder provider!"
 
+val paper by sourceSets.creating {
+    java.srcDir("src/paper/java")
+
+    // paper can see main code
+    compileClasspath += sourceSets.main.get().output
+    runtimeClasspath += output + compileClasspath
+}
+
 repositories {
     maven("https://oss.sonatype.org/content/repositories/snapshots/")
 
@@ -24,21 +33,23 @@ repositories {
 }
 
 dependencies {
-    implementation("org.bstats:bstats-bukkit:3.0.1")
-    implementation("net.kyori:adventure-platform-bukkit:4.3.3")
+    implementation("org.bstats:bstats-bukkit:3.1.0")
+    implementation("net.kyori:adventure-platform-bukkit:4.4.1")
 
-    //compileOnly("org.spigotmc:spigot-api:1.21-R0.1-SNAPSHOT")
-    compileOnly("dev.folia:folia-api:1.20.1-R0.1-SNAPSHOT")
+    add(paper.compileOnlyConfigurationName, "net.kyori:adventure-platform-bukkit:4.4.1")
+    add(paper.compileOnlyConfigurationName, "dev.folia:folia-api:1.21.11-R0.1-SNAPSHOT")
+
+    compileOnly("dev.folia:folia-api:1.21.11-R0.1-SNAPSHOT")
     compileOnlyApi("org.jetbrains:annotations:23.0.0")
 
-    testImplementation("org.openjdk.jmh:jmh-core:1.32")
-    testImplementation("org.openjdk.jmh:jmh-generator-annprocess:1.32")
+    jmh("org.openjdk.jmh:jmh-core:1.37")
+    jmh("org.openjdk.jmh:jmh-generator-annprocess:1.37")
+    jmhAnnotationProcessor("org.openjdk.jmh:jmh-generator-annprocess:1.37")
 
-    testImplementation("org.junit.jupiter:junit-jupiter-engine:5.8.2")
-    testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.8.1")
+    testImplementation("org.junit.jupiter:junit-jupiter:6.0.2")
+    testRuntimeOnly("org.junit.platform:junit-platform-launcher")
 }
 
-
 java {
     sourceCompatibility = JavaVersion.VERSION_1_8
     targetCompatibility = JavaVersion.VERSION_1_8
@@ -49,19 +60,6 @@ java {
     disableAutoTargetJvm()
 }
 
-license {
-    header = rootProject.file("config/headers/main.txt")
-
-    include("**/*.java")
-    mapping("java", "JAVADOC_STYLE")
-
-    encoding = "UTF-8"
-
-    ext {
-        set("year", 2024)
-    }
-}
-
 val javaComponent: SoftwareComponent = components["java"]
 
 tasks {
@@ -73,14 +71,36 @@ tasks {
         dependsOn(named("shadowJar"))
     }
 
-    withType<JavaCompile> {
+    register<JavaCompile>("compilePaper") {
+        source = paper.java
+        classpath = paper.compileClasspath
+        destinationDirectory.set(layout.buildDirectory.dir("classes/java/paper"))
         options.encoding = "UTF-8"
         options.release = 8
     }
 
-    withType<Javadoc> {
+    val plainJar by registering(Jar::class) {
+        dependsOn("compilePaper")
+
+        archiveClassifier.set("plain")
+        from(sourceSets.main.get().output)
+        from(paper.output)
+    }
+
+    val combinedSourcesJar by registering(Jar::class) {
+        archiveClassifier.set("sources")
+        from(sourceSets.main.get().allSource)
+        from(paper.allSource)
+
+        duplicatesStrategy = DuplicatesStrategy.EXCLUDE
+    }
+
+    val combinedJavadoc by registering(Javadoc::class) {
         isFailOnError = false
 
+        source = sourceSets.main.get().allJava + paper.allJava
+        classpath = sourceSets.main.get().compileClasspath + paper.compileClasspath
+
         with(options as StandardJavadocDocletOptions) {
             addStringOption("Xdoclint:none", "-quiet")
             addStringOption("encoding", "UTF-8")
@@ -88,13 +108,41 @@ tasks {
         }
     }
 
+    val combinedJavadocJar by registering(Jar::class) {
+        archiveClassifier.set("javadoc")
+        dependsOn(combinedJavadoc)
+        from(combinedJavadoc.get().destinationDir)
+    }
+
+    withType<JavaCompile> {
+        options.encoding = "UTF-8"
+        options.release = 8
+    }
+
     withType<ShadowJar> {
+        configurations = listOf(project.configurations.runtimeClasspath.get())
+
+        from(sourceSets.main.get().output)
+
         archiveClassifier.set("")
 
         relocate("org.bstats", "me.clip.placeholderapi.metrics")
         relocate("net.kyori", "me.clip.placeholderapi.libs.kyori")
 
         exclude("META-INF/versions/**")
+
+        dependsOn("compilePaper")
+
+        doLast {
+            val paperDir = layout.buildDirectory.dir("classes/java/paper").get().asFile
+            val jarFile = archiveFile.get().asFile
+
+            ant.invokeMethod("zip", mapOf(
+                "destfile" to jarFile,
+                "update" to "true",
+                "basedir" to paperDir
+            ))
+        }
     }
 
     test {
@@ -105,7 +153,19 @@ tasks {
         publications {
             create<MavenPublication>("maven") {
                 artifactId = "placeholderapi"
-                from(javaComponent)
+
+                artifact(plainJar) {
+                    builtBy(plainJar)
+                    classifier = ""
+                }
+
+                artifact(combinedSourcesJar) {
+                    builtBy(combinedSourcesJar)
+                }
+
+                artifact(combinedJavadocJar) {
+                    builtBy(combinedJavadocJar)
+                }
             }
         }
 

config/headers/jsonmessage.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2018-2024 Peter Blood
+Copyright (c) 2018-2026 Peter Blood
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 

gradle/wrapper/gradle-wrapper.properties

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

src/jmh/java/me/clip/placeholderapi/Values.java

@@ -0,0 +1,94 @@
+/*
+ * This file is part of PlaceholderAPI
+ *
+ * PlaceholderAPI
+ * Copyright (c) 2015 - 2026 PlaceholderAPI Team
+ *
+ * PlaceholderAPI free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * PlaceholderAPI is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package me.clip.placeholderapi;
+
+import com.google.common.collect.ImmutableMap;
+import me.clip.placeholderapi.expansion.PlaceholderExpansion;
+import me.clip.placeholderapi.replacer.CharsReplacer;
+import me.clip.placeholderapi.replacer.OldCharsReplacer;
+import me.clip.placeholderapi.replacer.Replacer;
+import org.bukkit.OfflinePlayer;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+public interface Values {
+
+    String SMALL_TEXT = "My name is %player_name%";
+    String LARGE_TEXT = "My name is %player_name% and my location is (%player_x%, %player_y%, %player_z%), this placeholder is invalid %server_name%";
+
+    ImmutableMap<String, PlaceholderExpansion> PLACEHOLDERS = ImmutableMap.<String, PlaceholderExpansion>builder()
+            .put("player", new MockPlayerPlaceholderExpansion())
+            .build();
+
+
+    Replacer CHARS_REPLACER = new CharsReplacer(Replacer.Closure.PERCENT);
+    Replacer OLD_CHARS_REPLACER = new OldCharsReplacer(Replacer.Closure.PERCENT);
+
+    final class MockPlayerPlaceholderExpansion extends PlaceholderExpansion {
+
+        public static final String PLAYER_X = "10";
+        public static final String PLAYER_Y = "20";
+        public static final String PLAYER_Z = "30";
+        public static final String PLAYER_NAME = "Sxtanna";
+
+
+        @NotNull
+        @Override
+        public String getIdentifier() {
+            return "player";
+        }
+
+        @NotNull
+        @Override
+        public String getAuthor() {
+            return "Sxtanna";
+        }
+
+        @NotNull
+        @Override
+        public String getVersion() {
+            return "1.0";
+        }
+
+        @Override
+        public String onRequest(@Nullable final OfflinePlayer player, @NotNull final String params) {
+            final String[] parts = params.split("_");
+            if (parts.length == 0) {
+                return null;
+            }
+
+            switch (parts[0]) {
+                case "name":
+                    return PLAYER_NAME;
+                case "x":
+                    return PLAYER_X;
+                case "y":
+                    return PLAYER_Y;
+                case "z":
+                    return PLAYER_Z;
+            }
+
+            return null;
+        }
+
+    }
+
+}

src/jmh/java/me/clip/placeholderapi/replacer/OldCharsReplacer.java

@@ -0,0 +1,136 @@
+package me.clip.placeholderapi.replacer;
+
+/*
+ * This file is part of PlaceholderAPI
+ *
+ * PlaceholderAPI
+ * Copyright (c) 2015 - 2026 PlaceholderAPI Team
+ *
+ * PlaceholderAPI free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * PlaceholderAPI is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import java.util.Locale;
+import java.util.function.Function;
+
+import me.clip.placeholderapi.expansion.PlaceholderExpansion;
+import org.bukkit.OfflinePlayer;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+public final class OldCharsReplacer implements Replacer {
+
+    @NotNull
+    private final Closure closure;
+
+    public OldCharsReplacer(@NotNull final Closure closure) {
+        this.closure = closure;
+    }
+
+    @NotNull
+    @Override
+    public String apply(@NotNull final String text, @Nullable final OfflinePlayer player,
+                        @NotNull final Function<String, @Nullable PlaceholderExpansion> lookup) {
+        final char[] chars = text.toCharArray();
+        final StringBuilder builder = new StringBuilder(text.length());
+
+        final StringBuilder identifier = new StringBuilder();
+        final StringBuilder parameters = new StringBuilder();
+
+        for (int i = 0; i < chars.length; i++) {
+            final char l = chars[i];
+
+            if (l != closure.head || i + 1 >= chars.length) {
+                builder.append(l);
+                continue;
+            }
+
+            boolean identified = false;
+            boolean invalid = true;
+            boolean hadSpace = false;
+
+            while (++i < chars.length) {
+                final char p = chars[i];
+
+                if (p == ' ' && !identified) {
+                    hadSpace = true;
+                    break;
+                }
+                if (p == closure.tail) {
+                    invalid = false;
+                    break;
+                }
+
+                if (p == '_' && !identified) {
+                    identified = true;
+                    continue;
+                }
+
+                if (identified) {
+                    parameters.append(p);
+                } else {
+                    identifier.append(p);
+                }
+            }
+
+            final String identifierString = identifier.toString();
+            final String lowercaseIdentifierString = identifierString.toLowerCase(Locale.ROOT);
+            final String parametersString = parameters.toString();
+
+            identifier.setLength(0);
+            parameters.setLength(0);
+
+            if (invalid) {
+                builder.append(closure.head).append(identifierString);
+
+                if (identified) {
+                    builder.append('_').append(parametersString);
+                }
+
+                if (hadSpace) {
+                    builder.append(' ');
+                }
+                continue;
+            }
+
+            final PlaceholderExpansion placeholder = lookup.apply(lowercaseIdentifierString);
+            if (placeholder == null) {
+                builder.append(closure.head).append(identifierString);
+
+                if (identified) {
+                    builder.append('_');
+                }
+
+                builder.append(parametersString).append(closure.tail);
+                continue;
+            }
+
+            final String replacement = placeholder.onRequest(player, parametersString);
+            if (replacement == null) {
+                builder.append(closure.head).append(identifierString);
+
+                if (identified) {
+                    builder.append('_');
+                }
+
+                builder.append(parametersString).append(closure.tail);
+                continue;
+            }
+
+            builder.append(replacement);
+        }
+
+        return builder.toString();
+    }
+
+}

src/jmh/java/me/clip/placeholderapi/replacer/ReplacerBenchmarks.java

@@ -0,0 +1,66 @@
+/*
+ * This file is part of PlaceholderAPI
+ *
+ * PlaceholderAPI
+ * Copyright (c) 2015 - 2026 PlaceholderAPI Team
+ *
+ * PlaceholderAPI free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * PlaceholderAPI is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package me.clip.placeholderapi.replacer;
+
+import me.clip.placeholderapi.Values;
+import me.clip.placeholderapi.expansion.PlaceholderExpansion;
+import org.jetbrains.annotations.Nullable;
+import org.openjdk.jmh.annotations.*;
+import org.openjdk.jmh.infra.Blackhole;
+
+import java.util.concurrent.TimeUnit;
+import java.util.function.Function;
+
+@State(Scope.Benchmark)
+@OutputTimeUnit(TimeUnit.NANOSECONDS)
+@BenchmarkMode({Mode.AverageTime, Mode.Throughput})
+@Fork(value = 3, warmups = 1)
+@Warmup(iterations = 5, time = 1)
+@Measurement(iterations = 10, time = 1)
+public class ReplacerBenchmarks {
+
+    private Function<String, @Nullable PlaceholderExpansion> expansionFunction;
+
+    @Setup
+    public void setup() {
+        this.expansionFunction = Values.PLACEHOLDERS::get;
+    }
+
+    @Benchmark
+    public void measureCharsReplacerSmallText(final Blackhole blackhole) {
+        blackhole.consume(Values.CHARS_REPLACER.apply(Values.SMALL_TEXT, null, expansionFunction));
+    }
+
+    @Benchmark
+    public void measureCharsReplacerLargeText(final Blackhole blackhole) {
+        blackhole.consume(Values.CHARS_REPLACER.apply(Values.LARGE_TEXT, null, expansionFunction));
+    }
+
+    @Benchmark
+    public void measureCharsReplacerSmallTextOld(final Blackhole blackhole) {
+        blackhole.consume(Values.OLD_CHARS_REPLACER.apply(Values.SMALL_TEXT, null, expansionFunction));
+    }
+
+    @Benchmark
+    public void measureCharsReplacerLargeTextOld(final Blackhole blackhole) {
+        blackhole.consume(Values.OLD_CHARS_REPLACER.apply(Values.LARGE_TEXT, null, expansionFunction));
+    }
+}

src/main/java/me/clip/placeholderapi/PlaceholderAPI.java

@@ -2,7 +2,7 @@
  * This file is part of PlaceholderAPI
  *
  * PlaceholderAPI
- * Copyright (c) 2015 - 2024 PlaceholderAPI Team
+ * Copyright (c) 2015 - 2026 PlaceholderAPI Team
  *
  * PlaceholderAPI free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -20,14 +20,11 @@
 
 package me.clip.placeholderapi;
 
-import com.google.common.collect.ImmutableSet;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
+
 import me.clip.placeholderapi.expansion.PlaceholderExpansion;
 import me.clip.placeholderapi.expansion.Relational;
 import me.clip.placeholderapi.expansion.manager.LocalExpansionManager;
@@ -46,9 +43,9 @@ public final class PlaceholderAPI {
     private static final Replacer REPLACER_PERCENT = new CharsReplacer(Closure.PERCENT);
     private static final Replacer REPLACER_BRACKET = new CharsReplacer(Closure.BRACKET);
 
-  private static final Pattern PLACEHOLDER_PATTERN = Pattern.compile("[%]([^%]+)[%]");
-  private static final Pattern BRACKET_PLACEHOLDER_PATTERN = Pattern.compile("[{]([^{}]+)[}]");
-  private static final Pattern RELATIONAL_PLACEHOLDER_PATTERN = Pattern
+    static final Pattern PLACEHOLDER_PATTERN = Pattern.compile("[%]([^%]+)[%]");
+    static final Pattern BRACKET_PLACEHOLDER_PATTERN = Pattern.compile("[{]([^{}]+)[}]");
+    static final Pattern RELATIONAL_PLACEHOLDER_PATTERN = Pattern
             .compile("[%](rel_)([^%]+)[%]");
 
 
@@ -83,7 +80,11 @@ public final class PlaceholderAPI {
     @NotNull
     public static List<String> setPlaceholders(final OfflinePlayer player,
                                                @NotNull final List<String> text) {
-    return text.stream().map(line -> setPlaceholders(player, line)).collect(Collectors.toList());
+        final List<String> result = new ArrayList<>(text.size());
+        for (final String line : text) {
+            result.add(setPlaceholders(player, line));
+        }
+        return result;
     }
 
     /**
@@ -138,8 +139,11 @@ public final class PlaceholderAPI {
     @NotNull
     public static List<@NotNull String> setBracketPlaceholders(final OfflinePlayer player,
                                                                @NotNull final List<@NotNull String> text) {
-    return text.stream().map(line -> setBracketPlaceholders(player, line))
-        .collect(Collectors.toList());
+        final List<String> result = new ArrayList<>(text.size());
+        for (final String line : text) {
+            result.add(setBracketPlaceholders(player, line));
+        }
+        return result;
     }
 
     /**
@@ -177,14 +181,14 @@ public final class PlaceholderAPI {
      * @param text Text to parse the placeholders in
      * @return The text containing the parsed relational placeholders
      */
-  public static String setRelationalPlaceholders(Player one, Player two, String text) {
+    public static String setRelationalPlaceholders(final Player one, final Player two, @NotNull String text) {
         final Matcher matcher = RELATIONAL_PLACEHOLDER_PATTERN.matcher(text);
 
         while (matcher.find()) {
             final String format = matcher.group(2);
-      final int index = format.indexOf("_");
+            final int index = format.indexOf('_');
 
-      if (index <= 0 || index >= format.length()) {
+            if (index <= 0) {
                 continue;
             }
 
@@ -216,9 +220,12 @@ public final class PlaceholderAPI {
      * @param text text to parse the placeholder values to
      * @return The text containing the parsed relational placeholders
      */
-  public static List<String> setRelationalPlaceholders(Player one, Player two, List<String> text) {
-    return text.stream().map(line -> setRelationalPlaceholders(one, two, line))
-        .collect(Collectors.toList());
+    public static List<String> setRelationalPlaceholders(final Player one, final Player two, final @NotNull List<String> text) {
+        final List<String> result = new ArrayList<>(text.size());
+        for (final String line : text) {
+            result.add(setRelationalPlaceholders(one, two, line));
+        }
+        return result;
     }
 
     /**
@@ -239,8 +246,7 @@ public final class PlaceholderAPI {
      */
     @NotNull
     public static Set<String> getRegisteredIdentifiers() {
-    return ImmutableSet
-        .copyOf(PlaceholderAPIPlugin.getInstance().getLocalExpansionManager().getIdentifiers());
+        return PlaceholderAPIPlugin.getInstance().getLocalExpansionManager().getIdentifiers();
     }
 
     /**
@@ -277,8 +283,15 @@ public final class PlaceholderAPI {
      * @param text String to check
      * @return true if String contains any matches to the normal placeholder pattern, false otherwise
      */
-  public static boolean containsPlaceholders(String text) {
-    return text != null && PLACEHOLDER_PATTERN.matcher(text).find();
+    public static boolean containsPlaceholders(final String text) {
+        if (text == null) {
+            return false;
+        }
+        final int firstPercent = text.indexOf('%');
+        if (firstPercent == -1) {
+            return false;
+        }
+        return text.indexOf('%', firstPercent + 1) != -1;
     }
 
     /**
@@ -288,32 +301,36 @@ public final class PlaceholderAPI {
      * @param text String to check
      * @return true if String contains any matches to the bracket placeholder pattern, false otherwise
      */
-  public static boolean containsBracketPlaceholders(String text) {
-    return text != null && BRACKET_PLACEHOLDER_PATTERN.matcher(text).find();
+    public static boolean containsBracketPlaceholders(final String text) {
+        if (text == null) {
+            return false;
+        }
+        final int openBracket = text.indexOf('{');
+        if (openBracket == -1) {
+            return false;
+        }
+        return text.indexOf('}', openBracket + 1) != -1;
     }
 
     // === Deprecated API ===
 
     @Deprecated
     @ApiStatus.ScheduledForRemoval(inVersion = "2.13.0")
-  public static boolean registerExpansion(PlaceholderExpansion expansion)
-  {
+    public static boolean registerExpansion(PlaceholderExpansion expansion) {
         return expansion.register();
     }
 
     @Deprecated
     @ApiStatus.ScheduledForRemoval(inVersion = "2.13.0")
-  public static boolean unregisterExpansion(PlaceholderExpansion expansion)
-  {
+    public static boolean unregisterExpansion(PlaceholderExpansion expansion) {
         return expansion.unregister();
     }
 
     /**
      * Get map of registered placeholders
      *
-   * @deprecated Use {@link LocalExpansionManager#getExpansions()} instead.
-   *
      * @return Map of registered placeholders
+     * @deprecated Use {@link LocalExpansionManager#getExpansions()} instead.
      */
     @Deprecated
     @ApiStatus.ScheduledForRemoval(inVersion = "2.13.0")
@@ -324,12 +341,11 @@ public final class PlaceholderAPI {
     }
 
     /**
-   * @deprecated Please use {@link PlaceholderExpansion} to
-   * register placeholders instead
-   * 
      * @param plugin          The Plugin to register with this {@link PlaceholderHook}
      * @param placeholderHook The {@link PlaceholderHook} to register
      * @return always false
+     * @deprecated Please use {@link PlaceholderExpansion} to
+     * register placeholders instead
      */
     @Deprecated
     @ApiStatus.ScheduledForRemoval(inVersion = "2.13.0")
@@ -341,12 +357,11 @@ public final class PlaceholderAPI {
     }
 
     /**
-   * @deprecated Please use {@link PlaceholderExpansion} to
-   * register placeholders instead
-   * 
      * @param identifier      The identifier to use for the {@link PlaceholderHook}
      * @param placeholderHook The {@link PlaceholderHook} to register
      * @return always false
+     * @deprecated Please use {@link PlaceholderExpansion} to
+     * register placeholders instead
      */
     @Deprecated
     @ApiStatus.ScheduledForRemoval(inVersion = "2.13.0")
@@ -358,11 +373,10 @@ public final class PlaceholderAPI {
     }
 
     /**
-   * @deprecated Please use {@link PlaceholderExpansion} to
-   * unregister placeholders instead
-   * 
      * @param plugin The plugin to unregister
      * @return always false
+     * @deprecated Please use {@link PlaceholderExpansion} to
+     * unregister placeholders instead
      */
     @Deprecated
     @ApiStatus.ScheduledForRemoval(inVersion = "2.13.0")
@@ -374,11 +388,10 @@ public final class PlaceholderAPI {
     }
 
     /**
-   * @deprecated Please use {@link PlaceholderExpansion} to
-   * unregister placeholders instead
-   * 
      * @param identifier The identifier to unregister
      * @return always false
+     * @deprecated Please use {@link PlaceholderExpansion} to
+     * unregister placeholders instead
      */
     @Deprecated
     @ApiStatus.ScheduledForRemoval(inVersion = "2.13.0")
@@ -390,9 +403,8 @@ public final class PlaceholderAPI {
     }
 
     /**
-   * @deprecated Will be removed in a future release.
-   * 
      * @return Set of registered identifiers
+     * @deprecated Will be removed in a future release.
      */
     @Deprecated
     @ApiStatus.ScheduledForRemoval(inVersion = "2.13.0")
@@ -401,9 +413,8 @@ public final class PlaceholderAPI {
     }
 
     /**
-   * @deprecated Will be removed in a future release.
-   * 
      * @return always null
+     * @deprecated Will be removed in a future release.
      */
     @Deprecated
     @ApiStatus.ScheduledForRemoval(inVersion = "2.13.0")
@@ -412,13 +423,12 @@ public final class PlaceholderAPI {
     }
 
     /**
-   * @deprecated Please use {@link #setPlaceholders(OfflinePlayer, String)} instead
-   * 
      * @param player   The offline player to parse the placeholders against
      * @param text     The text to parse
      * @param pattern  The Pattern to use
      * @param colorize If PlaceholderAPI should also parse color codes
      * @return String with the parsed placeholders
+     * @deprecated Please use {@link #setPlaceholders(OfflinePlayer, String)} instead
      */
     @Deprecated
     @ApiStatus.ScheduledForRemoval(inVersion = "2.13.0")
@@ -428,13 +438,12 @@ public final class PlaceholderAPI {
     }
 
     /**
-   * @deprecated Please use {@link #setPlaceholders(OfflinePlayer, List)} instead
-   * 
      * @param player   The offline player to parse the placeholders against
      * @param text     The List of text to parse
      * @param pattern  The Pattern to use
      * @param colorize If PlaceholderAPI should also parse color codes
      * @return String with the parsed placeholders
+     * @deprecated Please use {@link #setPlaceholders(OfflinePlayer, List)} instead
      */
     @Deprecated
     @ApiStatus.ScheduledForRemoval(inVersion = "2.13.0")
@@ -444,12 +453,11 @@ public final class PlaceholderAPI {
     }
 
     /**
-   * @deprecated Use {@link #setPlaceholders(OfflinePlayer, List)} instead.
-   *
      * @param player   The offline player to parse the placeholders against
      * @param text     The List of text to parse
      * @param colorize If PlaceholderAPI should also parse color codes
      * @return String with the parsed placeholders
+     * @deprecated Use {@link #setPlaceholders(OfflinePlayer, List)} instead.
      */
     @Deprecated
     @ApiStatus.ScheduledForRemoval(inVersion = "2.13.0")
@@ -459,12 +467,11 @@ public final class PlaceholderAPI {
     }
 
     /**
-   * @deprecated Use {@link #setPlaceholders(OfflinePlayer, List)} instead.
-   *
      * @param player  The offline player to parse the placeholders against
      * @param text    The List of text to parse
      * @param pattern The Pattern to use
      * @return String with the parsed placeholders
+     * @deprecated Use {@link #setPlaceholders(OfflinePlayer, List)} instead.
      */
     @Deprecated
     @ApiStatus.ScheduledForRemoval(inVersion = "2.13.0")
@@ -472,13 +479,13 @@ public final class PlaceholderAPI {
                                                Pattern pattern) {
         return setPlaceholders(player, text);
     }
+
     /**
-   * @deprecated Will be removed in a future release.
-   *
      * @param player   The offline player to parse the placeholders against
      * @param text     The text to parse
      * @param colorize If PlaceholderAPI should also parse color codes
      * @return String with the parsed placeholders
+     * @deprecated Will be removed in a future release.
      */
     @Deprecated
     @ApiStatus.ScheduledForRemoval(inVersion = "2.13.0")
@@ -487,12 +494,11 @@ public final class PlaceholderAPI {
     }
 
     /**
-   * @deprecated Will be removed in a future release.
-   *
      * @param player   The offline player to parse the placeholders against
      * @param text     The List of text to parse
      * @param colorize If PlaceholderAPI should also parse color codes
      * @return String with the parsed placeholders
+     * @deprecated Will be removed in a future release.
      */
     @Deprecated
     @ApiStatus.ScheduledForRemoval(inVersion = "2.13.0")
@@ -501,12 +507,11 @@ public final class PlaceholderAPI {
     }
 
     /**
-   * @deprecated Use {@link #setPlaceholders(OfflinePlayer, String)} instead.
-   *
      * @param player   The offline player to parse the placeholders against
      * @param text     The text to parse
      * @param colorize If PlaceholderAPI should also parse color codes
      * @return String with the parsed placeholders
+     * @deprecated Use {@link #setPlaceholders(OfflinePlayer, String)} instead.
      */
     @Deprecated
     @ApiStatus.ScheduledForRemoval(inVersion = "2.13.0")
@@ -515,12 +520,11 @@ public final class PlaceholderAPI {
     }
 
     /**
-   * @deprecated Use {@link #setPlaceholders(OfflinePlayer, String)} instead.
-   *
      * @param player  The offline player to parse the placeholders against
      * @param text    The text to parse
      * @param pattern The Pattern to use
      * @return String with the parsed placeholders
+     * @deprecated Use {@link #setPlaceholders(OfflinePlayer, String)} instead.
      */
     @Deprecated
     @ApiStatus.ScheduledForRemoval(inVersion = "2.13.0")
@@ -529,12 +533,11 @@ public final class PlaceholderAPI {
     }
 
     /**
-   * @deprecated Use {@link #setPlaceholders(OfflinePlayer, List)} instead.
-   *
      * @param player   The offline player to parse the placeholders against
      * @param text     The List of text to parse
      * @param colorize If PlaceholderAPI should also parse color codes
      * @return String with the parsed placeholders
+     * @deprecated Use {@link #setPlaceholders(OfflinePlayer, List)} instead.
      */
     @Deprecated
     @ApiStatus.ScheduledForRemoval(inVersion = "2.13.0")
@@ -544,12 +547,11 @@ public final class PlaceholderAPI {
     }
 
     /**
-   * @deprecated Use {@link #setPlaceholders(OfflinePlayer, String)} instead.
-   *
      * @param player   The offline player to parse the placeholders against
      * @param text     The text to parse
      * @param colorize If PlaceholderAPI should also parse color codes
      * @return String with the parsed placeholders
+     * @deprecated Use {@link #setPlaceholders(OfflinePlayer, String)} instead.
      */
     @Deprecated
     @ApiStatus.ScheduledForRemoval(inVersion = "2.13.0")
@@ -558,12 +560,11 @@ public final class PlaceholderAPI {
     }
 
     /**
-   * @deprecated Will be removed in a future release.
-   *
      * @param player   The offline player to parse the placeholders against
      * @param text     The text to parse
      * @param colorize If PlaceholderAPI should also parse color codes
      * @return String with the parsed placeholders
+     * @deprecated Will be removed in a future release.
      */
     @Deprecated
     @ApiStatus.ScheduledForRemoval(inVersion = "2.13.0")
@@ -572,12 +573,11 @@ public final class PlaceholderAPI {
     }
 
     /**
-   * @deprecated Will be removed in a future release.
-   *
      * @param player   The offline player to parse the placeholders against
      * @param text     The List of text to parse
      * @param colorize If PlaceholderAPI should also parse color codes
      * @return String with the parsed placeholders
+     * @deprecated Will be removed in a future release.
      */
     @Deprecated
     @ApiStatus.ScheduledForRemoval(inVersion = "2.13.0")

src/main/java/me/clip/placeholderapi/PlaceholderAPIPlugin.java

@@ -2,7 +2,7 @@
  * This file is part of PlaceholderAPI
  *
  * PlaceholderAPI
- * Copyright (c) 2015 - 2024 PlaceholderAPI Team
+ * Copyright (c) 2015 - 2026 PlaceholderAPI Team
  *
  * PlaceholderAPI free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -21,9 +21,9 @@
 package me.clip.placeholderapi;
 
 import java.text.SimpleDateFormat;
-import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Map;
+
 import me.clip.placeholderapi.commands.PlaceholderCommandRouter;
 import me.clip.placeholderapi.configuration.PlaceholderAPIConfig;
 import me.clip.placeholderapi.expansion.PlaceholderExpansion;
@@ -34,6 +34,7 @@ import me.clip.placeholderapi.listeners.ServerLoadEventListener;
 import me.clip.placeholderapi.scheduler.UniversalScheduler;
 import me.clip.placeholderapi.scheduler.scheduling.schedulers.TaskScheduler;
 import me.clip.placeholderapi.updatechecker.UpdateChecker;
+import me.clip.placeholderapi.util.ExpansionSafetyCheck;
 import me.clip.placeholderapi.util.Msg;
 import net.kyori.adventure.platform.bukkit.BukkitAudiences;
 import org.bstats.bukkit.Metrics;
@@ -43,6 +44,7 @@ import org.bukkit.Bukkit;
 import org.bukkit.command.CommandSender;
 import org.bukkit.command.PluginCommand;
 import org.bukkit.event.HandlerList;
+import org.bukkit.event.Listener;
 import org.bukkit.plugin.java.JavaPlugin;
 import org.jetbrains.annotations.NotNull;
 
@@ -92,6 +94,7 @@ public final class PlaceholderAPIPlugin extends JavaPlugin {
     private final TaskScheduler scheduler = UniversalScheduler.getScheduler(this);
 
     private BukkitAudiences adventure;
+    private boolean safetyCheck = false;
 
 
     /**
@@ -150,13 +153,23 @@ public final class PlaceholderAPIPlugin extends JavaPlugin {
 
     @Override
     public void onLoad() {
-    instance = this;
-
         saveDefaultConfig();
+
+        safetyCheck = new ExpansionSafetyCheck(this).runChecks();
+
+        if (safetyCheck) {
+            return;
+        }
+
+        instance = this;
     }
 
     @Override
     public void onEnable() {
+        if (safetyCheck) {
+            return;
+        }
+
         setupCommand();
         setupMetrics();
         setupExpansions();
@@ -174,6 +187,10 @@ public final class PlaceholderAPIPlugin extends JavaPlugin {
 
     @Override
     public void onDisable() {
+        if (safetyCheck) {
+            return;
+        }
+
         getCloudExpansionManager().kill();
         getLocalExpansionManager().kill();
 

src/main/java/me/clip/placeholderapi/PlaceholderHook.java

@@ -2,7 +2,7 @@
  * This file is part of PlaceholderAPI
  *
  * PlaceholderAPI
- * Copyright (c) 2015 - 2024 PlaceholderAPI Team
+ * Copyright (c) 2015 - 2026 PlaceholderAPI Team
  *
  * PlaceholderAPI free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

src/main/java/me/clip/placeholderapi/commands/PlaceholderCommand.java

@@ -2,7 +2,7 @@
  * This file is part of PlaceholderAPI
  *
  * PlaceholderAPI
- * Copyright (c) 2015 - 2024 PlaceholderAPI Team
+ * Copyright (c) 2015 - 2026 PlaceholderAPI Team
  *
  * PlaceholderAPI free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -22,10 +22,12 @@ package me.clip.placeholderapi.commands;
 
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Sets;
+
 import java.util.List;
 import java.util.Locale;
 import java.util.Set;
 import java.util.stream.Stream;
+
 import me.clip.placeholderapi.PlaceholderAPIPlugin;
 import org.bukkit.command.CommandSender;
 import org.jetbrains.annotations.NotNull;

src/main/java/me/clip/placeholderapi/commands/PlaceholderCommandRouter.java

@@ -2,7 +2,7 @@
  * This file is part of PlaceholderAPI
  *
  * PlaceholderAPI
- * Copyright (c) 2015 - 2024 PlaceholderAPI Team
+ * Copyright (c) 2015 - 2026 PlaceholderAPI Team
  *
  * PlaceholderAPI free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -22,6 +22,7 @@ package me.clip.placeholderapi.commands;
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
+
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
@@ -30,6 +31,8 @@ import java.util.List;
 import java.util.Locale;
 import java.util.Map;
 import java.util.stream.Stream;
+
+import com.google.common.collect.Lists;
 import me.clip.placeholderapi.PlaceholderAPIPlugin;
 import me.clip.placeholderapi.commands.impl.cloud.CommandECloud;
 import me.clip.placeholderapi.commands.impl.local.CommandDump;
@@ -117,14 +120,18 @@ public final class PlaceholderCommandRouter implements CommandExecutor, TabCompl
     }
 
     @Override
-  public List<String> onTabComplete(@NotNull final CommandSender sender,
-      @NotNull final Command command, @NotNull final String alias, @NotNull final String[] args) {
+    public List<String> onTabComplete(@NotNull final CommandSender sender, @NotNull final Command command,
+                                      @NotNull final String alias, @NotNull final String[] args) {
         final List<String> suggestions = new ArrayList<>();
 
         if (args.length > 1) {
             final PlaceholderCommand target = this.commands.get(args[0].toLowerCase(Locale.ROOT));
 
             if (target != null) {
+                if (target.getPermission() != null && !target.getPermission().isEmpty() && !sender.hasPermission(target.getPermission())) {
+                    return suggestions;
+                }
+
                 target.complete(plugin, sender, args[0].toLowerCase(Locale.ROOT),
                         Arrays.asList(Arrays.copyOfRange(args, 1, args.length)), suggestions);
             }

src/main/java/me/clip/placeholderapi/commands/impl/cloud/CommandECloud.java

@@ -2,7 +2,7 @@
  * This file is part of PlaceholderAPI
  *
  * PlaceholderAPI
- * Copyright (c) 2015 - 2024 PlaceholderAPI Team
+ * Copyright (c) 2015 - 2026 PlaceholderAPI Team
  *
  * PlaceholderAPI free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -118,6 +118,11 @@ public final class CommandECloud extends PlaceholderCommand {
             return;
         }
 
+        if (!target.getLabel().equalsIgnoreCase("refresh") && plugin.getCloudExpansionManager().isEmpty()) {
+            Msg.msg(sender, "&cThere is no available data from the eCloud. Please try running &f/papi ecloud refresh&c. If this does not resolve the issue, the eCloud may be blocked by your firewall, server host, or service provider.\n&r\n&cMore information: &fhttps://placeholderapi.com/ecloud-blocked");
+            return;
+        }
+
         target.evaluate(plugin, sender, search, params.subList(1, params.size()));
     }
 

src/main/java/me/clip/placeholderapi/commands/impl/cloud/CommandECloudClear.java

@@ -2,7 +2,7 @@
  * This file is part of PlaceholderAPI
  *
  * PlaceholderAPI
- * Copyright (c) 2015 - 2024 PlaceholderAPI Team
+ * Copyright (c) 2015 - 2026 PlaceholderAPI Team
  *
  * PlaceholderAPI free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -21,6 +21,7 @@
 package me.clip.placeholderapi.commands.impl.cloud;
 
 import java.util.List;
+
 import me.clip.placeholderapi.PlaceholderAPIPlugin;
 import me.clip.placeholderapi.commands.PlaceholderCommand;
 import me.clip.placeholderapi.util.Msg;

src/main/java/me/clip/placeholderapi/commands/impl/cloud/CommandECloudDownload.java

@@ -2,7 +2,7 @@
  * This file is part of PlaceholderAPI
  *
  * PlaceholderAPI
- * Copyright (c) 2015 - 2024 PlaceholderAPI Team
+ * Copyright (c) 2015 - 2026 PlaceholderAPI Team
  *
  * PlaceholderAPI free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -24,6 +24,7 @@ import java.util.Arrays;
 import java.util.List;
 import java.util.Optional;
 import java.util.stream.Stream;
+
 import me.clip.placeholderapi.PlaceholderAPIPlugin;
 import me.clip.placeholderapi.commands.PlaceholderCommand;
 import me.clip.placeholderapi.expansion.cloud.CloudExpansion;
@@ -72,11 +73,6 @@ public final class CommandECloudDownload extends PlaceholderCommand {
             return;
         }
 
-    if (!expansion.isVerified()) {
-      Msg.msg(sender, "&cThe expansion '&f" + params.get(0) + "&c' is not verified and can only be downloaded manually from &fhttps://placeholderapi.com/ecloud");
-      return;
-    }
-
         final CloudExpansion.Version version;
         if (params.size() < 2) {
             version = expansion.getVersion(expansion.getLatestVersion());
@@ -95,6 +91,11 @@ public final class CommandECloudDownload extends PlaceholderCommand {
             }
         }
 
+        if (!version.isVerified()) {
+            Msg.msg(sender, "&cThe expansion '&f" + params.get(0) + "&c' is not verified and can only be downloaded manually from &fhttps://ecloud.placeholderapi.com");
+            return;
+        }
+
         plugin.getCloudExpansionManager().downloadExpansion(expansion, version)
                 .whenComplete((file, exception) -> {
                     if (exception != null) {

src/main/java/me/clip/placeholderapi/commands/impl/cloud/CommandECloudExpansionInfo.java

@@ -2,7 +2,7 @@
  * This file is part of PlaceholderAPI
  *
  * PlaceholderAPI
- * Copyright (c) 2015 - 2024 PlaceholderAPI Team
+ * Copyright (c) 2015 - 2026 PlaceholderAPI Team
  *
  * PlaceholderAPI free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -23,6 +23,7 @@ package me.clip.placeholderapi.commands.impl.cloud;
 import java.util.List;
 import java.util.Optional;
 import java.util.stream.Stream;
+
 import me.clip.placeholderapi.PlaceholderAPIPlugin;
 import me.clip.placeholderapi.commands.PlaceholderCommand;
 import me.clip.placeholderapi.expansion.cloud.CloudExpansion;
@@ -63,9 +64,6 @@ public final class CommandECloudExpansionInfo extends PlaceholderCommand {
                 .append('\n')
                 .append("&bAuthor: &f")
                 .append(expansion.getAuthor())
-        .append('\n')
-        .append("&bVerified: ")
-        .append(expansion.isVerified() ? "&a&l✔" : "&c&l❌")
                 .append('\n');
 
         if (params.size() < 2) {
@@ -76,6 +74,9 @@ public final class CommandECloudExpansionInfo extends PlaceholderCommand {
                     .append(expansion.getTimeSinceLastUpdate())
                     .append(" ago")
                     .append('\n')
+                    .append("&bVerified: ")
+                    .append(expansion.getVersion().isVerified() ? "&a&l✔" : "&c&l❌")
+                    .append('\n')
                     .append("&bRelease Notes: &f")
                     .append(expansion.getVersion().getReleaseNotes())
                     .append('\n');
@@ -91,6 +92,9 @@ public final class CommandECloudExpansionInfo extends PlaceholderCommand {
             builder.append("&bVersion: &f")
                     .append(version.getVersion())
                     .append('\n')
+                    .append("&bVerified: ")
+                    .append(version.isVerified() ? "&a&l✔" : "&c&l❌")
+                    .append('\n')
                     .append("&bRelease Notes: &f")
                     .append(version.getReleaseNotes())
                     .append('\n')

src/main/java/me/clip/placeholderapi/commands/impl/cloud/CommandECloudExpansionList.java

@@ -2,7 +2,7 @@
  * This file is part of PlaceholderAPI
  *
  * PlaceholderAPI
- * Copyright (c) 2015 - 2024 PlaceholderAPI Team
+ * Copyright (c) 2015 - 2026 PlaceholderAPI Team
  *
  * PlaceholderAPI free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -25,12 +25,14 @@ import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Sets;
 import com.google.common.primitives.Ints;
+
 import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
+
 import me.clip.placeholderapi.PlaceholderAPIPlugin;
 import me.clip.placeholderapi.commands.PlaceholderCommand;
 import me.clip.placeholderapi.configuration.ExpansionSort;
@@ -65,7 +67,7 @@ public final class CommandECloudExpansionList extends PlaceholderCommand {
             expansion -> "&f" + expansion.getAuthor();
     @NotNull
     private static final Function<CloudExpansion, Object> EXPANSION_VERIFIED =
-      expansion -> expansion.isVerified() ? "&aY" : "&cN";
+            expansion -> expansion.getVersion().isVerified() ? "&aY" : "&cN";
     @NotNull
     private static final Function<CloudExpansion, Object> EXPANSION_LATEST_VERSION =
             expansion -> "&f" + expansion.getLatestVersion();
@@ -168,7 +170,9 @@ public final class CommandECloudExpansionList extends PlaceholderCommand {
                     .append(newline()).append(newline())
                     .append(text("Author: ", AQUA)).append(text(expansion.getAuthor(), WHITE))
                     .append(newline())
-              .append(text("Verified: ", AQUA)).append(text(expansion.isVerified() ? "✔" : "❌", expansion.isVerified() ? GREEN : RED, TextDecoration.BOLD))
+                    .append(text("Version: ", AQUA)).append(text(expansion.getVersion().getVersion(), WHITE))
+                    .append(newline())
+                    .append(text("Verified: ", AQUA)).append(text(expansion.getVersion().isVerified() ? "✔" : "❌", expansion.getVersion().isVerified() ? GREEN : RED, TextDecoration.BOLD))
                     .append(newline())
                     .append(text("Released: ", AQUA)).append(text(format.format(expansion.getLastUpdate()), WHITE))
                     .toBuilder();

src/main/java/me/clip/placeholderapi/commands/impl/cloud/CommandECloudExpansionPlaceholders.java

@@ -2,7 +2,7 @@
  * This file is part of PlaceholderAPI
  *
  * PlaceholderAPI
- * Copyright (c) 2015 - 2024 PlaceholderAPI Team
+ * Copyright (c) 2015 - 2026 PlaceholderAPI Team
  *
  * PlaceholderAPI free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -21,9 +21,11 @@
 package me.clip.placeholderapi.commands.impl.cloud;
 
 import com.google.common.collect.Lists;
+
 import java.util.List;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
+
 import me.clip.placeholderapi.PlaceholderAPIPlugin;
 import me.clip.placeholderapi.commands.PlaceholderCommand;
 import me.clip.placeholderapi.expansion.cloud.CloudExpansion;

src/main/java/me/clip/placeholderapi/commands/impl/cloud/CommandECloudRefresh.java

@@ -2,7 +2,7 @@
  * This file is part of PlaceholderAPI
  *
  * PlaceholderAPI
- * Copyright (c) 2015 - 2024 PlaceholderAPI Team
+ * Copyright (c) 2015 - 2026 PlaceholderAPI Team
  *
  * PlaceholderAPI free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -21,6 +21,7 @@
 package me.clip.placeholderapi.commands.impl.cloud;
 
 import java.util.List;
+
 import me.clip.placeholderapi.PlaceholderAPIPlugin;
 import me.clip.placeholderapi.commands.PlaceholderCommand;
 import me.clip.placeholderapi.util.Msg;

src/main/java/me/clip/placeholderapi/commands/impl/cloud/CommandECloudStatus.java

@@ -2,7 +2,7 @@
  * This file is part of PlaceholderAPI
  *
  * PlaceholderAPI
- * Copyright (c) 2015 - 2024 PlaceholderAPI Team
+ * Copyright (c) 2015 - 2026 PlaceholderAPI Team
  *
  * PlaceholderAPI free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -21,6 +21,7 @@
 package me.clip.placeholderapi.commands.impl.cloud;
 
 import java.util.List;
+
 import me.clip.placeholderapi.PlaceholderAPIPlugin;
 import me.clip.placeholderapi.commands.PlaceholderCommand;
 import me.clip.placeholderapi.expansion.manager.CloudExpansionManager;

src/main/java/me/clip/placeholderapi/commands/impl/cloud/CommandECloudUpdate.java

@@ -2,7 +2,7 @@
  * This file is part of PlaceholderAPI
  *
  * PlaceholderAPI
- * Copyright (c) 2015 - 2024 PlaceholderAPI Team
+ * Copyright (c) 2015 - 2026 PlaceholderAPI Team
  *
  * PlaceholderAPI free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -21,6 +21,7 @@
 package me.clip.placeholderapi.commands.impl.cloud;
 
 import com.google.common.collect.Lists;
+
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Locale;
@@ -28,6 +29,7 @@ import java.util.Objects;
 import java.util.Optional;
 import java.util.concurrent.CompletableFuture;
 import java.util.stream.Collectors;
+
 import me.clip.placeholderapi.PlaceholderAPIPlugin;
 import me.clip.placeholderapi.commands.PlaceholderCommand;
 import me.clip.placeholderapi.expansion.PlaceholderExpansion;

src/main/java/me/clip/placeholderapi/commands/impl/local/CommandDump.java

@@ -2,7 +2,7 @@
  * This file is part of PlaceholderAPI
  *
  * PlaceholderAPI
- * Copyright (c) 2015 - 2024 PlaceholderAPI Team
+ * Copyright (c) 2015 - 2026 PlaceholderAPI Team
  *
  * PlaceholderAPI free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

src/main/java/me/clip/placeholderapi/commands/impl/local/CommandExpansionRegister.java

@@ -2,7 +2,7 @@
  * This file is part of PlaceholderAPI
  *
  * PlaceholderAPI
- * Copyright (c) 2015 - 2024 PlaceholderAPI Team
+ * Copyright (c) 2015 - 2026 PlaceholderAPI Team
  *
  * PlaceholderAPI free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -25,6 +25,7 @@ import java.util.Arrays;
 import java.util.List;
 import java.util.Optional;
 import java.util.logging.Level;
+
 import me.clip.placeholderapi.PlaceholderAPIPlugin;
 import me.clip.placeholderapi.commands.PlaceholderCommand;
 import me.clip.placeholderapi.expansion.PlaceholderExpansion;

src/main/java/me/clip/placeholderapi/commands/impl/local/CommandExpansionUnregister.java

@@ -2,7 +2,7 @@
  * This file is part of PlaceholderAPI
  *
  * PlaceholderAPI
- * Copyright (c) 2015 - 2024 PlaceholderAPI Team
+ * Copyright (c) 2015 - 2026 PlaceholderAPI Team
  *
  * PlaceholderAPI free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -22,6 +22,7 @@ package me.clip.placeholderapi.commands.impl.local;
 
 import java.util.List;
 import java.util.Optional;
+
 import me.clip.placeholderapi.PlaceholderAPI;
 import me.clip.placeholderapi.PlaceholderAPIPlugin;
 import me.clip.placeholderapi.commands.PlaceholderCommand;

src/main/java/me/clip/placeholderapi/commands/impl/local/CommandHelp.java

@@ -2,7 +2,7 @@
  * This file is part of PlaceholderAPI
  *
  * PlaceholderAPI
- * Copyright (c) 2015 - 2024 PlaceholderAPI Team
+ * Copyright (c) 2015 - 2026 PlaceholderAPI Team
  *
  * PlaceholderAPI free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -21,6 +21,7 @@
 package me.clip.placeholderapi.commands.impl.local;
 
 import java.util.List;
+
 import me.clip.placeholderapi.PlaceholderAPIPlugin;
 import me.clip.placeholderapi.commands.PlaceholderCommand;
 import me.clip.placeholderapi.util.Msg;

src/main/java/me/clip/placeholderapi/commands/impl/local/CommandInfo.java

@@ -2,7 +2,7 @@
  * This file is part of PlaceholderAPI
  *
  * PlaceholderAPI
- * Copyright (c) 2015 - 2024 PlaceholderAPI Team
+ * Copyright (c) 2015 - 2026 PlaceholderAPI Team
  *
  * PlaceholderAPI free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -21,6 +21,7 @@
 package me.clip.placeholderapi.commands.impl.local;
 
 import java.util.List;
+
 import me.clip.placeholderapi.PlaceholderAPI;
 import me.clip.placeholderapi.PlaceholderAPIPlugin;
 import me.clip.placeholderapi.commands.PlaceholderCommand;

src/main/java/me/clip/placeholderapi/commands/impl/local/CommandList.java

@@ -2,7 +2,7 @@
  * This file is part of PlaceholderAPI
  *
  * PlaceholderAPI
- * Copyright (c) 2015 - 2024 PlaceholderAPI Team
+ * Copyright (c) 2015 - 2026 PlaceholderAPI Team
  *
  * PlaceholderAPI free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -21,9 +21,11 @@
 package me.clip.placeholderapi.commands.impl.local;
 
 import com.google.common.collect.Lists;
+
 import java.util.List;
 import java.util.Set;
 import java.util.stream.Collectors;
+
 import me.clip.placeholderapi.PlaceholderAPI;
 import me.clip.placeholderapi.PlaceholderAPIPlugin;
 import me.clip.placeholderapi.commands.PlaceholderCommand;

src/main/java/me/clip/placeholderapi/commands/impl/local/CommandParse.java

@@ -2,7 +2,7 @@
  * This file is part of PlaceholderAPI
  *
  * PlaceholderAPI
- * Copyright (c) 2015 - 2024 PlaceholderAPI Team
+ * Copyright (c) 2015 - 2026 PlaceholderAPI Team
  *
  * PlaceholderAPI free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -25,6 +25,7 @@ import java.util.List;
 import java.util.Locale;
 import java.util.Set;
 import java.util.stream.Stream;
+
 import me.clip.placeholderapi.PlaceholderAPI;
 import me.clip.placeholderapi.PlaceholderAPIPlugin;
 import me.clip.placeholderapi.commands.PlaceholderCommand;

src/main/java/me/clip/placeholderapi/commands/impl/local/CommandReload.java

@@ -2,7 +2,7 @@
  * This file is part of PlaceholderAPI
  *
  * PlaceholderAPI
- * Copyright (c) 2015 - 2024 PlaceholderAPI Team
+ * Copyright (c) 2015 - 2026 PlaceholderAPI Team
  *
  * PlaceholderAPI free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -21,8 +21,10 @@
 package me.clip.placeholderapi.commands.impl.local;
 
 import java.util.List;
+
 import me.clip.placeholderapi.PlaceholderAPIPlugin;
 import me.clip.placeholderapi.commands.PlaceholderCommand;
+import me.clip.placeholderapi.util.ExpansionSafetyCheck;
 import org.bukkit.command.CommandSender;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Unmodifiable;
@@ -37,7 +39,9 @@ public final class CommandReload extends PlaceholderCommand {
     public void evaluate(@NotNull final PlaceholderAPIPlugin plugin,
                          @NotNull final CommandSender sender, @NotNull final String alias,
                          @NotNull @Unmodifiable final List<String> params) {
+        if (!new ExpansionSafetyCheck(plugin).runChecks()) {
             plugin.reloadConf(sender);
         }
+    }
 
 }

src/main/java/me/clip/placeholderapi/commands/impl/local/CommandVersion.java

@@ -2,7 +2,7 @@
  * This file is part of PlaceholderAPI
  *
  * PlaceholderAPI
- * Copyright (c) 2015 - 2024 PlaceholderAPI Team
+ * Copyright (c) 2015 - 2026 PlaceholderAPI Team
  *
  * PlaceholderAPI free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -21,6 +21,7 @@
 package me.clip.placeholderapi.commands.impl.local;
 
 import java.util.List;
+
 import me.clip.placeholderapi.PlaceholderAPIPlugin;
 import me.clip.placeholderapi.commands.PlaceholderCommand;
 import me.clip.placeholderapi.util.Msg;

src/main/java/me/clip/placeholderapi/configuration/ExpansionSort.java

@@ -2,7 +2,7 @@
  * This file is part of PlaceholderAPI
  *
  * PlaceholderAPI
- * Copyright (c) 2015 - 2024 PlaceholderAPI Team
+ * Copyright (c) 2015 - 2026 PlaceholderAPI Team
  *
  * PlaceholderAPI free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -21,6 +21,7 @@
 package me.clip.placeholderapi.configuration;
 
 import java.util.Comparator;
+
 import me.clip.placeholderapi.expansion.cloud.CloudExpansion;
 import org.jetbrains.annotations.NotNull;
 

src/main/java/me/clip/placeholderapi/configuration/PlaceholderAPIConfig.java

@@ -2,7 +2,7 @@
  * This file is part of PlaceholderAPI
  *
  * PlaceholderAPI
- * Copyright (c) 2015 - 2024 PlaceholderAPI Team
+ * Copyright (c) 2015 - 2026 PlaceholderAPI Team
  *
  * PlaceholderAPI free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -21,6 +21,7 @@
 package me.clip.placeholderapi.configuration;
 
 import java.util.Optional;
+
 import me.clip.placeholderapi.PlaceholderAPIPlugin;
 import org.jetbrains.annotations.NotNull;
 
@@ -53,6 +54,10 @@ public final class PlaceholderAPIConfig {
         return plugin.getConfig().getBoolean("debug", false);
     }
 
+    public boolean useAdventureReplacer() {
+        return plugin.getConfig().getBoolean("use_adventure_provided_replacer", false);
+    }
+
 
     public Optional<ExpansionSort> getExpansionSort() {
         final String option = plugin.getConfig()
@@ -86,4 +91,11 @@ public final class PlaceholderAPIConfig {
         return plugin.getConfig().getString("boolean.false", "false");
     }
 
+    public boolean useAdventureProvidedReplacer() {
+        return plugin.getConfig().getBoolean("use_adventure_provided_replacer", false);
+    }
+
+    public boolean detectMaliciousExpansions() {
+        return plugin.getConfig().getBoolean("detect_malicious_expansions", true);
+    }
 }

src/main/java/me/clip/placeholderapi/events/ExpansionRegisterEvent.java

@@ -2,7 +2,7 @@
  * This file is part of PlaceholderAPI
  *
  * PlaceholderAPI
- * Copyright (c) 2015 - 2024 PlaceholderAPI Team
+ * Copyright (c) 2015 - 2026 PlaceholderAPI Team
  *
  * PlaceholderAPI free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

src/main/java/me/clip/placeholderapi/events/ExpansionUnregisterEvent.java

@@ -2,7 +2,7 @@
  * This file is part of PlaceholderAPI
  *
  * PlaceholderAPI
- * Copyright (c) 2015 - 2024 PlaceholderAPI Team
+ * Copyright (c) 2015 - 2026 PlaceholderAPI Team
  *
  * PlaceholderAPI free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

src/main/java/me/clip/placeholderapi/events/ExpansionsLoadedEvent.java

@@ -2,7 +2,7 @@
  * This file is part of PlaceholderAPI
  *
  * PlaceholderAPI
- * Copyright (c) 2015 - 2024 PlaceholderAPI Team
+ * Copyright (c) 2015 - 2026 PlaceholderAPI Team
  *
  * PlaceholderAPI free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -23,6 +23,7 @@ package me.clip.placeholderapi.events;
 
 import java.util.Collections;
 import java.util.List;
+
 import me.clip.placeholderapi.expansion.PlaceholderExpansion;
 import org.bukkit.event.Event;
 import org.bukkit.event.HandlerList;

src/main/java/me/clip/placeholderapi/events/PlaceholderHookUnloadEvent.java

@@ -2,7 +2,7 @@
  * This file is part of PlaceholderAPI
  *
  * PlaceholderAPI
- * Copyright (c) 2015 - 2024 PlaceholderAPI Team
+ * Copyright (c) 2015 - 2026 PlaceholderAPI Team
  *
  * PlaceholderAPI free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

src/main/java/me/clip/placeholderapi/exceptions/NoDefaultCommandException.java

@@ -2,7 +2,7 @@
  * This file is part of PlaceholderAPI
  *
  * PlaceholderAPI
- * Copyright (c) 2015 - 2024 PlaceholderAPI Team
+ * Copyright (c) 2015 - 2026 PlaceholderAPI Team
  *
  * PlaceholderAPI free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

src/main/java/me/clip/placeholderapi/expansion/Cacheable.java

@@ -2,7 +2,7 @@
  * This file is part of PlaceholderAPI
  *
  * PlaceholderAPI
- * Copyright (c) 2015 - 2024 PlaceholderAPI Team
+ * Copyright (c) 2015 - 2026 PlaceholderAPI Team
  *
  * PlaceholderAPI free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

src/main/java/me/clip/placeholderapi/expansion/Cleanable.java

@@ -2,7 +2,7 @@
  * This file is part of PlaceholderAPI
  *
  * PlaceholderAPI
- * Copyright (c) 2015 - 2024 PlaceholderAPI Team
+ * Copyright (c) 2015 - 2026 PlaceholderAPI Team
  *
  * PlaceholderAPI free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

src/main/java/me/clip/placeholderapi/expansion/Configurable.java

@@ -2,7 +2,7 @@
  * This file is part of PlaceholderAPI
  *
  * PlaceholderAPI
- * Copyright (c) 2015 - 2024 PlaceholderAPI Team
+ * Copyright (c) 2015 - 2026 PlaceholderAPI Team
  *
  * PlaceholderAPI free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

src/main/java/me/clip/placeholderapi/expansion/NMSVersion.java

@@ -2,7 +2,7 @@
  * This file is part of PlaceholderAPI
  *
  * PlaceholderAPI
- * Copyright (c) 2015 - 2024 PlaceholderAPI Team
+ * Copyright (c) 2015 - 2026 PlaceholderAPI Team
  *
  * PlaceholderAPI free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

src/main/java/me/clip/placeholderapi/expansion/PlaceholderExpansion.java

@@ -2,7 +2,7 @@
  * This file is part of PlaceholderAPI
  *
  * PlaceholderAPI
- * Copyright (c) 2015 - 2024 PlaceholderAPI Team
+ * Copyright (c) 2015 - 2026 PlaceholderAPI Team
  *
  * PlaceholderAPI free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -23,6 +23,7 @@ package me.clip.placeholderapi.expansion;
 import java.util.Collections;
 import java.util.List;
 import java.util.logging.Level;
+
 import me.clip.placeholderapi.PlaceholderAPIPlugin;
 import me.clip.placeholderapi.PlaceholderHook;
 import org.bukkit.Bukkit;
@@ -43,6 +44,7 @@ public abstract class PlaceholderExpansion extends PlaceholderHook {
     /**
      * The type is {@link Type#INTERNAL} by default.
      * For external expansions, the type is updated on {@link me.clip.placeholderapi.expansion.manager.LocalExpansionManager#register(Class) register}.
+     *
      * @since 2.11.4
      */
     @ApiStatus.Internal
@@ -180,6 +182,7 @@ public abstract class PlaceholderExpansion extends PlaceholderHook {
 
     /**
      * Set the type of the expansion
+     *
      * @param expansionType the new type
      * @since 2.11.4
      */
@@ -430,9 +433,8 @@ public abstract class PlaceholderExpansion extends PlaceholderHook {
     // === Deprecated API ===
 
     /**
-   * @deprecated As of versions greater than 2.8.7, use {@link #getRequiredPlugin()}
-   *
      * @return The plugin name.
+     * @deprecated As of versions greater than 2.8.7, use {@link #getRequiredPlugin()}
      */
     @Deprecated
     @ApiStatus.ScheduledForRemoval(inVersion = "2.13.0")
@@ -441,9 +443,8 @@ public abstract class PlaceholderExpansion extends PlaceholderHook {
     }
 
     /**
-   * @deprecated As of versions greater than 2.8.7, use the expansion cloud to show a description
-   *
      * @return The description of the expansion.
+     * @deprecated As of versions greater than 2.8.7, use the expansion cloud to show a description
      */
     @Deprecated
     @ApiStatus.ScheduledForRemoval(inVersion = "2.13.0")
@@ -452,9 +453,8 @@ public abstract class PlaceholderExpansion extends PlaceholderHook {
     }
 
     /**
-   * @deprecated As of versions greater than 2.8.7, use the expansion cloud to display a link
-   *
      * @return The link for the expansion.
+     * @deprecated As of versions greater than 2.8.7, use the expansion cloud to display a link
      */
     @Deprecated
     @ApiStatus.ScheduledForRemoval(inVersion = "2.13.0")

src/main/java/me/clip/placeholderapi/expansion/Relational.java

@@ -2,7 +2,7 @@
  * This file is part of PlaceholderAPI
  *
  * PlaceholderAPI
- * Copyright (c) 2015 - 2024 PlaceholderAPI Team
+ * Copyright (c) 2015 - 2026 PlaceholderAPI Team
  *
  * PlaceholderAPI free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

src/main/java/me/clip/placeholderapi/expansion/Taskable.java

@@ -2,7 +2,7 @@
  * This file is part of PlaceholderAPI
  *
  * PlaceholderAPI
- * Copyright (c) 2015 - 2024 PlaceholderAPI Team
+ * Copyright (c) 2015 - 2026 PlaceholderAPI Team
  *
  * PlaceholderAPI free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

src/main/java/me/clip/placeholderapi/expansion/Version.java

@@ -2,7 +2,7 @@
  * This file is part of PlaceholderAPI
  *
  * PlaceholderAPI
- * Copyright (c) 2015 - 2024 PlaceholderAPI Team
+ * Copyright (c) 2015 - 2026 PlaceholderAPI Team
  *
  * PlaceholderAPI free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

src/main/java/me/clip/placeholderapi/expansion/VersionSpecific.java

@@ -2,7 +2,7 @@
  * This file is part of PlaceholderAPI
  *
  * PlaceholderAPI
- * Copyright (c) 2015 - 2024 PlaceholderAPI Team
+ * Copyright (c) 2015 - 2026 PlaceholderAPI Team
  *
  * PlaceholderAPI free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -27,7 +27,6 @@ package me.clip.placeholderapi.expansion;
  * with that version.
  *
  * @author Ryan McCarthy
- *
  * @deprecated Will be removed in a future release.
  */
 @Deprecated
@@ -38,7 +37,6 @@ public interface VersionSpecific {
      * will be passed to this method so you know what version the server is currently running.
      *
      * @param v The {@link Version} to check against
-   *
      * @return true if your expansion is compatible with the version the server is running.
      */
     boolean isCompatibleWith(Version v);

src/main/java/me/clip/placeholderapi/expansion/cloud/CloudExpansion.java

@@ -2,7 +2,7 @@
  * This file is part of PlaceholderAPI
  *
  * PlaceholderAPI
- * Copyright (c) 2015 - 2024 PlaceholderAPI Team
+ * Copyright (c) 2015 - 2026 PlaceholderAPI Team
  *
  * PlaceholderAPI free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -23,6 +23,7 @@ package me.clip.placeholderapi.expansion.cloud;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
+
 import me.clip.placeholderapi.util.TimeUtil;
 
 
@@ -36,8 +37,7 @@ public class CloudExpansion {
             dependency_url;
 
     private boolean hasExpansion,
-      shouldUpdate,
-      verified;
+            shouldUpdate;
 
     private long last_update,
             ratings_count;
@@ -135,10 +135,6 @@ public class CloudExpansion {
         this.shouldUpdate = shouldUpdate;
     }
 
-  public boolean isVerified() {
-    return verified;
-  }
-
     public long getLastUpdate() {
         return last_update;
     }
@@ -174,6 +170,7 @@ public class CloudExpansion {
     public static class Version {
 
         private String url, version, release_notes;
+        private boolean verified;
 
         public String getUrl() {
             return url;
@@ -198,5 +195,13 @@ public class CloudExpansion {
         public void setReleaseNotes(String release_notes) {
             this.release_notes = release_notes;
         }
+
+        public boolean isVerified() {
+            return verified;
+        }
+
+        public void setVerified(boolean verified) {
+            this.verified = verified;
+        }
     }
 }

src/main/java/me/clip/placeholderapi/expansion/manager/CloudExpansionManager.java

@@ -2,7 +2,7 @@
  * This file is part of PlaceholderAPI
  *
  * PlaceholderAPI
- * Copyright (c) 2015 - 2024 PlaceholderAPI Team
+ * Copyright (c) 2015 - 2026 PlaceholderAPI Team
  *
  * PlaceholderAPI free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -25,11 +25,10 @@ import com.google.common.io.Resources;
 import com.google.common.util.concurrent.ThreadFactoryBuilder;
 import com.google.gson.Gson;
 import com.google.gson.reflect.TypeToken;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
+
+import java.io.*;
 import java.lang.reflect.Type;
-import java.net.URL;
+import java.net.*;
 import java.nio.channels.Channels;
 import java.nio.channels.ReadableByteChannel;
 import java.nio.charset.StandardCharsets;
@@ -50,6 +49,7 @@ import java.util.function.Function;
 import java.util.logging.Level;
 import java.util.stream.Collector;
 import java.util.stream.Collectors;
+
 import me.clip.placeholderapi.PlaceholderAPIPlugin;
 import me.clip.placeholderapi.expansion.PlaceholderExpansion;
 import me.clip.placeholderapi.expansion.cloud.CloudExpansion;
@@ -58,9 +58,27 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Unmodifiable;
 
 public final class CloudExpansionManager {
+    @NotNull
+    public static final String USER_AGENT;
+
+    static {
+        String userAgent;
+
+        try (final InputStream in = PlaceholderAPIPlugin.class.getResourceAsStream("/user-agent.txt")) {
+            if (in == null) {
+                userAgent = "PlaceholderAPI-Bukkit-null";
+            } else {
+                userAgent = new BufferedReader(new InputStreamReader(in, StandardCharsets.UTF_8)).readLine();
+            }
+        } catch (IOException e) {
+            userAgent = "PlaceholderAPI-Bukkit-null";
+        }
+
+        USER_AGENT = userAgent;
+    }
 
     @NotNull
-  private static final String API_URL = "http://api.extendedclip.com/v2/";
+    private static final String API_URL = "https://ecloud.placeholderapi.com/api/v3/?platform=bukkit";
 
     @NotNull
     private static final Gson GSON = new Gson();
@@ -113,6 +131,10 @@ public final class CloudExpansionManager {
         return ImmutableMap.copyOf(cache);
     }
 
+    public boolean isEmpty() {
+        return cache.isEmpty();
+    }
+
     @NotNull
     @Unmodifiable
     public Map<String, CloudExpansion> getCloudExpansionsInstalled() {
@@ -178,8 +200,16 @@ public final class CloudExpansionManager {
                     // a defence tactic! use ConcurrentHashMap instead of normal HashMap
                     Map<String, CloudExpansion> values = new ConcurrentHashMap<>();
                     try {
-            //noinspection UnstableApiUsage
-            String json = Resources.toString(new URL(API_URL), StandardCharsets.UTF_8);
+                        final URI uri = new URI(API_URL);
+                        final URLConnection connection = uri.toURL().openConnection();
+                        connection.setRequestProperty("User-Agent", USER_AGENT);
+                        final String json;
+
+                        try (final InputStream in = connection.getInputStream()) {
+                            final BufferedReader reader = new BufferedReader(new InputStreamReader(in, StandardCharsets.UTF_8));
+                            json = reader.lines().collect(Collectors.joining(System.lineSeparator()));
+                        }
+
                         values.putAll(GSON.fromJson(json, TYPE));
 
                         List<String> toRemove = new ArrayList<>();
@@ -195,6 +225,8 @@ public final class CloudExpansionManager {
                         for (String name : toRemove) {
                             values.remove(name);
                         }
+                    } catch (UnknownHostException e) {
+                        plugin.getLogger().log(Level.WARNING, "There is no data available from the eCloud. Please try running /papi refresh. If this does not resolve the issue, the eCloud may be blocked by your firewall, server host, or service provider.\n\nMore information: https://placeholderapi.com/ecloud-blocked", e);
                     } catch (Throwable e) {
                         // ugly swallowing of every throwable, but we have to be defensive
                         plugin.getLogger().log(Level.WARNING, "Failed to download expansion information", e);
@@ -251,10 +283,14 @@ public final class CloudExpansionManager {
                 "Expansion-" + toIndexName(expansion) + ".jar");
 
         final CompletableFuture<File> download = CompletableFuture.supplyAsync(() -> {
-      try (final ReadableByteChannel source = Channels.newChannel(new URL(version.getUrl())
-          .openStream()); final FileOutputStream target = new FileOutputStream(file)) {
+            try {
+                final URLConnection connection = new URI(version.getUrl()).toURL().openConnection();
+                connection.setRequestProperty("User-Agent", USER_AGENT);
+
+                try (final ReadableByteChannel source = Channels.newChannel(connection.getInputStream()); final FileOutputStream target = new FileOutputStream(file)) {
                     target.getChannel().transferFrom(source, 0, Long.MAX_VALUE);
-      } catch (final IOException ex) {
+                }
+            } catch (final IOException | URISyntaxException ex) {
                 throw new CompletionException(ex);
             }
             return file;

src/main/java/me/clip/placeholderapi/expansion/manager/LocalExpansionManager.java

@@ -2,7 +2,7 @@
  * This file is part of PlaceholderAPI
  *
  * PlaceholderAPI
- * Copyright (c) 2015 - 2024 PlaceholderAPI Team
+ * Copyright (c) 2015 - 2026 PlaceholderAPI Team
  *
  * PlaceholderAPI free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -22,6 +22,7 @@ package me.clip.placeholderapi.expansion.manager;
 
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Sets;
+
 import java.io.File;
 import java.lang.reflect.Modifier;
 import java.util.Arrays;
@@ -38,6 +39,7 @@ import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.locks.ReentrantLock;
 import java.util.logging.Level;
 import java.util.stream.Collectors;
+
 import me.clip.placeholderapi.PlaceholderAPIPlugin;
 import me.clip.placeholderapi.events.ExpansionRegisterEvent;
 import me.clip.placeholderapi.events.ExpansionUnregisterEvent;
@@ -112,7 +114,7 @@ public final class LocalExpansionManager implements Listener {
 
     @NotNull
     @Unmodifiable
-  public Collection<String> getIdentifiers() {
+    public Set<String> getIdentifiers() {
         expansionsLock.lock();
         try {
             return ImmutableSet.copyOf(expansions.keySet());
@@ -134,12 +136,7 @@ public final class LocalExpansionManager implements Listener {
 
     @Nullable
     public PlaceholderExpansion getExpansion(@NotNull final String identifier) {
-    expansionsLock.lock();
-    try {
         return expansions.get(identifier.toLowerCase(Locale.ROOT));
-    } finally {
-      expansionsLock.unlock();
-    }
     }
 
     @NotNull
@@ -213,6 +210,7 @@ public final class LocalExpansionManager implements Listener {
 
     /**
      * Attempt to register a {@link PlaceholderExpansion}
+     *
      * @param expansion the expansion to register
      * @return if the expansion was registered
      */

src/main/java/me/clip/placeholderapi/expansion/manager/MethodSignature.java

@@ -2,7 +2,7 @@
  * This file is part of PlaceholderAPI
  *
  * PlaceholderAPI
- * Copyright (c) 2015 - 2024 PlaceholderAPI Team
+ * Copyright (c) 2015 - 2026 PlaceholderAPI Team
  *
  * PlaceholderAPI free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

src/main/java/me/clip/placeholderapi/listeners/ServerLoadEventListener.java

@@ -2,7 +2,7 @@
  * This file is part of PlaceholderAPI
  *
  * PlaceholderAPI
- * Copyright (c) 2015 - 2024 PlaceholderAPI Team
+ * Copyright (c) 2015 - 2026 PlaceholderAPI Team
  *
  * PlaceholderAPI free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

src/main/java/me/clip/placeholderapi/replacer/CharsReplacer.java

@@ -2,7 +2,7 @@
  * This file is part of PlaceholderAPI
  *
  * PlaceholderAPI
- * Copyright (c) 2015 - 2024 PlaceholderAPI Team
+ * Copyright (c) 2015 - 2026 PlaceholderAPI Team
  *
  * PlaceholderAPI free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -23,7 +23,6 @@ package me.clip.placeholderapi.replacer;
 import java.util.Locale;
 import java.util.function.Function;
 import me.clip.placeholderapi.expansion.PlaceholderExpansion;
-import org.bukkit.ChatColor;
 import org.bukkit.OfflinePlayer;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -37,98 +36,113 @@ public final class CharsReplacer implements Replacer {
         this.closure = closure;
     }
 
-
+    /**
+     * Translates placeholders within the provided text using a high-performance
+     * character-scanning approach.
+     * * <p>The method identifies placeholders delimited by the defined {@link Closure}
+     * (e.g., %identifier_params% or {identifier_params}). If a placeholder is
+     * successfully identified, the provided lookup function is used to fetch the
+     * corresponding {@link PlaceholderExpansion}.</p>
+     *
+     * @param text   The raw text containing potential placeholders to be replaced.
+     * @param player The {@link OfflinePlayer} to contextually parse the placeholders against.
+     * May be {@code null} if no player context is available.
+     * @param lookup A function that maps a lowercase identifier string to a registered
+     * {@link PlaceholderExpansion}.
+     * @return A string with all valid placeholders replaced by their respective values.
+     * Returns the original text if no placeholders are found.
+     */
     @NotNull
     @Override
     public String apply(@NotNull final String text, @Nullable final OfflinePlayer player,
                         @NotNull final Function<String, @Nullable PlaceholderExpansion> lookup) {
-    final char[] chars = text.toCharArray();
-    final StringBuilder builder = new StringBuilder(text.length());
+        final char head = closure.head;
+        int startPlaceholder = text.indexOf(head);
 
-    final StringBuilder identifier = new StringBuilder();
-    final StringBuilder parameters = new StringBuilder();
+        if (startPlaceholder == -1) {
+            return text;
+        }
 
-    for (int i = 0; i < chars.length; i++) {
-      final char l = chars[i];
+        final int length = text.length();
+        final StringBuilder builder = new StringBuilder(length + (length >> 3));
+        int cursor = 0;
 
-      if (l != closure.head || i + 1 >= chars.length) {
-        builder.append(l);
+        final char tail = closure.tail;
+
+        loop: do {
+            // Append plain text preceding the placeholder
+            if (startPlaceholder > cursor) {
+                builder.append(text, cursor, startPlaceholder);
+            }
+
+            final int endPlaceholder = text.indexOf(tail, startPlaceholder + 1);
+
+            if (endPlaceholder == -1) {
+                builder.append(text, startPlaceholder, length);
+                return builder.toString();
+            }
+
+            int underscoreIndex = -1;
+
+            for (int i = startPlaceholder + 1; i < endPlaceholder; i++) {
+                final char current = text.charAt(i);
+
+                if (current == ' ' && underscoreIndex == -1) {
+                    // Invalid placeholder (contains space before _).
+                    // Treat the opening symbol as literal text and search for the next one.
+                    builder.append(head);
+                    cursor = startPlaceholder + 1;
+                    startPlaceholder = text.indexOf(head, cursor);
+
+                    // Safety check: If no more placeholders exist, break to finalize
+                    if (startPlaceholder == -1) {
+                        break loop;
+                    }
+                    continue loop;
+                }
+
+                if (current == '_' && underscoreIndex == -1) {
+                    underscoreIndex = i;
+                }
+            }
+
+            if (underscoreIndex == -1) {
+                builder.append(text, startPlaceholder, endPlaceholder + 1);
+                cursor = endPlaceholder + 1;
+                startPlaceholder = text.indexOf(head, cursor);
                 continue;
             }
 
-      boolean identified = false;
-      boolean invalid = true;
-      boolean hadSpace = false;
+            String identifier = text.substring(startPlaceholder + 1, underscoreIndex);
+            String parameters = "";
 
-      while (++i < chars.length) {
-        final char p = chars[i];
-
-        if (p == ' ' && !identified) {
-          hadSpace = true;
-          break;
-        }
-        if (p == closure.tail) {
-          invalid = false;
-          break;
+            if (underscoreIndex + 1 < endPlaceholder) {
+                parameters = text.substring(underscoreIndex + 1, endPlaceholder);
             }
 
-        if (p == '_' && !identified) {
-          identified = true;
-          continue;
-        }
-
-        if (identified) {
-          parameters.append(p);
-        } else {
-          identifier.append(p);
-        }
-      }
-
-      final String identifierString = identifier.toString();
-      final String lowercaseIdentifierString = identifierString.toLowerCase(Locale.ROOT);
-      final String parametersString = parameters.toString();
-
-      identifier.setLength(0);
-      parameters.setLength(0);
-
-      if (invalid) {
-        builder.append(closure.head).append(identifierString);
-
-        if (identified) {
-          builder.append('_').append(parametersString);
-        }
-
-        if (hadSpace) {
-          builder.append(' ');
-        }
-        continue;
-      }
-
-      final PlaceholderExpansion placeholder = lookup.apply(lowercaseIdentifierString);
-      if (placeholder == null) {
-        builder.append(closure.head).append(identifierString);
-
-        if (identified) {
-          builder.append('_');
-        }
-
-        builder.append(parametersString).append(closure.tail);
-        continue;
-      }
-
-      final String replacement = placeholder.onRequest(player, parametersString);
-      if (replacement == null) {
-        builder.append(closure.head).append(identifierString);
-
-        if (identified) {
-          builder.append('_');
-        }
-
-        builder.append(parametersString).append(closure.tail);
-        continue;
+            final PlaceholderExpansion expansion = lookup.apply(identifier.toLowerCase(Locale.ROOT));
+            String replacement = null;
+
+            if (expansion != null) {
+                replacement = expansion.onRequest(player, parameters);
             }
 
+            if (replacement != null) {
                 builder.append(replacement);
+            } else {
+                // Fallback: Restore original placeholder format
+                builder.append(head).append(identifier);
+                builder.append('_').append(parameters);
+                builder.append(tail);
+            }
+
+            cursor = endPlaceholder + 1;
+            startPlaceholder = text.indexOf(head, cursor);
+
+        } while (startPlaceholder != -1);
+
+        if (cursor < length) {
+            builder.append(text, cursor, length);
         }
 
         return builder.toString();

src/main/java/me/clip/placeholderapi/replacer/Replacer.java

@@ -2,7 +2,7 @@
  * This file is part of PlaceholderAPI
  *
  * PlaceholderAPI
- * Copyright (c) 2015 - 2024 PlaceholderAPI Team
+ * Copyright (c) 2015 - 2026 PlaceholderAPI Team
  *
  * PlaceholderAPI free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -21,6 +21,7 @@
 package me.clip.placeholderapi.replacer;
 
 import java.util.function.Function;
+
 import me.clip.placeholderapi.expansion.PlaceholderExpansion;
 import org.bukkit.OfflinePlayer;
 import org.jetbrains.annotations.NotNull;

src/main/java/me/clip/placeholderapi/scheduler/UniversalRunnable.java

@@ -27,7 +27,9 @@ import me.clip.placeholderapi.scheduler.scheduling.schedulers.TaskScheduler;
 import me.clip.placeholderapi.scheduler.scheduling.tasks.MyScheduledTask;
 import org.bukkit.plugin.Plugin;
 
-/** Just modified BukkitRunnable */
+/**
+ * Just modified BukkitRunnable
+ */
 public abstract class UniversalRunnable implements Runnable {
     MyScheduledTask task;
 

src/main/java/me/clip/placeholderapi/updatechecker/UpdateChecker.java

@@ -2,7 +2,7 @@
  * This file is part of PlaceholderAPI
  *
  * PlaceholderAPI
- * Copyright (c) 2015 - 2024 PlaceholderAPI Team
+ * Copyright (c) 2015 - 2026 PlaceholderAPI Team
  *
  * PlaceholderAPI free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -25,6 +25,9 @@ import java.io.InputStreamReader;
 import java.net.URL;
 import java.util.Arrays;
 import javax.net.ssl.HttpsURLConnection;
+
+import com.google.gson.Gson;
+import com.google.gson.JsonElement;
 import me.clip.placeholderapi.PlaceholderAPIPlugin;
 import me.clip.placeholderapi.scheduler.scheduling.schedulers.TaskScheduler;
 import me.clip.placeholderapi.util.Msg;
@@ -35,12 +38,13 @@ import org.bukkit.event.Listener;
 import org.bukkit.event.player.PlayerJoinEvent;
 
 public class UpdateChecker implements Listener {
+    private static final String MODRINTH_URL = "https://api.modrinth.com/v2/project/lKEzGugV/version";
 
     private static final int RESOURCE_ID = 6245;
     private final PlaceholderAPIPlugin plugin;
     private final TaskScheduler scheduler;
     private final String pluginVersion;
-  private String spigotVersion;
+    private String modrinthVersion;
     private boolean updateAvailable;
 
     public UpdateChecker(PlaceholderAPIPlugin plugin) {
@@ -53,27 +57,27 @@ public class UpdateChecker implements Listener {
         return updateAvailable;
     }
 
-  public String getSpigotVersion() {
-    return spigotVersion;
+    public String getModrinthVersion() {
+        return modrinthVersion;
     }
 
     public void fetch() {
         scheduler.runTaskAsynchronously(() -> {
             try {
-        HttpsURLConnection con = (HttpsURLConnection) new URL(
-            "https://api.spigotmc.org/legacy/update.php?resource=" + RESOURCE_ID).openConnection();
+                HttpsURLConnection con = (HttpsURLConnection) new URL(MODRINTH_URL).openConnection();
                 con.setRequestMethod("GET");
-        spigotVersion = new BufferedReader(new InputStreamReader(con.getInputStream())).readLine();
+                final JsonElement json = new Gson().fromJson(new BufferedReader(new InputStreamReader(con.getInputStream())), JsonElement.class);
+                modrinthVersion = json.getAsJsonArray().get(0).getAsJsonObject().get("version_number").getAsString();
             } catch (Exception ex) {
-        plugin.getLogger().info("Failed to check for updates on spigot.");
+                plugin.getLogger().info("Failed to check for updates on modrinth.");
                 return;
             }
 
-      if (spigotVersion == null || spigotVersion.isEmpty()) {
+            if (modrinthVersion == null || modrinthVersion.isEmpty()) {
                 return;
             }
 
-      updateAvailable = spigotIsNewer();
+            updateAvailable = modrinthIsNewer();
 
             if (!updateAvailable) {
                 return;
@@ -81,21 +85,21 @@ public class UpdateChecker implements Listener {
 
             scheduler.runTask(() -> {
                 plugin.getLogger()
-            .info("An update for PlaceholderAPI (v" + getSpigotVersion() + ") is available at:");
+                        .info("An update for PlaceholderAPI (v" + getModrinthVersion() + ") is available at:");
                 plugin.getLogger()
-            .info("https://www.spigotmc.org/resources/placeholderapi." + RESOURCE_ID + "/");
+                        .info("https://modrinth.com/plugin/placeholderapi");
                 Bukkit.getPluginManager().registerEvents(this, plugin);
             });
         });
     }
 
-  private boolean spigotIsNewer() {
-    if (spigotVersion == null || spigotVersion.isEmpty()) {
+    private boolean modrinthIsNewer() {
+        if (modrinthVersion == null || modrinthVersion.isEmpty()) {
             return false;
         }
 
         int[] plV = toReadable(pluginVersion);
-    int[] spV = toReadable(spigotVersion);
+        int[] spV = toReadable(modrinthVersion);
 
         if (plV[0] < spV[0]) {
             return true;
@@ -118,10 +122,9 @@ public class UpdateChecker implements Listener {
     public void onJoin(PlayerJoinEvent e) {
         if (e.getPlayer().hasPermission("placeholderapi.updatenotify")) {
             Msg.msg(e.getPlayer(),
-          "&bAn update for &fPlaceholder&7API &e(&fPlaceholder&7API &fv" + getSpigotVersion()
+                    "&bAn update for &fPlaceholder&7API &e(&fPlaceholder&7API &fv" + getModrinthVersion()
                             + "&e)"
-          , "&bis available at &ehttps://www.spigotmc.org/resources/placeholderapi." + RESOURCE_ID
-              + "/");
+                    , "&bis available at &ehttps://modrinth.com/plugin/placeholderapi");
         }
     }
 }

src/main/java/me/clip/placeholderapi/util/ExpansionSafetyCheck.java

@@ -0,0 +1,97 @@
+package me.clip.placeholderapi.util;
+
+import com.google.common.hash.Hashing;
+import com.google.common.io.Files;
+import com.google.common.io.Resources;
+import me.clip.placeholderapi.PlaceholderAPIPlugin;
+import me.clip.placeholderapi.expansion.manager.CloudExpansionManager;
+import org.jetbrains.annotations.NotNull;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.InputStreamReader;
+import java.net.URI;
+import java.net.URL;
+import java.net.URLConnection;
+import java.nio.charset.StandardCharsets;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Set;
+import java.util.logging.Level;
+import java.util.stream.Collectors;
+
+public final class ExpansionSafetyCheck {
+    private static final String MESSAGE =
+            "\n###############################################\n" +
+                    "###############################################\n" +
+                    "PlaceholderAPI performs checks at startup and /papi reload for known malicious expansions. If you're seeing this message, there are the following malicious expansions in plugins/PlaceholderAPI/expansions.\n" +
+                    "%s" +
+                    "To prevent further infection PlaceholderAPI has stopped the server.\n" +
+                    "If you're seeing this message after updating PAPI, your server may have been infected for some time, so best practice is a complete system wipe and reinstall of your server software and plugins to be safe.\n" +
+                    "If you're seeing this after downloading an expansion however, PAPI hasn't loaded any of the malicious expansions above so you should be safe to simply delete the expansion in question.\n" +
+                    "###############################################\n" +
+                    "###############################################";
+
+    private final PlaceholderAPIPlugin main;
+
+    public ExpansionSafetyCheck(@NotNull final PlaceholderAPIPlugin main) {
+        this.main = main;
+    }
+
+    public boolean runChecks() {
+        if (!main.getPlaceholderAPIConfig().detectMaliciousExpansions()) {
+            return false;
+        }
+
+        final File expansionsFolder = new File(main.getDataFolder(), "expansions");
+
+        if (!expansionsFolder.exists()) {
+            return false;
+        }
+
+        final Set<String> knownMaliciousExpansions;
+
+        try {
+            final URLConnection connection = new URI("https://check.placeholderapi.com").toURL().openConnection();
+            connection.setRequestProperty("User-Agent", CloudExpansionManager.USER_AGENT);
+            final String hashes = new BufferedReader(new InputStreamReader(connection.getInputStream(), StandardCharsets.UTF_8))
+                    .lines().collect(Collectors.joining(System.lineSeparator()));
+            knownMaliciousExpansions = Arrays.stream(hashes.split("\n")).collect(Collectors.toSet());
+        } catch (Exception e) {
+            main.getLogger().log(Level.SEVERE, "Failed to download anti malware hash check list from https://check.placeholderapi.com", e);
+            return false;
+        }
+
+        final Set<String> maliciousPaths = new HashSet<>();
+        final File[] files = expansionsFolder.listFiles();
+
+        if (files == null) {
+            return false;
+        }
+
+        for (File file : files) {
+            try {
+                if (!file.isFile()) {
+                    continue;
+                }
+
+                final String hash = Hashing.sha256().hashBytes(Files.asByteSource(file).read()).toString();
+
+                if (knownMaliciousExpansions.contains(hash)) {
+                    maliciousPaths.add(file.getAbsolutePath());
+                }
+            } catch (Exception e) {
+                main.getLogger().log(Level.SEVERE, "Error occurred while trying to read " + file.getAbsolutePath(), e);
+            }
+        }
+
+        if (maliciousPaths.isEmpty()) {
+            return false;
+        }
+
+        main.getLogger().severe(String.format(MESSAGE, maliciousPaths.stream().map(p -> "HASH OF " + p + " MATCHES KNOWN MALICIOUS EXPANSION DELETE IMMEDIATELY\n").collect(Collectors.joining())));
+
+        main.getServer().shutdown();
+        return true;
+    }
+}

src/main/java/me/clip/placeholderapi/util/FileUtil.java

@@ -2,7 +2,7 @@
  * This file is part of PlaceholderAPI
  *
  * PlaceholderAPI
- * Copyright (c) 2015 - 2024 PlaceholderAPI Team
+ * Copyright (c) 2015 - 2026 PlaceholderAPI Team
  *
  * PlaceholderAPI free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

src/main/java/me/clip/placeholderapi/util/Format.java

@@ -2,7 +2,7 @@
  * This file is part of PlaceholderAPI
  *
  * PlaceholderAPI
- * Copyright (c) 2015 - 2024 PlaceholderAPI Team
+ * Copyright (c) 2015 - 2026 PlaceholderAPI Team
  *
  * PlaceholderAPI free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -29,6 +29,7 @@ import static java.util.stream.IntStream.range;
 
 import java.util.List;
 import java.util.Optional;
+
 import org.jetbrains.annotations.NotNull;
 
 /**

src/main/java/me/clip/placeholderapi/util/Futures.java

@@ -2,7 +2,7 @@
  * This file is part of PlaceholderAPI
  *
  * PlaceholderAPI
- * Copyright (c) 2015 - 2024 PlaceholderAPI Team
+ * Copyright (c) 2015 - 2026 PlaceholderAPI Team
  *
  * PlaceholderAPI free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

src/main/java/me/clip/placeholderapi/util/Msg.java

@@ -2,7 +2,7 @@
  * This file is part of PlaceholderAPI
  *
  * PlaceholderAPI
- * Copyright (c) 2015 - 2024 PlaceholderAPI Team
+ * Copyright (c) 2015 - 2026 PlaceholderAPI Team
  *
  * PlaceholderAPI free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -23,6 +23,7 @@ package me.clip.placeholderapi.util;
 import java.util.Arrays;
 import java.util.logging.Level;
 import java.util.stream.Collectors;
+
 import me.clip.placeholderapi.PlaceholderAPIPlugin;
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;

src/main/java/me/clip/placeholderapi/util/TimeFormat.java

@@ -2,7 +2,7 @@
  * This file is part of PlaceholderAPI
  *
  * PlaceholderAPI
- * Copyright (c) 2015 - 2024 PlaceholderAPI Team
+ * Copyright (c) 2015 - 2026 PlaceholderAPI Team
  *
  * PlaceholderAPI free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

src/main/java/me/clip/placeholderapi/util/TimeUtil.java

@@ -2,7 +2,7 @@
  * This file is part of PlaceholderAPI
  *
  * PlaceholderAPI
- * Copyright (c) 2015 - 2024 PlaceholderAPI Team
+ * Copyright (c) 2015 - 2026 PlaceholderAPI Team
  *
  * PlaceholderAPI free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

src/main/resources/config.yml

@@ -6,6 +6,8 @@
 # Expansions: https://placeholderapi.com/ecloud
 # Wiki: https://wiki.placeholderapi.com/
 # Discord: https://helpch.at/discord
+# If you're seeing performance issues with plugins that use component replacement, or things don't look quite right,
+# switch to the replacer provided by adventure itself by changing use_adventure_provided_replacer to true
 # No placeholders are provided with this plugin by default.
 # Download placeholders: /papi ecloud
 check_updates: true
@@ -15,4 +17,6 @@ boolean:
   'true': 'yes'
   'false': 'no'
 date_format: MM/dd/yy HH:mm:ss
+detect_malicious_expansions: true
+use_adventure_provided_replacer: false
 debug: false

src/main/resources/user-agent.txt

@@ -0,0 +1 @@
+PlaceholderAPI-Bukkit-${version}

src/paper/java/me/clip/placeholderapi/PAPIComponents.java

@@ -0,0 +1,301 @@
+/*
+ * This file is part of PlaceholderAPI
+ *
+ * PlaceholderAPI
+ * Copyright (c) 2015 - 2026 PlaceholderAPI Team
+ *
+ * PlaceholderAPI free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * PlaceholderAPI is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package me.clip.placeholderapi;
+
+import me.clip.placeholderapi.replacer.ComponentReplacer;
+import me.clip.placeholderapi.replacer.ExactReplacer;
+import me.clip.placeholderapi.replacer.RelationalExactReplacer;
+import me.clip.placeholderapi.replacer.Replacer;
+import net.kyori.adventure.text.Component;
+import net.kyori.adventure.text.ComponentLike;
+import org.bukkit.OfflinePlayer;
+import org.bukkit.entity.Player;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.List;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+
+import static me.clip.placeholderapi.PlaceholderAPI.RELATIONAL_PLACEHOLDER_PATTERN;
+
+public final class PAPIComponents {
+    private static final Replacer PERCENT_EXACT_REPLACER = new ExactReplacer('%', '%');
+    private static final Replacer BRACKET_EXACT_REPLACER = new ExactReplacer('{', '}');
+    private static final RelationalExactReplacer RELATIONAL_EXACT_REPLACER = new RelationalExactReplacer();
+
+    /**
+     * Translates all placeholders into their corresponding values.
+     * <br>The pattern of a valid placeholder is {@literal %<identifier>_<params>%}.
+     *
+     * @param player    Player to parse the placeholders against
+     * @param component Component to set the placeholder values in
+     * @return Component containing all translated placeholders
+     */
+    @NotNull
+    public static Component setPlaceholders(final OfflinePlayer player, @NotNull final Component component) {
+        return setPlaceholders(player, component, null);
+    }
+
+    /**
+     * Translates all placeholders into their corresponding values.
+     * <br>The pattern of a valid placeholder is {@literal %<identifier>_<params>%}.
+     *
+     * @param player     Player to parse the placeholders against
+     * @param component  Component to set the placeholder values in
+     * @param deserializer Optional function to serialize parsed placeholder values into ComponentLike
+     * @return Component containing all translated placeholders
+     */
+    @NotNull
+    public static Component setPlaceholders(final OfflinePlayer player, @NotNull final Component component, @Nullable Function<String, ComponentLike> deserializer) {
+        if (PlaceholderAPIPlugin.getInstance().getPlaceholderAPIConfig().useAdventureProvidedReplacer()) {
+            return component.replaceText(config -> config.match(PlaceholderAPI.PLACEHOLDER_PATTERN).replacement((result, builder) -> {
+                String parsed = PERCENT_EXACT_REPLACER.apply(result.group(), player, PlaceholderAPIPlugin.getInstance().getLocalExpansionManager()::getExpansion);
+                return deserializer == null ? builder.content(parsed) : deserializer.apply(parsed);
+            }));
+        }
+
+        return ComponentReplacer.replace(component, str -> PlaceholderAPI.setPlaceholders(player, str), deserializer == null ? null : s -> deserializer.apply(s).asComponent());
+    }
+
+    /**
+     * Translates all placeholders into their corresponding values.
+     * <br>The pattern of a valid placeholder is {@literal %<identifier>_<params>%}.
+     *
+     * @param player     Player to parse the placeholders against
+     * @param components List of Components to set the placeholder values in
+     * @return List of Components containing all translated placeholders
+     */
+    @NotNull
+    public static List<Component> setPlaceholders(final OfflinePlayer player, @NotNull final List<Component> components) {
+        return setPlaceholders(player, components, null);
+    }
+
+    /**
+     * Translates all placeholders into their corresponding values.
+     * <br>The pattern of a valid placeholder is {@literal %<identifier>_<params>%}.
+     *
+     * @param player     Player to parse the placeholders against
+     * @param components List of Components to set the placeholder values in
+     * @param deserializer Optional function to serialize parsed placeholder values into ComponentLike
+     * @return List of Components containing all translated placeholders
+     */
+    @NotNull
+    public static List<Component> setPlaceholders(final OfflinePlayer player, @NotNull final List<Component> components, @Nullable Function<String, ComponentLike> deserializer) {
+        return components.stream().map(component -> setPlaceholders(player, component, deserializer == null ? null : s -> deserializer.apply(s).asComponent())).collect(Collectors.toList());
+    }
+
+    /**
+     * Translates all placeholders into their corresponding values.
+     * <br>The pattern of a valid placeholder is {@literal %<identifier>_<params>%}.
+     *
+     * @param player    Player to parse the placeholders against
+     * @param component Component to set the placeholder values in
+     * @return Component containing all translated placeholders
+     */
+    @NotNull
+    public static Component setPlaceholders(final Player player, @NotNull final Component component) {
+        return setPlaceholders(player, component, null);
+    }
+
+    /**
+     * Translates all placeholders into their corresponding values.
+     * <br>The pattern of a valid placeholder is {@literal %<identifier>_<params>%}.
+     *
+     * @param player     Player to parse the placeholders against
+     * @param component  Component to set the placeholder values in
+     * @param deserializer Optional function to serialize parsed placeholder values into ComponentLike
+     * @return Component containing all translated placeholders
+     */
+    @NotNull
+    public static Component setPlaceholders(final Player player, @NotNull final Component component, @Nullable Function<String, ComponentLike> deserializer) {
+        return setPlaceholders((OfflinePlayer) player, component, deserializer);
+    }
+
+    /**
+     * Translates all placeholders into their corresponding values.
+     * <br>The pattern of a valid placeholder is {@literal %<identifier>_<params>%}.
+     *
+     * @param player     Player to parse the placeholders against
+     * @param components List of Components to set the placeholder values in
+     * @return List of components containing all translated placeholders
+     */
+    @NotNull
+    public static List<Component> setPlaceholders(final Player player, @NotNull final List<Component> components) {
+        return setPlaceholders(player, components, null);
+    }
+
+    /**
+     * Translates all placeholders into their corresponding values.
+     * <br>The pattern of a valid placeholder is {@literal %<identifier>_<params>%}.
+     *
+     * @param player     Player to parse the placeholders against
+     * @param components List of Components to set the placeholder values in
+     * @param deserializer Optional function to serialize parsed placeholder values into ComponentLike
+     * @return List of components containing all translated placeholders
+     */
+    @NotNull
+    public static List<Component> setPlaceholders(final Player player, @NotNull final List<Component> components, @Nullable Function<String, ComponentLike> deserializer) {
+        return setPlaceholders((OfflinePlayer) player, components, deserializer);
+    }
+
+    /**
+     * Translates all placeholders into their corresponding values.
+     * <br>The pattern of a valid placeholder is {@literal {<identifier>_<params>}}.
+     *
+     * @param player    Player to parse the placeholders against
+     * @param component Component to set the placeholder values in
+     * @return Component containing all translated placeholders
+     */
+    @NotNull
+    public static Component setBracketPlaceholders(final OfflinePlayer player, @NotNull final Component component) {
+        return setBracketPlaceholders(player, component, null);
+    }
+
+    /**
+     * Translates all placeholders into their corresponding values.
+     * <br>The pattern of a valid placeholder is {@literal {<identifier>_<params>}}.
+     *
+     * @param player     Player to parse the placeholders against
+     * @param component  Component to set the placeholder values in
+     * @param deserializer Optional function to serialize parsed placeholder values into ComponentLike
+     * @return Component containing all translated placeholders
+     */
+    @NotNull
+    public static Component setBracketPlaceholders(final OfflinePlayer player, @NotNull final Component component, @Nullable Function<String, ComponentLike> deserializer) {
+        if (PlaceholderAPIPlugin.getInstance().getPlaceholderAPIConfig().useAdventureReplacer()) {
+            return component.replaceText(config -> config.match(PlaceholderAPI.BRACKET_PLACEHOLDER_PATTERN).replacement((result, builder) ->
+                    builder.content(BRACKET_EXACT_REPLACER.apply(result.group(), player, PlaceholderAPIPlugin.getInstance().getLocalExpansionManager()::getExpansion))));
+        }
+
+        return ComponentReplacer.replace(component, str -> PlaceholderAPI.setBracketPlaceholders(player, str), deserializer == null ? null : s -> deserializer.apply(s).asComponent());
+    }
+
+    /**
+     * Translates all placeholders into their corresponding values.
+     * <br>The pattern of a valid placeholder is {@literal {<identifier>_<params>}}.
+     *
+     * @param player     Player to parse the placeholders against
+     * @param components List of Components to set the placeholder values in
+     * @return List of Components containing all translated placeholders
+     */
+    @NotNull
+    public static List<Component> setBracketPlaceholders(final OfflinePlayer player, @NotNull final List<Component> components) {
+        return setBracketPlaceholders(player, components, null);
+    }
+
+    /**
+     * Translates all placeholders into their corresponding values.
+     * <br>The pattern of a valid placeholder is {@literal {<identifier>_<params>}}.
+     *
+     * @param player     Player to parse the placeholders against
+     * @param components List of Components to set the placeholder values in
+     * @param deserializer Optional function to serialize parsed placeholder values into ComponentLike
+     * @return List of Components containing all translated placeholders
+     */
+    @NotNull
+    public static List<Component> setBracketPlaceholders(final OfflinePlayer player, @NotNull final List<Component> components, @Nullable Function<String, ComponentLike> deserializer) {
+        return components.stream().map(component -> setBracketPlaceholders(player, component, deserializer)).collect(Collectors.toList());
+    }
+
+    /**
+     * Translates all placeholders into their corresponding values.
+     * <br>The pattern of a valid placeholder is {@literal {<identifier>_<params>}}.
+     *
+     * @param player    Player to parse the placeholders against
+     * @param component Component to set the placeholder values in
+     * @return Component containing all translated placeholders
+     */
+    @NotNull
+    public static Component setBracketPlaceholders(final Player player, @NotNull final Component component) {
+        return setBracketPlaceholders(player, component, null);
+    }
+
+    /**
+     * Translates all placeholders into their corresponding values.
+     * <br>The pattern of a valid placeholder is {@literal {<identifier>_<params>}}.
+     *
+     * @param player     Player to parse the placeholders against
+     * @param component  Component to set the placeholder values in
+     * @param deserializer Optional function to serialize parsed placeholder values into ComponentLike
+     * @return Component containing all translated placeholders
+     */
+    @NotNull
+    public static Component setBracketPlaceholders(final Player player, @NotNull final Component component, @Nullable Function<String, ComponentLike> deserializer) {
+        return setBracketPlaceholders((OfflinePlayer) player, component, deserializer);
+    }
+
+    /**
+     * Translates all placeholders into their corresponding values.
+     * <br>The pattern of a valid placeholder is {@literal {<identifier>_<params>}}.
+     *
+     * @param player     Player to parse the placeholders against
+     * @param components List of Components to set the placeholder values in
+     * @return List of Components containing all translated placeholders
+     */
+    @NotNull
+    public static List<Component> setBracketPlaceholders(final Player player, @NotNull final List<Component> components) {
+        return setBracketPlaceholders(player, components, null);
+    }
+
+    /**
+     * Translates all placeholders into their corresponding values.
+     * <br>The pattern of a valid placeholder is {@literal {<identifier>_<params>}}.
+     *
+     * @param player     Player to parse the placeholders against
+     * @param components List of Components to set the placeholder values in
+     * @param deserializer Optional function to serialize parsed placeholder values into ComponentLike
+     * @return List of Components containing all translated placeholders
+     */
+    @NotNull
+    public static List<Component> setBracketPlaceholders(final Player player, @NotNull final List<Component> components, @Nullable Function<String, ComponentLike> deserializer) {
+        return setBracketPlaceholders((OfflinePlayer) player, components, deserializer);
+    }
+
+    /**
+     * set relational placeholders in the text specified placeholders are matched with the pattern
+     * {@literal %<rel_(identifier)_(params)>%} when set with this method
+     *
+     * @param one       First player to compare
+     * @param two       Second player to compare
+     * @param component Component to parse the placeholders in
+     * @return The Component containing the parsed relational placeholders
+     */
+    public static Component setRelationalPlaceholders(Player one, Player two, Component component) {
+        //todo: custom replacer
+        return component.replaceText(config -> config.match(RELATIONAL_PLACEHOLDER_PATTERN).replacement((result, builder) ->
+                builder.content(RELATIONAL_EXACT_REPLACER.apply(result.group(2), one, two, PlaceholderAPIPlugin.getInstance().getLocalExpansionManager()::getExpansion))));
+    }
+
+    /**
+     * Translate placeholders in the provided List based on the relation of the two provided players.
+     * <br>The pattern of a valid placeholder is {@literal %rel_<identifier>_<param>%}.
+     *
+     * @param one        Player to compare
+     * @param two        Player to compare
+     * @param components List of Components to parse the placeholder values to
+     * @return The List of Components containing the parsed relational placeholders
+     */
+    public static List<Component> setRelationalPlaceholders(Player one, Player two, List<Component> components) {
+        return components.stream().map(line -> setRelationalPlaceholders(one, two, line))
+                .collect(Collectors.toList());
+    }
+}

src/paper/java/me/clip/placeholderapi/replacer/ComponentReplacer.java

@@ -0,0 +1,175 @@
+package me.clip.placeholderapi.replacer;
+
+import net.kyori.adventure.key.Key;
+import net.kyori.adventure.nbt.api.BinaryTagHolder;
+import net.kyori.adventure.text.*;
+import net.kyori.adventure.text.event.ClickEvent;
+import net.kyori.adventure.text.event.DataComponentValue;
+import net.kyori.adventure.text.event.HoverEvent;
+import net.kyori.adventure.text.format.Style;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+
+public class ComponentReplacer {
+    @NotNull
+    public static Component replace(@NotNull final Component component, @NotNull final Function<String, String> replacer, @Nullable final Function<String, Component> deserializer) {
+        return rebuild(component, replacer, deserializer);
+    }
+
+    @NotNull
+    private static Component rebuild(@NotNull final Component component, @NotNull final Function<String, String> replacer, @Nullable final Function<String, Component> deserializer) {
+        Component rebuilt;
+
+        if (component instanceof TextComponent) {
+            final TextComponent text = (TextComponent) component;
+            final String replaced = replacer.apply(text.content());
+
+            rebuilt = deserializer == null ? Component.text(replaced) : deserializer.apply(replaced);
+        } else if (component instanceof TranslatableComponent) {
+            final TranslatableComponent translatable = (TranslatableComponent) component;
+            final List<Component> arguments = new ArrayList<>();
+
+            for (final ComponentLike arg : translatable.arguments()) {
+                arguments.add(rebuild(arg.asComponent(), replacer, deserializer));
+            }
+
+            rebuilt = Component.translatable(translatable.key(), arguments);
+        } else if (component instanceof KeybindComponent) {
+            final KeybindComponent keybind = (KeybindComponent) component;
+            rebuilt = Component.keybind(keybind.keybind());
+        } else if (component instanceof ScoreComponent) {
+            final ScoreComponent score = (ScoreComponent) component;
+            rebuilt = Component.score(score.name(), score.objective());
+        } else if (component instanceof SelectorComponent) {
+            final SelectorComponent selector = (SelectorComponent) component;
+            rebuilt = Component.selector(selector.pattern());
+        } else {
+            rebuilt = Component.empty();
+        }
+
+        rebuilt = rebuilt.style(rebuildStyle(component.style(), replacer, deserializer));
+
+        if (!component.children().isEmpty()) {
+            final List<Component> children = new ArrayList<>();
+            for (Component child : component.children()) {
+                children.add(rebuild(child, replacer, deserializer));
+            }
+            rebuilt = rebuilt.children(children);
+        }
+
+        return rebuilt;
+    }
+
+    @NotNull
+    private static Style rebuildStyle(@NotNull final Style style, @NotNull final Function<String, String> replacer, @Nullable final Function<String, Component> deserializer) {
+        final Style.Builder builder = style.toBuilder();
+        final ClickEvent click = style.clickEvent();
+
+        if (click != null) {
+            builder.clickEvent(rebuildClickEvent(click, replacer));
+        }
+
+        final HoverEvent<?> hover = style.hoverEvent();
+
+        if (hover != null) {
+            builder.hoverEvent(rebuildHoverEvent(hover, replacer, deserializer));
+        }
+
+        return builder.build();
+    }
+
+    @NotNull
+    private static ClickEvent rebuildClickEvent(@NotNull final ClickEvent click, @NotNull final Function<String, String> replacer) {
+        final ClickEvent.Payload payload = click.payload();
+
+        if (!(payload instanceof ClickEvent.Payload.Text)) {
+            return click;
+        }
+
+        final String original = ((ClickEvent.Payload.Text) payload).value();
+        final String replaced = replacer.apply(original);
+
+        final ClickEvent.Action action = click.action();
+
+        switch (action) {
+            case OPEN_URL:
+                return ClickEvent.openUrl(replaced);
+            case OPEN_FILE:
+                return ClickEvent.openFile(replaced);
+            case RUN_COMMAND:
+                return ClickEvent.runCommand(replaced);
+            case SUGGEST_COMMAND:
+                return ClickEvent.suggestCommand(replaced);
+            case COPY_TO_CLIPBOARD:
+                return ClickEvent.copyToClipboard(replaced);
+            default:
+                return click;
+        }
+    }
+
+    @NotNull
+    private static HoverEvent<?> rebuildHoverEvent(@NotNull final HoverEvent<?> hover, @NotNull final Function<String, String> replacer, @Nullable final Function<String, Component> deserializer) {
+        final Object value = hover.value();
+
+        if (value instanceof Component) {
+            final Component rebuilt = rebuild((Component) value, replacer, deserializer);
+            return HoverEvent.showText(rebuilt);
+        }
+
+        if (value instanceof HoverEvent.ShowItem) {
+            return rebuildShowItem((HoverEvent.ShowItem) value, replacer);
+        }
+
+        if (value instanceof HoverEvent.ShowEntity) {
+            final HoverEvent.ShowEntity entity = (HoverEvent.ShowEntity) value;
+
+            Component rebuiltName = null;
+            if (entity.name() != null) {
+                rebuiltName = rebuild(entity.name(), replacer, deserializer);
+            }
+
+            return HoverEvent.showEntity(entity.type(), entity.id(), rebuiltName);
+        }
+
+        return hover;
+    }
+
+    @NotNull
+    private static HoverEvent<?> rebuildShowItem(@NotNull final HoverEvent.ShowItem item, @NotNull final Function<String, String> replacer) {
+        final BinaryTagHolder nbt = item.nbt();
+
+        if (nbt != null && !nbt.string().isEmpty()) {
+            final String replaced = replacer.apply(nbt.string());
+
+            return HoverEvent.showItem(item.item(), item.count(), BinaryTagHolder.binaryTagHolder(replaced));
+        }
+
+        //I'm not 100% sure this is how we're meant to support data components but let's give it a go and see if it causes any issues :)
+        final Map<Key, DataComponentValue> components = item.dataComponents();
+
+        if (!components.isEmpty()) {
+            final Map<Key, DataComponentValue> rebuilt = new HashMap<>();
+
+            for (final Map.Entry<Key, DataComponentValue> entry : components.entrySet()) {
+                final DataComponentValue value = entry.getValue();
+
+                if (!(value instanceof BinaryTagHolder)) {
+                    rebuilt.put(entry.getKey(), value);
+                    continue;
+                }
+
+                rebuilt.put(entry.getKey(), BinaryTagHolder.binaryTagHolder(replacer.apply(((BinaryTagHolder) value).string())));
+            }
+
+            return HoverEvent.showItem(item.item(), item.count(), rebuilt);
+        }
+
+        return HoverEvent.showItem(item);
+    }
+}

src/paper/java/me/clip/placeholderapi/replacer/ExactReplacer.java

@@ -0,0 +1,76 @@
+/*
+ * This file is part of PlaceholderAPI
+ *
+ * PlaceholderAPI
+ * Copyright (c) 2015 - 2026 PlaceholderAPI Team
+ *
+ * PlaceholderAPI free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * PlaceholderAPI is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package me.clip.placeholderapi.replacer;
+
+import me.clip.placeholderapi.expansion.PlaceholderExpansion;
+import org.bukkit.OfflinePlayer;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.function.Function;
+import java.util.regex.Pattern;
+
+public final class ExactReplacer implements Replacer {
+    private static final Pattern DELIMITER = Pattern.compile("_");
+
+    private final char start;
+    private final char end;
+
+    public ExactReplacer(final char start, final char end) {
+        this.start = start;
+        this.end = end;
+    }
+
+    @NotNull
+    @Override
+    public String apply(@NotNull String text, @Nullable final OfflinePlayer player,
+                        @NotNull final Function<String, @Nullable PlaceholderExpansion> lookup) {
+        text = text.substring(1, text.length() - 1);
+        final String[] parts = DELIMITER.split(text);
+        final PlaceholderExpansion expansion;
+
+        if (parts.length == 0) {
+            expansion = lookup.apply(text);
+        } else {
+            expansion = lookup.apply(parts[0]);
+        }
+
+        if (expansion == null) {
+            return start + text + end;
+        }
+
+        final String params;
+
+        if (text.endsWith("_")) {
+            params = "";
+        } else {
+            params = text.substring(text.indexOf('_') + 1);
+        }
+
+        final String result = expansion.onRequest(player, params);
+
+        if (result == null) {
+            return start + text + end;
+        }
+
+        return result;
+    }
+}

src/paper/java/me/clip/placeholderapi/replacer/RelationalExactReplacer.java

@@ -0,0 +1,73 @@
+/*
+ * This file is part of PlaceholderAPI
+ *
+ * PlaceholderAPI
+ * Copyright (c) 2015 - 2026 PlaceholderAPI Team
+ *
+ * PlaceholderAPI free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * PlaceholderAPI is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package me.clip.placeholderapi.replacer;
+
+import me.clip.placeholderapi.expansion.PlaceholderExpansion;
+import me.clip.placeholderapi.expansion.Relational;
+import org.bukkit.OfflinePlayer;
+import org.bukkit.entity.Player;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.function.Function;
+import java.util.regex.Pattern;
+
+public final class RelationalExactReplacer {
+    private static final Pattern DELIMITER = Pattern.compile("_");
+
+    @NotNull
+    public String apply(@NotNull String text, @Nullable final Player player1,
+                        @Nullable final Player player2, @NotNull final Function<String,
+                        @Nullable PlaceholderExpansion> lookup) {
+        final String[] parts = DELIMITER.split(text);
+        final PlaceholderExpansion expansion;
+
+        if (parts.length == 0) {
+            expansion = lookup.apply(text);
+        } else {
+            expansion = lookup.apply(parts[0]);
+        }
+
+        if (expansion == null) {
+            return "%rel_" + text + '%';
+        }
+
+        if (!(expansion instanceof Relational)) {
+            return "%rel_" + text + '%';
+        }
+
+        final String params;
+
+        if (text.endsWith("_")) {
+            params = "";
+        } else {
+            params = text.substring(text.indexOf('_') + 1);
+        }
+
+        final String result = ((Relational) expansion).onPlaceholderRequest(player1, player2, params);
+
+        if (result == null) {
+            return "%rel_" + text + '%';
+        }
+
+        return result;
+    }
+}

src/test/java/me/clip/placeholderapi/Values.java

@@ -2,7 +2,7 @@
  * This file is part of PlaceholderAPI
  *
  * PlaceholderAPI
- * Copyright (c) 2015 - 2024 PlaceholderAPI Team
+ * Copyright (c) 2015 - 2026 PlaceholderAPI Team
  *
  * PlaceholderAPI free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -30,6 +30,8 @@ import org.jetbrains.annotations.Nullable;
 
 public interface Values {
 
+    String NO_ARGUMENTS_PLACEHOLDER = "%player%";
+    String EMPTY_ARGUMENT_PLACEHOLDER = "%player_%";
     String SMALL_TEXT = "My name is %player_name%";
     String LARGE_TEXT = "My name is %player_name% and my location is (%player_x%, %player_y%, %player_z%), this placeholder is invalid %server_name%";
 
@@ -43,6 +45,7 @@ public interface Values {
 
     final class MockPlayerPlaceholderExpansion extends PlaceholderExpansion {
 
+        public static final String EMPTY_ARGUMENT = "Empty Argument";
         public static final String PLAYER_X = "10";
         public static final String PLAYER_Y = "20";
         public static final String PLAYER_Z = "30";
@@ -83,6 +86,8 @@ public interface Values {
                     return PLAYER_Y;
                 case "z":
                     return PLAYER_Z;
+                case "":
+                    return EMPTY_ARGUMENT;
             }
 
             return null;

src/test/java/me/clip/placeholderapi/replacer/ReplacerBenchmarks.java

@@ -1,38 +0,0 @@
-/*
- * This file is part of PlaceholderAPI
- *
- * PlaceholderAPI
- * Copyright (c) 2015 - 2024 PlaceholderAPI Team
- *
- * PlaceholderAPI free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * PlaceholderAPI is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-package me.clip.placeholderapi.replacer;
-
-import me.clip.placeholderapi.Values;
-import org.openjdk.jmh.annotations.Benchmark;
-
-public class ReplacerBenchmarks {
-
-  @Benchmark
-  public void measureCharsReplacerSmallText() {
-    Values.CHARS_REPLACER.apply(Values.SMALL_TEXT, null, Values.PLACEHOLDERS::get);
-  }
-
-  @Benchmark
-  public void measureCharsReplacerLargeText() {
-    Values.CHARS_REPLACER.apply(Values.LARGE_TEXT, null, Values.PLACEHOLDERS::get);
-  }
-
-}

src/test/java/me/clip/placeholderapi/replacer/ReplacerUnitTester.java

@@ -2,7 +2,7 @@
  * This file is part of PlaceholderAPI
  *
  * PlaceholderAPI
- * Copyright (c) 2015 - 2024 PlaceholderAPI Team
+ * Copyright (c) 2015 - 2026 PlaceholderAPI Team
  *
  * PlaceholderAPI free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -24,6 +24,7 @@ import static me.clip.placeholderapi.Values.MockPlayerPlaceholderExpansion.PLAYE
 import static me.clip.placeholderapi.Values.MockPlayerPlaceholderExpansion.PLAYER_X;
 import static me.clip.placeholderapi.Values.MockPlayerPlaceholderExpansion.PLAYER_Y;
 import static me.clip.placeholderapi.Values.MockPlayerPlaceholderExpansion.PLAYER_Z;
+import static me.clip.placeholderapi.Values.MockPlayerPlaceholderExpansion.EMPTY_ARGUMENT;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import me.clip.placeholderapi.Values;
@@ -37,6 +38,18 @@ public final class ReplacerUnitTester {
                 Values.CHARS_REPLACER.apply("%player_name%", null, Values.PLACEHOLDERS::get));
     }
 
+    @Test
+    void charsReplacersDoesNotParsePlaceholdersWithNoArguments() {
+        assertEquals(Values.NO_ARGUMENTS_PLACEHOLDER,
+                Values.CHARS_REPLACER.apply(Values.NO_ARGUMENTS_PLACEHOLDER, null, Values.PLACEHOLDERS::get));
+    }
+
+    @Test
+    void charsReplacersParsesPlaceholdersWithOneArgumentThatIsEmpty() {
+        assertEquals(EMPTY_ARGUMENT,
+                Values.CHARS_REPLACER.apply(Values.EMPTY_ARGUMENT_PLACEHOLDER, null, Values.PLACEHOLDERS::get));
+    }
+
     @Test
     void testCharsReplacerProducesExpectedSentence() {
         assertEquals(String.format(