Fixed some messed up refactoring

This commit is contained in:
yueh 2015-12-24 02:05:39 +01:00
parent c9e8a6e939
commit 15664b2822
7 changed files with 26 additions and 6 deletions

View file

@ -446,7 +446,7 @@ public abstract class AEBaseBlock extends Block implements IAEFeature
@Override @Override
public boolean hasComparatorInputOverride() public boolean hasComparatorInputOverride()
{ {
return this.isInventory; return this.isInventory();
} }
@Override @Override
@ -711,4 +711,19 @@ public abstract class AEBaseBlock extends Block implements IAEFeature
return featureSubName; return featureSubName;
} }
public boolean isInventory()
{
return isInventory;
}
public void setInventory( boolean isInventory )
{
this.isInventory = isInventory;
}
public void setHasSubtypes( boolean hasSubtypes )
{
this.hasSubtypes = hasSubtypes;
}
} }

View file

@ -50,7 +50,7 @@ public class AEBaseItemBlock extends ItemBlock
{ {
super( id ); super( id );
this.blockType = (AEBaseBlock) id; this.blockType = (AEBaseBlock) id;
this.hasSubtypes = this.blockType.hasSubtypes; this.hasSubtypes = this.blockType.hasSubtypes();
} }
@Override @Override

View file

@ -91,7 +91,7 @@ public abstract class AEBaseTileBlock extends AEBaseBlock implements IAEFeature,
protected void setTileEntity( final Class<? extends TileEntity> c ) protected void setTileEntity( final Class<? extends TileEntity> c )
{ {
this.tileEntityType = c; this.tileEntityType = c;
this.isInventory = IInventory.class.isAssignableFrom( c ); this.setInventory( IInventory.class.isAssignableFrom( c ) );
this.setTileProvider( this.hasBlockTileEntity() ); this.setTileProvider( this.hasBlockTileEntity() );
} }

View file

@ -60,7 +60,7 @@ public class BlockSkyChest extends AEBaseTileBlock implements ICustomCollision
this.setTileEntity( TileSkyChest.class ); this.setTileEntity( TileSkyChest.class );
this.setOpaque( this.setFullSize( false ) ); this.setOpaque( this.setFullSize( false ) );
this.lightOpacity = 0; this.lightOpacity = 0;
this.hasSubtypes = true; this.setHasSubtypes( true );
this.setHardness( 50 ); this.setHardness( 50 );
this.blockResistance = 150.0f; this.blockResistance = 150.0f;
this.type = type; this.type = type;

View file

@ -613,7 +613,7 @@ public class ModelGenerator
BakedQuad bf = this.faceBakery.makeBakedQuad( face.getTo(), face.getFrom(), bpf, face.getSpite(), myFace, mr, null, true, true ); BakedQuad bf = this.faceBakery.makeBakedQuad( face.getTo(), face.getFrom(), bpf, face.getSpite(), myFace, mr, null, true, true );
bf = new IColoredBakedQuad.ColoredBakedQuad( bf.getVertexData(), face.getColor(), bf.getFace() ); bf = new IColoredBakedQuad.ColoredBakedQuad( bf.getVertexData(), face.getColor(), bf.getFace() );
if( face.isEdge ) if( face.isEdge() )
this.generatedModel.getFaceQuads( myFace ).add( bf ); this.generatedModel.getFaceQuads( myFace ).add( bf );
else else
this.generatedModel.getGeneralQuads().add( bf ); this.generatedModel.getGeneralQuads().add( bf );

View file

@ -65,4 +65,9 @@ public class SMFace
return spite; return spite;
} }
public boolean isEdge()
{
return isEdge;
}
} }

View file

@ -49,7 +49,7 @@ public class SkyStoneBlock extends AEBaseBlock
{ {
super( Material.rock, Optional.of( type.name() ) ); super( Material.rock, Optional.of( type.name() ) );
this.setHardness( 50 ); this.setHardness( 50 );
this.hasSubtypes = true; this.setHasSubtypes( true );
this.blockResistance = BLOCK_RESISTANCE; this.blockResistance = BLOCK_RESISTANCE;
if( type == SkystoneType.STONE ) if( type == SkystoneType.STONE )
{ {