Compare commits

..
3 Commits
Author SHA1 Message Date
CN_132DAS f88742e7ab Allow bees use EFR flowers (#104) 2025-12-14 19:54:18 +01:00
Martin Robertz fb2ff8aef3 update 2025-11-04 22:38:13 +01:00
3f41c5e8f8 Add null guards to BlockUtil reflections to prevent NullPointerExceptions (#103)
Co-authored-by: Teteros <[email protected]>
Co-authored-by: Martin Robertz <[email protected]>
2025-11-04 21:39:04 +01:00
3 changed files with 69 additions and 1 deletions

No files matched your search

@@ -47,6 +47,7 @@ import forestry.plugins.compat.PluginBuildCraftTransport;
import forestry.plugins.compat.PluginChisel;
import forestry.plugins.compat.PluginEnderIO;
import forestry.plugins.compat.PluginErebus;
import forestry.plugins.compat.PluginEtFuturumRequiem;
import forestry.plugins.compat.PluginExtraUtilities;
import forestry.plugins.compat.PluginGrowthCraft;
import forestry.plugins.compat.PluginHarvestCraft;
@@ -118,7 +119,8 @@ public class PluginManager {
NATURA(new PluginNatura()),
PLANTMEGAPACK(new PluginPlantMegaPack()),
ROTARYCRAFT(new PluginRotaryCraft()),
WITCHERY(new PluginWitchery());
WITCHERY(new PluginWitchery()),
EFR(new PluginEtFuturumRequiem());
static {
ForestryAPI.enabledPlugins = new HashSet<>();
@@ -0,0 +1,65 @@
package forestry.plugins.compat;
import net.minecraft.block.Block;
import cpw.mods.fml.common.registry.GameRegistry;
import forestry.api.apiculture.FlowerManager;
import forestry.core.utils.ModUtil;
import forestry.plugins.ForestryPlugin;
import forestry.plugins.Plugin;
import forestry.plugins.PluginManager;
@Plugin(
pluginID = "EtFuturumRequiem",
name = "EtFuturumRequiem",
unlocalizedDescription = "for.plugin.etfuturum.description")
public class PluginEtFuturumRequiem extends ForestryPlugin {
private static final String EFR = "etfuturum";
@Override
public boolean isAvailable() {
return ModUtil.isModLoaded(EFR);
}
@Override
public String getFailMessage() {
return "EtFuturumRequiem not found";
}
@Override
public void doInit() {
super.doInit();
if (PluginManager.Module.APICULTURE.isEnabled()) {
addFlowers();
}
}
private void addFlowers() {
Block CornFlower = GameRegistry.findBlock(EFR, "cornflower");
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");
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);
}
}
}
@@ -1738,6 +1738,7 @@ for.plugin.growthcraft.description=Compatibility plugin for GrowthCraft
for.plugin.erebus.description=Compatibility plugin for Erebus
for.plugin.rotarycraft.description=Compatibility plugin for RotaryCraft
for.plugin.minefactoryreloaded.description=Compatibility plugin for MineFactoryReloaded
for.plugin.etfuturum.description=Compatibility plugin for EtFuturumRequiem
####################
# CONFIG FILES