Skip to content

Commit 3c53c0a

Browse files
chsamichsami
authored
Merge pull request #289 from chsami/development
Development into main
2 parents 4daf77b + a7b373f commit 3c53c0a

50 files changed

Lines changed: 1456 additions & 670 deletions

Some content is hidden

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

‎.github/workflows/release.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ jobs:
2727
uses: "marvinpinto/action-automatic-releases@latest"
2828
with:
2929
repo_token: "${{ secrets.GITHUB_TOKEN }}"
30-
automatic_release_tag: "1.3.4"
30+
automatic_release_tag: "1.3.5"
3131
prerelease: false
32-
title: "Release 1.3.4"
32+
title: "Release 1.3.5"
3333
files: |
3434
/home/runner/work/microbot/microbot/runelite-client/target/microbot-*.jar

‎.gitignore‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,4 @@ project.properties
1010
.classpath
1111
.vscode
1212
.factorypath
13-
.DS_Store
13+
.DS_Store

‎runelite-client/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
<git.commit.id.abbrev>nogit</git.commit.id.abbrev>
4242
<git.dirty>false</git.dirty>
4343
<shade.skip>false</shade.skip>
44-
<microbot.version>1.3.4</microbot.version>
44+
<microbot.version>1.3.5</microbot.version>
4545
</properties>
4646

4747
<dependencies>

‎runelite-client/src/main/java/net/runelite/client/plugins/PluginDescriptor.java‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,7 @@
3838
String Bank = "<html>[<font color=#9900ff>B</font>] ";
3939
String Forn = "<html>[<font color=#AF2B1E>F</font>] ";
4040
String See1Duck = "<html>[<font color=#ffff1a>\uD83E\uDD86</font>] ";
41-
42-
String Lucid = "<html>[<font color=#32CD32>L</font>] ";
43-
44-
String xKylee = "<html><font color=\"#32CD32\">K</font>";
41+
String GMason = "<html>[<font color=#F213E8>G</font>] ";
4542

4643
String name();
4744

‎runelite-client/src/main/java/net/runelite/client/plugins/devtools/WidgetInfoTableModel.java‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,17 +26,18 @@
2626

2727
import com.google.common.collect.ImmutableMap;
2828
import com.google.inject.Inject;
29-
import java.util.ArrayList;
30-
import java.util.List;
31-
import java.util.Map;
32-
import java.util.function.Function;
33-
import javax.swing.SwingUtilities;
34-
import javax.swing.table.AbstractTableModel;
3529
import net.runelite.api.Client;
3630
import net.runelite.api.WidgetNode;
3731
import net.runelite.api.widgets.Widget;
3832
import net.runelite.client.callback.ClientThread;
3933

34+
import javax.swing.*;
35+
import javax.swing.table.AbstractTableModel;
36+
import java.util.ArrayList;
37+
import java.util.List;
38+
import java.util.Map;
39+
import java.util.function.Function;
40+
4041
public class WidgetInfoTableModel extends AbstractTableModel
4142
{
4243
@Inject
@@ -148,6 +149,7 @@ private List<WidgetField<?>> populateWidgetFields()
148149
out.add(new WidgetField<>("SelfHidden", Widget::isSelfHidden, Widget::setHidden, Boolean.class));
149150
out.add(new WidgetField<>("Hidden", Widget::isHidden));
150151
out.add(new WidgetField<>("Text", Widget::getText, Widget::setText, String.class));
152+
out.add(new WidgetField<>("Actions", Widget::getActions));
151153
out.add(new WidgetField<>("TextColor",
152154
w -> Integer.toString(w.getTextColor(), 16),
153155
(w, str) -> w.setTextColor(Integer.parseInt(str, 16)),

‎runelite-client/src/main/java/net/runelite/client/plugins/microbot/agility/MicroAgilityPlugin.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ protected void startUp() throws AWTException {
5252
agilityScript.draynorCourse.add(new AgilityObstacleModel(TIGHTROPE_11406));
5353
agilityScript.draynorCourse.add(new AgilityObstacleModel(NARROW_WALL));
5454
agilityScript.draynorCourse.add(new AgilityObstacleModel(WALL_11630, -1, 3256, Operation.GREATER, Operation.GREATER_EQUAL));
55-
agilityScript.draynorCourse.add(new AgilityObstacleModel(GAP_11631, -1, 3256, Operation.GREATER, Operation.LESS_EQUAL));
55+
agilityScript.draynorCourse.add(new AgilityObstacleModel(GAP_11631, -1, 3255, Operation.GREATER, Operation.LESS_EQUAL));
5656
agilityScript.draynorCourse.add(new AgilityObstacleModel(CRATE_11632));
5757

5858
// Al Kharid

runelite-client/src/main/java/net/runelite/client/plugins/microbot/bankjs/development/BanksShopper/Actions.java renamed to runelite-client/src/main/java/net/runelite/client/plugins/microbot/bankjs/BanksShopper/Actions.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package net.runelite.client.plugins.microbot.bankjs.development.BanksShopper;
1+
package net.runelite.client.plugins.microbot.bankjs.BanksShopper;
22

33

44
import lombok.Getter;

runelite-client/src/main/java/net/runelite/client/plugins/microbot/bankjs/development/BanksShopper/BanksShopperConfig.java renamed to runelite-client/src/main/java/net/runelite/client/plugins/microbot/bankjs/BanksShopper/BanksShopperConfig.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package net.runelite.client.plugins.microbot.bankjs.development.BanksShopper;
1+
package net.runelite.client.plugins.microbot.bankjs.BanksShopper;
22

33
import net.runelite.client.config.*;
44

runelite-client/src/main/java/net/runelite/client/plugins/microbot/bankjs/development/BanksShopper/BanksShopperOverlay.java renamed to runelite-client/src/main/java/net/runelite/client/plugins/microbot/bankjs/BanksShopper/BanksShopperOverlay.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package net.runelite.client.plugins.microbot.bankjs.development.BanksShopper;
1+
package net.runelite.client.plugins.microbot.bankjs.BanksShopper;
22

33
import net.runelite.client.plugins.microbot.Microbot;
44
import net.runelite.client.ui.overlay.OverlayPanel;

runelite-client/src/main/java/net/runelite/client/plugins/microbot/bankjs/development/BanksShopper/BanksShopperPlugin.java renamed to runelite-client/src/main/java/net/runelite/client/plugins/microbot/bankjs/BanksShopper/BanksShopperPlugin.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package net.runelite.client.plugins.microbot.bankjs.development.BanksShopper;
1+
package net.runelite.client.plugins.microbot.bankjs.BanksShopper;
22

33
import com.google.inject.Provides;
44
import lombok.extern.slf4j.Slf4j;

0 commit comments

Comments
 (0)