cluescroll: fix cluescroll plugin

cluescroll: fix cluescroll plugin

cluescroll/cluescroll.gradle.kts

@@ -23,7 +23,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-version = "0.0.24"
+version = "0.0.25"
 
 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/ClueScrollEmoteOverlay.java

@@ -27,7 +27,6 @@
 import java.awt.Dimension;
 import java.awt.Graphics2D;
 import javax.inject.Inject;
-import javax.inject.Singleton;
 import net.runelite.api.Client;
 import net.runelite.api.widgets.Widget;
 import net.runelite.api.widgets.WidgetInfo;
@@ -37,7 +36,6 @@
 import net.runelite.client.ui.overlay.OverlayLayer;
 import net.runelite.client.ui.overlay.OverlayPosition;
 
-@Singleton
 class ClueScrollEmoteOverlay extends Overlay
 {
 	private final ClueScrollPlugin plugin;
@@ -46,7 +44,7 @@ class ClueScrollEmoteOverlay extends Overlay
 	private boolean hasScrolled;
 
 	@Inject
-	private ClueScrollEmoteOverlay(final ClueScrollPlugin plugin, final Client client)
+	private ClueScrollEmoteOverlay(ClueScrollPlugin plugin, Client client)
 	{
 		setPosition(OverlayPosition.DYNAMIC);
 		setLayer(OverlayLayer.ABOVE_WIDGETS);

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

@@ -28,7 +28,6 @@
 import java.awt.Graphics2D;
 import java.awt.Rectangle;
 import javax.inject.Inject;
-import javax.inject.Singleton;
 import net.runelite.api.Client;
 import net.runelite.api.widgets.Widget;
 import net.runelite.api.widgets.WidgetInfo;
@@ -38,7 +37,6 @@
 import net.runelite.client.ui.overlay.OverlayLayer;
 import net.runelite.client.ui.overlay.OverlayPosition;
 
-@Singleton
 class ClueScrollMusicOverlay extends Overlay
 {
 	private static final Rectangle PADDING = new Rectangle(2, 1, 0, 1);
@@ -49,7 +47,7 @@ class ClueScrollMusicOverlay extends Overlay
 	private boolean hasScrolled;
 
 	@Inject
-	private ClueScrollMusicOverlay(final ClueScrollPlugin plugin, final Client client)
+	private ClueScrollMusicOverlay(ClueScrollPlugin plugin, Client client)
 	{
 		setPosition(OverlayPosition.DYNAMIC);
 		setLayer(OverlayLayer.ABOVE_WIDGETS);

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

@@ -1,6 +1,7 @@
 /*
  * Copyright (c) 2016-2017, Seth <[email protected]>
  * Copyright (c) 2018, Lotto <https://github.com/devLotto>
+ * Copyright (c) 2019, David <https://github.com/drahenshaw>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -30,7 +31,6 @@
 import java.awt.Dimension;
 import java.awt.Graphics2D;
 import javax.inject.Inject;
-import javax.inject.Singleton;
 import net.runelite.api.Client;
 import net.runelite.api.Item;
 import static net.runelite.api.ItemID.*;
@@ -47,7 +47,6 @@
 import net.runelite.client.ui.overlay.OverlayPriority;
 import net.runelite.client.ui.overlay.components.LineComponent;
 
-@Singleton
 public class ClueScrollOverlay extends OverlayPanel
 {
 	private static final ItemRequirement HAS_SPADE = new SingleItemRequirement(SPADE);
@@ -81,7 +80,7 @@ public class ClueScrollOverlay extends OverlayPanel
 	private final Client client;
 
 	@Inject
-	private ClueScrollOverlay(final ClueScrollPlugin plugin, final Client client)
+	private ClueScrollOverlay(ClueScrollPlugin plugin, Client client)
 	{
 		super(plugin);
 		this.plugin = plugin;
@@ -117,8 +116,8 @@ public Dimension render(Graphics2D graphics)
 
 		if (clue.isRequiresLight()
 			&& ((clue.getHasFirePit() == null || client.getVar(clue.getHasFirePit()) != 1)
-			&& (inventoryItems == null || !HAS_LIGHT.fulfilledBy(inventoryItems))
-			&& (equippedItems == null || !HAS_LIGHT.fulfilledBy(equippedItems))))
+				&& (inventoryItems == null || !HAS_LIGHT.fulfilledBy(inventoryItems))
+					&& (equippedItems == null || !HAS_LIGHT.fulfilledBy(equippedItems))))
 		{
 			panelComponent.getChildren().add(LineComponent.builder().left("").build());
 			panelComponent.getChildren().add(LineComponent.builder().left("Requires Light Source!").leftColor(Color.RED).build());