SpigotMC-Mirrors
/
PlaceholderAPI
mirror of https://github.com/PlaceholderAPI/PlaceholderAPI
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

updated to use new closure

This commit is contained in:
Sxtanna 2020-07-20 17:38:18 -04:00
parent 49012dc6b2
commit 9060ea6bd3
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/test/java/me/clip/placeholderapi/Values.java
View File

@ -2,7 +2,6 @@ package me.clip.placeholderapi;
import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableMap;
import com.google.common.collect.ImmutableSet; import com.google.common.collect.ImmutableSet;
import me.clip.placeholderapi.expansion.PlaceholderExpansion;
import me.clip.placeholderapi.replacer.CharsReplacer; import me.clip.placeholderapi.replacer.CharsReplacer;
import me.clip.placeholderapi.replacer.RegexReplacer; import me.clip.placeholderapi.replacer.RegexReplacer;
import me.clip.placeholderapi.replacer.Replacer; import me.clip.placeholderapi.replacer.Replacer;
@ -33,7 +32,7 @@ public interface Values
'a', 'b', 'c', 'd', 'e', 'f', 'k', 'l', 'm', 'o', 'r', 'x'); 'a', 'b', 'c', 'd', 'e', 'f', 'k', 'l', 'm', 'o', 'r', 'x');
private final boolean colorize = true; private final boolean colorize = true;
private final PlaceholderReplacer.Closure closure = PlaceholderReplacer.Closure.PERCENT; private final Replacer.Closure closure = Replacer.Closure.PERCENT;
@Override @Override
public @NotNull String apply(final @NotNull String text, final @Nullable OfflinePlayer player, final @NotNull Function<String, @Nullable PlaceholderHook> lookup) public @NotNull String apply(final @NotNull String text, final @Nullable OfflinePlayer player, final @NotNull Function<String, @Nullable PlaceholderHook> lookup)
@ -63,7 +62,7 @@ public interface Values
} }
// Check if the placeholder starts or ends. // Check if the placeholder starts or ends.
if (ch == closure.start || ch == closure.end) if (ch == closure.head || ch == closure.tail)
{ {
// If the placeholder ends. // If the placeholder ends.
if (stage == 2) if (stage == 2)
@ -73,8 +72,8 @@ public interface Values
if (translated == null) if (translated == null)
{ {
String name = handler.isExpansion() ? ((PlaceholderExpansion) handler).getIdentifier() : ""; String name = "";
builder.append(closure.start).append(name).append('_').append(parameter).append(closure.end); builder.append(closure.head).append(name).append('_').append(parameter).append(closure.tail);
} }
else else
{ {
@ -87,7 +86,7 @@ public interface Values
} }
else if (stage == 1) else if (stage == 1)
{ // If it just started | Double closures | If it's still hasn't detected the indentifier, reset. { // If it just started | Double closures | If it's still hasn't detected the indentifier, reset.
builder.append(closure.start).append(identifier); builder.append(closure.head).append(identifier);
} }
identifier.setLength(0); identifier.setLength(0);
@ -105,7 +104,7 @@ public interface Values
handler = lookup.apply(identifier.toString()); handler = lookup.apply(identifier.toString());
if (handler == null) if (handler == null)
{ {
builder.append(closure.start).append(identifier).append('_'); builder.append(closure.head).append(identifier).append('_');
stage = 0; stage = 0;
} }
else else
@ -141,7 +140,7 @@ public interface Values
{ {
if (stage > 0) if (stage > 0)
{ {
builder.append(closure.end); builder.append(closure.tail);
} }
builder.append(identifier); builder.append(identifier);
} }