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

Rename dumb class

Browse Source
This commit is contained in:
Lucas
2019-05-22 19:07:53 +02:00
parent 6af0da37ea
commit f2d7cf13bc
3 changed files with 50 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
runelite-client/src/main/java/net/runelite/client/menus/AbstractMenuEntry.java → runelite-client/src/main/java/net/runelite/client/menus/ComparableEntry.java
View File

@@ -32,7 +32,7 @@ import static net.runelite.client.menus.MenuManager.LEVEL_PATTERN;
import net.runelite.client.util.Text;
@EqualsAndHashCode
public class AbstractMenuEntry
public class ComparableEntry
{
@Getter
private String option;
@@ -52,17 +52,17 @@ public class AbstractMenuEntry
@Getter
private boolean strictTarget;
public AbstractMenuEntry(String option, String target)
public ComparableEntry(String option, String target)
{
this(option, target, -1, -1, true, true);
}
public AbstractMenuEntry(String option, String target, boolean strictTarget)
public ComparableEntry(String option, String target, boolean strictTarget)
{
this(option, target, -1, -1, true, strictTarget);
}
public AbstractMenuEntry(String option, String target, int id, int type, boolean strictOption, boolean strictTarget)
public ComparableEntry(String option, String target, int id, int type, boolean strictOption, boolean strictTarget)
{
this.option = option;
this.target = target;
@@ -113,14 +113,4 @@ public class AbstractMenuEntry
return true;
}
/*boolean equals(AbstractMenuEntry other)
{
return target.equals(other.getTarget())
&& option.equals(other.getOption())
&& id == other.getId()
&& type == other.getType()
&& strictOption == other.isStrictOption()
&& strictTarget == other.isStrictTarget();
}*/
}

70
runelite-client/src/main/java/net/runelite/client/menus/MenuManager.java
View File

