mirror of
https://github.com/2006-Scape/Parabot.git
synced 2026-07-06 16:50:39 +00:00
isDevMode -> InDebugMode
+ Random indention changes.
This commit is contained in:
@@ -22,7 +22,7 @@ public final class Landing {
|
|||||||
t.printStackTrace();
|
t.printStackTrace();
|
||||||
}
|
}
|
||||||
Directories.validate();
|
Directories.validate();
|
||||||
Core.enableDevMode();
|
Core.setDebug(true);
|
||||||
ServerSelector.getInstance().setVisible(true);
|
ServerSelector.getInstance().setVisible(true);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -3,25 +3,21 @@ package org.parabot.core;
|
|||||||
/**
|
/**
|
||||||
*
|
*
|
||||||
* @author Clisprail
|
* @author Clisprail
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
public class Core {
|
public class Core {
|
||||||
private static boolean devMode = false;
|
|
||||||
|
private static boolean debug = false;
|
||||||
/**
|
|
||||||
* Enables the developers mode
|
public static void setDebug(boolean debug) {
|
||||||
*/
|
Core.debug = debug;
|
||||||
public static void enableDevMode() {
|
|
||||||
devMode = true;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Determines if bot is in developers mode
|
* @return if the botclient is in debug mode.
|
||||||
* @return <b>true</b> if bot is in developers mode
|
|
||||||
*/
|
*/
|
||||||
public static boolean isDevMode() {
|
public static boolean inDebugMode() {
|
||||||
return devMode;
|
return debug;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -20,20 +20,21 @@ import org.parabot.environment.servers.loader.ServerLoader;
|
|||||||
/**
|
/**
|
||||||
*
|
*
|
||||||
* @author Clisprail
|
* @author Clisprail
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
public class ServerManifestParser {
|
public class ServerManifestParser {
|
||||||
public static Map<ServerDescription, ServerCache> cache = new HashMap<ServerDescription, ServerCache>();
|
public static Map<ServerDescription, ServerCache> cache = new HashMap<ServerDescription, ServerCache>();
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Gets server descriptions
|
* Gets server descriptions
|
||||||
|
*
|
||||||
* @return list of descriptions
|
* @return list of descriptions
|
||||||
*/
|
*/
|
||||||
public ServerDescription[] getDescriptions() {
|
public ServerDescription[] getDescriptions() {
|
||||||
if(Core.isDevMode()) {
|
if (Core.inDebugMode()) {
|
||||||
return localDesc();
|
return localDesc();
|
||||||
}
|
}
|
||||||
return publicDesc();
|
return publicDesc();
|
||||||
}
|
}
|
||||||
|
|
||||||
private ServerDescription[] publicDesc() {
|
private ServerDescription[] publicDesc() {
|
||||||
@@ -47,17 +48,17 @@ public class ServerManifestParser {
|
|||||||
Method method = URLClassLoader.class.getDeclaredMethod("addURL", URL.class);
|
Method method = URLClassLoader.class.getDeclaredMethod("addURL", URL.class);
|
||||||
method.setAccessible(true);
|
method.setAccessible(true);
|
||||||
method.invoke((URLClassLoader) ClassLoader.getSystemClassLoader(), Directories.getServerPath().toURI().toURL());
|
method.invoke((URLClassLoader) ClassLoader.getSystemClassLoader(), Directories.getServerPath().toURI().toURL());
|
||||||
} catch(Exception e) {
|
} catch (Exception e) {
|
||||||
e.printStackTrace();
|
e.printStackTrace();
|
||||||
}
|
}
|
||||||
final ServerLoader loader = new ServerLoader(path);
|
final ServerLoader loader = new ServerLoader(path);
|
||||||
final List<ServerProvider> providers = new ArrayList<ServerProvider>();
|
final List<ServerProvider> providers = new ArrayList<ServerProvider>();
|
||||||
final List<ServerDescription> descs = new ArrayList<ServerDescription>();
|
final List<ServerDescription> descs = new ArrayList<ServerDescription>();
|
||||||
for(final String className : loader.getServerClassNames()) {
|
for (final String className : loader.getServerClassNames()) {
|
||||||
try {
|
try {
|
||||||
final Class<?> serverProviderClass = loader.loadClass(className);
|
final Class<?> serverProviderClass = loader.loadClass(className);
|
||||||
final Object annotation = serverProviderClass.getAnnotation(ServerManifest.class);
|
final Object annotation = serverProviderClass.getAnnotation(ServerManifest.class);
|
||||||
if(annotation == null) {
|
if (annotation == null) {
|
||||||
throw new RuntimeException("Missing manifest at " + className);
|
throw new RuntimeException("Missing manifest at " + className);
|
||||||
}
|
}
|
||||||
final ServerManifest manifest = (ServerManifest) annotation;
|
final ServerManifest manifest = (ServerManifest) annotation;
|
||||||
@@ -69,29 +70,29 @@ public class ServerManifestParser {
|
|||||||
t.printStackTrace();
|
t.printStackTrace();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if(providers.isEmpty()) {
|
if (providers.isEmpty()) {
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
final ServerCache cachedServer = new ServerCache(loader, providers.toArray(new ServerProvider[providers.size()]));
|
final ServerCache cachedServer = new ServerCache(loader, providers.toArray(new ServerProvider[providers.size()]));
|
||||||
for(final ServerDescription desc : descs) {
|
for (final ServerDescription desc : descs) {
|
||||||
cache.put(desc, cachedServer);
|
cache.put(desc, cachedServer);
|
||||||
}
|
}
|
||||||
return descs.toArray(new ServerDescription[descs.size()]);
|
return descs.toArray(new ServerDescription[descs.size()]);
|
||||||
}
|
}
|
||||||
|
|
||||||
public class ServerCache {
|
public class ServerCache {
|
||||||
private ServerLoader serverLoader = null;
|
private ServerLoader serverLoader = null;
|
||||||
private ServerProvider[] serverProviders = null;
|
private ServerProvider[] serverProviders = null;
|
||||||
|
|
||||||
private ServerCache(final ServerLoader serverLoader, final ServerProvider[] serverProviders) {
|
private ServerCache(final ServerLoader serverLoader, final ServerProvider[] serverProviders) {
|
||||||
this.serverLoader = serverLoader;
|
this.serverLoader = serverLoader;
|
||||||
this.serverProviders = serverProviders;
|
this.serverProviders = serverProviders;
|
||||||
}
|
}
|
||||||
|
|
||||||
public ServerLoader getLoader() {
|
public ServerLoader getLoader() {
|
||||||
return serverLoader;
|
return serverLoader;
|
||||||
}
|
}
|
||||||
|
|
||||||
public ServerProvider[] getProviders() {
|
public ServerProvider[] getProviders() {
|
||||||
return serverProviders;
|
return serverProviders;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -16,6 +16,7 @@ import org.parabot.core.logging.SystemConsoleHandler;
|
|||||||
import org.parabot.core.logging.TextAreaLogHandler;
|
import org.parabot.core.logging.TextAreaLogHandler;
|
||||||
|
|
||||||
public class LogArea extends JScrollPane {
|
public class LogArea extends JScrollPane {
|
||||||
|
|
||||||
private static final long serialVersionUID = 6571141103751675714L;
|
private static final long serialVersionUID = 6571141103751675714L;
|
||||||
private static LogArea instance = null;
|
private static LogArea instance = null;
|
||||||
private static LogTextArea logArea = new LogTextArea();
|
private static LogTextArea logArea = new LogTextArea();
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
package org.parabot.environment;
|
package org.parabot.environment;
|
||||||
|
|
||||||
import java.lang.reflect.Constructor;
|
import java.lang.reflect.Constructor;
|
||||||
|
|
||||||
import org.parabot.core.Context;
|
import org.parabot.core.Context;
|
||||||
import org.parabot.core.Core;
|
import org.parabot.core.Core;
|
||||||
import org.parabot.core.classpath.ClassPath;
|
import org.parabot.core.classpath.ClassPath;
|
||||||
@@ -16,26 +17,27 @@ import org.parabot.environment.servers.loader.ServerLoader;
|
|||||||
/**
|
/**
|
||||||
*
|
*
|
||||||
* @author Clisprail
|
* @author Clisprail
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
public class Environment {
|
public class Environment {
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Loads a new environment
|
* Loads a new environment
|
||||||
|
*
|
||||||
* @param url
|
* @param url
|
||||||
*/
|
*/
|
||||||
public static void load(final ServerDescription desc, final String serverName) {
|
public static void load(final ServerDescription desc, final String serverName) {
|
||||||
ServerSelector.getInstance().dispose();
|
ServerSelector.getInstance().dispose();
|
||||||
if(!BotUI.getInstance().isVisible()) {
|
if (!BotUI.getInstance().isVisible()) {
|
||||||
BotUI.getInstance().setVisible(true);
|
BotUI.getInstance().setVisible(true);
|
||||||
}
|
}
|
||||||
|
|
||||||
final ClassPath classPath = Core.isDevMode() ? null : new ClassPath();
|
final ClassPath classPath = Core.inDebugMode() ? null : new ClassPath();
|
||||||
final ServerCache cache = Core.isDevMode() ? ServerManifestParser.cache.get(desc) : null;
|
final ServerCache cache = Core.inDebugMode() ? ServerManifestParser.cache.get(desc) : null;
|
||||||
|
|
||||||
final ServerLoader serverLoader = Core.isDevMode() ? cache.getLoader() : new ServerLoader(classPath);
|
final ServerLoader serverLoader = Core.inDebugMode() ? cache.getLoader() : new ServerLoader(classPath);
|
||||||
String[] serverProviders = null;
|
String[] serverProviders = null;
|
||||||
if(!Core.isDevMode()) {
|
if (!Core.inDebugMode()) {
|
||||||
serverProviders = serverLoader.getServerClassNames();
|
serverProviders = serverLoader.getServerClassNames();
|
||||||
if (serverProviders == null) {
|
if (serverProviders == null) {
|
||||||
throw new RuntimeException("No server provided.");
|
throw new RuntimeException("No server provided.");
|
||||||
@@ -47,7 +49,7 @@ public class Environment {
|
|||||||
@Override
|
@Override
|
||||||
public void run() {
|
public void run() {
|
||||||
try {
|
try {
|
||||||
final ServerProvider server = !Core.isDevMode() ? fetchServerProvider(serverLoader) : cache.getProviders()[desc.providerIndex];
|
final ServerProvider server = !Core.inDebugMode() ? fetchServerProvider(serverLoader) : cache.getProviders()[desc.providerIndex];
|
||||||
final Context context = new Context(server);
|
final Context context = new Context(server);
|
||||||
context.setEnvironment(serverLoader);
|
context.setEnvironment(serverLoader);
|
||||||
BotToolbar.getInstance().addTab(context, serverName);
|
BotToolbar.getInstance().addTab(context, serverName);
|
||||||
@@ -58,7 +60,7 @@ public class Environment {
|
|||||||
}
|
}
|
||||||
}).start();
|
}).start();
|
||||||
}
|
}
|
||||||
|
|
||||||
private static ServerProvider fetchServerProvider(ServerLoader loader) {
|
private static ServerProvider fetchServerProvider(ServerLoader loader) {
|
||||||
try {
|
try {
|
||||||
final String[] serverProviders = loader.getServerClassNames();
|
final String[] serverProviders = loader.getServerClassNames();
|
||||||
|
|||||||
Reference in New Issue
Block a user