Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Allow for nested placeholders #26

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Allow for nested placeholders #26

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6d6f446
Allow for nested placeholders by following placeholderAPI method of %…
AkatGabrielGoncalves Jul 17, 2022
b753f14
replace all setBracketPlaceholders to setPlaceholders
AkatGabrielGoncalves Jul 17, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/main/java/mineverse/Aust1n46/chat/MineverseChat.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -998,7 +998,7 @@ public void run() {
sendPluginMessage(stream);
return;
}
p.getPlayer().sendMessage(Format.FormatStringAll(PlaceholderAPI.setBracketPlaceholders(p.getPlayer(), send.replaceAll("receiver_", ""))) + msg);
p.getPlayer().sendMessage(Format.FormatStringAll(PlaceholderAPI.setPlaceholders(p.getPlayer(), send.replaceAll("receiver_", ""))) + msg);
if(p.hasNotifications()) {
Format.playMessageSound(p);
}
Expand All @@ -1015,8 +1015,8 @@ public void run() {
out.writeUTF(p.getUUID().toString());
out.writeUTF(sender.toString());
out.writeUTF(sName);
out.writeUTF(Format.FormatStringAll(PlaceholderAPI.setBracketPlaceholders(p.getPlayer(), echo.replaceAll("receiver_", ""))) + msg);
out.writeUTF(Format.FormatStringAll(PlaceholderAPI.setBracketPlaceholders(p.getPlayer(), spy.replaceAll("receiver_", ""))) + msg);
out.writeUTF(Format.FormatStringAll(PlaceholderAPI.setPlaceholders(p.getPlayer(), echo.replaceAll("receiver_", ""))) + msg);
out.writeUTF(Format.FormatStringAll(PlaceholderAPI.setPlaceholders(p.getPlayer(), spy.replaceAll("receiver_", ""))) + msg);
sendPluginMessage(stream);
return;
}
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/mineverse/Aust1n46/chat/command/chat/VentureChatGui.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ private void openInventory(MineverseChatPlayer mcp, MineverseChatPlayer target,
ItemMeta gMeta = gStack.getItemMeta();
String displayName = g.getText().replace("{player_name}", target.getName()).replace("{channel}", channel.getName()).replace("{hash}", hash + "");
if (target.isOnline()) {
displayName = PlaceholderAPI.setBracketPlaceholders(target.getPlayer(), displayName);
displayName = PlaceholderAPI.setPlaceholders(target.getPlayer(), displayName);
}
gMeta.setDisplayName(Format.FormatStringAll(displayName));
List<String> gLore = new ArrayList<String>();
Expand Down
18 changes: 9 additions & 9 deletions src/main/java/mineverse/Aust1n46/chat/command/message/Message.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,13 +83,13 @@ public boolean execute(CommandSender sender, String command, String[] args) {
msg = Format.FormatString(msg);
}

send = Format.FormatStringAll(PlaceholderAPI.setBracketPlaceholders(mcp.getPlayer(), plugin.getConfig().getString("tellformatfrom").replaceAll("sender_", "")));
echo = Format.FormatStringAll(PlaceholderAPI.setBracketPlaceholders(mcp.getPlayer(), plugin.getConfig().getString("tellformatto").replaceAll("sender_", "")));
spy = Format.FormatStringAll(PlaceholderAPI.setBracketPlaceholders(mcp.getPlayer(), plugin.getConfig().getString("tellformatspy").replaceAll("sender_", "")));
send = Format.FormatStringAll(PlaceholderAPI.setPlaceholders(mcp.getPlayer(), plugin.getConfig().getString("tellformatfrom").replaceAll("sender_", "")));
echo = Format.FormatStringAll(PlaceholderAPI.setPlaceholders(mcp.getPlayer(), plugin.getConfig().getString("tellformatto").replaceAll("sender_", "")));
spy = Format.FormatStringAll(PlaceholderAPI.setPlaceholders(mcp.getPlayer(), plugin.getConfig().getString("tellformatspy").replaceAll("sender_", "")));

send = Format.FormatStringAll(PlaceholderAPI.setBracketPlaceholders(player.getPlayer(), send.replaceAll("receiver_", ""))) + msg;
echo = Format.FormatStringAll(PlaceholderAPI.setBracketPlaceholders(player.getPlayer(), echo.replaceAll("receiver_", ""))) + msg;
spy = Format.FormatStringAll(PlaceholderAPI.setBracketPlaceholders(player.getPlayer(), spy.replaceAll("receiver_", ""))) + msg;
send = Format.FormatStringAll(PlaceholderAPI.setPlaceholders(player.getPlayer(), send.replaceAll("receiver_", ""))) + msg;
echo = Format.FormatStringAll(PlaceholderAPI.setPlaceholders(player.getPlayer(), echo.replaceAll("receiver_", ""))) + msg;
spy = Format.FormatStringAll(PlaceholderAPI.setPlaceholders(player.getPlayer(), spy.replaceAll("receiver_", ""))) + msg;

player.setReplyPlayer(mcp.getUUID());
mcp.setReplyPlayer(player.getUUID());
Expand Down Expand Up @@ -182,11 +182,11 @@ private void sendBungeeCordMessage(MineverseChatPlayer mcp, String command, Stri
msg = Format.FormatString(msg);
}

String send = Format.FormatStringAll(PlaceholderAPI.setBracketPlaceholders(mcp.getPlayer(), plugin.getConfig().getString("tellformatfrom").replaceAll("sender_", "")));
String echo = Format.FormatStringAll(PlaceholderAPI.setBracketPlaceholders(mcp.getPlayer(), plugin.getConfig().getString("tellformatto").replaceAll("sender_", "")));
String send = Format.FormatStringAll(PlaceholderAPI.setPlaceholders(mcp.getPlayer(), plugin.getConfig().getString("tellformatfrom").replaceAll("sender_", "")));
String echo = Format.FormatStringAll(PlaceholderAPI.setPlaceholders(mcp.getPlayer(), plugin.getConfig().getString("tellformatto").replaceAll("sender_", "")));
String spy = "VentureChat:NoSpy";
if (!mcp.getPlayer().hasPermission("venturechat.spy.override")) {
spy = Format.FormatStringAll(PlaceholderAPI.setBracketPlaceholders(mcp.getPlayer(), plugin.getConfig().getString("tellformatspy").replaceAll("sender_", "")));
spy = Format.FormatStringAll(PlaceholderAPI.setPlaceholders(mcp.getPlayer(), plugin.getConfig().getString("tellformatspy").replaceAll("sender_", "")));
}
try {
out.writeUTF("Message");
Expand Down
18 changes: 9 additions & 9 deletions src/main/java/mineverse/Aust1n46/chat/command/message/Reply.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,13 +73,13 @@ public boolean execute(CommandSender sender, String command, String[] args) {
}

send = Format
.FormatStringAll(PlaceholderAPI.setBracketPlaceholders(mcp.getPlayer(), plugin.getConfig().getString("replyformatfrom").replaceAll("sender_", "")));
echo = Format.FormatStringAll(PlaceholderAPI.setBracketPlaceholders(mcp.getPlayer(), plugin.getConfig().getString("replyformatto").replaceAll("sender_", "")));
spy = Format.FormatStringAll(PlaceholderAPI.setBracketPlaceholders(mcp.getPlayer(), plugin.getConfig().getString("replyformatspy").replaceAll("sender_", "")));
.FormatStringAll(PlaceholderAPI.setPlaceholders(mcp.getPlayer(), plugin.getConfig().getString("replyformatfrom").replaceAll("sender_", "")));
echo = Format.FormatStringAll(PlaceholderAPI.setPlaceholders(mcp.getPlayer(), plugin.getConfig().getString("replyformatto").replaceAll("sender_", "")));
spy = Format.FormatStringAll(PlaceholderAPI.setPlaceholders(mcp.getPlayer(), plugin.getConfig().getString("replyformatspy").replaceAll("sender_", "")));

send = Format.FormatStringAll(PlaceholderAPI.setBracketPlaceholders(player.getPlayer(), send.replaceAll("receiver_", ""))) + msg;
echo = Format.FormatStringAll(PlaceholderAPI.setBracketPlaceholders(player.getPlayer(), echo.replaceAll("receiver_", ""))) + msg;
spy = Format.FormatStringAll(PlaceholderAPI.setBracketPlaceholders(player.getPlayer(), spy.replaceAll("receiver_", ""))) + msg;
send = Format.FormatStringAll(PlaceholderAPI.setPlaceholders(player.getPlayer(), send.replaceAll("receiver_", ""))) + msg;
echo = Format.FormatStringAll(PlaceholderAPI.setPlaceholders(player.getPlayer(), echo.replaceAll("receiver_", ""))) + msg;
spy = Format.FormatStringAll(PlaceholderAPI.setPlaceholders(player.getPlayer(), spy.replaceAll("receiver_", ""))) + msg;

if (!mcp.getPlayer().hasPermission("venturechat.spy.override")) {
for (MineverseChatPlayer p : MineverseChatAPI.getOnlineMineverseChatPlayers()) {
Expand Down Expand Up @@ -128,11 +128,11 @@ private void sendBungeeCordReply(MineverseChatPlayer mcp, String[] args) {
msg = Format.FormatString(msg);
}

String send = Format.FormatStringAll(PlaceholderAPI.setBracketPlaceholders(mcp.getPlayer(), plugin.getConfig().getString("replyformatfrom").replaceAll("sender_", "")));
String echo = Format.FormatStringAll(PlaceholderAPI.setBracketPlaceholders(mcp.getPlayer(), plugin.getConfig().getString("replyformatto").replaceAll("sender_", "")));
String send = Format.FormatStringAll(PlaceholderAPI.setPlaceholders(mcp.getPlayer(), plugin.getConfig().getString("replyformatfrom").replaceAll("sender_", "")));
String echo = Format.FormatStringAll(PlaceholderAPI.setPlaceholders(mcp.getPlayer(), plugin.getConfig().getString("replyformatto").replaceAll("sender_", "")));
String spy = "VentureChat:NoSpy";
if (!mcp.getPlayer().hasPermission("venturechat.spy.override")) {
spy = Format.FormatStringAll(PlaceholderAPI.setBracketPlaceholders(mcp.getPlayer(), plugin.getConfig().getString("replyformatspy").replaceAll("sender_", "")));
spy = Format.FormatStringAll(PlaceholderAPI.setPlaceholders(mcp.getPlayer(), plugin.getConfig().getString("replyformatspy").replaceAll("sender_", "")));
}
try {
out.writeUTF("Message");
Expand Down
16 changes: 8 additions & 8 deletions src/main/java/mineverse/Aust1n46/chat/listeners/ChatListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,13 +123,13 @@ public void handleTrueAsyncPlayerChatEvent(AsyncPlayerChatEvent event) {
}
filtered = " " + filtered;

send = Format.FormatStringAll(PlaceholderAPI.setBracketPlaceholders(mcp.getPlayer(), plugin.getConfig().getString("tellformatfrom").replaceAll("sender_", "")));
echo = Format.FormatStringAll(PlaceholderAPI.setBracketPlaceholders(mcp.getPlayer(), plugin.getConfig().getString("tellformatto").replaceAll("sender_", "")));
spy = Format.FormatStringAll(PlaceholderAPI.setBracketPlaceholders(mcp.getPlayer(), plugin.getConfig().getString("tellformatspy").replaceAll("sender_", "")));
send = Format.FormatStringAll(PlaceholderAPI.setPlaceholders(mcp.getPlayer(), plugin.getConfig().getString("tellformatfrom").replaceAll("sender_", "")));
echo = Format.FormatStringAll(PlaceholderAPI.setPlaceholders(mcp.getPlayer(), plugin.getConfig().getString("tellformatto").replaceAll("sender_", "")));
spy = Format.FormatStringAll(PlaceholderAPI.setPlaceholders(mcp.getPlayer(), plugin.getConfig().getString("tellformatspy").replaceAll("sender_", "")));

send = Format.FormatStringAll(PlaceholderAPI.setBracketPlaceholders(tp.getPlayer(), send.replaceAll("receiver_", ""))) + filtered;
echo = Format.FormatStringAll(PlaceholderAPI.setBracketPlaceholders(tp.getPlayer(), echo.replaceAll("receiver_", ""))) + filtered;
spy = Format.FormatStringAll(PlaceholderAPI.setBracketPlaceholders(tp.getPlayer(), spy.replaceAll("receiver_", ""))) + filtered;
send = Format.FormatStringAll(PlaceholderAPI.setPlaceholders(tp.getPlayer(), send.replaceAll("receiver_", ""))) + filtered;
echo = Format.FormatStringAll(PlaceholderAPI.setPlaceholders(tp.getPlayer(), echo.replaceAll("receiver_", ""))) + filtered;
spy = Format.FormatStringAll(PlaceholderAPI.setPlaceholders(tp.getPlayer(), spy.replaceAll("receiver_", ""))) + filtered;

if(!mcp.getPlayer().hasPermission("venturechat.spy.override")) {
for(MineverseChatPlayer p : MineverseChatAPI.getOnlineMineverseChatPlayers()) {
Expand Down Expand Up @@ -478,14 +478,14 @@ else if(!(mplayer.getFactionName().equals(mplayerp.getFactionName()))) {
}
if(curColor.equalsIgnoreCase("None")) {
// Format the placeholders and their color codes to determine the last color code to use for the chat message color
chat = Format.getLastCode(Format.FormatStringAll(PlaceholderAPI.setBracketPlaceholders(mcp.getPlayer(), format))) + chat;
chat = Format.getLastCode(Format.FormatStringAll(PlaceholderAPI.setPlaceholders(mcp.getPlayer(), format))) + chat;
}
else {
chat = curColor + chat;
}

String globalJSON = Format.convertToJson(mcp, format, chat);
format = Format.FormatStringAll(PlaceholderAPI.setBracketPlaceholders(mcp.getPlayer(), Format.FormatStringAll(format)));
format = Format.FormatStringAll(PlaceholderAPI.setPlaceholders(mcp.getPlayer(), Format.FormatStringAll(format)));
String message = Format.stripColor(format + chat); // UTF-8 encoding issues.
int hash = message.hashCode();

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/mineverse/Aust1n46/chat/listeners/CommandListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ public void InventoryClick(InventoryClickEvent e) {
if (target != null) {
command = command.replace("{player_name}", target.getName());
if (target.isOnline()) {
command = Format.FormatStringAll(PlaceholderAPI.setBracketPlaceholders(target.getPlayer(), command));
command = Format.FormatStringAll(PlaceholderAPI.setPlaceholders(target.getPlayer(), command));
}
} else {
command = command.replace("{player_name}", "Discord_Message");
Expand Down
10 changes: 5 additions & 5 deletions src/main/java/mineverse/Aust1n46/chat/utilities/Format.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ public class Format {
private static final Pattern LEGACY_CHAT_COLOR_PATTERN = Pattern.compile(
"(?<!(&x(&[a-fA-F0-9]){5}))(?<!(&x(&[a-fA-F0-9]){4}))(?<!(&x(&[a-fA-F0-9]){3}))(?<!(&x(&[a-fA-F0-9]){2}))(?<!(&x(&[a-fA-F0-9]){1}))(?<!(&x))(&)([0-9a-fA-F])");

private static final Pattern PLACEHOLDERAPI_PLACEHOLDER_PATTERN = Pattern.compile("\\{([^\\{\\}]+)\\}");
private static final Pattern PLACEHOLDERAPI_PLACEHOLDER_PATTERN = Pattern.compile("\\%[^\\{\\}%]*\\{?[^\\{\\}%]+\\}?[^\\{\\}%]*\\%");

public static final long MILLISECONDS_PER_DAY = 86400000;
public static final long MILLISECONDS_PER_HOUR = 3600000;
Expand Down Expand Up @@ -109,25 +109,25 @@ private static String convertPlaceholders(String s, JsonFormat format, Mineverse
indexStart = matcher.start();
indexEnd = matcher.end();
placeholder = remaining.substring(indexStart, indexEnd);
formattedPlaceholder = Format.FormatStringAll(PlaceholderAPI.setBracketPlaceholders(icp.getPlayer(), placeholder));
formattedPlaceholder = Format.FormatStringAll(PlaceholderAPI.setPlaceholders(icp.getPlayer(), placeholder));
temp += convertToJsonColors(lastCode + remaining.substring(0, indexStart)) + ",";
lastCode = getLastCode(lastCode + remaining.substring(0, indexStart));
String action = "";
String text = "";
String hover = "";
for (JsonAttribute jsonAttribute : format.getJsonAttributes()) {
if (placeholder.contains(jsonAttribute.getName().replace("{", "").replace("}", ""))) {
if (placeholder.contains(jsonAttribute.getName().replace("%", "").replace("%", ""))) {
action = jsonAttribute.getClickAction();
text = Format.FormatStringAll(
PlaceholderAPI.setBracketPlaceholders(icp.getPlayer(), jsonAttribute.getClickText()));
PlaceholderAPI.setPlaceholders(icp.getPlayer(), jsonAttribute.getClickText()));
for (String st : jsonAttribute.getHoverText()) {
hover += Format.FormatStringAll(st) + "\n";
}
}
}
if(!hover.isEmpty()) {
hover = Format.FormatStringAll(
PlaceholderAPI.setBracketPlaceholders(icp.getPlayer(), hover.substring(0, hover.length() - 1)));
PlaceholderAPI.setPlaceholders(icp.getPlayer(), hover.substring(0, hover.length() - 1)));
}
temp += convertToJsonColors(lastCode + formattedPlaceholder,
",\"clickEvent\":{\"action\":\"" + action + "\",\"value\":\"" + text
Expand Down