minster586/OpenInv
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 36 Wiki Activity

Correct double chest logic for Silent/AnyContainer in 1.13

Browse Source
This commit is contained in:
Jikoo
2018-08-09 18:50:24 -04:00
parent 27812c133d
commit 59a8ed70bb
1 changed files with 23 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
internal/v1_13_R1/src/main/java/com/lishid/openinv/internal/v1_13_R1/AnySilentContainer.java
View File

@@ -21,6 +21,7 @@ import java.lang.reflect.Field;
import com.lishid.openinv.internal.IAnySilentContainer; import com.lishid.openinv.internal.IAnySilentContainer;
import net.minecraft.server.v1_13_R1.BlockChestTrapped; import net.minecraft.server.v1_13_R1.BlockChestTrapped;
import net.minecraft.server.v1_13_R1.BlockPropertyChestType;
import net.minecraft.server.v1_13_R1.ChatMessage; import net.minecraft.server.v1_13_R1.ChatMessage;
import net.minecraft.server.v1_13_R1.VoxelShapes; import net.minecraft.server.v1_13_R1.VoxelShapes;
import org.bukkit.Material; import org.bukkit.Material;
@@ -193,31 +194,34 @@ public class AnySilentContainer implements IAnySilentContainer {
} }
ITileInventory tileInventory = (ITileInventory) tile; ITileInventory tileInventory = (ITileInventory) tile;
Block block = world.getType(blockPosition).getBlock(); IBlockData blockData = world.getType(blockPosition);
Block block = blockData.getBlock();
if (block instanceof BlockChest) { if (block instanceof BlockChest) {
for (EnumDirection localEnumDirection : EnumDirection.EnumDirectionLimit.HORIZONTAL) {
BlockPosition localBlockPosition = blockPosition.shift(localEnumDirection);
Block localBlock = world.getType(localBlockPosition).getBlock();
if (localBlock != block) { BlockPropertyChestType chestType = blockData.get(BlockChest.b);
continue;
}
TileEntity localTileEntity = world.getTileEntity(localBlockPosition); if (chestType != BlockPropertyChestType.SINGLE) {
if (!(localTileEntity instanceof TileEntityChest)) {
continue;
}
if (localEnumDirection == EnumDirection.WEST BlockPosition adjacentBlockPosition = blockPosition.shift(BlockChest.k(blockData));
|| localEnumDirection == EnumDirection.NORTH) { IBlockData adjacentBlockData = world.getType(adjacentBlockPosition);
tileInventory = new InventoryLargeChest(new ChatMessage("container.chestDouble"),
(TileEntityChest) localTileEntity, tileInventory); if (adjacentBlockData.getBlock() == block) {
} else {
tileInventory = new InventoryLargeChest(new ChatMessage("container.chestDouble"), BlockPropertyChestType adjacentChestType = adjacentBlockData.get(BlockChest.b);
tileInventory, (TileEntityChest) localTileEntity);
if (adjacentChestType != BlockPropertyChestType.SINGLE && chestType != adjacentChestType
&& adjacentBlockData.get(BlockChest.FACING) == blockData.get(BlockChest.FACING)) {
TileEntity adjacentTile = world.getTileEntity(adjacentBlockPosition);
if (adjacentTile instanceof TileEntityChest) {
ITileInventory rightChest = chestType == BlockPropertyChestType.RIGHT ? tileInventory : (ITileInventory) adjacentTile;
ITileInventory leftChest = chestType == BlockPropertyChestType.RIGHT ? (ITileInventory) adjacentTile : tileInventory;
tileInventory = new InventoryLargeChest(new ChatMessage("container.chestDouble"), rightChest, leftChest);
}
}
} }
break;
} }
if (block instanceof BlockChestTrapped) { if (block instanceof BlockChestTrapped) {