maxhit: Use interface instead of type

This commit is contained in:
sdburns1998
2019-07-07 15:35:25 +02:00
parent 2de768179f
commit 3f7021798e
5 changed files with 15 additions and 13 deletions

View File

@@ -25,6 +25,7 @@
package net.runelite.client.plugins.maxhit.calculators;
import java.util.ArrayList;
import java.util.List;
import java.util.function.BiFunction;
import net.runelite.api.Client;
import net.runelite.api.Item;
@@ -97,9 +98,9 @@ public abstract class MaxHitCalculator
double applyEquipmentBonus(double maxhit, EquipmentBonusConfig.BonusType bonusType)
{
double bonus = 1;
ArrayList<Double> addList = new ArrayList<>();
List<Double> addList = new ArrayList<>();
ArrayList<EquipmentBonusConfig> equipmentBonuses = EquipmentBonusConfig.getBonusByType(bonusType);
List<EquipmentBonusConfig> equipmentBonuses = EquipmentBonusConfig.getBonusByType(bonusType);
for (EquipmentBonusConfig equipmentBonus : equipmentBonuses)
{

View File

@@ -27,6 +27,7 @@ package net.runelite.client.plugins.maxhit.config;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import java.util.function.BiFunction;
import net.runelite.api.Client;
import net.runelite.api.EquipmentInventorySlot;
@@ -205,10 +206,10 @@ public enum CustomFormulaConfig
);
private final MaxHitCalculator.CombatMethod requiredCombatMethod;
private final ArrayList<Requirement> requirements;
private final List<Requirement> requirements;
private final BiFunction<Client, MaxHitCalculator, Double> customFormula;
CustomFormulaConfig(MaxHitCalculator.CombatMethod requiredCombatMethod, ArrayList<Requirement> requirements, BiFunction<Client, MaxHitCalculator, Double> customFormula)
CustomFormulaConfig(MaxHitCalculator.CombatMethod requiredCombatMethod, List<Requirement> requirements, BiFunction<Client, MaxHitCalculator, Double> customFormula)
{
this.requiredCombatMethod = requiredCombatMethod;
this.requirements = requirements;
@@ -225,7 +226,7 @@ public enum CustomFormulaConfig
return customFormula;
}
public ArrayList<Requirement> getRequirements()
public List<Requirement> getRequirements()
{
return this.requirements;
}

View File

@@ -376,7 +376,7 @@ public enum EquipmentBonusConfig
this.operation = operation;
}
public static ArrayList<EquipmentBonusConfig> getBonusByType(BonusType bonusType)
public static List<EquipmentBonusConfig> getBonusByType(BonusType bonusType)
{
if (!bonusTypes.containsKey(bonusType))
{

View File

@@ -24,21 +24,21 @@
*/
package net.runelite.client.plugins.maxhit.equipment;
import java.util.ArrayList;
import java.util.List;
import net.runelite.api.EquipmentInventorySlot;
public class EquipmentSlotItem
{
private final EquipmentInventorySlot equipmentSlot;
private final ArrayList<Integer> itemIds;
private final List<Integer> itemIds;
public EquipmentSlotItem(EquipmentInventorySlot equipmentSlot, ArrayList<Integer> itemIds)
public EquipmentSlotItem(EquipmentInventorySlot equipmentSlot, List<Integer> itemIds)
{
this.equipmentSlot = equipmentSlot;
this.itemIds = itemIds;
}
public ArrayList<Integer> getItems()
public List<Integer> getItems()
{
return this.itemIds;
}

View File

@@ -24,7 +24,7 @@
*/
package net.runelite.client.plugins.maxhit.requirements;
import java.util.ArrayList;
import java.util.List;
import net.runelite.api.Client;
import net.runelite.api.Varbits;
import net.runelite.client.plugins.maxhit.config.SpellBaseDamageConfig;
@@ -32,9 +32,9 @@ import net.runelite.client.plugins.maxhit.config.SpellBaseDamageConfig;
public class AutocastSpellRequirement implements Requirement
{
private final ArrayList<SpellBaseDamageConfig> autocastSpells;
private final List<SpellBaseDamageConfig> autocastSpells;
public AutocastSpellRequirement(ArrayList<SpellBaseDamageConfig> autocastSpells)
public AutocastSpellRequirement(List<SpellBaseDamageConfig> autocastSpells)
{
this.autocastSpells = autocastSpells;
}