Merge pull request Ghost-chu#1581 from Ghost-chu/master

Ghost-chu · web-flow · commit 9fe00d2cfb89 · 2021-11-09T15:03:01.000+08:00
5.0.0.10
diff --git a/pom.xml b/pom.xml
@@ -25,7 +25,7 @@
     <artifactId>QuickShop</artifactId>
 
     <properties>
-        <pluginver>5.0.0.10</pluginver>
+        <pluginver>5.0.0.11</pluginver>
         <package>org.maxgamer.quickshop</package>
         <developer>Ghost-chu</developer>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
diff --git a/src/main/java/org/maxgamer/quickshop/command/subcommand/SubCommand_Buy.java b/src/main/java/org/maxgamer/quickshop/command/subcommand/SubCommand_Buy.java
@@ -48,7 +48,7 @@ public void onCommand(@NotNull Player sender
                 if (shop.getModerator().isModerator(sender.getUniqueId()) || QuickShop.getPermissionManager().hasPermission(sender, "quickshop.other.control")) {
                     shop.setShopType(ShopType.BUYING);
                     shop.update();
-                    plugin.text().of(sender, "command.now-buying", MsgUtil.convertItemStackToTranslateText(shop.getItem().getType())).send();
+                    plugin.text().of(sender, "command.now-buying", MsgUtil.getTranslateText(shop.getItem())).send();
                 } else {
                     plugin.text().of(sender, "not-managed-shop").send();
                 }
diff --git a/src/main/java/org/maxgamer/quickshop/command/subcommand/SubCommand_Item.java b/src/main/java/org/maxgamer/quickshop/command/subcommand/SubCommand_Item.java
@@ -71,7 +71,7 @@ public void onCommand(@NotNull Player sender, @NotNull String commandLabel, @Not
                         plugin.getConfiguration().getBoolean("whole-number-prices-only"));
                 PriceLimiterCheckResult checkResult = limiter.check(itemStack, shop.getPrice());
                 if (checkResult.getStatus() != PriceLimiterStatus.PASS) {
-                    plugin.text().of(sender, "restricted-prices", MsgUtil.convertItemStackToTranslateText(shop.getItem().getType()),
+                    plugin.text().of(sender, "restricted-prices", MsgUtil.getTranslateText(shop.getItem()),
                             String.valueOf(checkResult.getMin()),
                             String.valueOf(checkResult.getMax())).send();
                     return;
diff --git a/src/main/java/org/maxgamer/quickshop/command/subcommand/SubCommand_Price.java b/src/main/java/org/maxgamer/quickshop/command/subcommand/SubCommand_Price.java
@@ -116,7 +116,7 @@ public void onCommand(@NotNull Player sender, @NotNull String commandLabel, @Not
                 return;
             }
             if (checkResult.getStatus() == PriceLimiterStatus.PRICE_RESTRICTED) {
-                plugin.text().of(sender, "restricted-prices", MsgUtil.convertItemStackToTranslateText(shop.getItem().getType()),
+                plugin.text().of(sender, "restricted-prices", MsgUtil.getTranslateText(shop.getItem()),
                         String.valueOf(checkResult.getMin()),
                         String.valueOf(checkResult.getMax())).send();
                 return;
diff --git a/src/main/java/org/maxgamer/quickshop/command/subcommand/SubCommand_Sell.java b/src/main/java/org/maxgamer/quickshop/command/subcommand/SubCommand_Sell.java
@@ -47,7 +47,7 @@ public void onCommand(@NotNull Player sender, @NotNull String commandLabel, @Not
                 if (shop.getModerator().isModerator(sender.getUniqueId()) || QuickShop.getPermissionManager().hasPermission(sender, "quickshop.other.control")) {
                     shop.setShopType(ShopType.SELLING);
                     shop.update();
-                    plugin.text().of(sender, "command.now-selling", MsgUtil.convertItemStackToTranslateText(shop.getItem().getType())).send();
+                    plugin.text().of(sender, "command.now-selling", MsgUtil.getTranslateText(shop.getItem())).send();
                 } else {
                     plugin.text().of(sender, "not-managed-shop").send();
                 }
diff --git a/src/main/java/org/maxgamer/quickshop/command/subcommand/SubCommand_SilentSell.java b/src/main/java/org/maxgamer/quickshop/command/subcommand/SubCommand_SilentSell.java
@@ -54,6 +54,6 @@ public void onCommand(@NotNull Player sender, @NotNull String commandLabel, @Not
         shop.update();
         MsgUtil.sendControlPanelInfo(sender, shop);
         plugin.text().of(sender,
-                "command.now-selling", MsgUtil.convertItemStackToTranslateText(shop.getItem().getType())).send();
+                "command.now-selling", MsgUtil.getTranslateText(shop.getItem())).send();
     }
 }
diff --git a/src/main/java/org/maxgamer/quickshop/command/subcommand/SubCommand_Size.java b/src/main/java/org/maxgamer/quickshop/command/subcommand/SubCommand_Size.java
@@ -75,13 +75,13 @@ public void onCommand(@NotNull Player sender, @NotNull String commandLabel, @Not
                             plugin.getConfiguration().getBoolean("whole-number-prices-only"));
                     PriceLimiterCheckResult checkResult = limiter.check(pendingItemStack, shop.getPrice());
                     if (checkResult.getStatus() != PriceLimiterStatus.PASS) {
-                        plugin.text().of(sender, "restricted-prices", MsgUtil.convertItemStackToTranslateText(shop.getItem().getType()),
+                        plugin.text().of(sender, "restricted-prices", MsgUtil.getTranslateText(shop.getItem()),
                                 String.valueOf(checkResult.getMin()),
                                 String.valueOf(checkResult.getMax())).send();
                         return;
                     }
                     shop.setItem(pendingItemStack);
-                    plugin.text().of(sender, "command.bulk-size-now", Integer.toString(shop.getItem().getAmount()), MsgUtil.convertItemStackToTranslateText(shop.getItem().getType())).send();
+                    plugin.text().of(sender, "command.bulk-size-now", Integer.toString(shop.getItem().getAmount()), MsgUtil.getTranslateText(shop.getItem())).send();
                     return;
                 } else {
                     plugin.text().of(sender, "not-managed-shop").send();
diff --git a/src/main/java/org/maxgamer/quickshop/command/subcommand/SubCommand_SuperCreate.java b/src/main/java/org/maxgamer/quickshop/command/subcommand/SubCommand_SuperCreate.java
@@ -66,7 +66,7 @@ public void onCommand(@NotNull Player sender, @NotNull String commandLabel, @Not
             final SimpleInfo info = new SimpleInfo(b.getLocation(), ShopAction.CREATE, sender.getInventory().getItemInMainHand(), b.getRelative(sender.getFacing().getOppositeFace()), true);
 
             plugin.getShopManager().getActions().put(sender.getUniqueId(), info);
-            plugin.text().of(sender, "how-much-to-trade-for", MsgUtil.convertItemStackToTranslateText(info.getItem().getType()), Integer.toString(plugin.isAllowStack() && QuickShop.getPermissionManager().hasPermission(sender, "quickshop.create.stacks") ? item.getAmount() : 1)).send();
+            plugin.text().of(sender, "how-much-to-trade-for", MsgUtil.getTranslateText(info.getItem()), Integer.toString(plugin.isAllowStack() && QuickShop.getPermissionManager().hasPermission(sender, "quickshop.create.stacks") ? item.getAmount() : 1)).send();
             return;
         }
         plugin.text().of(sender, "not-looking-at-shop").send();
diff --git a/src/main/java/org/maxgamer/quickshop/listener/PlayerListener.java b/src/main/java/org/maxgamer/quickshop/listener/PlayerListener.java
@@ -278,7 +278,7 @@ else if (e.useInteractedBlock() == Event.Result.ALLOW
             final SimpleInfo info = new SimpleInfo(b.getLocation(), ShopAction.CREATE, e.getItem(), last, false);
 
             plugin.getShopManager().getActions().put(p.getUniqueId(), info);
-            plugin.text().of(p, "how-much-to-trade-for", MsgUtil.convertItemStackToTranslateText(Objects.requireNonNull(e.getItem()).getType()), Integer.toString(plugin.isAllowStack() && QuickShop.getPermissionManager().hasPermission(p, "quickshop.create.stacks") ? item.getAmount() : 1)).send();
+            plugin.text().of(p, "how-much-to-trade-for", MsgUtil.getTranslateText(Objects.requireNonNull(e.getItem())), Integer.toString(plugin.isAllowStack() && QuickShop.getPermissionManager().hasPermission(p, "quickshop.create.stacks") ? item.getAmount() : 1)).send();
         }
     }
 
diff --git a/src/main/java/org/maxgamer/quickshop/shop/SimpleShopManager.java b/src/main/java/org/maxgamer/quickshop/shop/SimpleShopManager.java
@@ -641,7 +641,7 @@ public void actionBuy(
             space = 10000;
         }
         if (space < amount) {
-            plugin.text().of(buyer, "shop-has-no-space", Integer.toString(space), MsgUtil.convertItemStackToTranslateText(shop.getItem().getType())).send();
+            plugin.text().of(buyer, "shop-has-no-space", Integer.toString(space), MsgUtil.getTranslateText(shop.getItem())).send();
             return;
         }
         int count = Util.countItems(buyerInventory, shop.getItem());
@@ -650,7 +650,7 @@ public void actionBuy(
             plugin.text().of(buyer,
                     "you-dont-have-that-many-items",
                     Integer.toString(count),
-                    MsgUtil.convertItemStackToTranslateText(shop.getItem().getType())).send();
+                    MsgUtil.getTranslateText(shop.getItem())).send();
             return;
         }
         if (amount < 1) {
@@ -711,7 +711,7 @@ public void actionBuy(
         String msg = plugin.text().of(buyer, "player-sold-to-your-store",
                 player != null ? player.getName() : buyer.toString(),
                 String.valueOf(amount),
-                MsgUtil.convertItemStackToTranslateText(shop.getItem().getType())).forLocale();
+                MsgUtil.getTranslateText(shop.getItem())).forLocale();
 
         MsgUtil.TransactionMessage transactionMessage = new MsgUtil.TransactionMessage(msg, Util.serialize(shop.getItem()), null);
 
@@ -895,7 +895,7 @@ public void actionCreate(@NotNull Player p, Info info, @NotNull String message)
                 return;
             case PRICE_RESTRICTED:
                 plugin.text().of(p, "restricted-prices",
-                        MsgUtil.convertItemStackToTranslateText(info.getItem().getType()),
+                        MsgUtil.getTranslateText(info.getItem()),
                         String.valueOf(priceCheckResult.getMin()),
                         String.valueOf(priceCheckResult.getMax())).send();
                 return;
@@ -1023,7 +1023,7 @@ public void actionSell(
         }
         if (stock < amount) {
             plugin.text().of(seller, "shop-stock-too-low", Integer.toString(stock),
-                    MsgUtil.convertItemStackToTranslateText(shop.getItem().getType())).send();
+                    MsgUtil.getTranslateText(shop.getItem())).send();
             return;
         }
         if (amount < 1) {
@@ -1094,14 +1094,14 @@ public void actionSell(
             msg = plugin.text().of(seller, "player-bought-from-your-store-tax",
                     player != null ? player.getName() : seller.toString(),
                     Integer.toString(amount * shop.getItem().getAmount()),
-                    MsgUtil.convertItemStackToTranslateText(shop.getItem().getType()),
+                    MsgUtil.getTranslateText(shop.getItem()),
                     Double.toString(total),
                     this.formatter.format(CalculateUtil.multiply(taxModifier, total), shop)).forLocale();
         } else {
             msg = plugin.text().of(seller, "player-bought-from-your-store",
                     player != null ? player.getName() : seller.toString(),
                     Integer.toString(amount * shop.getItem().getAmount()),
-                    MsgUtil.convertItemStackToTranslateText(shop.getItem().getType()),
+                    MsgUtil.getTranslateText(shop.getItem()),
                     Double.toString(total)).forLocale();
         }
 
@@ -1153,7 +1153,7 @@ public void sendPurchaseSuccess(@NotNull UUID purchaser, @NotNull Shop shop, int
         ChatSheetPrinter chatSheetPrinter = new ChatSheetPrinter(sender);
         chatSheetPrinter.printHeader();
         chatSheetPrinter.printLine(plugin.text().of(sender, "menu.successful-purchase").forLocale());
-        chatSheetPrinter.printLine(plugin.text().of(sender, "menu.item-name-and-price", Integer.toString(amount * shop.getItem().getAmount()), MsgUtil.convertItemStackToTranslateText(shop.getItem().getType()), format(amount * shop.getPrice(), shop)).forLocale());
+        chatSheetPrinter.printLine(plugin.text().of(sender, "menu.item-name-and-price", Integer.toString(amount * shop.getItem().getAmount()), MsgUtil.getTranslateText(shop.getItem()), format(amount * shop.getPrice(), shop)).forLocale());
         MsgUtil.printEnchantment(sender, shop, chatSheetPrinter);
         chatSheetPrinter.printFooter();
     }
@@ -1178,7 +1178,7 @@ public void sendSellSuccess(@NotNull UUID seller, @NotNull Shop shop, int amount
                 plugin.text().of(sender,
                         "menu.item-name-and-price",
                         Integer.toString(amount),
-                        MsgUtil.convertItemStackToTranslateText(shop.getItem().getType()),
+                        MsgUtil.getTranslateText(shop.getItem()),
                         format(amount * shop.getPrice(), shop)).forLocale());
         if (plugin.getConfiguration().getBoolean("show-tax")) {
             double tax = plugin.getConfiguration().getDouble("tax");
@@ -1211,11 +1211,7 @@ public void sendShopInfo(@NotNull Player p, @NotNull Shop shop) {
         chatSheetPrinter.printLine(plugin.text().of(p, "menu.shop-information").forLocale());
         chatSheetPrinter.printLine(plugin.text().of(p, "menu.owner", shop.ownerName()).forLocale());
         // Enabled
-        if (plugin.getConfiguration().getBoolean("force-use-item-original-name") || !items.hasItemMeta() || !items.getItemMeta().hasDisplayName()) {
-            plugin.getQuickChat().send(p, plugin.getQuickChat().getItemHologramChat(shop, items, p, ChatColor.DARK_PURPLE + plugin.text().of(p, "tableformat.left_begin").forLocale() + plugin.text().of(p, "menu.item", MsgUtil.convertItemStackToTranslateText(shop.getItem().getType())).forLocale() + "  "));
-        } else {
-            plugin.getQuickChat().send(p, plugin.getQuickChat().getItemHologramChat(shop, items, p, ChatColor.DARK_PURPLE + plugin.text().of(p, "tableformat.left_begin").forLocale() + plugin.text().of(p, "menu.item", Util.getItemStackName(shop.getItem())).forLocale() + "  "));
-        }
+        plugin.getQuickChat().send(p, plugin.getQuickChat().getItemHologramChat(shop, items, p, ChatColor.DARK_PURPLE + plugin.text().of(p, "tableformat.left_begin").forLocale() + plugin.text().of(p, "menu.item", MsgUtil.getTranslateText(shop.getItem())).forLocale() + "  "));
         if (Util.isTool(items.getType())) {
             chatSheetPrinter.printLine(
                     plugin.text().of(p, "menu.damage-percent-remaining", Util.getToolPercentage(items)).forLocale());
@@ -1238,9 +1234,9 @@ public void sendShopInfo(@NotNull Player p, @NotNull Shop shop) {
             }
         }
         if (shop.getItem().getAmount() == 1) {
-            chatSheetPrinter.printLine(plugin.text().of(p, "menu.price-per", MsgUtil.convertItemStackToTranslateText(shop.getItem().getType()), format(shop.getPrice(), shop)).forLocale());
+            chatSheetPrinter.printLine(plugin.text().of(p, "menu.price-per", MsgUtil.getTranslateText(shop.getItem()), format(shop.getPrice(), shop)).forLocale());
         } else {
-            chatSheetPrinter.printLine(plugin.text().of(p, "menu.price-per-stack", MsgUtil.convertItemStackToTranslateText(shop.getItem().getType()), format(shop.getPrice(), shop), Integer.toString(shop.getItem().getAmount())).forLocale());
+            chatSheetPrinter.printLine(plugin.text().of(p, "menu.price-per-stack", MsgUtil.getTranslateText(shop.getItem()), format(shop.getPrice(), shop), Integer.toString(shop.getItem().getAmount())).forLocale());
         }
         if (shop.isBuying()) {
             chatSheetPrinter.printLine(plugin.text().of(p, "menu.this-shop-is-buying").forLocale());
@@ -1353,7 +1349,7 @@ private void actionTrade(@NotNull Player p, Info info, @NotNull String message)
                         if (shopHaveSpaces == 0) {
                             // when typed 'all' but the shop doesn't have any empty space
                             plugin.text().of(p, "shop-has-no-space", Integer.toString(shopHaveSpaces),
-                                    MsgUtil.convertItemStackToTranslateText(shop.getItem().getType())).send();
+                                    MsgUtil.getTranslateText(shop.getItem())).send();
                             return;
                         }
                         if (ownerCanAfford == 0
@@ -1373,7 +1369,7 @@ private void actionTrade(@NotNull Player p, Info info, @NotNull String message)
                         // when typed 'all' but player doesn't have any items to sell
                         plugin.text().of(p, "you-dont-have-that-many-items",
                                 Integer.toString(amount),
-                                MsgUtil.convertItemStackToTranslateText(shop.getItem().getType())).send();
+                                MsgUtil.getTranslateText(shop.getItem())).send();
                         return;
                     }
                 } else {
@@ -1411,7 +1407,7 @@ private void actionTrade(@NotNull Player p, Info info, @NotNull String message)
                             // but also the shop's stock is 0
                             plugin.text().of(p, "shop-stock-too-low",
                                     Integer.toString(shop.getRemainingStock()),
-                                    MsgUtil.convertItemStackToTranslateText(shop.getItem().getType())).send();
+                                    MsgUtil.getTranslateText(shop.getItem())).send();
                         } else {
                             // when if player's inventory is full
                             if (invHaveSpaces <= 0) {
diff --git a/src/main/java/org/maxgamer/quickshop/util/MsgUtil.java b/src/main/java/org/maxgamer/quickshop/util/MsgUtil.java
@@ -212,6 +212,14 @@ public static void loadGameLanguage(@NotNull String languageCode) {
         gameLanguage = ServiceInjector.getGameLanguage(new MojangGameLanguageImpl(plugin, languageCode));
     }
 
+    public static String getTranslateText(ItemStack stack) {
+        if (plugin.getConfiguration().getBoolean("force-use-item-original-name") || !stack.hasItemMeta() || !stack.getItemMeta().hasDisplayName()) {
+            return convertItemStackToTranslateText(stack.getType());
+        } else {
+            return Util.getItemStackName(stack);
+        }
+    }
+
     public static String convertItemStackToTranslateText(Material mat) {
         return TextSplitter.bakeComponent(new ComponentBuilder().append(new TranslatableComponent(ReflectFactory.getMaterialMinecraftNamespacedKey(mat))).create());
     }
diff --git a/src/main/java/org/maxgamer/quickshop/util/matcher/item/BukkitItemMatcherImpl.java b/src/main/java/org/maxgamer/quickshop/util/matcher/item/BukkitItemMatcherImpl.java
@@ -72,6 +72,19 @@ public boolean matches(@Nullable ItemStack original, @Nullable ItemStack tester)
         if ((original == null) != (tester == null)) {
             return false;
         }
+
+        original = original.clone();
+        original.setAmount(1);
+        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;
+//            }
+//        }
         return tester.isSimilar(original);
     }
 }
diff --git a/src/main/java/org/maxgamer/quickshop/util/matcher/item/QuickShopItemMatcherImpl.java b/src/main/java/org/maxgamer/quickshop/util/matcher/item/QuickShopItemMatcherImpl.java
@@ -144,6 +144,14 @@ 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 (workType == 1) {
             return requireStack.isSimilar(givenStack);
         }

Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ public void onCommand(@NotNull Player sender`
`48`	`48`	`if (shop.getModerator().isModerator(sender.getUniqueId()) \|\| QuickShop.getPermissionManager().hasPermission(sender, "quickshop.other.control")) {`
`49`	`49`	`shop.setShopType(ShopType.BUYING);`
`50`	`50`	`shop.update();`
`51`		`- plugin.text().of(sender, "command.now-buying", MsgUtil.convertItemStackToTranslateText(shop.getItem().getType())).send();`
	`51`	`+ plugin.text().of(sender, "command.now-buying", MsgUtil.getTranslateText(shop.getItem())).send();`
`52`	`52`	`} else {`
`53`	`53`	`plugin.text().of(sender, "not-managed-shop").send();`
`54`	`54`	`}`
Original file line number	Diff line number	Diff line change
`@@ -116,7 +116,7 @@ public void onCommand(@NotNull Player sender, @NotNull String commandLabel, @Not`
`116`	`116`	`return;`
`117`	`117`	`}`
`118`	`118`	`if (checkResult.getStatus() == PriceLimiterStatus.PRICE_RESTRICTED) {`
`119`		`- plugin.text().of(sender, "restricted-prices", MsgUtil.convertItemStackToTranslateText(shop.getItem().getType()),`
	`119`	`+ plugin.text().of(sender, "restricted-prices", MsgUtil.getTranslateText(shop.getItem()),`
`120`	`120`	`String.valueOf(checkResult.getMin()),`
`121`	`121`	`String.valueOf(checkResult.getMax())).send();`
`122`	`122`	`return;`
Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ public void onCommand(@NotNull Player sender, @NotNull String commandLabel, @Not`
`47`	`47`	`if (shop.getModerator().isModerator(sender.getUniqueId()) \|\| QuickShop.getPermissionManager().hasPermission(sender, "quickshop.other.control")) {`
`48`	`48`	`shop.setShopType(ShopType.SELLING);`
`49`	`49`	`shop.update();`
`50`		`- plugin.text().of(sender, "command.now-selling", MsgUtil.convertItemStackToTranslateText(shop.getItem().getType())).send();`
	`50`	`+ plugin.text().of(sender, "command.now-selling", MsgUtil.getTranslateText(shop.getItem())).send();`
`51`	`51`	`} else {`
`52`	`52`	`plugin.text().of(sender, "not-managed-shop").send();`
`53`	`53`	`}`
Original file line number	Diff line number	Diff line change
`@@ -54,6 +54,6 @@ public void onCommand(@NotNull Player sender, @NotNull String commandLabel, @Not`
`54`	`54`	`shop.update();`
`55`	`55`	`MsgUtil.sendControlPanelInfo(sender, shop);`
`56`	`56`	`plugin.text().of(sender,`
`57`		`- "command.now-selling", MsgUtil.convertItemStackToTranslateText(shop.getItem().getType())).send();`
	`57`	`+ "command.now-selling", MsgUtil.getTranslateText(shop.getItem())).send();`
`58`	`58`	`}`
`59`	`59`	`}`
Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@ public void onCommand(@NotNull Player sender, @NotNull String commandLabel, @Not`
`66`	`66`	`final SimpleInfo info = new SimpleInfo(b.getLocation(), ShopAction.CREATE, sender.getInventory().getItemInMainHand(), b.getRelative(sender.getFacing().getOppositeFace()), true);`
`67`	`67`
`68`	`68`	`plugin.getShopManager().getActions().put(sender.getUniqueId(), info);`
`69`		`- plugin.text().of(sender, "how-much-to-trade-for", MsgUtil.convertItemStackToTranslateText(info.getItem().getType()), Integer.toString(plugin.isAllowStack() && QuickShop.getPermissionManager().hasPermission(sender, "quickshop.create.stacks") ? item.getAmount() : 1)).send();`
	`69`	`+ plugin.text().of(sender, "how-much-to-trade-for", MsgUtil.getTranslateText(info.getItem()), Integer.toString(plugin.isAllowStack() && QuickShop.getPermissionManager().hasPermission(sender, "quickshop.create.stacks") ? item.getAmount() : 1)).send();`
`70`	`70`	`return;`
`71`	`71`	`}`
`72`	`72`	`plugin.text().of(sender, "not-looking-at-shop").send();`
Original file line number	Diff line number	Diff line change
`@@ -278,7 +278,7 @@ else if (e.useInteractedBlock() == Event.Result.ALLOW`
`278`	`278`	`final SimpleInfo info = new SimpleInfo(b.getLocation(), ShopAction.CREATE, e.getItem(), last, false);`
`279`	`279`
`280`	`280`	`plugin.getShopManager().getActions().put(p.getUniqueId(), info);`
`281`		`- plugin.text().of(p, "how-much-to-trade-for", MsgUtil.convertItemStackToTranslateText(Objects.requireNonNull(e.getItem()).getType()), Integer.toString(plugin.isAllowStack() && QuickShop.getPermissionManager().hasPermission(p, "quickshop.create.stacks") ? item.getAmount() : 1)).send();`
	`281`	`+ plugin.text().of(p, "how-much-to-trade-for", MsgUtil.getTranslateText(Objects.requireNonNull(e.getItem())), Integer.toString(plugin.isAllowStack() && QuickShop.getPermissionManager().hasPermission(p, "quickshop.create.stacks") ? item.getAmount() : 1)).send();`
`282`	`282`	`}`
`283`	`283`	`}`
`284`	`284`