MTScript Drawing functions

src/main/java/net/rptools/lib/io/PackedFile.java

@@ -16,31 +16,13 @@
 
 import com.google.common.io.CharStreams;
 import com.thoughtworks.xstream.XStream;
-import java.io.BufferedInputStream;
-import java.io.BufferedOutputStream;
-import java.io.BufferedWriter;
-import java.io.ByteArrayInputStream;
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.LineNumberReader;
-import java.io.OutputStream;
-import java.io.OutputStreamWriter;
-import java.io.Reader;
-import java.io.StringReader;
+import com.thoughtworks.xstream.security.ExplicitTypePermission;
+import java.io.*;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
-import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
 import java.util.stream.Collectors;
 import java.util.zip.Deflater;
 import java.util.zip.ZipEntry;
@@ -55,6 +37,8 @@
 import net.rptools.maptool.model.Asset;
 import net.rptools.maptool.model.AssetManager;
 import net.rptools.maptool.model.GUID;
+import org.apache.batik.ext.awt.geom.ExtendedGeneralPath;
+import org.apache.batik.ext.awt.geom.Polygon2D;
 import org.apache.commons.io.IOUtils;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
@@ -551,6 +535,9 @@ public Object getFileObject(String path) throws IOException {
     try (r) {
       xstream
           .ignoreUnknownElements(); // Jamz: Should we use this? This will ignore new classes/fields
+      xstream.addPermission(
+          new ExplicitTypePermission(new Class[] {ExtendedGeneralPath.class, Polygon2D.class}));
+
       // added.
       var obj = xstream.fromXML(r);
       return obj;

src/main/java/net/rptools/maptool/client/MapToolExpressionParser.java

@@ -22,7 +22,7 @@
 import net.rptools.dicelib.expression.ExpressionParser;
 import net.rptools.maptool.client.functions.*;
 import net.rptools.maptool.client.functions.json.JSONMacroFunctions;
-import net.rptools.maptool.client.script.javascript.*;
+import net.rptools.maptool.client.script.javascript.JSMacro;
 import net.rptools.parser.Expression;
 import net.rptools.parser.Parser;
 import net.rptools.parser.ParserException;
@@ -95,6 +95,7 @@ public class MapToolExpressionParser extends ExpressionParser {
               DrawingGetterFunctions.getInstance(),
               DrawingSetterFunctions.getInstance(),
               DrawingMiscFunctions.getInstance(),
+              ShapeFunctions.getInstance(),
               ExportDataFunctions.getInstance(),
               RESTfulFunctions.getInstance(),
               HeroLabFunctions.getInstance(),