<400 errors

This commit is contained in:
aidancbrady committed 2016-05-25 10:10:47 -04:00
1 parent af008b9395
commit c73eef6be8
90 files changed
+880 -749

No files matched your search

@@ -216,7 +216,7 @@ public abstract class BlockBasic extends Block implements ICTMBlock
}
@Override
public void onNeighborBlockChange(World world, BlockPos pos, IBlockState state, Block neighborBlock)
public void neighborChanged(IBlockState state, World world, BlockPos pos, Block neighborBlock)
{
if(!world.isRemote)
{
@@ -325,9 +325,8 @@ public abstract class BlockBasic extends Block implements ICTMBlock
}
@Override
public boolean canCreatureSpawn(IBlockAccess world, BlockPos pos, SpawnPlacementType type)
public boolean canCreatureSpawn(IBlockState state, IBlockAccess world, BlockPos pos, SpawnPlacementType type)
{
IBlockState state = world.getBlockState(pos);
int meta = state.getBlock().getMetaFromState(state);
switch(getBasicBlock())
@@ -358,7 +357,7 @@ public abstract class BlockBasic extends Block implements ICTMBlock
}
}
default:
return super.canCreatureSpawn(world, pos, type);
return super.canCreatureSpawn(state, world, pos, type);
}
case BASIC_BLOCK_2:
switch(meta)
@@ -558,9 +557,9 @@ public abstract class BlockBasic extends Block implements ICTMBlock
}
@Override
public boolean isSideSolid(IBlockAccess world, BlockPos pos, EnumFacing side)
public boolean isSideSolid(IBlockState state, IBlockAccess world, BlockPos pos, EnumFacing side)
{
return BasicBlockType.get(world.getBlockState(pos)) != BasicBlockType.STRUCTURAL_GLASS;
return BasicBlockType.get(state) != BasicBlockType.STRUCTURAL_GLASS;
}
@SideOnly(Side.CLIENT)
@@ -853,9 +852,8 @@ public abstract class BlockBasic extends Block implements ICTMBlock
}
@Override
public ItemStack getPickBlock(RayTraceResult target, World world, BlockPos pos, EntityPlayer player)
public ItemStack getPickBlock(IBlockState state, RayTraceResult target, World world, BlockPos pos, EntityPlayer player)
{
IBlockState state = world.getBlockState(pos);
BasicBlockType type = BasicBlockType.get(state);
ItemStack ret = new ItemStack(this, 1, state.getBlock().getMetaFromState(state));
@@ -901,7 +899,7 @@ public abstract class BlockBasic extends Block implements ICTMBlock
}
@Override
public boolean removedByPlayer(World world, BlockPos pos, EntityPlayer player, boolean willHarvest)
public boolean removedByPlayer(IBlockState state, World world, BlockPos pos, EntityPlayer player, boolean willHarvest)
{
if(!player.capabilities.isCreativeMode && !world.isRemote && willHarvest)
{
@@ -910,7 +908,7 @@ public abstract class BlockBasic extends Block implements ICTMBlock
double motionY = (world.rand.nextFloat() * motion) + (1.0F - motion) * 0.5D;
double motionZ = (world.rand.nextFloat() * motion) + (1.0F - motion) * 0.5D;
EntityItem entityItem = new EntityItem(world, pos.getX() + motionX, pos.getY() + motionY, pos.getZ() + motionZ, getPickBlock(null, world, pos, player));
EntityItem entityItem = new EntityItem(world, pos.getX() + motionX, pos.getY() + motionY, pos.getZ() + motionZ, getPickBlock(state, null, world, pos, player));
world.spawnEntityInWorld(entityItem);
}
@@ -918,9 +916,9 @@ public abstract class BlockBasic extends Block implements ICTMBlock
return world.setBlockToAir(pos);
}
public ItemStack dismantleBlock(World world, BlockPos pos, boolean returnBlock)
public ItemStack dismantleBlock(IBlockState state, World world, BlockPos pos, boolean returnBlock)
{
ItemStack itemStack = getPickBlock(null, world, pos, null);
ItemStack itemStack = getPickBlock(state, null, world, pos, null);
world.setBlockToAir(pos);