Skip to content

Commit 1cafc4a

Browse files
* Fix silent command throwing exception when input is invalid * Bump to 5.1.0.2 * Fix "§r" is not working * Fix coloring issue * Add comment for code and fix pending comment bug * Fix unlimited and free shop counting issue * Fix coloring issue again * Fix sign-dye-color is missing in config.yml * Fix broken find command * New Crowdin updates (PotatoCraft-Studio#32) * Update source file messages.json * New translations messages.json (Chinese Simplified) * New translations messages.json (Swedish) * New translations messages.json (Polish) * New translations messages.json (Norwegian) * New translations messages.json (German) * New translations messages.json (German) * Bump SongodaCore from 2.6.3 to 2.6.6 (PotatoCraft-Studio#33) Bumps SongodaCore from 2.6.3 to 2.6.6. --- updated-dependencies: - dependency-name: com.songoda:SongodaCore dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump PlotSquared-Core from 6.1.4 to 6.2.0 (PotatoCraft-Studio#34) Bumps [PlotSquared-Core](https://github.com/IntellectualSites/PlotSquared) from 6.1.4 to 6.2.0. - [Release notes](https://github.com/IntellectualSites/PlotSquared/releases) - [Commits](IntellectualSites/PlotSquared@6.1.4...6.2.0) --- updated-dependencies: - dependency-name: com.plotsquared:PlotSquared-Core dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Fix debug command not respect local config.yml Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
1 parent 3fe05f0 commit 1cafc4a

25 files changed

+355
-127
lines changed

crowdin/lang/de-DE/messages.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"translation-contributors": "Mitwirkende: Timtower, Netherfoam, KaiNoMood, Mgazul, JackTheChicken und Andre_601",
77
"translation-country": "Sprache: Deutsch (de_DE)",
88
"language-version": "63",
9-
"not-looking-at-valid-shop-block": "&cCould not find a block for creating shop. You need to look at one.",
9+
"not-looking-at-valid-shop-block": "&cKonnte keinen Block zum erstellen eines Shops finden. Stelle sicher dass du einen ansiehst.",
1010
"not-looking-at-shop": "&cKonnte keinen QuickShop finden. Du musst auf einen schauen.",
1111
"no-anythings-in-your-hand": "&cEs befindet sich nichts in deiner Hand.",
1212
"no-permission": "&cDu hast keine Berechtigung um das zu tun.",
@@ -110,8 +110,8 @@
110110
},
111111
"bypassing-lock": "&cUmgehe eine QuickShop Sicherung!",
112112
"that-is-locked": "&cDieser Shop ist geschützt.",
113-
"how-many-buy": "&aEnter in chat, how many you wish to &bBUY&a. You can buy &e{0}&a. Enter &b{1}&a to buy them all.",
114-
"how-many-sell": "&aEnter in chat, how much you wish to &dSELL&a. You can sell &e{0}&a. Enter &b{1}&a in chat, to sell all.",
113+
"how-many-buy": "&aSchreib im Chat, wie viele du gerne &bKAUFEN&a willst. Du kannst &e{0}&a kaufen. Schreibe &b{1}&a um alle zu kaufen.",
114+
"how-many-sell": "&aSchreib im Chat, wie viele du gerne &dVERKAUFEN&a willst. Du kannst &e{0}&a verkaufen. Schreibe &b{1}&a um alle zu verkaufen.",
115115
"not-allowed-to-create": "&cDu kannst hier keinen Shop erstellen.",
116116
"blacklisted-item": "&cDu kannst dieses Item nicht verkaufen, da es auf der schwarzen Liste steht",
117117
"how-much-to-trade-for": "&aGib im Chat ein, für wieviel du {1}x &e{0}&a handeln willst.",
@@ -167,7 +167,7 @@
167167
"about": "&eZeigt QuickShop Informationen",
168168
"help": "&eZeigt QuickShop-Hilfe",
169169
"item": "&eÄndert das Shopitem eines Shops",
170-
"size": "&eÄndert die Mengenanzahl eines Shops",
170+
"size": "&eÄndert die Anzahl an Items pro Menge eines Shops",
171171
"supercreate": "&eErstellen eines Shops, während alle Schutzprüfungen umgangen werden",
172172
"language": "&eÄndert die derzeitig verwendete Sprache",
173173
"removeall": "&eEntferne ALLE Shops eines bestimmten Spielers",
@@ -220,7 +220,7 @@
220220
"empty-hover": "&eKlicke hier um den Shop zu leeren.",
221221
"remove": "&c&l[Shop entfernen]",
222222
"remove-hover": "&eKlicke um diesen Shop zu entfernen.",
223-
"stack": "&aMengeneinheit: &b{0} &e[&d&lÄndern&e]",
223+
"stack": "&aItems pro Menge: &b{0} &e[&d&lÄndern&e]",
224224
"stack-hover": "&eKlicke um die Anzahl an Items pro Mengeneinheit zu ändern. Setze es zu 1 für normales Verhalten.",
225225
"item": "&aShopitem: {0} &e[&d&lÄndern&e]",
226226
"item-hover": "&eKlicke, um das Shopitem zu ändern",
@@ -307,8 +307,8 @@
307307
"shop-cannot-trade-when-freezing": "&cDu kannst mit diesem Shop nicht handeln, da er eingefroren ist.",
308308
"shop-freezed-at-location": "&eDein Shop {0} bei {1} wurde eingefroren!",
309309
"denied-put-in-item": "&cDu kannst dieses Item nicht in deinen Shop setzen!",
310-
"how-many-buy-stack": "&eEnter in chat, how many bulks you wish to &bBUY&a. There are &e{0}&a items in each bulk and you can buy &e{1}&a bulks. Enter &b{2}&a in chat to buy all.",
311-
"how-many-sell-stack": "&aEnter in chat, how many bulk you wish to &dSELL&a. There are &e{0}&a items per bulk and you can sell &e{1}&a bulks. Enter &b{2}&a in chat to sell all.",
310+
"how-many-buy-stack": "&aSchreib im Chat, wie viele Mengen du gerne &bKAUFEN&a willst. Es sind &e{0}&a Items pro Menge und du kannst &e{1}&a Mengen kaufen. Schreibe &b{2}&a um alle zu kaufen.",
311+
"how-many-sell-stack": "&aSchreib im Chat, wie viele Mengen du gerne &dVERKAUFEN&a willst. Es sind &e{0}&a Items pro Menge und du kannst &e{1}&a Mengen verkaufen. Schreibe &b{2}&a um alle zu verkaufen.",
312312
"language": {
313313
"name": "&eName: &6{0}",
314314
"code": "&eCode: &6{0}",

crowdin/lang/no-NO/messages.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"translation-contributors": "Bidragsytere: Timtower, Netherfoam, KaiNoMood, Mgazul, JackTheChicken and Andre_601",
77
"translation-country": "Språksone: Norsk (no_NO)",
88
"language-version": "63",
9-
"not-looking-at-valid-shop-block": "&cCould not find a block for creating shop. You need to look at one.",
9+
"not-looking-at-valid-shop-block": "&cKunne ikke finne en blokk for å opprette butikk. Du må se på en gyldig blokk.",
1010
"not-looking-at-shop": "&cKunne ikke finne en QuickShop. Du må se på en butikk.",
1111
"no-anythings-in-your-hand": "&cDet er ingenting i hånden din.",
1212
"no-permission": "&cDu har ikke tillatelse til å gjøre det.",
@@ -110,8 +110,8 @@
110110
},
111111
"bypassing-lock": "&cIgnorerer en QuickShop lås!",
112112
"that-is-locked": "&cDenne butikken er låst.",
113-
"how-many-buy": "&aEnter in chat, how many you wish to &bBUY&a. You can buy &e{0}&a. Enter &b{1}&a to buy them all.",
114-
"how-many-sell": "&aEnter in chat, how much you wish to &dSELL&a. You can sell &e{0}&a. Enter &b{1}&a in chat, to sell all.",
113+
"how-many-buy": "&aSkriv i chat hvor mange du ønsker å &bKJØPE&a. Du kan kjøpe maks &e{0}&a. Skriv &b{1}&a om du vil kjøpe alle.",
114+
"how-many-sell": "&aSkriv i chat hvor mange du ønsker å &dSELGE&a. Du kan selge &e{0}&a. Skriv &b{1}&a for å selge alle.",
115115
"not-allowed-to-create": "&cDu kan ikke opprette en butikk her.",
116116
"blacklisted-item": "&cDu kan ikke selge denne gjenstanden fordi den er på svartelisten",
117117
"how-much-to-trade-for": "&aSkriv i chat hvor mye du ønsker å selge &e{1}x {0}&a for.",
@@ -307,8 +307,8 @@
307307
"shop-cannot-trade-when-freezing": "&cDu kan ikke handle med denne butikken fordi den er frosset.",
308308
"shop-freezed-at-location": "&eDin butikk {0} på {1} ble frosset!",
309309
"denied-put-in-item": "&cDu kan ikke legge denne varen i butikken din!",
310-
"how-many-buy-stack": "&eEnter in chat, how many bulks you wish to &bBUY&a. There are &e{0}&a items in each bulk and you can buy &e{1}&a bulks. Enter &b{2}&a in chat to buy all.",
311-
"how-many-sell-stack": "&aEnter in chat, how many bulk you wish to &dSELL&a. There are &e{0}&a items per bulk and you can sell &e{1}&a bulks. Enter &b{2}&a in chat to sell all.",
310+
"how-many-buy-stack": "&eSkriv i chat hvor mange pakker du ønsker å &bKJØPE&a. Det er &e{0}&a varer i hver pakke og du kan kjøpe totalt &e{1}&a pakker. Skriv &b{2}&a om du vil kjøpe alle.",
311+
"how-many-sell-stack": "&eSkriv i chat hvor mange pakker du ønsker å &bSELGE&a. Det er &e{0}&a varer i hver pakke og du kan selge &e{1}&a pakker. Skriv &b{2}&a om du vil selge alle.",
312312
"language": {
313313
"name": "&eNavn: &6{0}",
314314
"code": "&eKode: &6{0}",

crowdin/lang/pl-PL/messages.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"translation-contributors": "Współtwórcy: Timtower, Netherfoam, KaiNoMood, Mgazul, JackTheChicken i Andre_601",
77
"translation-country": "Język: Polski (pl_PL)",
88
"language-version": "63",
9-
"not-looking-at-valid-shop-block": "&cCould not find a block for creating shop. You need to look at one.",
9+
"not-looking-at-valid-shop-block": "&cNie można znaleźć bloku do tworzenia sklepu. Musisz patrzeć się na jeden z nich.",
1010
"not-looking-at-shop": "&cNie można znaleźć QuickShop. Musisz na niego patrzeć.",
1111
"no-anythings-in-your-hand": "&cW twojej ręce nic nie ma.",
1212
"no-permission": "&cNie masz uprawnień, aby to zrobić.",
@@ -110,8 +110,8 @@
110110
},
111111
"bypassing-lock": "&cOmijanie blokady QuickShop!",
112112
"that-is-locked": "&cTen sklep jest zablokowany.",
113-
"how-many-buy": "&aEnter in chat, how many you wish to &bBUY&a. You can buy &e{0}&a. Enter &b{1}&a to buy them all.",
114-
"how-many-sell": "&aEnter in chat, how much you wish to &dSELL&a. You can sell &e{0}&a. Enter &b{1}&a in chat, to sell all.",
113+
"how-many-buy": "&aWpisz ilość jaką chcesz &bKUPIĆ&a na czacie. Możesz kupić &e{0}&a. Wpisz &b{1}&a, jeśli chcesz kupić wszystko.",
114+
"how-many-sell": "&aWpisz ilość jaką chcesz &dSPRZEDAĆ&a na czacie. Możesz sprzedać &e{0}&a. Wpisz &b{1}&a, jeśli chcesz sprzedać wszystko.",
115115
"not-allowed-to-create": "&cTu nie zrobisz sklepu.",
116116
"blacklisted-item": "&cNie możesz sprzedać tego przedmiotu, ponieważ znajduje się na czarnej liście",
117117
"how-much-to-trade-for": "&aWpisz na czacie cenę za &e{1}x {0}&a.",

