Generics take2

src/main/java/com/laytonsmith/PureUtilities/Common/Annotations/AnnotationChecks.java

@@ -39,8 +39,11 @@ public static void checkForTypeInTypeofClasses() throws Exception {
 					errors.add("TYPE is null? " + clazz.getClassName());
 					continue;
 				}
-				if(!type.val().equals(clazz.getAnnotation(typeof.class).getValue("value"))) {
-					errors.add(clazz.getClassName() + "'s TYPE value is different than the typeof annotation on it");
+				String classType = type.val().replaceAll("<.*>", "");
+				if(!classType.equals(clazz.getAnnotation(typeof.class).getValue("value"))) {
+					errors.add(clazz.getClassName() + "'s TYPE value is different than the typeof annotation on it"
+							+ " (expected " + clazz.getAnnotation(typeof.class).getValue("value") + " but"
+							+ " got " + type.val() + ")");
 				}
 			} catch (ReflectionUtils.ReflectionException ex) {
 				errors.add(clazz.getClassName() + " needs to add the following:\n\t@SuppressWarnings(\"FieldNameHidesFieldInSuperclass\")\n"

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

@@ -1,6 +1,7 @@
 package com.laytonsmith.abstraction;
 
 import com.laytonsmith.PureUtilities.DaemonManager;
+import com.laytonsmith.core.environments.Environment;
 import com.laytonsmith.core.events.BindableEvent;
 import com.laytonsmith.core.events.Driver;
 import com.laytonsmith.core.events.EventUtils;
@@ -24,15 +25,15 @@ public void addShutdownHook(Runnable r) {
 	}
 
 	@Override
-	public void runShutdownHooks() {
+	public void runShutdownHooks(Environment env) {
 		// Fire off the shutdown event, before we shut down all the internal hooks
 		EventUtils.TriggerListener(Driver.SHUTDOWN, "shutdown", new BindableEvent() {
 
 			@Override
 			public Object _GetObject() {
 				return new Object();
 			}
-		});
+		}, env);
 		Iterator<Runnable> iter = shutdownHooks.iterator();
 		while(iter.hasNext()) {
 			iter.next().run();

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

@@ -140,7 +140,7 @@ public interface Convertor {
 	 * Runs all the registered shutdown hooks. This should only be called by the shutdown mechanism. After running, each
 	 * Runnable will be removed from the queue.
 	 */
-	void runShutdownHooks();
+	void runShutdownHooks(Environment env);
 
 	/**
 	 * Runs some task on the "main" thread, possibly now, possibly in the future, and possibly even on this thread.

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

@@ -8,27 +8,31 @@
 import com.laytonsmith.abstraction.MCPlugin;
 import com.laytonsmith.abstraction.bukkit.events.BukkitMiscEvents.BukkitMCCommandTabCompleteEvent;
 import com.laytonsmith.commandhelper.CommandHelperPlugin;
+import com.laytonsmith.core.Static;
 import com.laytonsmith.core.constructs.CArray;
 import com.laytonsmith.core.constructs.CBoolean;
 import com.laytonsmith.core.constructs.CClosure;
 import com.laytonsmith.core.constructs.CString;
 import com.laytonsmith.core.constructs.Target;
+import com.laytonsmith.core.constructs.generics.GenericParameters;
 import com.laytonsmith.core.environments.CommandHelperEnvironment;
+import com.laytonsmith.core.environments.Environment;
 import com.laytonsmith.core.events.Driver;
 import com.laytonsmith.core.events.EventUtils;
 import com.laytonsmith.core.exceptions.CRE.CREPluginInternalException;
 import com.laytonsmith.core.exceptions.ConfigRuntimeException;
 import com.laytonsmith.core.functions.Commands;
 import com.laytonsmith.core.natives.interfaces.Mixed;
-import java.util.ArrayList;
-import java.util.List;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandException;
 import org.bukkit.command.CommandSender;
 import org.bukkit.command.PluginCommand;
 import org.bukkit.command.PluginIdentifiableCommand;
 import org.bukkit.plugin.Plugin;
 
+import java.util.ArrayList;
+import java.util.List;
+
 public class BukkitMCCommand implements MCCommand {
 
 	Command cmd;
@@ -209,23 +213,30 @@ public String toString() {
 
 	@Override
 	public List<String> handleTabComplete(MCCommandSender sender, String alias, String[] args) {
+		Environment env;
+		try {
+			env = Static.GenerateStandaloneEnvironment();
+		} catch (Exception ex) {
+			throw new RuntimeException(ex);
+		}
 		if(Commands.onTabComplete.containsKey(cmd.getName().toLowerCase())) {
 			Target t = Target.UNKNOWN;
-			CArray cargs = new CArray(t);
+			CArray cargs = new CArray(t, GenericParameters.start(CArray.TYPE)
+					.addParameter(CString.TYPE, null).build(), env);
 			for(String arg : args) {
-				cargs.push(new CString(arg, t), t);
+				cargs.push(new CString(arg, t), t, env);
 			}
 			CClosure closure = Commands.onTabComplete.get(cmd.getName().toLowerCase());
 			closure.getEnv().getEnv(CommandHelperEnvironment.class).SetCommandSender(sender);
 			try {
 				Mixed fret = closure.executeCallable(null, t, new CString(alias, t), new CString(sender.getName(), t), cargs,
-						new CArray(t) // reserved for an obgen style command array
+						new CArray(t, null, env) // reserved for an obgen style command array
 				);
-				if(fret.isInstanceOf(CArray.TYPE)) {
+				if(fret.isInstanceOf(CArray.TYPE, null, env)) {
 					List<String> ret = new ArrayList<>();
 					if(((CArray) fret).inAssociativeMode()) {
 						for(Mixed key : ((CArray) fret).keySet()) {
-							ret.add(((CArray) fret).get(key, Target.UNKNOWN).val());
+							ret.add(((CArray) fret).get(key, Target.UNKNOWN, env).val());
 						}
 					} else {
 						for(Mixed value : ((CArray) fret).asList()) {
@@ -240,17 +251,24 @@ public List<String> handleTabComplete(MCCommandSender sender, String alias, Stri
 			}
 		}
 		BukkitMCCommandTabCompleteEvent event = new BukkitMCCommandTabCompleteEvent(sender, cmd, alias, args);
-		EventUtils.TriggerListener(Driver.TAB_COMPLETE, "tab_complete_command", event);
+		EventUtils.TriggerListener(Driver.TAB_COMPLETE, "tab_complete_command", event, CommandHelperPlugin.getCore().getLastLoadedEnv());
 		return event.getCompletions();
 	}
 
 	@Override
 	public boolean handleCustomCommand(MCCommandSender sender, String label, String[] args) {
+		Environment env;
+		try {
+			env = Static.GenerateStandaloneEnvironment();
+		} catch (Exception ex) {
+			throw new RuntimeException(ex);
+		}
 		if(Commands.onCommand.containsKey(cmd.getName().toLowerCase())) {
 			Target t = Target.UNKNOWN;
-			CArray cargs = new CArray(t);
+			CArray cargs = new CArray(t, GenericParameters.start(CArray.TYPE)
+					.addParameter(CString.TYPE, null).build(), env);
 			for(String arg : args) {
-				cargs.push(new CString(arg, t), t);
+				cargs.push(new CString(arg, t), t, env);
 			}
 
 			CClosure closure = Commands.onCommand.get(cmd.getName().toLowerCase());
@@ -260,9 +278,9 @@ public boolean handleCustomCommand(MCCommandSender sender, String label, String[
 
 			try {
 				Mixed fret = closure.executeCallable(null, t, new CString(label, t), new CString(sender.getName(), t), cargs,
-						new CArray(t) // reserved for an obgen style command array
+						new CArray(t, null, env) // reserved for an obgen style command array
 				);
-				if(fret.isInstanceOf(CBoolean.TYPE)) {
+				if(fret.isInstanceOf(CBoolean.TYPE, null, env)) {
 					return ((CBoolean) fret).getBoolean();
 				}
 			} catch (ConfigRuntimeException cre) {

src/main/java/com/laytonsmith/abstraction/bukkit/events/BukkitBlockEvents.java

@@ -42,6 +42,8 @@
 import com.laytonsmith.core.constructs.CArray;
 import com.laytonsmith.core.constructs.CString;
 import com.laytonsmith.core.constructs.Target;
+import com.laytonsmith.core.constructs.generics.GenericParameters;
+import com.laytonsmith.core.environments.Environment;
 import com.laytonsmith.core.exceptions.CRE.CREIllegalArgumentException;
 import org.bukkit.block.Block;
 import org.bukkit.event.block.BlockBreakEvent;
@@ -367,7 +369,7 @@ public BukkitMCSignChangeEvent(SignChangeEvent e) {
 		public static BukkitMCSignChangeEvent _instantiate(MCBlock sign, MCPlayer player, CArray signtext) {
 			String[] text = new String[4];
 			for(int i = 0; i < signtext.size(); i++) {
-				text[i] = signtext.get(i, Target.UNKNOWN).toString();
+				text[i] = signtext.get(i, Target.UNKNOWN, null).toString();
 			}
 			return new BukkitMCSignChangeEvent(new SignChangeEvent(((BukkitMCBlock) sign).__Block(), ((BukkitMCPlayer) player)._Player(),
 					text));
@@ -384,11 +386,12 @@ public CString getLine(int index) {
 		}
 
 		@Override
-		public CArray getLines() {
-			CArray retn = new CArray(Target.UNKNOWN);
+		public CArray getLines(Environment env) {
+			CArray retn = new CArray(Target.UNKNOWN, GenericParameters.start(CArray.TYPE)
+					.addParameter(CString.TYPE, null).build(), env);
 
 			for(int i = 0; i < 4; i++) {
-				retn.push(new CString(pie.getLine(i), Target.UNKNOWN), Target.UNKNOWN);
+				retn.push(new CString(pie.getLine(i), Target.UNKNOWN), Target.UNKNOWN, env);
 			}
 
 			return retn;

src/main/java/com/laytonsmith/abstraction/bukkit/events/drivers/BukkitBlockListener.java

@@ -2,9 +2,9 @@
 
 import com.laytonsmith.abstraction.MCItemStack;
 import com.laytonsmith.abstraction.bukkit.events.BukkitBlockEvents;
+import com.laytonsmith.commandhelper.CommandHelperPlugin;
 import com.laytonsmith.core.events.Driver;
 import com.laytonsmith.core.events.EventUtils;
-
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
 import org.bukkit.Material;
@@ -19,6 +19,7 @@
 import org.bukkit.event.block.BlockDispenseEvent;
 import org.bukkit.event.block.BlockExplodeEvent;
 import org.bukkit.event.block.BlockFadeEvent;
+import org.bukkit.event.block.BlockFormEvent;
 import org.bukkit.event.block.BlockFromToEvent;
 import org.bukkit.event.block.BlockGrowEvent;
 import org.bukkit.event.block.BlockIgniteEvent;
@@ -27,7 +28,6 @@
 import org.bukkit.event.block.BlockPlaceEvent;
 import org.bukkit.event.block.NotePlayEvent;
 import org.bukkit.event.block.SignChangeEvent;
-import org.bukkit.event.block.BlockFormEvent;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.plugin.PluginManager;
 
@@ -36,25 +36,25 @@ public class BukkitBlockListener implements Listener {
 	@EventHandler(priority = EventPriority.LOWEST)
 	public void onPistonExtend(final BlockPistonExtendEvent e) {
 		BukkitBlockEvents.BukkitMCBlockPistonExtendEvent mce = new BukkitBlockEvents.BukkitMCBlockPistonExtendEvent(e);
-		EventUtils.TriggerListener(Driver.PISTON_EXTEND, "piston_extend", mce);
+		EventUtils.TriggerListener(Driver.PISTON_EXTEND, "piston_extend", mce, CommandHelperPlugin.getCore().getLastLoadedEnv());
 	}
 
 	@EventHandler(priority = EventPriority.LOWEST)
 	public void onPistonRetract(final BlockPistonRetractEvent e) {
 		BukkitBlockEvents.BukkitMCBlockPistonRetractEvent mce = new BukkitBlockEvents.BukkitMCBlockPistonRetractEvent(e);
-		EventUtils.TriggerListener(Driver.PISTON_RETRACT, "piston_retract", mce);
+		EventUtils.TriggerListener(Driver.PISTON_RETRACT, "piston_retract", mce, CommandHelperPlugin.getCore().getLastLoadedEnv());
 	}
 
 	@EventHandler(priority = EventPriority.LOWEST)
 	public void onSignChange(SignChangeEvent e) {
 		BukkitBlockEvents.BukkitMCSignChangeEvent mce = new BukkitBlockEvents.BukkitMCSignChangeEvent(e);
-		EventUtils.TriggerListener(Driver.SIGN_CHANGED, "sign_changed", mce);
+		EventUtils.TriggerListener(Driver.SIGN_CHANGED, "sign_changed", mce, CommandHelperPlugin.getCore().getLastLoadedEnv());
 	}
 
 	@EventHandler(priority = EventPriority.LOWEST)
 	public void onBlockPlace(BlockPlaceEvent e) {
 		BukkitBlockEvents.BukkitMCBlockPlaceEvent bpe = new BukkitBlockEvents.BukkitMCBlockPlaceEvent(e);
-		EventUtils.TriggerListener(Driver.BLOCK_PLACE, "block_place", bpe);
+		EventUtils.TriggerListener(Driver.BLOCK_PLACE, "block_place", bpe, CommandHelperPlugin.getCore().getLastLoadedEnv());
 	}
 
 	private static boolean ignorebreak = false;
@@ -65,7 +65,7 @@ public void onBlockBreak(BlockBreakEvent e) {
 			return;
 		}
 		BukkitBlockEvents.BukkitMCBlockBreakEvent bbe = new BukkitBlockEvents.BukkitMCBlockBreakEvent(e);
-		EventUtils.TriggerListener(Driver.BLOCK_BREAK, "block_break", bbe);
+		EventUtils.TriggerListener(Driver.BLOCK_BREAK, "block_break", bbe, CommandHelperPlugin.getCore().getLastLoadedEnv());
 		if(bbe.isModified() && !e.isCancelled()) {
 			if(bbe.getDrops().isEmpty()) {
 				e.setDropItems(false);
@@ -104,54 +104,54 @@ public void onBlockBreak(BlockBreakEvent e) {
 	@EventHandler(priority = EventPriority.LOWEST)
 	public void onBlockDispense(BlockDispenseEvent e) {
 		BukkitBlockEvents.BukkitMCBlockDispenseEvent bde = new BukkitBlockEvents.BukkitMCBlockDispenseEvent(e);
-		EventUtils.TriggerListener(Driver.BLOCK_DISPENSE, "block_dispense", bde);
+		EventUtils.TriggerListener(Driver.BLOCK_DISPENSE, "block_dispense", bde, CommandHelperPlugin.getCore().getLastLoadedEnv());
 	}
 
 	@EventHandler(priority = EventPriority.LOWEST)
 	public void onBlockBurn(BlockBurnEvent e) {
 		BukkitBlockEvents.BukkitMCBlockBurnEvent bbe = new BukkitBlockEvents.BukkitMCBlockBurnEvent(e);
-		EventUtils.TriggerListener(Driver.BLOCK_BURN, "block_burn", bbe);
+		EventUtils.TriggerListener(Driver.BLOCK_BURN, "block_burn", bbe, CommandHelperPlugin.getCore().getLastLoadedEnv());
 	}
 
 	@EventHandler(priority = EventPriority.LOWEST)
 	public void onBlockFromTo(BlockFromToEvent e) {
 		BukkitBlockEvents.BukkitMCBlockFromToEvent bbe = new BukkitBlockEvents.BukkitMCBlockFromToEvent(e);
-		EventUtils.TriggerListener(Driver.BLOCK_FROM_TO, "block_from_to", bbe);
+		EventUtils.TriggerListener(Driver.BLOCK_FROM_TO, "block_from_to", bbe, CommandHelperPlugin.getCore().getLastLoadedEnv());
 	}
 
 	@EventHandler(priority = EventPriority.LOWEST)
 	public void onBlockIgnite(BlockIgniteEvent e) {
 		BukkitBlockEvents.BukkitMCBlockIgniteEvent bie = new BukkitBlockEvents.BukkitMCBlockIgniteEvent(e);
-		EventUtils.TriggerListener(Driver.BLOCK_IGNITE, "block_ignite", bie);
+		EventUtils.TriggerListener(Driver.BLOCK_IGNITE, "block_ignite", bie, CommandHelperPlugin.getCore().getLastLoadedEnv());
 	}
 
 	@EventHandler(priority = EventPriority.LOWEST)
 	public void onBlockGrow(BlockGrowEvent e) {
 		BukkitBlockEvents.BukkitMCBlockGrowEvent bge = new BukkitBlockEvents.BukkitMCBlockGrowEvent(e);
-		EventUtils.TriggerListener(Driver.BLOCK_GROW, "block_grow", bge);
+		EventUtils.TriggerListener(Driver.BLOCK_GROW, "block_grow", bge, CommandHelperPlugin.getCore().getLastLoadedEnv());
 	}
 
 	@EventHandler(priority = EventPriority.LOWEST)
 	public void onNotePlay(NotePlayEvent e) {
 		BukkitBlockEvents.BukkitMCNotePlayEvent npe = new BukkitBlockEvents.BukkitMCNotePlayEvent(e);
-		EventUtils.TriggerListener(Driver.NOTE_PLAY, "note_play", npe);
+		EventUtils.TriggerListener(Driver.NOTE_PLAY, "note_play", npe, CommandHelperPlugin.getCore().getLastLoadedEnv());
 	}
 
 	@EventHandler(priority = EventPriority.LOWEST)
 	public void onBlockFade(BlockFadeEvent e) {
 		BukkitBlockEvents.BukkitMCBlockFadeEvent bfe = new BukkitBlockEvents.BukkitMCBlockFadeEvent(e);
-		EventUtils.TriggerListener(Driver.BLOCK_FADE, "block_fade", bfe);
+		EventUtils.TriggerListener(Driver.BLOCK_FADE, "block_fade", bfe, CommandHelperPlugin.getCore().getLastLoadedEnv());
 	}
 
 	@EventHandler(priority = EventPriority.LOWEST)
 	public void onBlockExplode(BlockExplodeEvent e) {
 		BukkitBlockEvents.BukkitMCBlockExplodeEvent bee = new BukkitBlockEvents.BukkitMCBlockExplodeEvent(e);
-		EventUtils.TriggerListener(Driver.BLOCK_EXPLODE, "block_explode", bee);
+		EventUtils.TriggerListener(Driver.BLOCK_EXPLODE, "block_explode", bee, CommandHelperPlugin.getCore().getLastLoadedEnv());
 	}
 
 	@EventHandler(priority = EventPriority.LOWEST)
 	public void onBlockForm(BlockFormEvent event) {
 		BukkitBlockEvents.BukkitBlockFormEventEvent form = new BukkitBlockEvents.BukkitBlockFormEventEvent(event);
-		EventUtils.TriggerListener(Driver.BLOCK_FORM, "block_form", form);
+		EventUtils.TriggerListener(Driver.BLOCK_FORM, "block_form", form, CommandHelperPlugin.getCore().getLastLoadedEnv());
 	}
 }