From 6d6de61560ceedcd3d7f2e1164670a6d16c4ea97 Mon Sep 17 00:00:00 2001 From: MattBDev <4009945+MattBDev@users.noreply.github.com> Date: Mon, 6 Jul 2020 23:54:55 -0400 Subject: [PATCH] Updated missing biomes, entities, and categories. --- .../com/sk89q/worldedit/world/biome/BiomeTypes.java | 7 ++++++- .../sk89q/worldedit/world/entity/EntityTypes.java | 7 ++++++- .../sk89q/worldedit/world/item/ItemCategories.java | 12 ++++++++++++ 3 files changed, 24 insertions(+), 2 deletions(-) diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/world/biome/BiomeTypes.java b/worldedit-core/src/main/java/com/sk89q/worldedit/world/biome/BiomeTypes.java index b75e597f5..0dc6b568d 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/world/biome/BiomeTypes.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/world/biome/BiomeTypes.java @@ -31,10 +31,12 @@ public final class BiomeTypes { @Nullable public static final BiomeType BADLANDS_PLATEAU = get("minecraft:badlands_plateau"); @Nullable public static final BiomeType BAMBOO_JUNGLE = get("minecraft:bamboo_jungle"); @Nullable public static final BiomeType BAMBOO_JUNGLE_HILLS = get("minecraft:bamboo_jungle_hills"); + @Nullable public static final BiomeType BASALT_DELTAS = get("minecraft:basalt_deltas"); @Nullable public static final BiomeType BEACH = get("minecraft:beach"); @Nullable public static final BiomeType BIRCH_FOREST = get("minecraft:birch_forest"); @Nullable public static final BiomeType BIRCH_FOREST_HILLS = get("minecraft:birch_forest_hills"); @Nullable public static final BiomeType COLD_OCEAN = get("minecraft:cold_ocean"); + @Nullable public static final BiomeType CRIMSON_FOREST = get("minecraft:crimson_forest"); @Nullable public static final BiomeType DARK_FOREST = get("minecraft:dark_forest"); @Nullable public static final BiomeType DARK_FOREST_HILLS = get("minecraft:dark_forest_hills"); @Nullable public static final BiomeType DEEP_COLD_OCEAN = get("minecraft:deep_cold_ocean"); @@ -72,7 +74,8 @@ public final class BiomeTypes { @Nullable public static final BiomeType MOUNTAINS = get("minecraft:mountains"); @Nullable public static final BiomeType MUSHROOM_FIELD_SHORE = get("minecraft:mushroom_field_shore"); @Nullable public static final BiomeType MUSHROOM_FIELDS = get("minecraft:mushroom_fields"); - @Nullable public static final BiomeType NETHER = get("minecraft:nether"); + @Nullable @Deprecated public static final BiomeType NETHER = get("minecraft:nether"); + @Nullable public static final BiomeType NETHER_WASTES = get("minecraft:nether_wastes"); @Nullable public static final BiomeType OCEAN = get("minecraft:ocean"); @Nullable public static final BiomeType PLAINS = get("minecraft:plains"); @Nullable public static final BiomeType RIVER = get("minecraft:river"); @@ -87,6 +90,7 @@ public final class BiomeTypes { @Nullable public static final BiomeType SNOWY_TAIGA_HILLS = get("minecraft:snowy_taiga_hills"); @Nullable public static final BiomeType SNOWY_TAIGA_MOUNTAINS = get("minecraft:snowy_taiga_mountains"); @Nullable public static final BiomeType SNOWY_TUNDRA = get("minecraft:snowy_tundra"); + @Nullable public static final BiomeType SOUL_SAND_VALLEY = get("minecraft:soul_sand_valley"); @Nullable public static final BiomeType STONE_SHORE = get("minecraft:stone_shore"); @Nullable public static final BiomeType SUNFLOWER_PLAINS = get("minecraft:sunflower_plains"); @Nullable public static final BiomeType SWAMP = get("minecraft:swamp"); @@ -99,6 +103,7 @@ public final class BiomeTypes { @Nullable public static final BiomeType THE_END = get("minecraft:the_end"); @Nullable public static final BiomeType THE_VOID = get("minecraft:the_void"); @Nullable public static final BiomeType WARM_OCEAN = get("minecraft:warm_ocean"); + @Nullable public static final BiomeType WARPED_FOREST = get("minecraft:warped_forest"); @Nullable public static final BiomeType WOODED_BADLANDS_PLATEAU = get("minecraft:wooded_badlands_plateau"); @Nullable public static final BiomeType WOODED_HILLS = get("minecraft:wooded_hills"); @Nullable public static final BiomeType WOODED_MOUNTAINS = get("minecraft:wooded_mountains"); diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/world/entity/EntityTypes.java b/worldedit-core/src/main/java/com/sk89q/worldedit/world/entity/EntityTypes.java index e174bff09..9d9b81422 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/world/entity/EntityTypes.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/world/entity/EntityTypes.java @@ -64,6 +64,7 @@ public class EntityTypes { @Nullable public static final EntityType GHAST = get("minecraft:ghast"); @Nullable public static final EntityType GIANT = get("minecraft:giant"); @Nullable public static final EntityType GUARDIAN = get("minecraft:guardian"); + @Nullable public static final EntityType HOGLIN = get("minecraft:hoglin"); @Nullable public static final EntityType HOPPER_MINECART = get("minecraft:hopper_minecart"); @Nullable public static final EntityType HORSE = get("minecraft:horse"); @Nullable public static final EntityType HUSK = get("minecraft:husk"); @@ -85,6 +86,7 @@ public class EntityTypes { @Nullable public static final EntityType PARROT = get("minecraft:parrot"); @Nullable public static final EntityType PHANTOM = get("minecraft:phantom"); @Nullable public static final EntityType PIG = get("minecraft:pig"); + @Nullable public static final EntityType PIGLIN = get("minecraft:piglin"); @Nullable public static final EntityType PILLAGER = get("minecraft:pillager"); @Nullable public static final EntityType PLAYER = get("minecraft:player"); @Nullable public static final EntityType POLAR_BEAR = get("minecraft:polar_bear"); @@ -108,6 +110,7 @@ public class EntityTypes { @Nullable public static final EntityType SPIDER = get("minecraft:spider"); @Nullable public static final EntityType SQUID = get("minecraft:squid"); @Nullable public static final EntityType STRAY = get("minecraft:stray"); + @Nullable public static final EntityType STRIDER = get("minecraft:strider"); @Nullable public static final EntityType TNT = get("minecraft:tnt"); @Nullable public static final EntityType TNT_MINECART = get("minecraft:tnt_minecart"); @Nullable public static final EntityType TRADER_LLAMA = get("minecraft:trader_llama"); @@ -123,10 +126,12 @@ public class EntityTypes { @Nullable public static final EntityType WITHER_SKELETON = get("minecraft:wither_skeleton"); @Nullable public static final EntityType WITHER_SKULL = get("minecraft:wither_skull"); @Nullable public static final EntityType WOLF = get("minecraft:wolf"); + @Nullable public static final EntityType ZOGLIN = get("minecraft:zoglin"); @Nullable public static final EntityType ZOMBIE = get("minecraft:zombie"); @Nullable public static final EntityType ZOMBIE_HORSE = get("minecraft:zombie_horse"); - @Nullable public static final EntityType ZOMBIE_PIGMAN = get("minecraft:zombie_pigman"); + @Nullable @Deprecated public static final EntityType ZOMBIE_PIGMAN = get("minecraft:zombie_pigman"); @Nullable public static final EntityType ZOMBIE_VILLAGER = get("minecraft:zombie_villager"); + @Nullable public static final EntityType ZOMBIFIED_PIGLIN = get("minecraft:zombified_piglin"); private EntityTypes() { } diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/world/item/ItemCategories.java b/worldedit-core/src/main/java/com/sk89q/worldedit/world/item/ItemCategories.java index b27813fd9..b1345af74 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/world/item/ItemCategories.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/world/item/ItemCategories.java @@ -28,23 +28,32 @@ public final class ItemCategories { public static final ItemCategory ANVIL = get("minecraft:anvil"); public static final ItemCategory ARROWS = get("minecraft:arrows"); public static final ItemCategory BANNERS = get("minecraft:banners"); + public static final ItemCategory BEACON_PAYMENT_ITEMS = get("minecraft:beacon_payment_items"); public static final ItemCategory BEDS = get("minecraft:beds"); public static final ItemCategory BIRCH_LOGS = get("minecraft:birch_logs"); public static final ItemCategory BOATS = get("minecraft:boats"); public static final ItemCategory BUTTONS = get("minecraft:buttons"); public static final ItemCategory CARPETS = get("minecraft:carpets"); public static final ItemCategory COALS = get("minecraft:coals"); + public static final ItemCategory CREEPER_DROP_MUSIC_DISCS = get("minecraft:creeper_drop_music_discs"); + public static final ItemCategory CRIMSON_STEMS = get("minecraft:crimson_stems"); public static final ItemCategory DARK_OAK_LOGS = get("minecraft:dark_oak_logs"); 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 FURNACE_MATERIALS = get("minecraft:furnace_materials"); + public static final ItemCategory GOLD_ORES = get("minecraft:gold_ores"); 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 LOGS_THAT_BURN = get("minecraft:logs_that_burn"); public static final ItemCategory MUSIC_DISCS = get("minecraft:music_discs"); + public static final ItemCategory NON_FLAMMABLE_WOOD = get("minecraft:non_flammable_wood"); public static final ItemCategory OAK_LOGS = get("minecraft:oak_logs"); + public static final ItemCategory PIGLIN_LOVED = get("minecraft:piglin_loved"); + public static final ItemCategory PIGLIN_REPELLENTS = get("minecraft:piglin_repellents"); public static final ItemCategory PLANKS = get("minecraft:planks"); public static final ItemCategory RAILS = get("minecraft:rails"); public static final ItemCategory SAND = get("minecraft:sand"); @@ -52,12 +61,15 @@ public final class ItemCategories { public static final ItemCategory SIGNS = get("minecraft:signs"); public static final ItemCategory SLABS = get("minecraft:slabs"); public static final ItemCategory SMALL_FLOWERS = get("minecraft:small_flowers"); + public static final ItemCategory SOUL_FIRE_BASE_BLOCKS = get("minecraft:soul_fire_base_blocks"); 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 STONE_TOOL_MATERIALS = get("minecraft:stone_tool_materials"); 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 WARPED_STEMS = get("minecraft:warped_stems"); public static final ItemCategory WOODEN_BUTTONS = get("minecraft:wooden_buttons"); public static final ItemCategory WOODEN_DOORS = get("minecraft:wooden_doors"); public static final ItemCategory WOODEN_FENCES = get("minecraft:wooden_fences");