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

This commit is contained in:
Owain van Brakel
2019-08-11 05:13:29 +02:00
4 changed files with 8 additions and 4 deletions

View File

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

View File

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

View File

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

View File

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