Upstream/addon-challenges
1
0
Fork 0
mirror of https://github.com/BentoBoxWorld/Challenges.git synced 2024-11-24 19:45:14 +01:00
Code Issues Projects Releases Wiki Activity

Improve equal item listing.

Browse Source 
Change when items should be grouped.
Instead of relaying strictly from ignoreMetaData set, now try to group equal elements without durability check, and use set only if that fails.
This commit is contained in:
BONNe 2022-03-22 12:49:57 +02:00 committed by GitHub
parent e96e2c7e72
commit 36ad61b4b9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 28 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/main/java/world/bentobox/challenges/utils/Utils.java
View File

@ -7,16 +7,12 @@ import java.util.List;
import java.util.Locale; import java.util.Locale;
import java.util.Set; import java.util.Set;
import org.bukkit.ChatColor; import org.bukkit.*;
import org.bukkit.Material;
import org.bukkit.Statistic;
import org.bukkit.World;
import org.bukkit.enchantments.Enchantment; import org.bukkit.enchantments.Enchantment;
import org.bukkit.entity.EntityType; import org.bukkit.entity.EntityType;
import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.ItemStack;
import org.bukkit.inventory.meta.*; import org.bukkit.inventory.meta.*;
import org.bukkit.potion.PotionData; import org.bukkit.potion.PotionData;
import org.bukkit.potion.PotionEffectType;
import org.bukkit.potion.PotionType; import org.bukkit.potion.PotionType;
import org.eclipse.jdt.annotation.Nullable; import org.eclipse.jdt.annotation.Nullable;
@ -31,6 +27,31 @@ import world.bentobox.bentobox.util.Util;
*/ */
public class Utils public class Utils
{ {
/**
* This method checks if 2 given item stacks are similar without durability check.
* @param input First item.
* @param stack Second item.
* @return {@code true} if items are equal, {@code false} otherwise.
*/
public static boolean isSimilarNoDurability(@Nullable ItemStack input, @Nullable ItemStack stack)
{
if (stack == null || input == null)
{
return false;
}
else if (stack == input)
{
return true;
}
else
{
return input.getType() == stack.getType() &&
input.hasItemMeta() == stack.hasItemMeta() &&
(!input.hasItemMeta() || Bukkit.getItemFactory().equals(input.getItemMeta(), stack.getItemMeta()));
}
}
/** /**
* This method groups input items in single itemstack with correct amount and returns it. * This method groups input items in single itemstack with correct amount and returns it.
* Allows to remove duplicate items from list. * Allows to remove duplicate items from list.
@ -55,7 +76,8 @@ public class Utils
ItemStack required = returnItems.get(i); ItemStack required = returnItems.get(i);
// Merge items which meta can be ignored or is similar to item in required list. // Merge items which meta can be ignored or is similar to item in required list.
if (ignoreMetaData.contains(item.getType()) && item.getType().equals(required.getType())) if (Utils.isSimilarNoDurability(required, item) ||
ignoreMetaData.contains(item.getType()) && item.getType().equals(required.getType()))
{ {
required.setAmount(required.getAmount() + item.getAmount()); required.setAmount(required.getAmount() + item.getAmount());
isUnique = false; isUnique = false;