Finished base for randoms

This commit is contained in:
JKetelaar
2014-09-11 23:31:41 +02:00
parent b66c8f970c
commit cd8943d079
4 changed files with 68 additions and 47 deletions
+11 -14
View File
@@ -5,6 +5,8 @@ import org.parabot.core.Directories;
import org.parabot.core.asm.ASMClassLoader;
import org.parabot.core.asm.adapters.AddInterfaceAdapter;
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.servers.ServerManifest;
@@ -18,16 +20,15 @@ import org.rev317.min.ui.BotMenu;
import javax.swing.*;
import java.applet.Applet;
import java.io.File;
import java.net.MalformedURLException;
import java.net.URL;
/**
* @author Everel
* @author Everel, Paradox
*/
@ServerManifest(author = "Everel & Paradox", name = "Server name here", type = Type.INJECTION, version = 2.1)
public class Loader extends ServerProvider {
private Applet applet;
private HookFile hookFile; //= new HookFile(new File(Directories.getCachePath() + "/ikov-hooks.xml"), HookFile.TYPE_XML);
private HookFile hookFile = new HookFile(Context.getInstance().getServerProviderInfo().getExtendedHookFile(), HookFile.TYPE_XML);
public static Client getClient() {
return (Client) Context.getInstance().getClient();
@@ -38,10 +39,10 @@ public class Loader extends ServerProvider {
try {
final Context context = Context.getInstance();
final ASMClassLoader classLoader = context.getASMClassLoader();
final Class<?> clientClass = classLoader.loadClass("b");
final Class<?> clientClass = classLoader.loadClass(Context.getInstance().getServerProviderInfo().getClientClass());
Object instance = clientClass.newInstance();
applet = (Applet) instance;
return applet;
this.applet = (Applet) instance;
return this.applet;
} catch (Exception e) {
e.printStackTrace();
return null;
@@ -50,11 +51,11 @@ public class Loader extends ServerProvider {
@Override
public URL getJar() {
//ServerProviderInfo serverProvider = Context.getInstance().getServerProviderInfo();
ServerProviderInfo serverProvider = Context.getInstance().getServerProviderInfo();
File target = new File(Directories.getCachePath(), "3672181877.jar");
File target = new File(Directories.getCachePath(), serverProvider.getClientCRC32() + ".jar");
if (!target.exists()) {
//WebUtil.downloadFile(serverProvider.getClient(), target, VerboseLoader.get());
WebUtil.downloadFile(serverProvider.getClient(), target, VerboseLoader.get());
}
return WebUtil.toURL(target);
@@ -72,11 +73,7 @@ public class Loader extends ServerProvider {
super.injectHooks();
} catch (Exception e) {
e.printStackTrace();
try {
this.hookFile = new HookFile(new File(Directories.getCachePath() + "/ikov-hooks.xml"), HookFile.TYPE_XML);
} catch (MalformedURLException e1) {
e1.printStackTrace();
}
this.hookFile = new HookFile(Context.getInstance().getServerProviderInfo().getHookFile(), HookFile.TYPE_XML);
super.injectHooks();
}
}