Changed loading from database

This commit is contained in:
Jeroen Ketelaar
2014-04-11 01:51:04 +02:00
parent 318dea6ad7
commit 61b37ff6cf
+23 -24
View File
@@ -1,16 +1,13 @@
package org.rev317.min; package org.rev317.min;
import java.applet.Applet;
import java.io.File;
import java.net.MalformedURLException;
import java.net.URL;
import javax.swing.JMenuBar;
import org.parabot.core.Context; import org.parabot.core.Context;
import org.parabot.core.Directories;
import org.parabot.core.asm.ASMClassLoader; import org.parabot.core.asm.ASMClassLoader;
import org.parabot.core.asm.adapters.AddInterfaceAdapter; import org.parabot.core.asm.adapters.AddInterfaceAdapter;
import org.parabot.core.asm.hooks.HookFile; import org.parabot.core.asm.hooks.HookFile;
import org.parabot.core.desc.ServerProviderInfo;
import org.parabot.core.ui.components.VerboseLoader;
import org.parabot.environment.api.utils.WebUtil;
import org.parabot.environment.scripts.Script; import org.parabot.environment.scripts.Script;
import org.parabot.environment.servers.ServerManifest; import org.parabot.environment.servers.ServerManifest;
import org.parabot.environment.servers.ServerProvider; import org.parabot.environment.servers.ServerProvider;
@@ -19,12 +16,17 @@ import org.rev317.min.accessors.Client;
import org.rev317.min.script.ScriptEngine; import org.rev317.min.script.ScriptEngine;
import org.rev317.min.ui.BotMenu; import org.rev317.min.ui.BotMenu;
import javax.swing.*;
import java.applet.Applet;
import java.io.File;
import java.net.URL;
/** /**
* *
* @author Everel * @author Everel
* *
*/ */
@ServerManifest(author = "Everel", name = "Local Client", type = Type.INJECTION, version = 0.1) @ServerManifest(author = "Everel & Paradox", name = "Server name here", type = Type.INJECTION, version = 0.2)
public class Loader extends ServerProvider { public class Loader extends ServerProvider {
private Applet applet; private Applet applet;
@@ -33,7 +35,7 @@ public class Loader extends ServerProvider {
try { try {
final Context context = Context.getInstance(); final Context context = Context.getInstance();
final ASMClassLoader classLoader = context.getASMClassLoader(); final ASMClassLoader classLoader = context.getASMClassLoader();
final Class<?> clientClass = classLoader.loadClass("Client"); final Class<?> clientClass = classLoader.loadClass(context.getServerProviderInfo().getClientClass());
Object instance = clientClass.newInstance(); Object instance = clientClass.newInstance();
applet = (Applet) instance; applet = (Applet) instance;
return applet; return applet;
@@ -43,15 +45,17 @@ public class Loader extends ServerProvider {
} }
} }
@Override @Override
public URL getJar() { public URL getJar() {
try { ServerProviderInfo serverProvider = Context.getInstance().getServerProviderInfo();
return new File("D:/317client.jar").toURI().toURL();
} catch(Throwable t) { File target = new File(Directories.getCachePath(), serverProvider.getClientCRC32() + ".jar");
t.printStackTrace(); if(!target.exists()) {
} WebUtil.downloadFile(serverProvider.getClient(), target, VerboseLoader.get());
return null; }
}
return WebUtil.toURL(target);
}
public static Client getClient() { public static Client getClient() {
return (Client) Context.getInstance().getClient(); return (Client) Context.getInstance().getClient();
@@ -77,12 +81,7 @@ public class Loader extends ServerProvider {
@Override @Override
public HookFile getHookFile() { public HookFile getHookFile() {
try { return new HookFile(Context.getInstance().getServerProviderInfo().getHookFile(), HookFile.TYPE_XML);
return new HookFile(new URL("http://bot.parabot.org/hooks/317api_hooks_min.xml"), HookFile.TYPE_XML);
} catch (MalformedURLException e) {
e.printStackTrace();
}
return null;
} }
public void unloadScript(Script script) { public void unloadScript(Script script) {