Revert "temp disable shopItemId feature in release since we hadn't get it ready"

This reverts commit 568eb72

Author: Ghost-chu

src/main/java/org/maxgamer/quickshop/util/matcher/item/BukkitItemMatcherImpl.java

@@ -19,6 +19,7 @@
 
 package org.maxgamer.quickshop.util.matcher.item;
 
+import de.tr7zw.nbtapi.NBTItem;
 import lombok.AllArgsConstructor;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.plugin.Plugin;
@@ -27,6 +28,8 @@
 import org.maxgamer.quickshop.QuickShop;
 import org.maxgamer.quickshop.api.shop.ItemMatcher;
 
+import java.util.Objects;
+
 /**
  * A simple impl for ItemMatcher
  *
@@ -78,13 +81,13 @@ public boolean matches(@Nullable ItemStack original, @Nullable ItemStack tester)
         tester = tester.clone();
         tester.setAmount(1);
 
-//        if (plugin.getNbtapi() != null) {
-//            NBTItem nbtItemOriginal = new NBTItem(original);
-//            NBTItem nbtItemTester = new NBTItem(tester);
-//            if (Objects.equals(nbtItemOriginal.getString("shopId"), nbtItemTester.getString("shopId"))) {
-//                return true;
-//            }
-//        }
+        if (plugin.getNbtapi() != null) {
+            NBTItem nbtItemOriginal = new NBTItem(original);
+            NBTItem nbtItemTester = new NBTItem(tester);
+            if (Objects.equals(nbtItemOriginal.getString("shopId"), nbtItemTester.getString("shopId"))) {
+                return true;
+            }
+        }
         return tester.isSimilar(original);
     }
 }

src/main/java/org/maxgamer/quickshop/util/matcher/item/QuickShopItemMatcherImpl.java

@@ -20,6 +20,7 @@
 package org.maxgamer.quickshop.util.matcher.item;
 
 import de.leonhard.storage.sections.FlatFileSection;
+import de.tr7zw.nbtapi.NBTItem;
 import lombok.AllArgsConstructor;
 import org.bukkit.attribute.Attribute;
 import org.bukkit.block.ShulkerBox;
@@ -144,13 +145,13 @@ public boolean matches(@Nullable ItemStack requireStack, @Nullable ItemStack giv
         givenStack = givenStack.clone();
         givenStack.setAmount(1);
 
-//        if (plugin.getNbtapi() != null) {
-//            NBTItem nbtItemOriginal = new NBTItem(requireStack);
-//            NBTItem nbtItemTester = new NBTItem(givenStack);
-//            if (Objects.equals(nbtItemOriginal.getString("shopItemId"), nbtItemTester.getString("shopItemId"))) {
-//                return true;
-//            }
-//        }
+        if (plugin.getNbtapi() != null) {
+            NBTItem nbtItemOriginal = new NBTItem(requireStack);
+            NBTItem nbtItemTester = new NBTItem(givenStack);
+            if (Objects.equals(nbtItemOriginal.getString("shopItemId"), nbtItemTester.getString("shopItemId"))) {
+                return true;
+            }
+        }
 
         if (workType == 1) {
             return requireStack.isSimilar(givenStack);