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

menu swapper: rename SwapConfig to ItemSwapConfig

Browse Source
This commit is contained in:
Adam
2022-03-31 12:08:10 -04:00
parent 1550fae2ed
commit bded770d53
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -472,7 +472,7 @@ public class MenuEntrySwapperPlugin extends Plugin
client.getItemCompositionCache().reset(); client.getItemCompositionCache().reset();
} }
private Integer getSwapConfig(boolean shift, int itemId) private Integer getItemSwapConfig(boolean shift, int itemId)
{ {
itemId = ItemVariationMapping.map(itemId); itemId = ItemVariationMapping.map(itemId);
String config = configManager.getConfiguration(shift ? SHIFTCLICK_CONFIG_GROUP : MenuEntrySwapperConfig.GROUP, ITEM_KEY_PREFIX + itemId); String config = configManager.getConfiguration(shift ? SHIFTCLICK_CONFIG_GROUP : MenuEntrySwapperConfig.GROUP, ITEM_KEY_PREFIX + itemId);
@@ -484,13 +484,13 @@ public class MenuEntrySwapperPlugin extends Plugin
return Integer.parseInt(config); return Integer.parseInt(config);
} }
private void setSwapConfig(boolean shift, int itemId, int index) private void setItemSwapConfig(boolean shift, int itemId, int index)
{ {
itemId = ItemVariationMapping.map(itemId); itemId = ItemVariationMapping.map(itemId);
configManager.setConfiguration(shift ? SHIFTCLICK_CONFIG_GROUP : MenuEntrySwapperConfig.GROUP, ITEM_KEY_PREFIX + itemId, index); configManager.setConfiguration(shift ? SHIFTCLICK_CONFIG_GROUP : MenuEntrySwapperConfig.GROUP, ITEM_KEY_PREFIX + itemId, index);
} }
private void unsetSwapConfig(boolean shift, int itemId) private void unsetItemSwapConfig(boolean shift, int itemId)
{ {
itemId = ItemVariationMapping.map(itemId); itemId = ItemVariationMapping.map(itemId);
configManager.unsetConfiguration(shift ? SHIFTCLICK_CONFIG_GROUP : MenuEntrySwapperConfig.GROUP, ITEM_KEY_PREFIX + itemId); configManager.unsetConfiguration(shift ? SHIFTCLICK_CONFIG_GROUP : MenuEntrySwapperConfig.GROUP, ITEM_KEY_PREFIX + itemId);
@@ -553,7 +553,7 @@ public class MenuEntrySwapperPlugin extends Plugin
else else
{ {
// Otherwise it is possible that we have Use swap configured // Otherwise it is possible that we have Use swap configured
Integer config = getSwapConfig(true, itemId); Integer config = getItemSwapConfig(true, itemId);
if (config != null && config == -1) if (config != null && config == -1)
{ {
activeAction = MenuAction.ITEM_USE; activeAction = MenuAction.ITEM_USE;
@@ -563,7 +563,7 @@ public class MenuEntrySwapperPlugin extends Plugin
else else
{ {
// Apply left click action from configuration // Apply left click action from configuration
Integer config = getSwapConfig(false, itemId); Integer config = getItemSwapConfig(false, itemId);
if (config != null) if (config != null)
{ {
activeAction = config >= 0 activeAction = config >= 0
@@ -586,7 +586,7 @@ public class MenuEntrySwapperPlugin extends Plugin
int index = menuAction == MenuAction.ITEM_USE int index = menuAction == MenuAction.ITEM_USE
? -1 ? -1
: menuAction.getId() - MenuAction.ITEM_FIRST_OPTION.getId(); : menuAction.getId() - MenuAction.ITEM_FIRST_OPTION.getId();
setSwapConfig(configuringShiftClick, itemId, index); setItemSwapConfig(configuringShiftClick, itemId, index);
}); });
if (activeAction == menuAction) if (activeAction == menuAction)
@@ -600,7 +600,7 @@ public class MenuEntrySwapperPlugin extends Plugin
.setOption(RESET) .setOption(RESET)
.setTarget(configuringShiftClick ? SHIFT_CLICK_MENU_TARGET : LEFT_CLICK_MENU_TARGET) .setTarget(configuringShiftClick ? SHIFT_CLICK_MENU_TARGET : LEFT_CLICK_MENU_TARGET)
.setType(MenuAction.RUNELITE) .setType(MenuAction.RUNELITE)
.onClick(e -> unsetSwapConfig(configuringShiftClick, itemId)); .onClick(e -> unsetItemSwapConfig(configuringShiftClick, itemId));
} }
@Subscribe @Subscribe
@@ -705,7 +705,7 @@ public class MenuEntrySwapperPlugin extends Plugin
// the client unable to perform the swap itself. // the client unable to perform the swap itself.
if (config.shiftClickCustomization() && !option.equals("use")) if (config.shiftClickCustomization() && !option.equals("use"))
{ {
Integer customOption = getSwapConfig(true, eventId); Integer customOption = getItemSwapConfig(true, eventId);
if (customOption != null && customOption == -1) if (customOption != null && customOption == -1)
{ {
@@ -721,7 +721,7 @@ public class MenuEntrySwapperPlugin extends Plugin
// Custom left-click item swap // Custom left-click item swap
if (itemOp) if (itemOp)
{ {
Integer swapIndex = getSwapConfig(false, eventId); Integer swapIndex = getItemSwapConfig(false, eventId);
if (swapIndex != null) if (swapIndex != null)
{ {
MenuAction swapAction = swapIndex >= 0 MenuAction swapAction = swapIndex >= 0
@@ -790,7 +790,7 @@ public class MenuEntrySwapperPlugin extends Plugin
} }
ItemComposition itemComposition = event.getItemComposition(); ItemComposition itemComposition = event.getItemComposition();
Integer option = getSwapConfig(true, itemComposition.getId()); Integer option = getItemSwapConfig(true, itemComposition.getId());
if (option != null && option < itemComposition.getInventoryActions().length) if (option != null && option < itemComposition.getInventoryActions().length)
{ {