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

5.0.0.10

Author: Ghost-chu

crowdin/lang/de-DE/messages.json

@@ -346,6 +346,6 @@
   "display-turn-on": "&aShopanzeige erfolgreich aktiviert.",
   "display-turn-off": "&aShopanzeige erfolgreich deaktiviert.",
   "shop-purged-start": "&aShop-Löschung gestartet. Überprüfe die Konsole für 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."
+  "purchase-out-of-stock": "&cDieser Shop hat keine Items mehr. Kontaktiere den Shopeigentümer oder Shop-Mitarbeiter um den Bestand wieder aufzufüllen.",
+  "purchase-out-of-space": "&cDieser Shop hat keinen Platz mehr. Kontaktiere den Shopeigentümer oder Shop-Mitarbeiter damit er geleert wird."
 }

crowdin/lang/en-US/messages.json

@@ -67,28 +67,28 @@
   "nothing-to-flush": "&aYou have no new shop messages.",
   "break-shop-use-supertool": "&eYou can break the shop by using the SuperTool.",
   "failed-to-put-sign": "&cNot enough space around the shop to place the info sign.",
-  "failed-to-paste": "&cFailed to upload the data to Pastebin. Check your internet connection and try again. (See console for details)",
-  "warn-to-paste": "&eCollecting data and uploading it to Pastebin, this may take a while. &c&lWarning:&c The data is kept public for one week! It may leak your server configuration and other sensitive information. Make sure you only send it to &ltrusted staff/developers.",
-  "price-too-high": "&cThe shop price is too high! You cannot create one with a price higher than {0}.",
-  "you-cant-create-shop-in-there": "&cYou don't have permission to create a shop at this location.",
+  "failed-to-paste": "&cFailed to upload the data to pastebin. Check your internet connection and try again. (See console for details)",
+  "warn-to-paste": "&eCollecting data and uploading to Pastebin, this may take a while. &c&lWarning:&c The data is kept public for one week! It may leak your server configuration and other sensitive information. Make sure you only send it to &ltrusted staff/developers.",
+  "price-too-high": "&cThe shop price is too high! You cannot create a shop with a price higher than {0}.",
+  "you-cant-create-shop-in-there": "&cYou don't have permissions to create a shop at this location.",
   "unknown-player": "&cTarget player doesn't exist, please check the username you typed.",
   "shop-staff-cleared": "&aSuccessfully removed all staff members from your shop.",
-  "shop-staff-added": "&aSuccessfully added {0} as a staff member for your shop.",
-  "shop-staff-deleted": "&aSuccessfully removed {0} as a staff member for your shop.",
+  "shop-staff-added": "&aSuccessfully added {0} as a staff member to your shop.",
+  "shop-staff-deleted": "&aSuccessfully removed {0} as a staff member from your shop.",
   "no-permission-build": "&cYou cannot build a shop here.",
   "success-change-owner-to-server": "&aSuccessfully set the shop owner to Server.",
-  "flush-finished": "&aSuccessfully flushed the messages.",
+  "flush-finished": "&aSuccessfully cleared recent messages.",
   "purchase-failed": "&cPurchase failed: Internal Error. Please contact the Server Administrator.",
