diff --git a/.idea/artifacts/Trading.xml b/.idea/artifacts/Trading.xml index 4bf0a24..290fc38 100644 --- a/.idea/artifacts/Trading.xml +++ b/.idea/artifacts/Trading.xml @@ -1,6 +1,6 @@ - D:/Nukkit/plugins + $USER_HOME$/Nukkit/plugins diff --git a/.idea/libraries/EconomyAPI_1_0_1.xml b/.idea/libraries/EconomyAPI_1_0_1.xml deleted file mode 100644 index e51c955..0000000 --- a/.idea/libraries/EconomyAPI_1_0_1.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/nukkit_1_0_SNAPSHOT.xml b/.idea/libraries/nukkit_1_0_SNAPSHOT.xml deleted file mode 100644 index 41ce4f4..0000000 --- a/.idea/libraries/nukkit_1_0_SNAPSHOT.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index 5755a99..645f9e6 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -7,7 +7,7 @@ - + \ No newline at end of file diff --git a/Trading.iml b/Trading.iml index ac746b4..9a43163 100644 --- a/Trading.iml +++ b/Trading.iml @@ -1,6 +1,6 @@ - + @@ -11,7 +11,7 @@ - - + + \ No newline at end of file diff --git a/pom.xml b/pom.xml index f35d033..87b8343 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,33 @@ ua.leonidius.trading Trading - 1.0-SNAPSHOT + 1.0.4 + + + + nukkitx-repo + https://repo.nukkitx.com/snapshot/ + + + onebone + http://jenkins.onebone.me/plugin/repository/everything/ + + + + + + cn.nukkit + nukkit + 1.0-SNAPSHOT + provided + + + me.onebone + economyapi + 1.0.0 + provided + + \ No newline at end of file diff --git a/src/main/java/ua/leonidius/trading/auction/StartAuctionCmd.java b/src/main/java/ua/leonidius/trading/auction/StartAuctionCmd.java index 2594f62..52bc0ee 100644 --- a/src/main/java/ua/leonidius/trading/auction/StartAuctionCmd.java +++ b/src/main/java/ua/leonidius/trading/auction/StartAuctionCmd.java @@ -76,6 +76,10 @@ public boolean onCommand(CommandSender sender, Command command, String s, String if (args.length >= 2) item = Item.fromString(args[0]); else item = player.getInventory().getItemInHand(); if (item.getId() == 0) return false; + if (item.hasCustomName()) { + Message.AUC_CUSTOM_NAME.printError(player); + return true; + } int amount; diff --git a/src/main/java/ua/leonidius/trading/utils/Message.java b/src/main/java/ua/leonidius/trading/utils/Message.java index f090818..d50c4bf 100644 --- a/src/main/java/ua/leonidius/trading/utils/Message.java +++ b/src/main/java/ua/leonidius/trading/utils/Message.java @@ -105,7 +105,8 @@ public enum Message { AUC_WINNER_NO_SPACE ("Auction winner has no free space in his inventory. The lot and the tax were returned."), AUC_YOU_WON_NO_SPACE ("You won the auction, but there is not enough space in your inventory. The bid was returned."), AUC_NO_SPACE_FOR_RETURNING_COMPENSATION ("The lot had to be returned to you, but there is no free space in your inventory. You've been paid a compensation (%1%%2%)."), - AUC_NO_SPACE_FOR_RETURNING ("The lot had to be returned to you, but there is no free space in your inventory."); + AUC_NO_SPACE_FOR_RETURNING ("The lot had to be returned to you, but there is no free space in your inventory."), + AUC_CUSTOM_NAME ("You can't sell an item with a custom name."); private static String language = "english"; private static char c1; //= 'a'; diff --git a/src/main/resources/lang/rus.lng b/src/main/resources/lang/rus.lng index 7d4c3ec..048b814 100644 --- a/src/main/resources/lang/rus.lng +++ b/src/main/resources/lang/rus.lng @@ -85,3 +85,4 @@ auc_winner_no_space: У победителя аукциона недостато auc_you_won_no_space: Вы выиграли аукцион, но у вас недостаточно свободного места в инвентаре. Ставка была возвращена. auc_no_space_for_returning_compensation: Лот должен был быть возвращён вам, но в вашем инвентаре недостаточно места. Вам была выплачена компенсация (%1%%2%). auc_no_space_for_returning: Лот должен был быть возвращён вам, но в вашем инвентаре недостаточно места. +auc_custom_name: Вы не можете выставить на аукцион предмет с пользовательским именем. \ No newline at end of file diff --git a/src/main/resources/lang/ukr.lng b/src/main/resources/lang/ukr.lng index 1a6b4bc..ed47d61 100644 --- a/src/main/resources/lang/ukr.lng +++ b/src/main/resources/lang/ukr.lng @@ -85,3 +85,4 @@ auc_winner_no_space: У переможця аукціону недостатнь auc_you_won_no_space: Ви перемогли на аукціоні, але у вас недостатньо вільного місця в інвентарі. Ставку було повернено. auc_no_space_for_returning_compensation: Лот мало бути повернено вам, але у вашому інвентарі недостатньо місця. Вам було сплачено компенсацію (%1%%2%). auc_no_space_for_returning: Лот мало бути повернено вам, але у вашому інвентарі недостатньо місця. +auc_custom_name: "Ви не можете виставити на аукціон предмет з користувацьким ім'ям." \ No newline at end of file diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index 542a35d..7b3b4b8 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -1,6 +1,6 @@ name: Trading Commands main: ua.leonidius.trading.Main -version: 1.0.3 +version: 1.0.4 author: Leonidius20 api: ["1.0.0"] description: Shop and auction system, based on commands.