diff --git a/src/main/java/com/voxelutopia/ultramarine/data/registry/BlockRegistry.java b/src/main/java/com/voxelutopia/ultramarine/data/registry/BlockRegistry.java index c1fb1b17..ba70b758 100644 --- a/src/main/java/com/voxelutopia/ultramarine/data/registry/BlockRegistry.java +++ b/src/main/java/com/voxelutopia/ultramarine/data/registry/BlockRegistry.java @@ -740,36 +740,36 @@ public class BlockRegistry { // BONSAI - public static final RegistryObject RED_CORAL_BONSAI = BLOCKS.register("red_coral_bonsai", - () -> DecorativeBlock.with(BaseBlockProperty.PORCELAIN).shaped(DecorativeBlock.FULL_14).directional().noCollision().build()); - public static final RegistryObject TALL_BLUE_VASE_BONSAI = BLOCKS.register("tall_blue_vase_bonsai", - () -> DecorativeBlock.with(BaseBlockProperty.PORCELAIN).shaped(DecorativeBlock.FULL_12).directional().diagonallyPlaceable().placeOffset(Direction.UP).noCollision().build()); - public static final RegistryObject BAMBOO_BONSAI = BLOCKS.register("bamboo_bonsai", - () -> DecorativeBlock.with(BaseBlockProperty.PORCELAIN).shaped(DecorativeBlock.FULL_14).directional().noCollision().noOcclusion().build()); - public static final RegistryObject RED_PLUM_BONSAI = BLOCKS.register("red_plum_bonsai", - () -> DecorativeBlock.with(BaseBlockProperty.PORCELAIN).shaped(DecorativeBlock.FULL_12).directional().noCollision().build()); public static final RegistryObject SMALL_GREETING_PINE_BONSAI = BLOCKS.register("small_greeting_pine_bonsai", () -> DecorativeBlock.with(BaseBlockProperty.PORCELAIN).shaped(DecorativeBlock.FULL_12).directional().noCollision().build()); - public static final RegistryObject TALL_BLUE_AND_WHITE_PORCELAIN_BONSAI = BLOCKS.register("tall_blue_and_white_porcelain_bonsai", - () -> DecorativeBlock.with(BaseBlockProperty.PORCELAIN).shaped(DecorativeBlock.FULL_10).directional().diagonallyPlaceable().noCollision().noOcclusion().build()); - public static final RegistryObject GREEN_PORCELAIN_VASE_BONSAI = BLOCKS.register("green_porcelain_vase_bonsai", + public static final RegistryObject MEDIUM_GREETING_PINE_BONSAI = BLOCKS.register("medium_greeting_pine_bonsai", + () -> DecorativeBlock.with(BaseBlockProperty.PORCELAIN).shaped(DecorativeBlock.FULL_14).directional().noCollision().noOcclusion().build()); + public static final RegistryObject LARGE_GREETING_PINE_BONSAI = BLOCKS.register("large_greeting_pine_bonsai", + () -> DecorativeBlock.with(BaseBlockProperty.PORCELAIN).shaped(DecorativeBlock.FULL_14).directional().placeOffset(Direction.UP).noCollision().noOcclusion().build()); + public static final RegistryObject SMALL_WHITE_PORCELAIN_VASE_BONSAI = BLOCKS.register("small_white_porcelain_vase_bonsai", () -> DecorativeBlock.with(BaseBlockProperty.PORCELAIN).shaped(DecorativeBlock.FULL_10).directional().diagonallyPlaceable().noCollision().build()); - public static final RegistryObject LARGE_BONSAI = BLOCKS.register("large_bonsai", - () -> DecorativeBlock.with(BaseBlockProperty.TERRACOTTA).shaped(DecorativeBlock.FULL_14).directional().diagonallyPlaceable().noCollision().noOcclusion().build()); - public static final RegistryObject MEDIUM_BONSAI = BLOCKS.register("medium_bonsai", - () -> DecorativeBlock.with(BaseBlockProperty.TERRACOTTA).shaped(DecorativeBlock.FULL_12).directional().diagonallyPlaceable().noCollision().noOcclusion().build()); - public static final RegistryObject SMALL_GREEN_PORCELAIN_VASE_BONSAI = BLOCKS.register("small_green_porcelain_vase_bonsai", - () -> DecorativeBlock.with(BaseBlockProperty.PORCELAIN).shaped(DecorativeBlock.FULL_10).directional().noCollision().build()); public static final RegistryObject MEDIUM_WHITE_PORCELAIN_VASE_BONSAI = BLOCKS.register("medium_white_porcelain_vase_bonsai", () -> DecorativeBlock.with(BaseBlockProperty.PORCELAIN).shaped(DecorativeBlock.FULL_14).directional().diagonallyPlaceable().noCollision().build()); public static final RegistryObject LARGE_WHITE_PORCELAIN_VASE_BONSAI = BLOCKS.register("large_white_porcelain_vase_bonsai", () -> DecorativeBlock.with(BaseBlockProperty.PORCELAIN).shaped(DecorativeBlock.FULL_14).directional().diagonallyPlaceable().noCollision().noOcclusion().build()); - public static final RegistryObject LARGE_GREETING_PINE_BONSAI = BLOCKS.register("large_greeting_pine_bonsai", - () -> DecorativeBlock.with(BaseBlockProperty.PORCELAIN).shaped(DecorativeBlock.FULL_14).directional().placeOffset(Direction.UP).noCollision().noOcclusion().build()); - public static final RegistryObject SMALL_WHITE_PORCELAIN_VASE_BONSAI = BLOCKS.register("small_white_porcelain_vase_bonsai", + public static final RegistryObject SMALL_GREEN_PORCELAIN_VASE_BONSAI = BLOCKS.register("small_green_porcelain_vase_bonsai", + () -> DecorativeBlock.with(BaseBlockProperty.PORCELAIN).shaped(DecorativeBlock.FULL_10).directional().noCollision().build()); + public static final RegistryObject GREEN_PORCELAIN_VASE_BONSAI = BLOCKS.register("green_porcelain_vase_bonsai", () -> DecorativeBlock.with(BaseBlockProperty.PORCELAIN).shaped(DecorativeBlock.FULL_10).directional().diagonallyPlaceable().noCollision().build()); - public static final RegistryObject MEDIUM_GREETING_PINE_BONSAI = BLOCKS.register("medium_greeting_pine_bonsai", + public static final RegistryObject RED_CORAL_BONSAI = BLOCKS.register("red_coral_bonsai", + () -> DecorativeBlock.with(BaseBlockProperty.PORCELAIN).shaped(DecorativeBlock.FULL_14).directional().noCollision().build()); + public static final RegistryObject RED_PLUM_BONSAI = BLOCKS.register("red_plum_bonsai", + () -> DecorativeBlock.with(BaseBlockProperty.PORCELAIN).shaped(DecorativeBlock.FULL_12).directional().noCollision().build()); + public static final RegistryObject BAMBOO_BONSAI = BLOCKS.register("bamboo_bonsai", () -> DecorativeBlock.with(BaseBlockProperty.PORCELAIN).shaped(DecorativeBlock.FULL_14).directional().noCollision().noOcclusion().build()); + public static final RegistryObject TALL_BLUE_VASE_BONSAI = BLOCKS.register("tall_blue_vase_bonsai", + () -> DecorativeBlock.with(BaseBlockProperty.PORCELAIN).shaped(DecorativeBlock.FULL_12).directional().diagonallyPlaceable().placeOffset(Direction.UP).noCollision().build()); + public static final RegistryObject TALL_BLUE_AND_WHITE_PORCELAIN_BONSAI = BLOCKS.register("tall_blue_and_white_porcelain_bonsai", + () -> DecorativeBlock.with(BaseBlockProperty.PORCELAIN).shaped(DecorativeBlock.FULL_10).directional().diagonallyPlaceable().noCollision().noOcclusion().build()); + public static final RegistryObject MEDIUM_BONSAI = BLOCKS.register("medium_bonsai", + () -> DecorativeBlock.with(BaseBlockProperty.TERRACOTTA).shaped(DecorativeBlock.FULL_12).directional().diagonallyPlaceable().noCollision().noOcclusion().build()); + public static final RegistryObject LARGE_BONSAI = BLOCKS.register("large_bonsai", + () -> DecorativeBlock.with(BaseBlockProperty.TERRACOTTA).shaped(DecorativeBlock.FULL_14).directional().diagonallyPlaceable().noCollision().noOcclusion().build()); /** * LAMPS diff --git a/src/main/java/com/voxelutopia/ultramarine/data/registry/ItemRegistry.java b/src/main/java/com/voxelutopia/ultramarine/data/registry/ItemRegistry.java index 982cda68..2bc995dc 100644 --- a/src/main/java/com/voxelutopia/ultramarine/data/registry/ItemRegistry.java +++ b/src/main/java/com/voxelutopia/ultramarine/data/registry/ItemRegistry.java @@ -589,21 +589,21 @@ public class ItemRegistry { // BONSAI + public static final RegistryObject SMALL_GREETING_PINE_BONSAI = fromBlock(BlockRegistry.SMALL_GREETING_PINE_BONSAI, ModCreativeTab.PLANTS); + public static final RegistryObject MEDIUM_GREETING_PINE_BONSAI = fromBlock(BlockRegistry.MEDIUM_GREETING_PINE_BONSAI, ModCreativeTab.PLANTS); + public static final RegistryObject LARGE_GREETING_PINE_BONSAI = fromBlock(BlockRegistry.LARGE_GREETING_PINE_BONSAI, ModCreativeTab.PLANTS); + public static final RegistryObject SMALL_WHITE_PORCELAIN_VASE_BONSAI = fromBlock(BlockRegistry.SMALL_WHITE_PORCELAIN_VASE_BONSAI, ModCreativeTab.PLANTS); + public static final RegistryObject MEDIUM_WHITE_PORCELAIN_VASE_BONSAI = fromBlock(BlockRegistry.MEDIUM_WHITE_PORCELAIN_VASE_BONSAI, ModCreativeTab.PLANTS); + public static final RegistryObject LARGE_WHITE_PORCELAIN_VASE_BONSAI = fromBlock(BlockRegistry.LARGE_WHITE_PORCELAIN_VASE_BONSAI, ModCreativeTab.PLANTS); + public static final RegistryObject SMALL_GREEN_PORCELAIN_VASE_BONSAI = fromBlock(BlockRegistry.SMALL_GREEN_PORCELAIN_VASE_BONSAI, ModCreativeTab.PLANTS); + public static final RegistryObject GREEN_PORCELAIN_VASE_BONSAI = fromBlock(BlockRegistry.GREEN_PORCELAIN_VASE_BONSAI, ModCreativeTab.PLANTS); public static final RegistryObject RED_CORAL_BONSAI = fromBlock(BlockRegistry.RED_CORAL_BONSAI, ModCreativeTab.PLANTS); - public static final RegistryObject TALL_BLUE_VASE_BONSAI = fromBlock(BlockRegistry.TALL_BLUE_VASE_BONSAI, ModCreativeTab.PLANTS); - public static final RegistryObject BAMBOO_BONSAI = fromBlock(BlockRegistry.BAMBOO_BONSAI, ModCreativeTab.PLANTS); public static final RegistryObject RED_PLUM_BONSAI = fromBlock(BlockRegistry.RED_PLUM_BONSAI, ModCreativeTab.PLANTS); - public static final RegistryObject SMALL_GREETING_PINE_BONSAI = fromBlock(BlockRegistry.SMALL_GREETING_PINE_BONSAI, ModCreativeTab.PLANTS); + public static final RegistryObject BAMBOO_BONSAI = fromBlock(BlockRegistry.BAMBOO_BONSAI, ModCreativeTab.PLANTS); + public static final RegistryObject TALL_BLUE_VASE_BONSAI = fromBlock(BlockRegistry.TALL_BLUE_VASE_BONSAI, ModCreativeTab.PLANTS); public static final RegistryObject TALL_BLUE_AND_WHITE_PORCELAIN_BONSAI = fromBlock(BlockRegistry.TALL_BLUE_AND_WHITE_PORCELAIN_BONSAI, ModCreativeTab.PLANTS); - public static final RegistryObject GREEN_PORCELAIN_VASE_BONSAI = fromBlock(BlockRegistry.GREEN_PORCELAIN_VASE_BONSAI, ModCreativeTab.PLANTS); - public static final RegistryObject LARGE_BONSAI = fromBlock(BlockRegistry.LARGE_BONSAI, ModCreativeTab.PLANTS); public static final RegistryObject MEDIUM_BONSAI = fromBlock(BlockRegistry.MEDIUM_BONSAI, ModCreativeTab.PLANTS); - public static final RegistryObject SMALL_GREEN_PORCELAIN_VASE_BONSAI = fromBlock(BlockRegistry.SMALL_GREEN_PORCELAIN_VASE_BONSAI, ModCreativeTab.PLANTS); - public static final RegistryObject MEDIUM_WHITE_PORCELAIN_VASE_BONSAI = fromBlock(BlockRegistry.MEDIUM_WHITE_PORCELAIN_VASE_BONSAI, ModCreativeTab.PLANTS); - public static final RegistryObject LARGE_WHITE_PORCELAIN_VASE_BONSAI = fromBlock(BlockRegistry.LARGE_WHITE_PORCELAIN_VASE_BONSAI, ModCreativeTab.PLANTS); - public static final RegistryObject LARGE_GREETING_PINE_BONSAI = fromBlock(BlockRegistry.LARGE_GREETING_PINE_BONSAI, ModCreativeTab.PLANTS); - public static final RegistryObject SMALL_WHITE_PORCELAIN_VASE_BONSAI = fromBlock(BlockRegistry.SMALL_WHITE_PORCELAIN_VASE_BONSAI, ModCreativeTab.PLANTS); - public static final RegistryObject MEDIUM_GREETING_PINE_BONSAI = fromBlock(BlockRegistry.MEDIUM_GREETING_PINE_BONSAI, ModCreativeTab.PLANTS); + public static final RegistryObject LARGE_BONSAI = fromBlock(BlockRegistry.LARGE_BONSAI, ModCreativeTab.PLANTS); /** * LAMPS