-  "no-pending-action": "&cYou do not have any pending actions",
-  "permission-denied-3rd-party": "&cPermission denied: 3rd Party Plugin [{0}].",
-  "shops-removed-in-world": "&eTotal &b{0}&e shops has been deleted in world &b{1}&e.",
+  "no-pending-action": "&cYou don't have any pending actions",
+  "permission-denied-3rd-party": "&cPermission denied by 3rd-party Plugin {0}.",
+  "shops-removed-in-world": "&eA total of &b{0}&e shops have been deleted in world &b{1}&e.",
   "world-not-exists": "&cThe world &e{0}&c doesn't exist",
   "menu": {
     "successful-purchase": "&aSuccessfully purchased:",
     "successfully-sold": "&aSuccessfully sold:",
     "item-name-and-price": "&e{0} {1} &afor &e{2}",
     "sell-tax": "&aYou paid &e{0} &ain taxes.",
-    "sell-tax-self": "&aYou didn't pay taxes because you own this shop.",
+    "sell-tax-self": "&aYou didn't had to pay taxes because you own this shop.",
     "enchants": "&5Enchantments",
     "stored-enchants": "&5Stored Enchantments",
     "shop-information": "&aShop Information:",
@@ -97,7 +97,7 @@
     "item-holochat-error": "&c[Error]",
     "preview": "&b[Item Preview]",
     "space": "&aSpace: &e{0}",
-    "stock": "&aStock &e{0}",
+    "stock": "&aStock: &e{0}",
     "price-per": "&aPrice per &e{0} &a- &e{1}",
     "price-per-stack": "&aPrice per &e{2}x {0} - {1}",
     "total-value-of-chest": "&aTotal value of chest: &e{0}",
@@ -110,12 +110,12 @@
   "bypassing-lock": "&cBypassing a QuickShop lock!",
   "that-is-locked": "&cThis shop is locked.",
   "how-many-buy": "&aEnter in chat, how many you wish to &bBUY&a. You can buy &e{0}&a. Enter &ball&a to buy them all.",
-  "how-many-sell": "&aEnter in chat, how much you wish to &dSELL&a. You have &e{0}&a available. Enter &ball&a in chat, to sell all.",
+  "how-many-sell": "&aEnter in chat, how many you wish to &dSELL&a. You can buy &e{0}&a. Enter &ball&a to buy them all.",
   "not-allowed-to-create": "&cYou may not create a shop here.",
   "blacklisted-item": "&cYou cannot sell this item because it is on the blacklist",
   "how-much-to-trade-for": "&aEnter in chat, how much you wish to trade &e{1}x {0}&a for.",
   "command": {
-    "format": "&a/{0} {1} &e- {2}",
+    "format": "&a{0} {1} &e- {2}",
     "format-disabled": "&c/{0} {1} &7- {2}",
     "toggle-unlimited": {
       "unlimited": "&aShop is now unlimited",

crowdin/lang/pl-PL/messages.json

@@ -179,7 +179,7 @@
       "lock": "&eZmień status blokady sklepu",
       "taxaccount": "&eUstaw konto podatkowe, które sklep ma używać",
       "toggledisplay": "&ePrzełącz stan wyświetlania przedmiotu w sklepie",
-      "purge": "&eStart the shop purge task in background"
+      "purge": "&eUruchom zadanie czyszczenia sklepu w tle"
     },
     "disabled": "&cTa komenda jest wyłączona: &e{0}",
     "feature-not-enabled": "Ta funkcja nie jest włączona w pliku konfiguracyjnym."
@@ -229,8 +229,8 @@
     "lock-hover": "&eWłącz/Wyłącz ochronę blokady sklepu.",
     "freeze": "&eTryb zamrożenia: &b{0} &e[&d&lPrzełącz&e]",
     "freeze-hover": "&ePrzełącz status zamrożenia sklepu.",
-    "toggledisplay": "&eDisplayItem: &b{0} &e[&d&lToggle&e]",
-    "toggledisplay-hover": "&eToggle the shop's displayitem status"
+    "toggledisplay": "&eWyświetlacz Przedmiotu: &b{0} &e[&d&lPrzełącz&e]",
+    "toggledisplay-hover": "&ePrzełącz status wyświetlania przedmiotu w sklepie"
   },
   "tableformat": {
     "full_line": "+---------------------------------------------------+",
@@ -346,6 +346,6 @@
   "display-turn-on": "&aPomyślnie włączono wyświetlacz sklepu.",
   "display-turn-off": "&aPomyślnie wyłączono wyświetlacz sklepu.",
   "shop-purged-start": "&aRozpoczęto czyszczenie sklepu, sprawdź konsolę, aby uzyskać szczegółowe informacje.",
-  "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."
+  "purchase-out-of-stock": "&cW tym sklepie skończyły się zapasy, skontaktuj się z właścicielem sklepu lub personelem, aby uzupełnić zapasy.",
+  "purchase-out-of-space": "&cW tym sklepie zabrakło miejsca, skontaktuj się z właścicielem sklepu lub personelem, aby opróżnić sklep."
 }

crowdin/lang/sv-SE/messages.json

@@ -179,7 +179,7 @@
       "lock": "&eVäxla butikens låsstatus",
       "taxaccount": "&eAnge skattekontot som butiken använder",
       "toggledisplay": "&eVäxla butikens status för visningsobjekt",
-      "purge": "&eStart the shop purge task in background"
+      "purge": "&aStarta rensningsuppgifter för butiker i bakgrunden"
     },
     "disabled": "&cDetta kommando är inaktiverat: &e{0}",
     "feature-not-enabled": "Funktionen är inte aktiverad i konfigurationsfilen."
