From 9970d386e0d9543c3de71ec1bb9a5cb85035a950 Mon Sep 17 00:00:00 2001 From: "Joseph T. McQuigg" Date: Mon, 29 Jul 2024 21:48:22 -0400 Subject: [PATCH] Fix Jacaranda Bushes Missing Collision Closes #22 --- CHANGELOG.md | 1 + .../biomeswevegone/world/level/block/BWGBlocks.java | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ab5d18499..366a0a4f7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,6 @@ # 1.0.2-Beta - Fix Golden Apple from Green Apple Recipe overriding Vanilla Recipe +- Fix Jacaranda Bushes Missing Collision # 1.0.1-Beta - Allow BoneMealing Allium Flower Bushes into Tall Alliums diff --git a/Common/src/main/java/net/potionstudios/biomeswevegone/world/level/block/BWGBlocks.java b/Common/src/main/java/net/potionstudios/biomeswevegone/world/level/block/BWGBlocks.java index 2cf5fdd38..25e5288e4 100644 --- a/Common/src/main/java/net/potionstudios/biomeswevegone/world/level/block/BWGBlocks.java +++ b/Common/src/main/java/net/potionstudios/biomeswevegone/world/level/block/BWGBlocks.java @@ -90,10 +90,10 @@ public class BWGBlocks { public static final Supplier BLUEBERRY_BUSH = registerBlock("blueberry_bush", () -> new BWGBerryBush(() -> BWGItems.BLUEBERRIES, true)); //public static final Supplier NIGHTSHADE_BERRY_BUSH = registerBlock("nightshade_berry_bush", NightshadeBerryBush::new); - public static final Supplier FLOWERING_JACARANDA_BUSH = registerBlockItem("flowering_jacaranda_bush", () -> new FloweringBushBlock(BlockBehaviour.Properties.copy(Blocks.SWEET_BERRY_BUSH))); - public static final PottedBlock JACARANDA_BUSH = createPottedVariant("jacaranda_bush", () -> new FlowerableBushBlock(BlockBehaviour.Properties.copy(Blocks.SWEET_BERRY_BUSH), FLOWERING_JACARANDA_BUSH)); - public static final Supplier FLOWERING_INDIGO_JACARANDA_BUSH = registerBlockItem("flowering_indigo_jacaranda_bush", () -> new FloweringBushBlock(BlockBehaviour.Properties.copy(Blocks.SWEET_BERRY_BUSH))); - public static final PottedBlock INDIGO_JACARANDA_BUSH = createPottedVariant("indigo_jacaranda_bush", () -> new FlowerableBushBlock(BlockBehaviour.Properties.copy(Blocks.SWEET_BERRY_BUSH), FLOWERING_INDIGO_JACARANDA_BUSH)); + public static final Supplier FLOWERING_JACARANDA_BUSH = registerBlockItem("flowering_jacaranda_bush", () -> new FloweringBushBlock(BlockBehaviour.Properties.copy(Blocks.AZALEA))); + public static final PottedBlock JACARANDA_BUSH = createPottedVariant("jacaranda_bush", () -> new FlowerableBushBlock(BlockBehaviour.Properties.copy(Blocks.AZALEA), FLOWERING_JACARANDA_BUSH)); + public static final Supplier FLOWERING_INDIGO_JACARANDA_BUSH = registerBlockItem("flowering_indigo_jacaranda_bush", () -> new FloweringBushBlock(BlockBehaviour.Properties.copy(Blocks.AZALEA))); + public static final PottedBlock INDIGO_JACARANDA_BUSH = createPottedVariant("indigo_jacaranda_bush", () -> new FlowerableBushBlock(BlockBehaviour.Properties.copy(Blocks.AZALEA), FLOWERING_INDIGO_JACARANDA_BUSH)); public static final PottedBlock HYDRANGEA_BUSH = createPottedVariant("hydrangea_bush", HydrangeaBushBlock::new); public static final Supplier HYDRANGEA_HEDGE = registerBlockItem("hydrangea_hedge", HydrangeaHedgeBlock::new); public static final PottedBlock SHRUB = createPottedVariant("shrub", () -> new ShrubBlock(null));