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

IsEmpty check moved

Browse Source
This commit is contained in:
Scott Burns
2019-06-01 03:12:23 +02:00
parent d36db6f1a0
commit 4efaea55f7
27 changed files with 30 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
runelite-client/src/main/java/net/runelite/client/plugins/agility/LapCounterOverlay.java
View File

@@ -95,10 +95,7 @@ class LapCounterOverlay extends Overlay
tableComponent.addRow("Laps until goal:", Integer.toString(session.getLapsTillGoal()));
}
if (!tableComponent.isEmpty())
{
panelComponent.getChildren().add(tableComponent);
}
panelComponent.getChildren().add(tableComponent);
return panelComponent.render(graphics);
}

5
runelite-client/src/main/java/net/runelite/client/plugins/barrows/BarrowsBrotherSlainOverlay.java
View File

@@ -90,10 +90,7 @@ public class BarrowsBrotherSlainOverlay extends Overlay
float rewardPercent = client.getVar(Varbits.BARROWS_REWARD_POTENTIAL) / 10.0f;
tableComponent.addRow("Potential", ColorUtil.prependColorTag(rewardPercent != 0 ? rewardPercent + "%" : "0%", rewardPercent >= 73.0f && rewardPercent <= 88.0f ? Color.GREEN : rewardPercent < 65.6f ? Color.WHITE : Color.YELLOW));
if (!tableComponent.isEmpty())
{
panelComponent.getChildren().add(tableComponent);
}
panelComponent.getChildren().add(tableComponent);
return panelComponent.render(graphics);
}

5
runelite-client/src/main/java/net/runelite/client/plugins/blastfurnace/BlastFurnaceCofferOverlay.java
View File

@@ -75,10 +75,7 @@ class BlastFurnaceCofferOverlay extends Overlay
TableComponent tableComponent = new TableComponent();
tableComponent.addRow("Coffer:", StackFormatter.quantityToStackSize(client.getVar(BLAST_FURNACE_COFFER)) + " gp");
if (!tableComponent.isEmpty())
{
panelComponent.getChildren().add(tableComponent);
}
panelComponent.getChildren().add(tableComponent);
}
return panelComponent.render(graphics);

5
runelite-client/src/main/java/net/runelite/client/plugins/boosts/BoostsOverlay.java
View File

@@ -121,10 +121,7 @@ class BoostsOverlay extends Overlay
}
}
if (!tableComponent.isEmpty())
{
panelComponent.getChildren().add(tableComponent);
}
panelComponent.getChildren().add(tableComponent);
return panelComponent.render(graphics);
}

5
runelite-client/src/main/java/net/runelite/client/plugins/cooking/CookingOverlay.java
View File

@@ -99,10 +99,7 @@ class CookingOverlay extends Overlay
tableComponent.addRow("Cooked:", session.getCookAmount() + (session.getCookAmount() >= 1 ? " (" + xpTrackerService.getActionsHr(Skill.COOKING) + "/hr)" : ""));
tableComponent.addRow("Burnt:", session.getBurnAmount() + (session.getBurnAmount() >= 1 ? " (" + FORMAT.format(session.getBurntPercentage()) + "%)" : ""));
if (!tableComponent.isEmpty())
{
panelComponent.getChildren().add(tableComponent);
}
panelComponent.getChildren().add(tableComponent);
return panelComponent.render(graphics);
}

5
runelite-client/src/main/java/net/runelite/client/plugins/cooking/FermentTimerOverlay.java
View File

