diff --git a/eco-api/src/main/java/com/willfp/eco/core/items/args/ColorArgParser.java b/eco-api/src/main/java/com/willfp/eco/core/items/args/ColorArgParser.java index 012dcf3e..45ad4738 100644 --- a/eco-api/src/main/java/com/willfp/eco/core/items/args/ColorArgParser.java +++ b/eco-api/src/main/java/com/willfp/eco/core/items/args/ColorArgParser.java @@ -1,9 +1,7 @@ package com.willfp.eco.core.items.args; -import org.bukkit.Color; import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.meta.ItemMeta; -import org.bukkit.inventory.meta.LeatherArmorMeta; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -19,50 +17,6 @@ public class ColorArgParser implements LookupArgParser { @Override public @Nullable Predicate parseArguments(@NotNull final String[] args, @NotNull final ItemMeta meta) { - if (!(meta instanceof LeatherArmorMeta armorMeta)) { - return null; - } - - String color = null; - - for (String arg : args) { - String[] argSplit = arg.split(":"); - if (!argSplit[0].equalsIgnoreCase("color")) { - continue; - } - - if (argSplit.length < 2) { - continue; - } - - color = argSplit[1]; - } - - if (color == null) { - return null; - } - - armorMeta.setColor(Color.fromRGB(Integer.parseInt(color, 16))); - - String finalColor = color; - return test -> { - if (!test.hasItemMeta()) { - return false; - } - - ItemMeta testMeta = test.getItemMeta(); - - assert testMeta != null; - - if (testMeta instanceof LeatherArmorMeta cast) { - return finalColor.equalsIgnoreCase( - Integer.toHexString(cast.getColor().getRed()) - + Integer.toHexString(cast.getColor().getGreen()) - + Integer.toHexString(cast.getColor().getBlue()) - ); - } - - return true; - }; + return null; } } diff --git a/eco-api/src/main/java/com/willfp/eco/core/items/args/CustomModelDataArgParser.java b/eco-api/src/main/java/com/willfp/eco/core/items/args/CustomModelDataArgParser.java index 9fde351c..25830fec 100644 --- a/eco-api/src/main/java/com/willfp/eco/core/items/args/CustomModelDataArgParser.java +++ b/eco-api/src/main/java/com/willfp/eco/core/items/args/CustomModelDataArgParser.java @@ -17,44 +17,6 @@ public class CustomModelDataArgParser implements LookupArgParser { @Override public @Nullable Predicate parseArguments(@NotNull final String[] args, @NotNull final ItemMeta meta) { - Integer modelData = null; - - for (String arg : args) { - String[] argSplit = arg.split(":"); - if (!argSplit[0].equalsIgnoreCase("custom-model-data")) { - continue; - } - - if (argSplit.length < 2) { - continue; - } - - String asString = argSplit[1]; - - try { - modelData = Integer.parseInt(asString); - } catch (NumberFormatException e) { - modelData = null; - } - } - - if (modelData == null) { - return null; - } - - meta.setCustomModelData(modelData); - - int finalModelData = modelData; - return test -> { - if (!test.hasItemMeta()) { - return false; - } - - ItemMeta testMeta = test.getItemMeta(); - - assert testMeta != null; - - return testMeta.getCustomModelData() == finalModelData; - }; + return null; } } diff --git a/eco-api/src/main/java/com/willfp/eco/core/items/args/EnchantmentArgParser.java b/eco-api/src/main/java/com/willfp/eco/core/items/args/EnchantmentArgParser.java index 3094d9ec..0fc9c33d 100644 --- a/eco-api/src/main/java/com/willfp/eco/core/items/args/EnchantmentArgParser.java +++ b/eco-api/src/main/java/com/willfp/eco/core/items/args/EnchantmentArgParser.java @@ -1,15 +1,10 @@ package com.willfp.eco.core.items.args; -import org.bukkit.NamespacedKey; -import org.bukkit.enchantments.Enchantment; import org.bukkit.inventory.ItemStack; -import org.bukkit.inventory.meta.EnchantmentStorageMeta; import org.bukkit.inventory.meta.ItemMeta; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import java.util.HashMap; -import java.util.Map; import java.util.function.Predicate; /** @@ -22,65 +17,6 @@ public class EnchantmentArgParser implements LookupArgParser { @Override public @Nullable Predicate parseArguments(@NotNull final String[] args, @NotNull final ItemMeta meta) { - Map requiredEnchantments = new HashMap<>(); - - for (String enchantArg : args) { - String[] enchantArgSplit = enchantArg.split(":"); - - Enchantment enchantment = Enchantment.getByKey(NamespacedKey.minecraft(enchantArgSplit[0].toLowerCase())); - if (enchantment == null) { - continue; - } - - if (enchantArgSplit.length < 2) { - continue; - } - - int level = Integer.parseInt(enchantArgSplit[1]); - - requiredEnchantments.put(enchantment, level); - } - - if (requiredEnchantments.isEmpty()) { - return null; - } - - if (meta instanceof EnchantmentStorageMeta storageMeta) { - requiredEnchantments.forEach((enchantment, integer) -> storageMeta.addStoredEnchant(enchantment, integer, true)); - } else { - requiredEnchantments.forEach((enchantment, integer) -> meta.addEnchant(enchantment, integer, true)); - } - - return test -> { - if (!test.hasItemMeta()) { - return false; - } - - ItemMeta testMeta = test.getItemMeta(); - - assert testMeta != null; - - if (testMeta instanceof EnchantmentStorageMeta storageMeta) { - for (Map.Entry entry : requiredEnchantments.entrySet()) { - if (!storageMeta.hasStoredEnchant(entry.getKey())) { - return false; - } - if (storageMeta.getStoredEnchantLevel(entry.getKey()) < entry.getValue()) { - return false; - } - } - } else { - for (Map.Entry entry : requiredEnchantments.entrySet()) { - if (!testMeta.hasEnchant(entry.getKey())) { - return false; - } - if (testMeta.getEnchantLevel(entry.getKey()) < entry.getValue()) { - return false; - } - } - } - - return true; - }; + return null; } } diff --git a/eco-api/src/main/java/com/willfp/eco/core/items/args/TextureArgParser.java b/eco-api/src/main/java/com/willfp/eco/core/items/args/TextureArgParser.java index 570c1c3c..deb36e2f 100644 --- a/eco-api/src/main/java/com/willfp/eco/core/items/args/TextureArgParser.java +++ b/eco-api/src/main/java/com/willfp/eco/core/items/args/TextureArgParser.java @@ -1,9 +1,7 @@ package com.willfp.eco.core.items.args; -import com.willfp.eco.util.SkullUtils; import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.meta.ItemMeta; -import org.bukkit.inventory.meta.SkullMeta; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -19,44 +17,6 @@ public class TextureArgParser implements LookupArgParser { @Override public @Nullable Predicate parseArguments(@NotNull final String[] args, @NotNull final ItemMeta meta) { - String skullTexture = null; - - for (String arg : args) { - String[] argSplit = arg.split(":"); - if (!argSplit[0].equalsIgnoreCase("texture")) { - continue; - } - - if (argSplit.length < 2) { - continue; - } - - skullTexture = argSplit[1]; - } - - if (meta instanceof SkullMeta skullMeta && skullTexture != null) { - SkullUtils.setSkullTexture(skullMeta, skullTexture); - } - - if (skullTexture == null) { - return null; - } - - String finalSkullTexture = skullTexture; - return test -> { - if (!test.hasItemMeta()) { - return false; - } - - ItemMeta testMeta = test.getItemMeta(); - - assert testMeta != null; - - if (testMeta instanceof SkullMeta skullMeta) { - return finalSkullTexture.equalsIgnoreCase(SkullUtils.getSkullTexture(skullMeta)); - } - - return true; - }; + return null; } }