project: Merge upstream

agility/agility.gradle.kts

@@ -23,7 +23,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-version = "0.0.10"
+version = "0.0.11"
 
 project.extra["PluginName"] = "Agility"
 project.extra["PluginDescription"] = "Show helpful information about agility courses and obstacles"

agility/src/main/java/net/runelite/client/plugins/agility/Obstacles.java

@@ -54,7 +54,7 @@ class Obstacles
 		// Penguin
 		STEPPING_STONE_21120, STEPPING_STONE_21126, STEPPING_STONE_21128, STEPPING_STONE_21129,
 		STEPPING_STONE_21130, STEPPING_STONE_21131, STEPPING_STONE_21132, STEPPING_STONE_21133,
-		ICICLES, ICE, ICE_21149, ICE_21150, ICE_21151, ICE_21152, ICE_21153, ICE_21154, ICE_21155, ICE_21156,
+		ICICLES, ICE, ICE_21149, ICE_21150, ICE_21151, ICE_21152, ICE_21153, ICE_21154, ICE_21155, ICE_21156, GATE_21172,
 		// Barbarian
 		ROPESWING_23131, LOG_BALANCE_23144, OBSTACLE_NET_20211, BALANCING_LEDGE_23547, LADDER_16682, CRUMBLING_WALL_1948,
 		// Canifis

chathistory/chathistory.gradle.kts

@@ -23,7 +23,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-version = "0.0.3"
+version = "0.0.4"
 
 project.extra["PluginName"] = "Chat History"
 project.extra["PluginDescription"] = "Retain your chat history when logging in/out or world hopping"

chathistory/src/main/java/net/runelite/client/plugins/chathistory/ChatHistoryPlugin.java

@@ -219,7 +219,7 @@ public void onMenuOpened(MenuOpened event)
 		// Use second entry as first one can be walk here with transparent chatbox
 		final MenuEntry entry = event.getMenuEntries()[event.getMenuEntries().length - 2];
 
-		if (entry.getOpcode() != MenuOpcode.CC_OP_LOW_PRIORITY.getId())
+		if (entry.getOpcode() != MenuOpcode.CC_OP_LOW_PRIORITY.getId() && entry.getOpcode() != MenuOpcode.RUNELITE.getId())
 		{
 			return;
 		}

cluescroll/cluescroll.gradle.kts

@@ -23,7 +23,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-version = "0.0.20"
+version = "0.0.21"
 
 project.extra["PluginName"] = "Clue Scroll"
 project.extra["PluginDescription"] = "Show answers to clue scroll riddles, anagrams, ciphers, and cryptic clues"

cluescroll/src/main/java/net/runelite/client/plugins/cluescrolls/ClueScrollOverlay.java

@@ -121,7 +121,16 @@ public Dimension render(Graphics2D graphics)
 			&& (equippedItems == null || !HAS_LIGHT.fulfilledBy(equippedItems))))
 		{
 			panelComponent.getChildren().add(LineComponent.builder().left("").build());
-			panelComponent.getChildren().add(LineComponent.builder().left("Light Source!").leftColor(Color.RED).build());
+			panelComponent.getChildren().add(LineComponent.builder().left("Requires Light Source!").leftColor(Color.RED).build());
+		}
+
+		if (clue.getEnemy() != null)
+		{
+			panelComponent.getChildren().add(LineComponent.builder().left("").build());
+			panelComponent.getChildren().add(LineComponent.builder()
+				.left(clue.getEnemy().getText())
+				.leftColor(Color.YELLOW)
+				.build());
 		}
 
 		return super.render(graphics);

cluescroll/src/main/java/net/runelite/client/plugins/cluescrolls/clues/ClueScroll.java

@@ -46,6 +46,10 @@ public abstract class ClueScroll
 	@Getter(AccessLevel.PUBLIC)
 	private Varbits hasFirePit;
 
+	@Setter(AccessLevel.PROTECTED)
+	@Getter(AccessLevel.PUBLIC)
+	private Enemy enemy;
+
 	public abstract void makeOverlayHint(PanelComponent panelComponent, ClueScrollPlugin plugin);
 
 	public abstract void makeWorldOverlayHint(Graphics2D graphics, ClueScrollPlugin plugin);

cluescroll/src/main/java/net/runelite/client/plugins/cluescrolls/clues/Enemy.java

@@ -0,0 +1,54 @@
+/*
+ * Copyright (c) 2020, Trevor <https://github.com/TrevorMartz>
+ * 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.cluescrolls.clues;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+@AllArgsConstructor
+@Getter
+public enum Enemy
+{
+	//appears in hard clue emote steps in the wilderness
+	DOUBLE_AGENT_65("Double Agent level 65"),
+	//appears in hard clue emote steps not in the wilderness
+	DOUBLE_AGENT_108("Double Agent level 108"),
+	//appears for master clue emote steps all areas
+	DOUBLE_AGENT_141("Double Agent level 141"),
+	//appears for hard clue coordinate steps in the wilderness
+	ZAMORAK_WIZARD("Zamorak Wizard"),
+	//appears for hard clue coordinate steps not in the wilderness
+	SARADOMIN_WIZARD("Saradomin Wizard"),
+	//appears for elite clue coordinate steps all areas
+	ARMADYLIAN_OR_BANDOSIAN_GUARD("Armadylian OR Bandosian Guard"),
+	//appears for master clue coordinate and hot cold clues when single-way combat
+	BRASSICAN_MAGE("Brassican Mage"),
+	//appears for master clue coordinate and hot cold clues when multi-way combat
+	ANCIENT_WIZARDS("Ancient Wizard Trio"),
+	//There is a master hot cold step that overlaps the border of multi and single according to the wiki.
+	BRASSICAN_OR_WIZARDS("Brassican Mage OR Ancient Wizards");
+
+	private final String text;
+}