diff --git a/src/main/java/crazypants/enderio/farm/BlockFarmStation.java b/src/main/java/crazypants/enderio/farm/BlockFarmStation.java index 8a86df2b..8c625b18 100644 --- a/src/main/java/crazypants/enderio/farm/BlockFarmStation.java +++ b/src/main/java/crazypants/enderio/farm/BlockFarmStation.java @@ -6,6 +6,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; import net.minecraft.world.World; +import crazypants.enderio.EnderIO; import crazypants.enderio.GuiHandler; import crazypants.enderio.ModObject; import crazypants.enderio.machine.AbstractMachineBlock; @@ -13,6 +14,7 @@ import crazypants.enderio.machine.AbstractMachineBlock; public class BlockFarmStation extends AbstractMachineBlock { public static BlockFarmStation create() { + EnderIO.packetPipeline.registerPacket(FarmActionPacket.class); BlockFarmStation result = new BlockFarmStation(); result.init(); return result; diff --git a/src/main/java/crazypants/enderio/farm/FarmActionPacket.java b/src/main/java/crazypants/enderio/farm/FarmActionPacket.java new file mode 100644 index 00000000..690ac03f --- /dev/null +++ b/src/main/java/crazypants/enderio/farm/FarmActionPacket.java @@ -0,0 +1,66 @@ +package crazypants.enderio.farm; + +import io.netty.buffer.ByteBuf; +import io.netty.channel.ChannelHandlerContext; + +import java.util.ArrayList; +import java.util.List; +import java.util.Random; + +import net.minecraft.entity.player.EntityPlayer; +import crazypants.enderio.network.IPacketEio; +import crazypants.util.BlockCoord; + +public class FarmActionPacket implements IPacketEio { + + private static Random rand = new Random(); + + private List coords; + + public FarmActionPacket() { + } + + public FarmActionPacket(List coords) { + this.coords = coords; + } + + @Override + public void encode(ChannelHandlerContext ctx, ByteBuf buffer) { + int size = coords.size(); + buffer.writeInt(size); + for (BlockCoord coord : coords) { + buffer.writeInt(coord.x); + buffer.writeInt(coord.y); + buffer.writeInt(coord.z); + } + + } + + @Override + public void decode(ChannelHandlerContext ctx, ByteBuf buffer) { + int size = buffer.readInt(); + coords = new ArrayList(size); + for (int i = 0; i < size; i++) { + coords.add(new BlockCoord(buffer.readInt(), buffer.readInt(), buffer.readInt())); + } + } + + @Override + public void handleClientSide(EntityPlayer player) { + for (BlockCoord bc : coords) { + for (int i = 0; i < 15; i++) { + double xOff = 0.5 + (rand.nextDouble() - 0.5); + double yOff = -0.5 + (rand.nextDouble() - 0.5) * 0.2; + double zOff = 0.5 + (rand.nextDouble() - 0.5); + player.worldObj.spawnParticle("portal", bc.x + xOff, bc.y + yOff, bc.z + zOff, 0, 0, 0); + } + } + + System.out.println("FarmActionPacket.handleClientSide: !!!!!!!!!!!!!!!"); + } + + @Override + public void handleServerSide(EntityPlayer player) { + } + +} diff --git a/src/main/java/crazypants/enderio/farm/TileFarmStation.java b/src/main/java/crazypants/enderio/farm/TileFarmStation.java index 6289bd77..aed71134 100644 --- a/src/main/java/crazypants/enderio/farm/TileFarmStation.java +++ b/src/main/java/crazypants/enderio/farm/TileFarmStation.java @@ -21,6 +21,7 @@ import net.minecraft.util.AxisAlignedBB; import net.minecraftforge.common.util.FakePlayer; import net.minecraftforge.common.util.FakePlayerFactory; import net.minecraftforge.common.util.ForgeDirection; +import cpw.mods.fml.common.network.NetworkRegistry.TargetPoint; import crazypants.enderio.EnderIO; import crazypants.enderio.ModObject; import crazypants.enderio.machine.AbstractPoweredTaskEntity; @@ -37,7 +38,7 @@ public class TileFarmStation extends AbstractPoweredTaskEntity implements IEntit private static final float ENERGY_PER_TICK = 1; - private crazypants.util.BlockCoord lastScanned; + private BlockCoord lastScanned; private FakePlayer farmerJoe; private int farmSize = 3; @@ -98,8 +99,6 @@ public class TileFarmStation extends AbstractPoweredTaskEntity implements IEntit } } - - public EntityPlayer getFakePlayer() { return farmerJoe; } @@ -160,9 +159,9 @@ public class TileFarmStation extends AbstractPoweredTaskEntity implements IEntit if(!redstoneCheckPassed || !hasPower()) { return false; } - if(worldObj.getWorldTime() % 4 != 0) { - return false; - } +// if(worldObj.getWorldTime() % 4 != 0) { +// return false; +// } BlockCoord bc = getNextCoord(); if(bc == null) { @@ -181,10 +180,14 @@ public class TileFarmStation extends AbstractPoweredTaskEntity implements IEntit FarmersComune.instance.prepareBlock(this, bc, block, meta); IHarvestResult harvest = FarmersComune.instance.harvestBlock(this, bc, block, meta); - if(harvest != null && harvest.getDrops() != null) { - for (EntityItem ei : harvest.getDrops()) { - if(ei != null) { - worldObj.spawnEntityInWorld(ei); + if(harvest != null) { + if(harvest.getDrops() != null) { + FarmActionPacket pkt = new FarmActionPacket(harvest.getHarvestedBlocks()); + EnderIO.packetPipeline.sendToAllAround(pkt, new TargetPoint(worldObj.provider.dimensionId, bc.x, bc.y, bc.z, 64)); + for (EntityItem ei : harvest.getDrops()) { + if(ei != null) { + worldObj.spawnEntityInWorld(ei); + } } } } @@ -432,6 +435,4 @@ public class TileFarmStation extends AbstractPoweredTaskEntity implements IEntit } } - - } diff --git a/src/main/java/crazypants/enderio/farm/TreeFarmer.java b/src/main/java/crazypants/enderio/farm/TreeFarmer.java index 37f4ed65..107c3e4f 100644 --- a/src/main/java/crazypants/enderio/farm/TreeFarmer.java +++ b/src/main/java/crazypants/enderio/farm/TreeFarmer.java @@ -80,7 +80,7 @@ public class TreeFarmer implements IFarmerJoe { } protected void harvestUp(TileFarmStation farm, BlockCoord bc, HarvestResult res) { - boolean foundWoodAtLevel = false; + if(wood == farm.getBlock(bc) && farm.hasAxe()) { res.harvestedBlocks.add(bc); ArrayList drops = wood.getDrops(farm.getWorld(), bc.x, bc.y, bc.z, farm.getBlockMeta(bc), farm.geAxeLootingValue()); @@ -92,23 +92,32 @@ public class TreeFarmer implements IFarmerJoe { } farm.damageAxe(); farm.getWorld().setBlockToAir(bc.x, bc.y, bc.z); - foundWoodAtLevel = true; - } else { - //for new trees, check the sides - for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { - if(dir.offsetY == 0) { - foundWoodAtLevel |= wood == farm.getBlock(bc.getLocation(dir)); - } - } - } - if(foundWoodAtLevel) { for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { if(dir != ForgeDirection.DOWN) { harvestUp(farm, bc.getLocation(dir), res); } } + + + } else { + //for new trees, check the sides + for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { + if(dir.offsetY == 0) { + if(wood == farm.getBlock(bc.getLocation(dir))) { + harvestUp(farm, bc.getLocation(dir), res); + } + } + } } +// +// if(foundWoodAtLevel) { +// for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { +// if(dir != ForgeDirection.DOWN) { +// harvestUp(farm, bc.getLocation(dir), res); +// } +// } +// } } diff --git a/src/main/java/crazypants/enderio/network/IPacketEio.java b/src/main/java/crazypants/enderio/network/IPacketEio.java index d7309c9c..600c9f27 100644 --- a/src/main/java/crazypants/enderio/network/IPacketEio.java +++ b/src/main/java/crazypants/enderio/network/IPacketEio.java @@ -5,7 +5,7 @@ import io.netty.channel.ChannelHandlerContext; import net.minecraft.entity.player.EntityPlayer; /** - * Created by brad on 27/02/14. + * */ public interface IPacketEio {