From 3f7021798e8d500001baea34e8d98a2d43aab13c Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 15:35:25 +0200 Subject: [PATCH] maxhit: Use interface instead of type --- .../plugins/maxhit/calculators/MaxHitCalculator.java | 5 +++-- .../client/plugins/maxhit/config/CustomFormulaConfig.java | 7 ++++--- .../plugins/maxhit/config/EquipmentBonusConfig.java | 2 +- .../plugins/maxhit/equipment/EquipmentSlotItem.java | 8 ++++---- .../maxhit/requirements/AutocastSpellRequirement.java | 6 +++--- 5 files changed, 15 insertions(+), 13 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/maxhit/calculators/MaxHitCalculator.java b/runelite-client/src/main/java/net/runelite/client/plugins/maxhit/calculators/MaxHitCalculator.java index c868d3b25a..ce0e468770 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/maxhit/calculators/MaxHitCalculator.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/maxhit/calculators/MaxHitCalculator.java @@ -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 addList = new ArrayList<>(); + List addList = new ArrayList<>(); - ArrayList equipmentBonuses = EquipmentBonusConfig.getBonusByType(bonusType); + List equipmentBonuses = EquipmentBonusConfig.getBonusByType(bonusType); for (EquipmentBonusConfig equipmentBonus : equipmentBonuses) { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/maxhit/config/CustomFormulaConfig.java b/runelite-client/src/main/java/net/runelite/client/plugins/maxhit/config/CustomFormulaConfig.java index 51ec9c6234..3e51821336 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/maxhit/config/CustomFormulaConfig.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/maxhit/config/CustomFormulaConfig.java @@ -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 requirements; + private final List requirements; private final BiFunction customFormula; - CustomFormulaConfig(MaxHitCalculator.CombatMethod requiredCombatMethod, ArrayList requirements, BiFunction customFormula) + CustomFormulaConfig(MaxHitCalculator.CombatMethod requiredCombatMethod, List requirements, BiFunction customFormula) { this.requiredCombatMethod = requiredCombatMethod; this.requirements = requirements; @@ -225,7 +226,7 @@ public enum CustomFormulaConfig return customFormula; } - public ArrayList getRequirements() + public List getRequirements() { return this.requirements; } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/maxhit/config/EquipmentBonusConfig.java b/runelite-client/src/main/java/net/runelite/client/plugins/maxhit/config/EquipmentBonusConfig.java index 86915c66a8..015566d5e0 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/maxhit/config/EquipmentBonusConfig.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/maxhit/config/EquipmentBonusConfig.java @@ -376,7 +376,7 @@ public enum EquipmentBonusConfig this.operation = operation; } - public static ArrayList getBonusByType(BonusType bonusType) + public static List getBonusByType(BonusType bonusType) { if (!bonusTypes.containsKey(bonusType)) { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/maxhit/equipment/EquipmentSlotItem.java b/runelite-client/src/main/java/net/runelite/client/plugins/maxhit/equipment/EquipmentSlotItem.java index 5e440d5064..1bd3d6c861 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/maxhit/equipment/EquipmentSlotItem.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/maxhit/equipment/EquipmentSlotItem.java @@ -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 itemIds; + private final List itemIds; - public EquipmentSlotItem(EquipmentInventorySlot equipmentSlot, ArrayList itemIds) + public EquipmentSlotItem(EquipmentInventorySlot equipmentSlot, List itemIds) { this.equipmentSlot = equipmentSlot; this.itemIds = itemIds; } - public ArrayList getItems() + public List getItems() { return this.itemIds; } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/maxhit/requirements/AutocastSpellRequirement.java b/runelite-client/src/main/java/net/runelite/client/plugins/maxhit/requirements/AutocastSpellRequirement.java index e6e771281e..5e933a3e61 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/maxhit/requirements/AutocastSpellRequirement.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/maxhit/requirements/AutocastSpellRequirement.java @@ -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 autocastSpells; + private final List autocastSpells; - public AutocastSpellRequirement(ArrayList autocastSpells) + public AutocastSpellRequirement(List autocastSpells) { this.autocastSpells = autocastSpells; }