Upstream
/
ChestShop-3
mirror of https://github.com/ChestShop-authors/ChestShop-3.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

1.13 allows single chests besides each other. Handle that correctly.

This commit is contained in:
Brokkonaut 2018-08-29 20:57:48 +01:00 committed by Phoenix616
parent b972e79132
commit f5b3aa6b75
2 changed files with 41 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/com/Acrobot/Breeze/Utils/BlockUtil.java
View File

@ -3,7 +3,6 @@ package com.Acrobot.Breeze.Utils;
import org.bukkit.Material;
import org.bukkit.block.Block;
import org.bukkit.block.BlockFace;
import org.bukkit.block.Chest;
import org.bukkit.block.DoubleChest;
import org.bukkit.block.data.BlockData;
import org.bukkit.block.data.Directional;
@ -36,7 +35,7 @@ public class BlockUtil {
* @return Is this block a chest?
*/
public static boolean isChest(Block block) {
return block.getState() instanceof Chest;
return block.getBlockData() instanceof org.bukkit.block.data.type.Chest;
}
/**
@ -46,7 +45,7 @@ public class BlockUtil {
* @return Is this holder a chest?
*/
public static boolean isChest(InventoryHolder holder) {
return holder instanceof Chest || holder instanceof DoubleChest;
return holder instanceof org.bukkit.block.Chest || holder instanceof DoubleChest;
}
/**

53
src/main/java/com/Acrobot/ChestShop/Utils/uBlock.java
View File

@ -4,8 +4,9 @@ import com.Acrobot.Breeze.Utils.BlockUtil;
import com.Acrobot.ChestShop.Signs.ChestShopSign;
import org.bukkit.block.Block;
import org.bukkit.block.BlockFace;
import org.bukkit.block.Chest;
import org.bukkit.block.Sign;
import org.bukkit.block.data.BlockData;
import org.bukkit.block.data.type.Chest;
import org.bukkit.material.Attachable;
/**
@ -17,7 +18,7 @@ public class uBlock {
@Deprecated
public static final BlockFace[] NEIGHBOR_FACES = {BlockFace.EAST, BlockFace.NORTH, BlockFace.WEST, BlockFace.SOUTH};
public static Sign getConnectedSign(Chest chest) {
public static Sign getConnectedSign(org.bukkit.block.Chest chest) {
Sign sign = uBlock.findAnyNearbyShopSign(chest.getBlock());
if (sign == null) {
@ -43,7 +44,7 @@ public class uBlock {
return sign;
}
public static Chest findConnectedChest(Sign sign) {
public static org.bukkit.block.Chest findConnectedChest(Sign sign) {
BlockFace signFace = null;
if (((org.bukkit.material.Sign) sign.getData()).isWallSign()) {
signFace = ((Attachable) sign.getData()).getAttachedFace();
@ -51,7 +52,7 @@ public class uBlock {
return findConnectedChest(sign.getBlock(), signFace);
}
public static Chest findConnectedChest(Block block) {
public static org.bukkit.block.Chest findConnectedChest(Block block) {
BlockFace signFace = null;
if (BlockUtil.isSign(block)) {
Sign sign = (Sign) block.getState();
@ -62,11 +63,11 @@ public class uBlock {
return findConnectedChest(block, signFace);
}
private static Chest findConnectedChest(Block block, BlockFace signFace) {
private static org.bukkit.block.Chest findConnectedChest(Block block, BlockFace signFace) {
if (signFace != null) {
Block faceBlock = block.getRelative(signFace);
if (BlockUtil.isChest(faceBlock)) {
return (Chest) faceBlock.getState();
return (org.bukkit.block.Chest) faceBlock.getState();
}
}
@ -74,7 +75,7 @@ public class uBlock {
if (bf != signFace) {
Block faceBlock = block.getRelative(bf);
if (BlockUtil.isChest(faceBlock)) {
return (Chest) faceBlock.getState();
return (org.bukkit.block.Chest) faceBlock.getState();
}
}
}
@ -122,18 +123,42 @@ public class uBlock {
return null;
}
public static Chest findNeighbor(Chest chest) {
public static org.bukkit.block.Chest findNeighbor(org.bukkit.block.Chest chest) {
Block neighbor = findNeighbor(chest.getBlock());
return neighbor != null ? (Chest) neighbor.getState() : null;
return neighbor != null ? (org.bukkit.block.Chest) neighbor.getState() : null;
}
public static Block findNeighbor(Block block) {
for (BlockFace blockFace : CHEST_EXTENSION_FACES) {
Block neighborBlock = block.getRelative(blockFace);
BlockData blockData = block.getBlockData();
if (!(blockData instanceof Chest)) {
return null;
}
if (neighborBlock.getType() == block.getType()) {
return neighborBlock;
}
Chest chestData = (Chest) blockData;
if (chestData.getType() == Chest.Type.SINGLE) {
return null;
}
BlockFace chestFace = chestData.getFacing();
// we have to rotate is to get the adjacent chest
// west, right -> south
// west, left -> north
if (chestFace == BlockFace.WEST) {
chestFace = BlockFace.NORTH;
} else if (chestFace == BlockFace.NORTH) {
chestFace = BlockFace.EAST;
} else if (chestFace == BlockFace.EAST) {
chestFace = BlockFace.SOUTH;
} else if (chestFace == BlockFace.SOUTH) {
chestFace = BlockFace.WEST;
}
if (chestData.getType() == Chest.Type.RIGHT) {
chestFace = chestFace.getOppositeFace();
}
Block neighborBlock = block.getRelative(chestFace);
if (neighborBlock.getType() == block.getType()) {
return neighborBlock;
}
return null;