Add support for 1.15

Fixes #291

pom.xml

@@ -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>

script/entries.txt

@@ -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

src/main/java/de/epiceric/shopchest/ShopChest.java

@@ -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() + "!");

src/main/java/de/epiceric/shopchest/language/LanguageUtils.java

@@ -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")));

src/main/java/de/epiceric/shopchest/utils/Utils.java

@@ -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;
                 }

src/main/resources/item_names.txt

@@ -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
@@ -39,7 +39,10 @@ BARRIER
 BAT_SPAWN_EGG
 BEACON
 BEDROCK
+BEE_NEST
+BEE_SPAWN_EGG
 BEEF 
+BEEHIVE
 BEETROOT
 BEETROOT_SEEDS
 BEETROOT_SOUP
@@ -407,6 +410,10 @@ GUNPOWDER
 HAY_BLOCK
 HEART_OF_THE_SEA
 HEAVY_WEIGHTED_PRESSURE_PLATE
+HONEY_BLOCK
+HONEY_BOTTLE
+HONEYCOMB
+HONEYCOMB_BLOCK
 HOPPER 
 HOPPER_MINECART
 HORN_CORAL

src/main/resources/lang/de_DE.lang

@@ -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

src/main/resources/lang/en_US.lang

@@ -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