@@ -84,10 +84,7 @@ class FermentTimerOverlay extends Overlay
tableComponent.setColumnAlignments(TableAlignment.LEFT, TableAlignment.RIGHT);
tableComponent.addRow("Ferments in:", String.valueOf(INITIAL_TIME - Duration.between(session.getLastWineMakingAction(), Instant.now()).getSeconds()));
if (!tableComponent.isEmpty())
{
panelComponent.getChildren().add(tableComponent);
}
panelComponent.getChildren().add(tableComponent);
}
else
{

5
runelite-client/src/main/java/net/runelite/client/plugins/coxhelper/VanguardsOverlay.java
View File

@@ -74,10 +74,7 @@ public class VanguardsOverlay extends Overlay
tableComponent.addRow(ColorUtil.prependColorTag("Mage", Color.BLUE), Integer.toString(plugin.getMageVangHP()));
tableComponent.addRow(ColorUtil.prependColorTag("Melee", Color.RED), Integer.toString(plugin.getMeleeVangHP()));
if (!tableComponent.isEmpty())
{
panelComponent.getChildren().add(tableComponent);
}
panelComponent.getChildren().add(tableComponent);
return panelComponent.render(graphics);
}

5
runelite-client/src/main/java/net/runelite/client/plugins/devtools/CameraOverlay.java
View File

@@ -69,10 +69,7 @@ public class CameraOverlay extends Overlay
tableComponent.addRow("Yaw", "" + client.getCameraYaw());
tableComponent.addRow("Scale", "" + client.getScale());
if (!tableComponent.isEmpty())
{
panelComponent.getChildren().add(tableComponent);
}
panelComponent.getChildren().add(tableComponent);
return panelComponent.render(graphics);
}

5
runelite-client/src/main/java/net/runelite/client/plugins/devtools/LocationOverlay.java
View File

@@ -98,10 +98,7 @@ public class LocationOverlay extends Overlay
tableComponent.addRow((i == 0) ? "Map regions" : " ", ColorUtil.prependColorTag(String.valueOf(region), (region == regionID) ? Color.GREEN : Color.WHITE));
}
if (!tableComponent.isEmpty())
{
panelComponent.getChildren().add(tableComponent);
}
panelComponent.getChildren().add(tableComponent);
return panelComponent.render(graphics);
}

5
runelite-client/src/main/java/net/runelite/client/plugins/fightcave/WaveOverlay.java
View File

@@ -104,10 +104,7 @@ class WaveOverlay extends Overlay
tableComponent.addRow(line);
}
if (!tableComponent.isEmpty())
{
panelComponent.getChildren().add(tableComponent);
}
panelComponent.getChildren().add(tableComponent);
}
private static Collection<String> buildWaveLines(final Map<WaveMonster, Integer> wave)

5
runelite-client/src/main/java/net/runelite/client/plugins/fishing/FishingOverlay.java
View File

@@ -102,10 +102,7 @@ class FishingOverlay extends Overlay
tableComponent.addRow("Fish/hr:", Integer.toString(xpTrackerService.getActionsHr(Skill.FISHING)));
}
if (!tableComponent.isEmpty())
{
panelComponent.getChildren().add(tableComponent);
}
panelComponent.getChildren().add(tableComponent);
}
return panelComponent.render(graphics);

5
runelite-client/src/main/java/net/runelite/client/plugins/mining/MiningOverlay.java
View File

@@ -113,10 +113,7 @@ class MiningOverlay extends Overlay
tableComponent.addRow("Pay-dirt mined:", Integer.toString(session.getTotalMined()));
tableComponent.addRow("Pay-dirt/hr:", session.getRecentMined() > 2 ? Integer.toString(session.getPerHour()) : "");
if (!tableComponent.isEmpty())
{
panelComponent.getChildren().add(tableComponent);
}
panelComponent.getChildren().add(tableComponent);
return panelComponent.render(graphics);
}

5
runelite-client/src/main/java/net/runelite/client/plugins/motherlode/MotherlodeGemOverlay.java
View File

@@ -106,10 +106,7 @@ public class MotherlodeGemOverlay extends Overlay
tableComponent.addRow("Sapphires:", Integer.toString(sapphiresFound));
}
if (!tableComponent.isEmpty())
{
panelComponent.getChildren().add(tableComponent);
}
panelComponent.getChildren().add(tableComponent);
return panelComponent.render(graphics);
}