@@ -229,8 +229,8 @@
     "lock-hover": "&eAktivera/Inaktivera butikens låsskydd.",
     "freeze": "&eFryst läge: &b{0} &e[&d&lVäxla&e]",
     "freeze-hover": "&eVäxla butikens frysningsstatus.",
-    "toggledisplay": "&eDisplayItem: &b{0} &e[&d&lToggle&e]",
-    "toggledisplay-hover": "&eToggle the shop's displayitem status"
+    "toggledisplay": "&eVisningsföremål: &b{0} &e[&d&lVäxla&e]",
+    "toggledisplay-hover": "&eVäxla butikens status för visningsföremålet"
   },
   "tableformat": {
     "full_line": "+---------------------------------------------------+",
@@ -346,6 +346,6 @@
   "display-turn-on": "&aLyckades aktivera butiksdisplayen.",
   "display-turn-off": "&aLyckades aktivera butiksdisplayen.",
   "shop-purged-start": "&aShop rensning startade, kontrollera konsolen för detaljer.",
-  "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."
+  "purchase-out-of-stock": "&cDenna butik har slut på lagret, Kontakta butiksägare eller personal för att fylla på lagret.",
+  "purchase-out-of-space": "&cDenna butik har slut på tillgängligt utrymme, Kontakta butiksägare eller personal för att tömma butiken."
 }

crowdin/lang/tr-TR/messages.json

@@ -129,7 +129,7 @@
     "now-buying": "&aŞimdi &e{0} &dALIYOR",
     "now-selling": "&aŞimdi &e{0} &bSATILIYOR",
     "cleaning": "&aStoksuz marketler kaldırılıyor...",
-    "reloading": "&aConfiguration reloaded. &eSome changes may require reboot to affect. \n&7(Notice: Reloading behavior has been changed after 4.0.9.10, we now only reload configuration but not whole plugin to ensure the server won't crashed.)",
+    "reloading": "&aYapılandırma yeniden yüklendi. &eBazı değişikliklerin etki etmesi için yeniden başlatma gerekebilir. \\n&7(Yeniden yükleme davranışı 4.0.9.10'dan sonra değiştirildi. Sunucunun çökmemesi için artık sadece yapılandırmayı yeniden yüklüyoruz, tüm eklentiyi değil.)",
     "cleaned": "&e{0}&a market kaldırıldı.",
     "no-type-given": "&cKullanım: /qs find <item>",
     "no-world-given": "&cLütfen bir dünya adı belirtin",
@@ -177,9 +177,9 @@
       "unban": "&eBir oyuncunun bu marketteki yasaklamasını kaldırır",
       "freeze": "&eMarket takasını devre dışı bırak ya da aktifleştir",
       "lock": "&eMarketin kilit statüsünü değiştir",
-      "taxaccount": "&eSet the tax account that shop using",
+      "taxaccount": "&eAlışveriş yapılırken verginin aktarılacağı hesabı ayarlar",
       "toggledisplay": "&eToggle the shop display item status",
-      "purge": "&eStart the shop purge task in background"
+      "purge": "&eMarket temizleme görevini arka planda başlatır"
     },
     "disabled": "&cBu komut aktif değil: &e{0}",
     "feature-not-enabled": "Bu özellik yapılandırma dosyasında aktif değil."
