From 90a868bc40648d4250cd3644c29f6a9f5f881e4b Mon Sep 17 00:00:00 2001 From: Florian CUNY Date: Tue, 7 Aug 2018 16:02:29 +0200 Subject: [PATCH] Updated ItemParser to use the new banner materials --- .../java/world/bentobox/bentobox/util/ItemParser.java | 11 +++-------- src/main/resources/locales/de-DE.yml | 2 +- src/main/resources/locales/en-GB.yml | 2 +- src/main/resources/locales/en-US.yml | 2 +- src/main/resources/locales/fr-FR.yml | 2 +- src/main/resources/locales/pl-PL.yml | 2 +- src/main/resources/locales/vi-VN.yml | 2 +- src/main/resources/locales/zh-CN.yml | 2 +- .../world/bentobox/bentobox/util/ItemParserTest.java | 4 +--- 9 files changed, 11 insertions(+), 18 deletions(-) diff --git a/src/main/java/world/bentobox/bentobox/util/ItemParser.java b/src/main/java/world/bentobox/bentobox/util/ItemParser.java index bd32ffb61..14f5e3a5d 100644 --- a/src/main/java/world/bentobox/bentobox/util/ItemParser.java +++ b/src/main/java/world/bentobox/bentobox/util/ItemParser.java @@ -112,16 +112,11 @@ public class ItemParser { private static ItemStack banner(String[] part) { try { - if (part.length == 2) { - return new ItemStack(Material.WHITE_BANNER, Integer.parseInt(part[1])); - } - if (part.length >= 3) { - int reqAmount = Integer.parseInt(part[1]); - - ItemStack result = new ItemStack(Material.getMaterial(part[2] + "_BANNER"), reqAmount); + if (part.length >= 2) { + ItemStack result = new ItemStack(Material.getMaterial(part[0]), Integer.parseInt(part[1])); BannerMeta meta = (BannerMeta) result.getItemMeta(); - for (int i = 3; i < part.length; i += 2) { + for (int i = 2; i < part.length; i += 2) { meta.addPattern(new Pattern(DyeColor.valueOf(part[i + 1]), PatternType.valueOf(part[i]))); } diff --git a/src/main/resources/locales/de-DE.yml b/src/main/resources/locales/de-DE.yml index 19bb9bfef..208ea3651 100644 --- a/src/main/resources/locales/de-DE.yml +++ b/src/main/resources/locales/de-DE.yml @@ -10,7 +10,7 @@ # # This translation is adapted to version : [alpha-1] -banner: "BANNER:1:RED:STRIPE_RIGHT:BLACK:STRIPE_LEFT:YELLOW" +banner: "RED_BANNER:1:STRIPE_RIGHT:BLACK:STRIPE_LEFT:YELLOW" not-setup: header: |- diff --git a/src/main/resources/locales/en-GB.yml b/src/main/resources/locales/en-GB.yml index 22f6e9f43..35b19f38c 100644 --- a/src/main/resources/locales/en-GB.yml +++ b/src/main/resources/locales/en-GB.yml @@ -9,7 +9,7 @@ # # This translation is adapted to version : [alpha-1] -banner: "BANNER:1:BLUE:STRIPE_DOWNLEFT:WHITE:STRIPE_DOWNRIGHT:WHITE:STRIPE_CENTER:WHITE:STRIPE_MIDDLE:WHITE:STRAIGHT_CROSS:RED:CROSS:RED" +banner: "BLUE_BANNER:1:STRIPE_DOWNLEFT:WHITE:STRIPE_DOWNRIGHT:WHITE:STRIPE_CENTER:WHITE:STRIPE_MIDDLE:WHITE:STRAIGHT_CROSS:RED:CROSS:RED" protection: flags: diff --git a/src/main/resources/locales/en-US.yml b/src/main/resources/locales/en-US.yml index 1560ecfcc..4009670aa 100644 --- a/src/main/resources/locales/en-US.yml +++ b/src/main/resources/locales/en-US.yml @@ -9,7 +9,7 @@ # # This translation is adapted to version : [alpha-2] -banner: "BANNER:1:WHITE:STRIPE_SMALL:RED:SQUARE_TOP_RIGHT:CYAN:SQUARE_TOP_RIGHT:BLUE" +banner: "WHITE_BANNER:1:STRIPE_SMALL:RED:SQUARE_TOP_RIGHT:CYAN:SQUARE_TOP_RIGHT:BLUE" general: success: "&aSuccess!" diff --git a/src/main/resources/locales/fr-FR.yml b/src/main/resources/locales/fr-FR.yml index 4b6c50672..836e48b3c 100644 --- a/src/main/resources/locales/fr-FR.yml +++ b/src/main/resources/locales/fr-FR.yml @@ -9,7 +9,7 @@ # # Cette traduction est adaptée pour la version : [alpha-2] -banner: "BANNER:1:WHITE:STRIPE_BOTTOM:RED:STRIPE_TOP:BLUE" +banner: "WHITE_BANNER:1:STRIPE_BOTTOM:RED:STRIPE_TOP:BLUE" general: deaths: "morts" diff --git a/src/main/resources/locales/pl-PL.yml b/src/main/resources/locales/pl-PL.yml index d229e8efd..a642447fb 100644 --- a/src/main/resources/locales/pl-PL.yml +++ b/src/main/resources/locales/pl-PL.yml @@ -8,7 +8,7 @@ # # This translation is adapted to version : [alpha-2] -banner: "BANNER:1:WHITE:HALF_VERTICAL:RED" +banner: "WHITE_BANNER:1:HALF_VERTICAL:RED" general: success: "&aSukces!" diff --git a/src/main/resources/locales/vi-VN.yml b/src/main/resources/locales/vi-VN.yml index 135161bf2..3236eab73 100644 --- a/src/main/resources/locales/vi-VN.yml +++ b/src/main/resources/locales/vi-VN.yml @@ -10,7 +10,7 @@ # Banbeucmas: Người dịch bản YML gốc # This translation is adapted to version : [alpha-2] -banner: "BANNER:1:RED:CREEPER:YELLOW:RHOMBUS_MIDDLE:YELLOW:TRIANGLES_BOTTOM:RED:SQUARE_BOTTOM_LEFT:RED:SQUARE_BOTTOM_RIGHT:RED" +banner: "RED_BANNER:1:CREEPER:YELLOW:RHOMBUS_MIDDLE:YELLOW:TRIANGLES_BOTTOM:RED:SQUARE_BOTTOM_LEFT:RED:SQUARE_BOTTOM_RIGHT:RED" general: deaths: "Chết" diff --git a/src/main/resources/locales/zh-CN.yml b/src/main/resources/locales/zh-CN.yml index 94d6121b9..155719072 100644 --- a/src/main/resources/locales/zh-CN.yml +++ b/src/main/resources/locales/zh-CN.yml @@ -9,7 +9,7 @@ # DuckSoft: translator # This translation is adapted to version : [alpha-1] -banner: "BANNER:1:RED:SQUARE_TOP_RIGHT:YELLOW:CROSS:RED:CURLY_BORDER:RED:MOJANG:YELLOW:HALF_HORIZONTAL_MIRROR:RED:HALF_VERTICAL:RED" +banner: "RED_BANNER:1:SQUARE_TOP_RIGHT:YELLOW:CROSS:RED:CURLY_BORDER:RED:MOJANG:YELLOW:HALF_HORIZONTAL_MIRROR:RED:HALF_VERTICAL:RED" not-setup: header: |- diff --git a/src/test/java/world/bentobox/bentobox/util/ItemParserTest.java b/src/test/java/world/bentobox/bentobox/util/ItemParserTest.java index 4ac1ea7e3..5282b29f8 100644 --- a/src/test/java/world/bentobox/bentobox/util/ItemParserTest.java +++ b/src/test/java/world/bentobox/bentobox/util/ItemParserTest.java @@ -214,8 +214,6 @@ public class ItemParserTest { assertEquals(2, result.getAmount()); } - /* - * Commenting out to get build to work @Test public void testParseBannerThreeArgs() { // Germany @@ -230,7 +228,7 @@ public class ItemParserTest { ItemParser.parse("RED_BANNER:1:STRIPE_RIGHT:BLACK:STRIPE_LEFT:YELLOW"); Mockito.verify(bannerMeta, Mockito.times(2)).addPattern(Mockito.any()); } - */ + @Test public void testParseBannerTooManyColons() { ItemStack result = ItemParser.parse("WHITE_BANNER:1:::::::::::::");