From 318dea6ad7455bd586190ea8b31ce20babf397fa Mon Sep 17 00:00:00 2001 From: Jeroen Ketelaar Date: Thu, 10 Apr 2014 19:54:45 +0200 Subject: [PATCH 1/9] First commit from pc --- .gitignore | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.gitignore b/.gitignore index 0f182a0..23d66ad 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,9 @@ *.jar *.war *.ear + +# IntelliJ +/out/ +out +*.iml +.idea/ \ No newline at end of file From 61b37ff6cfbc6c50a7bed0f07e6d64abbf301ff7 Mon Sep 17 00:00:00 2001 From: Jeroen Ketelaar Date: Fri, 11 Apr 2014 01:51:04 +0200 Subject: [PATCH 2/9] Changed loading from database --- src/org/rev317/min/Loader.java | 47 +++++++++++++++++----------------- 1 file changed, 23 insertions(+), 24 deletions(-) diff --git a/src/org/rev317/min/Loader.java b/src/org/rev317/min/Loader.java index 4aba373..d750723 100644 --- a/src/org/rev317/min/Loader.java +++ b/src/org/rev317/min/Loader.java @@ -1,16 +1,13 @@ 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.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; 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.ui.BotMenu; +import javax.swing.*; +import java.applet.Applet; +import java.io.File; +import java.net.URL; + /** * * @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 { private Applet applet; @@ -33,7 +35,7 @@ public class Loader extends ServerProvider { try { final Context context = Context.getInstance(); final ASMClassLoader classLoader = context.getASMClassLoader(); - final Class clientClass = classLoader.loadClass("Client"); + final Class clientClass = classLoader.loadClass(context.getServerProviderInfo().getClientClass()); Object instance = clientClass.newInstance(); applet = (Applet) instance; return applet; @@ -43,15 +45,17 @@ public class Loader extends ServerProvider { } } - @Override - public URL getJar() { - try { - return new File("D:/317client.jar").toURI().toURL(); - } catch(Throwable t) { - t.printStackTrace(); - } - return null; - } + @Override + public URL getJar() { + ServerProviderInfo serverProvider = Context.getInstance().getServerProviderInfo(); + + File target = new File(Directories.getCachePath(), serverProvider.getClientCRC32() + ".jar"); + if(!target.exists()) { + WebUtil.downloadFile(serverProvider.getClient(), target, VerboseLoader.get()); + } + + return WebUtil.toURL(target); + } public static Client getClient() { return (Client) Context.getInstance().getClient(); @@ -77,12 +81,7 @@ public class Loader extends ServerProvider { @Override public HookFile getHookFile() { - try { - return new HookFile(new URL("http://bot.parabot.org/hooks/317api_hooks_min.xml"), HookFile.TYPE_XML); - } catch (MalformedURLException e) { - e.printStackTrace(); - } - return null; + return new HookFile(Context.getInstance().getServerProviderInfo().getHookFile(), HookFile.TYPE_XML); } public void unloadScript(Script script) { From faffaaec93de76edac02521344d30c58d72fd4e4 Mon Sep 17 00:00:00 2001 From: JKetelaar Date: Fri, 11 Apr 2014 02:05:09 +0200 Subject: [PATCH 3/9] Changed version --- src/org/rev317/min/Loader.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/org/rev317/min/Loader.java b/src/org/rev317/min/Loader.java index d750723..a3bcc79 100644 --- a/src/org/rev317/min/Loader.java +++ b/src/org/rev317/min/Loader.java @@ -22,11 +22,11 @@ import java.io.File; import java.net.URL; /** - * + * * @author Everel * */ -@ServerManifest(author = "Everel & Paradox", name = "Server name here", type = Type.INJECTION, version = 0.2) +@ServerManifest(author = "Everel & Paradox", name = "Server name here", type = Type.INJECTION, version = 0.3) public class Loader extends ServerProvider { private Applet applet; From e73b5893ebf48c23375240b320eed807763ca072 Mon Sep 17 00:00:00 2001 From: JKetelaar Date: Fri, 11 Apr 2014 02:05:45 +0200 Subject: [PATCH 4/9] Changed version --- src/org/rev317/min/Loader.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/org/rev317/min/Loader.java b/src/org/rev317/min/Loader.java index a3bcc79..23fad93 100644 --- a/src/org/rev317/min/Loader.java +++ b/src/org/rev317/min/Loader.java @@ -69,7 +69,6 @@ public class Loader extends ServerProvider { @Override public void injectHooks() { AddInterfaceAdapter.setAccessorPackage("org/rev317/min/accessors/"); - // default injection is done by bot, it basically parses the hooks file super.injectHooks(); } From eb1d3ce7178fb4bd93945562e6575d64d241db15 Mon Sep 17 00:00:00 2001 From: JKetelaar Date: Fri, 11 Apr 2014 02:07:14 +0200 Subject: [PATCH 5/9] Reverted previous commit --- src/org/rev317/min/Loader.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/org/rev317/min/Loader.java b/src/org/rev317/min/Loader.java index 23fad93..a3bcc79 100644 --- a/src/org/rev317/min/Loader.java +++ b/src/org/rev317/min/Loader.java @@ -69,6 +69,7 @@ public class Loader extends ServerProvider { @Override public void injectHooks() { AddInterfaceAdapter.setAccessorPackage("org/rev317/min/accessors/"); + // default injection is done by bot, it basically parses the hooks file super.injectHooks(); } From 99cfb31b7c8a77c83eb6881ee67a1f800ef2dd3c Mon Sep 17 00:00:00 2001 From: Mathias Date: Tue, 15 Apr 2014 11:43:42 -0700 Subject: [PATCH 6/9] Update DSceneObjects.java Reverses the output. So it become easier to read. And I added nullchecks just incase. --- src/org/rev317/min/debug/DSceneObjects.java | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/org/rev317/min/debug/DSceneObjects.java b/src/org/rev317/min/debug/DSceneObjects.java index 5dc39cb..b35fd5f 100644 --- a/src/org/rev317/min/debug/DSceneObjects.java +++ b/src/org/rev317/min/debug/DSceneObjects.java @@ -10,7 +10,6 @@ public class DSceneObjects extends AbstractDebugger { @Override public void paint(Graphics g) { - } @Override @@ -21,8 +20,15 @@ public class DSceneObjects extends AbstractDebugger { @Override public void toggle() { SceneObject[] objects = SceneObjects.getNearest(); - for(SceneObject object : objects) { - System.out.println("ID: " + object.getId() + " UID: " + object.getHash() + " Location: " + object.getLocation() + " Distance: " + object.distanceTo()); + if(objects == null || objects.length == 0) + return; + + for (int i = objects.length - 1; i >= 0; i--) { + System.out.println( + " ID: " + objects[i].getId() + + " UID: " + objects[i].getHash() + + " Location: "+ objects[i].getLocation() + + " Distance: "+ objects[i].distanceTo()); } } From c4b4d267d7b3ff0e81413d8b419e60f95cf489e0 Mon Sep 17 00:00:00 2001 From: Mathias Date: Tue, 15 Apr 2014 11:53:39 -0700 Subject: [PATCH 7/9] Update BotMenu.java Added inventory & bank debugging. --- src/org/rev317/min/ui/BotMenu.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/org/rev317/min/ui/BotMenu.java b/src/org/rev317/min/ui/BotMenu.java index be7d929..bdf75a6 100644 --- a/src/org/rev317/min/ui/BotMenu.java +++ b/src/org/rev317/min/ui/BotMenu.java @@ -20,6 +20,8 @@ public class BotMenu implements ActionListener { JMenu debug = new JMenu("Debug"); + JMenuItem inventory = newItem("Inventory"); + JMenuItem bank = newItem("Bank"); JMenuItem map = newItem("Map"); JMenuItem animation = newItem("Animation"); JMenuItem objects = newItem("Objects"); @@ -31,6 +33,8 @@ public class BotMenu implements ActionListener { debugger.addDebugger("Actions", new DActions()); debugger.addDebugger("Animation", new DAnimation()); + debugger.addDebugger("Inventory", new DInventory()); + debugger.addDebugger("Bank", new DBank()); debugger.addDebugger("Map", new DMap()); debugger.addDebugger("Objects", new DSceneObjects()); debugger.addDebugger("Npcs", new DNpcs()); @@ -46,6 +50,8 @@ public class BotMenu implements ActionListener { debug.add(items); debug.add(interfaces); debug.add(flags); + debug.add(inventory); + debug.add(bank); bar.add(debug); } @@ -62,4 +68,3 @@ public class BotMenu implements ActionListener { } } - From 98ea9621c176dc3ae006c321f1355bb79513d8eb Mon Sep 17 00:00:00 2001 From: Mathias Date: Tue, 15 Apr 2014 11:55:28 -0700 Subject: [PATCH 8/9] Create DBank.java Debugs the bank. --- src/org/rev317/min/debug/DBank.java | 32 +++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 src/org/rev317/min/debug/DBank.java diff --git a/src/org/rev317/min/debug/DBank.java b/src/org/rev317/min/debug/DBank.java new file mode 100644 index 0000000..88072ab --- /dev/null +++ b/src/org/rev317/min/debug/DBank.java @@ -0,0 +1,32 @@ +package org.rev317.min.debug; + +import java.awt.Graphics; + +import org.parabot.core.paint.AbstractDebugger; +import org.rev317.min.api.methods.Bank; + +public class DBank extends AbstractDebugger { + + @Override + public void paint(Graphics g) { + + } + + @Override + public boolean isEnabled() { + return false; + } + + @Override + public void toggle() { + if (!Bank.isOpen()) + return; + + for (int i = Bank.getBankItems().length - 1; i >= 0; i--) { + System.out.println("ID: " + Bank.getBankItems()[i].getId() + + " Stack: " + Bank.getBankItems()[i].getStackSize() + + " Slot: " + Bank.getBankItems()[i].getSlot()); + } + } + +} From 7d0d9b275802eb8196bf7d92e8a9d2f7e991070c Mon Sep 17 00:00:00 2001 From: Mathias Date: Tue, 15 Apr 2014 11:56:25 -0700 Subject: [PATCH 9/9] Create DInventory.java Debugs the inventory. --- src/org/rev317/min/debug/DInventory.java | 28 ++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 src/org/rev317/min/debug/DInventory.java diff --git a/src/org/rev317/min/debug/DInventory.java b/src/org/rev317/min/debug/DInventory.java new file mode 100644 index 0000000..f08df94 --- /dev/null +++ b/src/org/rev317/min/debug/DInventory.java @@ -0,0 +1,28 @@ +package org.rev317.min.debug; + +import java.awt.Graphics; + +import org.parabot.core.paint.AbstractDebugger; +import org.rev317.min.api.methods.Inventory; +import org.rev317.min.api.wrappers.Item; + +public class DInventory extends AbstractDebugger { + + @Override + public void paint(Graphics g) { + + } + + @Override + public boolean isEnabled() { + return false; + } + + @Override + public void toggle() { + for(Item i : Inventory.getItems()) { + System.out.println("ID: " + i.getId() + " Stack: " + i.getStackSize() + " Slot: " + i.getSlot()); + } + } + +}