Merge branch 'master' into PR-InvalidBlooms

Remove commented out code
Disable flowers that cannot be planted
2026-11-15 17:44:55 +00:00 · 2025-05-17 16:07:55 +02:00 · 2025-05-17 16:00:03 +02:00 · 2025-05-15 19:32:57 +02:00
1 changed files with 0 additions and 12 deletions
@@ -197,8 +197,6 @@ public class PluginBiomesOPlenty extends ForestryPlugin {
                    FlowerManager.FlowerTypeVanilla,
                    FlowerManager.FlowerTypeSnow,
                    FlowerManager.FlowerTypeMushrooms); // Swampflower
-            // FlowerManager.flowerRegistry.registerPlantableFlower(flowers, 2, 1.0, FlowerManager.FlowerTypeNether);
-            // //Deathbloom
            FlowerManager.flowerRegistry.registerPlantableFlower(
                    flowers,
                    3,
@@ -248,16 +246,8 @@ public class PluginBiomesOPlenty extends ForestryPlugin {
                    1.0,
                    FlowerManager.FlowerTypeVanilla,
                    FlowerManager.FlowerTypeSnow); // Waterlily
-            FlowerManager.flowerRegistry.registerPlantableFlower(
-                    flowers,
-                    11,
-                    1.0,
-                    FlowerManager.FlowerTypeVanilla,
-                    FlowerManager.FlowerTypeSnow); // EnderLotus (does not actually spawn in the end)
            FlowerManager.flowerRegistry.registerPlantableFlower(flowers, 12, 1.0, FlowerManager.FlowerTypeCacti); // Bromeliad
            FlowerManager.flowerRegistry.registerPlantableFlower(flowers, 13, 1.0, FlowerManager.FlowerTypeNether); // EyeBulb
-            // FlowerManager.flowerRegistry.registerPlantableFlower(flowers, 14, 1.0, FlowerManager.FlowerTypeNether);
-            // // Unlisted top of the eyebulb
            FlowerManager.flowerRegistry.registerPlantableFlower(
                    flowers,
                    15,
@@ -283,8 +273,6 @@ public class PluginBiomesOPlenty extends ForestryPlugin {
            FlowerManager.flowerRegistry.registerPlantableFlower(flowers2, 3, 1.0, FlowerManager.FlowerTypeVanilla); // Lavender
            FlowerManager.flowerRegistry.registerPlantableFlower(flowers2, 4, 1.0, FlowerManager.FlowerTypeVanilla); // Goldenrod
            FlowerManager.flowerRegistry.registerPlantableFlower(flowers2, 5, 1.0, FlowerManager.FlowerTypeVanilla); // Bluebells
-            FlowerManager.flowerRegistry.registerPlantableFlower(flowers2, 6, 1.0, FlowerManager.FlowerTypeVanilla); // Miner's
-                                                                                                                     // delight
            FlowerManager.flowerRegistry.registerPlantableFlower(
                    flowers2,
                    7,
Author	SHA1	Message	Date
DrParadox7	c9545edcf7	Merge branch 'master' into PR-InvalidBlooms	2025-05-17 16:07:55 +02:00
DrParadox7	c6fa47dc57	Remove commented out code	2025-05-17 16:00:03 +02:00
DrParadox7	4f77d6a56c	Disable flowers that cannot be planted Disables BoP's hardcoded Enderlotus and the Miner's Delight floral generation, which cannot be planted. Any attempt to spawn these flowers in this manner causes them to instantly break, and drop themselves as itemstacks.	2025-05-15 19:32:57 +02:00