Fix command parsing in tellraw functions in 1.21.5+

* Switches to the Gson library for JSON serialization
* Improves exception handling, fixing core errors
* Uses /execute instead of sudo() for ptellraw

Author: PseudoKnight

src/main/java/com/laytonsmith/core/functions/Echoes.java

@@ -1,5 +1,8 @@
 package com.laytonsmith.core.functions;
 
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import com.google.gson.JsonIOException;
 import com.laytonsmith.PureUtilities.Common.StreamUtils;
 import com.laytonsmith.PureUtilities.Common.StringUtils;
 import com.laytonsmith.PureUtilities.TermColors;
@@ -27,6 +30,7 @@
 import com.laytonsmith.core.environments.GlobalEnv;
 import com.laytonsmith.core.exceptions.CRE.CRECastException;
 import com.laytonsmith.core.exceptions.CRE.CREFormatException;
+import com.laytonsmith.core.exceptions.CRE.CREIOException;
 import com.laytonsmith.core.exceptions.CRE.CREInsufficientArgumentsException;
 import com.laytonsmith.core.exceptions.CRE.CRELengthException;
 import com.laytonsmith.core.exceptions.CRE.CREPlayerOfflineException;
@@ -183,7 +187,7 @@ public static class tellraw extends AbstractFunction {
 
 		@Override
 		public Class<? extends CREThrowable>[] thrown() {
-			return new Class[]{CRECastException.class};
+			return new Class[]{CRECastException.class, CREFormatException.class, CREIOException.class};
 		}
 
 		@Override
@@ -200,13 +204,24 @@ public Boolean runAsync() {
 		public Mixed exec(Target t, Environment environment, Mixed... args) throws ConfigRuntimeException {
 			String selector = "@a";
 			String json;
-			if(args.length == 1) {
-				json = new DataTransformations.json_encode().exec(t, environment, args[0]).val();
-			} else {
-				selector = ArgumentValidation.getString(args[0], t);
-				json = new DataTransformations.json_encode().exec(t, environment, args[1]).val();
+			try {
+				Gson gson = new GsonBuilder().disableHtmlEscaping().create();
+				if(args.length == 1) {
+					json = gson.toJson(Construct.GetPOJO(args[0]));
+				} else {
+					selector = ArgumentValidation.getString(args[0], t);
+					json = gson.toJson(Construct.GetPOJO(args[1]));
+				}
+			} catch(ClassCastException ex) {
+				throw new CRECastException(ex.getMessage(), t);
+			} catch(JsonIOException ex) {
+				throw new CREIOException(ex.getMessage(), t);
+			}
+			try {
+				Static.getServer().runasConsole("minecraft:tellraw " + selector + " " + json);
+			} catch(Exception ex) {
+				throw new CREFormatException(ex.getMessage(), t, ex.getCause());
 			}
-			Static.getServer().runasConsole("minecraft:tellraw " + selector + " " + json);
 			return CVoid.VOID;
 		}
 
@@ -226,11 +241,12 @@ public String docs() {
 					+ " this simply passes the input to the command. The raw is passed in as an array and json encoded."
 					+ " No validation is done on the input, so the command may fail."
 					+ " Do not use double quotes (smart string) when providing the selector."
-					+ " If not provided, the selector defaults to @a. See {{function|ptellraw}} if you need player"
-					+ " context. ---- The specification of the array may change from version to version of Minecraft,"
-					+ " but is documented here https://minecraft.gamepedia.com/Commands#Raw_JSON_text."
-					+ " This function is simply written in terms of json_encode and runas, and is otherwise equivalent"
-					+ " to runas('~console', '/minecraft:tellraw ' . @selector . ' ' . json_encode(@raw))";
+					+ " If not provided, the selector defaults to @a. See {{function|ptellraw}} if you need the @s"
+					+ " selector with player context. ---- The specification of the array may change from version to"
+					+ " version of Minecraft, but is documented here: https://minecraft.wiki/w/Text_component_format."
+					+ " This function is roughly equivalent to"
+					+ " runas('~console', '/tellraw '.@selector.' '.json_encode(@raw))"
+					+ " but uses the Gson serializer instead.";
 		}
 
 		@Override

src/main/java/com/laytonsmith/core/functions/PlayerManagement.java

@@ -1,5 +1,8 @@
 package com.laytonsmith.core.functions;
 
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import com.google.gson.JsonIOException;
 import com.laytonsmith.PureUtilities.Common.StringUtils;
 import com.laytonsmith.PureUtilities.Vector3D;
 import com.laytonsmith.PureUtilities.Version;
@@ -63,6 +66,7 @@
 import com.laytonsmith.core.exceptions.CRE.CREBadEntityException;
 import com.laytonsmith.core.exceptions.CRE.CRECastException;
 import com.laytonsmith.core.exceptions.CRE.CREFormatException;
+import com.laytonsmith.core.exceptions.CRE.CREIOException;
 import com.laytonsmith.core.exceptions.CRE.CREIllegalArgumentException;
 import com.laytonsmith.core.exceptions.CRE.CREInsufficientArgumentsException;
 import com.laytonsmith.core.exceptions.CRE.CREInvalidWorldException;
@@ -6187,7 +6191,8 @@ public static class ptellraw extends AbstractFunction {
 
 		@Override
 		public Class<? extends CREThrowable>[] thrown() {
-			return new Class[]{CRECastException.class};
+			return new Class[]{CRECastException.class, CREFormatException.class, CREIOException.class,
+					CREPlayerOfflineException.class};
 		}
 
 		@Override
@@ -6202,15 +6207,31 @@ public Boolean runAsync() {
 
 		@Override
 		public Mixed exec(Target t, Environment environment, Mixed... args) throws ConfigRuntimeException {
+			MCPlayer p = environment.getEnv(CommandHelperEnvironment.class).GetPlayer();
+			if(p == null) {
+				throw new CREPlayerOfflineException("ptellraw() requires player context. Consider tellraw().", t);
+			}
 			String selector = "@s";
 			String json;
-			if(args.length == 1) {
-				json = new DataTransformations.json_encode().exec(t, environment, args[0]).val();
-			} else {
-				selector = ArgumentValidation.getString(args[0], t);
-				json = new DataTransformations.json_encode().exec(t, environment, args[1]).val();
+			try {
+				Gson gson = new GsonBuilder().disableHtmlEscaping().create();
+				if(args.length == 1) {
+					json = gson.toJson(Construct.GetPOJO(args[0]));
+				} else {
+					selector = ArgumentValidation.getString(args[0], t);
+					json = gson.toJson(Construct.GetPOJO(args[1]));
+				}
+			} catch(ClassCastException ex) {
+				throw new CRECastException(ex.getMessage(), t);
+			} catch(JsonIOException ex) {
+				throw new CREIOException(ex.getMessage(), t);
+			}
+			try {
+				Static.getServer().runasConsole("minecraft:execute as " + p.getName() + " at @s"
+						+ " run minecraft:tellraw " + selector + " " + json);
+			} catch(Exception ex) {
+				throw new CREFormatException(ex.getMessage(), t, ex.getCause());
 			}
-			new Meta.sudo().exec(t, environment, new CString("/minecraft:tellraw " + selector + " " + json, t));
 			return CVoid.VOID;
 		}
 
@@ -6230,11 +6251,12 @@ public String docs() {
 					+ " this simply passes the input to the command. The raw is passed in as a normal"
 					+ " (possibly associative) array, and json encoded. No validation is done on the input,"
 					+ " so the command may fail. If not provided, the selector defaults to @s. Do not use double quotes"
-					+ " (smart string) when providing the selector. See {{function|tellraw}} if you don't need player"
-					+ " context. ---- The specification of the array may change from version to version of Minecraft,"
-					+ " but is documented here https://minecraft.gamepedia.com/Commands#Raw_JSON_text."
-					+ " This function is simply written in terms of json_encode and sudo, and is otherwise equivalent"
-					+ " to sudo('/minecraft:tellraw ' . @selector . ' ' . json_encode(@raw))";
+					+ " (smart string) when providing the selector. See {{function|tellraw}} if you don't need the @s"
+					+ " selector with player context. ---- The specification of the array may change from version to"
+					+ " version of Minecraft, but is documented here: https://minecraft.wiki/w/Text_component_format."
+					+ " This function is roughly equivalent to"
+					+ " runas('~console', '/execute as '.player().' at @s tellraw '.@selector.' '.json_encode(@raw))"
+					+ " but uses the Gson serializer instead.";
 		}
 
 		@Override
@@ -6251,8 +6273,7 @@ public ExampleScript[] examples() throws ConfigCompileException {
 				new ExampleScript("Advanced usage with embedded selectors.",
 						"ptellraw('@a', array(\n"
 								+ "\tarray('selector': '@s'), // prints current player\n"
-								+ "\tarray('text': ': Hello '),\n"
-								+ "\tarray('selector': '@p') // prints receiving player\n"
+								+ "\tarray('text': ': Hello World!')\n"
 								+ "));",
 						"<<Would output a message from the current player to all players.>>"),
 				new ExampleScript("Complex object",