diff --git a/eco-core/core-nms/v1_16_R3/src/main/java/com/willfp/ecoenchants/proxy/v1_16_R3/FastGetEnchants.java b/eco-core/core-nms/v1_16_R3/src/main/java/com/willfp/ecoenchants/proxy/v1_16_R3/FastGetEnchants.java index 1479cc18..bda58459 100644 --- a/eco-core/core-nms/v1_16_R3/src/main/java/com/willfp/ecoenchants/proxy/v1_16_R3/FastGetEnchants.java +++ b/eco-core/core-nms/v1_16_R3/src/main/java/com/willfp/ecoenchants/proxy/v1_16_R3/FastGetEnchants.java @@ -21,7 +21,7 @@ public final class FastGetEnchants implements FastGetEnchantsProxy { final boolean checkStored) { net.minecraft.server.v1_16_R3.ItemStack nmsStack = CraftItemStack.asNMSCopy(itemStack); NBTTagList enchantmentNBT = checkStored && nmsStack.getItem() == Items.ENCHANTED_BOOK ? ItemEnchantedBook.d(nmsStack) : nmsStack.getEnchantments(); - HashMap foundEnchantments = new HashMap<>(); + Map foundEnchantments = new HashMap<>(); for (NBTBase base : enchantmentNBT) { NBTTagCompound compound = (NBTTagCompound) base; diff --git a/eco-core/core-nms/v1_17_R1/src/main/java/com/willfp/ecoenchants/proxy/v1_17_R1/FastGetEnchants.java b/eco-core/core-nms/v1_17_R1/src/main/java/com/willfp/ecoenchants/proxy/v1_17_R1/FastGetEnchants.java index d5621715..56a02877 100644 --- a/eco-core/core-nms/v1_17_R1/src/main/java/com/willfp/ecoenchants/proxy/v1_17_R1/FastGetEnchants.java +++ b/eco-core/core-nms/v1_17_R1/src/main/java/com/willfp/ecoenchants/proxy/v1_17_R1/FastGetEnchants.java @@ -21,7 +21,7 @@ public final class FastGetEnchants implements FastGetEnchantsProxy { final boolean checkStored) { net.minecraft.world.item.ItemStack nmsStack = CraftItemStack.asNMSCopy(itemStack); NBTTagList enchantmentNBT = checkStored && itemStack.getType() == Material.ENCHANTED_BOOK ? ItemEnchantedBook.d(nmsStack) : nmsStack.getEnchantments(); - HashMap foundEnchantments = new HashMap<>(); + Map foundEnchantments = new HashMap<>(); for (NBTBase base : enchantmentNBT) { NBTTagCompound compound = (NBTTagCompound) base; diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/display/EnchantDisplay.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/display/EnchantDisplay.java index 1f7d2489..3d70ae9a 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/display/EnchantDisplay.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/display/EnchantDisplay.java @@ -24,6 +24,7 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.LinkedHashMap; import java.util.List; +import java.util.Map; /** * All methods and fields pertaining to showing players the enchantments on their items. @@ -119,7 +120,7 @@ public class EnchantDisplay extends DisplayModule { List unsorted = new ArrayList<>(); enchantments.forEach((enchantment, integer) -> unsorted.add(enchantment)); - HashMap tempEnchantments = new HashMap<>(enchantments); + Map tempEnchantments = new HashMap<>(enchantments); options.getSorter().sortEnchantments(unsorted); diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/curse/CallingCurse.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/curse/CallingCurse.java index dc0843e0..f3dbad90 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/curse/CallingCurse.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/curse/CallingCurse.java @@ -18,9 +18,10 @@ import org.bukkit.util.Vector; import org.jetbrains.annotations.NotNull; import java.util.HashMap; +import java.util.Map; public class CallingCurse extends EcoEnchant implements TimedRunnable { - private final HashMap players = new HashMap<>(); + private final Map players = new HashMap<>(); private double distance = this.getConfig().getDouble(EcoEnchants.CONFIG_LOCATION + "distance"); public CallingCurse() { diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Forcefield.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Forcefield.java index f46df890..05b2fd92 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Forcefield.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Forcefield.java @@ -16,9 +16,10 @@ import org.bukkit.event.player.PlayerQuitEvent; import org.jetbrains.annotations.NotNull; import java.util.HashMap; +import java.util.Map; public class Forcefield extends EcoEnchant implements TimedRunnable { - private final HashMap players = new HashMap<>(); + private final Map players = new HashMap<>(); private double initialDistance = this.getConfig().getDouble(EcoEnchants.CONFIG_LOCATION + "initial-distance"); private double bonus = this.getConfig().getDouble(EcoEnchants.CONFIG_LOCATION + "bonus-per-level"); private double damagePerPoint = this.getConfig().getDouble(EcoEnchants.CONFIG_LOCATION + "damage-per-level"); diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/InfernalTouch.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/InfernalTouch.java index 533d11db..e3ac97aa 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/InfernalTouch.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/InfernalTouch.java @@ -28,10 +28,11 @@ import java.util.Collection; import java.util.HashMap; import java.util.HashSet; import java.util.Iterator; +import java.util.Map; import java.util.Set; public class InfernalTouch extends EcoEnchant { - private static final HashMap> RECIPES = new HashMap<>(); + private static final Map> RECIPES = new HashMap<>(); private static final Set FORTUNE_MATERIALS = new HashSet<>( Arrays.asList( Material.GOLD_INGOT, diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Magnetic.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Magnetic.java index 33f16750..63dd4053 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Magnetic.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Magnetic.java @@ -18,9 +18,10 @@ import org.bukkit.util.Vector; import org.jetbrains.annotations.NotNull; import java.util.HashMap; +import java.util.Map; public class Magnetic extends EcoEnchant implements TimedRunnable { - private final HashMap players = new HashMap<>(); + private final Map players = new HashMap<>(); private double initialDistance = 1; private double bonus = 1; diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/support/merging/anvil/AnvilListeners.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/support/merging/anvil/AnvilListeners.java index 2c19ae8f..cce81754 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/support/merging/anvil/AnvilListeners.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/support/merging/anvil/AnvilListeners.java @@ -17,6 +17,7 @@ import org.bukkit.inventory.ItemStack; import org.jetbrains.annotations.NotNull; import java.util.HashMap; +import java.util.Map; import java.util.Objects; import java.util.UUID; @@ -24,7 +25,7 @@ public class AnvilListeners extends PluginDependent implements Listen /** * Map to prevent incrementing cost several times as inventory events are fired 3 times. */ - private static final HashMap ANTI_REPEAT = new HashMap<>(); + private static final Map ANTI_REPEAT = new HashMap<>(); /** * Class for AnvilGUI wrappers to ignore them. diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/support/obtaining/LootPopulator.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/support/obtaining/LootPopulator.java index c77fcff2..400b741a 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/support/obtaining/LootPopulator.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/support/obtaining/LootPopulator.java @@ -23,6 +23,7 @@ import org.jetbrains.annotations.NotNull; import java.util.ArrayList; import java.util.Collections; import java.util.HashMap; +import java.util.Map; import java.util.Random; import java.util.concurrent.atomic.AtomicBoolean; @@ -74,7 +75,7 @@ public class LootPopulator extends BlockPopulator { continue; } - HashMap toAdd = new HashMap<>(); + Map toAdd = new HashMap<>(); ArrayList enchantments = new ArrayList<>(EcoEnchants.values()); Collections.shuffle(enchantments); // Prevent list bias towards early enchantments like telekinesis