diff --git a/pom.xml b/pom.xml
index af0f9b8..0ca23c5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -132,7 +132,7 @@
org.bukkit
bukkit
- 1.11.2-R0.1-SNAPSHOT
+ 1.12-pre2-SNAPSHOT
provided
diff --git a/src/main/java/de/epiceric/shopchest/ShopChest.java b/src/main/java/de/epiceric/shopchest/ShopChest.java
index 7d4c400..bd6707a 100644
--- a/src/main/java/de/epiceric/shopchest/ShopChest.java
+++ b/src/main/java/de/epiceric/shopchest/ShopChest.java
@@ -139,6 +139,7 @@ public class ShopChest extends JavaPlugin {
case "v1_9_R2":
case "v1_10_R1":
case "v1_11_R1":
+ case "v1_12_R1":
break;
default:
debug("Server version not officially supported: " + Utils.getServerVersion() + "!");
diff --git a/src/main/java/de/epiceric/shopchest/language/LanguageUtils.java b/src/main/java/de/epiceric/shopchest/language/LanguageUtils.java
index f250082..2abf402 100644
--- a/src/main/java/de/epiceric/shopchest/language/LanguageUtils.java
+++ b/src/main/java/de/epiceric/shopchest/language/LanguageUtils.java
@@ -101,7 +101,6 @@ public class LanguageUtils {
itemNames.add(new ItemName(Material.SANDSTONE, 1, langConfig.getString("tile.sandStone.chiseled.name", "Chiseled Sandstone")));
itemNames.add(new ItemName(Material.SANDSTONE, 2, langConfig.getString("tile.sandStone.smooth.name", "Smooth Sandstone")));
itemNames.add(new ItemName(Material.NOTE_BLOCK, langConfig.getString("tile.musicBlock.name", "Note Block")));
- itemNames.add(new ItemName(Material.BED, langConfig.getString("tile.bed.name", "Bed")));
itemNames.add(new ItemName(Material.POWERED_RAIL, langConfig.getString("tile.goldenRail.name", "Powered Rail")));
itemNames.add(new ItemName(Material.DETECTOR_RAIL, langConfig.getString("tile.detectorRail.name", "Detector Rail")));
itemNames.add(new ItemName(Material.PISTON_STICKY_BASE, langConfig.getString("tile.pistonStickyBase.name", "Sticky Piston")));
@@ -267,22 +266,22 @@ public class LanguageUtils {
itemNames.add(new ItemName(Material.QUARTZ_STAIRS, langConfig.getString("tile.stairsQuartz.name", "Quartz Stairs")));
itemNames.add(new ItemName(Material.ACTIVATOR_RAIL, langConfig.getString("tile.activatorRail.name", "Activator Rail")));
itemNames.add(new ItemName(Material.DROPPER, langConfig.getString("tile.dropper.name", "Dropper")));
- itemNames.add(new ItemName(Material.STAINED_CLAY, langConfig.getString("tile.clayHardenedStained.white.name", "White Hardened Clay")));
- itemNames.add(new ItemName(Material.STAINED_CLAY, 1, langConfig.getString("tile.clayHardenedStained.orange.name", "Orange Hardened Clay")));
- itemNames.add(new ItemName(Material.STAINED_CLAY, 2, langConfig.getString("tile.clayHardenedStained.magenta.name", "Magenta Hardened Clay")));
- itemNames.add(new ItemName(Material.STAINED_CLAY, 3, langConfig.getString("tile.clayHardenedStained.lightBlue.name", "Light Blue Hardened Clay")));
- itemNames.add(new ItemName(Material.STAINED_CLAY, 4, langConfig.getString("tile.clayHardenedStained.yellow.name", "Yellow Hardened Clay")));
- itemNames.add(new ItemName(Material.STAINED_CLAY, 5, langConfig.getString("tile.clayHardenedStained.lime.name", "Lime Hardened Clay")));
- itemNames.add(new ItemName(Material.STAINED_CLAY, 6, langConfig.getString("tile.clayHardenedStained.pink.name", "Pink Hardened Clay")));
- itemNames.add(new ItemName(Material.STAINED_CLAY, 7, langConfig.getString("tile.clayHardenedStained.gray.name", "Gray Hardened Clay")));
- itemNames.add(new ItemName(Material.STAINED_CLAY, 8, langConfig.getString("tile.clayHardenedStained.silver.name", "Light Gray Hardened Clay")));
- itemNames.add(new ItemName(Material.STAINED_CLAY, 9, langConfig.getString("tile.clayHardenedStained.cyan.name", "Cyan Hardened Clay")));
- itemNames.add(new ItemName(Material.STAINED_CLAY, 10, langConfig.getString("tile.clayHardenedStained.purple.name", "Purple Hardened Clay")));
- itemNames.add(new ItemName(Material.STAINED_CLAY, 11, langConfig.getString("tile.clayHardenedStained.blue.name", "Blue Hardened Clay")));
- itemNames.add(new ItemName(Material.STAINED_CLAY, 12, langConfig.getString("tile.clayHardenedStained.brown.name", "Brown Hardened Clay")));
- itemNames.add(new ItemName(Material.STAINED_CLAY, 13, langConfig.getString("tile.clayHardenedStained.green.name", "Green Hardened Clay")));
- itemNames.add(new ItemName(Material.STAINED_CLAY, 14, langConfig.getString("tile.clayHardenedStained.red.name", "Red Hardened Clay")));
- itemNames.add(new ItemName(Material.STAINED_CLAY, 15, langConfig.getString("tile.clayHardenedStained.black.name", "Black Hardened Clay")));
+ itemNames.add(new ItemName(Material.STAINED_CLAY, langConfig.getString("tile.clayHardenedStained.white.name", "White Terracotta")));
+ itemNames.add(new ItemName(Material.STAINED_CLAY, 1, langConfig.getString("tile.clayHardenedStained.orange.name", "Orange Terracotta")));
+ itemNames.add(new ItemName(Material.STAINED_CLAY, 2, langConfig.getString("tile.clayHardenedStained.magenta.name", "Magenta Terracotta")));
+ itemNames.add(new ItemName(Material.STAINED_CLAY, 3, langConfig.getString("tile.clayHardenedStained.lightBlue.name", "Light Blue Terracotta")));
+ itemNames.add(new ItemName(Material.STAINED_CLAY, 4, langConfig.getString("tile.clayHardenedStained.yellow.name", "Yellow Terracotta")));
+ itemNames.add(new ItemName(Material.STAINED_CLAY, 5, langConfig.getString("tile.clayHardenedStained.lime.name", "Lime Terracotta")));
+ itemNames.add(new ItemName(Material.STAINED_CLAY, 6, langConfig.getString("tile.clayHardenedStained.pink.name", "Pink Terracotta")));
+ itemNames.add(new ItemName(Material.STAINED_CLAY, 7, langConfig.getString("tile.clayHardenedStained.gray.name", "Gray Terracotta")));
+ itemNames.add(new ItemName(Material.STAINED_CLAY, 8, langConfig.getString("tile.clayHardenedStained.silver.name", "Light Gray Terracotta")));
+ itemNames.add(new ItemName(Material.STAINED_CLAY, 9, langConfig.getString("tile.clayHardenedStained.cyan.name", "Cyan Terracotta")));
+ itemNames.add(new ItemName(Material.STAINED_CLAY, 10, langConfig.getString("tile.clayHardenedStained.purple.name", "Purple Terracotta")));
+ itemNames.add(new ItemName(Material.STAINED_CLAY, 11, langConfig.getString("tile.clayHardenedStained.blue.name", "Blue Terracotta")));
+ itemNames.add(new ItemName(Material.STAINED_CLAY, 12, langConfig.getString("tile.clayHardenedStained.brown.name", "Brown Terracotta")));
+ itemNames.add(new ItemName(Material.STAINED_CLAY, 13, langConfig.getString("tile.clayHardenedStained.green.name", "Green Terracotta")));
+ itemNames.add(new ItemName(Material.STAINED_CLAY, 14, langConfig.getString("tile.clayHardenedStained.red.name", "Red Terracotta")));
+ itemNames.add(new ItemName(Material.STAINED_CLAY, 15, langConfig.getString("tile.clayHardenedStained.black.name", "Black Terracotta")));
itemNames.add(new ItemName(Material.STAINED_GLASS_PANE, langConfig.getString("tile.thinStainedGlass.white.name", "White Stained Glass Pane")));
itemNames.add(new ItemName(Material.STAINED_GLASS_PANE, 1, langConfig.getString("tile.thinStainedGlass.orange.name", "Orange Stained Glass Pane")));
itemNames.add(new ItemName(Material.STAINED_GLASS_PANE, 2, langConfig.getString("tile.thinStainedGlass.magenta.name", "Magenta Stained Glass Pane")));
@@ -400,6 +399,58 @@ public class LanguageUtils {
itemNames.add(new ItemName(Material.BLACK_SHULKER_BOX, langConfig.getString("tile.shulkerBoxBlack.name", "Black Shulker Box")));
}
+ if (Utils.getMajorVersion() >= 12) {
+ // Add Block Names of 1.12
+ itemNames.add(new ItemName(Material.CONCRETE, langConfig.getString("tile.concrete.white.name", "White Concrete")));
+ itemNames.add(new ItemName(Material.CONCRETE, 1, langConfig.getString("tile.concrete.orange.name", "Orange Concrete")));
+ itemNames.add(new ItemName(Material.CONCRETE, 2, langConfig.getString("tile.concrete.magenta.name", "Magenta Concrete")));
+ itemNames.add(new ItemName(Material.CONCRETE, 3, langConfig.getString("tile.concrete.lightBlue.name", "Light Blue Concrete")));
+ itemNames.add(new ItemName(Material.CONCRETE, 4, langConfig.getString("tile.concrete.yellow.name", "Yellow Concrete")));
+ itemNames.add(new ItemName(Material.CONCRETE, 5, langConfig.getString("tile.concrete.lime.name", "Lime Concrete")));
+ itemNames.add(new ItemName(Material.CONCRETE, 6, langConfig.getString("tile.concrete.pink.name", "Pink Concrete")));
+ itemNames.add(new ItemName(Material.CONCRETE, 7, langConfig.getString("tile.concrete.gray.name", "Gray Concrete")));
+ itemNames.add(new ItemName(Material.CONCRETE, 8, langConfig.getString("tile.concrete.silver.name", "Light Gray Concrete")));
+ itemNames.add(new ItemName(Material.CONCRETE, 9, langConfig.getString("tile.concrete.cyan.name", "Cyan Concrete")));
+ itemNames.add(new ItemName(Material.CONCRETE, 10, langConfig.getString("tile.concrete.purple.name", "Purple Concrete")));
+ itemNames.add(new ItemName(Material.CONCRETE, 11, langConfig.getString("tile.concrete.blue.name", "Blue Concrete")));
+ itemNames.add(new ItemName(Material.CONCRETE, 12, langConfig.getString("tile.concrete.brown.name", "Brown Concrete")));
+ itemNames.add(new ItemName(Material.CONCRETE, 13, langConfig.getString("tile.concrete.green.name", "Green Concrete")));
+ itemNames.add(new ItemName(Material.CONCRETE, 14, langConfig.getString("tile.concrete.red.name", "Red Concrete")));
+ itemNames.add(new ItemName(Material.CONCRETE, 15, langConfig.getString("tile.concrete.black.name", "Black Concrete")));
+ itemNames.add(new ItemName(Material.CONCRETE_POWDER, langConfig.getString("tile.concretePowder.white.name", "White Concrete Powder")));
+ itemNames.add(new ItemName(Material.CONCRETE_POWDER, 1, langConfig.getString("tile.concretePowder.orange.name", "Orange Concrete Powder")));
+ itemNames.add(new ItemName(Material.CONCRETE_POWDER, 2, langConfig.getString("tile.concretePowder.magenta.name", "Magenta Concrete Powder")));
+ itemNames.add(new ItemName(Material.CONCRETE_POWDER, 3, langConfig.getString("tile.concretePowder.lightBlue.name", "Light Blue Concrete Powder")));
+ itemNames.add(new ItemName(Material.CONCRETE_POWDER, 4, langConfig.getString("tile.concretePowder.yellow.name", "Yellow Concrete Powder")));
+ itemNames.add(new ItemName(Material.CONCRETE_POWDER, 5, langConfig.getString("tile.concretePowder.lime.name", "Lime Concrete Powder")));
+ itemNames.add(new ItemName(Material.CONCRETE_POWDER, 6, langConfig.getString("tile.concretePowder.pink.name", "Pink Concrete Powder")));
+ itemNames.add(new ItemName(Material.CONCRETE_POWDER, 7, langConfig.getString("tile.concretePowder.gray.name", "Gray Concrete Powder")));
+ itemNames.add(new ItemName(Material.CONCRETE_POWDER, 8, langConfig.getString("tile.concretePowder.silver.name", "Light Gray Concrete Powder")));
+ itemNames.add(new ItemName(Material.CONCRETE_POWDER, 9, langConfig.getString("tile.concretePowder.cyan.name", "Cyan Concrete Powder")));
+ itemNames.add(new ItemName(Material.CONCRETE_POWDER, 10, langConfig.getString("tile.concretePowder.purple.name", "Purple Concrete Powder")));
+ itemNames.add(new ItemName(Material.CONCRETE_POWDER, 11, langConfig.getString("tile.concretePowder.blue.name", "Blue Concrete Powder")));
+ itemNames.add(new ItemName(Material.CONCRETE_POWDER, 12, langConfig.getString("tile.concretePowder.brown.name", "Brown Concrete Powder")));
+ itemNames.add(new ItemName(Material.CONCRETE_POWDER, 13, langConfig.getString("tile.concretePowder.green.name", "Green Concrete Powder")));
+ itemNames.add(new ItemName(Material.CONCRETE_POWDER, 14, langConfig.getString("tile.concretePowder.red.name", "Red Concrete Powder")));
+ itemNames.add(new ItemName(Material.CONCRETE_POWDER, 15, langConfig.getString("tile.concretePowder.black.name", "Black Concrete Powder")));
+ itemNames.add(new ItemName(Material.WHITE_GLAZED_TERRACOTTA, langConfig.getString("tile.glazedTerracottaWhite.name", "White Terracotta")));
+ itemNames.add(new ItemName(Material.ORANGE_GLAZED_TERRACOTTA, langConfig.getString("tile.glazedTerracottaOrange.name", "Orange Glazed Terracotta")));
+ itemNames.add(new ItemName(Material.MAGENTA_GLAZED_TERRACOTTA, langConfig.getString("tile.glazedTerracottaMagenta.name", "Magenta Glazed Terracotta")));
+ itemNames.add(new ItemName(Material.LIGHT_BLUE_GLAZED_TERRACOTTA, langConfig.getString("tile.glazedTerracottaLightBlue.name", "Light Blue Glazed Terracotta")));
+ itemNames.add(new ItemName(Material.YELLOW_GLAZED_TERRACOTTA, langConfig.getString("tile.glazedTerracottaYellow.name", "Yellow Glazed Terracotta")));
+ itemNames.add(new ItemName(Material.LIME_GLAZED_TERRACOTTA, langConfig.getString("tile.glazedTerracottaLime.name", "Lime Glazed Terracotta")));
+ itemNames.add(new ItemName(Material.PINK_GLAZED_TERRACOTTA, langConfig.getString("tile.glazedTerracottaPink.name", "Pink Glazed Terracotta")));
+ itemNames.add(new ItemName(Material.GRAY_GLAZED_TERRACOTTA, langConfig.getString("tile.glazedTerracottaGray.name", "Gray Glazed Terracotta")));
+ itemNames.add(new ItemName(Material.SILVER_GLAZED_TERRACOTTA, langConfig.getString("tile.glazedTerracottaSilver.name", "Light Gray Glazed Terracotta")));
+ itemNames.add(new ItemName(Material.CYAN_GLAZED_TERRACOTTA, langConfig.getString("tile.glazedTerracottaCyan.name", "Cyan Glazed Terracotta")));
+ itemNames.add(new ItemName(Material.PURPLE_GLAZED_TERRACOTTA, langConfig.getString("tile.glazedTerracottaPurple.name", "Purple Glazed Terracotta")));
+ itemNames.add(new ItemName(Material.BLUE_GLAZED_TERRACOTTA, langConfig.getString("tile.glazedTerracottaBlue.name", "Blue Glazed Terracotta")));
+ itemNames.add(new ItemName(Material.BROWN_GLAZED_TERRACOTTA, langConfig.getString("tile.glazedTerracottaBrown.name", "Brown Glazed Terracotta")));
+ itemNames.add(new ItemName(Material.GREEN_GLAZED_TERRACOTTA, langConfig.getString("tile.glazedTerracottaGreen.name", "Green Glazed Terracotta")));
+ itemNames.add(new ItemName(Material.RED_GLAZED_TERRACOTTA, langConfig.getString("tile.glazedTerracottaRed.name", "Red Glazed Terracotta")));
+ itemNames.add(new ItemName(Material.BLACK_GLAZED_TERRACOTTA, langConfig.getString("tile.glazedTerracottaBlack.name", "Black Glazed Terracotta")));
+ }
+
// Add Item Names
itemNames.add(new ItemName(Material.IRON_SPADE, langConfig.getString("item.shovelIron.name", "Iron Shovel")));
itemNames.add(new ItemName(Material.IRON_PICKAXE, langConfig.getString("item.pickaxeIron.name", "Iron Pickaxe")));
@@ -521,7 +572,6 @@ public class LanguageUtils {
itemNames.add(new ItemName(Material.BONE, langConfig.getString("item.bone.name", "Bone")));
itemNames.add(new ItemName(Material.SUGAR, langConfig.getString("item.sugar.name", "Sugar")));
itemNames.add(new ItemName(Material.CAKE, langConfig.getString("item.cake.name", "Cake")));
- itemNames.add(new ItemName(Material.BED, langConfig.getString("item.bed.name", "Bed")));
itemNames.add(new ItemName(Material.DIODE, langConfig.getString("item.diode.name", "Redstone Repeater")));
itemNames.add(new ItemName(Material.COOKIE, langConfig.getString("item.cookie.name", "Cookie")));
itemNames.add(new ItemName(Material.MAP, langConfig.getString("item.map.name", "Map")));
@@ -661,6 +711,30 @@ public class LanguageUtils {
}
}
+ if (Utils.getMajorVersion() >= 12) {
+ // Add Item Name of 1.12
+ itemNames.add(new ItemName(Material.KNOWLEDGE_BOOK, langConfig.getString("item.knowledgeBook.name", "Knowledge Book")));
+ itemNames.add(new ItemName(Material.BED, langConfig.getString("item.bed.white.name", "White Bed")));
+ itemNames.add(new ItemName(Material.BED, 1, langConfig.getString("item.bed.orange.name", "Orange Bed")));
+ itemNames.add(new ItemName(Material.BED, 2, langConfig.getString("item.bed.magenta.name", "Magenta Bed")));
+ itemNames.add(new ItemName(Material.BED, 3, langConfig.getString("item.bed.lightBlue.name", "Light Blue Bed")));
+ itemNames.add(new ItemName(Material.BED, 4, langConfig.getString("item.bed.yellow.name", "Yellow Bed")));
+ itemNames.add(new ItemName(Material.BED, 5, langConfig.getString("item.bed.lime.name", "Lime Bed")));
+ itemNames.add(new ItemName(Material.BED, 6, langConfig.getString("item.bed.pink.name", "Pink Bed")));
+ itemNames.add(new ItemName(Material.BED, 7, langConfig.getString("item.bed.gray.name", "Gray Bed")));
+ itemNames.add(new ItemName(Material.BED, 8, langConfig.getString("item.bed.silver.name", "Light Gray Bed")));
+ itemNames.add(new ItemName(Material.BED, 9, langConfig.getString("item.bed.cyan.name", "Cyan Bed")));
+ itemNames.add(new ItemName(Material.BED, 10, langConfig.getString("item.bed.purple.name", "Purple Bed")));
+ itemNames.add(new ItemName(Material.BED, 11, langConfig.getString("item.bed.blue.name", "Blue Bed")));
+ itemNames.add(new ItemName(Material.BED, 12, langConfig.getString("item.bed.brown.name", "Brown Bed")));
+ itemNames.add(new ItemName(Material.BED, 13, langConfig.getString("item.bed.green.name", "Green Bed")));
+ itemNames.add(new ItemName(Material.BED, 14, langConfig.getString("item.bed.red.name", "Red Bed")));
+ itemNames.add(new ItemName(Material.BED, 15, langConfig.getString("item.bed.black.name", "Black Bed")));
+ } else {
+ // Before 1.12, bed is just called "Bed" without colors
+ itemNames.add(new ItemName(Material.BED, langConfig.getString("item.bed.name", "Bed")));
+ }
+
// Add Enchantment Names
enchantmentNames.add(new EnchantmentName(Enchantment.ARROW_DAMAGE, langConfig.getString("enchantment.arrowDamage", "Power")));
enchantmentNames.add(new EnchantmentName(Enchantment.ARROW_FIRE, langConfig.getString("enchantment.arrowFire", "Flame")));
@@ -774,6 +848,12 @@ public class LanguageUtils {
entityNames.add(new EntityName(EntityType.HUSK, langConfig.getString("entity.Husk.name", "Husk")));
}
+ if (Utils.getMajorVersion() >= 12) {
+ // Add Entity Names of 1.12
+ entityNames.add(new EntityName(EntityType.PARROT, langConfig.getString("entity.Parrot.name", "Parrot")));
+ entityNames.add(new EntityName(EntityType.ILLUSIONER, langConfig.getString("entity.IllusionIllager.name", "Illusioner")));
+ }
+
// Add Potion Effect Names
potionEffectNames.add(new PotionEffectName(PotionType.FIRE_RESISTANCE, langConfig.getString("effect.fireResistance", "Fire Resistance")));
potionEffectNames.add(new PotionEffectName(PotionType.INSTANT_DAMAGE, langConfig.getString("effect.harm", "Instant Damage")));
diff --git a/src/main/resources/item_names.txt b/src/main/resources/item_names.txt
index 404fde3..ba73108 100644
--- a/src/main/resources/item_names.txt
+++ b/src/main/resources/item_names.txt
@@ -27,9 +27,11 @@ BIRCH_DOOR_ITEM
BIRCH_FENCE
BIRCH_FENCE_GATE
BIRCH_WOOD_STAIRS
+BLACK_GLAZED_TERRACOTTA
BLACK_SHULKER_BOX
BLAZE_POWDER
BLAZE_ROD
+BLUE_GLAZED_TERRACOTTA
BLUE_SHULKER_BOX
BOAT
BOAT_ACACIA
@@ -49,6 +51,7 @@ BREWING_STAND
BREWING_STAND_ITEM
BRICK
BRICK_STAIRS
+BROWN_GLAZED_TERRACOTTA
BROWN_MUSHROOM
BROWN_SHULKER_BOX
BUCKET
@@ -86,6 +89,8 @@ COMMAND_CHAIN
COMMAND_MINECART
COMMAND_REPEATING
COMPASS
+CONCRETE
+CONCRETE_POWDER
COOKED_BEEF
COOKED_CHICKEN
COOKED_FISH
@@ -93,6 +98,7 @@ COOKED_MUTTON
COOKED_RABBIT
COOKIE
CROPS
+CYAN_GLAZED_TERRACOTTA
CYAN_SHULKER_BOX
DARK_OAK_DOOR
DARK_OAK_DOOR_ITEM
@@ -189,7 +195,9 @@ GOLDEN_CARROT
GRASS
GRASS_PATH
GRAVEL
+GRAY_GLAZED_TERRACOTTA
GRAY_SHULKER_BOX
+GREEN_GLAZED_TERRACOTTA
GREEN_RECORD
GREEN_SHULKER_BOX
GRILLED_PORK
@@ -228,6 +236,7 @@ JUNGLE_DOOR_ITEM
JUNGLE_FENCE
JUNGLE_FENCE_GATE
JUNGLE_WOOD_STAIRS
+KNOWLEDGE_BOOK
LADDER
LAPIS_BLOCK
LAPIS_ORE
@@ -242,12 +251,15 @@ LEATHER_LEGGINGS
LEAVES
LEAVES_2
LEVER
+LIGHT_BLUE_GLAZED_TERRACOTTA
LIGHT_BLUE_SHULKER_BOX
+LIME_GLAZED_TERRACOTTA
LIME_SHULKER_BOX
LINGERING_POTION
LOG
LOG_2
LONG_GRASS
+MAGENTA_GLAZED_TERRACOTTA
MAGENTA_SHULKER_BOX
MAGMA
MAGMA_CREAM
@@ -278,10 +290,12 @@ NETHERRACK
NOTE_BLOCK
OBSERVER
OBSIDIAN
+ORANGE_GLAZED_TERRACOTTA
ORANGE_SHULKER_BOX
PACKED_ICE
PAINTING
PAPER
+PINK_GLAZED_TERRACOTTA
PINK_SHULKER_BOX
PISTON_BASE
PISTON_EXTENSION
@@ -302,6 +316,7 @@ PUMPKIN
PUMPKIN_PIE
PUMPKIN_SEEDS
PUMPKIN_STEM
+PURPLE_GLAZED_TERRACOTTA
PURPLE_SHULKER_BOX
PURPUR_BLOCK
PURPUR_DOUBLE_SLAB
@@ -330,6 +345,7 @@ RECORD_6
RECORD_7
RECORD_8
RECORD_9
+RED_GLAZED_TERRACOTTA
RED_MUSHROOM
RED_NETHER_BRICK
RED_ROSE
@@ -360,6 +376,7 @@ SHIELD
SHULKER_SHELL
SIGN
SIGN_POST
+SILVER_GLAZED_TERRACOTTA
SILVER_SHULKER_BOX
SKULL
SKULL_ITEM
@@ -425,6 +442,7 @@ WATER_BUCKET
WATER_LILY
WEB
WHEAT
+WHITE_GLAZED_TERRACOTTA
WHITE_SHULKER_BOX
WOOD
WOOD_AXE
@@ -443,4 +461,5 @@ WOOL
WORKBENCH
WRITTEN_BOOK
YELLOW_FLOWER
+YELLOW_GLAZED_TERRACOTTA
YELLOW_SHULKER_BOX
\ No newline at end of file
diff --git a/src/main/resources/lang/de_DE.lang b/src/main/resources/lang/de_DE.lang
index dcf805a..8407ad4 100644
--- a/src/main/resources/lang/de_DE.lang
+++ b/src/main/resources/lang/de_DE.lang
@@ -181,12 +181,14 @@ entity.Giant.name=Riese
entity.Guardian.name=Wächter
entity.Horse.name=Pferd
entity.Husk.name=Wüstenzombie
+entity.IllusionIllager.name=Illusionist
entity.KillerBunny.name=Das Killer-Kaninchen
entity.LavaSlime.name=Magmawürfel
entity.Llama.name=Lama
entity.Mule.name=Maultier
entity.MushroomCow.name=Mooshroom
entity.Ozelot.name=Ozelot
+entity.Parrot.name=Papagei
entity.Pig.name=Schwein
entity.PigZombie.name=Schweinezombie
entity.PolarBear.name=Eisbär
@@ -233,6 +235,22 @@ item.banner.silver.name=Hellgraues Banner
item.banner.white.name=Weißes Banner
item.banner.yellow.name=Gelbes Banner
item.bed.name=Bett
+item.bed.black.name=Schwarzes Bett
+item.bed.blue.name=Blaues Bett
+item.bed.brown.name=Braunes Bett
+item.bed.cyan.name=Türkises Bett
+item.bed.gray.name=Graues Bett
+item.bed.green.name=Grünes Bett
+item.bed.lightBlue.name=Hellblaues Bett
+item.bed.lime.name=Hellgrünes Bett
+item.bed.magenta.name=Magenta Bett
+item.bed.orange.name=Oranges Bett
+item.bed.pink.name=Rosa Bett
+item.bed.purple.name=Violettes Bett
+item.bed.red.name=Rotes Bett
+item.bed.silver.name=Hellgraues Bett
+item.bed.white.name=Weißes Bett
+item.bed.yellow.name=Gelbes Bett
item.beefCooked.name=Steak
item.beefRaw.name=Rohes Rindfleisch
item.beetroot.name=Rote Bete
@@ -386,6 +404,8 @@ item.horsearmorgold.name=Goldene Pferderüstung
item.horsearmormetal.name=Eiserne Pferderüstung
item.ingotGold.name=Goldbarren
item.ingotIron.name=Eisenbarren
+item.ironNugget.name=Eisenklumpen
+item.knowledgeBook.name=Buch des Wissens
item.leash.name=Leine
item.leather.name=Leder
item.leaves.name=Laub
@@ -551,24 +571,24 @@ tile.chestTrap.name=Redstone-Truhe
tile.chorusFlower.name=Chorusblüte
tile.chorusPlant.name=Choruspflanze
tile.clay.name=Ton
-tile.clayHardened.name=Gebrannter Ton
-tile.clayHardenedStained.black.name=Schwarzer gebrannter Ton
-tile.clayHardenedStained.blue.name=Blauer gebrannter Ton
-tile.clayHardenedStained.brown.name=Brauner gebrannter Ton
-tile.clayHardenedStained.cyan.name=Türkiser gebrannter Ton
-tile.clayHardenedStained.gray.name=Grauer gebrannter Ton
-tile.clayHardenedStained.green.name=Grüner gebrannter Ton
-tile.clayHardenedStained.lightBlue.name=Hellblauer gebrannter Ton
-tile.clayHardenedStained.lime.name=Hellgrüner gebrannter Ton
-tile.clayHardenedStained.magenta.name=Magenta gebrannter Ton
-tile.clayHardenedStained.name=Gefärbter gebrannter Ton
-tile.clayHardenedStained.orange.name=Oranger gebrannter Ton
-tile.clayHardenedStained.pink.name=Rosa gebrannter Ton
-tile.clayHardenedStained.purple.name=Violetter gebrannter Ton
-tile.clayHardenedStained.red.name=Roter gebrannter Ton
-tile.clayHardenedStained.silver.name=Hellgrauer gebrannter Ton
-tile.clayHardenedStained.white.name=Weißer gebrannter Ton
-tile.clayHardenedStained.yellow.name=Gelber gebrannter Ton
+tile.clayHardened.name=Keramik
+tile.clayHardenedStained.black.name=Schwarze Keramik
+tile.clayHardenedStained.blue.name=Blaue Keramik
+tile.clayHardenedStained.brown.name=Braune Keramik
+tile.clayHardenedStained.cyan.name=Türkise Keramik
+tile.clayHardenedStained.gray.name=Graue Keramik
+tile.clayHardenedStained.green.name=Grüne Keramik
+tile.clayHardenedStained.lightBlue.name=Hellblaue Keramik
+tile.clayHardenedStained.lime.name=Hellgrüne Keramik
+tile.clayHardenedStained.magenta.name=Magenta Keramik
+tile.clayHardenedStained.name=Gefärbte Keramik
+tile.clayHardenedStained.orange.name=Orange Keramik
+tile.clayHardenedStained.pink.name=Rosa Keramik
+tile.clayHardenedStained.purple.name=Violette Keramik
+tile.clayHardenedStained.red.name=Rote Keramik
+tile.clayHardenedStained.silver.name=Hellgraue Keramik
+tile.clayHardenedStained.white.name=Weiße Keramik
+tile.clayHardenedStained.yellow.name=Gelbe Keramik
tile.cloth.black.name=Schwarze Wolle
tile.cloth.blue.name=Blaue Wolle
tile.cloth.brown.name=Braune Wolle
@@ -590,6 +610,38 @@ tile.cobbleWall.mossy.name=Bemooste Bruchsteinmauer
tile.cobbleWall.normal.name=Bruchsteinmauer
tile.cocoa.name=Kakao
tile.commandBlock.name=Befehlsblock
+tile.concrete.black.name=Schwarzer Beton
+tile.concrete.blue.name=Blauer Beton
+tile.concrete.brown.name=Brauner Beton
+tile.concrete.cyan.name=Türkiser Beton
+tile.concrete.gray.name=Grauer Beton
+tile.concrete.green.name=Grüner Beton
+tile.concrete.lightBlue.name=Hellblauer Beton
+tile.concrete.lime.name=Hellgrüner Beton
+tile.concrete.magenta.name=Magenta Beton
+tile.concrete.orange.name=Oranger Beton
+tile.concrete.pink.name=Rosa Beton
+tile.concrete.purple.name=Violetter Beton
+tile.concrete.red.name=Roter Beton
+tile.concrete.silver.name=Hellgrauer Beton
+tile.concrete.white.name=Weißer Beton
+tile.concrete.yellow.name=Gelber Beton
+tile.concretePowder.black.name=Schwarzer Trockenbeton
+tile.concretePowder.blue.name=Blauer Trockenbeton
+tile.concretePowder.brown.name=Brauner Trockenbeton
+tile.concretePowder.cyan.name=Türkiser Trockenbeton
+tile.concretePowder.gray.name=Grauer Trockenbeton
+tile.concretePowder.green.name=Grüner Trockenbeton
+tile.concretePowder.lightBlue.name=Hellblauer Trockenbeton
+tile.concretePowder.lime.name=Hellgrüner Trockenbeton
+tile.concretePowder.magenta.name=Magenta Trockenbeton
+tile.concretePowder.orange.name=Oranger Trockenbeton
+tile.concretePowder.pink.name=Rosa Trockenbeton
+tile.concretePowder.purple.name=Violetter Trockenbeton
+tile.concretePowder.red.name=Roter Trockenbeton
+tile.concretePowder.silver.name=Hellgrauer Trockenbeton
+tile.concretePowder.white.name=Weißer Trockenbeton
+tile.concretePowder.yellow.name=Gelber Trockenbeton
tile.crops.name=Getreide
tile.darkOakFence.name=Schwarzeichenholzzaun
tile.darkOakFenceGate.name=Schwarzeichenholzzauntor
@@ -637,6 +689,22 @@ tile.flower2.tulipWhite.name=Weiße Tulpe
tile.frostedIce.name=Brüchiges Eis
tile.furnace.name=Ofen
tile.glass.name=Glas
+tile.glazedTerracottaBlack.name=Schwarze glasierte Keramik
+tile.glazedTerracottaBlue.name=Blaue glasierte Keramik
+tile.glazedTerracottaBrown.name=Braune glasierte Keramik
+tile.glazedTerracottaCyan.name=Türkise glasierte Keramik
+tile.glazedTerracottaGray.name=Graue glasierte Keramik
+tile.glazedTerracottaGreen.name=Grüne glasierte Keramik
+tile.glazedTerracottaLightBlue.name=Hellblaue glasierte Keramik
+tile.glazedTerracottaLime.name=Hellgrüne glasierte Keramik
+tile.glazedTerracottaMagenta.name=Magenta glasierte Keramik
+tile.glazedTerracottaOrange.name=Orange glasierte Keramik
+tile.glazedTerracottaPink.name=Rosa glasierte Keramik
+tile.glazedTerracottaPurple.name=Violette glasierte Keramik
+tile.glazedTerracottaRed.name=Rote glasierte Keramik
+tile.glazedTerracottaSilver.name=Hellgraue glasierte Keramik
+tile.glazedTerracottaWhite.name=Weiße glasierte Keramik
+tile.glazedTerracottaYellow.name=Gelbe glasierte Keramik
tile.goldenRail.name=Antriebsschiene
tile.grass.name=Grasblock
tile.grassPath.name=Trampelpfad
diff --git a/src/main/resources/lang/en_US.lang b/src/main/resources/lang/en_US.lang
index 4f95af2..5f5ec33 100644
--- a/src/main/resources/lang/en_US.lang
+++ b/src/main/resources/lang/en_US.lang
@@ -526,6 +526,8 @@ entity.ZombieHorse.name=Zombie Horse
entity.Rabbit.name=Rabbit
entity.KillerBunny.name=The Killer Bunny
entity.Llama.name=Llama
+entity.Parrot.name=Parrot
+entity.IllusionIllager.name=Illusioner
# Item names that will be displayed in the hologram
item.nameTag.name=Name Tag
@@ -695,6 +697,22 @@ item.dyePowder.white.name=Bone Meal
item.sugar.name=Sugar
item.cake.name=Cake
item.bed.name=Bed
+item.bed.black.name=Black Bed
+item.bed.red.name=Red Bed
+item.bed.green.name=Green Bed
+item.bed.brown.name=Brown Bed
+item.bed.blue.name=Blue Bed
+item.bed.purple.name=Purple Bed
+item.bed.cyan.name=Cyan Bed
+item.bed.silver.name=Light Gray Bed
+item.bed.gray.name=Gray Bed
+item.bed.pink.name=Pink Bed
+item.bed.lime.name=Lime Bed
+item.bed.yellow.name=Yellow Bed
+item.bed.lightBlue.name=Light Blue Bed
+item.bed.magenta.name=Magenta Bed
+item.bed.orange.name=Orange Bed
+item.bed.white.name=White Bed
item.diode.name=Redstone Repeater
item.comparator.name=Redstone Comparator
item.map.name=Map
@@ -820,6 +838,7 @@ item.banner.white.name=White Banner
item.totem.name=Totem of Undying
item.shulkerShell.name=Shulker Shell
item.ironNugget.name=Iron Nugget
+item.knowledgeBook.name=Knowledge Book
# Block names that will be displayed in the hologram
tile.barrier.name=Barrier
@@ -1031,24 +1050,24 @@ tile.frostedIce.name=Frosted Ice
tile.icePacked.name=Packed Ice
tile.cactus.name=Cactus
tile.clay.name=Clay
-tile.clayHardenedStained.name=Stained Hardened Clay
-tile.clayHardenedStained.black.name=Black Hardened Clay
-tile.clayHardenedStained.red.name=Red Hardened Clay
-tile.clayHardenedStained.green.name=Green Hardened Clay
-tile.clayHardenedStained.brown.name=Brown Hardened Clay
-tile.clayHardenedStained.blue.name=Blue Hardened Clay
-tile.clayHardenedStained.purple.name=Purple Hardened Clay
-tile.clayHardenedStained.cyan.name=Cyan Hardened Clay
-tile.clayHardenedStained.silver.name=Light Gray Hardened Clay
-tile.clayHardenedStained.gray.name=Gray Hardened Clay
-tile.clayHardenedStained.pink.name=Pink Hardened Clay
-tile.clayHardenedStained.lime.name=Lime Hardened Clay
-tile.clayHardenedStained.yellow.name=Yellow Hardened Clay
-tile.clayHardenedStained.lightBlue.name=Light Blue Hardened Clay
-tile.clayHardenedStained.magenta.name=Magenta Hardened Clay
-tile.clayHardenedStained.orange.name=Orange Hardened Clay
-tile.clayHardenedStained.white.name=White Hardened Clay
-tile.clayHardened.name=Hardened Clay
+tile.clayHardenedStained.name=Stained Terracotta
+tile.clayHardenedStained.black.name=Black Terracotta
+tile.clayHardenedStained.red.name=Red Terracotta
+tile.clayHardenedStained.green.name=Green Terracotta
+tile.clayHardenedStained.brown.name=Brown Terracotta
+tile.clayHardenedStained.blue.name=Blue Terracotta
+tile.clayHardenedStained.purple.name=Purple Terracotta
+tile.clayHardenedStained.cyan.name=Cyan Terracotta
+tile.clayHardenedStained.silver.name=Light Gray Terracotta
+tile.clayHardenedStained.gray.name=Gray Terracotta
+tile.clayHardenedStained.pink.name=Pink Terracotta
+tile.clayHardenedStained.lime.name=Lime Terracotta
+tile.clayHardenedStained.yellow.name=Yellow Terracotta
+tile.clayHardenedStained.lightBlue.name=Light Blue Terracotta
+tile.clayHardenedStained.magenta.name=Magenta Terracotta
+tile.clayHardenedStained.orange.name=Orange Terracotta
+tile.clayHardenedStained.white.name=White Terracotta
+tile.clayHardened.name=Terracotta
tile.reeds.name=Sugar cane
tile.jukebox.name=Jukebox
tile.fence.name=Oak Fence
@@ -1191,5 +1210,53 @@ tile.shulkerBoxBrown.name=Brown Shulker Box
tile.shulkerBoxGreen.name=Green Shulker Box
tile.shulkerBoxRed.name=Red Shulker Box
tile.shulkerBoxBlack.name=Black Shulker Box
+tile.glazedTerracottaWhite.name=White Glazed Terracotta
+tile.glazedTerracottaOrange.name=Orange Glazed Terracotta
+tile.glazedTerracottaMagenta.name=Magenta Glazed Terracotta
+tile.glazedTerracottaLightBlue.name=Light Blue Glazed Terracotta
+tile.glazedTerracottaYellow.name=Yellow Glazed Terracotta
+tile.glazedTerracottaLime.name=Lime Glazed Terracotta
+tile.glazedTerracottaPink.name=Pink Glazed Terracotta
+tile.glazedTerracottaGray.name=Gray Glazed Terracotta
+tile.glazedTerracottaSilver.name=Light Gray Glazed Terracotta
+tile.glazedTerracottaCyan.name=Cyan Glazed Terracotta
+tile.glazedTerracottaPurple.name=Purple Glazed Terracotta
+tile.glazedTerracottaBlue.name=Blue Glazed Terracotta
+tile.glazedTerracottaBrown.name=Brown Glazed Terracotta
+tile.glazedTerracottaGreen.name=Green Glazed Terracotta
+tile.glazedTerracottaRed.name=Red Glazed Terracotta
+tile.glazedTerracottaBlack.name=Black Glazed Terracotta
+tile.concrete.black.name=Black Concrete
+tile.concrete.red.name=Red Concrete
+tile.concrete.green.name=Green Concrete
+tile.concrete.brown.name=Brown Concrete
+tile.concrete.blue.name=Blue Concrete
+tile.concrete.purple.name=Purple Concrete
+tile.concrete.cyan.name=Cyan Concrete
+tile.concrete.silver.name=Light Gray Concrete
+tile.concrete.gray.name=Gray Concrete
+tile.concrete.pink.name=Pink Concrete
+tile.concrete.lime.name=Lime Concrete
+tile.concrete.yellow.name=Yellow Concrete
+tile.concrete.lightBlue.name=Light Blue Concrete
+tile.concrete.magenta.name=Magenta Concrete
+tile.concrete.orange.name=Orange Concrete
+tile.concrete.white.name=White Concrete
+tile.concretePowder.black.name=Black Concrete Powder
+tile.concretePowder.red.name=Red Concrete Powder
+tile.concretePowder.green.name=Green Concrete Powder
+tile.concretePowder.brown.name=Brown Concrete Powder
+tile.concretePowder.blue.name=Blue Concrete Powder
+tile.concretePowder.purple.name=Purple Concrete Powder
+tile.concretePowder.cyan.name=Cyan Concrete Powder
+tile.concretePowder.silver.name=Light Gray Concrete Powder
+tile.concretePowder.gray.name=Gray Concrete Powder
+tile.concretePowder.pink.name=Pink Concrete Powder
+tile.concretePowder.lime.name=Lime Concrete Powder
+tile.concretePowder.yellow.name=Yellow Concrete Powder
+tile.concretePowder.lightBlue.name=Light Blue Concrete Powder
+tile.concretePowder.magenta.name=Magenta Concrete Powder
+tile.concretePowder.orange.name=Orange Concrete Powder
+tile.concretePowder.white.name=White Concrete Powder
tile.structureVoid.name=Structure Void
tile.structureBlock.name=Structure Block
\ No newline at end of file