@@ -333,8 +333,8 @@
   "unlimited-shop-owner-keeped": "&eDikkat: Marketin sahibi hala sınırsız market sahibidir, yeni dükkan sahibini yeniden ayarlamanız gerekmektedir.",
   "server-crash-warning": "&cEğer QuickShop Jar dosyasını sunucu çalışırken değiştirdiyseniz/sildiyseniz, /qs reload komutunu çalıştırdığınızda sunucu çökebilir.",
   "reloading-status": {
-    "success": "&aReload completed without any errors.",
-    "require-restart": "&aReload completed. &e(Some changes require server restart to affect)",
+    "success": "&aYeniden yükleme hata olmadan tamamlandı.",
+    "require-restart": "&aYeniden yükleme tamamlandı. &e(Bazı değişikliklerin etkilenmesi için sunucuyu yeniden başlatmak gerekebilir)",
     "failed": "&cReload failed, check the server console",
     "scheduled": "&aReload completed. &7(Some changes required a while to affect)"
   },
@@ -346,6 +346,6 @@
   "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.",
-  "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."
+  "purchase-out-of-stock": "&cBu marketin stoğu tükendi, stoğu yeniden doldurmaları için mağaza sahibi ya da personelleri ile iletişime geç.",
+  "purchase-out-of-space": "&cBu markette yer kalmadı, marketi boşaltmaları için mağaza sahibi ya da personelleri ile iletişime geç."
 }

pom.xml

@@ -25,7 +25,7 @@
     <artifactId>QuickShop</artifactId>
 
     <properties>
-        <pluginver>5.0.0.9</pluginver>
+        <pluginver>5.0.0.10</pluginver>
         <package>org.maxgamer.quickshop</package>
         <developer>Ghost-chu</developer>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

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

@@ -308,7 +308,7 @@ private int getPlayerCanSell(Shop shop, double money, double price, Inventory pl
             items = Math.min(items, shop.getRemainingSpace());
             // Amount check player selling item total cost and the shop owner's balance
             items = Math.min(items, ownerCanAfford);
-        } else if (plugin.getConfig().getBoolean("shop.pay-unlimited-shop-owners")) {
+        } else if (plugin.getConfiguration().getBoolean("shop.pay-unlimited-shop-owners")) {
             // even if the shop is unlimited, the config option pay-unlimited-shop-owners is set to
             // true,
             // the unlimited shop owner should have enough money.

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

@@ -27,8 +27,6 @@
 import org.maxgamer.quickshop.QuickShop;
 import org.maxgamer.quickshop.api.shop.ItemMatcher;
 
-import java.util.Objects;
-
 /**
  * A simple impl for ItemMatcher
  *
@@ -68,21 +66,12 @@ public class BukkitItemMatcherImpl implements ItemMatcher {
      */
     @Override
     public boolean matches(@Nullable ItemStack original, @Nullable ItemStack tester) {
-        return Objects.equals(original, tester);
-        /*
-        @Override
-        @Utility
-        public boolean equals(Object obj) {
-            if (this == obj) {
-                return true;
-            }
-            if (!(obj instanceof ItemStack)) {
-                return false;
-            }
-
-            ItemStack stack = (ItemStack) obj;
-            return getAmount() == stack.getAmount() && isSimilar(stack);
+        if (original == null && tester == null) {
+            return true;
+        }
+        if ((original == null) != (tester == null)) {
+            return false;
         }
-         */
+        return tester.isSimilar(original);
     }
 }

src/main/java/org/maxgamer/quickshop/util/paste/Paste.java

@@ -525,6 +525,14 @@ public String paste(@NotNull String content, PasteType type) {
                 } catch (Exception ignore) {
                 }
                 break;
+            case HELPCHAT:
+                try {
+                    // Ubuntu Pastebin
+                    paster = new HelpChatPastebinPaster();
+                    return paster.pasteTheText(content);
+                } catch (Exception ignore) {
+                }
+                break;
             default:
                 try {
                     // Lucko Pastebin
@@ -540,6 +548,7 @@ public String paste(@NotNull String content, PasteType type) {
     public enum PasteType {
         LUCKO,
         PASTEBIN,
-        UBUNTU
+        UBUNTU,
+        HELPCHAT
     }
 }

src/main/resources/config.yml

@@ -480,7 +480,7 @@ matcher:
   #1= Bukkit item matcher, can be more accurate.
   #2= Stricter Bukkit matcher, equals method.
   work-type: 0
-  #For Item
+  #For Item (Only works under QuickShop ItemMatcher)
   item:
     #Should the Plugin check the item damage?
     damage: true