UndineMailer v1.9.2 : Added "api-version: 1.13"

ucchyocean · Jul 16, 2019 · f457c20 · f457c20
1 parent 5f187bb
commit f457c20
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 5 deletions.
diff --git a/pom.xml b/pom.xml
@@ -2,7 +2,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.bitbucket.ucchy</groupId>
   <artifactId>UndineMailer</artifactId>
-  <version>1.9.1</version>
+  <version>1.9.2</version>
   <description></description>
 
   <licenses>

diff --git a/src/main/java/org/bitbucket/ucchy/undine/command/UndineCommandUtil.java b/src/main/java/org/bitbucket/ucchy/undine/command/UndineCommandUtil.java
@@ -77,7 +77,8 @@ protected static void showOKCancelButton(
     protected static String getItemDesc(ItemStack item) {
 //        return item.getDurability() == 0 ? item.getType().toString() :
 //                item.getType().toString() + ":" + item.getDurability();
-        return item.serialize().toString();
+//        return item.serialize().toString();
+        return item != null ? item.getType().toString() : "null";
     }
 
     /**

diff --git a/src/main/java/org/bitbucket/ucchy/undine/command/UndineItemCommand.java b/src/main/java/org/bitbucket/ucchy/undine/command/UndineItemCommand.java
@@ -63,7 +63,7 @@ public void runCommand(CommandSender sender, String label, String[] args) {
 
         // 情報表示
         String description = UndineCommandUtil.getItemDesc(hand);
-        String isTradable = Messages.get("Yes");
+        String isTradable = Messages.get("Yes"); // すべてのアイテムが取引可能
         sender.sendMessage(Messages.get("InformationItemDetail",
                 new String[]{"%desc", "%tradable"},
                 new String[]{description, isTradable}));

diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml
@@ -157,7 +157,7 @@ welcomeMailDelaySeconds: 30
 # Attachment items of welcome mail.
 welcomeMailAttachments:
   attachment1:
-    material: STONE_SPADE
+    material: STONE_SHOVEL
   attachment2:
     material: STONE_PICKAXE
   attachment3:

diff --git a/src/main/resources/config_ja.yml b/src/main/resources/config_ja.yml
@@ -173,7 +173,7 @@ welcomeMailDelaySeconds: 30
 # ウェルカムメールの添付アイテム設定です。
 welcomeMailAttachments:
   attachment1:
-    material: STONE_SPADE
+    material: STONE_SHOVEL
   attachment2:
     material: STONE_PICKAXE
   attachment3:

diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
@@ -4,6 +4,7 @@ main: org.bitbucket.ucchy.undine.UndineMailer
 description: UndineMailer - Mail Plugin
 softdepend: [Vault,PermissionsEx]
 author: ucchy
+api-version: 1.13
 
 commands:
   mail: