diff --git a/src/main/java/binnie/botany/farm/FarmableFlower.java b/src/main/java/binnie/botany/farm/FarmableFlower.java index 29f6fa5a..05c3a2bc 100644 --- a/src/main/java/binnie/botany/farm/FarmableFlower.java +++ b/src/main/java/binnie/botany/farm/FarmableFlower.java @@ -4,11 +4,13 @@ import binnie.botany.Botany; import binnie.botany.api.EnumFlowerStage; import binnie.botany.api.IFlower; import binnie.botany.core.BotanyCore; +import binnie.botany.flower.TileEntityFlower; import binnie.botany.gardening.Gardening; import forestry.api.farming.ICrop; import forestry.api.farming.IFarmable; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; @@ -24,6 +26,20 @@ public class FarmableFlower implements IFarmable { @Nullable @Override public ICrop getCropAt(World world, BlockPos pos, IBlockState blockState) { + IFlower flower = null; + if (world.getTileEntity(pos) instanceof TileEntityFlower) { + flower = ((TileEntityFlower) world.getTileEntity(pos)).getFlower(); + } + // Look at TileEntityFlower::onShear logic + if (flower != null && flower.getAge() > 1) { + ItemStack mature = BotanyCore.getFlowerRoot().getMemberStack(flower, EnumFlowerStage.FLOWER); + ItemStack seed = BotanyCore.getFlowerRoot().getMemberStack(flower, EnumFlowerStage.SEED); + if (mature != null && seed != null) { + world.setBlockState(pos, Blocks.AIR.getDefaultState(), 2); + return new FlowerCrop(pos, mature, seed); + } + } + return null; } diff --git a/src/main/java/binnie/botany/farm/FlowerCrop.java b/src/main/java/binnie/botany/farm/FlowerCrop.java new file mode 100644 index 00000000..211848ba --- /dev/null +++ b/src/main/java/binnie/botany/farm/FlowerCrop.java @@ -0,0 +1,30 @@ +package binnie.botany.farm; + +import forestry.api.farming.ICrop; +import net.minecraft.item.ItemStack; +import net.minecraft.util.NonNullList; +import net.minecraft.util.math.BlockPos; + +import javax.annotation.Nullable; +import java.util.Arrays; + +public class FlowerCrop implements ICrop { + NonNullList drops = NonNullList.create(); + BlockPos position; + + public FlowerCrop(BlockPos pos, ItemStack... drops) { + Arrays.stream(drops).forEach(drop -> this.drops.add(drop)); + position = pos; + } + + @Nullable + @Override + public NonNullList harvest() { + return drops; + } + + @Override + public BlockPos getPosition() { + return position; + } +} diff --git a/src/main/java/binnie/botany/farm/GardenLogic.java b/src/main/java/binnie/botany/farm/GardenLogic.java index 3f8b16da..ad4cfb76 100644 --- a/src/main/java/binnie/botany/farm/GardenLogic.java +++ b/src/main/java/binnie/botany/farm/GardenLogic.java @@ -1,11 +1,20 @@ package binnie.botany.farm; -import javax.annotation.Nullable; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; -import java.util.List; - +import binnie.Binnie; +import binnie.botany.Botany; +import binnie.botany.api.EnumAcidity; +import binnie.botany.api.EnumMoisture; +import binnie.botany.api.EnumSoilType; +import binnie.botany.api.IBlockSoil; +import binnie.botany.flower.TileEntityFlower; +import binnie.botany.gardening.Gardening; +import binnie.core.liquid.ManagerLiquid; +import forestry.api.farming.FarmDirection; +import forestry.api.farming.ICrop; +import forestry.api.farming.IFarmHousing; +import forestry.api.farming.IFarmable; +import forestry.core.owner.IOwnedTile; +import forestry.core.utils.BlockUtil; import net.minecraft.block.Block; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.init.Blocks; @@ -17,25 +26,15 @@ import net.minecraft.util.NonNullList; import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; - import net.minecraftforge.fluids.FluidStack; -import forestry.api.farming.FarmDirection; -import forestry.api.farming.ICrop; -import forestry.api.farming.IFarmHousing; -import forestry.api.farming.IFarmable; -import forestry.core.owner.IOwnedTile; -import forestry.core.utils.BlockUtil; - -import binnie.Binnie; -import binnie.botany.Botany; -import binnie.botany.api.EnumAcidity; -import binnie.botany.api.EnumMoisture; -import binnie.botany.api.EnumSoilType; -import binnie.botany.api.IBlockSoil; -import binnie.botany.flower.TileEntityFlower; -import binnie.botany.gardening.Gardening; -import binnie.core.liquid.ManagerLiquid; +import javax.annotation.Nullable; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.List; +import java.util.Objects; +import java.util.stream.Collectors; public class GardenLogic extends FarmLogic { List farmables; @@ -72,10 +71,10 @@ public class GardenLogic extends FarmLogic { @Override public boolean isAcceptedResource(final ItemStack itemstack) { return Gardening.isSoil(itemstack.getItem()) || - itemstack.getItem() == Item.getItemFromBlock(Blocks.SAND) || - itemstack.getItem() == Item.getItemFromBlock(Blocks.DIRT) || - Gardening.isAcidFertiliser(itemstack) || - Gardening.isAlkalineFertiliser(itemstack); + itemstack.getItem() == Item.getItemFromBlock(Blocks.SAND) || + itemstack.getItem() == Item.getItemFromBlock(Blocks.DIRT) || + Gardening.isAcidFertiliser(itemstack) || + Gardening.isAlkalineFertiliser(itemstack); } @Override @@ -88,8 +87,8 @@ public class GardenLogic extends FarmLogic { @Override public boolean cultivate(World world, IFarmHousing farmHousing, BlockPos pos, FarmDirection direction, int extent) { return this.maintainSoil(world, pos, direction, extent, farmHousing) || - (!this.isManual && this.maintainWater(world, pos, direction, extent, farmHousing)) || - this.maintainCrops(world, pos.up(), direction, extent, farmHousing); + (!this.isManual && this.maintainWater(world, pos, direction, extent, farmHousing)) || + this.maintainCrops(world, pos.up(), direction, extent, farmHousing); } private boolean isWaste(final ItemStack stack) { @@ -280,7 +279,12 @@ public class GardenLogic extends FarmLogic { @Override public Collection harvest(World world, BlockPos pos, FarmDirection direction, int extent) { - return Collections.emptyList(); + if (isManual) { + return Collections.emptyList(); + } else { + return farmables.stream().map(farmable -> farmable.getCropAt(world, pos.up(), world.getBlockState(pos.up()))) + .filter(Objects::nonNull).collect(Collectors.toList()); + } } @Override