Gave Empyreal Wood a slightly better color scheme

common/src/main/java/biomesoplenty/api/block/BOPBlocks.java

@@ -74,7 +74,6 @@ public class BOPBlocks
     public static Block SMALL_ROSE_QUARTZ_BUD;
 
     public static Block ALGAL_END_STONE;
-    public static Block BARNACLES;
     public static Block NULL_END_STONE;
     public static Block NULL_BLOCK;
     public static Block ANOMALY;
@@ -405,6 +404,7 @@ public class BOPBlocks
     public static Block TINY_CACTUS;
     public static Block BRAMBLE;
     public static Block BRAMBLE_LEAVES;
+    public static Block BARNACLES;
 
     public static Block BLOOD;
 

common/src/main/java/biomesoplenty/api/item/BOPItems.java

@@ -81,7 +81,6 @@ public class BOPItems
     public static Item ROSE_QUARTZ_CHUNK;
 
     public static Item ALGAL_END_STONE;
-    public static Item BARNACLES;
     public static Item NULL_END_STONE;
     public static Item NULL_BLOCK;
     public static Item ANOMALY;
@@ -424,6 +423,7 @@ public class BOPItems
     public static Item TINY_CACTUS;
     public static Item BRAMBLE;
     public static Item BRAMBLE_LEAVES;
+    public static Item BARNACLES;
 
     public static Item MUSIC_DISC_WANDERER;
 

common/src/main/java/biomesoplenty/init/ModBlocks.java

@@ -127,7 +127,6 @@ private static void registerBlocks(BiConsumer<ResourceLocation, Block> func)
         SMALL_ROSE_QUARTZ_BUD = register(func, new AmethystClusterBlock(3, 4, BlockBehaviour.Properties.ofFullCopy(ROSE_QUARTZ_CLUSTER).pushReaction(PushReaction.DESTROY).forceSolidOn().sound(SoundType.SMALL_AMETHYST_BUD).lightLevel((state) -> 5)), "small_rose_quartz_bud");
 
         ALGAL_END_STONE = register(func, new AlgalEndStoneBlock(BlockBehaviour.Properties.of().instrument(NoteBlockInstrument.BASEDRUM).mapColor(MapColor.TERRACOTTA_YELLOW).randomTicks().requiresCorrectToolForDrops().strength(3.0F, 9.0F)), "algal_end_stone");
-        BARNACLES = register(func, new BarnaclesBlock(BlockBehaviour.Properties.of().mapColor(MapColor.CLAY).pushReaction(PushReaction.DESTROY).replaceable().noCollission().sound(SoundType.CORAL_BLOCK)), "barnacles");
         NULL_END_STONE = register(func, new Block(BlockBehaviour.Properties.of().instrument(NoteBlockInstrument.BASEDRUM).requiresCorrectToolForDrops().strength(1.5F, 4.5F)), "null_end_stone");
         NULL_BLOCK = register(func, new NullBlock(BlockBehaviour.Properties.of()), "null_block");
         ANOMALY = register(func, new AnomalyBlock(BlockBehaviour.Properties.of().lightLevel((state) -> 5)), "anomaly");
@@ -474,6 +473,7 @@ private static void registerBlocks(BiConsumer<ResourceLocation, Block> func)
         TINY_CACTUS = register(func, new TinyCactusBlock(BlockBehaviour.Properties.of().pushReaction(PushReaction.DESTROY).mapColor(MapColor.PLANT).noCollission().instabreak().sound(SoundType.WOOL).offsetType(BlockBehaviour.OffsetType.XZ)), "tiny_cactus");
         BRAMBLE = register(func, new BrambleBlock(BlockBehaviour.Properties.of().pushReaction(PushReaction.DESTROY).mapColor(MapColor.NETHER).strength(0.4F).sound(SoundType.WOOD)), "bramble");
         BRAMBLE_LEAVES = register(func, new BrambleLeavesBlock(BlockBehaviour.Properties.of().noOcclusion().pushReaction(PushReaction.DESTROY).mapColor(MapColor.PLANT).instabreak().sound(SoundType.GRASS)), "bramble_leaves");
+        BARNACLES = register(func, new BarnaclesBlock(BlockBehaviour.Properties.of().mapColor(MapColor.CLAY).pushReaction(PushReaction.DESTROY).replaceable().noCollission().sound(SoundType.CORAL_BLOCK)), "barnacles");
 
         //Potted Plants
         POTTED_ORIGIN_SAPLING = register(func, new FlowerPotBlock(ORIGIN_SAPLING, BlockBehaviour.Properties.of().noOcclusion().pushReaction(PushReaction.DESTROY).instabreak()), "potted_origin_sapling");

