From 1c010ea9b2f8ce955e53f2ba294ffb99afb63c7d Mon Sep 17 00:00:00 2001
From: ME1312 <admin@me1312.net>
Date: Mon, 8 Mar 2021 06:08:54 -0500
Subject: [PATCH] Change placeholder format

This is to make it compatible with PAPI bracket format.
---
 .../Library/Compatibility/PlaceholderImpl.java   | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Library/Compatibility/PlaceholderImpl.java b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Library/Compatibility/PlaceholderImpl.java
index 02f0cef2..fcc04339 100644
--- a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Library/Compatibility/PlaceholderImpl.java
+++ b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Library/Compatibility/PlaceholderImpl.java
@@ -206,8 +206,8 @@ public class PlaceholderImpl extends PlaceholderExpansion implements Taskable, C
         values[0] = text.substring(0, start);
         text = text.substring(start);
 
-        int[] open =  {'(', '{'};
-        int[] close = {')', '}'};
+        int[] open =  {'(', '<'};
+        int[] close = {')', '>'};
         Arrays.sort(open);
         Arrays.sort(close);
 
@@ -242,7 +242,7 @@ public class PlaceholderImpl extends PlaceholderExpansion implements Taskable, C
                         for (int ix = i + 1; ix < text.codePoints().count(); ++ix) {
                             int cx = text.codePointAt(ix);
                             if (!Character.isWhitespace(cx) && cx != '_') {
-                                more = cx == '{';
+                                more = cx == '<';
                                 break;
                             }
                         }
@@ -269,7 +269,7 @@ public class PlaceholderImpl extends PlaceholderExpansion implements Taskable, C
     }
 
     private String[] parseMethod(OfflinePlayer player, String text) {
-        Matcher m = Pattern.compile("^#?(.+?)(?:[\\s_]*\\((.*?)\\))?(?:[\\s_]*\\{(.*)})?$", Pattern.CASE_INSENSITIVE).matcher(text);
+        Matcher m = Pattern.compile("^#?(.+?)(?:[\\s_]*\\((.*?)\\))?(?:[\\s_]*<(.*)>)?$", Pattern.CASE_INSENSITIVE).matcher(text);
 
         if (m.find()) {
             String[] values = new String[3];
@@ -277,11 +277,11 @@ public class PlaceholderImpl extends PlaceholderExpansion implements Taskable, C
             values[0] = m.group(1);
             if (m.group(2) == null || m.group(2).trim().isEmpty() ||
                     m.group(3) == null || m.group(3).trim().isEmpty()) {
-                // Simple parsing << () or {} >>
+                // Simple parsing: () or <>
                 values[1] = m.group(2);
                 values[2] = m.group(3);
             } else {
-                // Complex parsing << () and {} >>
+                // Complex parsing: () and <>
                 text = text.substring(m.end(1));
                 int stage = 1, level = 0, i = 0;
                 char open = '(', close = ')';
@@ -301,14 +301,14 @@ public class PlaceholderImpl extends PlaceholderExpansion implements Taskable, C
                             for (int ix = i + 1; ix < text.codePoints().count(); ++ix) {
                                 int cx = text.codePointAt(ix);
                                 if (!Character.isWhitespace(cx) && cx != '_') {
-                                    more = cx == '{';
+                                    more = cx == '<';
                                     break;
                                 }
                             }
                             if (!more) break;
                             else {
                                 responses = true;
-                                open = '{'; close = '}';
+                                open = '<'; close = '>';
                                 values[stage++] = str.toString();
                                 str = new StringBuilder();
                             }