Closed Ghost-chu#1563

Author: Ghost-chu

src/main/java/org/maxgamer/quickshop/listener/PlayerListener.java

@@ -196,13 +196,23 @@ private void postTrade(PlayerInteractEvent e) {
             final double money = plugin.getEconomy().getBalance(p.getUniqueId(), shop.getLocation().getWorld(), shop.getCurrency());
             final Inventory playerInventory = p.getInventory();
             if (shop.isSelling()) {
+                if (shop.getRemainingStock() == 0) {
+                    plugin.text().of(p, "purchase-out-of-stock", shop.ownerName()).send();
+                    return;
+                }
+
                 int itemAmount = getPlayerCanBuy(shop, money, price, playerInventory);
                 if (shop.isStackingShop()) {
                     plugin.text().of(p, "how-many-buy-stack", Integer.toString(shop.getItem().getAmount()), Integer.toString(itemAmount)).send();
                 } else {
                     plugin.text().of(p, "how-many-buy", Integer.toString(itemAmount)).send();
                 }
             } else {
+                if (shop.getRemainingSpace() == 0) {
+                    plugin.text().of(p, "purchase-out-of-space", shop.ownerName()).send();
+                    return;
+                }
+
                 int items = getPlayerCanSell(shop, money, price, playerInventory);
                 if (shop.isStackingShop()) {
                     plugin.text().of(p, "how-many-sell-stack", Integer.toString(shop.getItem().getAmount()), Integer.toString(items)).send();

src/main/java/org/maxgamer/quickshop/localization/text/SimpleTextManager.java

@@ -395,6 +395,7 @@ private List<String> postProcess(@NotNull List<String> text) {
         public List<String> forLocale(@NotNull String locale) {
             JsonConfiguration index = mapping.get(locale);
             if (index == null) {
+                Util.debugLog("Fallback " + locale + " to default game-language locale caused by QuickShop doesn't support this locale");
                 if (MsgUtil.processGameLanguageCode(plugin.getConfiguration().getOrDefault("game-language", "default")).equals(locale)) {
                     List<String> str = fallbackLocal();
                     if (str.isEmpty()) {
@@ -407,12 +408,15 @@ public List<String> forLocale(@NotNull String locale) {
             } else {
                 List<String> str = index.getStringList(path);
                 if (str.isEmpty()) {
-                    return Collections.singletonList("Missing Language Key: " + path);
-                } else {
-                    return postProcess(str);
+                    // Fallback
+                    Util.debugLog("Fallback " + path + " to bundle translation caused OTA & User's override file doesn't contains this key");
+                    str = fallbackLocal();
+                    if (str.isEmpty()) {
+                        return Collections.singletonList("Fallback Missing Language Key: " + path + ", report to QuickShop!");
+                    }
                 }
+                return postProcess(str);
             }
-
         }
 
         /**
@@ -512,6 +516,7 @@ private String postProcess(@NotNull String text) {
         public String forLocale(@NotNull String locale) {
             JsonConfiguration index = mapping.get(locale);
             if (index == null) {
+                Util.debugLog("Fallback " + locale + " to default game-language locale caused by QuickShop doesn't support this locale");
                 if (MsgUtil.processGameLanguageCode(plugin.getConfiguration().getOrDefault("game-language", "default")).equals(locale)) {
                     String str = fallbackLocal();
                     if (str == null) {
@@ -524,7 +529,12 @@ public String forLocale(@NotNull String locale) {
             } else {
                 String str = index.getString(path);
                 if (str == null) {
-                    return "Missing Language Key: " + path;
+                    // Fallback
+                    Util.debugLog("Fallback " + path + " to bundle translation caused OTA & User's override file doesn't contains this key");
+                    str = fallbackLocal();
+                    if (str == null) {
+                        return "Fallback Missing Language Key: " + path + ", report to QuickShop!";
+                    }
                 }
                 return postProcess(str);
             }

src/main/resources/lang/messages.json

@@ -345,5 +345,7 @@
   "taxaccount-invalid": "&cTarget account not invalid, please enter a valid player name or uuid(with dashes).",
   "display-turn-on": "&aSuccessfully turn on the shop display.",
   "display-turn-off": "&aSuccessfully turn off the shop display.",
-  "shop-purged-start": "&aShop purge started, check the console for details."
+  "shop-purged-start": "&aShop purge started, check the console for details.",
+  "purchase-out-of-stock": "&cThis shop run out of the stock, Contact shop owner or staffs to refill the stock.",
+  "purchase-out-of-space": "&cThis shop run out of the space, Contact shop owner or staffs to empty the shop."
 }