More 1.15 wip

worldedit-core/src/main/java/com/sk89q/worldedit/world/block/BlockCategories.java

@@ -29,19 +29,23 @@ public final class BlockCategories {
     public static final BlockCategory BAMBOO_PLANTABLE_ON = get("minecraft:bamboo_plantable_on");
     public static final BlockCategory BANNERS = get("minecraft:banners");
     public static final BlockCategory BEDS = get("minecraft:beds");
+    public static final BlockCategory BEE_GROWABLES = get("minecraft:bee_growables");
+    public static final BlockCategory BEEHIVES = get("minecraft:beehives");
     public static final BlockCategory BIRCH_LOGS = get("minecraft:birch_logs");
     public static final BlockCategory BUTTONS = get("minecraft:buttons");
     public static final BlockCategory CARPETS = get("minecraft:carpets");
     public static final BlockCategory CORAL_BLOCKS = get("minecraft:coral_blocks");
     public static final BlockCategory CORAL_PLANTS = get("minecraft:coral_plants");
     public static final BlockCategory CORALS = get("minecraft:corals");
+    public static final BlockCategory CROPS = get("minecraft:crops");
     public static final BlockCategory DARK_OAK_LOGS = get("minecraft:dark_oak_logs");
-    public static final BlockCategory DIRT_LIKE = get("minecraft:dirt_like");
+    @Deprecated public static final BlockCategory DIRT_LIKE = get("minecraft:dirt_like");
     public static final BlockCategory DOORS = get("minecraft:doors");
     public static final BlockCategory DRAGON_IMMUNE = get("minecraft:dragon_immune");
     public static final BlockCategory ENDERMAN_HOLDABLE = get("minecraft:enderman_holdable");
     public static final BlockCategory FENCES = get("minecraft:fences");
     public static final BlockCategory FLOWER_POTS = get("minecraft:flower_pots");
+    public static final BlockCategory FLOWERS = get("minecraft:flowers");
     public static final BlockCategory ICE = get("minecraft:ice");
     public static final BlockCategory IMPERMEABLE = get("minecraft:impermeable");
     public static final BlockCategory JUNGLE_LOGS = get("minecraft:jungle_logs");
@@ -49,9 +53,11 @@ public final class BlockCategories {
     public static final BlockCategory LOGS = get("minecraft:logs");
     public static final BlockCategory OAK_LOGS = get("minecraft:oak_logs");
     public static final BlockCategory PLANKS = get("minecraft:planks");
+    public static final BlockCategory PORTALS = get("minecraft:portals");
     public static final BlockCategory RAILS = get("minecraft:rails");
     public static final BlockCategory SAND = get("minecraft:sand");
     public static final BlockCategory SAPLINGS = get("minecraft:saplings");
+    public static final BlockCategory SHULKER_BOXES = get("minecraft:shulker_boxes");
     public static final BlockCategory SIGNS = get("minecraft:signs");
     public static final BlockCategory SLABS = get("minecraft:slabs");
     public static final BlockCategory SMALL_FLOWERS = get("minecraft:small_flowers");
@@ -59,6 +65,7 @@ public final class BlockCategories {
     public static final BlockCategory STAIRS = get("minecraft:stairs");
     public static final BlockCategory STANDING_SIGNS = get("minecraft:standing_signs");
     public static final BlockCategory STONE_BRICKS = get("minecraft:stone_bricks");
+    public static final BlockCategory TALL_FLOWERS = get("minecraft:tall_flowers");
     public static final BlockCategory TRAPDOORS = get("minecraft:trapdoors");
     public static final BlockCategory UNDERWATER_BONEMEALS = get("minecraft:underwater_bonemeals");
     public static final BlockCategory VALID_SPAWN = get("minecraft:valid_spawn");

worldedit-core/src/main/java/com/sk89q/worldedit/world/block/BlockTypes.java

@@ -90,6 +90,8 @@ public final class BlockTypes {
     @Nullable public static final BlockType BARRIER = init();
     @Nullable public static final BlockType BEACON = init();
     @Nullable public static final BlockType BEDROCK = init();
+    @Nullable public static final BlockType BEE_NEST = init();
+    @Nullable public static final BlockType BEEHIVE = init();
     @Nullable public static final BlockType BEETROOTS = init();
     @Nullable public static final BlockType BELL = init();
     @Nullable public static final BlockType BIRCH_BUTTON = init();
@@ -336,6 +338,8 @@ public final class BlockTypes {
     @Nullable public static final BlockType GRINDSTONE = init();
     @Nullable public static final BlockType HAY_BLOCK = init();
     @Nullable public static final BlockType HEAVY_WEIGHTED_PRESSURE_PLATE = init();
+    @Nullable public static final BlockType HONEY_BLOCK = init();
+    @Nullable public static final BlockType HONEYCOMB_BLOCK = init();
     @Nullable public static final BlockType HOPPER = init();
     @Nullable public static final BlockType HORN_CORAL = init();
     @Nullable public static final BlockType HORN_CORAL_BLOCK = init();

worldedit-core/src/main/java/com/sk89q/worldedit/world/entity/EntityTypes.java

@@ -28,6 +28,7 @@ public class EntityTypes {
     @Nullable public static final EntityType ARMOR_STAND = get("minecraft:armor_stand");
     @Nullable public static final EntityType ARROW = get("minecraft:arrow");
     @Nullable public static final EntityType BAT = get("minecraft:bat");
+    @Nullable public static final EntityType BEE = get("minecraft:bee");
     @Nullable public static final EntityType BLAZE = get("minecraft:blaze");
     @Nullable public static final EntityType BOAT = get("minecraft:boat");
     @Nullable public static final EntityType CAT = get("minecraft:cat");

worldedit-core/src/main/java/com/sk89q/worldedit/world/item/ItemCategories.java

@@ -38,8 +38,10 @@ public final class ItemCategories {
     public static final ItemCategory DOORS = get("minecraft:doors");
     public static final ItemCategory FENCES = get("minecraft:fences");
     public static final ItemCategory FISHES = get("minecraft:fishes");
+    public static final ItemCategory FLOWERS = get("minecraft:flowers");
     public static final ItemCategory JUNGLE_LOGS = get("minecraft:jungle_logs");
     public static final ItemCategory LEAVES = get("minecraft:leaves");
+    public static final ItemCategory LECTERN_BOOKS = get("minecraft:lectern_books");
     public static final ItemCategory LOGS = get("minecraft:logs");
     public static final ItemCategory MUSIC_DISCS = get("minecraft:music_discs");
     public static final ItemCategory OAK_LOGS = get("minecraft:oak_logs");
@@ -53,6 +55,7 @@ public final class ItemCategories {
     public static final ItemCategory SPRUCE_LOGS = get("minecraft:spruce_logs");
     public static final ItemCategory STAIRS = get("minecraft:stairs");
     public static final ItemCategory STONE_BRICKS = get("minecraft:stone_bricks");
+    public static final ItemCategory TALL_FLOWERS = get("minecraft:tall_flowers");
     public static final ItemCategory TRAPDOORS = get("minecraft:trapdoors");
     public static final ItemCategory WALLS = get("minecraft:walls");
     public static final ItemCategory WOODEN_BUTTONS = get("minecraft:wooden_buttons");

worldedit-core/src/main/java/com/sk89q/worldedit/world/item/ItemTypes.java

@@ -68,7 +68,10 @@ public final class ItemTypes {
     @Nullable public static final ItemType BAT_SPAWN_EGG = init();
     @Nullable public static final ItemType BEACON = init();
     @Nullable public static final ItemType BEDROCK = init();
+    @Nullable public static final ItemType BEE_NEST = init();
+    @Nullable public static final ItemType BEE_SPAWN_EGG = init();
     @Nullable public static final ItemType BEEF = init();
+    @Nullable public static final ItemType BEEHIVE = init();
     @Nullable public static final ItemType BEETROOT = init();
     @Nullable public static final ItemType BEETROOT_SEEDS = init();
     @Nullable public static final ItemType BEETROOT_SOUP = init();
@@ -409,6 +412,10 @@ public final class ItemTypes {
     @Nullable public static final ItemType HAY_BLOCK = init();
     @Nullable public static final ItemType HEART_OF_THE_SEA = init();
     @Nullable public static final ItemType HEAVY_WEIGHTED_PRESSURE_PLATE = init();
+    @Nullable public static final ItemType HONEY_BLOCK = init();
+    @Nullable public static final ItemType HONEY_BOTTLE = init();
+    @Nullable public static final ItemType HONEYCOMB = init();
+    @Nullable public static final ItemType HONEYCOMB_BLOCK = init();
     @Nullable public static final ItemType HOPPER = init();
     @Nullable public static final ItemType HOPPER_MINECART = init();
     @Nullable public static final ItemType HORN_CORAL = init();

worldedit-core/src/main/java/com/sk89q/worldedit/world/registry/BundledBlockData.java

@@ -90,7 +90,9 @@ public final class BundledBlockData {
         Gson gson = gsonBuilder.create();
         URL url = null;
         final int dataVersion = WorldEdit.getInstance().getPlatformManager().queryCapability(Capability.WORLD_EDITING).getDataVersion();
-        if (dataVersion > 1900) { // > MC 1.13
+        if (dataVersion > 2224) { // > MC 1.14
+            url = ResourceLoader.getResource(BundledBlockData.class, "blocks.115.json");
+        } else if (dataVersion > 1900) { // > MC 1.13
             url = ResourceLoader.getResource(BundledBlockData.class, "blocks.114.json");
         }
         if (url == null) {

worldedit-core/src/main/java/com/sk89q/worldedit/world/registry/BundledItemData.java

@@ -79,7 +79,9 @@ public final class BundledItemData {
         Gson gson = gsonBuilder.create();
         URL url = null;
         final int dataVersion = WorldEdit.getInstance().getPlatformManager().queryCapability(Capability.WORLD_EDITING).getDataVersion();
-        if (dataVersion > 1900) { // > MC 1.13
+        if (dataVersion > 2224) { // > MC 1.14
+            url = ResourceLoader.getResource(BundledBlockData.class, "items.115.json");
+        } else if (dataVersion > 1900) { // > MC 1.13
             url = ResourceLoader.getResource(BundledBlockData.class, "items.114.json");
         }
         if (url == null) {

worldedit-core/src/test/java/com/sk89q/worldedit/internal/expression/BaseExpressionTest.java

@@ -47,6 +47,7 @@ class BaseExpressionTest {
             }
         });
         WorldEdit.getInstance().getPlatformManager().register(mockPlat);
+        WorldEdit.getInstance().getConfiguration().calculationTimeout = 1_000;
     }
 
     double simpleEval(String expressionString) throws ExpressionException {