Skip to content

Commit ebc651e

Browse files
committed
Added placeholder parsing to js condition
Closes #160
1 parent c9913ab commit ebc651e

File tree

4 files changed

+15
-21
lines changed

4 files changed

+15
-21
lines changed

.travis.yml

Lines changed: 0 additions & 7 deletions
This file was deleted.

LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
MIT License
22

3-
Copyright (c) 2024 Lorenzo0111
3+
Copyright (c) 2025 Lorenzo0111
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

build.gradle

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,13 @@ import org.apache.tools.ant.filters.ReplaceTokens
2727
plugins {
2828
id 'java'
2929
id 'maven-publish'
30-
id "com.github.johnrengelman.shadow" version "8.1.1"
30+
id "com.gradleup.shadow" version "8.3.6"
3131
id "net.kyori.indra.license-header" version "3.1.3"
3232
id "io.github.slimjar" version "1.3.0"
3333
}
3434

3535
group = 'me.lorenzo0111'
36-
version = '2.3.1'
36+
version = '2.3.2'
3737
description = 'RocketPlaceholders'
3838

3939
ext {
@@ -51,9 +51,9 @@ repositories {
5151
}
5252

5353
dependencies {
54-
compileOnly("org.spigotmc:spigot-api:1.21-R0.1-SNAPSHOT")
54+
compileOnly("org.spigotmc:spigot-api:1.21.4-R0.1-SNAPSHOT")
5555
compileOnly("me.clip:placeholderapi:2.11.6")
56-
compileOnly('org.jetbrains:annotations:24.1.0')
56+
compileOnly('org.jetbrains:annotations:26.0.2')
5757
compileOnly("com.github.MilkBowl:VaultAPI:1.7.1")
5858
compileOnly("be.maximvdw:MVdWPlaceholderAPI:3.0.1-SNAPSHOT") {
5959
exclude module: 'spigot'
@@ -62,16 +62,16 @@ dependencies {
6262
implementation("io.github.slimjar:slimjar:1.2.8")
6363
implementation("com.github.glyart:mystral:1.4.6-SNAPSHOT")
6464
implementation("dev.triumphteam:triumph-gui:3.2.2")
65-
implementation("org.bstats:bstats-bukkit:3.0.2")
66-
implementation('com.github.cryptomorin:XSeries:11.0.0')
67-
implementation('net.kyori:adventure-api:4.17.0')
68-
implementation('net.kyori:adventure-text-serializer-legacy:4.17.0')
65+
implementation("org.bstats:bstats-bukkit:3.1.0")
66+
implementation('com.github.cryptomorin:XSeries:13.0.0')
67+
implementation('net.kyori:adventure-api:4.19.0')
68+
implementation('net.kyori:adventure-text-serializer-legacy:4.19.0')
6969
implementation("com.github.l1m0n3:HexiTextLib:b9e30055b7") {
7070
exclude module: "annotations"
7171
}
7272

73-
slim("com.mysql:mysql-connector-j:8.4.0")
74-
slim("commons-io:commons-io:2.16.1")
73+
slim("com.mysql:mysql-connector-j:9.2.0")
74+
slim("commons-io:commons-io:2.18.0")
7575
}
7676

7777
shadowJar {
@@ -94,9 +94,9 @@ slimJar {
9494

9595
javadoc {
9696
options.links(
97-
'https://javadoc.io/static/org.jetbrains/annotations/21.0.1/',
97+
'https://javadoc.io/static/org.jetbrains/annotations/26.0.2/',
9898
'https://docs.oracle.com/en/java/javase/16/docs/api/',
99-
'https://jd.papermc.io/paper/1.19/'
99+
'https://jd.papermc.io/paper/1.21.4/'
100100
)
101101
options.addStringOption('Xdoclint:none', '-quiet')
102102
source = sourceSets.main.allJava

src/main/java/me/lorenzo0111/rocketplaceholders/creator/conditions/types/JSCondition.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
import me.lorenzo0111.rocketplaceholders.creator.conditions.Requirement;
2828
import me.lorenzo0111.rocketplaceholders.creator.conditions.RequirementType;
2929
import me.lorenzo0111.rocketplaceholders.exceptions.InvalidConditionException;
30+
import me.lorenzo0111.rocketplaceholders.providers.ProviderUtils;
3031
import me.lorenzo0111.rocketplaceholders.utilities.JavaScriptParser;
3132
import org.bukkit.entity.Player;
3233

@@ -47,7 +48,7 @@ public JSCondition(String expression) {
4748
public boolean apply(Player player) {
4849
try {
4950
engine.bind("Player", player);
50-
Boolean result = engine.parse(expression);
51+
Boolean result = engine.parse(ProviderUtils.setPlaceholders(plugin, expression, player));
5152
if (result == null) {
5253
plugin.getLogger().severe("Expression '" + expression + "' has to return a boolean. Returning as false..");
5354
return false;

0 commit comments

Comments
 (0)