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];
break;
case "-loadlocal":
Core.setLoadLocal(true);
Core.setLocalMode(args[++i]);
break;
case "-dump":
Core.setDump(true);
+27 -16
View File
@@ -14,22 +14,35 @@ public class Core {
private static boolean debug;
private static boolean verbose;
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) {
Core.loadLocal = loadLocal;
public static boolean inLoadLocalScripts(){
return loadLocalScripts;
}
/**
* @return if the client is in loadLocal mode.
*
* @return if the client is in loadLocalServers mode
*/
public static boolean inLoadLocal() {
return loadLocal;
public static boolean inLoadLocalServers(){
return loadLocalServers;
}
/**
*
* @param mode
*/
public static void setLocalMode(String mode){
if (mode.toLowerCase().equals("scripts")){
loadLocalScripts = true;
}else{
loadLocalServers = true;
}
}
/**
@@ -40,14 +53,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;
}
/**
@@ -63,12 +76,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;
}
/**
@@ -100,9 +113,7 @@ public class Core {
Core.verbose("No updates available.");
return true;
}
} catch (NumberFormatException e) {
e.printStackTrace();
} catch (IOException e) {
} catch (NumberFormatException | IOException e) {
e.printStackTrace();
} finally {
try {
@@ -23,12 +23,11 @@ public abstract class ScriptParser {
public static ScriptDescription[] getDescriptions() {
SCRIPT_CACHE.clear();
final ArrayList<ScriptParser> parsers = new ArrayList<ScriptParser>();
if (Core.inLoadLocal()) {
if (Core.inLoadLocalScripts()) {
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()) {
@@ -21,9 +21,8 @@ public abstract class ServerParser {
public static final ServerDescription[] getDescriptions() {
SERVER_CACHE.clear();
final ArrayList<ServerParser> parsers = new ArrayList<ServerParser>();
if (Core.inLoadLocal()) {
if (Core.inLoadLocalServers()) {
parsers.add(new LocalServers());
parsers.add(new PublicServers());
} else if (Core.inDebugMode()) {
parsers.add(new LocalServers());
} else {