Fix #1827 Allow Natura nether saplings to be autofarmed in arboreal farm (#1829)

This commit is contained in:
LachimHeigrim authored and mezz committed 2017-09-01 19:58:46 -07:00
1 parent b3549edf51
commit e6cb758e0e
15 files changed
+227 -86

No files matched your search

@@ -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();
@@ -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.
* <p>
@@ -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<String, IFarmable> farmables = HashMultimap.create();
private final Map<ItemStack, Integer> fertilizers = new LinkedHashMap<>();
private final Map<String, IFarmLogic> logics = new HashMap<String, IFarmLogic>();
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));
@@ -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
@@ -26,6 +26,10 @@ public class CircuitFarmLogic extends Circuit {
super(uid);
this.logic = logic;
}
public IFarmLogic getFarmLogic() {
return logic;
}
public CircuitFarmLogic setManual() {
isManual = true;
@@ -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<ItemStack> collect(World world, IFarmHousing farmHousing) {
@@ -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
}
}
@@ -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<ItemStack> 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;
}
}
}
@@ -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<ICrop> getHarvestBlocks(World world, BlockPos position) {
Set<BlockPos> seen = new HashSet<>();
@@ -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<IFarmable> germlings = FarmRegistry.getInstance().getFarmables("farmPoales");
private ArrayList<Soil> 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;
}
}
@@ -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
}
}
@@ -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<IFarmable> germlings = FarmRegistry.getInstance().getFarmables("farmSucculentes");
private ArrayList<Soil> 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
@@ -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<Soil> soils = new ArrayList<>();
private static final FluidStack STACK_WATER = new FluidStack(FluidRegistry.WATER, Fluid.BUCKET_VOLUME);
protected NonNullList<ItemStack> 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<ItemStack> resources = NonNullList.create();
resources.add(resource);
for (Soil soil : soils) {
NonNullList<ItemStack> 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<ItemStack> resources = NonNullList.create();
resources.add(resource);
if (!farmHousing.getFarmInventory().hasResources(resources)) {
@@ -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;
}
}
@@ -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);
}
}