project: Cleanup

This commit is contained in:
Owain van Brakel
2020-01-12 18:40:15 +01:00
parent 7b3c51d42b
commit d950ff2028
7 changed files with 28 additions and 18 deletions

0
gradlew vendored Executable file → Normal file
View File

View File

@@ -107,33 +107,47 @@ public class PartyPlugin extends Plugin implements KeyListener
private final Map<UUID, PartyData> partyDataMap = Collections.synchronizedMap(new HashMap<>());
@Getter(AccessLevel.PACKAGE)
private final List<PartyTilePingData> 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;
}
}

View File

@@ -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;

View File

@@ -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

View File

@@ -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);

View File

@@ -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);
}

View File

@@ -50,19 +50,21 @@ import net.runelite.client.ui.overlay.OverlayManager;
)
public class TempleTrekkingPlugin extends Plugin
{
@Getter
private final Set<GroundObject> bogList = new HashSet<GroundObject>();
private final Set<GroundObject> 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;
}
}