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

menu swapper: fix toggling customizable shift-click option

Browse Source 
This was not actually enabling/disabling shift click on config toggle,
nor was it respecting the config option when overwriting the shift click
indexes
This commit is contained in:
Adam
2020-06-25 20:51:14 -04:00
parent 924064ddc5
commit 1e1273d172
2 changed files with 18 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -29,9 +29,11 @@ import net.runelite.client.config.ConfigGroup;
import net.runelite.client.config.ConfigItem; import net.runelite.client.config.ConfigItem;
import net.runelite.client.config.ConfigSection; import net.runelite.client.config.ConfigSection;
@ConfigGroup("menuentryswapper") @ConfigGroup(MenuEntrySwapperConfig.GROUP)
public interface MenuEntrySwapperConfig extends Config public interface MenuEntrySwapperConfig extends Config
{ {
String GROUP = "menuentryswapper";
@ConfigSection( @ConfigSection(
name = "Item Swaps", name = "Item Swaps",
description = "All options that swap item menu entries", description = "All options that swap item menu entries",

26
runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/MenuEntrySwapperPlugin.java
View File

@@ -85,7 +85,7 @@ public class MenuEntrySwapperPlugin extends Plugin
private static final String RESET = "Reset"; private static final String RESET = "Reset";
private static final String MENU_TARGET = "Shift-click"; private static final String MENU_TARGET = "Shift-click";
private static final String CONFIG_GROUP = "shiftclick"; private static final String SHIFTCLICK_CONFIG_GROUP = "shiftclick";
private static final String ITEM_KEY_PREFIX = "item_"; private static final String ITEM_KEY_PREFIX = "item_";
private static final WidgetMenuOption FIXED_INVENTORY_TAB_CONFIGURE = new WidgetMenuOption(CONFIGURE, private static final WidgetMenuOption FIXED_INVENTORY_TAB_CONFIGURE = new WidgetMenuOption(CONFIGURE,
@@ -389,12 +389,7 @@ public class MenuEntrySwapperPlugin extends Plugin
@Subscribe @Subscribe
public void onConfigChanged(ConfigChanged event) public void onConfigChanged(ConfigChanged event)
{ {
if (!CONFIG_GROUP.equals(event.getGroup())) if (event.getGroup().equals(MenuEntrySwapperConfig.GROUP) && event.getKey().equals("shiftClickCustomization"))
{
return;
}
if (event.getKey().equals("shiftClickCustomization"))
{ {
if (config.shiftClickCustomization()) if (config.shiftClickCustomization())
{ {
@@ -405,7 +400,7 @@ public class MenuEntrySwapperPlugin extends Plugin
disableCustomization(); disableCustomization();
} }
} }
else if (event.getKey().startsWith(ITEM_KEY_PREFIX)) else if (event.getGroup().equals(SHIFTCLICK_CONFIG_GROUP) && event.getKey().startsWith(ITEM_KEY_PREFIX))
{ {
clientThread.invoke(this::resetItemCompositionCache); clientThread.invoke(this::resetItemCompositionCache);
} }
@@ -420,7 +415,7 @@ public class MenuEntrySwapperPlugin extends Plugin
private Integer getSwapConfig(int itemId) private Integer getSwapConfig(int itemId)
{ {
itemId = ItemVariationMapping.map(itemId); itemId = ItemVariationMapping.map(itemId);
String config = configManager.getConfiguration(CONFIG_GROUP, ITEM_KEY_PREFIX + itemId); String config = configManager.getConfiguration(SHIFTCLICK_CONFIG_GROUP, ITEM_KEY_PREFIX + itemId);
if (config == null || config.isEmpty()) if (config == null || config.isEmpty())
{ {
return null; return null;
@@ -432,19 +427,20 @@ public class MenuEntrySwapperPlugin extends Plugin
private void setSwapConfig(int itemId, int index) private void setSwapConfig(int itemId, int index)
{ {
itemId = ItemVariationMapping.map(itemId); itemId = ItemVariationMapping.map(itemId);
configManager.setConfiguration(CONFIG_GROUP, ITEM_KEY_PREFIX + itemId, index); configManager.setConfiguration(SHIFTCLICK_CONFIG_GROUP, ITEM_KEY_PREFIX + itemId, index);
} }
private void unsetSwapConfig(int itemId) private void unsetSwapConfig(int itemId)
{ {
itemId = ItemVariationMapping.map(itemId); itemId = ItemVariationMapping.map(itemId);
configManager.unsetConfiguration(CONFIG_GROUP, ITEM_KEY_PREFIX + itemId); configManager.unsetConfiguration(SHIFTCLICK_CONFIG_GROUP, ITEM_KEY_PREFIX + itemId);
} }
private void enableCustomization() private void enableCustomization()
{ {
keyManager.registerKeyListener(inputListener); keyManager.registerKeyListener(inputListener);
refreshShiftClickCustomizationMenus(); refreshShiftClickCustomizationMenus();
// set shift click action index on the item compositions
clientThread.invoke(this::resetItemCompositionCache); clientThread.invoke(this::resetItemCompositionCache);
} }
@@ -453,6 +449,7 @@ public class MenuEntrySwapperPlugin extends Plugin
keyManager.unregisterKeyListener(inputListener); keyManager.unregisterKeyListener(inputListener);
removeShiftClickCustomizationMenus(); removeShiftClickCustomizationMenus();
configuringShiftClick = false; configuringShiftClick = false;
// flush item compositions to reset the shift click action index
clientThread.invoke(this::resetItemCompositionCache); clientThread.invoke(this::resetItemCompositionCache);
} }
@@ -707,6 +704,13 @@ public class MenuEntrySwapperPlugin extends Plugin
@Subscribe @Subscribe
public void onPostItemComposition(PostItemComposition event) public void onPostItemComposition(PostItemComposition event)
{ {
if (!config.shiftClickCustomization())
{
// since shift-click is done by the client we have to check if our shift click customization is on
// prior to altering the item shift click action index.
return;
}
ItemComposition itemComposition = event.getItemComposition(); ItemComposition itemComposition = event.getItemComposition();
Integer option = getSwapConfig(itemComposition.getId()); Integer option = getSwapConfig(itemComposition.getId());