ra/runelite
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/0908-merge' into 0908-merge

Browse Source
This commit is contained in:
Owain van Brakel
2019-08-11 05:13:29 +02:00
parent 8db4f83fa3 df0501f302
commit 66f0c6aeb8
4 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
runelite-api/src/main/java/net/runelite/api/widgets/Widget.java
View File

@@ -623,7 +623,8 @@ public interface Widget
*/ */
Object[] getOnLoadListener(); Object[] getOnLoadListener();
Object[] getOnInvTransmitListener(); Object[] getOnInvTransmit();
/** /**
* Returns the archive id of the font used * Returns the archive id of the font used

2
runelite-client/src/main/java/net/runelite/client/plugins/banktags/tabs/BankSearch.java
View File

@@ -60,7 +60,7 @@ public class BankSearch
return; return;
} }
Object[] scriptArgs = bankContainer.getOnInvTransmitListener(); Object[] scriptArgs = bankContainer.getOnInvTransmit();
if (scriptArgs == null) if (scriptArgs == null)
{ {

3
runelite-client/src/main/java/net/runelite/client/ui/RuneLiteSplashScreen.java
View File

@@ -131,8 +131,7 @@ public class RuneLiteSplashScreen extends JFrame
}); });
} }
public static void stage(double startProgress, double endProgress, public static void stage(double startProgress, double endProgress, String progressText, int done, int total)
String progressText, int done, int total)
{ {
String progress = done + " / " + total; String progress = done + " / " + total;
stage(startProgress + ((endProgress - startProgress) * done / total), progressText + " " + progress); stage(startProgress + ((endProgress - startProgress) * done / total), progressText + " " + progress);

4
runescape-api/src/main/java/net/runelite/rs/api/RSWidget.java
View File

@@ -481,4 +481,8 @@ public interface RSWidget extends Widget
@Import("modelFrameCycle") @Import("modelFrameCycle")
int getModelFrameCycle(); int getModelFrameCycle();
@Import("onInvTransmit")
@Override
Object[] getOnInvTransmit();
} }