From 61555db8f16203afeaa24a92883a2cdad6b3d018 Mon Sep 17 00:00:00 2001
From: Acrobot <andrzejp@dysleksja.pl>
Date: Wed, 26 Dec 2012 21:42:22 +0100
Subject: [PATCH] Refractoring

---
 com/Acrobot/Breeze/Utils/BlockUtil.java       | 21 +++++
 .../Listeners/Player/PlayerInteract.java      | 77 ++++++++++++++++---
 2 files changed, 89 insertions(+), 9 deletions(-)

diff --git a/com/Acrobot/Breeze/Utils/BlockUtil.java b/com/Acrobot/Breeze/Utils/BlockUtil.java
index 5c36101..07f3008 100644
--- a/com/Acrobot/Breeze/Utils/BlockUtil.java
+++ b/com/Acrobot/Breeze/Utils/BlockUtil.java
@@ -3,6 +3,9 @@ package com.Acrobot.Breeze.Utils;
 import org.bukkit.Material;
 import org.bukkit.block.Block;
 import org.bukkit.block.Sign;
+import org.bukkit.entity.Player;
+import org.bukkit.inventory.Inventory;
+import org.bukkit.inventory.InventoryHolder;
 import org.bukkit.material.Attachable;
 
 /**
@@ -38,4 +41,22 @@ public class BlockUtil {
     public static Block getAttachedFace(Sign sign) {
         return sign.getBlock().getRelative(((Attachable) sign.getData()).getAttachedFace());
     }
+
+    /**
+     * Opens the block's inventory's GUI
+     *
+     * @param block  Block
+     * @param player Player on whose screen the GUI is going to be shown
+     * @return Was the opening successful?
+     */
+    public static boolean openBlockGUI(Block block, Player player) {
+        if (!(block instanceof InventoryHolder)) {
+            return false;
+        }
+
+        Inventory inventory = ((InventoryHolder) block).getInventory();
+        player.openInventory(inventory);
+
+        return true;
+    }
 }
diff --git a/com/Acrobot/ChestShop/Listeners/Player/PlayerInteract.java b/com/Acrobot/ChestShop/Listeners/Player/PlayerInteract.java
index 05786dd..d45a71e 100644
--- a/com/Acrobot/ChestShop/Listeners/Player/PlayerInteract.java
+++ b/com/Acrobot/ChestShop/Listeners/Player/PlayerInteract.java
@@ -41,6 +41,70 @@ import static org.bukkit.event.block.Action.RIGHT_CLICK_BLOCK;
  * @author Acrobot
  */
 public class PlayerInteract implements Listener {
+
+    /*@EventHandler(priority = EventPriority.HIGHEST)
+    public static void onInteract(PlayerInteractEvent event) {
+        Block block = event.getClickedBlock();
+
+        if (block == null) {
+            return;
+        }
+
+        Action action = event.getAction();
+        Player player = event.getPlayer();
+
+        if (isChest(block) && Properties.USE_BUILT_IN_PROTECTION) {
+            if (Properties.TURN_OFF_DEFAULT_PROTECTION_WHEN_PROTECTED_EXTERNALLY) {
+                return;
+            }
+
+            if (!canOpenOtherShops(player) && !ChestShop.canAccess(player, block)) {
+                player.sendMessage(Messages.prefix(Messages.ACCESS_DENIED));
+                event.setCancelled(true);
+            }
+
+            return;
+        }
+
+        if (!isSign(block) || player.getItemInHand().getType() == Material.SIGN) { // Blocking accidental sign edition
+            return;
+        }
+
+        Sign sign = (Sign) block.getState();
+
+        if (!ChestShopSign.isValid(sign)) {
+            return;
+        }
+
+        if (ChestShopSign.canAccess(player, sign)) {
+            if (!Properties.ALLOW_SIGN_CHEST_OPEN || player.isSneaking()) {
+                return;
+            }
+
+            if (!Properties.ALLOW_LEFT_CLICK_DESTROYING || action != LEFT_CLICK_BLOCK) {
+                event.setCancelled(true);
+                showChestGUI(player, block);
+            }
+
+            return;
+        }
+
+        if (action == RIGHT_CLICK_BLOCK) {
+            event.setCancelled(true);
+        }
+
+        PreTransactionEvent pEvent = preparePreTransactionEvent(sign, player, action);
+        Bukkit.getPluginManager().callEvent(pEvent);
+
+        if (pEvent.isCancelled()) {
+            return;
+        }
+
+        TransactionEvent tEvent = new TransactionEvent(pEvent, sign);
+        Bukkit.getPluginManager().callEvent(tEvent);
+    }*/
+
+
     @EventHandler(priority = EventPriority.HIGHEST)
     public static void onPlayerInteract(PlayerInteractEvent event) {
         Block clickedBlock = event.getClickedBlock();
@@ -147,23 +211,18 @@ public class PlayerInteract implements Listener {
         return Permission.has(player, Permission.ADMIN) || Permission.has(player, Permission.MOD);
     }
 
-    private static void showChestGUI(Player player, Block block) {
-        Chest chest = uBlock.findConnectedChest(block);
+    private static void showChestGUI(Player player, Block signBlock) {
+        Chest chest = uBlock.findConnectedChest(signBlock);
 
         if (chest == null) {
             player.sendMessage(Messages.prefix(Messages.NO_CHEST_DETECTED));
             return;
         }
 
-        if (!canOpenOtherShops(player) && !Security.canAccess(player, block)) {
+        if (!canOpenOtherShops(player) && !Security.canAccess(player, signBlock)) {
             return;
         }
 
-        if (chest.getBlock().getType() != Material.CHEST) {
-            return; //To prevent people from breaking the chest and instantly clicking the sign
-        }
-
-        Inventory chestInv = chest.getInventory();
-        player.openInventory(chestInv);
+        BlockUtil.openBlockGUI(chest.getBlock(), player);
     }
 }