2006-Scape/Parabot
1
0
Fork 0
mirror of https://github.com/2006-Scape/Parabot.git synced 2026-07-03 00:37:55 +00:00
Code Issues 2 Packages Projects Releases 3 Wiki Activity

Merge branch 'master' of https://github.com/Parabot/Parabot.git

Browse Source
This commit is contained in:
Clisprail
2014-04-29 01:42:47 +02:00
parent 98ac8ab301 f83acee021
commit a4cd5337db
7 changed files with 186 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
README.md
+1 -1
View File
@@ -1,6 +1,6 @@
# Parabot
Parabot V2.08.
Parabot V2.09.
#### Website
parabotv2/src/org/parabot/core/ui/BotUI.java
+30 -16
View File
@@ -1,13 +1,7 @@
package org.parabot.core.ui;
import org.parabot.core.Context;
import org.parabot.core.ui.components.GamePanel;
import org.parabot.core.ui.images.Images;
import org.parabot.environment.scripts.Script;
import javax.swing.*;
import java.awt.*;
import java.awt.BorderLayout;
import java.awt.Point;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.event.ComponentEvent;
@@ -15,6 +9,21 @@ import java.awt.event.ComponentListener;
import java.awt.event.WindowEvent;
import java.awt.event.WindowListener;
import javax.swing.ImageIcon;
import javax.swing.JCheckBoxMenuItem;
import javax.swing.JDialog;
import javax.swing.JFrame;
import javax.swing.JMenu;
import javax.swing.JMenuBar;
import javax.swing.JMenuItem;
import javax.swing.JPopupMenu;
import org.parabot.core.Context;
import org.parabot.core.ui.components.GamePanel;
import org.parabot.core.ui.images.Images;
import org.parabot.core.ui.utils.SwingUtil;
import org.parabot.environment.scripts.Script;
/**
*
* The bot user interface
@@ -41,11 +50,23 @@ public class BotUI extends JFrame implements ActionListener, ComponentListener,
setTitle("Parabot");
setResizable(false);
setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
setIconImage(Images.getResource("/org/parabot/core/ui/images/icon.png"));
createMenu();
setLayout(new BorderLayout());
addComponentListener(this);
addWindowListener(this);
add(GamePanel.getInstance());
GamePanel.getInstance().addLoader();
SwingUtil.setParabotIcons(this);
pack();
setLocationRelativeTo(null);
BotDialog.getInstance(this);
}
private void createMenu() {
JMenuBar menuBar = new JMenuBar();
JMenu file = new JMenu("File");
@@ -87,13 +108,6 @@ public class BotUI extends JFrame implements ActionListener, ComponentListener,
menuBar.add(scripts);
setJMenuBar(menuBar);
add(GamePanel.getInstance());
GamePanel.getInstance().addLoader();
pack();
setLocationRelativeTo(null);
BotDialog.getInstance(this);
}
@Override
parabotv2/src/org/parabot/core/ui/LoginUI.java
+3 -2
View File
@@ -23,6 +23,7 @@ import org.parabot.core.Core;
import org.parabot.core.forum.AccountManager;
import org.parabot.core.forum.AccountManagerAccess;
import org.parabot.core.ui.images.Images;
import org.parabot.core.ui.utils.SwingUtil;
/**
*
@@ -88,8 +89,8 @@ public class LoginUI extends JFrame {
this.setLocationByPlatform(true);
this.setLayout(new BorderLayout());
this.setResizable(false);
this.setIconImage(Images
.getResource("/org/parabot/core/ui/images/icon.png"));
SwingUtil.setParabotIcons(this);
int w = 250;
int x = 8;
parabotv2/src/org/parabot/core/ui/ServerSelector.java
+11 -9
View File
@@ -1,18 +1,20 @@
package org.parabot.core.ui;
import java.awt.BorderLayout;
import java.awt.Dimension;
import java.util.LinkedList;
import java.util.Queue;
import javax.swing.JFrame;
import javax.swing.JPanel;
import javax.swing.JScrollPane;
import org.parabot.core.desc.ServerDescription;
import org.parabot.core.parsers.servers.ServerParser;
import org.parabot.core.ui.components.ServerComponent;
import org.parabot.core.ui.images.Images;
import org.parabot.core.ui.utils.SwingUtil;
import org.parabot.environment.Environment;
import javax.swing.*;
import java.awt.*;
import java.util.LinkedList;
import java.util.Queue;
/**
*
* Shows a list of every supported server which can be started
@@ -48,7 +50,8 @@ public class ServerSelector extends JFrame {
this.setTitle("Servers");
this.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
this.setResizable(false);
this.setIconImage(Images.getResource("/org/parabot/core/ui/images/icon.png"));
SwingUtil.setParabotIcons(this);
this.panel = new JPanel(new BorderLayout());
this.panel.setPreferredSize(new Dimension(600, 400));
@@ -89,7 +92,6 @@ public class ServerSelector extends JFrame {
* @param widgets
*/
private boolean runServer(Queue<ServerComponent> widgets) {
// TODO: test this method
if (widgets == null || widgets.isEmpty()) {
return false;
}
parabotv2/src/org/parabot/core/ui/utils/SwingUtil.java
+24
View File
@@ -1,7 +1,14 @@
package org.parabot.core.ui.utils;
import java.awt.Image;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import javax.swing.JFrame;
import org.parabot.core.ui.images.Images;
import org.parabot.environment.OperatingSystem;
/**
*
* Holds various swing util based methods
@@ -21,5 +28,22 @@ public class SwingUtil {
f.setLocationRelativeTo(null);
f.setVisible(true);
}
public static void setParabotIcons(JFrame f) {
f.setIconImage(Images.getResource("/org/parabot/core/ui/images/icon.png"));
if(OperatingSystem.getOS() == OperatingSystem.MAC) {
/** Adds the dock icon to mac users */
try {
Class<?> util = Class.forName("com.apple.eawt.Application");
Object application = util.getMethod("getApplication", new Class[] { }).invoke(null);
Method setDockIconImage = util.getMethod("setDockIconImage", new Class[] { Image.class });
setDockIconImage.invoke(application, Images.getResource("/org/parabot/core/ui/images/icon.png"));
} catch (ClassNotFoundException | NoSuchMethodException | InvocationTargetException | IllegalAccessException ignored) {
} catch (Throwable t) {
t.printStackTrace();
}
}
}
}
parabotv2/src/org/parabot/environment/scripts/Frameworks.java
Executable
+67
View File
@@ -0,0 +1,67 @@
package org.parabot.environment.scripts;
import java.util.Collection;
import org.parabot.environment.scripts.framework.AbstractFramework;
import org.parabot.environment.scripts.framework.LoopTask;
import org.parabot.environment.scripts.framework.Strategy;
/**
*
* Holds various script frameworks
*
* @author Everel
*
*/
public class Frameworks {
public static Looper getLooper(LoopTask loopTask) {
return new Looper(loopTask);
}
public static StrategyWorker getStrategyWorker(Collection<Strategy> strategies) {
return new StrategyWorker(strategies);
}
}
class Looper extends AbstractFramework {
private LoopTask loopTask = null;
public Looper(LoopTask loopTask) {
this.loopTask = loopTask;
}
@Override
public boolean execute() {
int sleepTime = loopTask.loop();
if(sleepTime < 0) {
return false;
}
try {
Thread.sleep(sleepTime);
} catch (InterruptedException e) {
e.printStackTrace();
}
return true;
}
}
class StrategyWorker extends AbstractFramework {
private Collection<Strategy> strategies;
public StrategyWorker(Collection<Strategy> strategies) {
this.strategies = strategies;
}
@Override
public boolean execute() {
for(Strategy s : strategies) {
if(s.activate()) {
s.execute();
return true;
}
}
return true;
}
}
parabotv2/src/org/parabot/environment/servers/LocalServerExecuter.java
Executable
+50
View File
@@ -0,0 +1,50 @@
package org.parabot.environment.servers;
import org.parabot.core.Core;
import org.parabot.core.Directories;
import org.parabot.core.build.BuildPath;
import org.parabot.core.classpath.ClassPath;
import org.parabot.environment.servers.executers.ServerExecuter;
import java.net.MalformedURLException;
/**
*
* Loads locally stored server providers
*
* @author Everel
*
*/
public class LocalServerExecuter extends ServerExecuter {
private final ServerProvider serverProvider;
private ClassPath classPath;
private String serverName;
public LocalServerExecuter(ServerProvider serverProvider,
ClassPath classPath, final String serverName) {
this.serverProvider = serverProvider;
this.classPath = classPath;
this.serverName = serverName;
}
@Override
public void run() {
// add jar or directory to buildpath.
if (this.classPath.isJar()) {
Core.verbose("Adding server provider jar to buildpath: "
+ this.classPath.lastParsed.toString());
this.classPath.addToBuildPath();
} else {
Core.verbose("Adding server providers directory to buildpath: "
+ Directories.getServerPath().getPath());
try {
BuildPath.add(Directories.getServerPath().toURI().toURL());
} catch (MalformedURLException e) {
e.printStackTrace();
}
}
// finalize
super.finalize(this.serverProvider, this.serverName);
}
}