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

Commit 98ef3f2

Browse files
ExplvExplv
Explv
authored and
Explv
committed
Fix image loading
Use Roboto for paint font Fix DurationPanel saving / loading Fix RuneCrafting not withdrawing 28 essence when using tiara
1 parent ff31a63 commit 98ef3f2

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

78 files changed

+47
-51
lines changed

‎README.md‎

Lines changed: 1 addition & 1 deletion

‎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.0.0</version>
9+
<version>v3.0.1</version>
1010
<repositories>
1111
<repository>
1212
<id>local-repo</id>

‎src/main/java/activities/skills/runecrafting/RunecraftingActivity.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ public void onStart() {
2626
talismanBanking.exchangeContext(getBot());
2727

2828
if (getInventory().contains(altar.tiara) || getEquipment().isWearingItem(EquipmentSlot.HAT, altar.tiara)) {
29-
talismanReq = new ItemReq(altar.tiara);
29+
talismanReq = new ItemReq(altar.tiara).setEquipable();
3030
} else if (getInventory().contains(altar.talisman)) {
3131
talismanReq = new ItemReq(altar.talisman);
3232
}

‎src/main/java/gui/Gui.java‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,8 @@ public Gui() {
6767
saveLoadPanel.add(createButtonPanel(
6868
"Save",
6969
"Save",
70-
"saveIcon.png",
71-
"saveIconHover.png",
70+
"images/saveIcon.png",
71+
"images/saveIconHover.png",
7272
e -> {
7373
if (!validate(gui)) {
7474
JOptionPane.showMessageDialog(gui, "Fields highlighted in red are invalid", "Error", JOptionPane.ERROR_MESSAGE);
@@ -81,8 +81,8 @@ public Gui() {
8181
saveLoadPanel.add(createButtonPanel(
8282
"Load",
8383
"Load",
84-
"loadIcon.png",
85-
"loadIconHover.png",
84+
"images/loadIcon.png",
85+
"images/loadIconHover.png",
8686
e -> loadConfig()
8787
));
8888

@@ -108,56 +108,56 @@ public Gui() {
108108
addTaskPanel.add(createButtonPanel(
109109
"Level",
110110
"Level Task",
111-
"levelIcon.png",
112-
"levelIconHover.png",
111+
"images/levelIcon.png",
112+
"images/levelIconHover.png",
113113
e -> taskList.addTask(TaskType.LEVEL)
114114
));
115115

116116
addTaskPanel.add(createButtonPanel(
117117
"Resource",
118118
"Resource Task",
119-
"resourceIcon.png",
120-
"resourceIconHover.png",
119+
"images/resourceIcon.png",
120+
"images/resourceIconHover.png",
121121
e -> taskList.addTask(TaskType.RESOURCE)
122122
));
123123

124124
addTaskPanel.add(createButtonPanel(
125125
"Timed",
126126
"Timed Task",
127-
"timedIcon.png",
128-
"timedIconHover.png",
127+
"images/timedIcon.png",
128+
"images/timedIconHover.png",
129129
e -> taskList.addTask(TaskType.TIMED)
130130
));
131131

132132
addTaskPanel.add(createButtonPanel(
133133
"Loop",
134134
"Loop Previous Tasks",
135-
"loopIcon.png",
136-
"loopIconHover.png",
135+
"images/loopIcon.png",
136+
"images/loopIconHover.png",
137137
e -> taskList.addTask(TaskType.LOOP)
138138
));
139139

140140
addTaskPanel.add(createButtonPanel(
141141
"Quest",
142142
"Quest Task",
143-
"questIcon.png",
144-
"questIconHover.png",
143+
"images/questIcon.png",
144+
"images/questIconHover.png",
145145
e -> taskList.addTask(TaskType.QUEST)
146146
));
147147

148148
addTaskPanel.add(createButtonPanel(
149149
"Grand Exchange",
150150
"GE Task",
151-
"geIcon.png",
152-
"geIconHover.png",
151+
"images/geIcon.png",
152+
"images/geIconHover.png",
153153
e -> taskList.addTask(TaskType.GRAND_EXCHANGE)
154154
));
155155

156156
addTaskPanel.add(createButtonPanel(
157157
"Break",
158158
"Break Task",
159-
"breakIcon.png",
160-
"breakIconHover.png",
159+
"images/breakIcon.png",
160+
"images/breakIconHover.png",
161161
e -> taskList.addTask(TaskType.BREAK)
162162
));
163163
controlsPanel.add(createSpacerPanel());
@@ -180,8 +180,8 @@ public Gui() {
180180
startPanel.add(createButtonPanel(
181181
"Start",
182182
"Start",
183-
"startIcon.png",
184-
"startIconHover.png",
183+
"images/startIcon.png",
184+
"images/startIconHover.png",
185185
e -> {
186186
if (!validate(gui)) {
187187
JOptionPane.showMessageDialog(gui, "Fields highlighted in red are invalid", "Error", JOptionPane.ERROR_MESSAGE);

‎src/main/java/gui/task_panels/TaskPanel.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,17 +50,17 @@ public TaskPanel(final TaskType taskType) {
5050

5151
box.add(Box.createHorizontalGlue());
5252

53-
moveTaskUpButton = IconButton.createButton("Move task up", "moveUpIcon.png", "moveUpIconHover.png", null);
53+
moveTaskUpButton = IconButton.createButton("Move task up", "images/moveUpIcon.png", "images/moveUpIconHover.png", null);
5454
box.add(moveTaskUpButton);
5555

5656
box.add(Box.createHorizontalStrut(5));
5757

58-
moveTaskDownButton = IconButton.createButton("Move task down", "moveDownIcon.png", "moveDownIconHover.png", null);
58+
moveTaskDownButton = IconButton.createButton("Move task down", "images/moveDownIcon.png", "images/moveDownIconHover.png", null);
5959
box.add(moveTaskDownButton);
6060

6161
box.add(Box.createHorizontalStrut(5));
6262

63-
removeTaskButton = IconButton.createButton("Remove task", "closeIcon.png", "closeIconHover.png", null);
63+
removeTaskButton = IconButton.createButton("Remove task", "images/closeIcon.png", "images/closeIconHover.png", null);
6464
box.add(removeTaskButton);
6565

6666
JPopupMenu contextMenu = new JPopupMenu();

‎src/main/java/gui/utils/CopyToClipboardButton.java‎

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

1111
public class CopyToClipboardButton {
1212
public static JButton create(final Supplier<String> textSupplier) {
13-
return IconButton.createButton("Copy to clipboard", "clipboardIcon.png", "clipboardIconHover.png", e -> {
13+
return IconButton.createButton("Copy to clipboard", "images/clipboardIcon.png", "images/clipboardIconHover.png", e -> {
1414
Clipboard clipboard = Toolkit.getDefaultToolkit().getSystemClipboard();
1515
clipboard.setContents(new StringSelection(textSupplier.get()), null);
1616
});

‎src/main/java/gui/utils/DurationPanel.java‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -69,23 +69,28 @@ public LocalDateTime getSelectedDateTime() {
6969
public JSONObject toJSON() {
7070
JSONObject jsonObject = new JSONObject();
7171

72-
if (timeTypeSelector.getSelectedItem() == TimeType.MINUTES) {
73-
jsonObject.put("duration", durationField.getText());
74-
} else {
72+
jsonObject.put("time_type", ((TimeType) timeTypeSelector.getSelectedItem()).name());
73+
74+
if (timeTypeSelector.getSelectedItem() == TimeType.DATE_TIME) {
7575
jsonObject.put(
7676
"datetime",
7777
dateTimePanel.getDateTime().format(dtFormatter)
7878
);
79+
} else {
80+
jsonObject.put("duration", durationField.getText());
7981
}
8082

8183
return jsonObject;
8284
}
8385

8486
@Override
8587
public void fromJSON(final JSONObject jsonObject) {
88+
if (jsonObject.containsKey("time_type")) {
89+
timeTypeSelector.setSelectedItem(TimeType.valueOf((String) jsonObject.get("time_type")));
90+
}
91+
8692
if (jsonObject.containsKey("duration")) {
8793
durationField.setText((String) jsonObject.get("duration"));
88-
timeTypeSelector.setSelectedItem(TimeType.MINUTES);
8994
}
9095

9196
if (jsonObject.containsKey("datetime")) {
@@ -95,7 +100,6 @@ public void fromJSON(final JSONObject jsonObject) {
95100
dtFormatter
96101
);
97102
dateTimePanel.setDateTime(datetime);
98-
timeTypeSelector.setSelectedItem(TimeType.DATE_TIME);
99103
}
100104
}
101105

‎src/main/java/gui/utils/LoadoutPanel.java‎

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

2929
public class LoadoutPanel extends JPanel {
3030

31-
private static final String IMAGE_DIR = "/loadout/";
31+
private static final String IMAGE_DIR = "images/loadout/";
3232
private static final BufferedImage SLOT_BACKGROUND_IMAGE = ImageManager.loadImage(IMAGE_DIR + "slot_background.png");
3333

3434
private Map<EquipmentSlot, String> equipmentMap = new HashMap<>();

‎src/main/java/paint/Paint.java‎

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7,18 +7,17 @@
77
import tasks.Task;
88
import util.RSUnits;
99
import util.SkillTracker;
10+
import util.file_managers.FontManager;
11+
import util.file_managers.ImageManager;
1012

11-
import javax.imageio.ImageIO;
1213
import java.awt.*;
1314
import java.awt.event.MouseEvent;
14-
import java.io.IOException;
1515

1616
public class Paint implements Painter {
1717

1818
private final Bot bot;
1919
private final SkillTracker skillTracker;
2020
private final Color holoBlueLight = Color.decode("#33b5e5");
21-
private final Font trebuchet = new Font("Trebuchet MS", Font.PLAIN, 14);
2221
private final Rectangle toggleButton = new Rectangle(435, 7, 76, 24);
2322
private int offsetY;
2423
private int offsetX;
@@ -27,20 +26,15 @@ public class Paint implements Painter {
2726
private Task currentTask;
2827
private boolean paintHidden;
2928
private boolean toggleButtonHovered;
30-
private Image mouseImage;
29+
30+
private static final Image mouseImage = ImageManager.loadImage("images/cursor.png");
3131

3232
private boolean paused;
3333

3434
public Paint(final Bot bot, final SkillTracker skillTracker) {
3535
this.bot = bot;
3636
this.skillTracker = skillTracker;
3737

38-
try {
39-
mouseImage = ImageIO.read(getClass().getResourceAsStream("/resources/cursor.png"));
40-
} catch (IOException e) {
41-
e.printStackTrace();
42-
}
43-
4438
bot.addMouseListener(new BotMouseListener() {
4539
@Override
4640
public void checkMouseEvent(final MouseEvent e) {
@@ -98,13 +92,13 @@ private void drawScriptInfo(Graphics2D g) {
9892
if (!paintHidden) {
9993
drawScriptInfoBackground(g);
10094
drawTitle(g);
101-
g.setFont(trebuchet);
95+
g.setFont(FontManager.ROBOTO_REGULAR);
10296
drawRunTime(g);
10397
drawTaskInfo(g);
10498
drawActivityInfo(g);
10599
drawSkillsInfo(g);
106100
}
107-
g.setFont(trebuchet);
101+
g.setFont(FontManager.ROBOTO_REGULAR);
108102
drawTogglePaintButton(g);
109103
}
110104

‎src/main/java/script/AIO.java‎

Lines changed: 3 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.0.0";
33+
static final String VERSION = "v3.0.1";
3434

3535
private Gui gui;
3636
private Paint paint;
@@ -162,7 +162,8 @@ private boolean osrsClientIsConfigurable() {
162162
!getDialogues().isPendingContinuation() &&
163163
!myPlayer().isAnimating() &&
164164
taskExecutor.getCurrentTask() != null &&
165-
!(taskExecutor.getCurrentTask() instanceof TutorialIslandTask);
165+
!(taskExecutor.getCurrentTask() instanceof TutorialIslandTask) &&
166+
getNpcs().closest("Lumbridge Guide") == null;
166167
}
167168

168169
private boolean configureOSRSClient() {

0 commit comments

Comments
 (0)