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

OpenOSRS: fix hiding plugins (#2123)

Browse Source 
OpenOSRS: fix hiding plugins
This commit is contained in:
Kyle
2019-12-13 19:58:16 +00:00
committed by GitHub
parent d928f0517f
commit 3ad68bcce6
1 changed files with 22 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
runelite-client/src/main/java/net/runelite/client/plugins/openosrs/OpenOSRSPlugin.java
View File

@@ -60,7 +60,7 @@ import net.runelite.client.util.HotkeyListener;
public class OpenOSRSPlugin extends Plugin public class OpenOSRSPlugin extends Plugin
{ {
private final openosrsKeyListener keyListener = new openosrsKeyListener(); private final openosrsKeyListener keyListener = new openosrsKeyListener();
private final List<String> colorOptions = Arrays.asList("externalColor", "pvmColor", "pvpColor", "skillingColor", "utilityColor"); private final List<String> HidePlugins = Arrays.asList("hidePlugins", "hidePvmPlugins", "hidePvpPlugins", "hideSkillingPlugins", "hideUtilityPlugins", "hideExternalPlugins");
@Inject @Inject
private OpenOSRSConfig config; private OpenOSRSConfig config;
@@ -73,7 +73,11 @@ public class OpenOSRSPlugin extends Plugin
@Inject @Inject
private ClientThread clientThread; private ClientThread clientThread;
private int entered = -1;
private int enterIdx;
private boolean expectInput;
private boolean detach;
private Keybind keybind;
private final HotkeyListener hotkeyListener = new HotkeyListener(() -> this.keybind) private final HotkeyListener hotkeyListener = new HotkeyListener(() -> this.keybind)
{ {
@Override @Override
@@ -84,16 +88,10 @@ public class OpenOSRSPlugin extends Plugin
client.setOculusOrbNormalSpeed(detach ? 36 : 12); client.setOculusOrbNormalSpeed(detach ? 36 : 12);
} }
}; };
private int entered = -1;
private int enterIdx;
private boolean expectInput;
private boolean detach;
private Keybind keybind;
@Override @Override
protected void startUp() protected void startUp()
{ {
entered = -1; entered = -1;
enterIdx = 0; enterIdx = 0;
expectInput = false; expectInput = false;
@@ -119,7 +117,7 @@ public class OpenOSRSPlugin extends Plugin
return; return;
} }
if (colorOptions.stream().anyMatch(option -> option.equals(event.getKey()))) if (HidePlugins.stream().anyMatch(option -> option.equals(event.getKey())))
{ {
updatePlugins(); updatePlugins();
} }
@@ -220,6 +218,20 @@ public class OpenOSRSPlugin extends Plugin
} }
} }
private void updatePlugins()
{
ConfigPanel.pluginList.forEach(listItem ->
{
if (listItem.getPluginType() == PluginType.GENERAL_USE || listItem.getPluginType() == PluginType.IMPORTANT)
{
return;
}
listItem.setColor(ConfigPanel.getColorByCategory(config, listItem.getPluginType()));
listItem.setHidden(ConfigPanel.getHiddenByCategory(config, listItem.getPluginType()));
});
}
private class openosrsKeyListener implements KeyListener private class openosrsKeyListener implements KeyListener
{ {
private int lastKeyCycle; private int lastKeyCycle;
@@ -254,18 +266,4 @@ public class OpenOSRSPlugin extends Plugin
{ {
} }
} }
}
private void updatePlugins()
{
ConfigPanel.pluginList.forEach(listItem ->
{
if (listItem.getPluginType() == PluginType.GENERAL_USE || listItem.getPluginType() == PluginType.IMPORTANT)
{
return;
}
listItem.setColor(ConfigPanel.getColorByCategory(config, listItem.getPluginType()));
listItem.setHidden(ConfigPanel.getHiddenByCategory(config, listItem.getPluginType()));
});
}
}