EpicKnarvik97/ArmoredElytra
EpicKnarvik97/ArmoredElytra
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Maintain a list of allowed and disallowed enchantments rather than calling from the config every time

Browse Source
This commit is contained in:
Brett Bonifas 2022-03-10 15:34:03 -05:00
parent 67a4b8c7c5
commit 28e30265c5
1 changed files with 35 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
src/main/java/nl/pim16aap2/armoredElytra/util/EnchantmentContainer.java
View File

@ -7,7 +7,6 @@ import org.bukkit.inventory.ItemStack;
import org.bukkit.inventory.meta.EnchantmentStorageMeta; import org.bukkit.inventory.meta.EnchantmentStorageMeta;
import java.util.*; import java.util.*;
import java.util.logging.Level;
public class EnchantmentContainer implements Iterable<Map.Entry<Enchantment, Integer>> public class EnchantmentContainer implements Iterable<Map.Entry<Enchantment, Integer>>
{ {
@ -156,22 +155,24 @@ public class EnchantmentContainer implements Iterable<Map.Entry<Enchantment, Int
} }
/** /**
* Determines if two enchantments are mutually exclusive * Returns a list of all enchantments that are mutually exclusive with the provided enchantment.
* <br>This does <b>not</b> include the provided enchantment
* *
* @return True if the two enchantments are defined as mutually exclusive in the config * @param enchantment The enchantment to get the mutually exclusives of
* @return A linked list containing all the mutually exclusive enchantments
*/ */
public static boolean areMutuallyExclusive(Enchantment one, Enchantment two) public static List<Enchantment> getMutuallyExclusiveEnchantments(Enchantment enchantment)
{ {
List<Enchantment> enchantments = new LinkedList<>();
for (List<Enchantment> mutuallyExclusiveEnchantments : ArmoredElytra.getInstance().getConfigLoader().getMutuallyExclusiveEnchantments()) for (List<Enchantment> mutuallyExclusiveEnchantments : ArmoredElytra.getInstance().getConfigLoader().getMutuallyExclusiveEnchantments())
{ for (Enchantment mutuallyExclusiveEnchantment : mutuallyExclusiveEnchantments)
int count = 0; if (mutuallyExclusiveEnchantment.equals(enchantment))
for (Enchantment mutuallyExclusiveEnchantment : mutuallyExclusiveEnchantments) { {
if (mutuallyExclusiveEnchantment.equals(one)) count++; enchantments.addAll(mutuallyExclusiveEnchantments.stream()
if (mutuallyExclusiveEnchantment.equals(two)) count++; .filter(i -> !i.equals(enchantment)).toList());
if (count > 1) return true; break;
} }
} return enchantments;
return false;
} }
/** /**
@ -202,11 +203,29 @@ public class EnchantmentContainer implements Iterable<Map.Entry<Enchantment, Int
if (first == null || first.isEmpty()) if (first == null || first.isEmpty())
return second; return second;
final Map<Enchantment, Integer> combined = new HashMap<>(first); final Map<Enchantment, Integer> combined = new HashMap<>();
final List<Enchantment> disallowedEnchantments = new LinkedList<>();
final List<Enchantment> allowedEnchantments = new LinkedList<>();
// Filter first item for mutually exclusive enchantments before adding to combined
for (Map.Entry<Enchantment, Integer> entry : first.entrySet())
{
if (disallowedEnchantments.contains(entry.getKey())) continue;
disallowedEnchantments.addAll(getMutuallyExclusiveEnchantments(entry.getKey()).stream()
.filter(i -> !i.equals(entry.getKey())).toList());
allowedEnchantments.add(entry.getKey());
combined.put(entry.getKey(), entry.getValue());
}
for (Map.Entry<Enchantment, Integer> entry : second.entrySet()) for (Map.Entry<Enchantment, Integer> entry : second.entrySet())
{ {
// Check for mutually exclusive enchantment (giving second entry priority) // Check for mutually exclusive enchantments
combined.keySet().removeIf(firstEnchantment -> areMutuallyExclusive(firstEnchantment, entry.getKey())); // No need to update allow list as Minecraft doesn't allow multiple of the same enchant on one item
if (!allowedEnchantments.contains(entry.getKey()))
{
if (disallowedEnchantments.contains(entry.getKey())) continue;
disallowedEnchantments.addAll(getMutuallyExclusiveEnchantments(entry.getKey()).stream()
.filter(i -> !i.equals(entry.getKey())).toList());
}
// Check for enchants with higher level // Check for enchants with higher level
Integer enchantLevel = combined.get(entry.getKey()); Integer enchantLevel = combined.get(entry.getKey());