diff --git a/src/main/java/biomesoplenty/common/block/BlockBOPPlant.java b/src/main/java/biomesoplenty/common/block/BlockBOPPlant.java index 9f06b85fc..7af1ae49b 100644 --- a/src/main/java/biomesoplenty/common/block/BlockBOPPlant.java +++ b/src/main/java/biomesoplenty/common/block/BlockBOPPlant.java @@ -167,7 +167,7 @@ public class BlockBOPPlant extends BlockBOPDecoration implements IShearable, IHo switch ((BOPPlants) state.getValue(BlockBOPPlant.this.variantProperty)) { - case BERRYBUSH: case SHRUB: + case BUSH: case BERRYBUSH: case SHRUB: return 0xFFFFFF; default: diff --git a/src/main/resources/assets/biomesoplenty/models/block/bush.json b/src/main/resources/assets/biomesoplenty/models/block/bush.json index c30c1560d..f01a69447 100644 --- a/src/main/resources/assets/biomesoplenty/models/block/bush.json +++ b/src/main/resources/assets/biomesoplenty/models/block/bush.json @@ -1,6 +1,8 @@ { - "parent": "block/tinted_cross", + "parent": "biomesoplenty:block/cross_with_overlay", "textures": { - "cross": "biomesoplenty:blocks/bush" + "colored": "biomesoplenty:blocks/bush_branch", + "greyscale": "biomesoplenty:blocks/bush", + "particle": "biomesoplenty:blocks/bush" } } diff --git a/src/main/resources/assets/biomesoplenty/models/item/bush.json b/src/main/resources/assets/biomesoplenty/models/item/bush.json index 21a850e52..fddb94e4b 100644 --- a/src/main/resources/assets/biomesoplenty/models/item/bush.json +++ b/src/main/resources/assets/biomesoplenty/models/item/bush.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "biomesoplenty:blocks/bush" + "layer0": "biomesoplenty:items/bush" } } \ No newline at end of file diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/berrybush.png b/src/main/resources/assets/biomesoplenty/textures/blocks/berrybush.png index 1a300e896..0b6a8300d 100644 Binary files a/src/main/resources/assets/biomesoplenty/textures/blocks/berrybush.png and b/src/main/resources/assets/biomesoplenty/textures/blocks/berrybush.png differ diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/berrybush_berry.png b/src/main/resources/assets/biomesoplenty/textures/blocks/berrybush_berry.png index 4e5e7b86b..adf81296a 100644 Binary files a/src/main/resources/assets/biomesoplenty/textures/blocks/berrybush_berry.png and b/src/main/resources/assets/biomesoplenty/textures/blocks/berrybush_berry.png differ diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/bush.png b/src/main/resources/assets/biomesoplenty/textures/blocks/bush.png index 8ed92bb0c..eddbfa3d3 100644 Binary files a/src/main/resources/assets/biomesoplenty/textures/blocks/bush.png and b/src/main/resources/assets/biomesoplenty/textures/blocks/bush.png differ diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/bush_branch.png b/src/main/resources/assets/biomesoplenty/textures/blocks/bush_branch.png new file mode 100644 index 000000000..b1281ff0f Binary files /dev/null and b/src/main/resources/assets/biomesoplenty/textures/blocks/bush_branch.png differ diff --git a/src/main/resources/assets/biomesoplenty/textures/items/berrybush.png b/src/main/resources/assets/biomesoplenty/textures/items/berrybush.png index ff09dc4b4..6094936d3 100644 Binary files a/src/main/resources/assets/biomesoplenty/textures/items/berrybush.png and b/src/main/resources/assets/biomesoplenty/textures/items/berrybush.png differ diff --git a/src/main/resources/assets/biomesoplenty/textures/items/bush.png b/src/main/resources/assets/biomesoplenty/textures/items/bush.png new file mode 100644 index 000000000..de0f526bb Binary files /dev/null and b/src/main/resources/assets/biomesoplenty/textures/items/bush.png differ