Putting items with custom names on an auction is now prohibited

Leonidius20 · Oct 6, 2018 · 92d6f0b · 92d6f0b
1 parent f60b05f
commit 92d6f0b
Show file tree

Hide file tree

Showing 11 changed files with 41 additions and 26 deletions.
diff --git a/.idea/artifacts/Trading.xml b/.idea/artifacts/Trading.xml
diff --git a/.idea/libraries/EconomyAPI_1_0_1.xml b/.idea/libraries/EconomyAPI_1_0_1.xml
diff --git a/.idea/libraries/nukkit_1_0_SNAPSHOT.xml b/.idea/libraries/nukkit_1_0_SNAPSHOT.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/Trading.iml b/Trading.iml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_5" inherit-compiler-output="false">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_5">
     <output url="file://$MODULE_DIR$/target/classes" />
     <output-test url="file://$MODULE_DIR$/target/test-classes" />
     <content url="file://$MODULE_DIR$">
@@ -11,7 +11,7 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="nukkit-1.0-SNAPSHOT" level="project" />
-    <orderEntry type="library" name="EconomyAPI-1.0.1" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: cn.nukkit:nukkit:1.0-SNAPSHOT" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: me.onebone:economyapi:1.0.0" level="project" />
   </component>
 </module>
diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,33 @@
 
     <groupId>ua.leonidius.trading</groupId>
     <artifactId>Trading</artifactId>
-    <version>1.0-SNAPSHOT</version>
+    <version>1.0.4</version>
+
+    <repositories>
+        <repository>
+            <id>nukkitx-repo</id>
+            <url>https://repo.nukkitx.com/snapshot/</url>
+        </repository>
+        <repository>
+            <id>onebone</id>
+            <url>http://jenkins.onebone.me/plugin/repository/everything/</url>
+        </repository>
+    </repositories>
+
+    <dependencies>
+        <dependency>
+            <groupId>cn.nukkit</groupId>
+            <artifactId>nukkit</artifactId>
+            <version>1.0-SNAPSHOT</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>me.onebone</groupId>
+            <artifactId>economyapi</artifactId>
+            <version>1.0.0</version>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
 
 
 </project>
diff --git 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
@@ -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
@@ -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: Вы не можете выставить на аукцион предмет с пользовательским именем.
diff --git 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: "Ви не можете виставити на аукціон предмет з користувацьким ім'ям."
diff --git 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.