upstream: merge

upstream: merge

cache/src/main/java/net/runelite/cache/definitions/KitDefinition.java

@@ -35,8 +35,8 @@ public class KitDefinition
 	public short[] retextureToFind;
 	public short[] retextureToReplace;
 	public int bodyPartId = -1;
-	public int[] modelIds;
+	public int[] models;
-	public int[] models = new int[]
+	public int[] chatheadModels = new int[]
 	{
 		-1, -1, -1, -1, -1
 	};

cache/src/main/java/net/runelite/cache/definitions/loaders/KitLoader.java

@@ -53,11 +53,11 @@ public class KitLoader
 			else if (opcode == 2)
 			{
 				int length = is.readUnsignedByte();
-				def.modelIds = new int[length];
+				def.models = new int[length];
 
 				for (int index = 0; index < length; ++index)
 				{
-					def.modelIds[index] = is.readUnsignedShort();
+					def.models[index] = is.readUnsignedShort();
 				}
 			}
 			else if (opcode == 3)
@@ -90,7 +90,7 @@ public class KitLoader
 			}
 			else if (opcode >= 60 && opcode < 70)
 			{
-				def.models[opcode - 60] = is.readShort();
+				def.chatheadModels[opcode - 60] = is.readUnsignedShort();
 			}
 		}
 

runelite-api/src/main/java/net/runelite/api/InventoryID.java

@@ -57,6 +57,10 @@ public enum InventoryID
 	 * Monkey madness puzzle box inventory.
 	 */
 	MONKEY_MADNESS_PUZZLE_BOX(221),
+	/**
+	 * Drift net fishing reward
+	 */
+	DRIFT_NET_FISHING_REWARD(307),
 	/**
 	 * Looting Bag inventory
 	 */

runelite-api/src/main/java/net/runelite/api/Varbits.java

@@ -501,6 +501,7 @@ public enum Varbits
 	SUPERIOR_ENABLED(5362),
 	FOSSIL_ISLAND_WYVERN_DISABLE(6251),
 
+	BANK_REARRANGE_MODE(3959),
 	CURRENT_BANK_TAB(4150),
 
 	WORLDHOPPER_FAVROITE_1(4597),

runelite-api/src/main/java/net/runelite/api/util/Text.java

@@ -33,11 +33,12 @@ import java.util.Collection;
 import java.util.List;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.text.WordUtils;
+import org.apache.commons.text.similarity.JaroWinklerDistance;
 
 public class Text
 {
 	private static final StringBuilder SB = new StringBuilder(64);
-
+	private static final JaroWinklerDistance DISTANCE = new JaroWinklerDistance();
 	public static final Splitter COMMA_SPLITTER = Splitter
 		.on(",")
 		.omitEmptyStrings()
@@ -292,4 +293,22 @@ public class Text
 
 		return toString;
 	}
+	
+	/**
+	 * Checks if all the search terms in the given list matches at least one keyword.
+	 *
+	 * @return true if all search terms matches at least one keyword, or false if otherwise.
+	 */
+	public static boolean matchesSearchTerms(String[] searchTerms, final Collection<String> keywords)
+	{
+		for (String term : searchTerms)
+		{
+			if (keywords.stream().noneMatch((t) -> t.contains(term) ||
+				DISTANCE.apply(t, term) > 0.9))
+			{
+				return false;
+			}
+		}
+		return true;
+	}
 }

runelite-api/src/main/java/net/runelite/api/widgets/WidgetID.java

@@ -124,6 +124,7 @@ public class WidgetID
 	public static final int WORLD_SWITCHER_GROUP_ID = 69;
 	public static final int DIALOG_OPTION_GROUP_ID = 219;
 	public static final int DIALOG_PLAYER_GROUP_ID = 217;
+	public static final int DRIFT_NET_FISHING_REWARD_GROUP_ID = 607;
 	public static final int FOSSIL_ISLAND_OXYGENBAR_ID = 609;
 	public static final int MINIGAME_TAB_ID = 76;
 	public static final int SPELLBOOK_GROUP_ID = 218;
@@ -164,6 +165,8 @@ public class WidgetID
 	public static final int OPTIONS_GROUP_ID = 261;
 	public static final int THEATRE_OF_BLOOD_PARTY_GROUP_ID = 28;
 	public static final int GWD_KC_GROUP_ID = 406;
+	public static final int ADVENTURE_LOG_ID = 187;
+	public static final int COUNTERS_LOG_GROUP_ID = 625;
 
 	static class WorldMap
 	{
@@ -1227,4 +1230,24 @@ public class WidgetID
 		static final int CONTAINER = 0;
 	}
 
