From 7dce1776e7e529bab436a3831931245d84034390 Mon Sep 17 00:00:00 2001
From: Brokkonaut <hannos17@gmx.de>
Date: Mon, 18 Feb 2019 21:15:42 +0100
Subject: [PATCH] Log pumpkin carving

Fixes #743
---
 .../java/de/diddiz/LogBlock/LogBlock.java     |  3 +-
 .../LogBlock/listeners/InteractLogging.java   | 28 ++++++++++++++++++-
 2 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/src/main/java/de/diddiz/LogBlock/LogBlock.java b/src/main/java/de/diddiz/LogBlock/LogBlock.java
index 34493e9..5f6afb6 100644
--- a/src/main/java/de/diddiz/LogBlock/LogBlock.java
+++ b/src/main/java/de/diddiz/LogBlock/LogBlock.java
@@ -161,7 +161,8 @@ public class LogBlock extends JavaPlugin {
         if (isLogging(Logging.CHESTACCESS)) {
             pm.registerEvents(new ChestAccessLogging(this), this);
         }
-        if (isLogging(Logging.SWITCHINTERACT) || isLogging(Logging.DOORINTERACT) || isLogging(Logging.CAKEEAT) || isLogging(Logging.DIODEINTERACT) || isLogging(Logging.COMPARATORINTERACT) || isLogging(Logging.NOTEBLOCKINTERACT) || isLogging(Logging.PRESUREPLATEINTERACT) || isLogging(Logging.TRIPWIREINTERACT) || isLogging(Logging.CROPTRAMPLE)) {
+        if (isLogging(Logging.BLOCKBREAK) || isLogging(Logging.BLOCKPLACE) || isLogging(Logging.SWITCHINTERACT) || isLogging(Logging.DOORINTERACT) || isLogging(Logging.CAKEEAT) || isLogging(Logging.DIODEINTERACT) || isLogging(Logging.COMPARATORINTERACT) || isLogging(Logging.NOTEBLOCKINTERACT)
+                || isLogging(Logging.PRESUREPLATEINTERACT) || isLogging(Logging.TRIPWIREINTERACT) || isLogging(Logging.CROPTRAMPLE)) {
             pm.registerEvents(new InteractLogging(this), this);
         }
         if (isLogging(Logging.CREATURECROPTRAMPLE)) {
diff --git a/src/main/java/de/diddiz/LogBlock/listeners/InteractLogging.java b/src/main/java/de/diddiz/LogBlock/listeners/InteractLogging.java
index 8de3a23..a93569b 100644
--- a/src/main/java/de/diddiz/LogBlock/listeners/InteractLogging.java
+++ b/src/main/java/de/diddiz/LogBlock/listeners/InteractLogging.java
@@ -12,6 +12,7 @@ import org.bukkit.Note.Tone;
 import org.bukkit.block.Block;
 import org.bukkit.block.BlockFace;
 import org.bukkit.block.data.BlockData;
+import org.bukkit.block.data.Directional;
 import org.bukkit.block.data.Openable;
 import org.bukkit.block.data.type.Cake;
 import org.bukkit.block.data.type.Comparator;
@@ -27,6 +28,7 @@ import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.block.Action;
 import org.bukkit.event.player.PlayerInteractEvent;
+import org.bukkit.inventory.ItemStack;
 
 import static de.diddiz.LogBlock.config.Config.getWorldConfig;
 
@@ -140,7 +142,7 @@ public class InteractLogging extends LoggingListener {
                     }
                     break;
                 case TURTLE_EGG:
-                    if (event.getAction() == Action.PHYSICAL) {
+                    if (wcfg.isLogging(Logging.BLOCKBREAK) && event.getAction() == Action.PHYSICAL) {
                         TurtleEgg turtleEggData = (TurtleEgg) blockData;
                         int eggs = turtleEggData.getEggs();
                         if (eggs > 1) {
@@ -152,6 +154,30 @@ public class InteractLogging extends LoggingListener {
                         }
                     }
                     break;
+                case PUMPKIN:
+                    if ((wcfg.isLogging(Logging.BLOCKBREAK) || wcfg.isLogging(Logging.BLOCKPLACE)) && event.getAction() == Action.RIGHT_CLICK_BLOCK) {
+                        ItemStack inHand = event.getItem();
+                        if (inHand.getType() == Material.SHEARS) {
+                            BlockFace clickedFace = event.getBlockFace();
+                            Directional newBlockData = (Directional) Material.CARVED_PUMPKIN.createBlockData();
+                            if (clickedFace == BlockFace.NORTH || clickedFace == BlockFace.SOUTH || clickedFace == BlockFace.EAST || clickedFace == BlockFace.WEST) {
+                                newBlockData.setFacing(clickedFace);
+                            } else {
+                                // use player distance to calculate the facing
+                                Location playerLoc = player.getLocation();
+                                playerLoc.subtract(0.5, 0, 0.5);
+                                double dx = playerLoc.getX() - loc.getX();
+                                double dz = playerLoc.getZ() - loc.getZ();
+                                if (Math.abs(dx) > Math.abs(dz)) {
+                                    newBlockData.setFacing(dx > 0 ? BlockFace.EAST : BlockFace.WEST);
+                                } else {
+                                    newBlockData.setFacing(dz > 0 ? BlockFace.SOUTH : BlockFace.NORTH);
+                                }
+                            }
+                            consumer.queueBlock(Actor.actorFromEntity(player), loc, blockData, newBlockData);
+                        }
+                    }
+                    break;
                 default:
                     if (BukkitUtils.isButton(type) || type == Material.LEVER) {
                         if (wcfg.isLogging(Logging.SWITCHINTERACT) && event.getAction() == Action.RIGHT_CLICK_BLOCK) {