lauchmelder/BloodMagic
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rewrite base blocks to be less weird

Browse source 
Added base ItemBlock classes for each base type (to be used later)
This commit is contained in:
Nicholas Ignoffo 2016-10-15 09:21:30 -07:00
parent ea43fbce7d
commit 3e0f3f5aa1
14 changed files with 265 additions and 209 deletions
src/main/java/WayofTime/bloodmagic/block/base
BlockStringStairs.java

21
src/main/java/WayofTime/bloodmagic/block/base/BlockStringStairs.java
View file

@ -10,7 +10,6 @@ import net.minecraft.block.BlockStairs;
import net.minecraft.block.BlockStairs.EnumHalf;
import net.minecraft.block.BlockStairs.EnumShape;
import net.minecraft.block.material.Material;
import net.minecraft.block.properties.IProperty;
import net.minecraft.block.properties.PropertyDirection;
import net.minecraft.block.state.BlockStateContainer;
import net.minecraft.block.state.IBlockState;
@ -27,10 +26,9 @@ import net.minecraft.util.math.RayTraceResult;
import net.minecraft.util.math.Vec3d;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
import net.minecraftforge.common.property.ExtendedBlockState;
import net.minecraftforge.common.property.IUnlistedProperty;
import com.google.common.collect.Lists;
import org.apache.commons.lang3.ArrayUtils;
public class BlockStringStairs extends BlockString
{
@ -65,6 +63,11 @@ public class BlockStringStairs extends BlockString
this(material, values, "type");
}
@Override
protected BlockStateContainer createStateContainer() {
return new BlockStateContainer.Builder(this).add(getProperty(), FACING, BlockStairs.HALF, BlockStairs.SHAPE).build();
}
@Override
public void addCollisionBoxToList(IBlockState state, World worldIn, BlockPos pos, AxisAlignedBB entityBox, List<AxisAlignedBB> collidingBoxes, @Nullable Entity entityIn)
{
@ -206,7 +209,7 @@ public class BlockStringStairs extends BlockString
public IBlockState getStateFromMeta(int meta)
{
IBlockState state = getBlockState().getBaseState().withProperty(BlockStairs.HALF, (meta & 8) > 0 ? BlockStairs.EnumHalf.TOP : BlockStairs.EnumHalf.BOTTOM);
state = state.withProperty(FACING, EnumFacing.getFront(5 - (meta & 6) / 2)).withProperty(this.getStringProp(), this.getValues().get(meta % 2));
state = state.withProperty(FACING, EnumFacing.getFront(5 - (meta & 6) / 2)).withProperty(this.getProperty(), getTypes()[meta % 2]);
return state;
}
@ -222,7 +225,7 @@ public class BlockStringStairs extends BlockString
}
i = i | 5 - state.getValue(FACING).getIndex();
return i * 2 + this.getValues().indexOf(state.getValue(this.getStringProp()));
return i * 2 + ArrayUtils.indexOf(getTypes(), state.getValue(getProperty()));
}
@Override
@ -340,12 +343,6 @@ public class BlockStringStairs extends BlockString
return super.withMirror(state, mirrorIn);
}
@Override
protected BlockStateContainer createRealBlockState()
{
return new ExtendedBlockState(this, new IProperty[] { BlockStairs.HALF, BlockStairs.SHAPE, FACING, this.getStringProp() }, new IUnlistedProperty[] { this.getUnlistedStringProp() });
}
@Override
protected ItemStack createStackedBlock(IBlockState state)
{
@ -355,7 +352,7 @@ public class BlockStringStairs extends BlockString
@Override
public int damageDropped(IBlockState state)
{
return this.getValues().indexOf(state.getValue(this.getStringProp()));
return super.getMetaFromState(state);
}
@Override