More rendering work. I can't figure out the deal with these generator resources, it's freaking me out

This commit is contained in:
aidancbrady committed 2016-05-17 01:11:39 -04:00
1 parent 99630d3ff8
commit e308cd161b
14 files changed
+308 -36

No files matched your search

@@ -241,7 +241,8 @@ public abstract class BlockBasic extends Block implements ICTMBlock//TODO? imple
@Override
public float getExplosionResistance(World world, BlockPos pos, Entity exploder, Explosion explosion)
{
BasicBlockType type = BasicBlockType.get(getBasicBlock(), getMetaFromState(world.getBlockState(pos)));
IBlockState state = world.getBlockState(pos);
BasicBlockType type = BasicBlockType.get(getBasicBlock(), state.getBlock().getMetaFromState(state));
if(type == BasicBlockType.REFINED_OBSIDIAN)
{
@@ -288,7 +289,7 @@ public abstract class BlockBasic extends Block implements ICTMBlock//TODO? imple
@Override
public int damageDropped(IBlockState state)
{
return getMetaFromState(state);
return state.getBlock().getMetaFromState(state);
}
@Override
@@ -906,7 +907,6 @@ public abstract class BlockBasic extends Block implements ICTMBlock//TODO? imple
{
if(!player.capabilities.isCreativeMode && !world.isRemote && willHarvest)
{
float motion = 0.7F;
double motionX = (world.rand.nextFloat() * motion) + (1.0F - motion) * 0.5D;
double motionY = (world.rand.nextFloat() * motion) + (1.0F - motion) * 0.5D;
@@ -1000,7 +1000,7 @@ public abstract class BlockBasic extends Block implements ICTMBlock//TODO? imple
@Override
public CTMData getCTMData(IBlockState state)
{
return ctmData[getMetaFromState(state)][0];
return ctmData[state.getBlock().getMetaFromState(state)][0];
}
@Override