diff --git a/src/main/java/forestry/api/farming/IFarmLogic.java b/src/main/java/forestry/api/farming/IFarmLogic.java index 4ddfecb3d..03fa75cd8 100644 --- a/src/main/java/forestry/api/farming/IFarmLogic.java +++ b/src/main/java/forestry/api/farming/IFarmLogic.java @@ -7,6 +7,7 @@ package forestry.api.farming; import java.util.Collection; +import net.minecraft.block.state.IBlockState; import net.minecraft.item.ItemStack; import net.minecraft.util.NonNullList; import net.minecraft.util.ResourceLocation; @@ -33,6 +34,8 @@ public interface IFarmLogic { IFarmLogic setManual(boolean manual); + void addSoil(ItemStack resource, IBlockState soilState, boolean hasMetaData); + @SideOnly(Side.CLIENT) ResourceLocation getTextureMap(); diff --git a/src/main/java/forestry/api/farming/IFarmRegistry.java b/src/main/java/forestry/api/farming/IFarmRegistry.java index a3a0b8f0d..028fa7d48 100644 --- a/src/main/java/forestry/api/farming/IFarmRegistry.java +++ b/src/main/java/forestry/api/farming/IFarmRegistry.java @@ -11,6 +11,13 @@ import net.minecraft.item.ItemStack; public interface IFarmRegistry { + /** + * Registers farming logic in registry under given identifier + * @param identifier Valid identifiers: farmArboreal farmWheat farmGourd farmInfernal farmPoales farmSucculentes farmVegetables farmShroom + * @param logic corresponding instance of logic + */ + void registerFarmLogic(String identifier, IFarmLogic logic); + /** * Can be used to add IFarmables to some of the vanilla farm logics. *

diff --git a/src/main/java/forestry/farming/FarmRegistry.java b/src/main/java/forestry/farming/FarmRegistry.java index fd241b12f..47ca7d1b1 100644 --- a/src/main/java/forestry/farming/FarmRegistry.java +++ b/src/main/java/forestry/farming/FarmRegistry.java @@ -7,6 +7,7 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; import java.util.Collections; +import java.util.HashMap; import java.util.HashSet; import java.util.LinkedHashMap; import java.util.List; @@ -15,10 +16,8 @@ import java.util.Map.Entry; import java.util.Set; import net.minecraft.item.ItemStack; - import net.minecraftforge.common.config.Property; import net.minecraftforge.oredict.OreDictionary; - import forestry.api.core.ForestryAPI; import forestry.api.farming.IFarmLogic; import forestry.api.farming.IFarmRegistry; @@ -35,6 +34,7 @@ public final class FarmRegistry implements IFarmRegistry { private static final FarmRegistry INSTANCE = new FarmRegistry(); private final Multimap farmables = HashMultimap.create(); private final Map fertilizers = new LinkedHashMap<>(); + private final Map logics = new HashMap(); static { ForestryAPI.farmRegistry = INSTANCE; @@ -44,6 +44,14 @@ public final class FarmRegistry implements IFarmRegistry { return INSTANCE; } + public void registerFarmLogic(String identifier, IFarmLogic logic) { + logics.put(identifier, logic); + } + + public IFarmLogic getFarmLogic(String identifier) { + return logics.get(identifier); + } + @Override public void registerFarmables(String identifier, IFarmable... farmablesArray) { farmables.putAll(identifier, Arrays.asList(farmablesArray)); diff --git a/src/main/java/forestry/farming/PluginFarming.java b/src/main/java/forestry/farming/PluginFarming.java index f8a25fa03..bb8dd4117 100644 --- a/src/main/java/forestry/farming/PluginFarming.java +++ b/src/main/java/forestry/farming/PluginFarming.java @@ -190,6 +190,13 @@ public class PluginFarming extends BlankForestryPlugin { Circuits.farmCocoaManual = new CircuitFarmLogic("manualCocoa", new FarmLogicCocoa()).setManual(); Circuits.farmOrchardManual = new CircuitFarmLogic("manualOrchard", new FarmLogicOrchard()); + + // Make Forestry farming logics accessible to plugins via FarmRegistry + FarmRegistry.getInstance().registerFarmLogic("farmArboreal",((CircuitFarmLogic)Circuits.farmArborealManaged).getFarmLogic()); + FarmRegistry.getInstance().registerFarmLogic("farmShroom",((CircuitFarmLogic)Circuits.farmShroomManaged).getFarmLogic()); + FarmRegistry.getInstance().registerFarmLogic("farmWheat",((CircuitFarmLogic)Circuits.farmCerealManaged).getFarmLogic()); + FarmRegistry.getInstance().registerFarmLogic("farmVegetables",((CircuitFarmLogic)Circuits.farmVegetableManaged).getFarmLogic()); + FarmRegistry.getInstance().registerFarmLogic("farmInfernal",((CircuitFarmLogic)Circuits.farmInfernalManaged).getFarmLogic()); } @Override diff --git a/src/main/java/forestry/farming/circuits/CircuitFarmLogic.java b/src/main/java/forestry/farming/circuits/CircuitFarmLogic.java index 4e556230b..1e434f54e 100755 --- a/src/main/java/forestry/farming/circuits/CircuitFarmLogic.java +++ b/src/main/java/forestry/farming/circuits/CircuitFarmLogic.java @@ -26,6 +26,10 @@ public class CircuitFarmLogic extends Circuit { super(uid); this.logic = logic; } + + public IFarmLogic getFarmLogic() { + return logic; + } public CircuitFarmLogic setManual() { isManual = true; diff --git a/src/main/java/forestry/farming/logic/FarmLogicCocoa.java b/src/main/java/forestry/farming/logic/FarmLogicCocoa.java index 8332f0959..6d9b743bd 100755 --- a/src/main/java/forestry/farming/logic/FarmLogicCocoa.java +++ b/src/main/java/forestry/farming/logic/FarmLogicCocoa.java @@ -73,6 +73,11 @@ public class FarmLogicCocoa extends FarmLogic { public boolean isAcceptedWindfall(ItemStack stack) { return false; } + + @Override + public void addSoil(ItemStack resource, IBlockState soilState, boolean hasMetaData) { + // do nothing as soil is not managed by farm + } @Override public NonNullList collect(World world, IFarmHousing farmHousing) { diff --git a/src/main/java/forestry/farming/logic/FarmLogicGourd.java b/src/main/java/forestry/farming/logic/FarmLogicGourd.java index 4aacc518b..ce62f72a6 100755 --- a/src/main/java/forestry/farming/logic/FarmLogicGourd.java +++ b/src/main/java/forestry/farming/logic/FarmLogicGourd.java @@ -97,4 +97,9 @@ public class FarmLogicGourd extends FarmLogic { return crops; } + @Override + public void addSoil(ItemStack resource, IBlockState soilState, boolean hasMetaData) { + // do nothing as soil is not managed by farm + + } } diff --git a/src/main/java/forestry/farming/logic/FarmLogicHomogeneous.java b/src/main/java/forestry/farming/logic/FarmLogicHomogeneous.java index 7773cda47..0bee068ea 100644 --- a/src/main/java/forestry/farming/logic/FarmLogicHomogeneous.java +++ b/src/main/java/forestry/farming/logic/FarmLogicHomogeneous.java @@ -37,17 +37,17 @@ public abstract class FarmLogicHomogeneous extends FarmLogic { this.farmables = new ArrayList<>(farmables); } - protected void addSoil(ItemStack resource, IBlockState soilState, boolean hasMetaData){ + public void addSoil(ItemStack resource, IBlockState soilState, boolean hasMetaData){ soils.add(new Soil(resource, soilState, hasMetaData)); } protected boolean isAcceptedSoil(IBlockState blockState) { for(Soil soil : soils){ - IBlockState soilState = soil.soilState; + IBlockState soilState = soil.getSoilState(); Block soilBlock = soilState.getBlock(); Block block = blockState.getBlock(); if(soilState.getBlock() == blockState.getBlock()){ - if(!soil.hasMetaData || block.getMetaFromState(blockState) == soilBlock.getMetaFromState(soilState)){ + if(!soil.hasMetaData() || block.getMetaFromState(blockState) == soilBlock.getMetaFromState(soilState)){ return true; } } @@ -58,7 +58,7 @@ public abstract class FarmLogicHomogeneous extends FarmLogic { @Override public boolean isAcceptedResource(ItemStack itemstack) { for(Soil soil : soils){ - ItemStack resource = soil.resource; + ItemStack resource = soil.getResource(); if(resource.isItemEqual(itemstack)){ return true; } @@ -95,7 +95,7 @@ public abstract class FarmLogicHomogeneous extends FarmLogic { private boolean maintainSoil(World world, IFarmHousing farmHousing, BlockPos pos, FarmDirection direction, int extent) { for(Soil soil : soils){ NonNullList resources = NonNullList.create(); - resources.add(soil.resource); + resources.add(soil.getResource()); if (!farmHousing.getFarmInventory().hasResources(resources)) { continue; } @@ -120,7 +120,7 @@ public abstract class FarmLogicHomogeneous extends FarmLogic { produce.addAll(BlockUtil.getBlockDrops(world, position)); - BlockUtil.setBlockWithPlaceSound(world, position, soil.soilState); + BlockUtil.setBlockWithPlaceSound(world, position, soil.getSoilState()); farmHousing.getFarmInventory().removeResources(resources); return true; } @@ -130,16 +130,4 @@ public abstract class FarmLogicHomogeneous extends FarmLogic { } protected abstract boolean maintainGermlings(World world, IFarmHousing farmHousing, BlockPos pos, FarmDirection direction, int extent); - - private static class Soil{ - protected final ItemStack resource; - protected final IBlockState soilState; - protected final boolean hasMetaData; - - public Soil(ItemStack resource, IBlockState soilState, boolean hasMetaData) { - this.resource = resource; - this.soilState = soilState; - this.hasMetaData = hasMetaData; - } - } } \ No newline at end of file diff --git a/src/main/java/forestry/farming/logic/FarmLogicOrchard.java b/src/main/java/forestry/farming/logic/FarmLogicOrchard.java index 403666627..8a55bc4d0 100644 --- a/src/main/java/forestry/farming/logic/FarmLogicOrchard.java +++ b/src/main/java/forestry/farming/logic/FarmLogicOrchard.java @@ -130,6 +130,11 @@ public class FarmLogicOrchard extends FarmLogic { public String getName() { return "Orchard"; } + + @Override + public void addSoil(ItemStack resource, IBlockState soilState, boolean hasMetaData) { + // do nothing as soil is not managed by farm + } private Collection getHarvestBlocks(World world, BlockPos position) { Set seen = new HashSet<>(); diff --git a/src/main/java/forestry/farming/logic/FarmLogicReeds.java b/src/main/java/forestry/farming/logic/FarmLogicReeds.java index 9d20c2d77..c576ba111 100644 --- a/src/main/java/forestry/farming/logic/FarmLogicReeds.java +++ b/src/main/java/forestry/farming/logic/FarmLogicReeds.java @@ -10,15 +10,10 @@ ******************************************************************************/ package forestry.farming.logic; +import java.util.ArrayList; import java.util.Collection; import java.util.Stack; -import forestry.api.farming.FarmDirection; -import forestry.api.farming.ICrop; -import forestry.api.farming.IFarmHousing; -import forestry.api.farming.IFarmable; -import forestry.core.utils.ItemStackUtil; -import forestry.farming.FarmRegistry; import net.minecraft.block.state.IBlockState; import net.minecraft.init.Blocks; import net.minecraft.init.Items; @@ -26,10 +21,23 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.NonNullList; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +import forestry.api.farming.FarmDirection; +import forestry.api.farming.ICrop; +import forestry.api.farming.IFarmHousing; +import forestry.api.farming.IFarmable; +import forestry.farming.FarmRegistry; public class FarmLogicReeds extends FarmLogic { + private final Collection germlings = FarmRegistry.getInstance().getFarmables("farmPoales"); - + private ArrayList soils = new ArrayList<>(); + + + public FarmLogicReeds() { + addSoil(new ItemStack(Blocks.SAND), Blocks.SAND.getDefaultState(),true); + addSoil(new ItemStack(Blocks.DIRT), Blocks.DIRT.getDefaultState(),false); + } + @Override public ItemStack getIconItemStack() { return new ItemStack(Items.REEDS); @@ -44,6 +52,11 @@ public class FarmLogicReeds extends FarmLogic { } } + @Override + public void addSoil(ItemStack resource, IBlockState soilState, boolean hasMetaData) { + this.soils.add(new Soil(resource,soilState,hasMetaData)); + } + @Override public int getFertilizerConsumption() { return 10; @@ -60,7 +73,14 @@ public class FarmLogicReeds extends FarmLogic { return false; } - return ItemStackUtil.equals(Blocks.SAND, itemstack) || ItemStackUtil.equals(Blocks.DIRT, itemstack); + for(Soil soil : soils){ + ItemStack resource = soil.getResource(); + if(resource.isItemEqual(itemstack)){ + return true; + } + } + return false; + } @Override @@ -104,4 +124,6 @@ public class FarmLogicReeds extends FarmLogic { return crops; } + + } diff --git a/src/main/java/forestry/farming/logic/FarmLogicRubber.java b/src/main/java/forestry/farming/logic/FarmLogicRubber.java index 23425d204..a92b7fe9d 100755 --- a/src/main/java/forestry/farming/logic/FarmLogicRubber.java +++ b/src/main/java/forestry/farming/logic/FarmLogicRubber.java @@ -131,4 +131,9 @@ public class FarmLogicRubber extends FarmLogic { return crops; } + @Override + public void addSoil(ItemStack resource, IBlockState soilState, boolean hasMetaData) { + // do nothing as soil is not managed by farm + } + } diff --git a/src/main/java/forestry/farming/logic/FarmLogicSucculent.java b/src/main/java/forestry/farming/logic/FarmLogicSucculent.java index e685bd49d..e53b76870 100755 --- a/src/main/java/forestry/farming/logic/FarmLogicSucculent.java +++ b/src/main/java/forestry/farming/logic/FarmLogicSucculent.java @@ -10,6 +10,7 @@ ******************************************************************************/ package forestry.farming.logic; +import java.util.ArrayList; import java.util.Collection; import java.util.Stack; @@ -20,7 +21,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.NonNullList; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; - import forestry.api.farming.FarmDirection; import forestry.api.farming.ICrop; import forestry.api.farming.IFarmHousing; @@ -29,8 +29,14 @@ import forestry.core.utils.ItemStackUtil; import forestry.farming.FarmRegistry; public class FarmLogicSucculent extends FarmLogic { + private final Collection germlings = FarmRegistry.getInstance().getFarmables("farmSucculentes"); - + private ArrayList soils = new ArrayList<>(); + + public FarmLogicSucculent() { + addSoil(new ItemStack(Blocks.SAND), Blocks.SAND.getDefaultState(),true); + } + @Override public ItemStack getIconItemStack() { return new ItemStack(Items.DYE, 1, 2); @@ -45,6 +51,11 @@ public class FarmLogicSucculent extends FarmLogic { } } + @Override + public void addSoil(ItemStack resource, IBlockState soilState, boolean hasMetaData) { + this.soils.add(new Soil(resource,soilState,hasMetaData)); + } + @Override public int getFertilizerConsumption() { return 10; @@ -54,14 +65,20 @@ public class FarmLogicSucculent extends FarmLogic { public int getWaterConsumption(float hydrationModifier) { return 1; } - + @Override public boolean isAcceptedResource(ItemStack itemstack) { if (isManual) { return false; } - return ItemStackUtil.equals(Blocks.SAND, itemstack); + for(Soil soil : soils){ + ItemStack resource = soil.getResource(); + if(resource.isItemEqual(itemstack)) { + return true; + } + } + return false; } @Override diff --git a/src/main/java/forestry/farming/logic/FarmLogicWatered.java b/src/main/java/forestry/farming/logic/FarmLogicWatered.java index 1fcc5ba5a..7102a54b0 100755 --- a/src/main/java/forestry/farming/logic/FarmLogicWatered.java +++ b/src/main/java/forestry/farming/logic/FarmLogicWatered.java @@ -10,17 +10,19 @@ ******************************************************************************/ package forestry.farming.logic; +import java.util.ArrayList; +import java.util.List; + +import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.util.NonNullList; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; - import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; - import forestry.api.farming.FarmDirection; import forestry.api.farming.IFarmHousing; import forestry.core.utils.BlockUtil; @@ -28,16 +30,20 @@ import forestry.farming.FarmHelper; public abstract class FarmLogicWatered extends FarmLogic { - protected final IBlockState ground; - private final ItemStack resource; - + + private final List soils = new ArrayList<>(); + private static final FluidStack STACK_WATER = new FluidStack(FluidRegistry.WATER, Fluid.BUCKET_VOLUME); protected NonNullList produce = NonNullList.create(); protected FarmLogicWatered(ItemStack resource, IBlockState ground) { - this.ground = ground; - this.resource = resource; + addSoil(resource,ground,false); + } + + @Override + public void addSoil(ItemStack resource, IBlockState soilState, boolean hasMetaData) { + soils.add(new Soil(resource,soilState,hasMetaData)); } @Override @@ -51,12 +57,28 @@ public abstract class FarmLogicWatered extends FarmLogic { } protected boolean isAcceptedGround(IBlockState ground) { - return this.ground.getBlock() == ground.getBlock(); + for(Soil soil : soils){ + IBlockState soilState = soil.getSoilState(); + Block soilBlock = soilState.getBlock(); + Block block = ground.getBlock(); + if(soilState.getBlock() == ground.getBlock()){ + if(!soil.hasMetaData() || block.getMetaFromState(ground) == soilBlock.getMetaFromState(soilState)){ + return true; + } + } + } + return false; } @Override public boolean isAcceptedResource(ItemStack itemstack) { - return resource.isItemEqual(itemstack); + for(Soil soil : soils){ + ItemStack resource = soil.getResource(); + if(resource.isItemEqual(itemstack)){ + return true; + } + } + return false; } @Override @@ -85,34 +107,36 @@ public abstract class FarmLogicWatered extends FarmLogic { } private boolean maintainSoil(World world, IFarmHousing farmHousing, BlockPos pos, FarmDirection direction, int extent) { - NonNullList resources = NonNullList.create(); - resources.add(resource); + for (Soil soil : soils) { + NonNullList resources = NonNullList.create(); + resources.add(soil.getResource()); - for (int i = 0; i < extent; i++) { - BlockPos position = translateWithOffset(pos, direction, i); - IBlockState state = world.getBlockState(position); - if (isAcceptedGround(state) || isWaterSourceBlock(world, position) || !farmHousing.getFarmInventory().hasResources(resources)) { - continue; - } - - BlockPos platformPosition = position.down(); - IBlockState blockState = world.getBlockState(platformPosition); - if (!FarmHelper.bricks.contains(blockState.getBlock())) { - break; - } - - if (!BlockUtil.isReplaceableBlock(state, world, position)) { - produce.addAll(BlockUtil.getBlockDrops(world, position)); - world.setBlockToAir(position); - return trySetSoil(world, farmHousing, position); - } - - if (!isManual) { - if (trySetWater(world, farmHousing, position)) { - return true; + for (int i = 0; i < extent; i++) { + BlockPos position = translateWithOffset(pos, direction, i); + IBlockState state = world.getBlockState(position); + if (isAcceptedGround(state) || isWaterSourceBlock(world, position) || !farmHousing.getFarmInventory().hasResources(resources)) { + continue; + } + + BlockPos platformPosition = position.down(); + IBlockState blockState = world.getBlockState(platformPosition); + if (!FarmHelper.bricks.contains(blockState.getBlock())) { + break; + } + + if (!BlockUtil.isReplaceableBlock(state, world, position)) { + produce.addAll(BlockUtil.getBlockDrops(world, position)); + world.setBlockToAir(position); + return trySetSoil(world, farmHousing, position, soil.getResource(), soil.getSoilState()); + } + + if (!isManual) { + if (trySetWater(world, farmHousing, position)) { + return true; + } + + return trySetSoil(world, farmHousing, position, soil.getResource(), soil.getSoilState()); } - - return trySetSoil(world, farmHousing, position); } } @@ -142,7 +166,7 @@ public abstract class FarmLogicWatered extends FarmLogic { return false; } - private boolean trySetSoil(World world, IFarmHousing farmHousing, BlockPos position) { + private boolean trySetSoil(World world, IFarmHousing farmHousing, BlockPos position, ItemStack resource, IBlockState ground) { NonNullList resources = NonNullList.create(); resources.add(resource); if (!farmHousing.getFarmInventory().hasResources(resources)) { diff --git a/src/main/java/forestry/farming/logic/Soil.java b/src/main/java/forestry/farming/logic/Soil.java new file mode 100644 index 000000000..19fe7a77d --- /dev/null +++ b/src/main/java/forestry/farming/logic/Soil.java @@ -0,0 +1,28 @@ +package forestry.farming.logic; + +import net.minecraft.block.state.IBlockState; +import net.minecraft.item.ItemStack; + +class Soil { + private final ItemStack resource; + private final IBlockState soilState; + private final boolean hasMetaData; + + public Soil(ItemStack resource, IBlockState soilState, boolean hasMetaData) { + this.resource = resource; + this.soilState = soilState; + this.hasMetaData = hasMetaData; + } + + public ItemStack getResource() { + return resource; + } + + public IBlockState getSoilState() { + return soilState; + } + + public boolean hasMetaData() { + return this.hasMetaData; + } +} \ No newline at end of file diff --git a/src/main/java/forestry/plugins/compat/PluginNatura.java b/src/main/java/forestry/plugins/compat/PluginNatura.java index 396ed30ad..8c4667060 100644 --- a/src/main/java/forestry/plugins/compat/PluginNatura.java +++ b/src/main/java/forestry/plugins/compat/PluginNatura.java @@ -10,9 +10,28 @@ ******************************************************************************/ package forestry.plugins.compat; +import java.util.ArrayList; +import java.util.Collection; +import java.util.function.Consumer; + +import net.minecraft.block.Block; +import net.minecraft.block.properties.IProperty; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.init.Blocks; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.util.NonNullList; +import net.minecraft.util.ResourceLocation; +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.event.RegistryEvent; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.fml.common.registry.ForgeRegistries; +import net.minecraftforge.oredict.OreDictionary; + import com.google.common.collect.Iterables; + import forestry.api.core.ForestryAPI; -import forestry.api.farming.Farmables; +import forestry.api.farming.IFarmLogic; import forestry.api.fuels.FuelManager; import forestry.api.fuels.MoistenerFuel; import forestry.api.recipes.RecipeManagers; @@ -31,23 +50,6 @@ import forestry.farming.logic.FarmableSapling; 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.creativetab.CreativeTabs; -import net.minecraft.init.Blocks; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.util.NonNullList; -import net.minecraft.util.ResourceLocation; -import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.event.RegistryEvent; -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -import net.minecraftforge.fml.common.registry.ForgeRegistries; -import net.minecraftforge.oredict.OreDictionary; - -import java.util.ArrayList; -import java.util.Collection; -import java.util.function.Consumer; @ForestryPlugin(pluginID = ForestryPluginUids.NATURA, name = "Natura", author = "SirSengir", url = Constants.URL, unlocalizedDescription = "for.plugin.natura.description") public class PluginNatura extends BlankForestryPlugin { @@ -256,5 +258,16 @@ public class PluginNatura extends BlankForestryPlugin { FuelManager.moistenerResource.put(crop, new MoistenerFuel(crop, PluginCore.items.mouldyWheat.getItemStack(), 0, 300)); }); } + + + /* + * Register soils required by Natura trees. Must run in postInit(), after core PluginFarming has registered FarmingLogic instances + */ + @Override + public void postInit() { + IFarmLogic farmArboreal = FarmRegistry.getInstance().getFarmLogic("farmArboreal"); + farmArboreal.addSoil(new ItemStack(Blocks.NETHERRACK), Blocks.NETHERRACK.getDefaultState(), false); + + } }