handle NBSPs internally a bit cleaner

DenizenScript · Apr 9, 2020 · 321575f · 321575f
1 parent 90c1684
commit 321575f
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/src/main/java/com/denizenscript/denizencore/objects/core/ElementTag.java b/src/main/java/com/denizenscript/denizencore/objects/core/ElementTag.java
@@ -1444,7 +1444,7 @@ else if (CoreUtilities.toLowerCase(element).contains(CoreUtilities.toLowerCase(c
                 attribute.echoError("The tag ElementTag.pad_left[...] must have a value.");
                 return null;
             }
-            String with = String.valueOf((char) 0x00A0);
+            String with = CoreUtilities.NBSP;
             int length = attribute.getIntContext(1);
 
             // <--[tag]
@@ -1481,7 +1481,7 @@ else if (CoreUtilities.toLowerCase(element).contains(CoreUtilities.toLowerCase(c
                 attribute.echoError("The tag ElementTag.pad_right[...] must have a value.");
                 return null;
             }
-            String with = String.valueOf((char) 0x00A0);
+            String with = CoreUtilities.NBSP;
             int length = attribute.getIntContext(1);
 
             // <--[tag]

diff --git a/src/main/java/com/denizenscript/denizencore/tags/core/EscapeTagBase.java b/src/main/java/com/denizenscript/denizencore/tags/core/EscapeTagBase.java
@@ -127,7 +127,7 @@ public static String unEscape(String input) {
         input = CoreUtilities.replace(input, "&fs", "/");
         input = CoreUtilities.replace(input, "&ss", "§");
         input = CoreUtilities.replace(input, "&ns", "#");
-        input = CoreUtilities.replace(input, "&sp", String.valueOf((char) 0x00A0));
+        input = CoreUtilities.replace(input, "&sp", CoreUtilities.NBSP);
         input = CoreUtilities.replace(input, "&amp", "&");
         return input;
     }

diff --git a/src/main/java/com/denizenscript/denizencore/utilities/CoreUtilities.java b/src/main/java/com/denizenscript/denizencore/utilities/CoreUtilities.java
@@ -22,6 +22,14 @@
 
 public class CoreUtilities {
 
+    public static final char NBSP_Char = (char) 0x00A0;
+
+    public static final String NBSP = String.valueOf(NBSP_Char);
+
+    public static String clearNBSPs(String input) {
+        return input.replace(NBSP_Char, ' ');
+    }
+
     public static TagContext noDebugContext;
     public static TagContext basicContext;