Showing with 794 additions and 277 deletions.
  1. +1 −1 .github/workflows/docs.yml
  2. +13 −11 build.gradle
  3. +7 −2 docs/user/general.md
  4. +4 −0 docs/user/mod-placeholders.md
  5. +5 −6 gradle.properties
  6. BIN gradle/wrapper/gradle-wrapper.jar
  7. +3 −1 gradle/wrapper/gradle-wrapper.properties
  8. +30 −13 gradlew
  9. +21 −16 gradlew.bat
  10. +36 −4 src/main/java/eu/pb4/placeholders/api/ParserContext.java
  11. +0 −1 src/main/java/eu/pb4/placeholders/api/node/TextNode.java
  12. +37 −4 src/main/java/eu/pb4/placeholders/api/node/parent/ClickActionNode.java
  13. +7 −1 src/main/java/eu/pb4/placeholders/api/node/parent/ColorNode.java
  14. +17 −1 src/main/java/eu/pb4/placeholders/api/node/parent/DynamicColorNode.java
  15. +76 −0 src/main/java/eu/pb4/placeholders/api/node/parent/DynamicShadowNode.java
  16. +23 −1 src/main/java/eu/pb4/placeholders/api/node/parent/FormattingNode.java
  17. +6 −1 src/main/java/eu/pb4/placeholders/api/node/parent/GradientNode.java
  18. +109 −36 src/main/java/eu/pb4/placeholders/api/node/parent/HoverNode.java
  19. +11 −2 src/main/java/eu/pb4/placeholders/api/node/parent/ParentNode.java
  20. +35 −0 src/main/java/eu/pb4/placeholders/api/node/parent/ShadowNode.java
  21. +26 −7 src/main/java/eu/pb4/placeholders/api/node/parent/StyledNode.java
  22. +67 −69 src/main/java/eu/pb4/placeholders/api/parsers/MarkdownLiteParserV1.java
  23. +1 −1 src/main/java/eu/pb4/placeholders/api/parsers/NodeParser.java
  24. +1 −1 src/main/java/eu/pb4/placeholders/api/parsers/ParserBuilder.java
  25. +93 −18 src/main/java/eu/pb4/placeholders/impl/GeneralUtils.java
  26. +102 −47 src/main/java/eu/pb4/placeholders/impl/textparser/BuiltinTags.java
  27. +40 −26 src/main/java/eu/pb4/placeholders/impl/textparser/TextTagsV1.java
  28. +2 −2 src/main/resources/fabric.mod.json
  29. +21 −5 src/testmod/java/eu/pb4/placeholderstest/TestMod.java
2 changes: 1 addition & 1 deletion .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on:
release:
types:
- published
workflow_dispatch:
workflow_dispatch:

jobs:
build:
Expand Down
24 changes: 13 additions & 11 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,16 +1,15 @@
plugins {
id 'fabric-loom' version '1.7.+'
id 'fabric-loom' version '1.10.+'
id 'maven-publish'
id "com.modrinth.minotaur" version "2.+"
id 'com.matthewprenger.cursegradle' version '1.4.0'
}

sourceCompatibility = JavaVersion.VERSION_21
targetCompatibility = JavaVersion.VERSION_21

archivesBaseName = project.archives_base_name
version = project.mod_version
group = project.maven_group
base {
archivesName = project.archives_base_name
version = project.mod_version
group = project.maven_group
}


repositories {
Expand All @@ -20,8 +19,8 @@ repositories {
// See https://docs.gradle.org/current/userguide/declaring_repositories.html
// for more information about repositories.

maven { url "https://maven.nucleoid.xyz" }
maven { url "https://jitpack.io" }
maven { url = "https://maven.nucleoid.xyz" }
maven { url = "https://jitpack.io" }
}

sourceSets {
Expand All @@ -37,13 +36,13 @@ loom {
client()
ideConfigGenerated project.rootProject == project
name = "Test Mod Client"
source sourceSets.testmod
source = sourceSets.testmod
}
testmodServer {
server()
ideConfigGenerated project.rootProject == project
name = "Test Mod Server"
source sourceSets.testmod
source = sourceSets.testmod
}
}
}
Expand Down Expand Up @@ -86,6 +85,8 @@ tasks.withType(JavaCompile).configureEach {
}

