From 0ecef657c5d0e88f8ef35bb93bd7286865b05cc4 Mon Sep 17 00:00:00 2001 From: Jeroen Ketelaar Date: Tue, 18 Feb 2014 22:40:06 +0100 Subject: [PATCH] Started on random handler --- .../org/parabot/core/ui/ScriptSelector.java | 37 +++++--------- .../parabot/environment/randoms/Handler.java | 49 +++++++++++++++++++ .../parabot/environment/scripts/Script.java | 6 +-- .../environment/servers/ServerProvider.java | 9 +++- 4 files changed, 71 insertions(+), 30 deletions(-) create mode 100644 parabotv2/src/org/parabot/environment/randoms/Handler.java diff --git a/parabotv2/src/org/parabot/core/ui/ScriptSelector.java b/parabotv2/src/org/parabot/core/ui/ScriptSelector.java index dd582fa..472ff33 100644 --- a/parabotv2/src/org/parabot/core/ui/ScriptSelector.java +++ b/parabotv2/src/org/parabot/core/ui/ScriptSelector.java @@ -1,36 +1,23 @@ package org.parabot.core.ui; -import java.awt.BorderLayout; -import java.awt.Color; -import java.awt.Component; -import java.awt.Desktop; -import java.awt.Dimension; -import java.awt.Font; -import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; -import java.awt.image.BufferedImage; -import java.util.HashMap; - -import javax.swing.ImageIcon; -import javax.swing.JButton; -import javax.swing.JEditorPane; -import javax.swing.JFrame; -import javax.swing.JLabel; -import javax.swing.JPanel; -import javax.swing.JScrollPane; -import javax.swing.JTree; -import javax.swing.event.TreeSelectionEvent; -import javax.swing.event.TreeSelectionListener; -import javax.swing.tree.DefaultMutableTreeNode; -import javax.swing.tree.DefaultTreeModel; -import javax.swing.tree.TreeCellRenderer; - import org.parabot.core.Context; import org.parabot.core.Directories; import org.parabot.core.desc.ScriptDescription; import org.parabot.core.parsers.scripts.ScriptParser; import org.parabot.environment.scripts.Category; +import javax.swing.*; +import javax.swing.event.TreeSelectionEvent; +import javax.swing.event.TreeSelectionListener; +import javax.swing.tree.DefaultMutableTreeNode; +import javax.swing.tree.DefaultTreeModel; +import javax.swing.tree.TreeCellRenderer; +import java.awt.*; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.awt.image.BufferedImage; +import java.util.HashMap; + /** * * Script Selector GUI, shows all scripts diff --git a/parabotv2/src/org/parabot/environment/randoms/Handler.java b/parabotv2/src/org/parabot/environment/randoms/Handler.java new file mode 100644 index 0000000..5b11963 --- /dev/null +++ b/parabotv2/src/org/parabot/environment/randoms/Handler.java @@ -0,0 +1,49 @@ +package org.parabot.environment.randoms; + +import org.parabot.environment.scripts.Script; + +import java.util.ArrayList; + +/** + * User: Jeroen + * Date: 18/02/14 + * Time: 19:37 + */ +public class Handler { + + + public static class RandomChecker { + private ArrayList randoms; + + public void addRandom(Random random) { + randoms.add(random); + } + + public void checkAndRun() { + Script s = new Script(); + for(Random r : randoms) { + if(r.shouldRun()) { + s.setState(1); + r.run(); + } + } + } + } + + public interface Random { + public boolean shouldRun(); + public void run(); + } + + public abstract class RandomScript { + //private RandomChecker randomChecker = ServerProvider.getRandomChecker(); + + public void scriptLoop() { + while(true) { + // randomChecker.checkAndRun(); + // framework.loop(); + } + } + } + +} diff --git a/parabotv2/src/org/parabot/environment/scripts/Script.java b/parabotv2/src/org/parabot/environment/scripts/Script.java index dee3cdc..59b7c08 100644 --- a/parabotv2/src/org/parabot/environment/scripts/Script.java +++ b/parabotv2/src/org/parabot/environment/scripts/Script.java @@ -1,7 +1,5 @@ package org.parabot.environment.scripts; -import java.util.Collection; - import org.parabot.core.Context; import org.parabot.core.Core; import org.parabot.core.ui.components.BotToolbar; @@ -12,6 +10,8 @@ import org.parabot.environment.scripts.framework.LoopTask; import org.parabot.environment.scripts.framework.SleepCondition; import org.parabot.environment.scripts.framework.Strategy; +import java.util.Collection; + /** * * Script template, scripts are 'add-ons' which executes various tasks in-game @@ -33,7 +33,7 @@ public class Script implements Runnable { public static final int STATE_PAUSE = 1; public static final int STATE_STOPPED = 2; - public boolean onExecute() { + public boolean onExecute() { return true; } diff --git a/parabotv2/src/org/parabot/environment/servers/ServerProvider.java b/parabotv2/src/org/parabot/environment/servers/ServerProvider.java index a8c4173..55a6a52 100644 --- a/parabotv2/src/org/parabot/environment/servers/ServerProvider.java +++ b/parabotv2/src/org/parabot/environment/servers/ServerProvider.java @@ -10,7 +10,6 @@ import org.parabot.environment.input.Mouse; import org.parabot.environment.scripts.Script; import javax.swing.*; - import java.applet.Applet; import java.applet.AppletStub; import java.net.URL; @@ -23,7 +22,12 @@ import java.net.URL; */ public abstract class ServerProvider implements Opcodes { - /** +// public static Handler.RandomChecker getRandomChecker() { +// Handler.RandomChecker randomChecker = new Handler.RandomChecker(); +// return randomChecker; +// } + + /** * Hooks to parse * * @deprecated use getHookFile() now @@ -133,4 +137,5 @@ public abstract class ServerProvider implements Opcodes { } + }