Merge pull request #4549 from thommy101/issue-3534

[1.11] Fix TE access from ChunkCache.
This commit is contained in:
Aidan authored and GitHub committed 2017-07-22 19:58:03 -07:00
commit 34847c8c15
11 files changed
+35 -34

No files matched your search

@@ -158,8 +158,8 @@ public abstract class BlockBasic extends Block implements ICTMBlock
@Override
public IBlockState getActualState(IBlockState state, IBlockAccess worldIn, BlockPos pos)
{
TileEntity tile = worldIn.getTileEntity(pos);
TileEntity tile = MekanismUtils.getTileEntitySafe(worldIn, pos);
if(tile instanceof TileEntityBasicBlock && ((TileEntityBasicBlock)tile).facing != null)
{
state = state.withProperty(BlockStateFacing.facingProperty, ((TileEntityBasicBlock)tile).facing);
@@ -344,7 +344,7 @@ public abstract class BlockBasic extends Block implements ICTMBlock
return false;
case 9:
case 11:
TileEntityDynamicTank tileEntity = (TileEntityDynamicTank)world.getTileEntity(pos);
TileEntityDynamicTank tileEntity = (TileEntityDynamicTank) MekanismUtils.getTileEntitySafe(world, pos);
if(tileEntity != null)
{
@@ -372,7 +372,7 @@ public abstract class BlockBasic extends Block implements ICTMBlock
case 2:
case 7:
case 8:
TileEntityMultiblock tileEntity = (TileEntityMultiblock)world.getTileEntity(pos);
TileEntityMultiblock tileEntity = (TileEntityMultiblock) MekanismUtils.getTileEntitySafe(world, pos);
if(tileEntity != null)
{
@@ -716,7 +716,7 @@ public abstract class BlockBasic extends Block implements ICTMBlock
@Override
public int getLightValue(IBlockState state, IBlockAccess world, BlockPos pos)
{
TileEntity tileEntity = world.getTileEntity(pos);
TileEntity tileEntity = MekanismUtils.getTileEntitySafe(world, pos);
int metadata = state.getBlock().getMetaFromState(state);
if(tileEntity instanceof IActiveState)
@@ -1044,4 +1044,4 @@ public abstract class BlockBasic extends Block implements ICTMBlock
{
return BasicBlockType.get(world.getBlockState(pos)).isBeaconBase;
}
}
}
@@ -87,7 +87,7 @@ public class BlockEnergyCube extends BlockContainer
@Override
public IBlockState getActualState(IBlockState state, IBlockAccess worldIn, BlockPos pos)
{
TileEntity tile = worldIn.getTileEntity(pos);
TileEntity tile = MekanismUtils.getTileEntitySafe(worldIn, pos);
if(tile instanceof TileEntityEnergyCube)
{
@@ -74,7 +74,7 @@ public class BlockGasTank extends BlockContainer
@Override
public IBlockState getActualState(IBlockState state, IBlockAccess worldIn, BlockPos pos)
{
TileEntity tile = worldIn.getTileEntity(pos);
TileEntity tile = MekanismUtils.getTileEntitySafe(worldIn, pos);
if(tile instanceof TileEntityGasTank)
{
@@ -9,6 +9,7 @@ import mekanism.common.block.property.PropertyColor;
import mekanism.common.block.states.BlockStateFacing;
import mekanism.common.block.states.BlockStateGlowPanel;
import mekanism.common.tile.TileEntityGlowPanel;
import mekanism.common.util.MekanismUtils;
import mekanism.common.util.MultipartUtils;
import net.minecraft.block.Block;
import net.minecraft.block.ITileEntityProvider;
@@ -71,7 +72,7 @@ public class BlockGlowPanel extends Block implements ITileEntityProvider
@Override
public IBlockState getActualState(IBlockState state, IBlockAccess world, BlockPos pos)
{
TileEntityGlowPanel tileEntity = (TileEntityGlowPanel)world.getTileEntity(pos);
TileEntityGlowPanel tileEntity = (TileEntityGlowPanel) MekanismUtils.getTileEntitySafe(world, pos);
return tileEntity != null ? state.withProperty(BlockStateFacing.facingProperty, tileEntity.side) : state;
}
@@ -79,8 +80,8 @@ public class BlockGlowPanel extends Block implements ITileEntityProvider
@Override
public IBlockState getExtendedState(IBlockState state, IBlockAccess world, BlockPos pos)
{
TileEntityGlowPanel tileEntity = (TileEntityGlowPanel)world.getTileEntity(pos);
TileEntityGlowPanel tileEntity = (TileEntityGlowPanel) MekanismUtils.getTileEntitySafe(world, pos);
if(tileEntity != null)
{
state = state.withProperty(BlockStateFacing.facingProperty, tileEntity.side);
@@ -117,7 +118,7 @@ public class BlockGlowPanel extends Block implements ITileEntityProvider
@Override
public void onNeighborChange(IBlockAccess world, BlockPos pos, BlockPos neighbor)
{
TileEntityGlowPanel tileEntity = (TileEntityGlowPanel)world.getTileEntity(pos);
TileEntityGlowPanel tileEntity = (TileEntityGlowPanel) MekanismUtils.getTileEntitySafe(world, pos);
if(!tileEntity.getWorld().isRemote && !canStay(tileEntity))
{
@@ -137,7 +138,7 @@ public class BlockGlowPanel extends Block implements ITileEntityProvider
@Override
public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess world, BlockPos pos)
{
TileEntity tile = world.getTileEntity(pos);
TileEntity tile = MekanismUtils.getTileEntitySafe(world, pos);
if(tile != null && tile instanceof TileEntityGlowPanel)
{
@@ -206,7 +206,7 @@ public abstract class BlockMachine extends BlockContainer implements ICTMBlock
@Override
public IBlockState getActualState(IBlockState state, IBlockAccess worldIn, BlockPos pos)
{
TileEntity tile = worldIn.getTileEntity(pos);
TileEntity tile = MekanismUtils.getTileEntitySafe(worldIn, pos);
if(tile instanceof TileEntityBasicBlock && ((TileEntityBasicBlock)tile).facing != null)
{
@@ -383,7 +383,7 @@ public abstract class BlockMachine extends BlockContainer implements ICTMBlock
{
if(client.enableAmbientLighting)
{
TileEntity tileEntity = world.getTileEntity(pos);
TileEntity tileEntity = MekanismUtils.getTileEntitySafe(world, pos);
if(tileEntity instanceof IActiveState)
{
@@ -992,7 +992,7 @@ public abstract class BlockMachine extends BlockContainer implements ICTMBlock
public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess world, BlockPos pos)
{
MachineType type = MachineType.get(getMachineBlock(), state.getBlock().getMetaFromState(state));
TileEntity tile = world.getTileEntity(pos);
TileEntity tile = MekanismUtils.getTileEntitySafe(world, pos);
if(type == null)
{
@@ -1025,12 +1025,6 @@ public abstract class BlockMachine extends BlockContainer implements ICTMBlock
{
return false;
}
@Override
public AxisAlignedBB getCollisionBoundingBox(IBlockState state, IBlockAccess world, BlockPos pos)
{
return super.getCollisionBoundingBox(state, world, pos);
}
@Override
public boolean isSideSolid(IBlockState state, IBlockAccess world, BlockPos pos, EnumFacing side)
@@ -1111,7 +1105,7 @@ public abstract class BlockMachine extends BlockContainer implements ICTMBlock
@Override
public int getWeakPower(IBlockState state, IBlockAccess world, BlockPos pos, EnumFacing side)
{
TileEntity tile = world.getTileEntity(pos);
TileEntity tile = MekanismUtils.getTileEntitySafe(world, pos);
if(tile instanceof TileEntityLaserAmplifier)
{
@@ -14,9 +14,7 @@ import net.minecraft.item.EnumDyeColor;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.NonNullList;
import net.minecraft.util.math.AxisAlignedBB;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.Vec3d;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
import net.minecraftforge.fml.relauncher.Side;
@@ -95,7 +95,7 @@ public class BlockTransmitter extends Block implements ITileEntityProvider
@Override
public IBlockState getActualState(IBlockState state, IBlockAccess worldIn, BlockPos pos)
{
TileEntity tile = worldIn.getTileEntity(pos);
TileEntity tile = MekanismUtils.getTileEntitySafe(worldIn, pos);
if(tile instanceof TileEntitySidedPipe)
{
@@ -129,7 +129,7 @@ public class BlockTransmitter extends Block implements ITileEntityProvider
@Override
public IBlockState getExtendedState(IBlockState state, IBlockAccess w, BlockPos pos)
{
TileEntitySidedPipe tile = (TileEntitySidedPipe)w.getTileEntity(pos);
TileEntitySidedPipe tile = (TileEntitySidedPipe) MekanismUtils.getTileEntitySafe(w, pos);
if(tile != null)
{
@@ -147,7 +147,7 @@ public class BlockTransmitter extends Block implements ITileEntityProvider
@Override
public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess world, BlockPos pos)
{
TileEntity tile = world.getTileEntity(pos);
TileEntity tile = MekanismUtils.getTileEntitySafe(world, pos);
if(tile instanceof TileEntitySidedPipe && ((TileEntitySidedPipe)tile).getTransmitterType().getSize() == Size.SMALL)
{
@@ -301,7 +301,7 @@ public class BlockTransmitter extends Block implements ITileEntityProvider
@Override
public void onNeighborChange(IBlockAccess world, BlockPos pos, BlockPos neighbor)
{
TileEntitySidedPipe tile = (TileEntitySidedPipe)world.getTileEntity(pos);
TileEntitySidedPipe tile = (TileEntitySidedPipe) MekanismUtils.getTileEntitySafe(world, pos);
EnumFacing side = EnumFacing.getFacingFromVector(neighbor.getX() - pos.getX(), neighbor.getY() - pos.getY(), neighbor.getZ() - pos.getZ());
tile.onNeighborTileChange(side);
}
@@ -82,9 +82,11 @@ import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.RayTraceResult;
import net.minecraft.util.math.Vec3d;
import net.minecraft.util.text.TextComponentString;
import net.minecraft.world.ChunkCache;
import net.minecraft.world.EnumSkyBlock;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
import net.minecraft.world.chunk.Chunk;
import net.minecraftforge.fluids.BlockFluidBase;
import net.minecraftforge.fluids.Fluid;
import net.minecraftforge.fluids.FluidRegistry;
@@ -1539,4 +1541,9 @@ public final class MekanismUtils
return prefix + "/";
}
}
public static TileEntity getTileEntitySafe(IBlockAccess worldIn, BlockPos pos)
{
return worldIn instanceof ChunkCache ? ((ChunkCache)worldIn).getTileEntity(pos, Chunk.EnumCreateEntityType.CHECK) : worldIn.getTileEntity(pos);
}
}
@@ -1,6 +1,7 @@
package mekanism.generators.common;
import mekanism.common.item.ItemMekanism;
import mekanism.common.util.MekanismUtils;
import mekanism.generators.common.item.ItemHohlraum;
import mekanism.generators.common.tile.turbine.TileEntityTurbineRotor;
import net.minecraft.entity.player.EntityPlayer;
@@ -20,7 +21,7 @@ public class GeneratorsItems
@Override
public boolean doesSneakBypassUse(ItemStack stack, IBlockAccess world, BlockPos pos, EntityPlayer player)
{
return world.getTileEntity(pos) instanceof TileEntityTurbineRotor;
return MekanismUtils.getTileEntitySafe(world, pos) instanceof TileEntityTurbineRotor;
}
};
@@ -169,7 +169,7 @@ public abstract class BlockGenerator extends BlockContainer implements ICTMBlock
@Override
public IBlockState getActualState(IBlockState state, IBlockAccess worldIn, BlockPos pos)
{
TileEntity tile = worldIn.getTileEntity(pos);
TileEntity tile = MekanismUtils.getTileEntitySafe(worldIn, pos);
if(tile instanceof TileEntityBasicBlock && ((TileEntityBasicBlock)tile).facing != null)
{
@@ -254,7 +254,7 @@ public abstract class BlockGenerator extends BlockContainer implements ICTMBlock
{
if(client.enableAmbientLighting)
{
TileEntity tileEntity = world.getTileEntity(pos);
TileEntity tileEntity = MekanismUtils.getTileEntitySafe(world, pos);
if(tileEntity instanceof IActiveState && !(tileEntity instanceof TileEntitySolarGenerator))
{
@@ -75,7 +75,7 @@ public abstract class BlockReactor extends Block implements ICTMBlock, ITileEnti
@Override
public IBlockState getActualState(IBlockState state, IBlockAccess worldIn, BlockPos pos)
{
TileEntity tile = worldIn.getTileEntity(pos);
TileEntity tile = MekanismUtils.getTileEntitySafe(worldIn, pos);
if(tile instanceof TileEntityReactorController)
{
@@ -293,7 +293,7 @@ public abstract class BlockReactor extends Block implements ICTMBlock, ITileEnti
@Override
public int getWeakPower(IBlockState state, IBlockAccess world, BlockPos pos, EnumFacing side)
{
TileEntity tile = world.getTileEntity(pos);
TileEntity tile = MekanismUtils.getTileEntitySafe(world, pos);
if(tile instanceof TileEntityReactorLogicAdapter)
{