Compare commits

...
3 Commits
Author SHA1 Message Date
Martin Robertz f001136b53 update 2025-12-09 17:10:22 +01:00
Martin Robertz ddb0a59964 Merge remote-tracking branch 'CN132DAS/EFRcompat' into dev 2025-12-09 17:10:04 +01:00
CN132DAS 8fedc2aa59 Allow bees use EFR flowers 2025-12-01 15:25:35 +08:00
4 changed files with 56 additions and 4 deletions

No files matched your search

+3 -3
View File
@@ -2,10 +2,10 @@
dependencies {
api('curse.maven:cofh-lib-220333:2388748')
compileOnlyApi('com.github.GTNewHorizons:Angelica:1.0.0-beta64:api')
devOnlyNonPublishable('com.github.GTNewHorizons:NotEnoughItems:2.8.26-GTNH:dev')
compileOnlyApi('com.github.GTNewHorizons:Angelica:1.0.0-beta68:api')
devOnlyNonPublishable('com.github.GTNewHorizons:NotEnoughItems:2.8.40-GTNH:dev')
compileOnly('com.github.GTNewHorizons:inventory-tweaks:1.7.1:api')
compileOnly('com.github.GTNewHorizons:BuildCraft:7.1.45:api')
compileOnly('com.github.GTNewHorizons:BuildCraft:7.1.47:api')
compileOnly('net.industrial-craft:industrialcraft-2:2.2.828-experimental:dev')
compileOnly('curse.maven:craftguide-75557:2459320')
}
@@ -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,49 @@
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");
FlowerManager.flowerRegistry.registerAcceptableFlower(CornFlower, FlowerManager.FlowerTypeVanilla);
FlowerManager.flowerRegistry.registerAcceptableFlower(Lily, FlowerManager.FlowerTypeVanilla);
FlowerManager.flowerRegistry.registerAcceptableFlower(Petals, FlowerManager.FlowerTypeVanilla);
FlowerManager.flowerRegistry.registerAcceptableFlower(Rose, FlowerManager.FlowerTypeVanilla);
}
}
@@ -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