Merge pull request #89 from OSRSB/wip2

Revised the input location for scripts

build.gradle

@@ -12,7 +12,6 @@ repositories {
 }
 
 def runeLiteVersion = '1.8.9'
-def Tag = '0.0.2'
 
 dependencies {
     compile group: 'net.runelite', name: 'client', version: runeLiteVersion
@@ -29,7 +28,6 @@ dependencies {
     compile group: 'com.github.joonasvali.naturalmouse', name: 'naturalmouse', version: '2.0.2'
     compile group: 'javassist', name: 'javassist', version: '3.12.1.GA'
     compile group: 'net.sf.jopt-simple', name:'jopt-simple', version: '5.0.4'
-
 }
 
 group = 'rsb'

src/main/java/rsb/botLauncher/RuneLite.java

@@ -374,10 +374,11 @@ public int getIndex() {
      * @return          The ArgumentAcceptingOptionSpec array (the fields for our options)
      */
     public static ArgumentAcceptingOptionSpec<?>[] handleParsing(OptionParser parser) {
-        parser.accepts("developer-mode", "Enable developer tools");
-        parser.accepts("debug", "Show extra debugging output");
+
         parser.accepts("bot", "Starts the client in bot mode");
         parser.accepts("bot-runelite", "Starts the client in Bot RuneLite mode");
+        parser.accepts("developer-mode", "Enable developer tools");
+        parser.accepts("debug", "Show extra debugging output");
         parser.accepts("insecure-skip-tls-verification", "Disables TLS verification");
         parser.accepts("jav_config", "jav_config url")
                 .withRequiredArg()
@@ -409,7 +410,7 @@ public ClientUpdateCheckMode convert(String v)
                 });
 
         final ArgumentAcceptingOptionSpec<String> proxyInfo = parser
-                .accepts("proxy")
+                .accepts("proxy", "Designates a proxy ip address to be used to make the bot server connections")
                 .withRequiredArg().ofType(String.class);
 
         return (ArgumentAcceptingOptionSpec<?>[]) new ArgumentAcceptingOptionSpec[]{sessionfile, configfile, updateMode, proxyInfo};
@@ -428,30 +429,25 @@ public static void handleOptions(OptionParser parser, ArgumentAcceptingOptionSpe
             System.exit(0);
         }
 
-        if (options.has("proxy"))
-        {
-            String[] proxy = options.valueOf(optionSpecs[Options.sessionfile.getIndex()].ofType(String.class)).split(":");
+        if (options.has("proxy")) {
+            String[] proxy = options.valueOf(optionSpecs[Options.proxyinfo.getIndex()].ofType(String.class)).split(":");
 
-            if (proxy.length >= 2)
-            {
+            if (proxy.length >= 2) {
                 System.setProperty("socksProxyHost", proxy[0]);
                 System.setProperty("socksProxyPort", proxy[1]);
             }
 
-            if (proxy.length >= 4)
-            {
+            if (proxy.length >= 4) {
                 System.setProperty("java.net.socks.username", proxy[2]);
                 System.setProperty("java.net.socks.password", proxy[3]);
 
                 final String user = proxy[2];
                 final char[] pass = proxy[3].toCharArray();
 
-                Authenticator.setDefault(new Authenticator()
-                {
+                Authenticator.setDefault(new Authenticator() {
                     private PasswordAuthentication auth = new PasswordAuthentication(user, pass);
 
-                    protected PasswordAuthentication getPasswordAuthentication()
-                    {
+                    protected PasswordAuthentication getPasswordAuthentication() {
                         return auth;
                     }
                 });

src/main/java/rsb/gui/ScriptSelector.java

@@ -185,8 +185,8 @@ public void load() {
 		scripts.addAll(SRC_BUNDLED.list());
 		scripts.addAll(SRC_PRECOMPILED.list());
 		scripts.addAll(SRC_SOURCES.list());
-		generateTestScripts();
-		scripts.addAll(SRC_TEST.list());
+		//generateTestScripts();
+		//scripts.addAll(SRC_TEST.list());
 		model.search(search.getText());
 		deleteTemporaryFiles();
 	}

src/main/java/rsb/internal/globval/GlobalConfiguration.java

@@ -80,9 +80,10 @@ public static String getAccountsFile() {
 		public static String getHomeDirectory() {
 			final String env = System.getenv(GlobalConfiguration.NAME.toUpperCase() + "_HOME");
 			if ((env == null) || env.isEmpty()) {
-				return (GlobalConfiguration.getCurrentOperatingSystem() == OperatingSystem.WINDOWS ?
-						FileSystemView.getFileSystemView().getDefaultDirectory().getAbsolutePath() :
-						Paths.getUnixHome()) + File.separator + GlobalConfiguration.NAME;
+				String test = GlobalConfiguration.getCurrentOperatingSystem() == OperatingSystem.WINDOWS ?
+						System.getProperty("user.home") :
+						Paths.getUnixHome();
+				return (test + File.separator + GlobalConfiguration.NAME);
 			} else {
 				return env;
 			}