Some renaming in mmm.deco
This commit is contained in:
parent
f7d6bcf3a9
commit
47b663ae14
8 changed files with 148 additions and 148 deletions
|
|
@ -15,7 +15,7 @@ import net.minecraft.util.IStringSerializable;
|
|||
|
||||
|
||||
|
||||
public abstract class DExtraSlabBlock
|
||||
public abstract class A_DSlabBlock
|
||||
extends BlockSlab
|
||||
{
|
||||
|
||||
|
|
@ -30,14 +30,14 @@ public abstract class DExtraSlabBlock
|
|||
}
|
||||
}
|
||||
|
||||
public static final PropertyEnum< DExtraSlabBlock.E_Variant > VARIANT //
|
||||
= PropertyEnum.< DExtraSlabBlock.E_Variant > create( "variant" , DExtraSlabBlock.E_Variant.class );
|
||||
public static final PropertyEnum< A_DSlabBlock.E_Variant > VARIANT //
|
||||
= PropertyEnum.< A_DSlabBlock.E_Variant > create( "variant" , A_DSlabBlock.E_Variant.class );
|
||||
|
||||
public final IBlockState modelState;
|
||||
public final Block modelBlock;
|
||||
|
||||
|
||||
public DExtraSlabBlock( final IBlockState modelState , final String name )
|
||||
public A_DSlabBlock( final IBlockState modelState , final String name )
|
||||
{
|
||||
super( modelState.getMaterial( ) );
|
||||
this.modelState = modelState;
|
||||
|
|
@ -59,7 +59,7 @@ public abstract class DExtraSlabBlock
|
|||
if ( !this.isDouble( ) ) {
|
||||
state = state.withProperty( BlockSlab.HALF , BlockSlab.EnumBlockHalf.BOTTOM );
|
||||
}
|
||||
this.setDefaultState( state.withProperty( DExtraSlabBlock.VARIANT , E_Variant.DEFAULT ) );
|
||||
this.setDefaultState( state.withProperty( A_DSlabBlock.VARIANT , E_Variant.DEFAULT ) );
|
||||
|
||||
URegistry.setIdentifiers( this , "deco" , "slabs" , name );
|
||||
}
|
||||
|
|
@ -68,7 +68,7 @@ public abstract class DExtraSlabBlock
|
|||
@Override
|
||||
public IBlockState getStateFromMeta( final int meta )
|
||||
{
|
||||
IBlockState iblockstate = this.getDefaultState( ).withProperty( DExtraSlabBlock.VARIANT , E_Variant.DEFAULT );
|
||||
IBlockState iblockstate = this.getDefaultState( ).withProperty( A_DSlabBlock.VARIANT , E_Variant.DEFAULT );
|
||||
if ( !this.isDouble( ) ) {
|
||||
iblockstate = iblockstate.withProperty( BlockSlab.HALF ,
|
||||
( meta & 1 ) == 0 ? BlockSlab.EnumBlockHalf.BOTTOM : BlockSlab.EnumBlockHalf.TOP );
|
||||
|
|
@ -93,10 +93,10 @@ public abstract class DExtraSlabBlock
|
|||
{
|
||||
return this.isDouble( ) //
|
||||
? new BlockStateContainer( this , new IProperty[] {
|
||||
DExtraSlabBlock.VARIANT
|
||||
A_DSlabBlock.VARIANT
|
||||
} ) //
|
||||
: new BlockStateContainer( this , new IProperty[] {
|
||||
BlockSlab.HALF , DExtraSlabBlock.VARIANT
|
||||
BlockSlab.HALF , A_DSlabBlock.VARIANT
|
||||
} );
|
||||
}
|
||||
|
||||
|
|
@ -111,7 +111,7 @@ public abstract class DExtraSlabBlock
|
|||
@Override
|
||||
public IProperty< ? > getVariantProperty( )
|
||||
{
|
||||
return DExtraSlabBlock.VARIANT;
|
||||
return A_DSlabBlock.VARIANT;
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -39,7 +39,7 @@ import net.minecraftforge.fml.relauncher.SideOnly;
|
|||
|
||||
|
||||
|
||||
public class DBlockChair
|
||||
public class DChair
|
||||
extends Block
|
||||
implements I_URecipeRegistrar , I_UBlockSeat
|
||||
{
|
||||
|
|
@ -55,11 +55,11 @@ public class DBlockChair
|
|||
public final E_DWoodType type;
|
||||
|
||||
|
||||
public DBlockChair( final E_DWoodType type )
|
||||
public DChair( final E_DWoodType type )
|
||||
{
|
||||
super( Material.WOOD , type.mapColor );
|
||||
this.type = type;
|
||||
this.setDefaultState( this.blockState.getBaseState( ).withProperty( DBlockChair.FACING , EnumFacing.NORTH ) );
|
||||
this.setDefaultState( this.blockState.getBaseState( ).withProperty( DChair.FACING , EnumFacing.NORTH ) );
|
||||
|
||||
this.setCreativeTab( CreativeTabs.DECORATIONS );
|
||||
URegistry.setIdentifiers( this , "deco" , "chair" , type.suffix );
|
||||
|
|
@ -79,7 +79,7 @@ public class DBlockChair
|
|||
@Override
|
||||
public AxisAlignedBB getBoundingBox( final IBlockState state , final IBlockAccess source , final BlockPos pos )
|
||||
{
|
||||
return DBlockChair.BOUNDING_BOX;
|
||||
return DChair.BOUNDING_BOX;
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -87,21 +87,21 @@ public class DBlockChair
|
|||
public void addCollisionBoxToList( final IBlockState state , final World worldIn , final BlockPos pos ,
|
||||
final AxisAlignedBB container , final List< AxisAlignedBB > output , final Entity entity )
|
||||
{
|
||||
Block.addCollisionBoxToList( pos , container , output , DBlockChair.COLLISION_BOTTOM );
|
||||
Block.addCollisionBoxToList( pos , container , output , DChair.COLLISION_BOTTOM );
|
||||
|
||||
AxisAlignedBB back;
|
||||
switch ( state.getValue( DBlockChair.FACING ) ) {
|
||||
switch ( state.getValue( DChair.FACING ) ) {
|
||||
case EAST:
|
||||
back = DBlockChair.COLLISION_TOP_EAST;
|
||||
back = DChair.COLLISION_TOP_EAST;
|
||||
break;
|
||||
case NORTH:
|
||||
back = DBlockChair.COLLISION_TOP_NORTH;
|
||||
back = DChair.COLLISION_TOP_NORTH;
|
||||
break;
|
||||
case SOUTH:
|
||||
back = DBlockChair.COLLISION_TOP_SOUTH;
|
||||
back = DChair.COLLISION_TOP_SOUTH;
|
||||
break;
|
||||
case WEST:
|
||||
back = DBlockChair.COLLISION_TOP_WEST;
|
||||
back = DChair.COLLISION_TOP_WEST;
|
||||
break;
|
||||
default:
|
||||
// TODO log problem
|
||||
|
|
@ -158,7 +158,7 @@ public class DBlockChair
|
|||
protected BlockStateContainer createBlockState( )
|
||||
{
|
||||
return new BlockStateContainer( this , new IProperty[] {
|
||||
DBlockChair.FACING
|
||||
DChair.FACING
|
||||
} );
|
||||
}
|
||||
|
||||
|
|
@ -166,14 +166,14 @@ public class DBlockChair
|
|||
@Override
|
||||
public IBlockState withRotation( final IBlockState state , final Rotation rot )
|
||||
{
|
||||
return state.withProperty( DBlockChair.FACING , rot.rotate( state.getValue( DBlockChair.FACING ) ) );
|
||||
return state.withProperty( DChair.FACING , rot.rotate( state.getValue( DChair.FACING ) ) );
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public IBlockState withMirror( final IBlockState state , final Mirror mirrorIn )
|
||||
{
|
||||
return state.withRotation( mirrorIn.toRotation( state.getValue( DBlockChair.FACING ) ) );
|
||||
return state.withRotation( mirrorIn.toRotation( state.getValue( DChair.FACING ) ) );
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -186,14 +186,14 @@ public class DBlockChair
|
|||
enumfacing = EnumFacing.NORTH;
|
||||
}
|
||||
|
||||
return this.getDefaultState( ).withProperty( DBlockChair.FACING , enumfacing );
|
||||
return this.getDefaultState( ).withProperty( DChair.FACING , enumfacing );
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public int getMetaFromState( final IBlockState state )
|
||||
{
|
||||
return state.getValue( DBlockChair.FACING ).getIndex( );
|
||||
return state.getValue( DChair.FACING ).getIndex( );
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -201,7 +201,7 @@ public class DBlockChair
|
|||
public IBlockState onBlockPlaced( final World worldIn , final BlockPos pos , final EnumFacing facing ,
|
||||
final float hitX , final float hitY , final float hitZ , final int meta , final EntityLivingBase placer )
|
||||
{
|
||||
return this.getDefaultState( ).withProperty( DBlockChair.FACING , placer.getHorizontalFacing( ) );
|
||||
return this.getDefaultState( ).withProperty( DChair.FACING , placer.getHorizontalFacing( ) );
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -13,31 +13,31 @@ import net.minecraftforge.fml.common.registry.GameRegistry;
|
|||
|
||||
|
||||
|
||||
public class DExtraSlab
|
||||
public class DSlab
|
||||
implements I_URecipeRegistrar
|
||||
{
|
||||
public static DExtraSlab fromStone( final BlockStone.EnumType type )
|
||||
public static DSlab fromStone( final BlockStone.EnumType type )
|
||||
{
|
||||
final IBlockState bs = Blocks.STONE.getDefaultState( ).withProperty( BlockStone.VARIANT , type );
|
||||
final String name = type.getName( ).replace( "smooth_" , "" );
|
||||
return new DExtraSlab( bs , name );
|
||||
return new DSlab( bs , name );
|
||||
}
|
||||
|
||||
public final DExtraSlabHalf HALF;
|
||||
public final DExtraSlabDouble DOUBLE;
|
||||
public final DSlabHalf HALF;
|
||||
public final DSlabDouble DOUBLE;
|
||||
public final ItemSlab ITEM;
|
||||
|
||||
|
||||
public DExtraSlab( final IBlockState modelState , final String name )
|
||||
public DSlab( final IBlockState modelState , final String name )
|
||||
{
|
||||
this.HALF = new DExtraSlabHalf( modelState , name );
|
||||
this.DOUBLE = new DExtraSlabDouble( this.HALF , name );
|
||||
this.HALF = new DSlabHalf( modelState , name );
|
||||
this.DOUBLE = new DSlabDouble( this.HALF , name );
|
||||
this.ITEM = new ItemSlab( this.HALF , this.HALF , this.DOUBLE );
|
||||
URegistry.setIdentifiers( this.ITEM , "deco" , "slabs" , name );
|
||||
}
|
||||
|
||||
|
||||
public DExtraSlab register( )
|
||||
public DSlab register( )
|
||||
{
|
||||
URegistry.addBlock( this.HALF , this.ITEM );
|
||||
URegistry.addBlock( this.DOUBLE , null );
|
||||
|
|
@ -13,14 +13,14 @@ import net.minecraft.world.World;
|
|||
|
||||
|
||||
|
||||
public class DExtraSlabDouble
|
||||
extends DExtraSlabBlock
|
||||
public class DSlabDouble
|
||||
extends A_DSlabBlock
|
||||
{
|
||||
|
||||
public final DExtraSlabHalf singleSlab;
|
||||
public final DSlabHalf singleSlab;
|
||||
|
||||
|
||||
public DExtraSlabDouble( final DExtraSlabHalf single , final String name )
|
||||
public DSlabDouble( final DSlabHalf single , final String name )
|
||||
{
|
||||
super( single.modelState , name + "_double" );
|
||||
this.singleSlab = single;
|
||||
|
|
@ -5,11 +5,11 @@ import net.minecraft.block.state.IBlockState;
|
|||
|
||||
|
||||
|
||||
public class DExtraSlabHalf
|
||||
extends DExtraSlabBlock
|
||||
public class DSlabHalf
|
||||
extends A_DSlabBlock
|
||||
{
|
||||
|
||||
public DExtraSlabHalf( final IBlockState modelState , final String name )
|
||||
public DSlabHalf( final IBlockState modelState , final String name )
|
||||
{
|
||||
super( modelState , name );
|
||||
}
|
||||
|
|
@ -13,21 +13,21 @@ import net.minecraftforge.fml.common.registry.GameRegistry;
|
|||
|
||||
|
||||
|
||||
public class DExtraStairs
|
||||
public class DStairs
|
||||
extends BlockStairs
|
||||
implements I_URecipeRegistrar
|
||||
{
|
||||
public static DExtraStairs fromStone( final BlockStone.EnumType type )
|
||||
public static DStairs fromStone( final BlockStone.EnumType type )
|
||||
{
|
||||
final IBlockState bs = Blocks.STONE.getDefaultState( ).withProperty( BlockStone.VARIANT , type );
|
||||
return new DExtraStairs( bs , type.getName( ).replace( "smooth_" , "" ) );
|
||||
return new DStairs( bs , type.getName( ).replace( "smooth_" , "" ) );
|
||||
}
|
||||
|
||||
public final IBlockState modelState;
|
||||
public final Block modelBlock;
|
||||
|
||||
|
||||
public DExtraStairs( final IBlockState modelState , final String name )
|
||||
public DStairs( final IBlockState modelState , final String name )
|
||||
{
|
||||
super( modelState );
|
||||
this.modelState = modelState;
|
||||
|
|
@ -32,7 +32,7 @@ import net.minecraftforge.fml.relauncher.SideOnly;
|
|||
|
||||
|
||||
|
||||
public class DBlockTable
|
||||
public class DTable
|
||||
extends Block
|
||||
implements I_URecipeRegistrar
|
||||
{
|
||||
|
|
@ -54,27 +54,27 @@ public class DBlockTable
|
|||
public static final PropertyBool SW = PropertyBool.create( "sw" );
|
||||
public static final PropertyBool SE = PropertyBool.create( "se" );
|
||||
private static final PropertyBool[] DIRECTIONS = { //
|
||||
DBlockTable.NORTH , DBlockTable.NE , DBlockTable.EAST , DBlockTable.SE , DBlockTable.SOUTH ,
|
||||
DBlockTable.SW , DBlockTable.WEST , DBlockTable.NW//
|
||||
DTable.NORTH , DTable.NE , DTable.EAST , DTable.SE , DTable.SOUTH ,
|
||||
DTable.SW , DTable.WEST , DTable.NW//
|
||||
};
|
||||
|
||||
public final E_DWoodType type;
|
||||
|
||||
|
||||
public DBlockTable( final E_DWoodType type )
|
||||
public DTable( final E_DWoodType type )
|
||||
{
|
||||
super( Material.WOOD , type.mapColor );
|
||||
this.type = type;
|
||||
|
||||
this.setDefaultState( this.blockState.getBaseState( )//
|
||||
.withProperty( DBlockTable.NORTH , Boolean.valueOf( false ) )//
|
||||
.withProperty( DBlockTable.EAST , Boolean.valueOf( false ) )//
|
||||
.withProperty( DBlockTable.SOUTH , Boolean.valueOf( false ) )//
|
||||
.withProperty( DBlockTable.WEST , Boolean.valueOf( false ) )//
|
||||
.withProperty( DBlockTable.NW , Boolean.valueOf( false ) )//
|
||||
.withProperty( DBlockTable.NE , Boolean.valueOf( false ) )//
|
||||
.withProperty( DBlockTable.SW , Boolean.valueOf( false ) )//
|
||||
.withProperty( DBlockTable.SE , Boolean.valueOf( false ) ) );
|
||||
.withProperty( DTable.NORTH , Boolean.valueOf( false ) )//
|
||||
.withProperty( DTable.EAST , Boolean.valueOf( false ) )//
|
||||
.withProperty( DTable.SOUTH , Boolean.valueOf( false ) )//
|
||||
.withProperty( DTable.WEST , Boolean.valueOf( false ) )//
|
||||
.withProperty( DTable.NW , Boolean.valueOf( false ) )//
|
||||
.withProperty( DTable.NE , Boolean.valueOf( false ) )//
|
||||
.withProperty( DTable.SW , Boolean.valueOf( false ) )//
|
||||
.withProperty( DTable.SE , Boolean.valueOf( false ) ) );
|
||||
|
||||
this.setCreativeTab( CreativeTabs.DECORATIONS );
|
||||
URegistry.setIdentifiers( this , "deco" , "table" , type.suffix );
|
||||
|
|
@ -127,8 +127,8 @@ public class DBlockTable
|
|||
protected BlockStateContainer createBlockState( )
|
||||
{
|
||||
return new BlockStateContainer( this , new IProperty[] {
|
||||
DBlockTable.NORTH , DBlockTable.EAST , DBlockTable.WEST , DBlockTable.SOUTH , DBlockTable.NE ,
|
||||
DBlockTable.NW , DBlockTable.SE , DBlockTable.SW
|
||||
DTable.NORTH , DTable.EAST , DTable.WEST , DTable.SOUTH , DTable.NE ,
|
||||
DTable.NW , DTable.SE , DTable.SW
|
||||
} );
|
||||
}
|
||||
|
||||
|
|
@ -147,14 +147,14 @@ public class DBlockTable
|
|||
final BlockPos s = pos.south( );
|
||||
final BlockPos w = pos.west( );
|
||||
final BlockPos e = pos.east( );
|
||||
return state.withProperty( DBlockTable.NORTH , Boolean.valueOf( this.canConnectTo( worldIn , n ) ) )//
|
||||
.withProperty( DBlockTable.EAST , Boolean.valueOf( this.canConnectTo( worldIn , e ) ) )//
|
||||
.withProperty( DBlockTable.SOUTH , Boolean.valueOf( this.canConnectTo( worldIn , s ) ) )//
|
||||
.withProperty( DBlockTable.WEST , Boolean.valueOf( this.canConnectTo( worldIn , w ) ) )//
|
||||
.withProperty( DBlockTable.NW , Boolean.valueOf( this.canConnectTo( worldIn , n.west( ) ) ) )//
|
||||
.withProperty( DBlockTable.NE , Boolean.valueOf( this.canConnectTo( worldIn , n.east( ) ) ) )//
|
||||
.withProperty( DBlockTable.SW , Boolean.valueOf( this.canConnectTo( worldIn , s.west( ) ) ) )//
|
||||
.withProperty( DBlockTable.SE , Boolean.valueOf( this.canConnectTo( worldIn , s.east( ) ) ) )//
|
||||
return state.withProperty( DTable.NORTH , Boolean.valueOf( this.canConnectTo( worldIn , n ) ) )//
|
||||
.withProperty( DTable.EAST , Boolean.valueOf( this.canConnectTo( worldIn , e ) ) )//
|
||||
.withProperty( DTable.SOUTH , Boolean.valueOf( this.canConnectTo( worldIn , s ) ) )//
|
||||
.withProperty( DTable.WEST , Boolean.valueOf( this.canConnectTo( worldIn , w ) ) )//
|
||||
.withProperty( DTable.NW , Boolean.valueOf( this.canConnectTo( worldIn , n.west( ) ) ) )//
|
||||
.withProperty( DTable.NE , Boolean.valueOf( this.canConnectTo( worldIn , n.east( ) ) ) )//
|
||||
.withProperty( DTable.SW , Boolean.valueOf( this.canConnectTo( worldIn , s.west( ) ) ) )//
|
||||
.withProperty( DTable.SE , Boolean.valueOf( this.canConnectTo( worldIn , s.east( ) ) ) )//
|
||||
;
|
||||
}
|
||||
|
||||
|
|
@ -164,34 +164,34 @@ public class DBlockTable
|
|||
{
|
||||
switch ( rot ) {
|
||||
case CLOCKWISE_180:
|
||||
return state.withProperty( DBlockTable.NORTH , state.getValue( DBlockTable.SOUTH ) )//
|
||||
.withProperty( DBlockTable.EAST , state.getValue( DBlockTable.WEST ) )//
|
||||
.withProperty( DBlockTable.SOUTH , state.getValue( DBlockTable.NORTH ) )//
|
||||
.withProperty( DBlockTable.WEST , state.getValue( DBlockTable.EAST ) )//
|
||||
.withProperty( DBlockTable.NW , state.getValue( DBlockTable.SE ) )//
|
||||
.withProperty( DBlockTable.NE , state.getValue( DBlockTable.SW ) )//
|
||||
.withProperty( DBlockTable.SE , state.getValue( DBlockTable.NW ) )//
|
||||
.withProperty( DBlockTable.SW , state.getValue( DBlockTable.NE ) )//
|
||||
return state.withProperty( DTable.NORTH , state.getValue( DTable.SOUTH ) )//
|
||||
.withProperty( DTable.EAST , state.getValue( DTable.WEST ) )//
|
||||
.withProperty( DTable.SOUTH , state.getValue( DTable.NORTH ) )//
|
||||
.withProperty( DTable.WEST , state.getValue( DTable.EAST ) )//
|
||||
.withProperty( DTable.NW , state.getValue( DTable.SE ) )//
|
||||
.withProperty( DTable.NE , state.getValue( DTable.SW ) )//
|
||||
.withProperty( DTable.SE , state.getValue( DTable.NW ) )//
|
||||
.withProperty( DTable.SW , state.getValue( DTable.NE ) )//
|
||||
;
|
||||
case COUNTERCLOCKWISE_90:
|
||||
return state.withProperty( DBlockTable.NORTH , state.getValue( DBlockTable.EAST ) )//
|
||||
.withProperty( DBlockTable.EAST , state.getValue( DBlockTable.SOUTH ) )//
|
||||
.withProperty( DBlockTable.SOUTH , state.getValue( DBlockTable.WEST ) )//
|
||||
.withProperty( DBlockTable.WEST , state.getValue( DBlockTable.NORTH ) )//
|
||||
.withProperty( DBlockTable.NW , state.getValue( DBlockTable.NE ) )//
|
||||
.withProperty( DBlockTable.NE , state.getValue( DBlockTable.SE ) )//
|
||||
.withProperty( DBlockTable.SE , state.getValue( DBlockTable.SW ) )//
|
||||
.withProperty( DBlockTable.SW , state.getValue( DBlockTable.NW ) )//
|
||||
return state.withProperty( DTable.NORTH , state.getValue( DTable.EAST ) )//
|
||||
.withProperty( DTable.EAST , state.getValue( DTable.SOUTH ) )//
|
||||
.withProperty( DTable.SOUTH , state.getValue( DTable.WEST ) )//
|
||||
.withProperty( DTable.WEST , state.getValue( DTable.NORTH ) )//
|
||||
.withProperty( DTable.NW , state.getValue( DTable.NE ) )//
|
||||
.withProperty( DTable.NE , state.getValue( DTable.SE ) )//
|
||||
.withProperty( DTable.SE , state.getValue( DTable.SW ) )//
|
||||
.withProperty( DTable.SW , state.getValue( DTable.NW ) )//
|
||||
;
|
||||
case CLOCKWISE_90:
|
||||
return state.withProperty( DBlockTable.NORTH , state.getValue( DBlockTable.WEST ) )//
|
||||
.withProperty( DBlockTable.EAST , state.getValue( DBlockTable.NORTH ) )//
|
||||
.withProperty( DBlockTable.SOUTH , state.getValue( DBlockTable.EAST ) )//
|
||||
.withProperty( DBlockTable.WEST , state.getValue( DBlockTable.SOUTH ) )//
|
||||
.withProperty( DBlockTable.NW , state.getValue( DBlockTable.SW ) )//
|
||||
.withProperty( DBlockTable.NE , state.getValue( DBlockTable.NW ) )//
|
||||
.withProperty( DBlockTable.SE , state.getValue( DBlockTable.NE ) )//
|
||||
.withProperty( DBlockTable.SW , state.getValue( DBlockTable.SE ) )//
|
||||
return state.withProperty( DTable.NORTH , state.getValue( DTable.WEST ) )//
|
||||
.withProperty( DTable.EAST , state.getValue( DTable.NORTH ) )//
|
||||
.withProperty( DTable.SOUTH , state.getValue( DTable.EAST ) )//
|
||||
.withProperty( DTable.WEST , state.getValue( DTable.SOUTH ) )//
|
||||
.withProperty( DTable.NW , state.getValue( DTable.SW ) )//
|
||||
.withProperty( DTable.NE , state.getValue( DTable.NW ) )//
|
||||
.withProperty( DTable.SE , state.getValue( DTable.NE ) )//
|
||||
.withProperty( DTable.SW , state.getValue( DTable.SE ) )//
|
||||
;
|
||||
default:
|
||||
return state;
|
||||
|
|
@ -204,20 +204,20 @@ public class DBlockTable
|
|||
{
|
||||
switch ( mirrorIn ) {
|
||||
case LEFT_RIGHT:
|
||||
return state.withProperty( DBlockTable.NORTH , state.getValue( DBlockTable.SOUTH ) )//
|
||||
.withProperty( DBlockTable.SOUTH , state.getValue( DBlockTable.NORTH ) )//
|
||||
.withProperty( DBlockTable.NW , state.getValue( DBlockTable.SW ) )//
|
||||
.withProperty( DBlockTable.NE , state.getValue( DBlockTable.SE ) )//
|
||||
.withProperty( DBlockTable.SW , state.getValue( DBlockTable.NW ) )//
|
||||
.withProperty( DBlockTable.SE , state.getValue( DBlockTable.NE ) )//
|
||||
return state.withProperty( DTable.NORTH , state.getValue( DTable.SOUTH ) )//
|
||||
.withProperty( DTable.SOUTH , state.getValue( DTable.NORTH ) )//
|
||||
.withProperty( DTable.NW , state.getValue( DTable.SW ) )//
|
||||
.withProperty( DTable.NE , state.getValue( DTable.SE ) )//
|
||||
.withProperty( DTable.SW , state.getValue( DTable.NW ) )//
|
||||
.withProperty( DTable.SE , state.getValue( DTable.NE ) )//
|
||||
;
|
||||
case FRONT_BACK:
|
||||
return state.withProperty( DBlockTable.EAST , state.getValue( DBlockTable.WEST ) )//
|
||||
.withProperty( DBlockTable.WEST , state.getValue( DBlockTable.EAST ) )//
|
||||
.withProperty( DBlockTable.NW , state.getValue( DBlockTable.NE ) )//
|
||||
.withProperty( DBlockTable.NE , state.getValue( DBlockTable.NW ) )//
|
||||
.withProperty( DBlockTable.SW , state.getValue( DBlockTable.SE ) )//
|
||||
.withProperty( DBlockTable.SE , state.getValue( DBlockTable.SW ) )//
|
||||
return state.withProperty( DTable.EAST , state.getValue( DTable.WEST ) )//
|
||||
.withProperty( DTable.WEST , state.getValue( DTable.EAST ) )//
|
||||
.withProperty( DTable.NW , state.getValue( DTable.NE ) )//
|
||||
.withProperty( DTable.NE , state.getValue( DTable.NW ) )//
|
||||
.withProperty( DTable.SW , state.getValue( DTable.SE ) )//
|
||||
.withProperty( DTable.SE , state.getValue( DTable.SW ) )//
|
||||
;
|
||||
default:
|
||||
return state;
|
||||
|
|
@ -230,14 +230,14 @@ public class DBlockTable
|
|||
{
|
||||
final IBlockState actual = this.getActualState( state , source , pos );
|
||||
for ( int i = 0 , dir = 0 ; i < 4 ; i++ , dir += 2 ) {
|
||||
final boolean c0 = actual.getValue( DBlockTable.DIRECTIONS[ dir ] );
|
||||
final boolean c1 = actual.getValue( DBlockTable.DIRECTIONS[ ( dir + 6 ) % 8 ] );
|
||||
final boolean c10 = actual.getValue( DBlockTable.DIRECTIONS[ ( dir + 7 ) % 8 ] );
|
||||
final boolean c0 = actual.getValue( DTable.DIRECTIONS[ dir ] );
|
||||
final boolean c1 = actual.getValue( DTable.DIRECTIONS[ ( dir + 6 ) % 8 ] );
|
||||
final boolean c10 = actual.getValue( DTable.DIRECTIONS[ ( dir + 7 ) % 8 ] );
|
||||
if ( ! ( c0 || c1 ) || c0 && c1 && !c10 ) {
|
||||
return Block.FULL_BLOCK_AABB;
|
||||
}
|
||||
}
|
||||
return DBlockTable.COLLISION_TOP;
|
||||
return DTable.COLLISION_TOP;
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -246,13 +246,13 @@ public class DBlockTable
|
|||
final AxisAlignedBB container , final List< AxisAlignedBB > output , final Entity entity )
|
||||
{
|
||||
final IBlockState actual = this.getActualState( state , worldIn , pos );
|
||||
Block.addCollisionBoxToList( pos , container , output , DBlockTable.COLLISION_TOP );
|
||||
Block.addCollisionBoxToList( pos , container , output , DTable.COLLISION_TOP );
|
||||
for ( int i = 0 , dir = 0 ; i < 4 ; i++ , dir += 2 ) {
|
||||
final boolean c0 = actual.getValue( DBlockTable.DIRECTIONS[ dir ] );
|
||||
final boolean c1 = actual.getValue( DBlockTable.DIRECTIONS[ ( dir + 6 ) % 8 ] );
|
||||
final boolean c10 = actual.getValue( DBlockTable.DIRECTIONS[ ( dir + 7 ) % 8 ] );
|
||||
final boolean c0 = actual.getValue( DTable.DIRECTIONS[ dir ] );
|
||||
final boolean c1 = actual.getValue( DTable.DIRECTIONS[ ( dir + 6 ) % 8 ] );
|
||||
final boolean c10 = actual.getValue( DTable.DIRECTIONS[ ( dir + 7 ) % 8 ] );
|
||||
if ( ! ( c0 || c1 ) || c0 && c1 && !c10 ) {
|
||||
Block.addCollisionBoxToList( pos , container , output , DBlockTable.COLLISION_LEGS[ i ] );
|
||||
Block.addCollisionBoxToList( pos , container , output , DTable.COLLISION_LEGS[ i ] );
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -8,54 +8,54 @@ import net.minecraft.block.BlockStone;
|
|||
|
||||
public class DecorativeBlocks
|
||||
{
|
||||
public static final DExtraStairs STAIRS_GRANITE;
|
||||
public static final DExtraStairs STAIRS_DIORITE;
|
||||
public static final DExtraStairs STAIRS_ANDESITE;
|
||||
public static final DStairs STAIRS_GRANITE;
|
||||
public static final DStairs STAIRS_DIORITE;
|
||||
public static final DStairs STAIRS_ANDESITE;
|
||||
|
||||
public static final DExtraSlab SLAB_GRANITE;
|
||||
public static final DExtraSlab SLAB_DIORITE;
|
||||
public static final DExtraSlab SLAB_ANDESITE;
|
||||
public static final DSlab SLAB_GRANITE;
|
||||
public static final DSlab SLAB_DIORITE;
|
||||
public static final DSlab SLAB_ANDESITE;
|
||||
|
||||
public static final DBlockTable TABLE_OAK;
|
||||
public static final DBlockTable TABLE_BIRCH;
|
||||
public static final DBlockTable TABLE_SPRUCE;
|
||||
public static final DBlockTable TABLE_JUNGLE;
|
||||
public static final DBlockTable TABLE_DARK_OAK;
|
||||
public static final DBlockTable TABLE_ACACIA;
|
||||
public static final DTable TABLE_OAK;
|
||||
public static final DTable TABLE_BIRCH;
|
||||
public static final DTable TABLE_SPRUCE;
|
||||
public static final DTable TABLE_JUNGLE;
|
||||
public static final DTable TABLE_DARK_OAK;
|
||||
public static final DTable TABLE_ACACIA;
|
||||
|
||||
public static final DBlockChair CHAIR_OAK;
|
||||
public static final DBlockChair CHAIR_BIRCH;
|
||||
public static final DBlockChair CHAIR_SPRUCE;
|
||||
public static final DBlockChair CHAIR_JUNGLE;
|
||||
public static final DBlockChair CHAIR_DARK_OAK;
|
||||
public static final DBlockChair CHAIR_ACACIA;
|
||||
public static final DChair CHAIR_OAK;
|
||||
public static final DChair CHAIR_BIRCH;
|
||||
public static final DChair CHAIR_SPRUCE;
|
||||
public static final DChair CHAIR_JUNGLE;
|
||||
public static final DChair CHAIR_DARK_OAK;
|
||||
public static final DChair CHAIR_ACACIA;
|
||||
|
||||
static {
|
||||
final BlockStone.EnumType granite = BlockStone.EnumType.GRANITE_SMOOTH;
|
||||
final BlockStone.EnumType diorite = BlockStone.EnumType.DIORITE_SMOOTH;
|
||||
final BlockStone.EnumType andesite = BlockStone.EnumType.ANDESITE_SMOOTH;
|
||||
|
||||
URegistry.addBlock( STAIRS_GRANITE = DExtraStairs.fromStone( granite ) );
|
||||
URegistry.addBlock( STAIRS_DIORITE = DExtraStairs.fromStone( diorite ) );
|
||||
URegistry.addBlock( STAIRS_ANDESITE = DExtraStairs.fromStone( andesite ) );
|
||||
URegistry.addBlock( STAIRS_GRANITE = DStairs.fromStone( granite ) );
|
||||
URegistry.addBlock( STAIRS_DIORITE = DStairs.fromStone( diorite ) );
|
||||
URegistry.addBlock( STAIRS_ANDESITE = DStairs.fromStone( andesite ) );
|
||||
|
||||
SLAB_GRANITE = DExtraSlab.fromStone( granite ).register( );
|
||||
SLAB_DIORITE = DExtraSlab.fromStone( diorite ).register( );
|
||||
SLAB_ANDESITE = DExtraSlab.fromStone( andesite ).register( );
|
||||
SLAB_GRANITE = DSlab.fromStone( granite ).register( );
|
||||
SLAB_DIORITE = DSlab.fromStone( diorite ).register( );
|
||||
SLAB_ANDESITE = DSlab.fromStone( andesite ).register( );
|
||||
|
||||
URegistry.addBlock( TABLE_OAK = new DBlockTable( E_DWoodType.OAK ) );
|
||||
URegistry.addBlock( TABLE_BIRCH = new DBlockTable( E_DWoodType.BIRCH ) );
|
||||
URegistry.addBlock( TABLE_SPRUCE = new DBlockTable( E_DWoodType.SPRUCE ) );
|
||||
URegistry.addBlock( TABLE_JUNGLE = new DBlockTable( E_DWoodType.JUNGLE ) );
|
||||
URegistry.addBlock( TABLE_DARK_OAK = new DBlockTable( E_DWoodType.DARK_OAK ) );
|
||||
URegistry.addBlock( TABLE_ACACIA = new DBlockTable( E_DWoodType.ACACIA ) );
|
||||
URegistry.addBlock( TABLE_OAK = new DTable( E_DWoodType.OAK ) );
|
||||
URegistry.addBlock( TABLE_BIRCH = new DTable( E_DWoodType.BIRCH ) );
|
||||
URegistry.addBlock( TABLE_SPRUCE = new DTable( E_DWoodType.SPRUCE ) );
|
||||
URegistry.addBlock( TABLE_JUNGLE = new DTable( E_DWoodType.JUNGLE ) );
|
||||
URegistry.addBlock( TABLE_DARK_OAK = new DTable( E_DWoodType.DARK_OAK ) );
|
||||
URegistry.addBlock( TABLE_ACACIA = new DTable( E_DWoodType.ACACIA ) );
|
||||
|
||||
URegistry.addBlock( CHAIR_OAK = new DBlockChair( E_DWoodType.OAK ) );
|
||||
URegistry.addBlock( CHAIR_BIRCH = new DBlockChair( E_DWoodType.BIRCH ) );
|
||||
URegistry.addBlock( CHAIR_SPRUCE = new DBlockChair( E_DWoodType.SPRUCE ) );
|
||||
URegistry.addBlock( CHAIR_JUNGLE = new DBlockChair( E_DWoodType.JUNGLE ) );
|
||||
URegistry.addBlock( CHAIR_DARK_OAK = new DBlockChair( E_DWoodType.DARK_OAK ) );
|
||||
URegistry.addBlock( CHAIR_ACACIA = new DBlockChair( E_DWoodType.ACACIA ) );
|
||||
URegistry.addBlock( CHAIR_OAK = new DChair( E_DWoodType.OAK ) );
|
||||
URegistry.addBlock( CHAIR_BIRCH = new DChair( E_DWoodType.BIRCH ) );
|
||||
URegistry.addBlock( CHAIR_SPRUCE = new DChair( E_DWoodType.SPRUCE ) );
|
||||
URegistry.addBlock( CHAIR_JUNGLE = new DChair( E_DWoodType.JUNGLE ) );
|
||||
URegistry.addBlock( CHAIR_DARK_OAK = new DChair( E_DWoodType.DARK_OAK ) );
|
||||
URegistry.addBlock( CHAIR_ACACIA = new DChair( E_DWoodType.ACACIA ) );
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
Reference in a new issue