Revert loadlocal redo

Breaks server providers

parabotv2/src/org/parabot/Landing.java

@@ -8,6 +8,7 @@ import org.parabot.core.ui.ServerSelector;
 import org.parabot.core.ui.utils.UILog;
 
 import javax.swing.*;
+
 import java.io.File;
 import java.io.IOException;
 
@@ -85,21 +86,21 @@ public final class Landing {
                     password = args[++i];
                     break;
                 case "-loadlocal":
-                    Core.setLocalMode(args[++i]);
+                    Core.setLoadLocal(true);
                     break;
                 case "-dump":
-                    Core.setDump(true);
+                	Core.setDump(true);
-                    break;
+                	break;
                 case "-scriptsbin":
-                    Directories.setScriptCompiledDirectory(new File(args[++i]));
+                	Directories.setScriptCompiledDirectory(new File(args[++i]));
-                    break;
+                	break;
                 case "-serversbin":
-                    Directories.setServerCompiledDirectory(new File(args[++i]));
+                	Directories.setServerCompiledDirectory(new File(args[++i]));
-                    break;
+                	break;
             }
 
         }
     }
+    
 
-
+}
-}

parabotv2/src/org/parabot/core/Core.java

@@ -14,35 +14,22 @@ public class Core {
     private static boolean debug;
     private static boolean verbose;
     private static boolean dump;
-    private static boolean loadLocalScripts; //Loads both local and public scripts
+    private static boolean loadLocal; //Loads both local and public scripts/servers
-    private static boolean loadLocalServers; //Loads both local and public scripts
 
     /**
+     * Enabled loadLocal mode
      *
-     * @return if the client is in loadLocalScripts mode.
+     * @param loadLocal
      */
-    public static boolean inLoadLocalScripts(){
+    public static void setLoadLocal(final boolean loadLocal) {
-        return loadLocalScripts;
+        Core.loadLocal = loadLocal;
     }
 
     /**
-     *
+     * @return if the client is in loadLocal mode.
-     * @return if the client is in loadLocalServers mode
      */
-    public static boolean inLoadLocalServers(){
+    public static boolean inLoadLocal() {
-        return loadLocalServers;
+        return loadLocal;
-    }
-
-    /**
-     *
-     * @param mode
-     */
-    public static void setLocalMode(String mode){
-        if (mode.toLowerCase().equals("scripts")){
-            loadLocalScripts = true;
-        }else{
-            loadLocalServers = true;
-        }
     }
 
     /**
@@ -53,14 +40,14 @@ public class Core {
     public static void setDebug(final boolean debug) {
         Core.debug = debug;
     }
-
+    
     /**
      * Enables dump mode
-     *
+     * 
      * @param dump
      */
     public static void setDump(final boolean dump) {
-        Core.dump = dump;
+    	Core.dump = dump;
     }
 
     /**
@@ -76,12 +63,12 @@ public class Core {
     public static boolean inVerboseMode() {
         return verbose;
     }
-
+    
     /**
      * @return if parabot should dump injected jar
      */
     public static boolean shouldDump() {
-        return dump;
+    	return dump;
     }
 
     /**
@@ -113,7 +100,9 @@ public class Core {
                 Core.verbose("No updates available.");
                 return true;
             }
-        } catch (NumberFormatException | IOException e) {
+        } catch (NumberFormatException e) {
+            e.printStackTrace();
+        } catch (IOException e) {
             e.printStackTrace();
         } finally {
             try {
@@ -125,4 +114,4 @@ public class Core {
         Core.verbose("Updates available...");
         return false;
     }
-}
+}

parabotv2/src/org/parabot/core/parsers/scripts/ScriptParser.java

@@ -23,11 +23,12 @@ public abstract class ScriptParser {
     public static ScriptDescription[] getDescriptions() {
         SCRIPT_CACHE.clear();
         final ArrayList<ScriptParser> parsers = new ArrayList<ScriptParser>();
-        if (Core.inLoadLocalScripts()) {
+        if (Core.inLoadLocal()) {
             parsers.add(new LocalJavaScripts());
             if (Jython.isValid()) {
                 parsers.add(new LocalPythonScripts());
             }
+            parsers.add(new SDNScripts());
         } else if (Core.inDebugMode()) {
             parsers.add(new LocalJavaScripts());
             if (Jython.isValid()) {
@@ -52,4 +53,4 @@ public abstract class ScriptParser {
         return SCRIPT_CACHE.keySet().toArray(new ScriptDescription[SCRIPT_CACHE.size()]);
     }
 
-}
+}

parabotv2/src/org/parabot/core/parsers/servers/ServerParser.java

@@ -21,8 +21,9 @@ public abstract class ServerParser {
     public static final ServerDescription[] getDescriptions() {
         SERVER_CACHE.clear();
         final ArrayList<ServerParser> parsers = new ArrayList<ServerParser>();
-        if (Core.inLoadLocalServers()) {
+        if (Core.inLoadLocal()) {
             parsers.add(new LocalServers());
+            parsers.add(new PublicServers());
         } else if (Core.inDebugMode()) {
             parsers.add(new LocalServers());
         } else {
@@ -45,4 +46,4 @@ public abstract class ServerParser {
         return SERVER_CACHE.keySet().toArray(new ServerDescription[SERVER_CACHE.size()]);
     }
 
-}
+}