diff --git a/src/main/java/org/cloudburstmc/api/block/BlockIds.java b/src/main/java/org/cloudburstmc/api/block/BlockIds.java index dbe34f6aa..6dde58ac2 100644 --- a/src/main/java/org/cloudburstmc/api/block/BlockIds.java +++ b/src/main/java/org/cloudburstmc/api/block/BlockIds.java @@ -99,6 +99,7 @@ public final class BlockIds { public static final Identifier CHORUS_FLOWER = Identifier.fromString("chorus_flower"); public static final Identifier CHORUS_PLANT = Identifier.fromString("chorus_plant"); public static final Identifier CLAY = Identifier.fromString("clay"); + public static final Identifier CLIENT_REQUEST_PLACEHOLDER_BLOCK = Identifier.fromString("client_request_placeholder_block"); public static final Identifier COAL_BLOCK = Identifier.fromString("coal_block"); public static final Identifier COAL_ORE = Identifier.fromString("coal_ore"); public static final Identifier COBBLED_DEEPSLATE = Identifier.fromString("cobbled_deepslate"); @@ -125,8 +126,8 @@ public final class BlockIds { public static final Identifier CORAL_FAN_HANG = Identifier.fromString("coral_fan_hang"); public static final Identifier CORAL_FAN_HANG2 = Identifier.fromString("coral_fan_hang2"); public static final Identifier CORAL_FAN_HANG3 = Identifier.fromString("coral_fan_hang3"); - public static final Identifier CRACKED_DEEPSLATE_TILES = Identifier.fromString("cracked_deepslate_tiles"); public static final Identifier CRACKED_DEEPSLATE_BRICKS = Identifier.fromString("cracked_deepslate_bricks"); + public static final Identifier CRACKED_DEEPSLATE_TILES = Identifier.fromString("cracked_deepslate_tiles"); public static final Identifier CRACKED_NETHER_BRICKS = Identifier.fromString("cracked_nether_bricks"); public static final Identifier CRACKED_POLISHED_BLACKSTONE_BRICKS = Identifier.fromString("cracked_polished_blackstone_bricks"); public static final Identifier CRAFTING_TABLE = Identifier.fromString("crafting_table"); @@ -154,24 +155,24 @@ public final class BlockIds { public static final Identifier CYAN_CANDLE = Identifier.fromString("cyan_candle"); public static final Identifier CYAN_CANDLE_CAKE = Identifier.fromString("cyan_candle_cake"); public static final Identifier CYAN_GLAZED_TERRACOTTA = Identifier.fromString("cyan_glazed_terracotta"); - public static final Identifier DARK_OAK_STANDING_SIGN = Identifier.fromString("darkoak_standing_sign"); - public static final Identifier DARK_OAK_WALL_SIGN = Identifier.fromString("darkoak_wall_sign"); public static final Identifier DARK_OAK_BUTTON = Identifier.fromString("dark_oak_button"); public static final Identifier DARK_OAK_DOOR = Identifier.fromString("dark_oak_door"); public static final Identifier DARK_OAK_FENCE_GATE = Identifier.fromString("dark_oak_fence_gate"); public static final Identifier DARK_OAK_PRESSURE_PLATE = Identifier.fromString("dark_oak_pressure_plate"); public static final Identifier DARK_OAK_STAIRS = Identifier.fromString("dark_oak_stairs"); + public static final Identifier DARK_OAK_STANDING_SIGN = Identifier.fromString("darkoak_standing_sign"); public static final Identifier DARK_OAK_TRAPDOOR = Identifier.fromString("dark_oak_trapdoor"); + public static final Identifier DARK_OAK_WALL_SIGN = Identifier.fromString("darkoak_wall_sign"); public static final Identifier DARK_PRISMARINE_STAIRS = Identifier.fromString("dark_prismarine_stairs"); public static final Identifier DAYLIGHT_DETECTOR = Identifier.fromString("daylight_detector"); public static final Identifier DAYLIGHT_DETECTOR_INVERTED = Identifier.fromString("daylight_detector_inverted"); public static final Identifier DEADBUSH = Identifier.fromString("deadbush"); public static final Identifier DEEPSLATE = Identifier.fromString("deepslate"); + public static final Identifier DEEPSLATE_BRICKS = Identifier.fromString("deepslate_bricks"); public static final Identifier DEEPSLATE_BRICK_DOUBLE_SLAB = Identifier.fromString("deepslate_brick_double_slab"); public static final Identifier DEEPSLATE_BRICK_SLAB = Identifier.fromString("deepslate_brick_slab"); public static final Identifier DEEPSLATE_BRICK_STAIRS = Identifier.fromString("deepslate_brick_stairs"); public static final Identifier DEEPSLATE_BRICK_WALL = Identifier.fromString("deepslate_brick_wall"); - public static final Identifier DEEPSLATE_BRICKS = Identifier.fromString("deepslate_bricks"); public static final Identifier DEEPSLATE_COAL_ORE = Identifier.fromString("deepslate_coal_ore"); public static final Identifier DEEPSLATE_COPPER_ORE = Identifier.fromString("deepslate_copper_ore"); public static final Identifier DEEPSLATE_DIAMOND_ORE = Identifier.fromString("deepslate_diamond_ore"); @@ -180,11 +181,11 @@ public final class BlockIds { public static final Identifier DEEPSLATE_IRON_ORE = Identifier.fromString("deepslate_iron_ore"); public static final Identifier DEEPSLATE_LAPIS_ORE = Identifier.fromString("deepslate_lapis_ore"); public static final Identifier DEEPSLATE_REDSTONE_ORE = Identifier.fromString("deepslate_redstone_ore"); + public static final Identifier DEEPSLATE_TILES = Identifier.fromString("deepslate_tiles"); public static final Identifier DEEPSLATE_TILE_DOUBLE_SLAB = Identifier.fromString("deepslate_tile_double_slab"); public static final Identifier DEEPSLATE_TILE_SLAB = Identifier.fromString("deepslate_tile_slab"); public static final Identifier DEEPSLATE_TILE_STAIRS = Identifier.fromString("deepslate_tile_stairs"); public static final Identifier DEEPSLATE_TILE_WALL = Identifier.fromString("deepslate_tile_wall"); - public static final Identifier DEEPSLATE_TILES = Identifier.fromString("deepslate_tiles"); public static final Identifier DENY = Identifier.fromString("deny"); public static final Identifier DETECTOR_RAIL = Identifier.fromString("detector_rail"); public static final Identifier DIAMOND_BLOCK = Identifier.fromString("diamond_block"); @@ -341,23 +342,23 @@ public final class BlockIds { public static final Identifier EXPOSED_DOUBLE_CUT_COPPER_SLAB = Identifier.fromString("exposed_double_cut_copper_slab"); public static final Identifier FARMLAND = Identifier.fromString("farmland"); public static final Identifier FENCE = Identifier.fromString("fence"); - public static final Identifier OAK_FENCE_GATE = Identifier.fromString("fence_gate"); public static final Identifier FIRE = Identifier.fromString("fire"); public static final Identifier FLETCHING_TABLE = Identifier.fromString("fletching_table"); - public static final Identifier FLOWER_POT = Identifier.fromString("flower_pot"); public static final Identifier FLOWERING_AZALEA = Identifier.fromString("flowering_azalea"); + public static final Identifier FLOWER_POT = Identifier.fromString("flower_pot"); public static final Identifier FLOWING_LAVA = Identifier.fromString("flowing_lava"); public static final Identifier FLOWING_WATER = Identifier.fromString("flowing_water"); public static final Identifier FRAME = Identifier.fromString("frame"); + public static final Identifier FROG_EGG = Identifier.fromString("frog_egg"); public static final Identifier FROSTED_ICE = Identifier.fromString("frosted_ice"); public static final Identifier FURNACE = Identifier.fromString("furnace"); public static final Identifier GILDED_BLACKSTONE = Identifier.fromString("gilded_blackstone"); public static final Identifier GLASS = Identifier.fromString("glass"); public static final Identifier GLASS_PANE = Identifier.fromString("glass_pane"); - public static final Identifier GLOW_FRAME = Identifier.fromString("glow_frame"); - public static final Identifier GLOW_LICHEN = Identifier.fromString("glow_lichen"); public static final Identifier GLOWING_OBSIDIAN = Identifier.fromString("glowingobsidian"); public static final Identifier GLOWSTONE = Identifier.fromString("glowstone"); + public static final Identifier GLOW_FRAME = Identifier.fromString("glow_frame"); + public static final Identifier GLOW_LICHEN = Identifier.fromString("glow_lichen"); public static final Identifier GOLDEN_RAIL = Identifier.fromString("golden_rail"); public static final Identifier GOLD_BLOCK = Identifier.fromString("gold_block"); public static final Identifier GOLD_ORE = Identifier.fromString("gold_ore"); @@ -415,6 +416,7 @@ public final class BlockIds { public static final Identifier LEAVES2 = Identifier.fromString("leaves2"); public static final Identifier LECTERN = Identifier.fromString("lectern"); public static final Identifier LEVER = Identifier.fromString("lever"); + public static final Identifier LIGHTNING_ROD = Identifier.fromString("lightning_rod"); public static final Identifier LIGHT_BLOCK = Identifier.fromString("light_block"); public static final Identifier LIGHT_BLUE_CANDLE = Identifier.fromString("light_blue_candle"); public static final Identifier LIGHT_BLUE_CANDLE_CAKE = Identifier.fromString("light_blue_candle_cake"); @@ -422,7 +424,6 @@ public final class BlockIds { public static final Identifier LIGHT_GRAY_CANDLE = Identifier.fromString("light_gray_candle"); public static final Identifier LIGHT_GRAY_CANDLE_CAKE = Identifier.fromString("light_gray_candle_cake"); public static final Identifier LIGHT_WEIGHTED_PRESSURE_PLATE = Identifier.fromString("light_weighted_pressure_plate"); - public static final Identifier LIGHTNING_ROD = Identifier.fromString("lightning_rod"); public static final Identifier LIME_CANDLE = Identifier.fromString("lime_candle"); public static final Identifier LIME_CANDLE_CAKE = Identifier.fromString("lime_candle_cake"); public static final Identifier LIME_GLAZED_TERRACOTTA = Identifier.fromString("lime_glazed_terracotta"); @@ -446,20 +447,22 @@ public final class BlockIds { public static final Identifier MELON_STEM = Identifier.fromString("melon_stem"); public static final Identifier MOB_SPAWNER = Identifier.fromString("mob_spawner"); public static final Identifier MONSTER_EGG = Identifier.fromString("monster_egg"); - public static final Identifier MOSS_BLOCK = Identifier.fromString("moss_block"); - public static final Identifier MOSS_CARPET = Identifier.fromString("moss_carpet"); public static final Identifier MOSSY_COBBLESTONE = Identifier.fromString("mossy_cobblestone"); public static final Identifier MOSSY_COBBLESTONE_STAIRS = Identifier.fromString("mossy_cobblestone_stairs"); public static final Identifier MOSSY_STONE_BRICK_STAIRS = Identifier.fromString("mossy_stone_brick_stairs"); + public static final Identifier MOSS_BLOCK = Identifier.fromString("moss_block"); + public static final Identifier MOSS_CARPET = Identifier.fromString("moss_carpet"); public static final Identifier MOVING_BLOCK = Identifier.fromString("movingBlock"); public static final Identifier MYCELIUM = Identifier.fromString("mycelium"); + public static final Identifier MYSTERIOUS_FRAME = Identifier.fromString("mysterious_frame"); + public static final Identifier MYSTERIOUS_FRAME_SLOT = Identifier.fromString("mysterious_frame_slot"); public static final Identifier NETHERITE_BLOCK = Identifier.fromString("netherite_block"); public static final Identifier NETHERRACK = Identifier.fromString("netherrack"); - public static final Identifier NETHER_REACTOR = Identifier.fromString("netherreactor"); public static final Identifier NETHER_BRICK = Identifier.fromString("nether_brick"); public static final Identifier NETHER_BRICK_FENCE = Identifier.fromString("nether_brick_fence"); public static final Identifier NETHER_BRICK_STAIRS = Identifier.fromString("nether_brick_stairs"); public static final Identifier NETHER_GOLD_ORE = Identifier.fromString("nether_gold_ore"); + public static final Identifier NETHER_REACTOR = Identifier.fromString("netherreactor"); public static final Identifier NETHER_SPROUTS = Identifier.fromString("nether_sprouts"); public static final Identifier NETHER_WART = Identifier.fromString("nether_wart"); public static final Identifier NETHER_WART_BLOCK = Identifier.fromString("nether_wart_block"); @@ -467,10 +470,15 @@ public final class BlockIds { public static final Identifier NOTEBLOCK = Identifier.fromString("noteblock"); public static final Identifier OAK_BUTTON = Identifier.fromString("wooden_button"); public static final Identifier OAK_DOOR = Identifier.fromString("wooden_door"); + public static final Identifier OAK_FENCE_GATE = Identifier.fromString("fence_gate"); public static final Identifier OAK_PRESSURE_PLATE = Identifier.fromString("wooden_pressure_plate"); public static final Identifier OAK_STAIRS = Identifier.fromString("oak_stairs"); + public static final Identifier OAK_STANDING_SIGN = Identifier.fromString("standing_sign"); + public static final Identifier OAK_TRAPDOOR = Identifier.fromString("trapdoor"); + public static final Identifier OAK_WALL_SIGN = Identifier.fromString("wall_sign"); public static final Identifier OBSERVER = Identifier.fromString("observer"); public static final Identifier OBSIDIAN = Identifier.fromString("obsidian"); + public static final Identifier OCHRE_FROGLIGHT = Identifier.fromString("ochre_froglight"); public static final Identifier ORANGE_CANDLE = Identifier.fromString("orange_candle"); public static final Identifier ORANGE_CANDLE_CAKE = Identifier.fromString("orange_candle_cake"); public static final Identifier ORANGE_GLAZED_TERRACOTTA = Identifier.fromString("orange_glazed_terracotta"); @@ -480,6 +488,7 @@ public final class BlockIds { public static final Identifier OXIDIZED_CUT_COPPER_STAIRS = Identifier.fromString("oxidized_cut_copper_stairs"); public static final Identifier OXIDIZED_DOUBLE_CUT_COPPER_SLAB = Identifier.fromString("oxidized_double_cut_copper_slab"); public static final Identifier PACKED_ICE = Identifier.fromString("packed_ice"); + public static final Identifier PEARLESCENT_FROGLIGHT = Identifier.fromString("pearlescent_froglight"); public static final Identifier PINK_CANDLE = Identifier.fromString("pink_candle"); public static final Identifier PINK_CANDLE_CAKE = Identifier.fromString("pink_candle_cake"); public static final Identifier PINK_GLAZED_TERRACOTTA = Identifier.fromString("pink_glazed_terracotta"); @@ -537,9 +546,9 @@ public final class BlockIds { public static final Identifier REDSTONE_ORE = Identifier.fromString("redstone_ore"); public static final Identifier REDSTONE_TORCH = Identifier.fromString("redstone_torch"); public static final Identifier REDSTONE_WIRE = Identifier.fromString("redstone_wire"); - public static final Identifier RED_FLOWER = Identifier.fromString("red_flower"); public static final Identifier RED_CANDLE = Identifier.fromString("red_candle"); public static final Identifier RED_CANDLE_CAKE = Identifier.fromString("red_candle_cake"); + public static final Identifier RED_FLOWER = Identifier.fromString("red_flower"); public static final Identifier RED_GLAZED_TERRACOTTA = Identifier.fromString("red_glazed_terracotta"); public static final Identifier RED_MUSHROOM = Identifier.fromString("red_mushroom"); public static final Identifier RED_MUSHROOM_BLOCK = Identifier.fromString("red_mushroom_block"); @@ -556,7 +565,11 @@ public final class BlockIds { public static final Identifier SANDSTONE_STAIRS = Identifier.fromString("sandstone_stairs"); public static final Identifier SAPLING = Identifier.fromString("sapling"); public static final Identifier SCAFFOLDING = Identifier.fromString("scaffolding"); + public static final Identifier SCULK = Identifier.fromString("sculk"); + public static final Identifier SCULK_CATALYST = Identifier.fromString("sculk_catalyst"); public static final Identifier SCULK_SENSOR = Identifier.fromString("sculk_sensor"); + public static final Identifier SCULK_SHRIEKER = Identifier.fromString("sculk_shrieker"); + public static final Identifier SCULK_VEIN = Identifier.fromString("sculk_vein"); public static final Identifier SEAGRASS = Identifier.fromString("seagrass"); public static final Identifier SEA_LANTERN = Identifier.fromString("seaLantern"); public static final Identifier SEA_PICKLE = Identifier.fromString("sea_pickle"); @@ -596,9 +609,8 @@ public final class BlockIds { public static final Identifier STAINED_GLASS_PANE = Identifier.fromString("stained_glass_pane"); public static final Identifier STAINED_HARDENED_CLAY = Identifier.fromString("stained_hardened_clay"); public static final Identifier STANDING_BANNER = Identifier.fromString("standing_banner"); - public static final Identifier OAK_STANDING_SIGN = Identifier.fromString("standing_sign"); - public static final Identifier STICKY_PISTON_ARM_COLLISION = Identifier.fromString("stickyPistonArmCollision"); public static final Identifier STICKY_PISTON = Identifier.fromString("sticky_piston"); + public static final Identifier STICKY_PISTON_ARM_COLLISION = Identifier.fromString("stickyPistonArmCollision"); public static final Identifier STONE = Identifier.fromString("stone"); public static final Identifier STONEBRICK = Identifier.fromString("stonebrick"); public static final Identifier STONECUTTER = Identifier.fromString("stonecutter"); @@ -629,11 +641,10 @@ public final class BlockIds { public static final Identifier TINTED_GLASS = Identifier.fromString("tinted_glass"); public static final Identifier TNT = Identifier.fromString("tnt"); public static final Identifier TORCH = Identifier.fromString("torch"); - public static final Identifier TUFF = Identifier.fromString("tuff"); - public static final Identifier OAK_TRAPDOOR = Identifier.fromString("trapdoor"); public static final Identifier TRAPPED_CHEST = Identifier.fromString("trapped_chest"); public static final Identifier TRIPWIRE = Identifier.fromString("tripWire"); public static final Identifier TRIPWIRE_HOOK = Identifier.fromString("tripwire_hook"); + public static final Identifier TUFF = Identifier.fromString("tuff"); public static final Identifier TURTLE_EGG = Identifier.fromString("turtle_egg"); public static final Identifier TWISTING_VINES = Identifier.fromString("twisting_vines"); public static final Identifier UNDERWATER_TORCH = Identifier.fromString("underwater_torch"); @@ -642,9 +653,9 @@ public final class BlockIds { public static final Identifier UNLIT_REDSTONE_TORCH = Identifier.fromString("unlit_redstone_torch"); public static final Identifier UNPOWERED_COMPARATOR = Identifier.fromString("unpowered_comparator"); public static final Identifier UNPOWERED_REPEATER = Identifier.fromString("unpowered_repeater"); + public static final Identifier VERDANT_FROGLIGHT = Identifier.fromString("verdant_froglight"); public static final Identifier VINE = Identifier.fromString("vine"); public static final Identifier WALL_BANNER = Identifier.fromString("wall_banner"); - public static final Identifier OAK_WALL_SIGN = Identifier.fromString("wall_sign"); public static final Identifier WARPED_BUTTON = Identifier.fromString("warped_button"); public static final Identifier WARPED_DOOR = Identifier.fromString("warped_door"); public static final Identifier WARPED_DOUBLE_SLAB = Identifier.fromString("warped_double_slab"); @@ -700,9 +711,9 @@ public final class BlockIds { public static final Identifier WOOD = Identifier.fromString("wood"); public static final Identifier WOODEN_SLAB = Identifier.fromString("wooden_slab"); public static final Identifier WOOL = Identifier.fromString("wool"); - public static final Identifier YELLOW_FLOWER = Identifier.fromString("yellow_flower"); public static final Identifier YELLOW_CANDLE = Identifier.fromString("yellow_candle"); public static final Identifier YELLOW_CANDLE_CAKE = Identifier.fromString("yellow_candle_cake"); + public static final Identifier YELLOW_FLOWER = Identifier.fromString("yellow_flower"); public static final Identifier YELLOW_GLAZED_TERRACOTTA = Identifier.fromString("yellow_glazed_terracotta"); } diff --git a/src/main/java/org/cloudburstmc/api/block/BlockStates.java b/src/main/java/org/cloudburstmc/api/block/BlockStates.java index 6347bee61..6593c97fc 100644 --- a/src/main/java/org/cloudburstmc/api/block/BlockStates.java +++ b/src/main/java/org/cloudburstmc/api/block/BlockStates.java @@ -53,6 +53,7 @@ public class BlockStates { public static final BlockState CHORUS_FLOWER = BlockTypes.CHORUS_FLOWER.getDefaultState(); public static final BlockState CHORUS_PLANT = BlockTypes.CHORUS_PLANT.getDefaultState(); public static final BlockState CLAY = BlockTypes.CLAY.getDefaultState(); + public static final BlockState CLIENT_REQUEST_PLACEHOLDER_BLOCK = BlockTypes.CLIENT_REQUEST_PLACEHOLDER_BLOCK.getDefaultState(); public static final BlockState COAL_BLOCK = BlockTypes.COAL_BLOCK.getDefaultState(); public static final BlockState COAL_ORE = BlockTypes.COAL_ORE.getDefaultState(); public static final BlockState COBBLESTONE = BlockTypes.COBBLESTONE.getDefaultState(); @@ -105,6 +106,7 @@ public class BlockStates { public static final BlockState FLOWING_LAVA = BlockTypes.FLOWING_LAVA.getDefaultState(); public static final BlockState FLOWING_WATER = BlockTypes.FLOWING_WATER.getDefaultState(); public static final BlockState FRAME = BlockTypes.FRAME.getDefaultState(); + public static final BlockState FROG_EGG = BlockTypes.FROG_EGG.getDefaultState(); public static final BlockState FROSTED_ICE = BlockTypes.FROSTED_ICE.getDefaultState(); public static final BlockState FURNACE = BlockTypes.FURNACE.getDefaultState(); public static final BlockState GILDED_BLACKSTONE = BlockTypes.GILDED_BLACKSTONE.getDefaultState(); @@ -113,6 +115,7 @@ public class BlockStates { public static final BlockState GLAZED_TERRACOTTA = BlockTypes.GLAZED_TERRACOTTA.getDefaultState(); public static final BlockState GLOWING_OBSIDIAN = BlockTypes.GLOWING_OBSIDIAN.getDefaultState(); public static final BlockState GLOWSTONE = BlockTypes.GLOWSTONE.getDefaultState(); + public static final BlockState GLOW_FRAME = BlockTypes.GLOW_FRAME.getDefaultState(); public static final BlockState GOLDEN_RAIL = BlockTypes.GOLDEN_RAIL.getDefaultState(); public static final BlockState GOLD_BLOCK = BlockTypes.GOLD_BLOCK.getDefaultState(); public static final BlockState GOLD_ORE = BlockTypes.GOLD_ORE.getDefaultState(); @@ -164,6 +167,8 @@ public class BlockStates { public static final BlockState MOSSY_COBBLESTONE = BlockTypes.MOSSY_COBBLESTONE.getDefaultState(); public static final BlockState MOVING_BLOCK = BlockTypes.MOVING_BLOCK.getDefaultState(); public static final BlockState MYCELIUM = BlockTypes.MYCELIUM.getDefaultState(); + public static final BlockState MYSTERIOUS_FRAME = BlockTypes.MYSTERIOUS_FRAME.getDefaultState(); + public static final BlockState MYSTERIOUS_FRAME_SLOT = BlockTypes.MYSTERIOUS_FRAME_SLOT.getDefaultState(); public static final BlockState NETHERITE_BLOCK = BlockTypes.NETHERITE_BLOCK.getDefaultState(); public static final BlockState NETHERRACK = BlockTypes.NETHERRACK.getDefaultState(); public static final BlockState NETHER_BRICK = BlockTypes.NETHER_BRICK.getDefaultState(); @@ -179,7 +184,9 @@ public class BlockStates { public static final BlockState NOTEBLOCK = BlockTypes.NOTEBLOCK.getDefaultState(); public static final BlockState OBSERVER = BlockTypes.OBSERVER.getDefaultState(); public static final BlockState OBSIDIAN = BlockTypes.OBSIDIAN.getDefaultState(); + public static final BlockState OCHRE_FROGLIGHT = BlockTypes.OCHRE_FROGLIGHT.getDefaultState(); public static final BlockState PACKED_ICE = BlockTypes.PACKED_ICE.getDefaultState(); + public static final BlockState PEARLESCENT_FROGLIGHT = BlockTypes.PEARLESCENT_FROGLIGHT.getDefaultState(); public static final BlockState PISTON = BlockTypes.PISTON.getDefaultState(); public static final BlockState PISTON_ARM_COLLISION = BlockTypes.PISTON_ARM_COLLISION.getDefaultState(); public static final BlockState PLANKS = BlockTypes.PLANKS.getDefaultState(); @@ -214,6 +221,10 @@ public class BlockStates { public static final BlockState SANDSTONE = BlockTypes.SANDSTONE.getDefaultState(); public static final BlockState SAPLING = BlockTypes.SAPLING.getDefaultState(); public static final BlockState SCAFFOLDING = BlockTypes.SCAFFOLDING.getDefaultState(); + public static final BlockState SCULK = BlockTypes.SCULK.getDefaultState(); + public static final BlockState SCULK_CATALYST = BlockTypes.SCULK_CATALYST.getDefaultState(); + public static final BlockState SCULK_SHRIEKER = BlockTypes.SCULK_SHRIEKER.getDefaultState(); + public static final BlockState SCULK_VEIN = BlockTypes.SCULK_VEIN.getDefaultState(); public static final BlockState SEAGRASS = BlockTypes.SEAGRASS.getDefaultState(); public static final BlockState SEA_LANTERN = BlockTypes.SEA_LANTERN.getDefaultState(); public static final BlockState SEA_PICKLE = BlockTypes.SEA_PICKLE.getDefaultState(); @@ -258,6 +269,7 @@ public class BlockStates { public static final BlockState TWISTING_VINES = BlockTypes.TWISTING_VINES.getDefaultState(); public static final BlockState UNDERWATER_TORCH = BlockTypes.UNDERWATER_TORCH.getDefaultState(); public static final BlockState UNDYED_SHULKER_BOX = BlockTypes.UNDYED_SHULKER_BOX.getDefaultState(); + public static final BlockState VERDANT_FROGLIGHT = BlockTypes.VERDANT_FROGLIGHT.getDefaultState(); public static final BlockState VINE = BlockTypes.VINE.getDefaultState(); public static final BlockState WALL_BANNER = BlockTypes.WALL_BANNER.getDefaultState(); public static final BlockState WALL_SIGN = BlockTypes.WALL_SIGN.getDefaultState(); diff --git a/src/main/java/org/cloudburstmc/api/block/BlockTraits.java b/src/main/java/org/cloudburstmc/api/block/BlockTraits.java index df0e8644b..e356af72e 100644 --- a/src/main/java/org/cloudburstmc/api/block/BlockTraits.java +++ b/src/main/java/org/cloudburstmc/api/block/BlockTraits.java @@ -116,8 +116,13 @@ public class BlockTraits { public static final EnumBlockTrait CARDINAL_DIRECTION = EnumBlockTrait.of("cardinal_direction", "ground_sign_direction", CardinalDirection.class); public static final EnumBlockTrait LEVER_DIRECTION = EnumBlockTrait.of("lever_direction", LeverDirection.class); + public static final BooleanBlockTrait IS_ACTIVE = BooleanBlockTrait.of("is_active", "active"); public static final BooleanBlockTrait IS_ALLOWED_UNDERWATER = BooleanBlockTrait.of("is_allowed_underwater", "allow_underwater_bit"); public static final BooleanBlockTrait IS_ATTACHED = BooleanBlockTrait.of("is_attached", "attached_bit"); + public static final BooleanBlockTrait IS_BLOOMING = BooleanBlockTrait.of("is_blooming", "bloom"); + public static final BooleanBlockTrait IS_BREWING_A = BooleanBlockTrait.of("is_brewing_a", "brewing_stand_slot_a_bit"); + public static final BooleanBlockTrait IS_BREWING_B = BooleanBlockTrait.of("is_brewing_b", "brewing_stand_slot_b_bit"); + public static final BooleanBlockTrait IS_BREWING_C = BooleanBlockTrait.of("is_brewing_c", "brewing_stand_slot_c_bit"); public static final BooleanBlockTrait IS_BUTTON_PRESSED = BooleanBlockTrait.of("is_button_pressed", "button_pressed_bit"); public static final BooleanBlockTrait IS_CONDITIONAL = BooleanBlockTrait.of("is_conditional", "conditional_bit"); public static final BooleanBlockTrait IS_COVERED = BooleanBlockTrait.of("is_covered", "covered_bit"); @@ -132,6 +137,7 @@ public class BlockTraits { public static final BooleanBlockTrait IS_HEAD_PIECE = BooleanBlockTrait.of("is_head_piece", "head_piece_bit"); public static final BooleanBlockTrait IS_IN_WALL = BooleanBlockTrait.of("is_in_wall", "in_wall_bit"); public static final BooleanBlockTrait IS_INFESTED = BooleanBlockTrait.of("is_infested"); + public static final BooleanBlockTrait IS_LIT = BooleanBlockTrait.of("is_lit", "lit"); public static final BooleanBlockTrait IS_OCCUPIED = BooleanBlockTrait.of("is_occupied", "occupied_bit"); public static final BooleanBlockTrait IS_OPEN = BooleanBlockTrait.of("is_open", "open_bit"); public static final BooleanBlockTrait IS_OUTPUT_LIT = BooleanBlockTrait.of("is_output_lit", "output_lit_bit"); @@ -146,21 +152,18 @@ public class BlockTraits { public static final BooleanBlockTrait IS_TRIGGERED = BooleanBlockTrait.of("is_triggered", "triggered_bit"); public static final BooleanBlockTrait IS_UPPER_BLOCK = BooleanBlockTrait.of("is_upper_block", "upper_block_bit"); public static final BooleanBlockTrait IS_UPSIDE_DOWN = BooleanBlockTrait.of("is_upside_down", "upside_down_bit"); - public static final BooleanBlockTrait IS_BREWING_A = BooleanBlockTrait.of("is_brewing_a", "brewing_stand_slot_a_bit"); - public static final BooleanBlockTrait IS_BREWING_B = BooleanBlockTrait.of("is_brewing_b", "brewing_stand_slot_b_bit"); - public static final BooleanBlockTrait IS_BREWING_C = BooleanBlockTrait.of("is_brewing_c", "brewing_stand_slot_c_bit"); public static final BooleanBlockTrait IS_STICKY = BooleanBlockTrait.of("is_sticky"); public static final BooleanBlockTrait HAS_AGE = BooleanBlockTrait.of("has_age", "age_bit"); public static final BooleanBlockTrait HAS_COLOR = BooleanBlockTrait.of("has_color", "color_bit"); public static final BooleanBlockTrait HAS_END_PORTAL_EYE = BooleanBlockTrait.of("has_end_portal_eye", "end_portal_eye_bit"); public static final BooleanBlockTrait HAS_INFINIBURN = BooleanBlockTrait.of("has_infiniburn", "infiniburn_bit"); + public static final BooleanBlockTrait HAS_MAP = BooleanBlockTrait.of("has_map", "item_frame_map_bit"); + public static final BooleanBlockTrait HAS_PHOTO = BooleanBlockTrait.of("has_photo", "item_frame_photo_bit"); public static final BooleanBlockTrait HAS_NO_DROP = BooleanBlockTrait.of("has_no_drop", "no_drop_bit"); - public static final BooleanBlockTrait HAS_POST = BooleanBlockTrait.of("has_post", "wall_post_bit"); public static final BooleanBlockTrait HAS_STABILITY_CHECK = BooleanBlockTrait.of("has_stability_check", "stability_check"); public static final BooleanBlockTrait HAS_UPDATE = BooleanBlockTrait.of("has_update", "update_bit"); - public static final BooleanBlockTrait HAS_MAP = BooleanBlockTrait.of("has_map", "item_frame_map_bit"); + public static final BooleanBlockTrait HAS_POST = BooleanBlockTrait.of("has_post", "wall_post_bit"); - public static final BooleanBlockTrait IS_LIT = BooleanBlockTrait.of("is_lit", "lit"); public static final IntegerBlockTrait CANDLES = IntegerBlockTrait.from("candles", 0, 3); @Deprecated diff --git a/src/main/java/org/cloudburstmc/api/block/BlockTypes.java b/src/main/java/org/cloudburstmc/api/block/BlockTypes.java index a40ad3767..98c27b671 100644 --- a/src/main/java/org/cloudburstmc/api/block/BlockTypes.java +++ b/src/main/java/org/cloudburstmc/api/block/BlockTypes.java @@ -137,7 +137,7 @@ public class BlockTypes { public static final BlockType CARROTS = BlockType.of(Identifiers.CARROTS, BlockTraits.GROWTH); public static final BlockType POTATOES = BlockType.of(Identifiers.POTATOES, BlockTraits.GROWTH); public static final BlockType WOODEN_BUTTON = BlockType.of(Identifiers.OAK_BUTTON, BlockTraits.IS_BUTTON_PRESSED, BlockTraits.FACING_DIRECTION, BlockTraits.TREE_SPECIES); - public static final BlockType SKULL = BlockType.of(Identifiers.SKULL, BlockTraits.FACING_DIRECTION, BlockTraits.HAS_NO_DROP); + public static final BlockType SKULL = BlockType.of(Identifiers.SKULL, BlockTraits.FACING_DIRECTION); public static final BlockType ANVIL = BlockType.of(Identifiers.ANVIL, BlockTraits.DAMAGE, BlockTraits.DIRECTION); public static final BlockType TRAPPED_CHEST = BlockType.of(Identifiers.TRAPPED_CHEST, BlockTraits.FACING_DIRECTION); public static final BlockType LIGHT_WEIGHTED_PRESSURE_PLATE = BlockType.of(Identifiers.LIGHT_WEIGHTED_PRESSURE_PLATE, BlockTraits.REDSTONE_SIGNAL); @@ -171,7 +171,7 @@ public class BlockTypes { public static final BlockType HARD_STAINED_GLASS_PANE = BlockType.of(Identifiers.HARD_STAINED_GLASS_PANE, BlockTraits.COLOR); public static final BlockType CHEMICAL_HEAT = BlockType.of(Identifiers.CHEMICAL_HEAT); public static final BlockType GRASS_PATH = BlockType.of(Identifiers.GRASS_PATH); - public static final BlockType FRAME = BlockType.of(Identifiers.FRAME, BlockTraits.IS_GLOWING, BlockTraits.FACING_DIRECTION, BlockTraits.HAS_MAP); + public static final BlockType FRAME = BlockType.of(Identifiers.FRAME, BlockTraits.FACING_DIRECTION, BlockTraits.HAS_MAP, BlockTraits.HAS_PHOTO); public static final BlockType CHORUS_FLOWER = BlockType.of(Identifiers.CHORUS_FLOWER, BlockTraits.CHORUS_AGE); public static final BlockType PURPUR_BLOCK = BlockType.of(Identifiers.PURPUR_BLOCK, BlockTraits.CHISEL_TYPE, BlockTraits.AXIS); public static final BlockType COLORED_TORCH_RG = BlockType.of(Identifiers.COLORED_TORCH_RG, BlockTraits.HAS_COLOR, BlockTraits.TORCH_DIRECTION); @@ -300,6 +300,7 @@ public class BlockTypes { public static final BlockType MOSS_CARPET = BlockType.of(BlockIds.MOSS_CARPET); public static final BlockType SMALL_DRIPLEAF = BlockType.of(BlockIds.SMALL_DRIPLEAF_BLOCK, BlockTraits.DIRECTION, BlockTraits.IS_UPPER_BLOCK); public static final BlockType AZALEA = BlockType.of(BlockIds.AZALEA, BlockTraits.IS_FLOWERED); + public static final BlockType GLOW_FRAME = BlockType.of(BlockIds.GLOW_FRAME, BlockTraits.FACING_DIRECTION, BlockTraits.HAS_MAP, BlockTraits.HAS_PHOTO); public static final BlockType COPPER = BlockType.of(BlockIds.COPPER_BLOCK, BlockTraits.COPPER_TYPE); public static final BlockType CUT_COPPER = BlockType.of(BlockIds.CUT_COPPER, BlockTraits.COPPER_TYPE); public static final BlockType COPPER_STAIRS = BlockType.of(BlockIds.CUT_COPPER_STAIRS, BlockTraits.COPPER_TYPE, BlockTraits.IS_UPSIDE_DOWN, BlockTraits.DIRECTION); @@ -323,13 +324,22 @@ public class BlockTypes { public static final BlockType CRACKED_DEEPSLATE_TILES = BlockType.of(BlockIds.CRACKED_DEEPSLATE_TILES); public static final BlockType CRACKED_DEEPSLATE_BRICKS = BlockType.of(BlockIds.CRACKED_DEEPSLATE_BRICKS); public static final BlockType GLOW_LICHEN = BlockType.of(BlockIds.GLOW_LICHEN, BlockTraits.MULTI_FACE_DIRECTION); - - public static final BlockType RAW_COPPER_BLOCK = BlockType.of(BlockIds.RAW_COPPER_BLOCK); - public static final BlockType RAW_IRON_BLOCK = BlockType.of(BlockIds.RAW_IRON_BLOCK); - public static final BlockType RAW_GOLD_BLOCK = BlockType.of(BlockIds.RAW_GOLD_BLOCK); - public static final BlockType CANDLE = BlockType.of(BlockIds.CANDLE, BlockTraits.CANDLES, BlockTraits.IS_LIT, BlockTraits.COLOR_CANDLE); public static final BlockType CANDLE_CAKE = BlockType.of(BlockIds.CANDLE_CAKE, BlockTraits.IS_LIT, BlockTraits.COLOR_CANDLE); + public static final BlockType RAW_IRON_BLOCK = BlockType.of(BlockIds.RAW_IRON_BLOCK); + public static final BlockType RAW_COPPER_BLOCK = BlockType.of(BlockIds.RAW_COPPER_BLOCK); + public static final BlockType RAW_GOLD_BLOCK = BlockType.of(BlockIds.RAW_GOLD_BLOCK); + public static final BlockType SCULK = BlockType.of(BlockIds.SCULK); + public static final BlockType SCULK_VEIN = BlockType.of(BlockIds.SCULK_VEIN, BlockTraits.MULTI_FACE_DIRECTION); + public static final BlockType SCULK_CATALYST = BlockType.of(BlockIds.SCULK_CATALYST, BlockTraits.IS_BLOOMING); + public static final BlockType SCULK_SHRIEKER = BlockType.of(BlockIds.SCULK_SHRIEKER, BlockTraits.IS_ACTIVE); + public static final BlockType CLIENT_REQUEST_PLACEHOLDER_BLOCK = BlockType.of(BlockIds.CLIENT_REQUEST_PLACEHOLDER_BLOCK); + public static final BlockType MYSTERIOUS_FRAME = BlockType.of(BlockIds.MYSTERIOUS_FRAME); + public static final BlockType MYSTERIOUS_FRAME_SLOT = BlockType.of(BlockIds.MYSTERIOUS_FRAME_SLOT); + public static final BlockType FROG_EGG = BlockType.of(BlockIds.FROG_EGG); + public static final BlockType PEARLESCENT_FROGLIGHT = BlockType.of(BlockIds.PEARLESCENT_FROGLIGHT); + public static final BlockType VERDANT_FROGLIGHT = BlockType.of(BlockIds.VERDANT_FROGLIGHT); + public static final BlockType OCHRE_FROGLIGHT = BlockType.of(BlockIds.OCHRE_FROGLIGHT); public static final BlockType UNKNOWN = BlockType.of(Identifiers.UNKNOWN); }