5
runelite-client/src/main/java/net/runelite/client/plugins/motherlode/MotherlodeOreOverlay.java
View File

@@ -110,10 +110,7 @@ public class MotherlodeOreOverlay extends Overlay
tableComponent.addRow("Runite:", Integer.toString(runiteFound));
}
if (!tableComponent.isEmpty())
{
panelComponent.getChildren().add(tableComponent);
}
panelComponent.getChildren().add(tableComponent);
return panelComponent.render(graphics);
}

5
runelite-client/src/main/java/net/runelite/client/plugins/motherlode/MotherlodeOverlay.java
View File

@@ -116,10 +116,7 @@ class MotherlodeOverlay extends Overlay
tableComponent.addRow("Pay-dirt mined:", Integer.toString(session.getTotalMined()));
tableComponent.addRow("Pay-dirt/hr:", session.getRecentMined() > 2 ? Integer.toString(session.getPerHour()) : "");
if (!tableComponent.isEmpty())
{
panelComponent.getChildren().add(tableComponent);
}
panelComponent.getChildren().add(tableComponent);
return panelComponent.render(graphics);
}

5
runelite-client/src/main/java/net/runelite/client/plugins/motherlode/MotherlodeSackOverlay.java
View File

@@ -116,10 +116,7 @@ class MotherlodeSackOverlay extends Overlay
}
}
if (!tableComponent.isEmpty())
{
panelComponent.getChildren().add(tableComponent);
}
panelComponent.getChildren().add(tableComponent);
return panelComponent.render(graphics);
}

5
runelite-client/src/main/java/net/runelite/client/plugins/opponentinfo/PlayerComparisonOverlay.java
View File

@@ -171,10 +171,7 @@ class PlayerComparisonOverlay extends Overlay
ColorUtil.prependColorTag(Integer.toString(opponentSkillLevel), comparisonStatColor(opponentSkillLevel, playerSkillLevel)));
}
if (!tableComponent.isEmpty())
{
panelComponent.getChildren().add(tableComponent);
}
panelComponent.getChildren().add(tableComponent);
}
private static Color comparisonStatColor(int a, int b)

5
runelite-client/src/main/java/net/runelite/client/plugins/raids/RaidsOverlay.java
View File

@@ -361,10 +361,7 @@ public class RaidsOverlay extends Overlay
roomCount++;
}
if (!tableComponent.isEmpty())
{
panelComponent.getChildren().add(tableComponent);
}
panelComponent.getChildren().add(tableComponent);
Dimension panelDims = panelComponent.render(graphics);
width = (int) panelDims.getWidth();

5
runelite-client/src/main/java/net/runelite/client/plugins/raids/RaidsPointsOverlay.java
View File

@@ -108,10 +108,7 @@ public class RaidsPointsOverlay extends Overlay
.build());
}*/
if (!tableComponent.isEmpty())
{
panel.getChildren().add(tableComponent);
}
panel.getChildren().add(tableComponent);
return panel.render(graphics);
}

5
runelite-client/src/main/java/net/runelite/client/plugins/smelting/SmeltingOverlay.java
View File

@@ -111,10 +111,7 @@ class SmeltingOverlay extends Overlay
tableComponent.addRow("Actions/hr:", Integer.toString(xpTrackerService.getActionsHr(Skill.SMITHING)));
}
if (!tableComponent.isEmpty())
{
panelComponent.getChildren().add(tableComponent);
}
panelComponent.getChildren().add(tableComponent);
}
return panelComponent.render(graphics);

5
runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/nylocas/NyloOverlay.java
View File