@@ -91,10 +91,10 @@ public class MenuManager
private final Multimap<Integer, WidgetMenuOption> managedMenuOptions = HashMultimap.create();
private final Set<String> npcMenuOptions = new HashSet<>();
private final Set<AbstractMenuEntry> priorityEntries = new HashSet<>();
private final Set<ComparableEntry> priorityEntries = new HashSet<>();
private final Set<MenuEntry> currentPriorityEntries = new HashSet<>();
private final Map<AbstractMenuEntry, AbstractMenuEntry> swaps = new HashMap<>();
private final Map<ComparableEntry, ComparableEntry> swaps = new HashMap<>();
private final Set<MenuEntry> originalTypes = new HashSet<>();
private final Set<Integer> leftClickObjects = new HashSet<>();
@@ -176,7 +176,7 @@ public class MenuManager
final MenuEntry newestEntry = menuEntries[menuEntries.length - 1];
boolean isPrio = false;
for (AbstractMenuEntry p : priorityEntries)
for (ComparableEntry p : priorityEntries)
{
if (p.matches(newestEntry))
{
@@ -203,8 +203,8 @@ public class MenuManager
}
// Find the current entry in the swaps map
AbstractMenuEntry swapEntry = null;
for (AbstractMenuEntry e : swaps.keySet())
ComparableEntry swapEntry = null;
for (ComparableEntry e : swaps.keySet())
{
if (e.matches(newestEntry))
{
@@ -215,7 +215,7 @@ public class MenuManager
if (swapEntry != null)
{
AbstractMenuEntry swapTarget = swaps.get(swapEntry);
ComparableEntry swapTarget = swaps.get(swapEntry);
// Find the target for the swap in current menu entries
MenuEntry foundSwap = null;
@@ -587,7 +587,7 @@ public class MenuManager
option = Text.standardize(option);
target = Text.standardize(target);
AbstractMenuEntry entry = new AbstractMenuEntry(option, target);
ComparableEntry entry = new ComparableEntry(option, target);
priorityEntries.add(entry);
}
@@ -597,10 +597,10 @@ public class MenuManager
option = Text.standardize(option);
target = Text.standardize(target);
AbstractMenuEntry entry = new AbstractMenuEntry(option, target);
ComparableEntry entry = new ComparableEntry(option, target);
Set<AbstractMenuEntry> toRemove = new HashSet<>();
for (AbstractMenuEntry priorityEntry : priorityEntries)
Set<ComparableEntry> toRemove = new HashSet<>();
for (ComparableEntry priorityEntry : priorityEntries)
{
if (entry.equals(priorityEntry))
{
@@ -608,7 +608,7 @@ public class MenuManager
}
}
for (AbstractMenuEntry e : toRemove)
for (ComparableEntry e : toRemove)
{
priorityEntries.remove(e);
}
@@ -623,7 +623,7 @@ public class MenuManager
{
option = Text.standardize(option);
AbstractMenuEntry entry = new AbstractMenuEntry(option, "", false);
ComparableEntry entry = new ComparableEntry(option, "", false);
priorityEntries.add(entry);
}
@@ -632,10 +632,10 @@ public class MenuManager
{
option = Text.standardize(option);
AbstractMenuEntry entry = new AbstractMenuEntry(option, "", false);
ComparableEntry entry = new ComparableEntry(option, "", false);
Set<AbstractMenuEntry> toRemove = new HashSet<>();
for (AbstractMenuEntry priorityEntry : priorityEntries)
Set<ComparableEntry> toRemove = new HashSet<>();
for (ComparableEntry priorityEntry : priorityEntries)
{
if (entry.equals(priorityEntry))
{
@@ -643,7 +643,7 @@ public class MenuManager
}
}
for (AbstractMenuEntry e : toRemove)
for (ComparableEntry e : toRemove)
{
priorityEntries.remove(e);
}
@@ -660,8 +660,8 @@ public class MenuManager
option2 = Text.standardize(option2);
target2 = Text.standardize(target2);
AbstractMenuEntry swapFrom = new AbstractMenuEntry(option, target, -1, -1, strictOption, strictTarget);
AbstractMenuEntry swapTo = new AbstractMenuEntry(option2, target2, -1, -1, strictOption, strictTarget);
ComparableEntry swapFrom = new ComparableEntry(option, target, -1, -1, strictOption, strictTarget);
ComparableEntry swapTo = new ComparableEntry(option2, target2, -1, -1, strictOption, strictTarget);
if (swapTo.equals(swapFrom))
{
@@ -681,8 +681,8 @@ public class MenuManager
option2 = Text.standardize(option2);
target2 = Text.standardize(target2);
AbstractMenuEntry swapFrom = new AbstractMenuEntry(option, target, -1, -1, strictOption, strictTarget);
AbstractMenuEntry swapTo = new AbstractMenuEntry(option2, target2, -1, -1, strictOption, strictTarget);
ComparableEntry swapFrom = new ComparableEntry(option, target, -1, -1, strictOption, strictTarget);
ComparableEntry swapTo = new ComparableEntry(option2, target2, -1, -1, strictOption, strictTarget);
removeSwap(swapFrom, swapTo);
}
@@ -703,7 +703,7 @@ public class MenuManager
/**
* Adds to the map of swaps - Pre-baked Abstract entry
*/
public void addSwap(AbstractMenuEntry swapFrom, AbstractMenuEntry swapTo)
public void addSwap(ComparableEntry swapFrom, ComparableEntry swapTo)
{
if (swapTo.equals(swapFrom))
{
@@ -726,8 +726,8 @@ public class MenuManager
option2 = Text.standardize(option2);
target2 = Text.standardize(target2);
AbstractMenuEntry swapFrom = new AbstractMenuEntry(option, target, id, type, false, false);
AbstractMenuEntry swapTo = new AbstractMenuEntry(option2, target2, id2, type2, false, false);
ComparableEntry swapFrom = new ComparableEntry(option, target, id, type, false, false);
ComparableEntry swapTo = new ComparableEntry(option2, target2, id2, type2, false, false);
if (swapTo.equals(swapFrom))
{
@@ -746,11 +746,11 @@ public class MenuManager
option2 = Text.standardize(option2);
target2 = Text.standardize(target2);
AbstractMenuEntry swapFrom = new AbstractMenuEntry(option, target, id, type, false, false);
AbstractMenuEntry swapTo = new AbstractMenuEntry(option2, target2, id2, type2, false, false);
ComparableEntry swapFrom = new ComparableEntry(option, target, id, type, false, false);
ComparableEntry swapTo = new ComparableEntry(option2, target2, id2, type2, false, false);
Set<AbstractMenuEntry> toRemove = new HashSet<>();
for (Map.Entry<AbstractMenuEntry, AbstractMenuEntry> e : swaps.entrySet())
Set<ComparableEntry> toRemove = new HashSet<>();
for (Map.Entry<ComparableEntry, ComparableEntry> e : swaps.entrySet())
{
if (e.getKey().equals(swapFrom) && e.getValue().equals(swapTo))
{
@@ -758,16 +758,16 @@ public class MenuManager
}
}
for (AbstractMenuEntry entry : toRemove)
for (ComparableEntry entry : toRemove)
{
swaps.remove(entry);
}
}
public void removeSwap(AbstractMenuEntry swapFrom, AbstractMenuEntry swapTo)
public void removeSwap(ComparableEntry swapFrom, ComparableEntry swapTo)
{
Set<AbstractMenuEntry> toRemove = new HashSet<>();
for (Map.Entry<AbstractMenuEntry, AbstractMenuEntry> e : swaps.entrySet())
Set<ComparableEntry> toRemove = new HashSet<>();
for (Map.Entry<ComparableEntry, ComparableEntry> e : swaps.entrySet())
{
if (e.getKey().equals(swapFrom) && e.getValue().equals(swapTo))
{
@@ -775,7 +775,7 @@ public class MenuManager
}
}
for (AbstractMenuEntry entry : toRemove)
for (ComparableEntry entry : toRemove)
{
swaps.remove(entry);
}
@@ -788,9 +788,9 @@ public class MenuManager
{
withTarget = Text.standardize(withTarget);
Set<AbstractMenuEntry> toRemove = new HashSet<>();
Set<ComparableEntry> toRemove = new HashSet<>();
for (AbstractMenuEntry e : swaps.keySet())
for (ComparableEntry e : swaps.keySet())
{
if (e.getTarget().equals(withTarget))
{
@@ -798,7 +798,7 @@ public class MenuManager
}
}
for (AbstractMenuEntry entry : toRemove)
for (ComparableEntry entry : toRemove)
{
swaps.remove(entry);
}

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

@@ -55,7 +55,7 @@ import net.runelite.client.eventbus.Subscribe;
import net.runelite.client.game.ItemManager;
import net.runelite.client.game.ItemVariationMapping;
import net.runelite.client.input.KeyManager;
import net.runelite.client.menus.AbstractMenuEntry;
import net.runelite.client.menus.ComparableEntry;
import net.runelite.client.menus.MenuManager;
import net.runelite.client.menus.WidgetMenuOption;
import net.runelite.client.plugins.Plugin;
@@ -110,7 +110,7 @@ public class MenuEntrySwapperPlugin extends Plugin
.omitEmptyStrings()
.trimResults();
private final Map<AbstractMenuEntry, AbstractMenuEntry> customSwaps = new HashMap<>();
private final Map<ComparableEntry, ComparableEntry> customSwaps = new HashMap<>();
@Inject
private Client client;
@@ -762,7 +762,7 @@ else if (config.swapOccult() != OccultAltarMode.VENERATE && option.equals("vener
private void loadCustomSwaps(String config)
{
Map<AbstractMenuEntry, AbstractMenuEntry> tmp = new HashMap<>();
Map<ComparableEntry, ComparableEntry> tmp = new HashMap<>();
if (!Strings.isNullOrEmpty(config))
{
@@ -784,7 +784,7 @@ else if (config.swapOccult() != OccultAltarMode.VENERATE && option.equals("vener
targetFrom = splitFrom[1].trim();
}
AbstractMenuEntry fromEntry = new AbstractMenuEntry(optionFrom, targetFrom);
ComparableEntry fromEntry = new ComparableEntry(optionFrom, targetFrom);
String[] splitTo = Text.standardize(to).split(",");
String optionTo = splitTo[0].trim();
@@ -798,26 +798,26 @@ else if (config.swapOccult() != OccultAltarMode.VENERATE && option.equals("vener
targetTo = splitTo[1].trim();
}
AbstractMenuEntry toEntry = new AbstractMenuEntry(optionTo, targetTo);
ComparableEntry toEntry = new ComparableEntry(optionTo, targetTo);
tmp.put(fromEntry, toEntry);
}
}
for (Map.Entry<AbstractMenuEntry, AbstractMenuEntry> e : customSwaps.entrySet())
for (Map.Entry<ComparableEntry, ComparableEntry> e : customSwaps.entrySet())
{
AbstractMenuEntry key = e.getKey();
AbstractMenuEntry value = e.getValue();
ComparableEntry key = e.getKey();
ComparableEntry value = e.getValue();
menuManager.removeSwap(key, value);
}
customSwaps.clear();
customSwaps.putAll(tmp);
for (Map.Entry<AbstractMenuEntry, AbstractMenuEntry> entry : customSwaps.entrySet())
for (Map.Entry<ComparableEntry, ComparableEntry> entry : customSwaps.entrySet())
{
AbstractMenuEntry a1 = entry.getKey();
AbstractMenuEntry a2 = entry.getValue();
ComparableEntry a1 = entry.getKey();
ComparableEntry a2 = entry.getValue();
menuManager.addSwap(a1, a2);
}
}