From c7ee7050125fda4a7c04dd5b367c470034fe06d4 Mon Sep 17 00:00:00 2001 From: v_manijashvili Date: Sun, 26 Nov 2023 09:43:41 +0400 Subject: [PATCH 1/5] ignore repair-cost attribute when check ItemStack equals() --- src/main/java/com/Acrobot/Breeze/Utils/MaterialUtil.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/Acrobot/Breeze/Utils/MaterialUtil.java b/src/main/java/com/Acrobot/Breeze/Utils/MaterialUtil.java index 2d5b86e..58ea46d 100644 --- a/src/main/java/com/Acrobot/Breeze/Utils/MaterialUtil.java +++ b/src/main/java/com/Acrobot/Breeze/Utils/MaterialUtil.java @@ -32,6 +32,7 @@ import java.util.Map; import java.util.logging.Level; import java.util.regex.Matcher; import java.util.regex.Pattern; +import java.util.HashMap; import static com.Acrobot.Breeze.Utils.StringUtil.getMinecraftCharWidth; import static com.Acrobot.Breeze.Utils.StringUtil.getMinecraftStringWidth; @@ -136,8 +137,10 @@ public class MaterialUtil { if (oneMeta == twoMeta || oneMeta == null || twoMeta == null) { return oneMeta == twoMeta; } - Map oneSerMeta = oneMeta.serialize(); - Map twoSerMeta = twoMeta.serialize(); + Map oneSerMeta = new HashMap<>(oneMeta.serialize()); + Map twoSerMeta = new HashMap<>(twoMeta.serialize()); + oneSerMeta.remove("repair-cost"); + twoSerMeta.remove("repair-cost"); if (oneSerMeta.equals(twoSerMeta)) { return true; } From 86605352bed2d9a8b1f7cf6185499e39f3360a23 Mon Sep 17 00:00:00 2001 From: v_manijashvili Date: Sun, 26 Nov 2023 10:24:54 +0400 Subject: [PATCH 2/5] Posibility to ignore some enchantment from ItemStack Add configuration IGNORE_ENCHANT_ATTRIBUTE_FOR_SIMILARITY --- .../java/com/Acrobot/Breeze/Utils/MaterialUtil.java | 12 ++++++++++-- .../Acrobot/ChestShop/Configuration/Properties.java | 7 +++++++ 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/Acrobot/Breeze/Utils/MaterialUtil.java b/src/main/java/com/Acrobot/Breeze/Utils/MaterialUtil.java index 58ea46d..003987c 100644 --- a/src/main/java/com/Acrobot/Breeze/Utils/MaterialUtil.java +++ b/src/main/java/com/Acrobot/Breeze/Utils/MaterialUtil.java @@ -137,10 +137,18 @@ public class MaterialUtil { if (oneMeta == twoMeta || oneMeta == null || twoMeta == null) { return oneMeta == twoMeta; } + Map oneSerMeta = new HashMap<>(oneMeta.serialize()); Map twoSerMeta = new HashMap<>(twoMeta.serialize()); - oneSerMeta.remove("repair-cost"); - twoSerMeta.remove("repair-cost"); + System.out.println("IGNORE LIST: "); + System.out.println(Properties.IGNORE_ENCHANT_ATTRIBUTE_FOR_SIMILARITY); + if (!Properties.IGNORE_ENCHANT_ATTRIBUTE_FOR_SIMILARITY.isEmpty()) { + for (String ignoreKey : Properties.IGNORE_ENCHANT_ATTRIBUTE_FOR_SIMILARITY) { + oneSerMeta.remove(ignoreKey); + twoSerMeta.remove(ignoreKey); + } + } + if (oneSerMeta.equals(twoSerMeta)) { return true; } diff --git a/src/main/java/com/Acrobot/ChestShop/Configuration/Properties.java b/src/main/java/com/Acrobot/ChestShop/Configuration/Properties.java index cb2e7e7..493265f 100644 --- a/src/main/java/com/Acrobot/ChestShop/Configuration/Properties.java +++ b/src/main/java/com/Acrobot/ChestShop/Configuration/Properties.java @@ -18,6 +18,7 @@ import java.util.Locale; import java.util.Set; import java.util.UUID; import java.util.logging.Level; +import java.util.Collections; /** * @author Acrobot @@ -337,4 +338,10 @@ public class Properties { @PrecededBySpace @ConfigurationComment("Add stock counter to quantity line?") public static boolean USE_STOCK_COUNTER = false; + + @PrecededBySpace + @ConfigurationComment("Ignore enchantment attribute for similarity") + @Parser("StringSet") + public static Set IGNORE_ENCHANT_ATTRIBUTE_FOR_SIMILARITY = new LinkedHashSet<>(); + } \ No newline at end of file From a4472eb34738f90210819c5ea442c6206e398065 Mon Sep 17 00:00:00 2001 From: v_manijashvili Date: Sun, 26 Nov 2023 10:48:32 +0400 Subject: [PATCH 3/5] clear System.out.println --- src/main/java/com/Acrobot/Breeze/Utils/MaterialUtil.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/main/java/com/Acrobot/Breeze/Utils/MaterialUtil.java b/src/main/java/com/Acrobot/Breeze/Utils/MaterialUtil.java index 003987c..eb3bfc3 100644 --- a/src/main/java/com/Acrobot/Breeze/Utils/MaterialUtil.java +++ b/src/main/java/com/Acrobot/Breeze/Utils/MaterialUtil.java @@ -140,8 +140,6 @@ public class MaterialUtil { Map oneSerMeta = new HashMap<>(oneMeta.serialize()); Map twoSerMeta = new HashMap<>(twoMeta.serialize()); - System.out.println("IGNORE LIST: "); - System.out.println(Properties.IGNORE_ENCHANT_ATTRIBUTE_FOR_SIMILARITY); if (!Properties.IGNORE_ENCHANT_ATTRIBUTE_FOR_SIMILARITY.isEmpty()) { for (String ignoreKey : Properties.IGNORE_ENCHANT_ATTRIBUTE_FOR_SIMILARITY) { oneSerMeta.remove(ignoreKey); From e89cd04725dc70e4fe403178c825407d02de969e Mon Sep 17 00:00:00 2001 From: v_manijashvili Date: Sun, 26 Nov 2023 10:49:46 +0400 Subject: [PATCH 4/5] remove unused imports --- .../java/com/Acrobot/ChestShop/Configuration/Properties.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/com/Acrobot/ChestShop/Configuration/Properties.java b/src/main/java/com/Acrobot/ChestShop/Configuration/Properties.java index 493265f..33e679d 100644 --- a/src/main/java/com/Acrobot/ChestShop/Configuration/Properties.java +++ b/src/main/java/com/Acrobot/ChestShop/Configuration/Properties.java @@ -18,7 +18,6 @@ import java.util.Locale; import java.util.Set; import java.util.UUID; import java.util.logging.Level; -import java.util.Collections; /** * @author Acrobot From b274f673e2958e8edd9757968ee967dba70d16d3 Mon Sep 17 00:00:00 2001 From: v_manijashvili Date: Tue, 28 Nov 2023 16:25:58 +0400 Subject: [PATCH 5/5] rename configuration property IGNORE_ENCHANT_ATTRIBUTE_FOR_SIMILARITY to EXCLUDED_ITEM_ATTRIBUTES --- src/main/java/com/Acrobot/Breeze/Utils/MaterialUtil.java | 4 ++-- .../java/com/Acrobot/ChestShop/Configuration/Properties.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/Acrobot/Breeze/Utils/MaterialUtil.java b/src/main/java/com/Acrobot/Breeze/Utils/MaterialUtil.java index eb3bfc3..5d451ad 100644 --- a/src/main/java/com/Acrobot/Breeze/Utils/MaterialUtil.java +++ b/src/main/java/com/Acrobot/Breeze/Utils/MaterialUtil.java @@ -140,8 +140,8 @@ public class MaterialUtil { Map oneSerMeta = new HashMap<>(oneMeta.serialize()); Map twoSerMeta = new HashMap<>(twoMeta.serialize()); - if (!Properties.IGNORE_ENCHANT_ATTRIBUTE_FOR_SIMILARITY.isEmpty()) { - for (String ignoreKey : Properties.IGNORE_ENCHANT_ATTRIBUTE_FOR_SIMILARITY) { + if (!Properties.EXCLUDED_ITEM_ATTRIBUTES.isEmpty()) { + for (String ignoreKey : Properties.EXCLUDED_ITEM_ATTRIBUTES) { oneSerMeta.remove(ignoreKey); twoSerMeta.remove(ignoreKey); } diff --git a/src/main/java/com/Acrobot/ChestShop/Configuration/Properties.java b/src/main/java/com/Acrobot/ChestShop/Configuration/Properties.java index 33e679d..466888e 100644 --- a/src/main/java/com/Acrobot/ChestShop/Configuration/Properties.java +++ b/src/main/java/com/Acrobot/ChestShop/Configuration/Properties.java @@ -339,8 +339,8 @@ public class Properties { public static boolean USE_STOCK_COUNTER = false; @PrecededBySpace - @ConfigurationComment("Ignore enchantment attribute for similarity") + @ConfigurationComment("Exclude these enchantments from the similarity check when comparing items") @Parser("StringSet") - public static Set IGNORE_ENCHANT_ATTRIBUTE_FOR_SIMILARITY = new LinkedHashSet<>(); + public static Set EXCLUDED_ITEM_ATTRIBUTES = new LinkedHashSet<>(); } \ No newline at end of file