mirror of
https://github.com/GTNewHorizons/EnderIO.git
synced 2026-11-19 19:59:58 +00:00
Merge pull request #1 from catt0/master
farming station will cut down IC2 rubber trees if an axe is present
This commit is contained in:
commit
77beea05aa
1 file changed
+13
-8
@@ -19,7 +19,7 @@ public class RubberTreeFarmerIC2 extends TreeFarmer {
|
||||
private ItemStack stickyResin;
|
||||
|
||||
public RubberTreeFarmerIC2() {
|
||||
super(GameRegistry.findBlock("IC2", "blockRubSapling"), GameRegistry.findBlock("IC2", "blockRubWood"));
|
||||
super(true, GameRegistry.findBlock("IC2", "blockRubSapling"), GameRegistry.findBlock("IC2", "blockRubWood"));
|
||||
Item item = GameRegistry.findItem("IC2", "itemTreetap");
|
||||
if(item != null) {
|
||||
treeTap = item.getClass();
|
||||
@@ -37,19 +37,24 @@ public class RubberTreeFarmerIC2 extends TreeFarmer {
|
||||
|
||||
@Override
|
||||
public boolean prepareBlock(TileFarmStation farm, BlockCoord bc, Block block, int meta) {
|
||||
for(int x=-1;x<2;x++) {
|
||||
for(int z=-1;z<2;z++) {
|
||||
Block blk = farm.getBlock(bc.x + x, bc.y, bc.z + z);
|
||||
if(isWood(blk) || sapling == blk) {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
if(!farm.hasAxe()) {
|
||||
for(int x=-1;x<2;x++) {
|
||||
for(int z=-1;z<2;z++) {
|
||||
Block blk = farm.getBlock(bc.x + x, bc.y, bc.z + z);
|
||||
if(isWood(blk) || sapling == blk) {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
return super.prepareBlock(farm, bc, block, meta);
|
||||
}
|
||||
|
||||
@Override
|
||||
public IHarvestResult harvestBlock(TileFarmStation farm, BlockCoord bc, Block block, int meta) {
|
||||
if(farm.hasAxe()) {
|
||||
return super.harvestBlock(farm, bc, block, meta);
|
||||
}
|
||||
HarvestResult res = new HarvestResult();
|
||||
int y = bc.y;
|
||||
boolean done = false;
|
||||
|
||||
Reference in new issue
Block a user