WIP

Author: DevKevYT

.project

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>devscript</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>

changelog.txt

@@ -5,6 +5,14 @@ NOTICE:
 	Another future plan: Command: "include <abs|rel> <pathToFile>" a command to include external compiled libraries "plug in style".
 	Added in 1.8.0 with the command: import "path_to_jar";
 
+1.9.13:
+	- The "import" command got very few love the last updates:
+		- The class of the imported .jar file only has to extend the "Library" class and does not need to be named "CustomLibrary"
+		  BUT that means I have to use a third party library :(
+		- Relative paths (*/lib.jar for example) can either be: 
+			The folder of a script file that is being executed 
+			OR the folder of the script host, if no file is being loaded
+
 1.9.12:
 	- DevScript can now property handle the null variable $null. (="undefined")
 	- Added an explanation for the "wait" command

src/com/devkev/devscript/nativecommands/NativeLibrary.java

@@ -1040,18 +1040,28 @@ public Object execute(Object[] args, Process application, Block block) throws Ex
 					}
 				},
 
-				new Command("import", "string", "Imports a library from a compiled .jar file. The class should extend com.mygdx.devkev.devscript.raw.Library and be named CustomLibrary\n"
-						+ "You can use a * to reference the current path the process is executed in (*/library.jar") {
+				new Command("import", "string", "Imports a library from a compiled .jar file. The class should extend com.mygdx.devkev.devscript.raw.Library. If the path starts with * it looks in the current folder of the script file") {
 					@Override
 					public Object execute(Object[] args, Process application, Block block) throws Exception {
+						
 						if(!args[0].toString().endsWith(".jar")) args[0] += ".jar"; 
+						
 						File fileToImport;
-						if(!args[0].toString().startsWith("*")) fileToImport = new File(args[0].toString());
-						else {
-							File jarFile = new File(URLDecoder.decode(ConsoleMain.class.getProtectionDomain().getCodeSource().getLocation().getPath(), "UTF-8"));
-							fileToImport = new File(jarFile.getParent() + args[0].toString().substring(1));
+						
+						if(!args[0].toString().startsWith("*")) {
+							fileToImport = new File(args[0].toString());
+						
+						} else {
+							if(application.file == null) {
+								File jarFile = new File(URLDecoder.decode(ConsoleMain.class.getProtectionDomain().getCodeSource().getLocation().getPath(), "UTF-8"));
+								fileToImport = new File(jarFile.getParent() + args[0].toString().substring(1));
+							} else {
+								fileToImport = new File(application.file.getParentFile().getAbsolutePath() + "\\" + args[0].toString().substring(1));
+							}
 						}
 
+						System.out.println("Trying to import from: " + fileToImport);
+						
 						if(!fileToImport.exists()) {
 							application.kill(block, "File to import not found: " + fileToImport.getPath());
 							return null;
@@ -1061,10 +1071,11 @@ public Object execute(Object[] args, Process application, Block block) throws Ex
 						java.net.URL url = uri.toURL();
 
 						Library lib;
+						
 						try {
 							@SuppressWarnings("resource")
 							ClassLoader loader = new java.net.URLClassLoader(new java.net.URL[] {url});
-							Class<?> pluginClass = loader.loadClass("Library");
+							Class<?> pluginClass = loader.loadClass("com.devkev.devscript.raw.Library");
 
 							lib = (Library) pluginClass.getConstructor().newInstance();
 							lib.bound = application;

src/com/devkev/gui/Window.java

@@ -305,6 +305,7 @@ public void actionPerformed(ActionEvent e) {
 				runWindow.setTitle("Running...");
 				runWindow.setVisible(true);	
 				window.setEnabled(false);
+				p.file = openedFile;
 				p.setCaseSensitive(false);
 				p.execute(textArea.getText(), true);
 				p.setVariable("keyCode", "", false, true);
@@ -595,7 +596,7 @@ public void keyPressed(KeyEvent e) {
 		runWindow.add(consolePane);
 
 		runWindow.pack();
-		runWindow.setBounds((int) (Toolkit.getDefaultToolkit().getScreenSize().width *.5f-250), (int) (Toolkit.getDefaultToolkit().getScreenSize().height *.5f-100), 500, 200);
+		runWindow.setBounds((int) (Toolkit.getDefaultToolkit().getScreenSize().width * .5f - 250), (int) (Toolkit.getDefaultToolkit().getScreenSize().height *.5f-100), 500, 200);
 
 		runWindow.addKeyListener(new KeyListener() {