mirrors/CC-Tweaked
1
0
Fork 0
mirror of https://github.com/SquidDev-CC/CC-Tweaked synced 2025-08-30 00:57:55 +00:00
Code Issues Releases Wiki Activity

Fix finding inventories below y=0.

Browse Source 
Thankfully, the surface level of redstone ready flat worlds is now below
y=0 or, I wouldn't have noticed.

I reformatted some things to keep the diffs down against CC-Tweaked.
It might be nicer to make this return an ItemStorage as most
places we grab the Container and immediately wrap it.
This commit is contained in:
Toad-Dev
2021-12-16 18:52:22 -08:00
parent 6ad2cdaf62
commit 7b3537761b
1 changed files with 12 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/main/java/dan200/computercraft/shared/util/InventoryUtil.java
View File

@@ -42,27 +42,20 @@ public final class InventoryUtil
public static Container getInventory( Level world, BlockPos pos, Direction side ) public static Container getInventory( Level world, BlockPos pos, Direction side )
{ {
// Look for tile with inventory // Look for tile with inventory
int y = pos.getY(); BlockEntity tileEntity = world.getBlockEntity( pos );
if( y >= 0 && y < world.getHeight() ) if( tileEntity != null )
{ {
// Check if block is InventoryProvider Container inventory = getInventory( tileEntity );
BlockState blockState = world.getBlockState( pos ); if( inventory != null )
Block block = blockState.getBlock();
if( block instanceof WorldlyContainerHolder containerHolder )
{ {
return containerHolder.getContainer( blockState, world, pos ); return inventory;
} }
// Check if block is BlockEntity w/ Inventory }
if( blockState.hasBlockEntity() )
{
BlockEntity tileEntity = world.getBlockEntity( pos );
Container inventory = getInventory( tileEntity ); BlockState block = world.getBlockState( pos );
if( inventory != null ) if( block.getBlock() instanceof WorldlyContainerHolder containerHolder )
{ {
return inventory; return containerHolder.getContainer( block, world, pos );
}
}
} }
// Look for entity with inventory // Look for entity with inventory
@@ -97,9 +90,9 @@ public final class InventoryUtil
if( tileEntity instanceof Container ) if( tileEntity instanceof Container )
{ {
Container inventory = (Container) tileEntity; Container inventory = (Container) tileEntity;
if( inventory instanceof ChestBlockEntity && block instanceof ChestBlock ) if( inventory instanceof ChestBlockEntity && block instanceof ChestBlock chestBlock )
{ {
return ChestBlock.getContainer( (ChestBlock) block, blockState, world, pos, true ); return ChestBlock.getContainer( chestBlock, blockState, world, pos, true );
} }
return inventory; return inventory;
} }