mirror of
https://github.com/amalthea-mc/ShopChest.git
synced 2024-11-22 18:32:24 +00:00
Hopefully fixed item meta issues for good
This commit is contained in:
Eric
parent
f1712a6bce
commit
8e867a7c1d
@ -890,7 +890,7 @@ public class ShopInteractListener implements Listener {
|
|||||||
ItemStack item = inventory.getItem(slot);
|
ItemStack item = inventory.getItem(slot);
|
||||||
|
|
||||||
if (item != null && item.getType() != Material.AIR) {
|
if (item != null && item.getType() != Material.AIR) {
|
||||||
if (Utils.isItemSimilar(item, itemStack, false)) {
|
if (Utils.isItemSimilar(item, itemStack)) {
|
||||||
if (item.getAmount() != item.getMaxStackSize()) {
|
if (item.getAmount() != item.getMaxStackSize()) {
|
||||||
ItemStack newItemStack = new ItemStack(item);
|
ItemStack newItemStack = new ItemStack(item);
|
||||||
newItemStack.setAmount(item.getAmount() + 1);
|
newItemStack.setAmount(item.getAmount() + 1);
|
||||||
@ -948,7 +948,7 @@ public class ShopInteractListener implements Listener {
|
|||||||
ItemStack item = inventory.getItem(slot);
|
ItemStack item = inventory.getItem(slot);
|
||||||
|
|
||||||
if (item != null && item.getType() != Material.AIR) {
|
if (item != null && item.getType() != Material.AIR) {
|
||||||
if (Utils.isItemSimilar(item, itemStack, false)) {
|
if (Utils.isItemSimilar(item, itemStack)) {
|
||||||
if (item.getAmount() > 0) {
|
if (item.getAmount() > 0) {
|
||||||
int newAmount = item.getAmount() - 1;
|
int newAmount = item.getAmount() - 1;
|
||||||
|
|
||||||
|
|||||||
@ -58,4 +58,33 @@ public class CustomBookMeta {
|
|||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public static void setGeneration(ItemStack book, Generation generation) {
|
||||||
|
try {
|
||||||
|
Class<?> craftItemStackClass = Utils.getCraftClass("inventory.CraftItemStack");
|
||||||
|
|
||||||
|
if (craftItemStackClass == null) {
|
||||||
|
ShopChest.getInstance().debug("Failed to get NBTGeneration: Could not find CraftItemStack class");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
Object nmsStack = craftItemStackClass.getMethod("asNMSCopy", ItemStack.class).invoke(null, book);
|
||||||
|
|
||||||
|
Object nbtTagCompound = nmsStack.getClass().getMethod("getTag").invoke(nmsStack);
|
||||||
|
if (nbtTagCompound == null) {
|
||||||
|
ShopChest.getInstance().debug("Failed to get NBTGeneration: getTag returned null");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
nbtTagCompound.getClass().getMethod("setInt", String.class, int.class)
|
||||||
|
.invoke(nbtTagCompound, "generation", generation.ordinal());
|
||||||
|
|
||||||
|
nmsStack.getClass().getMethod("setTag", nbtTagCompound.getClass()).invoke(nmsStack, nbtTagCompound);
|
||||||
|
|
||||||
|
} catch (NoSuchMethodException | IllegalAccessException | InvocationTargetException e) {
|
||||||
|
ShopChest.getInstance().getLogger().severe("Failed to get NBTEntityID with reflection");
|
||||||
|
ShopChest.getInstance().debug("Failed to get NBTEntityID with reflection");
|
||||||
|
ShopChest.getInstance().debug(e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,106 +0,0 @@
|
|||||||
package de.epiceric.shopchest.nms;
|
|
||||||
|
|
||||||
import de.epiceric.shopchest.ShopChest;
|
|
||||||
import de.epiceric.shopchest.utils.Utils;
|
|
||||||
import org.bukkit.inventory.ItemStack;
|
|
||||||
|
|
||||||
import java.lang.reflect.InvocationTargetException;
|
|
||||||
import java.util.HashMap;
|
|
||||||
import java.util.Map;
|
|
||||||
|
|
||||||
public class ShulkerBoxMeta {
|
|
||||||
|
|
||||||
public static Map<Integer, ItemStack> getContents(ItemStack shulkerBox) {
|
|
||||||
try {
|
|
||||||
Class<?> craftItemStackClass = Utils.getCraftClass("inventory.CraftItemStack");
|
|
||||||
|
|
||||||
if (craftItemStackClass == null) {
|
|
||||||
ShopChest.getInstance().debug("Failed to get NBTContents: Could not find CraftItemStack class");
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
Object nmsStack = craftItemStackClass.getMethod("asNMSCopy", ItemStack.class).invoke(null, shulkerBox);
|
|
||||||
if (nmsStack == null) {
|
|
||||||
ShopChest.getInstance().debug("Failed to get NBTContents: asNMSCopy returned null");
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
Object hasTag = nmsStack.getClass().getMethod("hasTag").invoke(nmsStack);
|
|
||||||
if (hasTag == null || !(hasTag instanceof Boolean)) {
|
|
||||||
ShopChest.getInstance().debug("Failed to get NBTContents: hasTag returned null");
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!(boolean) hasTag) {
|
|
||||||
ShopChest.getInstance().debug("Failed to get NBTContents: ItemStack has no tag");
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
Object nbtTagCompound = nmsStack.getClass().getMethod("getTag").invoke(nmsStack);
|
|
||||||
if (nbtTagCompound == null) {
|
|
||||||
ShopChest.getInstance().debug("Failed to get NBTContents: getTag returned null");
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
Object blockEntityTagObject = nbtTagCompound.getClass().getMethod("getCompound", String.class).invoke(nbtTagCompound, "BlockEntityTag");
|
|
||||||
if (blockEntityTagObject == null) {
|
|
||||||
ShopChest.getInstance().debug("Failed to get NBTContents: getCompound returned null");
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
Object itemsObject = blockEntityTagObject.getClass().getMethod("getList", String.class, int.class).invoke(blockEntityTagObject, "Items", 10);
|
|
||||||
if (itemsObject == null) {
|
|
||||||
ShopChest.getInstance().debug("Failed to get NBTContents: getList returned null");
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
Object sizeObject = itemsObject.getClass().getMethod("size").invoke(itemsObject);
|
|
||||||
if (sizeObject == null) {
|
|
||||||
ShopChest.getInstance().debug("Failed to get NBTContents: size returned null or not an integer");
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
int size = (Integer) sizeObject;
|
|
||||||
|
|
||||||
Map<Integer, ItemStack> contentSlots = new HashMap<>();
|
|
||||||
|
|
||||||
for (int i = 0; i < size; i++) {
|
|
||||||
Object itemTag = itemsObject.getClass().getMethod("get", int.class).invoke(itemsObject, i);
|
|
||||||
if (itemTag == null) {
|
|
||||||
ShopChest.getInstance().debug("Failed to get NBTContents: get returned null");
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
Object nmsStack2 = nmsStack.getClass().getConstructor(nbtTagCompound.getClass()).newInstance(itemTag);
|
|
||||||
if (nmsStack2 == null) {
|
|
||||||
ShopChest.getInstance().debug("Failed to get NBTContents: Could not instantiate ItemStack with compound");
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
Object slotObject = itemTag.getClass().getMethod("getInt", String.class).invoke(itemTag, "Slot");
|
|
||||||
if (slotObject == null || !(slotObject instanceof Integer)) {
|
|
||||||
ShopChest.getInstance().debug("Failed to get NBTContents: getInt returned null or not an integer");
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
Object itemStack = craftItemStackClass.getMethod("asBukkitCopy", nmsStack2.getClass()).invoke(null, nmsStack2);
|
|
||||||
if (itemStack == null || !(itemStack instanceof ItemStack)) {
|
|
||||||
ShopChest.getInstance().debug("Failed to get NBTContents: asBukkitCopy returned null or not an ItemStack");
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
contentSlots.put((Integer) slotObject, (ItemStack) itemStack);
|
|
||||||
}
|
|
||||||
|
|
||||||
return contentSlots;
|
|
||||||
|
|
||||||
} catch (NoSuchMethodException | IllegalAccessException | InvocationTargetException | InstantiationException e) {
|
|
||||||
ShopChest.getInstance().getLogger().severe("Failed to get NBTContents with reflection");
|
|
||||||
ShopChest.getInstance().debug("Failed to get NBTContents with reflection");
|
|
||||||
ShopChest.getInstance().debug(e);
|
|
||||||
}
|
|
||||||
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
@ -1,9 +1,7 @@
|
|||||||
package de.epiceric.shopchest.utils;
|
package de.epiceric.shopchest.utils;
|
||||||
|
|
||||||
import com.google.common.collect.ImmutableList;
|
|
||||||
import de.epiceric.shopchest.ShopChest;
|
import de.epiceric.shopchest.ShopChest;
|
||||||
import de.epiceric.shopchest.nms.CustomBookMeta;
|
import de.epiceric.shopchest.nms.CustomBookMeta;
|
||||||
import de.epiceric.shopchest.nms.ShulkerBoxMeta;
|
|
||||||
import org.bukkit.Bukkit;
|
import org.bukkit.Bukkit;
|
||||||
import org.bukkit.Material;
|
import org.bukkit.Material;
|
||||||
import org.bukkit.configuration.InvalidConfigurationException;
|
import org.bukkit.configuration.InvalidConfigurationException;
|
||||||
@ -13,182 +11,66 @@ import org.bukkit.inventory.Inventory;
|
|||||||
import org.bukkit.inventory.ItemStack;
|
import org.bukkit.inventory.ItemStack;
|
||||||
import org.bukkit.inventory.PlayerInventory;
|
import org.bukkit.inventory.PlayerInventory;
|
||||||
import org.bukkit.inventory.meta.*;
|
import org.bukkit.inventory.meta.*;
|
||||||
import org.bukkit.material.MaterialData;
|
|
||||||
import org.bukkit.potion.Potion;
|
|
||||||
|
|
||||||
import javax.xml.bind.DatatypeConverter;
|
import javax.xml.bind.DatatypeConverter;
|
||||||
import java.lang.reflect.InvocationTargetException;
|
import java.lang.reflect.InvocationTargetException;
|
||||||
import java.nio.charset.StandardCharsets;
|
import java.nio.charset.StandardCharsets;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
import java.util.Map;
|
|
||||||
|
|
||||||
public class Utils {
|
public class Utils {
|
||||||
|
|
||||||
private static final ImmutableList<Material> SHULKER_BOX_MATERIALS = new ImmutableList.Builder<Material>()
|
|
||||||
.add(Material.BLACK_SHULKER_BOX)
|
|
||||||
.add(Material.BLUE_SHULKER_BOX)
|
|
||||||
.add(Material.BROWN_SHULKER_BOX)
|
|
||||||
.add(Material.CYAN_SHULKER_BOX)
|
|
||||||
.add(Material.GRAY_SHULKER_BOX)
|
|
||||||
.add(Material.GREEN_SHULKER_BOX)
|
|
||||||
.add(Material.LIGHT_BLUE_SHULKER_BOX)
|
|
||||||
.add(Material.LIME_SHULKER_BOX)
|
|
||||||
.add(Material.MAGENTA_SHULKER_BOX)
|
|
||||||
.add(Material.ORANGE_SHULKER_BOX)
|
|
||||||
.add(Material.PINK_SHULKER_BOX)
|
|
||||||
.add(Material.PURPLE_SHULKER_BOX)
|
|
||||||
.add(Material.RED_SHULKER_BOX)
|
|
||||||
.add(Material.SILVER_SHULKER_BOX)
|
|
||||||
.add(Material.WHITE_SHULKER_BOX)
|
|
||||||
.add(Material.YELLOW_SHULKER_BOX)
|
|
||||||
.build();
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Check if two items are similar to each other
|
* Check if two items are similar to each other
|
||||||
* @param itemStack1 The first item
|
* @param itemStack1 The first item
|
||||||
* @param itemStack2 The second item
|
* @param itemStack2 The second item
|
||||||
* @param checkAmount Whether the amount should be checked or ignored
|
|
||||||
* @return {@code true} if the given items are similar or {@code false} if not
|
* @return {@code true} if the given items are similar or {@code false} if not
|
||||||
*/
|
*/
|
||||||
public static boolean isItemSimilar(ItemStack itemStack1, ItemStack itemStack2, boolean checkAmount) {
|
public static boolean isItemSimilar(ItemStack itemStack1, ItemStack itemStack2) {
|
||||||
if (itemStack1 == null || itemStack2 == null) {
|
if (itemStack1 == null || itemStack2 == null) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
boolean similar;
|
boolean similar = (itemStack1.getType() == itemStack2.getType());
|
||||||
|
|
||||||
similar = (!checkAmount || (itemStack1.getAmount() == itemStack2.getAmount()));
|
|
||||||
similar &= (itemStack1.getType() == itemStack2.getType());
|
|
||||||
similar &= (itemStack1.getDurability() == itemStack2.getDurability());
|
similar &= (itemStack1.getDurability() == itemStack2.getDurability());
|
||||||
similar &= (itemStack1.getEnchantments().equals(itemStack2.getEnchantments()));
|
similar &= (itemStack1.getEnchantments().equals(itemStack2.getEnchantments()));
|
||||||
similar &= (itemStack1.getMaxStackSize() == itemStack2.getMaxStackSize());
|
similar &= (itemStack1.getMaxStackSize() == itemStack2.getMaxStackSize());
|
||||||
|
similar &= (itemStack1.getData().equals(itemStack2.getData()));
|
||||||
|
|
||||||
if (!similar) {
|
if (!similar) return false;
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
MaterialData itemData1 = itemStack1.getData();
|
|
||||||
MaterialData itemData2 = itemStack2.getData();
|
|
||||||
|
|
||||||
if (itemData1 != null && itemData2 != null) {
|
|
||||||
similar = itemData1.getItemType() == itemData2.getItemType();
|
|
||||||
}
|
|
||||||
|
|
||||||
ItemMeta itemMeta1 = itemStack1.getItemMeta();
|
ItemMeta itemMeta1 = itemStack1.getItemMeta();
|
||||||
ItemMeta itemMeta2 = itemStack2.getItemMeta();
|
ItemMeta itemMeta2 = itemStack2.getItemMeta();
|
||||||
|
|
||||||
if (itemMeta1.hasDisplayName()) similar = (itemMeta1.getDisplayName().equals(itemMeta2.getDisplayName()));
|
if (itemMeta1 instanceof BookMeta && itemMeta2 instanceof BookMeta) {
|
||||||
if (itemMeta1.hasEnchants()) similar &= (itemMeta1.getEnchants().equals(itemMeta2.getEnchants()));
|
BookMeta bookMeta1 = (BookMeta) itemStack1.getItemMeta();
|
||||||
if (itemMeta1.hasLore()) similar &= (itemMeta1.getLore().equals(itemMeta2.getLore()));
|
BookMeta bookMeta2 = (BookMeta) itemStack2.getItemMeta();
|
||||||
|
|
||||||
similar &= (itemMeta1.getItemFlags().equals(itemMeta2.getItemFlags()));
|
|
||||||
similar &= (itemMeta1.getClass().equals(itemMeta2.getClass()));
|
|
||||||
|
|
||||||
if (!similar) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (itemMeta1 instanceof BannerMeta) {
|
|
||||||
BannerMeta bannerMeta1 = (BannerMeta) itemMeta1;
|
|
||||||
BannerMeta bannerMeta2 = (BannerMeta) itemMeta2;
|
|
||||||
|
|
||||||
similar = (bannerMeta1.getBaseColor() == bannerMeta2.getBaseColor());
|
|
||||||
similar &= (bannerMeta1.getPatterns().equals(bannerMeta2.getPatterns()));
|
|
||||||
|
|
||||||
} else if (!getServerVersion().equals("v1_8_R1") && itemMeta1 instanceof BlockStateMeta) {
|
|
||||||
BlockStateMeta bsMeta1 = (BlockStateMeta) itemMeta1;
|
|
||||||
BlockStateMeta bsMeta2 = (BlockStateMeta) itemMeta2;
|
|
||||||
|
|
||||||
similar = (bsMeta1.hasBlockState() == bsMeta2.hasBlockState());
|
|
||||||
|
|
||||||
if (bsMeta1.hasBlockState()) similar &= (bsMeta1.getBlockState().equals(bsMeta2.getBlockState()));
|
|
||||||
|
|
||||||
if (getMajorVersion() >= 11 && SHULKER_BOX_MATERIALS.contains(itemStack1.getType())) {
|
|
||||||
Map<Integer, ItemStack> contents1 = ShulkerBoxMeta.getContents(itemStack1);
|
|
||||||
Map<Integer, ItemStack> contents2 = ShulkerBoxMeta.getContents(itemStack2);
|
|
||||||
|
|
||||||
if (contents1 != null) similar &= contents1.equals(contents2);
|
|
||||||
}
|
|
||||||
|
|
||||||
} else if (itemMeta1 instanceof BookMeta) {
|
|
||||||
BookMeta bookMeta1 = (BookMeta) itemMeta1;
|
|
||||||
BookMeta bookMeta2 = (BookMeta) itemMeta2;
|
|
||||||
|
|
||||||
if (bookMeta1.hasAuthor()) similar = (bookMeta1.getAuthor().equals(bookMeta2.getAuthor()));
|
|
||||||
if (bookMeta1.hasTitle()) similar &= (bookMeta1.getTitle().equals(bookMeta2.getTitle()));
|
|
||||||
if (bookMeta1.hasPages()) similar &= (bookMeta1.getPages().equals(bookMeta2.getPages()));
|
|
||||||
|
|
||||||
if ((getMajorVersion() == 9 && getRevision() == 1) || getMajorVersion() == 8) {
|
if ((getMajorVersion() == 9 && getRevision() == 1) || getMajorVersion() == 8) {
|
||||||
CustomBookMeta.Generation generation1 = CustomBookMeta.getGeneration(itemStack1);
|
CustomBookMeta.Generation generation1 = CustomBookMeta.getGeneration(itemStack1);
|
||||||
CustomBookMeta.Generation generation2 = CustomBookMeta.getGeneration(itemStack2);
|
CustomBookMeta.Generation generation2 = CustomBookMeta.getGeneration(itemStack2);
|
||||||
|
|
||||||
if (generation1 == null) generation1 = CustomBookMeta.Generation.ORIGINAL;
|
if (generation1 == null) CustomBookMeta.setGeneration(itemStack1, CustomBookMeta.Generation.ORIGINAL);
|
||||||
if (generation2 == null) generation2 = CustomBookMeta.Generation.ORIGINAL;
|
if (generation2 == null) CustomBookMeta.setGeneration(itemStack2, CustomBookMeta.Generation.ORIGINAL);
|
||||||
|
|
||||||
similar &= (generation1 == generation2);
|
|
||||||
|
|
||||||
} else if (getMajorVersion() >= 10) {
|
} else if (getMajorVersion() >= 10) {
|
||||||
if (bookMeta1.getGeneration() == null) bookMeta1.setGeneration(BookMeta.Generation.ORIGINAL);
|
if (bookMeta1.getGeneration() == null) bookMeta1.setGeneration(BookMeta.Generation.ORIGINAL);
|
||||||
if (bookMeta2.getGeneration() == null) bookMeta2.setGeneration(BookMeta.Generation.ORIGINAL);
|
if (bookMeta2.getGeneration() == null) bookMeta2.setGeneration(BookMeta.Generation.ORIGINAL);
|
||||||
|
|
||||||
similar &= (bookMeta1.getGeneration() == bookMeta2.getGeneration());
|
|
||||||
}
|
}
|
||||||
|
|
||||||
} else if (itemMeta1 instanceof EnchantmentStorageMeta) {
|
itemStack1.setItemMeta(bookMeta1);
|
||||||
EnchantmentStorageMeta esMeta1 = (EnchantmentStorageMeta) itemMeta1;
|
itemStack2.setItemMeta(bookMeta2);
|
||||||
EnchantmentStorageMeta esMeta2 = (EnchantmentStorageMeta) itemMeta2;
|
|
||||||
|
|
||||||
if (esMeta1.hasStoredEnchants()) similar = (esMeta1.getStoredEnchants().equals(esMeta2.getStoredEnchants()));
|
|
||||||
|
|
||||||
} else if (itemMeta1 instanceof FireworkEffectMeta) {
|
|
||||||
FireworkEffectMeta feMeta1 = (FireworkEffectMeta) itemMeta1;
|
|
||||||
FireworkEffectMeta feMeta2 = (FireworkEffectMeta) itemMeta2;
|
|
||||||
|
|
||||||
if (feMeta1.hasEffect()) similar = (feMeta1.getEffect().equals(feMeta2.getEffect()));
|
|
||||||
|
|
||||||
} else if (itemMeta1 instanceof FireworkMeta) {
|
|
||||||
FireworkMeta fireworkMeta1 = (FireworkMeta) itemMeta1;
|
|
||||||
FireworkMeta fireworkMeta2 = (FireworkMeta) itemMeta2;
|
|
||||||
|
|
||||||
if (fireworkMeta1.hasEffects()) similar = (fireworkMeta1.getEffects().equals(fireworkMeta2.getEffects()));
|
|
||||||
similar &= (fireworkMeta1.getPower() == fireworkMeta2.getPower());
|
|
||||||
|
|
||||||
} else if (itemMeta1 instanceof LeatherArmorMeta) {
|
|
||||||
LeatherArmorMeta laMeta1 = (LeatherArmorMeta) itemMeta1;
|
|
||||||
LeatherArmorMeta laMeta2 = (LeatherArmorMeta) itemMeta2;
|
|
||||||
|
|
||||||
similar = (laMeta1.getColor() == laMeta2.getColor());
|
|
||||||
} else if (itemMeta1 instanceof MapMeta) {
|
|
||||||
MapMeta mapMeta1 = (MapMeta) itemMeta1;
|
|
||||||
MapMeta mapMeta2 = (MapMeta) itemMeta2;
|
|
||||||
|
|
||||||
similar = (mapMeta1.isScaling() == mapMeta2.isScaling());
|
|
||||||
} else if (itemMeta1 instanceof PotionMeta) {
|
|
||||||
PotionMeta potionMeta1 = (PotionMeta) itemMeta1;
|
|
||||||
PotionMeta potionMeta2 = (PotionMeta) itemMeta2;
|
|
||||||
|
|
||||||
if (potionMeta1.hasCustomEffects()) similar = (potionMeta1.getCustomEffects().equals(potionMeta2.getCustomEffects()));
|
|
||||||
|
|
||||||
if (getMajorVersion() >= 9) {
|
|
||||||
similar &= (potionMeta1.getBasePotionData().equals(potionMeta2.getBasePotionData()));
|
|
||||||
} else {
|
|
||||||
Potion potion1 = Potion.fromItemStack(itemStack1);
|
|
||||||
Potion potion2 = Potion.fromItemStack(itemStack2);
|
|
||||||
|
|
||||||
similar &= (potion1.getType() == potion2.getType());
|
|
||||||
similar &= (potion1.getEffects().equals(potion2.getEffects()));
|
|
||||||
similar &= (potion1.getLevel() == potion2.getLevel());
|
|
||||||
}
|
}
|
||||||
|
|
||||||
} else if (itemMeta1 instanceof SkullMeta) {
|
YamlConfiguration yml1 = new YamlConfiguration();
|
||||||
SkullMeta skullMeta1 = (SkullMeta) itemMeta1;
|
YamlConfiguration yml2 = new YamlConfiguration();
|
||||||
SkullMeta skullMeta2 = (SkullMeta) itemMeta2;
|
yml1.set("itemMeta", itemMeta1);
|
||||||
|
yml2.set("itemMeta", itemMeta2);
|
||||||
|
|
||||||
if (skullMeta1.hasOwner()) similar = skullMeta1.getOwner().equals(skullMeta2.getOwner());
|
String sYml1 = yml1.saveToString();
|
||||||
}
|
String sYml2 = yml2.saveToString();
|
||||||
|
|
||||||
return similar;
|
return sYml1.equals(sYml2);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -219,7 +101,7 @@ public class Utils {
|
|||||||
}
|
}
|
||||||
|
|
||||||
for (ItemStack item : inventoryItems) {
|
for (ItemStack item : inventoryItems) {
|
||||||
if (isItemSimilar(item, itemStack, false)) {
|
if (isItemSimilar(item, itemStack)) {
|
||||||
amount += item.getAmount();
|
amount += item.getAmount();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -243,7 +125,7 @@ public class Utils {
|
|||||||
if (item == null || item.getType() == Material.AIR) {
|
if (item == null || item.getType() == Material.AIR) {
|
||||||
slotFree.put(i, itemStack.getMaxStackSize());
|
slotFree.put(i, itemStack.getMaxStackSize());
|
||||||
} else {
|
} else {
|
||||||
if (isItemSimilar(item, itemStack, false)) {
|
if (isItemSimilar(item, itemStack)) {
|
||||||
int amountInSlot = item.getAmount();
|
int amountInSlot = item.getAmount();
|
||||||
int amountToFullStack = itemStack.getMaxStackSize() - amountInSlot;
|
int amountToFullStack = itemStack.getMaxStackSize() - amountInSlot;
|
||||||
slotFree.put(i, amountToFullStack);
|
slotFree.put(i, amountToFullStack);
|
||||||
@ -256,7 +138,7 @@ public class Utils {
|
|||||||
if (item == null || item.getType() == Material.AIR) {
|
if (item == null || item.getType() == Material.AIR) {
|
||||||
slotFree.put(40, itemStack.getMaxStackSize());
|
slotFree.put(40, itemStack.getMaxStackSize());
|
||||||
} else {
|
} else {
|
||||||
if (isItemSimilar(item, itemStack, false)) {
|
if (isItemSimilar(item, itemStack)) {
|
||||||
int amountInSlot = item.getAmount();
|
int amountInSlot = item.getAmount();
|
||||||
int amountToFullStack = itemStack.getMaxStackSize() - amountInSlot;
|
int amountToFullStack = itemStack.getMaxStackSize() - amountInSlot;
|
||||||
slotFree.put(40, amountToFullStack);
|
slotFree.put(40, amountToFullStack);
|
||||||
@ -269,7 +151,7 @@ public class Utils {
|
|||||||
if (item == null || item.getType() == Material.AIR) {
|
if (item == null || item.getType() == Material.AIR) {
|
||||||
slotFree.put(i, itemStack.getMaxStackSize());
|
slotFree.put(i, itemStack.getMaxStackSize());
|
||||||
} else {
|
} else {
|
||||||
if (isItemSimilar(item, itemStack, false)) {
|
if (isItemSimilar(item, itemStack)) {
|
||||||
int amountInSlot = item.getAmount();
|
int amountInSlot = item.getAmount();
|
||||||
int amountToFullStack = itemStack.getMaxStackSize() - amountInSlot;
|
int amountToFullStack = itemStack.getMaxStackSize() - amountInSlot;
|
||||||
slotFree.put(i, amountToFullStack);
|
slotFree.put(i, amountToFullStack);
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user