2021-03-15 23:00:00 +01:00
|
|
|
--- a/net/minecraft/world/level/block/BlockChest.java
|
|
|
|
+++ b/net/minecraft/world/level/block/BlockChest.java
|
2022-06-07 18:00:00 +02:00
|
|
|
@@ -87,24 +87,7 @@
|
2021-11-21 23:00:00 +01:00
|
|
|
public Optional<ITileInventory> acceptDouble(final TileEntityChest tileentitychest, final TileEntityChest tileentitychest1) {
|
2019-04-25 05:57:18 +02:00
|
|
|
final InventoryLargeChest inventorylargechest = new InventoryLargeChest(tileentitychest, tileentitychest1);
|
|
|
|
|
2019-12-10 23:00:00 +01:00
|
|
|
- return Optional.of(new ITileInventory() {
|
2019-04-25 05:57:18 +02:00
|
|
|
- @Nullable
|
|
|
|
- @Override
|
|
|
|
- public Container createMenu(int i, PlayerInventory playerinventory, EntityHuman entityhuman) {
|
2021-11-21 23:00:00 +01:00
|
|
|
- if (tileentitychest.canOpen(entityhuman) && tileentitychest1.canOpen(entityhuman)) {
|
|
|
|
- tileentitychest.unpackLootTable(playerinventory.player);
|
|
|
|
- tileentitychest1.unpackLootTable(playerinventory.player);
|
|
|
|
- return ContainerChest.sixRows(i, playerinventory, inventorylargechest);
|
2019-04-25 05:57:18 +02:00
|
|
|
- } else {
|
|
|
|
- return null;
|
|
|
|
- }
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
- @Override
|
2021-11-21 23:00:00 +01:00
|
|
|
- public IChatBaseComponent getDisplayName() {
|
2022-06-07 18:00:00 +02:00
|
|
|
- return (IChatBaseComponent) (tileentitychest.hasCustomName() ? tileentitychest.getDisplayName() : (tileentitychest1.hasCustomName() ? tileentitychest1.getDisplayName() : IChatBaseComponent.translatable("container.chestDouble")));
|
2019-04-25 05:57:18 +02:00
|
|
|
- }
|
2019-12-10 23:00:00 +01:00
|
|
|
- });
|
|
|
|
+ return Optional.of(new DoubleInventory(tileentitychest, tileentitychest1, inventorylargechest)); // CraftBukkit
|
2019-04-25 05:57:18 +02:00
|
|
|
}
|
|
|
|
|
2021-11-21 23:00:00 +01:00
|
|
|
public Optional<ITileInventory> acceptSingle(TileEntityChest tileentitychest) {
|
2022-06-07 18:00:00 +02:00
|
|
|
@@ -117,6 +100,38 @@
|
2019-04-25 05:57:18 +02:00
|
|
|
}
|
|
|
|
};
|
|
|
|
|
|
|
|
+ // CraftBukkit start
|
|
|
|
+ public static class DoubleInventory implements ITileInventory {
|
|
|
|
+
|
|
|
|
+ private final TileEntityChest tileentitychest;
|
|
|
|
+ private final TileEntityChest tileentitychest1;
|
|
|
|
+ public final InventoryLargeChest inventorylargechest;
|
|
|
|
+
|
|
|
|
+ public DoubleInventory(TileEntityChest tileentitychest, TileEntityChest tileentitychest1, InventoryLargeChest inventorylargechest) {
|
|
|
|
+ this.tileentitychest = tileentitychest;
|
|
|
|
+ this.tileentitychest1 = tileentitychest1;
|
|
|
|
+ this.inventorylargechest = inventorylargechest;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ @Nullable
|
|
|
|
+ @Override
|
|
|
|
+ public Container createMenu(int i, PlayerInventory playerinventory, EntityHuman entityhuman) {
|
2021-11-21 23:00:00 +01:00
|
|
|
+ if (tileentitychest.canOpen(entityhuman) && tileentitychest1.canOpen(entityhuman)) {
|
|
|
|
+ tileentitychest.unpackLootTable(playerinventory.player);
|
|
|
|
+ tileentitychest1.unpackLootTable(playerinventory.player);
|
|
|
|
+ return ContainerChest.sixRows(i, playerinventory, inventorylargechest);
|
2019-04-25 05:57:18 +02:00
|
|
|
+ } else {
|
|
|
|
+ return null;
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ @Override
|
2021-11-21 23:00:00 +01:00
|
|
|
+ public IChatBaseComponent getDisplayName() {
|
2022-06-07 18:00:00 +02:00
|
|
|
+ return (IChatBaseComponent) (tileentitychest.hasCustomName() ? tileentitychest.getDisplayName() : (tileentitychest1.hasCustomName() ? tileentitychest1.getDisplayName() : IChatBaseComponent.translatable("container.chestDouble")));
|
2019-04-25 05:57:18 +02:00
|
|
|
+ }
|
|
|
|
+ };
|
|
|
|
+ // CraftBukkit end
|
|
|
|
+
|
2020-06-25 02:00:00 +02:00
|
|
|
protected BlockChest(BlockBase.Info blockbase_info, Supplier<TileEntityTypes<? extends TileEntityChest>> supplier) {
|
|
|
|
super(blockbase_info, supplier);
|
2021-11-21 23:00:00 +01:00
|
|
|
this.registerDefaultState((IBlockData) ((IBlockData) ((IBlockData) ((IBlockData) this.stateDefinition.any()).setValue(BlockChest.FACING, EnumDirection.NORTH)).setValue(BlockChest.TYPE, BlockPropertyChestType.SINGLE)).setValue(BlockChest.WATERLOGGED, false));
|
2022-06-07 18:00:00 +02:00
|
|
|
@@ -275,7 +290,7 @@
|
2019-12-10 23:00:00 +01:00
|
|
|
|
2021-06-11 07:00:00 +02:00
|
|
|
@Override
|
2021-11-21 23:00:00 +01:00
|
|
|
public DoubleBlockFinder.Result<? extends TileEntityChest> combine(IBlockData iblockdata, World world, BlockPosition blockposition, boolean flag) {
|
2019-12-10 23:00:00 +01:00
|
|
|
- BiPredicate bipredicate;
|
|
|
|
+ BiPredicate<GeneratorAccess, BlockPosition> bipredicate; // CraftBukkit - decompile error
|
|
|
|
|
|
|
|
if (flag) {
|
|
|
|
bipredicate = (generatoraccess, blockposition1) -> {
|
2022-06-07 18:00:00 +02:00
|
|
|
@@ -291,7 +306,14 @@
|
2021-10-16 09:48:21 +02:00
|
|
|
@Nullable
|
|
|
|
@Override
|
2021-11-21 23:00:00 +01:00
|
|
|
public ITileInventory getMenuProvider(IBlockData iblockdata, World world, BlockPosition blockposition) {
|
|
|
|
- return (ITileInventory) ((Optional) this.combine(iblockdata, world, blockposition, false).apply(BlockChest.MENU_PROVIDER_COMBINER)).orElse((Object) null);
|
2021-10-16 09:48:21 +02:00
|
|
|
+ // CraftBukkit start
|
2021-11-21 23:00:00 +01:00
|
|
|
+ return getMenuProvider(iblockdata, world, blockposition, false);
|
2021-10-16 09:48:21 +02:00
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ @Nullable
|
2021-11-21 23:00:00 +01:00
|
|
|
+ public ITileInventory getMenuProvider(IBlockData iblockdata, World world, BlockPosition blockposition, boolean ignoreObstructions) {
|
|
|
|
+ return (ITileInventory) ((Optional) this.combine(iblockdata, world, blockposition, ignoreObstructions).apply(BlockChest.MENU_PROVIDER_COMBINER)).orElse((Object) null);
|
2021-10-16 09:48:21 +02:00
|
|
|
+ // CraftBukkit end
|
|
|
|
}
|
|
|
|
|
2021-11-21 23:00:00 +01:00
|
|
|
public static DoubleBlockFinder.Combiner<TileEntityChest, Float2FloatFunction> opennessCombiner(final LidBlockEntity lidblockentity) {
|