From d950ff2028c91830f1a5da21cae01b7aba575263 Mon Sep 17 00:00:00 2001 From: Owain van Brakel Date: Sun, 12 Jan 2020 18:40:15 +0100 Subject: [PATCH] project: Cleanup --- gradlew | 0 .../client/plugins/party/PartyPlugin.java | 15 ++++++++++++++- .../client/plugins/party/PartyStatsOverlay.java | 2 +- .../StealingArtefactsPlugin.java | 2 +- .../strongholdofsecurity/StrongholdPlugin.java | 2 -- .../templetrekking/TempleTrekkingOverlay.java | 8 ++++---- .../templetrekking/TempleTrekkingPlugin.java | 17 ++++++++--------- 7 files changed, 28 insertions(+), 18 deletions(-) mode change 100755 => 100644 gradlew diff --git a/gradlew b/gradlew old mode 100755 new mode 100644 diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/party/PartyPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/party/PartyPlugin.java index a41650b056..c75c28f3e5 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/party/PartyPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/party/PartyPlugin.java @@ -107,33 +107,47 @@ public class PartyPlugin extends Plugin implements KeyListener private final Map partyDataMap = Collections.synchronizedMap(new HashMap<>()); @Getter(AccessLevel.PACKAGE) private final List pendingTilePings = Collections.synchronizedList(new ArrayList<>()); + @Inject @Named("developerMode") boolean developerMode; + @Inject private Client client; + @Inject private PartyService party; + @Inject private WSClient ws; + @Inject private OverlayManager overlayManager; + @Inject private PartyStatsOverlay partyStatsOverlay; + @Inject private PartyPingOverlay partyPingOverlay; + @Inject private KeyManager keyManager; + @Inject private WSClient wsClient; + @Inject private WorldMapPointManager worldMapManager; + @Inject private PartyConfig config; + @Inject private ChatMessageManager chatMessageManager; + @Inject private EventBus eventBus; + private int lastHp, lastPray; private boolean hotkeyDown, doSync; private boolean sendAlert; @@ -511,7 +525,6 @@ public class PartyPlugin extends Plugin implements KeyListener DiscordUserInfo info = new DiscordUserInfo(jobj.get("userId").getAsString(), jobj.get("avatarId").getAsString()); info.setMemberId(event.getMemberId()); eventBus.post(DiscordUserInfo.class, info); - return; } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/party/PartyStatsOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/party/PartyStatsOverlay.java index c15882cb30..82e5095234 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/party/PartyStatsOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/party/PartyStatsOverlay.java @@ -56,7 +56,7 @@ public class PartyStatsOverlay extends Overlay private final PanelComponent body = new PanelComponent(); @Inject - private PartyStatsOverlay(final PartyPlugin plugin, final PartyService party, final PartyConfig config) + private PartyStatsOverlay(final PartyPlugin plugin, final PartyService party) { super(plugin); this.plugin = plugin; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/stealingartefacts/StealingArtefactsPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/stealingartefacts/StealingArtefactsPlugin.java index d31e753330..6fcff6bcee 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/stealingartefacts/StealingArtefactsPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/stealingartefacts/StealingArtefactsPlugin.java @@ -67,7 +67,7 @@ import net.runelite.client.ui.overlay.worldmap.WorldMapPointManager; name = "Stealing Artefacts", description = "A plugin for the Stealing Artefacts minigame.", tags = {"stealing", "artefacts", "artifacts", "thieving", "minigame", "zeah"}, - type = PluginType.SKILLING, + type = PluginType.MINIGAME, enabledByDefault = false ) @Slf4j diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/strongholdofsecurity/StrongholdPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/strongholdofsecurity/StrongholdPlugin.java index a0c0c8b73f..513e8df8d0 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/strongholdofsecurity/StrongholdPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/strongholdofsecurity/StrongholdPlugin.java @@ -24,7 +24,6 @@ */ package net.runelite.client.plugins.strongholdofsecurity; -import lombok.extern.slf4j.Slf4j; import net.runelite.api.Client; import net.runelite.api.events.ClientTick; import net.runelite.api.events.WidgetLoaded; @@ -45,7 +44,6 @@ import java.awt.Color; tags = {"stronghold", "security", "overlay", "answer", "highlight"}, type = PluginType.UTILITY ) -@Slf4j public class StrongholdPlugin extends Plugin { private static final Color ANSWER_COLOR = new Color(230, 0, 230); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/templetrekking/TempleTrekkingOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/templetrekking/TempleTrekkingOverlay.java index af6b2f7e54..bef52d84e1 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/templetrekking/TempleTrekkingOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/templetrekking/TempleTrekkingOverlay.java @@ -59,17 +59,17 @@ public class TempleTrekkingOverlay extends Overlay int points = plugin.getRewardPoints(); double percentage = plugin.getRewardPercentage() * 100; panelComponent.getChildren().clear(); + Color rightColor = percentage < 25 ? Color.RED : percentage >= 25 && percentage < 50 ? Color.YELLOW : + percentage >= 50 && percentage < 75 ? Color.BLUE : Color.GREEN; panelComponent.getChildren().add(LineComponent.builder() .left("Trek Points: ") .right(Integer.toString(points)) - .rightColor(percentage < 25 ? Color.RED : percentage >= 25 && percentage < 50 ? Color.YELLOW : - percentage >= 50 && percentage < 75 ? Color.BLUE : Color.GREEN) + .rightColor(rightColor) .build()); panelComponent.getChildren().add(LineComponent.builder() .left("Reward %: ") .right(String.format("%.2f", percentage) + "%") - .rightColor(percentage < 25 ? Color.RED : percentage >= 25 && percentage < 50 ? Color.YELLOW : - percentage >= 50 && percentage < 75 ? Color.BLUE : Color.GREEN) + .rightColor(rightColor) .build()); return panelComponent.render(graphics); } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/templetrekking/TempleTrekkingPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/templetrekking/TempleTrekkingPlugin.java index 9d43d956d7..4b7336fd83 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/templetrekking/TempleTrekkingPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/templetrekking/TempleTrekkingPlugin.java @@ -50,19 +50,21 @@ import net.runelite.client.ui.overlay.OverlayManager; ) public class TempleTrekkingPlugin extends Plugin { - @Getter - private final Set bogList = new HashSet(); + private final Set bogList = new HashSet<>(); + @Inject private Client client; + @Inject private OverlayManager overlayManager; + @Inject private TempleTrekkingOverlay overlay; + @Inject private TempleTrekkingBogOverlay bogOverlay; - @Inject - private TempleTrekkingConfig config; + @Getter private boolean inTrek = false; @@ -109,12 +111,9 @@ public class TempleTrekkingPlugin extends Plugin { inTrek = true; } - else if (inTrek) + else if (inTrek && client.getVar(Varbits.TREK_STATUS) == 0 && client.getVar(Varbits.TREK_POINTS) == 0) { - if (client.getVar(Varbits.TREK_STATUS) == 0 && client.getVar(Varbits.TREK_POINTS) == 0) - { - inTrek = false; - } + inTrek = false; } }