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

plugintype: Rename important to system. (#2794)

Browse Source
This commit is contained in:
Ganom
2020-08-31 16:13:06 -04:00
committed by GitHub
parent 9b2eb98372
commit e3132599bf
3 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
runelite-client/src/main/java/net/runelite/client/plugins/PluginType.java
View File

@@ -13,12 +13,12 @@ public enum PluginType
SKILLING("Skilling"), SKILLING("Skilling"),
UTILITY("Utilities"), UTILITY("Utilities"),
MISCELLANEOUS("Miscellaneous"), MISCELLANEOUS("Miscellaneous"),
IMPORTANT("System"), SYSTEM("System"),
MINIGAME("Minigame"), MINIGAME("Minigame"),
GAMEMODE("Gamemode"), GAMEMODE("Gamemode"),
UNCATEGORIZED("Uncategorized"); UNCATEGORIZED("Uncategorized");
private String name; private final String name;
@Override @Override
public String toString() public String toString()

8
runelite-client/src/main/java/net/runelite/client/plugins/config/ConfigPlugin.java
View File

@@ -85,12 +85,12 @@ public class ConfigPlugin extends Plugin
pluginListPanel = pluginListPanelProvider.get(); pluginListPanel = pluginListPanelProvider.get();
pluginListPanel.addFakePlugin( pluginListPanel.addFakePlugin(
new PluginConfigurationDescriptor( new PluginConfigurationDescriptor(
"OpenOSRS", "OpenOSRS client settings", PluginType.IMPORTANT, "OpenOSRS", "OpenOSRS client settings", PluginType.SYSTEM,
new String[]{"sorting", "external", "logs", "categories", "colors", "opacity", "pin"}, new String[]{"sorting", "external", "logs", "categories", "colors", "opacity", "pin"},
null, openOSRSConfig, configManager.getConfigDescriptor(openOSRSConfig) null, openOSRSConfig, configManager.getConfigDescriptor(openOSRSConfig)
), ),
new PluginConfigurationDescriptor( new PluginConfigurationDescriptor(
"RuneLite", "RuneLite client settings", PluginType.IMPORTANT, "RuneLite", "RuneLite client settings", PluginType.SYSTEM,
new String[]{"client", "notification", "size", "position", "window", "chrome", "focus", "font", "overlay", "tooltip", "infobox"}, new String[]{"client", "notification", "size", "position", "window", "chrome", "focus", "font", "overlay", "tooltip", "infobox"},
null, runeLiteConfig, configManager.getConfigDescriptor(runeLiteConfig) null, runeLiteConfig, configManager.getConfigDescriptor(runeLiteConfig)
), ),
@@ -104,7 +104,7 @@ public class ConfigPlugin extends Plugin
{ {
pluginListPanel.addFakePlugin( pluginListPanel.addFakePlugin(
new PluginConfigurationDescriptor( new PluginConfigurationDescriptor(
"Launcher", "Launcher settings", PluginType.IMPORTANT, "Launcher", "Launcher settings", PluginType.SYSTEM,
new String[]{"hw", "nightly", "stable", "proxy", "bootstrap"}, new String[]{"hw", "nightly", "stable", "proxy", "bootstrap"},
null, launcherConfig, configManager.getConfigDescriptor(launcherConfig) null, launcherConfig, configManager.getConfigDescriptor(launcherConfig)
)); ));
@@ -166,4 +166,4 @@ public class ConfigPlugin extends Plugin
return Version.valueOf(launcherVersion).greaterThanOrEqualTo(Version.valueOf(version)); return Version.valueOf(launcherVersion).greaterThanOrEqualTo(Version.valueOf(version));
} }
} }

8
runelite-client/src/main/java/net/runelite/client/plugins/config/PluginListPanel.java
View File

@@ -113,7 +113,7 @@ public class PluginListPanel extends PluginPanel
); );
private static final List<String> colorOptions = Arrays.asList("enabledColors", "pvmColor", "pvpColor", "skillingColor", "utilityColor", "minigameColor", "miscellaneousColor", "gamemodeColor"); private static final List<String> colorOptions = Arrays.asList("enabledColors", "pvmColor", "pvpColor", "skillingColor", "utilityColor", "minigameColor", "miscellaneousColor", "gamemodeColor");
private static final List<PluginType> definedOrder = List.of(PluginType.IMPORTANT, PluginType.PVM, PluginType.SKILLING, PluginType.PVP, PluginType.UTILITY, PluginType.MINIGAME, PluginType.MISCELLANEOUS, PluginType.GAMEMODE, PluginType.UNCATEGORIZED); private static final List<PluginType> definedOrder = List.of(PluginType.SYSTEM, PluginType.PVM, PluginType.SKILLING, PluginType.PVP, PluginType.UTILITY, PluginType.MINIGAME, PluginType.MISCELLANEOUS, PluginType.GAMEMODE, PluginType.UNCATEGORIZED);
private static final Comparator<PluginListItem> categoryComparator = Comparator.comparing(plugin -> definedOrder.indexOf(plugin.getPluginType())); private static final Comparator<PluginListItem> categoryComparator = Comparator.comparing(plugin -> definedOrder.indexOf(plugin.getPluginType()));
private final ConfigManager configManager; private final ConfigManager configManager;
@@ -187,7 +187,7 @@ public class PluginListPanel extends PluginPanel
{ {
pluginList.forEach(listItem -> pluginList.forEach(listItem ->
{ {
if (listItem.getPluginType() == PluginType.IMPORTANT) if (listItem.getPluginType() == PluginType.SYSTEM)
{ {
return; return;
} }
@@ -692,7 +692,7 @@ public class PluginListPanel extends PluginPanel
return openOSRSConfig.minigameColor(); return openOSRSConfig.minigameColor();
case GAMEMODE: case GAMEMODE:
return openOSRSConfig.gamemodeColor(); return openOSRSConfig.gamemodeColor();
case IMPORTANT: case SYSTEM:
return Color.WHITE; return Color.WHITE;
} }
@@ -716,4 +716,4 @@ public class PluginListPanel extends PluginPanel
pluginList.sort(Comparator.comparing(ev -> ev.getPluginConfig().getName())); pluginList.sort(Comparator.comparing(ev -> ev.getPluginConfig().getName()));
} }
} }
} }