Allow scripts to be optionally interrupted during dispose()

Author: tomcashman

CHANGES

@@ -1,3 +1,6 @@
+[1.5.2]
+- Allow scripts to be optionally interrupted during dispose()
+
 [1.5.1]
 - Only allow currently executing scripts to finish during shutdown. Any other queued scripts will be skipped.
 - Add methods to cancel queued and running futures without sending skip event

core/src/main/java/org/mini2Dx/miniscript/core/DefaultThreadPoolProvider.java

@@ -63,7 +63,11 @@ public ScheduledFuture<?> schedule(Runnable command, long delay, TimeUnit unit)
 	}
 
 	@Override
-	public void shutdown() {
-		executorService.shutdown();
+	public void shutdown(boolean interruptThreads) {
+		if(interruptThreads) {
+			executorService.shutdownNow();
+		} else {
+			executorService.shutdown();
+		}
 	}
 }

core/src/main/java/org/mini2Dx/miniscript/core/GameScriptingEngine.java

@@ -213,13 +213,21 @@ public void run() {
 	 * Shuts down the thread pool and cleans up resources
 	 */
 	public void dispose() {
+		dispose(false);
+	}
+
+	/**
+	 * Shuts down the thread pool and cleans up resources
+	 * @param interruptScripts True if running scripts should be interrupted
+	 */
+	public void dispose(boolean interruptScripts) {
 		shuttingDown.set(true);
 
 		if(cleanupTask != null) {
 			cleanupTask.cancel(false);
 			cleanupTask = null;
 		}
-		threadPoolProvider.shutdown();
+		threadPoolProvider.shutdown(interruptScripts);
 	}
 
 	/**

core/src/main/java/org/mini2Dx/miniscript/core/ThreadPoolProvider.java

@@ -15,6 +15,6 @@ public interface ThreadPoolProvider {
 
 	public ScheduledFuture<?> schedule(Runnable command, long delay, TimeUnit unit);
 
-	void shutdown();
+	void shutdown(boolean interruptThreads);
 
 }