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

sigh, yet another fix

Browse Source 
sigh, yet another fix
This commit is contained in:
Kyleeld
2019-06-22 05:24:46 +01:00
parent 53b36a6397
commit 70335b5a95
1 changed files with 2 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

74
runelite-client/src/main/java/net/runelite/client/plugins/inferno/InfernoWaveOverlay.java
View File

@@ -12,76 +12,6 @@ import net.runelite.client.ui.overlay.components.PanelComponent;
import net.runelite.api.Client;
import net.runelite.client.ui.overlay.Overlay;
public class InfernoWaveOverlay extends Overlay
{
private final Client client;
private final InfernoPlugin plugin;
private final InfernoConfig config;
private PanelComponent panelComponent;
@Inject
InfernoWaveOverlay(final Client client, final InfernoPlugin plugin, final InfernoConfig config)
{
(this.panelComponent = new PanelComponent()).setPreferredSize(new Dimension(150, 0));
this.setPosition(OverlayPosition.TOP_RIGHT);
this.setPriority(OverlayPriority.HIGH);
this.client = client;
this.plugin = plugin;
this.config = config;
}
public Dimension render(final Graphics2D graphics)
{
if (!plugin.inInferno() || plugin.getCurrentWaveNumber() == -1)
{
return null;
}
panelComponent.getChildren().clear();
if (config.waveDisplay() == InfernoWaveDisplayMode.CURRENT
|| config.waveDisplay() == InfernoWaveDisplayMode.BOTH)
{
renderWave("Wave " + plugin.getCurrentWaveNumber(), plugin.getCurrentWaveNumber());
}
if ((config.waveDisplay() == InfernoWaveDisplayMode.NEXT
|| config.waveDisplay() == InfernoWaveDisplayMode.BOTH)
&& plugin.isNotFinalWave())
{
renderWave("Next Wave:", plugin.getNextWaveNumber());
}
return panelComponent.render(graphics);
}
private void renderWave(final String header, final int waveNumber)
{
panelComponent.getChildren().add(TitleComponent.builder().text(header).color(config.getWaveOverlayHeaderColor()).build());
final HashMap<Integer, Integer> waveMap = (HashMap<Integer, Integer>) InfernoWaveMappings.intArrayToHashmap(plugin.getWaves().get(waveNumber));
for (final Map.Entry<Integer, Integer> entry : waveMap.entrySet())
{
final int monsterID = entry.getKey();
final int quantity = entry.getValue();
if (quantity <= 0)
{
continue;
}
panelComponent.getChildren().add(TitleComponent.builder().text(quantity + "x " + plugin.getMonster().get(monsterID)).color(config.getWaveTextColor()).build());
}
}
}
package net.runelite.client.plugins.inferno;
import java.util.Iterator;
import java.util.HashMap;
import java.util.Map;
import com.google.inject.Inject;
import net.runelite.client.ui.overlay.components.TitleComponent;
import java.awt.Graphics2D;
import net.runelite.client.ui.overlay.OverlayPriority;
import net.runelite.client.ui.overlay.OverlayPosition;
import java.awt.Dimension;
import net.runelite.client.ui.overlay.components.PanelComponent;
import net.runelite.api.Client;
import net.runelite.client.ui.overlay.Overlay;
public class InfernoWaveOverlay extends Overlay
{
private final Client client;
@@ -116,7 +46,7 @@ public class InfernoWaveOverlay extends Overlay
|| config.waveDisplay() == InfernoWaveDisplayMode.BOTH)
&& plugin.isNotFinalWave())
{
renderWave("Next Wave (Wave " + plugin.getNextWaveNumber() + ")", plugin.getNextWaveNumber());
renderWave("Next Wave (Wave " + plugin.getNextWaveNumber() + ")", plugin.getCurrentWaveNumber());
}
return panelComponent.render(graphics);
}
@@ -136,4 +66,4 @@ public class InfernoWaveOverlay extends Overlay
panelComponent.getChildren().add(TitleComponent.builder().text(quantity + "x " + plugin.getMonster().get(monsterID)).color(config.getWaveTextColor()).build());
}
}
}
}