Add support for 1.15

Fixes #291
This commit is contained in:
Eric 2019-12-15 15:30:54 +01:00
parent 2a1375254e
commit 8ed16d7f3f
8 changed files with 163 additions and 122 deletions

View File

@ -65,7 +65,7 @@
<dependency>
<groupId>org.bukkit</groupId>
<artifactId>bukkit</artifactId>
<version>1.14.2-R0.1-SNAPSHOT</version>
<version>1.15-R0.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>

View File

@ -30,6 +30,8 @@ block.minecraft.barrel
block.minecraft.barrier
block.minecraft.beacon
block.minecraft.bedrock
block.minecraft.bee_nest
block.minecraft.beehive
block.minecraft.beetroots
block.minecraft.bell
block.minecraft.birch_button
@ -251,6 +253,8 @@ block.minecraft.green_wool
block.minecraft.grindstone
block.minecraft.hay_block
block.minecraft.heavy_weighted_pressure_plate
block.minecraft.honey_block
block.minecraft.honeycomb_block
block.minecraft.hopper
block.minecraft.horn_coral
block.minecraft.horn_coral_block
@ -716,6 +720,7 @@ item.minecraft.armor_stand
item.minecraft.arrow
item.minecraft.baked_potato
item.minecraft.bat_spawn_egg
item.minecraft.bee_spawn_egg
item.minecraft.beef
item.minecraft.beetroot
item.minecraft.beetroot_seeds
@ -848,6 +853,8 @@ item.minecraft.green_dye
item.minecraft.guardian_spawn_egg
item.minecraft.gunpowder
item.minecraft.heart_of_the_sea
item.minecraft.honey_bottle
item.minecraft.honeycomb
item.minecraft.hopper_minecart
item.minecraft.horse_spawn_egg
item.minecraft.husk_spawn_egg

View File

