ra/runelite
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Update to use Tables

Browse Source
This commit is contained in:
James Munson
2019-06-14 01:00:00 -07:00
parent 5c3378e438
commit a0e7d51a3a
1 changed files with 21 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
runelite-client/src/main/java/net/runelite/client/plugins/raids/RaidsPartyOverlay.java
View File

@@ -30,8 +30,12 @@ import java.awt.Color;
import java.util.Set; import java.util.Set;
import javax.inject.Inject; import javax.inject.Inject;
import net.runelite.api.*;
import net.runelite.api.Client;
import net.runelite.api.MenuAction;
import net.runelite.api.VarPlayer;
import net.runelite.api.Varbits;
import net.runelite.api.ClanMember;
import net.runelite.client.ui.overlay.Overlay; import net.runelite.client.ui.overlay.Overlay;
import static net.runelite.client.ui.overlay.OverlayManager.OPTION_CONFIGURE; import static net.runelite.client.ui.overlay.OverlayManager.OPTION_CONFIGURE;
@@ -39,8 +43,10 @@ import static net.runelite.client.ui.overlay.OverlayManager.OPTION_CONFIGURE;
import net.runelite.client.ui.overlay.OverlayMenuEntry; import net.runelite.client.ui.overlay.OverlayMenuEntry;
import net.runelite.client.ui.overlay.OverlayPosition; import net.runelite.client.ui.overlay.OverlayPosition;
import net.runelite.client.ui.overlay.OverlayPriority; import net.runelite.client.ui.overlay.OverlayPriority;
import net.runelite.client.ui.overlay.components.LineComponent;
import net.runelite.client.ui.overlay.components.PanelComponent; import net.runelite.client.ui.overlay.components.PanelComponent;
import net.runelite.client.ui.overlay.components.table.TableAlignment;
import net.runelite.client.ui.overlay.components.table.TableComponent;
import net.runelite.client.util.ColorUtil;
public class RaidsPartyOverlay extends Overlay public class RaidsPartyOverlay extends Overlay
{ {
@@ -86,6 +92,11 @@ public class RaidsPartyOverlay extends Overlay
int playerCount = client.getPlayers().size(); int playerCount = client.getPlayers().size();
TableComponent tableComponent = new TableComponent();
tableComponent.setColumnAlignments(TableAlignment.LEFT, TableAlignment.RIGHT);
String partyCountString; String partyCountString;
Color countColor = Color.WHITE; Color countColor = Color.WHITE;
@@ -114,12 +125,7 @@ public class RaidsPartyOverlay extends Overlay
panel.getChildren().clear(); panel.getChildren().clear();
// Show amount of people currently in raid vs total in the party tableComponent.addRow("Party size:", ColorUtil.prependColorTag(partyCountString, countColor));
panel.getChildren().add(LineComponent.builder()
.left("Party size:")
.right(partyCountString)
.rightColor(countColor)
.build());
if (inLobby) if (inLobby)
{ {
@@ -150,11 +156,8 @@ public class RaidsPartyOverlay extends Overlay
notInPartyColor = Color.WHITE; notInPartyColor = Color.WHITE;
} }
panel.getChildren().add(LineComponent.builder() tableComponent.addRow("Not at raids:", ColorUtil.prependColorTag(String.valueOf(notInParty), notInPartyColor));
.left("Not at raids:")
.right(String.valueOf(notInParty))
.rightColor(notInPartyColor)
.build());
// Show amount of clan members that are not in the right world. // Show amount of clan members that are not in the right world.
Color wrongWorldColor; Color wrongWorldColor;
@@ -167,11 +170,7 @@ public class RaidsPartyOverlay extends Overlay
wrongWorldColor = Color.WHITE; wrongWorldColor = Color.WHITE;
} }
panel.getChildren().add(LineComponent.builder() tableComponent.addRow("Wrong world:", ColorUtil.prependColorTag(String.valueOf(wrongWorldClanMembers), wrongWorldColor));
.left("Wrong world:")
.right(String.valueOf(wrongWorldClanMembers))
.rightColor(wrongWorldColor)
.build());
} }
else else
@@ -179,16 +178,13 @@ public class RaidsPartyOverlay extends Overlay
Set<String> missingPartyMembers = plugin.getMissingPartyMembers(); Set<String> missingPartyMembers = plugin.getMissingPartyMembers();
if (missingPartyMembers.size() > 0) if (missingPartyMembers.size() > 0)
{ {
panel.getChildren().add(LineComponent.builder()
.left("Missing players:")
.build()); tableComponent.addRow("Missing players:", "");
for (String member : missingPartyMembers) for (String member : missingPartyMembers)
{ {
panel.getChildren().add(LineComponent.builder() tableComponent.addRow(ColorUtil.prependColorTag(member, Color.RED), "");
.left(member)
.leftColor(Color.RED)
.build());
} }
} }
} }