Fixed some messed up refactoring
This commit is contained in:
parent
c9e8a6e939
commit
15664b2822
|
@ -446,7 +446,7 @@ public abstract class AEBaseBlock extends Block implements IAEFeature
|
|||
@Override
|
||||
public boolean hasComparatorInputOverride()
|
||||
{
|
||||
return this.isInventory;
|
||||
return this.isInventory();
|
||||
}
|
||||
|
||||
@Override
|
||||
|
@ -711,4 +711,19 @@ public abstract class AEBaseBlock extends Block implements IAEFeature
|
|||
return featureSubName;
|
||||
}
|
||||
|
||||
public boolean isInventory()
|
||||
{
|
||||
return isInventory;
|
||||
}
|
||||
|
||||
public void setInventory( boolean isInventory )
|
||||
{
|
||||
this.isInventory = isInventory;
|
||||
}
|
||||
|
||||
public void setHasSubtypes( boolean hasSubtypes )
|
||||
{
|
||||
this.hasSubtypes = hasSubtypes;
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
@ -50,7 +50,7 @@ public class AEBaseItemBlock extends ItemBlock
|
|||
{
|
||||
super( id );
|
||||
this.blockType = (AEBaseBlock) id;
|
||||
this.hasSubtypes = this.blockType.hasSubtypes;
|
||||
this.hasSubtypes = this.blockType.hasSubtypes();
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
|
@ -91,7 +91,7 @@ public abstract class AEBaseTileBlock extends AEBaseBlock implements IAEFeature,
|
|||
protected void setTileEntity( final Class<? extends TileEntity> c )
|
||||
{
|
||||
this.tileEntityType = c;
|
||||
this.isInventory = IInventory.class.isAssignableFrom( c );
|
||||
this.setInventory( IInventory.class.isAssignableFrom( c ) );
|
||||
this.setTileProvider( this.hasBlockTileEntity() );
|
||||
}
|
||||
|
||||
|
|
|
@ -60,7 +60,7 @@ public class BlockSkyChest extends AEBaseTileBlock implements ICustomCollision
|
|||
this.setTileEntity( TileSkyChest.class );
|
||||
this.setOpaque( this.setFullSize( false ) );
|
||||
this.lightOpacity = 0;
|
||||
this.hasSubtypes = true;
|
||||
this.setHasSubtypes( true );
|
||||
this.setHardness( 50 );
|
||||
this.blockResistance = 150.0f;
|
||||
this.type = type;
|
||||
|
|
|
@ -613,7 +613,7 @@ public class ModelGenerator
|
|||
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() );
|
||||
|
||||
if( face.isEdge )
|
||||
if( face.isEdge() )
|
||||
this.generatedModel.getFaceQuads( myFace ).add( bf );
|
||||
else
|
||||
this.generatedModel.getGeneralQuads().add( bf );
|
||||
|
|
|
@ -65,4 +65,9 @@ public class SMFace
|
|||
return spite;
|
||||
}
|
||||
|
||||
public boolean isEdge()
|
||||
{
|
||||
return isEdge;
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
@ -49,7 +49,7 @@ public class SkyStoneBlock extends AEBaseBlock
|
|||
{
|
||||
super( Material.rock, Optional.of( type.name() ) );
|
||||
this.setHardness( 50 );
|
||||
this.hasSubtypes = true;
|
||||
this.setHasSubtypes( true );
|
||||
this.blockResistance = BLOCK_RESISTANCE;
|
||||
if( type == SkystoneType.STONE )
|
||||
{
|
||||
|
|
Loading…
Reference in New Issue