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

runecraft: remove unnecessary rifts set

Browse Source
This commit is contained in:
Adam
2022-03-30 16:40:12 -04:00
parent 1cddbcef7d
commit a35c44ac25
3 changed files with 2 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
runelite-client/src/main/java/net/runelite/client/plugins/runecraft/AbyssMinimapOverlay.java
View File

@@ -71,7 +71,7 @@ class AbyssMinimapOverlay extends Overlay
for (DecorativeObject object : plugin.getAbyssObjects()) for (DecorativeObject object : plugin.getAbyssObjects())
{ {
AbyssRifts rift = AbyssRifts.getRift(object.getId()); AbyssRifts rift = AbyssRifts.getRift(object.getId());
if (rift == null || !plugin.getRifts().contains(rift)) if (rift == null || !rift.getConfigEnabled().test(config))
{ {
continue; continue;
} }

2
runelite-client/src/main/java/net/runelite/client/plugins/runecraft/AbyssOverlay.java
View File

@@ -73,7 +73,7 @@ class AbyssOverlay extends Overlay
private void renderRift(Graphics2D graphics, DecorativeObject object) private void renderRift(Graphics2D graphics, DecorativeObject object)
{ {
AbyssRifts rift = AbyssRifts.getRift(object.getId()); AbyssRifts rift = AbyssRifts.getRift(object.getId());
if (rift == null || !plugin.getRifts().contains(rift)) if (rift == null || !rift.getConfigEnabled().test(config))
{ {
return; return;
} }

23
runelite-client/src/main/java/net/runelite/client/plugins/runecraft/RunecraftPlugin.java
View File

@@ -27,7 +27,6 @@ package net.runelite.client.plugins.runecraft;
import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList;
import com.google.inject.Provides; import com.google.inject.Provides;
import java.awt.Color; import java.awt.Color;
import java.util.Arrays;
import java.util.HashSet; import java.util.HashSet;
import java.util.List; import java.util.List;
import java.util.Set; import java.util.Set;
@@ -52,7 +51,6 @@ import net.runelite.api.events.ItemContainerChanged;
import net.runelite.client.Notifier; import net.runelite.client.Notifier;
import net.runelite.client.config.ConfigManager; import net.runelite.client.config.ConfigManager;
import net.runelite.client.eventbus.Subscribe; import net.runelite.client.eventbus.Subscribe;
import net.runelite.client.events.ConfigChanged;
import net.runelite.client.game.npcoverlay.HighlightedNpc; import net.runelite.client.game.npcoverlay.HighlightedNpc;
import net.runelite.client.game.npcoverlay.NpcOverlayService; import net.runelite.client.game.npcoverlay.NpcOverlayService;
import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.Plugin;
@@ -77,9 +75,6 @@ public class RunecraftPlugin extends Plugin
@Getter(AccessLevel.PACKAGE) @Getter(AccessLevel.PACKAGE)
private final Set<DecorativeObject> abyssObjects = new HashSet<>(); private final Set<DecorativeObject> abyssObjects = new HashSet<>();
@Getter(AccessLevel.PACKAGE)
private final Set<AbyssRifts> rifts = new HashSet<>();
private boolean degradedPouchInInventory; private boolean degradedPouchInInventory;
@Inject @Inject
@@ -114,7 +109,6 @@ public class RunecraftPlugin extends Plugin
npcOverlayService.registerHighlighter(highlightDarkMage); npcOverlayService.registerHighlighter(highlightDarkMage);
overlayManager.add(abyssOverlay); overlayManager.add(abyssOverlay);
overlayManager.add(abyssMinimapOverlay); overlayManager.add(abyssMinimapOverlay);
updateRifts();
} }
@Override @Override
@@ -127,15 +121,6 @@ public class RunecraftPlugin extends Plugin
degradedPouchInInventory = false; degradedPouchInInventory = false;
} }
@Subscribe
public void onConfigChanged(ConfigChanged event)
{
if (event.getGroup().equals(RunecraftConfig.GROUP))
{
updateRifts();
}
}
@Subscribe @Subscribe
public void onChatMessage(ChatMessage event) public void onChatMessage(ChatMessage event)
{ {
@@ -205,12 +190,4 @@ public class RunecraftPlugin extends Plugin
} }
return null; return null;
} }
private void updateRifts()
{
rifts.clear();
Arrays.stream(AbyssRifts.values())
.filter(r -> r.getConfigEnabled().test(config))
.forEach(rifts::add);
}
} }