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

worldhopper: revert back to pre-upstream

Browse Source
This commit is contained in:
Justin
2021-12-02 17:15:15 +11:00
parent 2722244b91
commit dc7728f5ca
4 changed files with 121 additions and 141 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
runelite-client/src/main/java/net/runelite/client/plugins/worldhopper/RegionFilterMode.java
View File

@@ -24,13 +24,16 @@
*/ */
package net.runelite.client.plugins.worldhopper; package net.runelite.client.plugins.worldhopper;
import lombok.AllArgsConstructor;
import lombok.Getter; import lombok.Getter;
import lombok.RequiredArgsConstructor; import lombok.NoArgsConstructor;
import net.runelite.http.api.worlds.WorldRegion; import net.runelite.http.api.worlds.WorldRegion;
@RequiredArgsConstructor @NoArgsConstructor
enum RegionFilterMode @AllArgsConstructor
public enum RegionFilterMode
{ {
NONE,
AUSTRALIA(WorldRegion.AUSTRALIA), AUSTRALIA(WorldRegion.AUSTRALIA),
GERMANY(WorldRegion.GERMANY), GERMANY(WorldRegion.GERMANY),
UNITED_KINGDOM(WorldRegion.UNITED_KINGDOM) UNITED_KINGDOM(WorldRegion.UNITED_KINGDOM)
@@ -51,22 +54,5 @@ enum RegionFilterMode
}; };
@Getter @Getter
private final WorldRegion region; private WorldRegion region;
static RegionFilterMode of(WorldRegion region)
{
switch (region)
{
case UNITED_STATES_OF_AMERICA:
return UNITED_STATES;
case UNITED_KINGDOM:
return UNITED_KINGDOM;
case AUSTRALIA:
return AUSTRALIA;
case GERMANY:
return GERMANY;
default:
throw new IllegalStateException();
}
}
} }

10
runelite-client/src/main/java/net/runelite/client/plugins/worldhopper/WorldHopperConfig.java
View File

@@ -27,8 +27,6 @@ package net.runelite.client.plugins.worldhopper;
import java.awt.event.InputEvent; import java.awt.event.InputEvent;
import java.awt.event.KeyEvent; import java.awt.event.KeyEvent;
import java.util.Collections;
import java.util.Set;
import net.runelite.client.config.Config; import net.runelite.client.config.Config;
import net.runelite.client.config.ConfigGroup; import net.runelite.client.config.ConfigGroup;
import net.runelite.client.config.ConfigItem; import net.runelite.client.config.ConfigItem;
@@ -78,9 +76,9 @@ public interface WorldHopperConfig extends Config
description = "Limit quick-hopping to worlds of a specific region", description = "Limit quick-hopping to worlds of a specific region",
position = 3 position = 3
) )
default Set<RegionFilterMode> quickHopRegionFilter() default RegionFilterMode quickHopRegionFilter()
{ {
return Collections.emptySet(); return RegionFilterMode.NONE;
} }
@ConfigItem( @ConfigItem(
@@ -144,9 +142,9 @@ public interface WorldHopperConfig extends Config
description = "Restrict sidebar worlds to one region", description = "Restrict sidebar worlds to one region",
position = 8 position = 8
) )
default Set<RegionFilterMode> regionFilter() default RegionFilterMode regionFilter()
{ {
return Collections.emptySet(); return RegionFilterMode.NONE;
} }
@ConfigItem( @ConfigItem(

5
runelite-client/src/main/java/net/runelite/client/plugins/worldhopper/WorldHopperPlugin.java
View File

@@ -36,7 +36,6 @@ import java.util.EnumSet;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Set;
import java.util.concurrent.Executors; import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.ScheduledFuture; import java.util.concurrent.ScheduledFuture;
@@ -534,8 +533,6 @@ public class WorldHopperPlugin extends Plugin
int worldIdx = worlds.indexOf(currentWorld); int worldIdx = worlds.indexOf(currentWorld);
int totalLevel = client.getTotalLevel(); int totalLevel = client.getTotalLevel();
final Set<RegionFilterMode> regionFilter = config.quickHopRegionFilter();
World world; World world;
do do
{ {
@@ -567,7 +564,7 @@ public class WorldHopperPlugin extends Plugin
world = worlds.get(worldIdx); world = worlds.get(worldIdx);
// Check world region if filter is enabled // Check world region if filter is enabled
if (!regionFilter.isEmpty() && !regionFilter.contains(RegionFilterMode.of(world.getRegion()))) if (config.quickHopRegionFilter() != RegionFilterMode.NONE && world.getRegion() != config.quickHopRegionFilter().getRegion())
{ {
continue; continue;
} }

5
runelite-client/src/main/java/net/runelite/client/plugins/worldhopper/WorldSwitcherPanel.java
View File

@@ -34,7 +34,6 @@ import java.awt.event.MouseEvent;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Set;
import java.util.function.Function; import java.util.function.Function;
import javax.swing.JPanel; import javax.swing.JPanel;
import javax.swing.SwingUtilities; import javax.swing.SwingUtilities;
@@ -69,7 +68,7 @@ class WorldSwitcherPanel extends PluginPanel
@Setter(AccessLevel.PACKAGE) @Setter(AccessLevel.PACKAGE)
private SubscriptionFilterMode subscriptionFilterMode; private SubscriptionFilterMode subscriptionFilterMode;
@Setter(AccessLevel.PACKAGE) @Setter(AccessLevel.PACKAGE)
private Set<RegionFilterMode> regionFilterMode; private RegionFilterMode regionFilterMode;
WorldSwitcherPanel(WorldHopperPlugin plugin) WorldSwitcherPanel(WorldHopperPlugin plugin)
{ {
@@ -250,7 +249,7 @@ class WorldSwitcherPanel extends PluginPanel
break; break;
} }
if (!regionFilterMode.isEmpty() && !regionFilterMode.contains(RegionFilterMode.of(world.getRegion()))) if (regionFilterMode.getRegion() != null && !regionFilterMode.getRegion().equals(world.getRegion()))
{ {
continue; continue;
} }