Skip to content
This repository was archived by the owner on Feb 9, 2022. It is now read-only.

Commit 966678e

Browse files
author
Explv
committed
- Fix item name autocomplete not working
- Fix (some) of the GUI styling - Update to latest OSBot version (some API changes)
1 parent cd53d27 commit 966678e

File tree

6 files changed

+14
-18
lines changed

6 files changed

+14
-18
lines changed

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<groupId>org.explv.explv_osbot_manager</groupId>
88
<artifactId>explvs_aio</artifactId>
9-
<version>v3.1.3</version>
9+
<version>v3.1.4</version>
1010
<repositories>
1111
<repository>
1212
<id>local-repo</id>

src/main/java/activities/grand_exchange/item_guide/ItemGuide.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ public static Map<String, Integer> getAllGEItems() {
2626
try {
2727
if (!summaryFile.exists()) {
2828
System.out.println("Downloading summary JSON from RSBuddy");
29-
URL website = new URL("https://storage.googleapis.com/osbuddy-exchange/summary.json");
29+
URL website = new URL("https://rsbuddy.com/exchange/summary.json");
3030
ReadableByteChannel rbc = Channels.newChannel(website.openStream());
3131
FileOutputStream fos = new FileOutputStream(summaryFile);
3232
fos.getChannel().transferFrom(rbc, 0, Long.MAX_VALUE);

src/main/java/gui/Gui.java

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,7 @@
1818
import java.util.Optional;
1919

2020
public class Gui {
21-
22-
public static final Color DARK_GREY = Color.decode("#181818");
23-
21+
2422
private JDialog gui;
2523
private TaskList taskList;
2624

@@ -31,10 +29,10 @@ public Gui() {
3129
gui.setTitle("Explv's AIO");
3230
gui.setModal(true);
3331
gui.setModalityType(Dialog.ModalityType.DOCUMENT_MODAL);
34-
gui.setBackground(DARK_GREY);
32+
gui.setBackground(ColourScheme.DIALOG_BACKGROUND_GREY);
3533

3634
JPanel mainPanel = new StyledJPanel(new BorderLayout(0, 0));
37-
mainPanel.setBackground(DARK_GREY);
35+
mainPanel.setBackground(ColourScheme.DIALOG_BACKGROUND_GREY);
3836
mainPanel.setBorder(BorderFactory.createEmptyBorder(20, 20, 20, 10));
3937

4038
final JLabel titleLabel = new StyledJLabel();
@@ -46,12 +44,12 @@ public Gui() {
4644

4745
final JPanel controlsPanel = new StyledJPanel();
4846
controlsPanel.setLayout(new FlowLayout(FlowLayout.CENTER, 5, 5));
49-
controlsPanel.setBackground(DARK_GREY);
47+
controlsPanel.setBackground(ColourScheme.DIALOG_BACKGROUND_GREY);
5048
mainPanel.add(controlsPanel, BorderLayout.SOUTH);
5149

5250
final JPanel saveLoadPanel = new StyledJPanel();
5351
saveLoadPanel.setLayout(new FlowLayout(FlowLayout.CENTER, 5, 5));
54-
saveLoadPanel.setBackground(DARK_GREY);
52+
saveLoadPanel.setBackground(ColourScheme.DIALOG_BACKGROUND_GREY);
5553
controlsPanel.add(saveLoadPanel);
5654
saveLoadPanel.setBorder(
5755
BorderFactory.createTitledBorder(
@@ -92,7 +90,7 @@ public Gui() {
9290

9391
final JPanel addTaskPanel = new StyledJPanel();
9492
addTaskPanel.setLayout(new FlowLayout(FlowLayout.CENTER, 5, 5));
95-
addTaskPanel.setBackground(DARK_GREY);
93+
addTaskPanel.setBackground(ColourScheme.DIALOG_BACKGROUND_GREY);
9694
controlsPanel.add(addTaskPanel);
9795
addTaskPanel.setBorder(
9896
BorderFactory.createTitledBorder(
@@ -164,7 +162,7 @@ public Gui() {
164162

165163
final JPanel startPanel = new StyledJPanel();
166164
startPanel.setLayout(new FlowLayout(FlowLayout.CENTER, 5, 5));
167-
startPanel.setBackground(DARK_GREY);
165+
startPanel.setBackground(ColourScheme.DIALOG_BACKGROUND_GREY);
168166
controlsPanel.add(startPanel);
169167
startPanel.setBorder(
170168
BorderFactory.createTitledBorder(
@@ -237,15 +235,15 @@ private boolean validate(final Container container) {
237235

238236
private JPanel createSpacerPanel() {
239237
final JPanel panel = new StyledJPanel(new BorderLayout(0, 0));
240-
panel.setBackground(DARK_GREY);
238+
panel.setBackground(ColourScheme.DIALOG_BACKGROUND_GREY);
241239
panel.setBorder(BorderFactory.createEmptyBorder(0, 5, 0, 5));
242240
return panel;
243241
}
244242

245243
private JPanel createButtonPanel(final String label, final String toolTip, final String icon, final String rolloverIcon, ActionListener callback) {
246244
JPanel buttonPanel = new StyledJPanel(new BorderLayout(0, 3));
247245
buttonPanel.setBorder(BorderFactory.createEmptyBorder(0, 5, 0, 5));
248-
buttonPanel.setBackground(DARK_GREY);
246+
buttonPanel.setOpaque(false);
249247

250248
final JLabel panelLabel = new StyledJLabel();
251249
panelLabel.setForeground(ColourScheme.WHITE);
@@ -254,7 +252,6 @@ private JPanel createButtonPanel(final String label, final String toolTip, final
254252
buttonPanel.add(panelLabel, BorderLayout.SOUTH);
255253

256254
JButton button = IconButton.createButton(toolTip, icon, rolloverIcon, callback);
257-
258255
buttonPanel.add(button, BorderLayout.NORTH);
259256

260257
return buttonPanel;

src/main/java/gui/IconButton.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
public class IconButton {
1111
public static JButton createButton(final String toolTip, final String icon, final String rolloverIcon, ActionListener callback) {
1212
JButton button = new JButton();
13-
button.setBackground(Color.BLACK);
1413
button.setToolTipText(toolTip);
1514

1615
BufferedImage iconImage = ImageManager.loadImage(icon);

src/main/java/script/AIO.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
@ScriptManifest(author = "Explv", name = "Explv's AIO " + AIO.VERSION, info = "AIO", version = 0, logo = "http://i.imgur.com/58Zz0fb.png")
3131
public class AIO extends Script {
3232

33-
static final String VERSION = "v3.1.3";
33+
static final String VERSION = "v3.1.4";
3434

3535
private Gui gui;
3636
private Paint paint;
@@ -145,7 +145,7 @@ private List<Task> loadTasksFromGUI() throws InterruptedException {
145145

146146
@Override
147147
public int onLoop() throws InterruptedException {
148-
if (!getClient().isLoggedIn() || getWidgets().isVisible(WelcomeScreen.INTERFACE)) {
148+
if (!getClient().isLoggedIn()) {
149149
return random(1200, 1800);
150150
} else if (!osrsClientIsConfigured && osrsClientIsConfigurable()) {
151151
osrsClientIsConfigured = configureOSRSClient();

src/main/java/tasks/break_task/CustomBreakManager.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ public boolean finishedBreaking() {
5555

5656
@Override
5757
public int onLoop() throws InterruptedException {
58-
if (shouldLogout && getClient().getLoginState() == Client.LoginState.LOGGED_IN) {
58+
if (shouldLogout && getClient().getLoginState() == Client.LoginState.LOGIN_SUCCESSFUL) {
5959
if (getWidgets().closeOpenInterface() && getLogoutTab().logOut()) {
6060
return 1000;
6161
}

0 commit comments

Comments
 (0)