diff --git a/src/main/java/org/bukkit/Art.java b/src/main/java/org/bukkit/Art.java index 199976b7..f6260fb3 100644 --- a/src/main/java/org/bukkit/Art.java +++ b/src/main/java/org/bukkit/Art.java @@ -4,7 +4,6 @@ import com.google.common.base.Preconditions; import com.google.common.collect.Lists; import com.google.common.collect.Maps; import java.util.Map; -import org.apache.commons.lang.Validate; import org.bukkit.util.OldEnum; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -43,6 +42,10 @@ public abstract class Art extends OldEnum implements Keyed { public static final Art BURNING_SKULL = getArt("burning_skull"); public static final Art SKELETON = getArt("skeleton"); public static final Art DONKEY_KONG = getArt("donkey_kong"); + public static final Art EARTH = getArt("earth"); + public static final Art WIND = getArt("wind"); + public static final Art WATER = getArt("water"); + public static final Art FIRE = getArt("fire"); @NotNull private static Art getArt(@NotNull String key) { @@ -63,7 +66,7 @@ public abstract class Art extends OldEnum implements Keyed { */ @Nullable public static Art getByName(@NotNull String name) { - Validate.notNull(name, "Name cannot be null"); + Preconditions.checkArgument(name != null, "Name cannot be null"); return Registry.ART.get(NamespacedKey.fromString(name.toLowerCase(java.util.Locale.ENGLISH))); } diff --git a/src/main/java/org/bukkit/Material.java b/src/main/java/org/bukkit/Material.java index 3ffb9284..72f16fd3 100644 --- a/src/main/java/org/bukkit/Material.java +++ b/src/main/java/org/bukkit/Material.java @@ -3,7 +3,6 @@ package org.bukkit; import com.google.common.base.Preconditions; import com.google.common.collect.Multimap; import java.util.function.Consumer; -import org.apache.commons.lang.Validate; import org.bukkit.attribute.Attribute; import org.bukkit.attribute.AttributeModifier; import org.bukkit.block.BlockType; @@ -40,6 +39,7 @@ public interface Material extends Keyed, Comparable { Material COARSE_DIRT = getMaterial("coarse_dirt"); Material PODZOL = getMaterial("podzol"); Material ROOTED_DIRT = getMaterial("rooted_dirt"); + Material MUD = getMaterial("mud"); Material CRIMSON_NYLIUM = getMaterial("crimson_nylium"); Material WARPED_NYLIUM = getMaterial("warped_nylium"); Material COBBLESTONE = getMaterial("cobblestone"); @@ -49,6 +49,7 @@ public interface Material extends Keyed, Comparable { Material JUNGLE_PLANKS = getMaterial("jungle_planks"); Material ACACIA_PLANKS = getMaterial("acacia_planks"); Material DARK_OAK_PLANKS = getMaterial("dark_oak_planks"); + Material MANGROVE_PLANKS = getMaterial("mangrove_planks"); Material CRIMSON_PLANKS = getMaterial("crimson_planks"); Material WARPED_PLANKS = getMaterial("warped_planks"); Material OAK_SAPLING = getMaterial("oak_sapling"); @@ -57,6 +58,7 @@ public interface Material extends Keyed, Comparable { Material JUNGLE_SAPLING = getMaterial("jungle_sapling"); Material ACACIA_SAPLING = getMaterial("acacia_sapling"); Material DARK_OAK_SAPLING = getMaterial("dark_oak_sapling"); + Material MANGROVE_PROPAGULE = getMaterial("mangrove_propagule"); Material BEDROCK = getMaterial("bedrock"); Material SAND = getMaterial("sand"); Material RED_SAND = getMaterial("red_sand"); @@ -128,6 +130,9 @@ public interface Material extends Keyed, Comparable { Material JUNGLE_LOG = getMaterial("jungle_log"); Material ACACIA_LOG = getMaterial("acacia_log"); Material DARK_OAK_LOG = getMaterial("dark_oak_log"); + Material MANGROVE_LOG = getMaterial("mangrove_log"); + Material MANGROVE_ROOTS = getMaterial("mangrove_roots"); + Material MUDDY_MANGROVE_ROOTS = getMaterial("muddy_mangrove_roots"); Material CRIMSON_STEM = getMaterial("crimson_stem"); Material WARPED_STEM = getMaterial("warped_stem"); Material STRIPPED_OAK_LOG = getMaterial("stripped_oak_log"); @@ -136,6 +141,7 @@ public interface Material extends Keyed, Comparable { Material STRIPPED_JUNGLE_LOG = getMaterial("stripped_jungle_log"); Material STRIPPED_ACACIA_LOG = getMaterial("stripped_acacia_log"); Material STRIPPED_DARK_OAK_LOG = getMaterial("stripped_dark_oak_log"); + Material STRIPPED_MANGROVE_LOG = getMaterial("stripped_mangrove_log"); Material STRIPPED_CRIMSON_STEM = getMaterial("stripped_crimson_stem"); Material STRIPPED_WARPED_STEM = getMaterial("stripped_warped_stem"); Material STRIPPED_OAK_WOOD = getMaterial("stripped_oak_wood"); @@ -144,6 +150,7 @@ public interface Material extends Keyed, Comparable { Material STRIPPED_JUNGLE_WOOD = getMaterial("stripped_jungle_wood"); Material STRIPPED_ACACIA_WOOD = getMaterial("stripped_acacia_wood"); Material STRIPPED_DARK_OAK_WOOD = getMaterial("stripped_dark_oak_wood"); + Material STRIPPED_MANGROVE_WOOD = getMaterial("stripped_mangrove_wood"); Material STRIPPED_CRIMSON_HYPHAE = getMaterial("stripped_crimson_hyphae"); Material STRIPPED_WARPED_HYPHAE = getMaterial("stripped_warped_hyphae"); Material OAK_WOOD = getMaterial("oak_wood"); @@ -152,6 +159,7 @@ public interface Material extends Keyed, Comparable { Material JUNGLE_WOOD = getMaterial("jungle_wood"); Material ACACIA_WOOD = getMaterial("acacia_wood"); Material DARK_OAK_WOOD = getMaterial("dark_oak_wood"); + Material MANGROVE_WOOD = getMaterial("mangrove_wood"); Material CRIMSON_HYPHAE = getMaterial("crimson_hyphae"); Material WARPED_HYPHAE = getMaterial("warped_hyphae"); Material OAK_LEAVES = getMaterial("oak_leaves"); @@ -160,6 +168,7 @@ public interface Material extends Keyed, Comparable { Material JUNGLE_LEAVES = getMaterial("jungle_leaves"); Material ACACIA_LEAVES = getMaterial("acacia_leaves"); Material DARK_OAK_LEAVES = getMaterial("dark_oak_leaves"); + Material MANGROVE_LEAVES = getMaterial("mangrove_leaves"); Material AZALEA_LEAVES = getMaterial("azalea_leaves"); Material FLOWERING_AZALEA_LEAVES = getMaterial("flowering_azalea_leaves"); Material SPONGE = getMaterial("sponge"); @@ -231,6 +240,7 @@ public interface Material extends Keyed, Comparable { Material JUNGLE_SLAB = getMaterial("jungle_slab"); Material ACACIA_SLAB = getMaterial("acacia_slab"); Material DARK_OAK_SLAB = getMaterial("dark_oak_slab"); + Material MANGROVE_SLAB = getMaterial("mangrove_slab"); Material CRIMSON_SLAB = getMaterial("crimson_slab"); Material WARPED_SLAB = getMaterial("warped_slab"); Material STONE_SLAB = getMaterial("stone_slab"); @@ -241,6 +251,7 @@ public interface Material extends Keyed, Comparable { Material COBBLESTONE_SLAB = getMaterial("cobblestone_slab"); Material BRICK_SLAB = getMaterial("brick_slab"); Material STONE_BRICK_SLAB = getMaterial("stone_brick_slab"); + Material MUD_BRICK_SLAB = getMaterial("mud_brick_slab"); Material NETHER_BRICK_SLAB = getMaterial("nether_brick_slab"); Material QUARTZ_SLAB = getMaterial("quartz_slab"); Material RED_SANDSTONE_SLAB = getMaterial("red_sandstone_slab"); @@ -265,7 +276,6 @@ public interface Material extends Keyed, Comparable { Material PURPUR_PILLAR = getMaterial("purpur_pillar"); Material PURPUR_STAIRS = getMaterial("purpur_stairs"); Material SPAWNER = getMaterial("spawner"); - Material OAK_STAIRS = getMaterial("oak_stairs"); Material CHEST = getMaterial("chest"); Material CRAFTING_TABLE = getMaterial("crafting_table"); Material FARMLAND = getMaterial("farmland"); @@ -284,6 +294,7 @@ public interface Material extends Keyed, Comparable { Material JUNGLE_FENCE = getMaterial("jungle_fence"); Material ACACIA_FENCE = getMaterial("acacia_fence"); Material DARK_OAK_FENCE = getMaterial("dark_oak_fence"); + Material MANGROVE_FENCE = getMaterial("mangrove_fence"); Material CRIMSON_FENCE = getMaterial("crimson_fence"); Material WARPED_FENCE = getMaterial("warped_fence"); Material PUMPKIN = getMaterial("pumpkin"); @@ -308,11 +319,14 @@ public interface Material extends Keyed, Comparable { Material MOSSY_STONE_BRICKS = getMaterial("mossy_stone_bricks"); Material CRACKED_STONE_BRICKS = getMaterial("cracked_stone_bricks"); Material CHISELED_STONE_BRICKS = getMaterial("chiseled_stone_bricks"); + Material PACKED_MUD = getMaterial("packed_mud"); + Material MUD_BRICKS = getMaterial("mud_bricks"); Material DEEPSLATE_BRICKS = getMaterial("deepslate_bricks"); Material CRACKED_DEEPSLATE_BRICKS = getMaterial("cracked_deepslate_bricks"); Material DEEPSLATE_TILES = getMaterial("deepslate_tiles"); Material CRACKED_DEEPSLATE_TILES = getMaterial("cracked_deepslate_tiles"); Material CHISELED_DEEPSLATE = getMaterial("chiseled_deepslate"); + Material REINFORCED_DEEPSLATE = getMaterial("reinforced_deepslate"); Material BROWN_MUSHROOM_BLOCK = getMaterial("brown_mushroom_block"); Material RED_MUSHROOM_BLOCK = getMaterial("red_mushroom_block"); Material MUSHROOM_STEM = getMaterial("mushroom_stem"); @@ -324,6 +338,7 @@ public interface Material extends Keyed, Comparable { Material GLOW_LICHEN = getMaterial("glow_lichen"); Material BRICK_STAIRS = getMaterial("brick_stairs"); Material STONE_BRICK_STAIRS = getMaterial("stone_brick_stairs"); + Material MUD_BRICK_STAIRS = getMaterial("mud_brick_stairs"); Material MYCELIUM = getMaterial("mycelium"); Material LILY_PAD = getMaterial("lily_pad"); Material NETHER_BRICKS = getMaterial("nether_bricks"); @@ -331,6 +346,10 @@ public interface Material extends Keyed, Comparable { Material CHISELED_NETHER_BRICKS = getMaterial("chiseled_nether_bricks"); Material NETHER_BRICK_FENCE = getMaterial("nether_brick_fence"); Material NETHER_BRICK_STAIRS = getMaterial("nether_brick_stairs"); + Material SCULK = getMaterial("sculk"); + Material SCULK_VEIN = getMaterial("sculk_vein"); + Material SCULK_CATALYST = getMaterial("sculk_catalyst"); + Material SCULK_SHRIEKER = getMaterial("sculk_shrieker"); Material ENCHANTING_TABLE = getMaterial("enchanting_table"); Material END_PORTAL_FRAME = getMaterial("end_portal_frame"); Material END_STONE = getMaterial("end_stone"); @@ -339,9 +358,13 @@ public interface Material extends Keyed, Comparable { Material SANDSTONE_STAIRS = getMaterial("sandstone_stairs"); Material ENDER_CHEST = getMaterial("ender_chest"); Material EMERALD_BLOCK = getMaterial("emerald_block"); + Material OAK_STAIRS = getMaterial("oak_stairs"); Material SPRUCE_STAIRS = getMaterial("spruce_stairs"); Material BIRCH_STAIRS = getMaterial("birch_stairs"); Material JUNGLE_STAIRS = getMaterial("jungle_stairs"); + Material ACACIA_STAIRS = getMaterial("acacia_stairs"); + Material DARK_OAK_STAIRS = getMaterial("dark_oak_stairs"); + Material MANGROVE_STAIRS = getMaterial("mangrove_stairs"); Material CRIMSON_STAIRS = getMaterial("crimson_stairs"); Material WARPED_STAIRS = getMaterial("warped_stairs"); Material COMMAND_BLOCK = getMaterial("command_block"); @@ -354,6 +377,7 @@ public interface Material extends Keyed, Comparable { Material MOSSY_STONE_BRICK_WALL = getMaterial("mossy_stone_brick_wall"); Material GRANITE_WALL = getMaterial("granite_wall"); Material STONE_BRICK_WALL = getMaterial("stone_brick_wall"); + Material MUD_BRICK_WALL = getMaterial("mud_brick_wall"); Material NETHER_BRICK_WALL = getMaterial("nether_brick_wall"); Material ANDESITE_WALL = getMaterial("andesite_wall"); Material RED_NETHER_BRICK_WALL = getMaterial("red_nether_brick_wall"); @@ -412,8 +436,6 @@ public interface Material extends Keyed, Comparable { Material BLACK_CARPET = getMaterial("black_carpet"); Material TERRACOTTA = getMaterial("terracotta"); Material PACKED_ICE = getMaterial("packed_ice"); - Material ACACIA_STAIRS = getMaterial("acacia_stairs"); - Material DARK_OAK_STAIRS = getMaterial("dark_oak_stairs"); Material DIRT_PATH = getMaterial("dirt_path"); Material SUNFLOWER = getMaterial("sunflower"); Material LILAC = getMaterial("lilac"); @@ -638,6 +660,7 @@ public interface Material extends Keyed, Comparable { Material JUNGLE_BUTTON = getMaterial("jungle_button"); Material ACACIA_BUTTON = getMaterial("acacia_button"); Material DARK_OAK_BUTTON = getMaterial("dark_oak_button"); + Material MANGROVE_BUTTON = getMaterial("mangrove_button"); Material CRIMSON_BUTTON = getMaterial("crimson_button"); Material WARPED_BUTTON = getMaterial("warped_button"); Material STONE_PRESSURE_PLATE = getMaterial("stone_pressure_plate"); @@ -650,6 +673,7 @@ public interface Material extends Keyed, Comparable { Material JUNGLE_PRESSURE_PLATE = getMaterial("jungle_pressure_plate"); Material ACACIA_PRESSURE_PLATE = getMaterial("acacia_pressure_plate"); Material DARK_OAK_PRESSURE_PLATE = getMaterial("dark_oak_pressure_plate"); + Material MANGROVE_PRESSURE_PLATE = getMaterial("mangrove_pressure_plate"); Material CRIMSON_PRESSURE_PLATE = getMaterial("crimson_pressure_plate"); Material WARPED_PRESSURE_PLATE = getMaterial("warped_pressure_plate"); Material IRON_DOOR = getMaterial("iron_door"); @@ -659,6 +683,7 @@ public interface Material extends Keyed, Comparable { Material JUNGLE_DOOR = getMaterial("jungle_door"); Material ACACIA_DOOR = getMaterial("acacia_door"); Material DARK_OAK_DOOR = getMaterial("dark_oak_door"); + Material MANGROVE_DOOR = getMaterial("mangrove_door"); Material CRIMSON_DOOR = getMaterial("crimson_door"); Material WARPED_DOOR = getMaterial("warped_door"); Material IRON_TRAPDOOR = getMaterial("iron_trapdoor"); @@ -668,6 +693,7 @@ public interface Material extends Keyed, Comparable { Material JUNGLE_TRAPDOOR = getMaterial("jungle_trapdoor"); Material ACACIA_TRAPDOOR = getMaterial("acacia_trapdoor"); Material DARK_OAK_TRAPDOOR = getMaterial("dark_oak_trapdoor"); + Material MANGROVE_TRAPDOOR = getMaterial("mangrove_trapdoor"); Material CRIMSON_TRAPDOOR = getMaterial("crimson_trapdoor"); Material WARPED_TRAPDOOR = getMaterial("warped_trapdoor"); Material OAK_FENCE_GATE = getMaterial("oak_fence_gate"); @@ -676,6 +702,7 @@ public interface Material extends Keyed, Comparable { Material JUNGLE_FENCE_GATE = getMaterial("jungle_fence_gate"); Material ACACIA_FENCE_GATE = getMaterial("acacia_fence_gate"); Material DARK_OAK_FENCE_GATE = getMaterial("dark_oak_fence_gate"); + Material MANGROVE_FENCE_GATE = getMaterial("mangrove_fence_gate"); Material CRIMSON_FENCE_GATE = getMaterial("crimson_fence_gate"); Material WARPED_FENCE_GATE = getMaterial("warped_fence_gate"); Material POWERED_RAIL = getMaterial("powered_rail"); @@ -692,11 +719,19 @@ public interface Material extends Keyed, Comparable { Material WARPED_FUNGUS_ON_A_STICK = getMaterial("warped_fungus_on_a_stick"); Material ELYTRA = getMaterial("elytra"); Material OAK_BOAT = getMaterial("oak_boat"); + Material OAK_CHEST_BOAT = getMaterial("oak_chest_boat"); Material SPRUCE_BOAT = getMaterial("spruce_boat"); + Material SPRUCE_CHEST_BOAT = getMaterial("spruce_chest_boat"); Material BIRCH_BOAT = getMaterial("birch_boat"); + Material BIRCH_CHEST_BOAT = getMaterial("birch_chest_boat"); Material JUNGLE_BOAT = getMaterial("jungle_boat"); + Material JUNGLE_CHEST_BOAT = getMaterial("jungle_chest_boat"); Material ACACIA_BOAT = getMaterial("acacia_boat"); + Material ACACIA_CHEST_BOAT = getMaterial("acacia_chest_boat"); Material DARK_OAK_BOAT = getMaterial("dark_oak_boat"); + Material DARK_OAK_CHEST_BOAT = getMaterial("dark_oak_chest_boat"); + Material MANGROVE_BOAT = getMaterial("mangrove_boat"); + Material MANGROVE_CHEST_BOAT = getMaterial("mangrove_chest_boat"); Material STRUCTURE_BLOCK = getMaterial("structure_block"); Material JIGSAW = getMaterial("jigsaw"); Material TURTLE_HELMET = getMaterial("turtle_helmet"); @@ -795,6 +830,7 @@ public interface Material extends Keyed, Comparable { Material JUNGLE_SIGN = getMaterial("jungle_sign"); Material ACACIA_SIGN = getMaterial("acacia_sign"); Material DARK_OAK_SIGN = getMaterial("dark_oak_sign"); + Material MANGROVE_SIGN = getMaterial("mangrove_sign"); Material CRIMSON_SIGN = getMaterial("crimson_sign"); Material WARPED_SIGN = getMaterial("warped_sign"); Material BUCKET = getMaterial("bucket"); @@ -809,6 +845,7 @@ public interface Material extends Keyed, Comparable { Material COD_BUCKET = getMaterial("cod_bucket"); Material TROPICAL_FISH_BUCKET = getMaterial("tropical_fish_bucket"); Material AXOLOTL_BUCKET = getMaterial("axolotl_bucket"); + Material TADPOLE_BUCKET = getMaterial("tadpole_bucket"); Material BRICK = getMaterial("brick"); Material CLAY_BALL = getMaterial("clay_ball"); Material DRIED_KELP_BLOCK = getMaterial("dried_kelp_block"); @@ -817,6 +854,7 @@ public interface Material extends Keyed, Comparable { Material SLIME_BALL = getMaterial("slime_ball"); Material EGG = getMaterial("egg"); Material COMPASS = getMaterial("compass"); + Material RECOVERY_COMPASS = getMaterial("recovery_compass"); Material BUNDLE = getMaterial("bundle"); Material FISHING_ROD = getMaterial("fishing_rod"); Material CLOCK = getMaterial("clock"); @@ -894,6 +932,7 @@ public interface Material extends Keyed, Comparable { Material CAULDRON = getMaterial("cauldron"); Material ENDER_EYE = getMaterial("ender_eye"); Material GLISTERING_MELON_SLICE = getMaterial("glistering_melon_slice"); + Material ALLAY_SPAWN_EGG = getMaterial("allay_spawn_egg"); Material AXOLOTL_SPAWN_EGG = getMaterial("axolotl_spawn_egg"); Material BAT_SPAWN_EGG = getMaterial("bat_spawn_egg"); Material BEE_SPAWN_EGG = getMaterial("bee_spawn_egg"); @@ -912,6 +951,7 @@ public interface Material extends Keyed, Comparable { Material ENDERMITE_SPAWN_EGG = getMaterial("endermite_spawn_egg"); Material EVOKER_SPAWN_EGG = getMaterial("evoker_spawn_egg"); Material FOX_SPAWN_EGG = getMaterial("fox_spawn_egg"); + Material FROG_SPAWN_EGG = getMaterial("frog_spawn_egg"); Material GHAST_SPAWN_EGG = getMaterial("ghast_spawn_egg"); Material GLOW_SQUID_SPAWN_EGG = getMaterial("glow_squid_spawn_egg"); Material GOAT_SPAWN_EGG = getMaterial("goat_spawn_egg"); @@ -946,6 +986,7 @@ public interface Material extends Keyed, Comparable { Material SQUID_SPAWN_EGG = getMaterial("squid_spawn_egg"); Material STRAY_SPAWN_EGG = getMaterial("stray_spawn_egg"); Material STRIDER_SPAWN_EGG = getMaterial("strider_spawn_egg"); + Material TADPOLE_SPAWN_EGG = getMaterial("tadpole_spawn_egg"); Material TRADER_LLAMA_SPAWN_EGG = getMaterial("trader_llama_spawn_egg"); Material TROPICAL_FISH_SPAWN_EGG = getMaterial("tropical_fish_spawn_egg"); Material TURTLE_SPAWN_EGG = getMaterial("turtle_spawn_egg"); @@ -953,6 +994,7 @@ public interface Material extends Keyed, Comparable { Material VILLAGER_SPAWN_EGG = getMaterial("villager_spawn_egg"); Material VINDICATOR_SPAWN_EGG = getMaterial("vindicator_spawn_egg"); Material WANDERING_TRADER_SPAWN_EGG = getMaterial("wandering_trader_spawn_egg"); + Material WARDEN_SPAWN_EGG = getMaterial("warden_spawn_egg"); Material WITCH_SPAWN_EGG = getMaterial("witch_spawn_egg"); Material WITHER_SKELETON_SPAWN_EGG = getMaterial("wither_skeleton_spawn_egg"); Material WOLF_SPAWN_EGG = getMaterial("wolf_spawn_egg"); @@ -1049,7 +1091,9 @@ public interface Material extends Keyed, Comparable { Material MUSIC_DISC_11 = getMaterial("music_disc_11"); Material MUSIC_DISC_WAIT = getMaterial("music_disc_wait"); Material MUSIC_DISC_OTHERSIDE = getMaterial("music_disc_otherside"); + Material MUSIC_DISC_5 = getMaterial("music_disc_5"); Material MUSIC_DISC_PIGSTEP = getMaterial("music_disc_pigstep"); + Material DISC_FRAGMENT_5 = getMaterial("disc_fragment_5"); Material TRIDENT = getMaterial("trident"); Material PHANTOM_MEMBRANE = getMaterial("phantom_membrane"); Material NAUTILUS_SHELL = getMaterial("nautilus_shell"); @@ -1063,6 +1107,7 @@ public interface Material extends Keyed, Comparable { Material MOJANG_BANNER_PATTERN = getMaterial("mojang_banner_pattern"); Material GLOBE_BANNER_PATTERN = getMaterial("globe_banner_pattern"); Material PIGLIN_BANNER_PATTERN = getMaterial("piglin_banner_pattern"); + Material GOAT_HORN = getMaterial("goat_horn"); Material COMPOSTER = getMaterial("composter"); Material BARREL = getMaterial("barrel"); Material SMOKER = getMaterial("smoker"); @@ -1122,6 +1167,11 @@ public interface Material extends Keyed, Comparable { Material LARGE_AMETHYST_BUD = getMaterial("large_amethyst_bud"); Material AMETHYST_CLUSTER = getMaterial("amethyst_cluster"); Material POINTED_DRIPSTONE = getMaterial("pointed_dripstone"); + Material OCHRE_FROGLIGHT = getMaterial("ochre_froglight"); + Material VERDANT_FROGLIGHT = getMaterial("verdant_froglight"); + Material PEARLESCENT_FROGLIGHT = getMaterial("pearlescent_froglight"); + Material FROGSPAWN = getMaterial("frogspawn"); + Material ECHO_SHARD = getMaterial("echo_shard"); Material WATER = getMaterial("water"); Material LAVA = getMaterial("lava"); Material TALL_SEAGRASS = getMaterial("tall_seagrass"); @@ -1137,6 +1187,7 @@ public interface Material extends Keyed, Comparable { Material ACACIA_WALL_SIGN = getMaterial("acacia_wall_sign"); Material JUNGLE_WALL_SIGN = getMaterial("jungle_wall_sign"); Material DARK_OAK_WALL_SIGN = getMaterial("dark_oak_wall_sign"); + Material MANGROVE_WALL_SIGN = getMaterial("mangrove_wall_sign"); Material REDSTONE_WALL_TORCH = getMaterial("redstone_wall_torch"); Material SOUL_WALL_TORCH = getMaterial("soul_wall_torch"); Material NETHER_PORTAL = getMaterial("nether_portal"); @@ -1156,6 +1207,7 @@ public interface Material extends Keyed, Comparable { Material POTTED_JUNGLE_SAPLING = getMaterial("potted_jungle_sapling"); Material POTTED_ACACIA_SAPLING = getMaterial("potted_acacia_sapling"); Material POTTED_DARK_OAK_SAPLING = getMaterial("potted_dark_oak_sapling"); + Material POTTED_MANGROVE_PROPAGULE = getMaterial("potted_mangrove_propagule"); Material POTTED_FERN = getMaterial("potted_fern"); Material POTTED_DANDELION = getMaterial("potted_dandelion"); Material POTTED_POPPY = getMaterial("potted_poppy"); @@ -2265,7 +2317,7 @@ public interface Material extends Keyed, Comparable { */ @Nullable static Material matchMaterial(@NotNull final String name, boolean legacyName) { - Validate.notNull(name, "Name cannot be null"); + Preconditions.checkArgument(name != null, "Name cannot be null"); String filtered = name; if (filtered.startsWith(NamespacedKey.MINECRAFT + ":")) { @@ -2659,7 +2711,7 @@ public interface Material extends Keyed, Comparable { * @return the immutable {@link Multimap} with the respective default * Attributes and modifiers, or an empty map if no attributes are set. * @see Material#asItemType() - * @see ItemType#getDefaultAttributeModifiers() + * @see ItemType#getDefaultAttributeModifiers(EquipmentSlot) * @deprecated Can only get default attribute modifiers from ItemType */ @NotNull @@ -2685,7 +2737,7 @@ public interface Material extends Keyed, Comparable { */ @Deprecated @Override - public abstract int compareTo(@NotNull Material other); + int compareTo(@NotNull Material other); /** * @return the name of the old enum. @@ -2693,12 +2745,12 @@ public interface Material extends Keyed, Comparable { */ @NotNull @Deprecated - public abstract String name(); + String name(); /** * @return the ordinal of the old enum. * @deprecated only for backwards compatibility, it is not guaranteed that an old enum always has the same ordinal. */ @Deprecated - public abstract int ordinal(); + int ordinal(); } diff --git a/src/main/java/org/bukkit/Sound.java b/src/main/java/org/bukkit/Sound.java index 597a3d1a..e80da5f2 100644 --- a/src/main/java/org/bukkit/Sound.java +++ b/src/main/java/org/bukkit/Sound.java @@ -205,6 +205,17 @@ public abstract class Sound extends OldEnum implements Keyed { public static final Sound BLOCK_FLOWERING_AZALEA_HIT = getSound("block.flowering_azalea.hit"); public static final Sound BLOCK_FLOWERING_AZALEA_PLACE = getSound("block.flowering_azalea.place"); public static final Sound BLOCK_FLOWERING_AZALEA_STEP = getSound("block.flowering_azalea.step"); + public static final Sound BLOCK_FROGLIGHT_BREAK = getSound("block.froglight.break"); + public static final Sound BLOCK_FROGLIGHT_FALL = getSound("block.froglight.fall"); + public static final Sound BLOCK_FROGLIGHT_HIT = getSound("block.froglight.hit"); + public static final Sound BLOCK_FROGLIGHT_PLACE = getSound("block.froglight.place"); + public static final Sound BLOCK_FROGLIGHT_STEP = getSound("block.froglight.step"); + public static final Sound BLOCK_FROGSPAWN_BREAK = getSound("block.frogspawn.break"); + public static final Sound BLOCK_FROGSPAWN_FALL = getSound("block.frogspawn.fall"); + public static final Sound BLOCK_FROGSPAWN_HATCH = getSound("block.frogspawn.hatch"); + public static final Sound BLOCK_FROGSPAWN_HIT = getSound("block.frogspawn.hit"); + public static final Sound BLOCK_FROGSPAWN_PLACE = getSound("block.frogspawn.place"); + public static final Sound BLOCK_FROGSPAWN_STEP = getSound("block.frogspawn.step"); public static final Sound BLOCK_FUNGUS_BREAK = getSound("block.fungus.break"); public static final Sound BLOCK_FUNGUS_FALL = getSound("block.fungus.fall"); public static final Sound BLOCK_FUNGUS_HIT = getSound("block.fungus.hit"); @@ -270,6 +281,11 @@ public abstract class Sound extends OldEnum implements Keyed { public static final Sound BLOCK_LODESTONE_HIT = getSound("block.lodestone.hit"); public static final Sound BLOCK_LODESTONE_PLACE = getSound("block.lodestone.place"); public static final Sound BLOCK_LODESTONE_STEP = getSound("block.lodestone.step"); + public static final Sound BLOCK_MANGROVE_ROOTS_BREAK = getSound("block.mangrove_roots.break"); + public static final Sound BLOCK_MANGROVE_ROOTS_FALL = getSound("block.mangrove_roots.fall"); + public static final Sound BLOCK_MANGROVE_ROOTS_HIT = getSound("block.mangrove_roots.hit"); + public static final Sound BLOCK_MANGROVE_ROOTS_PLACE = getSound("block.mangrove_roots.place"); + public static final Sound BLOCK_MANGROVE_ROOTS_STEP = getSound("block.mangrove_roots.step"); public static final Sound BLOCK_MEDIUM_AMETHYST_BUD_BREAK = getSound("block.medium_amethyst_bud.break"); public static final Sound BLOCK_MEDIUM_AMETHYST_BUD_PLACE = getSound("block.medium_amethyst_bud.place"); public static final Sound BLOCK_METAL_BREAK = getSound("block.metal.break"); @@ -289,6 +305,21 @@ public abstract class Sound extends OldEnum implements Keyed { public static final Sound BLOCK_MOSS_HIT = getSound("block.moss.hit"); public static final Sound BLOCK_MOSS_PLACE = getSound("block.moss.place"); public static final Sound BLOCK_MOSS_STEP = getSound("block.moss.step"); + public static final Sound BLOCK_MUDDY_MANGROVE_ROOTS_BREAK = getSound("block.muddy_mangrove_roots.break"); + public static final Sound BLOCK_MUDDY_MANGROVE_ROOTS_FALL = getSound("block.muddy_mangrove_roots.fall"); + public static final Sound BLOCK_MUDDY_MANGROVE_ROOTS_HIT = getSound("block.muddy_mangrove_roots.hit"); + public static final Sound BLOCK_MUDDY_MANGROVE_ROOTS_PLACE = getSound("block.muddy_mangrove_roots.place"); + public static final Sound BLOCK_MUDDY_MANGROVE_ROOTS_STEP = getSound("block.muddy_mangrove_roots.step"); + public static final Sound BLOCK_MUD_BREAK = getSound("block.mud.break"); + public static final Sound BLOCK_MUD_BRICKS_BREAK = getSound("block.mud_bricks.break"); + public static final Sound BLOCK_MUD_BRICKS_FALL = getSound("block.mud_bricks.fall"); + public static final Sound BLOCK_MUD_BRICKS_HIT = getSound("block.mud_bricks.hit"); + public static final Sound BLOCK_MUD_BRICKS_PLACE = getSound("block.mud_bricks.place"); + public static final Sound BLOCK_MUD_BRICKS_STEP = getSound("block.mud_bricks.step"); + public static final Sound BLOCK_MUD_FALL = getSound("block.mud.fall"); + public static final Sound BLOCK_MUD_HIT = getSound("block.mud.hit"); + public static final Sound BLOCK_MUD_PLACE = getSound("block.mud.place"); + public static final Sound BLOCK_MUD_STEP = getSound("block.mud.step"); public static final Sound BLOCK_NETHERITE_BLOCK_BREAK = getSound("block.netherite_block.break"); public static final Sound BLOCK_NETHERITE_BLOCK_FALL = getSound("block.netherite_block.fall"); public static final Sound BLOCK_NETHERITE_BLOCK_HIT = getSound("block.netherite_block.hit"); @@ -341,6 +372,11 @@ public abstract class Sound extends OldEnum implements Keyed { public static final Sound BLOCK_NYLIUM_HIT = getSound("block.nylium.hit"); public static final Sound BLOCK_NYLIUM_PLACE = getSound("block.nylium.place"); public static final Sound BLOCK_NYLIUM_STEP = getSound("block.nylium.step"); + public static final Sound BLOCK_PACKED_MUD_BREAK = getSound("block.packed_mud.break"); + public static final Sound BLOCK_PACKED_MUD_FALL = getSound("block.packed_mud.fall"); + public static final Sound BLOCK_PACKED_MUD_HIT = getSound("block.packed_mud.hit"); + public static final Sound BLOCK_PACKED_MUD_PLACE = getSound("block.packed_mud.place"); + public static final Sound BLOCK_PACKED_MUD_STEP = getSound("block.packed_mud.step"); public static final Sound BLOCK_PISTON_CONTRACT = getSound("block.piston.contract"); public static final Sound BLOCK_PISTON_EXTEND = getSound("block.piston.extend"); public static final Sound BLOCK_POINTED_DRIPSTONE_BREAK = getSound("block.pointed_dripstone.break"); @@ -392,6 +428,17 @@ public abstract class Sound extends OldEnum implements Keyed { public static final Sound BLOCK_SCAFFOLDING_HIT = getSound("block.scaffolding.hit"); public static final Sound BLOCK_SCAFFOLDING_PLACE = getSound("block.scaffolding.place"); public static final Sound BLOCK_SCAFFOLDING_STEP = getSound("block.scaffolding.step"); + public static final Sound BLOCK_SCULK_BREAK = getSound("block.sculk.break"); + public static final Sound BLOCK_SCULK_CATALYST_BLOOM = getSound("block.sculk_catalyst.bloom"); + public static final Sound BLOCK_SCULK_CATALYST_BREAK = getSound("block.sculk_catalyst.break"); + public static final Sound BLOCK_SCULK_CATALYST_FALL = getSound("block.sculk_catalyst.fall"); + public static final Sound BLOCK_SCULK_CATALYST_HIT = getSound("block.sculk_catalyst.hit"); + public static final Sound BLOCK_SCULK_CATALYST_PLACE = getSound("block.sculk_catalyst.place"); + public static final Sound BLOCK_SCULK_CATALYST_STEP = getSound("block.sculk_catalyst.step"); + public static final Sound BLOCK_SCULK_CHARGE = getSound("block.sculk.charge"); + public static final Sound BLOCK_SCULK_FALL = getSound("block.sculk.fall"); + public static final Sound BLOCK_SCULK_HIT = getSound("block.sculk.hit"); + public static final Sound BLOCK_SCULK_PLACE = getSound("block.sculk.place"); public static final Sound BLOCK_SCULK_SENSOR_BREAK = getSound("block.sculk_sensor.break"); public static final Sound BLOCK_SCULK_SENSOR_CLICKING = getSound("block.sculk_sensor.clicking"); public static final Sound BLOCK_SCULK_SENSOR_CLICKING_STOP = getSound("block.sculk_sensor.clicking_stop"); @@ -399,6 +446,19 @@ public abstract class Sound extends OldEnum implements Keyed { public static final Sound BLOCK_SCULK_SENSOR_HIT = getSound("block.sculk_sensor.hit"); public static final Sound BLOCK_SCULK_SENSOR_PLACE = getSound("block.sculk_sensor.place"); public static final Sound BLOCK_SCULK_SENSOR_STEP = getSound("block.sculk_sensor.step"); + public static final Sound BLOCK_SCULK_SHRIEKER_BREAK = getSound("block.sculk_shrieker.break"); + public static final Sound BLOCK_SCULK_SHRIEKER_FALL = getSound("block.sculk_shrieker.fall"); + public static final Sound BLOCK_SCULK_SHRIEKER_HIT = getSound("block.sculk_shrieker.hit"); + public static final Sound BLOCK_SCULK_SHRIEKER_PLACE = getSound("block.sculk_shrieker.place"); + public static final Sound BLOCK_SCULK_SHRIEKER_SHRIEK = getSound("block.sculk_shrieker.shriek"); + public static final Sound BLOCK_SCULK_SHRIEKER_STEP = getSound("block.sculk_shrieker.step"); + public static final Sound BLOCK_SCULK_SPREAD = getSound("block.sculk.spread"); + public static final Sound BLOCK_SCULK_STEP = getSound("block.sculk.step"); + public static final Sound BLOCK_SCULK_VEIN_BREAK = getSound("block.sculk_vein.break"); + public static final Sound BLOCK_SCULK_VEIN_FALL = getSound("block.sculk_vein.fall"); + public static final Sound BLOCK_SCULK_VEIN_HIT = getSound("block.sculk_vein.hit"); + public static final Sound BLOCK_SCULK_VEIN_PLACE = getSound("block.sculk_vein.place"); + public static final Sound BLOCK_SCULK_VEIN_STEP = getSound("block.sculk_vein.step"); public static final Sound BLOCK_SHROOMLIGHT_BREAK = getSound("block.shroomlight.break"); public static final Sound BLOCK_SHROOMLIGHT_FALL = getSound("block.shroomlight.fall"); public static final Sound BLOCK_SHROOMLIGHT_HIT = getSound("block.shroomlight.hit"); @@ -506,6 +566,13 @@ public abstract class Sound extends OldEnum implements Keyed { public static final Sound BLOCK_WOOL_PLACE = getSound("block.wool.place"); public static final Sound BLOCK_WOOL_STEP = getSound("block.wool.step"); public static final Sound ENCHANT_THORNS_HIT = getSound("enchant.thorns.hit"); + public static final Sound ENTITY_ALLAY_AMBIENT_WITHOUT_ITEM = getSound("entity.allay.ambient_without_item"); + public static final Sound ENTITY_ALLAY_AMBIENT_WITH_ITEM = getSound("entity.allay.ambient_with_item"); + public static final Sound ENTITY_ALLAY_DEATH = getSound("entity.allay.death"); + public static final Sound ENTITY_ALLAY_HURT = getSound("entity.allay.hurt"); + public static final Sound ENTITY_ALLAY_ITEM_GIVEN = getSound("entity.allay.item_given"); + public static final Sound ENTITY_ALLAY_ITEM_TAKEN = getSound("entity.allay.item_taken"); + public static final Sound ENTITY_ALLAY_ITEM_THROWN = getSound("entity.allay.item_thrown"); public static final Sound ENTITY_ARMOR_STAND_BREAK = getSound("entity.armor_stand.break"); public static final Sound ENTITY_ARMOR_STAND_FALL = getSound("entity.armor_stand.fall"); public static final Sound ENTITY_ARMOR_STAND_HIT = getSound("entity.armor_stand.hit"); @@ -652,6 +719,14 @@ public abstract class Sound extends OldEnum implements Keyed { public static final Sound ENTITY_FOX_SNIFF = getSound("entity.fox.sniff"); public static final Sound ENTITY_FOX_SPIT = getSound("entity.fox.spit"); public static final Sound ENTITY_FOX_TELEPORT = getSound("entity.fox.teleport"); + public static final Sound ENTITY_FROG_AMBIENT = getSound("entity.frog.ambient"); + public static final Sound ENTITY_FROG_DEATH = getSound("entity.frog.death"); + public static final Sound ENTITY_FROG_EAT = getSound("entity.frog.eat"); + public static final Sound ENTITY_FROG_HURT = getSound("entity.frog.hurt"); + public static final Sound ENTITY_FROG_LAY_SPAWN = getSound("entity.frog.lay_spawn"); + public static final Sound ENTITY_FROG_LONG_JUMP = getSound("entity.frog.long_jump"); + public static final Sound ENTITY_FROG_STEP = getSound("entity.frog.step"); + public static final Sound ENTITY_FROG_TONGUE = getSound("entity.frog.tongue"); public static final Sound ENTITY_GENERIC_BIG_FALL = getSound("entity.generic.big_fall"); public static final Sound ENTITY_GENERIC_BURN = getSound("entity.generic.burn"); public static final Sound ENTITY_GENERIC_DEATH = getSound("entity.generic.death"); @@ -681,6 +756,7 @@ public abstract class Sound extends OldEnum implements Keyed { public static final Sound ENTITY_GOAT_AMBIENT = getSound("entity.goat.ambient"); public static final Sound ENTITY_GOAT_DEATH = getSound("entity.goat.death"); public static final Sound ENTITY_GOAT_EAT = getSound("entity.goat.eat"); + public static final Sound ENTITY_GOAT_HORN_BREAK = getSound("entity.goat.horn_break"); public static final Sound ENTITY_GOAT_HURT = getSound("entity.goat.hurt"); public static final Sound ENTITY_GOAT_LONG_JUMP = getSound("entity.goat.long_jump"); public static final Sound ENTITY_GOAT_MILK = getSound("entity.goat.milk"); @@ -689,6 +765,7 @@ public abstract class Sound extends OldEnum implements Keyed { public static final Sound ENTITY_GOAT_SCREAMING_AMBIENT = getSound("entity.goat.screaming.ambient"); public static final Sound ENTITY_GOAT_SCREAMING_DEATH = getSound("entity.goat.screaming.death"); public static final Sound ENTITY_GOAT_SCREAMING_EAT = getSound("entity.goat.screaming.eat"); + public static final Sound ENTITY_GOAT_SCREAMING_HORN_BREAK = getSound("entity.goat.screaming.horn_break"); public static final Sound ENTITY_GOAT_SCREAMING_HURT = getSound("entity.goat.screaming.hurt"); public static final Sound ENTITY_GOAT_SCREAMING_LONG_JUMP = getSound("entity.goat.screaming.long_jump"); public static final Sound ENTITY_GOAT_SCREAMING_MILK = getSound("entity.goat.screaming.milk"); @@ -837,6 +914,7 @@ public abstract class Sound extends OldEnum implements Keyed { public static final Sound ENTITY_PARROT_IMITATE_STRAY = getSound("entity.parrot.imitate.stray"); public static final Sound ENTITY_PARROT_IMITATE_VEX = getSound("entity.parrot.imitate.vex"); public static final Sound ENTITY_PARROT_IMITATE_VINDICATOR = getSound("entity.parrot.imitate.vindicator"); + public static final Sound ENTITY_PARROT_IMITATE_WARDEN = getSound("entity.parrot.imitate.warden"); public static final Sound ENTITY_PARROT_IMITATE_WITCH = getSound("entity.parrot.imitate.witch"); public static final Sound ENTITY_PARROT_IMITATE_WITHER = getSound("entity.parrot.imitate.wither"); public static final Sound ENTITY_PARROT_IMITATE_WITHER_SKELETON = getSound("entity.parrot.imitate.wither_skeleton"); @@ -996,6 +1074,10 @@ public abstract class Sound extends OldEnum implements Keyed { public static final Sound ENTITY_STRIDER_SADDLE = getSound("entity.strider.saddle"); public static final Sound ENTITY_STRIDER_STEP = getSound("entity.strider.step"); public static final Sound ENTITY_STRIDER_STEP_LAVA = getSound("entity.strider.step_lava"); + public static final Sound ENTITY_TADPOLE_DEATH = getSound("entity.tadpole.death"); + public static final Sound ENTITY_TADPOLE_FLOP = getSound("entity.tadpole.flop"); + public static final Sound ENTITY_TADPOLE_GROW_UP = getSound("entity.tadpole.grow_up"); + public static final Sound ENTITY_TADPOLE_HURT = getSound("entity.tadpole.hurt"); public static final Sound ENTITY_TNT_PRIMED = getSound("entity.tnt.primed"); public static final Sound ENTITY_TROPICAL_FISH_AMBIENT = getSound("entity.tropical_fish.ambient"); public static final Sound ENTITY_TROPICAL_FISH_DEATH = getSound("entity.tropical_fish.death"); @@ -1051,6 +1133,26 @@ public abstract class Sound extends OldEnum implements Keyed { public static final Sound ENTITY_WANDERING_TRADER_REAPPEARED = getSound("entity.wandering_trader.reappeared"); public static final Sound ENTITY_WANDERING_TRADER_TRADE = getSound("entity.wandering_trader.trade"); public static final Sound ENTITY_WANDERING_TRADER_YES = getSound("entity.wandering_trader.yes"); + public static final Sound ENTITY_WARDEN_AGITATED = getSound("entity.warden.agitated"); + public static final Sound ENTITY_WARDEN_AMBIENT = getSound("entity.warden.ambient"); + public static final Sound ENTITY_WARDEN_ANGRY = getSound("entity.warden.angry"); + public static final Sound ENTITY_WARDEN_ATTACK_IMPACT = getSound("entity.warden.attack_impact"); + public static final Sound ENTITY_WARDEN_DEATH = getSound("entity.warden.death"); + public static final Sound ENTITY_WARDEN_DIG = getSound("entity.warden.dig"); + public static final Sound ENTITY_WARDEN_EMERGE = getSound("entity.warden.emerge"); + public static final Sound ENTITY_WARDEN_HEARTBEAT = getSound("entity.warden.heartbeat"); + public static final Sound ENTITY_WARDEN_HURT = getSound("entity.warden.hurt"); + public static final Sound ENTITY_WARDEN_LISTENING = getSound("entity.warden.listening"); + public static final Sound ENTITY_WARDEN_LISTENING_ANGRY = getSound("entity.warden.listening_angry"); + public static final Sound ENTITY_WARDEN_NEARBY_CLOSE = getSound("entity.warden.nearby_close"); + public static final Sound ENTITY_WARDEN_NEARBY_CLOSER = getSound("entity.warden.nearby_closer"); + public static final Sound ENTITY_WARDEN_NEARBY_CLOSEST = getSound("entity.warden.nearby_closest"); + public static final Sound ENTITY_WARDEN_ROAR = getSound("entity.warden.roar"); + public static final Sound ENTITY_WARDEN_SNIFF = getSound("entity.warden.sniff"); + public static final Sound ENTITY_WARDEN_SONIC_BOOM = getSound("entity.warden.sonic_boom"); + public static final Sound ENTITY_WARDEN_SONIC_CHARGE = getSound("entity.warden.sonic_charge"); + public static final Sound ENTITY_WARDEN_STEP = getSound("entity.warden.step"); + public static final Sound ENTITY_WARDEN_TENDRIL_CLICKS = getSound("entity.warden.tendril_clicks"); public static final Sound ENTITY_WITCH_AMBIENT = getSound("entity.witch.ambient"); public static final Sound ENTITY_WITCH_CELEBRATE = getSound("entity.witch.celebrate"); public static final Sound ENTITY_WITCH_DEATH = getSound("entity.witch.death"); @@ -1129,11 +1231,13 @@ public abstract class Sound extends OldEnum implements Keyed { public static final Sound ITEM_BUCKET_EMPTY_FISH = getSound("item.bucket.empty_fish"); public static final Sound ITEM_BUCKET_EMPTY_LAVA = getSound("item.bucket.empty_lava"); public static final Sound ITEM_BUCKET_EMPTY_POWDER_SNOW = getSound("item.bucket.empty_powder_snow"); + public static final Sound ITEM_BUCKET_EMPTY_TADPOLE = getSound("item.bucket.empty_tadpole"); public static final Sound ITEM_BUCKET_FILL = getSound("item.bucket.fill"); public static final Sound ITEM_BUCKET_FILL_AXOLOTL = getSound("item.bucket.fill_axolotl"); public static final Sound ITEM_BUCKET_FILL_FISH = getSound("item.bucket.fill_fish"); public static final Sound ITEM_BUCKET_FILL_LAVA = getSound("item.bucket.fill_lava"); public static final Sound ITEM_BUCKET_FILL_POWDER_SNOW = getSound("item.bucket.fill_powder_snow"); + public static final Sound ITEM_BUCKET_FILL_TADPOLE = getSound("item.bucket.fill_tadpole"); public static final Sound ITEM_BUNDLE_DROP_CONTENTS = getSound("item.bundle.drop_contents"); public static final Sound ITEM_BUNDLE_INSERT = getSound("item.bundle.insert"); public static final Sound ITEM_BUNDLE_REMOVE_ONE = getSound("item.bundle.remove_one"); @@ -1152,6 +1256,15 @@ public abstract class Sound extends OldEnum implements Keyed { public static final Sound ITEM_FIRECHARGE_USE = getSound("item.firecharge.use"); public static final Sound ITEM_FLINTANDSTEEL_USE = getSound("item.flintandsteel.use"); public static final Sound ITEM_GLOW_INK_SAC_USE = getSound("item.glow_ink_sac.use"); + public static final Sound ITEM_GOAT_HORN_PLAY = getSound("item.goat_horn.play"); + public static final Sound ITEM_GOAT_HORN_SOUND_0 = getSound("item.goat_horn.sound.0"); + public static final Sound ITEM_GOAT_HORN_SOUND_1 = getSound("item.goat_horn.sound.1"); + public static final Sound ITEM_GOAT_HORN_SOUND_2 = getSound("item.goat_horn.sound.2"); + public static final Sound ITEM_GOAT_HORN_SOUND_3 = getSound("item.goat_horn.sound.3"); + public static final Sound ITEM_GOAT_HORN_SOUND_4 = getSound("item.goat_horn.sound.4"); + public static final Sound ITEM_GOAT_HORN_SOUND_5 = getSound("item.goat_horn.sound.5"); + public static final Sound ITEM_GOAT_HORN_SOUND_6 = getSound("item.goat_horn.sound.6"); + public static final Sound ITEM_GOAT_HORN_SOUND_7 = getSound("item.goat_horn.sound.7"); public static final Sound ITEM_HOE_TILL = getSound("item.hoe.till"); public static final Sound ITEM_HONEYCOMB_WAX_ON = getSound("item.honeycomb.wax_on"); public static final Sound ITEM_HONEY_BOTTLE_DRINK = getSound("item.honey_bottle.drink"); @@ -1176,6 +1289,7 @@ public abstract class Sound extends OldEnum implements Keyed { public static final Sound MUSIC_CREDITS = getSound("music.credits"); public static final Sound MUSIC_DISC_11 = getSound("music_disc.11"); public static final Sound MUSIC_DISC_13 = getSound("music_disc.13"); + public static final Sound MUSIC_DISC_5 = getSound("music_disc.5"); public static final Sound MUSIC_DISC_BLOCKS = getSound("music_disc.blocks"); public static final Sound MUSIC_DISC_CAT = getSound("music_disc.cat"); public static final Sound MUSIC_DISC_CHIRP = getSound("music_disc.chirp"); @@ -1197,14 +1311,18 @@ public abstract class Sound extends OldEnum implements Keyed { public static final Sound MUSIC_NETHER_NETHER_WASTES = getSound("music.nether.nether_wastes"); public static final Sound MUSIC_NETHER_SOUL_SAND_VALLEY = getSound("music.nether.soul_sand_valley"); public static final Sound MUSIC_NETHER_WARPED_FOREST = getSound("music.nether.warped_forest"); + public static final Sound MUSIC_OVERWORLD_DEEP_DARK = getSound("music.overworld.deep_dark"); public static final Sound MUSIC_OVERWORLD_DRIPSTONE_CAVES = getSound("music.overworld.dripstone_caves"); public static final Sound MUSIC_OVERWORLD_FROZEN_PEAKS = getSound("music.overworld.frozen_peaks"); public static final Sound MUSIC_OVERWORLD_GROVE = getSound("music.overworld.grove"); public static final Sound MUSIC_OVERWORLD_JAGGED_PEAKS = getSound("music.overworld.jagged_peaks"); + public static final Sound MUSIC_OVERWORLD_JUNGLE_AND_FOREST = getSound("music.overworld.jungle_and_forest"); public static final Sound MUSIC_OVERWORLD_LUSH_CAVES = getSound("music.overworld.lush_caves"); public static final Sound MUSIC_OVERWORLD_MEADOW = getSound("music.overworld.meadow"); + public static final Sound MUSIC_OVERWORLD_OLD_GROWTH_TAIGA = getSound("music.overworld.old_growth_taiga"); public static final Sound MUSIC_OVERWORLD_SNOWY_SLOPES = getSound("music.overworld.snowy_slopes"); public static final Sound MUSIC_OVERWORLD_STONY_PEAKS = getSound("music.overworld.stony_peaks"); + public static final Sound MUSIC_OVERWORLD_SWAMP = getSound("music.overworld.swamp"); public static final Sound MUSIC_UNDER_WATER = getSound("music.under_water"); public static final Sound PARTICLE_SOUL_ESCAPE = getSound("particle.soul_escape"); public static final Sound UI_BUTTON_CLICK = getSound("ui.button.click"); diff --git a/src/main/java/org/bukkit/block/Biome.java b/src/main/java/org/bukkit/block/Biome.java index 4645bdee..ecafba3e 100644 --- a/src/main/java/org/bukkit/block/Biome.java +++ b/src/main/java/org/bukkit/block/Biome.java @@ -23,6 +23,7 @@ public abstract class Biome extends OldEnum implements Keyed { public static final Biome FOREST = getBiome("forest"); public static final Biome TAIGA = getBiome("taiga"); public static final Biome SWAMP = getBiome("swamp"); + public static final Biome MANGROVE_SWAMP = getBiome("mangrove_swamp"); public static final Biome RIVER = getBiome("river"); public static final Biome NETHER_WASTES = getBiome("nether_wastes"); public static final Biome THE_END = getBiome("the_end"); @@ -71,6 +72,7 @@ public abstract class Biome extends OldEnum implements Keyed { public static final Biome BASALT_DELTAS = getBiome("basalt_deltas"); public static final Biome DRIPSTONE_CAVES = getBiome("dripstone_caves"); public static final Biome LUSH_CAVES = getBiome("lush_caves"); + public static final Biome DEEP_DARK = getBiome("deep_dark"); public static final Biome MEADOW = getBiome("meadow"); public static final Biome GROVE = getBiome("grove"); public static final Biome SNOWY_SLOPES = getBiome("snowy_slopes"); diff --git a/src/main/java/org/bukkit/block/BlockType.java b/src/main/java/org/bukkit/block/BlockType.java index 253dc165..90405067 100644 --- a/src/main/java/org/bukkit/block/BlockType.java +++ b/src/main/java/org/bukkit/block/BlockType.java @@ -58,6 +58,7 @@ import org.bukkit.block.data.type.Leaves; import org.bukkit.block.data.type.Lectern; import org.bukkit.block.data.type.Light; import org.bukkit.block.data.type.LightningRod; +import org.bukkit.block.data.type.MangrovePropagule; import org.bukkit.block.data.type.NoteBlock; import org.bukkit.block.data.type.Observer; import org.bukkit.block.data.type.Piston; @@ -121,6 +122,7 @@ public interface BlockType extends Material { */ BlockType PODZOL = asBlockType(Material.PODZOL); BlockType ROOTED_DIRT = asBlockType(Material.ROOTED_DIRT); + BlockType MUD = asBlockType(Material.MUD); BlockType CRIMSON_NYLIUM = asBlockType(Material.CRIMSON_NYLIUM); BlockType WARPED_NYLIUM = asBlockType(Material.WARPED_NYLIUM); BlockType COBBLESTONE = asBlockType(Material.COBBLESTONE); @@ -130,6 +132,7 @@ public interface BlockType extends Material { BlockType JUNGLE_PLANKS = asBlockType(Material.JUNGLE_PLANKS); BlockType ACACIA_PLANKS = asBlockType(Material.ACACIA_PLANKS); BlockType DARK_OAK_PLANKS = asBlockType(Material.DARK_OAK_PLANKS); + BlockType MANGROVE_PLANKS = asBlockType(Material.MANGROVE_PLANKS); BlockType CRIMSON_PLANKS = asBlockType(Material.CRIMSON_PLANKS); BlockType WARPED_PLANKS = asBlockType(Material.WARPED_PLANKS); /** @@ -156,6 +159,10 @@ public interface BlockType extends Material { * BlockData: {@link Sapling} */ BlockType DARK_OAK_SAPLING = asBlockType(Material.DARK_OAK_SAPLING); + /** + * BlockData: {@link MangrovePropagule} + */ + BlockType MANGROVE_PROPAGULE = asBlockType(Material.MANGROVE_PROPAGULE); BlockType BEDROCK = asBlockType(Material.BEDROCK); BlockType SAND = asBlockType(Material.SAND); BlockType RED_SAND = asBlockType(Material.RED_SAND); @@ -299,6 +306,18 @@ public interface BlockType extends Material { * BlockData: {@link Orientable} */ BlockType DARK_OAK_LOG = asBlockType(Material.DARK_OAK_LOG); + /** + * BlockData: {@link Orientable} + */ + BlockType MANGROVE_LOG = asBlockType(Material.MANGROVE_LOG); + /** + * BlockData: {@link Waterlogged} + */ + BlockType MANGROVE_ROOTS = asBlockType(Material.MANGROVE_ROOTS); + /** + * BlockData: {@link Orientable} + */ + BlockType MUDDY_MANGROVE_ROOTS = asBlockType(Material.MUDDY_MANGROVE_ROOTS); /** * BlockData: {@link Orientable} */ @@ -331,6 +350,10 @@ public interface BlockType extends Material { * BlockData: {@link Orientable} */ BlockType STRIPPED_DARK_OAK_LOG = asBlockType(Material.STRIPPED_DARK_OAK_LOG); + /** + * BlockData: {@link Orientable} + */ + BlockType STRIPPED_MANGROVE_LOG = asBlockType(Material.STRIPPED_MANGROVE_LOG); /** * BlockData: {@link Orientable} */ @@ -363,6 +386,10 @@ public interface BlockType extends Material { * BlockData: {@link Orientable} */ BlockType STRIPPED_DARK_OAK_WOOD = asBlockType(Material.STRIPPED_DARK_OAK_WOOD); + /** + * BlockData: {@link Orientable} + */ + BlockType STRIPPED_MANGROVE_WOOD = asBlockType(Material.STRIPPED_MANGROVE_WOOD); /** * BlockData: {@link Orientable} */ @@ -395,6 +422,10 @@ public interface BlockType extends Material { * BlockData: {@link Orientable} */ BlockType DARK_OAK_WOOD = asBlockType(Material.DARK_OAK_WOOD); + /** + * BlockData: {@link Orientable} + */ + BlockType MANGROVE_WOOD = asBlockType(Material.MANGROVE_WOOD); /** * BlockData: {@link Orientable} */ @@ -427,6 +458,10 @@ public interface BlockType extends Material { * BlockData: {@link Leaves} */ BlockType DARK_OAK_LEAVES = asBlockType(Material.DARK_OAK_LEAVES); + /** + * BlockData: {@link Leaves} + */ + BlockType MANGROVE_LEAVES = asBlockType(Material.MANGROVE_LEAVES); /** * BlockData: {@link Leaves} */ @@ -549,6 +584,10 @@ public interface BlockType extends Material { * BlockData: {@link Slab} */ BlockType DARK_OAK_SLAB = asBlockType(Material.DARK_OAK_SLAB); + /** + * BlockData: {@link Slab} + */ + BlockType MANGROVE_SLAB = asBlockType(Material.MANGROVE_SLAB); /** * BlockData: {@link Slab} */ @@ -589,6 +628,10 @@ public interface BlockType extends Material { * BlockData: {@link Slab} */ BlockType STONE_BRICK_SLAB = asBlockType(Material.STONE_BRICK_SLAB); + /** + * BlockData: {@link Slab} + */ + BlockType MUD_BRICK_SLAB = asBlockType(Material.MUD_BRICK_SLAB); /** * BlockData: {@link Slab} */ @@ -649,10 +692,6 @@ public interface BlockType extends Material { */ BlockType PURPUR_STAIRS = asBlockType(Material.PURPUR_STAIRS); BlockType SPAWNER = asBlockType(Material.SPAWNER); - /** - * BlockData: {@link Stairs} - */ - BlockType OAK_STAIRS = asBlockType(Material.OAK_STAIRS); /** * BlockData: {@link Chest} */ @@ -713,6 +752,10 @@ public interface BlockType extends Material { * BlockData: {@link Fence} */ BlockType DARK_OAK_FENCE = asBlockType(Material.DARK_OAK_FENCE); + /** + * BlockData: {@link Fence} + */ + BlockType MANGROVE_FENCE = asBlockType(Material.MANGROVE_FENCE); /** * BlockData: {@link Fence} */ @@ -758,11 +801,14 @@ public interface BlockType extends Material { BlockType MOSSY_STONE_BRICKS = asBlockType(Material.MOSSY_STONE_BRICKS); BlockType CRACKED_STONE_BRICKS = asBlockType(Material.CRACKED_STONE_BRICKS); BlockType CHISELED_STONE_BRICKS = asBlockType(Material.CHISELED_STONE_BRICKS); + BlockType PACKED_MUD = asBlockType(Material.PACKED_MUD); + BlockType MUD_BRICKS = asBlockType(Material.MUD_BRICKS); BlockType DEEPSLATE_BRICKS = asBlockType(Material.DEEPSLATE_BRICKS); BlockType CRACKED_DEEPSLATE_BRICKS = asBlockType(Material.CRACKED_DEEPSLATE_BRICKS); BlockType DEEPSLATE_TILES = asBlockType(Material.DEEPSLATE_TILES); BlockType CRACKED_DEEPSLATE_TILES = asBlockType(Material.CRACKED_DEEPSLATE_TILES); BlockType CHISELED_DEEPSLATE = asBlockType(Material.CHISELED_DEEPSLATE); + BlockType REINFORCED_DEEPSLATE = asBlockType(Material.REINFORCED_DEEPSLATE); /** * BlockData: {@link MultipleFacing} */ @@ -804,6 +850,10 @@ public interface BlockType extends Material { * BlockData: {@link Stairs} */ BlockType STONE_BRICK_STAIRS = asBlockType(Material.STONE_BRICK_STAIRS); + /** + * BlockData: {@link Stairs} + */ + BlockType MUD_BRICK_STAIRS = asBlockType(Material.MUD_BRICK_STAIRS); /** * BlockData: {@link Snowable} */ @@ -820,6 +870,13 @@ public interface BlockType extends Material { * BlockData: {@link Stairs} */ BlockType NETHER_BRICK_STAIRS = asBlockType(Material.NETHER_BRICK_STAIRS); + BlockType SCULK = asBlockType(Material.SCULK); + /** + * BlockData: {@link Waterlogged} + */ + BlockType SCULK_VEIN = asBlockType(Material.SCULK_VEIN); + BlockType SCULK_CATALYST = asBlockType(Material.SCULK_CATALYST); + BlockType SCULK_SHRIEKER = asBlockType(Material.SCULK_SHRIEKER); BlockType ENCHANTING_TABLE = asBlockType(Material.ENCHANTING_TABLE); /** * BlockData: {@link EndPortalFrame} @@ -837,6 +894,10 @@ public interface BlockType extends Material { */ BlockType ENDER_CHEST = asBlockType(Material.ENDER_CHEST); BlockType EMERALD_BLOCK = asBlockType(Material.EMERALD_BLOCK); + /** + * BlockData: {@link Stairs} + */ + BlockType OAK_STAIRS = asBlockType(Material.OAK_STAIRS); /** * BlockData: {@link Stairs} */ @@ -849,6 +910,18 @@ public interface BlockType extends Material { * BlockData: {@link Stairs} */ BlockType JUNGLE_STAIRS = asBlockType(Material.JUNGLE_STAIRS); + /** + * BlockData: {@link Stairs} + */ + BlockType ACACIA_STAIRS = asBlockType(Material.ACACIA_STAIRS); + /** + * BlockData: {@link Stairs} + */ + BlockType DARK_OAK_STAIRS = asBlockType(Material.DARK_OAK_STAIRS); + /** + * BlockData: {@link Stairs} + */ + BlockType MANGROVE_STAIRS = asBlockType(Material.MANGROVE_STAIRS); /** * BlockData: {@link Stairs} */ @@ -894,6 +967,10 @@ public interface BlockType extends Material { * BlockData: {@link Wall} */ BlockType STONE_BRICK_WALL = asBlockType(Material.STONE_BRICK_WALL); + /** + * BlockData: {@link Wall} + */ + BlockType MUD_BRICK_WALL = asBlockType(Material.MUD_BRICK_WALL); /** * BlockData: {@link Wall} */ @@ -1012,14 +1089,6 @@ public interface BlockType extends Material { BlockType BLACK_CARPET = asBlockType(Material.BLACK_CARPET); BlockType TERRACOTTA = asBlockType(Material.TERRACOTTA); BlockType PACKED_ICE = asBlockType(Material.PACKED_ICE); - /** - * BlockData: {@link Stairs} - */ - BlockType ACACIA_STAIRS = asBlockType(Material.ACACIA_STAIRS); - /** - * BlockData: {@link Stairs} - */ - BlockType DARK_OAK_STAIRS = asBlockType(Material.DARK_OAK_STAIRS); BlockType DIRT_PATH = asBlockType(Material.DIRT_PATH); /** * BlockData: {@link Bisected} @@ -1687,6 +1756,10 @@ public interface BlockType extends Material { * BlockData: {@link Switch} */ BlockType DARK_OAK_BUTTON = asBlockType(Material.DARK_OAK_BUTTON); + /** + * BlockData: {@link Switch} + */ + BlockType MANGROVE_BUTTON = asBlockType(Material.MANGROVE_BUTTON); /** * BlockData: {@link Switch} */ @@ -1735,6 +1808,10 @@ public interface BlockType extends Material { * BlockData: {@link Powerable} */ BlockType DARK_OAK_PRESSURE_PLATE = asBlockType(Material.DARK_OAK_PRESSURE_PLATE); + /** + * BlockData: {@link Powerable} + */ + BlockType MANGROVE_PRESSURE_PLATE = asBlockType(Material.MANGROVE_PRESSURE_PLATE); /** * BlockData: {@link Powerable} */ @@ -1771,6 +1848,10 @@ public interface BlockType extends Material { * BlockData: {@link Door} */ BlockType DARK_OAK_DOOR = asBlockType(Material.DARK_OAK_DOOR); + /** + * BlockData: {@link Door} + */ + BlockType MANGROVE_DOOR = asBlockType(Material.MANGROVE_DOOR); /** * BlockData: {@link Door} */ @@ -1807,6 +1888,10 @@ public interface BlockType extends Material { * BlockData: {@link TrapDoor} */ BlockType DARK_OAK_TRAPDOOR = asBlockType(Material.DARK_OAK_TRAPDOOR); + /** + * BlockData: {@link TrapDoor} + */ + BlockType MANGROVE_TRAPDOOR = asBlockType(Material.MANGROVE_TRAPDOOR); /** * BlockData: {@link TrapDoor} */ @@ -1839,6 +1924,10 @@ public interface BlockType extends Material { * BlockData: {@link Gate} */ BlockType DARK_OAK_FENCE_GATE = asBlockType(Material.DARK_OAK_FENCE_GATE); + /** + * BlockData: {@link Gate} + */ + BlockType MANGROVE_FENCE_GATE = asBlockType(Material.MANGROVE_FENCE_GATE); /** * BlockData: {@link Gate} */ @@ -1899,6 +1988,10 @@ public interface BlockType extends Material { * BlockData: {@link Sign} */ BlockType DARK_OAK_SIGN = asBlockType(Material.DARK_OAK_SIGN); + /** + * BlockData: {@link Sign} + */ + BlockType MANGROVE_SIGN = asBlockType(Material.MANGROVE_SIGN); /** * BlockData: {@link Sign} */ @@ -2250,6 +2343,19 @@ public interface BlockType extends Material { * BlockData: {@link PointedDripstone} */ BlockType POINTED_DRIPSTONE = asBlockType(Material.POINTED_DRIPSTONE); + /** + * BlockData: {@link Orientable} + */ + BlockType OCHRE_FROGLIGHT = asBlockType(Material.OCHRE_FROGLIGHT); + /** + * BlockData: {@link Orientable} + */ + BlockType VERDANT_FROGLIGHT = asBlockType(Material.VERDANT_FROGLIGHT); + /** + * BlockData: {@link Orientable} + */ + BlockType PEARLESCENT_FROGLIGHT = asBlockType(Material.PEARLESCENT_FROGLIGHT); + BlockType FROGSPAWN = asBlockType(Material.FROGSPAWN); /** * BlockData: {@link Levelled} */ @@ -2310,6 +2416,10 @@ public interface BlockType extends Material { * BlockData: {@link WallSign} */ BlockType DARK_OAK_WALL_SIGN = asBlockType(Material.DARK_OAK_WALL_SIGN); + /** + * BlockData: {@link WallSign} + */ + BlockType MANGROVE_WALL_SIGN = asBlockType(Material.MANGROVE_WALL_SIGN); /** * BlockData: {@link RedstoneWallTorch} */ @@ -2362,6 +2472,7 @@ public interface BlockType extends Material { BlockType POTTED_JUNGLE_SAPLING = asBlockType(Material.POTTED_JUNGLE_SAPLING); BlockType POTTED_ACACIA_SAPLING = asBlockType(Material.POTTED_ACACIA_SAPLING); BlockType POTTED_DARK_OAK_SAPLING = asBlockType(Material.POTTED_DARK_OAK_SAPLING); + BlockType POTTED_MANGROVE_PROPAGULE = asBlockType(Material.POTTED_MANGROVE_PROPAGULE); BlockType POTTED_FERN = asBlockType(Material.POTTED_FERN); BlockType POTTED_DANDELION = asBlockType(Material.POTTED_DANDELION); BlockType POTTED_POPPY = asBlockType(Material.POTTED_POPPY); diff --git a/src/main/java/org/bukkit/enchantments/Enchantment.java b/src/main/java/org/bukkit/enchantments/Enchantment.java index 09454f18..36f9410e 100644 --- a/src/main/java/org/bukkit/enchantments/Enchantment.java +++ b/src/main/java/org/bukkit/enchantments/Enchantment.java @@ -206,6 +206,11 @@ public abstract class Enchantment implements Keyed { */ public static final Enchantment SOUL_SPEED = getEnchantment("soul_speed"); + /** + * Walk quicker while sneaking + */ + public static final Enchantment SWIFT_SNEAK = getEnchantment("swift_sneak"); + @NotNull private static Enchantment getEnchantment(@NotNull String key) { NamespacedKey namespacedKey = NamespacedKey.minecraft(key); diff --git a/src/main/java/org/bukkit/entity/EntityType.java b/src/main/java/org/bukkit/entity/EntityType.java index ddf93964..042a6df0 100644 --- a/src/main/java/org/bukkit/entity/EntityType.java +++ b/src/main/java/org/bukkit/entity/EntityType.java @@ -275,6 +275,11 @@ public abstract class EntityType extends OldEnum implements Keyed { public static final EntityType GLOW_SQUID = getEntityType("glow_squid"); public static final EntityType GOAT = getEntityType("goat"); public static final EntityType MARKER = getEntityType("marker"); + public static final EntityType ALLAY = getEntityType("allay"); + public static final EntityType CHEST_BOAT = getEntityType("chest_boat"); + public static final EntityType FROG = getEntityType("frog"); + public static final EntityType TADPOLE = getEntityType("tadpole"); + public static final EntityType WARDEN = getEntityType("warden"); /** * A fishing line and bobber. */ diff --git a/src/main/java/org/bukkit/inventory/ItemType.java b/src/main/java/org/bukkit/inventory/ItemType.java index e0a351db..949d4b96 100644 --- a/src/main/java/org/bukkit/inventory/ItemType.java +++ b/src/main/java/org/bukkit/inventory/ItemType.java @@ -29,6 +29,7 @@ public interface ItemType extends Material { ItemType COARSE_DIRT = asItemType(Material.COARSE_DIRT); ItemType PODZOL = asItemType(Material.PODZOL); ItemType ROOTED_DIRT = asItemType(Material.ROOTED_DIRT); + ItemType MUD = asItemType(Material.MUD); ItemType CRIMSON_NYLIUM = asItemType(Material.CRIMSON_NYLIUM); ItemType WARPED_NYLIUM = asItemType(Material.WARPED_NYLIUM); ItemType COBBLESTONE = asItemType(Material.COBBLESTONE); @@ -38,6 +39,7 @@ public interface ItemType extends Material { ItemType JUNGLE_PLANKS = asItemType(Material.JUNGLE_PLANKS); ItemType ACACIA_PLANKS = asItemType(Material.ACACIA_PLANKS); ItemType DARK_OAK_PLANKS = asItemType(Material.DARK_OAK_PLANKS); + ItemType MANGROVE_PLANKS = asItemType(Material.MANGROVE_PLANKS); ItemType CRIMSON_PLANKS = asItemType(Material.CRIMSON_PLANKS); ItemType WARPED_PLANKS = asItemType(Material.WARPED_PLANKS); ItemType OAK_SAPLING = asItemType(Material.OAK_SAPLING); @@ -46,6 +48,7 @@ public interface ItemType extends Material { ItemType JUNGLE_SAPLING = asItemType(Material.JUNGLE_SAPLING); ItemType ACACIA_SAPLING = asItemType(Material.ACACIA_SAPLING); ItemType DARK_OAK_SAPLING = asItemType(Material.DARK_OAK_SAPLING); + ItemType MANGROVE_PROPAGULE = asItemType(Material.MANGROVE_PROPAGULE); ItemType BEDROCK = asItemType(Material.BEDROCK); ItemType SAND = asItemType(Material.SAND); ItemType RED_SAND = asItemType(Material.RED_SAND); @@ -117,6 +120,9 @@ public interface ItemType extends Material { ItemType JUNGLE_LOG = asItemType(Material.JUNGLE_LOG); ItemType ACACIA_LOG = asItemType(Material.ACACIA_LOG); ItemType DARK_OAK_LOG = asItemType(Material.DARK_OAK_LOG); + ItemType MANGROVE_LOG = asItemType(Material.MANGROVE_LOG); + ItemType MANGROVE_ROOTS = asItemType(Material.MANGROVE_ROOTS); + ItemType MUDDY_MANGROVE_ROOTS = asItemType(Material.MUDDY_MANGROVE_ROOTS); ItemType CRIMSON_STEM = asItemType(Material.CRIMSON_STEM); ItemType WARPED_STEM = asItemType(Material.WARPED_STEM); ItemType STRIPPED_OAK_LOG = asItemType(Material.STRIPPED_OAK_LOG); @@ -125,6 +131,7 @@ public interface ItemType extends Material { ItemType STRIPPED_JUNGLE_LOG = asItemType(Material.STRIPPED_JUNGLE_LOG); ItemType STRIPPED_ACACIA_LOG = asItemType(Material.STRIPPED_ACACIA_LOG); ItemType STRIPPED_DARK_OAK_LOG = asItemType(Material.STRIPPED_DARK_OAK_LOG); + ItemType STRIPPED_MANGROVE_LOG = asItemType(Material.STRIPPED_MANGROVE_LOG); ItemType STRIPPED_CRIMSON_STEM = asItemType(Material.STRIPPED_CRIMSON_STEM); ItemType STRIPPED_WARPED_STEM = asItemType(Material.STRIPPED_WARPED_STEM); ItemType STRIPPED_OAK_WOOD = asItemType(Material.STRIPPED_OAK_WOOD); @@ -133,6 +140,7 @@ public interface ItemType extends Material { ItemType STRIPPED_JUNGLE_WOOD = asItemType(Material.STRIPPED_JUNGLE_WOOD); ItemType STRIPPED_ACACIA_WOOD = asItemType(Material.STRIPPED_ACACIA_WOOD); ItemType STRIPPED_DARK_OAK_WOOD = asItemType(Material.STRIPPED_DARK_OAK_WOOD); + ItemType STRIPPED_MANGROVE_WOOD = asItemType(Material.STRIPPED_MANGROVE_WOOD); ItemType STRIPPED_CRIMSON_HYPHAE = asItemType(Material.STRIPPED_CRIMSON_HYPHAE); ItemType STRIPPED_WARPED_HYPHAE = asItemType(Material.STRIPPED_WARPED_HYPHAE); ItemType OAK_WOOD = asItemType(Material.OAK_WOOD); @@ -141,6 +149,7 @@ public interface ItemType extends Material { ItemType JUNGLE_WOOD = asItemType(Material.JUNGLE_WOOD); ItemType ACACIA_WOOD = asItemType(Material.ACACIA_WOOD); ItemType DARK_OAK_WOOD = asItemType(Material.DARK_OAK_WOOD); + ItemType MANGROVE_WOOD = asItemType(Material.MANGROVE_WOOD); ItemType CRIMSON_HYPHAE = asItemType(Material.CRIMSON_HYPHAE); ItemType WARPED_HYPHAE = asItemType(Material.WARPED_HYPHAE); ItemType OAK_LEAVES = asItemType(Material.OAK_LEAVES); @@ -149,6 +158,7 @@ public interface ItemType extends Material { ItemType JUNGLE_LEAVES = asItemType(Material.JUNGLE_LEAVES); ItemType ACACIA_LEAVES = asItemType(Material.ACACIA_LEAVES); ItemType DARK_OAK_LEAVES = asItemType(Material.DARK_OAK_LEAVES); + ItemType MANGROVE_LEAVES = asItemType(Material.MANGROVE_LEAVES); ItemType AZALEA_LEAVES = asItemType(Material.AZALEA_LEAVES); ItemType FLOWERING_AZALEA_LEAVES = asItemType(Material.FLOWERING_AZALEA_LEAVES); ItemType SPONGE = asItemType(Material.SPONGE); @@ -220,6 +230,7 @@ public interface ItemType extends Material { ItemType JUNGLE_SLAB = asItemType(Material.JUNGLE_SLAB); ItemType ACACIA_SLAB = asItemType(Material.ACACIA_SLAB); ItemType DARK_OAK_SLAB = asItemType(Material.DARK_OAK_SLAB); + ItemType MANGROVE_SLAB = asItemType(Material.MANGROVE_SLAB); ItemType CRIMSON_SLAB = asItemType(Material.CRIMSON_SLAB); ItemType WARPED_SLAB = asItemType(Material.WARPED_SLAB); ItemType STONE_SLAB = asItemType(Material.STONE_SLAB); @@ -230,6 +241,7 @@ public interface ItemType extends Material { ItemType COBBLESTONE_SLAB = asItemType(Material.COBBLESTONE_SLAB); ItemType BRICK_SLAB = asItemType(Material.BRICK_SLAB); ItemType STONE_BRICK_SLAB = asItemType(Material.STONE_BRICK_SLAB); + ItemType MUD_BRICK_SLAB = asItemType(Material.MUD_BRICK_SLAB); ItemType NETHER_BRICK_SLAB = asItemType(Material.NETHER_BRICK_SLAB); ItemType QUARTZ_SLAB = asItemType(Material.QUARTZ_SLAB); ItemType RED_SANDSTONE_SLAB = asItemType(Material.RED_SANDSTONE_SLAB); @@ -254,7 +266,6 @@ public interface ItemType extends Material { ItemType PURPUR_PILLAR = asItemType(Material.PURPUR_PILLAR); ItemType PURPUR_STAIRS = asItemType(Material.PURPUR_STAIRS); ItemType SPAWNER = asItemType(Material.SPAWNER); - ItemType OAK_STAIRS = asItemType(Material.OAK_STAIRS); ItemType CHEST = asItemType(Material.CHEST); ItemType CRAFTING_TABLE = asItemType(Material.CRAFTING_TABLE); ItemType FARMLAND = asItemType(Material.FARMLAND); @@ -273,6 +284,7 @@ public interface ItemType extends Material { ItemType JUNGLE_FENCE = asItemType(Material.JUNGLE_FENCE); ItemType ACACIA_FENCE = asItemType(Material.ACACIA_FENCE); ItemType DARK_OAK_FENCE = asItemType(Material.DARK_OAK_FENCE); + ItemType MANGROVE_FENCE = asItemType(Material.MANGROVE_FENCE); ItemType CRIMSON_FENCE = asItemType(Material.CRIMSON_FENCE); ItemType WARPED_FENCE = asItemType(Material.WARPED_FENCE); ItemType PUMPKIN = asItemType(Material.PUMPKIN); @@ -297,11 +309,14 @@ public interface ItemType extends Material { ItemType MOSSY_STONE_BRICKS = asItemType(Material.MOSSY_STONE_BRICKS); ItemType CRACKED_STONE_BRICKS = asItemType(Material.CRACKED_STONE_BRICKS); ItemType CHISELED_STONE_BRICKS = asItemType(Material.CHISELED_STONE_BRICKS); + ItemType PACKED_MUD = asItemType(Material.PACKED_MUD); + ItemType MUD_BRICKS = asItemType(Material.MUD_BRICKS); ItemType DEEPSLATE_BRICKS = asItemType(Material.DEEPSLATE_BRICKS); ItemType CRACKED_DEEPSLATE_BRICKS = asItemType(Material.CRACKED_DEEPSLATE_BRICKS); ItemType DEEPSLATE_TILES = asItemType(Material.DEEPSLATE_TILES); ItemType CRACKED_DEEPSLATE_TILES = asItemType(Material.CRACKED_DEEPSLATE_TILES); ItemType CHISELED_DEEPSLATE = asItemType(Material.CHISELED_DEEPSLATE); + ItemType REINFORCED_DEEPSLATE = asItemType(Material.REINFORCED_DEEPSLATE); ItemType BROWN_MUSHROOM_BLOCK = asItemType(Material.BROWN_MUSHROOM_BLOCK); ItemType RED_MUSHROOM_BLOCK = asItemType(Material.RED_MUSHROOM_BLOCK); ItemType MUSHROOM_STEM = asItemType(Material.MUSHROOM_STEM); @@ -313,6 +328,7 @@ public interface ItemType extends Material { ItemType GLOW_LICHEN = asItemType(Material.GLOW_LICHEN); ItemType BRICK_STAIRS = asItemType(Material.BRICK_STAIRS); ItemType STONE_BRICK_STAIRS = asItemType(Material.STONE_BRICK_STAIRS); + ItemType MUD_BRICK_STAIRS = asItemType(Material.MUD_BRICK_STAIRS); ItemType MYCELIUM = asItemType(Material.MYCELIUM); ItemType LILY_PAD = asItemType(Material.LILY_PAD); ItemType NETHER_BRICKS = asItemType(Material.NETHER_BRICKS); @@ -320,6 +336,10 @@ public interface ItemType extends Material { ItemType CHISELED_NETHER_BRICKS = asItemType(Material.CHISELED_NETHER_BRICKS); ItemType NETHER_BRICK_FENCE = asItemType(Material.NETHER_BRICK_FENCE); ItemType NETHER_BRICK_STAIRS = asItemType(Material.NETHER_BRICK_STAIRS); + ItemType SCULK = asItemType(Material.SCULK); + ItemType SCULK_VEIN = asItemType(Material.SCULK_VEIN); + ItemType SCULK_CATALYST = asItemType(Material.SCULK_CATALYST); + ItemType SCULK_SHRIEKER = asItemType(Material.SCULK_SHRIEKER); ItemType ENCHANTING_TABLE = asItemType(Material.ENCHANTING_TABLE); ItemType END_PORTAL_FRAME = asItemType(Material.END_PORTAL_FRAME); ItemType END_STONE = asItemType(Material.END_STONE); @@ -328,9 +348,13 @@ public interface ItemType extends Material { ItemType SANDSTONE_STAIRS = asItemType(Material.SANDSTONE_STAIRS); ItemType ENDER_CHEST = asItemType(Material.ENDER_CHEST); ItemType EMERALD_BLOCK = asItemType(Material.EMERALD_BLOCK); + ItemType OAK_STAIRS = asItemType(Material.OAK_STAIRS); ItemType SPRUCE_STAIRS = asItemType(Material.SPRUCE_STAIRS); ItemType BIRCH_STAIRS = asItemType(Material.BIRCH_STAIRS); ItemType JUNGLE_STAIRS = asItemType(Material.JUNGLE_STAIRS); + ItemType ACACIA_STAIRS = asItemType(Material.ACACIA_STAIRS); + ItemType DARK_OAK_STAIRS = asItemType(Material.DARK_OAK_STAIRS); + ItemType MANGROVE_STAIRS = asItemType(Material.MANGROVE_STAIRS); ItemType CRIMSON_STAIRS = asItemType(Material.CRIMSON_STAIRS); ItemType WARPED_STAIRS = asItemType(Material.WARPED_STAIRS); ItemType COMMAND_BLOCK = asItemType(Material.COMMAND_BLOCK); @@ -343,6 +367,7 @@ public interface ItemType extends Material { ItemType MOSSY_STONE_BRICK_WALL = asItemType(Material.MOSSY_STONE_BRICK_WALL); ItemType GRANITE_WALL = asItemType(Material.GRANITE_WALL); ItemType STONE_BRICK_WALL = asItemType(Material.STONE_BRICK_WALL); + ItemType MUD_BRICK_WALL = asItemType(Material.MUD_BRICK_WALL); ItemType NETHER_BRICK_WALL = asItemType(Material.NETHER_BRICK_WALL); ItemType ANDESITE_WALL = asItemType(Material.ANDESITE_WALL); ItemType RED_NETHER_BRICK_WALL = asItemType(Material.RED_NETHER_BRICK_WALL); @@ -401,8 +426,6 @@ public interface ItemType extends Material { ItemType BLACK_CARPET = asItemType(Material.BLACK_CARPET); ItemType TERRACOTTA = asItemType(Material.TERRACOTTA); ItemType PACKED_ICE = asItemType(Material.PACKED_ICE); - ItemType ACACIA_STAIRS = asItemType(Material.ACACIA_STAIRS); - ItemType DARK_OAK_STAIRS = asItemType(Material.DARK_OAK_STAIRS); ItemType DIRT_PATH = asItemType(Material.DIRT_PATH); ItemType SUNFLOWER = asItemType(Material.SUNFLOWER); ItemType LILAC = asItemType(Material.LILAC); @@ -627,6 +650,7 @@ public interface ItemType extends Material { ItemType JUNGLE_BUTTON = asItemType(Material.JUNGLE_BUTTON); ItemType ACACIA_BUTTON = asItemType(Material.ACACIA_BUTTON); ItemType DARK_OAK_BUTTON = asItemType(Material.DARK_OAK_BUTTON); + ItemType MANGROVE_BUTTON = asItemType(Material.MANGROVE_BUTTON); ItemType CRIMSON_BUTTON = asItemType(Material.CRIMSON_BUTTON); ItemType WARPED_BUTTON = asItemType(Material.WARPED_BUTTON); ItemType STONE_PRESSURE_PLATE = asItemType(Material.STONE_PRESSURE_PLATE); @@ -639,6 +663,7 @@ public interface ItemType extends Material { ItemType JUNGLE_PRESSURE_PLATE = asItemType(Material.JUNGLE_PRESSURE_PLATE); ItemType ACACIA_PRESSURE_PLATE = asItemType(Material.ACACIA_PRESSURE_PLATE); ItemType DARK_OAK_PRESSURE_PLATE = asItemType(Material.DARK_OAK_PRESSURE_PLATE); + ItemType MANGROVE_PRESSURE_PLATE = asItemType(Material.MANGROVE_PRESSURE_PLATE); ItemType CRIMSON_PRESSURE_PLATE = asItemType(Material.CRIMSON_PRESSURE_PLATE); ItemType WARPED_PRESSURE_PLATE = asItemType(Material.WARPED_PRESSURE_PLATE); ItemType IRON_DOOR = asItemType(Material.IRON_DOOR); @@ -648,6 +673,7 @@ public interface ItemType extends Material { ItemType JUNGLE_DOOR = asItemType(Material.JUNGLE_DOOR); ItemType ACACIA_DOOR = asItemType(Material.ACACIA_DOOR); ItemType DARK_OAK_DOOR = asItemType(Material.DARK_OAK_DOOR); + ItemType MANGROVE_DOOR = asItemType(Material.MANGROVE_DOOR); ItemType CRIMSON_DOOR = asItemType(Material.CRIMSON_DOOR); ItemType WARPED_DOOR = asItemType(Material.WARPED_DOOR); ItemType IRON_TRAPDOOR = asItemType(Material.IRON_TRAPDOOR); @@ -657,6 +683,7 @@ public interface ItemType extends Material { ItemType JUNGLE_TRAPDOOR = asItemType(Material.JUNGLE_TRAPDOOR); ItemType ACACIA_TRAPDOOR = asItemType(Material.ACACIA_TRAPDOOR); ItemType DARK_OAK_TRAPDOOR = asItemType(Material.DARK_OAK_TRAPDOOR); + ItemType MANGROVE_TRAPDOOR = asItemType(Material.MANGROVE_TRAPDOOR); ItemType CRIMSON_TRAPDOOR = asItemType(Material.CRIMSON_TRAPDOOR); ItemType WARPED_TRAPDOOR = asItemType(Material.WARPED_TRAPDOOR); ItemType OAK_FENCE_GATE = asItemType(Material.OAK_FENCE_GATE); @@ -665,6 +692,7 @@ public interface ItemType extends Material { ItemType JUNGLE_FENCE_GATE = asItemType(Material.JUNGLE_FENCE_GATE); ItemType ACACIA_FENCE_GATE = asItemType(Material.ACACIA_FENCE_GATE); ItemType DARK_OAK_FENCE_GATE = asItemType(Material.DARK_OAK_FENCE_GATE); + ItemType MANGROVE_FENCE_GATE = asItemType(Material.MANGROVE_FENCE_GATE); ItemType CRIMSON_FENCE_GATE = asItemType(Material.CRIMSON_FENCE_GATE); ItemType WARPED_FENCE_GATE = asItemType(Material.WARPED_FENCE_GATE); ItemType POWERED_RAIL = asItemType(Material.POWERED_RAIL); @@ -681,11 +709,19 @@ public interface ItemType extends Material { ItemType WARPED_FUNGUS_ON_A_STICK = asItemType(Material.WARPED_FUNGUS_ON_A_STICK); ItemType ELYTRA = asItemType(Material.ELYTRA); ItemType OAK_BOAT = asItemType(Material.OAK_BOAT); + ItemType OAK_CHEST_BOAT = asItemType(Material.OAK_CHEST_BOAT); ItemType SPRUCE_BOAT = asItemType(Material.SPRUCE_BOAT); + ItemType SPRUCE_CHEST_BOAT = asItemType(Material.SPRUCE_CHEST_BOAT); ItemType BIRCH_BOAT = asItemType(Material.BIRCH_BOAT); + ItemType BIRCH_CHEST_BOAT = asItemType(Material.BIRCH_CHEST_BOAT); ItemType JUNGLE_BOAT = asItemType(Material.JUNGLE_BOAT); + ItemType JUNGLE_CHEST_BOAT = asItemType(Material.JUNGLE_CHEST_BOAT); ItemType ACACIA_BOAT = asItemType(Material.ACACIA_BOAT); + ItemType ACACIA_CHEST_BOAT = asItemType(Material.ACACIA_CHEST_BOAT); ItemType DARK_OAK_BOAT = asItemType(Material.DARK_OAK_BOAT); + ItemType DARK_OAK_CHEST_BOAT = asItemType(Material.DARK_OAK_CHEST_BOAT); + ItemType MANGROVE_BOAT = asItemType(Material.MANGROVE_BOAT); + ItemType MANGROVE_CHEST_BOAT = asItemType(Material.MANGROVE_CHEST_BOAT); ItemType STRUCTURE_BLOCK = asItemType(Material.STRUCTURE_BLOCK); ItemType JIGSAW = asItemType(Material.JIGSAW); ItemType TURTLE_HELMET = asItemType(Material.TURTLE_HELMET); @@ -784,6 +820,7 @@ public interface ItemType extends Material { ItemType JUNGLE_SIGN = asItemType(Material.JUNGLE_SIGN); ItemType ACACIA_SIGN = asItemType(Material.ACACIA_SIGN); ItemType DARK_OAK_SIGN = asItemType(Material.DARK_OAK_SIGN); + ItemType MANGROVE_SIGN = asItemType(Material.MANGROVE_SIGN); ItemType CRIMSON_SIGN = asItemType(Material.CRIMSON_SIGN); ItemType WARPED_SIGN = asItemType(Material.WARPED_SIGN); ItemType BUCKET = asItemType(Material.BUCKET); @@ -798,6 +835,7 @@ public interface ItemType extends Material { ItemType COD_BUCKET = asItemType(Material.COD_BUCKET); ItemType TROPICAL_FISH_BUCKET = asItemType(Material.TROPICAL_FISH_BUCKET); ItemType AXOLOTL_BUCKET = asItemType(Material.AXOLOTL_BUCKET); + ItemType TADPOLE_BUCKET = asItemType(Material.TADPOLE_BUCKET); ItemType BRICK = asItemType(Material.BRICK); ItemType CLAY_BALL = asItemType(Material.CLAY_BALL); ItemType DRIED_KELP_BLOCK = asItemType(Material.DRIED_KELP_BLOCK); @@ -806,6 +844,7 @@ public interface ItemType extends Material { ItemType SLIME_BALL = asItemType(Material.SLIME_BALL); ItemType EGG = asItemType(Material.EGG); ItemType COMPASS = asItemType(Material.COMPASS); + ItemType RECOVERY_COMPASS = asItemType(Material.RECOVERY_COMPASS); ItemType BUNDLE = asItemType(Material.BUNDLE); ItemType FISHING_ROD = asItemType(Material.FISHING_ROD); ItemType CLOCK = asItemType(Material.CLOCK); @@ -883,6 +922,7 @@ public interface ItemType extends Material { ItemType CAULDRON = asItemType(Material.CAULDRON); ItemType ENDER_EYE = asItemType(Material.ENDER_EYE); ItemType GLISTERING_MELON_SLICE = asItemType(Material.GLISTERING_MELON_SLICE); + ItemType ALLAY_SPAWN_EGG = asItemType(Material.ALLAY_SPAWN_EGG); ItemType AXOLOTL_SPAWN_EGG = asItemType(Material.AXOLOTL_SPAWN_EGG); ItemType BAT_SPAWN_EGG = asItemType(Material.BAT_SPAWN_EGG); ItemType BEE_SPAWN_EGG = asItemType(Material.BEE_SPAWN_EGG); @@ -901,6 +941,7 @@ public interface ItemType extends Material { ItemType ENDERMITE_SPAWN_EGG = asItemType(Material.ENDERMITE_SPAWN_EGG); ItemType EVOKER_SPAWN_EGG = asItemType(Material.EVOKER_SPAWN_EGG); ItemType FOX_SPAWN_EGG = asItemType(Material.FOX_SPAWN_EGG); + ItemType FROG_SPAWN_EGG = asItemType(Material.FROG_SPAWN_EGG); ItemType GHAST_SPAWN_EGG = asItemType(Material.GHAST_SPAWN_EGG); ItemType GLOW_SQUID_SPAWN_EGG = asItemType(Material.GLOW_SQUID_SPAWN_EGG); ItemType GOAT_SPAWN_EGG = asItemType(Material.GOAT_SPAWN_EGG); @@ -935,6 +976,7 @@ public interface ItemType extends Material { ItemType SQUID_SPAWN_EGG = asItemType(Material.SQUID_SPAWN_EGG); ItemType STRAY_SPAWN_EGG = asItemType(Material.STRAY_SPAWN_EGG); ItemType STRIDER_SPAWN_EGG = asItemType(Material.STRIDER_SPAWN_EGG); + ItemType TADPOLE_SPAWN_EGG = asItemType(Material.TADPOLE_SPAWN_EGG); ItemType TRADER_LLAMA_SPAWN_EGG = asItemType(Material.TRADER_LLAMA_SPAWN_EGG); ItemType TROPICAL_FISH_SPAWN_EGG = asItemType(Material.TROPICAL_FISH_SPAWN_EGG); ItemType TURTLE_SPAWN_EGG = asItemType(Material.TURTLE_SPAWN_EGG); @@ -942,6 +984,7 @@ public interface ItemType extends Material { ItemType VILLAGER_SPAWN_EGG = asItemType(Material.VILLAGER_SPAWN_EGG); ItemType VINDICATOR_SPAWN_EGG = asItemType(Material.VINDICATOR_SPAWN_EGG); ItemType WANDERING_TRADER_SPAWN_EGG = asItemType(Material.WANDERING_TRADER_SPAWN_EGG); + ItemType WARDEN_SPAWN_EGG = asItemType(Material.WARDEN_SPAWN_EGG); ItemType WITCH_SPAWN_EGG = asItemType(Material.WITCH_SPAWN_EGG); ItemType WITHER_SKELETON_SPAWN_EGG = asItemType(Material.WITHER_SKELETON_SPAWN_EGG); ItemType WOLF_SPAWN_EGG = asItemType(Material.WOLF_SPAWN_EGG); @@ -1038,7 +1081,9 @@ public interface ItemType extends Material { ItemType MUSIC_DISC_11 = asItemType(Material.MUSIC_DISC_11); ItemType MUSIC_DISC_WAIT = asItemType(Material.MUSIC_DISC_WAIT); ItemType MUSIC_DISC_OTHERSIDE = asItemType(Material.MUSIC_DISC_OTHERSIDE); + ItemType MUSIC_DISC_5 = asItemType(Material.MUSIC_DISC_5); ItemType MUSIC_DISC_PIGSTEP = asItemType(Material.MUSIC_DISC_PIGSTEP); + ItemType DISC_FRAGMENT_5 = asItemType(Material.DISC_FRAGMENT_5); ItemType TRIDENT = asItemType(Material.TRIDENT); ItemType PHANTOM_MEMBRANE = asItemType(Material.PHANTOM_MEMBRANE); ItemType NAUTILUS_SHELL = asItemType(Material.NAUTILUS_SHELL); @@ -1052,6 +1097,7 @@ public interface ItemType extends Material { ItemType MOJANG_BANNER_PATTERN = asItemType(Material.MOJANG_BANNER_PATTERN); ItemType GLOBE_BANNER_PATTERN = asItemType(Material.GLOBE_BANNER_PATTERN); ItemType PIGLIN_BANNER_PATTERN = asItemType(Material.PIGLIN_BANNER_PATTERN); + ItemType GOAT_HORN = asItemType(Material.GOAT_HORN); ItemType COMPOSTER = asItemType(Material.COMPOSTER); ItemType BARREL = asItemType(Material.BARREL); ItemType SMOKER = asItemType(Material.SMOKER); @@ -1111,6 +1157,11 @@ public interface ItemType extends Material { ItemType LARGE_AMETHYST_BUD = asItemType(Material.LARGE_AMETHYST_BUD); ItemType AMETHYST_CLUSTER = asItemType(Material.AMETHYST_CLUSTER); ItemType POINTED_DRIPSTONE = asItemType(Material.POINTED_DRIPSTONE); + ItemType OCHRE_FROGLIGHT = asItemType(Material.OCHRE_FROGLIGHT); + ItemType VERDANT_FROGLIGHT = asItemType(Material.VERDANT_FROGLIGHT); + ItemType PEARLESCENT_FROGLIGHT = asItemType(Material.PEARLESCENT_FROGLIGHT); + ItemType FROGSPAWN = asItemType(Material.FROGSPAWN); + ItemType ECHO_SHARD = asItemType(Material.ECHO_SHARD); // @Contract("null -> null; !null -> !null") diff --git a/src/main/java/org/bukkit/potion/PotionEffectType.java b/src/main/java/org/bukkit/potion/PotionEffectType.java index 9f5bbd03..70574096 100644 --- a/src/main/java/org/bukkit/potion/PotionEffectType.java +++ b/src/main/java/org/bukkit/potion/PotionEffectType.java @@ -4,7 +4,6 @@ import com.google.common.base.Preconditions; import com.google.common.collect.BiMap; import com.google.common.collect.HashBiMap; import com.google.common.collect.Lists; -import org.apache.commons.lang.Validate; import org.bukkit.Color; import org.bukkit.Keyed; import org.bukkit.NamespacedKey; @@ -183,6 +182,10 @@ public abstract class PotionEffectType implements Keyed { * \o/. */ public static final PotionEffectType HERO_OF_THE_VILLAGE = getPotionEffectType(32, "hero_of_the_village"); + /** + * Causes the player's vision to dim occasionally. + */ + public static final PotionEffectType DARKNESS = getPotionEffectType(33, "darkness"); private static PotionEffectType getPotionEffectType(int typeId, @NotNull String key) { NamespacedKey namespacedKey = NamespacedKey.minecraft(key); @@ -286,7 +289,7 @@ public abstract class PotionEffectType implements Keyed { @Nullable @Deprecated public static PotionEffectType getByName(@NotNull String name) { - Validate.notNull(name, "name cannot be null"); + Preconditions.checkArgument(name != null, "name cannot be null"); return Registry.POTION_EFFECT_TYPE.get(NamespacedKey.fromString(name.toLowerCase(java.util.Locale.ENGLISH))); } diff --git a/src/test/java/org/bukkit/DyeColorTest.java b/src/test/java/org/bukkit/DyeColorTest.java index e56d9439..de61c885 100644 --- a/src/test/java/org/bukkit/DyeColorTest.java +++ b/src/test/java/org/bukkit/DyeColorTest.java @@ -7,6 +7,7 @@ import java.util.List; import org.bukkit.material.Colorable; import org.bukkit.material.Dye; import org.bukkit.material.Wool; +import org.bukkit.support.AbstractTestingBase; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; @@ -14,7 +15,7 @@ import org.junit.runners.Parameterized.Parameter; import org.junit.runners.Parameterized.Parameters; @RunWith(Parameterized.class) -public class DyeColorTest { +public class DyeColorTest extends AbstractTestingBase { @Parameters(name = "{index}: {0}") public static List data() { diff --git a/src/test/java/org/bukkit/LocationTest.java b/src/test/java/org/bukkit/LocationTest.java index 887305c0..199b2bba 100644 --- a/src/test/java/org/bukkit/LocationTest.java +++ b/src/test/java/org/bukkit/LocationTest.java @@ -5,6 +5,7 @@ import static org.junit.Assert.*; import com.google.common.collect.ImmutableList; import java.util.List; import java.util.Random; +import org.bukkit.support.AbstractTestingBase; import org.bukkit.util.Vector; import org.junit.Test; import org.junit.runner.RunWith; @@ -13,7 +14,7 @@ import org.junit.runners.Parameterized.Parameter; import org.junit.runners.Parameterized.Parameters; @RunWith(Parameterized.class) -public class LocationTest { +public class LocationTest extends AbstractTestingBase { private static final double delta = 1.0 / 1000000; /** *