Allow bees use EFR flowers (#104)

dependencies.gradle

@@ -2,10 +2,10 @@
 
 dependencies {
     api('curse.maven:cofh-lib-220333:2388748')
-    compileOnlyApi('com.github.GTNewHorizons:Angelica:1.0.0-beta68:api')
-    devOnlyNonPublishable('com.github.GTNewHorizons:NotEnoughItems:2.8.40-GTNH:dev')
+    compileOnlyApi('com.github.GTNewHorizons:Angelica:1.0.0-beta64:api')
+    devOnlyNonPublishable('com.github.GTNewHorizons:NotEnoughItems:2.8.26-GTNH:dev')
     compileOnly('com.github.GTNewHorizons:inventory-tweaks:1.7.1:api')
-    compileOnly('com.github.GTNewHorizons:BuildCraft:7.1.47:api')
+    compileOnly('com.github.GTNewHorizons:BuildCraft:7.1.45:api')
     compileOnly('net.industrial-craft:industrialcraft-2:2.2.828-experimental:dev')
     compileOnly('curse.maven:craftguide-75557:2459320')
 }

src/main/java/forestry/plugins/compat/PluginEtFuturumRequiem.java

@@ -40,10 +40,26 @@ public class PluginEtFuturumRequiem extends ForestryPlugin {
         Block Lily = GameRegistry.findBlock(EFR, "lily_of_the_valley");
         Block Petals = GameRegistry.findBlock(EFR, "pink_petals");
         Block Rose = GameRegistry.findBlock(EFR, "rose");
+        Block WitherRose = GameRegistry.findBlock(EFR, "wither_rose");
+        Block ChorusFlower = GameRegistry.findBlock(EFR, "chorus_flower");
 
-        FlowerManager.flowerRegistry.registerAcceptableFlower(CornFlower, FlowerManager.FlowerTypeVanilla);
-        FlowerManager.flowerRegistry.registerAcceptableFlower(Lily, FlowerManager.FlowerTypeVanilla);
-        FlowerManager.flowerRegistry.registerAcceptableFlower(Petals, FlowerManager.FlowerTypeVanilla);
-        FlowerManager.flowerRegistry.registerAcceptableFlower(Rose, FlowerManager.FlowerTypeVanilla);
+        if (CornFlower != null) {
+            FlowerManager.flowerRegistry.registerAcceptableFlower(CornFlower, FlowerManager.FlowerTypeVanilla);
+        }
+        if (Lily != null) {
+            FlowerManager.flowerRegistry.registerAcceptableFlower(Lily, FlowerManager.FlowerTypeVanilla);
+        }
+        if (Petals != null) {
+            FlowerManager.flowerRegistry.registerAcceptableFlower(Petals, FlowerManager.FlowerTypeVanilla);
+        }
+        if (Rose != null) {
+            FlowerManager.flowerRegistry.registerAcceptableFlower(Rose, FlowerManager.FlowerTypeVanilla);
+        }
+        if (WitherRose != null) {
+            FlowerManager.flowerRegistry.registerAcceptableFlower(WitherRose, FlowerManager.FlowerTypeNether);
+        }
+        if (ChorusFlower != null) {
+            FlowerManager.flowerRegistry.registerAcceptableFlower(ChorusFlower, FlowerManager.FlowerTypeEnd);
+        }
     }
 }