@@ -128,10 +128,7 @@ class NyloOverlay extends Overlay
}
}
if (!tableComponent.isEmpty())
{
panelComponent.getChildren().add(tableComponent);
}
panelComponent.getChildren().add(tableComponent);
/**

5
runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/xarpus/XarpusCounter.java
View File

@@ -62,10 +62,7 @@ public class XarpusCounter extends Overlay
TableComponent tableComponent = new TableComponent();
tableComponent.addRow("Exhumes", String.valueOf(xarpusHandler.getExhumesCount()));
if (!tableComponent.isEmpty())
{
panelComponent.getChildren().add(tableComponent);
}
panelComponent.getChildren().add(tableComponent);
return panelComponent.render(graphics);
}

5
runelite-client/src/main/java/net/runelite/client/plugins/thieving/ThievingOverlay.java
View File

@@ -102,10 +102,7 @@ public class ThievingOverlay extends Overlay
tableComponent.addRow("Succeeded:", session.getSuccessful() + (session.getSuccessful() >= 1 ? " (" + xpTrackerService.getActionsHr(Skill.THIEVING) + "/hr)" : ""));
tableComponent.addRow("Failed:", session.getFailed() + (session.getFailed() >= 1 ? " (" + FORMAT.format(session.getSuccessRate()) + "%)" : ""));
if (!tableComponent.isEmpty())
{
panelComponent.getChildren().add(tableComponent);
}
panelComponent.getChildren().add(tableComponent);
return panelComponent.render(graphics);
}

5
runelite-client/src/main/java/net/runelite/client/plugins/wintertodt/WintertodtOverlay.java
View File

@@ -95,10 +95,7 @@ class WintertodtOverlay extends Overlay
tableComponent.addRow(ColorUtil.prependColorTag("Kindling:", Color.WHITE), ColorUtil.prependColorTag(kindlingScore + " pts (" + kindlingXp + " xp)", plugin.getNumKindling() > 0 ? Color.GREEN : Color.RED));
tableComponent.addRow(ColorUtil.prependColorTag("Total:", Color.WHITE), ColorUtil.prependColorTag((rootsScore + kindlingScore) + " pts (" + (rootsXp + kindlingXp) + " xp)", (rootsScore + kindlingScore > 0) ? Color.GREEN : Color.RED));
if (!tableComponent.isEmpty())
{
panelComponent.getChildren().add(tableComponent);
}
panelComponent.getChildren().add(tableComponent);
return panelComponent.render(graphics);
}

5
runelite-client/src/main/java/net/runelite/client/plugins/woodcutting/WoodcuttingOverlay.java
View File

@@ -107,10 +107,7 @@ class WoodcuttingOverlay extends Overlay
}
}
if (!tableComponent.isEmpty())
{
panelComponent.getChildren().add(tableComponent);
}
panelComponent.getChildren().add(tableComponent);
return panelComponent.render(graphics);
}

5
runelite-client/src/main/java/net/runelite/client/plugins/xpglobes/XpGlobesOverlay.java
View File

@@ -280,10 +280,7 @@ public class XpGlobesOverlay extends Overlay
}
}
if (!tableComponent.isEmpty())
{
xpTooltip.getChildren().add(tableComponent);
}
xpTooltip.getChildren().add(tableComponent);
xpTooltip.render(graphics);
}

4
runelite-client/src/main/java/net/runelite/client/ui/overlay/components/PanelComponent.java
View File

@@ -34,6 +34,7 @@ import java.util.List;
import javax.annotation.Nullable;
import lombok.Getter;
import lombok.Setter;
import net.runelite.client.ui.overlay.components.table.TableComponent;
public class PanelComponent implements LayoutableRenderableEntity
{
@@ -74,6 +75,8 @@ public class PanelComponent implements LayoutableRenderableEntity
@Override
public Dimension render(Graphics2D graphics)
{
children.removeIf(child -> child instanceof TableComponent && ((TableComponent) child).isEmpty());
if (children.isEmpty())
{
return null;
@@ -114,6 +117,7 @@ public class PanelComponent implements LayoutableRenderableEntity
for (int i = 0; i < children.size(); i++)
{
final LayoutableRenderableEntity child = children.get(i);
child.setPreferredLocation(new Point(x, y));
child.setPreferredSize(childPreferredSize);
final Dimension childDimension = child.render(graphics);