Energy storage should drop inventory. Closes #1919

This commit is contained in:
drcrazy 2019-12-23 13:06:18 +03:00
parent 2afca5534b
commit 6dc1124bc6
11 changed files with 50 additions and 59 deletions

View file

@ -35,7 +35,7 @@ import reborncore.common.powerSystem.PowerAcceptorBlockEntity;
import reborncore.common.util.RebornInventory;
import team.reborn.energy.Energy;
import team.reborn.energy.EnergyTier;
import techreborn.blocks.storage.BlockEnergyStorage;
import techreborn.blocks.storage.EnergyStorageBlock;
/**
* Created by Rushmead
@ -114,7 +114,8 @@ public class EnergyStorageBlockEntity extends PowerAcceptorBlockEntity
// TileMachineBase
@Override
public void setFacing(Direction enumFacing) {
world.setBlockState(pos, world.getBlockState(pos).with(BlockEnergyStorage.FACING, enumFacing));
if (world == null) { return; }
world.setBlockState(pos, world.getBlockState(pos).with(EnergyStorageBlock.FACING, enumFacing));
}
@Override
@ -123,8 +124,8 @@ public class EnergyStorageBlockEntity extends PowerAcceptorBlockEntity
return null;
}
Block block = world.getBlockState(pos).getBlock();
if (block instanceof BlockEnergyStorage) {
return ((BlockEnergyStorage) block).getFacing(world.getBlockState(pos));
if (block instanceof EnergyStorageBlock) {
return ((EnergyStorageBlock) block).getFacing(world.getBlockState(pos));
}
return null;
}

View file

@ -34,7 +34,7 @@ import reborncore.client.containerBuilder.builder.BuiltContainer;
import reborncore.client.containerBuilder.builder.ContainerBuilder;
import team.reborn.energy.EnergyTier;
import techreborn.blockentity.storage.EnergyStorageBlockEntity;
import techreborn.blocks.storage.BlockLapotronicSU;
import techreborn.blocks.storage.LapotronicSUBlock;
import techreborn.config.TechRebornConfig;
import techreborn.init.TRBlockEntities;
import techreborn.init.TRContent;
@ -87,8 +87,8 @@ public class LapotronicSUBlockEntity extends EnergyStorageBlockEntity implements
@Override
public Direction getFacingEnum() {
Block block = world.getBlockState(pos).getBlock();
if (block instanceof BlockLapotronicSU) {
return ((BlockLapotronicSU) block).getFacing(world.getBlockState(pos));
if (block instanceof LapotronicSUBlock) {
return ((LapotronicSUBlock) block).getFacing(world.getBlockState(pos));
}
return null;
}