common/src/main/java/biomesoplenty/init/ModItems.java

@@ -155,7 +155,6 @@ public static void registerBlockItems(BiConsumer<ResourceLocation, Item> func)
         MEDIUM_ROSE_QUARTZ_BUD = register(func, "medium_rose_quartz_bud", new BlockItem(BOPBlocks.MEDIUM_ROSE_QUARTZ_BUD, new Item.Properties()));
         SMALL_ROSE_QUARTZ_BUD = register(func, "small_rose_quartz_bud", new BlockItem(BOPBlocks.SMALL_ROSE_QUARTZ_BUD, new Item.Properties()));
         ALGAL_END_STONE = register(func, "algal_end_stone", new BlockItem(BOPBlocks.ALGAL_END_STONE, new Item.Properties()));
-        BARNACLES = register(func, "barnacles", new BlockItem(BOPBlocks.BARNACLES, new Item.Properties()));
         NULL_END_STONE = register(func, "null_end_stone", new BlockItem(BOPBlocks.NULL_END_STONE, new Item.Properties()));
         NULL_BLOCK = register(func, "null_block", new BlockItem(BOPBlocks.NULL_BLOCK, new Item.Properties()));
         ANOMALY = register(func, "anomaly", new BlockItem(BOPBlocks.ANOMALY, new Item.Properties()));
@@ -426,6 +425,7 @@ public static void registerBlockItems(BiConsumer<ResourceLocation, Item> func)
         TINY_CACTUS = register(func, "tiny_cactus", new BlockItem(BOPBlocks.TINY_CACTUS, new Item.Properties()));
         BRAMBLE = register(func, "bramble", new BlockItem(BOPBlocks.BRAMBLE, new Item.Properties()));
         BRAMBLE_LEAVES = register(func, "bramble_leaves", new BlockItem(BOPBlocks.BRAMBLE_LEAVES, new Item.Properties()));
+        BARNACLES = register(func, "barnacles", new BlockItem(BOPBlocks.BARNACLES, new Item.Properties()));
         POTTED_ORIGIN_SAPLING = register(func, "potted_origin_sapling", new BlockItem(BOPBlocks.POTTED_ORIGIN_SAPLING, new Item.Properties()));
         POTTED_FLOWERING_OAK_SAPLING = register(func, "potted_flowering_oak_sapling", new BlockItem(BOPBlocks.POTTED_FLOWERING_OAK_SAPLING, new Item.Properties()));
         POTTED_SNOWBLOSSOM_SAPLING = register(func, "potted_snowblossom_sapling", new BlockItem(BOPBlocks.POTTED_SNOWBLOSSOM_SAPLING, new Item.Properties()));

common/src/main/resources/data/biomesoplenty/advancements/recipes/misc/light_gray_dye_from_endbloom.json

@@ -0,0 +1,33 @@
+{
+  "rewards": {
+    "recipes": [
+      "biomesoplenty:light_gray_dye_from_endbloom"
+    ]
+  },
+  "criteria": {
+    "has_flower": {
+      "trigger": "minecraft:inventory_changed",
+      "conditions": {
+        "items": [
+          {
+            "items": [
+               "biomesoplenty:endbloom"
+            ]
+          }
+        ]
+      }
+    },
+    "has_the_recipe": {
+      "trigger": "minecraft:recipe_unlocked",
+      "conditions": {
+        "recipe": "biomesoplenty:light_gray_dye_from_endbloom"
+      }
+    }
+  },
+  "requirements": [
+    [
+      "has_flower",
+      "has_the_recipe"
+    ]
+  ]
+}

common/src/main/resources/data/biomesoplenty/loot_tables/blocks/endbloom.json

@@ -11,10 +11,7 @@
       ],
       "conditions": [
         {
-          "condition": "minecraft:match_tool",
-          "predicate": {
-            "tag": "biomesoplenty:shears"
-          }
+          "condition": "minecraft:survives_explosion"
         }
       ]
     }

common/src/main/resources/data/biomesoplenty/recipes/light_gray_dye_from_endbloom.json

@@ -0,0 +1,13 @@
+{
+  "type": "minecraft:crafting_shapeless",
+  "group": "light_gray_dye",
+  "ingredients": [
+    {
+      "item": "biomesoplenty:endbloom"
+    }
+  ],
+  "result": {
+    "item": "minecraft:light_gray_dye",
+    "count": 1
+  }
+}