+	static class Lms
+	{
+		static final int INFO = 3;
+	}
+
+	static class LmsKDA
+	{
+		static final int INFO = 4;
+	}
+
+	static class AdventureLog
+	{
+		static final int CONTAINER = 0;
+	}
+
+	static class CountersLog
+	{
+		static final int OWNER = 4;
+		static final int TEXT = 6;
+	}
 }

runelite-api/src/main/java/net/runelite/api/widgets/WidgetInfo.java

@@ -515,6 +515,10 @@ public enum WidgetInfo
 	KILL_LOG_KILLS(WidgetID.KILL_LOGS_GROUP_ID, WidgetID.KillLog.KILLS),
 	KILL_LOG_STREAK(WidgetID.KILL_LOGS_GROUP_ID, WidgetID.KillLog.STREAK),
 
+	ADVENTURE_LOG(WidgetID.ADVENTURE_LOG_ID, WidgetID.AdventureLog.CONTAINER),
+
+	COUNTERS_LOG_TEXT(WidgetID.COUNTERS_LOG_GROUP_ID, WidgetID.CountersLog.TEXT),
+
 	WORLD_SWITCHER_LIST(WidgetID.WORLD_SWITCHER_GROUP_ID, WidgetID.WorldSwitcher.WORLD_LIST),
 
 	FOSSIL_ISLAND_OXYGENBAR(WidgetID.FOSSIL_ISLAND_OXYGENBAR_ID, WidgetID.FossilOxygen.FOSSIL_ISLAND_OXYGEN_BAR),

runelite-client/src/main/java/net/runelite/client/plugins/config/ConfigPanel.java

@@ -41,7 +41,6 @@ import java.awt.event.MouseEvent;
 import java.awt.image.BufferedImage;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
-import java.text.DecimalFormat;
 import java.util.ArrayList;
 import java.util.EnumSet;
 import java.util.HashMap;
@@ -672,11 +671,7 @@ class ConfigPanel extends PluginPanel
 
 					if (units != null)
 					{
-						DecimalFormat df = ((JSpinner.NumberEditor) spinner.getEditor()).getFormat();
+						spinnerTextField.setFormatterFactory(new UnitFormatterFactory(units));
-						df.setPositiveSuffix(units.value());
-						df.setNegativeSuffix(units.value());
-						// Force update the spinner to have it add the units initially
-						spinnerTextField.setValue(value);
 					}
 
 					item.add(spinner, BorderLayout.EAST);
@@ -812,11 +807,7 @@ class ConfigPanel extends PluginPanel
 
 				if (units != null)
 				{
-					DecimalFormat df = ((JSpinner.NumberEditor) widthSpinner.getEditor()).getFormat();
+					widthSpinnerTextField.setFormatterFactory(new UnitFormatterFactory(units));
-					df.setPositiveSuffix(units.value());
-					df.setNegativeSuffix(units.value());
-					// Force update the spinner to have it add the units initially
-					widthSpinnerTextField.setValue(width);
 				}
 
 				SpinnerModel heightModel = new SpinnerNumberModel(height, 0, Integer.MAX_VALUE, 1);
@@ -827,11 +818,7 @@ class ConfigPanel extends PluginPanel
 
 				if (units != null)
 				{
-					DecimalFormat df = ((JSpinner.NumberEditor) heightSpinner.getEditor()).getFormat();
+					heightSpinnerTextField.setFormatterFactory(new UnitFormatterFactory(units));
-					df.setPositiveSuffix(units.value());
-					df.setNegativeSuffix(units.value());
-					// Force update the spinner to have it add the units initially
-					heightSpinnerTextField.setValue(height);
 				}
 
 				ChangeListener listener = e ->

runelite-client/src/main/java/net/runelite/client/plugins/config/PluginListItem.java

@@ -45,12 +45,9 @@ import net.runelite.client.ui.ColorScheme;
 import net.runelite.client.ui.PluginPanel;
 import net.runelite.client.util.ImageUtil;
 import net.runelite.client.util.SwingUtil;
-import org.apache.commons.text.similarity.JaroWinklerDistance;
 
 public class PluginListItem extends JPanel
 {
-	private static final JaroWinklerDistance DISTANCE = new JaroWinklerDistance();
-
 	private static final ImageIcon CONFIG_ICON;
 	private static final ImageIcon CONFIG_ICON_HOVER;
 	private static final ImageIcon ON_STAR;
@@ -61,6 +58,7 @@ public class PluginListItem extends JPanel
 	@Getter
 	private final PluginConfigurationDescriptor pluginConfig;
 
+	@Getter
 	private final List<String> keywords = new ArrayList<>();
 
 	public JLabel nameLabel;
@@ -201,24 +199,6 @@ public class PluginListItem extends JPanel
 		onOffToggle.setSelected(enabled);
 	}
 