java {
sourceCompatibility = JavaVersion.VERSION_21
targetCompatibility = JavaVersion.VERSION_21
// Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task
// if it is present.
// If you remove this line, sources will not be generated.
Expand All @@ -104,6 +105,7 @@ def env = System.getenv()
publishing {
publications {
mavenJava(MavenPublication) {
//artifactId = base.archivesName.get()
// add all the jars that should be included when publishing to maven
artifact(remapJar) {
builtBy remapJar
Expand Down
9 changes: 7 additions & 2 deletions docs/user/general.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ You can check list of [build in placeholders here](/user/default-placeholders)
and [placeholders from mods here](/user/mod-placeholders).

### List of mods supporting displaying Placeholder API's placeholders:

!!! question inline end "Missing Your Mod?"

Are you a mod dev, and your mod is missing?
Expand Down Expand Up @@ -46,4 +46,9 @@ and [placeholders from mods here](/user/mod-placeholders).

- Fuji -
[Modrinth](https://modrinth.com/mod/fuji),
[Github](https://github.com/sakurawald/fuji-fabric/)
[Github](https://github.com/sakurawald/fuji-fabric/)

- Solstice Essentials -
[CurseForge](https://www.curseforge.com/minecraft/mc-mods/solstice),
[Modrinth](https://modrinth.com/mod/solstice-essentials),
[Github](https://github.com/Ale32bit/Solstice)
4 changes: 4 additions & 0 deletions docs/user/mod-placeholders.md
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,9 @@ These placeholders are provided by other mods. Some are build in directly, while
- `%playerpronouns:raw_pronouns%` / `%playerpronouns:raw_pronouns [default]%` - Displays player's pronouns as raw text, or `default` if
unset. This allows text formatting to be embedded into the pronouns.

### [Solstice Essentials](https://solstice.alexdevs.me)
- `%solstice:afk%` - Displays the AFK tag when the player is away from keyboard, configurable via the config.

### [Spark](https://spark.lucko.me/download)

- `%spark:tps%` / `%spark:tps duration%` - Shows server TPS. `duration` can be `5s`, `10s`, `1m`, `5m`, or `15m`. Shows all durations if
Expand Down Expand Up @@ -143,3 +146,4 @@ These placeholders are provided by other mods. Some are build in directly, while
*[MSPT]: Milliseconds Per Tick. The number of milliseconds it takes for a tick on the server. >50 MSPT means the server is lagging.
*[UUID]: UUIDs are used by minecraft to identify players and entities
*[UUIDs]: UUIDs are used by minecraft to identify players and entities

11 changes: 5 additions & 6 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,14 @@ org.gradle.jvmargs=-Xmx1G

# Fabric Properties
# check these on https://fabricmc.net/use
minecraft_version=1.21.3
yarn_mappings=1.21.3+build.1
loader_version=0.16.9
minecraft_version=1.21.5-rc1
yarn_mappings=1.21.5-rc1+build.1
loader_version=0.16.10

#Fabric api
fabric_version=0.106.1+1.21.3
fabric_version=0.119.1+1.21.5

# Mod Properties
mod_version = 2.5.1+1.21.3
mod_version = 2.6.0+1.21.5
maven_group = eu.pb4
archives_base_name = placeholder-api

Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
4 changes: 3 additions & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
43 changes: 30 additions & 13 deletions gradlew
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
# SPDX-License-Identifier: Apache-2.0
#

##############################################################################
#
Expand Down Expand Up @@ -55,7 +57,7 @@
# Darwin, MinGW, and NonStop.
#
# (3) This script is generated from the Groovy template
# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
# within the Gradle project.
#
# You can find Gradle at https://github.com/gradle/gradle/.
Expand All @@ -80,13 +82,11 @@ do
esac
done

APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit

APP_NAME="Gradle"
# This is normally unused
# shellcheck disable=SC2034
APP_BASE_NAME=${0##*/}

# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit

# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD=maximum
Expand Down Expand Up @@ -133,22 +133,29 @@ location of your Java installation."
fi
else
JAVACMD=java
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
if ! command -v java >/dev/null 2>&1
then
die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
Please set the JAVA_HOME variable in your environment to match the
location of your Java installation."
fi
fi

# Increase the maximum file descriptors if we can.
if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
case $MAX_FD in #(
max*)
# In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
# shellcheck disable=SC2039,SC3045
MAX_FD=$( ulimit -H -n ) ||
warn "Could not query maximum file descriptor limit"
esac
case $MAX_FD in #(
'' | soft) :;; #(
*)
# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
# shellcheck disable=SC2039,SC3045
ulimit -n "$MAX_FD" ||
warn "Could not set maximum file descriptor limit to $MAX_FD"
esac
Expand Down Expand Up @@ -193,18 +200,28 @@ if "$cygwin" || "$msys" ; then
done
fi

# Collect all arguments for the java command;
# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
# shell script including quotes and variable substitutions, so put them in
# double quotes to make sure that they get re-expanded; and
# * put everything else in single quotes, so that it's not re-expanded.

# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'

# Collect all arguments for the java command:
# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
# and any embedded shellness will be escaped.
# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
# treated as '${Hostname}' itself on the command line.

set -- \
"-Dorg.gradle.appname=$APP_BASE_NAME" \
-classpath "$CLASSPATH" \
org.gradle.wrapper.GradleWrapperMain \
"$@"

# Stop when "xargs" is not available.
if ! command -v xargs >/dev/null 2>&1
then
die "xargs is not available"
fi

# Use "xargs" to parse quoted args.
#
# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
Expand Down
37 changes: 21 additions & 16 deletions gradlew.bat
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,10 @@
@rem See the License for the specific language governing permissions and
@rem limitations under the License.
@rem
@rem SPDX-License-Identifier: Apache-2.0
@rem

@if "%DEBUG%" == "" @echo off
@if "%DEBUG%"=="" @echo off
@rem ##########################################################################
@rem
@rem Gradle startup script for Windows
Expand All @@ -25,7 +27,8 @@
if "%OS%"=="Windows_NT" setlocal

set DIRNAME=%~dp0
if "%DIRNAME%" == "" set DIRNAME=.
if "%DIRNAME%"=="" set DIRNAME=.
@rem This is normally unused
set APP_BASE_NAME=%~n0
set APP_HOME=%DIRNAME%

Expand All @@ -40,13 +43,13 @@ if defined JAVA_HOME goto findJavaFromJavaHome

set JAVA_EXE=java.exe
%JAVA_EXE% -version >NUL 2>&1
if "%ERRORLEVEL%" == "0" goto execute
if %ERRORLEVEL% equ 0 goto execute

echo.
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
echo.
echo Please set the JAVA_HOME variable in your environment to match the
echo location of your Java installation.
echo. 1>&2
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
echo. 1>&2
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
echo location of your Java installation. 1>&2

goto fail

Expand All @@ -56,11 +59,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe

if exist "%JAVA_EXE%" goto execute

echo.
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
echo.
echo Please set the JAVA_HOME variable in your environment to match the
echo location of your Java installation.
echo. 1>&2
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
echo. 1>&2
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
echo location of your Java installation. 1>&2

goto fail

Expand All @@ -75,13 +78,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar

:end
@rem End local scope for the variables with windows NT shell
if "%ERRORLEVEL%"=="0" goto mainEnd
if %ERRORLEVEL% equ 0 goto mainEnd

:fail
rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
rem the _cmd.exe /c_ return code!
if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
exit /b 1
set EXIT_CODE=%ERRORLEVEL%
if %EXIT_CODE% equ 0 set EXIT_CODE=1
if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
exit /b %EXIT_CODE%

:mainEnd
if "%OS%"=="Windows_NT" endlocal
Expand Down
Loading