Merge branch 'master' into genericsTake2

Author: LadyCailin

deprecation.txt

@@ -1,5 +1,6 @@
 package com.laytonsmith.abstraction;
 
+import com.laytonsmith.core.environments.Environment;
 import java.util.List;
 
 public interface MCCommand extends AbstractionObject {
@@ -52,7 +53,7 @@ public interface MCCommand extends AbstractionObject {
 
 	List<String> tabComplete(MCCommandSender sender, String alias, String[] args);
 
-	List<String> handleTabComplete(MCCommandSender sender, String alias, String[] args);
+	List<String> handleTabComplete(MCCommandSender sender, String alias, String[] args, Environment env);
 
 	boolean handleCustomCommand(MCCommandSender sender, String label, String[] args);
 }

src/main/java/com/laytonsmith/abstraction/MCCommand.java

@@ -211,11 +211,11 @@ public String toString() {
 	}
 
 	@Override
-	public List<String> handleTabComplete(MCCommandSender sender, String alias, String[] args) {
+	public List<String> handleTabComplete(MCCommandSender sender, String alias, String[] args, Environment env) {
 		if(Commands.onTabComplete.containsKey(cmd.getName().toLowerCase())) {
 			Target t = Target.UNKNOWN;
 			Callable closure = Commands.onTabComplete.get(cmd.getName().toLowerCase());
-			Environment env = closure.getEnv();
+			env = closure.getEnv();
 			CArray cargs = new CArray(t, GenericParameters.emptyBuilder(CArray.TYPE)
 					.addNativeParameter(CString.TYPE, null).buildNative(), env);
 			for(String arg : args) {
@@ -270,7 +270,7 @@ public boolean handleCustomCommand(MCCommandSender sender, String label, String[
 				Mixed fret = closure.executeCallable(null, t, new CString(label, t), new CString(sender.getName(), t), cargs,
 						new CArray(t, null, env) // reserved for an obgen style command array
 				);
-				if(fret.isInstanceOf(CBoolean.TYPE, null, env)) {
+				if(fret instanceof CBoolean) {
 					return ((CBoolean) fret).getBoolean();
 				}
 			} catch (ConfigRuntimeException cre) {

src/main/java/com/laytonsmith/abstraction/bukkit/BukkitMCCommand.java

@@ -9,6 +9,7 @@
 import com.laytonsmith.core.constructs.CInt;
 import com.laytonsmith.core.constructs.CString;
 import com.laytonsmith.core.constructs.Target;
+import com.laytonsmith.core.environments.Environment;
 import com.laytonsmith.core.exceptions.CRE.CRECastException;
 import com.laytonsmith.core.exceptions.CRE.CREFormatException;
 import com.laytonsmith.core.environments.Environment;
@@ -124,11 +125,18 @@ <T extends Mixed, Z> MCTagType(BiFunction<T, Environment, Z> conversion, BiFunct
 		this.construction = construction;
 	}
 
+	/** @deprecated Use {@link #convert(MCTagContainer, Mixed, Environment)} instead. */
+	@Deprecated
+	public Object convert(MCTagContainer container, Mixed value) {
+		return convert(container, value, null);
+	}
+
 	/**
 	 * Returns a Java object from a MethodScript construct.
 	 * Throws a ConfigRuntimeException if the value is not valid for this tag type.
 	 * @param container the tag container context
 	 * @param value MethodScript construct
+	 * @param env
 	 * @return a Java object
 	 */
 	public Object convert(MCTagContainer container, Mixed value, Environment env) {

src/main/java/com/laytonsmith/abstraction/enums/MCTagType.java

@@ -536,7 +536,8 @@ public void registerEventsDynamic(Listener listener) {
 	public List<String> onTabComplete(CommandSender sender, Command command, String alias, String[] args) {
 		MCCommandSender mcsender = BukkitConvertor.BukkitGetCorrectSender(sender);
 		MCCommand cmd = new BukkitMCCommand(command);
-		return cmd.handleTabComplete(mcsender, alias, args);
+		// TODO: Figure out how to get an env here
+		return cmd.handleTabComplete(mcsender, alias, args, null);
 	}
 
 	/**

src/main/java/com/laytonsmith/commandhelper/CommandHelperPlugin.java

@@ -315,7 +315,7 @@ public static long getInt(Mixed c, Target t, Environment env) {
 		}
 		if(c instanceof CInt || c.isInstanceOf(CInt.TYPE, null, env)) {
 			i = getObject(c, t, CInt.class).getInt();
-		} else if(c.isInstanceOf(CBoolean.TYPE, null, env)) {
+		} else if(c instanceof CBoolean) {
 			if(getObject(c, t, CBoolean.class).getBoolean()) {
 				i = 1;
 			} else {

src/main/java/com/laytonsmith/core/ArgumentValidation.java

@@ -333,6 +333,9 @@ public MCItemStack item(Mixed i, Target t, Environment env) {
 		return item(i, t, false, env);
 	}
 
+	/**
+	 * @deprecated Use {@link #item(Mixed, Target, boolean, Environment)} instead.
+	 */
 	@AggressiveDeprecation(deprecationDate = "2022-04-06", removalVersion = "3.3.7", deprecationVersion = "3.3.6")
 	@Deprecated
 	public MCItemStack item(Mixed i, Target t, boolean legacy) {
@@ -2170,7 +2173,7 @@ public Vector3D vector(Vector3D v, Mixed c, Target t) {
 	 */
 	public Vector3D vector(Vector3D v, Mixed c, Target t, Environment env) {
 		if(c.isInstanceOf(CArray.TYPE, null, env)) {
-			CArray va  = (CArray) c;
+			CArray va = (CArray) c;
 			double x = v.X();
 			double y = v.Y();
 			double z = v.Z();
@@ -2427,6 +2430,9 @@ public CArray potions(List<MCLivingEntity.MCEffect> effectList, Target t, Enviro
 		return ea;
 	}
 
+	/**
+	 * @deprecated Use {@link #potions(CArray, Target, Environment)} instead.
+	 */
 	@AggressiveDeprecation(deprecationDate = "2022-04-06", removalVersion = "3.3.7", deprecationVersion = "3.3.6")
 	@Deprecated
 	public List<MCLivingEntity.MCEffect> potions(CArray ea, Target t) {
@@ -2497,6 +2503,9 @@ public CArray potionData(MCPotionData mcpd, Target t, Environment env) {
 		return base;
 	}
 
+	/**
+	 * @deprecated Use {@link #potionData(CArray, Target, Environment)} instead.
+	 */
 	@AggressiveDeprecation(deprecationDate = "2022-04-06", removalVersion = "3.3.7", deprecationVersion = "3.3.6")
 	@Deprecated
 	public MCPotionData potionData(CArray pd, Target t) {
@@ -2523,7 +2532,7 @@ public MCPotionData potionData(CArray pd, Target t, Environment env) {
 		}
 		if(pd.containsKey("upgraded")) {
 			Mixed cupg = pd.get("upgraded", t, env);
-			if(cupg.isInstanceOf(CBoolean.TYPE, null, env)) {
+			if(cupg instanceof CBoolean) {
 				upgraded = ((CBoolean) cupg).getBoolean();
 			} else {
 				throw new CREFormatException(
@@ -2537,6 +2546,9 @@ public MCPotionData potionData(CArray pd, Target t, Environment env) {
 		}
 	}
 
+	/**
+	 * @deprecated Use {@link #legacyPotionData(CArray, Target, Environment)} instead.
+	 */
 	@AggressiveDeprecation(deprecationDate = "2022-04-06", removalVersion = "3.3.7", deprecationVersion = "3.3.6")
 	@Deprecated
 	public MCPotionType legacyPotionData(CArray potionArray, Target t) {
@@ -2558,13 +2570,13 @@ public MCPotionType legacyPotionData(CArray potionArray, Target t, Environment e
 		boolean upgraded = false;
 		if(potionArray.containsKey("extended")) {
 			Mixed cext = potionArray.get("extended", t, env);
-			if(cext.isInstanceOf(CBoolean.TYPE, null, env)) {
+			if(cext instanceof CBoolean) {
 				extended = ((CBoolean) cext).getBoolean();
 			}
 		}
 		if(potionArray.containsKey("upgraded")) {
 			Mixed cupg = potionArray.get("upgraded", t, env);
-			if(cupg.isInstanceOf(CBoolean.TYPE, null, env)) {
+			if(cupg instanceof CBoolean) {
 				upgraded = ((CBoolean) cupg).getBoolean();
 			}
 		}
@@ -3117,6 +3129,9 @@ private Construct blockState(String value) {
 		return new CString(value, Target.UNKNOWN);
 	}
 
+	/**
+	 * @deprecated Use {@link #particleData(MCParticle, MCLocation, CArray, Target, Environment)} instead.
+	 */
 	@AggressiveDeprecation(deprecationDate = "2022-04-06", removalVersion = "3.3.7", deprecationVersion = "3.3.6")
 	@Deprecated
 	public Object particleData(MCParticle particleType, MCLocation l, CArray pa, Target t) {
@@ -3348,4 +3363,4 @@ public CArray regMatchValue(MatchResult matchResult, Target t) {
 
 		return ret;
 	}
-}
+}

src/main/java/com/laytonsmith/core/ObjectGenerator.java

@@ -425,7 +425,7 @@ public Mixed eval(ParseTree c, final Environment env) throws CancelCommandExcept
 					if(f.shouldProfile()) {
 						Profiler profiler = env.getEnv(StaticRuntimeEnv.class).GetProfiler();
 						if(profiler.isLoggable(f.profileAt())) {
-							p = profiler.start(f.profileMessage(env, args), f.profileAt());
+							p = profiler.start(Function.ExecuteProfileMessage(f, env, args), f.profileAt());
 						}
 					}
 					Mixed ret;

src/main/java/com/laytonsmith/core/Script.java

@@ -44,6 +44,7 @@
 import com.laytonsmith.core.constructs.CString;
 import com.laytonsmith.core.constructs.CVoid;
 import com.laytonsmith.core.constructs.Construct;
+import com.laytonsmith.core.constructs.InstanceofUtil;
 import com.laytonsmith.core.constructs.NativeTypeList;
 import com.laytonsmith.core.constructs.Target;
 import com.laytonsmith.core.constructs.Variable;
@@ -844,6 +845,9 @@ public static UUID GetUUID(Mixed subject, Target t) {
 		return GetUUID(subject.val(), t);
 	}
 
+	/**
+	 * @deprecated Use {@link #GetUser(Mixed, Target, Environment)} instead.
+	 */
 	@Deprecated
 	@AggressiveDeprecation(deprecationDate = "2022-04-06", removalVersion = "3.3.7", deprecationVersion = "3.3.6")
 	public static MCOfflinePlayer GetUser(Mixed search, Target t) {
@@ -854,6 +858,9 @@ public static MCOfflinePlayer GetUser(Mixed search, Target t, Environment env) {
 		return GetUser(search.val(), t, env);
 	}
 
+	/**
+	 * @deprecated Use {@link #GetUser(String, Target, Environment)} instead.
+	 */
 	@Deprecated
 	@AggressiveDeprecation(deprecationDate = "2022-04-06", removalVersion = "3.3.7", deprecationVersion = "3.3.6")
 	public static MCOfflinePlayer GetUser(String search, Target t) {
@@ -867,6 +874,7 @@ public static MCOfflinePlayer GetUser(String search, Target t) {
 	 *
 	 * @param search The text to be searched, can be between 1 and 16 characters, or 32 or 36 characters
 	 * @param t
+	 * @param env
 	 * @return
 	 */
 	public static MCOfflinePlayer GetUser(String search, Target t, Environment env) {
@@ -904,6 +912,9 @@ public static MCOfflinePlayer GetUser(String search, Target t, Environment env)
 	 * @deprecated This method doesn't work with user classes, and will cause errors once those are introduced. This
 	 * will be removed once those are added, instead, use the version with the environment.
 	 */
+	/**
+	 * @deprecated Use {@link #GetPlayer(String, Target, Environment)} instead.
+	 */
 	@AggressiveDeprecation(deprecationDate = "2022-04-06", removalVersion = "3.3.7", deprecationVersion = "3.3.6")
 	@Deprecated
 	public static MCPlayer GetPlayer(String player, Target t) throws ConfigRuntimeException {
@@ -945,9 +956,9 @@ public static MCPlayer GetPlayer(Mixed player, Target t, Environment env) throws
 	}
 
 	/**
-	 * Returns the player specified by name.Injected players also are returned in this list. If provided a string
+	 * Returns the player specified by name or UUID. Injected players are also returned in this list. If provided a string
 	 * between 1 and 16 characters, the lookup will be name-based. If provided a string that is 32 or 36 characters, the
-	 * lookup will be uuid-based.
+	 * lookup will be UUID-based. Throws CREPlayerOfflineException if the player is not online.
 	 *
 	 * @param player
 	 * @param t
@@ -956,8 +967,6 @@ public static MCPlayer GetPlayer(Mixed player, Target t, Environment env) throws
 	 * @throws ConfigRuntimeException
 	 */
 	public static MCPlayer GetPlayer(String player, Target t, Environment env) throws ConfigRuntimeException {
-		MCCommandSender m;
-
 		if(player == null) {
 			throw new CREPlayerOfflineException("No player was specified!", t);
 		}
@@ -990,6 +999,8 @@ public static MCPlayer GetPlayer(String player, Target t, Environment env) throw
 		return p;
 	}
 
+
+
 	/**
 	 * Returns the specified command sender by name. Players are supported, as is the special ~console user. The special
 	 * ~console user will always return a user. Throws CREPlayerOfflineException if the player is not online or injected.
@@ -1727,6 +1738,14 @@ public String getString(CResource res) {
 		}
 	}
 
+	/**
+	 * @deprecated Use {@link #getJavaObject(Mixed, Environment)} instead.
+	 */
+	@Deprecated
+	public static Object getJavaObject(Mixed construct) {
+		return getJavaObject(construct, null);
+	}
+
 	/**
 	 * Given a MethodScript object, returns a java object.
 	 *
@@ -1745,7 +1764,7 @@ public static Object getJavaObject(Mixed construct, Environment env) {
 			return ((CInt) construct).getInt();
 		} else if(construct instanceof CDouble) {
 			return ((CDouble) construct).getDouble();
-		} else if(construct instanceof CString) {
+		} else if(InstanceofUtil.isInstanceof(construct, CString.class, env)) {
 			return construct.val();
 		} else if(construct instanceof CByteArray) {
 			return ((CByteArray) construct).asByteArrayCopy();
@@ -1815,7 +1834,7 @@ public static Object getJavaObject(Mixed construct, Environment env) {
 				}
 			}
 		} else {
-			return construct;
+			throw new ClassCastException(construct.getClass().getName() + " cannot be cast to a POJO");
 		}
 	}
 

src/main/java/com/laytonsmith/core/Static.java

@@ -82,12 +82,12 @@ public static String optimize(String script, Environment env,
 		StringBuilder b = new StringBuilder();
 		//The root always contains null.
 		for(ParseTree child : tree.getChildren()) {
-			b.append(optimize0(child));
+			b.append(optimize0(child, env));
 		}
 		return b.toString();
 	}
 
-	private static String optimize0(ParseTree node) {
+	private static String optimize0(ParseTree node, Environment env) {
 		if(node.getData() instanceof CFunction cFunction) {
 			StringBuilder b = new StringBuilder();
 			boolean first = true;
@@ -101,7 +101,7 @@ private static String optimize0(ParseTree node) {
 					b.append(",");
 				}
 				first = false;
-				b.append(optimize0(child));
+				b.append(optimize0(child, env));
 			}
 			b.append(")");
 			return b.toString();
@@ -129,7 +129,7 @@ private static String optimize0(ParseTree node) {
 					b.append(",");
 				}
 				first = false;
-				b.append(optimize0(new ParseTree(n.get(key, Target.UNKNOWN), node.getFileOptions(), true)));
+				b.append(optimize0(new ParseTree(n.get(key, Target.UNKNOWN), node.getFileOptions(), true), env));
 			}
 			b.append(")");
 			return b.toString();