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

skillcalculator: Use interface instead of type

Browse Source
This commit is contained in:
sdburns1998
2019-07-07 18:44:07 +02:00
parent ee776e3f0d
commit 59cbfcf7fe
6 changed files with 20 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -256,7 +256,7 @@ public class BankedCalculator extends JPanel
private void calculatedBankedMaps() private void calculatedBankedMaps()
{ {
// Grab all CriticalItems for this skill // Grab all CriticalItems for this skill
ArrayList<CriticalItem> items = CriticalItem.getBySkillName(currentSkill); List<CriticalItem> items = CriticalItem.getBySkillName(currentSkill);
// Loop over all Critical Items for this skill and determine how many are in the bank // Loop over all Critical Items for this skill and determine how many are in the bank
for (CriticalItem item : items) for (CriticalItem item : items)
@@ -414,7 +414,7 @@ public class BankedCalculator extends JPanel
for (String category : CriticalItem.getSkillCategories(currentSkill)) for (String category : CriticalItem.getSkillCategories(currentSkill))
{ {
ArrayList<CriticalItem> items = CriticalItem.getItemsForSkillCategories(currentSkill, category); List<CriticalItem> items = CriticalItem.getItemsForSkillCategories(currentSkill, category);
for (CriticalItem item : items) for (CriticalItem item : items)
{ {
Integer amount = bankMap.get(item.getItemID()); Integer amount = bankMap.get(item.getItemID());

2
runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/SkillCalculator.java
View File

@@ -74,7 +74,7 @@ class SkillCalculator extends JPanel
@Getter(AccessLevel.PACKAGE) @Getter(AccessLevel.PACKAGE)
private final UICombinedActionSlot combinedActionSlot; private final UICombinedActionSlot combinedActionSlot;
@Getter(AccessLevel.PACKAGE) @Getter(AccessLevel.PACKAGE)
private final ArrayList<UIActionSlot> combinedActionSlots = new ArrayList<>(); private final List<UIActionSlot> combinedActionSlots = new ArrayList<>();
private final List<JCheckBox> bonusCheckBoxes = new ArrayList<>(); private final List<JCheckBox> bonusCheckBoxes = new ArrayList<>();
private final IconTextField searchBar = new IconTextField(); private final IconTextField searchBar = new IconTextField();

3
runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/SkillCalculatorPanel.java
View File

@@ -32,6 +32,7 @@ import java.awt.GridBagLayout;
import java.awt.GridLayout; import java.awt.GridLayout;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Objects; import java.util.Objects;
import javax.inject.Singleton; import javax.inject.Singleton;
@@ -64,7 +65,7 @@ class SkillCalculatorPanel extends PluginPanel
private final MaterialTabGroup skillGroup; private final MaterialTabGroup skillGroup;
private final MaterialTabGroup tabGroup; private final MaterialTabGroup tabGroup;
private String currentTab; private String currentTab;
private ArrayList<String> tabs = new ArrayList<>(); private List<String> tabs = new ArrayList<>();
@Getter @Getter
private Map<Integer, Integer> bankMap = new HashMap<>(); private Map<Integer, Integer> bankMap = new HashMap<>();
private GridBagConstraints c; private GridBagConstraints c;

17
runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/banked/CriticalItem.java
View File

@@ -27,6 +27,7 @@ package net.runelite.client.plugins.skillcalculator.banked;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.HashSet; import java.util.HashSet;
import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
import lombok.Getter; import lombok.Getter;
@@ -320,9 +321,9 @@ public enum CriticalItem
} }
// Builds a Map to reduce looping frequency // Builds a Map to reduce looping frequency
private static Map<Skill, ArrayList<CriticalItem>> buildSkillItemMap() private static Map<Skill, List<CriticalItem>> buildSkillItemMap()
{ {
Map<Skill, ArrayList<CriticalItem>> map = new HashMap<>(); Map<Skill, List<CriticalItem>> map = new HashMap<>();
for (CriticalItem item : values()) for (CriticalItem item : values())
{ {
map.computeIfAbsent(item.getSkill(), e -> new ArrayList<>()).add(item); map.computeIfAbsent(item.getSkill(), e -> new ArrayList<>()).add(item);
@@ -331,9 +332,9 @@ public enum CriticalItem
return map; return map;
} }
private static final Map<Skill, ArrayList<CriticalItem>> bySkillName = buildSkillItemMap(); private static final Map<Skill, List<CriticalItem>> bySkillName = buildSkillItemMap();
public static ArrayList<CriticalItem> getBySkillName(Skill skill) public static List<CriticalItem> getBySkillName(Skill skill)
{ {
return bySkillName.get(skill); return bySkillName.get(skill);
} }
@@ -358,9 +359,9 @@ public enum CriticalItem
} }
// Builds a Map to reduce looping frequency // Builds a Map to reduce looping frequency
private static Map<String, ArrayList<CriticalItem>> buildItemSkillCategoryMap() private static Map<String, List<CriticalItem>> buildItemSkillCategoryMap()
{ {
Map<String, ArrayList<CriticalItem>> map = new HashMap<>(); Map<String, List<CriticalItem>> map = new HashMap<>();
for (CriticalItem item : values()) for (CriticalItem item : values())
{ {
String key = item.getCategory() + item.skill.getName(); String key = item.getCategory() + item.skill.getName();
@@ -370,9 +371,9 @@ public enum CriticalItem
return map; return map;
} }
private static final Map<String, ArrayList<CriticalItem>> itemsBySkillCategory = buildItemSkillCategoryMap(); private static final Map<String, List<CriticalItem>> itemsBySkillCategory = buildItemSkillCategoryMap();
public static ArrayList<CriticalItem> getItemsForSkillCategories(Skill skill, String category) public static List<CriticalItem> getItemsForSkillCategories(Skill skill, String category)
{ {
return itemsBySkillCategory.get(category + skill.getName()); return itemsBySkillCategory.get(category + skill.getName());
} }

9
runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/banked/beans/Activity.java
View File

@@ -26,6 +26,7 @@ package net.runelite.client.plugins.skillcalculator.banked.beans;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.List;
import java.util.Map; import java.util.Map;
import lombok.AccessLevel; import lombok.AccessLevel;
import lombok.Getter; import lombok.Getter;
@@ -377,7 +378,7 @@ public enum Activity
private static final Map<CriticalItem, ArrayList<Activity>> byCriticalItem = buildItemMap(); private static final Map<CriticalItem, ArrayList<Activity>> byCriticalItem = buildItemMap();
public static ArrayList<Activity> getByCriticalItem(CriticalItem item) public static List<Activity> getByCriticalItem(CriticalItem item)
{ {
return byCriticalItem.getOrDefault(item, new ArrayList<>()); return byCriticalItem.getOrDefault(item, new ArrayList<>());
@@ -390,10 +391,10 @@ public enum Activity
* @param limitLevel Level to check Activitiy requirements against. -1 or 0 value disables limits * @param limitLevel Level to check Activitiy requirements against. -1 or 0 value disables limits
* @return an empty list if no activities * @return an empty list if no activities
*/ */
public static ArrayList<Activity> getByCriticalItem(CriticalItem item, int limitLevel) public static List<Activity> getByCriticalItem(CriticalItem item, int limitLevel)
{ {
ArrayList<Activity> activities = getByCriticalItem(item); List<Activity> activities = getByCriticalItem(item);
ArrayList<Activity> l = new ArrayList<>(); List<Activity> l = new ArrayList<>();
if (limitLevel <= 0) if (limitLevel <= 0)
{ {
return l; return l;

3
runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/banked/ui/CriticalItemPanel.java
View File

@@ -36,7 +36,6 @@ import java.awt.event.MouseEvent;
import java.awt.image.BufferedImage; import java.awt.image.BufferedImage;
import java.io.IOException; import java.io.IOException;
import java.text.DecimalFormat; import java.text.DecimalFormat;
import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import javax.imageio.ImageIO; import javax.imageio.ImageIO;
@@ -298,7 +297,7 @@ public class CriticalItemPanel extends JPanel
private JPanel createActivitiesPanel() private JPanel createActivitiesPanel()
{ {
ArrayList<Activity> activities = Activity.getByCriticalItem(item); List<Activity> activities = Activity.getByCriticalItem(item);
if (activities == null || activities.size() == 1) if (activities == null || activities.size() == 1)
{ {
return null; return null;