Redo of the loadlocal argument

This commit is contained in:
JKetelaar
2014-04-11 13:56:14 +02:00
parent a2dafd9e41
commit 857c88a547
4 changed files with 30 additions and 21 deletions
+1 -1
View File
@@ -86,7 +86,7 @@ public final class Landing {
password = args[++i]; password = args[++i];
break; break;
case "-loadlocal": case "-loadlocal":
Core.setLoadLocal(true); Core.setLocalMode(args[++i]);
break; break;
case "-dump": case "-dump":
Core.setDump(true); Core.setDump(true);
+24 -13
View File
@@ -14,22 +14,35 @@ public class Core {
private static boolean debug; private static boolean debug;
private static boolean verbose; private static boolean verbose;
private static boolean dump; private static boolean dump;
private static boolean loadLocal; //Loads both local and public scripts/servers private static boolean loadLocalScripts; //Loads both local and public scripts
private static boolean loadLocalServers; //Loads both local and public scripts
/** /**
* Enabled loadLocal mode
* *
* @param loadLocal * @return if the client is in loadLocalScripts mode.
*/ */
public static void setLoadLocal(final boolean loadLocal) { public static boolean inLoadLocalScripts(){
Core.loadLocal = loadLocal; return loadLocalScripts;
} }
/** /**
* @return if the client is in loadLocal mode. *
* @return if the client is in loadLocalServers mode
*/ */
public static boolean inLoadLocal() { public static boolean inLoadLocalServers(){
return loadLocal; return loadLocalServers;
}
/**
*
* @param mode
*/
public static void setLocalMode(String mode){
if (mode.toLowerCase().equals("scripts")){
loadLocalScripts = true;
}else{
loadLocalServers = true;
}
} }
/** /**
@@ -47,7 +60,7 @@ public class Core {
* @param dump * @param dump
*/ */
public static void setDump(final boolean dump) { public static void setDump(final boolean dump) {
Core.dump = dump; Core.dump = dump;
} }
/** /**
@@ -68,7 +81,7 @@ public class Core {
* @return if parabot should dump injected jar * @return if parabot should dump injected jar
*/ */
public static boolean shouldDump() { public static boolean shouldDump() {
return dump; return dump;
} }
/** /**
@@ -100,9 +113,7 @@ public class Core {
Core.verbose("No updates available."); Core.verbose("No updates available.");
return true; return true;
} }
} catch (NumberFormatException e) { } catch (NumberFormatException | IOException e) {
e.printStackTrace();
} catch (IOException e) {
e.printStackTrace(); e.printStackTrace();
} finally { } finally {
try { try {
@@ -23,12 +23,11 @@ public abstract class ScriptParser {
public static ScriptDescription[] getDescriptions() { public static ScriptDescription[] getDescriptions() {
SCRIPT_CACHE.clear(); SCRIPT_CACHE.clear();
final ArrayList<ScriptParser> parsers = new ArrayList<ScriptParser>(); final ArrayList<ScriptParser> parsers = new ArrayList<ScriptParser>();
if (Core.inLoadLocal()) { if (Core.inLoadLocalScripts()) {
parsers.add(new LocalJavaScripts()); parsers.add(new LocalJavaScripts());
if (Jython.isValid()) { if (Jython.isValid()) {
parsers.add(new LocalPythonScripts()); parsers.add(new LocalPythonScripts());
} }
parsers.add(new SDNScripts());
} else if (Core.inDebugMode()) { } else if (Core.inDebugMode()) {
parsers.add(new LocalJavaScripts()); parsers.add(new LocalJavaScripts());
if (Jython.isValid()) { if (Jython.isValid()) {
@@ -21,9 +21,8 @@ public abstract class ServerParser {
public static final ServerDescription[] getDescriptions() { public static final ServerDescription[] getDescriptions() {
SERVER_CACHE.clear(); SERVER_CACHE.clear();
final ArrayList<ServerParser> parsers = new ArrayList<ServerParser>(); final ArrayList<ServerParser> parsers = new ArrayList<ServerParser>();
if (Core.inLoadLocal()) { if (Core.inLoadLocalServers()) {
parsers.add(new LocalServers()); parsers.add(new LocalServers());
parsers.add(new PublicServers());
} else if (Core.inDebugMode()) { } else if (Core.inDebugMode()) {
parsers.add(new LocalServers()); parsers.add(new LocalServers());
} else { } else {