Ellpeck/ActuallyAdditions
1
0
Fork 0
mirror of https://github.com/Ellpeck/ActuallyAdditions.git synced 2024-11-22 15:18:34 +01:00
Code Issues Projects Releases Wiki Activity

Allow plants to be planted on blocks other than farmland with the farmer

Browse source 
Closes #346
This commit is contained in:
Ellpeck 2016-11-10 16:38:37 +01:00
parent 20664fccf4
commit 66aec5cfdf
1 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityFarmer.java
View file

@ -12,7 +12,10 @@ package de.ellpeck.actuallyadditions.mod.tile;
import cofh.api.energy.EnergyStorage; import cofh.api.energy.EnergyStorage;
import de.ellpeck.actuallyadditions.mod.util.WorldUtil; import de.ellpeck.actuallyadditions.mod.util.WorldUtil;
import net.minecraft.block.*; import net.minecraft.block.Block;
import net.minecraft.block.BlockCrops;
import net.minecraft.block.BlockDirt;
import net.minecraft.block.BlockGrass;
import net.minecraft.block.state.IBlockState; import net.minecraft.block.state.IBlockState;
import net.minecraft.init.Blocks; import net.minecraft.init.Blocks;
import net.minecraft.init.SoundEvents; import net.minecraft.init.SoundEvents;
@ -105,12 +108,10 @@ public class TileEntityFarmer extends TileEntityInventoryBase implements ICustom
IBlockState farmlandState = this.worldObj.getBlockState(farmland); IBlockState farmlandState = this.worldObj.getBlockState(farmland);
Block farmlandBlock = farmlandState.getBlock(); Block farmlandBlock = farmlandState.getBlock();
if(farmlandBlock instanceof BlockFarmland){ IBlockState toPlant = this.getFirstPlantablePlantFromSlots(plant);
IBlockState toPlant = this.getFirstPlantablePlantFromSlots(plant); if(toPlant != null){
if(toPlant != null){ this.worldObj.setBlockState(plant, toPlant, 3);
this.worldObj.setBlockState(plant, toPlant, 2); didSomething = true;
didSomething = true;
}
} }
else if(farmlandBlock instanceof BlockDirt || farmlandBlock instanceof BlockGrass){ else if(farmlandBlock instanceof BlockDirt || farmlandBlock instanceof BlockGrass){
this.worldObj.setBlockState(farmland, Blocks.FARMLAND.getDefaultState(), 2); this.worldObj.setBlockState(farmland, Blocks.FARMLAND.getDefaultState(), 2);