Fixes #2398 by switching to use of the auto rotation

This commit is contained in:
Sebastian Hartte
2016-10-02 13:27:38 +02:00
parent c19d9d49f9
commit 18ea568e2a
4 changed files with 15 additions and 22 deletions
@@ -59,7 +59,10 @@ public class CraftingCubeRendering extends BlockRenderingCustomizer
ResourceLocation baseName = new ResourceLocation( AppEng.MOD_ID, registryName );
// Disable auto-rotation
rendering.modelCustomizer( ( loc, model ) -> model );
if( type != BlockCraftingUnit.CraftingUnitType.MONITOR )
{
rendering.modelCustomizer( ( loc, model ) -> model );
}
// This is the standard blockstate model
ModelResourceLocation defaultModel = new ModelResourceLocation( baseName, "normal" );
@@ -63,10 +63,9 @@ class MonitorBakedModel extends CraftingCubeBakedModel
@Override
protected void addInnerCube( EnumFacing side, IBlockState state, CubeBuilder builder, float x1, float y1, float z1, float x2, float y2, float z2 )
{
EnumFacing forward = getForward( state );
// For sides other than the front, use the chassis texture
if( side != forward )
// The actual rotation of the cube is handled by the auto rotation as usual
if( side != EnumFacing.NORTH )
{
builder.setTexture( chassisTexture );
builder.addCube( x1, y1, z1, x2, y2, z2 );
@@ -111,18 +110,4 @@ class MonitorBakedModel extends CraftingCubeBakedModel
return AEColor.TRANSPARENT;
}
private static EnumFacing getForward( IBlockState state )
{
if( state instanceof IExtendedBlockState )
{
IExtendedBlockState extState = (IExtendedBlockState) state;
EnumFacing forward = extState.getValue( BlockCraftingMonitor.FORWARD );
if( forward != null )
{
return forward;
}
}
return EnumFacing.NORTH;
}
}