Upstream/FabledSkyBlock
1
0
Fork 0
mirror of https://github.com/songoda/FabledSkyBlock.git synced 2024-09-28 22:47:26 +02:00
Code Issues Projects Releases Wiki Activity

Fixed Barrels not being counted in structures file

Browse Source
This commit is contained in:
Fabrizio La Rosa 2020-06-24 20:29:58 +02:00
parent 62f05196c7
commit 7d3a2b95a8
2 changed files with 39 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/songoda/skyblock/utils/world/block/BlockStateType.java
View File

@ -3,6 +3,6 @@ package com.songoda.skyblock.utils.world.block;
public enum BlockStateType {
NORMAL, BANNER, BEACON, BREWINGSTAND, COMMANDBLOCK, CHEST, DISPENSER, DROPPER, HOPPER, SHULKERBOX, CREATURESPAWNER,
ENDGATEWAY, FURNACE, JUKEBOX, SIGN, SKULL, DOUBLECHEST
ENDGATEWAY, FURNACE, JUKEBOX, SIGN, SKULL, DOUBLECHEST, BARREL
}

50
src/main/java/com/songoda/skyblock/utils/world/block/BlockUtil.java
View File

@ -172,7 +172,7 @@ public final class BlockUtil extends BlockUtils {
blockData.setRotateFace(skull.getRotation().toString());
blockData.setStateType(BlockStateType.SKULL.toString());
} else {
if (NMSVersion > 8) {
if (ServerVersion.isServerVersionAtLeast(ServerVersion.V1_9)) {
if (blockState instanceof EndGateway) {
EndGateway endGateway = (EndGateway) blockState;
blockData.setExactTeleport(endGateway.isExactTeleport());
@ -182,7 +182,7 @@ public final class BlockUtil extends BlockUtils {
blockData.setStateType(BlockStateType.ENDGATEWAY.toString());
}
if (NMSVersion > 10) {
if (ServerVersion.isServerVersionAtLeast(ServerVersion.V1_11)) {
if (blockState instanceof ShulkerBox) {
ShulkerBox shulkerBox = (ShulkerBox) blockState;
@ -197,6 +197,22 @@ public final class BlockUtil extends BlockUtils {
blockData.setStateType(BlockStateType.SHULKERBOX.toString());
}
}
if(ServerVersion.isServerVersionAtLeast(ServerVersion.V1_14)){
if (blockState instanceof Barrel) {
Barrel barrel = (Barrel) blockState;
for (int i = 0; i < barrel.getInventory().getSize(); i++) {
ItemStack is = barrel.getInventory().getItem(i);
if (is != null && is.getType() != CompatibleMaterial.AIR.getMaterial()) {
blockData.addItem(i, ItemStackUtil.serializeItemStack(is));
}
}
blockData.setStateType(BlockStateType.BARREL.toString());
}
}
}
}
@ -204,7 +220,7 @@ public final class BlockUtil extends BlockUtils {
blockData.setFacing(((Stairs) materialData).getFacing().toString());
blockData.setDataType(BlockDataType.STAIRS.toString());
} else if (materialData instanceof org.bukkit.material.FlowerPot) {
if (NMSVersion >= 8 && NMSVersion <= 12) {
if (ServerVersion.isServerVersionAtOrBelow(ServerVersion.V1_12)) {
try {
World world = block.getWorld();
@ -256,7 +272,7 @@ public final class BlockUtil extends BlockUtils {
Material material = Material.valueOf(materialStr);
if (material == Material.AIR) return;
if (ServerVersion.isServerVersionBelow(ServerVersion.V1_13))
if (ServerVersion.isServerVersionAtOrBelow(ServerVersion.V1_12))
setBlockFast(block.getWorld(), block.getX(), block.getY(), block.getZ(), material, blockData.getData());
else
block.setBlockData(Bukkit.getServer().createBlockData(blockData.getBlockData()));
@ -376,14 +392,14 @@ public final class BlockUtil extends BlockUtils {
skull.setRotation(BlockFace.valueOf(blockData.getRotateFace().toUpperCase()));
skull.setSkullType(SkullType.valueOf(blockData.getSkullType().toUpperCase()));
if (NMSVersion > 9) {
if (ServerVersion.isServerVersionAtLeast(ServerVersion.V1_10)) {
skull.setOwningPlayer(Bukkit.getServer().getOfflinePlayer(blockData.getSkullOwner()));
} else {
skull.setOwner(blockData.getSkullOwner());
}
state.update();
} else {
if (NMSVersion > 8) {
if (ServerVersion.isServerVersionAtLeast(ServerVersion.V1_9)) {
if (blockTypeState == BlockStateType.ENDGATEWAY) {
EndGateway endGateway = (EndGateway) state;
endGateway.setExactTeleport(blockData.isExactTeleport());
@ -399,15 +415,25 @@ public final class BlockUtil extends BlockUtils {
state.update();
}
if (NMSVersion > 9) {
if (NMSVersion > 10) {
if (blockTypeState == BlockStateType.SHULKERBOX) {
ShulkerBox shulkerBox = (ShulkerBox) state;
if (ServerVersion.isServerVersionAtLeast(ServerVersion.V1_11)) {
if (blockTypeState == BlockStateType.SHULKERBOX) {
ShulkerBox shulkerBox = (ShulkerBox) state;
for (Integer slotList : blockData.getInventory().keySet()) {
if (slotList < shulkerBox.getInventory().getSize()) {
ItemStack is = ItemStackUtil.deserializeItemStack(blockData.getInventory().get(slotList));
shulkerBox.getInventory().setItem(slotList, is);
}
}
}
if(ServerVersion.isServerVersionAtLeast(ServerVersion.V1_14)){
if (blockTypeState == BlockStateType.BARREL) {
Barrel barrel = (Barrel) state;
for (Integer slotList : blockData.getInventory().keySet()) {
if (slotList < shulkerBox.getInventory().getSize()) {
if (slotList < barrel.getInventory().getSize()) {
ItemStack is = ItemStackUtil.deserializeItemStack(blockData.getInventory().get(slotList));
shulkerBox.getInventory().setItem(slotList, is);
barrel.getInventory().setItem(slotList, is);
}
}
}