crowdin/lang/sv-SE/messages.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@
111111
"bypassing-lock": "&cIgnorerar ett butikslås!",
112112
"that-is-locked": "&cDenna butik är låst.",
113113
"how-many-buy": "&aAnge i chatten, hur många du vill &bKÖPA&a. Du kan köpa &e{0}&a. Ange &b{1}&a för att köpa alla.",
114-
"how-many-sell": "&aEnter in chat, how much you wish to &dSELL&a. You can sell &e{0}&a. Enter &b{1}&a in chat, to sell all.",
114+
"how-many-sell": "&aAnge i chatten, hur många du vill &dSÄLJA&a. Du har &{0}& tillgängliga. Ange &{1}&a i chatten, för att sälja alla.",
115115
"not-allowed-to-create": "&cDu får inte skapa en butik här.",
116116
"blacklisted-item": "&cDu kan inte sälja detta föremål eftersom det finns på svartlistan",
117117
"how-much-to-trade-for": "&aAnge i chatten, hur mycket du vill sälja &e{1}x {0}&a för.",
@@ -308,7 +308,7 @@
308308
"shop-freezed-at-location": "&eDin butik {0} vid {1} blev frusen!",
309309
"denied-put-in-item": "&cDu kan inte lägga in detta objekt i din butik!",
310310
"how-many-buy-stack": "&eAnge i chatten, hur många paket du vill &bKÖPA&a. Det finns &e{0}&a föremål i varje paket och du kan köpa &e{1}&a paket. Ange &b{2}&a i chatten för att köpa alla.",
311-
"how-many-sell-stack": "&aEnter in chat, how many bulk you wish to &dSELL&a. There are &e{0}&a items per bulk and you can sell &e{1}&a bulks. Enter &b{2}&a in chat to sell all.",
311+
"how-many-sell-stack": "&aAnge i chatten, hur många föremål du vill &dSÄLJA&a per paket. Det finns &e{0}&a föremål per paket och du har &e{1}&a paket tillgängliga. Ange &b{2}&a i chatten för att sälja alla.",
312312
"language": {
313313
"name": "&eNamn: &6{0}",
314314
"code": "&eKod: &6{0}",

crowdin/lang/zh-CN/messages.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@
111111
"bypassing-lock": "&c你绕过了QuickShop的锁!",
112112
"that-is-locked": "&c这个商店已上锁。",
113113
"how-many-buy": "&a在聊天中输入您想要&b购买&a的数量。您可以购买&e{0}&a个,输入&b{1}&a以购买全部。",
114-
"how-many-sell": "&aEnter in chat, how much you wish to &dSELL&a. You can sell &e{0}&a. Enter &b{1}&a in chat, to sell all.",
114+
"how-many-sell": "&a聊天栏中输入想 &d出售 &a的物品数量. 您现在可以卖出 &e{0} &a件物品。输入 &b{1}&a 来出售全部物品。",
115115
"not-allowed-to-create": "&c你不能在这里创建商店",
116116
"blacklisted-item": "&c这件物品已经被拉黑,你不能出售它",
117117
"how-much-to-trade-for": "&a请在聊天中输入交易&e{1}个{0}&a所需的价格。",
@@ -308,7 +308,7 @@
308308
"shop-freezed-at-location": "&e你在 {1} 的商店 {0} 被冻结了!",
309309
"denied-put-in-item": "&c您不能将此物品放入您的商店!",
310310
"how-many-buy-stack": "&a聊天栏中输入你想&b买&a的份数. 每份中有 &e{0}&a 个该物品, 你可以买 &e{1}&a 份. 输入 &b{2}&a 以买下所有该物品.",
311-
"how-many-sell-stack": "&aEnter in chat, how many bulk you wish to &dSELL&a. There are &e{0}&a items per bulk and you can sell &e{1}&a bulks. Enter &b{2}&a in chat to sell all.",
311+
"how-many-sell-stack": "&a在聊天栏中输入你想 &d卖&a 的份数. 每份中有 &e{0}&a 个该物品, 你目前可卖出 &e{1}&a 份这样的物品,输入 &b{2}&a 以卖出所有此项物品。",
312312
"language": {
313313
"name": "&e名称: &6{0}",
314314
"code": "&e代码: &6{0}",

pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
<artifactId>QuickShop</artifactId>
2626

2727
<properties>
28-
<pluginver>5.1.0.1</pluginver>
28+
<pluginver>5.1.0.2</pluginver>
2929
<package>org.maxgamer.quickshop</package>
3030
<developer>Ghost-chu</developer>
3131
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -710,7 +710,7 @@
710710
<dependency>
711711
<groupId>com.plotsquared</groupId>
712712
<artifactId>PlotSquared-Core</artifactId>
713-
<version>6.1.4</version>
713+
<version>6.2.0</version>
714714
<scope>provided</scope>
715715
<!--We just need the core jar-->
716716
<exclusions>
@@ -786,7 +786,7 @@
786786
<dependency>
787787
<groupId>com.songoda</groupId>
788788
<artifactId>SongodaCore</artifactId>
789-
<version>2.6.3</version>
789+
<version>2.6.6</version>
790790
<scope>provided</scope>
791791
</dependency>
792792
<!-- https://mvnrepository.com/artifact/commons-codec/commons-codec -->

src/main/java/org/maxgamer/quickshop/QuickShop.java

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1990,6 +1990,13 @@ private void updateConfig(int selectedVersion) throws IOException {
19901990
getConfig().set("integration.worldguard.respect-global-region", false);
19911991
getConfig().set("config-version", ++selectedVersion);
19921992
}
1993+
if (selectedVersion == 149) {
1994+
//Fix sign-dye-color setting is missing
1995+
if (!getConfig().isSet("shop.sign-dye-color")) {
1996+
getConfig().set("shop.sign-dye-color", "");
1997+
}
1998+
getConfig().set("config-version", ++selectedVersion);
1999+
}
19932000
if (getConfig().getInt("matcher.work-type") != 0 && GameVersion.get(ReflectFactory.getServerVersion()).name().contains("1_16")) {
19942001
getLogger().warning("You are not using QS Matcher, it may meeting item comparing issue mentioned there: https://hub.spigotmc.org/jira/browse/SPIGOT-5063");
19952002
}

0 commit comments

Comments
 (0)