From f1712a6bce317cba5ba9e0580791c487fecc00dc Mon Sep 17 00:00:00 2001 From: Eric Date: Mon, 2 Jan 2017 19:20:41 +0100 Subject: [PATCH] Added 1.11.2 translation values and the missing one for "Nether Wart" --- pom.xml | 2 +- .../de/epiceric/shopchest/language/LanguageUtils.java | 9 +++++++++ src/main/resources/lang/en_US.lang | 2 ++ 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index f0f782b..6023eb2 100644 --- a/pom.xml +++ b/pom.xml @@ -52,7 +52,7 @@ org.bukkit bukkit - 1.11-R0.1-SNAPSHOT + 1.11.2-R0.1-SNAPSHOT provided diff --git a/src/main/java/de/epiceric/shopchest/language/LanguageUtils.java b/src/main/java/de/epiceric/shopchest/language/LanguageUtils.java index 61c2f7e..82fc4e1 100644 --- a/src/main/java/de/epiceric/shopchest/language/LanguageUtils.java +++ b/src/main/java/de/epiceric/shopchest/language/LanguageUtils.java @@ -247,6 +247,7 @@ public class LanguageUtils { itemNames.add(new ItemName(Material.COBBLE_WALL, langConfig.getString("tile.cobbleWall.normal.name", "Cobblestone Wall"))); itemNames.add(new ItemName(Material.COBBLE_WALL, 1, langConfig.getString("tile.cobbleWall.mossy.name", "Mossy Cobblestone Wall"))); itemNames.add(new ItemName(Material.WOOD_BUTTON, langConfig.getString("tile.button.name", "Button"))); + itemNames.add(new ItemName(Material.NETHER_STALK, langConfig.getString("tile.netherStalk.name", "Nether Wart"))); itemNames.add(new ItemName(Material.ANVIL, langConfig.getString("tile.anvil.intact.name", "Anvil"))); itemNames.add(new ItemName(Material.ANVIL, 1, langConfig.getString("tile.anvil.slightlyDamaged.name", "Slightly Damaged Anvil"))); itemNames.add(new ItemName(Material.ANVIL, 2, langConfig.getString("tile.anvil.veryDamaged.name", "Very Damaged Anvil"))); @@ -650,6 +651,10 @@ public class LanguageUtils { // Add Item Names of 1.11 itemNames.add(new ItemName(Material.TOTEM, langConfig.getString("item.totem.name", "Totem of Undying"))); itemNames.add(new ItemName(Material.SHULKER_SHELL, langConfig.getString("item.shulkerShell.name", "Shulker Shell"))); + + if (Utils.getRevision() >= 2 || Utils.getMajorVersion() > 11) { + itemNames.add(new ItemName(Material.IRON_NUGGET, langConfig.getString("item.ironNugget.name", "Iron Nugget"))); + } } // Add Enchantment Names @@ -689,6 +694,10 @@ public class LanguageUtils { // Add Enchantment Names of 1.11 enchantmentNames.add(new EnchantmentName(Enchantment.BINDING_CURSE, langConfig.getString("enchantment.binding_curse", "Curse of Binding"))); enchantmentNames.add(new EnchantmentName(Enchantment.VANISHING_CURSE, langConfig.getString("enchantment.vanishing_curse", "Curse of Vanishing"))); + + if (Utils.getRevision() >= 2 || Utils.getMajorVersion() > 11) { + enchantmentNames.add(new EnchantmentName(Enchantment.SWEEPING_EDGE, langConfig.getString("enchantment.sweeping", "Sweeping Edge"))); + } } // Add Enchantment Level Names diff --git a/src/main/resources/lang/en_US.lang b/src/main/resources/lang/en_US.lang index 16d0459..e24789d 100644 --- a/src/main/resources/lang/en_US.lang +++ b/src/main/resources/lang/en_US.lang @@ -432,6 +432,7 @@ enchantment.thorns=Thorns enchantment.mending=Mending enchantment.binding_curse=Curse of Binding enchantment.vanishing_curse=Curse of Vanishing +enchantment.sweeping=Sweeping Edge enchantment.level.1=I enchantment.level.2=II enchantment.level.3=III @@ -783,6 +784,7 @@ item.banner.orange.name=Orange Banner item.banner.white.name=White Banner item.totem.name=Totem of Undying item.shulkerShell.name=Shulker Shell +item.ironNugget.name=Iron Nugget # Block names that will be displayed in the hologram tile.barrier.name=Barrier