-	/**
-	 * Checks if all the search terms in the given list matches at least one keyword.
-	 *
-	 * @return true if all search terms matches at least one keyword, or false if otherwise.
-	 */
-	boolean matchesSearchTerms(String[] searchTerms)
-	{
-		for (String term : searchTerms)
-		{
-			if (keywords.stream().noneMatch((t) -> t.contains(term) ||
-				DISTANCE.apply(t, term) > 0.9))
-			{
-				return false;
-			}
-		}
-		return true;
-	}
-
 	private void openGroupConfigPanel()
 	{
 		pluginListPanel.openConfigurationPanel(pluginConfig);

runelite-client/src/main/java/net/runelite/client/plugins/config/PluginListPanel.java

@@ -381,7 +381,7 @@ public class PluginListPanel extends PluginPanel
 			final String[] searchTerms = text.toLowerCase().split(" ");
 			pluginList.forEach(listItem ->
 			{
-				if (pinned == listItem.isPinned() && listItem.matchesSearchTerms(searchTerms))
+				if (pinned == listItem.isPinned() && Text.matchesSearchTerms(searchTerms, listItem.getKeywords()))
 				{
 					if (openOSRSConfig.pluginSortMode() == OpenOSRSConfig.SortStyle.ALPHABETICALLY || !openOSRSConfig.enableCategories())
 					{

runelite-client/src/main/java/net/runelite/client/plugins/config/UnitFormatter.java

@@ -0,0 +1,86 @@
+/*
+ * Copyright (c) 2020, Hydrox6 <ikada@protonmail.ch>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice, this
+ *    list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package net.runelite.client.plugins.config;
+
+import java.text.ParseException;
+import java.util.HashMap;
+import java.util.Map;
+import javax.swing.JFormattedTextField;
+import lombok.RequiredArgsConstructor;
+import net.runelite.client.config.Units;
+
+final class UnitFormatter extends JFormattedTextField.AbstractFormatter
+{
+	private final String units;
+
+	UnitFormatter(Units units)
+	{
+		this.units = units.value();
+	}
+
+	@Override
+	public Object stringToValue(final String text) throws ParseException
+	{
+		final String trimmedText;
+
+		// Using the spinner controls causes the value to have the unit on the end, so remove it
+		if (text.endsWith(units))
+		{
+			trimmedText = text.substring(0, text.length() - units.length());
+		}
+		else
+		{
+			trimmedText = text;
+		}
+
+		try
+		{
+			return Integer.valueOf(trimmedText);
+		}
+		catch (NumberFormatException e)
+		{
+			throw new ParseException(trimmedText + " is not an integer.", 0);
+		}
+	}
+
+	@Override
+	public String valueToString(final Object value)
+	{
+		return value + units;
+	}
+}
+
+@RequiredArgsConstructor
+final class UnitFormatterFactory extends JFormattedTextField.AbstractFormatterFactory
+{
+	private final Units units;
+	private final Map<JFormattedTextField, JFormattedTextField.AbstractFormatter> formatters = new HashMap<>();
+
+	@Override
+	public JFormattedTextField.AbstractFormatter getFormatter(final JFormattedTextField tf)
+	{
+		return formatters.computeIfAbsent(tf, (key) -> new UnitFormatter(units));
+	}
+}

runelite-client/src/main/java/net/runelite/client/util/ImageCapture.java

@@ -25,6 +25,7 @@
  */
 package net.runelite.client.util;
 
+import com.google.common.base.Strings;
 import java.awt.Toolkit;
 import java.awt.TrayIcon;
 import java.awt.datatransfer.Clipboard;
@@ -40,6 +41,7 @@ import java.text.SimpleDateFormat;
 import java.util.Base64;
 import java.util.Date;
 import java.util.EnumSet;
+import javax.annotation.Nullable;
 import javax.imageio.ImageIO;
 import javax.inject.Inject;
 import javax.inject.Singleton;
@@ -80,10 +82,11 @@ public class ImageCapture
 	 *
 	 * @param screenshot BufferedImage to capture.
 	 * @param fileName Filename to use, without file extension.
+	 * @param subDir Directory within the player screenshots dir to store the captured screenshot to.
 	 * @param notify Send a notification to the system tray when the image is captured.
 	 * @param imageUploadStyle which method to use to upload the screenshot (Imgur or directly to clipboard).
 	 */
-	public void takeScreenshot(BufferedImage screenshot, String fileName, boolean notify, ImageUploadStyle imageUploadStyle)
+	public void takeScreenshot(BufferedImage screenshot, String fileName, @Nullable String subDir, boolean notify, ImageUploadStyle imageUploadStyle)
 	{
 		if (client.getGameState() == GameState.LOGIN_SCREEN)
 		{
@@ -106,6 +109,12 @@ public class ImageCapture
 			{
 				playerDir += "-League";
 			}
+
+			if (!Strings.isNullOrEmpty(subDir))
+			{
+				playerDir += File.separator + subDir;
+			}
+
 			playerFolder = new File(SCREENSHOT_DIR, playerDir);
 		}
 		else
@@ -157,6 +166,20 @@ public class ImageCapture
 		}
 	}
 
+	/**
+	 * Saves a screenshot of the client window to the screenshot folder as a PNG,
+	 * and optionally uploads it to an image-hosting service.
+	 *
+	 * @param screenshot BufferedImage to capture.
+	 * @param fileName Filename to use, without file extension.
+	 * @param notify Send a notification to the system tray when the image is captured.
+	 * @param imageUploadStyle which method to use to upload the screenshot (Imgur or directly to clipboard).
+	 */
+	public void takeScreenshot(BufferedImage screenshot, String fileName, boolean notify, ImageUploadStyle imageUploadStyle)
+	{
+		takeScreenshot(screenshot, fileName, null, notify, imageUploadStyle);
+	}
+
 	/**
 	 * Uploads a screenshot to the Imgur image-hosting service,
 	 * and copies the image link to the clipboard.

runelite-client/src/main/scripts/BankSearchLayout.rs2asm

@@ -3,7 +3,17 @@
 .string_stack_count 0
 .int_var_count      35
 .string_var_count   1
-   sconst                 "bankLayoutInit"
+; callback "beforeBankLayout"
+;   Fired before the bank starts its layout
+;	Used by the TabInterface to hide fake bank items for tag tabs
+;
+; callback "setBankScroll"
+;	Fired before bank is calculated
+;   Used by the TabInterface to show fake bank items for tag tabs
+;
+; callback "isTabMenuActive"
+;	Used by the TabInterface to skip setting the bank title
+   sconst                 "beforeBankLayout"
    runelite_callback
    get_varbit             5102
    iconst                 1
@@ -387,6 +397,15 @@ LABEL339:
    sub                   
    istore                 29
 LABEL343:
+   iconst                 0               	; Scroll height variable
+   iconst                 0               	; Compare variable
+   iconst                 0               	;
+   sconst                 "setBankScroll"   ; Show fake bank items for tag tabs
+   runelite_callback                        ; If tag tab menu search isn't active
+   if_icmpeq              CONTINUE_SEARCH 	; continue to normal bank search
+   istore 				  27              	; Load scroll height into variable
+   jump                   GetTabRange     	; Skip normal bank layout
+CONTINUE_SEARCH:
    iload                  30
    iload                  29
    iconst                 1
@@ -814,8 +833,6 @@ LABEL720:
    iload                  11
    iload                  27
    iload                  28
-   sconst                 "addLastRow"
-   runelite_callback
    iload                  12
    iload                  13
    iload                  14
@@ -826,12 +843,12 @@ LABEL740:
    invoke                 514
    iconst                 1
    if_icmpeq              LABEL744
-   jump                   LABEL747
+   jump                   GetTabRange
 LABEL744:
    iconst                 1
    iconst                 1
    invoke                 299
-LABEL747:
+GetTabRange:
    iconst                 -1
    istore                 31
    iconst                 -1
@@ -848,7 +865,7 @@ LABEL759:
    iload                  19
    iconst                 816
    if_icmplt              LABEL763
-   jump                   LABEL843
+   jump                   SetTitle
 LABEL763:
    iload                  2
    iload                  19
@@ -940,12 +957,17 @@ LABEL838:
    add                   
    istore                 19
    jump                   LABEL759
-LABEL843:
+SetTitle:
+   iconst                 0              		; Compare variable
+   iconst                 0                   	;
+   sconst                 "isTabMenuActive"   	; Check if tag tab menu
+   runelite_callback                     		; is active and skip setting
+   if_icmpne              FinishBuilding       	; the bank title if it is
    get_varbit             4170
    iconst                 2
-   if_icmpeq              LABEL847
+   if_icmpeq              SetTitleRomanNumeral
-   jump                   LABEL857
+   jump                   SetTitleNumber
-LABEL847:
+SetTitleRomanNumeral:
    sconst                 "Tab "
    iconst                 105
    iconst                 115
@@ -957,8 +979,8 @@ LABEL847:
    runelite_callback     ;
    iload                  5
    if_settext            
-   jump                   LABEL863
+   jump                   FinishBuilding
-LABEL857:
+SetTitleNumber:
    sconst                 "Tab "
    get_varbit             4150
    tostring              
@@ -967,7 +989,7 @@ LABEL857:
    runelite_callback     ;
    iload                  5
    if_settext            
-LABEL863:
+FinishBuilding:
    iload                  0
    iload                  1
    iload                  2