Treefelling fixes (#1402)

Author: serenibyss

src/main/java/gregtech/api/items/toolitem/TreeFellingListener.java

@@ -4,43 +4,28 @@
 import net.minecraft.block.Block;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.entity.player.EntityPlayerMP;
-import net.minecraft.init.Blocks;
 import net.minecraft.item.ItemStack;
-import net.minecraft.util.EnumFacing;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
 import net.minecraftforge.fml.common.gameevent.TickEvent;
+import net.minecraftforge.fml.relauncher.Side;
 
 import javax.annotation.Nonnull;
 import java.util.*;
-import java.util.function.Function;
 import java.util.stream.Collectors;
 
-import static gregtech.api.items.toolitem.ToolHelper.RELOCATE_MINED_BLOCKS_KEY;
-
 public final class TreeFellingListener {
 
     private final EntityPlayerMP player;
     private final ItemStack tool;
     private final Deque<BlockPos> orderedBlocks;
-    private final BlockPos samplePos;
-    private final int minY;
-
-    private int minX, maxX, minZ, maxZ;
-    private boolean purgeLeaves;
-    private Block targetLeaves;
-    private Iterator<BlockPos.MutableBlockPos> leavesToPurge;
 
     private TreeFellingListener(EntityPlayerMP player, ItemStack tool, Deque<BlockPos> orderedBlocks) {
         this.player = player;
         this.tool = tool;
         this.orderedBlocks = orderedBlocks;
-        this.samplePos = orderedBlocks.getFirst();
-        this.minY = orderedBlocks.getLast().getY();
-        this.minX = this.maxX = this.samplePos.getX();
-        this.minZ = this.maxZ = this.samplePos.getZ();
     }
 
     public static void start(@Nonnull IBlockState state, ItemStack tool, BlockPos start, @Nonnull EntityPlayerMP player) {
@@ -87,102 +72,12 @@ public static void start(@Nonnull IBlockState state, ItemStack tool, BlockPos st
 
     @SubscribeEvent
     public void onWorldTick(@Nonnull TickEvent.WorldTickEvent event) {
-        if (event.phase == TickEvent.Phase.START && event.world == player.world) {
-            if (purgeLeaves) {
-                if (targetLeaves == null) {
-                    targetLeaves = Arrays.stream(EnumFacing.VALUES)
-                            .map(facing -> player.world.getBlockState(this.samplePos).getBlock())
-                            // Cannot use fastutil map::new here as setValue throws UOE
-                            .collect(Collectors.groupingBy(Function.identity(), Collectors.counting()))
-                            .entrySet()
-                            .stream()
-                            .max(Map.Entry.comparingByValue())
-                            .map(Map.Entry::getKey)
-                            .orElse(Blocks.AIR);
-                    BlockPos.MutableBlockPos mutablePos = new BlockPos.MutableBlockPos(this.samplePos);
-                    int topY = mutablePos.getY();
-                    int tries = 2;
-                    while (tries > 0) {
-                        IBlockState state;
-                        do {
-                            topY = mutablePos.getY() + 1;
-                            mutablePos.setY(topY);
-                        } while (targetLeaves == Blocks.AIR ?
-                                (state = player.world.getBlockState(mutablePos)).getBlock().isLeaves(state, player.world, mutablePos) :
-                                player.world.getBlockState(mutablePos).getBlock() == targetLeaves);
-                        tries--;
-                    }
-                    int offsetMinX = 3;
-                    int offsetMaxX = 3;
-                    int offsetMinZ = 3;
-                    int offsetMaxZ = 3;
-                    for (BlockPos.MutableBlockPos check : BlockPos.getAllInBoxMutable(this.minX - offsetMinX, this.minY, this.minZ - offsetMinZ, this.maxX + offsetMaxX, this.minY, this.maxZ + offsetMaxZ)) {
-                        if (check.getX() == this.samplePos.getX() && check.getZ() == this.samplePos.getZ()) {
-                            continue;
-                        }
-                        if (player.world.getBlockState(check).getBlock().isWood(player.world, check)) {
-                            int diff = this.samplePos.getX() - check.getX();
-                            if (diff > 0 && diff < offsetMaxX) {
-                                offsetMaxX = diff;
-                            } else if (Math.abs(diff) < offsetMinX) {
-                                offsetMinX = Math.abs(diff);
-                            }
-                            diff = this.samplePos.getZ() - check.getZ();
-                            if (diff > 0 && diff < offsetMaxZ) {
-                                offsetMaxZ = diff;
-                            } else if (Math.abs(diff) < offsetMinZ) {
-                                offsetMinZ = Math.abs(diff);
-                            }
-                        }
-                    }
-                    leavesToPurge = BlockPos.getAllInBoxMutable(this.minX - offsetMinX, this.minY, this.minZ - offsetMinZ, this.maxX + offsetMaxX, topY, this.maxZ + offsetMaxZ).iterator();
-                    return;
-                }
-                while (leavesToPurge.hasNext()) {
-                    BlockPos.MutableBlockPos check = leavesToPurge.next();
-                    IBlockState state = player.world.getBlockState(check);
-                    if (targetLeaves == Blocks.AIR ? state.getBlock().isLeaves(state, player.world, check) : state.getBlock() == targetLeaves) {
-                        if(ToolHelper.getBehaviorsTag(tool).getBoolean(RELOCATE_MINED_BLOCKS_KEY)) {
-                            List<ItemStack> drops = state.getBlock().getDrops(player.world, check, state, ToolHelper.getFortuneOrLootingLevel(tool));
-                            for (ItemStack dropStack : drops) {
-                                if(!player.addItemStackToInventory(dropStack)) {
-                                    player.dropItem(dropStack, false, false);
-                                }
-                            }
-                        }
-                        else {
-                            state.getBlock().dropBlockAsItem(player.world, check, state, 0);
-                        }
-                        player.world.setBlockToAir(check);
-                    }
-                }
+        if (event.phase == TickEvent.Phase.START && event.world == player.world && event.side == Side.SERVER) {
+            if (orderedBlocks.isEmpty() || tool.isEmpty()) {
                 MinecraftForge.EVENT_BUS.unregister(this);
                 return;
             }
-            if (tool.isEmpty()) {
-                MinecraftForge.EVENT_BUS.unregister(this);
-                return;
-            }
-            if (!orderedBlocks.isEmpty()) {
-                BlockPos posToBreak = orderedBlocks.removeLast();
-                int x = posToBreak.getX();
-                if (x > this.maxX) {
-                    this.maxX = x;
-                } else if (x < this.minX) {
-                    this.minX = x;
-                }
-                int z = posToBreak.getZ();
-                if (z > this.maxZ) {
-                    this.maxZ = z;
-                } else if (z < this.minZ) {
-                    this.minZ = z;
-                }
-                if (!ToolHelper.breakBlockRoutine(player, tool, posToBreak)) {
-                    purgeLeaves = true;
-                }
-            } else {
-                purgeLeaves = true;
-            }
+            ToolHelper.breakBlockRoutine(player, tool, orderedBlocks.removeLast());
         }
     }
 }