From c63fdb52d9804fb3eb868fc36c7ec68b7fa1c0c7 Mon Sep 17 00:00:00 2001
From: Sentropic <60368610+Sentropic@users.noreply.github.com>
Date: Sat, 19 Dec 2020 18:48:49 -0600
Subject: [PATCH] Added apostrophe (') placeholder (&sq) to Message and Command
 Mechanics

---
 editor/js/component.js                                    | 6 +++---
 src/main/java/com/sucy/skill/dynamic/EffectComponent.java | 5 +++++
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/editor/js/component.js b/editor/js/component.js
index 8ef121f3..6a5a5921 100644
--- a/editor/js/component.js
+++ b/editor/js/component.js
@@ -1765,10 +1765,10 @@ function MechanicCommand()
     this.description ='Executes a command for each of the targets.';
 
     this.data.push(new StringValue('Command', 'command', '')
-        .setTooltip('The command to execute')
+        .setTooltip('The command to execute. {player} = caster\'s name, {target} = target\'s name, {targetUUID} = target\'s UUID (useful if targets are non players), &lc: "{", &rc: "}", &sq: "\'"')
     );
     this.data.push(new ListValue('Execute Type', 'type', [ 'Console', 'OP' ], 'OP')
-        .setTooltip('Console: executes the command from the console. OP: Only if the target is a player, will have them execute it while given a temporary OP permission (If server closes in the meantime, the permission might stay, not recommended!!). {player} = caster\'s name, {target} = target\'s name, {targetUUID} = target\'s UUID (useful if targets are non players), &lc: "{", &rc: "}"')
+        .setTooltip('Console: executes the command from the console. OP: Only if the target is a player, will have them execute it while given a temporary OP permission (If server closes in the meantime, the permission might stay, not recommended!!)')
     );
 }
 
@@ -2229,7 +2229,7 @@ function MechanicMessage()
     this.description = 'Sends a message to each player target. To include numbers from Value mechanics, use the filters {<key>} where <key> is the key the value is stored under.'
 
     this.data.push(new StringValue('Message', 'message', 'text')
-        .setTooltip('The message to display')
+        .setTooltip('The message to display. {player} = caster\'s name, {target} = target\'s name, {targetUUID} = target\'s UUID (useful if targets are non players), &lc: "{", &rc: "}", &sq: "\'"')
     );
 }
 
diff --git a/src/main/java/com/sucy/skill/dynamic/EffectComponent.java b/src/main/java/com/sucy/skill/dynamic/EffectComponent.java
index a5148512..57a83f40 100644
--- a/src/main/java/com/sucy/skill/dynamic/EffectComponent.java
+++ b/src/main/java/com/sucy/skill/dynamic/EffectComponent.java
@@ -300,6 +300,11 @@ private static String filterSpecialChars(String string) {
                     builder.append('{');
                     i = j+3;
                     break;
+                case "sq":
+                    builder.append(string, i, j);
+                    builder.append('\'');
+                    i = j+3;
+                    break;
             }
             j = string.indexOf('&',i);
         }