Merge remote-tracking branch 'upstream/master' into master

runelite-api/src/main/java/net/runelite/api/queries/HotColdLocationTest.java

@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) 2021, Adam <Adam@sigterm.info>
+ * 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.
+ */
+<<<<<<< HEAD:deobfuscator/src/test/java/net/runelite/deob/deobfuscators/unusedclass/EmptyInterface.java
+package net.runelite.deob.deobfuscators.unusedclass;
+
+public interface EmptyInterface {}
+=======
+package net.runelite.client.plugins.cluescrolls.clues.hotcold;
+
+import org.junit.Test;
+
+public class HotColdLocationTest
+{
+	@Test
+	public void test()
+	{
+		HotColdLocation.values(); // test clinit
+	}
+}
+>>>>>>> upstream/master:runelite-api/src/main/java/net/runelite/api/queries/HotColdLocationTest.java

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

@@ -846,6 +846,20 @@ public interface Widget
 	 */
 	void setYPositionMode(int ypm);
 
+	/**
+	 * Get the line height for this widget.
+	 *
+	 * @return
+	 */
+	int getLineHeight();
+
+	/**
+	 * Set the line height for this widget. If set to 0, the line height is taken from the font instead.
+	 *
+	 * @param lineHeight
+	 */
+	void setLineHeight(int lineHeight);
+
 	/**
 	 * Gets the X axis text position mode
 	 *