diff --git a/src/main/java/forestry/core/utils/BlockUtil.java b/src/main/java/forestry/core/utils/BlockUtil.java index b441c3996..856b6864a 100644 --- a/src/main/java/forestry/core/utils/BlockUtil.java +++ b/src/main/java/forestry/core/utils/BlockUtil.java @@ -14,11 +14,17 @@ import javax.annotation.Nonnull; import javax.annotation.Nullable; import java.util.List; +import cofh.api.energy.IEnergyConnection; +import cofh.api.energy.IEnergyReceiver; +import forestry.core.network.packets.PacketFXSignal; +import forestry.core.proxy.Proxies; +import forestry.core.tiles.TileEngine; import net.minecraft.block.Block; import net.minecraft.block.BlockHorizontal; import net.minecraft.block.BlockOldLog; import net.minecraft.block.BlockPlanks; import net.minecraft.block.BlockStaticLiquid; +import net.minecraft.block.properties.IProperty; import net.minecraft.block.state.IBlockState; import net.minecraft.init.Blocks; import net.minecraft.item.Item; @@ -31,16 +37,8 @@ import net.minecraft.util.math.RayTraceResult; import net.minecraft.util.math.Vec3d; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; - import net.minecraftforge.oredict.OreDictionary; -import forestry.core.network.packets.PacketFXSignal; -import forestry.core.proxy.Proxies; -import forestry.core.tiles.TileEngine; - -import cofh.api.energy.IEnergyConnection; -import cofh.api.energy.IEnergyReceiver; - public abstract class BlockUtil { private static final int slabWoodId = OreDictionary.getOreID("slabWood"); @@ -343,4 +341,17 @@ public abstract class BlockUtil { } return false; } + + @Nullable + public static > IProperty getProperty(Block block, String propertyName, Class valueClass) { + for (IProperty property : block.getDefaultState().getPropertyNames()) { + if (property.getName().equals(propertyName)) { + if (property.getValueClass().isAssignableFrom(valueClass)) { + //noinspection unchecked + return (IProperty) property; + } + } + } + return null; + } } diff --git a/src/main/java/forestry/plugins/ForestryPluginUids.java b/src/main/java/forestry/plugins/ForestryPluginUids.java index ffcfa7476..a28939f0a 100644 --- a/src/main/java/forestry/plugins/ForestryPluginUids.java +++ b/src/main/java/forestry/plugins/ForestryPluginUids.java @@ -20,6 +20,7 @@ public class ForestryPluginUids { public static final String BUILDCRAFT_STATEMENTS = "forestry.buildcraft.statements"; public static final String BUILDCRAFT_TRANSPORT = "forestry.buildcraft.transport"; public static final String CHISEL = "forestry.chisel"; + public static final String EXTRA_UTILITIES = "forestry.extra.utilities"; public static final String NATURA = "forestry.natura"; public static final String INDUSTRIALCRAFT2 = "forestry.industrialcraft2"; } diff --git a/src/main/java/forestry/plugins/compat/PluginExtraUtilities.java b/src/main/java/forestry/plugins/compat/PluginExtraUtilities.java new file mode 100644 index 000000000..5dbb9d220 --- /dev/null +++ b/src/main/java/forestry/plugins/compat/PluginExtraUtilities.java @@ -0,0 +1,89 @@ +/******************************************************************************* + * Copyright (c) 2011-2014 SirSengir. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the GNU Lesser Public License v3 + * which accompanies this distribution, and is available at + * http://www.gnu.org/licenses/lgpl-3.0.txt + * + * Various Contributors including, but not limited to: + * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges + ******************************************************************************/ +package forestry.plugins.compat; + +import java.util.Collections; + +import forestry.api.circuits.ChipsetManager; +import forestry.api.circuits.ICircuitLayout; +import forestry.api.core.ForestryAPI; +import forestry.api.farming.Farmables; +import forestry.core.PluginCore; +import forestry.core.circuits.Circuit; +import forestry.core.config.Config; +import forestry.core.config.Constants; +import forestry.core.items.EnumElectronTube; +import forestry.core.utils.BlockUtil; +import forestry.core.utils.Log; +import forestry.core.utils.ModUtil; +import forestry.farming.circuits.CircuitFarmLogic; +import forestry.farming.logic.FarmLogicEnder; +import forestry.farming.logic.FarmableAgingCrop; +import forestry.plugins.BlankForestryPlugin; +import forestry.plugins.ForestryPlugin; +import forestry.plugins.ForestryPluginUids; +import net.minecraft.block.Block; +import net.minecraft.block.properties.IProperty; +import net.minecraft.init.Blocks; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.util.ResourceLocation; +import net.minecraftforge.fml.common.registry.ForgeRegistries; + +@ForestryPlugin(pluginID = ForestryPluginUids.EXTRA_UTILITIES, name = "ExtraUtilities", author = "Nirek", url = Constants.URL, unlocalizedDescription = "for.plugin.extrautilities.description") +public class PluginExtraUtilities extends BlankForestryPlugin { + + private static final String ExU = "ExtraUtils2"; + + @Override + public boolean isAvailable() { + return ModUtil.isModLoaded(ExU); + } + + @Override + public String getFailMessage() { + return "ExtraUtilities not found"; + } + + @Override + public void doInit() { + super.doInit(); + + if (Config.isExUtilEnderLilyEnabled()) { + Block enderLillyBlock = ForgeRegistries.BLOCKS.getValue(new ResourceLocation("extrautils2", "EnderLilly")); + Item enderLillyItem = Item.getItemFromBlock(enderLillyBlock); + if (enderLillyBlock == Blocks.AIR) { + Log.error("Could not find ender lilly block."); + } else if (enderLillyItem == null) { + Log.error("Could not find ender lilly item."); + } else { + IProperty growthProperty = BlockUtil.getProperty(enderLillyBlock, "growth", Integer.class); + if (growthProperty == null) { + Log.error("Could not find the growth property of ender lily."); + } else { + int harvestAge = Collections.max(growthProperty.getAllowedValues()); + int replantAge = enderLillyBlock.getDefaultState().getValue(growthProperty); + Farmables.farmables.put("farmEnder", new FarmableAgingCrop(new ItemStack(enderLillyItem), enderLillyBlock, growthProperty, harvestAge, replantAge)); + Circuit.farmEnderManaged = new CircuitFarmLogic("managedEnder", new FarmLogicEnder()); + } + } + } + } + + @Override + public void registerRecipes() { + super.registerRecipes(); + if (ForestryAPI.enabledPlugins.contains(ForestryPluginUids.FARMING) && Circuit.farmEnderManaged != null) { + ICircuitLayout layoutManaged = ChipsetManager.circuitRegistry.getLayout("forestry.farms.managed"); + ChipsetManager.solderManager.addRecipe(layoutManaged, PluginCore.items.tubes.get(EnumElectronTube.ENDER, 1), Circuit.farmEnderManaged); + } + } +}