mirror of
https://github.com/ChestShop-authors/ChestShop-3.git
synced 2024-09-29 15:07:40 +02:00
Refractoring
This commit is contained in:
parent
b1ca575404
commit
61555db8f1
@ -3,6 +3,9 @@ package com.Acrobot.Breeze.Utils;
|
|||||||
import org.bukkit.Material;
|
import org.bukkit.Material;
|
||||||
import org.bukkit.block.Block;
|
import org.bukkit.block.Block;
|
||||||
import org.bukkit.block.Sign;
|
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;
|
import org.bukkit.material.Attachable;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -38,4 +41,22 @@ public class BlockUtil {
|
|||||||
public static Block getAttachedFace(Sign sign) {
|
public static Block getAttachedFace(Sign sign) {
|
||||||
return sign.getBlock().getRelative(((Attachable) sign.getData()).getAttachedFace());
|
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;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
@ -41,6 +41,70 @@ import static org.bukkit.event.block.Action.RIGHT_CLICK_BLOCK;
|
|||||||
* @author Acrobot
|
* @author Acrobot
|
||||||
*/
|
*/
|
||||||
public class PlayerInteract implements Listener {
|
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)
|
@EventHandler(priority = EventPriority.HIGHEST)
|
||||||
public static void onPlayerInteract(PlayerInteractEvent event) {
|
public static void onPlayerInteract(PlayerInteractEvent event) {
|
||||||
Block clickedBlock = event.getClickedBlock();
|
Block clickedBlock = event.getClickedBlock();
|
||||||
@ -147,23 +211,18 @@ public class PlayerInteract implements Listener {
|
|||||||
return Permission.has(player, Permission.ADMIN) || Permission.has(player, Permission.MOD);
|
return Permission.has(player, Permission.ADMIN) || Permission.has(player, Permission.MOD);
|
||||||
}
|
}
|
||||||
|
|
||||||
private static void showChestGUI(Player player, Block block) {
|
private static void showChestGUI(Player player, Block signBlock) {
|
||||||
Chest chest = uBlock.findConnectedChest(block);
|
Chest chest = uBlock.findConnectedChest(signBlock);
|
||||||
|
|
||||||
if (chest == null) {
|
if (chest == null) {
|
||||||
player.sendMessage(Messages.prefix(Messages.NO_CHEST_DETECTED));
|
player.sendMessage(Messages.prefix(Messages.NO_CHEST_DETECTED));
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!canOpenOtherShops(player) && !Security.canAccess(player, block)) {
|
if (!canOpenOtherShops(player) && !Security.canAccess(player, signBlock)) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (chest.getBlock().getType() != Material.CHEST) {
|
BlockUtil.openBlockGUI(chest.getBlock(), player);
|
||||||
return; //To prevent people from breaking the chest and instantly clicking the sign
|
|
||||||
}
|
|
||||||
|
|
||||||
Inventory chestInv = chest.getInventory();
|
|
||||||
player.openInventory(chestInv);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user