fujin/Applied-Energistics-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merged stairs feature handler with block's one

Browse Source 
Merged stairs feature handler with block's one.
Relates to #9.
This commit is contained in:
elix-x
2016-07-20 15:49:03 +02:00
parent 8c5d85d52a
commit dc7ddfe107
4 changed files with 13 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/block/AEBaseBlock.java
+8 -21
View File
@@ -48,9 +48,6 @@ 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.IExtendedBlockState;
import net.minecraftforge.common.property.IUnlistedProperty;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
@@ -66,6 +63,7 @@ import appeng.helpers.ICustomCollision;
import appeng.util.LookDirection;
import appeng.util.Platform;
public abstract class AEBaseBlock extends Block implements IAEFeature
{
@@ -78,8 +76,7 @@ public abstract class AEBaseBlock extends Block implements IAEFeature
private boolean hasSubtypes = false;
private boolean isInventory = false;
private IFeatureHandler handler;
private String textureName;
protected AxisAlignedBB boundingBox = FULL_BLOCK_AABB;
@Override
@@ -131,7 +128,7 @@ public abstract class AEBaseBlock extends Block implements IAEFeature
@Override
protected BlockStateContainer createBlockState()
{
return new ExtendedBlockState( this, this.getAEStates(), new IUnlistedProperty[] {} );
return new BlockStateContainer( this, this.getAEStates() );
}
protected IProperty[] getAEStates()
@@ -168,7 +165,7 @@ public abstract class AEBaseBlock extends Block implements IAEFeature
}
@Override
public boolean isNormalCube(IBlockState state)
public boolean isNormalCube( IBlockState state )
{
return this.isFullSize() && this.isOpaque();
}
@@ -187,7 +184,7 @@ public abstract class AEBaseBlock extends Block implements IAEFeature
{
return boundingBox;
}
@Override
public void addCollisionBoxToList( final IBlockState state, final World w, final BlockPos pos, final AxisAlignedBB bb, final List<AxisAlignedBB> out, final Entity e )
{
@@ -211,7 +208,7 @@ public abstract class AEBaseBlock extends Block implements IAEFeature
super.addCollisionBoxToList( state, w, pos, bb, out, e );
}
}
@Override
@SideOnly( Side.CLIENT )
public AxisAlignedBB getSelectedBoundingBox( IBlockState state, final World w, final BlockPos pos )
@@ -297,7 +294,7 @@ public abstract class AEBaseBlock extends Block implements IAEFeature
}
@Override
public final boolean isOpaqueCube(IBlockState state)
public final boolean isOpaqueCube( IBlockState state )
{
return this.isOpaque();
}
@@ -363,7 +360,7 @@ public abstract class AEBaseBlock extends Block implements IAEFeature
}
@Override
public boolean hasComparatorInputOverride(IBlockState state)
public boolean hasComparatorInputOverride( IBlockState state )
{
return this.isInventory();
}
@@ -541,16 +538,6 @@ public abstract class AEBaseBlock extends Block implements IAEFeature
return null;
}
public void setBlockTextureName( final String texture )
{
this.textureName = texture;
}
private String getTextureName()
{
return this.textureName;
}
public boolean isFullSize()
{
return this.isFullSize;
src/main/java/appeng/block/AEBaseStairBlock.java
+2 -2
View File
@@ -27,10 +27,10 @@ import com.google.common.base.Preconditions;
import net.minecraft.block.Block;
import net.minecraft.block.BlockStairs;
import appeng.core.features.AEBlockFeatureHandler;
import appeng.core.features.AEFeature;
import appeng.core.features.IAEFeature;
import appeng.core.features.IFeatureHandler;
import appeng.core.features.StairBlockFeatureHandler;
public abstract class AEBaseStairBlock extends BlockStairs implements IAEFeature
@@ -45,7 +45,7 @@ public abstract class AEBaseStairBlock extends BlockStairs implements IAEFeature
Preconditions.checkNotNull( block.getUnlocalizedName() );
Preconditions.checkArgument( block.getUnlocalizedName().length() > 0 );
this.features = new StairBlockFeatureHandler( features, this, Optional.of( type ) );
this.features = new AEBlockFeatureHandler( features, this, Optional.of( type ) );
this.setUnlocalizedName( "stair." + type );
this.setLightOpacity( 0 );