@ -172,6 +172,7 @@ public class ShopChest extends JavaPlugin {
case "v1_13_R1":
case "v1_13_R2":
case "v1_14_R1":
case "v1_15_R1":
break;
default:
debug("Server version not officially supported: " + Utils.getServerVersion() + "!");

View File

@ -1946,6 +1946,16 @@ public class LanguageUtils {
itemNames.add(new ItemName(Material.valueOf("WALL_SIGN"), langConfig.getString("block.minecraft.wall_sign", "Wall Sign")));
}
if (Utils.getMajorVersion() >= 15) {
itemNames.add(new ItemName(Material.BEE_NEST, langConfig.getString("block.minecraft.bee_nest", "Bee Nest")));
itemNames.add(new ItemName(Material.BEE_SPAWN_EGG, langConfig.getString("item.minecraft.bee_spawn_egg", "Bee Spawn Egg")));
itemNames.add(new ItemName(Material.BEEHIVE, langConfig.getString("block.minecraft.beehive", "Beehive")));
itemNames.add(new ItemName(Material.HONEY_BLOCK, langConfig.getString("block.minecraft.honey_block", "Honey Block")));
itemNames.add(new ItemName(Material.HONEY_BOTTLE, langConfig.getString("item.minecraft.honey_bottle", "Honey Bottle")));
itemNames.add(new ItemName(Material.HONEYCOMB, langConfig.getString("item.minecraft.honeycomb", "Honeycomb")));
itemNames.add(new ItemName(Material.HONEYCOMB_BLOCK, langConfig.getString("block.minecraft.honeycomb_block", "Honeycomb Block")));
}
// Add Enchantment Names
enchantmentNames.add(new EnchantmentName(Enchantment.DAMAGE_ALL, langConfig.getString("enchantment.minecraft.sharpness", "Sharpness")));
enchantmentNames.add(new EnchantmentName(Enchantment.DAMAGE_UNDEAD, langConfig.getString("enchantment.minecraft.smite", "Smite")));

View File

@ -408,6 +408,8 @@ public class Utils {
dataWatcherObjectFieldNames = new String[] {"ac", "aD", "aF", "aE", "aG", "aH", "b", "a"};
} else if ("v1_14_R1".equals(version)) {
dataWatcherObjectFieldNames = new String[] {"W", "AIR_TICKS", "aA", "az", "aB", "aC", "ITEM", "b"};
} else if ("v1_15_R1".equals(version)) {
dataWatcherObjectFieldNames = new String[] {"T", "AIR_TICKS", "aA", "az", "aB", "aC", "ITEM", "b"};
} else {
return null;
}

View File

@ -1,4 +1,4 @@
Item names for Bukkit 1.14
Item names for Bukkit 1.15
(Source: https://hub.spigotmc.org/javadocs/bukkit/org/bukkit/Material.html)
ACACIA_BOAT
@ -7,7 +7,7 @@ ACACIA_DOOR
ACACIA_FENCE
ACACIA_FENCE_GATE
ACACIA_LEAVES
ACACIA_LOG
ACACIA_LOG
ACACIA_PLANKS
ACACIA_PRESSURE_PLATE
ACACIA_SAPLING
@ -15,7 +15,7 @@ ACACIA_SIGN
ACACIA_SLAB
ACACIA_STAIRS
ACACIA_TRAPDOOR
ACACIA_WALL_SIGN
ACACIA_WALL_SIGN
ACACIA_WOOD
ACTIVATOR_RAIL
AIR
@ -23,7 +23,7 @@ ALLIUM
ANDESITE
ANDESITE_SLAB
ANDESITE_STAIRS
ANDESITE_WALL
ANDESITE_WALL
ANVIL
APPLE
ARMOR_STAND
@ -31,7 +31,7 @@ ARROW
ATTACHED_MELON_STEM
ATTACHED_PUMPKIN_STEM
AZURE_BLUET
BAKED_POTATO
BAKED_POTATO
BAMBOO
BAMBOO_SAPLING
BARREL
@ -39,7 +39,10 @@ BARRIER
BAT_SPAWN_EGG
BEACON
BEDROCK
BEEF
BEE_NEST
BEE_SPAWN_EGG
BEEF
BEEHIVE
BEETROOT
BEETROOT_SEEDS
BEETROOT_SOUP
@ -47,7 +50,7 @@ BEETROOTS
BELL
BIRCH_BOAT
BIRCH_BUTTON
BIRCH_DOOR
BIRCH_DOOR
BIRCH_FENCE
BIRCH_FENCE_GATE
BIRCH_LEAVES
@ -55,7 +58,7 @@ BIRCH_LOG
BIRCH_PLANKS
BIRCH_PRESSURE_PLATE
BIRCH_SAPLING
BIRCH_SIGN
BIRCH_SIGN
BIRCH_SLAB
BIRCH_STAIRS
BIRCH_TRAPDOOR
@ -63,7 +66,7 @@ BIRCH_WALL_SIGN
BIRCH_WOOD
BLACK_BANNER
BLACK_BED
BLACK_CARPET
BLACK_CARPET
BLACK_CONCRETE
BLACK_CONCRETE_POWDER
BLACK_DYE
@ -71,7 +74,7 @@ BLACK_GLAZED_TERRACOTTA
BLACK_SHULKER_BOX
BLACK_STAINED_GLASS
BLACK_STAINED_GLASS_PANE
BLACK_TERRACOTTA
BLACK_TERRACOTTA
BLACK_WALL_BANNER
BLACK_WOOL
BLAST_FURNACE
@ -79,7 +82,7 @@ BLAZE_POWDER
BLAZE_ROD
BLAZE_SPAWN_EGG
BLUE_BANNER
BLUE_BED
BLUE_BED
BLUE_CARPET
BLUE_CONCRETE
BLUE_CONCRETE_POWDER
@ -87,7 +90,7 @@ BLUE_DYE
BLUE_GLAZED_TERRACOTTA
BLUE_ICE
BLUE_ORCHID
BLUE_SHULKER_BOX
BLUE_SHULKER_BOX
BLUE_STAINED_GLASS
BLUE_STAINED_GLASS_PANE
BLUE_TERRACOTTA
@ -95,7 +98,7 @@ BLUE_WALL_BANNER
BLUE_WOOL
BONE
BONE_BLOCK
BONE_MEAL
BONE_MEAL
BOOK
BOOKSHELF
BOW
@ -103,7 +106,7 @@ BOWL
BRAIN_CORAL
BRAIN_CORAL_BLOCK
BRAIN_CORAL_FAN
BRAIN_CORAL_WALL_FAN
BRAIN_CORAL_WALL_FAN
BREAD
BREWING_STAND
BRICK
@ -111,7 +114,7 @@ BRICK_SLAB
BRICK_STAIRS
BRICK_WALL
BRICKS
BROWN_BANNER
BROWN_BANNER
BROWN_BED
BROWN_CARPET
BROWN_CONCRETE
@ -119,7 +122,7 @@ BROWN_CONCRETE_POWDER
BROWN_DYE
BROWN_GLAZED_TERRACOTTA
BROWN_MUSHROOM
BROWN_MUSHROOM_BLOCK
BROWN_MUSHROOM_BLOCK
BROWN_SHULKER_BOX
BROWN_STAINED_GLASS
BROWN_STAINED_GLASS_PANE
@ -127,7 +130,7 @@ BROWN_TERRACOTTA
BROWN_WALL_BANNER
BROWN_WOOL
BUBBLE_COLUMN
BUBBLE_CORAL
BUBBLE_CORAL
BUBBLE_CORAL_BLOCK
BUBBLE_CORAL_FAN
BUBBLE_CORAL_WALL_FAN
@ -135,7 +138,7 @@ BUCKET
CACTUS
CAKE
CAMPFIRE
CARROT
CARROT
CARROT_ON_A_STICK
CARROTS
CARTOGRAPHY_TABLE
@ -143,7 +146,7 @@ CARVED_PUMPKIN
CAT_SPAWN_EGG
CAULDRON
CAVE_AIR
CAVE_SPIDER_SPAWN_EGG
CAVE_SPIDER_SPAWN_EGG
CHAIN_COMMAND_BLOCK
CHAINMAIL_BOOTS
CHAINMAIL_CHESTPLATE
@ -151,7 +154,7 @@ CHAINMAIL_HELMET
CHAINMAIL_LEGGINGS
CHARCOAL
CHEST
CHEST_MINECART
CHEST_MINECART
CHICKEN
CHICKEN_SPAWN_EGG
CHIPPED_ANVIL
@ -159,7 +162,7 @@ CHISELED_QUARTZ_BLOCK
CHISELED_RED_SANDSTONE
CHISELED_SANDSTONE
CHISELED_STONE_BRICKS
CHORUS_FLOWER
CHORUS_FLOWER
CHORUS_FRUIT
CHORUS_PLANT
CLAY
@ -167,7 +170,7 @@ CLAY_BALL
CLOCK
COAL
COAL_BLOCK
COAL_ORE
COAL_ORE
COARSE_DIRT
COBBLESTONE
COBBLESTONE_SLAB
@ -175,7 +178,7 @@ COBBLESTONE_STAIRS
COBBLESTONE_WALL
COBWEB
COCOA
COCOA_BEANS
COCOA_BEANS
COD
COD_BUCKET
COD_SPAWN_EGG
@ -183,7 +186,7 @@ COMMAND_BLOCK
COMMAND_BLOCK_MINECART
COMPARATOR
COMPASS
COMPOSTER
COMPOSTER
CONDUIT
COOKED_BEEF
COOKED_CHICKEN
@ -191,7 +194,7 @@ COOKED_COD
COOKED_MUTTON
COOKED_PORKCHOP
COOKED_RABBIT
COOKED_SALMON
COOKED_SALMON
COOKIE
CORNFLOWER
COW_SPAWN_EGG
@ -199,7 +202,7 @@ CRACKED_STONE_BRICKS
CRAFTING_TABLE
CREEPER_BANNER_PATTERN
CREEPER_HEAD
CREEPER_SPAWN_EGG
CREEPER_SPAWN_EGG
CREEPER_WALL_HEAD
CROSSBOW
CUT_RED_SANDSTONE
@ -207,7 +210,7 @@ CUT_RED_SANDSTONE_SLAB
CUT_SANDSTONE
CUT_SANDSTONE_SLAB
CYAN_BANNER
CYAN_BED
CYAN_BED
CYAN_CARPET
CYAN_CONCRETE
CYAN_CONCRETE_POWDER
@ -215,7 +218,7 @@ CYAN_DYE
CYAN_GLAZED_TERRACOTTA
CYAN_SHULKER_BOX
CYAN_STAINED_GLASS
CYAN_STAINED_GLASS_PANE
CYAN_STAINED_GLASS_PANE
CYAN_TERRACOTTA
CYAN_WALL_BANNER
CYAN_WOOL
@ -223,7 +226,7 @@ DAMAGED_ANVIL
DANDELION
DARK_OAK_BOAT
DARK_OAK_BUTTON
DARK_OAK_DOOR
DARK_OAK_DOOR
DARK_OAK_FENCE
DARK_OAK_FENCE_GATE
DARK_OAK_LEAVES
@ -231,7 +234,7 @@ DARK_OAK_LOG
DARK_OAK_PLANKS
DARK_OAK_PRESSURE_PLATE
DARK_OAK_SAPLING
DARK_OAK_SIGN
DARK_OAK_SIGN
DARK_OAK_SLAB
DARK_OAK_STAIRS
DARK_OAK_TRAPDOOR
@ -239,7 +242,7 @@ DARK_OAK_WALL_SIGN
DARK_OAK_WOOD
DARK_PRISMARINE
DARK_PRISMARINE_SLAB
DARK_PRISMARINE_STAIRS
DARK_PRISMARINE_STAIRS
DAYLIGHT_DETECTOR
DEAD_BRAIN_CORAL
DEAD_BRAIN_CORAL_BLOCK
@ -247,7 +250,7 @@ DEAD_BRAIN_CORAL_FAN
DEAD_BRAIN_CORAL_WALL_FAN
DEAD_BUBBLE_CORAL
DEAD_BUBBLE_CORAL_BLOCK
DEAD_BUBBLE_CORAL_FAN
DEAD_BUBBLE_CORAL_FAN
DEAD_BUBBLE_CORAL_WALL_FAN
DEAD_BUSH
DEAD_FIRE_CORAL
@ -255,7 +258,7 @@ DEAD_FIRE_CORAL_BLOCK
DEAD_FIRE_CORAL_FAN
DEAD_FIRE_CORAL_WALL_FAN
DEAD_HORN_CORAL
DEAD_HORN_CORAL_BLOCK
DEAD_HORN_CORAL_BLOCK
DEAD_HORN_CORAL_FAN
DEAD_HORN_CORAL_WALL_FAN
DEAD_TUBE_CORAL
@ -263,7 +266,7 @@ DEAD_TUBE_CORAL_BLOCK
DEAD_TUBE_CORAL_FAN
DEAD_TUBE_CORAL_WALL_FAN
DEBUG_STICK
DETECTOR_RAIL
DETECTOR_RAIL
DIAMOND
DIAMOND_AXE
DIAMOND_BLOCK
@ -271,7 +274,7 @@ DIAMOND_BOOTS
DIAMOND_CHESTPLATE
DIAMOND_HELMET
DIAMOND_HOE
DIAMOND_HORSE_ARMOR
DIAMOND_HORSE_ARMOR
DIAMOND_LEGGINGS
DIAMOND_ORE
DIAMOND_PICKAXE
@ -279,7 +282,7 @@ DIAMOND_SHOVEL
DIAMOND_SWORD
DIORITE
DIORITE_SLAB
DIORITE_STAIRS
DIORITE_STAIRS
DIORITE_WALL
DIRT
DISPENSER
@ -287,7 +290,7 @@ DOLPHIN_SPAWN_EGG
DONKEY_SPAWN_EGG
DRAGON_BREATH
DRAGON_EGG
DRAGON_HEAD
DRAGON_HEAD
DRAGON_WALL_HEAD
DRIED_KELP
DRIED_KELP_BLOCK
@ -295,7 +298,7 @@ DROPPER
DROWNED_SPAWN_EGG
EGG
ELDER_GUARDIAN_SPAWN_EGG
ELYTRA
ELYTRA
EMERALD
EMERALD_BLOCK
EMERALD_ORE
@ -303,7 +306,7 @@ ENCHANTED_BOOK
ENCHANTED_GOLDEN_APPLE
ENCHANTING_TABLE
END_CRYSTAL
END_GATEWAY
END_GATEWAY
END_PORTAL
END_PORTAL_FRAME
END_ROD
@ -311,7 +314,7 @@ END_STONE
END_STONE_BRICK_SLAB
END_STONE_BRICK_STAIRS
END_STONE_BRICK_WALL
END_STONE_BRICKS
END_STONE_BRICKS
ENDER_CHEST
ENDER_EYE
ENDER_PEARL
@ -319,7 +322,7 @@ ENDERMAN_SPAWN_EGG
ENDERMITE_SPAWN_EGG
EVOKER_SPAWN_EGG
EXPERIENCE_BOTTLE
FARMLAND
FARMLAND
FEATHER
FERMENTED_SPIDER_EYE
FERN
@ -327,7 +330,7 @@ FILLED_MAP
FIRE
FIRE_CHARGE
FIRE_CORAL
FIRE_CORAL_BLOCK
FIRE_CORAL_BLOCK
FIRE_CORAL_FAN
FIRE_CORAL_WALL_FAN
FIREWORK_ROCKET
@ -335,7 +338,7 @@ FIREWORK_STAR
FISHING_ROD
FLETCHING_TABLE
FLINT
FLINT_AND_STEEL
FLINT_AND_STEEL
FLOWER_BANNER_PATTERN
FLOWER_POT
FOX_SPAWN_EGG
@ -343,7 +346,7 @@ FROSTED_ICE
FURNACE
FURNACE_MINECART
GHAST_SPAWN_EGG
GHAST_TEAR
GHAST_TEAR
GLASS
GLASS_BOTTLE
GLASS_PANE
@ -351,7 +354,7 @@ GLISTERING_MELON_SLICE
GLOBE_BANNER_PATTERN
GLOWSTONE
GLOWSTONE_DUST
GOLD_BLOCK
GOLD_BLOCK
GOLD_INGOT
GOLD_NUGGET
GOLD_ORE
@ -359,7 +362,7 @@ GOLDEN_APPLE
GOLDEN_AXE
GOLDEN_BOOTS
GOLDEN_CARROT
GOLDEN_CHESTPLATE
GOLDEN_CHESTPLATE
GOLDEN_HELMET
GOLDEN_HOE
GOLDEN_HORSE_ARMOR
@ -367,7 +370,7 @@ GOLDEN_LEGGINGS
GOLDEN_PICKAXE
GOLDEN_SHOVEL
GOLDEN_SWORD
GRANITE
GRANITE
GRANITE_SLAB
GRANITE_STAIRS
GRANITE_WALL
@ -375,7 +378,7 @@ GRASS
GRASS_BLOCK
GRASS_PATH
GRAVEL
GRAY_BANNER
GRAY_BANNER
GRAY_BED
GRAY_CARPET
GRAY_CONCRETE
@ -383,7 +386,7 @@ GRAY_CONCRETE_POWDER
GRAY_DYE
GRAY_GLAZED_TERRACOTTA
GRAY_SHULKER_BOX
GRAY_STAINED_GLASS
GRAY_STAINED_GLASS
GRAY_STAINED_GLASS_PANE
GRAY_TERRACOTTA
GRAY_WALL_BANNER
@ -391,7 +394,7 @@ GRAY_WOOL
GREEN_BANNER
GREEN_BED
GREEN_CARPET
GREEN_CONCRETE
GREEN_CONCRETE
GREEN_CONCRETE_POWDER
GREEN_DYE
GREEN_GLAZED_TERRACOTTA
@ -399,7 +402,7 @@ GREEN_SHULKER_BOX
GREEN_STAINED_GLASS
GREEN_STAINED_GLASS_PANE
GREEN_TERRACOTTA
GREEN_WALL_BANNER
GREEN_WALL_BANNER
GREEN_WOOL
GRINDSTONE
GUARDIAN_SPAWN_EGG
@ -407,7 +410,11 @@ GUNPOWDER
HAY_BLOCK
HEART_OF_THE_SEA
HEAVY_WEIGHTED_PRESSURE_PLATE
HOPPER
HONEY_BLOCK
HONEY_BOTTLE
HONEYCOMB
HONEYCOMB_BLOCK
HOPPER
HOPPER_MINECART
HORN_CORAL
HORN_CORAL_BLOCK
@ -415,7 +422,7 @@ HORN_CORAL_FAN
HORN_CORAL_WALL_FAN
HORSE_SPAWN_EGG
HUSK_SPAWN_EGG
ICE
ICE
INFESTED_CHISELED_STONE_BRICKS
INFESTED_COBBLESTONE
INFESTED_CRACKED_STONE_BRICKS
@ -423,7 +430,7 @@ INFESTED_MOSSY_STONE_BRICKS
INFESTED_STONE
INFESTED_STONE_BRICKS
INK_SAC
IRON_AXE
IRON_AXE
IRON_BARS
IRON_BLOCK
IRON_BOOTS
@ -431,7 +438,7 @@ IRON_CHESTPLATE
IRON_DOOR
IRON_HELMET
IRON_HOE
IRON_HORSE_ARMOR
IRON_HORSE_ARMOR
IRON_INGOT
IRON_LEGGINGS
IRON_NUGGET
@ -439,7 +446,7 @@ IRON_ORE
IRON_PICKAXE
IRON_SHOVEL
IRON_SWORD
IRON_TRAPDOOR
IRON_TRAPDOOR
ITEM_FRAME
JACK_O_LANTERN
JIGSAW
@ -447,7 +454,7 @@ JUKEBOX
JUNGLE_BOAT
JUNGLE_BUTTON
JUNGLE_DOOR
JUNGLE_FENCE
JUNGLE_FENCE
JUNGLE_FENCE_GATE
JUNGLE_LEAVES
JUNGLE_LOG
@ -455,7 +462,7 @@ JUNGLE_PLANKS
JUNGLE_PRESSURE_PLATE
JUNGLE_SAPLING
JUNGLE_SIGN
JUNGLE_SLAB
JUNGLE_SLAB
JUNGLE_STAIRS
JUNGLE_TRAPDOOR
JUNGLE_WALL_SIGN
@ -463,7 +470,7 @@ JUNGLE_WOOD
KELP
KELP_PLANT
KNOWLEDGE_BOOK
LADDER
LADDER
LANTERN
LAPIS_BLOCK
LAPIS_LAZULI
@ -471,7 +478,7 @@ LAPIS_ORE
LARGE_FERN
LAVA
LAVA_BUCKET
LEAD
LEAD
LEATHER
LEATHER_BOOTS
LEATHER_CHESTPLATE
@ -480,7 +487,7 @@ LEATHER_HORSE_ARMOR
LEATHER_LEGGINGS
LECTERN
LEVER
LIGHT_BLUE_BANNER
LIGHT_BLUE_BANNER
LIGHT_BLUE_BED
LIGHT_BLUE_CARPET
LIGHT_BLUE_CONCRETE
@ -488,7 +495,7 @@ LIGHT_BLUE_CONCRETE_POWDER
LIGHT_BLUE_DYE
LIGHT_BLUE_GLAZED_TERRACOTTA
LIGHT_BLUE_SHULKER_BOX
LIGHT_BLUE_STAINED_GLASS
LIGHT_BLUE_STAINED_GLASS
LIGHT_BLUE_STAINED_GLASS_PANE
LIGHT_BLUE_TERRACOTTA
LIGHT_BLUE_WALL_BANNER
@ -496,7 +503,7 @@ LIGHT_BLUE_WOOL
LIGHT_GRAY_BANNER
LIGHT_GRAY_BED
LIGHT_GRAY_CARPET
LIGHT_GRAY_CONCRETE
LIGHT_GRAY_CONCRETE
LIGHT_GRAY_CONCRETE_POWDER
LIGHT_GRAY_DYE
LIGHT_GRAY_GLAZED_TERRACOTTA
@ -504,7 +511,7 @@ LIGHT_GRAY_SHULKER_BOX
LIGHT_GRAY_STAINED_GLASS
LIGHT_GRAY_STAINED_GLASS_PANE
LIGHT_GRAY_TERRACOTTA
LIGHT_GRAY_WALL_BANNER
LIGHT_GRAY_WALL_BANNER
LIGHT_GRAY_WOOL
LIGHT_WEIGHTED_PRESSURE_PLATE
LILAC
@ -512,7 +519,7 @@ LILY_OF_THE_VALLEY
LILY_PAD
LIME_BANNER
LIME_BED
LIME_CARPET
LIME_CARPET
LIME_CONCRETE
LIME_CONCRETE_POWDER
LIME_DYE
@ -520,7 +527,7 @@ LIME_GLAZED_TERRACOTTA
LIME_SHULKER_BOX
LIME_STAINED_GLASS
LIME_STAINED_GLASS_PANE
LIME_TERRACOTTA
LIME_TERRACOTTA
LIME_WALL_BANNER
LIME_WOOL
LINGERING_POTION
@ -528,7 +535,7 @@ LLAMA_SPAWN_EGG
LOOM
MAGENTA_BANNER
MAGENTA_BED
MAGENTA_CARPET
MAGENTA_CARPET
MAGENTA_CONCRETE
MAGENTA_CONCRETE_POWDER
MAGENTA_DYE
@ -536,7 +543,7 @@ MAGENTA_GLAZED_TERRACOTTA
MAGENTA_SHULKER_BOX
MAGENTA_STAINED_GLASS
MAGENTA_STAINED_GLASS_PANE
MAGENTA_TERRACOTTA
MAGENTA_TERRACOTTA
MAGENTA_WALL_BANNER
MAGENTA_WOOL
MAGMA_BLOCK
@ -544,7 +551,7 @@ MAGMA_CREAM
MAGMA_CUBE_SPAWN_EGG
MAP
MELON
MELON_SEEDS
MELON_SEEDS
MELON_SLICE
MELON_STEM
MILK_BUCKET
@ -552,7 +559,7 @@ MINECART
MOJANG_BANNER_PATTERN
MOOSHROOM_SPAWN_EGG
MOSSY_COBBLESTONE
MOSSY_COBBLESTONE_SLAB
MOSSY_COBBLESTONE_SLAB
MOSSY_COBBLESTONE_STAIRS
MOSSY_COBBLESTONE_WALL
MOSSY_STONE_BRICK_SLAB
@ -560,7 +567,7 @@ MOSSY_STONE_BRICK_STAIRS
MOSSY_STONE_BRICK_WALL
MOSSY_STONE_BRICKS
MOVING_PISTON
MULE_SPAWN_EGG
MULE_SPAWN_EGG
MUSHROOM_STEM
MUSHROOM_STEW
MUSIC_DISC_11
@ -568,7 +575,7 @@ MUSIC_DISC_13
MUSIC_DISC_BLOCKS
MUSIC_DISC_CAT
MUSIC_DISC_CHIRP
MUSIC_DISC_FAR
MUSIC_DISC_FAR
MUSIC_DISC_MALL
MUSIC_DISC_MELLOHI
MUSIC_DISC_STAL
@ -576,7 +583,7 @@ MUSIC_DISC_STRAD
MUSIC_DISC_WAIT
MUSIC_DISC_WARD
MUTTON
MYCELIUM
MYCELIUM
NAME_TAG
NAUTILUS_SHELL
NETHER_BRICK
@ -584,7 +591,7 @@ NETHER_BRICK_FENCE
NETHER_BRICK_SLAB
NETHER_BRICK_STAIRS
NETHER_BRICK_WALL
NETHER_BRICKS
NETHER_BRICKS
NETHER_PORTAL
NETHER_QUARTZ_ORE
NETHER_STAR
@ -592,7 +599,7 @@ NETHER_WART
NETHER_WART_BLOCK
NETHERRACK
NOTE_BLOCK
OAK_BOAT
OAK_BOAT
OAK_BUTTON
OAK_DOOR
OAK_FENCE
@ -600,7 +607,7 @@ OAK_FENCE_GATE
OAK_LEAVES
OAK_LOG
OAK_PLANKS
OAK_PRESSURE_PLATE
OAK_PRESSURE_PLATE
OAK_SAPLING
OAK_SIGN
OAK_SLAB
@ -608,7 +615,7 @@ OAK_STAIRS
OAK_TRAPDOOR
OAK_WALL_SIGN
OAK_WOOD
OBSERVER
OBSERVER
OBSIDIAN
OCELOT_SPAWN_EGG
ORANGE_BANNER
@ -616,7 +623,7 @@ ORANGE_BED
ORANGE_CARPET
ORANGE_CONCRETE
ORANGE_CONCRETE_POWDER
ORANGE_DYE
ORANGE_DYE
ORANGE_GLAZED_TERRACOTTA
ORANGE_SHULKER_BOX
ORANGE_STAINED_GLASS
@ -624,7 +631,7 @@ ORANGE_STAINED_GLASS_PANE
ORANGE_TERRACOTTA
ORANGE_TULIP
ORANGE_WALL_BANNER
ORANGE_WOOL
ORANGE_WOOL
OXEYE_DAISY
PACKED_ICE
PAINTING
@ -632,7 +639,7 @@ PANDA_SPAWN_EGG
PAPER
PARROT_SPAWN_EGG
PEONY
PETRIFIED_OAK_SLAB
PETRIFIED_OAK_SLAB
PHANTOM_MEMBRANE
PHANTOM_SPAWN_EGG
PIG_SPAWN_EGG
@ -640,7 +647,7 @@ PILLAGER_SPAWN_EGG
PINK_BANNER
PINK_BED
PINK_CARPET
PINK_CONCRETE
PINK_CONCRETE
PINK_CONCRETE_POWDER
PINK_DYE
PINK_GLAZED_TERRACOTTA
@ -648,7 +655,7 @@ PINK_SHULKER_BOX
PINK_STAINED_GLASS
PINK_STAINED_GLASS_PANE
PINK_TERRACOTTA
PINK_TULIP
PINK_TULIP
PINK_WALL_BANNER
PINK_WOOL
PISTON
@ -656,7 +663,7 @@ PISTON_HEAD
PLAYER_HEAD
PLAYER_WALL_HEAD
PODZOL
POISONOUS_POTATO
POISONOUS_POTATO
POLAR_BEAR_SPAWN_EGG
POLISHED_ANDESITE
POLISHED_ANDESITE_SLAB
@ -664,7 +671,7 @@ POLISHED_ANDESITE_STAIRS
POLISHED_DIORITE
POLISHED_DIORITE_SLAB
POLISHED_DIORITE_STAIRS
POLISHED_GRANITE
POLISHED_GRANITE
POLISHED_GRANITE_SLAB
POLISHED_GRANITE_STAIRS
POPPED_CHORUS_FRUIT
@ -672,7 +679,7 @@ POPPY
PORKCHOP
POTATO
POTATOES
POTION
POTION
POTTED_ACACIA_SAPLING
POTTED_ALLIUM
POTTED_AZURE_BLUET
@ -680,7 +687,7 @@ POTTED_BAMBOO
POTTED_BIRCH_SAPLING
POTTED_BLUE_ORCHID
POTTED_BROWN_MUSHROOM
POTTED_CACTUS
POTTED_CACTUS
POTTED_CORNFLOWER
POTTED_DANDELION
POTTED_DARK_OAK_SAPLING
@ -688,7 +695,7 @@ POTTED_DEAD_BUSH
POTTED_FERN
POTTED_JUNGLE_SAPLING
POTTED_LILY_OF_THE_VALLEY
POTTED_OAK_SAPLING
POTTED_OAK_SAPLING
POTTED_ORANGE_TULIP
POTTED_OXEYE_DAISY
POTTED_PINK_TULIP
@ -696,7 +703,7 @@ POTTED_POPPY
POTTED_RED_MUSHROOM
POTTED_RED_TULIP
POTTED_SPRUCE_SAPLING
POTTED_WHITE_TULIP
POTTED_WHITE_TULIP
POTTED_WITHER_ROSE
POWERED_RAIL
PRISMARINE
@ -704,7 +711,7 @@ PRISMARINE_BRICK_SLAB
PRISMARINE_BRICK_STAIRS
PRISMARINE_BRICKS
PRISMARINE_CRYSTALS
PRISMARINE_SHARD
PRISMARINE_SHARD
PRISMARINE_SLAB
PRISMARINE_STAIRS
PRISMARINE_WALL
@ -712,7 +719,7 @@ PUFFERFISH
PUFFERFISH_BUCKET
PUFFERFISH_SPAWN_EGG
PUMPKIN
PUMPKIN_PIE
PUMPKIN_PIE
PUMPKIN_SEEDS
PUMPKIN_STEM
PURPLE_BANNER
@ -720,7 +727,7 @@ PURPLE_BED
PURPLE_CARPET
PURPLE_CONCRETE
PURPLE_CONCRETE_POWDER
PURPLE_DYE
PURPLE_DYE
PURPLE_GLAZED_TERRACOTTA
PURPLE_SHULKER_BOX
PURPLE_STAINED_GLASS
@ -728,7 +735,7 @@ PURPLE_STAINED_GLASS_PANE
PURPLE_TERRACOTTA
PURPLE_WALL_BANNER
PURPLE_WOOL
PURPUR_BLOCK
PURPUR_BLOCK
PURPUR_PILLAR
PURPUR_SLAB
PURPUR_STAIRS
@ -736,7 +743,7 @@ QUARTZ
QUARTZ_BLOCK
QUARTZ_PILLAR
QUARTZ_SLAB
QUARTZ_STAIRS
QUARTZ_STAIRS
RABBIT
RABBIT_FOOT
RABBIT_HIDE
@ -744,7 +751,7 @@ RABBIT_SPAWN_EGG
RABBIT_STEW
RAIL
RAVAGER_SPAWN_EGG
RED_BANNER
RED_BANNER
RED_BED
RED_CARPET
RED_CONCRETE
@ -752,7 +759,7 @@ RED_CONCRETE_POWDER
RED_DYE
RED_GLAZED_TERRACOTTA
RED_MUSHROOM
RED_MUSHROOM_BLOCK
RED_MUSHROOM_BLOCK
RED_NETHER_BRICK_SLAB
RED_NETHER_BRICK_STAIRS
RED_NETHER_BRICK_WALL
@ -760,7 +767,7 @@ RED_NETHER_BRICKS
RED_SAND
RED_SANDSTONE
RED_SANDSTONE_SLAB
RED_SANDSTONE_STAIRS
RED_SANDSTONE_STAIRS
RED_SANDSTONE_WALL
RED_SHULKER_BOX
RED_STAINED_GLASS
@ -768,7 +775,7 @@ RED_STAINED_GLASS_PANE
RED_TERRACOTTA
RED_TULIP
RED_WALL_BANNER
RED_WOOL
RED_WOOL
REDSTONE
REDSTONE_BLOCK
REDSTONE_LAMP
@ -776,7 +783,7 @@ REDSTONE_ORE
REDSTONE_TORCH
REDSTONE_WALL_TORCH
REDSTONE_WIRE
REPEATER
REPEATER
REPEATING_COMMAND_BLOCK
ROSE_BUSH
ROTTEN_FLESH
@ -784,7 +791,7 @@ SADDLE
SALMON
SALMON_BUCKET
SALMON_SPAWN_EGG
SAND
SAND
SANDSTONE
SANDSTONE_SLAB
SANDSTONE_STAIRS
@ -792,7 +799,7 @@ SANDSTONE_WALL
SCAFFOLDING
SCUTE
SEA_LANTERN
SEA_PICKLE
SEA_PICKLE
SEAGRASS
SHEARS
SHEEP_SPAWN_EGG
@ -800,7 +807,7 @@ SHIELD
SHULKER_BOX
SHULKER_SHELL
SHULKER_SPAWN_EGG
SILVERFISH_SPAWN_EGG
SILVERFISH_SPAWN_EGG
SKELETON_HORSE_SPAWN_EGG
SKELETON_SKULL
SKELETON_SPAWN_EGG
@ -808,7 +815,7 @@ SKELETON_WALL_SKULL
SKULL_BANNER_PATTERN
SLIME_BALL
SLIME_BLOCK
SLIME_SPAWN_EGG
SLIME_SPAWN_EGG
SMITHING_TABLE
SMOKER
SMOOTH_QUARTZ
@ -816,7 +823,7 @@ SMOOTH_QUARTZ_SLAB
SMOOTH_QUARTZ_STAIRS
SMOOTH_RED_SANDSTONE
SMOOTH_RED_SANDSTONE_SLAB
SMOOTH_RED_SANDSTONE_STAIRS
SMOOTH_RED_SANDSTONE_STAIRS
SMOOTH_SANDSTONE
SMOOTH_SANDSTONE_SLAB
SMOOTH_SANDSTONE_STAIRS
@ -824,7 +831,7 @@ SMOOTH_STONE
SMOOTH_STONE_SLAB
SNOW
SNOW_BLOCK
SNOWBALL
SNOWBALL
SOUL_SAND
SPAWNER
SPECTRAL_ARROW
@ -832,7 +839,7 @@ SPIDER_EYE
SPIDER_SPAWN_EGG
SPLASH_POTION
SPONGE
SPRUCE_BOAT
SPRUCE_BOAT
SPRUCE_BUTTON
SPRUCE_DOOR
SPRUCE_FENCE
@ -840,7 +847,7 @@ SPRUCE_FENCE_GATE
SPRUCE_LEAVES
SPRUCE_LOG
SPRUCE_PLANKS
SPRUCE_PRESSURE_PLATE
SPRUCE_PRESSURE_PLATE
SPRUCE_SAPLING
SPRUCE_SIGN
SPRUCE_SLAB
@ -848,7 +855,7 @@ SPRUCE_STAIRS
SPRUCE_TRAPDOOR
SPRUCE_WALL_SIGN
SPRUCE_WOOD
SQUID_SPAWN_EGG
SQUID_SPAWN_EGG
STICK
STICKY_PISTON
STONE
@ -856,7 +863,7 @@ STONE_AXE
STONE_BRICK_SLAB
STONE_BRICK_STAIRS
STONE_BRICK_WALL
STONE_BRICKS
STONE_BRICKS
STONE_BUTTON
STONE_HOE
STONE_PICKAXE
@ -864,7 +871,7 @@ STONE_PRESSURE_PLATE
STONE_SHOVEL
STONE_SLAB
STONE_STAIRS
STONE_SWORD
STONE_SWORD
STONECUTTER
STRAY_SPAWN_EGG
STRING
@ -872,7 +879,7 @@ STRIPPED_ACACIA_LOG
STRIPPED_ACACIA_WOOD
STRIPPED_BIRCH_LOG
STRIPPED_BIRCH_WOOD
STRIPPED_DARK_OAK_LOG
STRIPPED_DARK_OAK_LOG
STRIPPED_DARK_OAK_WOOD
STRIPPED_JUNGLE_LOG
STRIPPED_JUNGLE_WOOD
@ -880,7 +887,7 @@ STRIPPED_OAK_LOG
STRIPPED_OAK_WOOD
STRIPPED_SPRUCE_LOG
STRIPPED_SPRUCE_WOOD
STRUCTURE_BLOCK
STRUCTURE_BLOCK
STRUCTURE_VOID
SUGAR
SUGAR_CANE
@ -888,7 +895,7 @@ SUNFLOWER
SUSPICIOUS_STEW
SWEET_BERRIES
SWEET_BERRY_BUSH
TALL_GRASS
TALL_GRASS
TALL_SEAGRASS
TERRACOTTA
TIPPED_ARROW
@ -896,7 +903,7 @@ TNT
TNT_MINECART
TORCH
TOTEM_OF_UNDYING
TRADER_LLAMA_SPAWN_EGG
TRADER_LLAMA_SPAWN_EGG
TRAPPED_CHEST
TRIDENT
TRIPWIRE
@ -904,7 +911,7 @@ TRIPWIRE_HOOK
TROPICAL_FISH
TROPICAL_FISH_BUCKET
TROPICAL_FISH_SPAWN_EGG
TUBE_CORAL
TUBE_CORAL
TUBE_CORAL_BLOCK
TUBE_CORAL_FAN
TUBE_CORAL_WALL_FAN
@ -912,7 +919,7 @@ TURTLE_EGG
TURTLE_HELMET
TURTLE_SPAWN_EGG
VEX_SPAWN_EGG
VILLAGER_SPAWN_EGG
VILLAGER_SPAWN_EGG
VINDICATOR_SPAWN_EGG
VINE
VOID_AIR
@ -920,7 +927,7 @@ WALL_TORCH
WANDERING_TRADER_SPAWN_EGG
WATER
WATER_BUCKET
WET_SPONGE
WET_SPONGE
WHEAT
WHEAT_SEEDS
WHITE_BANNER
@ -928,7 +935,7 @@ WHITE_BED
WHITE_CARPET
WHITE_CONCRETE
WHITE_CONCRETE_POWDER
WHITE_DYE
WHITE_DYE
WHITE_GLAZED_TERRACOTTA
WHITE_SHULKER_BOX
WHITE_STAINED_GLASS
@ -936,7 +943,7 @@ WHITE_STAINED_GLASS_PANE
WHITE_TERRACOTTA
WHITE_TULIP
WHITE_WALL_BANNER
WHITE_WOOL
WHITE_WOOL
WITCH_SPAWN_EGG
WITHER_ROSE
WITHER_SKELETON_SKULL
@ -944,7 +951,7 @@ WITHER_SKELETON_SPAWN_EGG
WITHER_SKELETON_WALL_SKULL
WOLF_SPAWN_EGG
WOODEN_AXE
WOODEN_HOE
WOODEN_HOE
WOODEN_PICKAXE
WOODEN_SHOVEL
WOODEN_SWORD
@ -952,7 +959,7 @@ WRITABLE_BOOK
WRITTEN_BOOK
YELLOW_BANNER
YELLOW_BED
YELLOW_CARPET
YELLOW_CARPET
YELLOW_CONCRETE
YELLOW_CONCRETE_POWDER
YELLOW_DYE
@ -960,7 +967,7 @@ YELLOW_GLAZED_TERRACOTTA
YELLOW_SHULKER_BOX
YELLOW_STAINED_GLASS
YELLOW_STAINED_GLASS_PANE
YELLOW_TERRACOTTA
YELLOW_TERRACOTTA
YELLOW_WALL_BANNER
YELLOW_WOOL
ZOMBIE_HEAD

View File

@ -126,6 +126,8 @@ block.minecraft.barrel=Fass
block.minecraft.barrier=Barriere
block.minecraft.beacon=Leuchtfeuer
block.minecraft.bedrock=Grundgestein
block.minecraft.bee_nest=Bienennest
block.minecraft.beehive=Bienenstock
block.minecraft.beetroots=Rote Bete
block.minecraft.bell=Glocke
block.minecraft.birch_button=Birkenholzknopf
@ -347,6 +349,8 @@ block.minecraft.green_wool=Grüne Wolle
block.minecraft.grindstone=Schleifstein
block.minecraft.hay_block=Strohballen
block.minecraft.heavy_weighted_pressure_plate=Grobwägeplatte
block.minecraft.honey_block=Honigblock
block.minecraft.honeycomb_block=Honigwabenblock
block.minecraft.hopper=Trichter
block.minecraft.horn_coral=Geweihkoralle
block.minecraft.horn_coral_block=Geweihkorallenblock
@ -812,6 +816,7 @@ item.minecraft.armor_stand=Rüstungsständer
item.minecraft.arrow=Pfeil
item.minecraft.baked_potato=Ofenkartoffel
item.minecraft.bat_spawn_egg=Fledermaus-Spawn-Ei
item.minecraft.bee_spawn_egg=Bienen-Spawn-Ei
item.minecraft.beef=Rohes Rindfleisch
item.minecraft.beetroot=Rote Bete
item.minecraft.beetroot_seeds=Rote-Bete-Samen
@ -944,6 +949,8 @@ item.minecraft.green_dye=Grüner Farbstoff
item.minecraft.guardian_spawn_egg=Wächter-Spawn-Ei
item.minecraft.gunpowder=Schwarzpulver
item.minecraft.heart_of_the_sea=Herz des Meeres
item.minecraft.honey_bottle=Honigflasche
item.minecraft.honeycomb=Honigwabe
item.minecraft.hopper_minecart=Trichterlore
item.minecraft.horse_spawn_egg=Pferde-Spawn-Ei
item.minecraft.husk_spawn_egg=Wüstenzombie-Spawn-Ei

View File

@ -946,6 +946,10 @@ block.minecraft.bell=Bell
block.minecraft.lantern=Lantern
block.minecraft.sweet_berry_bush=Sweet Berry Bush
block.minecraft.campfire=Campfire
block.minecraft.beehive=Beehive
block.minecraft.bee_nest=Bee Nest
block.minecraft.honey_block=Honey Block
block.minecraft.honeycomb_block=Honeycomb Block
item.minecraft.name_tag=Name Tag
item.minecraft.lead=Lead
item.minecraft.iron_shovel=Iron Shovel
@ -1167,6 +1171,7 @@ item.minecraft.brewing_stand=Brewing Stand
item.minecraft.ender_eye=Eye of Ender
item.minecraft.glistering_melon_slice=Glistering Melon Slice
item.minecraft.bat_spawn_egg=Bat Spawn Egg
item.minecraft.bee_spawn_egg=Bee Spawn Egg
item.minecraft.blaze_spawn_egg=Blaze Spawn Egg
item.minecraft.cat_spawn_egg=Cat Spawn Egg
item.minecraft.cave_spider_spawn_egg=Cave Spider Spawn Egg
@ -1286,6 +1291,8 @@ item.minecraft.flower_banner_pattern.desc=Flower Charge
item.minecraft.mojang_banner_pattern.desc=Thing
item.minecraft.globe_banner_pattern.desc=Globe
item.minecraft.sweet_berries=Sweet Berries
item.minecraft.honey_bottle=Honey Bottle
item.minecraft.honeycomb=Honeycomb
effect.minecraft.speed=Speed
effect.minecraft.slowness=Slowness
effect.minecraft.haste=Haste